summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/tlg2300/pd-main.c
diff options
context:
space:
mode:
authorHuang Shijie <shijie8@gmail.com>2010-02-11 03:53:51 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-02-26 15:10:58 -0300
commit007ad830364e795316d2825f1ab68b3a53a3d56c (patch)
treecdb6ac4326a4dedda0ef95bcc4c8e4ad8fcd6047 /drivers/media/video/tlg2300/pd-main.c
parent5b3f03f044ad6dffc8cd8c9c50bc5d7769cbd89f (diff)
downloadop-kernel-dev-007ad830364e795316d2825f1ab68b3a53a3d56c.zip
op-kernel-dev-007ad830364e795316d2825f1ab68b3a53a3d56c.tar.gz
V4L/DVB: tlg2300: remove the country code for analog tv and radio
video : use the V4L2_STD macros to select the proper audio setting. radio : add preemphasis ctr. test it by the command: v4l2-ctl -d /dev/radio0 --set-ctrl=pre_emphasis_settings=1 [mchehab@redhat.com: folded documentation patch] Signed-off-by: Huang Shijie <shijie8@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/tlg2300/pd-main.c')
-rw-r--r--drivers/media/video/tlg2300/pd-main.c36
1 files changed, 0 insertions, 36 deletions
diff --git a/drivers/media/video/tlg2300/pd-main.c b/drivers/media/video/tlg2300/pd-main.c
index 6df9380..fdcc500 100644
--- a/drivers/media/video/tlg2300/pd-main.c
+++ b/drivers/media/video/tlg2300/pd-main.c
@@ -189,41 +189,6 @@ int set_tuner_mode(struct poseidon *pd, unsigned char mode)
return 0;
}
-enum tlg__analog_audio_standard get_audio_std(s32 mode, s32 country_code)
-{
- s32 nicam[] = {27, 32, 33, 34, 36, 44, 45, 46, 47, 48, 64,
- 65, 86, 351, 352, 353, 354, 358, 372, 852, 972};
- s32 btsc[] = {1, 52, 54, 55, 886};
- s32 eiaj[] = {81};
- s32 i;
-
- if (mode == TLG_MODE_FM_RADIO) {
- if (country_code == 1)
- return TLG_TUNE_ASTD_FM_US;
- else
- return TLG_TUNE_ASTD_FM_EUR;
- } else if (mode == TLG_MODE_ANALOG_TV_UNCOMP) {
- for (i = 0; i < sizeof(nicam) / sizeof(s32); i++) {
- if (country_code == nicam[i])
- return TLG_TUNE_ASTD_NICAM;
- }
-
- for (i = 0; i < sizeof(btsc) / sizeof(s32); i++) {
- if (country_code == btsc[i])
- return TLG_TUNE_ASTD_BTSC;
- }
-
- for (i = 0; i < sizeof(eiaj) / sizeof(s32); i++) {
- if (country_code == eiaj[i])
- return TLG_TUNE_ASTD_EIAJ;
- }
-
- return TLG_TUNE_ASTD_A2;
- } else {
- return TLG_TUNE_ASTD_NONE;
- }
-}
-
void poseidon_delete(struct kref *kref)
{
struct poseidon *pd = container_of(kref, struct poseidon, kref);
@@ -462,7 +427,6 @@ static int poseidon_probe(struct usb_interface *interface,
struct device *dev = &interface->dev;
logpm(pd);
- pd->country_code = 86;
mutex_init(&pd->lock);
/* register v4l2 device */
OpenPOWER on IntegriCloud