diff options
Diffstat (limited to 'drivers/media/dvb/dvb-usb/dvb-usb.h')
-rw-r--r-- | drivers/media/dvb/dvb-usb/dvb-usb.h | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb.h b/drivers/media/dvb/dvb-usb/dvb-usb.h index abcee1943f64..a80567caf508 100644 --- a/drivers/media/dvb/dvb-usb/dvb-usb.h +++ b/drivers/media/dvb/dvb-usb/dvb-usb.h | |||
@@ -189,12 +189,13 @@ struct dvb_usb_properties { | |||
189 | struct { | 189 | struct { |
190 | int framesperurb; | 190 | int framesperurb; |
191 | int framesize; | 191 | int framesize; |
192 | int interval; | ||
192 | } isoc; | 193 | } isoc; |
193 | } u; | 194 | } u; |
194 | } urb; | 195 | } urb; |
195 | 196 | ||
196 | int num_device_descs; | 197 | int num_device_descs; |
197 | struct dvb_usb_device_description devices[8]; | 198 | struct dvb_usb_device_description devices[9]; |
198 | }; | 199 | }; |
199 | 200 | ||
200 | 201 | ||
@@ -207,19 +208,28 @@ struct dvb_usb_properties { | |||
207 | * @udev: pointer to the device's struct usb_device. | 208 | * @udev: pointer to the device's struct usb_device. |
208 | * @urb_list: array of dynamically allocated struct urb for the MPEG2-TS- | 209 | * @urb_list: array of dynamically allocated struct urb for the MPEG2-TS- |
209 | * streaming. | 210 | * streaming. |
210 | * @buffer: buffer used to streaming. | 211 | * |
211 | * @dma_handle: dma_addr_t for buffer. | 212 | * @buf_num: number of buffer allocated. |
213 | * @buf_size: size of each buffer in buf_list. | ||
214 | * @buf_list: array containing all allocate buffers for streaming. | ||
215 | * @dma_addr: list of dma_addr_t for each buffer in buf_list. | ||
216 | * | ||
212 | * @urbs_initialized: number of URBs initialized. | 217 | * @urbs_initialized: number of URBs initialized. |
213 | * @urbs_submitted: number of URBs submitted. | 218 | * @urbs_submitted: number of URBs submitted. |
219 | * | ||
214 | * @feedcount: number of reqested feeds (used for streaming-activation) | 220 | * @feedcount: number of reqested feeds (used for streaming-activation) |
215 | * @pid_filtering: is hardware pid_filtering used or not. | 221 | * @pid_filtering: is hardware pid_filtering used or not. |
222 | * | ||
216 | * @usb_sem: semaphore of USB control messages (reading needs two messages) | 223 | * @usb_sem: semaphore of USB control messages (reading needs two messages) |
217 | * @i2c_sem: semaphore for i2c-transfers | 224 | * @i2c_sem: semaphore for i2c-transfers |
225 | * | ||
218 | * @i2c_adap: device's i2c_adapter if it uses I2CoverUSB | 226 | * @i2c_adap: device's i2c_adapter if it uses I2CoverUSB |
219 | * @pll_addr: I2C address of the tuner for programming | 227 | * @pll_addr: I2C address of the tuner for programming |
220 | * @pll_init: array containing the initialization buffer | 228 | * @pll_init: array containing the initialization buffer |
221 | * @pll_desc: pointer to the appropriate struct dvb_pll_desc | 229 | * @pll_desc: pointer to the appropriate struct dvb_pll_desc |
222 | * @tuner_pass_ctrl: called to (de)activate tuner passthru of the demod | 230 | * |
231 | * @tuner_pass_ctrl: called to (de)activate tuner passthru of the demod or the board | ||
232 | * | ||
223 | * @dvb_adap: device's dvb_adapter. | 233 | * @dvb_adap: device's dvb_adapter. |
224 | * @dmxdev: device's dmxdev. | 234 | * @dmxdev: device's dmxdev. |
225 | * @demux: device's software demuxer. | 235 | * @demux: device's software demuxer. |
@@ -253,8 +263,12 @@ struct dvb_usb_device { | |||
253 | /* usb */ | 263 | /* usb */ |
254 | struct usb_device *udev; | 264 | struct usb_device *udev; |
255 | struct urb **urb_list; | 265 | struct urb **urb_list; |
256 | u8 *buffer; | 266 | |
257 | dma_addr_t dma_handle; | 267 | int buf_num; |
268 | unsigned long buf_size; | ||
269 | u8 **buf_list; | ||
270 | dma_addr_t *dma_addr; | ||
271 | |||
258 | int urbs_initialized; | 272 | int urbs_initialized; |
259 | int urbs_submitted; | 273 | int urbs_submitted; |
260 | 274 | ||