aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/dvb')
-rw-r--r--drivers/media/dvb/bt8xx/dst.c26
-rw-r--r--drivers/media/dvb/bt8xx/dst_common.h2
2 files changed, 14 insertions, 14 deletions
diff --git a/drivers/media/dvb/bt8xx/dst.c b/drivers/media/dvb/bt8xx/dst.c
index 638131af9733..5aa34f8bcbfa 100644
--- a/drivers/media/dvb/bt8xx/dst.c
+++ b/drivers/media/dvb/bt8xx/dst.c
@@ -562,8 +562,8 @@ static void dst_type_flags_print(struct dst_state *state)
562 u32 type_flags = state->type_flags; 562 u32 type_flags = state->type_flags;
563 563
564 dprintk(verbose, DST_ERROR, 0, "DST type flags :"); 564 dprintk(verbose, DST_ERROR, 0, "DST type flags :");
565 if (type_flags & DST_TYPE_HAS_NEWTUNE) 565 if (type_flags & DST_TYPE_HAS_TS188)
566 dprintk(verbose, DST_ERROR, 0, " 0x%x newtuner", DST_TYPE_HAS_NEWTUNE); 566 dprintk(verbose, DST_ERROR, 0, " 0x%x newtuner", DST_TYPE_HAS_TS188);
567 if (type_flags & DST_TYPE_HAS_NEWTUNE_2) 567 if (type_flags & DST_TYPE_HAS_NEWTUNE_2)
568 dprintk(verbose, DST_ERROR, 0, " 0x%x newtuner 2", DST_TYPE_HAS_NEWTUNE_2); 568 dprintk(verbose, DST_ERROR, 0, " 0x%x newtuner 2", DST_TYPE_HAS_NEWTUNE_2);
569 if (type_flags & DST_TYPE_HAS_TS204) 569 if (type_flags & DST_TYPE_HAS_TS204)
@@ -788,7 +788,7 @@ static struct dst_types dst_tlist[] = {
788 .device_id = "DST-030", 788 .device_id = "DST-030",
789 .offset = 0, 789 .offset = 0,
790 .dst_type = DST_TYPE_IS_SAT, 790 .dst_type = DST_TYPE_IS_SAT,
791 .type_flags = DST_TYPE_HAS_TS204 | DST_TYPE_HAS_NEWTUNE | DST_TYPE_HAS_FW_1, 791 .type_flags = DST_TYPE_HAS_TS204 | DST_TYPE_HAS_TS188 | DST_TYPE_HAS_FW_1,
792 .dst_feature = 0, 792 .dst_feature = 0,
793 .tuner_type = 0 793 .tuner_type = 0
794 }, /* obsolete */ 794 }, /* obsolete */
@@ -825,7 +825,7 @@ static struct dst_types dst_tlist[] = {
825 .device_id = "DSTMCI", 825 .device_id = "DSTMCI",
826 .offset = 1, 826 .offset = 1,
827 .dst_type = DST_TYPE_IS_SAT, 827 .dst_type = DST_TYPE_IS_SAT,
828 .type_flags = DST_TYPE_HAS_NEWTUNE | DST_TYPE_HAS_FW_2 | DST_TYPE_HAS_FW_BUILD | DST_TYPE_HAS_INC_COUNT, 828 .type_flags = DST_TYPE_HAS_TS188 | DST_TYPE_HAS_FW_2 | DST_TYPE_HAS_FW_BUILD | DST_TYPE_HAS_INC_COUNT,
829 .dst_feature = DST_TYPE_HAS_CA | DST_TYPE_HAS_DISEQC3 | DST_TYPE_HAS_DISEQC4 829 .dst_feature = DST_TYPE_HAS_CA | DST_TYPE_HAS_DISEQC3 | DST_TYPE_HAS_DISEQC4
830 | DST_TYPE_HAS_MOTO | DST_TYPE_HAS_MAC, 830 | DST_TYPE_HAS_MOTO | DST_TYPE_HAS_MAC,
831 .tuner_type = TUNER_TYPE_MULTI 831 .tuner_type = TUNER_TYPE_MULTI
@@ -835,7 +835,7 @@ static struct dst_types dst_tlist[] = {
835 .device_id = "DSTFCI", 835 .device_id = "DSTFCI",
836 .offset = 1, 836 .offset = 1,
837 .dst_type = DST_TYPE_IS_SAT, 837 .dst_type = DST_TYPE_IS_SAT,
838 .type_flags = DST_TYPE_HAS_NEWTUNE | DST_TYPE_HAS_FW_1, 838 .type_flags = DST_TYPE_HAS_TS188 | DST_TYPE_HAS_FW_1,
839 .dst_feature = 0, 839 .dst_feature = 0,
840 .tuner_type = 0 840 .tuner_type = 0
841 }, /* unknown to vendor */ 841 }, /* unknown to vendor */
@@ -853,7 +853,7 @@ static struct dst_types dst_tlist[] = {
853 .device_id = "DCTNEW", 853 .device_id = "DCTNEW",
854 .offset = 1, 854 .offset = 1,
855 .dst_type = DST_TYPE_IS_CABLE, 855 .dst_type = DST_TYPE_IS_CABLE,
856 .type_flags = DST_TYPE_HAS_NEWTUNE | DST_TYPE_HAS_FW_3 | DST_TYPE_HAS_FW_BUILD | DST_TYPE_MULTI_FE, 856 .type_flags = DST_TYPE_HAS_TS188 | DST_TYPE_HAS_FW_3 | DST_TYPE_HAS_FW_BUILD | DST_TYPE_HAS_MULTI_FE,
857 .dst_feature = 0, 857 .dst_feature = 0,
858 .tuner_type = 0 858 .tuner_type = 0
859 }, 859 },
@@ -1062,7 +1062,7 @@ static int dst_get_tuner_info(struct dst_state *state)
1062 } 1062 }
1063 if (state->board_info[0] == 0xbc) { 1063 if (state->board_info[0] == 0xbc) {
1064 if (state->type_flags != DST_TYPE_IS_ATSC) 1064 if (state->type_flags != DST_TYPE_IS_ATSC)
1065 state->type_flags |= DST_TYPE_HAS_NEWTUNE; 1065 state->type_flags |= DST_TYPE_HAS_TS188;
1066 else 1066 else
1067 state->type_flags |= DST_TYPE_HAS_NEWTUNE_2; 1067 state->type_flags |= DST_TYPE_HAS_NEWTUNE_2;
1068 1068
@@ -1342,7 +1342,7 @@ static int dst_get_tuna(struct dst_state *state)
1342 return -EIO; 1342 return -EIO;
1343// if (state->type_flags & DST_TYPE_HAS_NEWTUNE) 1343// if (state->type_flags & DST_TYPE_HAS_NEWTUNE)
1344// /* how to get variable length reply ???? */ 1344// /* how to get variable length reply ???? */
1345 if ((state->type_flags & DST_TYPE_HAS_NEWTUNE) && 1345 if ((state->type_flags & DST_TYPE_HAS_TS188) &&
1346 !(state->dst_type == DST_TYPE_IS_CABLE) && 1346 !(state->dst_type == DST_TYPE_IS_CABLE) &&
1347 !(state->dst_type == DST_TYPE_IS_ATSC)) 1347 !(state->dst_type == DST_TYPE_IS_ATSC))
1348 1348
@@ -1354,9 +1354,9 @@ static int dst_get_tuna(struct dst_state *state)
1354 return retval; 1354 return retval;
1355 } 1355 }
1356// if (state->type_flags & DST_TYPE_HAS_NEWTUNE) { 1356// if (state->type_flags & DST_TYPE_HAS_NEWTUNE) {
1357 if ((state->type_flags & DST_TYPE_HAS_NEWTUNE) && 1357 if ((state->type_flags & DST_TYPE_HAS_TS188) &&
1358 !(state->dst_type == DST_TYPE_IS_CABLE) && 1358 !(state->dst_type == DST_TYPE_IS_CABLE) &&
1359 !(state->dst_type == DST_TYPE_IS_ATSC) { 1359 !(state->dst_type == DST_TYPE_IS_ATSC)) {
1360 1360
1361 if (state->rx_tuna[9] != dst_check_sum(&state->rx_tuna[0], 9)) { 1361 if (state->rx_tuna[9] != dst_check_sum(&state->rx_tuna[0], 9)) {
1362 dprintk(verbose, DST_INFO, 1, "checksum failure ? "); 1362 dprintk(verbose, DST_INFO, 1, "checksum failure ? ");
@@ -1404,7 +1404,7 @@ static int dst_write_tuna(struct dvb_frontend *fe)
1404 goto error; 1404 goto error;
1405 } 1405 }
1406// if (state->type_flags & DST_TYPE_HAS_NEWTUNE) { 1406// if (state->type_flags & DST_TYPE_HAS_NEWTUNE) {
1407 if ((state->type_flags & DST_TYPE_HAS_NEWTUNE) && 1407 if ((state->type_flags & DST_TYPE_HAS_TS188) &&
1408 (!(state->dst_type == DST_TYPE_IS_CABLE)) && 1408 (!(state->dst_type == DST_TYPE_IS_CABLE)) &&
1409 (!(state->dst_type == DST_TYPE_IS_ATSC))) { 1409 (!(state->dst_type == DST_TYPE_IS_ATSC))) {
1410 1410
@@ -1572,9 +1572,9 @@ static int dst_init(struct dvb_frontend *fe)
1572 state->bandwidth = BANDWIDTH_7_MHZ; 1572 state->bandwidth = BANDWIDTH_7_MHZ;
1573 state->cur_jiff = jiffies; 1573 state->cur_jiff = jiffies;
1574 if (state->dst_type == DST_TYPE_IS_SAT) 1574 if (state->dst_type == DST_TYPE_IS_SAT)
1575 memcpy(state->tx_tuna, ((state->type_flags & DST_TYPE_HAS_NEWTUNE) ? sat_tuna_188 : sat_tuna_204), sizeof (sat_tuna_204)); 1575 memcpy(state->tx_tuna, ((state->type_flags & DST_TYPE_HAS_TS188) ? sat_tuna_188 : sat_tuna_204), sizeof (sat_tuna_204));
1576 else if (state->dst_type == DST_TYPE_IS_TERR) 1576 else if (state->dst_type == DST_TYPE_IS_TERR)
1577 memcpy(state->tx_tuna, ((state->type_flags & DST_TYPE_HAS_NEWTUNE) ? ter_tuna_188 : ter_tuna_204), sizeof (ter_tuna_204)); 1577 memcpy(state->tx_tuna, ((state->type_flags & DST_TYPE_HAS_TS188) ? ter_tuna_188 : ter_tuna_204), sizeof (ter_tuna_204));
1578 else if (state->dst_type == DST_TYPE_IS_CABLE) 1578 else if (state->dst_type == DST_TYPE_IS_CABLE)
1579 memcpy(state->tx_tuna, cable_tuna, sizeof (cable_tuna)); 1579 memcpy(state->tx_tuna, cable_tuna, sizeof (cable_tuna));
1580 else if (state->dst_type == DST_TYPE_IS_ATSC) 1580 else if (state->dst_type == DST_TYPE_IS_ATSC)
diff --git a/drivers/media/dvb/bt8xx/dst_common.h b/drivers/media/dvb/bt8xx/dst_common.h
index cb5a6ebffe02..0e7e19543224 100644
--- a/drivers/media/dvb/bt8xx/dst_common.h
+++ b/drivers/media/dvb/bt8xx/dst_common.h
@@ -42,7 +42,7 @@
42#define DST_TYPE_IS_CABLE 2 42#define DST_TYPE_IS_CABLE 2
43#define DST_TYPE_IS_ATSC 3 43#define DST_TYPE_IS_ATSC 3
44 44
45#define DST_TYPE_HAS_NEWTUNE 1 45#define DST_TYPE_HAS_TS188 1
46#define DST_TYPE_HAS_TS204 2 46#define DST_TYPE_HAS_TS204 2
47#define DST_TYPE_HAS_SYMDIV 4 47#define DST_TYPE_HAS_SYMDIV 4
48#define DST_TYPE_HAS_FW_1 8 48#define DST_TYPE_HAS_FW_1 8