Changeset 67f55e7b in mainline for uspace/lib/usbdev/src/hub.c

Timestamp:

2011-10-31T15:51:49Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

1b17e37

Parents:

0cd8089

Message:

usb: Allow devices to request explicit address.

File:

• uspace/lib/usbdev/src/hub.c (modified) (4 diffs)

uspace/lib/usbdev/src/hub.c

@@ -66 +66 @@
  *
  * @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).
@@ -71 +73 @@
  */
 usb_address_t usb_hc_request_address(usb_hc_connection_t *connection,
-    usb_speed_t speed)
+    usb_address_t preferred, bool strict, usb_speed_t speed)
 {
         CHECK_CONNECTION(connection);
@@ -78 +80 @@
         
         sysarg_t address;
-        int rc = async_req_2_1(exch, DEV_IFACE_ID(USBHC_DEV_IFACE),
-            IPC_M_USBHC_REQUEST_ADDRESS, speed,
-            &address);
+        int rc = async_req_4_1(exch, DEV_IFACE_ID(USBHC_DEV_IFACE),
+            IPC_M_USBHC_REQUEST_ADDRESS, preferred, strict, speed, &address);
         
         async_exchange_end(exch);
@@ -223 +224 @@
          * Request new address.
          */
-        usb_address_t dev_addr = usb_hc_request_address(&hc_conn, dev_speed);
+        usb_address_t dev_addr =
+            usb_hc_request_address(&hc_conn, 1, false, dev_speed);
         if (dev_addr < 0) {
                 rc = EADDRNOTAVAIL;