Changeset 90478727 in mainline for uspace/lib/usbdev/src/pipesinit.c

Timestamp:

2012-08-12T11:46:44Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

41b764b7

Parents:

e1e4192 (diff), 371cb6c (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.

Message:

merge mainline changes

File:

• uspace/lib/usbdev/src/pipesinit.c (modified) (4 diffs)

uspace/lib/usbdev/src/pipesinit.c

@@ -154 +154 @@
     usb_endpoint_mapping_t *mapping, size_t mapping_count,
     usb_standard_interface_descriptor_t *interface,
-    usb_standard_endpoint_descriptor_t *endpoint,
+    usb_standard_endpoint_descriptor_t *endpoint_desc,
     usb_device_connection_t *wire)
 {
@@ -163 +163 @@
 
         /* Actual endpoint number is in bits 0..3 */
-        const usb_endpoint_t ep_no = endpoint->endpoint_address & 0x0F;
+        const usb_endpoint_t ep_no = endpoint_desc->endpoint_address & 0x0F;
 
         const usb_endpoint_description_t description = {
                 /* Endpoint direction is set by bit 7 */
-                .direction = (endpoint->endpoint_address & 128)
+                .direction = (endpoint_desc->endpoint_address & 128)
                     ? USB_DIRECTION_IN : USB_DIRECTION_OUT,
                 /* Transfer type is in bits 0..2 and
                  * the enum values corresponds 1:1 */
-                .transfer_type = endpoint->attributes & 3,
+                .transfer_type = endpoint_desc->attributes & 3,
 
                 /* Get interface characteristics. */
@@ -194 +194 @@
 
         int rc = usb_pipe_initialize(&ep_mapping->pipe, wire,
-            ep_no, description.transfer_type, endpoint->max_packet_size,
+            ep_no, description.transfer_type,
+            uint16_usb2host(endpoint_desc->max_packet_size),
             description.direction);
         if (rc != EOK) {
@@ -201 +202 @@
 
         ep_mapping->present = true;
-        ep_mapping->descriptor = endpoint;
+        ep_mapping->descriptor = endpoint_desc;
         ep_mapping->interface = interface;