From 9a4c4bb7abbb9174990491388b3b5b963a8e824e Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Fri, 26 Oct 2007 17:54:54 -0200 Subject: Audio hooks moved to another file From: Mauro Carvalho Chehab Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/video/bt8xx/Makefile | 2 linux/drivers/media/video/bt8xx/bttv-audio-hook.c | 390 +++++++++++++++++++++ linux/drivers/media/video/bt8xx/bttv-audio-hook.h | 23 + linux/drivers/media/video/bt8xx/bttv-cards.c | 399 ---------------------- linux/drivers/media/video/bt8xx/bttv.h | 2 linux/drivers/media/video/bt8xx/bttvp.h | 3 6 files changed, 420 insertions(+), 399 deletions(-) --- linux/drivers/media/video/bt8xx/bttv-audio-hook.c | 390 ++++++++++++++++++++++ 1 file changed, 390 insertions(+) create mode 100644 linux/drivers/media/video/bt8xx/bttv-audio-hook.c (limited to 'linux/drivers/media/video/bt8xx/bttv-audio-hook.c') diff --git a/linux/drivers/media/video/bt8xx/bttv-audio-hook.c b/linux/drivers/media/video/bt8xx/bttv-audio-hook.c new file mode 100644 index 000000000..1e7fcaa25 --- /dev/null +++ b/linux/drivers/media/video/bt8xx/bttv-audio-hook.c @@ -0,0 +1,390 @@ +/* + * Handlers for board audio hooks, splitted from bttv-cards + * + * Copyright (c) 2006 Mauro Carvalho Chehab (mchehab@infradead.org) + * This code is placed under the terms of the GNU General Public License + */ + +/* ----------------------------------------------------------------------- */ +/* winview */ + +#include "bttvp.h" +#include + +static void winview_audio(struct bttv *btv, struct video_audio *v, int set) +{ + /* PT2254A programming Jon Tombs, jon@gte.esi.us.es */ + int bits_out, loops, vol, data; + + if (!set) { + /* Fixed by Leandro Lucarella flags |= VIDEO_AUDIO_VOLUME; + return; + } + + /* 32 levels logarithmic */ + vol = 32 - ((v->volume>>11)); + /* units */ + bits_out = (PT2254_DBS_IN_2>>(vol%5)); + /* tens */ + bits_out |= (PT2254_DBS_IN_10>>(vol/5)); + bits_out |= PT2254_L_CHANNEL | PT2254_R_CHANNEL; + data = gpio_read(); + data &= ~(WINVIEW_PT2254_CLK| WINVIEW_PT2254_DATA| + WINVIEW_PT2254_STROBE); + for (loops = 17; loops >= 0 ; loops--) { + if (bits_out & (1<mode & VIDEO_SOUND_LANG1) + con = 0x000; + if (v->mode & VIDEO_SOUND_LANG2) + con = 0x300; + if (v->mode & VIDEO_SOUND_STEREO) + con = 0x200; +/* if (v->mode & VIDEO_SOUND_MONO) + * con = 0x100; */ + gpio_bits(0x300, con); + } else { + v->mode = VIDEO_SOUND_STEREO | + VIDEO_SOUND_LANG1 | VIDEO_SOUND_LANG2; + } +} + +static void +gvbctv5pci_audio(struct bttv *btv, struct video_audio *v, int set) +{ + unsigned int val, con; + + if (btv->radio_user) + return; + + val = gpio_read(); + if (set) { + con = 0x000; + if (v->mode & VIDEO_SOUND_LANG2) { + if (v->mode & VIDEO_SOUND_LANG1) { + /* LANG1 + LANG2 */ + con = 0x100; + } + else { + /* LANG2 */ + con = 0x300; + } + } + if (con != (val & 0x300)) { + gpio_bits(0x300, con); + if (bttv_gpio) + bttv_gpio_tracking(btv,"gvbctv5pci"); + } + } else { + switch (val & 0x70) { + case 0x10: + v->mode = VIDEO_SOUND_LANG1 | VIDEO_SOUND_LANG2; + break; + case 0x30: + v->mode = VIDEO_SOUND_LANG2; + break; + case 0x50: + v->mode = VIDEO_SOUND_LANG1; + break; + case 0x60: + v->mode = VIDEO_SOUND_STEREO; + break; + case 0x70: + v->mode = VIDEO_SOUND_MONO; + break; + default: + v->mode = VIDEO_SOUND_MONO | VIDEO_SOUND_STEREO | + VIDEO_SOUND_LANG1 | VIDEO_SOUND_LANG2; + } + } +} + +/* + * Mario Medina Nussbaum + * I discover that on BT848_GPIO_DATA address a byte 0xcce enable stereo, + * 0xdde enables mono and 0xccd enables sap + * + * Petr Vandrovec + * P.S.: At least mask in line above is wrong - GPIO pins 3,2 select + * input/output sound connection, so both must be set for output mode. + * + * Looks like it's needed only for the "tvphone", the "tvphone 98" + * handles this with a tda9840 + * + */ +static void +avermedia_tvphone_audio(struct bttv *btv, struct video_audio *v, int set) +{ + int val = 0; + + if (set) { + if (v->mode & VIDEO_SOUND_LANG2) /* SAP */ + val = 0x02; + if (v->mode & VIDEO_SOUND_STEREO) + val = 0x01; + if (val) { + gpio_bits(0x03,val); + if (bttv_gpio) + bttv_gpio_tracking(btv,"avermedia"); + } + } else { + v->mode = VIDEO_SOUND_MONO | VIDEO_SOUND_STEREO | + VIDEO_SOUND_LANG1; + return; + } +} + +static void +avermedia_tv_stereo_audio(struct bttv *btv, struct video_audio *v, int set) +{ + int val = 0; + + if (set) { + if (v->mode & VIDEO_SOUND_LANG2) /* SAP */ + val = 0x01; + if (v->mode & VIDEO_SOUND_STEREO) /* STEREO */ + val = 0x02; + btaor(val, ~0x03, BT848_GPIO_DATA); + if (bttv_gpio) + bttv_gpio_tracking(btv,"avermedia"); + } else { + v->mode = VIDEO_SOUND_MONO | VIDEO_SOUND_STEREO | + VIDEO_SOUND_LANG1 | VIDEO_SOUND_LANG2; + return; + } +} + +/* Lifetec 9415 handling */ +static void +lt9415_audio(struct bttv *btv, struct video_audio *v, int set) +{ + int val = 0; + + if (gpio_read() & 0x4000) { + v->mode = VIDEO_SOUND_MONO; + return; + } + + if (set) { + if (v->mode & VIDEO_SOUND_LANG2) /* A2 SAP */ + val = 0x0080; + if (v->mode & VIDEO_SOUND_STEREO) /* A2 stereo */ + val = 0x0880; + if ((v->mode & VIDEO_SOUND_LANG1) || + (v->mode & VIDEO_SOUND_MONO)) + val = 0; + gpio_bits(0x0880, val); + if (bttv_gpio) + bttv_gpio_tracking(btv,"lt9415"); + } else { + /* autodetect doesn't work with this card :-( */ + v->mode = VIDEO_SOUND_MONO | VIDEO_SOUND_STEREO | + VIDEO_SOUND_LANG1 | VIDEO_SOUND_LANG2; + return; + } +} + +/* TDA9821 on TerraTV+ Bt848, Bt878 */ +static void +terratv_audio(struct bttv *btv, struct video_audio *v, int set) +{ + unsigned int con = 0; + + if (set) { + gpio_inout(0x180000,0x180000); + if (v->mode & VIDEO_SOUND_LANG2) + con = 0x080000; + if (v->mode & VIDEO_SOUND_STEREO) + con = 0x180000; + gpio_bits(0x180000, con); + if (bttv_gpio) + bttv_gpio_tracking(btv,"terratv"); + } else { + v->mode = VIDEO_SOUND_MONO | VIDEO_SOUND_STEREO | + VIDEO_SOUND_LANG1 | VIDEO_SOUND_LANG2; + } +} + +static void +winfast2000_audio(struct bttv *btv, struct video_audio *v, int set) +{ + unsigned long val = 0; + + if (set) { + /*btor (0xc32000, BT848_GPIO_OUT_EN);*/ + if (v->mode & VIDEO_SOUND_MONO) /* Mono */ + val = 0x420000; + if (v->mode & VIDEO_SOUND_LANG1) /* Mono */ + val = 0x420000; + if (v->mode & VIDEO_SOUND_LANG2) /* SAP */ + val = 0x410000; + if (v->mode & VIDEO_SOUND_STEREO) /* Stereo */ + val = 0x020000; + if (val) { + gpio_bits(0x430000, val); + if (bttv_gpio) + bttv_gpio_tracking(btv,"winfast2000"); + } + } else { + v->mode = VIDEO_SOUND_MONO | VIDEO_SOUND_STEREO | + VIDEO_SOUND_LANG1 | VIDEO_SOUND_LANG2; + } +} + +/* + * Dariusz Kowalewski + * sound control for Prolink PV-BT878P+9B (PixelView PlayTV Pro FM+NICAM + * revision 9B has on-board TDA9874A sound decoder). + * + * Note: There are card variants without tda9874a. Forcing the "stereo sound route" + * will mute this cards. + */ +static void +pvbt878p9b_audio(struct bttv *btv, struct video_audio *v, int set) +{ + unsigned int val = 0; + + if (btv->radio_user) + return; + + if (set) { + if (v->mode & VIDEO_SOUND_MONO) { + val = 0x01; + } + if ((v->mode & (VIDEO_SOUND_LANG1 | VIDEO_SOUND_LANG2)) + || (v->mode & VIDEO_SOUND_STEREO)) { + val = 0x02; + } + if (val) { + gpio_bits(0x03,val); + if (bttv_gpio) + bttv_gpio_tracking(btv,"pvbt878p9b"); + } + } else { + v->mode = VIDEO_SOUND_MONO | VIDEO_SOUND_STEREO | + VIDEO_SOUND_LANG1 | VIDEO_SOUND_LANG2; + } +} + +/* + * Dariusz Kowalewski + * sound control for FlyVideo 2000S (with tda9874 decoder) + * based on pvbt878p9b_audio() - this is not tested, please fix!!! + */ +static void +fv2000s_audio(struct bttv *btv, struct video_audio *v, int set) +{ + unsigned int val = 0xffff; + + if (btv->radio_user) + return; + + if (set) { + if (v->mode & VIDEO_SOUND_MONO) { + val = 0x0000; + } + if ((v->mode & (VIDEO_SOUND_LANG1 | VIDEO_SOUND_LANG2)) + || (v->mode & VIDEO_SOUND_STEREO)) { + val = 0x1080; /*-dk-???: 0x0880, 0x0080, 0x1800 ... */ + } + if (val != 0xffff) { + gpio_bits(0x1800, val); + if (bttv_gpio) + bttv_gpio_tracking(btv,"fv2000s"); + } + } else { + v->mode = VIDEO_SOUND_MONO | VIDEO_SOUND_STEREO | + VIDEO_SOUND_LANG1 | VIDEO_SOUND_LANG2; + } +} + +/* + * sound control for Canopus WinDVR PCI + * Masaki Suzuki + */ +static void +windvr_audio(struct bttv *btv, struct video_audio *v, int set) +{ + unsigned long val = 0; + + if (set) { + if (v->mode & VIDEO_SOUND_MONO) + val = 0x040000; + if (v->mode & VIDEO_SOUND_LANG1) + val = 0; + if (v->mode & VIDEO_SOUND_LANG2) + val = 0x100000; + if (v->mode & VIDEO_SOUND_STEREO) + val = 0; + if (val) { + gpio_bits(0x140000, val); + if (bttv_gpio) + bttv_gpio_tracking(btv,"windvr"); + } + } else { + v->mode = VIDEO_SOUND_MONO | VIDEO_SOUND_STEREO | + VIDEO_SOUND_LANG1 | VIDEO_SOUND_LANG2; + } +} + +/* + * sound control for AD-TVK503 + * Hiroshi Takekawa + */ +static void +adtvk503_audio(struct bttv *btv, struct video_audio *v, int set) +{ + unsigned int con = 0xffffff; + + /* btaor(0x1e0000, ~0x1e0000, BT848_GPIO_OUT_EN); */ + + if (set) { + /* btor(***, BT848_GPIO_OUT_EN); */ + if (v->mode & VIDEO_SOUND_LANG1) + con = 0x00000000; + if (v->mode & VIDEO_SOUND_LANG2) + con = 0x00180000; + if (v->mode & VIDEO_SOUND_STEREO) + con = 0x00000000; + if (v->mode & VIDEO_SOUND_MONO) + con = 0x00060000; + if (con != 0xffffff) { + gpio_bits(0x1e0000,con); + if (bttv_gpio) + bttv_gpio_tracking(btv, "adtvk503"); + } + } else { + v->mode = VIDEO_SOUND_MONO | VIDEO_SOUND_STEREO | + VIDEO_SOUND_LANG1 | VIDEO_SOUND_LANG2; + } +} -- cgit v1.2.3 From fc1f956eca9a6e77bd988271fe023dd49ea12d34 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Fri, 26 Oct 2007 18:21:30 -0200 Subject: Restructurize volume hook and drop unused mute hook. From: Nickolay V. Shmyrev Signed-off-by: Nickolay V. Shmyrev Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/video/bt8xx/bttv-audio-hook.c | 29 +++++++++----------- linux/drivers/media/video/bt8xx/bttv-driver.c | 31 ++-------------------- 2 files changed, 17 insertions(+), 43 deletions(-) --- linux/drivers/media/video/bt8xx/bttv-audio-hook.c | 29 +++++++++++------------ 1 file changed, 14 insertions(+), 15 deletions(-) (limited to 'linux/drivers/media/video/bt8xx/bttv-audio-hook.c') diff --git a/linux/drivers/media/video/bt8xx/bttv-audio-hook.c b/linux/drivers/media/video/bt8xx/bttv-audio-hook.c index 1e7fcaa25..1f25cdbed 100644 --- a/linux/drivers/media/video/bt8xx/bttv-audio-hook.c +++ b/linux/drivers/media/video/bt8xx/bttv-audio-hook.c @@ -5,13 +5,12 @@ * This code is placed under the terms of the GNU General Public License */ +#include "bttv-audio-hook.h" + /* ----------------------------------------------------------------------- */ /* winview */ -#include "bttvp.h" -#include - -static void winview_audio(struct bttv *btv, struct video_audio *v, int set) + void winview_audio(struct bttv *btv, struct video_audio *v, int set) { /* PT2254A programming Jon Tombs, jon@gte.esi.us.es */ int bits_out, loops, vol, data; @@ -57,7 +56,7 @@ static void winview_audio(struct bttv *btv, struct video_audio *v, int set) /* mono/stereo control for various cards (which don't use i2c chips but */ /* connect something to the GPIO pins */ -static void + void gvbctv3pci_audio(struct bttv *btv, struct video_audio *v, int set) { unsigned int con = 0; @@ -79,7 +78,7 @@ gvbctv3pci_audio(struct bttv *btv, struct video_audio *v, int set) } } -static void + void gvbctv5pci_audio(struct bttv *btv, struct video_audio *v, int set) { unsigned int val, con; @@ -142,7 +141,7 @@ gvbctv5pci_audio(struct bttv *btv, struct video_audio *v, int set) * handles this with a tda9840 * */ -static void + void avermedia_tvphone_audio(struct bttv *btv, struct video_audio *v, int set) { int val = 0; @@ -164,7 +163,7 @@ avermedia_tvphone_audio(struct bttv *btv, struct video_audio *v, int set) } } -static void + void avermedia_tv_stereo_audio(struct bttv *btv, struct video_audio *v, int set) { int val = 0; @@ -185,7 +184,7 @@ avermedia_tv_stereo_audio(struct bttv *btv, struct video_audio *v, int set) } /* Lifetec 9415 handling */ -static void + void lt9415_audio(struct bttv *btv, struct video_audio *v, int set) { int val = 0; @@ -215,7 +214,7 @@ lt9415_audio(struct bttv *btv, struct video_audio *v, int set) } /* TDA9821 on TerraTV+ Bt848, Bt878 */ -static void + void terratv_audio(struct bttv *btv, struct video_audio *v, int set) { unsigned int con = 0; @@ -235,7 +234,7 @@ terratv_audio(struct bttv *btv, struct video_audio *v, int set) } } -static void + void winfast2000_audio(struct bttv *btv, struct video_audio *v, int set) { unsigned long val = 0; @@ -269,7 +268,7 @@ winfast2000_audio(struct bttv *btv, struct video_audio *v, int set) * Note: There are card variants without tda9874a. Forcing the "stereo sound route" * will mute this cards. */ -static void + void pvbt878p9b_audio(struct bttv *btv, struct video_audio *v, int set) { unsigned int val = 0; @@ -301,7 +300,7 @@ pvbt878p9b_audio(struct bttv *btv, struct video_audio *v, int set) * sound control for FlyVideo 2000S (with tda9874 decoder) * based on pvbt878p9b_audio() - this is not tested, please fix!!! */ -static void + void fv2000s_audio(struct bttv *btv, struct video_audio *v, int set) { unsigned int val = 0xffff; @@ -332,7 +331,7 @@ fv2000s_audio(struct bttv *btv, struct video_audio *v, int set) * sound control for Canopus WinDVR PCI * Masaki Suzuki */ -static void + void windvr_audio(struct bttv *btv, struct video_audio *v, int set) { unsigned long val = 0; @@ -361,7 +360,7 @@ windvr_audio(struct bttv *btv, struct video_audio *v, int set) * sound control for AD-TVK503 * Hiroshi Takekawa */ -static void + void adtvk503_audio(struct bttv *btv, struct video_audio *v, int set) { unsigned int con = 0xffffff; -- cgit v1.2.3 From ba37c220adc7b3dac0ec2ff292d53afd9316a9ce Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Fri, 25 Aug 2006 16:53:04 -0300 Subject: Split hooks on volume and audio mode and rework their handling Also convert audio_mode_gpio functions from audio_hook From: Nickolay V. Shmyrev Signed-off-by: Nickolay V. Shmyrev Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/video/bt8xx/bttv-audio-hook.c | 173 ++++++++++------------ linux/drivers/media/video/bt8xx/bttv-audio-hook.h | 28 +-- linux/drivers/media/video/bt8xx/bttv-cards.c | 38 ++-- linux/drivers/media/video/bt8xx/bttv-driver.c | 97 ++---------- linux/drivers/media/video/bt8xx/bttv.h | 7 linux/drivers/media/video/bt8xx/bttvp.h | 7 6 files changed, 144 insertions(+), 206 deletions(-) --- linux/drivers/media/video/bt8xx/bttv-audio-hook.c | 173 ++++++++++------------ 1 file changed, 81 insertions(+), 92 deletions(-) (limited to 'linux/drivers/media/video/bt8xx/bttv-audio-hook.c') diff --git a/linux/drivers/media/video/bt8xx/bttv-audio-hook.c b/linux/drivers/media/video/bt8xx/bttv-audio-hook.c index 1f25cdbed..a075198f8 100644 --- a/linux/drivers/media/video/bt8xx/bttv-audio-hook.c +++ b/linux/drivers/media/video/bt8xx/bttv-audio-hook.c @@ -7,22 +7,18 @@ #include "bttv-audio-hook.h" +#include + /* ----------------------------------------------------------------------- */ /* winview */ - void winview_audio(struct bttv *btv, struct video_audio *v, int set) +void winview_volume(struct bttv *btv, __u16 volume) { /* PT2254A programming Jon Tombs, jon@gte.esi.us.es */ int bits_out, loops, vol, data; - if (!set) { - /* Fixed by Leandro Lucarella flags |= VIDEO_AUDIO_VOLUME; - return; - } - /* 32 levels logarithmic */ - vol = 32 - ((v->volume>>11)); + vol = 32 - ((volume>>11)); /* units */ bits_out = (PT2254_DBS_IN_2>>(vol%5)); /* tens */ @@ -56,30 +52,28 @@ /* mono/stereo control for various cards (which don't use i2c chips but */ /* connect something to the GPIO pins */ - void -gvbctv3pci_audio(struct bttv *btv, struct video_audio *v, int set) +void gvbctv3pci_audio(struct bttv *btv, struct v4l2_tuner *t, int set) { unsigned int con = 0; if (set) { gpio_inout(0x300, 0x300); - if (v->mode & VIDEO_SOUND_LANG1) + if (t->audmode & V4L2_TUNER_MODE_LANG1) con = 0x000; - if (v->mode & VIDEO_SOUND_LANG2) + if (t->audmode & V4L2_TUNER_MODE_LANG2) con = 0x300; - if (v->mode & VIDEO_SOUND_STEREO) + if (t->audmode & V4L2_TUNER_MODE_STEREO) con = 0x200; -/* if (v->mode & VIDEO_SOUND_MONO) +/* if (t->audmode & V4L2_TUNER_MODE_MONO) * con = 0x100; */ gpio_bits(0x300, con); } else { - v->mode = VIDEO_SOUND_STEREO | - VIDEO_SOUND_LANG1 | VIDEO_SOUND_LANG2; + t->audmode = V4L2_TUNER_MODE_STEREO | + V4L2_TUNER_MODE_LANG1 | V4L2_TUNER_MODE_LANG2; } } - void -gvbctv5pci_audio(struct bttv *btv, struct video_audio *v, int set) +void gvbctv5pci_audio(struct bttv *btv, struct v4l2_tuner *t, int set) { unsigned int val, con; @@ -89,8 +83,8 @@ gvbctv5pci_audio(struct bttv *btv, struct video_audio *v, int set) val = gpio_read(); if (set) { con = 0x000; - if (v->mode & VIDEO_SOUND_LANG2) { - if (v->mode & VIDEO_SOUND_LANG1) { + if (t->audmode & V4L2_TUNER_MODE_LANG2) { + if (t->audmode & V4L2_TUNER_MODE_LANG1) { /* LANG1 + LANG2 */ con = 0x100; } @@ -107,23 +101,23 @@ gvbctv5pci_audio(struct bttv *btv, struct video_audio *v, int set) } else { switch (val & 0x70) { case 0x10: - v->mode = VIDEO_SOUND_LANG1 | VIDEO_SOUND_LANG2; + t->audmode = V4L2_TUNER_MODE_LANG1 | V4L2_TUNER_MODE_LANG2; break; case 0x30: - v->mode = VIDEO_SOUND_LANG2; + t->audmode = V4L2_TUNER_MODE_LANG2; break; case 0x50: - v->mode = VIDEO_SOUND_LANG1; + t->audmode = V4L2_TUNER_MODE_LANG1; break; case 0x60: - v->mode = VIDEO_SOUND_STEREO; + t->audmode = V4L2_TUNER_MODE_STEREO; break; case 0x70: - v->mode = VIDEO_SOUND_MONO; + t->audmode = V4L2_TUNER_MODE_MONO; break; default: - v->mode = VIDEO_SOUND_MONO | VIDEO_SOUND_STEREO | - VIDEO_SOUND_LANG1 | VIDEO_SOUND_LANG2; + t->audmode = V4L2_TUNER_MODE_MONO | V4L2_TUNER_MODE_STEREO | + V4L2_TUNER_MODE_LANG1 | V4L2_TUNER_MODE_LANG2; } } } @@ -141,15 +135,15 @@ gvbctv5pci_audio(struct bttv *btv, struct video_audio *v, int set) * handles this with a tda9840 * */ - void -avermedia_tvphone_audio(struct bttv *btv, struct video_audio *v, int set) + +void avermedia_tvphone_audio(struct bttv *btv, struct v4l2_tuner *t, int set) { int val = 0; if (set) { - if (v->mode & VIDEO_SOUND_LANG2) /* SAP */ + if (t->audmode & V4L2_TUNER_MODE_LANG2) /* SAP */ val = 0x02; - if (v->mode & VIDEO_SOUND_STEREO) + if (t->audmode & V4L2_TUNER_MODE_STEREO) val = 0x01; if (val) { gpio_bits(0x03,val); @@ -157,97 +151,96 @@ avermedia_tvphone_audio(struct bttv *btv, struct video_audio *v, int set) bttv_gpio_tracking(btv,"avermedia"); } } else { - v->mode = VIDEO_SOUND_MONO | VIDEO_SOUND_STEREO | - VIDEO_SOUND_LANG1; + t->audmode = V4L2_TUNER_MODE_MONO | V4L2_TUNER_MODE_STEREO | + V4L2_TUNER_MODE_LANG1; return; } } - void -avermedia_tv_stereo_audio(struct bttv *btv, struct video_audio *v, int set) + +void avermedia_tv_stereo_audio(struct bttv *btv, struct v4l2_tuner *t, int set) { int val = 0; if (set) { - if (v->mode & VIDEO_SOUND_LANG2) /* SAP */ + if (t->audmode & V4L2_TUNER_MODE_LANG2) /* SAP */ val = 0x01; - if (v->mode & VIDEO_SOUND_STEREO) /* STEREO */ + if (t->audmode & V4L2_TUNER_MODE_STEREO) /* STEREO */ val = 0x02; btaor(val, ~0x03, BT848_GPIO_DATA); if (bttv_gpio) bttv_gpio_tracking(btv,"avermedia"); } else { - v->mode = VIDEO_SOUND_MONO | VIDEO_SOUND_STEREO | - VIDEO_SOUND_LANG1 | VIDEO_SOUND_LANG2; + t->audmode = V4L2_TUNER_MODE_MONO | V4L2_TUNER_MODE_STEREO | + V4L2_TUNER_MODE_LANG1 | V4L2_TUNER_MODE_LANG2; return; } } /* Lifetec 9415 handling */ - void -lt9415_audio(struct bttv *btv, struct video_audio *v, int set) + +void lt9415_audio(struct bttv *btv, struct v4l2_tuner *t, int set) { int val = 0; if (gpio_read() & 0x4000) { - v->mode = VIDEO_SOUND_MONO; + t->audmode = V4L2_TUNER_MODE_MONO; return; } if (set) { - if (v->mode & VIDEO_SOUND_LANG2) /* A2 SAP */ + if (t->audmode & V4L2_TUNER_MODE_LANG2) /* A2 SAP */ val = 0x0080; - if (v->mode & VIDEO_SOUND_STEREO) /* A2 stereo */ + if (t->audmode & V4L2_TUNER_MODE_STEREO) /* A2 stereo */ val = 0x0880; - if ((v->mode & VIDEO_SOUND_LANG1) || - (v->mode & VIDEO_SOUND_MONO)) + if ((t->audmode & V4L2_TUNER_MODE_LANG1) || + (t->audmode & V4L2_TUNER_MODE_MONO)) val = 0; gpio_bits(0x0880, val); if (bttv_gpio) bttv_gpio_tracking(btv,"lt9415"); } else { /* autodetect doesn't work with this card :-( */ - v->mode = VIDEO_SOUND_MONO | VIDEO_SOUND_STEREO | - VIDEO_SOUND_LANG1 | VIDEO_SOUND_LANG2; + t->audmode = V4L2_TUNER_MODE_MONO | V4L2_TUNER_MODE_STEREO | + V4L2_TUNER_MODE_LANG1 | V4L2_TUNER_MODE_LANG2; return; } } /* TDA9821 on TerraTV+ Bt848, Bt878 */ - void -terratv_audio(struct bttv *btv, struct video_audio *v, int set) +void terratv_audio(struct bttv *btv, struct v4l2_tuner *t, int set) { unsigned int con = 0; if (set) { gpio_inout(0x180000,0x180000); - if (v->mode & VIDEO_SOUND_LANG2) + if (t->audmode & V4L2_TUNER_MODE_LANG2) con = 0x080000; - if (v->mode & VIDEO_SOUND_STEREO) + if (t->audmode & V4L2_TUNER_MODE_STEREO) con = 0x180000; gpio_bits(0x180000, con); if (bttv_gpio) bttv_gpio_tracking(btv,"terratv"); } else { - v->mode = VIDEO_SOUND_MONO | VIDEO_SOUND_STEREO | - VIDEO_SOUND_LANG1 | VIDEO_SOUND_LANG2; + t->audmode = V4L2_TUNER_MODE_MONO | V4L2_TUNER_MODE_STEREO | + V4L2_TUNER_MODE_LANG1 | V4L2_TUNER_MODE_LANG2; } } - void -winfast2000_audio(struct bttv *btv, struct video_audio *v, int set) + +void winfast2000_audio(struct bttv *btv, struct v4l2_tuner *t, int set) { unsigned long val = 0; if (set) { /*btor (0xc32000, BT848_GPIO_OUT_EN);*/ - if (v->mode & VIDEO_SOUND_MONO) /* Mono */ + if (t->audmode & V4L2_TUNER_MODE_MONO) /* Mono */ val = 0x420000; - if (v->mode & VIDEO_SOUND_LANG1) /* Mono */ + if (t->audmode & V4L2_TUNER_MODE_LANG1) /* Mono */ val = 0x420000; - if (v->mode & VIDEO_SOUND_LANG2) /* SAP */ + if (t->audmode & V4L2_TUNER_MODE_LANG2) /* SAP */ val = 0x410000; - if (v->mode & VIDEO_SOUND_STEREO) /* Stereo */ + if (t->audmode & V4L2_TUNER_MODE_STEREO) /* Stereo */ val = 0x020000; if (val) { gpio_bits(0x430000, val); @@ -255,8 +248,8 @@ winfast2000_audio(struct bttv *btv, struct video_audio *v, int set) bttv_gpio_tracking(btv,"winfast2000"); } } else { - v->mode = VIDEO_SOUND_MONO | VIDEO_SOUND_STEREO | - VIDEO_SOUND_LANG1 | VIDEO_SOUND_LANG2; + t->audmode = V4L2_TUNER_MODE_MONO | V4L2_TUNER_MODE_STEREO | + V4L2_TUNER_MODE_LANG1 | V4L2_TUNER_MODE_LANG2; } } @@ -268,8 +261,7 @@ winfast2000_audio(struct bttv *btv, struct video_audio *v, int set) * Note: There are card variants without tda9874a. Forcing the "stereo sound route" * will mute this cards. */ - void -pvbt878p9b_audio(struct bttv *btv, struct video_audio *v, int set) +void pvbt878p9b_audio(struct bttv *btv, struct v4l2_tuner *t, int set) { unsigned int val = 0; @@ -277,11 +269,11 @@ pvbt878p9b_audio(struct bttv *btv, struct video_audio *v, int set) return; if (set) { - if (v->mode & VIDEO_SOUND_MONO) { + if (t->audmode & V4L2_TUNER_MODE_MONO) { val = 0x01; } - if ((v->mode & (VIDEO_SOUND_LANG1 | VIDEO_SOUND_LANG2)) - || (v->mode & VIDEO_SOUND_STEREO)) { + if ((t->audmode & (V4L2_TUNER_MODE_LANG1 | V4L2_TUNER_MODE_LANG2)) + || (t->audmode & V4L2_TUNER_MODE_STEREO)) { val = 0x02; } if (val) { @@ -290,8 +282,8 @@ pvbt878p9b_audio(struct bttv *btv, struct video_audio *v, int set) bttv_gpio_tracking(btv,"pvbt878p9b"); } } else { - v->mode = VIDEO_SOUND_MONO | VIDEO_SOUND_STEREO | - VIDEO_SOUND_LANG1 | VIDEO_SOUND_LANG2; + t->audmode = V4L2_TUNER_MODE_MONO | V4L2_TUNER_MODE_STEREO | + V4L2_TUNER_MODE_LANG1 | V4L2_TUNER_MODE_LANG2; } } @@ -300,8 +292,7 @@ pvbt878p9b_audio(struct bttv *btv, struct video_audio *v, int set) * sound control for FlyVideo 2000S (with tda9874 decoder) * based on pvbt878p9b_audio() - this is not tested, please fix!!! */ - void -fv2000s_audio(struct bttv *btv, struct video_audio *v, int set) +void fv2000s_audio(struct bttv *btv, struct v4l2_tuner *t, int set) { unsigned int val = 0xffff; @@ -309,11 +300,11 @@ fv2000s_audio(struct bttv *btv, struct video_audio *v, int set) return; if (set) { - if (v->mode & VIDEO_SOUND_MONO) { + if (t->audmode & V4L2_TUNER_MODE_MONO) { val = 0x0000; } - if ((v->mode & (VIDEO_SOUND_LANG1 | VIDEO_SOUND_LANG2)) - || (v->mode & VIDEO_SOUND_STEREO)) { + if ((t->audmode & (V4L2_TUNER_MODE_LANG1 | V4L2_TUNER_MODE_LANG2)) + || (t->audmode & V4L2_TUNER_MODE_STEREO)) { val = 0x1080; /*-dk-???: 0x0880, 0x0080, 0x1800 ... */ } if (val != 0xffff) { @@ -322,8 +313,8 @@ fv2000s_audio(struct bttv *btv, struct video_audio *v, int set) bttv_gpio_tracking(btv,"fv2000s"); } } else { - v->mode = VIDEO_SOUND_MONO | VIDEO_SOUND_STEREO | - VIDEO_SOUND_LANG1 | VIDEO_SOUND_LANG2; + t->audmode = V4L2_TUNER_MODE_MONO | V4L2_TUNER_MODE_STEREO | + V4L2_TUNER_MODE_LANG1 | V4L2_TUNER_MODE_LANG2; } } @@ -331,19 +322,18 @@ fv2000s_audio(struct bttv *btv, struct video_audio *v, int set) * sound control for Canopus WinDVR PCI * Masaki Suzuki */ - void -windvr_audio(struct bttv *btv, struct video_audio *v, int set) +void windvr_audio(struct bttv *btv, struct v4l2_tuner *t, int set) { unsigned long val = 0; if (set) { - if (v->mode & VIDEO_SOUND_MONO) + if (t->audmode & V4L2_TUNER_MODE_MONO) val = 0x040000; - if (v->mode & VIDEO_SOUND_LANG1) + if (t->audmode & V4L2_TUNER_MODE_LANG1) val = 0; - if (v->mode & VIDEO_SOUND_LANG2) + if (t->audmode & V4L2_TUNER_MODE_LANG2) val = 0x100000; - if (v->mode & VIDEO_SOUND_STEREO) + if (t->audmode & V4L2_TUNER_MODE_STEREO) val = 0; if (val) { gpio_bits(0x140000, val); @@ -351,8 +341,8 @@ windvr_audio(struct bttv *btv, struct video_audio *v, int set) bttv_gpio_tracking(btv,"windvr"); } } else { - v->mode = VIDEO_SOUND_MONO | VIDEO_SOUND_STEREO | - VIDEO_SOUND_LANG1 | VIDEO_SOUND_LANG2; + t->audmode = V4L2_TUNER_MODE_MONO | V4L2_TUNER_MODE_STEREO | + V4L2_TUNER_MODE_LANG1 | V4L2_TUNER_MODE_LANG2; } } @@ -360,8 +350,7 @@ windvr_audio(struct bttv *btv, struct video_audio *v, int set) * sound control for AD-TVK503 * Hiroshi Takekawa */ - void -adtvk503_audio(struct bttv *btv, struct video_audio *v, int set) +void adtvk503_audio(struct bttv *btv, struct v4l2_tuner *t, int set) { unsigned int con = 0xffffff; @@ -369,13 +358,13 @@ adtvk503_audio(struct bttv *btv, struct video_audio *v, int set) if (set) { /* btor(***, BT848_GPIO_OUT_EN); */ - if (v->mode & VIDEO_SOUND_LANG1) + if (t->audmode & V4L2_TUNER_MODE_LANG1) con = 0x00000000; - if (v->mode & VIDEO_SOUND_LANG2) + if (t->audmode & V4L2_TUNER_MODE_LANG2) con = 0x00180000; - if (v->mode & VIDEO_SOUND_STEREO) + if (t->audmode & V4L2_TUNER_MODE_STEREO) con = 0x00000000; - if (v->mode & VIDEO_SOUND_MONO) + if (t->audmode & V4L2_TUNER_MODE_MONO) con = 0x00060000; if (con != 0xffffff) { gpio_bits(0x1e0000,con); @@ -383,7 +372,7 @@ adtvk503_audio(struct bttv *btv, struct video_audio *v, int set) bttv_gpio_tracking(btv, "adtvk503"); } } else { - v->mode = VIDEO_SOUND_MONO | VIDEO_SOUND_STEREO | - VIDEO_SOUND_LANG1 | VIDEO_SOUND_LANG2; + t->audmode = V4L2_TUNER_MODE_MONO | V4L2_TUNER_MODE_STEREO | + V4L2_TUNER_MODE_LANG1 | V4L2_TUNER_MODE_LANG2; } } -- cgit v1.2.3 From a569bbcfb1eaa8fee24a6e70f43358088a84a77a Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Fri, 25 Aug 2006 16:53:07 -0300 Subject: Report detected sound carrier into rxsubchans From: Nickolay V. Shmyrev Signed-off-by: Nickolay V. Shmyrev Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/video/bt8xx/bttv-audio-hook.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) --- linux/drivers/media/video/bt8xx/bttv-audio-hook.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'linux/drivers/media/video/bt8xx/bttv-audio-hook.c') diff --git a/linux/drivers/media/video/bt8xx/bttv-audio-hook.c b/linux/drivers/media/video/bt8xx/bttv-audio-hook.c index a075198f8..67b634235 100644 --- a/linux/drivers/media/video/bt8xx/bttv-audio-hook.c +++ b/linux/drivers/media/video/bt8xx/bttv-audio-hook.c @@ -101,24 +101,28 @@ void gvbctv5pci_audio(struct bttv *btv, struct v4l2_tuner *t, int set) } else { switch (val & 0x70) { case 0x10: - t->audmode = V4L2_TUNER_MODE_LANG1 | V4L2_TUNER_MODE_LANG2; + t->rxsubchans = V4L2_TUNER_SUB_LANG1 | V4L2_TUNER_SUB_LANG2; break; case 0x30: - t->audmode = V4L2_TUNER_MODE_LANG2; + t->rxsubchans = V4L2_TUNER_SUB_LANG2; break; case 0x50: - t->audmode = V4L2_TUNER_MODE_LANG1; + t->rxsubchans = V4L2_TUNER_SUB_LANG1; break; case 0x60: - t->audmode = V4L2_TUNER_MODE_STEREO; + t->rxsubchans = V4L2_TUNER_SUB_STEREO; break; case 0x70: - t->audmode = V4L2_TUNER_MODE_MONO; + t->rxsubchans = V4L2_TUNER_SUB_MONO; break; default: - t->audmode = V4L2_TUNER_MODE_MONO | V4L2_TUNER_MODE_STEREO | - V4L2_TUNER_MODE_LANG1 | V4L2_TUNER_MODE_LANG2; + t->rxsubchans = V4L2_TUNER_SUB_MONO | + V4L2_TUNER_SUB_STEREO | + V4L2_TUNER_SUB_LANG1 | + V4L2_TUNER_SUB_LANG2; } + t->audmode = V4L2_TUNER_MODE_STEREO | + V4L2_TUNER_MODE_LANG1 | V4L2_TUNER_MODE_LANG2; } } -- cgit v1.2.3