Changeset eeca8a6 in mainline for uspace/lib/drv/generic/remote_usbhc.c

Timestamp:

2018-01-16T19:22:58Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

4603b35

Parents:

47e9494

Message:

usb: speed moved from default address reservation to enumeration callback

File:

• uspace/lib/drv/generic/remote_usbhc.c (modified) (3 diffs)

uspace/lib/drv/generic/remote_usbhc.c

@@ -57 +57 @@
 /** Reserve default USB address.
  * @param[in] exch IPC communication exchange
+ * @return Error code.
+ */
+int usbhc_reserve_default_address(async_exch_t *exch)
+{
+        if (!exch)
+                return EBADMEM;
+        return async_req_1_0(exch, DEV_IFACE_ID(USBHC_DEV_IFACE), IPC_M_USB_RESERVE_DEFAULT_ADDRESS);
+}
+
+/** Release default USB address.
+ *
+ * @param[in] exch IPC communication exchange
+ *
+ * @return Error code.
+ */
+int usbhc_release_default_address(async_exch_t *exch)
+{
+        if (!exch)
+                return EBADMEM;
+        return async_req_1_0(exch, DEV_IFACE_ID(USBHC_DEV_IFACE), IPC_M_USB_RELEASE_DEFAULT_ADDRESS);
+}
+
+/**
+ * Trigger USB device enumeration
+ *
+ * @param[in] exch IPC communication exchange
+ * @param[in] port Port number at which the device is attached
  * @param[in] speed Communication speed of the newly attached device
+ *
  * @return Error code.
  */
-int usbhc_reserve_default_address(async_exch_t *exch, usb_speed_t speed)
-{
-        if (!exch)
-                return EBADMEM;
-        return async_req_2_0(exch, DEV_IFACE_ID(USBHC_DEV_IFACE),
-            IPC_M_USB_RESERVE_DEFAULT_ADDRESS, speed);
-}
-
-/** Release default USB address.
- *
- * @param[in] exch IPC communication exchange
- *
- * @return Error code.
- *
- */
-int usbhc_release_default_address(async_exch_t *exch)
-{
-        if (!exch)
-                return EBADMEM;
-        return async_req_1_0(exch, DEV_IFACE_ID(USBHC_DEV_IFACE),
-            IPC_M_USB_RELEASE_DEFAULT_ADDRESS);
-}
-
-/** Trigger USB device enumeration
- *
- * @param[in]  exch   IPC communication exchange
- * @param[out] handle Identifier of the newly added device (if successful)
- *
- * @return Error code.
- *
- */
-int usbhc_device_enumerate(async_exch_t *exch, unsigned port)
-{
-        if (!exch)
-                return EBADMEM;
-        const int ret = async_req_2_0(exch, DEV_IFACE_ID(USBHC_DEV_IFACE),
-            IPC_M_USB_DEVICE_ENUMERATE, port);
+int usbhc_device_enumerate(async_exch_t *exch, unsigned port, usb_speed_t speed)
+{
+        if (!exch)
+                return EBADMEM;
+        const int ret = async_req_3_0(exch, DEV_IFACE_ID(USBHC_DEV_IFACE),
+            IPC_M_USB_DEVICE_ENUMERATE, port, speed);
         return ret;
 }
@@ -310 +307 @@
         }
 
-        usb_speed_t speed = DEV_IPC_GET_ARG1(*call);
-        const int ret = usbhc_iface->reserve_default_address(fun, speed);
+        const int ret = usbhc_iface->reserve_default_address(fun);
         async_answer_0(callid, ret);
 }
@@ -340 +336 @@
 
         const unsigned port = DEV_IPC_GET_ARG1(*call);
-        const int ret = usbhc_iface->device_enumerate(fun, port);
+        usb_speed_t speed = DEV_IPC_GET_ARG2(*call);
+        const int ret = usbhc_iface->device_enumerate(fun, port, speed);
         async_answer_0(callid, ret);
 }