diff options
Diffstat (limited to 'drivers/media/dvb/dvb-usb')
-rw-r--r-- | drivers/media/dvb/dvb-usb/a800.c | 36 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-usb/cxusb.c | 130 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-usb/dibusb-mb.c | 113 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-usb/dibusb-mc.c | 26 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-usb/digitv.c | 22 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-usb/dtt200u.c | 24 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-usb/gp8psk.c | 22 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-usb/nova-t-usb2.c | 34 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-usb/umt-010.c | 24 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-usb/vp702x.c | 20 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-usb/vp7045.c | 20 |
11 files changed, 236 insertions, 235 deletions
diff --git a/drivers/media/dvb/dvb-usb/a800.c b/drivers/media/dvb/dvb-usb/a800.c index 2ed3eb62d787..a6c5f19f680d 100644 --- a/drivers/media/dvb/dvb-usb/a800.c +++ b/drivers/media/dvb/dvb-usb/a800.c | |||
@@ -116,24 +116,24 @@ static struct dvb_usb_device_properties a800_properties = { | |||
116 | { | 116 | { |
117 | .caps = DVB_USB_ADAP_HAS_PID_FILTER | DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF, | 117 | .caps = DVB_USB_ADAP_HAS_PID_FILTER | DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF, |
118 | .pid_filter_count = 32, | 118 | .pid_filter_count = 32, |
119 | .streaming_ctrl = dibusb2_0_streaming_ctrl, | 119 | .streaming_ctrl = dibusb2_0_streaming_ctrl, |
120 | .pid_filter = dibusb_pid_filter, | 120 | .pid_filter = dibusb_pid_filter, |
121 | .pid_filter_ctrl = dibusb_pid_filter_ctrl, | 121 | .pid_filter_ctrl = dibusb_pid_filter_ctrl, |
122 | 122 | ||
123 | .frontend_attach = dibusb_dib3000mc_frontend_attach, | 123 | .frontend_attach = dibusb_dib3000mc_frontend_attach, |
124 | .tuner_attach = dibusb_dib3000mc_tuner_attach, | 124 | .tuner_attach = dibusb_dib3000mc_tuner_attach, |
125 | 125 | ||
126 | /* parameter for the MPEG2-data transfer */ | 126 | /* parameter for the MPEG2-data transfer */ |
127 | .stream = { | 127 | .stream = { |
128 | .type = USB_BULK, | 128 | .type = USB_BULK, |
129 | .count = 7, | 129 | .count = 7, |
130 | .endpoint = 0x06, | 130 | .endpoint = 0x06, |
131 | .u = { | 131 | .u = { |
132 | .bulk = { | 132 | .bulk = { |
133 | .buffersize = 4096, | 133 | .buffersize = 4096, |
134 | } | 134 | } |
135 | } | 135 | } |
136 | }, | 136 | }, |
137 | 137 | ||
138 | .size_of_priv = sizeof(struct dibusb_state), | 138 | .size_of_priv = sizeof(struct dibusb_state), |
139 | }, | 139 | }, |
diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c index 43f39069ef34..e05200b6110b 100644 --- a/drivers/media/dvb/dvb-usb/cxusb.c +++ b/drivers/media/dvb/dvb-usb/cxusb.c | |||
@@ -529,20 +529,20 @@ static struct dvb_usb_device_properties cxusb_medion_properties = { | |||
529 | .num_adapters = 1, | 529 | .num_adapters = 1, |
530 | .adapter = { | 530 | .adapter = { |
531 | { | 531 | { |
532 | .streaming_ctrl = cxusb_streaming_ctrl, | 532 | .streaming_ctrl = cxusb_streaming_ctrl, |
533 | .frontend_attach = cxusb_cx22702_frontend_attach, | 533 | .frontend_attach = cxusb_cx22702_frontend_attach, |
534 | .tuner_attach = cxusb_fmd1216me_tuner_attach, | 534 | .tuner_attach = cxusb_fmd1216me_tuner_attach, |
535 | /* parameter for the MPEG2-data transfer */ | 535 | /* parameter for the MPEG2-data transfer */ |
536 | .stream = { | 536 | .stream = { |
537 | .type = USB_BULK, | 537 | .type = USB_BULK, |
538 | .count = 5, | 538 | .count = 5, |
539 | .endpoint = 0x02, | 539 | .endpoint = 0x02, |
540 | .u = { | 540 | .u = { |
541 | .bulk = { | 541 | .bulk = { |
542 | .buffersize = 8192, | 542 | .buffersize = 8192, |
543 | } | 543 | } |
544 | } | 544 | } |
545 | }, | 545 | }, |
546 | 546 | ||
547 | }, | 547 | }, |
548 | }, | 548 | }, |
@@ -575,21 +575,21 @@ static struct dvb_usb_device_properties cxusb_bluebird_lgh064f_properties = { | |||
575 | .num_adapters = 1, | 575 | .num_adapters = 1, |
576 | .adapter = { | 576 | .adapter = { |
577 | { | 577 | { |
578 | .streaming_ctrl = cxusb_streaming_ctrl, | 578 | .streaming_ctrl = cxusb_streaming_ctrl, |
579 | .frontend_attach = cxusb_lgdt3303_frontend_attach, | 579 | .frontend_attach = cxusb_lgdt3303_frontend_attach, |
580 | .tuner_attach = cxusb_lgdt3303_tuner_attach, | 580 | .tuner_attach = cxusb_lgdt3303_tuner_attach, |
581 | 581 | ||
582 | /* parameter for the MPEG2-data transfer */ | 582 | /* parameter for the MPEG2-data transfer */ |
583 | .stream = { | 583 | .stream = { |
584 | .type = USB_BULK, | 584 | .type = USB_BULK, |
585 | .count = 5, | 585 | .count = 5, |
586 | .endpoint = 0x02, | 586 | .endpoint = 0x02, |
587 | .u = { | 587 | .u = { |
588 | .bulk = { | 588 | .bulk = { |
589 | .buffersize = 8192, | 589 | .buffersize = 8192, |
590 | } | 590 | } |
591 | } | 591 | } |
592 | }, | 592 | }, |
593 | }, | 593 | }, |
594 | }, | 594 | }, |
595 | 595 | ||
@@ -627,20 +627,20 @@ static struct dvb_usb_device_properties cxusb_bluebird_dee1601_properties = { | |||
627 | .num_adapters = 1, | 627 | .num_adapters = 1, |
628 | .adapter = { | 628 | .adapter = { |
629 | { | 629 | { |
630 | .streaming_ctrl = cxusb_streaming_ctrl, | 630 | .streaming_ctrl = cxusb_streaming_ctrl, |
631 | .frontend_attach = cxusb_dee1601_frontend_attach, | 631 | .frontend_attach = cxusb_dee1601_frontend_attach, |
632 | .tuner_attach = cxusb_dee1601_tuner_attach, | 632 | .tuner_attach = cxusb_dee1601_tuner_attach, |
633 | /* parameter for the MPEG2-data transfer */ | 633 | /* parameter for the MPEG2-data transfer */ |
634 | .stream = { | 634 | .stream = { |
635 | .type = USB_BULK, | 635 | .type = USB_BULK, |
636 | .count = 5, | 636 | .count = 5, |
637 | .endpoint = 0x04, | 637 | .endpoint = 0x04, |
638 | .u = { | 638 | .u = { |
639 | .bulk = { | 639 | .bulk = { |
640 | .buffersize = 8192, | 640 | .buffersize = 8192, |
641 | } | 641 | } |
642 | } | 642 | } |
643 | }, | 643 | }, |
644 | }, | 644 | }, |
645 | }, | 645 | }, |
646 | 646 | ||
@@ -686,21 +686,21 @@ static struct dvb_usb_device_properties cxusb_bluebird_lgz201_properties = { | |||
686 | .num_adapters = 2, | 686 | .num_adapters = 2, |
687 | .adapter = { | 687 | .adapter = { |
688 | { | 688 | { |
689 | .streaming_ctrl = cxusb_streaming_ctrl, | 689 | .streaming_ctrl = cxusb_streaming_ctrl, |
690 | .frontend_attach = cxusb_mt352_frontend_attach, | 690 | .frontend_attach = cxusb_mt352_frontend_attach, |
691 | .tuner_attach = cxusb_lgz201_tuner_attach, | 691 | .tuner_attach = cxusb_lgz201_tuner_attach, |
692 | 692 | ||
693 | /* parameter for the MPEG2-data transfer */ | 693 | /* parameter for the MPEG2-data transfer */ |
694 | .stream = { | 694 | .stream = { |
695 | .type = USB_BULK, | 695 | .type = USB_BULK, |
696 | .count = 5, | 696 | .count = 5, |
697 | .endpoint = 0x04, | 697 | .endpoint = 0x04, |
698 | .u = { | 698 | .u = { |
699 | .bulk = { | 699 | .bulk = { |
700 | .buffersize = 8192, | 700 | .buffersize = 8192, |
701 | } | 701 | } |
702 | } | 702 | } |
703 | }, | 703 | }, |
704 | }, | 704 | }, |
705 | }, | 705 | }, |
706 | .power_ctrl = cxusb_bluebird_power_ctrl, | 706 | .power_ctrl = cxusb_bluebird_power_ctrl, |
@@ -736,21 +736,21 @@ static struct dvb_usb_device_properties cxusb_bluebird_dtt7579_properties = { | |||
736 | .num_adapters = 1, | 736 | .num_adapters = 1, |
737 | .adapter = { | 737 | .adapter = { |
738 | { | 738 | { |
739 | .streaming_ctrl = cxusb_streaming_ctrl, | 739 | .streaming_ctrl = cxusb_streaming_ctrl, |
740 | .frontend_attach = cxusb_mt352_frontend_attach, | 740 | .frontend_attach = cxusb_mt352_frontend_attach, |
741 | .tuner_attach = cxusb_dtt7579_tuner_attach, | 741 | .tuner_attach = cxusb_dtt7579_tuner_attach, |
742 | 742 | ||
743 | /* parameter for the MPEG2-data transfer */ | 743 | /* parameter for the MPEG2-data transfer */ |
744 | .stream = { | 744 | .stream = { |
745 | .type = USB_BULK, | 745 | .type = USB_BULK, |
746 | .count = 5, | 746 | .count = 5, |
747 | .endpoint = 0x04, | 747 | .endpoint = 0x04, |
748 | .u = { | 748 | .u = { |
749 | .bulk = { | 749 | .bulk = { |
750 | .buffersize = 8192, | 750 | .buffersize = 8192, |
751 | } | 751 | } |
752 | } | 752 | } |
753 | }, | 753 | }, |
754 | }, | 754 | }, |
755 | }, | 755 | }, |
756 | .power_ctrl = cxusb_bluebird_power_ctrl, | 756 | .power_ctrl = cxusb_bluebird_power_ctrl, |
diff --git a/drivers/media/dvb/dvb-usb/dibusb-mb.c b/drivers/media/dvb/dvb-usb/dibusb-mb.c index 4fe363e48352..7a6ae8f482e0 100644 --- a/drivers/media/dvb/dvb-usb/dibusb-mb.c +++ b/drivers/media/dvb/dvb-usb/dibusb-mb.c | |||
@@ -163,23 +163,23 @@ static struct dvb_usb_device_properties dibusb1_1_properties = { | |||
163 | .caps = DVB_USB_ADAP_HAS_PID_FILTER | DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF, | 163 | .caps = DVB_USB_ADAP_HAS_PID_FILTER | DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF, |
164 | .pid_filter_count = 16, | 164 | .pid_filter_count = 16, |
165 | 165 | ||
166 | .streaming_ctrl = dibusb_streaming_ctrl, | 166 | .streaming_ctrl = dibusb_streaming_ctrl, |
167 | .pid_filter = dibusb_pid_filter, | 167 | .pid_filter = dibusb_pid_filter, |
168 | .pid_filter_ctrl = dibusb_pid_filter_ctrl, | 168 | .pid_filter_ctrl = dibusb_pid_filter_ctrl, |
169 | .frontend_attach = dibusb_dib3000mb_frontend_attach, | 169 | .frontend_attach = dibusb_dib3000mb_frontend_attach, |
170 | .tuner_attach = dibusb_tuner_probe_and_attach, | 170 | .tuner_attach = dibusb_tuner_probe_and_attach, |
171 | 171 | ||
172 | /* parameter for the MPEG2-data transfer */ | 172 | /* parameter for the MPEG2-data transfer */ |
173 | .stream = { | 173 | .stream = { |
174 | .type = USB_BULK, | 174 | .type = USB_BULK, |
175 | .count = 7, | 175 | .count = 7, |
176 | .endpoint = 0x02, | 176 | .endpoint = 0x02, |
177 | .u = { | 177 | .u = { |
178 | .bulk = { | 178 | .bulk = { |
179 | .buffersize = 4096, | 179 | .buffersize = 4096, |
180 | } | 180 | } |
181 | } | 181 | } |
182 | }, | 182 | }, |
183 | .size_of_priv = sizeof(struct dibusb_state), | 183 | .size_of_priv = sizeof(struct dibusb_state), |
184 | } | 184 | } |
185 | }, | 185 | }, |
@@ -248,23 +248,23 @@ static struct dvb_usb_device_properties dibusb1_1_an2235_properties = { | |||
248 | .caps = DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF | DVB_USB_ADAP_HAS_PID_FILTER, | 248 | .caps = DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF | DVB_USB_ADAP_HAS_PID_FILTER, |
249 | .pid_filter_count = 16, | 249 | .pid_filter_count = 16, |
250 | 250 | ||
251 | .streaming_ctrl = dibusb_streaming_ctrl, | 251 | .streaming_ctrl = dibusb_streaming_ctrl, |
252 | .pid_filter = dibusb_pid_filter, | 252 | .pid_filter = dibusb_pid_filter, |
253 | .pid_filter_ctrl = dibusb_pid_filter_ctrl, | 253 | .pid_filter_ctrl = dibusb_pid_filter_ctrl, |
254 | .frontend_attach = dibusb_dib3000mb_frontend_attach, | 254 | .frontend_attach = dibusb_dib3000mb_frontend_attach, |
255 | .tuner_attach = dibusb_tuner_probe_and_attach, | 255 | .tuner_attach = dibusb_tuner_probe_and_attach, |
256 | 256 | ||
257 | /* parameter for the MPEG2-data transfer */ | 257 | /* parameter for the MPEG2-data transfer */ |
258 | .stream = { | 258 | .stream = { |
259 | .type = USB_BULK, | 259 | .type = USB_BULK, |
260 | .count = 7, | 260 | .count = 7, |
261 | .endpoint = 0x02, | 261 | .endpoint = 0x02, |
262 | .u = { | 262 | .u = { |
263 | .bulk = { | 263 | .bulk = { |
264 | .buffersize = 4096, | 264 | .buffersize = 4096, |
265 | } | 265 | } |
266 | } | 266 | } |
267 | }, | 267 | }, |
268 | .size_of_priv = sizeof(struct dibusb_state), | 268 | .size_of_priv = sizeof(struct dibusb_state), |
269 | }, | 269 | }, |
270 | }, | 270 | }, |
@@ -312,22 +312,23 @@ static struct dvb_usb_device_properties dibusb2_0b_properties = { | |||
312 | .caps = DVB_USB_ADAP_HAS_PID_FILTER | DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF, | 312 | .caps = DVB_USB_ADAP_HAS_PID_FILTER | DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF, |
313 | .pid_filter_count = 16, | 313 | .pid_filter_count = 16, |
314 | 314 | ||
315 | .streaming_ctrl = dibusb2_0_streaming_ctrl, | 315 | .streaming_ctrl = dibusb2_0_streaming_ctrl, |
316 | .pid_filter = dibusb_pid_filter, | 316 | .pid_filter = dibusb_pid_filter, |
317 | .pid_filter_ctrl = dibusb_pid_filter_ctrl, | 317 | .pid_filter_ctrl = dibusb_pid_filter_ctrl, |
318 | .frontend_attach = dibusb_dib3000mb_frontend_attach, | 318 | .frontend_attach = dibusb_dib3000mb_frontend_attach, |
319 | .tuner_attach = dibusb_thomson_tuner_attach, | 319 | .tuner_attach = dibusb_thomson_tuner_attach, |
320 | /* parameter for the MPEG2-data transfer */ | 320 | |
321 | /* parameter for the MPEG2-data transfer */ | ||
321 | .stream = { | 322 | .stream = { |
322 | .type = USB_BULK, | 323 | .type = USB_BULK, |
323 | .count = 7, | 324 | .count = 7, |
324 | .endpoint = 0x06, | 325 | .endpoint = 0x06, |
325 | .u = { | 326 | .u = { |
326 | .bulk = { | 327 | .bulk = { |
327 | .buffersize = 4096, | 328 | .buffersize = 4096, |
328 | } | 329 | } |
329 | } | 330 | } |
330 | }, | 331 | }, |
331 | .size_of_priv = sizeof(struct dibusb_state), | 332 | .size_of_priv = sizeof(struct dibusb_state), |
332 | } | 333 | } |
333 | }, | 334 | }, |
@@ -369,22 +370,22 @@ static struct dvb_usb_device_properties artec_t1_usb2_properties = { | |||
369 | .caps = DVB_USB_ADAP_HAS_PID_FILTER | DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF, | 370 | .caps = DVB_USB_ADAP_HAS_PID_FILTER | DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF, |
370 | .pid_filter_count = 16, | 371 | .pid_filter_count = 16, |
371 | 372 | ||
372 | .streaming_ctrl = dibusb2_0_streaming_ctrl, | 373 | .streaming_ctrl = dibusb2_0_streaming_ctrl, |
373 | .pid_filter = dibusb_pid_filter, | 374 | .pid_filter = dibusb_pid_filter, |
374 | .pid_filter_ctrl = dibusb_pid_filter_ctrl, | 375 | .pid_filter_ctrl = dibusb_pid_filter_ctrl, |
375 | .frontend_attach = dibusb_dib3000mb_frontend_attach, | 376 | .frontend_attach = dibusb_dib3000mb_frontend_attach, |
376 | .tuner_attach = dibusb_tuner_probe_and_attach, | 377 | .tuner_attach = dibusb_tuner_probe_and_attach, |
377 | /* parameter for the MPEG2-data transfer */ | 378 | /* parameter for the MPEG2-data transfer */ |
378 | .stream = { | 379 | .stream = { |
379 | .type = USB_BULK, | 380 | .type = USB_BULK, |
380 | .count = 7, | 381 | .count = 7, |
381 | .endpoint = 0x06, | 382 | .endpoint = 0x06, |
382 | .u = { | 383 | .u = { |
383 | .bulk = { | 384 | .bulk = { |
384 | .buffersize = 4096, | 385 | .buffersize = 4096, |
385 | } | 386 | } |
386 | } | 387 | } |
387 | }, | 388 | }, |
388 | .size_of_priv = sizeof(struct dibusb_state), | 389 | .size_of_priv = sizeof(struct dibusb_state), |
389 | } | 390 | } |
390 | }, | 391 | }, |
diff --git a/drivers/media/dvb/dvb-usb/dibusb-mc.c b/drivers/media/dvb/dvb-usb/dibusb-mc.c index a0fd37efc04b..e7ea3e753d6d 100644 --- a/drivers/media/dvb/dvb-usb/dibusb-mc.c +++ b/drivers/media/dvb/dvb-usb/dibusb-mc.c | |||
@@ -54,23 +54,23 @@ static struct dvb_usb_device_properties dibusb_mc_properties = { | |||
54 | { | 54 | { |
55 | .caps = DVB_USB_ADAP_HAS_PID_FILTER | DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF, | 55 | .caps = DVB_USB_ADAP_HAS_PID_FILTER | DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF, |
56 | .pid_filter_count = 32, | 56 | .pid_filter_count = 32, |
57 | .streaming_ctrl = dibusb2_0_streaming_ctrl, | 57 | .streaming_ctrl = dibusb2_0_streaming_ctrl, |
58 | .pid_filter = dibusb_pid_filter, | 58 | .pid_filter = dibusb_pid_filter, |
59 | .pid_filter_ctrl = dibusb_pid_filter_ctrl, | 59 | .pid_filter_ctrl = dibusb_pid_filter_ctrl, |
60 | .frontend_attach = dibusb_dib3000mc_frontend_attach, | 60 | .frontend_attach = dibusb_dib3000mc_frontend_attach, |
61 | .tuner_attach = dibusb_dib3000mc_tuner_attach, | 61 | .tuner_attach = dibusb_dib3000mc_tuner_attach, |
62 | 62 | ||
63 | /* parameter for the MPEG2-data transfer */ | 63 | /* parameter for the MPEG2-data transfer */ |
64 | .stream = { | 64 | .stream = { |
65 | .type = USB_BULK, | 65 | .type = USB_BULK, |
66 | .count = 7, | 66 | .count = 7, |
67 | .endpoint = 0x06, | 67 | .endpoint = 0x06, |
68 | .u = { | 68 | .u = { |
69 | .bulk = { | 69 | .bulk = { |
70 | .buffersize = 4096, | 70 | .buffersize = 4096, |
71 | } | 71 | } |
72 | } | 72 | } |
73 | }, | 73 | }, |
74 | .size_of_priv = sizeof(struct dibusb_state), | 74 | .size_of_priv = sizeof(struct dibusb_state), |
75 | } | 75 | } |
76 | }, | 76 | }, |
diff --git a/drivers/media/dvb/dvb-usb/digitv.c b/drivers/media/dvb/dvb-usb/digitv.c index 8fb34375c1fb..4a198d4755b0 100644 --- a/drivers/media/dvb/dvb-usb/digitv.c +++ b/drivers/media/dvb/dvb-usb/digitv.c | |||
@@ -274,20 +274,20 @@ static struct dvb_usb_device_properties digitv_properties = { | |||
274 | .num_adapters = 1, | 274 | .num_adapters = 1, |
275 | .adapter = { | 275 | .adapter = { |
276 | { | 276 | { |
277 | .frontend_attach = digitv_frontend_attach, | 277 | .frontend_attach = digitv_frontend_attach, |
278 | .tuner_attach = digitv_tuner_attach, | 278 | .tuner_attach = digitv_tuner_attach, |
279 | 279 | ||
280 | /* parameter for the MPEG2-data transfer */ | 280 | /* parameter for the MPEG2-data transfer */ |
281 | .stream = { | 281 | .stream = { |
282 | .type = USB_BULK, | 282 | .type = USB_BULK, |
283 | .count = 7, | 283 | .count = 7, |
284 | .endpoint = 0x02, | 284 | .endpoint = 0x02, |
285 | .u = { | 285 | .u = { |
286 | .bulk = { | 286 | .bulk = { |
287 | .buffersize = 4096, | 287 | .buffersize = 4096, |
288 | } | 288 | } |
289 | } | 289 | } |
290 | }, | 290 | }, |
291 | } | 291 | } |
292 | }, | 292 | }, |
293 | .identify_state = digitv_identify_state, | 293 | .identify_state = digitv_identify_state, |
diff --git a/drivers/media/dvb/dvb-usb/dtt200u.c b/drivers/media/dvb/dvb-usb/dtt200u.c index fa43a41d753b..7dbe14321019 100644 --- a/drivers/media/dvb/dvb-usb/dtt200u.c +++ b/drivers/media/dvb/dvb-usb/dtt200u.c | |||
@@ -268,20 +268,20 @@ static struct dvb_usb_device_properties wt220u_zl0353_properties = { | |||
268 | .caps = DVB_USB_ADAP_HAS_PID_FILTER | DVB_USB_ADAP_NEED_PID_FILTERING, | 268 | .caps = DVB_USB_ADAP_HAS_PID_FILTER | DVB_USB_ADAP_NEED_PID_FILTERING, |
269 | .pid_filter_count = 15, | 269 | .pid_filter_count = 15, |
270 | 270 | ||
271 | .streaming_ctrl = dtt200u_streaming_ctrl, | 271 | .streaming_ctrl = dtt200u_streaming_ctrl, |
272 | .pid_filter = dtt200u_pid_filter, | 272 | .pid_filter = dtt200u_pid_filter, |
273 | .frontend_attach = dtt200u_frontend_attach, | 273 | .frontend_attach = dtt200u_frontend_attach, |
274 | /* parameter for the MPEG2-data transfer */ | 274 | /* parameter for the MPEG2-data transfer */ |
275 | .stream = { | 275 | .stream = { |
276 | .type = USB_BULK, | 276 | .type = USB_BULK, |
277 | .count = 7, | 277 | .count = 7, |
278 | .endpoint = 0x02, | 278 | .endpoint = 0x02, |
279 | .u = { | 279 | .u = { |
280 | .bulk = { | 280 | .bulk = { |
281 | .buffersize = 4096, | 281 | .buffersize = 4096, |
282 | } | 282 | } |
283 | } | 283 | } |
284 | }, | 284 | }, |
285 | } | 285 | } |
286 | }, | 286 | }, |
287 | .power_ctrl = dtt200u_power_ctrl, | 287 | .power_ctrl = dtt200u_power_ctrl, |
diff --git a/drivers/media/dvb/dvb-usb/gp8psk.c b/drivers/media/dvb/dvb-usb/gp8psk.c index 7375eb20166d..518d67fca5e8 100644 --- a/drivers/media/dvb/dvb-usb/gp8psk.c +++ b/drivers/media/dvb/dvb-usb/gp8psk.c | |||
@@ -194,19 +194,19 @@ static struct dvb_usb_device_properties gp8psk_properties = { | |||
194 | .num_adapters = 1, | 194 | .num_adapters = 1, |
195 | .adapter = { | 195 | .adapter = { |
196 | { | 196 | { |
197 | .streaming_ctrl = gp8psk_streaming_ctrl, | 197 | .streaming_ctrl = gp8psk_streaming_ctrl, |
198 | .frontend_attach = gp8psk_frontend_attach, | 198 | .frontend_attach = gp8psk_frontend_attach, |
199 | /* parameter for the MPEG2-data transfer */ | 199 | /* parameter for the MPEG2-data transfer */ |
200 | .stream = { | 200 | .stream = { |
201 | .type = USB_BULK, | 201 | .type = USB_BULK, |
202 | .count = 7, | 202 | .count = 7, |
203 | .endpoint = 0x82, | 203 | .endpoint = 0x82, |
204 | .u = { | 204 | .u = { |
205 | .bulk = { | 205 | .bulk = { |
206 | .buffersize = 8192, | 206 | .buffersize = 8192, |
207 | } | 207 | } |
208 | } | 208 | } |
209 | }, | 209 | }, |
210 | } | 210 | } |
211 | }, | 211 | }, |
212 | .power_ctrl = gp8psk_power_ctrl, | 212 | .power_ctrl = gp8psk_power_ctrl, |
diff --git a/drivers/media/dvb/dvb-usb/nova-t-usb2.c b/drivers/media/dvb/dvb-usb/nova-t-usb2.c index a58874c790b2..d48622e76b1b 100644 --- a/drivers/media/dvb/dvb-usb/nova-t-usb2.c +++ b/drivers/media/dvb/dvb-usb/nova-t-usb2.c | |||
@@ -163,23 +163,23 @@ static struct dvb_usb_device_properties nova_t_properties = { | |||
163 | .caps = DVB_USB_ADAP_HAS_PID_FILTER | DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF, | 163 | .caps = DVB_USB_ADAP_HAS_PID_FILTER | DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF, |
164 | .pid_filter_count = 32, | 164 | .pid_filter_count = 32, |
165 | 165 | ||
166 | .streaming_ctrl = dibusb2_0_streaming_ctrl, | 166 | .streaming_ctrl = dibusb2_0_streaming_ctrl, |
167 | .pid_filter = dibusb_pid_filter, | 167 | .pid_filter = dibusb_pid_filter, |
168 | .pid_filter_ctrl = dibusb_pid_filter_ctrl, | 168 | .pid_filter_ctrl = dibusb_pid_filter_ctrl, |
169 | .frontend_attach = dibusb_dib3000mc_frontend_attach, | 169 | .frontend_attach = dibusb_dib3000mc_frontend_attach, |
170 | .tuner_attach = dibusb_dib3000mc_tuner_attach, | 170 | .tuner_attach = dibusb_dib3000mc_tuner_attach, |
171 | 171 | ||
172 | /* parameter for the MPEG2-data transfer */ | 172 | /* parameter for the MPEG2-data transfer */ |
173 | .stream = { | 173 | .stream = { |
174 | .type = USB_BULK, | 174 | .type = USB_BULK, |
175 | .count = 7, | 175 | .count = 7, |
176 | .endpoint = 0x06, | 176 | .endpoint = 0x06, |
177 | .u = { | 177 | .u = { |
178 | .bulk = { | 178 | .bulk = { |
179 | .buffersize = 4096, | 179 | .buffersize = 4096, |
180 | } | 180 | } |
181 | } | 181 | } |
182 | }, | 182 | }, |
183 | 183 | ||
184 | .size_of_priv = sizeof(struct dibusb_state), | 184 | .size_of_priv = sizeof(struct dibusb_state), |
185 | } | 185 | } |
diff --git a/drivers/media/dvb/dvb-usb/umt-010.c b/drivers/media/dvb/dvb-usb/umt-010.c index f9941ea88b3e..f77b48f76582 100644 --- a/drivers/media/dvb/dvb-usb/umt-010.c +++ b/drivers/media/dvb/dvb-usb/umt-010.c | |||
@@ -99,21 +99,21 @@ static struct dvb_usb_device_properties umt_properties = { | |||
99 | .num_adapters = 1, | 99 | .num_adapters = 1, |
100 | .adapter = { | 100 | .adapter = { |
101 | { | 101 | { |
102 | .streaming_ctrl = dibusb2_0_streaming_ctrl, | 102 | .streaming_ctrl = dibusb2_0_streaming_ctrl, |
103 | .frontend_attach = umt_mt352_frontend_attach, | 103 | .frontend_attach = umt_mt352_frontend_attach, |
104 | .tuner_attach = umt_tuner_attach, | 104 | .tuner_attach = umt_tuner_attach, |
105 | 105 | ||
106 | /* parameter for the MPEG2-data transfer */ | 106 | /* parameter for the MPEG2-data transfer */ |
107 | .stream = { | 107 | .stream = { |
108 | .type = USB_BULK, | 108 | .type = USB_BULK, |
109 | .count = 20, | 109 | .count = 20, |
110 | .endpoint = 0x06, | 110 | .endpoint = 0x06, |
111 | .u = { | 111 | .u = { |
112 | .bulk = { | 112 | .bulk = { |
113 | .buffersize = 512, | 113 | .buffersize = 512, |
114 | } | 114 | } |
115 | } | 115 | } |
116 | }, | 116 | }, |
117 | 117 | ||
118 | .size_of_priv = sizeof(struct dibusb_state), | 118 | .size_of_priv = sizeof(struct dibusb_state), |
119 | } | 119 | } |
diff --git a/drivers/media/dvb/dvb-usb/vp702x.c b/drivers/media/dvb/dvb-usb/vp702x.c index 02bd61aaac66..16533b31a82d 100644 --- a/drivers/media/dvb/dvb-usb/vp702x.c +++ b/drivers/media/dvb/dvb-usb/vp702x.c | |||
@@ -275,22 +275,22 @@ static struct dvb_usb_device_properties vp702x_properties = { | |||
275 | .caps = DVB_USB_ADAP_RECEIVES_204_BYTE_TS, | 275 | .caps = DVB_USB_ADAP_RECEIVES_204_BYTE_TS, |
276 | 276 | ||
277 | .streaming_ctrl = vp702x_streaming_ctrl, | 277 | .streaming_ctrl = vp702x_streaming_ctrl, |
278 | .frontend_attach = vp702x_frontend_attach, | 278 | .frontend_attach = vp702x_frontend_attach, |
279 | 279 | ||
280 | /* parameter for the MPEG2-data transfer */ | 280 | /* parameter for the MPEG2-data transfer */ |
281 | .stream = { | 281 | .stream = { |
282 | .type = USB_BULK, | 282 | .type = USB_BULK, |
283 | .count = 10, | 283 | .count = 10, |
284 | .endpoint = 0x02, | 284 | .endpoint = 0x02, |
285 | .u = { | 285 | .u = { |
286 | .bulk = { | 286 | .bulk = { |
287 | .buffersize = 4096, | 287 | .buffersize = 4096, |
288 | } | 288 | } |
289 | } | 289 | } |
290 | }, | 290 | }, |
291 | .size_of_priv = sizeof(struct vp702x_state), | 291 | .size_of_priv = sizeof(struct vp702x_state), |
292 | } | 292 | } |
293 | }, | 293 | }, |
294 | .read_mac_address = vp702x_read_mac_addr, | 294 | .read_mac_address = vp702x_read_mac_addr, |
295 | 295 | ||
296 | .rc_key_map = vp702x_rc_keys, | 296 | .rc_key_map = vp702x_rc_keys, |
diff --git a/drivers/media/dvb/dvb-usb/vp7045.c b/drivers/media/dvb/dvb-usb/vp7045.c index b4cf002703a7..297806225f86 100644 --- a/drivers/media/dvb/dvb-usb/vp7045.c +++ b/drivers/media/dvb/dvb-usb/vp7045.c | |||
@@ -217,18 +217,18 @@ static struct dvb_usb_device_properties vp7045_properties = { | |||
217 | .num_adapters = 1, | 217 | .num_adapters = 1, |
218 | .adapter = { | 218 | .adapter = { |
219 | { | 219 | { |
220 | .frontend_attach = vp7045_frontend_attach, | 220 | .frontend_attach = vp7045_frontend_attach, |
221 | /* parameter for the MPEG2-data transfer */ | 221 | /* parameter for the MPEG2-data transfer */ |
222 | .stream = { | 222 | .stream = { |
223 | .type = USB_BULK, | 223 | .type = USB_BULK, |
224 | .count = 7, | 224 | .count = 7, |
225 | .endpoint = 0x02, | 225 | .endpoint = 0x02, |
226 | .u = { | 226 | .u = { |
227 | .bulk = { | 227 | .bulk = { |
228 | .buffersize = 4096, | 228 | .buffersize = 4096, |
229 | } | 229 | } |
230 | } | 230 | } |
231 | }, | 231 | }, |
232 | } | 232 | } |
233 | }, | 233 | }, |
234 | .power_ctrl = vp7045_power_ctrl, | 234 | .power_ctrl = vp7045_power_ctrl, |