Changeset 7aaed09 in mainline for uspace/drv/bus/usb/vhc/connhost.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/drv/bus/usb/vhc/connhost.c (modified) (8 diffs)

uspace/drv/bus/usb/vhc/connhost.c

@@ -57 +57 @@
  * @return Error code.
  */
-static int request_address(ddf_fun_t *fun, usb_speed_t speed,
-    usb_address_t *address)
-{
-        VHC_DATA(vhc, fun);
-
-        usb_address_t addr = usb_device_manager_get_free_address(
-            &vhc->dev_manager, USB_SPEED_HIGH);
-        if (addr < 0) {
-                return addr;
-        }
-
-        if (address != NULL) {
-                *address = addr;
-        }
-
-        return EOK;
+static int request_address(ddf_fun_t *fun, usb_address_t *address, bool strict,
+    usb_speed_t speed)
+{
+        VHC_DATA(vhc, fun);
+
+        assert(address);
+        return usb_device_manager_request_address(
+            &vhc->dev_manager, address, strict, speed);
 }
 
@@ -88 +80 @@
         usb_log_debug("Binding handle %" PRIun " to address %d.\n",
             handle, address);
-        usb_device_manager_bind(&vhc->dev_manager, address, handle);
+        usb_device_manager_bind_address(&vhc->dev_manager, address, handle);
 
         return EOK;
@@ -118 +110 @@
         VHC_DATA(vhc, fun);
         usb_log_debug("Releasing address %d...\n", address);
-        usb_device_manager_release(&vhc->dev_manager, address);
+        usb_device_manager_release_address(&vhc->dev_manager, address);
 
         return ENOTSUP;
@@ -136 +128 @@
  */
 static int register_endpoint(ddf_fun_t *fun,
-    usb_address_t address, usb_speed_t speed, usb_endpoint_t endpoint,
+    usb_address_t address, usb_endpoint_t endpoint,
     usb_transfer_type_t transfer_type, usb_direction_t direction,
     size_t max_packet_size, unsigned int interval)
@@ -479 +471 @@
 }
 
-static int tell_address(ddf_fun_t *fun, devman_handle_t handle,
-    usb_address_t *address)
+static int tell_address(ddf_fun_t *fun, usb_address_t *address)
 {
         UNSUPPORTED("tell_address");
@@ -497 +488 @@
 }
 
-static int tell_address_rh(ddf_fun_t *root_hub_fun, devman_handle_t handle,
-    usb_address_t *address)
+static int tell_address_rh(ddf_fun_t *root_hub_fun, usb_address_t *address)
 {
         VHC_DATA(vhc, root_hub_fun);
 
-        if (handle == 0) {
-                handle = root_hub_fun->handle;
-        }
+        devman_handle_t handle = root_hub_fun->handle;
 
         usb_log_debug("tell_address_rh(handle=%" PRIun ")\n", handle);
@@ -520 +508 @@
         .request_address = request_address,
         .bind_address = bind_address,
-        .find_by_address = find_by_address,
+        .get_handle = find_by_address,
         .release_address = release_address,
 
@@ -532 +520 @@
 usb_iface_t vhc_usb_iface = {
         .get_hc_handle = usb_iface_get_hc_handle_hc_impl,
-        .get_address = tell_address
+        .get_my_address = tell_address
 };
 
 usb_iface_t rh_usb_iface = {
         .get_hc_handle = usb_iface_get_hc_handle_rh_impl,
-        .get_address = tell_address_rh
+        .get_my_address = tell_address_rh
 };