Changes in uspace/lib/usb/src/ddfiface.c [bc1c6fb:357a302] in mainline

File:

• uspace/lib/usb/src/ddfiface.c (modified) (5 diffs)

uspace/lib/usb/src/ddfiface.c

@@ -34 +34 @@
  */
 #include <ipc/devman.h>
-#include <devman.h>
-#include <async.h>
 #include <usb/ddfiface.h>
-#include <usb/debug.h>
 #include <errno.h>
-#include <assert.h>
 
 /** DDF interface for USB device, implementation for typical hub. */
@@ -56 +52 @@
 /** Get host controller handle, interface implementation for hub driver.
  *
- * @param[in] fun Device function the operation is running on.
+ * @param[in] device Device the operation is running on.
  * @param[out] handle Storage for the host controller handle.
  * @return Error code.
  */
-int usb_iface_get_hc_handle_hub_impl(ddf_fun_t *fun, devman_handle_t *handle)
+int usb_iface_get_hc_handle_hub_impl(device_t *device, devman_handle_t *handle)
 {
-        assert(fun);
-        return usb_hc_find(fun->handle, handle);
+        assert(device);
+        return usb_hc_find(device->handle, handle);
 }
 
@@ -69 +65 @@
  * a hub driver.
  *
- * @param[in] fun Device function the operation is running on.
+ * @param[in] device Device the operation is running on.
  * @param[out] handle Storage for the host controller handle.
  * @return Error code.
  */
-int usb_iface_get_hc_handle_hub_child_impl(ddf_fun_t *fun,
+int usb_iface_get_hc_handle_hub_child_impl(device_t *device,
     devman_handle_t *handle)
 {
-        assert(fun != NULL);
+        assert(device);
+        device_t *parent = device->parent;
 
-        int parent_phone = devman_parent_device_connect(fun->handle,
-            IPC_FLAG_BLOCKING);
-        if (parent_phone < 0) {
-                return parent_phone;
+        /* Default error, device does not support this operation. */
+        int rc = ENOTSUP;
+
+        if (parent && parent->ops && parent->ops->interfaces[USB_DEV_IFACE]) {
+                usb_iface_t *usb_iface
+                    = (usb_iface_t *) parent->ops->interfaces[USB_DEV_IFACE];
+                assert(usb_iface != NULL);
+
+                if (usb_iface->get_hc_handle) {
+                        rc = usb_iface->get_hc_handle(parent, handle);
+                }
         }
 
-        sysarg_t hc_handle;
-        int rc = async_req_1_1(parent_phone, DEV_IFACE_ID(USB_DEV_IFACE),
-            IPC_M_USB_GET_HOST_CONTROLLER_HANDLE, &hc_handle);
-
-        async_hangup(parent_phone);
-
-        if (rc != EOK) {
-                return rc;
-        }
-
-        *handle = hc_handle;
-
-        return EOK;
+        return rc;
 }
 
 /** Get host controller handle, interface implementation for HC driver.
  *
- * @param[in] fun Device function the operation is running on.
+ * @param[in] device Device the operation is running on.
  * @param[out] handle Storage for the host controller handle.
  * @return Always EOK.
  */
-int usb_iface_get_hc_handle_hc_impl(ddf_fun_t *fun, devman_handle_t *handle)
+int usb_iface_get_hc_handle_hc_impl(device_t *device, devman_handle_t *handle)
 {
-        assert(fun);
+        assert(device);
 
         if (handle != NULL) {
-                *handle = fun->handle;
+                *handle = device->handle;
         }
 
@@ -118 +110 @@
 /** Get USB device address, interface implementation for hub driver.
  *
- * @param[in] fun Device function the operation is running on.
+ * @param[in] device Device the operation is running on.
  * @param[in] handle Devman handle of USB device we want address of.
  * @param[out] address Storage for USB address of device with handle @p handle.
  * @return Error code.
  */
-int usb_iface_get_address_hub_impl(ddf_fun_t *fun, devman_handle_t handle,
+int usb_iface_get_address_hub_impl(device_t *device, devman_handle_t handle,
     usb_address_t *address)
 {
-        assert(fun);
-        int parent_phone = devman_parent_device_connect(fun->handle,
+        assert(device);
+        int parent_phone = devman_parent_device_connect(device->handle,
             IPC_FLAG_BLOCKING);
         if (parent_phone < 0) {
@@ -153 +145 @@
  * a hub driver.
  *
- * @param[in] fun Device function the operation is running on.
+ * @param[in] device Device the operation is running on.
  * @param[in] handle Devman handle of USB device we want address of.
  * @param[out] address Storage for USB address of device with handle @p handle.
  * @return Error code.
  */
-int usb_iface_get_address_hub_child_impl(ddf_fun_t *fun,
+int usb_iface_get_address_hub_child_impl(device_t *device,
     devman_handle_t handle, usb_address_t *address)
 {
-        if (handle == 0) {
-                handle = fun->handle;
+        assert(device);
+        device_t *parent = device->parent;
+
+        /* Default error, device does not support this operation. */
+        int rc = ENOTSUP;
+
+        if (parent && parent->ops && parent->ops->interfaces[USB_DEV_IFACE]) {
+                usb_iface_t *usb_iface
+                    = (usb_iface_t *) parent->ops->interfaces[USB_DEV_IFACE];
+                assert(usb_iface != NULL);
+
+                if (usb_iface->get_address) {
+                        rc = usb_iface->get_address(parent, handle, address);
+                }
         }
-        return usb_iface_get_address_hub_impl(fun, handle, address);
+
+        return rc;
 }