3 files changed, 90 insertions, 84 deletions

diff --git a/drivers/media/video/bt8xx/Makefile b/drivers/media/video/bt8xx/Makefile
index 94350f21cdc0..db641a36b197 100644
--- a/drivers/media/video/bt8xx/Makefile
+++ b/drivers/media/video/bt8xx/Makefile
@@ -9,4 +9,4 @@ bttv-objs      :=      bttv-driver.o bttv-cards.o bttv-if.o \
 obj-$(CONFIG_VIDEO_BT848) += bttv.o
 
 EXTRA_CFLAGS += -I$(src)/..
-EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core
+EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index 74def9c23952..423e954948be 100644
--- a/drivers/media/video/bt8xx/bttv-driver.c
+++ b/drivers/media/video/bt8xx/bttv-driver.c
@@ -973,12 +973,12 @@ audio_mux(struct bttv *btv, int input, int mute)
                    For now this is sufficient. */
                 switch (input) {
                 case TVAUDIO_INPUT_RADIO:
-                        route.input = MSP_INPUT(MSP_IN_SCART_2, MSP_IN_TUNER_1,
-                                    MSP_DSP_OUT_SCART, MSP_DSP_OUT_SCART);
+                        route.input = MSP_INPUT(MSP_IN_SCART2, MSP_IN_TUNER1,
+                                    MSP_DSP_IN_SCART, MSP_DSP_IN_SCART);
                         break;
                 case TVAUDIO_INPUT_EXTERN:
-                        route.input = MSP_INPUT(MSP_IN_SCART_1, MSP_IN_TUNER_1,
-                                    MSP_DSP_OUT_SCART, MSP_DSP_OUT_SCART);
+                        route.input = MSP_INPUT(MSP_IN_SCART1, MSP_IN_TUNER1,
+                                    MSP_DSP_IN_SCART, MSP_DSP_IN_SCART);
                         break;
                 case TVAUDIO_INPUT_INTERN:
                         /* Yes, this is the same input as for RADIO. I doubt
@@ -986,8 +986,8 @@ audio_mux(struct bttv *btv, int input, int mute)
                            input is the BTTV_BOARD_AVERMEDIA98. I wonder how
                            that was tested. My guess is that the whole INTERN
                            input does not work. */
-                        route.input = MSP_INPUT(MSP_IN_SCART_2, MSP_IN_TUNER_1,
-                                    MSP_DSP_OUT_SCART, MSP_DSP_OUT_SCART);
+                        route.input = MSP_INPUT(MSP_IN_SCART2, MSP_IN_TUNER1,
+                                    MSP_DSP_IN_SCART, MSP_DSP_IN_SCART);
                         break;
                 case TVAUDIO_INPUT_TUNER:
                 default:
@@ -1023,14 +1023,11 @@ audio_input(struct bttv *btv, int input)
 static void
 i2c_vidiocschan(struct bttv *btv)
 {
-        struct video_channel c;
+        v4l2_std_id std = bttv_tvnorms[btv->tvnorm].v4l2_id;
 
-        memset(&c,0,sizeof(c));
-        c.norm    = btv->tvnorm;
-        c.channel = btv->input;
-        bttv_call_i2c_clients(btv,VIDIOCSCHAN,&c);
+        bttv_call_i2c_clients(btv, VIDIOC_S_STD, &std);
         if (btv->c.type == BTTV_BOARD_VOODOOTV_FM)
-                bttv_tda9880_setnorm(btv,c.norm);
+                bttv_tda9880_setnorm(btv,btv->tvnorm);
 }
 
 static int
@@ -1184,11 +1181,27 @@ static int get_control(struct bttv *btv, struct v4l2_control *c)
                         break;
         if (i == BTTV_CTLS)
                 return -EINVAL;
-        if (i >= 4 && i <= 8) {
+        if (btv->audio_hook && i >= 4 && i <= 8) {
                 memset(&va,0,sizeof(va));
-                bttv_call_i2c_clients(btv, VIDIOCGAUDIO, &va);
-                if (btv->audio_hook)
-                        btv->audio_hook(btv,&va,0);
+                btv->audio_hook(btv,&va,0);
+                switch (c->id) {
+                case V4L2_CID_AUDIO_MUTE:
+                        c->value = (VIDEO_AUDIO_MUTE & va.flags) ? 1 : 0;
+                        break;
+                case V4L2_CID_AUDIO_VOLUME:
+                        c->value = va.volume;
+                        break;
+                case V4L2_CID_AUDIO_BALANCE:
+                        c->value = va.balance;
+                        break;
+                case V4L2_CID_AUDIO_BASS:
+                        c->value = va.bass;
+                        break;
+                case V4L2_CID_AUDIO_TREBLE:
+                        c->value = va.treble;
+                        break;
+                }
+                return 0;
         }
         switch (c->id) {
         case V4L2_CID_BRIGHTNESS:
@@ -1205,19 +1218,11 @@ static int get_control(struct bttv *btv, struct v4l2_control *c)
                 break;
 
         case V4L2_CID_AUDIO_MUTE:
-                c->value = (VIDEO_AUDIO_MUTE & va.flags) ? 1 : 0;
-                break;
         case V4L2_CID_AUDIO_VOLUME:
-                c->value = va.volume;
-                break;
         case V4L2_CID_AUDIO_BALANCE:
-                c->value = va.balance;
-                break;
         case V4L2_CID_AUDIO_BASS:
-                c->value = va.bass;
-                break;
         case V4L2_CID_AUDIO_TREBLE:
-                c->value = va.treble;
+                bttv_call_i2c_clients(btv,VIDIOC_G_CTRL,c);
                 break;
 
         case V4L2_CID_PRIVATE_CHROMA_AGC:
@@ -1269,11 +1274,35 @@ static int set_control(struct bttv *btv, struct v4l2_control *c)
                         break;
         if (i == BTTV_CTLS)
                 return -EINVAL;
-        if (i >= 4 && i <= 8) {
+        if (btv->audio_hook && i >= 4 && i <= 8) {
                 memset(&va,0,sizeof(va));
-                bttv_call_i2c_clients(btv, VIDIOCGAUDIO, &va);
-                if (btv->audio_hook)
-                        btv->audio_hook(btv,&va,0);
+                btv->audio_hook(btv,&va,0);
+                switch (c->id) {
+                case V4L2_CID_AUDIO_MUTE:
+                        if (c->value) {
+                                va.flags |= VIDEO_AUDIO_MUTE;
+                                audio_mute(btv, 1);
+                        } else {
+                                va.flags &= ~VIDEO_AUDIO_MUTE;
+                                audio_mute(btv, 0);
+                        }
+                        break;
+
+                case V4L2_CID_AUDIO_VOLUME:
+                        va.volume = c->value;
+                        break;
+                case V4L2_CID_AUDIO_BALANCE:
+                        va.balance = c->value;
+                        break;
+                case V4L2_CID_AUDIO_BASS:
+                        va.bass = c->value;
+                        break;
+                case V4L2_CID_AUDIO_TREBLE:
+                        va.treble = c->value;
+                        break;
+                }
+                btv->audio_hook(btv,&va,1);
+                return 0;
         }
         switch (c->id) {
         case V4L2_CID_BRIGHTNESS:
@@ -1289,26 +1318,13 @@ static int set_control(struct bttv *btv, struct v4l2_control *c)
                 bt848_sat(btv,c->value);
                 break;
         case V4L2_CID_AUDIO_MUTE:
-                if (c->value) {
-                        va.flags |= VIDEO_AUDIO_MUTE;
-                        audio_mute(btv, 1);
-                } else {
-                        va.flags &= ~VIDEO_AUDIO_MUTE;
-                        audio_mute(btv, 0);
-                }
-                break;
-
+                audio_mute(btv, c->value);
+                /* fall through */
         case V4L2_CID_AUDIO_VOLUME:
-                va.volume = c->value;
-                break;
         case V4L2_CID_AUDIO_BALANCE:
-                va.balance = c->value;
-                break;
         case V4L2_CID_AUDIO_BASS:
-                va.bass = c->value;
-                break;
         case V4L2_CID_AUDIO_TREBLE:
-                va.treble = c->value;
+                bttv_call_i2c_clients(btv,VIDIOC_S_CTRL,c);
                 break;
 
         case V4L2_CID_PRIVATE_CHROMA_AGC:
@@ -1364,11 +1380,6 @@ static int set_control(struct bttv *btv, struct v4l2_control *c)
         default:
                 return -EINVAL;
         }
-        if (i >= 4 && i <= 8) {
-                bttv_call_i2c_clients(btv, VIDIOCSAUDIO, &va);
-                if (btv->audio_hook)
-                        btv->audio_hook(btv,&va,1);
-        }
         return 0;
 }
 
@@ -1591,12 +1602,16 @@ static int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg)
         }
         case VIDIOCSFREQ:
         {
-                unsigned long *freq = arg;
+                struct v4l2_frequency freq;
+
+                memset(&freq, 0, sizeof(freq));
+                freq.frequency = *(unsigned long *)arg;
                 mutex_lock(&btv->lock);
-                btv->freq=*freq;
-                bttv_call_i2c_clients(btv,VIDIOCSFREQ,freq);
+                freq.type = btv->radio_user ? V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV;
+                btv->freq = *(unsigned long *)arg;
+                bttv_call_i2c_clients(btv,VIDIOC_S_FREQUENCY,&freq);
                 if (btv->has_matchbox && btv->radio_user)
-                        tea5757_set_freq(btv,*freq);
+                        tea5757_set_freq(btv,*(unsigned long *)arg);
                 mutex_unlock(&btv->lock);
                 return 0;
         }
@@ -1827,33 +1842,26 @@ static int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg)
                         return -EINVAL;
                 mutex_lock(&btv->lock);
                 memset(t,0,sizeof(*t));
+                t->rxsubchans = V4L2_TUNER_SUB_MONO;
+                bttv_call_i2c_clients(btv, VIDIOC_G_TUNER, t);
                 strcpy(t->name, "Television");
-                t->type       = V4L2_TUNER_ANALOG_TV;
                 t->capability = V4L2_TUNER_CAP_NORM;
-                t->rxsubchans = V4L2_TUNER_SUB_MONO;
+                t->type       = V4L2_TUNER_ANALOG_TV;
                 if (btread(BT848_DSTATUS)&BT848_DSTATUS_HLOC)
                         t->signal = 0xffff;
-                {
-                        struct video_tuner tuner;
-
-                        memset(&tuner, 0, sizeof (tuner));
-                        tuner.rangehigh = 0xffffffffUL;
-                        bttv_call_i2c_clients(btv, VIDIOCGTUNER, &tuner);
-                        t->rangelow = tuner.rangelow;
-                        t->rangehigh = tuner.rangehigh;
-                }
-                {
+
+                if (btv->audio_hook) {
                         /* Hmmm ... */
                         struct video_audio va;
                         memset(&va, 0, sizeof(struct video_audio));
-                        bttv_call_i2c_clients(btv, VIDIOCGAUDIO, &va);
-                        if (btv->audio_hook)
-                                btv->audio_hook(btv,&va,0);
+                        btv->audio_hook(btv,&va,0);
+                        t->audmode    = V4L2_TUNER_MODE_MONO;
+                        t->rxsubchans = V4L2_TUNER_SUB_MONO;
                         if(va.mode & VIDEO_SOUND_STEREO) {
-                                t->audmode     = V4L2_TUNER_MODE_STEREO;
-                                t->rxsubchans |= V4L2_TUNER_SUB_STEREO;
+                                t->audmode    = V4L2_TUNER_MODE_STEREO;
+                                t->rxsubchans = V4L2_TUNER_SUB_STEREO;
                         }
-                        if(va.mode & VIDEO_SOUND_LANG1) {
+                        if(va.mode & VIDEO_SOUND_LANG2) {
                                 t->audmode    = V4L2_TUNER_MODE_LANG1;
                                 t->rxsubchans = V4L2_TUNER_SUB_LANG1
                                         | V4L2_TUNER_SUB_LANG2;
@@ -1872,10 +1880,10 @@ static int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg)
                 if (0 != t->index)
                         return -EINVAL;
                 mutex_lock(&btv->lock);
-                {
+                bttv_call_i2c_clients(btv, VIDIOC_S_TUNER, t);
+                if (btv->audio_hook) {
                         struct video_audio va;
                         memset(&va, 0, sizeof(struct video_audio));
-                        bttv_call_i2c_clients(btv, VIDIOCGAUDIO, &va);
                         if (t->audmode == V4L2_TUNER_MODE_MONO)
                                 va.mode = VIDEO_SOUND_MONO;
                         else if (t->audmode == V4L2_TUNER_MODE_STEREO ||
@@ -1885,9 +1893,7 @@ static int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg)
                                 va.mode = VIDEO_SOUND_LANG1;
                         else if (t->audmode == V4L2_TUNER_MODE_LANG2)
                                 va.mode = VIDEO_SOUND_LANG2;
-                        bttv_call_i2c_clients(btv, VIDIOCSAUDIO, &va);
-                        if (btv->audio_hook)
-                                btv->audio_hook(btv,&va,1);
+                        btv->audio_hook(btv,&va,1);
                 }
                 mutex_unlock(&btv->lock);
                 return 0;
@@ -1912,7 +1918,7 @@ static int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg)
                         return -EINVAL;
                 mutex_lock(&btv->lock);
                 btv->freq = f->frequency;
-                bttv_call_i2c_clients(btv,VIDIOCSFREQ,&btv->freq);
+                bttv_call_i2c_clients(btv,VIDIOC_S_FREQUENCY,f);
                 if (btv->has_matchbox && btv->radio_user)
                         tea5757_set_freq(btv,btv->freq);
                 mutex_unlock(&btv->lock);
@@ -1920,7 +1926,9 @@ static int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg)
         }
         case VIDIOC_LOG_STATUS:
         {
+                printk(KERN_INFO "bttv%d: =================  START STATUS CARD #%d  =================\n", btv->c.nr, btv->c.nr);
                 bttv_call_i2c_clients(btv, VIDIOC_LOG_STATUS, NULL);
+                printk(KERN_INFO "bttv%d: ==================  END STATUS CARD #%d  ==================\n", btv->c.nr, btv->c.nr);
                 return 0;
         }
 
@@ -2870,12 +2878,10 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file,
                         return 0;
                 }
                 *c = bttv_ctls[i];
-                if (i >= 4 && i <= 8) {
+                if (btv->audio_hook && i >= 4 && i <= 8) {
                         struct video_audio va;
                         memset(&va,0,sizeof(va));
-                        bttv_call_i2c_clients(btv, VIDIOCGAUDIO, &va);
-                        if (btv->audio_hook)
-                                btv->audio_hook(btv,&va,0);
+                        btv->audio_hook(btv,&va,0);
                         switch (bttv_ctls[i].id) {
                         case V4L2_CID_AUDIO_VOLUME:
                                 if (!(va.flags & VIDEO_AUDIO_VOLUME))
diff --git a/drivers/media/video/bt8xx/bttv-vbi.c b/drivers/media/video/bt8xx/bttv-vbi.c
index e20ff238e409..8c9f0f7cf467 100644
--- a/drivers/media/video/bt8xx/bttv-vbi.c
+++ b/drivers/media/video/bt8xx/bttv-vbi.c
@@ -184,7 +184,7 @@ void bttv_vbi_try_fmt(struct bttv_fh *fh, struct v4l2_format *f)
                 - tvnorm->vbistart[0];
         count1 = (s64) f->fmt.vbi.start[1] + f->fmt.vbi.count[1]
                 - tvnorm->vbistart[1];
-        count  = clamp (max (count0, count1), 1LL, (s64) VBI_MAXLINES);
+        count  = clamp (max (count0, count1), (s64) 1, (s64) VBI_MAXLINES);
 
         f->fmt.vbi.start[0] = tvnorm->vbistart[0];
         f->fmt.vbi.start[1] = tvnorm->vbistart[1];