Skip to content

R
raspberrypi-kernel

openeuler / raspberrypi-kernel

通知 13
Star 1
Fork 0
R
raspberrypi-kernel
提交 afa38521 编写于 作者: H Hans Verkuil 提交者： Mauro Carvalho Chehab
浏览文件
操作

[media] pwc: convert to video_ioctl2 

Tested with a Logitech QuickCam Pro 4000.
Signed-off-by: NHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
上级 b577f962
显示空白变更内容
内联 并排
Showing with 494 addition and 565 deletion
drivers/media/video/pwc/pwc-if.c
浏览文件 @ afa38521
...@@ -151,8 +151,6 @@ static int pwc_video_close(struct file *file); ...@@ -151,8 +151,6 @@ static int pwc_video_close(struct file *file);
static ssize_t pwc_video_read(struct file *file, char __user *buf, static ssize_t pwc_video_read(struct file *file, char __user *buf,
size_t count, loff_t *ppos); size_t count, loff_t *ppos);
static unsigned int pwc_video_poll(struct file *file, poll_table *wait); static unsigned int pwc_video_poll(struct file *file, poll_table *wait);
static long pwc_video_ioctl(struct file *file,
unsigned int ioctlnr, unsigned long arg);
static int pwc_video_mmap(struct file *file, struct vm_area_struct *vma); static int pwc_video_mmap(struct file *file, struct vm_area_struct *vma);
static const struct v4l2_file_operations pwc_fops = { static const struct v4l2_file_operations pwc_fops = {
...@@ -162,7 +160,7 @@ static const struct v4l2_file_operations pwc_fops = { ...@@ -162,7 +160,7 @@ static const struct v4l2_file_operations pwc_fops = {
.read = pwc_video_read, .read = pwc_video_read,
.poll = pwc_video_poll, .poll = pwc_video_poll,
.mmap = pwc_video_mmap, .mmap = pwc_video_mmap,
.unlocked_ioctl = pwc_video_ioctl, .unlocked_ioctl = video_ioctl2,
}; };
static struct video_device pwc_template = { static struct video_device pwc_template = {
.name = "Philips Webcam", /* Filled in later */ .name = "Philips Webcam", /* Filled in later */
...@@ -1378,23 +1376,6 @@ static unsigned int pwc_video_poll(struct file *file, poll_table *wait) ...@@ -1378,23 +1376,6 @@ static unsigned int pwc_video_poll(struct file *file, poll_table *wait)
return 0; return 0;
} }
static long pwc_video_ioctl(struct file *file,
unsigned int cmd, unsigned long arg)
{
struct video_device *vdev = file->private_data;
struct pwc_device *pdev;
long r = -ENODEV;
if (!vdev)
goto out;
pdev = video_get_drvdata(vdev);
if (!pdev->unplugged)
r = video_usercopy(file, cmd, arg, pwc_video_do_ioctl);
out:
return r;
}
static int pwc_video_mmap(struct file *file, struct vm_area_struct *vma) static int pwc_video_mmap(struct file *file, struct vm_area_struct *vma)
{ {
struct video_device *vdev = file->private_data; struct video_device *vdev = file->private_data;
...@@ -1744,6 +1725,7 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id ...@@ -1744,6 +1725,7 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id
memcpy(pdev->vdev, &pwc_template, sizeof(pwc_template)); memcpy(pdev->vdev, &pwc_template, sizeof(pwc_template));
pdev->vdev->parent = &intf->dev; pdev->vdev->parent = &intf->dev;
pdev->vdev->lock = &pdev->modlock; pdev->vdev->lock = &pdev->modlock;
pdev->vdev->ioctl_ops = &pwc_ioctl_ops;
strcpy(pdev->vdev->name, name); strcpy(pdev->vdev->name, name);
video_set_drvdata(pdev->vdev, pdev); video_set_drvdata(pdev->vdev, pdev);
......
drivers/media/video/pwc/pwc-v4l.c
浏览文件 @ afa38521
...@@ -341,153 +341,115 @@ static int pwc_vidioc_set_fmt(struct pwc_device *pdev, struct v4l2_format *f) ...@@ -341,153 +341,115 @@ static int pwc_vidioc_set_fmt(struct pwc_device *pdev, struct v4l2_format *f)
} }
long pwc_video_do_ioctl(struct file *file, unsigned int cmd, void *arg) static int pwc_querycap(struct file *file, void *fh, struct v4l2_capability *cap)
{ {
struct video_device *vdev = video_devdata(file); struct video_device *vdev = video_devdata(file);
struct pwc_device *pdev; struct pwc_device *pdev = video_drvdata(file);
DECLARE_WAITQUEUE(wait, current);
if (vdev == NULL)
return -EFAULT;
pdev = video_get_drvdata(vdev);
if (pdev == NULL)
return -EFAULT;
#ifdef CONFIG_USB_PWC_DEBUG
if (PWC_DEBUG_LEVEL_IOCTL & pwc_trace) {
v4l_printk_ioctl(cmd);
printk("\n");
}
#endif
switch (cmd) { strcpy(cap->driver, PWC_NAME);
/* V4L2 Layer */
case VIDIOC_QUERYCAP:
{
struct v4l2_capability *cap = arg;
PWC_DEBUG_IOCTL("ioctl(VIDIOC_QUERYCAP) This application "\
"try to use the v4l2 layer\n");
strcpy(cap->driver,PWC_NAME);
strlcpy(cap->card, vdev->name, sizeof(cap->card)); strlcpy(cap->card, vdev->name, sizeof(cap->card));
usb_make_path(pdev->udev,cap->bus_info,sizeof(cap->bus_info)); usb_make_path(pdev->udev, cap->bus_info, sizeof(cap->bus_info));
cap->version = PWC_VERSION_CODE; cap->version = PWC_VERSION_CODE;
cap->capabilities = cap->capabilities =
V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VIDEO_CAPTURE |
V4L2_CAP_STREAMING | V4L2_CAP_STREAMING |
V4L2_CAP_READWRITE; V4L2_CAP_READWRITE;
return 0; return 0;
} }
case VIDIOC_ENUMINPUT:
{
struct v4l2_input *i = arg;
if ( i->index ) /* Only one INPUT is supported */ static int pwc_enum_input(struct file *file, void *fh, struct v4l2_input *i)
{
if (i->index) /* Only one INPUT is supported */
return -EINVAL; return -EINVAL;
memset(i, 0, sizeof(struct v4l2_input));
strcpy(i->name, "usb"); strcpy(i->name, "usb");
return 0; return 0;
} }
case VIDIOC_G_INPUT: static int pwc_g_input(struct file *file, void *fh, unsigned int *i)
{ {
int *i = arg; *i = 0;
*i = 0; /* Only one INPUT is supported */
return 0; return 0;
} }
case VIDIOC_S_INPUT:
{
int *i = arg;
if ( *i ) { /* Only one INPUT is supported */ static int pwc_s_input(struct file *file, void *fh, unsigned int i)
PWC_DEBUG_IOCTL("Only one input source is"\ {
" supported with this webcam.\n"); return i ? -EINVAL : 0;
return -EINVAL; }
}
return 0;
}
/* TODO: */ static int pwc_queryctrl(struct file *file, void *fh, struct v4l2_queryctrl *c)
case VIDIOC_QUERYCTRL: {
{
struct v4l2_queryctrl *c = arg;
int i; int i;
PWC_DEBUG_IOCTL("ioctl(VIDIOC_QUERYCTRL) query id=%d\n", c->id); for (i = 0; i < sizeof(pwc_controls) / sizeof(struct v4l2_queryctrl); i++) {
for (i=0; i<sizeof(pwc_controls)/sizeof(struct v4l2_queryctrl); i++) {
if (pwc_controls[i].id == c->id) { if (pwc_controls[i].id == c->id) {
PWC_DEBUG_IOCTL("ioctl(VIDIOC_QUERYCTRL) found\n"); PWC_DEBUG_IOCTL("ioctl(VIDIOC_QUERYCTRL) found\n");
memcpy(c,&pwc_controls[i],sizeof(struct v4l2_queryctrl)); memcpy(c, &pwc_controls[i], sizeof(struct v4l2_queryctrl));
return 0; return 0;
} }
} }
PWC_DEBUG_IOCTL("ioctl(VIDIOC_QUERYCTRL) not found\n");
return -EINVAL; return -EINVAL;
} }
case VIDIOC_G_CTRL:
{ static int pwc_g_ctrl(struct file *file, void *fh, struct v4l2_control *c)
struct v4l2_control *c = arg; {
struct pwc_device *pdev = video_drvdata(file);
int ret; int ret;
switch (c->id) switch (c->id) {
{
case V4L2_CID_BRIGHTNESS: case V4L2_CID_BRIGHTNESS:
c->value = pwc_get_brightness(pdev); c->value = pwc_get_brightness(pdev);
if (c->value<0) if (c->value < 0)
return -EINVAL; return -EINVAL;
return 0; return 0;
case V4L2_CID_CONTRAST: case V4L2_CID_CONTRAST:
c->value = pwc_get_contrast(pdev); c->value = pwc_get_contrast(pdev);
if (c->value<0) if (c->value < 0)
return -EINVAL; return -EINVAL;
return 0; return 0;
case V4L2_CID_SATURATION: case V4L2_CID_SATURATION:
ret = pwc_get_saturation(pdev, &c->value); ret = pwc_get_saturation(pdev, &c->value);
if (ret<0) if (ret < 0)
return -EINVAL; return -EINVAL;
return 0; return 0;
case V4L2_CID_GAMMA: case V4L2_CID_GAMMA:
c->value = pwc_get_gamma(pdev); c->value = pwc_get_gamma(pdev);
if (c->value<0) if (c->value < 0)
return -EINVAL; return -EINVAL;
return 0; return 0;
case V4L2_CID_RED_BALANCE: case V4L2_CID_RED_BALANCE:
ret = pwc_get_red_gain(pdev, &c->value); ret = pwc_get_red_gain(pdev, &c->value);
if (ret<0) if (ret < 0)
return -EINVAL; return -EINVAL;
c->value >>= 8; c->value >>= 8;
return 0; return 0;
case V4L2_CID_BLUE_BALANCE: case V4L2_CID_BLUE_BALANCE:
ret = pwc_get_blue_gain(pdev, &c->value); ret = pwc_get_blue_gain(pdev, &c->value);
if (ret<0) if (ret < 0)
return -EINVAL; return -EINVAL;
c->value >>= 8; c->value >>= 8;
return 0; return 0;
case V4L2_CID_AUTO_WHITE_BALANCE: case V4L2_CID_AUTO_WHITE_BALANCE:
ret = pwc_get_awb(pdev); ret = pwc_get_awb(pdev);
if (ret<0) if (ret < 0)
return -EINVAL; return -EINVAL;
c->value = (ret == PWC_WB_MANUAL)?0:1; c->value = (ret == PWC_WB_MANUAL) ? 0 : 1;
return 0; return 0;
case V4L2_CID_GAIN: case V4L2_CID_GAIN:
ret = pwc_get_agc(pdev, &c->value); ret = pwc_get_agc(pdev, &c->value);
if (ret<0) if (ret < 0)
return -EINVAL; return -EINVAL;
c->value >>= 8; c->value >>= 8;
return 0; return 0;
case V4L2_CID_AUTOGAIN: case V4L2_CID_AUTOGAIN:
ret = pwc_get_agc(pdev, &c->value); ret = pwc_get_agc(pdev, &c->value);
if (ret<0) if (ret < 0)
return -EINVAL; return -EINVAL;
c->value = (c->value < 0)?1:0; c->value = (c->value < 0) ? 1 : 0;
return 0; return 0;
case V4L2_CID_EXPOSURE: case V4L2_CID_EXPOSURE:
ret = pwc_get_shutter_speed(pdev, &c->value); ret = pwc_get_shutter_speed(pdev, &c->value);
if (ret<0) if (ret < 0)
return -EINVAL; return -EINVAL;
return 0; return 0;
case V4L2_CID_PRIVATE_COLOUR_MODE: case V4L2_CID_PRIVATE_COLOUR_MODE:
...@@ -499,7 +461,7 @@ long pwc_video_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -499,7 +461,7 @@ long pwc_video_do_ioctl(struct file *file, unsigned int cmd, void *arg)
ret = pwc_get_contour(pdev, &c->value); ret = pwc_get_contour(pdev, &c->value);
if (ret < 0) if (ret < 0)
return -EINVAL; return -EINVAL;
c->value=(c->value == -1?1:0); c->value = (c->value == -1 ? 1 : 0);
return 0; return 0;
case V4L2_CID_PRIVATE_CONTOUR: case V4L2_CID_PRIVATE_CONTOUR:
ret = pwc_get_contour(pdev, &c->value); ret = pwc_get_contour(pdev, &c->value);
...@@ -516,7 +478,7 @@ long pwc_video_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -516,7 +478,7 @@ long pwc_video_do_ioctl(struct file *file, unsigned int cmd, void *arg)
ret = pwc_get_flicker(pdev, &c->value); ret = pwc_get_flicker(pdev, &c->value);
if (ret < 0) if (ret < 0)
return -EINVAL; return -EINVAL;
c->value=(c->value?1:0); c->value = (c->value ? 1 : 0);
return 0; return 0;
case V4L2_CID_PRIVATE_NOISE_REDUCTION: case V4L2_CID_PRIVATE_NOISE_REDUCTION:
ret = pwc_get_dynamic_noise(pdev, &c->value); ret = pwc_get_dynamic_noise(pdev, &c->value);
...@@ -530,59 +492,59 @@ long pwc_video_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -530,59 +492,59 @@ long pwc_video_do_ioctl(struct file *file, unsigned int cmd, void *arg)
return -EINVAL; return -EINVAL;
} }
return -EINVAL; return -EINVAL;
} }
case VIDIOC_S_CTRL:
{ static int pwc_s_ctrl(struct file *file, void *fh, struct v4l2_control *c)
struct v4l2_control *c = arg; {
struct pwc_device *pdev = video_drvdata(file);
int ret; int ret;
switch (c->id) switch (c->id) {
{
case V4L2_CID_BRIGHTNESS: case V4L2_CID_BRIGHTNESS:
c->value <<= 9; c->value <<= 9;
ret = pwc_set_brightness(pdev, c->value); ret = pwc_set_brightness(pdev, c->value);
if (ret<0) if (ret < 0)
return -EINVAL; return -EINVAL;
return 0; return 0;
case V4L2_CID_CONTRAST: case V4L2_CID_CONTRAST:
c->value <<= 10; c->value <<= 10;
ret = pwc_set_contrast(pdev, c->value); ret = pwc_set_contrast(pdev, c->value);
if (ret<0) if (ret < 0)
return -EINVAL; return -EINVAL;
return 0; return 0;
case V4L2_CID_SATURATION: case V4L2_CID_SATURATION:
ret = pwc_set_saturation(pdev, c->value); ret = pwc_set_saturation(pdev, c->value);
if (ret<0) if (ret < 0)
return -EINVAL; return -EINVAL;
return 0; return 0;
case V4L2_CID_GAMMA: case V4L2_CID_GAMMA:
c->value <<= 11; c->value <<= 11;
ret = pwc_set_gamma(pdev, c->value); ret = pwc_set_gamma(pdev, c->value);
if (ret<0) if (ret < 0)
return -EINVAL; return -EINVAL;
return 0; return 0;
case V4L2_CID_RED_BALANCE: case V4L2_CID_RED_BALANCE:
c->value <<= 8; c->value <<= 8;
ret = pwc_set_red_gain(pdev, c->value); ret = pwc_set_red_gain(pdev, c->value);
if (ret<0) if (ret < 0)
return -EINVAL; return -EINVAL;
return 0; return 0;
case V4L2_CID_BLUE_BALANCE: case V4L2_CID_BLUE_BALANCE:
c->value <<= 8; c->value <<= 8;
ret = pwc_set_blue_gain(pdev, c->value); ret = pwc_set_blue_gain(pdev, c->value);
if (ret<0) if (ret < 0)
return -EINVAL; return -EINVAL;
return 0; return 0;
case V4L2_CID_AUTO_WHITE_BALANCE: case V4L2_CID_AUTO_WHITE_BALANCE:
c->value = (c->value == 0)?PWC_WB_MANUAL:PWC_WB_AUTO; c->value = (c->value == 0) ? PWC_WB_MANUAL : PWC_WB_AUTO;
ret = pwc_set_awb(pdev, c->value); ret = pwc_set_awb(pdev, c->value);
if (ret<0) if (ret < 0)
return -EINVAL; return -EINVAL;
return 0; return 0;
case V4L2_CID_EXPOSURE: case V4L2_CID_EXPOSURE:
c->value <<= 8; c->value <<= 8;
ret = pwc_set_shutter_speed(pdev, c->value?0:1, c->value); ret = pwc_set_shutter_speed(pdev, c->value ? 0 : 1, c->value);
if (ret<0) if (ret < 0)
return -EINVAL; return -EINVAL;
return 0; return 0;
case V4L2_CID_AUTOGAIN: case V4L2_CID_AUTOGAIN:
...@@ -590,13 +552,13 @@ long pwc_video_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -590,13 +552,13 @@ long pwc_video_do_ioctl(struct file *file, unsigned int cmd, void *arg)
if (c->value == 0) if (c->value == 0)
return 0; return 0;
ret = pwc_set_agc(pdev, c->value, 0); ret = pwc_set_agc(pdev, c->value, 0);
if (ret<0) if (ret < 0)
return -EINVAL; return -EINVAL;
return 0; return 0;
case V4L2_CID_GAIN: case V4L2_CID_GAIN:
c->value <<= 8; c->value <<= 8;
ret = pwc_set_agc(pdev, 0, c->value); ret = pwc_set_agc(pdev, 0, c->value);
if (ret<0) if (ret < 0)
return -EINVAL; return -EINVAL;
return 0; return 0;
case V4L2_CID_PRIVATE_SAVE_USER: case V4L2_CID_PRIVATE_SAVE_USER:
...@@ -617,7 +579,7 @@ long pwc_video_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -617,7 +579,7 @@ long pwc_video_do_ioctl(struct file *file, unsigned int cmd, void *arg)
return -EINVAL; return -EINVAL;
return 0; return 0;
case V4L2_CID_PRIVATE_AUTOCONTOUR: case V4L2_CID_PRIVATE_AUTOCONTOUR:
c->value=(c->value == 1)?-1:0; c->value = (c->value == 1) ? -1 : 0;
ret = pwc_set_contour(pdev, c->value); ret = pwc_set_contour(pdev, c->value);
if (ret < 0) if (ret < 0)
return -EINVAL; return -EINVAL;
...@@ -645,89 +607,59 @@ long pwc_video_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -645,89 +607,59 @@ long pwc_video_do_ioctl(struct file *file, unsigned int cmd, void *arg)
} }
return -EINVAL; return -EINVAL;
} }
case VIDIOC_ENUM_FMT:
{
struct v4l2_fmtdesc *f = arg;
int index;
if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) static int pwc_enum_fmt_vid_cap(struct file *file, void *fh, struct v4l2_fmtdesc *f)
return -EINVAL; {
struct pwc_device *pdev = video_drvdata(file);
/* We only support two format: the raw format, and YUV */ /* We only support two format: the raw format, and YUV */
index = f->index; switch (f->index) {
memset(f,0,sizeof(struct v4l2_fmtdesc));
f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
f->index = index;
switch(index)
{
case 0: case 0:
/* RAW format */ /* RAW format */
f->pixelformat = pdev->type<=646?V4L2_PIX_FMT_PWC1:V4L2_PIX_FMT_PWC2; f->pixelformat = pdev->type <= 646 ? V4L2_PIX_FMT_PWC1 : V4L2_PIX_FMT_PWC2;
f->flags = V4L2_FMT_FLAG_COMPRESSED; f->flags = V4L2_FMT_FLAG_COMPRESSED;
strlcpy(f->description,"Raw Philips Webcam",sizeof(f->description)); strlcpy(f->description, "Raw Philips Webcam", sizeof(f->description));
break; break;
case 1: case 1:
f->pixelformat = V4L2_PIX_FMT_YUV420; f->pixelformat = V4L2_PIX_FMT_YUV420;
strlcpy(f->description,"4:2:0, planar, Y-Cb-Cr",sizeof(f->description)); strlcpy(f->description, "4:2:0, planar, Y-Cb-Cr", sizeof(f->description));
break; break;
default: default:
return -EINVAL; return -EINVAL;
} }
return 0; return 0;
} }
case VIDIOC_G_FMT:
{
struct v4l2_format *f = arg;
PWC_DEBUG_IOCTL("ioctl(VIDIOC_G_FMT) return size %dx%d\n",pdev->image.x,pdev->image.y); static int pwc_g_fmt_vid_cap(struct file *file, void *fh, struct v4l2_format *f)
if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {
return -EINVAL; struct pwc_device *pdev = video_drvdata(file);
PWC_DEBUG_IOCTL("ioctl(VIDIOC_G_FMT) return size %dx%d\n",
pdev->image.x, pdev->image.y);
pwc_vidioc_fill_fmt(pdev, f); pwc_vidioc_fill_fmt(pdev, f);
return 0; return 0;
} }
case VIDIOC_TRY_FMT:
return pwc_vidioc_try_fmt(pdev, arg);
case VIDIOC_S_FMT: static int pwc_try_fmt_vid_cap(struct file *file, void *fh, struct v4l2_format *f)
return pwc_vidioc_set_fmt(pdev, arg); {
struct pwc_device *pdev = video_drvdata(file);
case VIDIOC_G_STD: return pwc_vidioc_try_fmt(pdev, f);
{ }
v4l2_std_id *std = arg;
*std = V4L2_STD_UNKNOWN;
return 0;
}
case VIDIOC_S_STD: static int pwc_s_fmt_vid_cap(struct file *file, void *fh, struct v4l2_format *f)
{ {
v4l2_std_id *std = arg; struct pwc_device *pdev = video_drvdata(file);
if (*std != V4L2_STD_UNKNOWN)
return -EINVAL;
return 0;
}
case VIDIOC_ENUMSTD: return pwc_vidioc_set_fmt(pdev, f);
{ }
struct v4l2_standard *std = arg;
if (std->index != 0)
return -EINVAL;
std->id = V4L2_STD_UNKNOWN;
strlcpy(std->name, "webcam", sizeof(std->name));
return 0;
}
case VIDIOC_REQBUFS: static int pwc_reqbufs(struct file *file, void *fh, struct v4l2_requestbuffers *rb)
{ {
struct v4l2_requestbuffers *rb = arg;
int nbuffers; int nbuffers;
PWC_DEBUG_IOCTL("ioctl(VIDIOC_REQBUFS) count=%d\n",rb->count); PWC_DEBUG_IOCTL("ioctl(VIDIOC_REQBUFS) count=%d\n", rb->count);
if (rb->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) if (rb->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
return -EINVAL; return -EINVAL;
if (rb->memory != V4L2_MEMORY_MMAP) if (rb->memory != V4L2_MEMORY_MMAP)
...@@ -741,31 +673,24 @@ long pwc_video_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -741,31 +673,24 @@ long pwc_video_do_ioctl(struct file *file, unsigned int cmd, void *arg)
/* Force to use our # of buffers */ /* Force to use our # of buffers */
rb->count = pwc_mbufs; rb->count = pwc_mbufs;
return 0; return 0;
} }
case VIDIOC_QUERYBUF: static int pwc_querybuf(struct file *file, void *fh, struct v4l2_buffer *buf)
{ {
struct v4l2_buffer *buf = arg; struct pwc_device *pdev = video_drvdata(file);
int index; int index;
PWC_DEBUG_IOCTL("ioctl(VIDIOC_QUERYBUF) index=%d\n",buf->index); PWC_DEBUG_IOCTL("ioctl(VIDIOC_QUERYBUF) index=%d\n", buf->index);
if (buf->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) { if (buf->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {
PWC_DEBUG_IOCTL("ioctl(VIDIOC_QUERYBUF) Bad type\n"); PWC_DEBUG_IOCTL("ioctl(VIDIOC_QUERYBUF) Bad type\n");
return -EINVAL; return -EINVAL;
} }
if (buf->memory != V4L2_MEMORY_MMAP) {
PWC_DEBUG_IOCTL("ioctl(VIDIOC_QUERYBUF) Bad memory type\n");
return -EINVAL;
}
index = buf->index; index = buf->index;
if (index < 0 || index >= pwc_mbufs) { if (index < 0 || index >= pwc_mbufs) {
PWC_DEBUG_IOCTL("ioctl(VIDIOC_QUERYBUF) Bad index %d\n", buf->index); PWC_DEBUG_IOCTL("ioctl(VIDIOC_QUERYBUF) Bad index %d\n", buf->index);
return -EINVAL; return -EINVAL;
} }
memset(buf, 0, sizeof(struct v4l2_buffer));
buf->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
buf->index = index;
buf->m.offset = index * pdev->len_per_image; buf->m.offset = index * pdev->len_per_image;
if (pdev->pixfmt != V4L2_PIX_FMT_YUV420) if (pdev->pixfmt != V4L2_PIX_FMT_YUV420)
buf->bytesused = pdev->frame_size + sizeof(struct pwc_raw_frame); buf->bytesused = pdev->frame_size + sizeof(struct pwc_raw_frame);
...@@ -773,21 +698,19 @@ long pwc_video_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -773,21 +698,19 @@ long pwc_video_do_ioctl(struct file *file, unsigned int cmd, void *arg)
buf->bytesused = pdev->view.size; buf->bytesused = pdev->view.size;
buf->field = V4L2_FIELD_NONE; buf->field = V4L2_FIELD_NONE;
buf->memory = V4L2_MEMORY_MMAP; buf->memory = V4L2_MEMORY_MMAP;
//buf->flags = V4L2_BUF_FLAG_MAPPED; /*buf->flags = V4L2_BUF_FLAG_MAPPED;*/
buf->length = pdev->len_per_image; buf->length = pdev->len_per_image;
PWC_DEBUG_READ("VIDIOC_QUERYBUF: index=%d\n",buf->index); PWC_DEBUG_READ("VIDIOC_QUERYBUF: index=%d\n", buf->index);
PWC_DEBUG_READ("VIDIOC_QUERYBUF: m.offset=%d\n",buf->m.offset); PWC_DEBUG_READ("VIDIOC_QUERYBUF: m.offset=%d\n", buf->m.offset);
PWC_DEBUG_READ("VIDIOC_QUERYBUF: bytesused=%d\n",buf->bytesused); PWC_DEBUG_READ("VIDIOC_QUERYBUF: bytesused=%d\n", buf->bytesused);
return 0; return 0;
} }
case VIDIOC_QBUF:
{
struct v4l2_buffer *buf = arg;
PWC_DEBUG_IOCTL("ioctl(VIDIOC_QBUF) index=%d\n",buf->index); static int pwc_qbuf(struct file *file, void *fh, struct v4l2_buffer *buf)
{
PWC_DEBUG_IOCTL("ioctl(VIDIOC_QBUF) index=%d\n", buf->index);
if (buf->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) if (buf->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
return -EINVAL; return -EINVAL;
if (buf->memory != V4L2_MEMORY_MMAP) if (buf->memory != V4L2_MEMORY_MMAP)
...@@ -799,11 +722,12 @@ long pwc_video_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -799,11 +722,12 @@ long pwc_video_do_ioctl(struct file *file, unsigned int cmd, void *arg)
buf->flags &= ~V4L2_BUF_FLAG_DONE; buf->flags &= ~V4L2_BUF_FLAG_DONE;
return 0; return 0;
} }
case VIDIOC_DQBUF: static int pwc_dqbuf(struct file *file, void *fh, struct v4l2_buffer *buf)
{ {
struct v4l2_buffer *buf = arg; DECLARE_WAITQUEUE(wait, current);
struct pwc_device *pdev = video_drvdata(file);
int ret; int ret;
PWC_DEBUG_IOCTL("ioctl(VIDIOC_DQBUF)\n"); PWC_DEBUG_IOCTL("ioctl(VIDIOC_DQBUF)\n");
...@@ -811,12 +735,6 @@ long pwc_video_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -811,12 +735,6 @@ long pwc_video_do_ioctl(struct file *file, unsigned int cmd, void *arg)
if (buf->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) if (buf->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
return -EINVAL; return -EINVAL;
/* Add ourselves to the frame wait-queue.
FIXME: needs auditing for safety.
QUESTION: In what respect? I think that using the
frameq is safe now.
*/
add_wait_queue(&pdev->frameq, &wait); add_wait_queue(&pdev->frameq, &wait);
while (pdev->full_frames == NULL) { while (pdev->full_frames == NULL) {
if (pdev->error_status) { if (pdev->error_status) {
...@@ -859,29 +777,34 @@ long pwc_video_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -859,29 +777,34 @@ long pwc_video_do_ioctl(struct file *file, unsigned int cmd, void *arg)
buf->length = pdev->len_per_image; buf->length = pdev->len_per_image;
pwc_next_image(pdev); pwc_next_image(pdev);
PWC_DEBUG_IOCTL("VIDIOC_DQBUF: buf->index=%d\n",buf->index); PWC_DEBUG_IOCTL("VIDIOC_DQBUF: buf->index=%d\n", buf->index);
PWC_DEBUG_IOCTL("VIDIOC_DQBUF: buf->length=%d\n",buf->length); PWC_DEBUG_IOCTL("VIDIOC_DQBUF: buf->length=%d\n", buf->length);
PWC_DEBUG_IOCTL("VIDIOC_DQBUF: m.offset=%d\n",buf->m.offset); PWC_DEBUG_IOCTL("VIDIOC_DQBUF: m.offset=%d\n", buf->m.offset);
PWC_DEBUG_IOCTL("VIDIOC_DQBUF: bytesused=%d\n",buf->bytesused); PWC_DEBUG_IOCTL("VIDIOC_DQBUF: bytesused=%d\n", buf->bytesused);
PWC_DEBUG_IOCTL("VIDIOC_DQBUF: leaving\n"); PWC_DEBUG_IOCTL("VIDIOC_DQBUF: leaving\n");
return 0; return 0;
} }
static int pwc_streamon(struct file *file, void *fh, enum v4l2_buf_type i)
{
struct pwc_device *pdev = video_drvdata(file);
case VIDIOC_STREAMON:
{
return pwc_isoc_init(pdev); return pwc_isoc_init(pdev);
} }
static int pwc_streamoff(struct file *file, void *fh, enum v4l2_buf_type i)
{
struct pwc_device *pdev = video_drvdata(file);
case VIDIOC_STREAMOFF:
{
pwc_isoc_cleanup(pdev); pwc_isoc_cleanup(pdev);
return 0; return 0;
} }
case VIDIOC_ENUM_FRAMESIZES: static int pwc_enum_framesizes(struct file *file, void *fh,
{ struct v4l2_frmsizeenum *fsize)
struct v4l2_frmsizeenum *fsize = arg; {
struct pwc_device *pdev = video_drvdata(file);
unsigned int i = 0, index = fsize->index; unsigned int i = 0, index = fsize->index;
if (fsize->pixel_format == V4L2_PIX_FMT_YUV420) { if (fsize->pixel_format == V4L2_PIX_FMT_YUV420) {
...@@ -905,11 +828,12 @@ long pwc_video_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -905,11 +828,12 @@ long pwc_video_do_ioctl(struct file *file, unsigned int cmd, void *arg)
return 0; return 0;
} }
return -EINVAL; return -EINVAL;
} }
case VIDIOC_ENUM_FRAMEINTERVALS: static int pwc_enum_frameintervals(struct file *file, void *fh,
{ struct v4l2_frmivalenum *fival)
struct v4l2_frmivalenum *fival = arg; {
struct pwc_device *pdev = video_drvdata(file);
int size = -1; int size = -1;
unsigned int i; unsigned int i;
...@@ -922,9 +846,8 @@ long pwc_video_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -922,9 +846,8 @@ long pwc_video_do_ioctl(struct file *file, unsigned int cmd, void *arg)
} }
/* TODO: Support raw format */ /* TODO: Support raw format */
if (size < 0 || fival->pixel_format != V4L2_PIX_FMT_YUV420) { if (size < 0 || fival->pixel_format != V4L2_PIX_FMT_YUV420)
return -EINVAL; return -EINVAL;
}
i = pwc_get_fps(pdev, fival->index, size); i = pwc_get_fps(pdev, fival->index, size);
if (!i) if (!i)
...@@ -935,12 +858,37 @@ long pwc_video_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -935,12 +858,37 @@ long pwc_video_do_ioctl(struct file *file, unsigned int cmd, void *arg)
fival->discrete.denominator = i; fival->discrete.denominator = i;
return 0; return 0;
} }
static long pwc_default(struct file *file, void *fh, int cmd, void *arg)
{
struct pwc_device *pdev = video_drvdata(file);
default:
return pwc_ioctl(pdev, cmd, arg); return pwc_ioctl(pdev, cmd, arg);
} /* ..switch */
return 0;
} }
const struct v4l2_ioctl_ops pwc_ioctl_ops = {
.vidioc_querycap = pwc_querycap,
.vidioc_enum_input = pwc_enum_input,
.vidioc_g_input = pwc_g_input,
.vidioc_s_input = pwc_s_input,
.vidioc_enum_fmt_vid_cap = pwc_enum_fmt_vid_cap,
.vidioc_g_fmt_vid_cap = pwc_g_fmt_vid_cap,
.vidioc_s_fmt_vid_cap = pwc_s_fmt_vid_cap,
.vidioc_try_fmt_vid_cap = pwc_try_fmt_vid_cap,
.vidioc_queryctrl = pwc_queryctrl,
.vidioc_g_ctrl = pwc_g_ctrl,
.vidioc_s_ctrl = pwc_s_ctrl,
.vidioc_reqbufs = pwc_reqbufs,
.vidioc_querybuf = pwc_querybuf,
.vidioc_qbuf = pwc_qbuf,
.vidioc_dqbuf = pwc_dqbuf,
.vidioc_streamon = pwc_streamon,
.vidioc_streamoff = pwc_streamoff,
.vidioc_enum_framesizes = pwc_enum_framesizes,
.vidioc_enum_frameintervals = pwc_enum_frameintervals,
.vidioc_default = pwc_default,
};
/* vim: set cino= formatoptions=croql cindent shiftwidth=8 tabstop=8: */ /* vim: set cino= formatoptions=croql cindent shiftwidth=8 tabstop=8: */
drivers/media/video/pwc/pwc.h
浏览文件 @ afa38521
...@@ -339,8 +339,7 @@ extern int pwc_camera_power(struct pwc_device *pdev, int power); ...@@ -339,8 +339,7 @@ extern int pwc_camera_power(struct pwc_device *pdev, int power);
/* Private ioctl()s; see pwc-ioctl.h */ /* Private ioctl()s; see pwc-ioctl.h */
extern long pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg); extern long pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg);
/** Functions in pwc-v4l.c */ extern const struct v4l2_ioctl_ops pwc_ioctl_ops;
extern long pwc_video_do_ioctl(struct file *file, unsigned int cmd, void *arg);
/** pwc-uncompress.c */ /** pwc-uncompress.c */
/* Expand frame to image, possibly including decompression. Uses read_frame and fill_image */ /* Expand frame to image, possibly including decompression. Uses read_frame and fill_image */
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或