Changeset df6ded8 in mainline for uspace/lib/usbdev/src/request.c

Timestamp:

2018-02-28T16:37:50Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1b20da0

Parents:

f5e5f73 (diff), b2dca8de (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jakub Jermar <jakub@…> (2018-02-28 16:06:42)

git-committer:

Jakub Jermar <jakub@…> (2018-02-28 16:37:50)

Message:

Merge github.com:helenos-xhci-team/helenos

This commit merges support for USB 3 and generally refactors, fixes,
extends and cleans up the existing USB framework.

Notable additions and features:

• new host controller driver has been implemented to control various xHC models (among others, NEC Renesas uPD720200)
• isochronous data transfer mode
• support for explicit USB device removal
• USB tablet driver

File:

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

uspace/lib/usbdev/src/request.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2011 Vojtech Horky
+ * Copyright (c) 2018 Ondrej Hlavaty
  * All rights reserved.
  *
@@ -118 +119 @@
  * @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 +184 @@
 
         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 +315 @@
          */
         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 +341 @@
         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;
@@ -824 +825 @@
  * @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 +844 @@
                 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 +861 @@
 {
         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),