diff options
| author | Andy Walls <awalls@radix.net> | 2009-01-17 08:59:31 -0500 |
|---|---|---|
| committer | Andy Walls <awalls@radix.net> | 2009-01-17 08:59:31 -0500 |
| commit | c6138eadff2f01fd6d20a1f9a39b6ba4cbeff85b (patch) | |
| tree | 4ad3708cf7dc5ff01b2e657e314883ab2330c658 /linux/include | |
| parent | 708ba0701edccea0b0fc2b0ea9303337a85ff05c (diff) | |
| parent | b0fc8c78cb5fd9394d8d4ff3198bdc9390b96001 (diff) | |
| download | mediapointer-dvb-s2-c6138eadff2f01fd6d20a1f9a39b6ba4cbeff85b.tar.gz mediapointer-dvb-s2-c6138eadff2f01fd6d20a1f9a39b6ba4cbeff85b.tar.bz2 | |
Merge from master v4l-dvb repo
Diffstat (limited to 'linux/include')
| -rw-r--r-- | linux/include/media/v4l2-device.h | 8 | ||||
| -rw-r--r-- | linux/include/media/v4l2-subdev.h | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/linux/include/media/v4l2-device.h b/linux/include/media/v4l2-device.h index 9bf4ccc93..55e41afd9 100644 --- a/linux/include/media/v4l2-device.h +++ b/linux/include/media/v4l2-device.h @@ -94,16 +94,16 @@ void v4l2_device_unregister_subdev(struct v4l2_subdev *sd); /* Call the specified callback for all subdevs matching grp_id (if 0, then match them all). Ignore any errors. Note that you cannot add or delete a subdev while walking the subdevs list. */ -#define v4l2_device_call_all(dev, grp_id, o, f, args...) \ +#define v4l2_device_call_all(dev, grpid, o, f, args...) \ __v4l2_device_call_subdevs(dev, \ - !(grp_id) || sd->grp_id == (grp_id), o, f , ##args) + !(grpid) || sd->grp_id == (grpid), o, f , ##args) /* Call the specified callback for all subdevs matching grp_id (if 0, then match them all). If the callback returns an error other than 0 or -ENOIOCTLCMD, then return with that error code. Note that you cannot add or delete a subdev while walking the subdevs list. */ -#define v4l2_device_call_until_err(dev, grp_id, o, f, args...) \ +#define v4l2_device_call_until_err(dev, grpid, o, f, args...) \ __v4l2_device_call_subdevs_until_err(dev, \ - !(grp_id) || sd->grp_id == (grp_id), o, f , ##args) + !(grpid) || sd->grp_id == (grpid), o, f , ##args) #endif diff --git a/linux/include/media/v4l2-subdev.h b/linux/include/media/v4l2-subdev.h index 37b09e56e..9c1663d91 100644 --- a/linux/include/media/v4l2-subdev.h +++ b/linux/include/media/v4l2-subdev.h @@ -78,6 +78,9 @@ struct v4l2_subdev_core_ops { int (*queryctrl)(struct v4l2_subdev *sd, struct v4l2_queryctrl *qc); int (*g_ctrl)(struct v4l2_subdev *sd, struct v4l2_control *ctrl); int (*s_ctrl)(struct v4l2_subdev *sd, struct v4l2_control *ctrl); + int (*g_ext_ctrls)(struct v4l2_subdev *sd, struct v4l2_ext_controls *ctrls); + int (*s_ext_ctrls)(struct v4l2_subdev *sd, struct v4l2_ext_controls *ctrls); + int (*try_ext_ctrls)(struct v4l2_subdev *sd, struct v4l2_ext_controls *ctrls); int (*querymenu)(struct v4l2_subdev *sd, struct v4l2_querymenu *qm); long (*ioctl)(struct v4l2_subdev *sd, unsigned int cmd, void *arg); #ifdef CONFIG_VIDEO_ADV_DEBUG |