Changeset 0ee999d in mainline for uspace/lib/usbhost/src/ddf_helpers.c

Timestamp:

2013-08-20T12:24:16Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

5856b627

Parents:

5dad73d

Message:

libusbhost: Add TT information to usb_enpoint_t structure.

File:

• uspace/lib/usbhost/src/ddf_helpers.c (modified) (5 diffs)

uspace/lib/usbhost/src/ddf_helpers.c

@@ -114 +114 @@
 
         return hcd_add_ep(hcd, target, direction, transfer_type,
-            max_packet_size, size);
+            max_packet_size, size, dev->tt_address, dev->port);
 }
 
@@ -391 +391 @@
                     (d->device_version & 0xff));
         
-                /* Next, without release number. */     
+                /* Next, without release number. */
                 ADD_MATCHID_OR_RETURN(l, 90, "usb&vendor=%#04x&product=%#04x",
                     d->vendor_id, d->product_id);
@@ -453 +453 @@
 
         /* This checks whether the default address is reserved and gets speed */
-        int ret = usb_endpoint_manager_get_info_by_address(&hcd->ep_manager,
+        int ret = usb_endpoint_manager_get_speed(&hcd->ep_manager,
                 USB_ADDRESS_DEFAULT, &speed);
         if (ret != EOK) {
@@ -473 +473 @@
         }};
 
+        const usb_address_t tt_address = hub ? hub->tt_address : -1;
+
         /* Add default pipe on default address */
         ret = hcd_add_ep(hcd,
             default_target, USB_DIRECTION_BOTH, USB_TRANSFER_CONTROL,
-            CTRL_PIPE_MIN_PACKET_SIZE, CTRL_PIPE_MIN_PACKET_SIZE);
+            CTRL_PIPE_MIN_PACKET_SIZE, CTRL_PIPE_MIN_PACKET_SIZE,
+            tt_address, port);
 
         if (ret != EOK) {
@@ -501 +504 @@
         /* Register EP on the new address */
         ret = hcd_add_ep(hcd, target, USB_DIRECTION_BOTH, USB_TRANSFER_CONTROL,
-            desc.max_packet_size, desc.max_packet_size);
+            desc.max_packet_size, desc.max_packet_size, tt_address, port);
         if (ret != EOK) {
                 hcd_remove_ep(hcd, default_target, USB_DIRECTION_BOTH);