Changeset ea30cc1 in mainline

Timestamp:

2013-01-06T02:36:27Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c95c00e

Parents:

dc1d499

Message:

libsubdev: Add delay parameter to autopol.

usbhub: Set delay to 255 ms . Maximum allowed for endpoint.
This will be useful for devices that don't NAK poll requests.

Location:

uspace

Files:

• drv/bus/usb/usbhid/main.c (modified) (1 diff)
• drv/bus/usb/usbhub/usbhub.c (modified) (2 diffs)
• lib/usbdev/include/usb/dev/poll.h (modified) (1 diff)
• lib/usbdev/src/devpoll.c (modified) (2 diffs)

uspace/drv/bus/usb/usbhid/main.c

@@ -96 +96 @@
            /* How much data to request. */
            dev->pipes[hid_dev->poll_pipe_index].pipe.max_packet_size,
+           /* Delay */
+           0,
            /* Callback when the polling ends. */
            usb_hid_polling_ended_callback,

uspace/drv/bus/usb/usbhub/usbhub.c

@@ -147 +147 @@
         /* Start hub operation. */
         opResult = usb_device_auto_poll(hub_dev->usb_device, 0,
-            hub_port_changes_callback, ((hub_dev->port_count + 1 + 8) / 8),
+            hub_port_changes_callback, ((hub_dev->port_count + 1 + 7) / 8),
+            255000,
             usb_hub_polling_terminated_callback, hub_dev);
         if (opResult != EOK) {
@@ -247 +248 @@
 
         /* N + 1 bit indicates change on port N */
-        for (size_t port = 0; port < hub->port_count + 1; port++) {
+        for (size_t port = 0; port < hub->port_count; ++port) {
                 const size_t bit = port + 1;
                 const bool change = (change_bitmap[bit / 8] >> (bit % 8)) & 1;

uspace/lib/usbdev/include/usb/dev/poll.h

@@ -95 +95 @@
 
 int usb_device_auto_poll(usb_device_t *, size_t,
-    usb_polling_callback_t, size_t, usb_polling_terminted_callback_t, void *);
+    usb_polling_callback_t, size_t, int, usb_polling_terminted_callback_t, void *);
 
 #endif

uspace/lib/usbdev/src/devpoll.c

@@ -194 +194 @@
  */
 int usb_device_auto_poll(usb_device_t *dev, size_t pipe_index,
-    usb_polling_callback_t callback, size_t request_size,
+    usb_polling_callback_t callback, size_t request_size, int delay,
     usb_polling_terminted_callback_t terminated_callback, void *arg)
 {
@@ -200 +200 @@
                 .debug = 1,
                 .auto_clear_halt = true,
-                .delay = 0,
+                .delay = delay,
                 .max_failures = MAX_FAILED_ATTEMPTS,
                 .on_data = callback,