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

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
...@@ -2327,7 +2327,7 @@ struct tvcard bttv_tvcards[] = { ...@@ -2327,7 +2327,7 @@ struct tvcard bttv_tvcards[] = {
.tuner = 0, .tuner = 0,
.svhs = 2, .svhs = 2,
.muxsel = { 2, 3, 1, 0 }, .muxsel = { 2, 3, 1, 0 },
.tuner_type = TUNER_PHILIPS_ATSC, .tuner_type = TUNER_PHILIPS_FCV1236D,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET, .radio_addr = ADDR_UNSET,
.has_dvb = 1, .has_dvb = 1,
...@@ -2966,7 +2966,7 @@ struct tvcard bttv_tvcards[] = { ...@@ -2966,7 +2966,7 @@ struct tvcard bttv_tvcards[] = {
[BTTV_BOARD_DVICO_FUSIONHDTV_2] = { [BTTV_BOARD_DVICO_FUSIONHDTV_2] = {
.name = "DViCO FusionHDTV 2", .name = "DViCO FusionHDTV 2",
.tuner = 0, .tuner = 0,
.tuner_type = TUNER_PHILIPS_ATSC, /* FCV1236D */ .tuner_type = TUNER_PHILIPS_FCV1236D,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET, .radio_addr = ADDR_UNSET,
.video_inputs = 3, .video_inputs = 3,
......
...@@ -331,7 +331,7 @@ struct em28xx_board em28xx_boards[] = { ...@@ -331,7 +331,7 @@ struct em28xx_board em28xx_boards[] = {
.name = "Kworld USB2800", .name = "Kworld USB2800",
.is_em2800 = 1, .is_em2800 = 1,
.vchannels = 3, .vchannels = 3,
.tuner_type = TUNER_PHILIPS_ATSC, .tuner_type = TUNER_PHILIPS_FCV1236D,
.tda9887_conf = TDA9887_PRESENT, .tda9887_conf = TDA9887_PRESENT,
.decoder = EM28XX_SAA7113, .decoder = EM28XX_SAA7113,
.input = { { .input = { {
......
...@@ -185,7 +185,7 @@ static const struct pvr2_device_desc pvr2_device_onair_usb2 = { ...@@ -185,7 +185,7 @@ static const struct pvr2_device_desc pvr2_device_onair_usb2 = {
.shortname = "oa2", .shortname = "oa2",
.client_modules.lst = pvr2_client_onair_usb2, .client_modules.lst = pvr2_client_onair_usb2,
.client_modules.cnt = ARRAY_SIZE(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_analogtuner = !0,
.flag_has_composite = !0, .flag_has_composite = !0,
.flag_has_svideo = !0, .flag_has_svideo = !0,
......
...@@ -3333,7 +3333,7 @@ struct saa7134_board saa7134_boards[] = { ...@@ -3333,7 +3333,7 @@ struct saa7134_board saa7134_boards[] = {
/* Juan Pablo Sormani <sorman@gmail.com> */ /* Juan Pablo Sormani <sorman@gmail.com> */
.name = "Encore ENLTV-FM", .name = "Encore ENLTV-FM",
.audio_clock = 0x00200000, .audio_clock = 0x00200000,
.tuner_type = TUNER_PHILIPS_ATSC, .tuner_type = TUNER_PHILIPS_FCV1236D,
.radio_type = UNSET, .radio_type = UNSET,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET, .radio_addr = ADDR_UNSET,
......
...@@ -284,7 +284,7 @@ static void simple_set_rf_input(struct dvb_frontend *fe, ...@@ -284,7 +284,7 @@ static void simple_set_rf_input(struct dvb_frontend *fe,
break; break;
} }
break; break;
case TUNER_PHILIPS_ATSC: case TUNER_PHILIPS_FCV1236D:
switch (rf) { switch (rf) {
case 1: case 1:
*cb |= 0x01; *cb |= 0x01;
...@@ -356,7 +356,7 @@ static int simple_std_setup(struct dvb_frontend *fe, ...@@ -356,7 +356,7 @@ static int simple_std_setup(struct dvb_frontend *fe,
} }
break; break;
case TUNER_PHILIPS_ATSC: case TUNER_PHILIPS_FCV1236D:
/* 0x00 -> ATSC antenna input 1 */ /* 0x00 -> ATSC antenna input 1 */
/* 0x01 -> ATSC antenna input 2 */ /* 0x01 -> ATSC antenna input 2 */
/* 0x02 -> NTSC antenna input 1 */ /* 0x02 -> NTSC antenna input 1 */
...@@ -766,7 +766,7 @@ static void simple_set_dvb(struct dvb_frontend *fe, u8 *buf, ...@@ -766,7 +766,7 @@ static void simple_set_dvb(struct dvb_frontend *fe, u8 *buf,
buf[3] |= 1 << 3; buf[3] |= 1 << 3;
break; break;
case TUNER_PHILIPS_TUV1236D: case TUNER_PHILIPS_TUV1236D:
case TUNER_PHILIPS_ATSC: case TUNER_PHILIPS_FCV1236D:
{ {
unsigned int new_rf; unsigned int new_rf;
......
...@@ -615,7 +615,7 @@ static struct tuner_params tuner_philips_pal_mk_params[] = { ...@@ -615,7 +615,7 @@ static struct tuner_params tuner_philips_pal_mk_params[] = {
}, },
}; };
/* ---- TUNER_PHILIPS_ATSC - Philips FCV1236D (ATSC/NTSC) ---- */ /* ---- TUNER_PHILIPS_FCV1236D - Philips FCV1236D (ATSC/NTSC) ---- */
static struct tuner_range tuner_philips_fcv1236d_ntsc_ranges[] = { static struct tuner_range tuner_philips_fcv1236d_ntsc_ranges[] = {
{ 16 * 157.25 /*MHz*/, 0x8e, 0xa2, }, { 16 * 157.25 /*MHz*/, 0x8e, 0xa2, },
...@@ -1434,7 +1434,7 @@ struct tunertype tuners[] = { ...@@ -1434,7 +1434,7 @@ struct tunertype tuners[] = {
.params = tuner_philips_pal_mk_params, .params = tuner_philips_pal_mk_params,
.count = ARRAY_SIZE(tuner_philips_pal_mk_params), .count = ARRAY_SIZE(tuner_philips_pal_mk_params),
}, },
[TUNER_PHILIPS_ATSC] = { /* Philips ATSC */ [TUNER_PHILIPS_FCV1236D] = { /* Philips ATSC */
.name = "Philips FCV1236D ATSC/NTSC dual in", .name = "Philips FCV1236D ATSC/NTSC dual in",
.params = tuner_philips_fcv1236d_params, .params = tuner_philips_fcv1236d_params,
.count = ARRAY_SIZE(tuner_philips_fcv1236d_params), .count = ARRAY_SIZE(tuner_philips_fcv1236d_params),
......
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
#define TUNER_HITACHI_NTSC 40 #define TUNER_HITACHI_NTSC 40
#define TUNER_PHILIPS_PAL_MK 41 #define TUNER_PHILIPS_PAL_MK 41
#define TUNER_PHILIPS_ATSC 42 #define TUNER_PHILIPS_FCV1236D 42
#define TUNER_PHILIPS_FM1236_MK3 43 #define TUNER_PHILIPS_FM1236_MK3 43
#define TUNER_PHILIPS_4IN1 44 /* ATI TV Wonder Pro - Conexant */ #define TUNER_PHILIPS_4IN1 44 /* ATI TV Wonder Pro - Conexant */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment