diff options
author | Michael Krufky <mkrufky@linuxtv.org> | 2006-06-12 13:06:22 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-25 01:05:08 -0400 |
commit | c2af3cd68e0680a659166d0cecc24afb93b2000e (patch) | |
tree | 841f742470484a1e9baffa034caef4d5c79e4f4e /drivers/media/video | |
parent | 66dd0fccbdbb77db897dd5870a67cb8022899adc (diff) |
V4L/DVB (4098): Cx88: #ifdef cleanups
- moved CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL frontend_attach code up
to share the #ifdef block with CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video')
-rw-r--r-- | drivers/media/video/cx88/cx88-dvb.c | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c index 7db9d4052625..f634041ac985 100644 --- a/drivers/media/video/cx88/cx88-dvb.c +++ b/drivers/media/video/cx88/cx88-dvb.c | |||
@@ -562,6 +562,26 @@ static int dvb_register(struct cx8802_dev *dev) | |||
562 | } | 562 | } |
563 | #endif | 563 | #endif |
564 | break; | 564 | break; |
565 | case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL: | ||
566 | #ifdef HAVE_MT352 | ||
567 | /* The tin box says DEE1601, but it seems to be DTT7579 | ||
568 | * compatible, with a slightly different MT352 AGC gain. */ | ||
569 | dev->dvb.frontend = mt352_attach(&dvico_fusionhdtv_dual, | ||
570 | &dev->core->i2c_adap); | ||
571 | if (dev->dvb.frontend != NULL) { | ||
572 | dvb_pll_attach(dev->dvb.frontend, 0x61, &dev->core->i2c_adap, &dvb_pll_thomson_dtt7579); | ||
573 | break; | ||
574 | } | ||
575 | #endif | ||
576 | #ifdef HAVE_ZL10353 | ||
577 | /* ZL10353 replaces MT352 on later cards */ | ||
578 | dev->dvb.frontend = zl10353_attach(&dvico_fusionhdtv_plus_v1_1, | ||
579 | &dev->core->i2c_adap); | ||
580 | if (dev->dvb.frontend != NULL) { | ||
581 | dvb_pll_attach(dev->dvb.frontend, 0x61, &dev->core->i2c_adap, &dvb_pll_thomson_dtt7579); | ||
582 | } | ||
583 | #endif | ||
584 | break; | ||
565 | #endif /* HAVE_MT352 || HAVE_ZL10353 */ | 585 | #endif /* HAVE_MT352 || HAVE_ZL10353 */ |
566 | #ifdef HAVE_MT352 | 586 | #ifdef HAVE_MT352 |
567 | case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1: | 587 | case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1: |
@@ -594,27 +614,6 @@ static int dvb_register(struct cx8802_dev *dev) | |||
594 | #endif | 614 | #endif |
595 | break; | 615 | break; |
596 | #endif | 616 | #endif |
597 | #if defined(HAVE_MT352) || defined(HAVE_ZL10353) | ||
598 | case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL: | ||
599 | #ifdef HAVE_MT352 | ||
600 | /* The tin box says DEE1601, but it seems to be DTT7579 | ||
601 | * compatible, with a slightly different MT352 AGC gain. */ | ||
602 | dev->dvb.frontend = mt352_attach(&dvico_fusionhdtv_dual, | ||
603 | &dev->core->i2c_adap); | ||
604 | if (dev->dvb.frontend != NULL) { | ||
605 | dvb_pll_attach(dev->dvb.frontend, 0x61, &dev->core->i2c_adap, &dvb_pll_thomson_dtt7579); | ||
606 | break; | ||
607 | } | ||
608 | #endif | ||
609 | #ifdef HAVE_ZL10353 | ||
610 | /* ZL10353 replaces MT352 on later cards */ | ||
611 | dev->dvb.frontend = zl10353_attach(&dvico_fusionhdtv_plus_v1_1, &dev->core->i2c_adap); | ||
612 | if (dev->dvb.frontend != NULL) { | ||
613 | dvb_pll_attach(dev->dvb.frontend, 0x61, &dev->core->i2c_adap, &dvb_pll_thomson_dtt7579); | ||
614 | } | ||
615 | #endif | ||
616 | break; | ||
617 | #endif /* HAVE_MT352 || HAVE_ZL10353 */ | ||
618 | #ifdef HAVE_ZL10353 | 617 | #ifdef HAVE_ZL10353 |
619 | case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID: | 618 | case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID: |
620 | dev->core->pll_addr = 0x61; | 619 | dev->core->pll_addr = 0x61; |