Changes in uspace/lib/usbdev/include/usb/dev/hub.h [0edf7c7:6e3c005] in mainline

File:

• uspace/lib/usbdev/include/usb/dev/hub.h (modified) (2 diffs)

uspace/lib/usbdev/include/usb/dev/hub.h

@@ -38 +38 @@
 #define LIBUSBDEV_HUB_H_
 
+#include <ddf/driver.h>
 #include <sys/types.h>
+#include <errno.h>
 #include <usb/hc.h>
 
 int usb_hc_new_device_wrapper(ddf_dev_t *, usb_hc_connection_t *, usb_speed_t,
-    int (*)(int, void *), int, void *,
-    usb_address_t *, devman_handle_t *,
-    ddf_dev_ops_t *, void *, ddf_fun_t **);
+    int (*)(void *), void *, usb_address_t *, ddf_dev_ops_t *, void *,
+    ddf_fun_t **);
 
 /** Info about device attached to host controller.
@@ -55 +56 @@
         /** Device address. */
         usb_address_t address;
-        /** Devman handle of the device. */
-        devman_handle_t handle;
-} usb_hc_attached_device_t;
+        /** DDF function (external) of the device. */
+        ddf_fun_t *fun;
+} usb_hub_attached_device_t;
 
-usb_address_t usb_hc_request_address(usb_hc_connection_t *, usb_speed_t);
-int usb_hc_register_device(usb_hc_connection_t *,
-    const usb_hc_attached_device_t *);
-int usb_hc_unregister_device(usb_hc_connection_t *, usb_address_t);
+int usb_hub_register_device(usb_hc_connection_t *,
+    const usb_hub_attached_device_t *);
+
+static inline int usb_hub_unregister_device(usb_hc_connection_t *conn,
+    const usb_hub_attached_device_t *attached_device)
+{
+        assert(conn);
+        if (attached_device == NULL)
+                return EBADMEM;
+        return usb_hc_release_address(conn, attached_device->address);
+}
 
 #endif