diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-17 00:15:42 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-17 00:15:42 -0400 |
commit | 0dd5198672dd2bbeb933862e1fc82162e0b636be (patch) | |
tree | c9efed20d90603c4d1626c21bd7aab1e7fc74a58 /drivers/media/video/pvrusb2/pvrusb2-devattr.h | |
parent | c868d550115b9ccc0027c67265b9520790f05601 (diff) | |
parent | 11c635a25b9f3a5d87409ce46cf2e05c500251ec (diff) |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (425 commits)
V4L/DVB (11870): gspca - main: VIDIOC_ENUM_FRAMESIZES ioctl added.
V4L/DVB (12004): poll method lose race condition
V4L/DVB (11894): flexcop-pci: dmesg visible names broken
V4L/DVB (11892): Siano: smsendian - declare function as extern
V4L/DVB (11891): Siano: smscore - bind the GPIO SMS protocol
V4L/DVB (11890): Siano: smscore - remove redundant code
V4L/DVB (11889): Siano: smsdvb - add DVB v3 events
V4L/DVB (11888): Siano: smsusb - remove redundant ifdef
V4L/DVB (11887): Siano: smscards - add board (target) events
V4L/DVB (11886): Siano: smscore - fix some new GPIO definitions names
V4L/DVB (11885): Siano: Add new GPIO management interface
V4L/DVB (11884): Siano: smssdio - revert to stand alone module
V4L/DVB (11883): Siano: cards - add two additional (USB) devices
V4L/DVB (11824): Siano: smsusb - change exit func debug msg
V4L/DVB (11823): Siano: smsusb - fix typo in module description
V4L/DVB (11822): Siano: smscore - bug fix at get_device_mode
V4L/DVB (11821): Siano: smscore - fix isdb-t firmware name
V4L/DVB (11820): Siano: smscore - fix byte ordering bug
V4L/DVB (11819): Siano: smscore - fix get_common_buffer bug
V4L/DVB (11818): Siano: smscards - assign gpio to HPG targets
...
Diffstat (limited to 'drivers/media/video/pvrusb2/pvrusb2-devattr.h')
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-devattr.h | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-devattr.h b/drivers/media/video/pvrusb2/pvrusb2-devattr.h index 3e553389cbc3..ea04ecf8aa39 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-devattr.h +++ b/drivers/media/video/pvrusb2/pvrusb2-devattr.h | |||
@@ -69,6 +69,7 @@ struct pvr2_string_table { | |||
69 | #define PVR2_ROUTING_SCHEME_HAUPPAUGE 0 | 69 | #define PVR2_ROUTING_SCHEME_HAUPPAUGE 0 |
70 | #define PVR2_ROUTING_SCHEME_GOTVIEW 1 | 70 | #define PVR2_ROUTING_SCHEME_GOTVIEW 1 |
71 | #define PVR2_ROUTING_SCHEME_ONAIR 2 | 71 | #define PVR2_ROUTING_SCHEME_ONAIR 2 |
72 | #define PVR2_ROUTING_SCHEME_AV400 3 | ||
72 | 73 | ||
73 | #define PVR2_DIGITAL_SCHEME_NONE 0 | 74 | #define PVR2_DIGITAL_SCHEME_NONE 0 |
74 | #define PVR2_DIGITAL_SCHEME_HAUPPAUGE 1 | 75 | #define PVR2_DIGITAL_SCHEME_HAUPPAUGE 1 |
@@ -78,8 +79,10 @@ struct pvr2_string_table { | |||
78 | #define PVR2_LED_SCHEME_HAUPPAUGE 1 | 79 | #define PVR2_LED_SCHEME_HAUPPAUGE 1 |
79 | 80 | ||
80 | #define PVR2_IR_SCHEME_NONE 0 | 81 | #define PVR2_IR_SCHEME_NONE 0 |
81 | #define PVR2_IR_SCHEME_24XXX 1 | 82 | #define PVR2_IR_SCHEME_24XXX 1 /* FX2-controlled IR */ |
82 | #define PVR2_IR_SCHEME_ZILOG 2 | 83 | #define PVR2_IR_SCHEME_ZILOG 2 /* HVR-1950 style (must be taken out of reset) */ |
84 | #define PVR2_IR_SCHEME_24XXX_MCE 3 /* 24xxx MCE device */ | ||
85 | #define PVR2_IR_SCHEME_29XXX 4 /* Original 29xxx device */ | ||
83 | 86 | ||
84 | /* This describes a particular hardware type (except for the USB device ID | 87 | /* This describes a particular hardware type (except for the USB device ID |
85 | which must live in a separate structure due to environmental | 88 | which must live in a separate structure due to environmental |
@@ -162,19 +165,9 @@ struct pvr2_device_desc { | |||
162 | ensure that it is found. */ | 165 | ensure that it is found. */ |
163 | unsigned int flag_has_wm8775:1; | 166 | unsigned int flag_has_wm8775:1; |
164 | 167 | ||
165 | /* Indicate any specialized IR scheme that might need to be | 168 | /* Indicate IR scheme of hardware. If not set, then it is assumed |
166 | supported by this driver. If not set, then it is assumed that | 169 | that IR can work without any help from the driver. */ |
167 | IR can work without help from the driver (which is frequently | 170 | unsigned int ir_scheme:3; |
168 | the case). This is otherwise set to one of | ||
169 | PVR2_IR_SCHEME_xxxx. For "xxxx", the value "24XXX" indicates a | ||
170 | Hauppauge 24xxx class device which has an FPGA-hosted IR | ||
171 | receiver that can only be reached via FX2 command codes. In | ||
172 | that case the pvrusb2 driver will emulate the behavior of the | ||
173 | older 29xxx device's IR receiver (a "virtual" I2C chip) in terms | ||
174 | of those command codes. For the value "ZILOG", we're dealing | ||
175 | with an IR chip that must be taken out of reset via another FX2 | ||
176 | command code (which is the case for HVR-1950 devices). */ | ||
177 | unsigned int ir_scheme:2; | ||
178 | 171 | ||
179 | /* These bits define which kinds of sources the device can handle. | 172 | /* These bits define which kinds of sources the device can handle. |
180 | Note: Digital tuner presence is inferred by the | 173 | Note: Digital tuner presence is inferred by the |