Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2af3cd6 authored by Michael Krufky's avatar Michael Krufky Committed by Mauro Carvalho Chehab
Browse files

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: default avatarMichael Krufky <mkrufky@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 66dd0fcc

drivers/media/video/cx88/cx88-dvb.c

+20 −21
Original line number Original line Diff line number Diff line
@@ -560,6 +560,26 @@ static int dvb_register(struct cx8802_dev *dev) 
		if (dev->dvb.frontend != NULL) {

		if (dev->dvb.frontend != NULL) {

			dvb_pll_attach(dev->dvb.frontend, 0x60, &dev->core->i2c_adap, &dvb_pll_thomson_dtt7579);

			dvb_pll_attach(dev->dvb.frontend, 0x60, &dev->core->i2c_adap, &dvb_pll_thomson_dtt7579);

		}

		}

#endif

		break;

	case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL:

#ifdef HAVE_MT352

		/* The tin box says DEE1601, but it seems to be DTT7579

		 * compatible, with a slightly different MT352 AGC gain. */

		dev->dvb.frontend = mt352_attach(&dvico_fusionhdtv_dual,

						 &dev->core->i2c_adap);

		if (dev->dvb.frontend != NULL) {

			dvb_pll_attach(dev->dvb.frontend, 0x61, &dev->core->i2c_adap, &dvb_pll_thomson_dtt7579);

			break;

		}

#endif

#ifdef HAVE_ZL10353

		/* ZL10353 replaces MT352 on later cards */

		dev->dvb.frontend = zl10353_attach(&dvico_fusionhdtv_plus_v1_1,

						   &dev->core->i2c_adap);

		if (dev->dvb.frontend != NULL) {

			dvb_pll_attach(dev->dvb.frontend, 0x61, &dev->core->i2c_adap, &dvb_pll_thomson_dtt7579);

		}

#endif

#endif

		break;

		break;

#endif /* HAVE_MT352 || HAVE_ZL10353 */

#endif /* HAVE_MT352 || HAVE_ZL10353 */
@@ -594,27 +614,6 @@ static int dvb_register(struct cx8802_dev *dev) 
#endif

#endif

		break;

		break;

#endif

#endif

#if defined(HAVE_MT352) || defined(HAVE_ZL10353)

	case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL:

#ifdef HAVE_MT352

		/* The tin box says DEE1601, but it seems to be DTT7579

		 * compatible, with a slightly different MT352 AGC gain. */

		dev->dvb.frontend = mt352_attach(&dvico_fusionhdtv_dual,

						 &dev->core->i2c_adap);

		if (dev->dvb.frontend != NULL) {

			dvb_pll_attach(dev->dvb.frontend, 0x61, &dev->core->i2c_adap, &dvb_pll_thomson_dtt7579);

			break;

		}

#endif

#ifdef HAVE_ZL10353

		/* ZL10353 replaces MT352 on later cards */

		dev->dvb.frontend = zl10353_attach(&dvico_fusionhdtv_plus_v1_1, &dev->core->i2c_adap);

		if (dev->dvb.frontend != NULL) {

			dvb_pll_attach(dev->dvb.frontend, 0x61, &dev->core->i2c_adap, &dvb_pll_thomson_dtt7579);

		}

#endif

		break;

#endif /* HAVE_MT352 || HAVE_ZL10353 */

#ifdef HAVE_ZL10353

#ifdef HAVE_ZL10353

	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;