Changeset 298e010 in mainline

Timestamp:

2018-02-03T10:34:18Z (6 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

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

Children:

860bf94

Parents:

7cba9f7

Message:

drv: refactor usbdiag interface to errno_t

Location:

uspace/lib/drv

Files:

• generic/remote_usbdiag.c (modified) (7 diffs)
• include/usbdiag_iface.h (modified) (1 diff)

uspace/lib/drv/generic/remote_usbdiag.c

@@ -58 +58 @@
 }
 
-int usbdiag_test_in(async_exch_t *exch, const usbdiag_test_params_t *params, usbdiag_test_results_t *results)
+errno_t usbdiag_test_in(async_exch_t *exch, const usbdiag_test_params_t *params, usbdiag_test_results_t *results)
 {
         if (!exch)
@@ -66 +66 @@
         aid_t req = async_send_1(exch, DEV_IFACE_ID(USBDIAG_DEV_IFACE), IPC_M_USBDIAG_TEST_IN, &answer);
 
-        int rc = async_data_write_start(exch, params, sizeof(usbdiag_test_params_t));
+        errno_t rc = async_data_write_start(exch, params, sizeof(usbdiag_test_params_t));
         if (rc != EOK) {
                 async_exchange_end(exch);
@@ -85 +85 @@
         async_wait_for(req, &retval);
 
-        return (int) retval;
-}
-
-int usbdiag_test_out(async_exch_t *exch, const usbdiag_test_params_t *params, usbdiag_test_results_t *results)
+        return (errno_t) retval;
+}
+
+errno_t usbdiag_test_out(async_exch_t *exch, const usbdiag_test_params_t *params, usbdiag_test_results_t *results)
 {
         if (!exch)
@@ -96 +96 @@
         aid_t req = async_send_1(exch, DEV_IFACE_ID(USBDIAG_DEV_IFACE), IPC_M_USBDIAG_TEST_OUT, &answer);
 
-        int rc = async_data_write_start(exch, params, sizeof(usbdiag_test_params_t));
+        errno_t rc = async_data_write_start(exch, params, sizeof(usbdiag_test_params_t));
         if (rc != EOK) {
                 async_exchange_end(exch);
@@ -115 +115 @@
         async_wait_for(req, &retval);
 
-        return (int) retval;
+        return (errno_t) retval;
 }
 
@@ -158 +158 @@
 
         usbdiag_test_results_t results;
-        const int ret = !diag_iface->test_in ? ENOTSUP : diag_iface->test_in(fun, &params, &results);
+        const errno_t ret = !diag_iface->test_in ? ENOTSUP : diag_iface->test_in(fun, &params, &results);
 
         if (ret != EOK) {
@@ -210 +210 @@
 
         usbdiag_test_results_t results;
-        const int ret = !diag_iface->test_out ? ENOTSUP : diag_iface->test_out(fun, &params, &results);
+        const errno_t ret = !diag_iface->test_out ? ENOTSUP : diag_iface->test_out(fun, &params, &results);
 
         if (ret != EOK) {

uspace/lib/drv/include/usbdiag_iface.h

@@ -65 +65 @@
 void usbdiag_disconnect(async_sess_t*);
 
-int usbdiag_test_in(async_exch_t*, const usbdiag_test_params_t *, usbdiag_test_results_t *);
-int usbdiag_test_out(async_exch_t*, const usbdiag_test_params_t *, usbdiag_test_results_t *);
+errno_t usbdiag_test_in(async_exch_t*, const usbdiag_test_params_t *, usbdiag_test_results_t *);
+errno_t usbdiag_test_out(async_exch_t*, const usbdiag_test_params_t *, usbdiag_test_results_t *);
 
 /** USB diagnostic device communication interface. */
 typedef struct {
-        int (*test_in)(ddf_fun_t*, const usbdiag_test_params_t *, usbdiag_test_results_t *);
-        int (*test_out)(ddf_fun_t*, const usbdiag_test_params_t *, usbdiag_test_results_t *);
+        errno_t (*test_in)(ddf_fun_t*, const usbdiag_test_params_t *, usbdiag_test_results_t *);
+        errno_t (*test_out)(ddf_fun_t*, const usbdiag_test_params_t *, usbdiag_test_results_t *);
 } usbdiag_iface_t;