Changeset 3562cd18 in mainline

Timestamp:

2011-10-31T10:07:51Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

ae754e5f

Parents:

eea3e39

Message:

libusb: Remove usb_iface_get_hc_handle_hub_child_impl.

Rename usb_iface_get_hc_handle_hub_impl ⇒ usb_iface_get_hc_handle_device_impl.
This was just a hidden duplicity, the only difference was using EXCHANGE_SERIALIZE instead of EXCHANGE_ATOMIC.
All USB devices, but root hubs, ask their parents for hc handle.

Location:

uspace

Files:

• drv/bus/usb/usbmid/usbmid.c (modified) (1 diff)
• lib/usb/include/usb/ddfiface.h (modified) (1 diff)
• lib/usb/src/ddfiface.c (modified) (3 diffs)

uspace/drv/bus/usb/usbmid/usbmid.c

@@ -62 +62 @@
 /** DDF interface of the child - interface function. */
 static usb_iface_t child_usb_iface = {
-        .get_hc_handle = usb_iface_get_hc_handle_hub_child_impl,
+        .get_hc_handle = usb_iface_get_hc_handle_device_impl,
         .get_address = usb_iface_get_address_forward_impl,
         .get_interface = usb_iface_get_interface_impl

uspace/lib/usb/include/usb/ddfiface.h

@@ -39 +39 @@
 #include <usb_iface.h>
 
-int usb_iface_get_hc_handle_hub_impl(ddf_fun_t *, devman_handle_t *);
+int usb_iface_get_hc_handle_device_impl(ddf_fun_t *, devman_handle_t *);
 int usb_iface_get_address_forward_impl(ddf_fun_t *, devman_handle_t,
     usb_address_t *);
 extern usb_iface_t usb_iface_hub_impl;
 
-int usb_iface_get_hc_handle_hub_child_impl(ddf_fun_t *, devman_handle_t *);
 int usb_iface_get_address_set_my_handle_impl(ddf_fun_t *, devman_handle_t,
     usb_address_t *);

uspace/lib/usb/src/ddfiface.c

@@ -44 +44 @@
 /** 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_hc_handle = usb_iface_get_hc_handle_device_impl,
         .get_address = usb_iface_get_address_forward_impl,
 };
@@ -50 +50 @@
 /** 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_hc_handle = usb_iface_get_hc_handle_device_impl,
         .get_address = usb_iface_get_address_set_my_handle_impl
 };
@@ -61 +61 @@
  * @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;
 }