Changeset ef4e8eb in mainline for uspace/lib/usb/src

Timestamp:

2013-01-15T20:39:09Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

ef40434

Parents:

918e1e84

Message:

Remove unused usb hub code.

All the functionality is now handled by hc driver and libusbhost.

Location:

uspace/lib/usb/src

Files:

• ddfiface.c (modified) (4 diffs)
• hc.c (modified) (2 diffs)

uspace/lib/usb/src/ddfiface.c

@@ -40 +40 @@
 #include <usb/hc.h>
 #include <usb/debug.h>
-#include <usb/dev/hub.h>
 #include <errno.h>
 #include <assert.h>
@@ -52 +51 @@
 };
 
-/** 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_device_impl,
-        .get_my_address = usb_iface_get_my_address_from_device_data,
-};
-
-
 /** Get host controller handle, interface implementation for hub driver.
  *
@@ -69 +61 @@
         assert(fun);
         return usb_get_hc_by_handle(ddf_fun_get_handle(fun), handle);
-}
-
-/** Get host controller handle, interface implementation for HC driver.
- *
- * @param[in] fun Device function 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)
-{
-        assert(fun);
-
-        if (handle != NULL) {
-                *handle = ddf_fun_get_handle(fun);
-        }
-
-        return EOK;
 }
 
@@ -102 +77 @@
 }
 
-/** 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.
- * @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_my_address_from_device_data(ddf_fun_t *fun,
-    usb_address_t *address)
-{
-        const usb_hub_attached_device_t *device = ddf_fun_data_get(fun);
-        assert(device->fun == fun);
-        if (address)
-                *address = device->address;
-        return EOK;
-}
 
 /**

uspace/lib/usb/src/hc.c

@@ -164 +164 @@
 }
 
-/** Ask host controller for free address assignment.
- *
- * @param connection Opened connection to host controller.
- * @param preferred Preferred SUB address.
- * @param strict Fail if the preferred address is not avialable.
- * @param speed Speed of the new device (device that will be assigned
- *    the returned address).
- * @return Assigned USB address or negative error code.
- */
-usb_address_t usb_hc_request_address(usb_hc_connection_t *connection,
-    usb_address_t preferred, bool strict, usb_speed_t speed)
-{
-        async_exch_t *exch;
-        EXCH_INIT(connection, exch);
-
-        usb_address_t address = preferred;
-        const int ret = usbhc_request_address(exch, &address, strict, speed);
-
-        EXCH_FINI(connection, exch);
-        return ret == EOK ? address : ret;
-}
-
-int usb_hc_bind_address(usb_hc_connection_t * connection,
-    usb_address_t address, devman_handle_t handle)
-{
-        async_exch_t *exch;
-        EXCH_INIT(connection, exch);
-
-        const int ret = usbhc_bind_address(exch, address, handle);
-
-        EXCH_FINI(connection, exch);
-        return ret;
-}
 
 /** Get handle of USB device with given address.
@@ -217 +184 @@
 }
 
-int usb_hc_release_address(usb_hc_connection_t *connection,
-    usb_address_t address)
-{
-        async_exch_t *exch;
-        EXCH_INIT(connection, exch);
-
-        const int ret = usbhc_release_address(exch, address);
-
-        EXCH_FINI(connection, exch);
-        return ret;
-}
-
 int usb_hc_register_endpoint(usb_hc_connection_t *connection,
     usb_address_t address, usb_endpoint_t endpoint, usb_transfer_type_t type,