Commit ab8b870e430d3e2cfb299f81e0ae0aef7fe5bfda
Committed by
Mauro Carvalho Chehab
Mauro Carvalho Chehab
1 parent
e827931e37
Exists in
master
and in
7 other branches
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: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Showing 7 changed files with 11 additions and 11 deletions Side-by-side Diff
drivers/media/video/bt8xx/bttv-cards.c
| ... | ... | @@ -2327,7 +2327,7 @@ |
| 2327 | 2327 | .tuner = 0, |
| 2328 | 2328 | .svhs = 2, |
| 2329 | 2329 | .muxsel = { 2, 3, 1, 0 }, |
| 2330 | - .tuner_type = TUNER_PHILIPS_ATSC, | |
| 2330 | + .tuner_type = TUNER_PHILIPS_FCV1236D, | |
| 2331 | 2331 | .tuner_addr = ADDR_UNSET, |
| 2332 | 2332 | .radio_addr = ADDR_UNSET, |
| 2333 | 2333 | .has_dvb = 1, |
| ... | ... | @@ -2966,7 +2966,7 @@ |
| 2966 | 2966 | [BTTV_BOARD_DVICO_FUSIONHDTV_2] = { |
| 2967 | 2967 | .name = "DViCO FusionHDTV 2", |
| 2968 | 2968 | .tuner = 0, |
| 2969 | - .tuner_type = TUNER_PHILIPS_ATSC, /* FCV1236D */ | |
| 2969 | + .tuner_type = TUNER_PHILIPS_FCV1236D, | |
| 2970 | 2970 | .tuner_addr = ADDR_UNSET, |
| 2971 | 2971 | .radio_addr = ADDR_UNSET, |
| 2972 | 2972 | .video_inputs = 3, |
drivers/media/video/em28xx/em28xx-cards.c
drivers/media/video/pvrusb2/pvrusb2-devattr.c
| ... | ... | @@ -185,7 +185,7 @@ |
| 185 | 185 | .shortname = "oa2", |
| 186 | 186 | .client_modules.lst = pvr2_client_onair_usb2, |
| 187 | 187 | .client_modules.cnt = ARRAY_SIZE(pvr2_client_onair_usb2), |
| 188 | - .default_tuner_type = TUNER_PHILIPS_ATSC, | |
| 188 | + .default_tuner_type = TUNER_PHILIPS_FCV1236D, | |
| 189 | 189 | .flag_has_analogtuner = !0, |
| 190 | 190 | .flag_has_composite = !0, |
| 191 | 191 | .flag_has_svideo = !0, |
drivers/media/video/saa7134/saa7134-cards.c
| ... | ... | @@ -3333,7 +3333,7 @@ |
| 3333 | 3333 | /* Juan Pablo Sormani <sorman@gmail.com> */ |
| 3334 | 3334 | .name = "Encore ENLTV-FM", |
| 3335 | 3335 | .audio_clock = 0x00200000, |
| 3336 | - .tuner_type = TUNER_PHILIPS_ATSC, | |
| 3336 | + .tuner_type = TUNER_PHILIPS_FCV1236D, | |
| 3337 | 3337 | .radio_type = UNSET, |
| 3338 | 3338 | .tuner_addr = ADDR_UNSET, |
| 3339 | 3339 | .radio_addr = ADDR_UNSET, |
drivers/media/video/tuner-simple.c
| ... | ... | @@ -284,7 +284,7 @@ |
| 284 | 284 | break; |
| 285 | 285 | } |
| 286 | 286 | break; |
| 287 | - case TUNER_PHILIPS_ATSC: | |
| 287 | + case TUNER_PHILIPS_FCV1236D: | |
| 288 | 288 | switch (rf) { |
| 289 | 289 | case 1: |
| 290 | 290 | *cb |= 0x01; |
| ... | ... | @@ -356,7 +356,7 @@ |
| 356 | 356 | } |
| 357 | 357 | break; |
| 358 | 358 | |
| 359 | - case TUNER_PHILIPS_ATSC: | |
| 359 | + case TUNER_PHILIPS_FCV1236D: | |
| 360 | 360 | /* 0x00 -> ATSC antenna input 1 */ |
| 361 | 361 | /* 0x01 -> ATSC antenna input 2 */ |
| 362 | 362 | /* 0x02 -> NTSC antenna input 1 */ |
| ... | ... | @@ -766,7 +766,7 @@ |
| 766 | 766 | buf[3] |= 1 << 3; |
| 767 | 767 | break; |
| 768 | 768 | case TUNER_PHILIPS_TUV1236D: |
| 769 | - case TUNER_PHILIPS_ATSC: | |
| 769 | + case TUNER_PHILIPS_FCV1236D: | |
| 770 | 770 | { |
| 771 | 771 | unsigned int new_rf; |
| 772 | 772 |
drivers/media/video/tuner-types.c
| ... | ... | @@ -615,7 +615,7 @@ |
| 615 | 615 | }, |
| 616 | 616 | }; |
| 617 | 617 | |
| 618 | -/* ---- TUNER_PHILIPS_ATSC - Philips FCV1236D (ATSC/NTSC) ---- */ | |
| 618 | +/* ---- TUNER_PHILIPS_FCV1236D - Philips FCV1236D (ATSC/NTSC) ---- */ | |
| 619 | 619 | |
| 620 | 620 | static struct tuner_range tuner_philips_fcv1236d_ntsc_ranges[] = { |
| 621 | 621 | { 16 * 157.25 /*MHz*/, 0x8e, 0xa2, }, |
| ... | ... | @@ -1434,7 +1434,7 @@ |
| 1434 | 1434 | .params = tuner_philips_pal_mk_params, |
| 1435 | 1435 | .count = ARRAY_SIZE(tuner_philips_pal_mk_params), |
| 1436 | 1436 | }, |
| 1437 | - [TUNER_PHILIPS_ATSC] = { /* Philips ATSC */ | |
| 1437 | + [TUNER_PHILIPS_FCV1236D] = { /* Philips ATSC */ | |
| 1438 | 1438 | .name = "Philips FCV1236D ATSC/NTSC dual in", |
| 1439 | 1439 | .params = tuner_philips_fcv1236d_params, |
| 1440 | 1440 | .count = ARRAY_SIZE(tuner_philips_fcv1236d_params), |
include/media/tuner.h