Skip to content

L
linux
Commit 78b526a4 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files
Options

V4L/DVB (7949): videodev: renamed the vidioc_*_fmt_* callbacks 

The naming for the callbacks that handle the VIDIOC_ENUM_FMT and
VIDIOC_S/G/TRY_FMT ioctls was very confusing. Renamed it to match
the v4l2_buf_type name.
Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 0e3bd2b9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 302 additions and 310 deletions
drivers/media/video/bt8xx/bttv-driver.c
View file @ 78b526a4
...@@ -2448,7 +2448,7 @@ pix_format_set_size (struct v4l2_pix_format * f, ...@@ -2448,7 +2448,7 @@ pix_format_set_size (struct v4l2_pix_format * f,
} }
} }
static int bttv_g_fmt_cap(struct file *file, void *priv, static int bttv_g_fmt_vid_cap(struct file *file, void *priv,
struct v4l2_format *f) struct v4l2_format *f)
{ {
struct bttv_fh *fh = priv; struct bttv_fh *fh = priv;
...@@ -2461,7 +2461,7 @@ static int bttv_g_fmt_cap(struct file *file, void *priv, ...@@ -2461,7 +2461,7 @@ static int bttv_g_fmt_cap(struct file *file, void *priv,
return 0; return 0;
} }
static int bttv_g_fmt_overlay(struct file *file, void *priv, static int bttv_g_fmt_vid_overlay(struct file *file, void *priv,
struct v4l2_format *f) struct v4l2_format *f)
{ {
struct bttv_fh *fh = priv; struct bttv_fh *fh = priv;
...@@ -2472,7 +2472,7 @@ static int bttv_g_fmt_overlay(struct file *file, void *priv, ...@@ -2472,7 +2472,7 @@ static int bttv_g_fmt_overlay(struct file *file, void *priv,
return 0; return 0;
} }
static int bttv_try_fmt_cap(struct file *file, void *priv, static int bttv_try_fmt_vid_cap(struct file *file, void *priv,
struct v4l2_format *f) struct v4l2_format *f)
{ {
const struct bttv_format *fmt; const struct bttv_format *fmt;
...@@ -2532,7 +2532,7 @@ static int bttv_try_fmt_cap(struct file *file, void *priv, ...@@ -2532,7 +2532,7 @@ static int bttv_try_fmt_cap(struct file *file, void *priv,
return 0; return 0;
} }
static int bttv_try_fmt_overlay(struct file *file, void *priv, static int bttv_try_fmt_vid_overlay(struct file *file, void *priv,
struct v4l2_format *f) struct v4l2_format *f)
{ {
struct bttv_fh *fh = priv; struct bttv_fh *fh = priv;
...@@ -2542,7 +2542,7 @@ static int bttv_try_fmt_overlay(struct file *file, void *priv, ...@@ -2542,7 +2542,7 @@ static int bttv_try_fmt_overlay(struct file *file, void *priv,
/* adjust_crop */ 0); /* adjust_crop */ 0);
} }
static int bttv_s_fmt_cap(struct file *file, void *priv, static int bttv_s_fmt_vid_cap(struct file *file, void *priv,
struct v4l2_format *f) struct v4l2_format *f)
{ {
int retval; int retval;
...@@ -2556,7 +2556,7 @@ static int bttv_s_fmt_cap(struct file *file, void *priv, ...@@ -2556,7 +2556,7 @@ static int bttv_s_fmt_cap(struct file *file, void *priv,
if (0 != retval) if (0 != retval)
return retval; return retval;
retval = bttv_try_fmt_cap(file, priv, f); retval = bttv_try_fmt_vid_cap(file, priv, f);
if (0 != retval) if (0 != retval)
return retval; return retval;
...@@ -2591,7 +2591,7 @@ static int bttv_s_fmt_cap(struct file *file, void *priv, ...@@ -2591,7 +2591,7 @@ static int bttv_s_fmt_cap(struct file *file, void *priv,
return 0; return 0;
} }
static int bttv_s_fmt_overlay(struct file *file, void *priv, static int bttv_s_fmt_vid_overlay(struct file *file, void *priv,
struct v4l2_format *f) struct v4l2_format *f)
{ {
struct bttv_fh *fh = priv; struct bttv_fh *fh = priv;
...@@ -2661,7 +2661,7 @@ static int bttv_querycap(struct file *file, void *priv, ...@@ -2661,7 +2661,7 @@ static int bttv_querycap(struct file *file, void *priv,
return 0; return 0;
} }
static int bttv_enum_fmt_vbi(struct file *file, void *priv, static int bttv_enum_fmt_vbi_cap(struct file *file, void *priv,
struct v4l2_fmtdesc *f) struct v4l2_fmtdesc *f)
{ {
if (0 != f->index) if (0 != f->index)
...@@ -2692,7 +2692,7 @@ static int bttv_enum_fmt_cap_ovr(struct v4l2_fmtdesc *f) ...@@ -2692,7 +2692,7 @@ static int bttv_enum_fmt_cap_ovr(struct v4l2_fmtdesc *f)
return i; return i;
} }
static int bttv_enum_fmt_cap(struct file *file, void *priv, static int bttv_enum_fmt_vid_cap(struct file *file, void *priv,
struct v4l2_fmtdesc *f) struct v4l2_fmtdesc *f)
{ {
int rc = bttv_enum_fmt_cap_ovr(f); int rc = bttv_enum_fmt_cap_ovr(f);
...@@ -2703,7 +2703,7 @@ static int bttv_enum_fmt_cap(struct file *file, void *priv, ...@@ -2703,7 +2703,7 @@ static int bttv_enum_fmt_cap(struct file *file, void *priv,
return 0; return 0;
} }
static int bttv_enum_fmt_overlay(struct file *file, void *priv, static int bttv_enum_fmt_vid_overlay(struct file *file, void *priv,
struct v4l2_fmtdesc *f) struct v4l2_fmtdesc *f)
{ {
int rc; int rc;
...@@ -3362,18 +3362,18 @@ static struct video_device bttv_video_template = ...@@ -3362,18 +3362,18 @@ static struct video_device bttv_video_template =
.fops = &bttv_fops, .fops = &bttv_fops,
.minor = -1, .minor = -1,
.vidioc_querycap = bttv_querycap, .vidioc_querycap = bttv_querycap,
.vidioc_enum_fmt_cap = bttv_enum_fmt_cap, .vidioc_enum_fmt_vid_cap = bttv_enum_fmt_vid_cap,
.vidioc_g_fmt_cap = bttv_g_fmt_cap, .vidioc_g_fmt_vid_cap = bttv_g_fmt_vid_cap,
.vidioc_try_fmt_cap = bttv_try_fmt_cap, .vidioc_try_fmt_vid_cap = bttv_try_fmt_vid_cap,
.vidioc_s_fmt_cap = bttv_s_fmt_cap, .vidioc_s_fmt_vid_cap = bttv_s_fmt_vid_cap,
.vidioc_enum_fmt_overlay = bttv_enum_fmt_overlay, .vidioc_enum_fmt_vid_overlay = bttv_enum_fmt_vid_overlay,
.vidioc_g_fmt_overlay = bttv_g_fmt_overlay, .vidioc_g_fmt_vid_overlay = bttv_g_fmt_vid_overlay,
.vidioc_try_fmt_overlay = bttv_try_fmt_overlay, .vidioc_try_fmt_vid_overlay = bttv_try_fmt_vid_overlay,
.vidioc_s_fmt_overlay = bttv_s_fmt_overlay, .vidioc_s_fmt_vid_overlay = bttv_s_fmt_vid_overlay,
.vidioc_enum_fmt_vbi = bttv_enum_fmt_vbi, .vidioc_enum_fmt_vbi_cap = bttv_enum_fmt_vbi_cap,
.vidioc_g_fmt_vbi = bttv_g_fmt_vbi, .vidioc_g_fmt_vbi_cap = bttv_g_fmt_vbi_cap,
.vidioc_try_fmt_vbi = bttv_try_fmt_vbi, .vidioc_try_fmt_vbi_cap = bttv_try_fmt_vbi_cap,
.vidioc_s_fmt_vbi = bttv_s_fmt_vbi, .vidioc_s_fmt_vbi_cap = bttv_s_fmt_vbi_cap,
.vidioc_g_audio = bttv_g_audio, .vidioc_g_audio = bttv_g_audio,
.vidioc_s_audio = bttv_s_audio, .vidioc_s_audio = bttv_s_audio,
.vidioc_cropcap = bttv_cropcap, .vidioc_cropcap = bttv_cropcap,
......
drivers/media/video/bt8xx/bttv-vbi.c
View file @ 78b526a4
...@@ -303,7 +303,7 @@ static int try_fmt(struct v4l2_vbi_format *f, const struct bttv_tvnorm *tvnorm, ...@@ -303,7 +303,7 @@ static int try_fmt(struct v4l2_vbi_format *f, const struct bttv_tvnorm *tvnorm,
return 0; return 0;
} }
int bttv_try_fmt_vbi(struct file *file, void *f, struct v4l2_format *frt) int bttv_try_fmt_vbi_cap(struct file *file, void *f, struct v4l2_format *frt)
{ {
struct bttv_fh *fh = f; struct bttv_fh *fh = f;
struct bttv *btv = fh->btv; struct bttv *btv = fh->btv;
...@@ -321,7 +321,7 @@ int bttv_try_fmt_vbi(struct file *file, void *f, struct v4l2_format *frt) ...@@ -321,7 +321,7 @@ int bttv_try_fmt_vbi(struct file *file, void *f, struct v4l2_format *frt)
} }
int bttv_s_fmt_vbi(struct file *file, void *f, struct v4l2_format *frt) int bttv_s_fmt_vbi_cap(struct file *file, void *f, struct v4l2_format *frt)
{ {
struct bttv_fh *fh = f; struct bttv_fh *fh = f;
struct bttv *btv = fh->btv; struct bttv *btv = fh->btv;
...@@ -369,7 +369,7 @@ int bttv_s_fmt_vbi(struct file *file, void *f, struct v4l2_format *frt) ...@@ -369,7 +369,7 @@ int bttv_s_fmt_vbi(struct file *file, void *f, struct v4l2_format *frt)
} }
int bttv_g_fmt_vbi(struct file *file, void *f, struct v4l2_format *frt) int bttv_g_fmt_vbi_cap(struct file *file, void *f, struct v4l2_format *frt)
{ {
struct bttv_fh *fh = f; struct bttv_fh *fh = f;
const struct bttv_tvnorm *tvnorm; const struct bttv_tvnorm *tvnorm;
......
drivers/media/video/bt8xx/bttvp.h
View file @ 78b526a4
...@@ -254,9 +254,9 @@ int bttv_overlay_risc(struct bttv *btv, struct bttv_overlay *ov, ...@@ -254,9 +254,9 @@ int bttv_overlay_risc(struct bttv *btv, struct bttv_overlay *ov,
/* ---------------------------------------------------------- */ /* ---------------------------------------------------------- */
/* bttv-vbi.c */ /* bttv-vbi.c */
int bttv_try_fmt_vbi(struct file *file, void *fh, struct v4l2_format *f); int bttv_try_fmt_vbi_cap(struct file *file, void *fh, struct v4l2_format *f);
int bttv_g_fmt_vbi(struct file *file, void *fh, struct v4l2_format *f); int bttv_g_fmt_vbi_cap(struct file *file, void *fh, struct v4l2_format *f);
int bttv_s_fmt_vbi(struct file *file, void *fh, struct v4l2_format *f); int bttv_s_fmt_vbi_cap(struct file *file, void *fh, struct v4l2_format *f);
extern struct videobuf_queue_ops bttv_vbi_qops; extern struct videobuf_queue_ops bttv_vbi_qops;
......
drivers/media/video/cafe_ccic.c
View file @ 78b526a4
...@@ -1593,7 +1593,7 @@ static struct v4l2_pix_format cafe_def_pix_format = { ...@@ -1593,7 +1593,7 @@ static struct v4l2_pix_format cafe_def_pix_format = {
.sizeimage = VGA_WIDTH*VGA_HEIGHT*2, .sizeimage = VGA_WIDTH*VGA_HEIGHT*2,
}; };
static int cafe_vidioc_enum_fmt_cap(struct file *filp, static int cafe_vidioc_enum_fmt_vid_cap(struct file *filp,
void *priv, struct v4l2_fmtdesc *fmt) void *priv, struct v4l2_fmtdesc *fmt)
{ {
struct cafe_camera *cam = priv; struct cafe_camera *cam = priv;
...@@ -1608,7 +1608,7 @@ static int cafe_vidioc_enum_fmt_cap(struct file *filp, ...@@ -1608,7 +1608,7 @@ static int cafe_vidioc_enum_fmt_cap(struct file *filp,
} }
static int cafe_vidioc_try_fmt_cap (struct file *filp, void *priv, static int cafe_vidioc_try_fmt_vid_cap(struct file *filp, void *priv,
struct v4l2_format *fmt) struct v4l2_format *fmt)
{ {
struct cafe_camera *cam = priv; struct cafe_camera *cam = priv;
...@@ -1620,7 +1620,7 @@ static int cafe_vidioc_try_fmt_cap (struct file *filp, void *priv, ...@@ -1620,7 +1620,7 @@ static int cafe_vidioc_try_fmt_cap (struct file *filp, void *priv,
return ret; return ret;
} }
static int cafe_vidioc_s_fmt_cap(struct file *filp, void *priv, static int cafe_vidioc_s_fmt_vid_cap(struct file *filp, void *priv,
struct v4l2_format *fmt) struct v4l2_format *fmt)
{ {
struct cafe_camera *cam = priv; struct cafe_camera *cam = priv;
...@@ -1635,7 +1635,7 @@ static int cafe_vidioc_s_fmt_cap(struct file *filp, void *priv, ...@@ -1635,7 +1635,7 @@ static int cafe_vidioc_s_fmt_cap(struct file *filp, void *priv,
/* /*
* See if the formatting works in principle. * See if the formatting works in principle.
*/ */
ret = cafe_vidioc_try_fmt_cap(filp, priv, fmt); ret = cafe_vidioc_try_fmt_vid_cap(filp, priv, fmt);
if (ret) if (ret)
return ret; return ret;
/* /*
...@@ -1670,7 +1670,7 @@ static int cafe_vidioc_s_fmt_cap(struct file *filp, void *priv, ...@@ -1670,7 +1670,7 @@ static int cafe_vidioc_s_fmt_cap(struct file *filp, void *priv,
* The V4l2 spec wants us to be smarter, and actually get this from * The V4l2 spec wants us to be smarter, and actually get this from
* the camera (and not mess with it at open time). Someday. * the camera (and not mess with it at open time). Someday.
*/ */
static int cafe_vidioc_g_fmt_cap(struct file *filp, void *priv, static int cafe_vidioc_g_fmt_vid_cap(struct file *filp, void *priv,
struct v4l2_format *f) struct v4l2_format *f)
{ {
struct cafe_camera *cam = priv; struct cafe_camera *cam = priv;
...@@ -1780,10 +1780,10 @@ static struct video_device cafe_v4l_template = { ...@@ -1780,10 +1780,10 @@ static struct video_device cafe_v4l_template = {
.release = cafe_v4l_dev_release, .release = cafe_v4l_dev_release,
.vidioc_querycap = cafe_vidioc_querycap, .vidioc_querycap = cafe_vidioc_querycap,
.vidioc_enum_fmt_cap = cafe_vidioc_enum_fmt_cap, .vidioc_enum_fmt_vid_cap = cafe_vidioc_enum_fmt_vid_cap,
.vidioc_try_fmt_cap = cafe_vidioc_try_fmt_cap, .vidioc_try_fmt_vid_cap = cafe_vidioc_try_fmt_vid_cap,
.vidioc_s_fmt_cap = cafe_vidioc_s_fmt_cap, .vidioc_s_fmt_vid_cap = cafe_vidioc_s_fmt_vid_cap,
.vidioc_g_fmt_cap = cafe_vidioc_g_fmt_cap, .vidioc_g_fmt_vid_cap = cafe_vidioc_g_fmt_vid_cap,
.vidioc_enum_input = cafe_vidioc_enum_input, .vidioc_enum_input = cafe_vidioc_enum_input,
.vidioc_g_input = cafe_vidioc_g_input, .vidioc_g_input = cafe_vidioc_g_input,
.vidioc_s_input = cafe_vidioc_s_input, .vidioc_s_input = cafe_vidioc_s_input,
......
drivers/media/video/cx23885/cx23885-video.c
View file @ 78b526a4
...@@ -915,7 +915,7 @@ static void init_controls(struct cx23885_dev *dev) ...@@ -915,7 +915,7 @@ static void init_controls(struct cx23885_dev *dev)
/* ------------------------------------------------------------------ */ /* ------------------------------------------------------------------ */
/* VIDEO IOCTLS */ /* VIDEO IOCTLS */
static int vidioc_g_fmt_cap(struct file *file, void *priv, static int vidioc_g_fmt_vid_cap(struct file *file, void *priv,
struct v4l2_format *f) struct v4l2_format *f)
{ {
struct cx23885_fh *fh = priv; struct cx23885_fh *fh = priv;
...@@ -932,7 +932,7 @@ static int vidioc_g_fmt_cap(struct file *file, void *priv, ...@@ -932,7 +932,7 @@ static int vidioc_g_fmt_cap(struct file *file, void *priv,
return 0; return 0;
} }
static int vidioc_try_fmt_cap(struct file *file, void *priv, static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
struct v4l2_format *f) struct v4l2_format *f)
{ {
struct cx23885_dev *dev = ((struct cx23885_fh *)priv)->dev; struct cx23885_dev *dev = ((struct cx23885_fh *)priv)->dev;
...@@ -983,7 +983,7 @@ static int vidioc_try_fmt_cap(struct file *file, void *priv, ...@@ -983,7 +983,7 @@ static int vidioc_try_fmt_cap(struct file *file, void *priv,
return 0; return 0;
} }
static int vidioc_s_fmt_cap(struct file *file, void *priv, static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
struct v4l2_format *f) struct v4l2_format *f)
{ {
struct cx23885_fh *fh = priv; struct cx23885_fh *fh = priv;
...@@ -991,7 +991,7 @@ static int vidioc_s_fmt_cap(struct file *file, void *priv, ...@@ -991,7 +991,7 @@ static int vidioc_s_fmt_cap(struct file *file, void *priv,
int err; int err;
dprintk(2, "%s()\n", __func__); dprintk(2, "%s()\n", __func__);
err = vidioc_try_fmt_cap(file, priv, f); err = vidioc_try_fmt_vid_cap(file, priv, f);
if (0 != err) if (0 != err)
return err; return err;
...@@ -1025,7 +1025,7 @@ static int vidioc_querycap(struct file *file, void *priv, ...@@ -1025,7 +1025,7 @@ static int vidioc_querycap(struct file *file, void *priv,
return 0; return 0;
} }
static int vidioc_enum_fmt_cap(struct file *file, void *priv, static int vidioc_enum_fmt_vid_cap(struct file *file, void *priv,
struct v4l2_fmtdesc *f) struct v4l2_fmtdesc *f)
{ {
if (unlikely(f->index >= ARRAY_SIZE(formats))) if (unlikely(f->index >= ARRAY_SIZE(formats)))
...@@ -1440,13 +1440,13 @@ static struct video_device cx23885_video_template = { ...@@ -1440,13 +1440,13 @@ static struct video_device cx23885_video_template = {
.fops = &video_fops, .fops = &video_fops,
.minor = -1, .minor = -1,
.vidioc_querycap = vidioc_querycap, .vidioc_querycap = vidioc_querycap,
.vidioc_enum_fmt_cap = vidioc_enum_fmt_cap, .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap,
.vidioc_g_fmt_cap = vidioc_g_fmt_cap, .vidioc_g_fmt_vid_cap = vidioc_g_fmt_vid_cap,
.vidioc_try_fmt_cap = vidioc_try_fmt_cap, .vidioc_try_fmt_vid_cap = vidioc_try_fmt_vid_cap,
.vidioc_s_fmt_cap = vidioc_s_fmt_cap, .vidioc_s_fmt_vid_cap = vidioc_s_fmt_vid_cap,
.vidioc_g_fmt_vbi = cx23885_vbi_fmt, .vidioc_g_fmt_vbi_cap = cx23885_vbi_fmt,
.vidioc_try_fmt_vbi = cx23885_vbi_fmt, .vidioc_try_fmt_vbi_cap = cx23885_vbi_fmt,
.vidioc_s_fmt_vbi = cx23885_vbi_fmt, .vidioc_s_fmt_vbi_cap = cx23885_vbi_fmt,
.vidioc_reqbufs = vidioc_reqbufs, .vidioc_reqbufs = vidioc_reqbufs,
.vidioc_querybuf = vidioc_querybuf, .vidioc_querybuf = vidioc_querybuf,
.vidioc_qbuf = vidioc_qbuf, .vidioc_qbuf = vidioc_qbuf,
......
drivers/media/video/cx88/cx88-blackbird.c
View file @ 78b526a4
...@@ -737,7 +737,7 @@ static int vidioc_querycap (struct file *file, void *priv, ...@@ -737,7 +737,7 @@ static int vidioc_querycap (struct file *file, void *priv,
return 0; return 0;
} }
static int vidioc_enum_fmt_cap (struct file *file, void *priv, static int vidioc_enum_fmt_vid_cap (struct file *file, void *priv,
struct v4l2_fmtdesc *f) struct v4l2_fmtdesc *f)
{ {
if (f->index != 0) if (f->index != 0)
...@@ -749,7 +749,7 @@ static int vidioc_enum_fmt_cap (struct file *file, void *priv, ...@@ -749,7 +749,7 @@ static int vidioc_enum_fmt_cap (struct file *file, void *priv,
return 0; return 0;
} }
static int vidioc_g_fmt_cap (struct file *file, void *priv, static int vidioc_g_fmt_vid_cap (struct file *file, void *priv,
struct v4l2_format *f) struct v4l2_format *f)
{ {
struct cx8802_fh *fh = priv; struct cx8802_fh *fh = priv;
...@@ -768,7 +768,7 @@ static int vidioc_g_fmt_cap (struct file *file, void *priv, ...@@ -768,7 +768,7 @@ static int vidioc_g_fmt_cap (struct file *file, void *priv,
return 0; return 0;
} }
static int vidioc_try_fmt_cap (struct file *file, void *priv, static int vidioc_try_fmt_vid_cap (struct file *file, void *priv,
struct v4l2_format *f) struct v4l2_format *f)
{ {
struct cx8802_fh *fh = priv; struct cx8802_fh *fh = priv;
...@@ -784,7 +784,7 @@ static int vidioc_try_fmt_cap (struct file *file, void *priv, ...@@ -784,7 +784,7 @@ static int vidioc_try_fmt_cap (struct file *file, void *priv,
return 0; return 0;
} }
static int vidioc_s_fmt_cap (struct file *file, void *priv, static int vidioc_s_fmt_vid_cap (struct file *file, void *priv,
struct v4l2_format *f) struct v4l2_format *f)
{ {
struct cx8802_fh *fh = priv; struct cx8802_fh *fh = priv;
...@@ -1181,10 +1181,10 @@ static struct video_device cx8802_mpeg_template = ...@@ -1181,10 +1181,10 @@ static struct video_device cx8802_mpeg_template =
.minor = -1, .minor = -1,
.vidioc_querymenu = vidioc_querymenu, .vidioc_querymenu = vidioc_querymenu,
.vidioc_querycap = vidioc_querycap, .vidioc_querycap = vidioc_querycap,
.vidioc_enum_fmt_cap = vidioc_enum_fmt_cap, .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap,
.vidioc_g_fmt_cap = vidioc_g_fmt_cap, .vidioc_g_fmt_vid_cap = vidioc_g_fmt_vid_cap,
.vidioc_try_fmt_cap = vidioc_try_fmt_cap, .vidioc_try_fmt_vid_cap = vidioc_try_fmt_vid_cap,
.vidioc_s_fmt_cap = vidioc_s_fmt_cap, .vidioc_s_fmt_vid_cap = vidioc_s_fmt_vid_cap,
.vidioc_reqbufs = vidioc_reqbufs, .vidioc_reqbufs = vidioc_reqbufs,
.vidioc_querybuf = vidioc_querybuf, .vidioc_querybuf = vidioc_querybuf,
.vidioc_qbuf = vidioc_qbuf, .vidioc_qbuf = vidioc_qbuf,
......
drivers/media/video/cx88/cx88-video.c
View file @ 78b526a4
...@@ -1045,7 +1045,7 @@ static void init_controls(struct cx88_core *core) ...@@ -1045,7 +1045,7 @@ static void init_controls(struct cx88_core *core)
/* ------------------------------------------------------------------ */ /* ------------------------------------------------------------------ */
/* VIDEO IOCTLS */ /* VIDEO IOCTLS */
static int vidioc_g_fmt_cap (struct file *file, void *priv, static int vidioc_g_fmt_vid_cap(struct file *file, void *priv,
struct v4l2_format *f) struct v4l2_format *f)
{ {
struct cx8800_fh *fh = priv; struct cx8800_fh *fh = priv;
...@@ -1061,7 +1061,7 @@ static int vidioc_g_fmt_cap (struct file *file, void *priv, ...@@ -1061,7 +1061,7 @@ static int vidioc_g_fmt_cap (struct file *file, void *priv,
return 0; return 0;
} }
static int vidioc_try_fmt_cap (struct file *file, void *priv, static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
struct v4l2_format *f) struct v4l2_format *f)
{ {
struct cx88_core *core = ((struct cx8800_fh *)priv)->dev->core; struct cx88_core *core = ((struct cx8800_fh *)priv)->dev->core;
...@@ -1112,11 +1112,11 @@ static int vidioc_try_fmt_cap (struct file *file, void *priv, ...@@ -1112,11 +1112,11 @@ static int vidioc_try_fmt_cap (struct file *file, void *priv,
return 0; return 0;
} }
static int vidioc_s_fmt_cap (struct file *file, void *priv, static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
struct v4l2_format *f) struct v4l2_format *f)
{ {
struct cx8800_fh *fh = priv; struct cx8800_fh *fh = priv;
int err = vidioc_try_fmt_cap (file,priv,f); int err = vidioc_try_fmt_vid_cap (file,priv,f);
if (0 != err) if (0 != err)
return err; return err;
...@@ -1147,7 +1147,7 @@ static int vidioc_querycap (struct file *file, void *priv, ...@@ -1147,7 +1147,7 @@ static int vidioc_querycap (struct file *file, void *priv,
return 0; return 0;
} }
static int vidioc_enum_fmt_cap (struct file *file, void *priv, static int vidioc_enum_fmt_vid_cap (struct file *file, void *priv,
struct v4l2_fmtdesc *f) struct v4l2_fmtdesc *f)
{ {
if (unlikely(f->index >= ARRAY_SIZE(formats))) if (unlikely(f->index >= ARRAY_SIZE(formats)))
...@@ -1690,13 +1690,13 @@ static struct video_device cx8800_video_template = ...@@ -1690,13 +1690,13 @@ static struct video_device cx8800_video_template =
.fops = &video_fops, .fops = &video_fops,
.minor = -1, .minor = -1,
.vidioc_querycap = vidioc_querycap, .vidioc_querycap = vidioc_querycap,
.vidioc_enum_fmt_cap = vidioc_enum_fmt_cap, .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap,
.vidioc_g_fmt_cap = vidioc_g_fmt_cap, .vidioc_g_fmt_vid_cap = vidioc_g_fmt_vid_cap,
.vidioc_try_fmt_cap = vidioc_try_fmt_cap, .vidioc_try_fmt_vid_cap = vidioc_try_fmt_vid_cap,
.vidioc_s_fmt_cap = vidioc_s_fmt_cap, .vidioc_s_fmt_vid_cap = vidioc_s_fmt_vid_cap,
.vidioc_g_fmt_vbi = cx8800_vbi_fmt, .vidioc_g_fmt_vbi_cap = cx8800_vbi_fmt,
.vidioc_try_fmt_vbi = cx8800_vbi_fmt, .vidioc_try_fmt_vbi_cap = cx8800_vbi_fmt,
.vidioc_s_fmt_vbi = cx8800_vbi_fmt, .vidioc_s_fmt_vbi_cap = cx8800_vbi_fmt,
.vidioc_reqbufs = vidioc_reqbufs, .vidioc_reqbufs = vidioc_reqbufs,
.vidioc_querybuf = vidioc_querybuf, .vidioc_querybuf = vidioc_querybuf,
.vidioc_qbuf = vidioc_qbuf, .vidioc_qbuf = vidioc_qbuf,
......
drivers/media/video/em28xx/em28xx-video.c
View file @ 78b526a4
...@@ -683,7 +683,7 @@ static void get_scale(struct em28xx *dev, ...@@ -683,7 +683,7 @@ static void get_scale(struct em28xx *dev,
IOCTL vidioc handling IOCTL vidioc handling
------------------------------------------------------------------*/ ------------------------------------------------------------------*/
static int vidioc_g_fmt_cap(struct file *file, void *priv, static int vidioc_g_fmt_vid_cap(struct file *file, void *priv,
struct v4l2_format *f) struct v4l2_format *f)
{ {
struct em28xx_fh *fh = priv; struct em28xx_fh *fh = priv;
...@@ -706,7 +706,7 @@ static int vidioc_g_fmt_cap(struct file *file, void *priv, ...@@ -706,7 +706,7 @@ static int vidioc_g_fmt_cap(struct file *file, void *priv,
return 0; return 0;
} }
static int vidioc_try_fmt_cap(struct file *file, void *priv, static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
struct v4l2_format *f) struct v4l2_format *f)
{ {
struct em28xx_fh *fh = priv; struct em28xx_fh *fh = priv;
...@@ -766,7 +766,7 @@ static int vidioc_try_fmt_cap(struct file *file, void *priv, ...@@ -766,7 +766,7 @@ static int vidioc_try_fmt_cap(struct file *file, void *priv,
return 0; return 0;
} }
static int vidioc_s_fmt_cap(struct file *file, void *priv, static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
struct v4l2_format *f) struct v4l2_format *f)
{ {
struct em28xx_fh *fh = priv; struct em28xx_fh *fh = priv;
...@@ -777,7 +777,7 @@ static int vidioc_s_fmt_cap(struct file *file, void *priv, ...@@ -777,7 +777,7 @@ static int vidioc_s_fmt_cap(struct file *file, void *priv,
if (rc < 0) if (rc < 0)
return rc; return rc;
vidioc_try_fmt_cap(file, priv, f); vidioc_try_fmt_vid_cap(file, priv, f);
mutex_lock(&dev->lock); mutex_lock(&dev->lock);
...@@ -826,7 +826,7 @@ static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id * norm) ...@@ -826,7 +826,7 @@ static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id * norm)
/* Adjusts width/height, if needed */ /* Adjusts width/height, if needed */
f.fmt.pix.width = dev->width; f.fmt.pix.width = dev->width;
f.fmt.pix.height = dev->height; f.fmt.pix.height = dev->height;
vidioc_try_fmt_cap(file, priv, &f); vidioc_try_fmt_vid_cap(file, priv, &f);
mutex_lock(&dev->lock); mutex_lock(&dev->lock);
...@@ -1277,7 +1277,7 @@ static int vidioc_querycap(struct file *file, void *priv, ...@@ -1277,7 +1277,7 @@ static int vidioc_querycap(struct file *file, void *priv,
return 0; return 0;
} }
static int vidioc_enum_fmt_cap(struct file *file, void *priv, static int vidioc_enum_fmt_vid_cap(struct file *file, void *priv,
struct v4l2_fmtdesc *fmtd) struct v4l2_fmtdesc *fmtd)
{ {
if (fmtd->index != 0) if (fmtd->index != 0)
...@@ -1292,7 +1292,7 @@ static int vidioc_enum_fmt_cap(struct file *file, void *priv, ...@@ -1292,7 +1292,7 @@ static int vidioc_enum_fmt_cap(struct file *file, void *priv,
} }
/* Sliced VBI ioctls */ /* Sliced VBI ioctls */
static int vidioc_g_fmt_vbi_capture(struct file *file, void *priv, static int vidioc_g_fmt_sliced_vbi_cap(struct file *file, void *priv,
struct v4l2_format *f) struct v4l2_format *f)
{ {
struct em28xx_fh *fh = priv; struct em28xx_fh *fh = priv;
...@@ -1316,7 +1316,7 @@ static int vidioc_g_fmt_vbi_capture(struct file *file, void *priv, ...@@ -1316,7 +1316,7 @@ static int vidioc_g_fmt_vbi_capture(struct file *file, void *priv,
return rc; return rc;
} }
static int vidioc_try_set_vbi_capture(struct file *file, void *priv, static int vidioc_try_set_sliced_vbi_cap(struct file *file, void *priv,
struct v4l2_format *f) struct v4l2_format *f)
{ {
struct em28xx_fh *fh = priv; struct em28xx_fh *fh = priv;
...@@ -1776,17 +1776,17 @@ static const struct video_device em28xx_video_template = { ...@@ -1776,17 +1776,17 @@ static const struct video_device em28xx_video_template = {
.minor = -1, .minor = -1,
.vidioc_querycap = vidioc_querycap, .vidioc_querycap = vidioc_querycap,
.vidioc_enum_fmt_cap = vidioc_enum_fmt_cap, .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap,
.vidioc_g_fmt_cap = vidioc_g_fmt_cap, .vidioc_g_fmt_vid_cap = vidioc_g_fmt_vid_cap,
.vidioc_try_fmt_cap = vidioc_try_fmt_cap, .vidioc_try_fmt_vid_cap = vidioc_try_fmt_vid_cap,
.vidioc_s_fmt_cap = vidioc_s_fmt_cap, .vidioc_s_fmt_vid_cap = vidioc_s_fmt_vid_cap,
.vidioc_g_audio = vidioc_g_audio, .vidioc_g_audio = vidioc_g_audio,
.vidioc_s_audio = vidioc_s_audio, .vidioc_s_audio = vidioc_s_audio,
.vidioc_cropcap = vidioc_cropcap, .vidioc_cropcap = vidioc_cropcap,
.vidioc_g_fmt_vbi_capture = vidioc_g_fmt_vbi_capture, .vidioc_g_fmt_sliced_vbi_cap = vidioc_g_fmt_sliced_vbi_cap,
.vidioc_try_fmt_vbi_capture = vidioc_try_set_vbi_capture, .vidioc_try_fmt_sliced_vbi_cap = vidioc_try_set_sliced_vbi_cap,
.vidioc_s_fmt_vbi_capture = vidioc_try_set_vbi_capture, .vidioc_s_fmt_sliced_vbi_cap = vidioc_try_set_sliced_vbi_cap,
.vidioc_reqbufs = vidioc_reqbufs, .vidioc_reqbufs = vidioc_reqbufs,
.vidioc_querybuf = vidioc_querybuf, .vidioc_querybuf = vidioc_querybuf,
......
drivers/media/video/meye.c
View file @ 78b526a4
...@@ -1253,7 +1253,7 @@ static int vidioc_g_ctrl(struct file *file, void *fh, struct v4l2_control *c) ...@@ -1253,7 +1253,7 @@ static int vidioc_g_ctrl(struct file *file, void *fh, struct v4l2_control *c)
return 0; return 0;
} }
static int vidioc_enum_fmt_cap(struct file *file, void *fh, static int vidioc_enum_fmt_vid_cap(struct file *file, void *fh,
struct v4l2_fmtdesc *f) struct v4l2_fmtdesc *f)
{ {
if (f->index > 1) if (f->index > 1)
...@@ -1283,7 +1283,7 @@ static int vidioc_enum_fmt_cap(struct file *file, void *fh, ...@@ -1283,7 +1283,7 @@ static int vidioc_enum_fmt_cap(struct file *file, void *fh,
return 0; return 0;
} }
static int vidioc_try_fmt_cap(struct file *file, void *fh, static int vidioc_try_fmt_vid_cap(struct file *file, void *fh,
struct v4l2_format *f) struct v4l2_format *f)
{ {
if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
...@@ -1316,7 +1316,8 @@ static int vidioc_try_fmt_cap(struct file *file, void *fh, ...@@ -1316,7 +1316,8 @@ static int vidioc_try_fmt_cap(struct file *file, void *fh,
return 0; return 0;
} }
static int vidioc_g_fmt_cap(struct file *file, void *fh, struct v4l2_format *f) static int vidioc_g_fmt_vid_cap(struct file *file, void *fh,
struct v4l2_format *f)
{ {
if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
return -EINVAL; return -EINVAL;
...@@ -1346,7 +1347,8 @@ static int vidioc_g_fmt_cap(struct file *file, void *fh, struct v4l2_format *f) ...@@ -1346,7 +1347,8 @@ static int vidioc_g_fmt_cap(struct file *file, void *fh, struct v4l2_format *f)
return 0; return 0;
} }
static int vidioc_s_fmt_cap(struct file *file, void *fh, struct v4l2_format *f) static int vidioc_s_fmt_vid_cap(struct file *file, void *fh,
struct v4l2_format *f)
{ {
if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
return -EINVAL; return -EINVAL;
...@@ -1709,10 +1711,10 @@ static struct video_device meye_template = { ...@@ -1709,10 +1711,10 @@ static struct video_device meye_template = {
.vidioc_queryctrl = vidioc_queryctrl, .vidioc_queryctrl = vidioc_queryctrl,
.vidioc_s_ctrl = vidioc_s_ctrl, .vidioc_s_ctrl = vidioc_s_ctrl,
.vidioc_g_ctrl = vidioc_g_ctrl, .vidioc_g_ctrl = vidioc_g_ctrl,
.vidioc_enum_fmt_cap = vidioc_enum_fmt_cap, .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap,
.vidioc_try_fmt_cap = vidioc_try_fmt_cap, .vidioc_try_fmt_vid_cap = vidioc_try_fmt_vid_cap,
.vidioc_g_fmt_cap = vidioc_g_fmt_cap, .vidioc_g_fmt_vid_cap = vidioc_g_fmt_vid_cap,
.vidioc_s_fmt_cap = vidioc_s_fmt_cap, .vidioc_s_fmt_vid_cap = vidioc_s_fmt_vid_cap,
.vidioc_reqbufs = vidioc_reqbufs, .vidioc_reqbufs = vidioc_reqbufs,
.vidioc_querybuf = vidioc_querybuf, .vidioc_querybuf = vidioc_querybuf,
.vidioc_qbuf = vidioc_qbuf, .vidioc_qbuf = vidioc_qbuf,
......
drivers/media/video/saa7134/saa7134-empress.c
View file @ 78b526a4
...@@ -208,7 +208,7 @@ static int empress_s_input(struct file *file, void *priv, unsigned int i) ...@@ -208,7 +208,7 @@ static int empress_s_input(struct file *file, void *priv, unsigned int i)
return 0; return 0;
} }
static int empress_enum_fmt_cap(struct file *file, void *priv, static int empress_enum_fmt_vid_cap(struct file *file, void *priv,
struct v4l2_fmtdesc *f) struct v4l2_fmtdesc *f)
{ {
if (f->index != 0) if (f->index != 0)
...@@ -220,7 +220,7 @@ static int empress_enum_fmt_cap(struct file *file, void *priv, ...@@ -220,7 +220,7 @@ static int empress_enum_fmt_cap(struct file *file, void *priv,
return 0; return 0;
} }
static int empress_g_fmt_cap(struct file *file, void *priv, static int empress_g_fmt_vid_cap(struct file *file, void *priv,
struct v4l2_format *f) struct v4l2_format *f)
{ {
struct saa7134_dev *dev = file->private_data; struct saa7134_dev *dev = file->private_data;
...@@ -233,7 +233,7 @@ static int empress_g_fmt_cap(struct file *file, void *priv, ...@@ -233,7 +233,7 @@ static int empress_g_fmt_cap(struct file *file, void *priv,
return 0; return 0;
} }
static int empress_s_fmt_cap(struct file *file, void *priv, static int empress_s_fmt_vid_cap(struct file *file, void *priv,
struct v4l2_format *f) struct v4l2_format *f)
{ {
struct saa7134_dev *dev = file->private_data; struct saa7134_dev *dev = file->private_data;
...@@ -348,9 +348,9 @@ static struct video_device saa7134_empress_template = ...@@ -348,9 +348,9 @@ static struct video_device saa7134_empress_template =
.minor = -1, .minor = -1,
.vidioc_querycap = empress_querycap, .vidioc_querycap = empress_querycap,
.vidioc_enum_fmt_cap = empress_enum_fmt_cap, .vidioc_enum_fmt_vid_cap = empress_enum_fmt_vid_cap,
.vidioc_s_fmt_cap = empress_s_fmt_cap, .vidioc_s_fmt_vid_cap = empress_s_fmt_vid_cap,
.vidioc_g_fmt_cap = empress_g_fmt_cap, .vidioc_g_fmt_vid_cap = empress_g_fmt_vid_cap,
.vidioc_reqbufs = empress_reqbufs, .vidioc_reqbufs = empress_reqbufs,
.vidioc_querybuf = empress_querybuf, .vidioc_querybuf = empress_querybuf,
.vidioc_qbuf = empress_qbuf, .vidioc_qbuf = empress_qbuf,
......
drivers/media/video/saa7134/saa7134-video.c
View file @ 78b526a4
...@@ -1496,7 +1496,7 @@ static int video_mmap(struct file *file, struct vm_area_struct * vma) ...@@ -1496,7 +1496,7 @@ static int video_mmap(struct file *file, struct vm_area_struct * vma)
/* ------------------------------------------------------------------ */ /* ------------------------------------------------------------------ */
static int saa7134_try_get_set_fmt_vbi(struct file *file, void *priv, static int saa7134_try_get_set_fmt_vbi_cap(struct file *file, void *priv,
struct v4l2_format *f) struct v4l2_format *f)
{ {
struct saa7134_fh *fh = priv; struct saa7134_fh *fh = priv;
...@@ -1516,7 +1516,7 @@ static int saa7134_try_get_set_fmt_vbi(struct file *file, void *priv, ...@@ -1516,7 +1516,7 @@ static int saa7134_try_get_set_fmt_vbi(struct file *file, void *priv,
return 0; return 0;
} }
static int saa7134_g_fmt_cap(struct file *file, void *priv, static int saa7134_g_fmt_vid_cap(struct file *file, void *priv,
struct v4l2_format *f) struct v4l2_format *f)
{ {
struct saa7134_fh *fh = priv; struct saa7134_fh *fh = priv;
...@@ -1532,7 +1532,7 @@ static int saa7134_g_fmt_cap(struct file *file, void *priv, ...@@ -1532,7 +1532,7 @@ static int saa7134_g_fmt_cap(struct file *file, void *priv,
return 0; return 0;
} }
static int saa7134_g_fmt_overlay(struct file *file, void *priv, static int saa7134_g_fmt_vid_overlay(struct file *file, void *priv,
struct v4l2_format *f) struct v4l2_format *f)
{ {
struct saa7134_fh *fh = priv; struct saa7134_fh *fh = priv;
...@@ -1546,7 +1546,7 @@ static int saa7134_g_fmt_overlay(struct file *file, void *priv, ...@@ -1546,7 +1546,7 @@ static int saa7134_g_fmt_overlay(struct file *file, void *priv,
return 0; return 0;
} }
static int saa7134_try_fmt_cap(struct file *file, void *priv, static int saa7134_try_fmt_vid_cap(struct file *file, void *priv,
struct v4l2_format *f) struct v4l2_format *f)
{ {
struct saa7134_fh *fh = priv; struct saa7134_fh *fh = priv;
...@@ -1597,7 +1597,7 @@ static int saa7134_try_fmt_cap(struct file *file, void *priv, ...@@ -1597,7 +1597,7 @@ static int saa7134_try_fmt_cap(struct file *file, void *priv,
return 0; return 0;
} }
static int saa7134_try_fmt_overlay(struct file *file, void *priv, static int saa7134_try_fmt_vid_overlay(struct file *file, void *priv,
struct v4l2_format *f) struct v4l2_format *f)
{ {
struct saa7134_fh *fh = priv; struct saa7134_fh *fh = priv;
...@@ -1611,13 +1611,13 @@ static int saa7134_try_fmt_overlay(struct file *file, void *priv, ...@@ -1611,13 +1611,13 @@ static int saa7134_try_fmt_overlay(struct file *file, void *priv,
return verify_preview(dev, &f->fmt.win); return verify_preview(dev, &f->fmt.win);
} }
static int saa7134_s_fmt_cap(struct file *file, void *priv, static int saa7134_s_fmt_vid_cap(struct file *file, void *priv,
struct v4l2_format *f) struct v4l2_format *f)
{ {
struct saa7134_fh *fh = priv; struct saa7134_fh *fh = priv;
int err; int err;
err = saa7134_try_fmt_cap(file, priv, f); err = saa7134_try_fmt_vid_cap(file, priv, f);
if (0 != err) if (0 != err)
return err; return err;
...@@ -1628,7 +1628,7 @@ static int saa7134_s_fmt_cap(struct file *file, void *priv, ...@@ -1628,7 +1628,7 @@ static int saa7134_s_fmt_cap(struct file *file, void *priv,
return 0; return 0;
} }
static int saa7134_s_fmt_overlay(struct file *file, void *priv, static int saa7134_s_fmt_vid_overlay(struct file *file, void *priv,
struct v4l2_format *f) struct v4l2_format *f)
{ {
struct saa7134_fh *fh = priv; struct saa7134_fh *fh = priv;
...@@ -2028,7 +2028,7 @@ static int saa7134_s_priority(struct file *file, void *f, ...@@ -2028,7 +2028,7 @@ static int saa7134_s_priority(struct file *file, void *f,
return v4l2_prio_change(&dev->prio, &fh->prio, prio); return v4l2_prio_change(&dev->prio, &fh->prio, prio);
} }
static int saa7134_enum_fmt_cap(struct file *file, void *priv, static int saa7134_enum_fmt_vid_cap(struct file *file, void *priv,
struct v4l2_fmtdesc *f) struct v4l2_fmtdesc *f)
{ {
if (f->index >= FORMATS) if (f->index >= FORMATS)
...@@ -2042,7 +2042,7 @@ static int saa7134_enum_fmt_cap(struct file *file, void *priv, ...@@ -2042,7 +2042,7 @@ static int saa7134_enum_fmt_cap(struct file *file, void *priv,
return 0; return 0;
} }
static int saa7134_enum_fmt_overlay(struct file *file, void *priv, static int saa7134_enum_fmt_vid_overlay(struct file *file, void *priv,
struct v4l2_fmtdesc *f) struct v4l2_fmtdesc *f)
{ {
if (saa7134_no_overlay > 0) { if (saa7134_no_overlay > 0) {
...@@ -2061,7 +2061,7 @@ static int saa7134_enum_fmt_overlay(struct file *file, void *priv, ...@@ -2061,7 +2061,7 @@ static int saa7134_enum_fmt_overlay(struct file *file, void *priv,
return 0; return 0;
} }
static int saa7134_enum_fmt_vbi(struct file *file, void *priv, static int saa7134_enum_fmt_vbi_cap(struct file *file, void *priv,
struct v4l2_fmtdesc *f) struct v4l2_fmtdesc *f)
{ {
if (0 != f->index) if (0 != f->index)
...@@ -2348,18 +2348,18 @@ struct video_device saa7134_video_template = ...@@ -2348,18 +2348,18 @@ struct video_device saa7134_video_template =
.fops = &video_fops, .fops = &video_fops,
.minor = -1, .minor = -1,
.vidioc_querycap = saa7134_querycap, .vidioc_querycap = saa7134_querycap,
.vidioc_enum_fmt_cap = saa7134_enum_fmt_cap, .vidioc_enum_fmt_vid_cap = saa7134_enum_fmt_vid_cap,
.vidioc_g_fmt_cap = saa7134_g_fmt_cap, .vidioc_g_fmt_vid_cap = saa7134_g_fmt_vid_cap,
.vidioc_try_fmt_cap = saa7134_try_fmt_cap, .vidioc_try_fmt_vid_cap = saa7134_try_fmt_vid_cap,
.vidioc_s_fmt_cap = saa7134_s_fmt_cap, .vidioc_s_fmt_vid_cap = saa7134_s_fmt_vid_cap,
.vidioc_enum_fmt_overlay = saa7134_enum_fmt_overlay, .vidioc_enum_fmt_vid_overlay = saa7134_enum_fmt_vid_overlay,
.vidioc_g_fmt_overlay = saa7134_g_fmt_overlay, .vidioc_g_fmt_vid_overlay = saa7134_g_fmt_vid_overlay,
.vidioc_try_fmt_overlay = saa7134_try_fmt_overlay, .vidioc_try_fmt_vid_overlay = saa7134_try_fmt_vid_overlay,
.vidioc_s_fmt_overlay = saa7134_s_fmt_overlay, .vidioc_s_fmt_vid_overlay = saa7134_s_fmt_vid_overlay,
.vidioc_enum_fmt_vbi = saa7134_enum_fmt_vbi, .vidioc_enum_fmt_vbi_cap = saa7134_enum_fmt_vbi_cap,
.vidioc_g_fmt_vbi = saa7134_try_get_set_fmt_vbi, .vidioc_g_fmt_vbi_cap = saa7134_try_get_set_fmt_vbi_cap,
.vidioc_try_fmt_vbi = saa7134_try_get_set_fmt_vbi, .vidioc_try_fmt_vbi_cap = saa7134_try_get_set_fmt_vbi_cap,
.vidioc_s_fmt_vbi = saa7134_try_get_set_fmt_vbi, .vidioc_s_fmt_vbi_cap = saa7134_try_get_set_fmt_vbi_cap,
.vidioc_g_audio = saa7134_g_audio, .vidioc_g_audio = saa7134_g_audio,
.vidioc_s_audio = saa7134_s_audio, .vidioc_s_audio = saa7134_s_audio,
.vidioc_cropcap = saa7134_cropcap, .vidioc_cropcap = saa7134_cropcap,
......
drivers/media/video/stk-webcam.c
View file @ 78b526a4
...@@ -981,7 +981,7 @@ static int stk_vidioc_s_ctrl(struct file *filp, ...@@ -981,7 +981,7 @@ static int stk_vidioc_s_ctrl(struct file *filp,
} }
static int stk_vidioc_enum_fmt_cap(struct file *filp, static int stk_vidioc_enum_fmt_vid_cap(struct file *filp,
void *priv, struct v4l2_fmtdesc *fmtd) void *priv, struct v4l2_fmtdesc *fmtd)
{ {
fmtd->flags = 0; fmtd->flags = 0;
...@@ -1025,7 +1025,7 @@ static struct stk_size { ...@@ -1025,7 +1025,7 @@ static struct stk_size {
{ .w = 176, .h = 144, .m = MODE_QCIF, }, { .w = 176, .h = 144, .m = MODE_QCIF, },
}; };
static int stk_vidioc_g_fmt_cap(struct file *filp, static int stk_vidioc_g_fmt_vid_cap(struct file *filp,
void *priv, struct v4l2_format *f) void *priv, struct v4l2_format *f)
{ {
struct v4l2_pix_format *pix_format = &f->fmt.pix; struct v4l2_pix_format *pix_format = &f->fmt.pix;
...@@ -1054,7 +1054,7 @@ static int stk_vidioc_g_fmt_cap(struct file *filp, ...@@ -1054,7 +1054,7 @@ static int stk_vidioc_g_fmt_cap(struct file *filp,
return 0; return 0;
} }
static int stk_vidioc_try_fmt_cap(struct file *filp, static int stk_vidioc_try_fmt_vid_cap(struct file *filp,
void *priv, struct v4l2_format *fmtd) void *priv, struct v4l2_format *fmtd)
{ {
int i; int i;
...@@ -1131,7 +1131,7 @@ static int stk_setup_format(struct stk_camera *dev) ...@@ -1131,7 +1131,7 @@ static int stk_setup_format(struct stk_camera *dev)
return stk_sensor_configure(dev); return stk_sensor_configure(dev);
} }
static int stk_vidioc_s_fmt_cap(struct file *filp, static int stk_vidioc_s_fmt_vid_cap(struct file *filp,
void *priv, struct v4l2_format *fmtd) void *priv, struct v4l2_format *fmtd)
{ {
int ret; int ret;
...@@ -1145,7 +1145,7 @@ static int stk_vidioc_s_fmt_cap(struct file *filp, ...@@ -1145,7 +1145,7 @@ static int stk_vidioc_s_fmt_cap(struct file *filp,
return -EBUSY; return -EBUSY;
if (dev->owner && dev->owner != filp) if (dev->owner && dev->owner != filp)
return -EBUSY; return -EBUSY;
ret = stk_vidioc_try_fmt_cap(filp, priv, fmtd); ret = stk_vidioc_try_fmt_vid_cap(filp, priv, fmtd);
if (ret) if (ret)
return ret; return ret;
dev->owner = filp; dev->owner = filp;
...@@ -1342,10 +1342,10 @@ static struct video_device stk_v4l_data = { ...@@ -1342,10 +1342,10 @@ static struct video_device stk_v4l_data = {
.release = stk_v4l_dev_release, .release = stk_v4l_dev_release,
.vidioc_querycap = stk_vidioc_querycap, .vidioc_querycap = stk_vidioc_querycap,
.vidioc_enum_fmt_cap = stk_vidioc_enum_fmt_cap, .vidioc_enum_fmt_vid_cap = stk_vidioc_enum_fmt_vid_cap,
.vidioc_try_fmt_cap = stk_vidioc_try_fmt_cap, .vidioc_try_fmt_vid_cap = stk_vidioc_try_fmt_vid_cap,
.vidioc_s_fmt_cap = stk_vidioc_s_fmt_cap, .vidioc_s_fmt_vid_cap = stk_vidioc_s_fmt_vid_cap,
.vidioc_g_fmt_cap = stk_vidioc_g_fmt_cap, .vidioc_g_fmt_vid_cap = stk_vidioc_g_fmt_vid_cap,
.vidioc_enum_input = stk_vidioc_enum_input, .vidioc_enum_input = stk_vidioc_enum_input,
.vidioc_s_input = stk_vidioc_s_input, .vidioc_s_input = stk_vidioc_s_input,
.vidioc_g_input = stk_vidioc_g_input, .vidioc_g_input = stk_vidioc_g_input,
......
drivers/media/video/usbvision/usbvision-video.c
View file @ 78b526a4
...@@ -998,7 +998,7 @@ static int vidioc_streamoff(struct file *file, ...@@ -998,7 +998,7 @@ static int vidioc_streamoff(struct file *file,
return 0; return 0;
} }
static int vidioc_enum_fmt_cap (struct file *file, void *priv, static int vidioc_enum_fmt_vid_cap (struct file *file, void *priv,
struct v4l2_fmtdesc *vfd) struct v4l2_fmtdesc *vfd)
{ {
if(vfd->index>=USBVISION_SUPPORTED_PALETTES-1) { if(vfd->index>=USBVISION_SUPPORTED_PALETTES-1) {
...@@ -1012,7 +1012,7 @@ static int vidioc_enum_fmt_cap (struct file *file, void *priv, ...@@ -1012,7 +1012,7 @@ static int vidioc_enum_fmt_cap (struct file *file, void *priv,
return 0; return 0;
} }
static int vidioc_g_fmt_cap (struct file *file, void *priv, static int vidioc_g_fmt_vid_cap (struct file *file, void *priv,
struct v4l2_format *vf) struct v4l2_format *vf)
{ {
struct video_device *dev = video_devdata(file); struct video_device *dev = video_devdata(file);
...@@ -1030,7 +1030,7 @@ static int vidioc_g_fmt_cap (struct file *file, void *priv, ...@@ -1030,7 +1030,7 @@ static int vidioc_g_fmt_cap (struct file *file, void *priv,
return 0; return 0;
} }
static int vidioc_try_fmt_cap (struct file *file, void *priv, static int vidioc_try_fmt_vid_cap (struct file *file, void *priv,
struct v4l2_format *vf) struct v4l2_format *vf)
{ {
struct video_device *dev = video_devdata(file); struct video_device *dev = video_devdata(file);
...@@ -1060,7 +1060,7 @@ static int vidioc_try_fmt_cap (struct file *file, void *priv, ...@@ -1060,7 +1060,7 @@ static int vidioc_try_fmt_cap (struct file *file, void *priv,
return 0; return 0;
} }
static int vidioc_s_fmt_cap(struct file *file, void *priv, static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
struct v4l2_format *vf) struct v4l2_format *vf)
{ {
struct video_device *dev = video_devdata(file); struct video_device *dev = video_devdata(file);
...@@ -1068,7 +1068,7 @@ static int vidioc_s_fmt_cap(struct file *file, void *priv, ...@@ -1068,7 +1068,7 @@ static int vidioc_s_fmt_cap(struct file *file, void *priv,
(struct usb_usbvision *) video_get_drvdata(dev); (struct usb_usbvision *) video_get_drvdata(dev);
int ret; int ret;
if( 0 != (ret=vidioc_try_fmt_cap (file, priv, vf)) ) { if( 0 != (ret=vidioc_try_fmt_vid_cap (file, priv, vf)) ) {
return ret; return ret;
} }
...@@ -1407,10 +1407,10 @@ static struct video_device usbvision_video_template = { ...@@ -1407,10 +1407,10 @@ static struct video_device usbvision_video_template = {
.release = video_device_release, .release = video_device_release,
.minor = -1, .minor = -1,
.vidioc_querycap = vidioc_querycap, .vidioc_querycap = vidioc_querycap,
.vidioc_enum_fmt_cap = vidioc_enum_fmt_cap, .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap,
.vidioc_g_fmt_cap = vidioc_g_fmt_cap, .vidioc_g_fmt_vid_cap = vidioc_g_fmt_vid_cap,
.vidioc_try_fmt_cap = vidioc_try_fmt_cap, .vidioc_try_fmt_vid_cap = vidioc_try_fmt_vid_cap,
.vidioc_s_fmt_cap = vidioc_s_fmt_cap, .vidioc_s_fmt_vid_cap = vidioc_s_fmt_vid_cap,
.vidioc_reqbufs = vidioc_reqbufs, .vidioc_reqbufs = vidioc_reqbufs,
.vidioc_querybuf = vidioc_querybuf, .vidioc_querybuf = vidioc_querybuf,
.vidioc_qbuf = vidioc_qbuf, .vidioc_qbuf = vidioc_qbuf,
......
drivers/media/video/videodev.c
View file @ 78b526a4
This diff is collapsed.
drivers/media/video/vivi.c
View file @ 78b526a4
...@@ -630,7 +630,7 @@ static int vidioc_querycap(struct file *file, void *priv, ...@@ -630,7 +630,7 @@ static int vidioc_querycap(struct file *file, void *priv,
return 0; return 0;
} }
static int vidioc_enum_fmt_cap(struct file *file, void *priv, static int vidioc_enum_fmt_vid_cap(struct file *file, void *priv,
struct v4l2_fmtdesc *f) struct v4l2_fmtdesc *f)
{ {
if (f->index > 0) if (f->index > 0)
...@@ -641,7 +641,7 @@ static int vidioc_enum_fmt_cap(struct file *file, void *priv, ...@@ -641,7 +641,7 @@ static int vidioc_enum_fmt_cap(struct file *file, void *priv,
return 0; return 0;
} }
static int vidioc_g_fmt_cap(struct file *file, void *priv, static int vidioc_g_fmt_vid_cap(struct file *file, void *priv,
struct v4l2_format *f) struct v4l2_format *f)
{ {
struct vivi_fh *fh = priv; struct vivi_fh *fh = priv;
...@@ -658,7 +658,7 @@ static int vidioc_g_fmt_cap(struct file *file, void *priv, ...@@ -658,7 +658,7 @@ static int vidioc_g_fmt_cap(struct file *file, void *priv,
return (0); return (0);
} }
static int vidioc_try_fmt_cap(struct file *file, void *priv, static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
struct v4l2_format *f) struct v4l2_format *f)
{ {
struct vivi_fh *fh = priv; struct vivi_fh *fh = priv;
...@@ -706,13 +706,13 @@ static int vidioc_try_fmt_cap(struct file *file, void *priv, ...@@ -706,13 +706,13 @@ static int vidioc_try_fmt_cap(struct file *file, void *priv,
} }
/*FIXME: This seems to be generic enough to be at videodev2 */ /*FIXME: This seems to be generic enough to be at videodev2 */
static int vidioc_s_fmt_cap(struct file *file, void *priv, static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
struct v4l2_format *f) struct v4l2_format *f)
{ {
struct vivi_fh *fh = priv; struct vivi_fh *fh = priv;
struct videobuf_queue *q = &fh->vb_vidq; struct videobuf_queue *q = &fh->vb_vidq;
int ret = vidioc_try_fmt_cap(file, fh, f); int ret = vidioc_try_fmt_vid_cap(file, fh, f);
if (ret < 0) if (ret < 0)
return (ret); return (ret);
...@@ -1066,10 +1066,10 @@ static struct video_device vivi_template = { ...@@ -1066,10 +1066,10 @@ static struct video_device vivi_template = {
.release = video_device_release, .release = video_device_release,
.vidioc_querycap = vidioc_querycap, .vidioc_querycap = vidioc_querycap,
.vidioc_enum_fmt_cap = vidioc_enum_fmt_cap, .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap,
.vidioc_g_fmt_cap = vidioc_g_fmt_cap, .vidioc_g_fmt_vid_cap = vidioc_g_fmt_vid_cap,
.vidioc_try_fmt_cap = vidioc_try_fmt_cap, .vidioc_try_fmt_vid_cap = vidioc_try_fmt_vid_cap,
.vidioc_s_fmt_cap = vidioc_s_fmt_cap, .vidioc_s_fmt_vid_cap = vidioc_s_fmt_vid_cap,
.vidioc_reqbufs = vidioc_reqbufs, .vidioc_reqbufs = vidioc_reqbufs,
.vidioc_querybuf = vidioc_querybuf, .vidioc_querybuf = vidioc_querybuf,
.vidioc_qbuf = vidioc_qbuf, .vidioc_qbuf = vidioc_qbuf,
......
drivers/media/video/zr364xx.c
View file @ 78b526a4
...@@ -521,7 +521,7 @@ static int zr364xx_vidioc_g_ctrl(struct file *file, void *priv, ...@@ -521,7 +521,7 @@ static int zr364xx_vidioc_g_ctrl(struct file *file, void *priv,
return 0; return 0;
} }
static int zr364xx_vidioc_enum_fmt_cap(struct file *file, static int zr364xx_vidioc_enum_fmt_vid_cap(struct file *file,
void *priv, struct v4l2_fmtdesc *f) void *priv, struct v4l2_fmtdesc *f)
{ {
if (f->index > 0) if (f->index > 0)
...@@ -537,7 +537,7 @@ static int zr364xx_vidioc_enum_fmt_cap(struct file *file, ...@@ -537,7 +537,7 @@ static int zr364xx_vidioc_enum_fmt_cap(struct file *file,
return 0; return 0;
} }
static int zr364xx_vidioc_try_fmt_cap(struct file *file, void *priv, static int zr364xx_vidioc_try_fmt_vid_cap(struct file *file, void *priv,
struct v4l2_format *f) struct v4l2_format *f)
{ {
struct video_device *vdev = video_devdata(file); struct video_device *vdev = video_devdata(file);
...@@ -564,7 +564,7 @@ static int zr364xx_vidioc_try_fmt_cap(struct file *file, void *priv, ...@@ -564,7 +564,7 @@ static int zr364xx_vidioc_try_fmt_cap(struct file *file, void *priv,
return 0; return 0;
} }
static int zr364xx_vidioc_g_fmt_cap(struct file *file, void *priv, static int zr364xx_vidioc_g_fmt_vid_cap(struct file *file, void *priv,
struct v4l2_format *f) struct v4l2_format *f)
{ {
struct video_device *vdev = video_devdata(file); struct video_device *vdev = video_devdata(file);
...@@ -589,7 +589,7 @@ static int zr364xx_vidioc_g_fmt_cap(struct file *file, void *priv, ...@@ -589,7 +589,7 @@ static int zr364xx_vidioc_g_fmt_cap(struct file *file, void *priv,
return 0; return 0;
} }
static int zr364xx_vidioc_s_fmt_cap(struct file *file, void *priv, static int zr364xx_vidioc_s_fmt_vid_cap(struct file *file, void *priv,
struct v4l2_format *f) struct v4l2_format *f)
{ {
struct video_device *vdev = video_devdata(file); struct video_device *vdev = video_devdata(file);
...@@ -770,10 +770,10 @@ static struct video_device zr364xx_template = { ...@@ -770,10 +770,10 @@ static struct video_device zr364xx_template = {
.minor = -1, .minor = -1,
.vidioc_querycap = zr364xx_vidioc_querycap, .vidioc_querycap = zr364xx_vidioc_querycap,
.vidioc_enum_fmt_cap = zr364xx_vidioc_enum_fmt_cap, .vidioc_enum_fmt_vid_cap = zr364xx_vidioc_enum_fmt_vid_cap,
.vidioc_try_fmt_cap = zr364xx_vidioc_try_fmt_cap, .vidioc_try_fmt_vid_cap = zr364xx_vidioc_try_fmt_vid_cap,
.vidioc_s_fmt_cap = zr364xx_vidioc_s_fmt_cap, .vidioc_s_fmt_vid_cap = zr364xx_vidioc_s_fmt_vid_cap,
.vidioc_g_fmt_cap = zr364xx_vidioc_g_fmt_cap, .vidioc_g_fmt_vid_cap = zr364xx_vidioc_g_fmt_vid_cap,
.vidioc_enum_input = zr364xx_vidioc_enum_input, .vidioc_enum_input = zr364xx_vidioc_enum_input,
.vidioc_g_input = zr364xx_vidioc_g_input, .vidioc_g_input = zr364xx_vidioc_g_input,
.vidioc_s_input = zr364xx_vidioc_s_input, .vidioc_s_input = zr364xx_vidioc_s_input,
......
include/media/v4l2-dev.h
View file @ 78b526a4
...@@ -118,82 +118,76 @@ struct video_device ...@@ -118,82 +118,76 @@ struct video_device
enum v4l2_priority p); enum v4l2_priority p);
/* VIDIOC_ENUM_FMT handlers */ /* VIDIOC_ENUM_FMT handlers */
int (*vidioc_enum_fmt_cap) (struct file *file, void *fh, int (*vidioc_enum_fmt_vid_cap) (struct file *file, void *fh,
struct v4l2_fmtdesc *f); struct v4l2_fmtdesc *f);
int (*vidioc_enum_fmt_overlay) (struct file *file, void *fh, int (*vidioc_enum_fmt_vid_overlay) (struct file *file, void *fh,
struct v4l2_fmtdesc *f); struct v4l2_fmtdesc *f);
int (*vidioc_enum_fmt_vbi) (struct file *file, void *fh, int (*vidioc_enum_fmt_vid_out) (struct file *file, void *fh,
struct v4l2_fmtdesc *f); struct v4l2_fmtdesc *f);
int (*vidioc_enum_fmt_vbi_capture) (struct file *file, void *fh, #if 1
struct v4l2_fmtdesc *f); /* deprecated, will be removed in 2.6.28 */
int (*vidioc_enum_fmt_video_output)(struct file *file, void *fh, int (*vidioc_enum_fmt_vbi_cap) (struct file *file, void *fh,
struct v4l2_fmtdesc *f);
int (*vidioc_enum_fmt_output_overlay) (struct file *file, void *fh,
struct v4l2_fmtdesc *f);
int (*vidioc_enum_fmt_vbi_output) (struct file *file, void *fh,
struct v4l2_fmtdesc *f);
int (*vidioc_enum_fmt_sliced_vbi_output) (struct file *file, void *fh,
struct v4l2_fmtdesc *f); struct v4l2_fmtdesc *f);
#endif
int (*vidioc_enum_fmt_type_private)(struct file *file, void *fh, int (*vidioc_enum_fmt_type_private)(struct file *file, void *fh,
struct v4l2_fmtdesc *f); struct v4l2_fmtdesc *f);
/* VIDIOC_G_FMT handlers */ /* VIDIOC_G_FMT handlers */
int (*vidioc_g_fmt_cap) (struct file *file, void *fh, int (*vidioc_g_fmt_vid_cap) (struct file *file, void *fh,
struct v4l2_format *f); struct v4l2_format *f);
int (*vidioc_g_fmt_overlay) (struct file *file, void *fh, int (*vidioc_g_fmt_vid_overlay)(struct file *file, void *fh,
struct v4l2_format *f); struct v4l2_format *f);
int (*vidioc_g_fmt_vbi) (struct file *file, void *fh, int (*vidioc_g_fmt_vid_out) (struct file *file, void *fh,
struct v4l2_format *f); struct v4l2_format *f);
int (*vidioc_g_fmt_vbi_output) (struct file *file, void *fh, int (*vidioc_g_fmt_vid_out_overlay)(struct file *file, void *fh,
struct v4l2_format *f); struct v4l2_format *f);
int (*vidioc_g_fmt_sliced_vbi_output) (struct file *file, void *fh, int (*vidioc_g_fmt_vbi_cap) (struct file *file, void *fh,
struct v4l2_format *f); struct v4l2_format *f);
int (*vidioc_g_fmt_vbi_capture)(struct file *file, void *fh, int (*vidioc_g_fmt_vbi_out) (struct file *file, void *fh,
struct v4l2_format *f); struct v4l2_format *f);
int (*vidioc_g_fmt_video_output)(struct file *file, void *fh, int (*vidioc_g_fmt_sliced_vbi_cap)(struct file *file, void *fh,
struct v4l2_format *f); struct v4l2_format *f);
int (*vidioc_g_fmt_output_overlay) (struct file *file, void *fh, int (*vidioc_g_fmt_sliced_vbi_out)(struct file *file, void *fh,
struct v4l2_format *f); struct v4l2_format *f);
int (*vidioc_g_fmt_type_private)(struct file *file, void *fh, int (*vidioc_g_fmt_type_private)(struct file *file, void *fh,
struct v4l2_format *f); struct v4l2_format *f);
/* VIDIOC_S_FMT handlers */ /* VIDIOC_S_FMT handlers */
int (*vidioc_s_fmt_cap) (struct file *file, void *fh, int (*vidioc_s_fmt_vid_cap) (struct file *file, void *fh,
struct v4l2_format *f); struct v4l2_format *f);
int (*vidioc_s_fmt_vid_overlay)(struct file *file, void *fh,
int (*vidioc_s_fmt_overlay) (struct file *file, void *fh,
struct v4l2_format *f); struct v4l2_format *f);
int (*vidioc_s_fmt_vbi) (struct file *file, void *fh, int (*vidioc_s_fmt_vid_out) (struct file *file, void *fh,
struct v4l2_format *f); struct v4l2_format *f);
int (*vidioc_s_fmt_vbi_output) (struct file *file, void *fh, int (*vidioc_s_fmt_vid_out_overlay)(struct file *file, void *fh,
struct v4l2_format *f); struct v4l2_format *f);
int (*vidioc_s_fmt_sliced_vbi_output) (struct file *file, void *fh, int (*vidioc_s_fmt_vbi_cap) (struct file *file, void *fh,
struct v4l2_format *f); struct v4l2_format *f);
int (*vidioc_s_fmt_vbi_capture)(struct file *file, void *fh, int (*vidioc_s_fmt_vbi_out) (struct file *file, void *fh,
struct v4l2_format *f); struct v4l2_format *f);
int (*vidioc_s_fmt_video_output)(struct file *file, void *fh, int (*vidioc_s_fmt_sliced_vbi_cap)(struct file *file, void *fh,
struct v4l2_format *f); struct v4l2_format *f);
int (*vidioc_s_fmt_output_overlay) (struct file *file, void *fh, int (*vidioc_s_fmt_sliced_vbi_out)(struct file *file, void *fh,
struct v4l2_format *f); struct v4l2_format *f);
int (*vidioc_s_fmt_type_private)(struct file *file, void *fh, int (*vidioc_s_fmt_type_private)(struct file *file, void *fh,
struct v4l2_format *f); struct v4l2_format *f);
/* VIDIOC_TRY_FMT handlers */ /* VIDIOC_TRY_FMT handlers */
int (*vidioc_try_fmt_cap) (struct file *file, void *fh, int (*vidioc_try_fmt_vid_cap) (struct file *file, void *fh,
struct v4l2_format *f); struct v4l2_format *f);
int (*vidioc_try_fmt_overlay) (struct file *file, void *fh, int (*vidioc_try_fmt_vid_overlay)(struct file *file, void *fh,
struct v4l2_format *f); struct v4l2_format *f);
int (*vidioc_try_fmt_vbi) (struct file *file, void *fh, int (*vidioc_try_fmt_vid_out) (struct file *file, void *fh,
struct v4l2_format *f); struct v4l2_format *f);
int (*vidioc_try_fmt_vbi_output) (struct file *file, void *fh, int (*vidioc_try_fmt_vid_out_overlay)(struct file *file, void *fh,
struct v4l2_format *f); struct v4l2_format *f);
int (*vidioc_try_fmt_sliced_vbi_output) (struct file *file, void *fh, int (*vidioc_try_fmt_vbi_cap) (struct file *file, void *fh,
struct v4l2_format *f); struct v4l2_format *f);
int (*vidioc_try_fmt_vbi_capture)(struct file *file, void *fh, int (*vidioc_try_fmt_vbi_out) (struct file *file, void *fh,
struct v4l2_format *f); struct v4l2_format *f);
int (*vidioc_try_fmt_video_output)(struct file *file, void *fh, int (*vidioc_try_fmt_sliced_vbi_cap)(struct file *file, void *fh,
struct v4l2_format *f); struct v4l2_format *f);
int (*vidioc_try_fmt_output_overlay)(struct file *file, void *fh, int (*vidioc_try_fmt_sliced_vbi_out)(struct file *file, void *fh,
struct v4l2_format *f); struct v4l2_format *f);
int (*vidioc_try_fmt_type_private)(struct file *file, void *fh, int (*vidioc_try_fmt_type_private)(struct file *file, void *fh,
struct v4l2_format *f); struct v4l2_format *f);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7