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

V4L/DVB (7381): tuner: rename TUNER_PHILIPS_ATSC to TUNER_PHILIPS_FCV1236D 



TUNER_PHILIPS_ATSC is an ambiguous name for a tuner.  Rename it to
TUNER_PHILIPS_FCV1236D to be more descriptive.

Signed-off-by: default avatarMichael Krufky <mkrufky@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent e827931e

drivers/media/video/bt8xx/bttv-cards.c

+2 −2
Original line number Diff line number Diff line
@@ -2327,7 +2327,7 @@ struct tvcard bttv_tvcards[] = { 
		.tuner          = 0,

		.svhs           = 2,

		.muxsel         = { 2, 3, 1, 0 },

		.tuner_type     = TUNER_PHILIPS_ATSC,

		.tuner_type     = TUNER_PHILIPS_FCV1236D,

		.tuner_addr	= ADDR_UNSET,

		.radio_addr     = ADDR_UNSET,

		.has_dvb        = 1,
@@ -2966,7 +2966,7 @@ struct tvcard bttv_tvcards[] = { 
	[BTTV_BOARD_DVICO_FUSIONHDTV_2] = {

		.name           = "DViCO FusionHDTV 2",

		.tuner          = 0,

		.tuner_type     = TUNER_PHILIPS_ATSC, /* FCV1236D */

		.tuner_type     = TUNER_PHILIPS_FCV1236D,

		.tuner_addr	= ADDR_UNSET,

		.radio_addr     = ADDR_UNSET,

		.video_inputs   = 3,

drivers/media/video/em28xx/em28xx-cards.c

+1 −1
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ struct em28xx_board em28xx_boards[] = { 
		.name         = "Kworld USB2800",

		.is_em2800    = 1,

		.vchannels    = 3,

		.tuner_type   = TUNER_PHILIPS_ATSC,

		.tuner_type   = TUNER_PHILIPS_FCV1236D,

		.tda9887_conf = TDA9887_PRESENT,

		.decoder      = EM28XX_SAA7113,

		.input          = { {

drivers/media/video/pvrusb2/pvrusb2-devattr.c

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ static const struct pvr2_device_desc pvr2_device_onair_usb2 = { 
		.shortname = "oa2",

		.client_modules.lst = pvr2_client_onair_usb2,

		.client_modules.cnt = ARRAY_SIZE(pvr2_client_onair_usb2),

		.default_tuner_type = TUNER_PHILIPS_ATSC,

		.default_tuner_type = TUNER_PHILIPS_FCV1236D,

		.flag_has_analogtuner = !0,

		.flag_has_composite = !0,

		.flag_has_svideo = !0,

drivers/media/video/saa7134/saa7134-cards.c

+1 −1
Original line number Diff line number Diff line
@@ -3333,7 +3333,7 @@ struct saa7134_board saa7134_boards[] = { 
  /*	Juan Pablo Sormani <sorman@gmail.com> */

		.name           = "Encore ENLTV-FM",

		.audio_clock    = 0x00200000,

		.tuner_type     = TUNER_PHILIPS_ATSC,

		.tuner_type     = TUNER_PHILIPS_FCV1236D,

		.radio_type     = UNSET,

		.tuner_addr	= ADDR_UNSET,

		.radio_addr	= ADDR_UNSET,

drivers/media/video/tuner-simple.c

+3 −3
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ static void simple_set_rf_input(struct dvb_frontend *fe, 
			break;

		}

		break;

	case TUNER_PHILIPS_ATSC:

	case TUNER_PHILIPS_FCV1236D:

		switch (rf) {

		case 1:

			*cb |= 0x01;
@@ -356,7 +356,7 @@ static int simple_std_setup(struct dvb_frontend *fe, 
		}

		break;



	case TUNER_PHILIPS_ATSC:

	case TUNER_PHILIPS_FCV1236D:

		/* 0x00 -> ATSC antenna input 1 */

		/* 0x01 -> ATSC antenna input 2 */

		/* 0x02 -> NTSC antenna input 1 */
@@ -766,7 +766,7 @@ static void simple_set_dvb(struct dvb_frontend *fe, u8 *buf, 
			buf[3] |= 1 << 3;

		break;

	case TUNER_PHILIPS_TUV1236D:

	case TUNER_PHILIPS_ATSC:

	case TUNER_PHILIPS_FCV1236D:

	{

		unsigned int new_rf;