Changeset 62066b4 in mainline for uspace/drv/usbhub/usbhub.c

Timestamp:

2011-02-20T21:47:23Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

ace12560

Parents:

6bb83c7 (diff), 423e8c81 (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 with usb/development

File:

• uspace/drv/usbhub/usbhub.c (modified) (3 diffs)

uspace/drv/usbhub/usbhub.c

@@ -52 +52 @@
 #include "usb/pipes.h"
 
+static int iface_get_hc_handle(device_t *device, devman_handle_t *handle)
+{
+        return usb_hc_find(device->handle, handle);
+}
+
 static usb_iface_t hub_usb_iface = {
-        .get_hc_handle = usb_drv_find_hc
+        .get_hc_handle = iface_get_hc_handle
 };
 
@@ -263 +268 @@
         //get default address
         //opResult = usb_drv_reserve_default_address(hc);
-        opResult = usb_hc_reserve_default_address(&hub->connection, false);
+        opResult = usb_hc_reserve_default_address(&hub->connection, USB_SPEED_LOW);
         if (opResult != EOK) {
                 dprintf(USB_LOG_LEVEL_WARNING, "cannot assign default address, it is probably used");
@@ -320 +325 @@
         usb_address_t new_device_address = usb_hc_request_address(
                         &hub->connection,
-                        false/// \TODO fullspeed??
+                        USB_SPEED_LOW/// \TODO fullspeed??
                         );
         if (new_device_address < 0) {