Changeset e9d600c2 in mainline for uspace/lib/drv/generic/remote_usbdiag.c

Timestamp:

2017-12-21T09:03:55Z (6 years ago)

Author:

Petr Mánek <petr.manek@…>

Branches:

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

Children:

ad2a8b1

Parents:

cec130b

Message:

usbdiag: added interrupt endpoint tests, printing tmon device path

File:

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

uspace/lib/drv/generic/remote_usbdiag.c

@@ -43 +43 @@
 
 typedef enum {
-        IPC_M_USBDIAG_STRESS_BULK_OUT,
-        IPC_M_USBDIAG_STRESS_BULK_IN
+        IPC_M_USBDIAG_STRESS_INTR_IN,
+        IPC_M_USBDIAG_STRESS_INTR_OUT,
+        IPC_M_USBDIAG_STRESS_BULK_IN,
+        IPC_M_USBDIAG_STRESS_BULK_OUT
 } usb_iface_funcs_t;
 
@@ -58 +60 @@
 }
 
-int usbdiag_stress_bulk_out(async_exch_t *exch, int cycles, size_t size)
+int usbdiag_stress_intr_in(async_exch_t *exch, int cycles, size_t size)
 {
         if (!exch)
                 return EBADMEM;
 
-        return async_req_3_0(exch, DEV_IFACE_ID(USBDIAG_DEV_IFACE), IPC_M_USBDIAG_STRESS_BULK_OUT, cycles, size);
+        return async_req_3_0(exch, DEV_IFACE_ID(USBDIAG_DEV_IFACE), IPC_M_USBDIAG_STRESS_INTR_IN, cycles, size);
+}
+
+int usbdiag_stress_intr_out(async_exch_t *exch, int cycles, size_t size)
+{
+        if (!exch)
+                return EBADMEM;
+
+        return async_req_3_0(exch, DEV_IFACE_ID(USBDIAG_DEV_IFACE), IPC_M_USBDIAG_STRESS_INTR_OUT, cycles, size);
 }
 
@@ -74 +84 @@
 }
 
+int usbdiag_stress_bulk_out(async_exch_t *exch, int cycles, size_t size)
+{
+        if (!exch)
+                return EBADMEM;
+
+        return async_req_3_0(exch, DEV_IFACE_ID(USBDIAG_DEV_IFACE), IPC_M_USBDIAG_STRESS_BULK_OUT, cycles, size);
+}
+
+static void remote_usbdiag_stress_intr_in(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
+static void remote_usbdiag_stress_intr_out(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
+static void remote_usbdiag_stress_bulk_in(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
 static void remote_usbdiag_stress_bulk_out(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
-static void remote_usbdiag_stress_bulk_in(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
 
 /** Remote USB diagnostic interface operations. */
 static const remote_iface_func_ptr_t remote_usbdiag_iface_ops [] = {
-        [IPC_M_USBDIAG_STRESS_BULK_OUT] = remote_usbdiag_stress_bulk_out,
-        [IPC_M_USBDIAG_STRESS_BULK_IN] = remote_usbdiag_stress_bulk_in,
+[       IPC_M_USBDIAG_STRESS_INTR_IN] = remote_usbdiag_stress_intr_in,
+        [IPC_M_USBDIAG_STRESS_INTR_OUT] = remote_usbdiag_stress_intr_out,
+[       IPC_M_USBDIAG_STRESS_BULK_IN] = remote_usbdiag_stress_bulk_in,
+        [IPC_M_USBDIAG_STRESS_BULK_OUT] = remote_usbdiag_stress_bulk_out
 };
 
@@ -89 +111 @@
 };
 
-void remote_usbdiag_stress_bulk_out(ddf_fun_t *fun, void *iface, ipc_callid_t callid, ipc_call_t *call)
+void remote_usbdiag_stress_intr_in(ddf_fun_t *fun, void *iface, ipc_callid_t callid, ipc_call_t *call)
+{
+        const usbdiag_iface_t *diag_iface = (usbdiag_iface_t *) iface;
+
+        if (diag_iface->stress_bulk_in == NULL) {
+                async_answer_0(callid, ENOTSUP);
+                return;
+        }
+
+        int cycles = DEV_IPC_GET_ARG1(*call);
+        size_t size = DEV_IPC_GET_ARG2(*call);
+        const int ret = diag_iface->stress_intr_in(fun, cycles, size);
+        async_answer_0(callid, ret);
+}
+
+void remote_usbdiag_stress_intr_out(ddf_fun_t *fun, void *iface, ipc_callid_t callid, ipc_call_t *call)
 {
         const usbdiag_iface_t *diag_iface = (usbdiag_iface_t *) iface;
@@ -100 +137 @@
         int cycles = DEV_IPC_GET_ARG1(*call);
         size_t size = DEV_IPC_GET_ARG2(*call);
-        const int ret = diag_iface->stress_bulk_out(fun, cycles, size);
+        const int ret = diag_iface->stress_intr_out(fun, cycles, size);
         async_answer_0(callid, ret);
 }
@@ -119 +156 @@
 }
 
+void remote_usbdiag_stress_bulk_out(ddf_fun_t *fun, void *iface, ipc_callid_t callid, ipc_call_t *call)
+{
+        const usbdiag_iface_t *diag_iface = (usbdiag_iface_t *) iface;
+
+        if (diag_iface->stress_bulk_out == NULL) {
+                async_answer_0(callid, ENOTSUP);
+                return;
+        }
+
+        int cycles = DEV_IPC_GET_ARG1(*call);
+        size_t size = DEV_IPC_GET_ARG2(*call);
+        const int ret = diag_iface->stress_bulk_out(fun, cycles, size);
+        async_answer_0(callid, ret);
+}
+
 /**
  * @}