Commit f7b54b10 authored by Michael Krufky's avatar Michael Krufky Committed by Mauro Carvalho Chehab

V4L/DVB (4439): Whitespace cleanups for cx88-dvb and saa7134-dvb

This patch cleans up some whitespace problems after the dvb_attach changes
in cx88-dvb.c and saa7134-dvb.c, and converts some capitalized i2c address
constants to lowercase.
Signed-off-by: default avatarMichael Krufky <mkrufky@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 4ad8eee5
...@@ -165,7 +165,7 @@ static int dntv_live_dvbt_demod_init(struct dvb_frontend* fe) ...@@ -165,7 +165,7 @@ static int dntv_live_dvbt_demod_init(struct dvb_frontend* fe)
} }
static struct mt352_config dvico_fusionhdtv = { static struct mt352_config dvico_fusionhdtv = {
.demod_address = 0x0F, .demod_address = 0x0f,
.demod_init = dvico_fusionhdtv_demod_init, .demod_init = dvico_fusionhdtv_demod_init,
}; };
...@@ -175,7 +175,7 @@ static struct mt352_config dntv_live_dvbt_config = { ...@@ -175,7 +175,7 @@ static struct mt352_config dntv_live_dvbt_config = {
}; };
static struct mt352_config dvico_fusionhdtv_dual = { static struct mt352_config dvico_fusionhdtv_dual = {
.demod_address = 0x0F, .demod_address = 0x0f,
.demod_init = dvico_dual_demod_init, .demod_init = dvico_dual_demod_init,
}; };
...@@ -298,12 +298,12 @@ static int dvico_hybrid_tuner_set_params(struct dvb_frontend *fe, ...@@ -298,12 +298,12 @@ static int dvico_hybrid_tuner_set_params(struct dvb_frontend *fe,
} }
static struct zl10353_config dvico_fusionhdtv_hybrid = { static struct zl10353_config dvico_fusionhdtv_hybrid = {
.demod_address = 0x0F, .demod_address = 0x0f,
.no_tuner = 1, .no_tuner = 1,
}; };
static struct zl10353_config dvico_fusionhdtv_plus_v1_1 = { static struct zl10353_config dvico_fusionhdtv_plus_v1_1 = {
.demod_address = 0x0F, .demod_address = 0x0f,
}; };
static struct cx22702_config connexant_refboard_config = { static struct cx22702_config connexant_refboard_config = {
...@@ -448,17 +448,18 @@ static int cx24123_set_ts_param(struct dvb_frontend* fe, ...@@ -448,17 +448,18 @@ static int cx24123_set_ts_param(struct dvb_frontend* fe,
int is_punctured) int is_punctured)
{ {
struct cx8802_dev *dev= fe->dvb->priv; struct cx8802_dev *dev= fe->dvb->priv;
dev->ts_gen_cntrl = 0x2; dev->ts_gen_cntrl = 0x02;
return 0; return 0;
} }
static int kworld_dvbs_100_set_voltage(struct dvb_frontend* fe, fe_sec_voltage_t voltage) static int kworld_dvbs_100_set_voltage(struct dvb_frontend* fe,
fe_sec_voltage_t voltage)
{ {
struct cx8802_dev *dev= fe->dvb->priv; struct cx8802_dev *dev= fe->dvb->priv;
struct cx88_core *core = dev->core; struct cx88_core *core = dev->core;
if (voltage == SEC_VOLTAGE_OFF) { if (voltage == SEC_VOLTAGE_OFF) {
cx_write(MO_GP0_IO, 0x000006fB); cx_write(MO_GP0_IO, 0x000006fb);
} else { } else {
cx_write(MO_GP0_IO, 0x000006f9); cx_write(MO_GP0_IO, 0x000006f9);
} }
...@@ -468,7 +469,8 @@ static int kworld_dvbs_100_set_voltage(struct dvb_frontend* fe, fe_sec_voltage_t ...@@ -468,7 +469,8 @@ static int kworld_dvbs_100_set_voltage(struct dvb_frontend* fe, fe_sec_voltage_t
return 0; return 0;
} }
static int geniatech_dvbs_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage) static int geniatech_dvbs_set_voltage(struct dvb_frontend *fe,
fe_sec_voltage_t voltage)
{ {
struct cx8802_dev *dev= fe->dvb->priv; struct cx8802_dev *dev= fe->dvb->priv;
struct cx88_core *core = dev->core; struct cx88_core *core = dev->core;
...@@ -507,7 +509,8 @@ static int dvb_register(struct cx8802_dev *dev) ...@@ -507,7 +509,8 @@ static int dvb_register(struct cx8802_dev *dev)
/* init frontend */ /* init frontend */
switch (dev->core->board) { switch (dev->core->board) {
case CX88_BOARD_HAUPPAUGE_DVB_T1: case CX88_BOARD_HAUPPAUGE_DVB_T1:
dev->dvb.frontend = dvb_attach(cx22702_attach, &hauppauge_novat_config, dev->dvb.frontend = dvb_attach(cx22702_attach,
&hauppauge_novat_config,
&dev->core->i2c_adap); &dev->core->i2c_adap);
if (dev->dvb.frontend != NULL) { if (dev->dvb.frontend != NULL) {
dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
...@@ -519,7 +522,8 @@ static int dvb_register(struct cx8802_dev *dev) ...@@ -519,7 +522,8 @@ static int dvb_register(struct cx8802_dev *dev)
case CX88_BOARD_CONEXANT_DVB_T1: case CX88_BOARD_CONEXANT_DVB_T1:
case CX88_BOARD_KWORLD_DVB_T_CX22702: case CX88_BOARD_KWORLD_DVB_T_CX22702:
case CX88_BOARD_WINFAST_DTV1000: case CX88_BOARD_WINFAST_DTV1000:
dev->dvb.frontend = dvb_attach(cx22702_attach, &connexant_refboard_config, dev->dvb.frontend = dvb_attach(cx22702_attach,
&connexant_refboard_config,
&dev->core->i2c_adap); &dev->core->i2c_adap);
if (dev->dvb.frontend != NULL) { if (dev->dvb.frontend != NULL) {
dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x60, dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x60,
...@@ -530,7 +534,8 @@ static int dvb_register(struct cx8802_dev *dev) ...@@ -530,7 +534,8 @@ static int dvb_register(struct cx8802_dev *dev)
case CX88_BOARD_WINFAST_DTV2000H: case CX88_BOARD_WINFAST_DTV2000H:
case CX88_BOARD_HAUPPAUGE_HVR1100: case CX88_BOARD_HAUPPAUGE_HVR1100:
case CX88_BOARD_HAUPPAUGE_HVR1100LP: case CX88_BOARD_HAUPPAUGE_HVR1100LP:
dev->dvb.frontend = dvb_attach(cx22702_attach, &hauppauge_hvr1100_config, dev->dvb.frontend = dvb_attach(cx22702_attach,
&hauppauge_hvr1100_config,
&dev->core->i2c_adap); &dev->core->i2c_adap);
if (dev->dvb.frontend != NULL) { if (dev->dvb.frontend != NULL) {
dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
...@@ -539,7 +544,8 @@ static int dvb_register(struct cx8802_dev *dev) ...@@ -539,7 +544,8 @@ static int dvb_register(struct cx8802_dev *dev)
} }
break; break;
case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS: case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS:
dev->dvb.frontend = dvb_attach(mt352_attach, &dvico_fusionhdtv, dev->dvb.frontend = dvb_attach(mt352_attach,
&dvico_fusionhdtv,
&dev->core->i2c_adap); &dev->core->i2c_adap);
if (dev->dvb.frontend != NULL) { if (dev->dvb.frontend != NULL) {
dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x60, dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x60,
...@@ -547,7 +553,8 @@ static int dvb_register(struct cx8802_dev *dev) ...@@ -547,7 +553,8 @@ static int dvb_register(struct cx8802_dev *dev)
break; break;
} }
/* ZL10353 replaces MT352 on later cards */ /* ZL10353 replaces MT352 on later cards */
dev->dvb.frontend = dvb_attach(zl10353_attach, &dvico_fusionhdtv_plus_v1_1, dev->dvb.frontend = dvb_attach(zl10353_attach,
&dvico_fusionhdtv_plus_v1_1,
&dev->core->i2c_adap); &dev->core->i2c_adap);
if (dev->dvb.frontend != NULL) { if (dev->dvb.frontend != NULL) {
dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x60, dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x60,
...@@ -557,7 +564,8 @@ static int dvb_register(struct cx8802_dev *dev) ...@@ -557,7 +564,8 @@ static int dvb_register(struct cx8802_dev *dev)
case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL: case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL:
/* The tin box says DEE1601, but it seems to be DTT7579 /* The tin box says DEE1601, but it seems to be DTT7579
* compatible, with a slightly different MT352 AGC gain. */ * compatible, with a slightly different MT352 AGC gain. */
dev->dvb.frontend = dvb_attach(mt352_attach, &dvico_fusionhdtv_dual, dev->dvb.frontend = dvb_attach(mt352_attach,
&dvico_fusionhdtv_dual,
&dev->core->i2c_adap); &dev->core->i2c_adap);
if (dev->dvb.frontend != NULL) { if (dev->dvb.frontend != NULL) {
dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
...@@ -565,7 +573,8 @@ static int dvb_register(struct cx8802_dev *dev) ...@@ -565,7 +573,8 @@ static int dvb_register(struct cx8802_dev *dev)
break; break;
} }
/* ZL10353 replaces MT352 on later cards */ /* ZL10353 replaces MT352 on later cards */
dev->dvb.frontend = dvb_attach(zl10353_attach, &dvico_fusionhdtv_plus_v1_1, dev->dvb.frontend = dvb_attach(zl10353_attach,
&dvico_fusionhdtv_plus_v1_1,
&dev->core->i2c_adap); &dev->core->i2c_adap);
if (dev->dvb.frontend != NULL) { if (dev->dvb.frontend != NULL) {
dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
...@@ -573,7 +582,8 @@ static int dvb_register(struct cx8802_dev *dev) ...@@ -573,7 +582,8 @@ static int dvb_register(struct cx8802_dev *dev)
} }
break; break;
case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1: case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1:
dev->dvb.frontend = dvb_attach(mt352_attach, &dvico_fusionhdtv, dev->dvb.frontend = dvb_attach(mt352_attach,
&dvico_fusionhdtv,
&dev->core->i2c_adap); &dev->core->i2c_adap);
if (dev->dvb.frontend != NULL) { if (dev->dvb.frontend != NULL) {
dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
...@@ -583,7 +593,8 @@ static int dvb_register(struct cx8802_dev *dev) ...@@ -583,7 +593,8 @@ static int dvb_register(struct cx8802_dev *dev)
case CX88_BOARD_KWORLD_DVB_T: case CX88_BOARD_KWORLD_DVB_T:
case CX88_BOARD_DNTV_LIVE_DVB_T: case CX88_BOARD_DNTV_LIVE_DVB_T:
case CX88_BOARD_ADSTECH_DVB_T_PCI: case CX88_BOARD_ADSTECH_DVB_T_PCI:
dev->dvb.frontend = dvb_attach(mt352_attach, &dntv_live_dvbt_config, dev->dvb.frontend = dvb_attach(mt352_attach,
&dntv_live_dvbt_config,
&dev->core->i2c_adap); &dev->core->i2c_adap);
if (dev->dvb.frontend != NULL) { if (dev->dvb.frontend != NULL) {
dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
...@@ -606,14 +617,16 @@ static int dvb_register(struct cx8802_dev *dev) ...@@ -606,14 +617,16 @@ static int dvb_register(struct cx8802_dev *dev)
case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID: case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID:
dev->core->pll_addr = 0x61; dev->core->pll_addr = 0x61;
dev->core->pll_desc = &dvb_pll_thomson_fe6600; dev->core->pll_desc = &dvb_pll_thomson_fe6600;
dev->dvb.frontend = dvb_attach(zl10353_attach, &dvico_fusionhdtv_hybrid, dev->dvb.frontend = dvb_attach(zl10353_attach,
&dvico_fusionhdtv_hybrid,
&dev->core->i2c_adap); &dev->core->i2c_adap);
if (dev->dvb.frontend != NULL) { if (dev->dvb.frontend != NULL) {
dev->dvb.frontend->ops.tuner_ops.set_params = dvico_hybrid_tuner_set_params; dev->dvb.frontend->ops.tuner_ops.set_params = dvico_hybrid_tuner_set_params;
} }
break; break;
case CX88_BOARD_PCHDTV_HD3000: case CX88_BOARD_PCHDTV_HD3000:
dev->dvb.frontend = dvb_attach(or51132_attach, &pchdtv_hd3000, dev->dvb.frontend = dvb_attach(or51132_attach,
&pchdtv_hd3000,
&dev->core->i2c_adap); &dev->core->i2c_adap);
if (dev->dvb.frontend != NULL) { if (dev->dvb.frontend != NULL) {
dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
...@@ -636,7 +649,8 @@ static int dvb_register(struct cx8802_dev *dev) ...@@ -636,7 +649,8 @@ static int dvb_register(struct cx8802_dev *dev)
fusionhdtv_3_gold.pll_rf_set = lgdt330x_pll_rf_set; fusionhdtv_3_gold.pll_rf_set = lgdt330x_pll_rf_set;
dev->core->pll_addr = 0x61; dev->core->pll_addr = 0x61;
dev->core->pll_desc = &dvb_pll_microtune_4042; dev->core->pll_desc = &dvb_pll_microtune_4042;
dev->dvb.frontend = dvb_attach(lgdt330x_attach, &fusionhdtv_3_gold, dev->dvb.frontend = dvb_attach(lgdt330x_attach,
&fusionhdtv_3_gold,
&dev->core->i2c_adap); &dev->core->i2c_adap);
if (dev->dvb.frontend != NULL) { if (dev->dvb.frontend != NULL) {
dev->dvb.frontend->ops.tuner_ops.set_params = lgdt3302_tuner_set_params; dev->dvb.frontend->ops.tuner_ops.set_params = lgdt3302_tuner_set_params;
...@@ -655,7 +669,8 @@ static int dvb_register(struct cx8802_dev *dev) ...@@ -655,7 +669,8 @@ static int dvb_register(struct cx8802_dev *dev)
mdelay(200); mdelay(200);
dev->core->pll_addr = 0x61; dev->core->pll_addr = 0x61;
dev->core->pll_desc = &dvb_pll_thomson_dtt761x; dev->core->pll_desc = &dvb_pll_thomson_dtt761x;
dev->dvb.frontend = dvb_attach(lgdt330x_attach, &fusionhdtv_3_gold, dev->dvb.frontend = dvb_attach(lgdt330x_attach,
&fusionhdtv_3_gold,
&dev->core->i2c_adap); &dev->core->i2c_adap);
if (dev->dvb.frontend != NULL) { if (dev->dvb.frontend != NULL) {
dev->dvb.frontend->ops.tuner_ops.set_params = lgdt3302_tuner_set_params; dev->dvb.frontend->ops.tuner_ops.set_params = lgdt3302_tuner_set_params;
...@@ -672,7 +687,8 @@ static int dvb_register(struct cx8802_dev *dev) ...@@ -672,7 +687,8 @@ static int dvb_register(struct cx8802_dev *dev)
mdelay(100); mdelay(100);
cx_set(MO_GP0_IO, 1); cx_set(MO_GP0_IO, 1);
mdelay(200); mdelay(200);
dev->dvb.frontend = dvb_attach(lgdt330x_attach, &fusionhdtv_5_gold, dev->dvb.frontend = dvb_attach(lgdt330x_attach,
&fusionhdtv_5_gold,
&dev->core->i2c_adap); &dev->core->i2c_adap);
if (dev->dvb.frontend != NULL) { if (dev->dvb.frontend != NULL) {
dev->dvb.frontend->ops.tuner_ops.set_params = lgdt3303_tuner_set_params; dev->dvb.frontend->ops.tuner_ops.set_params = lgdt3303_tuner_set_params;
...@@ -689,7 +705,8 @@ static int dvb_register(struct cx8802_dev *dev) ...@@ -689,7 +705,8 @@ static int dvb_register(struct cx8802_dev *dev)
mdelay(100); mdelay(100);
cx_set(MO_GP0_IO, 1); cx_set(MO_GP0_IO, 1);
mdelay(200); mdelay(200);
dev->dvb.frontend = dvb_attach(lgdt330x_attach, &pchdtv_hd5500, dev->dvb.frontend = dvb_attach(lgdt330x_attach,
&pchdtv_hd5500,
&dev->core->i2c_adap); &dev->core->i2c_adap);
if (dev->dvb.frontend != NULL) { if (dev->dvb.frontend != NULL) {
dev->dvb.frontend->ops.tuner_ops.set_params = lgdt3303_tuner_set_params; dev->dvb.frontend->ops.tuner_ops.set_params = lgdt3303_tuner_set_params;
...@@ -697,7 +714,8 @@ static int dvb_register(struct cx8802_dev *dev) ...@@ -697,7 +714,8 @@ static int dvb_register(struct cx8802_dev *dev)
} }
break; break;
case CX88_BOARD_ATI_HDTVWONDER: case CX88_BOARD_ATI_HDTVWONDER:
dev->dvb.frontend = dvb_attach(nxt200x_attach, &ati_hdtvwonder, dev->dvb.frontend = dvb_attach(nxt200x_attach,
&ati_hdtvwonder,
&dev->core->i2c_adap); &dev->core->i2c_adap);
if (dev->dvb.frontend != NULL) { if (dev->dvb.frontend != NULL) {
dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
...@@ -706,15 +724,17 @@ static int dvb_register(struct cx8802_dev *dev) ...@@ -706,15 +724,17 @@ static int dvb_register(struct cx8802_dev *dev)
break; break;
case CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1: case CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1:
case CX88_BOARD_HAUPPAUGE_NOVASE2_S1: case CX88_BOARD_HAUPPAUGE_NOVASE2_S1:
dev->dvb.frontend = dvb_attach(cx24123_attach, &hauppauge_novas_config, dev->dvb.frontend = dvb_attach(cx24123_attach,
&hauppauge_novas_config,
&dev->core->i2c_adap); &dev->core->i2c_adap);
if (dev->dvb.frontend) { if (dev->dvb.frontend) {
dvb_attach(isl6421_attach, dev->dvb.frontend, &dev->core->i2c_adap, dvb_attach(isl6421_attach, dev->dvb.frontend,
0x08, 0x00, 0x00); &dev->core->i2c_adap, 0x08, 0x00, 0x00);
} }
break; break;
case CX88_BOARD_KWORLD_DVBS_100: case CX88_BOARD_KWORLD_DVBS_100:
dev->dvb.frontend = dvb_attach(cx24123_attach, &kworld_dvbs_100_config, dev->dvb.frontend = dvb_attach(cx24123_attach,
&kworld_dvbs_100_config,
&dev->core->i2c_adap); &dev->core->i2c_adap);
if (dev->dvb.frontend) { if (dev->dvb.frontend) {
dev->core->prev_set_voltage = dev->dvb.frontend->ops.set_voltage; dev->core->prev_set_voltage = dev->dvb.frontend->ops.set_voltage;
...@@ -722,7 +742,8 @@ static int dvb_register(struct cx8802_dev *dev) ...@@ -722,7 +742,8 @@ static int dvb_register(struct cx8802_dev *dev)
} }
break; break;
case CX88_BOARD_GENIATECH_DVBS: case CX88_BOARD_GENIATECH_DVBS:
dev->dvb.frontend = dvb_attach(cx24123_attach, &geniatech_dvbs_config, dev->dvb.frontend = dvb_attach(cx24123_attach,
&geniatech_dvbs_config,
&dev->core->i2c_adap); &dev->core->i2c_adap);
if (dev->dvb.frontend) { if (dev->dvb.frontend) {
dev->core->prev_set_voltage = dev->dvb.frontend->ops.set_voltage; dev->core->prev_set_voltage = dev->dvb.frontend->ops.set_voltage;
......
...@@ -1063,7 +1063,8 @@ static int dvb_init(struct saa7134_dev *dev) ...@@ -1063,7 +1063,8 @@ static int dvb_init(struct saa7134_dev *dev)
} }
break; break;
case SAA7134_BOARD_MD7134: case SAA7134_BOARD_MD7134:
dev->dvb.frontend = dvb_attach(tda10046_attach, &medion_cardbus, dev->dvb.frontend = dvb_attach(tda10046_attach,
&medion_cardbus,
&dev->i2c_adap); &dev->i2c_adap);
if (dev->dvb.frontend) { if (dev->dvb.frontend) {
dev->dvb.frontend->ops.tuner_ops.init = philips_fmd1216_tuner_init; dev->dvb.frontend->ops.tuner_ops.init = philips_fmd1216_tuner_init;
...@@ -1072,7 +1073,8 @@ static int dvb_init(struct saa7134_dev *dev) ...@@ -1072,7 +1073,8 @@ static int dvb_init(struct saa7134_dev *dev)
} }
break; break;
case SAA7134_BOARD_PHILIPS_TOUGH: case SAA7134_BOARD_PHILIPS_TOUGH:
dev->dvb.frontend = dvb_attach(tda10046_attach, &philips_tu1216_60_config, dev->dvb.frontend = dvb_attach(tda10046_attach,
&philips_tu1216_60_config,
&dev->i2c_adap); &dev->i2c_adap);
if (dev->dvb.frontend) { if (dev->dvb.frontend) {
dev->dvb.frontend->ops.tuner_ops.init = philips_tu1216_tuner_60_init; dev->dvb.frontend->ops.tuner_ops.init = philips_tu1216_tuner_60_init;
...@@ -1080,7 +1082,8 @@ static int dvb_init(struct saa7134_dev *dev) ...@@ -1080,7 +1082,8 @@ static int dvb_init(struct saa7134_dev *dev)
} }
break; break;
case SAA7134_BOARD_FLYDVBTDUO: case SAA7134_BOARD_FLYDVBTDUO:
dev->dvb.frontend = dvb_attach(tda10046_attach, &tda827x_lifeview_config, dev->dvb.frontend = dvb_attach(tda10046_attach,
&tda827x_lifeview_config,
&dev->i2c_adap); &dev->i2c_adap);
if (dev->dvb.frontend) { if (dev->dvb.frontend) {
dev->dvb.frontend->ops.tuner_ops.init = philips_tda827x_tuner_init; dev->dvb.frontend->ops.tuner_ops.init = philips_tda827x_tuner_init;
...@@ -1089,7 +1092,8 @@ static int dvb_init(struct saa7134_dev *dev) ...@@ -1089,7 +1092,8 @@ static int dvb_init(struct saa7134_dev *dev)
} }
break; break;
case SAA7134_BOARD_FLYDVBT_DUO_CARDBUS: case SAA7134_BOARD_FLYDVBT_DUO_CARDBUS:
dev->dvb.frontend = dvb_attach(tda10046_attach, &tda827x_lifeview_config, dev->dvb.frontend = dvb_attach(tda10046_attach,
&tda827x_lifeview_config,
&dev->i2c_adap); &dev->i2c_adap);
if (dev->dvb.frontend) { if (dev->dvb.frontend) {
dev->dvb.frontend->ops.tuner_ops.init = philips_tda827x_tuner_init; dev->dvb.frontend->ops.tuner_ops.init = philips_tda827x_tuner_init;
...@@ -1098,7 +1102,8 @@ static int dvb_init(struct saa7134_dev *dev) ...@@ -1098,7 +1102,8 @@ static int dvb_init(struct saa7134_dev *dev)
} }
break; break;
case SAA7134_BOARD_PHILIPS_EUROPA: case SAA7134_BOARD_PHILIPS_EUROPA:
dev->dvb.frontend = dvb_attach(tda10046_attach, &philips_europa_config, dev->dvb.frontend = dvb_attach(tda10046_attach,
&philips_europa_config,
&dev->i2c_adap); &dev->i2c_adap);
if (dev->dvb.frontend) { if (dev->dvb.frontend) {
dev->original_demod_sleep = dev->dvb.frontend->ops.sleep; dev->original_demod_sleep = dev->dvb.frontend->ops.sleep;
...@@ -1109,7 +1114,8 @@ static int dvb_init(struct saa7134_dev *dev) ...@@ -1109,7 +1114,8 @@ static int dvb_init(struct saa7134_dev *dev)
} }
break; break;
case SAA7134_BOARD_VIDEOMATE_DVBT_300: case SAA7134_BOARD_VIDEOMATE_DVBT_300:
dev->dvb.frontend = dvb_attach(tda10046_attach, &philips_europa_config, dev->dvb.frontend = dvb_attach(tda10046_attach,
&philips_europa_config,
&dev->i2c_adap); &dev->i2c_adap);
if (dev->dvb.frontend) { if (dev->dvb.frontend) {
dev->dvb.frontend->ops.tuner_ops.init = philips_europa_tuner_init; dev->dvb.frontend->ops.tuner_ops.init = philips_europa_tuner_init;
...@@ -1118,7 +1124,8 @@ static int dvb_init(struct saa7134_dev *dev) ...@@ -1118,7 +1124,8 @@ static int dvb_init(struct saa7134_dev *dev)
} }
break; break;
case SAA7134_BOARD_VIDEOMATE_DVBT_200: case SAA7134_BOARD_VIDEOMATE_DVBT_200:
dev->dvb.frontend = dvb_attach(tda10046_attach, &philips_tu1216_61_config, dev->dvb.frontend = dvb_attach(tda10046_attach,
&philips_tu1216_61_config,
&dev->i2c_adap); &dev->i2c_adap);
if (dev->dvb.frontend) { if (dev->dvb.frontend) {
dev->dvb.frontend->ops.tuner_ops.init = philips_tu1216_tuner_61_init; dev->dvb.frontend->ops.tuner_ops.init = philips_tu1216_tuner_61_init;
...@@ -1126,7 +1133,8 @@ static int dvb_init(struct saa7134_dev *dev) ...@@ -1126,7 +1133,8 @@ static int dvb_init(struct saa7134_dev *dev)
} }
break; break;
case SAA7134_BOARD_PHILIPS_TIGER: case SAA7134_BOARD_PHILIPS_TIGER:
dev->dvb.frontend = dvb_attach(tda10046_attach, &philips_tiger_config, dev->dvb.frontend = dvb_attach(tda10046_attach,
&philips_tiger_config,
&dev->i2c_adap); &dev->i2c_adap);
if (dev->dvb.frontend) { if (dev->dvb.frontend) {
dev->dvb.frontend->ops.tuner_ops.init = philips_tiger_tuner_init; dev->dvb.frontend->ops.tuner_ops.init = philips_tiger_tuner_init;
...@@ -1135,7 +1143,8 @@ static int dvb_init(struct saa7134_dev *dev) ...@@ -1135,7 +1143,8 @@ static int dvb_init(struct saa7134_dev *dev)
} }
break; break;
case SAA7134_BOARD_ASUSTeK_P7131_DUAL: case SAA7134_BOARD_ASUSTeK_P7131_DUAL:
dev->dvb.frontend = dvb_attach(tda10046_attach, &philips_tiger_config, dev->dvb.frontend = dvb_attach(tda10046_attach,
&philips_tiger_config,
&dev->i2c_adap); &dev->i2c_adap);
if (dev->dvb.frontend) { if (dev->dvb.frontend) {
dev->dvb.frontend->ops.tuner_ops.init = philips_tiger_tuner_init; dev->dvb.frontend->ops.tuner_ops.init = philips_tiger_tuner_init;
...@@ -1144,7 +1153,8 @@ static int dvb_init(struct saa7134_dev *dev) ...@@ -1144,7 +1153,8 @@ static int dvb_init(struct saa7134_dev *dev)
} }
break; break;
case SAA7134_BOARD_FLYDVBT_LR301: case SAA7134_BOARD_FLYDVBT_LR301:
dev->dvb.frontend = dvb_attach(tda10046_attach, &tda827x_lifeview_config, dev->dvb.frontend = dvb_attach(tda10046_attach,
&tda827x_lifeview_config,
&dev->i2c_adap); &dev->i2c_adap);
if (dev->dvb.frontend) { if (dev->dvb.frontend) {
dev->dvb.frontend->ops.tuner_ops.init = philips_tda827x_tuner_init; dev->dvb.frontend->ops.tuner_ops.init = philips_tda827x_tuner_init;
...@@ -1153,7 +1163,8 @@ static int dvb_init(struct saa7134_dev *dev) ...@@ -1153,7 +1163,8 @@ static int dvb_init(struct saa7134_dev *dev)
} }
break; break;
case SAA7134_BOARD_FLYDVB_TRIO: case SAA7134_BOARD_FLYDVB_TRIO:
dev->dvb.frontend = dvb_attach(tda10046_attach, &lifeview_trio_config, dev->dvb.frontend = dvb_attach(tda10046_attach,
&lifeview_trio_config,
&dev->i2c_adap); &dev->i2c_adap);
if (dev->dvb.frontend) { if (dev->dvb.frontend) {
dev->dvb.frontend->ops.tuner_ops.sleep = lifeview_trio_tuner_sleep; dev->dvb.frontend->ops.tuner_ops.sleep = lifeview_trio_tuner_sleep;
...@@ -1161,7 +1172,8 @@ static int dvb_init(struct saa7134_dev *dev) ...@@ -1161,7 +1172,8 @@ static int dvb_init(struct saa7134_dev *dev)
} }
break; break;
case SAA7134_BOARD_ADS_DUO_CARDBUS_PTV331: case SAA7134_BOARD_ADS_DUO_CARDBUS_PTV331:
dev->dvb.frontend = dvb_attach(tda10046_attach, &ads_tech_duo_config, dev->dvb.frontend = dvb_attach(tda10046_attach,
&ads_tech_duo_config,
&dev->i2c_adap); &dev->i2c_adap);
if (dev->dvb.frontend) { if (dev->dvb.frontend) {
dev->dvb.frontend->ops.tuner_ops.init = ads_duo_tuner_init; dev->dvb.frontend->ops.tuner_ops.init = ads_duo_tuner_init;
...@@ -1170,7 +1182,8 @@ static int dvb_init(struct saa7134_dev *dev) ...@@ -1170,7 +1182,8 @@ static int dvb_init(struct saa7134_dev *dev)
} }
break; break;
case SAA7134_BOARD_TEVION_DVBT_220RF: case SAA7134_BOARD_TEVION_DVBT_220RF:
dev->dvb.frontend = dvb_attach(tda10046_attach, &tevion_dvbt220rf_config, dev->dvb.frontend = dvb_attach(tda10046_attach,
&tevion_dvbt220rf_config,
&dev->i2c_adap); &dev->i2c_adap);
if (dev->dvb.frontend) { if (dev->dvb.frontend) {
dev->dvb.frontend->ops.tuner_ops.sleep = tevion_dvb220rf_tuner_sleep; dev->dvb.frontend->ops.tuner_ops.sleep = tevion_dvb220rf_tuner_sleep;
...@@ -1178,7 +1191,8 @@ static int dvb_init(struct saa7134_dev *dev) ...@@ -1178,7 +1191,8 @@ static int dvb_init(struct saa7134_dev *dev)
} }
break; break;
case SAA7134_BOARD_FLYDVBT_HYBRID_CARDBUS: case SAA7134_BOARD_FLYDVBT_HYBRID_CARDBUS:
dev->dvb.frontend = dvb_attach(tda10046_attach, &ads_tech_duo_config, dev->dvb.frontend = dvb_attach(tda10046_attach,
&ads_tech_duo_config,
&dev->i2c_adap); &dev->i2c_adap);
if (dev->dvb.frontend) { if (dev->dvb.frontend) {
dev->dvb.frontend->ops.tuner_ops.init = ads_duo_tuner_init; dev->dvb.frontend->ops.tuner_ops.init = ads_duo_tuner_init;
...@@ -1196,26 +1210,31 @@ static int dvb_init(struct saa7134_dev *dev) ...@@ -1196,26 +1210,31 @@ static int dvb_init(struct saa7134_dev *dev)
} }
break; break;
case SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180: case SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180:
dev->dvb.frontend = dvb_attach(nxt200x_attach, &avertvhda180, &dev->i2c_adap); dev->dvb.frontend = dvb_attach(nxt200x_attach, &avertvhda180,
&dev->i2c_adap);
if (dev->dvb.frontend) { if (dev->dvb.frontend) {
dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
NULL, &dvb_pll_tdhu2); NULL, &dvb_pll_tdhu2);
} }
break; break;
case SAA7134_BOARD_KWORLD_ATSC110: case SAA7134_BOARD_KWORLD_ATSC110:
dev->dvb.frontend = dvb_attach(nxt200x_attach, &kworldatsc110, &dev->i2c_adap); dev->dvb.frontend = dvb_attach(nxt200x_attach, &kworldatsc110,
&dev->i2c_adap);
if (dev->dvb.frontend) { if (dev->dvb.frontend) {
dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
NULL, &dvb_pll_tuv1236d); NULL, &dvb_pll_tuv1236d);
} }
break; break;
case SAA7134_BOARD_FLYDVBS_LR300: case SAA7134_BOARD_FLYDVBS_LR300:
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) {
if (dvb_attach(tda826x_attach, dev->dvb.frontend, 0x60, &dev->i2c_adap, 0) == NULL) { if (dvb_attach(tda826x_attach, dev->dvb.frontend, 0x60,
&dev->i2c_adap, 0) == NULL) {
printk("%s: No tda826x found!\n", __FUNCTION__); printk("%s: No tda826x found!\n", __FUNCTION__);
} }
if (dvb_attach(isl6421_attach, dev->dvb.frontend, &dev->i2c_adap, 0x08, 0, 0) == NULL) { if (dvb_attach(isl6421_attach, dev->dvb.frontend,
&dev->i2c_adap, 0x08, 0, 0) == NULL) {
printk("%s: No ISL6421 found!\n", __FUNCTION__); printk("%s: No ISL6421 found!\n", __FUNCTION__);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment