Changes in uspace/lib/usbdev/src/request.c [33b8d024:5a6cc679] in mainline

File:

• uspace/lib/usbdev/src/request.c (modified) (8 diffs)

uspace/lib/usbdev/src/request.c

@@ -118 +118 @@
  * @param data_size        Size of the @p data buffer
  *                         (in native endianness).
- * @param actual_data_size Actual size of transfered data
+ * @param actual_data_size Actual size of transferred data
  *                         (in native endianness).
  *
@@ -183 +183 @@
 
         uint16_t status_usb_endianess;
-        size_t data_transfered_size;
+        size_t data_transferred_size;
         errno_t rc = usb_control_request_get(pipe, USB_REQUEST_TYPE_STANDARD,
             recipient, USB_DEVREQ_GET_STATUS, 0, uint16_host2usb(index),
-            &status_usb_endianess, 2, &data_transfered_size);
-        if (rc != EOK) {
-                return rc;
-        }
-        if (data_transfered_size != 2) {
+            &status_usb_endianess, 2, &data_transferred_size);
+        if (rc != EOK) {
+                return rc;
+        }
+        if (data_transferred_size != 2) {
                 return ELIMIT;
         }
@@ -314 +314 @@
          */
         uint8_t tmp_buffer;
-        size_t bytes_transfered;
+        size_t bytes_transferred;
         rc = usb_request_get_descriptor(pipe, request_type, recipient,
             descriptor_type, descriptor_index, language,
-            &tmp_buffer, sizeof(tmp_buffer), &bytes_transfered);
-        if (rc != EOK) {
-                return rc;
-        }
-        if (bytes_transfered != 1) {
+            &tmp_buffer, sizeof(tmp_buffer), &bytes_transferred);
+        if (rc != EOK) {
+                return rc;
+        }
+        if (bytes_transferred != 1) {
                 return ELIMIT;
         }
@@ -340 +340 @@
         rc = usb_request_get_descriptor(pipe, request_type, recipient,
             descriptor_type, descriptor_index, language,
-            buffer, size, &bytes_transfered);
+            buffer, size, &bytes_transferred);
         if (rc != EOK) {
                 free(buffer);
                 return rc;
         }
-        if (bytes_transfered != size) {
+        if (bytes_transferred != size) {
                 free(buffer);
                 return ELIMIT;
@@ -475 +475 @@
 errno_t usb_request_get_full_configuration_descriptor_alloc(
     usb_pipe_t *pipe, int index,
-    void **descriptor_ptr, size_t *descriptor_size)
+    const void **descriptor_ptr, size_t *descriptor_size)
 {
         errno_t rc;
@@ -824 +824 @@
  * @return Error code.
  */
-errno_t usb_request_clear_endpoint_halt(usb_pipe_t *pipe, uint16_t ep_index)
+static errno_t usb_request_clear_endpoint_halt(usb_pipe_t *pipe, uint16_t ep_index)
 {
         return usb_request_clear_feature(pipe,
@@ -843 +843 @@
                 return EINVAL;
         }
-        return usb_request_clear_endpoint_halt(ctrl_pipe,
-            target_pipe->endpoint_no);
+
+        uint16_t index = target_pipe->desc.endpoint_no;
+        index |= (target_pipe->desc.direction == USB_DIRECTION_IN) << 7;
+        return usb_request_clear_endpoint_halt(ctrl_pipe, index);
 }
 
@@ -858 +860 @@
 {
         uint16_t status_tmp;
-        uint16_t pipe_index = (uint16_t) pipe->endpoint_no;
+        uint16_t pipe_index = (uint16_t) pipe->desc.endpoint_no;
         errno_t rc = usb_request_get_status(ctrl_pipe,
             USB_REQUEST_RECIPIENT_ENDPOINT, uint16_host2usb(pipe_index),