Changeset 5fd9c30 in mainline for uspace/lib/usb

Timestamp:

2017-10-21T20:52:56Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

766043c

Parents:

74b852b

Message:

usbhost refactoring: let transfer_batch be initialized by bus

Currently makes older HCs fail, work in progress.

Location:

uspace/lib/usb

Files:

• include/usb/request.h (modified) (1 diff)
• src/usb.c (modified) (3 diffs)

uspace/lib/usb/include/usb/request.h

@@ -109 +109 @@
 int assert[(sizeof(usb_device_request_setup_packet_t) == 8) ? 1: -1];
 
-int usb_request_needs_toggle_reset(
+/** How much toggles needs to be reset */
+typedef enum {
+        RESET_NONE,
+        RESET_EP,
+        RESET_ALL
+} toggle_reset_mode_t;
+
+toggle_reset_mode_t usb_request_get_toggle_reset_mode(
     const usb_device_request_setup_packet_t *request);
 

uspace/lib/usb/src/usb.c

@@ -128 +128 @@
  *
  */
-int usb_request_needs_toggle_reset(
+toggle_reset_mode_t usb_request_get_toggle_reset_mode(
     const usb_device_request_setup_packet_t *request)
 {
@@ -139 +139 @@
                 if ((request->request_type == 0x2) &&
                     (request->value == USB_FEATURE_ENDPOINT_HALT))
-                        return uint16_usb2host(request->index);
+                        return RESET_EP;
                 break;
         case USB_DEVREQ_SET_CONFIGURATION:
@@ -149 +149 @@
                  * interface of an already setup device. */
                 if (!(request->request_type & SETUP_REQUEST_TYPE_DEVICE_TO_HOST))
-                        return 0;
+                        return RESET_ALL;
                 break;
         default:
                 break;
         }
-        return -1;
+
+        return RESET_NONE;
 }