[media] bttv: use centralized std and implement g_std

The 'current_norm' field cannot be used if multiple device nodes (video and
vbi in this case) set the same std.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c
index 41de79b..46ead7d 100644 (file)
--- a/drivers/media/pci/bt8xx/bttv-driver.c
+++ b/drivers/media/pci/bt8xx/bttv-driver.c
@@ -1716,6 +1716,7 @@ static int bttv_s_std(struct file *file, void *priv, v4l2_std_id *id)
                goto err;
        }
 
+       btv->std = *id;
        set_tvnorm(btv, i);
 
 err:
@@ -1723,6 +1724,15 @@ err:
        return err;
 }
 
+static int bttv_g_std(struct file *file, void *priv, v4l2_std_id *id)
+{
+       struct bttv_fh *fh  = priv;
+       struct bttv *btv = fh->btv;
+
+       *id = btv->std;
+       return 0;
+}
+
 static int bttv_querystd(struct file *file, void *f, v4l2_std_id *id)
 {
        struct bttv_fh *fh = f;
@@ -3166,6 +3176,7 @@ static const struct v4l2_ioctl_ops bttv_ioctl_ops = {
        .vidioc_qbuf                    = bttv_qbuf,
        .vidioc_dqbuf                   = bttv_dqbuf,
        .vidioc_s_std                   = bttv_s_std,
+       .vidioc_g_std                   = bttv_g_std,
        .vidioc_enum_input              = bttv_enum_input,
        .vidioc_g_input                 = bttv_g_input,
        .vidioc_s_input                 = bttv_s_input,
@@ -3196,7 +3207,6 @@ static struct video_device bttv_video_template = {
        .fops         = &bttv_fops,
        .ioctl_ops    = &bttv_ioctl_ops,
        .tvnorms      = BTTV_NORMS,
-       .current_norm = V4L2_STD_PAL,
 };
 
 /* ----------------------------------------------------------------------- */
@@ -4192,6 +4202,7 @@ static int bttv_probe(struct pci_dev *dev, const struct pci_device_id *pci_id)
                bttv_set_frequency(btv, &init_freq);
                btv->radio_freq = 90500 * 16; /* 90.5Mhz default */
        }
+       btv->std = V4L2_STD_PAL;
        init_irqreg(btv);
        v4l2_ctrl_handler_setup(hdl);
 

diff --git a/drivers/media/pci/bt8xx/bttvp.h b/drivers/media/pci/bt8xx/bttvp.h
index 12cc4eb..86d67bb 100644 (file)
--- a/drivers/media/pci/bt8xx/bttvp.h
+++ b/drivers/media/pci/bt8xx/bttvp.h
@@ -424,6 +424,7 @@ struct bttv {
        unsigned int mute;
        unsigned long tv_freq;
        unsigned int tvnorm;
+       v4l2_std_id std;
        int hue, contrast, bright, saturation;
        struct v4l2_framebuffer fbuf;
        unsigned int field_count;