diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-25 16:59:51 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-25 16:59:51 -0500 |
| commit | b31fde6db2b76a9f7f59bf016652b46cff43f8da (patch) | |
| tree | 2af4c48ae97b9800604fc0b36bc5c274d46d4aa3 /include/media/cx25840.h | |
| parent | f31c338675872875e24f124af0689131b0c72600 (diff) | |
| parent | a999337b49fcdd2c4a475e97e4b8337ebdfa4abf (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
* git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (509 commits)
V4L/DVB (7078): radio: fix sf16fmi section mismatch
V4L/DVB (7077): bt878: remove handcrafted PCI subsystem ID check
V4L/DVB (7075): Make a local function static
V4L/DVB (7074): DiB7000P: correct tuning problem for 7MHz channel
V4L/DVB (7073): DiB7070: Reception quality improved
V4L/DVB (7072): sets the MT2060 IF1 frequency according to EEPROM
V4L/DVB (7071): DiB0700: Start streaming the right way
V4L/DVB (7070): Fix some tuning problems
V4L/DVB (7069): Support for myTV.t
V4L/DVB (7068): Add support for WinTV Nova-T-CE driver
V4L/DVB (7067): fix autoserach in the Hauppauge NOVA-T 500
V4L/DVB (7066): ASUS My Cinema U3000 Mini DVBT Tuner
V4L/DVB (7065): Artec T14BR patches
V4L/DVB (7063): xc5000: Fix OOPS caused by missing firmware
V4L/DVB (7062): radio-si570x: Some fixes and new USB ID addition
V4L/DVB (7061): radio-si470x: Some cleanups
V4L/DVB (7060): em28xx: remove has_tuner
V4L/DVB (7059): cx88: Ensure the tuner is reset correctly
V4L/DVB (7058): IR corrections for the Pinnacle 800i
V4L/DVB (7056): tuner: suppress obsolete tuner i2c address warning for XC5000 tuners
...
Diffstat (limited to 'include/media/cx25840.h')
| -rw-r--r-- | include/media/cx25840.h | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/include/media/cx25840.h b/include/media/cx25840.h index 8e7e52d659a0..cd599ad29fb2 100644 --- a/include/media/cx25840.h +++ b/include/media/cx25840.h | |||
| @@ -49,6 +49,25 @@ enum cx25840_video_input { | |||
| 49 | CX25840_SVIDEO2 = 0x620, | 49 | CX25840_SVIDEO2 = 0x620, |
| 50 | CX25840_SVIDEO3 = 0x730, | 50 | CX25840_SVIDEO3 = 0x730, |
| 51 | CX25840_SVIDEO4 = 0x840, | 51 | CX25840_SVIDEO4 = 0x840, |
| 52 | |||
| 53 | /* Allow frames to specify specific input configurations */ | ||
| 54 | CX25840_VIN1_CH1 = 0x80000000, | ||
| 55 | CX25840_VIN2_CH1 = 0x80000001, | ||
| 56 | CX25840_VIN3_CH1 = 0x80000002, | ||
| 57 | CX25840_VIN4_CH1 = 0x80000003, | ||
| 58 | CX25840_VIN5_CH1 = 0x80000004, | ||
| 59 | CX25840_VIN6_CH1 = 0x80000005, | ||
| 60 | CX25840_VIN7_CH1 = 0x80000006, | ||
| 61 | CX25840_VIN8_CH1 = 0x80000007, | ||
| 62 | CX25840_VIN4_CH2 = 0x80000000, | ||
| 63 | CX25840_VIN5_CH2 = 0x80000010, | ||
| 64 | CX25840_VIN6_CH2 = 0x80000020, | ||
| 65 | CX25840_NONE_CH2 = 0x80000030, | ||
| 66 | CX25840_VIN7_CH3 = 0x80000000, | ||
| 67 | CX25840_VIN8_CH3 = 0x80000040, | ||
| 68 | CX25840_NONE0_CH3 = 0x80000080, | ||
| 69 | CX25840_NONE1_CH3 = 0x800000c0, | ||
| 70 | CX25840_SVIDEO_ON = 0x80000100, | ||
| 52 | }; | 71 | }; |
| 53 | 72 | ||
| 54 | enum cx25840_audio_input { | 73 | enum cx25840_audio_input { |