leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

V4L/DVB (10646): vivi: controls are per-device, not global.

Browse Source 
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Hans Verkuil 2009-02-14 13:43:44 -03:00 committed by Mauro Carvalho Chehab
parent 5ab6c9af37
commit c41ee24bc4
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
drivers/media/video/vivi.c
View File

@ -125,8 +125,6 @@ static struct v4l2_queryctrl vivi_qctrl[] = {
}
};
static int qctl_regs[ARRAY_SIZE(vivi_qctrl)];
#define dprintk(dev, level, fmt, arg...) \
v4l2_dbg(level, debug, &dev->v4l2_dev, fmt, ## arg)
@ -239,6 +237,9 @@ struct vivi_dev {
/* Input Number */
int input;
/* Control 'registers' */
int qctl_regs[ARRAY_SIZE(vivi_qctrl)];
};
struct vivi_fh {
@ -1108,12 +1109,14 @@ static int vidioc_queryctrl(struct file *file, void *priv,
static int vidioc_g_ctrl(struct file *file, void *priv,
struct v4l2_control *ctrl)
{
struct vivi_fh *fh = priv;
struct vivi_dev *dev = fh->dev;
int i;
for (i = 0; i < ARRAY_SIZE(vivi_qctrl); i++)
if (ctrl->id == vivi_qctrl[i].id) {
ctrl->value = qctl_regs[i];
return (0);
ctrl->value = dev->qctl_regs[i];
return 0;
}
return -EINVAL;
@ -1121,16 +1124,18 @@ static int vidioc_g_ctrl(struct file *file, void *priv,
static int vidioc_s_ctrl(struct file *file, void *priv,
struct v4l2_control *ctrl)
{
struct vivi_fh *fh = priv;
struct vivi_dev *dev = fh->dev;
int i;
for (i = 0; i < ARRAY_SIZE(vivi_qctrl); i++)
if (ctrl->id == vivi_qctrl[i].id) {
if (ctrl->value < vivi_qctrl[i].minimum
|| ctrl->value > vivi_qctrl[i].maximum) {
return (-ERANGE);
}
qctl_regs[i] = ctrl->value;
return (0);
if (ctrl->value < vivi_qctrl[i].minimum ||
ctrl->value > vivi_qctrl[i].maximum) {
return -ERANGE;
}
dev->qctl_regs[i] = ctrl->value;
return 0;
}
return -EINVAL;
}
@ -1143,7 +1148,6 @@ static int vivi_open(struct file *file)
{
struct vivi_dev *dev = video_drvdata(file);
struct vivi_fh *fh = NULL;
int i;
int retval = 0;
mutex_lock(&dev->mutex);
@ -1177,10 +1181,6 @@ static int vivi_open(struct file *file)
fh->width = 640;
fh->height = 480;
/* Put all controls at a sane state */
for (i = 0; i < ARRAY_SIZE(vivi_qctrl); i++)
qctl_regs[i] = vivi_qctrl[i].default_value;
/* Resets frame counters */
dev->h = 0;
dev->m = 0;
@ -1338,18 +1338,18 @@ static int vivi_release(void)
return 0;
}
static int __init vivi_create_instance(int i)
static int __init vivi_create_instance(int inst)
{
struct vivi_dev *dev;
struct video_device *vfd;
int ret;
int ret, i;
dev = kzalloc(sizeof(*dev), GFP_KERNEL);
if (!dev)
return -ENOMEM;
snprintf(dev->v4l2_dev.name, sizeof(dev->v4l2_dev.name),
"%s-%03d", VIVI_MODULE_NAME, i);
"%s-%03d", VIVI_MODULE_NAME, inst);
ret = v4l2_device_register(NULL, &dev->v4l2_dev);
if (ret)
goto free_dev;
@ -1375,6 +1375,10 @@ static int __init vivi_create_instance(int i)
video_set_drvdata(vfd, dev);
/* Set all controls to their default value. */
for (i = 0; i < ARRAY_SIZE(vivi_qctrl); i++)
dev->qctl_regs[i] = vivi_qctrl[i].default_value;
/* Now that everything is fine, let's add it to device list */
list_add_tail(&dev->vivi_devlist, &vivi_devlist);