Changeset 4b8ecff in mainline

Timestamp:

2013-08-07T09:14:47Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

5514cf7

Parents:

cb8ede1

Message:

libusbhost: remove implementations of the old HC handle based functions

File:

• uspace/lib/usbhost/src/ddf_helpers.c (modified) (5 diffs)

uspace/lib/usbhost/src/ddf_helpers.c

@@ -74 +74 @@
         usb_address_t address;
         usb_speed_t speed;
-        devman_handle_t hc_handle;
 } usb_dev_t;
 
@@ -183 +182 @@
 }
 
-/** Get USB address assigned to root hub.
- *
- * @param[in] fun Root hub function.
- * @param[out] address Store the address here.
- * @return Error code.
- */
-static int get_my_address(ddf_fun_t *fun, usb_address_t *address)
-{
-        assert(fun);
-        if (address != NULL) {
-                usb_dev_t *usb_dev = ddf_fun_data_get(fun);
-                *address = usb_dev->address;
-        }
-        return EOK;
-}
-
-/** Gets handle of the respective hc (this device, hc function).
- *
- * @param[in] root_hub_fun Root hub function seeking hc handle.
- * @param[out] handle Place to write the handle.
- * @return Error code.
- */
-static int get_hc_handle(ddf_fun_t *fun, devman_handle_t *handle)
-{
-        assert(fun);
-
-        if (handle != NULL) {
-                usb_dev_t *usb_dev = ddf_fun_data_get(fun);
-                *handle = usb_dev->hc_handle;
-        }
-        return EOK;
-}
-
 /** Gets handle of the respective hc (this device, hc function).
  *
@@ -284 +250 @@
 /** Root hub USB interface */
 static usb_iface_t usb_iface = {
-        .get_hc_handle = get_hc_handle,
-        .get_my_address = get_my_address,
-
         .get_device_handle = get_device_handle,
 
         .reserve_default_address = reserve_default_address,
         .release_default_address = release_default_address,
+
         .device_enumerate = device_enumerate,
         .device_remove = device_remove,
+
         .register_endpoint = register_endpoint,
         .unregister_endpoint = unregister_endpoint,
+
         .read = dev_read,
         .write = dev_write,
@@ -332 +298 @@
         assert(parent);
         hc_dev_t *hc_dev = dev_to_hc_dev(parent);
-        devman_handle_t hc_handle = ddf_fun_get_handle(hc_dev->hc_fun);
 
         char default_name[10] = { 0 }; /* usbxyz-ss */
@@ -352 +317 @@
         info->address = address;
         info->speed = speed;
-        info->hc_handle = hc_handle;
         info->fun = fun;
         link_initialize(&info->link);