diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-11 22:05:53 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-11 22:05:53 -0200 |
| commit | ad3ae53104ecf959f75a4737869697412fa7f2b1 (patch) | |
| tree | 1d54da58a9b1cbdc33b72283ae18deb4acdca898 /linux/include | |
| parent | 33a272a323c5b3548dc446cc23f9f7c82d8b14db (diff) | |
| parent | 66f3e98340a34bd0062a84e6b8e2aa84d29c42e3 (diff) | |
| download | mediapointer-dvb-s2-ad3ae53104ecf959f75a4737869697412fa7f2b1.tar.gz mediapointer-dvb-s2-ad3ae53104ecf959f75a4737869697412fa7f2b1.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~stoth/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/media/cx25840.h | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/linux/include/media/cx25840.h b/linux/include/media/cx25840.h index 8e7e52d65..cd599ad29 100644 --- a/linux/include/media/cx25840.h +++ b/linux/include/media/cx25840.h @@ -49,6 +49,25 @@ enum cx25840_video_input { CX25840_SVIDEO2 = 0x620, CX25840_SVIDEO3 = 0x730, CX25840_SVIDEO4 = 0x840, + + /* Allow frames to specify specific input configurations */ + CX25840_VIN1_CH1 = 0x80000000, + CX25840_VIN2_CH1 = 0x80000001, + CX25840_VIN3_CH1 = 0x80000002, + CX25840_VIN4_CH1 = 0x80000003, + CX25840_VIN5_CH1 = 0x80000004, + CX25840_VIN6_CH1 = 0x80000005, + CX25840_VIN7_CH1 = 0x80000006, + CX25840_VIN8_CH1 = 0x80000007, + CX25840_VIN4_CH2 = 0x80000000, + CX25840_VIN5_CH2 = 0x80000010, + CX25840_VIN6_CH2 = 0x80000020, + CX25840_NONE_CH2 = 0x80000030, + CX25840_VIN7_CH3 = 0x80000000, + CX25840_VIN8_CH3 = 0x80000040, + CX25840_NONE0_CH3 = 0x80000080, + CX25840_NONE1_CH3 = 0x800000c0, + CX25840_SVIDEO_ON = 0x80000100, }; enum cx25840_audio_input { |