adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 11:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

V4L/DVB (3411): FE6600 is a Thomson tuner

Browse source 
- The tuner used in DViCO FusionHDTV DVB-T hybrid is made by Thomson
- renamed tuner and dvb_pll structs accordingly

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Michael Krufky 2006-03-01 00:04:42 -03:00 committed by Mauro Carvalho Chehab
parent 69b27e3dfe
commit 91ae3299d7
7 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Documentation/video4linux/CARDLIST.tuner
View file

@ -70,4 +70,4 @@ tuner=68 - Philips TUV1236D ATSC/NTSC dual in
tuner=69 - Tena TNF 5335 MF
tuner=70 - Samsung TCPN 2121P30A
tuner=71 - Xceive xc3028
tuner=72 - FE6600
tuner=72 - Thomson FE6600

6
drivers/media/dvb/frontends/dvb-pll.c
View file

@ -405,8 +405,8 @@ struct dvb_pll_desc dvb_pll_philips_td1316 = {
EXPORT_SYMBOL(dvb_pll_philips_td1316);
/* FE6600 used on DViCO Hybrid */
struct dvb_pll_desc dvb_pll_unknown_fe6600 = {
.name = "FE6600",
struct dvb_pll_desc dvb_pll_thomson_fe6600 = {
.name = "Thomson FE6600",
.min = 44250000,
.max = 858000000,
.count = 4,
@ -417,7 +417,7 @@ struct dvb_pll_desc dvb_pll_unknown_fe6600 = {
{ 999999999, 36213333, 166667, 0xf4, 0x18 },
}
};
EXPORT_SYMBOL(dvb_pll_unknown_fe6600);
EXPORT_SYMBOL(dvb_pll_thomson_fe6600);
/* ----------------------------------------------------------- */
/* code */

2
drivers/media/dvb/frontends/dvb-pll.h
View file

@ -42,7 +42,7 @@ extern struct dvb_pll_desc dvb_pll_samsung_tbmv;
extern struct dvb_pll_desc dvb_pll_philips_sd1878_tda8261;
extern struct dvb_pll_desc dvb_pll_philips_td1316;
extern struct dvb_pll_desc dvb_pll_unknown_fe6600;
extern struct dvb_pll_desc dvb_pll_thomson_fe6600;
int dvb_pll_configure(struct dvb_pll_desc *desc, u8 *buf,
u32 freq, int bandwidth);

2
drivers/media/video/cx88/cx88-cards.c
View file

@ -1073,7 +1073,7 @@ struct cx88_board cx88_boards[] = {
},
[CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID] = {
.name = "DViCO FusionHDTV DVB-T Hybrid",
.tuner_type = TUNER_FE6600,
.tuner_type = TUNER_THOMSON_FE6600,
.radio_type = UNSET,
.tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET,

2
drivers/media/video/cx88/cx88-dvb.c
View file

@ -599,7 +599,7 @@ static int dvb_register(struct cx8802_dev *dev)
#ifdef HAVE_ZL10353
case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID:
dev->core->pll_addr = 0x61;
dev->core->pll_desc = &dvb_pll_unknown_fe6600;
dev->core->pll_desc = &dvb_pll_thomson_fe6600;
dev->dvb.frontend = zl10353_attach(&dvico_fusionhdtv_hybrid,
&dev->core->i2c_adap);
break;

16
drivers/media/video/tuner-types.c
View file

@ -983,19 +983,19 @@ static struct tuner_params tuner_samsung_tcpn_2121p30a_params[] = {
},
};
/* ------------ TUNER_FE6600 - DViCO Hybrid PAL ------------ */
/* ------------ TUNER_THOMSON_FE6600 - DViCO Hybrid PAL ------------ */
static struct tuner_range tuner_fe6600_ranges[] = {
static struct tuner_range tuner_thomson_fe6600_ranges[] = {
{ 16 * 160.00 /*MHz*/, 0xfe, 0x11, },
{ 16 * 442.00 /*MHz*/, 0xf6, 0x12, },
{ 16 * 999.99 , 0xf6, 0x18, },
};
static struct tuner_params tuner_fe6600_params[] = {
static struct tuner_params tuner_thomson_fe6600_params[] = {
{
.type = TUNER_PARAM_TYPE_PAL,
.ranges = tuner_fe6600_ranges,
.count = ARRAY_SIZE(tuner_fe6600_ranges),
.ranges = tuner_thomson_fe6600_ranges,
.count = ARRAY_SIZE(tuner_thomson_fe6600_ranges),
},
};
@ -1370,9 +1370,9 @@ struct tunertype tuners[] = {
.name = "Xceive xc3028",
/* see xc3028.c for details */
},
[TUNER_FE6600] = { /* */
.name = "FE6600",
.params = tuner_fe6600_params,
[TUNER_THOMSON_FE6600] = { /* Thomson PAL / DVB-T */
.name = "Thomson FE6600",
.params = tuner_thomson_fe6600_params,
},
};

2
include/media/tuner.h
View file

@ -118,7 +118,7 @@
#define TUNER_SAMSUNG_TCPN_2121P30A 70 /* Hauppauge PVR-500MCE NTSC */
#define TUNER_XCEIVE_XC3028 71
#define TUNER_FE6600 72 /* DViCO FusionHDTV DVB-T Hybrid */
#define TUNER_THOMSON_FE6600 72 /* DViCO FusionHDTV DVB-T Hybrid */
/* tv card specific */
#define TDA9887_PRESENT (1<<0)