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/bttvp.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'linux/drivers/media/video/bt8xx/bttvp.h') diff --git a/linux/drivers/media/video/bt8xx/bttvp.h b/linux/drivers/media/video/bt8xx/bttvp.h index ce132b58b..6e8519444 100644 --- a/linux/drivers/media/video/bt8xx/bttvp.h +++ b/linux/drivers/media/video/bt8xx/bttvp.h @@ -350,9 +350,10 @@ struct bttv { /* old gpio interface */ wait_queue_head_t gpioq; int shutdown; -#ifdef CONFIG_VIDEO_V4L1 - void (*audio_hook)(struct bttv *btv, struct video_audio *v, int set); -#endif + + void (*volume_gpio)(struct bttv *btv, __u16 volume); + void (*audio_mode_gpio)(struct bttv *btv, struct v4l2_tuner *tuner, int set); + /* new gpio interface */ spinlock_t gpio_lock; -- cgit v1.2.3