PWN-Hunter/android_kernel_xiaomi_sdm845
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Michael Krufky 2006-08-08 15:48:08 -03:00 committed by Mauro Carvalho Chehab
parent 4ad8eee5ac
commit f7b54b1067
2 changed files with 161 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

193
drivers/media/video/cx88/cx88-dvb.c
View File

@ -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 = {
}; };
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,
}; };
@ -250,8 +250,8 @@ static int dntv_live_dvbt_pro_tuner_set_params(struct dvb_frontend* fe,
if ((err = i2c_transfer(&dev->core->i2c_adap, &msg, 1)) != 1) { if ((err = i2c_transfer(&dev->core->i2c_adap, &msg, 1)) != 1) {
printk(KERN_WARNING "cx88-dvb: %s error " printk(KERN_WARNING "cx88-dvb: %s error "
"(addr %02x <- %02x, err = %i)\n", "(addr %02x <- %02x, err = %i)\n",
__FUNCTION__, dev->core->pll_addr, buf[0], err); __FUNCTION__, dev->core->pll_addr, buf[0], err);
if (err < 0) if (err < 0)
return err; return err;
else else
@ -286,8 +286,8 @@ static int dvico_hybrid_tuner_set_params(struct dvb_frontend *fe,
fe->ops.i2c_gate_ctrl(fe, 1); fe->ops.i2c_gate_ctrl(fe, 1);
if ((err = i2c_transfer(&dev->core->i2c_adap, &msg, 1)) != 1) { if ((err = i2c_transfer(&dev->core->i2c_adap, &msg, 1)) != 1) {
printk(KERN_WARNING "cx88-dvb: %s error " printk(KERN_WARNING "cx88-dvb: %s error "
"(addr %02x <- %02x, err = %i)\n", "(addr %02x <- %02x, err = %i)\n",
__FUNCTION__, pllbuf[0], pllbuf[1], err); __FUNCTION__, pllbuf[0], pllbuf[1], err);
if (err < 0) if (err < 0)
return err; return err;
else else
@ -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 = {
@ -329,8 +329,8 @@ static int or51132_set_ts_param(struct dvb_frontend* fe,
} }
static struct or51132_config pchdtv_hd3000 = { static struct or51132_config pchdtv_hd3000 = {
.demod_address = 0x15, .demod_address = 0x15,
.set_ts_params = or51132_set_ts_param, .set_ts_params = or51132_set_ts_param,
}; };
static int lgdt3302_tuner_set_params(struct dvb_frontend* fe, static int lgdt3302_tuner_set_params(struct dvb_frontend* fe,
@ -349,14 +349,14 @@ static int lgdt3302_tuner_set_params(struct dvb_frontend* fe,
dvb_pll_configure(core->pll_desc, buf, params->frequency, 0); dvb_pll_configure(core->pll_desc, buf, params->frequency, 0);
dprintk(1, "%s: tuner at 0x%02x bytes: 0x%02x 0x%02x 0x%02x 0x%02x\n", dprintk(1, "%s: tuner at 0x%02x bytes: 0x%02x 0x%02x 0x%02x 0x%02x\n",
__FUNCTION__, msg.addr, buf[0],buf[1],buf[2],buf[3]); __FUNCTION__, msg.addr, buf[0],buf[1],buf[2],buf[3]);
if (fe->ops.i2c_gate_ctrl) if (fe->ops.i2c_gate_ctrl)
fe->ops.i2c_gate_ctrl(fe, 1); fe->ops.i2c_gate_ctrl(fe, 1);
if ((err = i2c_transfer(&core->i2c_adap, &msg, 1)) != 1) { if ((err = i2c_transfer(&core->i2c_adap, &msg, 1)) != 1) {
printk(KERN_WARNING "cx88-dvb: %s error " printk(KERN_WARNING "cx88-dvb: %s error "
"(addr %02x <- %02x, err = %i)\n", "(addr %02x <- %02x, err = %i)\n",
__FUNCTION__, buf[0], buf[1], err); __FUNCTION__, buf[0], buf[1], err);
if (err < 0) if (err < 0)
return err; return err;
else else
@ -401,24 +401,24 @@ static int lgdt330x_set_ts_param(struct dvb_frontend* fe, int is_punctured)
} }
static struct lgdt330x_config fusionhdtv_3_gold = { static struct lgdt330x_config fusionhdtv_3_gold = {
.demod_address = 0x0e, .demod_address = 0x0e,
.demod_chip = LGDT3302, .demod_chip = LGDT3302,
.serial_mpeg = 0x04, /* TPSERIAL for 3302 in TOP_CONTROL */ .serial_mpeg = 0x04, /* TPSERIAL for 3302 in TOP_CONTROL */
.set_ts_params = lgdt330x_set_ts_param, .set_ts_params = lgdt330x_set_ts_param,
}; };
static struct lgdt330x_config fusionhdtv_5_gold = { static struct lgdt330x_config fusionhdtv_5_gold = {
.demod_address = 0x0e, .demod_address = 0x0e,
.demod_chip = LGDT3303, .demod_chip = LGDT3303,
.serial_mpeg = 0x40, /* TPSERIAL for 3303 in TOP_CONTROL */ .serial_mpeg = 0x40, /* TPSERIAL for 3303 in TOP_CONTROL */
.set_ts_params = lgdt330x_set_ts_param, .set_ts_params = lgdt330x_set_ts_param,
}; };
static struct lgdt330x_config pchdtv_hd5500 = { static struct lgdt330x_config pchdtv_hd5500 = {
.demod_address = 0x59, .demod_address = 0x59,
.demod_chip = LGDT3303, .demod_chip = LGDT3303,
.serial_mpeg = 0x40, /* TPSERIAL for 3303 in TOP_CONTROL */ .serial_mpeg = 0x40, /* TPSERIAL for 3303 in TOP_CONTROL */
.set_ts_params = lgdt330x_set_ts_param, .set_ts_params = lgdt330x_set_ts_param,
}; };
static int nxt200x_set_ts_param(struct dvb_frontend* fe, static int nxt200x_set_ts_param(struct dvb_frontend* fe,
@ -439,26 +439,27 @@ static int nxt200x_set_pll_input(u8* buf, int input)
} }
static struct nxt200x_config ati_hdtvwonder = { static struct nxt200x_config ati_hdtvwonder = {
.demod_address = 0x0a, .demod_address = 0x0a,
.set_pll_input = nxt200x_set_pll_input, .set_pll_input = nxt200x_set_pll_input,
.set_ts_params = nxt200x_set_ts_param, .set_ts_params = nxt200x_set_ts_param,
}; };
static int cx24123_set_ts_param(struct dvb_frontend* fe, 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
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;
@ -484,18 +486,18 @@ static int geniatech_dvbs_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t
} }
static struct cx24123_config geniatech_dvbs_config = { static struct cx24123_config geniatech_dvbs_config = {
.demod_address = 0x55, .demod_address = 0x55,
.set_ts_params = cx24123_set_ts_param, .set_ts_params = cx24123_set_ts_param,
}; };
static struct cx24123_config hauppauge_novas_config = { static struct cx24123_config hauppauge_novas_config = {
.demod_address = 0x55, .demod_address = 0x55,
.set_ts_params = cx24123_set_ts_param, .set_ts_params = cx24123_set_ts_param,
}; };
static struct cx24123_config kworld_dvbs_100_config = { static struct cx24123_config kworld_dvbs_100_config = {
.demod_address = 0x15, .demod_address = 0x15,
.set_ts_params = cx24123_set_ts_param, .set_ts_params = cx24123_set_ts_param,
}; };
static int dvb_register(struct cx8802_dev *dev) static int dvb_register(struct cx8802_dev *dev)
@ -507,48 +509,53 @@ 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,
&dev->core->i2c_adap); &hauppauge_novat_config,
&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,
&dev->core->i2c_adap, &dev->core->i2c_adap,
&dvb_pll_thomson_dtt759x); &dvb_pll_thomson_dtt759x);
} }
break; break;
case CX88_BOARD_TERRATEC_CINERGY_1400_DVB_T1: case CX88_BOARD_TERRATEC_CINERGY_1400_DVB_T1:
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,
&dev->core->i2c_adap); &connexant_refboard_config,
&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,
&dev->core->i2c_adap, &dev->core->i2c_adap,
&dvb_pll_thomson_dtt7579); &dvb_pll_thomson_dtt7579);
} }
break; break;
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,
&dev->core->i2c_adap); &hauppauge_hvr1100_config,
&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,
&dev->core->i2c_adap, &dev->core->i2c_adap,
&dvb_pll_fmd1216me); &dvb_pll_fmd1216me);
} }
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,
&dev->core->i2c_adap); &dvico_fusionhdtv,
&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,
NULL, &dvb_pll_thomson_dtt7579); NULL, &dvb_pll_thomson_dtt7579);
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,
&dev->core->i2c_adap); &dvico_fusionhdtv_plus_v1_1,
&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,
NULL, &dvb_pll_thomson_dtt7579); NULL, &dvb_pll_thomson_dtt7579);
@ -557,24 +564,27 @@ 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,
&dev->core->i2c_adap); &dvico_fusionhdtv_dual,
&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,
NULL, &dvb_pll_thomson_dtt7579); NULL, &dvb_pll_thomson_dtt7579);
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,
&dev->core->i2c_adap); &dvico_fusionhdtv_plus_v1_1,
&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,
NULL, &dvb_pll_thomson_dtt7579); NULL, &dvb_pll_thomson_dtt7579);
} }
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,
&dev->core->i2c_adap); &dvico_fusionhdtv,
&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,
NULL, &dvb_pll_lg_z201); NULL, &dvb_pll_lg_z201);
@ -583,8 +593,9 @@ 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,
&dev->core->i2c_adap); &dntv_live_dvbt_config,
&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,
NULL, &dvb_pll_unknown_1); NULL, &dvb_pll_unknown_1);
@ -606,19 +617,21 @@ 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,
&dev->core->i2c_adap); &dvico_fusionhdtv_hybrid,
&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,
&dev->core->i2c_adap); &pchdtv_hd3000,
&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,
&dev->core->i2c_adap, &dev->core->i2c_adap,
&dvb_pll_thomson_dtt761x); &dvb_pll_thomson_dtt761x);
} }
break; break;
case CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q: case CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q:
@ -636,8 +649,9 @@ 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,
&dev->core->i2c_adap); &fusionhdtv_3_gold,
&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,8 +669,9 @@ 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,
&dev->core->i2c_adap); &fusionhdtv_3_gold,
&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,8 +687,9 @@ 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,
&dev->core->i2c_adap); &fusionhdtv_5_gold,
&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,16 +705,18 @@ 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,
&dev->core->i2c_adap); &pchdtv_hd5500,
&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;
} }
} }
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,
&dev->core->i2c_adap); &ati_hdtvwonder,
&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,
NULL, &dvb_pll_tuv1236d); NULL, &dvb_pll_tuv1236d);
@ -706,24 +724,27 @@ 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,
&dev->core->i2c_adap); &hauppauge_novas_config,
&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,
&dev->core->i2c_adap); &kworld_dvbs_100_config,
&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;
dev->dvb.frontend->ops.set_voltage = kworld_dvbs_100_set_voltage; dev->dvb.frontend->ops.set_voltage = kworld_dvbs_100_set_voltage;
} }
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,
&dev->core->i2c_adap); &geniatech_dvbs_config,
&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;
dev->dvb.frontend->ops.set_voltage = geniatech_dvbs_set_voltage; dev->dvb.frontend->ops.set_voltage = geniatech_dvbs_set_voltage;

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

@ -1049,7 +1049,7 @@ static int dvb_init(struct saa7134_dev *dev)
case SAA7134_BOARD_PINNACLE_300I_DVBT_PAL: case SAA7134_BOARD_PINNACLE_300I_DVBT_PAL:
printk("%s: pinnacle 300i dvb setup\n",dev->name); printk("%s: pinnacle 300i dvb setup\n",dev->name);
dev->dvb.frontend = dvb_attach(mt352_attach, &pinnacle_300i, dev->dvb.frontend = dvb_attach(mt352_attach, &pinnacle_300i,
&dev->i2c_adap); &dev->i2c_adap);
if (dev->dvb.frontend) { if (dev->dvb.frontend) {
dev->dvb.frontend->ops.tuner_ops.set_params = mt352_pinnacle_tuner_set_params; dev->dvb.frontend->ops.tuner_ops.set_params = mt352_pinnacle_tuner_set_params;
} }
@ -1057,14 +1057,15 @@ static int dvb_init(struct saa7134_dev *dev)
case SAA7134_BOARD_AVERMEDIA_777: case SAA7134_BOARD_AVERMEDIA_777:
printk("%s: avertv 777 dvb setup\n",dev->name); printk("%s: avertv 777 dvb setup\n",dev->name);
dev->dvb.frontend = dvb_attach(mt352_attach, &avermedia_777, dev->dvb.frontend = dvb_attach(mt352_attach, &avermedia_777,
&dev->i2c_adap); &dev->i2c_adap);
if (dev->dvb.frontend) { if (dev->dvb.frontend) {
dev->dvb.frontend->ops.tuner_ops.calc_regs = mt352_aver777_tuner_calc_regs; dev->dvb.frontend->ops.tuner_ops.calc_regs = mt352_aver777_tuner_calc_regs;
} }
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,
&dev->i2c_adap); &medion_cardbus,
&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;
dev->dvb.frontend->ops.tuner_ops.sleep = philips_fmd1216_tuner_sleep; dev->dvb.frontend->ops.tuner_ops.sleep = philips_fmd1216_tuner_sleep;
@ -1072,16 +1073,18 @@ 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,
&dev->i2c_adap); &philips_tu1216_60_config,
&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;
dev->dvb.frontend->ops.tuner_ops.set_params = philips_tu1216_tuner_60_set_params; dev->dvb.frontend->ops.tuner_ops.set_params = philips_tu1216_tuner_60_set_params;
} }
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,
&dev->i2c_adap); &tda827x_lifeview_config,
&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;
dev->dvb.frontend->ops.tuner_ops.sleep = philips_tda827x_tuner_sleep; dev->dvb.frontend->ops.tuner_ops.sleep = philips_tda827x_tuner_sleep;
@ -1089,8 +1092,9 @@ 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,
&dev->i2c_adap); &tda827x_lifeview_config,
&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;
dev->dvb.frontend->ops.tuner_ops.sleep = philips_tda827x_tuner_sleep; dev->dvb.frontend->ops.tuner_ops.sleep = philips_tda827x_tuner_sleep;
@ -1098,8 +1102,9 @@ 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,
&dev->i2c_adap); &philips_europa_config,
&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;
dev->dvb.frontend->ops.sleep = philips_europa_demod_sleep; dev->dvb.frontend->ops.sleep = philips_europa_demod_sleep;
@ -1109,8 +1114,9 @@ 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,
&dev->i2c_adap); &philips_europa_config,
&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;
dev->dvb.frontend->ops.tuner_ops.sleep = philips_europa_tuner_sleep; dev->dvb.frontend->ops.tuner_ops.sleep = philips_europa_tuner_sleep;
@ -1118,16 +1124,18 @@ 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,
&dev->i2c_adap); &philips_tu1216_61_config,
&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;
dev->dvb.frontend->ops.tuner_ops.set_params = philips_tu1216_tuner_61_set_params; dev->dvb.frontend->ops.tuner_ops.set_params = philips_tu1216_tuner_61_set_params;
} }
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,
&dev->i2c_adap); &philips_tiger_config,
&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;
dev->dvb.frontend->ops.tuner_ops.sleep = philips_tiger_tuner_sleep; dev->dvb.frontend->ops.tuner_ops.sleep = philips_tiger_tuner_sleep;
@ -1135,8 +1143,9 @@ 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,
&dev->i2c_adap); &philips_tiger_config,
&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;
dev->dvb.frontend->ops.tuner_ops.sleep = philips_tiger_tuner_sleep; dev->dvb.frontend->ops.tuner_ops.sleep = philips_tiger_tuner_sleep;
@ -1144,8 +1153,9 @@ 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,
&dev->i2c_adap); &tda827x_lifeview_config,
&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;
dev->dvb.frontend->ops.tuner_ops.sleep = philips_tda827x_tuner_sleep; dev->dvb.frontend->ops.tuner_ops.sleep = philips_tda827x_tuner_sleep;
@ -1153,16 +1163,18 @@ 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,
&dev->i2c_adap); &lifeview_trio_config,
&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;
dev->dvb.frontend->ops.tuner_ops.set_params = lifeview_trio_tuner_set_params; dev->dvb.frontend->ops.tuner_ops.set_params = lifeview_trio_tuner_set_params;
} }
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,
&dev->i2c_adap); &ads_tech_duo_config,
&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;
dev->dvb.frontend->ops.tuner_ops.sleep = ads_duo_tuner_sleep; dev->dvb.frontend->ops.tuner_ops.sleep = ads_duo_tuner_sleep;
@ -1170,16 +1182,18 @@ 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,
&dev->i2c_adap); &tevion_dvbt220rf_config,
&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;
dev->dvb.frontend->ops.tuner_ops.set_params = tevion_dvb220rf_tuner_set_params; dev->dvb.frontend->ops.tuner_ops.set_params = tevion_dvb220rf_tuner_set_params;
} }
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,
&dev->i2c_adap); &ads_tech_duo_config,
&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;
dev->dvb.frontend->ops.tuner_ops.sleep = ads_duo_tuner_sleep; dev->dvb.frontend->ops.tuner_ops.sleep = ads_duo_tuner_sleep;
@ -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__);
} }
} }