Skip to content

L
linux
Commit 8b3b90ac authored by Marcin Slusarz's avatar Marcin Slusarz Committed by Mauro Carvalho Chehab
Browse files
Options

V4L/DVB (7363): fix coding style violations in v4l1-compat.c 

fix most coding style violations found by checkpatch
Signed-off-by: default avatarMarcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent a2a7f84b
Show whitespace changes
Inline Side-by-side
Showing with 90 additions and 94 deletions
drivers/media/video/v4l1-compat.c
View file @ 8b3b90ac
...@@ -41,13 +41,16 @@ ...@@ -41,13 +41,16 @@
static unsigned int debug; static unsigned int debug;
module_param(debug, int, 0644); module_param(debug, int, 0644);
MODULE_PARM_DESC(debug,"enable debug messages"); MODULE_PARM_DESC(debug, "enable debug messages");
MODULE_AUTHOR("Bill Dirks"); MODULE_AUTHOR("Bill Dirks");
MODULE_DESCRIPTION("v4l(1) compatibility layer for v4l2 drivers."); MODULE_DESCRIPTION("v4l(1) compatibility layer for v4l2 drivers.");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
#define dprintk(fmt, arg...) if (debug) \ #define dprintk(fmt, arg...) \
printk(KERN_DEBUG "v4l1-compat: " fmt , ## arg) do { \
if (debug) \
printk(KERN_DEBUG "v4l1-compat: " fmt , ## arg);\
} while (0)
/* /*
* I O C T L T R A N S L A T I O N * I O C T L T R A N S L A T I O N
...@@ -69,14 +72,12 @@ get_v4l_control(struct inode *inode, ...@@ -69,14 +72,12 @@ get_v4l_control(struct inode *inode,
qctrl2.id = cid; qctrl2.id = cid;
err = drv(inode, file, VIDIOC_QUERYCTRL, &qctrl2); err = drv(inode, file, VIDIOC_QUERYCTRL, &qctrl2);
if (err < 0) if (err < 0)
dprintk("VIDIOC_QUERYCTRL: %d\n",err); dprintk("VIDIOC_QUERYCTRL: %d\n", err);
if (err == 0 && if (err == 0 && !(qctrl2.flags & V4L2_CTRL_FLAG_DISABLED)) {
!(qctrl2.flags & V4L2_CTRL_FLAG_DISABLED))
{
ctrl2.id = qctrl2.id; ctrl2.id = qctrl2.id;
err = drv(inode, file, VIDIOC_G_CTRL, &ctrl2); err = drv(inode, file, VIDIOC_G_CTRL, &ctrl2);
if (err < 0) { if (err < 0) {
dprintk("VIDIOC_G_CTRL: %d\n",err); dprintk("VIDIOC_G_CTRL: %d\n", err);
return 0; return 0;
} }
return ((ctrl2.value - qctrl2.minimum) * 65535 return ((ctrl2.value - qctrl2.minimum) * 65535
...@@ -100,11 +101,10 @@ set_v4l_control(struct inode *inode, ...@@ -100,11 +101,10 @@ set_v4l_control(struct inode *inode,
qctrl2.id = cid; qctrl2.id = cid;
err = drv(inode, file, VIDIOC_QUERYCTRL, &qctrl2); err = drv(inode, file, VIDIOC_QUERYCTRL, &qctrl2);
if (err < 0) if (err < 0)
dprintk("VIDIOC_QUERYCTRL: %d\n",err); dprintk("VIDIOC_QUERYCTRL: %d\n", err);
if (err == 0 && if (err == 0 &&
!(qctrl2.flags & V4L2_CTRL_FLAG_DISABLED) && !(qctrl2.flags & V4L2_CTRL_FLAG_DISABLED) &&
!(qctrl2.flags & V4L2_CTRL_FLAG_GRABBED)) !(qctrl2.flags & V4L2_CTRL_FLAG_GRABBED)) {
{
if (value < 0) if (value < 0)
value = 0; value = 0;
if (value > 65535) if (value > 65535)
...@@ -119,7 +119,7 @@ set_v4l_control(struct inode *inode, ...@@ -119,7 +119,7 @@ set_v4l_control(struct inode *inode,
ctrl2.value += qctrl2.minimum; ctrl2.value += qctrl2.minimum;
err = drv(inode, file, VIDIOC_S_CTRL, &ctrl2); err = drv(inode, file, VIDIOC_S_CTRL, &ctrl2);
if (err < 0) if (err < 0)
dprintk("VIDIOC_S_CTRL: %d\n",err); dprintk("VIDIOC_S_CTRL: %d\n", err);
} }
return 0; return 0;
} }
...@@ -157,8 +157,7 @@ static unsigned int __attribute_const__ ...@@ -157,8 +157,7 @@ static unsigned int __attribute_const__
pixelformat_to_palette(unsigned int pixelformat) pixelformat_to_palette(unsigned int pixelformat)
{ {
int palette = 0; int palette = 0;
switch (pixelformat) switch (pixelformat) {
{
case V4L2_PIX_FMT_GREY: case V4L2_PIX_FMT_GREY:
palette = VIDEO_PALETTE_GREY; palette = VIDEO_PALETTE_GREY;
break; break;
...@@ -234,9 +233,9 @@ static int count_inputs(struct inode *inode, ...@@ -234,9 +233,9 @@ static int count_inputs(struct inode *inode,
int i; int i;
for (i = 0;; i++) { for (i = 0;; i++) {
memset(&input2,0,sizeof(input2)); memset(&input2, 0, sizeof(input2));
input2.index = i; input2.index = i;
if (0 != drv(inode,file,VIDIOC_ENUMINPUT, &input2)) if (0 != drv(inode, file, VIDIOC_ENUMINPUT, &input2))
break; break;
} }
return i; return i;
...@@ -250,18 +249,18 @@ static int check_size(struct inode *inode, ...@@ -250,18 +249,18 @@ static int check_size(struct inode *inode,
struct v4l2_fmtdesc desc2; struct v4l2_fmtdesc desc2;
struct v4l2_format fmt2; struct v4l2_format fmt2;
memset(&desc2,0,sizeof(desc2)); memset(&desc2, 0, sizeof(desc2));
memset(&fmt2,0,sizeof(fmt2)); memset(&fmt2, 0, sizeof(fmt2));
desc2.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; desc2.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
if (0 != drv(inode,file,VIDIOC_ENUM_FMT, &desc2)) if (0 != drv(inode, file, VIDIOC_ENUM_FMT, &desc2))
goto done; goto done;
fmt2.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; fmt2.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
fmt2.fmt.pix.width = 10000; fmt2.fmt.pix.width = 10000;
fmt2.fmt.pix.height = 10000; fmt2.fmt.pix.height = 10000;
fmt2.fmt.pix.pixelformat = desc2.pixelformat; fmt2.fmt.pix.pixelformat = desc2.pixelformat;
if (0 != drv(inode,file,VIDIOC_TRY_FMT, &fmt2)) if (0 != drv(inode, file, VIDIOC_TRY_FMT, &fmt2))
goto done; goto done;
*maxw = fmt2.fmt.pix.width; *maxw = fmt2.fmt.pix.width;
...@@ -313,13 +312,13 @@ v4l_compat_translate_ioctl(struct inode *inode, ...@@ -313,13 +312,13 @@ v4l_compat_translate_ioctl(struct inode *inode,
err = drv(inode, file, VIDIOC_QUERYCAP, cap2); err = drv(inode, file, VIDIOC_QUERYCAP, cap2);
if (err < 0) { if (err < 0) {
dprintk("VIDIOCGCAP / VIDIOC_QUERYCAP: %d\n",err); dprintk("VIDIOCGCAP / VIDIOC_QUERYCAP: %d\n", err);
break; break;
} }
if (cap2->capabilities & V4L2_CAP_VIDEO_OVERLAY) { if (cap2->capabilities & V4L2_CAP_VIDEO_OVERLAY) {
err = drv(inode, file, VIDIOC_G_FBUF, &fbuf2); err = drv(inode, file, VIDIOC_G_FBUF, &fbuf2);
if (err < 0) { if (err < 0) {
dprintk("VIDIOCGCAP / VIDIOC_G_FBUF: %d\n",err); dprintk("VIDIOCGCAP / VIDIOC_G_FBUF: %d\n", err);
memset(&fbuf2, 0, sizeof(fbuf2)); memset(&fbuf2, 0, sizeof(fbuf2));
} }
err = 0; err = 0;
...@@ -339,9 +338,9 @@ v4l_compat_translate_ioctl(struct inode *inode, ...@@ -339,9 +338,9 @@ v4l_compat_translate_ioctl(struct inode *inode,
if (fbuf2.capability & V4L2_FBUF_CAP_LIST_CLIPPING) if (fbuf2.capability & V4L2_FBUF_CAP_LIST_CLIPPING)
cap->type |= VID_TYPE_CLIPPING; cap->type |= VID_TYPE_CLIPPING;
cap->channels = count_inputs(inode,file,drv); cap->channels = count_inputs(inode, file, drv);
check_size(inode,file,drv, check_size(inode, file, drv,
&cap->maxwidth,&cap->maxheight); &cap->maxwidth, &cap->maxheight);
cap->audios = 0; /* FIXME */ cap->audios = 0; /* FIXME */
cap->minwidth = 48; /* FIXME */ cap->minwidth = 48; /* FIXME */
cap->minheight = 32; /* FIXME */ cap->minheight = 32; /* FIXME */
...@@ -356,7 +355,7 @@ v4l_compat_translate_ioctl(struct inode *inode, ...@@ -356,7 +355,7 @@ v4l_compat_translate_ioctl(struct inode *inode,
err = drv(inode, file, VIDIOC_G_FBUF, &fbuf2); err = drv(inode, file, VIDIOC_G_FBUF, &fbuf2);
if (err < 0) { if (err < 0) {
dprintk("VIDIOCGFBUF / VIDIOC_G_FBUF: %d\n",err); dprintk("VIDIOCGFBUF / VIDIOC_G_FBUF: %d\n", err);
break; break;
} }
buffer->base = fbuf2.base; buffer->base = fbuf2.base;
...@@ -386,8 +385,8 @@ v4l_compat_translate_ioctl(struct inode *inode, ...@@ -386,8 +385,8 @@ v4l_compat_translate_ioctl(struct inode *inode,
buffer->bytesperline = fbuf2.fmt.bytesperline; buffer->bytesperline = fbuf2.fmt.bytesperline;
if (!buffer->depth && buffer->width) if (!buffer->depth && buffer->width)
buffer->depth = ((fbuf2.fmt.bytesperline<<3) buffer->depth = ((fbuf2.fmt.bytesperline<<3)
+ (buffer->width-1) ) + (buffer->width-1))
/buffer->width; / buffer->width;
} else { } else {
buffer->bytesperline = buffer->bytesperline =
(buffer->width * buffer->depth + 7) & 7; (buffer->width * buffer->depth + 7) & 7;
...@@ -423,7 +422,7 @@ v4l_compat_translate_ioctl(struct inode *inode, ...@@ -423,7 +422,7 @@ v4l_compat_translate_ioctl(struct inode *inode,
fbuf2.fmt.bytesperline = buffer->bytesperline; fbuf2.fmt.bytesperline = buffer->bytesperline;
err = drv(inode, file, VIDIOC_S_FBUF, &fbuf2); err = drv(inode, file, VIDIOC_S_FBUF, &fbuf2);
if (err < 0) if (err < 0)
dprintk("VIDIOCSFBUF / VIDIOC_S_FBUF: %d\n",err); dprintk("VIDIOCSFBUF / VIDIOC_S_FBUF: %d\n", err);
break; break;
} }
case VIDIOCGWIN: /* get window or capture dimensions */ case VIDIOCGWIN: /* get window or capture dimensions */
...@@ -435,12 +434,12 @@ v4l_compat_translate_ioctl(struct inode *inode, ...@@ -435,12 +434,12 @@ v4l_compat_translate_ioctl(struct inode *inode,
err = -ENOMEM; err = -ENOMEM;
break; break;
} }
memset(win,0,sizeof(*win)); memset(win, 0, sizeof(*win));
fmt2->type = V4L2_BUF_TYPE_VIDEO_OVERLAY; fmt2->type = V4L2_BUF_TYPE_VIDEO_OVERLAY;
err = drv(inode, file, VIDIOC_G_FMT, fmt2); err = drv(inode, file, VIDIOC_G_FMT, fmt2);
if (err < 0) if (err < 0)
dprintk("VIDIOCGWIN / VIDIOC_G_WIN: %d\n",err); dprintk("VIDIOCGWIN / VIDIOC_G_WIN: %d\n", err);
if (err == 0) { if (err == 0) {
win->x = fmt2->fmt.win.w.left; win->x = fmt2->fmt.win.w.left;
win->y = fmt2->fmt.win.w.top; win->y = fmt2->fmt.win.w.top;
...@@ -455,7 +454,7 @@ v4l_compat_translate_ioctl(struct inode *inode, ...@@ -455,7 +454,7 @@ v4l_compat_translate_ioctl(struct inode *inode,
fmt2->type = V4L2_BUF_TYPE_VIDEO_CAPTURE; fmt2->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
err = drv(inode, file, VIDIOC_G_FMT, fmt2); err = drv(inode, file, VIDIOC_G_FMT, fmt2);
if (err < 0) { if (err < 0) {
dprintk("VIDIOCGWIN / VIDIOC_G_FMT: %d\n",err); dprintk("VIDIOCGWIN / VIDIOC_G_FMT: %d\n", err);
break; break;
} }
win->x = 0; win->x = 0;
...@@ -470,7 +469,7 @@ v4l_compat_translate_ioctl(struct inode *inode, ...@@ -470,7 +469,7 @@ v4l_compat_translate_ioctl(struct inode *inode,
case VIDIOCSWIN: /* set window and/or capture dimensions */ case VIDIOCSWIN: /* set window and/or capture dimensions */
{ {
struct video_window *win = arg; struct video_window *win = arg;
int err1,err2; int err1, err2;
fmt2 = kzalloc(sizeof(*fmt2), GFP_KERNEL); fmt2 = kzalloc(sizeof(*fmt2), GFP_KERNEL);
if (!fmt2) { if (!fmt2) {
...@@ -481,7 +480,7 @@ v4l_compat_translate_ioctl(struct inode *inode, ...@@ -481,7 +480,7 @@ v4l_compat_translate_ioctl(struct inode *inode,
drv(inode, file, VIDIOC_STREAMOFF, &fmt2->type); drv(inode, file, VIDIOC_STREAMOFF, &fmt2->type);
err1 = drv(inode, file, VIDIOC_G_FMT, fmt2); err1 = drv(inode, file, VIDIOC_G_FMT, fmt2);
if (err1 < 0) if (err1 < 0)
dprintk("VIDIOCSWIN / VIDIOC_G_FMT: %d\n",err); dprintk("VIDIOCSWIN / VIDIOC_G_FMT: %d\n", err);
if (err1 == 0) { if (err1 == 0) {
fmt2->fmt.pix.width = win->width; fmt2->fmt.pix.width = win->width;
fmt2->fmt.pix.height = win->height; fmt2->fmt.pix.height = win->height;
...@@ -495,7 +494,7 @@ v4l_compat_translate_ioctl(struct inode *inode, ...@@ -495,7 +494,7 @@ v4l_compat_translate_ioctl(struct inode *inode,
win->height = fmt2->fmt.pix.height; win->height = fmt2->fmt.pix.height;
} }
memset(fmt2,0,sizeof(*fmt2)); memset(fmt2, 0, sizeof(*fmt2));
fmt2->type = V4L2_BUF_TYPE_VIDEO_OVERLAY; fmt2->type = V4L2_BUF_TYPE_VIDEO_OVERLAY;
fmt2->fmt.win.w.left = win->x; fmt2->fmt.win.w.left = win->x;
fmt2->fmt.win.w.top = win->y; fmt2->fmt.win.w.top = win->y;
...@@ -506,7 +505,7 @@ v4l_compat_translate_ioctl(struct inode *inode, ...@@ -506,7 +505,7 @@ v4l_compat_translate_ioctl(struct inode *inode,
fmt2->fmt.win.clipcount = win->clipcount; fmt2->fmt.win.clipcount = win->clipcount;
err2 = drv(inode, file, VIDIOC_S_FMT, fmt2); err2 = drv(inode, file, VIDIOC_S_FMT, fmt2);
if (err2 < 0) if (err2 < 0)
dprintk("VIDIOCSWIN / VIDIOC_S_FMT #2: %d\n",err); dprintk("VIDIOCSWIN / VIDIOC_S_FMT #2: %d\n", err);
if (err1 != 0 && err2 != 0) if (err1 != 0 && err2 != 0)
err = err1; err = err1;
...@@ -524,19 +523,19 @@ v4l_compat_translate_ioctl(struct inode *inode, ...@@ -524,19 +523,19 @@ v4l_compat_translate_ioctl(struct inode *inode,
} }
err = drv(inode, file, VIDIOC_OVERLAY, arg); err = drv(inode, file, VIDIOC_OVERLAY, arg);
if (err < 0) if (err < 0)
dprintk("VIDIOCCAPTURE / VIDIOC_PREVIEW: %d\n",err); dprintk("VIDIOCCAPTURE / VIDIOC_PREVIEW: %d\n", err);
break; break;
} }
case VIDIOCGCHAN: /* get input information */ case VIDIOCGCHAN: /* get input information */
{ {
struct video_channel *chan = arg; struct video_channel *chan = arg;
memset(&input2,0,sizeof(input2)); memset(&input2, 0, sizeof(input2));
input2.index = chan->channel; input2.index = chan->channel;
err = drv(inode, file, VIDIOC_ENUMINPUT, &input2); err = drv(inode, file, VIDIOC_ENUMINPUT, &input2);
if (err < 0) { if (err < 0) {
dprintk("VIDIOCGCHAN / VIDIOC_ENUMINPUT: " dprintk("VIDIOCGCHAN / VIDIOC_ENUMINPUT: "
"channel=%d err=%d\n",chan->channel,err); "channel=%d err=%d\n", chan->channel, err);
break; break;
} }
chan->channel = input2.index; chan->channel = input2.index;
...@@ -557,7 +556,7 @@ v4l_compat_translate_ioctl(struct inode *inode, ...@@ -557,7 +556,7 @@ v4l_compat_translate_ioctl(struct inode *inode,
chan->norm = 0; chan->norm = 0;
err = drv(inode, file, VIDIOC_G_STD, &sid); err = drv(inode, file, VIDIOC_G_STD, &sid);
if (err < 0) if (err < 0)
dprintk("VIDIOCGCHAN / VIDIOC_G_STD: %d\n",err); dprintk("VIDIOCGCHAN / VIDIOC_G_STD: %d\n", err);
if (err == 0) { if (err == 0) {
if (sid & V4L2_STD_PAL) if (sid & V4L2_STD_PAL)
chan->norm = VIDEO_MODE_PAL; chan->norm = VIDEO_MODE_PAL;
...@@ -575,7 +574,7 @@ v4l_compat_translate_ioctl(struct inode *inode, ...@@ -575,7 +574,7 @@ v4l_compat_translate_ioctl(struct inode *inode,
sid = 0; sid = 0;
err = drv(inode, file, VIDIOC_S_INPUT, &chan->channel); err = drv(inode, file, VIDIOC_S_INPUT, &chan->channel);
if (err < 0) if (err < 0)
dprintk("VIDIOCSCHAN / VIDIOC_S_INPUT: %d\n",err); dprintk("VIDIOCSCHAN / VIDIOC_S_INPUT: %d\n", err);
switch (chan->norm) { switch (chan->norm) {
case VIDEO_MODE_PAL: case VIDEO_MODE_PAL:
sid = V4L2_STD_PAL; sid = V4L2_STD_PAL;
...@@ -590,7 +589,7 @@ v4l_compat_translate_ioctl(struct inode *inode, ...@@ -590,7 +589,7 @@ v4l_compat_translate_ioctl(struct inode *inode,
if (0 != sid) { if (0 != sid) {
err = drv(inode, file, VIDIOC_S_STD, &sid); err = drv(inode, file, VIDIOC_S_STD, &sid);
if (err < 0) if (err < 0)
dprintk("VIDIOCSCHAN / VIDIOC_S_STD: %d\n",err); dprintk("VIDIOCSCHAN / VIDIOC_S_STD: %d\n", err);
} }
break; break;
} }
...@@ -605,7 +604,7 @@ v4l_compat_translate_ioctl(struct inode *inode, ...@@ -605,7 +604,7 @@ v4l_compat_translate_ioctl(struct inode *inode,
} }
pict->brightness = get_v4l_control(inode, file, pict->brightness = get_v4l_control(inode, file,
V4L2_CID_BRIGHTNESS,drv); V4L2_CID_BRIGHTNESS, drv);
pict->hue = get_v4l_control(inode, file, pict->hue = get_v4l_control(inode, file,
V4L2_CID_HUE, drv); V4L2_CID_HUE, drv);
pict->contrast = get_v4l_control(inode, file, pict->contrast = get_v4l_control(inode, file,
...@@ -618,13 +617,13 @@ v4l_compat_translate_ioctl(struct inode *inode, ...@@ -618,13 +617,13 @@ v4l_compat_translate_ioctl(struct inode *inode,
fmt2->type = V4L2_BUF_TYPE_VIDEO_CAPTURE; fmt2->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
err = drv(inode, file, VIDIOC_G_FMT, fmt2); err = drv(inode, file, VIDIOC_G_FMT, fmt2);
if (err < 0) { if (err < 0) {
dprintk("VIDIOCGPICT / VIDIOC_G_FMT: %d\n",err); dprintk("VIDIOCGPICT / VIDIOC_G_FMT: %d\n", err);
break; break;
} }
pict->depth = ((fmt2->fmt.pix.bytesperline<<3) pict->depth = ((fmt2->fmt.pix.bytesperline << 3)
+ (fmt2->fmt.pix.width-1) ) + (fmt2->fmt.pix.width - 1))
/fmt2->fmt.pix.width; / fmt2->fmt.pix.width;
pict->palette = pixelformat_to_palette( pict->palette = pixelformat_to_palette(
fmt2->fmt.pix.pixelformat); fmt2->fmt.pix.pixelformat);
break; break;
...@@ -664,7 +663,7 @@ v4l_compat_translate_ioctl(struct inode *inode, ...@@ -664,7 +663,7 @@ v4l_compat_translate_ioctl(struct inode *inode,
support memory capture. Trying to set the memory capture support memory capture. Trying to set the memory capture
parameters would be pointless. */ parameters would be pointless. */
if (err < 0) { if (err < 0) {
dprintk("VIDIOCSPICT / VIDIOC_G_FMT: %d\n",err); dprintk("VIDIOCSPICT / VIDIOC_G_FMT: %d\n", err);
mem_err = -1000; /* didn't even try */ mem_err = -1000; /* didn't even try */
} else if (fmt2->fmt.pix.pixelformat != } else if (fmt2->fmt.pix.pixelformat !=
palette_to_pixelformat(pict->palette)) { palette_to_pixelformat(pict->palette)) {
...@@ -681,7 +680,7 @@ v4l_compat_translate_ioctl(struct inode *inode, ...@@ -681,7 +680,7 @@ v4l_compat_translate_ioctl(struct inode *inode,
support overlay. Trying to set the overlay parameters support overlay. Trying to set the overlay parameters
would be quite pointless. */ would be quite pointless. */
if (err < 0) { if (err < 0) {
dprintk("VIDIOCSPICT / VIDIOC_G_FBUF: %d\n",err); dprintk("VIDIOCSPICT / VIDIOC_G_FBUF: %d\n", err);
ovl_err = -1000; /* didn't even try */ ovl_err = -1000; /* didn't even try */
} else if (fbuf2.fmt.pixelformat != } else if (fbuf2.fmt.pixelformat !=
palette_to_pixelformat(pict->palette)) { palette_to_pixelformat(pict->palette)) {
...@@ -692,16 +691,15 @@ v4l_compat_translate_ioctl(struct inode *inode, ...@@ -692,16 +691,15 @@ v4l_compat_translate_ioctl(struct inode *inode,
dprintk("VIDIOCSPICT / VIDIOC_S_FBUF: %d\n", dprintk("VIDIOCSPICT / VIDIOC_S_FBUF: %d\n",
ovl_err); ovl_err);
} }
if (ovl_err < 0 && mem_err < 0) if (ovl_err < 0 && mem_err < 0) {
/* ioctl failed, couldn't set either parameter */ /* ioctl failed, couldn't set either parameter */
if (mem_err != -1000) { if (mem_err != -1000)
err = mem_err; err = mem_err;
} else if (ovl_err == -EPERM) { else if (ovl_err == -EPERM)
err = 0; err = 0;
} else {
err = ovl_err;
}
else else
err = ovl_err;
} else
err = 0; err = 0;
break; break;
} }
...@@ -709,10 +707,10 @@ v4l_compat_translate_ioctl(struct inode *inode, ...@@ -709,10 +707,10 @@ v4l_compat_translate_ioctl(struct inode *inode,
{ {
struct video_tuner *tun = arg; struct video_tuner *tun = arg;
memset(&tun2,0,sizeof(tun2)); memset(&tun2, 0, sizeof(tun2));
err = drv(inode, file, VIDIOC_G_TUNER, &tun2); err = drv(inode, file, VIDIOC_G_TUNER, &tun2);
if (err < 0) { if (err < 0) {
dprintk("VIDIOCGTUNER / VIDIOC_G_TUNER: %d\n",err); dprintk("VIDIOCGTUNER / VIDIOC_G_TUNER: %d\n", err);
break; break;
} }
memcpy(tun->name, tun2.name, memcpy(tun->name, tun2.name,
...@@ -724,7 +722,7 @@ v4l_compat_translate_ioctl(struct inode *inode, ...@@ -724,7 +722,7 @@ v4l_compat_translate_ioctl(struct inode *inode,
tun->mode = VIDEO_MODE_AUTO; tun->mode = VIDEO_MODE_AUTO;
for (i = 0; i < 64; i++) { for (i = 0; i < 64; i++) {
memset(&std2,0,sizeof(std2)); memset(&std2, 0, sizeof(std2));
std2.index = i; std2.index = i;
if (0 != drv(inode, file, VIDIOC_ENUMSTD, &std2)) if (0 != drv(inode, file, VIDIOC_ENUMSTD, &std2))
break; break;
...@@ -738,7 +736,7 @@ v4l_compat_translate_ioctl(struct inode *inode, ...@@ -738,7 +736,7 @@ v4l_compat_translate_ioctl(struct inode *inode,
err = drv(inode, file, VIDIOC_G_STD, &sid); err = drv(inode, file, VIDIOC_G_STD, &sid);
if (err < 0) if (err < 0)
dprintk("VIDIOCGTUNER / VIDIOC_G_STD: %d\n",err); dprintk("VIDIOCGTUNER / VIDIOC_G_STD: %d\n", err);
if (err == 0) { if (err == 0) {
if (sid & V4L2_STD_PAL) if (sid & V4L2_STD_PAL)
tun->mode = VIDEO_MODE_PAL; tun->mode = VIDEO_MODE_PAL;
...@@ -759,25 +757,25 @@ v4l_compat_translate_ioctl(struct inode *inode, ...@@ -759,25 +757,25 @@ v4l_compat_translate_ioctl(struct inode *inode,
{ {
struct video_tuner *tun = arg; struct video_tuner *tun = arg;
struct v4l2_tuner t; struct v4l2_tuner t;
memset(&t,0,sizeof(t)); memset(&t, 0, sizeof(t));
t.index=tun->tuner; t.index = tun->tuner;
err = drv(inode, file, VIDIOC_S_INPUT, &t); err = drv(inode, file, VIDIOC_S_INPUT, &t);
if (err < 0) if (err < 0)
dprintk("VIDIOCSTUNER / VIDIOC_S_INPUT: %d\n",err); dprintk("VIDIOCSTUNER / VIDIOC_S_INPUT: %d\n", err);
break; break;
} }
case VIDIOCGFREQ: /* get frequency */ case VIDIOCGFREQ: /* get frequency */
{ {
unsigned long *freq = arg; unsigned long *freq = arg;
memset(&freq2,0,sizeof(freq2)); memset(&freq2, 0, sizeof(freq2));
freq2.tuner = 0; freq2.tuner = 0;
err = drv(inode, file, VIDIOC_G_FREQUENCY, &freq2); err = drv(inode, file, VIDIOC_G_FREQUENCY, &freq2);
if (err < 0) if (err < 0)
dprintk("VIDIOCGFREQ / VIDIOC_G_FREQUENCY: %d\n",err); dprintk("VIDIOCGFREQ / VIDIOC_G_FREQUENCY: %d\n", err);
if (0 == err) if (0 == err)
*freq = freq2.frequency; *freq = freq2.frequency;
break; break;
...@@ -785,23 +783,23 @@ v4l_compat_translate_ioctl(struct inode *inode, ...@@ -785,23 +783,23 @@ v4l_compat_translate_ioctl(struct inode *inode,
case VIDIOCSFREQ: /* set frequency */ case VIDIOCSFREQ: /* set frequency */
{ {
unsigned long *freq = arg; unsigned long *freq = arg;
memset(&freq2,0,sizeof(freq2)); memset(&freq2, 0, sizeof(freq2));
drv(inode, file, VIDIOC_G_FREQUENCY, &freq2); drv(inode, file, VIDIOC_G_FREQUENCY, &freq2);
freq2.frequency = *freq; freq2.frequency = *freq;
err = drv(inode, file, VIDIOC_S_FREQUENCY, &freq2); err = drv(inode, file, VIDIOC_S_FREQUENCY, &freq2);
if (err < 0) if (err < 0)
dprintk("VIDIOCSFREQ / VIDIOC_S_FREQUENCY: %d\n",err); dprintk("VIDIOCSFREQ / VIDIOC_S_FREQUENCY: %d\n", err);
break; break;
} }
case VIDIOCGAUDIO: /* get audio properties/controls */ case VIDIOCGAUDIO: /* get audio properties/controls */
{ {
struct video_audio *aud = arg; struct video_audio *aud = arg;
memset(&aud2,0,sizeof(aud2)); memset(&aud2, 0, sizeof(aud2));
err = drv(inode, file, VIDIOC_G_AUDIO, &aud2); err = drv(inode, file, VIDIOC_G_AUDIO, &aud2);
if (err < 0) { if (err < 0) {
dprintk("VIDIOCGAUDIO / VIDIOC_G_AUDIO: %d\n",err); dprintk("VIDIOCGAUDIO / VIDIOC_G_AUDIO: %d\n", err);
break; break;
} }
memcpy(aud->name, aud2.name, memcpy(aud->name, aud2.name,
...@@ -842,10 +840,10 @@ v4l_compat_translate_ioctl(struct inode *inode, ...@@ -842,10 +840,10 @@ v4l_compat_translate_ioctl(struct inode *inode,
aud->step = qctrl2.step; aud->step = qctrl2.step;
aud->mode = 0; aud->mode = 0;
memset(&tun2,0,sizeof(tun2)); memset(&tun2, 0, sizeof(tun2));
err = drv(inode, file, VIDIOC_G_TUNER, &tun2); err = drv(inode, file, VIDIOC_G_TUNER, &tun2);
if (err < 0) { if (err < 0) {
dprintk("VIDIOCGAUDIO / VIDIOC_G_TUNER: %d\n",err); dprintk("VIDIOCGAUDIO / VIDIOC_G_TUNER: %d\n", err);
err = 0; err = 0;
break; break;
} }
...@@ -862,13 +860,13 @@ v4l_compat_translate_ioctl(struct inode *inode, ...@@ -862,13 +860,13 @@ v4l_compat_translate_ioctl(struct inode *inode,
{ {
struct video_audio *aud = arg; struct video_audio *aud = arg;
memset(&aud2,0,sizeof(aud2)); memset(&aud2, 0, sizeof(aud2));
memset(&tun2,0,sizeof(tun2)); memset(&tun2, 0, sizeof(tun2));
aud2.index = aud->audio; aud2.index = aud->audio;
err = drv(inode, file, VIDIOC_S_AUDIO, &aud2); err = drv(inode, file, VIDIOC_S_AUDIO, &aud2);
if (err < 0) { if (err < 0) {
dprintk("VIDIOCSAUDIO / VIDIOC_S_AUDIO: %d\n",err); dprintk("VIDIOCSAUDIO / VIDIOC_S_AUDIO: %d\n", err);
break; break;
} }
...@@ -885,7 +883,7 @@ v4l_compat_translate_ioctl(struct inode *inode, ...@@ -885,7 +883,7 @@ v4l_compat_translate_ioctl(struct inode *inode,
err = drv(inode, file, VIDIOC_G_TUNER, &tun2); err = drv(inode, file, VIDIOC_G_TUNER, &tun2);
if (err < 0) if (err < 0)
dprintk("VIDIOCSAUDIO / VIDIOC_G_TUNER: %d\n",err); dprintk("VIDIOCSAUDIO / VIDIOC_G_TUNER: %d\n", err);
if (err == 0) { if (err == 0) {
switch (aud->mode) { switch (aud->mode) {
default: default:
...@@ -902,7 +900,7 @@ v4l_compat_translate_ioctl(struct inode *inode, ...@@ -902,7 +900,7 @@ v4l_compat_translate_ioctl(struct inode *inode,
} }
err = drv(inode, file, VIDIOC_S_TUNER, &tun2); err = drv(inode, file, VIDIOC_S_TUNER, &tun2);
if (err < 0) if (err < 0)
dprintk("VIDIOCSAUDIO / VIDIOC_S_TUNER: %d\n",err); dprintk("VIDIOCSAUDIO / VIDIOC_S_TUNER: %d\n", err);
} }
err = 0; err = 0;
break; break;
...@@ -916,19 +914,19 @@ v4l_compat_translate_ioctl(struct inode *inode, ...@@ -916,19 +914,19 @@ v4l_compat_translate_ioctl(struct inode *inode,
err = -ENOMEM; err = -ENOMEM;
break; break;
} }
memset(&buf2,0,sizeof(buf2)); memset(&buf2, 0, sizeof(buf2));
fmt2->type = V4L2_BUF_TYPE_VIDEO_CAPTURE; fmt2->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
err = drv(inode, file, VIDIOC_G_FMT, fmt2); err = drv(inode, file, VIDIOC_G_FMT, fmt2);
if (err < 0) { if (err < 0) {
dprintk("VIDIOCMCAPTURE / VIDIOC_G_FMT: %d\n",err); dprintk("VIDIOCMCAPTURE / VIDIOC_G_FMT: %d\n", err);
break; break;
} }
if (mm->width != fmt2->fmt.pix.width || if (mm->width != fmt2->fmt.pix.width ||
mm->height != fmt2->fmt.pix.height || mm->height != fmt2->fmt.pix.height ||
palette_to_pixelformat(mm->format) != palette_to_pixelformat(mm->format) !=
fmt2->fmt.pix.pixelformat) fmt2->fmt.pix.pixelformat) {
{/* New capture format... */ /* New capture format... */
fmt2->fmt.pix.width = mm->width; fmt2->fmt.pix.width = mm->width;
fmt2->fmt.pix.height = mm->height; fmt2->fmt.pix.height = mm->height;
fmt2->fmt.pix.pixelformat = fmt2->fmt.pix.pixelformat =
...@@ -937,7 +935,7 @@ v4l_compat_translate_ioctl(struct inode *inode, ...@@ -937,7 +935,7 @@ v4l_compat_translate_ioctl(struct inode *inode,
fmt2->fmt.pix.bytesperline = 0; fmt2->fmt.pix.bytesperline = 0;
err = drv(inode, file, VIDIOC_S_FMT, fmt2); err = drv(inode, file, VIDIOC_S_FMT, fmt2);
if (err < 0) { if (err < 0) {
dprintk("VIDIOCMCAPTURE / VIDIOC_S_FMT: %d\n",err); dprintk("VIDIOCMCAPTURE / VIDIOC_S_FMT: %d\n", err);
break; break;
} }
} }
...@@ -945,30 +943,30 @@ v4l_compat_translate_ioctl(struct inode *inode, ...@@ -945,30 +943,30 @@ v4l_compat_translate_ioctl(struct inode *inode,
buf2.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; buf2.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
err = drv(inode, file, VIDIOC_QUERYBUF, &buf2); err = drv(inode, file, VIDIOC_QUERYBUF, &buf2);
if (err < 0) { if (err < 0) {
dprintk("VIDIOCMCAPTURE / VIDIOC_QUERYBUF: %d\n",err); dprintk("VIDIOCMCAPTURE / VIDIOC_QUERYBUF: %d\n", err);
break; break;
} }
err = drv(inode, file, VIDIOC_QBUF, &buf2); err = drv(inode, file, VIDIOC_QBUF, &buf2);
if (err < 0) { if (err < 0) {
dprintk("VIDIOCMCAPTURE / VIDIOC_QBUF: %d\n",err); dprintk("VIDIOCMCAPTURE / VIDIOC_QBUF: %d\n", err);
break; break;
} }
err = drv(inode, file, VIDIOC_STREAMON, &captype); err = drv(inode, file, VIDIOC_STREAMON, &captype);
if (err < 0) if (err < 0)
dprintk("VIDIOCMCAPTURE / VIDIOC_STREAMON: %d\n",err); dprintk("VIDIOCMCAPTURE / VIDIOC_STREAMON: %d\n", err);
break; break;
} }
case VIDIOCSYNC: /* wait for a frame */ case VIDIOCSYNC: /* wait for a frame */
{ {
int *i = arg; int *i = arg;
memset(&buf2,0,sizeof(buf2)); memset(&buf2, 0, sizeof(buf2));
buf2.index = *i; buf2.index = *i;
buf2.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; buf2.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
err = drv(inode, file, VIDIOC_QUERYBUF, &buf2); err = drv(inode, file, VIDIOC_QUERYBUF, &buf2);
if (err < 0) { if (err < 0) {
/* No such buffer */ /* No such buffer */
dprintk("VIDIOCSYNC / VIDIOC_QUERYBUF: %d\n",err); dprintk("VIDIOCSYNC / VIDIOC_QUERYBUF: %d\n", err);
break; break;
} }
if (!(buf2.flags & V4L2_BUF_FLAG_MAPPED)) { if (!(buf2.flags & V4L2_BUF_FLAG_MAPPED)) {
...@@ -980,29 +978,28 @@ v4l_compat_translate_ioctl(struct inode *inode, ...@@ -980,29 +978,28 @@ v4l_compat_translate_ioctl(struct inode *inode,
/* make sure capture actually runs so we don't block forever */ /* make sure capture actually runs so we don't block forever */
err = drv(inode, file, VIDIOC_STREAMON, &captype); err = drv(inode, file, VIDIOC_STREAMON, &captype);
if (err < 0) { if (err < 0) {
dprintk("VIDIOCSYNC / VIDIOC_STREAMON: %d\n",err); dprintk("VIDIOCSYNC / VIDIOC_STREAMON: %d\n", err);
break; break;
} }
/* Loop as long as the buffer is queued, but not done */ /* Loop as long as the buffer is queued, but not done */
while ((buf2.flags & while ((buf2.flags &
(V4L2_BUF_FLAG_QUEUED | V4L2_BUF_FLAG_DONE)) (V4L2_BUF_FLAG_QUEUED | V4L2_BUF_FLAG_DONE))
== V4L2_BUF_FLAG_QUEUED) == V4L2_BUF_FLAG_QUEUED) {
{
err = poll_one(file); err = poll_one(file);
if (err < 0 || /* error or sleep was interrupted */ if (err < 0 || /* error or sleep was interrupted */
err == 0) /* timeout? Shouldn't occur. */ err == 0) /* timeout? Shouldn't occur. */
break; break;
err = drv(inode, file, VIDIOC_QUERYBUF, &buf2); err = drv(inode, file, VIDIOC_QUERYBUF, &buf2);
if (err < 0) if (err < 0)
dprintk("VIDIOCSYNC / VIDIOC_QUERYBUF: %d\n",err); dprintk("VIDIOCSYNC / VIDIOC_QUERYBUF: %d\n", err);
} }
if (!(buf2.flags & V4L2_BUF_FLAG_DONE)) /* not done */ if (!(buf2.flags & V4L2_BUF_FLAG_DONE)) /* not done */
break; break;
do { do {
err = drv(inode, file, VIDIOC_DQBUF, &buf2); err = drv(inode, file, VIDIOC_DQBUF, &buf2);
if (err < 0) if (err < 0)
dprintk("VIDIOCSYNC / VIDIOC_DQBUF: %d\n",err); dprintk("VIDIOCSYNC / VIDIOC_DQBUF: %d\n", err);
} while (err == 0 && buf2.index != *i); } while (err == 0 && buf2.index != *i);
break; break;
} }
...@@ -1093,7 +1090,6 @@ v4l_compat_translate_ioctl(struct inode *inode, ...@@ -1093,7 +1090,6 @@ v4l_compat_translate_ioctl(struct inode *inode,
kfree(fmt2); kfree(fmt2);
return err; return err;
} }
EXPORT_SYMBOL(v4l_compat_translate_ioctl); EXPORT_SYMBOL(v4l_compat_translate_ioctl);
/* /*
......
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