Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aecde8b5 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (10141): v4l2: debugging API changed to match against driver name instead of ID. 



Since the i2c driver ID will be removed in the near future we have to
modify the v4l2 debugging API to use the driver name instead of driver ID.

Note that this API is not used in applications other than v4l2-dbg.cpp
as it is for debugging and testing only.

Should anyone use the old VIDIOC_G_CHIP_IDENT, then this will be logged
with a warning that it is deprecated and will be removed in 2.6.30.

Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent da1b5c95

Documentation/video4linux/v4l2-framework.txt

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ may be NULL if the subdev driver does not support anything from that category. 
It looks like this:



struct v4l2_subdev_core_ops {

	int (*g_chip_ident)(struct v4l2_subdev *sd, struct v4l2_chip_ident *chip);

	int (*g_chip_ident)(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ident *chip);

	int (*log_status)(struct v4l2_subdev *sd);

	int (*init)(struct v4l2_subdev *sd, u32 val);

	...

drivers/media/video/bt8xx/bttv-driver.c

+5 −4
Original line number Diff line number Diff line
@@ -2039,7 +2039,7 @@ static int bttv_log_status(struct file *file, void *f) 


#ifdef CONFIG_VIDEO_ADV_DEBUG

static int bttv_g_register(struct file *file, void *f,

					struct v4l2_register *reg)

					struct v4l2_dbg_register *reg)

{

	struct bttv_fh *fh = f;

	struct bttv *btv = fh->btv;
@@ -2047,18 +2047,19 @@ static int bttv_g_register(struct file *file, void *f, 
	if (!capable(CAP_SYS_ADMIN))

		return -EPERM;



	if (!v4l2_chip_match_host(reg->match_type, reg->match_chip))

	if (!v4l2_chip_match_host(&reg->match))

		return -EINVAL;



	/* bt848 has a 12-bit register space */

	reg->reg &= 0xfff;

	reg->val = btread(reg->reg);

	reg->size = 1;



	return 0;

}



static int bttv_s_register(struct file *file, void *f,

					struct v4l2_register *reg)

					struct v4l2_dbg_register *reg)

{

	struct bttv_fh *fh = f;

	struct bttv *btv = fh->btv;
@@ -2066,7 +2067,7 @@ static int bttv_s_register(struct file *file, void *f, 
	if (!capable(CAP_SYS_ADMIN))

		return -EPERM;



	if (!v4l2_chip_match_host(reg->match_type, reg->match_chip))

	if (!v4l2_chip_match_host(&reg->match))

		return -EINVAL;



	/* bt848 has a 12-bit register space */

drivers/media/video/cafe_ccic.c

+4 −3
Original line number Diff line number Diff line
@@ -859,7 +859,7 @@ static int __cafe_cam_reset(struct cafe_camera *cam) 
 */

static int cafe_cam_init(struct cafe_camera *cam)

{

	struct v4l2_chip_ident chip = { V4L2_CHIP_MATCH_I2C_ADDR, 0, 0, 0 };

	struct v4l2_dbg_chip_ident chip;

	int ret;



	mutex_lock(&cam->s_mutex);
@@ -869,8 +869,9 @@ static int cafe_cam_init(struct cafe_camera *cam) 
	ret = __cafe_cam_reset(cam);

	if (ret)

		goto out;

	chip.match_chip = cam->sensor->addr;

	ret = __cafe_cam_cmd(cam, VIDIOC_G_CHIP_IDENT, &chip);

	chip.match.type = V4L2_CHIP_MATCH_I2C_ADDR;

	chip.match.addr = cam->sensor->addr;

	ret = __cafe_cam_cmd(cam, VIDIOC_DBG_G_CHIP_IDENT, &chip);

	if (ret)

		goto out;

	cam->sensor_type = chip.ident;

drivers/media/video/cs5345.c

+6 −7
Original line number Diff line number Diff line
@@ -95,25 +95,24 @@ static int cs5345_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl) 
}



#ifdef CONFIG_VIDEO_ADV_DEBUG

static int cs5345_g_register(struct v4l2_subdev *sd, struct v4l2_register *reg)

static int cs5345_g_register(struct v4l2_subdev *sd, struct v4l2_dbg_register *reg)

{

	struct i2c_client *client = v4l2_get_subdevdata(sd);



	if (!v4l2_chip_match_i2c_client(client,

				reg->match_type, reg->match_chip))

	if (!v4l2_chip_match_i2c_client(client, &reg->match))

		return -EINVAL;

	if (!capable(CAP_SYS_ADMIN))

		return -EPERM;

	reg->size = 1;

	reg->val = cs5345_read(sd, reg->reg & 0x1f);

	return 0;

}



static int cs5345_s_register(struct v4l2_subdev *sd, struct v4l2_register *reg)

static int cs5345_s_register(struct v4l2_subdev *sd, struct v4l2_dbg_register *reg)

{

	struct i2c_client *client = v4l2_get_subdevdata(sd);



	if (!v4l2_chip_match_i2c_client(client,

				reg->match_type, reg->match_chip))

	if (!v4l2_chip_match_i2c_client(client, &reg->match))

		return -EINVAL;

	if (!capable(CAP_SYS_ADMIN))

		return -EPERM;
@@ -122,7 +121,7 @@ static int cs5345_s_register(struct v4l2_subdev *sd, struct v4l2_register *reg) 
}

#endif



static int cs5345_g_chip_ident(struct v4l2_subdev *sd, struct v4l2_chip_ident *chip)

static int cs5345_g_chip_ident(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ident *chip)

{

	struct i2c_client *client = v4l2_get_subdevdata(sd);

drivers/media/video/cs53l32a.c

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static int cs53l32a_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl) 
	return 0;

}



static int cs53l32a_g_chip_ident(struct v4l2_subdev *sd, struct v4l2_chip_ident *chip)

static int cs53l32a_g_chip_ident(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ident *chip)

{

	struct i2c_client *client = v4l2_get_subdevdata(sd);