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

Timestamp:

2018-01-16T20:23:54Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

51a51be

Parents:

eeca8a6

Message:

libdrv: merged usbhc default address reservation operations

File:

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

uspace/lib/drv/generic/remote_usbhc.c

@@ -45 +45 @@
 
 typedef enum {
-        IPC_M_USB_RESERVE_DEFAULT_ADDRESS,
-        IPC_M_USB_RELEASE_DEFAULT_ADDRESS,
+        IPC_M_USB_DEFAULT_ADDRESS_RESERVATION,
         IPC_M_USB_DEVICE_ENUMERATE,
         IPC_M_USB_DEVICE_REMOVE,
@@ -63 +62 @@
         if (!exch)
                 return EBADMEM;
-        return async_req_1_0(exch, DEV_IFACE_ID(USBHC_DEV_IFACE), IPC_M_USB_RESERVE_DEFAULT_ADDRESS);
+        return async_req_2_0(exch, DEV_IFACE_ID(USBHC_DEV_IFACE), IPC_M_USB_DEFAULT_ADDRESS_RESERVATION, true);
 }
 
@@ -76 +75 @@
         if (!exch)
                 return EBADMEM;
-        return async_req_1_0(exch, DEV_IFACE_ID(USBHC_DEV_IFACE), IPC_M_USB_RELEASE_DEFAULT_ADDRESS);
+        return async_req_2_0(exch, DEV_IFACE_ID(USBHC_DEV_IFACE), IPC_M_USB_DEFAULT_ADDRESS_RESERVATION, false);
 }
 
@@ -263 +262 @@
 }
 
-static void remote_usbhc_reserve_default_address(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
-static void remote_usbhc_release_default_address(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
+static void remote_usbhc_default_address_reservation(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
 static void remote_usbhc_device_enumerate(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
 static void remote_usbhc_device_remove(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
@@ -274 +272 @@
 /** Remote USB interface operations. */
 static const remote_iface_func_ptr_t remote_usbhc_iface_ops [] = {
-        [IPC_M_USB_RESERVE_DEFAULT_ADDRESS] = remote_usbhc_reserve_default_address,
-        [IPC_M_USB_RELEASE_DEFAULT_ADDRESS] = remote_usbhc_release_default_address,
+        [IPC_M_USB_DEFAULT_ADDRESS_RESERVATION] = remote_usbhc_default_address_reservation,
         [IPC_M_USB_DEVICE_ENUMERATE] = remote_usbhc_device_enumerate,
         [IPC_M_USB_DEVICE_REMOVE] = remote_usbhc_device_remove,
@@ -297 +294 @@
 } async_transaction_t;
 
-void remote_usbhc_reserve_default_address(ddf_fun_t *fun, void *iface,
+void remote_usbhc_default_address_reservation(ddf_fun_t *fun, void *iface,
     ipc_callid_t callid, ipc_call_t *call)
 {
         const usbhc_iface_t *usbhc_iface = (usbhc_iface_t *) iface;
 
-        if (usbhc_iface->reserve_default_address == NULL) {
-                async_answer_0(callid, ENOTSUP);
-                return;
-        }
-
-        const int ret = usbhc_iface->reserve_default_address(fun);
+        if (usbhc_iface->default_address_reservation == NULL) {
+                async_answer_0(callid, ENOTSUP);
+                return;
+        }
+
+        const bool reserve = IPC_GET_ARG2(*call);
+        const int ret = usbhc_iface->default_address_reservation(fun, reserve);
         async_answer_0(callid, ret);
 }
 
-void remote_usbhc_release_default_address(ddf_fun_t *fun, void *iface,
-    ipc_callid_t callid, ipc_call_t *call)
-{
-        const usbhc_iface_t *usbhc_iface = (usbhc_iface_t *) iface;
-
-        if (usbhc_iface->release_default_address == NULL) {
-                async_answer_0(callid, ENOTSUP);
-                return;
-        }
-
-        const int ret = usbhc_iface->release_default_address(fun);
-        async_answer_0(callid, ret);
-}
 
 static void remote_usbhc_device_enumerate(ddf_fun_t *fun, void *iface,