diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-02-13 18:29:48 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-02-13 18:29:48 -0200 |
| commit | 20a16b5ff3c186e90241702dbbc00a25d0b1b9e2 (patch) | |
| tree | 9cf76edcb9951186fccb7d89db0cb45a1bb637b1 /linux/include/media/v4l2-common.h | |
| parent | 27bdf53f81e7783e79bcd334e4d3d5d329708694 (diff) | |
| parent | 646f5e295e95d6295503fd5b3f5105102c8cc687 (diff) | |
| download | mediapointer-dvb-s2-20a16b5ff3c186e90241702dbbc00a25d0b1b9e2.tar.gz mediapointer-dvb-s2-20a16b5ff3c186e90241702dbbc00a25d0b1b9e2.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-lib
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/include/media/v4l2-common.h')
| -rw-r--r-- | linux/include/media/v4l2-common.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/linux/include/media/v4l2-common.h b/linux/include/media/v4l2-common.h index 0f864f8da..de785da45 100644 --- a/linux/include/media/v4l2-common.h +++ b/linux/include/media/v4l2-common.h @@ -107,6 +107,11 @@ int v4l2_ctrl_query_menu(struct v4l2_querymenu *qmenu, struct v4l2_queryctrl *qctrl, const char **menu_items); #define V4L2_CTRL_MENU_IDS_END (0xffffffff) int v4l2_ctrl_query_menu_valid_items(struct v4l2_querymenu *qmenu, const u32 *ids); + +/* Note: ctrl_classes points to an array of u32 pointers. Each u32 array is a + 0-terminated array of control IDs. Each array must be sorted low to high + and belong to the same control class. The array of u32 pointers must also + be sorted, from low class IDs to high class IDs. */ u32 v4l2_ctrl_next(const u32 * const *ctrl_classes, u32 id); /* ------------------------------------------------------------------------- */ @@ -297,4 +302,7 @@ struct v4l2_crystal_freq { a v4l2_gpio struct if a direction is also needed. */ #define VIDIOC_INT_S_GPIO _IOW('d', 117, u32) +/* Get input status. Same as the status field in the v4l2_input struct. */ +#define VIDIOC_INT_G_INPUT_STATUS _IOR('d', 118, u32) + #endif /* V4L2_COMMON_H_ */ |