korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-02 08:34:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

[media] v4l2-core: deprecate V4L2_BUF_TYPE_PRIVATE

Browse Source 
This buffer type isn't used at all, and since it is effectively undefined
what it should do it is deprecated. The define still exists, but any
internal support for such buffers is removed.
The decisions to deprecate this was taken during the 2012 Media Workshop.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Hans Verkuil 2012-09-17 05:02:26 -03:00 committed by Mauro Carvalho Chehab
parent 72c2af6ec1
commit 633c98e52a
5 changed files with 7 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/media/v4l2-core/v4l2-compat-ioctl32.c
View File

@ -195,10 +195,6 @@ static int __get_v4l2_format32(struct v4l2_format *kp, struct v4l2_format32 __us
case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE: case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE:
case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT: case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT:
return get_v4l2_sliced_vbi_format(&kp->fmt.sliced, &up->fmt.sliced); return get_v4l2_sliced_vbi_format(&kp->fmt.sliced, &up->fmt.sliced);
case V4L2_BUF_TYPE_PRIVATE:
if (copy_from_user(kp, up, sizeof(kp->fmt.raw_data)))
return -EFAULT;
return 0;
default: default:
printk(KERN_INFO "compat_ioctl32: unexpected VIDIOC_FMT type %d\n", printk(KERN_INFO "compat_ioctl32: unexpected VIDIOC_FMT type %d\n",
kp->type); kp->type);
@ -241,10 +237,6 @@ static int __put_v4l2_format32(struct v4l2_format *kp, struct v4l2_format32 __us
case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE: case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE:
case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT: case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT:
return put_v4l2_sliced_vbi_format(&kp->fmt.sliced, &up->fmt.sliced); return put_v4l2_sliced_vbi_format(&kp->fmt.sliced, &up->fmt.sliced);
case V4L2_BUF_TYPE_PRIVATE:
if (copy_to_user(up, kp, sizeof(up->fmt.raw_data)))
return -EFAULT;
return 0;
default: default:
printk(KERN_INFO "compat_ioctl32: unexpected VIDIOC_FMT type %d\n", printk(KERN_INFO "compat_ioctl32: unexpected VIDIOC_FMT type %d\n",
kp->type); kp->type);

12
drivers/media/v4l2-core/v4l2-dev.c
View File

@ -565,8 +565,7 @@ static void determine_valid_ioctls(struct video_device *vdev)
ops->vidioc_enum_fmt_vid_out || ops->vidioc_enum_fmt_vid_out ||
ops->vidioc_enum_fmt_vid_cap_mplane || ops->vidioc_enum_fmt_vid_cap_mplane ||
ops->vidioc_enum_fmt_vid_out_mplane || ops->vidioc_enum_fmt_vid_out_mplane ||
ops->vidioc_enum_fmt_vid_overlay || ops->vidioc_enum_fmt_vid_overlay)
ops->vidioc_enum_fmt_type_private)
set_bit(_IOC_NR(VIDIOC_ENUM_FMT), valid_ioctls); set_bit(_IOC_NR(VIDIOC_ENUM_FMT), valid_ioctls);
if (ops->vidioc_g_fmt_vid_cap || if (ops->vidioc_g_fmt_vid_cap ||
ops->vidioc_g_fmt_vid_out || ops->vidioc_g_fmt_vid_out ||
@ -577,8 +576,7 @@ static void determine_valid_ioctls(struct video_device *vdev)
ops->vidioc_g_fmt_vid_out_overlay || ops->vidioc_g_fmt_vid_out_overlay ||
ops->vidioc_g_fmt_vbi_out || ops->vidioc_g_fmt_vbi_out ||
ops->vidioc_g_fmt_sliced_vbi_cap || ops->vidioc_g_fmt_sliced_vbi_cap ||
ops->vidioc_g_fmt_sliced_vbi_out || ops->vidioc_g_fmt_sliced_vbi_out)
ops->vidioc_g_fmt_type_private)
set_bit(_IOC_NR(VIDIOC_G_FMT), valid_ioctls); set_bit(_IOC_NR(VIDIOC_G_FMT), valid_ioctls);
if (ops->vidioc_s_fmt_vid_cap || if (ops->vidioc_s_fmt_vid_cap ||
ops->vidioc_s_fmt_vid_out || ops->vidioc_s_fmt_vid_out ||
@ -589,8 +587,7 @@ static void determine_valid_ioctls(struct video_device *vdev)
ops->vidioc_s_fmt_vid_out_overlay || ops->vidioc_s_fmt_vid_out_overlay ||
ops->vidioc_s_fmt_vbi_out || ops->vidioc_s_fmt_vbi_out ||
ops->vidioc_s_fmt_sliced_vbi_cap || ops->vidioc_s_fmt_sliced_vbi_cap ||
ops->vidioc_s_fmt_sliced_vbi_out || ops->vidioc_s_fmt_sliced_vbi_out)
ops->vidioc_s_fmt_type_private)
set_bit(_IOC_NR(VIDIOC_S_FMT), valid_ioctls); set_bit(_IOC_NR(VIDIOC_S_FMT), valid_ioctls);
if (ops->vidioc_try_fmt_vid_cap || if (ops->vidioc_try_fmt_vid_cap ||
ops->vidioc_try_fmt_vid_out || ops->vidioc_try_fmt_vid_out ||
@ -601,8 +598,7 @@ static void determine_valid_ioctls(struct video_device *vdev)
ops->vidioc_try_fmt_vid_out_overlay || ops->vidioc_try_fmt_vid_out_overlay ||
ops->vidioc_try_fmt_vbi_out || ops->vidioc_try_fmt_vbi_out ||
ops->vidioc_try_fmt_sliced_vbi_cap || ops->vidioc_try_fmt_sliced_vbi_cap ||
ops->vidioc_try_fmt_sliced_vbi_out || ops->vidioc_try_fmt_sliced_vbi_out)
ops->vidioc_try_fmt_type_private)
set_bit(_IOC_NR(VIDIOC_TRY_FMT), valid_ioctls); set_bit(_IOC_NR(VIDIOC_TRY_FMT), valid_ioctls);
SET_VALID_IOCTL(ops, VIDIOC_REQBUFS, vidioc_reqbufs); SET_VALID_IOCTL(ops, VIDIOC_REQBUFS, vidioc_reqbufs);
SET_VALID_IOCTL(ops, VIDIOC_QUERYBUF, vidioc_querybuf); SET_VALID_IOCTL(ops, VIDIOC_QUERYBUF, vidioc_querybuf);

26
drivers/media/v4l2-core/v4l2-ioctl.c
View File

@ -316,9 +316,6 @@ static void v4l_print_format(const void *arg, bool write_only)
sliced->service_lines[0][i], sliced->service_lines[0][i],
sliced->service_lines[1][i]); sliced->service_lines[1][i]);
break; break;
case V4L2_BUF_TYPE_PRIVATE:
pr_cont("\n");
break;
} }
} }
@ -927,9 +924,7 @@ static int check_fmt(const struct v4l2_ioctl_ops *ops, enum v4l2_buf_type type)
if (ops->vidioc_g_fmt_sliced_vbi_out) if (ops->vidioc_g_fmt_sliced_vbi_out)
return 0; return 0;
break; break;
case V4L2_BUF_TYPE_PRIVATE: default:
if (ops->vidioc_g_fmt_type_private)
return 0;
break; break;
} }
return -EINVAL; return -EINVAL;
@ -1051,10 +1046,6 @@ static int v4l_enum_fmt(const struct v4l2_ioctl_ops *ops,
if (unlikely(!ops->vidioc_enum_fmt_vid_out_mplane)) if (unlikely(!ops->vidioc_enum_fmt_vid_out_mplane))
break; break;
return ops->vidioc_enum_fmt_vid_out_mplane(file, fh, arg); return ops->vidioc_enum_fmt_vid_out_mplane(file, fh, arg);
case V4L2_BUF_TYPE_PRIVATE:
if (unlikely(!ops->vidioc_enum_fmt_type_private))
break;
return ops->vidioc_enum_fmt_type_private(file, fh, arg);
} }
return -EINVAL; return -EINVAL;
} }
@ -1105,10 +1096,6 @@ static int v4l_g_fmt(const struct v4l2_ioctl_ops *ops,
if (unlikely(!ops->vidioc_g_fmt_sliced_vbi_out)) if (unlikely(!ops->vidioc_g_fmt_sliced_vbi_out))
break; break;
return ops->vidioc_g_fmt_sliced_vbi_out(file, fh, arg); return ops->vidioc_g_fmt_sliced_vbi_out(file, fh, arg);
case V4L2_BUF_TYPE_PRIVATE:
if (unlikely(!ops->vidioc_g_fmt_type_private))
break;
return ops->vidioc_g_fmt_type_private(file, fh, arg);
} }
return -EINVAL; return -EINVAL;
} }
@ -1169,10 +1156,6 @@ static int v4l_s_fmt(const struct v4l2_ioctl_ops *ops,
break; break;
CLEAR_AFTER_FIELD(p, fmt.sliced); CLEAR_AFTER_FIELD(p, fmt.sliced);
return ops->vidioc_s_fmt_sliced_vbi_out(file, fh, arg); return ops->vidioc_s_fmt_sliced_vbi_out(file, fh, arg);
case V4L2_BUF_TYPE_PRIVATE:
if (unlikely(!ops->vidioc_s_fmt_type_private))
break;
return ops->vidioc_s_fmt_type_private(file, fh, arg);
} }
return -EINVAL; return -EINVAL;
} }
@ -1233,10 +1216,6 @@ static int v4l_try_fmt(const struct v4l2_ioctl_ops *ops,
break; break;
CLEAR_AFTER_FIELD(p, fmt.sliced); CLEAR_AFTER_FIELD(p, fmt.sliced);
return ops->vidioc_try_fmt_sliced_vbi_out(file, fh, arg); return ops->vidioc_try_fmt_sliced_vbi_out(file, fh, arg);
case V4L2_BUF_TYPE_PRIVATE:
if (unlikely(!ops->vidioc_try_fmt_type_private))
break;
return ops->vidioc_try_fmt_type_private(file, fh, arg);
} }
return -EINVAL; return -EINVAL;
} }
@ -1425,8 +1404,7 @@ static int v4l_reqbufs(const struct v4l2_ioctl_ops *ops,
if (ret) if (ret)
return ret; return ret;
if (p->type < V4L2_BUF_TYPE_PRIVATE) CLEAR_AFTER_FIELD(p, memory);
CLEAR_AFTER_FIELD(p, memory);
return ops->vidioc_reqbufs(file, fh, p); return ops->vidioc_reqbufs(file, fh, p);
} }

1
include/linux/videodev2.h
View File

@ -162,6 +162,7 @@ enum v4l2_buf_type {
#endif #endif
V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE = 9, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE = 9,
V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE = 10, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE = 10,
/* Deprecated, do not use */
V4L2_BUF_TYPE_PRIVATE = 0x80, V4L2_BUF_TYPE_PRIVATE = 0x80,
}; };

8
include/media/v4l2-ioctl.h
View File

@ -40,8 +40,6 @@ struct v4l2_ioctl_ops {
struct v4l2_fmtdesc *f); struct v4l2_fmtdesc *f);
int (*vidioc_enum_fmt_vid_out_mplane)(struct file *file, void *fh, int (*vidioc_enum_fmt_vid_out_mplane)(struct file *file, void *fh,
struct v4l2_fmtdesc *f); struct v4l2_fmtdesc *f);
int (*vidioc_enum_fmt_type_private)(struct file *file, void *fh,
struct v4l2_fmtdesc *f);
/* VIDIOC_G_FMT handlers */ /* VIDIOC_G_FMT handlers */
int (*vidioc_g_fmt_vid_cap) (struct file *file, void *fh, int (*vidioc_g_fmt_vid_cap) (struct file *file, void *fh,
@ -64,8 +62,6 @@ struct v4l2_ioctl_ops {
struct v4l2_format *f); struct v4l2_format *f);
int (*vidioc_g_fmt_vid_out_mplane)(struct file *file, void *fh, int (*vidioc_g_fmt_vid_out_mplane)(struct file *file, void *fh,
struct v4l2_format *f); struct v4l2_format *f);
int (*vidioc_g_fmt_type_private)(struct file *file, void *fh,
struct v4l2_format *f);
/* VIDIOC_S_FMT handlers */ /* VIDIOC_S_FMT handlers */
int (*vidioc_s_fmt_vid_cap) (struct file *file, void *fh, int (*vidioc_s_fmt_vid_cap) (struct file *file, void *fh,
@ -88,8 +84,6 @@ struct v4l2_ioctl_ops {
struct v4l2_format *f); struct v4l2_format *f);
int (*vidioc_s_fmt_vid_out_mplane)(struct file *file, void *fh, int (*vidioc_s_fmt_vid_out_mplane)(struct file *file, void *fh,
struct v4l2_format *f); struct v4l2_format *f);
int (*vidioc_s_fmt_type_private)(struct file *file, void *fh,
struct v4l2_format *f);
/* VIDIOC_TRY_FMT handlers */ /* VIDIOC_TRY_FMT handlers */
int (*vidioc_try_fmt_vid_cap) (struct file *file, void *fh, int (*vidioc_try_fmt_vid_cap) (struct file *file, void *fh,
@ -112,8 +106,6 @@ struct v4l2_ioctl_ops {
struct v4l2_format *f); struct v4l2_format *f);
int (*vidioc_try_fmt_vid_out_mplane)(struct file *file, void *fh, int (*vidioc_try_fmt_vid_out_mplane)(struct file *file, void *fh,
struct v4l2_format *f); struct v4l2_format *f);
int (*vidioc_try_fmt_type_private)(struct file *file, void *fh,
struct v4l2_format *f);
/* Buffer handlers */ /* Buffer handlers */
int (*vidioc_reqbufs) (struct file *file, void *fh, struct v4l2_requestbuffers *b); int (*vidioc_reqbufs) (struct file *file, void *fh, struct v4l2_requestbuffers *b);