openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

V4L/DVB (5322): Removed board naming code in saa7134-dvb 

This is for better consistency with other drivers

Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Hartmut Hackmann 2007-04-27 12:31:16 -03:00 committed by Mauro Carvalho Chehab
parent 1c4f76abb8
commit b8bc76d88f
1 changed files with 13 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
drivers/media/video/saa7134/saa7134-dvb.c
View File

@ -208,15 +208,6 @@ static int philips_tda1004x_request_firmware(struct dvb_frontend *fe,
return request_firmware(fw, name, &dev->pci->dev); return request_firmware(fw, name, &dev->pci->dev);
} }
static void philips_tda1004x_set_board_name(struct dvb_frontend *fe, char *name)
{
size_t len;
len = sizeof(fe->ops.info.name);
strncpy(fe->ops.info.name, name, len);
fe->ops.info.name[len - 1] = 0;
}
/* ------------------------------------------------------------------ /* ------------------------------------------------------------------
* these tuners are tu1216, td1316(a) * these tuners are tu1216, td1316(a)
*/ */
@ -695,8 +686,7 @@ static struct tda827x_config tda827x_cfg = {
.sleep = philips_tda827x_tuner_sleep .sleep = philips_tda827x_tuner_sleep
}; };
static void configure_tda827x_fe(struct saa7134_dev *dev, struct tda1004x_config *tda_conf, static void configure_tda827x_fe(struct saa7134_dev *dev, struct tda1004x_config *tda_conf)
char *board_name)
{ {
dev->dvb.frontend = dvb_attach(tda10046_attach, tda_conf, &dev->i2c_adap); dev->dvb.frontend = dvb_attach(tda10046_attach, tda_conf, &dev->i2c_adap);
if (dev->dvb.frontend) { if (dev->dvb.frontend) {
@ -705,7 +695,6 @@ static void configure_tda827x_fe(struct saa7134_dev *dev, struct tda1004x_config
dvb_attach(tda827x_attach,dev->dvb.frontend, dvb_attach(tda827x_attach,dev->dvb.frontend,
tda_conf->tuner_address,&dev->i2c_adap,&tda827x_cfg); tda_conf->tuner_address,&dev->i2c_adap,&tda827x_cfg);
} }
philips_tda1004x_set_board_name(dev->dvb.frontend, board_name);
} }
/* ------------------------------------------------------------------ */ /* ------------------------------------------------------------------ */
@ -936,7 +925,6 @@ static struct nxt200x_config kworldatsc110 = {
static int dvb_init(struct saa7134_dev *dev) static int dvb_init(struct saa7134_dev *dev)
{ {
char *board_name;
int ret; int ret;
/* init struct videobuf_dvb */ /* init struct videobuf_dvb */
dev->ts.nr_bufs = 32; dev->ts.nr_bufs = 32;
@ -975,7 +963,6 @@ static int dvb_init(struct saa7134_dev *dev)
dev->dvb.frontend->ops.tuner_ops.init = philips_fmd1216_tuner_init; dev->dvb.frontend->ops.tuner_ops.init = philips_fmd1216_tuner_init;
dev->dvb.frontend->ops.tuner_ops.sleep = philips_fmd1216_tuner_sleep; dev->dvb.frontend->ops.tuner_ops.sleep = philips_fmd1216_tuner_sleep;
dev->dvb.frontend->ops.tuner_ops.set_params = philips_fmd1216_tuner_set_params; dev->dvb.frontend->ops.tuner_ops.set_params = philips_fmd1216_tuner_set_params;
philips_tda1004x_set_board_name(dev->dvb.frontend, "DVB-T Medion MD7134");
} }
break; break;
case SAA7134_BOARD_PHILIPS_TOUGH: case SAA7134_BOARD_PHILIPS_TOUGH:
@ -985,12 +972,11 @@ static int dvb_init(struct saa7134_dev *dev)
if (dev->dvb.frontend) { if (dev->dvb.frontend) {
dev->dvb.frontend->ops.tuner_ops.init = philips_tu1216_init; dev->dvb.frontend->ops.tuner_ops.init = philips_tu1216_init;
dev->dvb.frontend->ops.tuner_ops.set_params = philips_tda6651_pll_set; dev->dvb.frontend->ops.tuner_ops.set_params = philips_tda6651_pll_set;
philips_tda1004x_set_board_name(dev->dvb.frontend, "DVB-T Philips TOUGH");
} }
break; break;
case SAA7134_BOARD_FLYDVBTDUO: case SAA7134_BOARD_FLYDVBTDUO:
case SAA7134_BOARD_FLYDVBT_DUO_CARDBUS: case SAA7134_BOARD_FLYDVBT_DUO_CARDBUS:
configure_tda827x_fe(dev, &tda827x_lifeview_config, "DVB-T Lifeview FlyDVB Duo"); configure_tda827x_fe(dev, &tda827x_lifeview_config);
break; break;
case SAA7134_BOARD_PHILIPS_EUROPA: case SAA7134_BOARD_PHILIPS_EUROPA:
case SAA7134_BOARD_VIDEOMATE_DVBT_300: case SAA7134_BOARD_VIDEOMATE_DVBT_300:
@ -1003,11 +989,6 @@ static int dvb_init(struct saa7134_dev *dev)
dev->dvb.frontend->ops.tuner_ops.init = philips_europa_tuner_init; dev->dvb.frontend->ops.tuner_ops.init = philips_europa_tuner_init;
dev->dvb.frontend->ops.tuner_ops.sleep = philips_europa_tuner_sleep; dev->dvb.frontend->ops.tuner_ops.sleep = philips_europa_tuner_sleep;
dev->dvb.frontend->ops.tuner_ops.set_params = philips_td1316_tuner_set_params; dev->dvb.frontend->ops.tuner_ops.set_params = philips_td1316_tuner_set_params;
if (dev->board == SAA7134_BOARD_VIDEOMATE_DVBT_300)
board_name = "DVB-T Compro VideoMate 300";
else
board_name = "DVB-T Philips Europa";
philips_tda1004x_set_board_name(dev->dvb.frontend, board_name);
} }
break; break;
case SAA7134_BOARD_VIDEOMATE_DVBT_200: case SAA7134_BOARD_VIDEOMATE_DVBT_200:
@ -1017,27 +998,26 @@ static int dvb_init(struct saa7134_dev *dev)
if (dev->dvb.frontend) { if (dev->dvb.frontend) {
dev->dvb.frontend->ops.tuner_ops.init = philips_tu1216_init; dev->dvb.frontend->ops.tuner_ops.init = philips_tu1216_init;
dev->dvb.frontend->ops.tuner_ops.set_params = philips_tda6651_pll_set; dev->dvb.frontend->ops.tuner_ops.set_params = philips_tda6651_pll_set;
philips_tda1004x_set_board_name(dev->dvb.frontend, "DVB-T Compro VideoMate 200");
} }
break; break;
case SAA7134_BOARD_PHILIPS_TIGER: case SAA7134_BOARD_PHILIPS_TIGER:
configure_tda827x_fe(dev, &philips_tiger_config, "DVB-T Philips Tiger"); configure_tda827x_fe(dev, &philips_tiger_config);
break; break;
case SAA7134_BOARD_PINNACLE_PCTV_310i: case SAA7134_BOARD_PINNACLE_PCTV_310i:
configure_tda827x_fe(dev, &pinnacle_pctv_310i_config, "DVB-T Pinnacle PCTV 310i"); configure_tda827x_fe(dev, &pinnacle_pctv_310i_config);
break; break;
case SAA7134_BOARD_HAUPPAUGE_HVR1110: case SAA7134_BOARD_HAUPPAUGE_HVR1110:
configure_tda827x_fe(dev, &hauppauge_hvr_1110_config, "DVB-T Hauppauge HVR 1110"); configure_tda827x_fe(dev, &hauppauge_hvr_1110_config);
break; break;
case SAA7134_BOARD_ASUSTeK_P7131_DUAL: case SAA7134_BOARD_ASUSTeK_P7131_DUAL:
configure_tda827x_fe(dev, &asus_p7131_dual_config, "DVB-T Asus P7131 Dual"); configure_tda827x_fe(dev, &asus_p7131_dual_config);
break; break;
case SAA7134_BOARD_FLYDVBT_LR301: case SAA7134_BOARD_FLYDVBT_LR301:
configure_tda827x_fe(dev, &tda827x_lifeview_config, "DVB-T Lifeview FlyDVBT LR301"); configure_tda827x_fe(dev, &tda827x_lifeview_config);
break; break;
case SAA7134_BOARD_FLYDVB_TRIO: case SAA7134_BOARD_FLYDVB_TRIO:
if(! use_frontend) { //terrestrial if(! use_frontend) { //terrestrial
configure_tda827x_fe(dev, &lifeview_trio_config, NULL); configure_tda827x_fe(dev, &lifeview_trio_config);
} else { //satellite } else { //satellite
dev->dvb.frontend = dvb_attach(tda10086_attach, &flydvbs, &dev->i2c_adap); dev->dvb.frontend = dvb_attach(tda10086_attach, &flydvbs, &dev->i2c_adap);
if (dev->dvb.frontend) { if (dev->dvb.frontend) {
@ -1061,18 +1041,13 @@ static int dvb_init(struct saa7134_dev *dev)
dvb_attach(tda827x_attach,dev->dvb.frontend, dvb_attach(tda827x_attach,dev->dvb.frontend,
ads_tech_duo_config.tuner_address, ads_tech_duo_config.tuner_address,
&dev->i2c_adap,&ads_duo_cfg); &dev->i2c_adap,&ads_duo_cfg);
if (dev->board == SAA7134_BOARD_ADS_DUO_CARDBUS_PTV331)
board_name = "DVB-T ADS DUO Cardbus PTV331";
else
board_name = "DVB-T Lifeview FlyDVT Cardbus";
philips_tda1004x_set_board_name(dev->dvb.frontend, board_name);
} }
break; break;
case SAA7134_BOARD_TEVION_DVBT_220RF: case SAA7134_BOARD_TEVION_DVBT_220RF:
configure_tda827x_fe(dev, &tevion_dvbt220rf_config, "DVB-T Tevion 220RF"); configure_tda827x_fe(dev, &tevion_dvbt220rf_config);
break; break;
case SAA7134_BOARD_MEDION_MD8800_QUADRO: case SAA7134_BOARD_MEDION_MD8800_QUADRO:
configure_tda827x_fe(dev, &md8800_dvbt_config, "DVB-T Medion MD8800"); configure_tda827x_fe(dev, &md8800_dvbt_config);
break; break;
case SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180: case SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180:
dev->dvb.frontend = dvb_attach(nxt200x_attach, &avertvhda180, dev->dvb.frontend = dvb_attach(nxt200x_attach, &avertvhda180,
@ -1113,7 +1088,6 @@ static int dvb_init(struct saa7134_dev *dev)
dev->dvb.frontend->ops.tuner_ops.init = philips_fmd1216_tuner_init; dev->dvb.frontend->ops.tuner_ops.init = philips_fmd1216_tuner_init;
dev->dvb.frontend->ops.tuner_ops.sleep = philips_fmd1216_tuner_sleep; dev->dvb.frontend->ops.tuner_ops.sleep = philips_fmd1216_tuner_sleep;
dev->dvb.frontend->ops.tuner_ops.set_params = philips_fmd1216_tuner_set_params; dev->dvb.frontend->ops.tuner_ops.set_params = philips_fmd1216_tuner_set_params;
philips_tda1004x_set_board_name(dev->dvb.frontend, "DVBT Asus Europa 2 Hybrid");
} }
break; break;
case SAA7134_BOARD_VIDEOMATE_DVBT_200A: case SAA7134_BOARD_VIDEOMATE_DVBT_200A:
@ -1123,17 +1097,16 @@ static int dvb_init(struct saa7134_dev *dev)
if (dev->dvb.frontend) { if (dev->dvb.frontend) {
dev->dvb.frontend->ops.tuner_ops.init = philips_td1316_tuner_init; dev->dvb.frontend->ops.tuner_ops.init = philips_td1316_tuner_init;
dev->dvb.frontend->ops.tuner_ops.set_params = philips_td1316_tuner_set_params; dev->dvb.frontend->ops.tuner_ops.set_params = philips_td1316_tuner_set_params;
philips_tda1004x_set_board_name(dev->dvb.frontend, "DVBT Compro Videomate 200a");
} }
break; break;
case SAA7134_BOARD_CINERGY_HT_PCMCIA: case SAA7134_BOARD_CINERGY_HT_PCMCIA:
configure_tda827x_fe(dev, &cinergy_ht_config, "DVB-T Terratec Cinergy HT Cardbus"); configure_tda827x_fe(dev, &cinergy_ht_config);
break; break;
case SAA7134_BOARD_CINERGY_HT_PCI: case SAA7134_BOARD_CINERGY_HT_PCI:
configure_tda827x_fe(dev, &cinergy_ht_pci_config, "DVB-T Terratec Cinergy HT PCI"); configure_tda827x_fe(dev, &cinergy_ht_pci_config);
break; break;
case SAA7134_BOARD_PHILIPS_TIGER_S: case SAA7134_BOARD_PHILIPS_TIGER_S:
configure_tda827x_fe(dev, &philips_tiger_s_config, "DVB-T Philips Tiger S"); configure_tda827x_fe(dev, &philips_tiger_s_config);
break; break;
default: default:
printk("%s: Huh? unknown DVB card?\n",dev->name); printk("%s: Huh? unknown DVB card?\n",dev->name);