Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 30037
b: refs/heads/master
c: 396cffd
h: refs/heads/master
i:
  30035: 028be4b
v: v3
  • Loading branch information
Manu Abraham authored and Mauro Carvalho Chehab committed Jun 25, 2006
1 parent 9a633b3 commit e33cc33
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 17 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1c4e7339e55af69bad55eb9a8f9d5b03a552020b
refs/heads/master: 396cffd63ed460ae2544d62745fabd22296af99a
45 changes: 30 additions & 15 deletions trunk/drivers/media/dvb/bt8xx/dst.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -627,23 +627,26 @@ static struct dst_types dst_tlist[] = {
.offset = 0,
.dst_type = DST_TYPE_IS_SAT,
.type_flags = DST_TYPE_HAS_SYMDIV | DST_TYPE_HAS_FW_1 | DST_TYPE_HAS_OBS_REGS,
.dst_feature = 0
.dst_feature = 0,
.tuner_type = 0
}, /* obsolete */

{
.device_id = "DST-020",
.offset = 0,
.dst_type = DST_TYPE_IS_SAT,
.type_flags = DST_TYPE_HAS_SYMDIV | DST_TYPE_HAS_FW_1,
.dst_feature = 0
.dst_feature = 0,
.tuner_type = 0
}, /* obsolete */

{
.device_id = "DST-030",
.offset = 0,
.dst_type = DST_TYPE_IS_SAT,
.type_flags = DST_TYPE_HAS_TS204 | DST_TYPE_HAS_NEWTUNE | DST_TYPE_HAS_FW_1,
.dst_feature = 0
.dst_feature = 0,
.tuner_type = 0
}, /* obsolete */

{
Expand All @@ -652,23 +655,26 @@ static struct dst_types dst_tlist[] = {
.dst_type = DST_TYPE_IS_SAT,
.type_flags = DST_TYPE_HAS_SYMDIV | DST_TYPE_HAS_TS204 | DST_TYPE_HAS_FW_2,
.dst_feature = DST_TYPE_HAS_DISEQC3 | DST_TYPE_HAS_DISEQC4 | DST_TYPE_HAS_DISEQC5
| DST_TYPE_HAS_MAC | DST_TYPE_HAS_MOTO
| DST_TYPE_HAS_MAC | DST_TYPE_HAS_MOTO,
.tuner_type = TUNER_TYPE_STV0299
},

{
.device_id = "DST-MOT",
.offset = 0,
.dst_type = DST_TYPE_IS_SAT,
.type_flags = DST_TYPE_HAS_SYMDIV | DST_TYPE_HAS_FW_1,
.dst_feature = 0
.dst_feature = 0,
.tuner_type = 0
}, /* obsolete */

{
.device_id = "DST-CI",
.offset = 1,
.dst_type = DST_TYPE_IS_SAT,
.type_flags = DST_TYPE_HAS_TS204 | DST_TYPE_HAS_FW_1,
.dst_feature = DST_TYPE_HAS_CA
.dst_feature = DST_TYPE_HAS_CA,
.tuner_type = 0
}, /* An OEM board */

{
Expand All @@ -677,71 +683,80 @@ static struct dst_types dst_tlist[] = {
.dst_type = DST_TYPE_IS_SAT,
.type_flags = DST_TYPE_HAS_NEWTUNE | DST_TYPE_HAS_FW_2 | DST_TYPE_HAS_FW_BUILD | DST_TYPE_HAS_INC_COUNT,
.dst_feature = DST_TYPE_HAS_CA | DST_TYPE_HAS_DISEQC3 | DST_TYPE_HAS_DISEQC4
| DST_TYPE_HAS_MOTO | DST_TYPE_HAS_MAC
| DST_TYPE_HAS_MOTO | DST_TYPE_HAS_MAC,
.tuner_type = TUNER_TYPE_MULTI
},

{
.device_id = "DSTFCI",
.offset = 1,
.dst_type = DST_TYPE_IS_SAT,
.type_flags = DST_TYPE_HAS_NEWTUNE | DST_TYPE_HAS_FW_1,
.dst_feature = 0
.dst_feature = 0,
.tuner_type = 0
}, /* unknown to vendor */

{
.device_id = "DCT-CI",
.offset = 1,
.dst_type = DST_TYPE_IS_CABLE,
.type_flags = DST_TYPE_HAS_MULTI_FE | DST_TYPE_HAS_FW_1 | DST_TYPE_HAS_FW_2,
.dst_feature = DST_TYPE_HAS_CA
.dst_feature = DST_TYPE_HAS_CA,
.tuner_type = 0
},

{
.device_id = "DCTNEW",
.offset = 1,
.dst_type = DST_TYPE_IS_CABLE,
.type_flags = DST_TYPE_HAS_NEWTUNE | DST_TYPE_HAS_FW_3 | DST_TYPE_HAS_FW_BUILD,
.dst_feature = 0
.dst_feature = 0,
.tuner_type = 0
},

{
.device_id = "DTT-CI",
.offset = 1,
.dst_type = DST_TYPE_IS_TERR,
.type_flags = DST_TYPE_HAS_FW_2 | DST_TYPE_HAS_MULTI_FE,
.dst_feature = DST_TYPE_HAS_CA
.dst_feature = DST_TYPE_HAS_CA,
.tuner_type = 0
},

{
.device_id = "DTTDIG",
.offset = 1,
.dst_type = DST_TYPE_IS_TERR,
.type_flags = DST_TYPE_HAS_FW_2,
.dst_feature = 0
.dst_feature = 0,
.tuner_type = 0
},

{
.device_id = "DTTNXT",
.offset = 1,
.dst_type = DST_TYPE_IS_TERR,
.type_flags = DST_TYPE_HAS_FW_2,
.dst_feature = DST_TYPE_HAS_ANALOG
.dst_feature = DST_TYPE_HAS_ANALOG,
.tuner_type = 0
},

{
.device_id = "ATSCDI",
.offset = 1,
.dst_type = DST_TYPE_IS_ATSC,
.type_flags = DST_TYPE_HAS_FW_2,
.dst_feature = 0
.dst_feature = 0,
.tuner_type = 0
},

{
.device_id = "ATSCAD",
.offset = 1,
.dst_type = DST_TYPE_IS_ATSC,
.type_flags = DST_TYPE_HAS_MULTI_FE | DST_TYPE_HAS_FW_2 | DST_TYPE_HAS_FW_BUILD,
.dst_feature = DST_TYPE_HAS_MAC | DST_TYPE_HAS_ANALOG
.dst_feature = DST_TYPE_HAS_MAC | DST_TYPE_HAS_ANALOG,
.tuner_type = 0
},

{ }
Expand Down
8 changes: 7 additions & 1 deletion trunk/drivers/media/dvb/bt8xx/dst_common.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,11 @@
#define DST_TYPE_HAS_ANALOG 64 /* Analog inputs */
#define DST_TYPE_HAS_SESSION 128

#define TUNER_TYPE_MULTI 1
#define TUNER_TYPE_L64724 2
#define TUNER_TYPE_STV0299 4
#define TUNER_TYPE_MB86A15 8

#define RDC_8820_PIO_0_DISABLE 0
#define RDC_8820_PIO_0_ENABLE 1
#define RDC_8820_INT 2
Expand Down Expand Up @@ -119,7 +124,7 @@ struct dst_state {
u8 card_info[8];
u8 vendor[8];
u8 board_info[8];

u32 tuner_type;
struct mutex dst_mutex;
};

Expand All @@ -129,6 +134,7 @@ struct dst_types {
u8 dst_type;
u32 type_flags;
u32 dst_feature;
u32 tuner_type;
};

struct dst_config
Expand Down

0 comments on commit e33cc33

Please sign in to comment.