aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb
diff options
context:
space:
mode:
authorAntti Palosaari <crope@iki.fi>2009-09-12 12:35:29 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-09-18 22:47:53 -0400
commit9c863278097a4905a78ee0d70d417641aecfac2e (patch)
tree46e41f245dd5aa74c57cb9b660049ae1839af7a1 /drivers/media/dvb
parent353330c3ebf01c8f436b41690d95ec1548b6f364 (diff)
V4L/DVB (12754): af9015: [2/2] fix USB TS configuration
Fix wrongly configured USB1.1 TS EP. Patch serie also increases USB URB size to reduce wakeups. USB1.1 URB size from 64 to 940 bytes USB2.0 URB size from 512 to 16356 bytes Signed-off-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb')
-rw-r--r--drivers/media/dvb/dvb-usb/af9015.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/media/dvb/dvb-usb/af9015.c b/drivers/media/dvb/dvb-usb/af9015.c
index 03838e629e0..fdfa0f54291 100644
--- a/drivers/media/dvb/dvb-usb/af9015.c
+++ b/drivers/media/dvb/dvb-usb/af9015.c
@@ -369,12 +369,14 @@ static int af9015_init_endpoint(struct dvb_usb_device *d)
369 u8 packet_size; 369 u8 packet_size;
370 deb_info("%s: USB speed:%d\n", __func__, d->udev->speed); 370 deb_info("%s: USB speed:%d\n", __func__, d->udev->speed);
371 371
372 /* Windows driver uses packet count 21 for USB1.1 and 348 for USB2.0.
373 We use smaller - about 1/4 from the original, 5 and 87. */
372#define TS_PACKET_SIZE 188 374#define TS_PACKET_SIZE 188
373 375
374#define TS_USB20_PACKET_COUNT 348 376#define TS_USB20_PACKET_COUNT 87
375#define TS_USB20_FRAME_SIZE (TS_PACKET_SIZE*TS_USB20_PACKET_COUNT) 377#define TS_USB20_FRAME_SIZE (TS_PACKET_SIZE*TS_USB20_PACKET_COUNT)
376 378
377#define TS_USB11_PACKET_COUNT 21 379#define TS_USB11_PACKET_COUNT 5
378#define TS_USB11_FRAME_SIZE (TS_PACKET_SIZE*TS_USB11_PACKET_COUNT) 380#define TS_USB11_FRAME_SIZE (TS_PACKET_SIZE*TS_USB11_PACKET_COUNT)
379 381
380#define TS_USB20_MAX_PACKET_SIZE 512 382#define TS_USB20_MAX_PACKET_SIZE 512
@@ -868,7 +870,7 @@ static int af9015_read_config(struct usb_device *udev)
868 /* USB1.1 set smaller buffersize and disable 2nd adapter */ 870 /* USB1.1 set smaller buffersize and disable 2nd adapter */
869 if (udev->speed == USB_SPEED_FULL) { 871 if (udev->speed == USB_SPEED_FULL) {
870 af9015_properties[i].adapter[0].stream.u.bulk.buffersize 872 af9015_properties[i].adapter[0].stream.u.bulk.buffersize
871 = TS_USB11_MAX_PACKET_SIZE; 873 = TS_USB11_FRAME_SIZE;
872 /* disable 2nd adapter because we don't have 874 /* disable 2nd adapter because we don't have
873 PID-filters */ 875 PID-filters */
874 af9015_config.dual_mode = 0; 876 af9015_config.dual_mode = 0;