Skip to content

K
kernel_linux

OpenHarmony / kernel_linux
上一次同步 3 年多

通知 13
Star 8
Fork 2
K
kernel_linux
提交 305519c9 编写于 作者: D Douglas Schilling Landgraf 提交者： Mauro Carvalho Chehab
浏览文件
操作

V4L/DVB (8120): cx23885-417: Replace cx23885_do_ioctl to use video_ioctl2 

Convert cx23885-417 to use video_ioctl2
Signed-off-by: NDouglas Schilling Landgraf <dougsland@gmail.com>
Signed-off-by: NMichael Krufky <mkrufky@linuxtv.org>
Signed-off-by: NMauro Carvalho Chehab <mchehab@infradead.org>
上级 9c7ecaf5
显示空白变更内容
内联 并排
Showing with 375 addition and 324 deletion
drivers/media/video/cx23885/cx23885-417.c
浏览文件 @ 305519c9
......@@ -1176,40 +1176,10 @@ static int cx23885_querymenu(struct cx23885_dev *dev,
cx2341x_ctrl_get_menu(&dev->mpeg_params, qmenu->id));
}
int cx23885_do_ioctl(struct inode *inode, struct file *file, int radio,
struct cx23885_dev *dev, unsigned int cmd, void *arg,
v4l2_kioctl driver_ioctl)
static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *id)
{
int err;
switch (cmd) {
/* ---------- tv norms ---------- */
case VIDIOC_ENUMSTD:
{
struct v4l2_standard *e = arg;
unsigned int i;
i = e->index;
if (i >= ARRAY_SIZE(cx23885_tvnorms))
return -EINVAL;
err = v4l2_video_std_construct(e,
cx23885_tvnorms[e->index].id,
cx23885_tvnorms[e->index].name);
e->index = i;
if (err < 0)
return err;
return 0;
}
case VIDIOC_G_STD:
{
v4l2_std_id *id = arg;
*id = dev->encodernorm.id;
return 0;
}
case VIDIOC_S_STD:
{
v4l2_std_id *id = arg;
struct cx23885_fh *fh = file->private_data;
struct cx23885_dev *dev = fh->dev;
unsigned int i;
for (i = 0; i < ARRAY_SIZE(cx23885_tvnorms); i++)
......@@ -1218,28 +1188,34 @@ int cx23885_do_ioctl(struct inode *inode, struct file *file, int radio,
if (i == ARRAY_SIZE(cx23885_tvnorms))
return -EINVAL;
dev->encodernorm = cx23885_tvnorms[i];
return 0;
}
}
/* ------ input switching ---------- */
case VIDIOC_ENUMINPUT:
{
static int vidioc_enum_input(struct file *file, void *priv,
struct v4l2_input *i)
{
struct cx23885_fh *fh = file->private_data;
struct cx23885_dev *dev = fh->dev;
struct cx23885_input *input;
struct v4l2_input *i = arg;
unsigned int n;
n = i->index;
if (n >= 4)
return -EINVAL;
input = &cx23885_boards[dev->board].input[n];
if (input->type == 0)
return -EINVAL;
memset(i, 0, sizeof(*i));
i->index = n;
/* FIXME
* strcpy(i->name, input->name); */
strcpy(i->name, "unset");
if (input->type == CX23885_VMUX_TELEVISION ||
input->type == CX23885_VMUX_CABLE)
i->type = V4L2_INPUT_TYPE_TUNER;
......@@ -1249,28 +1225,30 @@ int cx23885_do_ioctl(struct inode *inode, struct file *file, int radio,
for (n = 0; n < ARRAY_SIZE(cx23885_tvnorms); n++)
i->std |= cx23885_tvnorms[n].id;
return 0;
}
case VIDIOC_G_INPUT:
{
unsigned int *i = arg;
}
static int vidioc_g_input(struct file *file, void *priv, unsigned int *i)
{
struct cx23885_fh *fh = file->private_data;
struct cx23885_dev *dev = fh->dev;
*i = dev->input;
return 0;
}
case VIDIOC_S_INPUT:
{
unsigned int *i = arg;
}
if (*i >= 4)
static int vidioc_s_input(struct file *file, void *priv, unsigned int i)
{
if (i >= 4)
return -EINVAL;
return 0;
}
}
/* --- tuner ioctls ------------------------------------------ */
case VIDIOC_G_TUNER:
{
struct v4l2_tuner *t = arg;
static int vidioc_g_tuner(struct file *file, void *priv,
struct v4l2_tuner *t)
{
struct cx23885_fh *fh = file->private_data;
struct cx23885_dev *dev = fh->dev;
if (UNSET == dev->tuner_type)
return -EINVAL;
......@@ -1284,10 +1262,13 @@ int cx23885_do_ioctl(struct inode *inode, struct file *file, int radio,
dprintk(1, "VIDIOC_G_TUNER: tuner type %d\n", t->type);
return 0;
}
case VIDIOC_S_TUNER:
{
struct v4l2_tuner *t = arg;
}
static int vidioc_s_tuner(struct file *file, void *priv,
struct v4l2_tuner *t)
{
struct cx23885_fh *fh = file->private_data;
struct cx23885_dev *dev = fh->dev;
if (UNSET == dev->tuner_type)
return -EINVAL;
......@@ -1296,10 +1277,13 @@ int cx23885_do_ioctl(struct inode *inode, struct file *file, int radio,
cx23885_call_i2c_clients(&dev->i2c_bus[2], VIDIOC_S_TUNER, t);
return 0;
}
case VIDIOC_G_FREQUENCY:
{
struct v4l2_frequency *f = arg;
}
static int vidioc_g_frequency(struct file *file, void *priv,
struct v4l2_frequency *f)
{
struct cx23885_fh *fh = file->private_data;
struct cx23885_dev *dev = fh->dev;
memset(f, 0, sizeof(*f));
if (UNSET == dev->tuner_type)
......@@ -1308,14 +1292,20 @@ int cx23885_do_ioctl(struct inode *inode, struct file *file, int radio,
f->frequency = dev->freq;
/* Assumption that tuner is always on bus 1 */
cx23885_call_i2c_clients(&dev->i2c_bus[1],
VIDIOC_G_FREQUENCY, f);
cx23885_call_i2c_clients(&dev->i2c_bus[1], VIDIOC_G_FREQUENCY, f);
return 0;
}
case VIDIOC_S_FREQUENCY:
{
struct v4l2_frequency *f = arg;
}
static int vidioc_s_frequency(struct file *file, void *priv,
struct v4l2_frequency *f)
{
struct cx23885_fh *fh = file->private_data;
struct cx23885_dev *dev = fh->dev;
cx23885_api_cmd(fh->dev, CX2341X_ENC_STOP_CAPTURE, 3, 0,
CX23885_END_NOW, CX23885_MPEG_CAPTURE,
CX23885_RAW_BITS_NONE);
dprintk(1, "VIDIOC_S_FREQUENCY: dev type %d, f\n",
dev->tuner_type);
......@@ -1330,42 +1320,30 @@ int cx23885_do_ioctl(struct inode *inode, struct file *file, int radio,
dev->freq = f->frequency;
/* Assumption that tuner is always on bus 1 */
cx23885_call_i2c_clients(&dev->i2c_bus[1],
VIDIOC_S_FREQUENCY, f);
return 0;
}
case VIDIOC_S_CTRL:
{
/* Update the A/V core */
cx23885_call_i2c_clients(&dev->i2c_bus[2], VIDIOC_S_CTRL, arg);
return 0;
}
default:
/* Convert V4L ioctl to V4L2 and call mpeg_do_ioctl
* (driver_ioctl) */
return v4l_compat_translate_ioctl(inode, file, cmd, arg,
driver_ioctl);
}
cx23885_call_i2c_clients(&dev->i2c_bus[1], VIDIOC_S_FREQUENCY, f);
cx23885_initialize_codec(dev);
return 0;
}
static int mpeg_do_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, void *arg)
static int vidioc_s_ctrl(struct file *file, void *priv,
struct v4l2_control *ctl)
{
struct cx23885_fh *fh = file->private_data;
struct cx23885_dev *dev = fh->dev;
struct cx23885_tsport *tsport = &dev->ts1;
if (v4l_debug > 1)
v4l_print_ioctl(dev->name, cmd);
switch (cmd) {
/* Update the A/V core */
cx23885_call_i2c_clients(&dev->i2c_bus[2], VIDIOC_S_CTRL, ctl);
return 0;
}
/* --- capabilities ------------------------------------------ */
case VIDIOC_QUERYCAP:
{
struct v4l2_capability *cap = arg;
static int vidioc_querycap(struct file *file, void *priv,
struct v4l2_capability *cap)
{
struct cx23885_fh *fh = file->private_data;
struct cx23885_dev *dev = fh->dev;
struct cx23885_tsport *tsport = &dev->ts1;
memset(cap, 0, sizeof(*cap));
strcpy(cap->driver, dev->name);
......@@ -1382,12 +1360,11 @@ static int mpeg_do_ioctl(struct inode *inode, struct file *file,
cap->capabilities |= V4L2_CAP_TUNER;
return 0;
}
}
/* --- capture ioctls ---------------------------------------- */
case VIDIOC_ENUM_FMT:
{
struct v4l2_fmtdesc *f = arg;
static int vidioc_enum_fmt_vid_cap(struct file *file, void *priv,
struct v4l2_fmtdesc *f)
{
int index;
index = f->index;
......@@ -1399,11 +1376,15 @@ static int mpeg_do_ioctl(struct inode *inode, struct file *file,
strlcpy(f->description, "MPEG", sizeof(f->description));
f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
f->pixelformat = V4L2_PIX_FMT_MPEG;
return 0;
}
case VIDIOC_G_FMT:
{
struct v4l2_format *f = arg;
}
static int vidioc_g_fmt_vid_cap(struct file *file, void *priv,
struct v4l2_format *f)
{
struct cx23885_fh *fh = file->private_data;
struct cx23885_dev *dev = fh->dev;
memset(f, 0, sizeof(*f));
f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
......@@ -1418,10 +1399,13 @@ static int mpeg_do_ioctl(struct inode *inode, struct file *file,
dprintk(1, "VIDIOC_G_FMT: w: %d, h: %d, f: %d\n",
dev->ts1.width, dev->ts1.height, fh->mpegq.field);
return 0;
}
case VIDIOC_TRY_FMT:
{
struct v4l2_format *f = arg;
}
static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
struct v4l2_format *f)
{
struct cx23885_fh *fh = file->private_data;
struct cx23885_dev *dev = fh->dev;
f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
f->fmt.pix.pixelformat = V4L2_PIX_FMT_MPEG;
......@@ -1433,10 +1417,13 @@ static int mpeg_do_ioctl(struct inode *inode, struct file *file,
dprintk(1, "VIDIOC_TRY_FMT: w: %d, h: %d, f: %d\n",
dev->ts1.width, dev->ts1.height, fh->mpegq.field);
return 0;
}
case VIDIOC_S_FMT:
{
struct v4l2_format *f = arg;
}
static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
struct v4l2_format *f)
{
struct cx23885_fh *fh = file->private_data;
struct cx23885_dev *dev = fh->dev;
f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
f->fmt.pix.pixelformat = V4L2_PIX_FMT_MPEG;
......@@ -1447,67 +1434,108 @@ static int mpeg_do_ioctl(struct inode *inode, struct file *file,
dprintk(1, "VIDIOC_S_FMT: w: %d, h: %d, f: %d\n",
f->fmt.pix.width, f->fmt.pix.height, f->fmt.pix.field);
return 0;
}
}
/* --- streaming capture ------------------------------------- */
case VIDIOC_REQBUFS:
return videobuf_reqbufs(&fh->mpegq, arg);
static int vidioc_reqbufs(struct file *file, void *priv,
struct v4l2_requestbuffers *p)
{
struct cx23885_fh *fh = file->private_data;
case VIDIOC_QUERYBUF:
return videobuf_querybuf(&fh->mpegq, arg);
return videobuf_reqbufs(&fh->mpegq, p);
}
case VIDIOC_QBUF:
return videobuf_qbuf(&fh->mpegq, arg);
static int vidioc_querybuf(struct file *file, void *priv,
struct v4l2_buffer *p)
{
struct cx23885_fh *fh = file->private_data;
case VIDIOC_DQBUF:
return videobuf_dqbuf(&fh->mpegq, arg,
file->f_flags & O_NONBLOCK);
return videobuf_querybuf(&fh->mpegq, p);
}
static int vidioc_qbuf(struct file *file, void *priv,
struct v4l2_buffer *p)
{
struct cx23885_fh *fh = file->private_data;
return videobuf_qbuf(&fh->mpegq, p);
}
static int vidioc_dqbuf(struct file *file, void *priv, struct v4l2_buffer *b)
{
struct cx23885_fh *fh = priv;
return videobuf_dqbuf(&fh->mpegq, b, file->f_flags & O_NONBLOCK);
}
static int vidioc_streamon(struct file *file, void *priv,
enum v4l2_buf_type i)
{
struct cx23885_fh *fh = file->private_data;
case VIDIOC_STREAMON:
return videobuf_streamon(&fh->mpegq);
}
static int vidioc_streamoff(struct file *file, void *priv, enum v4l2_buf_type i)
{
struct cx23885_fh *fh = file->private_data;
case VIDIOC_STREAMOFF:
return videobuf_streamoff(&fh->mpegq);
}
case VIDIOC_G_EXT_CTRLS:
{
struct v4l2_ext_controls *f = arg;
static int vidioc_g_ext_ctrls(struct file *file, void *priv,
struct v4l2_ext_controls *f)
{
struct cx23885_fh *fh = priv;
struct cx23885_dev *dev = fh->dev;
if (f->ctrl_class != V4L2_CTRL_CLASS_MPEG)
return -EINVAL;
return cx2341x_ext_ctrls(&dev->mpeg_params, 0, f, cmd);
}
case VIDIOC_S_EXT_CTRLS:
case VIDIOC_TRY_EXT_CTRLS:
{
struct v4l2_ext_controls *f = arg;
return cx2341x_ext_ctrls(&dev->mpeg_params, 0, f, VIDIOC_G_EXT_CTRLS);
}
static int vidioc_s_ext_ctrls(struct file *file, void *priv,
struct v4l2_ext_controls *f)
{
struct cx23885_fh *fh = priv;
struct cx23885_dev *dev = fh->dev;
struct cx2341x_mpeg_params p;
int err;
if (f->ctrl_class != V4L2_CTRL_CLASS_MPEG)
return -EINVAL;
p = dev->mpeg_params;
err = cx2341x_ext_ctrls(&p, 0, f, cmd);
if (err == 0 && cmd == VIDIOC_S_EXT_CTRLS) {
err = cx2341x_ext_ctrls(&p, 0, f, VIDIOC_S_EXT_CTRLS);
if (err == 0) {
err = cx2341x_update(dev, cx23885_mbox_func,
&dev->mpeg_params, &p);
dev->mpeg_params = p;
}
return err;
}
case VIDIOC_S_FREQUENCY:
{
cx23885_api_cmd(fh->dev, CX2341X_ENC_STOP_CAPTURE, 3, 0,
CX23885_END_NOW, CX23885_MPEG_CAPTURE,
CX23885_RAW_BITS_NONE);
cx23885_do_ioctl(inode, file, 0, dev, cmd, arg,
mpeg_do_ioctl);
cx23885_initialize_codec(dev);
}
return 0;
}
case VIDIOC_LOG_STATUS:
{
static int vidioc_try_ext_ctrls(struct file *file, void *priv,
struct v4l2_ext_controls *f)
{
struct cx23885_fh *fh = priv;
struct cx23885_dev *dev = fh->dev;
struct cx2341x_mpeg_params p;
int err;
if (f->ctrl_class != V4L2_CTRL_CLASS_MPEG)
return -EINVAL;
p = dev->mpeg_params;
err = cx2341x_ext_ctrls(&p, 0, f, VIDIOC_TRY_EXT_CTRLS);
return err;
}
static int vidioc_log_status(struct file *file, void *priv)
{
struct cx23885_fh *fh = priv;
struct cx23885_dev *dev = fh->dev;
char name[32 + 2];
snprintf(name, sizeof(name), "%s/2", dev->name);
......@@ -1525,27 +1553,24 @@ static int mpeg_do_ioctl(struct inode *inode, struct file *file,
"%s/2: ============= END LOG STATUS =============\n",
dev->name);
return 0;
}
case VIDIOC_QUERYMENU:
return cx23885_querymenu(dev, arg);
case VIDIOC_QUERYCTRL:
{
struct v4l2_queryctrl *c = arg;
}
return cx23885_queryctrl(dev, c);
}
static int vidioc_querymenu(struct file *file, void *priv,
struct v4l2_querymenu *a)
{
struct cx23885_fh *fh = priv;
struct cx23885_dev *dev = fh->dev;
default:
return cx23885_do_ioctl(inode, file, 0, dev, cmd, arg,
mpeg_do_ioctl);
}
return 0;
return cx23885_querymenu(dev, a);
}
static int mpeg_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg)
static int vidioc_queryctrl(struct file *file, void *priv,
struct v4l2_queryctrl *c)
{
return video_usercopy(inode, file, cmd, arg, mpeg_do_ioctl);
struct cx23885_fh *fh = priv;
struct cx23885_dev *dev = fh->dev;
return cx23885_queryctrl(dev, c);
}
static int mpeg_open(struct inode *inode, struct file *file)
......@@ -1670,7 +1695,7 @@ static struct file_operations mpeg_fops = {
.read = mpeg_read,
.poll = mpeg_poll,
.mmap = mpeg_mmap,
.ioctl = mpeg_ioctl,
.ioctl = video_ioctl2,
.llseek = no_llseek,
};
......@@ -1682,6 +1707,32 @@ static struct video_device cx23885_mpeg_template = {
VID_TYPE_MPEG_ENCODER,
.fops = &mpeg_fops,
.minor = -1,
.vidioc_s_std = vidioc_s_std,
.vidioc_enum_input = vidioc_enum_input,
.vidioc_g_input = vidioc_g_input,
.vidioc_s_input = vidioc_s_input,
.vidioc_g_tuner = vidioc_g_tuner,
.vidioc_s_tuner = vidioc_s_tuner,
.vidioc_g_frequency = vidioc_g_frequency,
.vidioc_s_frequency = vidioc_s_frequency,
.vidioc_s_ctrl = vidioc_s_ctrl,
.vidioc_querycap = vidioc_querycap,
.vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap,
.vidioc_g_fmt_vid_cap = vidioc_g_fmt_vid_cap,
.vidioc_try_fmt_vid_cap = vidioc_try_fmt_vid_cap,
.vidioc_s_fmt_vid_cap = vidioc_s_fmt_vid_cap,
.vidioc_reqbufs = vidioc_reqbufs,
.vidioc_querybuf = vidioc_querybuf,
.vidioc_qbuf = vidioc_qbuf,
.vidioc_dqbuf = vidioc_dqbuf,
.vidioc_streamon = vidioc_streamon,
.vidioc_streamoff = vidioc_streamoff,
.vidioc_g_ext_ctrls = vidioc_g_ext_ctrls,
.vidioc_s_ext_ctrls = vidioc_s_ext_ctrls,
.vidioc_try_ext_ctrls = vidioc_try_ext_ctrls,
.vidioc_log_status = vidioc_log_status,
.vidioc_querymenu = vidioc_querymenu,
.vidioc_queryctrl = vidioc_queryctrl,
};
void cx23885_417_unregister(struct cx23885_dev *dev)
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或