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/dvb/frontends/dib7000m.c | |
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/dvb/frontends/dib7000m.c')
-rw-r--r-- | drivers/media/dvb/frontends/dib7000m.c | 10 |
1 files changed, 5 insertions, 5 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 | } |