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

Timestamp:

2017-12-30T21:36:08Z (6 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

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

Children:

2523293

Parents:

bf7b747

git-author:

Petr Manek <petr.manek@…> (2017-12-30 21:33:41)

git-committer:

Petr Manek <petr.manek@…> (2017-12-30 21:36:08)

Message:

libdrv: extend usbdiag interface with data validity tests

File:

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

uspace/lib/drv/generic/remote_usbdiag.c

@@ -48 +48 @@
         IPC_M_USBDIAG_BURST_BULK_OUT,
         IPC_M_USBDIAG_BURST_ISOCH_IN,
-        IPC_M_USBDIAG_BURST_ISOCH_OUT
+        IPC_M_USBDIAG_BURST_ISOCH_OUT,
+        IPC_M_USBDIAG_DATA_INTR_IN,
+        IPC_M_USBDIAG_DATA_INTR_OUT,
+        IPC_M_USBDIAG_DATA_BULK_IN,
+        IPC_M_USBDIAG_DATA_BULK_OUT,
+        IPC_M_USBDIAG_DATA_ISOCH_IN,
+        IPC_M_USBDIAG_DATA_ISOCH_OUT
 } usb_iface_funcs_t;
 
@@ -139 +145 @@
         sysarg_t duration_;
         const int rc = async_req_3_1(exch, DEV_IFACE_ID(USBDIAG_DEV_IFACE), IPC_M_USBDIAG_BURST_ISOCH_OUT, cycles, size, &duration_);
+
+        if (rc == EOK && duration)
+                *duration = duration_;
+
+        return rc;
+}
+
+int usbdiag_data_intr_in(async_exch_t *exch, int cycles, size_t size, usbdiag_dur_t *duration)
+{
+        if (!exch)
+                return EBADMEM;
+
+        sysarg_t duration_;
+        const int rc = async_req_3_1(exch, DEV_IFACE_ID(USBDIAG_DEV_IFACE), IPC_M_USBDIAG_DATA_INTR_IN, cycles, size, &duration_);
+
+        if (rc == EOK && duration)
+                *duration = duration_;
+
+        return rc;
+}
+
+int usbdiag_data_intr_out(async_exch_t *exch, int cycles, size_t size, usbdiag_dur_t *duration)
+{
+        if (!exch)
+                return EBADMEM;
+
+        sysarg_t duration_;
+        const int rc = async_req_3_1(exch, DEV_IFACE_ID(USBDIAG_DEV_IFACE), IPC_M_USBDIAG_DATA_INTR_OUT, cycles, size, &duration_);
+
+        if (rc == EOK && duration)
+                *duration = duration_;
+
+        return rc;
+}
+
+int usbdiag_data_bulk_in(async_exch_t *exch, int cycles, size_t size, usbdiag_dur_t *duration)
+{
+        if (!exch)
+                return EBADMEM;
+
+        sysarg_t duration_;
+        const int rc = async_req_3_1(exch, DEV_IFACE_ID(USBDIAG_DEV_IFACE), IPC_M_USBDIAG_DATA_BULK_IN, cycles, size, &duration_);
+
+        if (rc == EOK && duration)
+                *duration = duration_;
+
+        return rc;
+}
+
+int usbdiag_data_bulk_out(async_exch_t *exch, int cycles, size_t size, usbdiag_dur_t *duration)
+{
+        if (!exch)
+                return EBADMEM;
+
+        sysarg_t duration_;
+        const int rc = async_req_3_1(exch, DEV_IFACE_ID(USBDIAG_DEV_IFACE), IPC_M_USBDIAG_DATA_BULK_OUT, cycles, size, &duration_);
+
+        if (rc == EOK && duration)
+                *duration = duration_;
+
+        return rc;
+}
+
+int usbdiag_data_isoch_in(async_exch_t *exch, int cycles, size_t size, usbdiag_dur_t *duration)
+{
+        if (!exch)
+                return EBADMEM;
+
+        sysarg_t duration_;
+        const int rc = async_req_3_1(exch, DEV_IFACE_ID(USBDIAG_DEV_IFACE), IPC_M_USBDIAG_DATA_ISOCH_IN, cycles, size, &duration_);
+
+        if (rc == EOK && duration)
+                *duration = duration_;
+
+        return rc;
+}
+
+int usbdiag_data_isoch_out(async_exch_t *exch, int cycles, size_t size, usbdiag_dur_t *duration)
+{
+        if (!exch)
+                return EBADMEM;
+
+        sysarg_t duration_;
+        const int rc = async_req_3_1(exch, DEV_IFACE_ID(USBDIAG_DEV_IFACE), IPC_M_USBDIAG_DATA_ISOCH_OUT, cycles, size, &duration_);
 
         if (rc == EOK && duration)
@@ -152 +242 @@
 static void remote_usbdiag_burst_isoch_in(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
 static void remote_usbdiag_burst_isoch_out(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
+
+static void remote_usbdiag_data_intr_in(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
+static void remote_usbdiag_data_intr_out(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
+static void remote_usbdiag_data_bulk_in(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
+static void remote_usbdiag_data_bulk_out(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
+static void remote_usbdiag_data_isoch_in(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
+static void remote_usbdiag_data_isoch_out(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
 
 /** Remote USB diagnostic interface operations. */
@@ -160 +257 @@
         [IPC_M_USBDIAG_BURST_BULK_OUT] = remote_usbdiag_burst_bulk_out,
         [IPC_M_USBDIAG_BURST_ISOCH_IN] = remote_usbdiag_burst_isoch_in,
-        [IPC_M_USBDIAG_BURST_ISOCH_OUT] = remote_usbdiag_burst_isoch_out
+        [IPC_M_USBDIAG_BURST_ISOCH_OUT] = remote_usbdiag_burst_isoch_out,
+        [IPC_M_USBDIAG_DATA_INTR_IN] = remote_usbdiag_data_intr_in,
+        [IPC_M_USBDIAG_DATA_INTR_OUT] = remote_usbdiag_data_intr_out,
+        [IPC_M_USBDIAG_DATA_BULK_IN] = remote_usbdiag_data_bulk_in,
+        [IPC_M_USBDIAG_DATA_BULK_OUT] = remote_usbdiag_data_bulk_out,
+        [IPC_M_USBDIAG_DATA_ISOCH_IN] = remote_usbdiag_data_isoch_in,
+        [IPC_M_USBDIAG_DATA_ISOCH_OUT] = remote_usbdiag_data_isoch_out
 };
 
@@ -295 +398 @@
 }
 
+void remote_usbdiag_data_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->data_bulk_in == NULL) {
+                async_answer_0(callid, ENOTSUP);
+                return;
+        }
+
+        int cycles = DEV_IPC_GET_ARG1(*call);
+        size_t size = DEV_IPC_GET_ARG2(*call);
+        usbdiag_dur_t duration;
+        const int ret = diag_iface->data_intr_in(fun, cycles, size, &duration);
+
+        if (ret != EOK) {
+                async_answer_0(callid, ret);
+        } else {
+                async_answer_1(callid, EOK, duration);
+        }
+}
+
+void remote_usbdiag_data_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;
+
+        if (diag_iface->data_bulk_out == NULL) {
+                async_answer_0(callid, ENOTSUP);
+                return;
+        }
+
+        int cycles = DEV_IPC_GET_ARG1(*call);
+        size_t size = DEV_IPC_GET_ARG2(*call);
+        usbdiag_dur_t duration;
+        const int ret = diag_iface->data_intr_out(fun, cycles, size, &duration);
+
+        if (ret != EOK) {
+                async_answer_0(callid, ret);
+        } else {
+                async_answer_1(callid, EOK, duration);
+        }
+}
+
+void remote_usbdiag_data_bulk_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->data_bulk_in == NULL) {
+                async_answer_0(callid, ENOTSUP);
+                return;
+        }
+
+        int cycles = DEV_IPC_GET_ARG1(*call);
+        size_t size = DEV_IPC_GET_ARG2(*call);
+        usbdiag_dur_t duration;
+        const int ret = diag_iface->data_bulk_in(fun, cycles, size, &duration);
+
+        if (ret != EOK) {
+                async_answer_0(callid, ret);
+        } else {
+                async_answer_1(callid, EOK, duration);
+        }
+}
+
+void remote_usbdiag_data_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->data_bulk_out == NULL) {
+                async_answer_0(callid, ENOTSUP);
+                return;
+        }
+
+        int cycles = DEV_IPC_GET_ARG1(*call);
+        size_t size = DEV_IPC_GET_ARG2(*call);
+        usbdiag_dur_t duration;
+        const int ret = diag_iface->data_bulk_out(fun, cycles, size, &duration);
+
+        if (ret != EOK) {
+                async_answer_0(callid, ret);
+        } else {
+                async_answer_1(callid, EOK, duration);
+        }
+}
+
+void remote_usbdiag_data_isoch_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->data_isoch_in == NULL) {
+                async_answer_0(callid, ENOTSUP);
+                return;
+        }
+
+        int cycles = DEV_IPC_GET_ARG1(*call);
+        size_t size = DEV_IPC_GET_ARG2(*call);
+        usbdiag_dur_t duration;
+        const int ret = diag_iface->data_isoch_in(fun, cycles, size, &duration);
+
+        if (ret != EOK) {
+                async_answer_0(callid, ret);
+        } else {
+                async_answer_1(callid, EOK, duration);
+        }
+}
+
+void remote_usbdiag_data_isoch_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->data_isoch_out == NULL) {
+                async_answer_0(callid, ENOTSUP);
+                return;
+        }
+
+        int cycles = DEV_IPC_GET_ARG1(*call);
+        size_t size = DEV_IPC_GET_ARG2(*call);
+        usbdiag_dur_t duration;
+        const int ret = diag_iface->data_isoch_out(fun, cycles, size, &duration);
+
+        if (ret != EOK) {
+                async_answer_0(callid, ret);
+        } else {
+                async_answer_1(callid, EOK, duration);
+        }
+}
+
 /**
  * @}