diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-05-14 02:46:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-05-14 02:46:22 -0700 |
| commit | 0cd6f6c123fb688380c1a48ce5f64c811913eee3 (patch) | |
| tree | eb6763cd496673af01a4142aa6e31b14fd5d04cd /include/linux/video_decoder.h | |
| parent | a0d4e51c1a5e5d031aa9dd1fb2fa207ccfafe627 (diff) | |
| parent | 744804bcdeaef29a736421bd0f2b0eddcfa9f879 (diff) | |
Merge bk://kernel.bkbits.net/gregkh/linux/i2c-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include/linux/video_decoder.h')
| -rw-r--r-- | include/linux/video_decoder.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/video_decoder.h b/include/linux/video_decoder.h index 1302c7f44ec5..0e9e48b83e3b 100644 --- a/include/linux/video_decoder.h +++ b/include/linux/video_decoder.h @@ -22,6 +22,10 @@ DECODER_STATUS_GOOD, the others are just nice things to know. #define DECODER_STATUS_NTSC 8 /* auto detected */ #define DECODER_STATUS_SECAM 16 /* auto detected */ +struct video_decoder_init { + unsigned char len; + const unsigned char *data; +}; #define DECODER_GET_CAPABILITIES _IOR('d', 1, struct video_decoder_capability) #define DECODER_GET_STATUS _IOR('d', 2, int) @@ -30,6 +34,9 @@ DECODER_STATUS_GOOD, the others are just nice things to know. #define DECODER_SET_OUTPUT _IOW('d', 5, int) /* 0 <= output < #outputs */ #define DECODER_ENABLE_OUTPUT _IOW('d', 6, int) /* boolean output enable control */ #define DECODER_SET_PICTURE _IOW('d', 7, struct video_picture) +#define DECODER_SET_GPIO _IOW('d', 8, int) /* switch general purpose pin */ +#define DECODER_INIT _IOW('d', 9, struct video_decoder_init) /* init internal registers at once */ +#define DECODER_SET_VBI_BYPASS _IOW('d', 10, int) /* switch vbi bypass */ #define DECODER_DUMP _IO('d', 192) /* debug hook */ |