Changeset ef40434 in mainline for uspace/lib/usbhost/src/iface.c

Timestamp:

2013-01-15T21:50:52Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

0f4bff8

Parents:

ef4e8eb

Message:

usb: Drop deprecated usb hc interface functions.

File:

• uspace/lib/usbhost/src/iface.c (modified) (4 diffs)

uspace/lib/usbhost/src/iface.c

@@ -42 +42 @@
 #include "ddf_helpers.h"
 
-/** Request address interface function.
- *
- * @param[in] fun DDF function that was called.
- * @param[in] address Pointer to preferred USB address.
- * @param[out] address Place to write a new address.
- * @param[in] strict Fail if the preferred address is not available.
- * @param[in] speed Speed to associate with the new default address.
- * @return Error code.
- */
-static int request_address(
-    ddf_fun_t *fun, usb_address_t *address, bool strict, usb_speed_t speed)
-{
-        assert(fun);
-        hcd_t *hcd = dev_to_hcd(ddf_fun_get_dev(fun));
-        assert(hcd);
-        assert(address);
-        usb_log_debug("Address request: speed: %s, address: %d, strict: %s.\n",
-            usb_str_speed(speed), *address, strict ? "YES" : "NO");
-        return usb_device_manager_request_address(
-            &hcd->dev_manager, address, strict, speed);
-}
-
-/** Bind address interface function.
- *
- * @param[in] fun DDF function that was called.
- * @param[in] address Address of the device
- * @param[in] handle Devman handle of the device driver.
- * @return Error code.
- */
-static int bind_address(
-    ddf_fun_t *fun, usb_address_t address, devman_handle_t handle)
-{
-        assert(fun);
-        hcd_t *hcd = dev_to_hcd(ddf_fun_get_dev(fun));
-        assert(hcd);
-
-        usb_log_debug("Address bind %d-%" PRIun ".\n", address, handle);
-        return usb_device_manager_bind_address(
-            &hcd->dev_manager, address, handle);
-}
-
 /** Find device handle by address interface function.
  *
@@ -98 +57 @@
         return usb_device_manager_get_info_by_address(
             &hcd->dev_manager, address, handle, NULL);
-}
-
-/** Release address interface function.
- *
- * @param[in] fun DDF function that was called.
- * @param[in] address USB address to be released.
- * @return Error code.
- */
-static int release_address(ddf_fun_t *fun, usb_address_t address)
-{
-        assert(fun);
-        hcd_t *hcd = dev_to_hcd(ddf_fun_get_dev(fun));
-        usb_log_debug("Address release %d.\n", address);
-        return hcd_release_address(hcd, address);
 }
 
@@ -134 +79 @@
         const size_t size = max_packet_size;
         const usb_target_t target = {{.address = address, .endpoint = endpoint}};
-        
+
         usb_log_debug("Register endpoint %d:%d %s-%s %zuB %ums.\n",
             address, endpoint, usb_str_transfer_type(transfer_type),
@@ -203 +148 @@
 /** usbhc Interface implementation using hcd_t from libusbhost library. */
 usbhc_iface_t hcd_iface = {
-        .request_address = request_address,
-        .bind_address = bind_address,
         .get_handle = find_by_address,
-        .release_address = release_address,
 
         .register_endpoint = register_endpoint,