aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx88/cx88-dvb.c
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2006-08-08 14:48:08 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-09-26 10:53:40 -0400
commitf7b54b1067bc0ccc6a2a2051f039ce630083f927 (patch)
tree9320e72a998547079c7d1f13d5ac16f3f87fb1bb /drivers/media/video/cx88/cx88-dvb.c
parent4ad8eee5ac8d8336ac7965e4a4027a7b4ec080f1 (diff)
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: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/cx88/cx88-dvb.c')
-rw-r--r--drivers/media/video/cx88/cx88-dvb.c193
1 files changed, 107 insertions, 86 deletions
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index 52467b2ecdcb..ebbf54077132 100644
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -165,7 +165,7 @@ static int dntv_live_dvbt_demod_init(struct dvb_frontend* fe)
165} 165}
166 166
167static struct mt352_config dvico_fusionhdtv = { 167static struct mt352_config dvico_fusionhdtv = {
168 .demod_address = 0x0F, 168 .demod_address = 0x0f,
169 .demod_init = dvico_fusionhdtv_demod_init, 169 .demod_init = dvico_fusionhdtv_demod_init,
170}; 170};
171 171
@@ -175,7 +175,7 @@ static struct mt352_config dntv_live_dvbt_config = {
175}; 175};
176 176
177static struct mt352_config dvico_fusionhdtv_dual = { 177static struct mt352_config dvico_fusionhdtv_dual = {
178 .demod_address = 0x0F, 178 .demod_address = 0x0f,
179 .demod_init = dvico_dual_demod_init, 179 .demod_init = dvico_dual_demod_init,
180}; 180};
181 181
@@ -250,8 +250,8 @@ static int dntv_live_dvbt_pro_tuner_set_params(struct dvb_frontend* fe,
250 if ((err = i2c_transfer(&dev->core->i2c_adap, &msg, 1)) != 1) { 250 if ((err = i2c_transfer(&dev->core->i2c_adap, &msg, 1)) != 1) {
251 251
252 printk(KERN_WARNING "cx88-dvb: %s error " 252 printk(KERN_WARNING "cx88-dvb: %s error "
253 "(addr %02x <- %02x, err = %i)\n", 253 "(addr %02x <- %02x, err = %i)\n",
254 __FUNCTION__, dev->core->pll_addr, buf[0], err); 254 __FUNCTION__, dev->core->pll_addr, buf[0], err);
255 if (err < 0) 255 if (err < 0)
256 return err; 256 return err;
257 else 257 else
@@ -286,8 +286,8 @@ static int dvico_hybrid_tuner_set_params(struct dvb_frontend *fe,
286 fe->ops.i2c_gate_ctrl(fe, 1); 286 fe->ops.i2c_gate_ctrl(fe, 1);
287 if ((err = i2c_transfer(&dev->core->i2c_adap, &msg, 1)) != 1) { 287 if ((err = i2c_transfer(&dev->core->i2c_adap, &msg, 1)) != 1) {
288 printk(KERN_WARNING "cx88-dvb: %s error " 288 printk(KERN_WARNING "cx88-dvb: %s error "
289 "(addr %02x <- %02x, err = %i)\n", 289 "(addr %02x <- %02x, err = %i)\n",
290 __FUNCTION__, pllbuf[0], pllbuf[1], err); 290 __FUNCTION__, pllbuf[0], pllbuf[1], err);
291 if (err < 0) 291 if (err < 0)
292 return err; 292 return err;
293 else 293 else
@@ -298,12 +298,12 @@ static int dvico_hybrid_tuner_set_params(struct dvb_frontend *fe,
298} 298}
299 299
300static struct zl10353_config dvico_fusionhdtv_hybrid = { 300static struct zl10353_config dvico_fusionhdtv_hybrid = {
301 .demod_address = 0x0F, 301 .demod_address = 0x0f,
302 .no_tuner = 1, 302 .no_tuner = 1,
303}; 303};
304 304
305static struct zl10353_config dvico_fusionhdtv_plus_v1_1 = { 305static struct zl10353_config dvico_fusionhdtv_plus_v1_1 = {
306 .demod_address = 0x0F, 306 .demod_address = 0x0f,
307}; 307};
308 308
309static struct cx22702_config connexant_refboard_config = { 309static struct cx22702_config connexant_refboard_config = {
@@ -329,8 +329,8 @@ static int or51132_set_ts_param(struct dvb_frontend* fe,
329} 329}
330 330
331static struct or51132_config pchdtv_hd3000 = { 331static struct or51132_config pchdtv_hd3000 = {
332 .demod_address = 0x15, 332 .demod_address = 0x15,
333 .set_ts_params = or51132_set_ts_param, 333 .set_ts_params = or51132_set_ts_param,
334}; 334};
335 335
336static int lgdt3302_tuner_set_params(struct dvb_frontend* fe, 336static int lgdt3302_tuner_set_params(struct dvb_frontend* fe,
@@ -349,14 +349,14 @@ static int lgdt3302_tuner_set_params(struct dvb_frontend* fe,
349 349
350 dvb_pll_configure(core->pll_desc, buf, params->frequency, 0); 350 dvb_pll_configure(core->pll_desc, buf, params->frequency, 0);
351 dprintk(1, "%s: tuner at 0x%02x bytes: 0x%02x 0x%02x 0x%02x 0x%02x\n", 351 dprintk(1, "%s: tuner at 0x%02x bytes: 0x%02x 0x%02x 0x%02x 0x%02x\n",
352 __FUNCTION__, msg.addr, buf[0],buf[1],buf[2],buf[3]); 352 __FUNCTION__, msg.addr, buf[0],buf[1],buf[2],buf[3]);
353 353
354 if (fe->ops.i2c_gate_ctrl) 354 if (fe->ops.i2c_gate_ctrl)
355 fe->ops.i2c_gate_ctrl(fe, 1); 355 fe->ops.i2c_gate_ctrl(fe, 1);
356 if ((err = i2c_transfer(&core->i2c_adap, &msg, 1)) != 1) { 356 if ((err = i2c_transfer(&core->i2c_adap, &msg, 1)) != 1) {
357 printk(KERN_WARNING "cx88-dvb: %s error " 357 printk(KERN_WARNING "cx88-dvb: %s error "
358 "(addr %02x <- %02x, err = %i)\n", 358 "(addr %02x <- %02x, err = %i)\n",
359 __FUNCTION__, buf[0], buf[1], err); 359 __FUNCTION__, buf[0], buf[1], err);
360 if (err < 0) 360 if (err < 0)
361 return err; 361 return err;
362 else 362 else
@@ -401,24 +401,24 @@ static int lgdt330x_set_ts_param(struct dvb_frontend* fe, int is_punctured)
401} 401}
402 402
403static struct lgdt330x_config fusionhdtv_3_gold = { 403static struct lgdt330x_config fusionhdtv_3_gold = {
404 .demod_address = 0x0e, 404 .demod_address = 0x0e,
405 .demod_chip = LGDT3302, 405 .demod_chip = LGDT3302,
406 .serial_mpeg = 0x04, /* TPSERIAL for 3302 in TOP_CONTROL */ 406 .serial_mpeg = 0x04, /* TPSERIAL for 3302 in TOP_CONTROL */
407 .set_ts_params = lgdt330x_set_ts_param, 407 .set_ts_params = lgdt330x_set_ts_param,
408}; 408};
409 409
410static struct lgdt330x_config fusionhdtv_5_gold = { 410static struct lgdt330x_config fusionhdtv_5_gold = {
411 .demod_address = 0x0e, 411 .demod_address = 0x0e,
412 .demod_chip = LGDT3303, 412 .demod_chip = LGDT3303,
413 .serial_mpeg = 0x40, /* TPSERIAL for 3303 in TOP_CONTROL */ 413 .serial_mpeg = 0x40, /* TPSERIAL for 3303 in TOP_CONTROL */
414 .set_ts_params = lgdt330x_set_ts_param, 414 .set_ts_params = lgdt330x_set_ts_param,
415}; 415};
416 416
417static struct lgdt330x_config pchdtv_hd5500 = { 417static struct lgdt330x_config pchdtv_hd5500 = {
418 .demod_address = 0x59, 418 .demod_address = 0x59,
419 .demod_chip = LGDT3303, 419 .demod_chip = LGDT3303,
420 .serial_mpeg = 0x40, /* TPSERIAL for 3303 in TOP_CONTROL */ 420 .serial_mpeg = 0x40, /* TPSERIAL for 3303 in TOP_CONTROL */
421 .set_ts_params = lgdt330x_set_ts_param, 421 .set_ts_params = lgdt330x_set_ts_param,
422}; 422};
423 423
424static int nxt200x_set_ts_param(struct dvb_frontend* fe, 424static int nxt200x_set_ts_param(struct dvb_frontend* fe,
@@ -439,26 +439,27 @@ static int nxt200x_set_pll_input(u8* buf, int input)
439} 439}
440 440
441static struct nxt200x_config ati_hdtvwonder = { 441static struct nxt200x_config ati_hdtvwonder = {
442 .demod_address = 0x0a, 442 .demod_address = 0x0a,
443 .set_pll_input = nxt200x_set_pll_input, 443 .set_pll_input = nxt200x_set_pll_input,
444 .set_ts_params = nxt200x_set_ts_param, 444 .set_ts_params = nxt200x_set_ts_param,
445}; 445};
446 446
447static int cx24123_set_ts_param(struct dvb_frontend* fe, 447static int cx24123_set_ts_param(struct dvb_frontend* fe,
448 int is_punctured) 448 int is_punctured)
449{ 449{
450 struct cx8802_dev *dev= fe->dvb->priv; 450 struct cx8802_dev *dev= fe->dvb->priv;
451 dev->ts_gen_cntrl = 0x2; 451 dev->ts_gen_cntrl = 0x02;
452 return 0; 452 return 0;
453} 453}
454 454
455static int kworld_dvbs_100_set_voltage(struct dvb_frontend* fe, fe_sec_voltage_t voltage) 455static int kworld_dvbs_100_set_voltage(struct dvb_frontend* fe,
456 fe_sec_voltage_t voltage)
456{ 457{
457 struct cx8802_dev *dev= fe->dvb->priv; 458 struct cx8802_dev *dev= fe->dvb->priv;
458 struct cx88_core *core = dev->core; 459 struct cx88_core *core = dev->core;
459 460
460 if (voltage == SEC_VOLTAGE_OFF) { 461 if (voltage == SEC_VOLTAGE_OFF) {
461 cx_write(MO_GP0_IO, 0x000006fB); 462 cx_write(MO_GP0_IO, 0x000006fb);
462 } else { 463 } else {
463 cx_write(MO_GP0_IO, 0x000006f9); 464 cx_write(MO_GP0_IO, 0x000006f9);
464 } 465 }
@@ -468,7 +469,8 @@ static int kworld_dvbs_100_set_voltage(struct dvb_frontend* fe, fe_sec_voltage_t
468 return 0; 469 return 0;
469} 470}
470 471
471static int geniatech_dvbs_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage) 472static int geniatech_dvbs_set_voltage(struct dvb_frontend *fe,
473 fe_sec_voltage_t voltage)
472{ 474{
473 struct cx8802_dev *dev= fe->dvb->priv; 475 struct cx8802_dev *dev= fe->dvb->priv;
474 struct cx88_core *core = dev->core; 476 struct cx88_core *core = dev->core;
@@ -484,18 +486,18 @@ static int geniatech_dvbs_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t
484} 486}
485 487
486static struct cx24123_config geniatech_dvbs_config = { 488static struct cx24123_config geniatech_dvbs_config = {
487 .demod_address = 0x55, 489 .demod_address = 0x55,
488 .set_ts_params = cx24123_set_ts_param, 490 .set_ts_params = cx24123_set_ts_param,
489}; 491};
490 492
491static struct cx24123_config hauppauge_novas_config = { 493static struct cx24123_config hauppauge_novas_config = {
492 .demod_address = 0x55, 494 .demod_address = 0x55,
493 .set_ts_params = cx24123_set_ts_param, 495 .set_ts_params = cx24123_set_ts_param,
494}; 496};
495 497
496static struct cx24123_config kworld_dvbs_100_config = { 498static struct cx24123_config kworld_dvbs_100_config = {
497 .demod_address = 0x15, 499 .demod_address = 0x15,
498 .set_ts_params = cx24123_set_ts_param, 500 .set_ts_params = cx24123_set_ts_param,
499}; 501};
500 502
501static int dvb_register(struct cx8802_dev *dev) 503static int dvb_register(struct cx8802_dev *dev)
@@ -507,48 +509,53 @@ static int dvb_register(struct cx8802_dev *dev)
507 /* init frontend */ 509 /* init frontend */
508 switch (dev->core->board) { 510 switch (dev->core->board) {
509 case CX88_BOARD_HAUPPAUGE_DVB_T1: 511 case CX88_BOARD_HAUPPAUGE_DVB_T1:
510 dev->dvb.frontend = dvb_attach(cx22702_attach, &hauppauge_novat_config, 512 dev->dvb.frontend = dvb_attach(cx22702_attach,
511 &dev->core->i2c_adap); 513 &hauppauge_novat_config,
514 &dev->core->i2c_adap);
512 if (dev->dvb.frontend != NULL) { 515 if (dev->dvb.frontend != NULL) {
513 dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, 516 dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
514 &dev->core->i2c_adap, 517 &dev->core->i2c_adap,
515 &dvb_pll_thomson_dtt759x); 518 &dvb_pll_thomson_dtt759x);
516 } 519 }
517 break; 520 break;
518 case CX88_BOARD_TERRATEC_CINERGY_1400_DVB_T1: 521 case CX88_BOARD_TERRATEC_CINERGY_1400_DVB_T1:
519 case CX88_BOARD_CONEXANT_DVB_T1: 522 case CX88_BOARD_CONEXANT_DVB_T1:
520 case CX88_BOARD_KWORLD_DVB_T_CX22702: 523 case CX88_BOARD_KWORLD_DVB_T_CX22702:
521 case CX88_BOARD_WINFAST_DTV1000: 524 case CX88_BOARD_WINFAST_DTV1000:
522 dev->dvb.frontend = dvb_attach(cx22702_attach, &connexant_refboard_config, 525 dev->dvb.frontend = dvb_attach(cx22702_attach,
523 &dev->core->i2c_adap); 526 &connexant_refboard_config,
527 &dev->core->i2c_adap);
524 if (dev->dvb.frontend != NULL) { 528 if (dev->dvb.frontend != NULL) {
525 dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x60, 529 dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x60,
526 &dev->core->i2c_adap, 530 &dev->core->i2c_adap,
527 &dvb_pll_thomson_dtt7579); 531 &dvb_pll_thomson_dtt7579);
528 } 532 }
529 break; 533 break;
530 case CX88_BOARD_WINFAST_DTV2000H: 534 case CX88_BOARD_WINFAST_DTV2000H:
531 case CX88_BOARD_HAUPPAUGE_HVR1100: 535 case CX88_BOARD_HAUPPAUGE_HVR1100:
532 case CX88_BOARD_HAUPPAUGE_HVR1100LP: 536 case CX88_BOARD_HAUPPAUGE_HVR1100LP:
533 dev->dvb.frontend = dvb_attach(cx22702_attach, &hauppauge_hvr1100_config, 537 dev->dvb.frontend = dvb_attach(cx22702_attach,
534 &dev->core->i2c_adap); 538 &hauppauge_hvr1100_config,
539 &dev->core->i2c_adap);
535 if (dev->dvb.frontend != NULL) { 540 if (dev->dvb.frontend != NULL) {
536 dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, 541 dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
537 &dev->core->i2c_adap, 542 &dev->core->i2c_adap,
538 &dvb_pll_fmd1216me); 543 &dvb_pll_fmd1216me);
539 } 544 }
540 break; 545 break;
541 case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS: 546 case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS:
542 dev->dvb.frontend = dvb_attach(mt352_attach, &dvico_fusionhdtv, 547 dev->dvb.frontend = dvb_attach(mt352_attach,
543 &dev->core->i2c_adap); 548 &dvico_fusionhdtv,
549 &dev->core->i2c_adap);
544 if (dev->dvb.frontend != NULL) { 550 if (dev->dvb.frontend != NULL) {
545 dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x60, 551 dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x60,
546 NULL, &dvb_pll_thomson_dtt7579); 552 NULL, &dvb_pll_thomson_dtt7579);
547 break; 553 break;
548 } 554 }
549 /* ZL10353 replaces MT352 on later cards */ 555 /* ZL10353 replaces MT352 on later cards */
550 dev->dvb.frontend = dvb_attach(zl10353_attach, &dvico_fusionhdtv_plus_v1_1, 556 dev->dvb.frontend = dvb_attach(zl10353_attach,
551 &dev->core->i2c_adap); 557 &dvico_fusionhdtv_plus_v1_1,
558 &dev->core->i2c_adap);
552 if (dev->dvb.frontend != NULL) { 559 if (dev->dvb.frontend != NULL) {
553 dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x60, 560 dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x60,
554 NULL, &dvb_pll_thomson_dtt7579); 561 NULL, &dvb_pll_thomson_dtt7579);
@@ -557,24 +564,27 @@ static int dvb_register(struct cx8802_dev *dev)
557 case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL: 564 case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL:
558 /* The tin box says DEE1601, but it seems to be DTT7579 565 /* The tin box says DEE1601, but it seems to be DTT7579
559 * compatible, with a slightly different MT352 AGC gain. */ 566 * compatible, with a slightly different MT352 AGC gain. */
560 dev->dvb.frontend = dvb_attach(mt352_attach, &dvico_fusionhdtv_dual, 567 dev->dvb.frontend = dvb_attach(mt352_attach,
561 &dev->core->i2c_adap); 568 &dvico_fusionhdtv_dual,
569 &dev->core->i2c_adap);
562 if (dev->dvb.frontend != NULL) { 570 if (dev->dvb.frontend != NULL) {
563 dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, 571 dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
564 NULL, &dvb_pll_thomson_dtt7579); 572 NULL, &dvb_pll_thomson_dtt7579);
565 break; 573 break;
566 } 574 }
567 /* ZL10353 replaces MT352 on later cards */ 575 /* ZL10353 replaces MT352 on later cards */
568 dev->dvb.frontend = dvb_attach(zl10353_attach, &dvico_fusionhdtv_plus_v1_1, 576 dev->dvb.frontend = dvb_attach(zl10353_attach,
569 &dev->core->i2c_adap); 577 &dvico_fusionhdtv_plus_v1_1,
578 &dev->core->i2c_adap);
570 if (dev->dvb.frontend != NULL) { 579 if (dev->dvb.frontend != NULL) {
571 dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, 580 dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
572 NULL, &dvb_pll_thomson_dtt7579); 581 NULL, &dvb_pll_thomson_dtt7579);
573 } 582 }
574 break; 583 break;
575 case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1: 584 case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1:
576 dev->dvb.frontend = dvb_attach(mt352_attach, &dvico_fusionhdtv, 585 dev->dvb.frontend = dvb_attach(mt352_attach,
577 &dev->core->i2c_adap); 586 &dvico_fusionhdtv,
587 &dev->core->i2c_adap);
578 if (dev->dvb.frontend != NULL) { 588 if (dev->dvb.frontend != NULL) {
579 dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, 589 dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
580 NULL, &dvb_pll_lg_z201); 590 NULL, &dvb_pll_lg_z201);
@@ -583,8 +593,9 @@ static int dvb_register(struct cx8802_dev *dev)
583 case CX88_BOARD_KWORLD_DVB_T: 593 case CX88_BOARD_KWORLD_DVB_T:
584 case CX88_BOARD_DNTV_LIVE_DVB_T: 594 case CX88_BOARD_DNTV_LIVE_DVB_T:
585 case CX88_BOARD_ADSTECH_DVB_T_PCI: 595 case CX88_BOARD_ADSTECH_DVB_T_PCI:
586 dev->dvb.frontend = dvb_attach(mt352_attach, &dntv_live_dvbt_config, 596 dev->dvb.frontend = dvb_attach(mt352_attach,
587 &dev->core->i2c_adap); 597 &dntv_live_dvbt_config,
598 &dev->core->i2c_adap);
588 if (dev->dvb.frontend != NULL) { 599 if (dev->dvb.frontend != NULL) {
589 dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, 600 dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
590 NULL, &dvb_pll_unknown_1); 601 NULL, &dvb_pll_unknown_1);
@@ -606,19 +617,21 @@ static int dvb_register(struct cx8802_dev *dev)
606 case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID: 617 case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID:
607 dev->core->pll_addr = 0x61; 618 dev->core->pll_addr = 0x61;
608 dev->core->pll_desc = &dvb_pll_thomson_fe6600; 619 dev->core->pll_desc = &dvb_pll_thomson_fe6600;
609 dev->dvb.frontend = dvb_attach(zl10353_attach, &dvico_fusionhdtv_hybrid, 620 dev->dvb.frontend = dvb_attach(zl10353_attach,
610 &dev->core->i2c_adap); 621 &dvico_fusionhdtv_hybrid,
622 &dev->core->i2c_adap);
611 if (dev->dvb.frontend != NULL) { 623 if (dev->dvb.frontend != NULL) {
612 dev->dvb.frontend->ops.tuner_ops.set_params = dvico_hybrid_tuner_set_params; 624 dev->dvb.frontend->ops.tuner_ops.set_params = dvico_hybrid_tuner_set_params;
613 } 625 }
614 break; 626 break;
615 case CX88_BOARD_PCHDTV_HD3000: 627 case CX88_BOARD_PCHDTV_HD3000:
616 dev->dvb.frontend = dvb_attach(or51132_attach, &pchdtv_hd3000, 628 dev->dvb.frontend = dvb_attach(or51132_attach,
617 &dev->core->i2c_adap); 629 &pchdtv_hd3000,
630 &dev->core->i2c_adap);
618 if (dev->dvb.frontend != NULL) { 631 if (dev->dvb.frontend != NULL) {
619 dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, 632 dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
620 &dev->core->i2c_adap, 633 &dev->core->i2c_adap,
621 &dvb_pll_thomson_dtt761x); 634 &dvb_pll_thomson_dtt761x);
622 } 635 }
623 break; 636 break;
624 case CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q: 637 case CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q:
@@ -636,8 +649,9 @@ static int dvb_register(struct cx8802_dev *dev)
636 fusionhdtv_3_gold.pll_rf_set = lgdt330x_pll_rf_set; 649 fusionhdtv_3_gold.pll_rf_set = lgdt330x_pll_rf_set;
637 dev->core->pll_addr = 0x61; 650 dev->core->pll_addr = 0x61;
638 dev->core->pll_desc = &dvb_pll_microtune_4042; 651 dev->core->pll_desc = &dvb_pll_microtune_4042;
639 dev->dvb.frontend = dvb_attach(lgdt330x_attach, &fusionhdtv_3_gold, 652 dev->dvb.frontend = dvb_attach(lgdt330x_attach,
640 &dev->core->i2c_adap); 653 &fusionhdtv_3_gold,
654 &dev->core->i2c_adap);
641 if (dev->dvb.frontend != NULL) { 655 if (dev->dvb.frontend != NULL) {
642 dev->dvb.frontend->ops.tuner_ops.set_params = lgdt3302_tuner_set_params; 656 dev->dvb.frontend->ops.tuner_ops.set_params = lgdt3302_tuner_set_params;
643 } 657 }
@@ -655,8 +669,9 @@ static int dvb_register(struct cx8802_dev *dev)
655 mdelay(200); 669 mdelay(200);
656 dev->core->pll_addr = 0x61; 670 dev->core->pll_addr = 0x61;
657 dev->core->pll_desc = &dvb_pll_thomson_dtt761x; 671 dev->core->pll_desc = &dvb_pll_thomson_dtt761x;
658 dev->dvb.frontend = dvb_attach(lgdt330x_attach, &fusionhdtv_3_gold, 672 dev->dvb.frontend = dvb_attach(lgdt330x_attach,
659 &dev->core->i2c_adap); 673 &fusionhdtv_3_gold,
674 &dev->core->i2c_adap);
660 if (dev->dvb.frontend != NULL) { 675 if (dev->dvb.frontend != NULL) {
661 dev->dvb.frontend->ops.tuner_ops.set_params = lgdt3302_tuner_set_params; 676 dev->dvb.frontend->ops.tuner_ops.set_params = lgdt3302_tuner_set_params;
662 } 677 }
@@ -672,8 +687,9 @@ static int dvb_register(struct cx8802_dev *dev)
672 mdelay(100); 687 mdelay(100);
673 cx_set(MO_GP0_IO, 1); 688 cx_set(MO_GP0_IO, 1);
674 mdelay(200); 689 mdelay(200);
675 dev->dvb.frontend = dvb_attach(lgdt330x_attach, &fusionhdtv_5_gold, 690 dev->dvb.frontend = dvb_attach(lgdt330x_attach,
676 &dev->core->i2c_adap); 691 &fusionhdtv_5_gold,
692 &dev->core->i2c_adap);
677 if (dev->dvb.frontend != NULL) { 693 if (dev->dvb.frontend != NULL) {
678 dev->dvb.frontend->ops.tuner_ops.set_params = lgdt3303_tuner_set_params; 694 dev->dvb.frontend->ops.tuner_ops.set_params = lgdt3303_tuner_set_params;
679 } 695 }
@@ -689,16 +705,18 @@ static int dvb_register(struct cx8802_dev *dev)
689 mdelay(100); 705 mdelay(100);
690 cx_set(MO_GP0_IO, 1); 706 cx_set(MO_GP0_IO, 1);
691 mdelay(200); 707 mdelay(200);
692 dev->dvb.frontend = dvb_attach(lgdt330x_attach, &pchdtv_hd5500, 708 dev->dvb.frontend = dvb_attach(lgdt330x_attach,
693 &dev->core->i2c_adap); 709 &pchdtv_hd5500,
710 &dev->core->i2c_adap);
694 if (dev->dvb.frontend != NULL) { 711 if (dev->dvb.frontend != NULL) {
695 dev->dvb.frontend->ops.tuner_ops.set_params = lgdt3303_tuner_set_params; 712 dev->dvb.frontend->ops.tuner_ops.set_params = lgdt3303_tuner_set_params;
696 } 713 }
697 } 714 }
698 break; 715 break;
699 case CX88_BOARD_ATI_HDTVWONDER: 716 case CX88_BOARD_ATI_HDTVWONDER:
700 dev->dvb.frontend = dvb_attach(nxt200x_attach, &ati_hdtvwonder, 717 dev->dvb.frontend = dvb_attach(nxt200x_attach,
701 &dev->core->i2c_adap); 718 &ati_hdtvwonder,
719 &dev->core->i2c_adap);
702 if (dev->dvb.frontend != NULL) { 720 if (dev->dvb.frontend != NULL) {
703 dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, 721 dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
704 NULL, &dvb_pll_tuv1236d); 722 NULL, &dvb_pll_tuv1236d);
@@ -706,24 +724,27 @@ static int dvb_register(struct cx8802_dev *dev)
706 break; 724 break;
707 case CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1: 725 case CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1:
708 case CX88_BOARD_HAUPPAUGE_NOVASE2_S1: 726 case CX88_BOARD_HAUPPAUGE_NOVASE2_S1:
709 dev->dvb.frontend = dvb_attach(cx24123_attach, &hauppauge_novas_config, 727 dev->dvb.frontend = dvb_attach(cx24123_attach,
710 &dev->core->i2c_adap); 728 &hauppauge_novas_config,
729 &dev->core->i2c_adap);
711 if (dev->dvb.frontend) { 730 if (dev->dvb.frontend) {
712 dvb_attach(isl6421_attach, dev->dvb.frontend, &dev->core->i2c_adap, 731 dvb_attach(isl6421_attach, dev->dvb.frontend,
713 0x08, 0x00, 0x00); 732 &dev->core->i2c_adap, 0x08, 0x00, 0x00);
714 } 733 }
715 break; 734 break;
716 case CX88_BOARD_KWORLD_DVBS_100: 735 case CX88_BOARD_KWORLD_DVBS_100:
717 dev->dvb.frontend = dvb_attach(cx24123_attach, &kworld_dvbs_100_config, 736 dev->dvb.frontend = dvb_attach(cx24123_attach,
718 &dev->core->i2c_adap); 737 &kworld_dvbs_100_config,
738 &dev->core->i2c_adap);
719 if (dev->dvb.frontend) { 739 if (dev->dvb.frontend) {
720 dev->core->prev_set_voltage = dev->dvb.frontend->ops.set_voltage; 740 dev->core->prev_set_voltage = dev->dvb.frontend->ops.set_voltage;
721 dev->dvb.frontend->ops.set_voltage = kworld_dvbs_100_set_voltage; 741 dev->dvb.frontend->ops.set_voltage = kworld_dvbs_100_set_voltage;
722 } 742 }
723 break; 743 break;
724 case CX88_BOARD_GENIATECH_DVBS: 744 case CX88_BOARD_GENIATECH_DVBS:
725 dev->dvb.frontend = dvb_attach(cx24123_attach, &geniatech_dvbs_config, 745 dev->dvb.frontend = dvb_attach(cx24123_attach,
726 &dev->core->i2c_adap); 746 &geniatech_dvbs_config,
747 &dev->core->i2c_adap);
727 if (dev->dvb.frontend) { 748 if (dev->dvb.frontend) {
728 dev->core->prev_set_voltage = dev->dvb.frontend->ops.set_voltage; 749 dev->core->prev_set_voltage = dev->dvb.frontend->ops.set_voltage;
729 dev->dvb.frontend->ops.set_voltage = geniatech_dvbs_set_voltage; 750 dev->dvb.frontend->ops.set_voltage = geniatech_dvbs_set_voltage;
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-24 18:11:25 -0500