Changeset 7aaed09 in mainline for uspace/lib/usb/src/ddfiface.c

Timestamp:

2011-12-18T14:02:30Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c868e2d

Parents:

3b71e84d (diff), 1761268 (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 mainline changes.

File:

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

uspace/lib/usb/src/ddfiface.c

@@ -36 +36 @@
 #include <devman.h>
 #include <async.h>
+#include <usb_iface.h>
 #include <usb/ddfiface.h>
 #include <usb/hc.h>
 #include <usb/debug.h>
+#include <usb/dev/hub.h>
 #include <errno.h>
 #include <assert.h>
 
 /** DDF interface for USB device, implementation for typical hub. */
-usb_iface_t  usb_iface_hub_impl = {
-        .get_hc_handle = usb_iface_get_hc_handle_hub_impl,
-        .get_address = usb_iface_get_address_hub_impl
+usb_iface_t usb_iface_hub_impl = {
+        .get_hc_handle = usb_iface_get_hc_handle_device_impl,
+        .get_my_address = usb_iface_get_my_address_forward_impl,
 };
 
 /** DDF interface for USB device, implementation for child of a typical hub. */
-usb_iface_t  usb_iface_hub_child_impl = {
-        .get_hc_handle = usb_iface_get_hc_handle_hub_child_impl,
-        .get_address = usb_iface_get_address_hub_child_impl
+usb_iface_t usb_iface_hub_child_impl = {
+        .get_hc_handle = usb_iface_get_hc_handle_device_impl,
+        .get_my_address = usb_iface_get_my_address_from_device_data,
 };
 
@@ -61 +63 @@
  * @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_device_impl(ddf_fun_t *fun, devman_handle_t *handle)
 {
         assert(fun);
         return usb_hc_find(fun->handle, handle);
-}
-
-/** Get host controller handle, interface implementation for child of
- * a hub driver.
- *
- * @param[in] fun Device function 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,
-    devman_handle_t *handle)
-{
-        assert(fun != NULL);
-        
-        async_sess_t *parent_sess =
-            devman_parent_device_connect(EXCHANGE_SERIALIZE, fun->handle,
-            IPC_FLAG_BLOCKING);
-        if (!parent_sess)
-                return ENOMEM;
-        
-        async_exch_t *exch = async_exchange_begin(parent_sess);
-        
-        sysarg_t hc_handle;
-        int rc = async_req_1_1(exch, DEV_IFACE_ID(USB_DEV_IFACE),
-            IPC_M_USB_GET_HOST_CONTROLLER_HANDLE, &hc_handle);
-        
-        async_exchange_end(exch);
-        async_hangup(parent_sess);
-        
-        if (rc != EOK)
-                return rc;
-        
-        *handle = hc_handle;
-        return EOK;
 }
 
@@ -125 +93 @@
  * @return Error code.
  */
-int usb_iface_get_address_hub_impl(ddf_fun_t *fun, devman_handle_t handle,
+int usb_iface_get_my_address_forward_impl(ddf_fun_t *fun,
     usb_address_t *address)
 {
         assert(fun);
-        
+
         async_sess_t *parent_sess =
             devman_parent_device_connect(EXCHANGE_SERIALIZE, fun->handle,
@@ -135 +103 @@
         if (!parent_sess)
                 return ENOMEM;
-        
+
         async_exch_t *exch = async_exchange_begin(parent_sess);
-        
-        sysarg_t addr;
-        int rc = async_req_2_1(exch, DEV_IFACE_ID(USB_DEV_IFACE),
-            IPC_M_USB_GET_ADDRESS, handle, &addr);
-        
+        if (!exch) {
+                async_hangup(parent_sess);
+                return ENOMEM;
+        }
+
+        const int ret = usb_get_my_address(exch, address);
+
         async_exchange_end(exch);
         async_hangup(parent_sess);
-        
-        if (rc != EOK)
-                return rc;
-        
-        if (address != NULL)
-                *address = (usb_address_t) addr;
-        
-        return EOK;
+
+        return ret;
 }
 
 /** Get USB device address, interface implementation for child of
  * a hub driver.
+ *
+ * This implementation eccepts 0 as valid handle and replaces it with fun's
+ * handle.
  *
  * @param[in] fun Device function the operation is running on.
@@ -162 +129 @@
  * @return Error code.
  */
-int usb_iface_get_address_hub_child_impl(ddf_fun_t *fun,
-    devman_handle_t handle, usb_address_t *address)
+int usb_iface_get_my_address_from_device_data(ddf_fun_t *fun,
+    usb_address_t *address)
 {
-        if (handle == 0) {
-                handle = fun->handle;
-        }
-        return usb_iface_get_address_hub_impl(fun, handle, address);
+        assert(fun);
+        assert(fun->driver_data);
+        usb_hub_attached_device_t *device = fun->driver_data;
+        assert(device->fun == fun);
+        if (address)
+                *address = device->address;
+        return EOK;
 }