adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-31 21:26:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

V4L/DVB (10087): Add new enum_input function on soc_camera

Browse source 
This patch presents new method to be able to select V4L2 input type

Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.com>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Kuninori Morimoto 2008-12-18 12:47:46 -03:00 committed by Mauro Carvalho Chehab
parent 513791aba6
commit 34d359db7d
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/media/video/soc_camera.c
View file

@ -125,14 +125,23 @@ static int soc_camera_try_fmt_vid_cap(struct file *file, void *priv,
static int soc_camera_enum_input(struct file *file, void *priv, static int soc_camera_enum_input(struct file *file, void *priv,
struct v4l2_input *inp) struct v4l2_input *inp)
{ {
struct soc_camera_file *icf = file->private_data;
struct soc_camera_device *icd = icf->icd;
int ret = 0;
if (inp->index != 0) if (inp->index != 0)
return -EINVAL; return -EINVAL;
inp->type = V4L2_INPUT_TYPE_CAMERA; if (icd->ops->enum_input)
inp->std = V4L2_STD_UNKNOWN; ret = icd->ops->enum_input(icd, inp);
strcpy(inp->name, "Camera"); else {
/* default is camera */
inp->type = V4L2_INPUT_TYPE_CAMERA;
inp->std = V4L2_STD_UNKNOWN;
strcpy(inp->name, "Camera");
}
return 0; return ret;
} }
static int soc_camera_g_input(struct file *file, void *priv, unsigned int *i) static int soc_camera_g_input(struct file *file, void *priv, unsigned int *i)

1
include/media/soc_camera.h
View file

@ -166,6 +166,7 @@ struct soc_camera_ops {
int (*get_chip_id)(struct soc_camera_device *, int (*get_chip_id)(struct soc_camera_device *,
struct v4l2_chip_ident *); struct v4l2_chip_ident *);
int (*set_std)(struct soc_camera_device *, v4l2_std_id *); int (*set_std)(struct soc_camera_device *, v4l2_std_id *);
int (*enum_input)(struct soc_camera_device *, struct v4l2_input *);
#ifdef CONFIG_VIDEO_ADV_DEBUG #ifdef CONFIG_VIDEO_ADV_DEBUG
int (*get_register)(struct soc_camera_device *, struct v4l2_register *); int (*get_register)(struct soc_camera_device *, struct v4l2_register *);
int (*set_register)(struct soc_camera_device *, struct v4l2_register *); int (*set_register)(struct soc_camera_device *, struct v4l2_register *);