diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-08-28 07:59:35 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-08-28 07:59:35 -0300 |
| commit | c0ed3442e926ec304d6d231bfaa66d5e2e53059c (patch) | |
| tree | b15123da87e6668c64f17e4d4eebfaa01449523e /linux/include | |
| parent | 7d302bb17d4ebe98e2e0cbe76beb2a72b3292843 (diff) | |
| parent | e62da4f3647592717616864fd8e60b7f27566953 (diff) | |
| download | mediapointer-dvb-s2-c0ed3442e926ec304d6d231bfaa66d5e2e53059c.tar.gz mediapointer-dvb-s2-c0ed3442e926ec304d6d231bfaa66d5e2e53059c.tar.bz2 | |
merge: http://linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/include')
| -rw-r--r-- | linux/include/linux/videodev2.h | 3 | ||||
| -rw-r--r-- | linux/include/media/v4l2-common.h | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/linux/include/linux/videodev2.h b/linux/include/linux/videodev2.h index 9eccad749..a2c663daf 100644 --- a/linux/include/linux/videodev2.h +++ b/linux/include/linux/videodev2.h @@ -1203,7 +1203,8 @@ struct v4l2_sliced_vbi_cap (equals frame lines 313-336 for 625 line video standards, 263-286 for 525 line standards) */ __u16 service_lines[2][24]; - __u32 reserved[4]; /* must be 0 */ + enum v4l2_buf_type type; + __u32 reserved[3]; /* must be 0 */ }; struct v4l2_sliced_vbi_data diff --git a/linux/include/media/v4l2-common.h b/linux/include/media/v4l2-common.h index 98976fd3b..ca40bca45 100644 --- a/linux/include/media/v4l2-common.h +++ b/linux/include/media/v4l2-common.h @@ -175,8 +175,9 @@ enum v4l2_chip_ident { #define VIDIOC_INT_S_REGISTER _IOR ('d', 100, struct v4l2_register) #define VIDIOC_INT_G_REGISTER _IOWR('d', 101, struct v4l2_register) -/* Reset the I2C chip */ -#define VIDIOC_INT_RESET _IO ('d', 102) +/* Generic reset command. The argument selects which subsystems to reset. + Passing 0 will always reset the whole chip. */ +#define VIDIOC_INT_RESET _IOW ('d', 102, u32) /* Set the frequency (in Hz) of the audio clock output. Used to slave an audio processor to the video decoder, ensuring that audio |