diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-12-27 09:55:07 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-12-29 05:17:13 -0500 |
commit | 2e94b53c55d00b4d4d4b9e65007566f7fbffab7a (patch) | |
tree | 41ff127a6771bf4f062c521a015a043879421da4 /drivers/media | |
parent | d78aa7292ad38b22ccb9cdba99293cedb52fb342 (diff) |
[media] dib7000m/dib7000p: Add support for TRANSMISSION_MODE_4K
Fixes several warnings:
drivers/media/dvb/frontends/dib7000m.c: In function ‘dib7000m_set_channel’:
drivers/media/dvb/frontends/dib7000m.c:808:3: warning: case value ‘255’ not in enumerated type ‘fe_transmit_mode_t’
drivers/media/dvb/frontends/dib7000m.c:869:3: warning: case value ‘255’ not in enumerated type ‘fe_transmit_mode_t’
drivers/media/dvb/frontends/dib7000m.c: In function ‘dib7000m_tune’:
drivers/media/dvb/frontends/dib7000m.c:1023:3: warning: case value ‘255’ not in enumerated type ‘fe_transmit_mode_t’
drivers/media/dvb/frontends/dib7000m.c:1033:3: warning: case value ‘255’ not in enumerated type ‘fe_transmit_mode_t’
drivers/media/dvb/frontends/dib7000m.c:1043:3: warning: case value ‘255’ not in enumerated type ‘fe_transmit_mode_t’
drivers/media/dvb/frontends/dib7000p.c: In function ‘dib7000p_set_channel’:
drivers/media/dvb/frontends/dib7000p.c:720:3: warning: case value ‘255’ not in enumerated type ‘fe_transmit_mode_t’
drivers/media/dvb/frontends/dib7000p.c:773:3: warning: case value ‘255’ not in enumerated type ‘fe_transmit_mode_t’
drivers/media/dvb/frontends/dib7000p.c: In function ‘dib7000p_tune’:
drivers/media/dvb/frontends/dib7000p.c:997:3: warning: case value ‘255’ not in enumerated type ‘fe_transmit_mode_t’
drivers/media/dvb/frontends/dib7000p.c:1007:3: warning: case value ‘255’ not in enumerated type ‘fe_transmit_mode_t’
drivers/media/dvb/frontends/dib7000p.c:1017:3: warning: case value ‘255’ not in enumerated type ‘fe_transmit_mode_t’
The drivers were prepared to support 4K carriers, but as the define were added
later, they were using a "magic" value of 255.
Cc: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/dvb/frontends/dib7000m.c | 10 | ||||
-rw-r--r-- | drivers/media/dvb/frontends/dib7000p.c | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/drivers/media/dvb/frontends/dib7000m.c b/drivers/media/dvb/frontends/dib7000m.c index 0f09fd31cb29..c7f5ccf54aa5 100644 --- a/drivers/media/dvb/frontends/dib7000m.c +++ b/drivers/media/dvb/frontends/dib7000m.c | |||
@@ -805,7 +805,7 @@ static void dib7000m_set_channel(struct dib7000m_state *state, struct dvb_fronte | |||
805 | value = 0; | 805 | value = 0; |
806 | switch (ch->u.ofdm.transmission_mode) { | 806 | switch (ch->u.ofdm.transmission_mode) { |
807 | case TRANSMISSION_MODE_2K: value |= (0 << 7); break; | 807 | case TRANSMISSION_MODE_2K: value |= (0 << 7); break; |
808 | case /* 4K MODE */ 255: value |= (2 << 7); break; | 808 | case TRANSMISSION_MODE_4K: value |= (2 << 7); break; |
809 | default: | 809 | default: |
810 | case TRANSMISSION_MODE_8K: value |= (1 << 7); break; | 810 | case TRANSMISSION_MODE_8K: value |= (1 << 7); break; |
811 | } | 811 | } |
@@ -866,7 +866,7 @@ static void dib7000m_set_channel(struct dib7000m_state *state, struct dvb_fronte | |||
866 | /* P_dvsy_sync_wait */ | 866 | /* P_dvsy_sync_wait */ |
867 | switch (ch->u.ofdm.transmission_mode) { | 867 | switch (ch->u.ofdm.transmission_mode) { |
868 | case TRANSMISSION_MODE_8K: value = 256; break; | 868 | case TRANSMISSION_MODE_8K: value = 256; break; |
869 | case /* 4K MODE */ 255: value = 128; break; | 869 | case TRANSMISSION_MODE_4K: value = 128; break; |
870 | case TRANSMISSION_MODE_2K: | 870 | case TRANSMISSION_MODE_2K: |
871 | default: value = 64; break; | 871 | default: value = 64; break; |
872 | } | 872 | } |
@@ -1020,7 +1020,7 @@ static int dib7000m_tune(struct dvb_frontend *demod, struct dvb_frontend_paramet | |||
1020 | value = (6 << 8) | 0x80; | 1020 | value = (6 << 8) | 0x80; |
1021 | switch (ch->u.ofdm.transmission_mode) { | 1021 | switch (ch->u.ofdm.transmission_mode) { |
1022 | case TRANSMISSION_MODE_2K: value |= (7 << 12); break; | 1022 | case TRANSMISSION_MODE_2K: value |= (7 << 12); break; |
1023 | case /* 4K MODE */ 255: value |= (8 << 12); break; | 1023 | case TRANSMISSION_MODE_4K: value |= (8 << 12); break; |
1024 | default: | 1024 | default: |
1025 | case TRANSMISSION_MODE_8K: value |= (9 << 12); break; | 1025 | case TRANSMISSION_MODE_8K: value |= (9 << 12); break; |
1026 | } | 1026 | } |
@@ -1030,7 +1030,7 @@ static int dib7000m_tune(struct dvb_frontend *demod, struct dvb_frontend_paramet | |||
1030 | value = (0 << 4); | 1030 | value = (0 << 4); |
1031 | switch (ch->u.ofdm.transmission_mode) { | 1031 | switch (ch->u.ofdm.transmission_mode) { |
1032 | case TRANSMISSION_MODE_2K: value |= 0x6; break; | 1032 | case TRANSMISSION_MODE_2K: value |= 0x6; break; |
1033 | case /* 4K MODE */ 255: value |= 0x7; break; | 1033 | case TRANSMISSION_MODE_4K: value |= 0x7; break; |
1034 | default: | 1034 | default: |
1035 | case TRANSMISSION_MODE_8K: value |= 0x8; break; | 1035 | case TRANSMISSION_MODE_8K: value |= 0x8; break; |
1036 | } | 1036 | } |
@@ -1040,7 +1040,7 @@ static int dib7000m_tune(struct dvb_frontend *demod, struct dvb_frontend_paramet | |||
1040 | value = (0 << 4); | 1040 | value = (0 << 4); |
1041 | switch (ch->u.ofdm.transmission_mode) { | 1041 | switch (ch->u.ofdm.transmission_mode) { |
1042 | case TRANSMISSION_MODE_2K: value |= 0x6; break; | 1042 | case TRANSMISSION_MODE_2K: value |= 0x6; break; |
1043 | case /* 4K MODE */ 255: value |= 0x7; break; | 1043 | case TRANSMISSION_MODE_4K: value |= 0x7; break; |
1044 | default: | 1044 | default: |
1045 | case TRANSMISSION_MODE_8K: value |= 0x8; break; | 1045 | case TRANSMISSION_MODE_8K: value |= 0x8; break; |
1046 | } | 1046 | } |
diff --git a/drivers/media/dvb/frontends/dib7000p.c b/drivers/media/dvb/frontends/dib7000p.c index 3aed0d433921..6aa02cb80733 100644 --- a/drivers/media/dvb/frontends/dib7000p.c +++ b/drivers/media/dvb/frontends/dib7000p.c | |||
@@ -717,7 +717,7 @@ static void dib7000p_set_channel(struct dib7000p_state *state, struct dvb_fronte | |||
717 | value = 0; | 717 | value = 0; |
718 | switch (ch->u.ofdm.transmission_mode) { | 718 | switch (ch->u.ofdm.transmission_mode) { |
719 | case TRANSMISSION_MODE_2K: value |= (0 << 7); break; | 719 | case TRANSMISSION_MODE_2K: value |= (0 << 7); break; |
720 | case /* 4K MODE */ 255: value |= (2 << 7); break; | 720 | case TRANSMISSION_MODE_4K: value |= (2 << 7); break; |
721 | default: | 721 | default: |
722 | case TRANSMISSION_MODE_8K: value |= (1 << 7); break; | 722 | case TRANSMISSION_MODE_8K: value |= (1 << 7); break; |
723 | } | 723 | } |
@@ -770,7 +770,7 @@ static void dib7000p_set_channel(struct dib7000p_state *state, struct dvb_fronte | |||
770 | /* P_dvsy_sync_wait */ | 770 | /* P_dvsy_sync_wait */ |
771 | switch (ch->u.ofdm.transmission_mode) { | 771 | switch (ch->u.ofdm.transmission_mode) { |
772 | case TRANSMISSION_MODE_8K: value = 256; break; | 772 | case TRANSMISSION_MODE_8K: value = 256; break; |
773 | case /* 4K MODE */ 255: value = 128; break; | 773 | case TRANSMISSION_MODE_4K: value = 128; break; |
774 | case TRANSMISSION_MODE_2K: | 774 | case TRANSMISSION_MODE_2K: |
775 | default: value = 64; break; | 775 | default: value = 64; break; |
776 | } | 776 | } |
@@ -994,7 +994,7 @@ static int dib7000p_tune(struct dvb_frontend *demod, struct dvb_frontend_paramet | |||
994 | tmp = (6 << 8) | 0x80; | 994 | tmp = (6 << 8) | 0x80; |
995 | switch (ch->u.ofdm.transmission_mode) { | 995 | switch (ch->u.ofdm.transmission_mode) { |
996 | case TRANSMISSION_MODE_2K: tmp |= (7 << 12); break; | 996 | case TRANSMISSION_MODE_2K: tmp |= (7 << 12); break; |
997 | case /* 4K MODE */ 255: tmp |= (8 << 12); break; | 997 | case TRANSMISSION_MODE_4K: tmp |= (8 << 12); break; |
998 | default: | 998 | default: |
999 | case TRANSMISSION_MODE_8K: tmp |= (9 << 12); break; | 999 | case TRANSMISSION_MODE_8K: tmp |= (9 << 12); break; |
1000 | } | 1000 | } |
@@ -1004,7 +1004,7 @@ static int dib7000p_tune(struct dvb_frontend *demod, struct dvb_frontend_paramet | |||
1004 | tmp = (0 << 4); | 1004 | tmp = (0 << 4); |
1005 | switch (ch->u.ofdm.transmission_mode) { | 1005 | switch (ch->u.ofdm.transmission_mode) { |
1006 | case TRANSMISSION_MODE_2K: tmp |= 0x6; break; | 1006 | case TRANSMISSION_MODE_2K: tmp |= 0x6; break; |
1007 | case /* 4K MODE */ 255: tmp |= 0x7; break; | 1007 | case TRANSMISSION_MODE_4K: tmp |= 0x7; break; |
1008 | default: | 1008 | default: |
1009 | case TRANSMISSION_MODE_8K: tmp |= 0x8; break; | 1009 | case TRANSMISSION_MODE_8K: tmp |= 0x8; break; |
1010 | } | 1010 | } |
@@ -1014,7 +1014,7 @@ static int dib7000p_tune(struct dvb_frontend *demod, struct dvb_frontend_paramet | |||
1014 | tmp = (0 << 4); | 1014 | tmp = (0 << 4); |
1015 | switch (ch->u.ofdm.transmission_mode) { | 1015 | switch (ch->u.ofdm.transmission_mode) { |
1016 | case TRANSMISSION_MODE_2K: tmp |= 0x6; break; | 1016 | case TRANSMISSION_MODE_2K: tmp |= 0x6; break; |
1017 | case /* 4K MODE */ 255: tmp |= 0x7; break; | 1017 | case TRANSMISSION_MODE_4K: tmp |= 0x7; break; |
1018 | default: | 1018 | default: |
1019 | case TRANSMISSION_MODE_8K: tmp |= 0x8; break; | 1019 | case TRANSMISSION_MODE_8K: tmp |= 0x8; break; |
1020 | } | 1020 | } |