Changes in uspace/drv/usbhub/usbhub.c [0f21c0c:6bb83c7] in mainline

File:

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

uspace/drv/usbhub/usbhub.c

@@ -39 +39 @@
 
 #include <usb_iface.h>
-#include <usb/ddfiface.h>
+#include <usb/usbdrv.h>
 #include <usb/descriptor.h>
 #include <usb/recognise.h>
+#include <usb/devreq.h>
 #include <usb/request.h>
 #include <usb/classes/hub.h>
@@ -51 +52 @@
 #include "usb/pipes.h"
 
+static usb_iface_t hub_usb_iface = {
+        .get_hc_handle = usb_drv_find_hc
+};
+
 static device_ops_t hub_device_ops = {
-        .interfaces[USB_DEV_IFACE] = &usb_iface_hub_impl
+        .interfaces[USB_DEV_IFACE] = &hub_usb_iface
 };
 
@@ -230 +235 @@
 
 /**
+ * Convenience function for releasing default address and writing debug info
+ * (these few lines are used too often to be written again and again).
+ * @param hc
+ * @return
+ */
+inline static int usb_hub_release_default_address(int hc){
+        int opResult;
+        dprintf(USB_LOG_LEVEL_INFO, "releasing default address");
+        opResult = usb_drv_release_default_address(hc);
+        if (opResult != EOK) {
+                dprintf(USB_LOG_LEVEL_WARNING, "failed to release default address");
+        }
+        return opResult;
+}
+
+/**
  * Reset the port with new device and reserve the default address.
  * @param hc
@@ -242 +263 @@
         //get default address
         //opResult = usb_drv_reserve_default_address(hc);
-        opResult = usb_hc_reserve_default_address(&hub->connection, USB_SPEED_LOW);
-
+        opResult = usb_hc_reserve_default_address(&hub->connection, false);
         if (opResult != EOK) {
                 dprintf(USB_LOG_LEVEL_WARNING, "cannot assign default address, it is probably used");
@@ -300 +320 @@
         usb_address_t new_device_address = usb_hc_request_address(
                         &hub->connection,
-                        USB_SPEED_LOW/// \TODO fullspeed??
+                        false/// \TODO fullspeed??
                         );
         if (new_device_address < 0) {