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

Commit 098c645e authored by Sakari Ailus's avatar Sakari Ailus Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (6216): V4L: Int if: add vidioc_int_g_ifparm, other updates 



vidioc_int_g_ifparm can be used to obtain hardware-specific information
about the interface used by the slave.

Rearrange v4l2-int-device.h as well.

Also remove useless & characters.

Signed-off-by: default avatarSakari Ailus <sakari.ailus@nokia.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 588005e1

drivers/media/video/v4l2-int-device.c

+2 −2
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ int v4l2_int_ioctl_0(struct v4l2_int_device *d, int cmd) 
{

	return ((v4l2_int_ioctl_func_0 *)

		find_ioctl(d->u.slave, cmd,

			   (v4l2_int_ioctl_func *)&no_such_ioctl_0))(d);

			   (v4l2_int_ioctl_func *)no_such_ioctl_0))(d);

}



static int no_such_ioctl_1(struct v4l2_int_device *d, void *arg)
@@ -162,5 +162,5 @@ int v4l2_int_ioctl_1(struct v4l2_int_device *d, int cmd, void *arg) 
{

	return ((v4l2_int_ioctl_func_1 *)

		find_ioctl(d->u.slave, cmd,

			   (v4l2_int_ioctl_func *)&no_such_ioctl_1))(d, arg);

			   (v4l2_int_ioctl_func *)no_such_ioctl_1))(d, arg);

}

include/media/v4l2-int-device.h

+78 −52
Original line number Diff line number Diff line
@@ -30,11 +30,84 @@ 


#define V4L2NAMESIZE 32



/*

 *

 * The internal V4L2 device interface core.

 *

 */



enum v4l2_int_type {

	v4l2_int_type_master = 1,

	v4l2_int_type_slave

};



struct v4l2_int_device;



struct v4l2_int_master {

	int (*attach)(struct v4l2_int_device *master,

		      struct v4l2_int_device *slave);

	void (*detach)(struct v4l2_int_device *master);

};



typedef int (v4l2_int_ioctl_func)(struct v4l2_int_device *);

typedef int (v4l2_int_ioctl_func_0)(struct v4l2_int_device *);

typedef int (v4l2_int_ioctl_func_1)(struct v4l2_int_device *, void *);



struct v4l2_int_ioctl_desc {

	int num;

	v4l2_int_ioctl_func *func;

};



struct v4l2_int_slave {

	/* Don't touch master. */

	struct v4l2_int_device *master;



	char attach_to[V4L2NAMESIZE];



	int num_ioctls;

	struct v4l2_int_ioctl_desc *ioctls;

};



struct v4l2_int_device {

	/* Don't touch head. */

	struct list_head head;



	struct module *module;



	char name[V4L2NAMESIZE];



	enum v4l2_int_type type;

	union {

		struct v4l2_int_master *master;

		struct v4l2_int_slave *slave;

	} u;



	void *priv;

};



int v4l2_int_device_register(struct v4l2_int_device *d);

void v4l2_int_device_unregister(struct v4l2_int_device *d);



int v4l2_int_ioctl_0(struct v4l2_int_device *d, int cmd);

int v4l2_int_ioctl_1(struct v4l2_int_device *d, int cmd, void *arg);



/*

 *

 * Types and definitions for IOCTL commands.

 *

 */



/* Slave interface type. */

enum v4l2_if_type {

};



struct v4l2_ifparm {

	enum v4l2_if_type if_type;

	union {

	} u;

};



/* IOCTL command numbers. */

enum v4l2_int_ioctl_num {

	/*

	 *
@@ -62,10 +135,12 @@ enum v4l2_int_ioctl_num { 
	vidioc_int_dev_exit_num,

	/* Set device power state: 0 is off, non-zero is on. */

	vidioc_int_s_power_num,

	/* Get parallel interface clock speed for current settings. */

	/* Get slave interface parameters. */

	vidioc_int_g_ifparm_num,

	/* Get external clock speed for current slave settings. */

	vidioc_int_g_ext_clk_num,

	/*

	 * Tell what the parallel interface clock speed actually is.

	 * Tell what the generated interface clock speed actually is.

	 */

	vidioc_int_s_ext_clk_num,

	/* Does the slave need to be reset after VIDIOC_DQBUF? */
@@ -91,56 +166,6 @@ enum v4l2_int_ioctl_num { 
	vidioc_int_priv_start_num = 2000,

};



struct v4l2_int_device;



struct v4l2_int_master {

	int (*attach)(struct v4l2_int_device *master,

		      struct v4l2_int_device *slave);

	void (*detach)(struct v4l2_int_device *master);

};



typedef int (v4l2_int_ioctl_func)(struct v4l2_int_device *);

typedef int (v4l2_int_ioctl_func_0)(struct v4l2_int_device *);

typedef int (v4l2_int_ioctl_func_1)(struct v4l2_int_device *, void *);



struct v4l2_int_ioctl_desc {

	int num;

	v4l2_int_ioctl_func *func;

};



struct v4l2_int_slave {

	/* Don't touch master. */

	struct v4l2_int_device *master;



	char attach_to[V4L2NAMESIZE];



	int num_ioctls;

	struct v4l2_int_ioctl_desc *ioctls;

};



struct v4l2_int_device {

	/* Don't touch head. */

	struct list_head head;



	struct module *module;



	char name[V4L2NAMESIZE];



	enum v4l2_int_type type;

	union {

		struct v4l2_int_master *master;

		struct v4l2_int_slave *slave;

	} u;



	void *priv;

};



int v4l2_int_device_register(struct v4l2_int_device *d);

void v4l2_int_device_unregister(struct v4l2_int_device *d);



int v4l2_int_ioctl_0(struct v4l2_int_device *d, int cmd);

int v4l2_int_ioctl_1(struct v4l2_int_device *d, int cmd, void *arg);



/*

 *

 * IOCTL wrapper functions for better type checking.
@@ -199,6 +224,7 @@ V4L2_INT_WRAPPER_1(s_parm, struct v4l2_streamparm, *); 
V4L2_INT_WRAPPER_0(dev_init);

V4L2_INT_WRAPPER_0(dev_exit);

V4L2_INT_WRAPPER_1(s_power, int, );

V4L2_INT_WRAPPER_1(g_ifparm, struct v4l2_ifparm, *);

V4L2_INT_WRAPPER_1(s_ext_clk, u32, );

V4L2_INT_WRAPPER_1(g_ext_clk, u32, *);

V4L2_INT_WRAPPER_1(g_needs_reset, void, *);