Changeset 5c69377 in mainline

Timestamp:

2018-02-03T10:56:48Z (7 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

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

Children:

cc63815

Parents:

98b1d30

Message:

drv: refactor other usb interfaces to errno_t

Location:

uspace/lib/drv

Files:

• generic/remote_usbhc.c (modified) (13 diffs)
• include/usbhc_iface.h (modified) (1 diff)

uspace/lib/drv/generic/remote_usbhc.c

@@ -59 +59 @@
  * @return Error code.
  */
-int usbhc_reserve_default_address(async_exch_t *exch)
+errno_t usbhc_reserve_default_address(async_exch_t *exch)
 {
         if (!exch)
@@ -72 +72 @@
  * @return Error code.
  */
-int usbhc_release_default_address(async_exch_t *exch)
+errno_t usbhc_release_default_address(async_exch_t *exch)
 {
         if (!exch)
@@ -88 +88 @@
  * @return Error code.
  */
-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),
+errno_t usbhc_device_enumerate(async_exch_t *exch, unsigned port, usb_speed_t speed)
+{
+        if (!exch)
+                return EBADMEM;
+        const errno_t ret = async_req_3_0(exch, DEV_IFACE_ID(USBHC_DEV_IFACE),
             IPC_M_USB_DEVICE_ENUMERATE, port, speed);
         return ret;
@@ -129 +129 @@
         }
 
-        int ret = async_data_write_start(exch, desc, sizeof(*desc));
+        errno_t ret = async_data_write_start(exch, desc, sizeof(*desc));
         if (ret != EOK) {
                 async_forget(opening_request);
@@ -136 +136 @@
 
         /* Wait for the answer. */
-        int opening_request_rc;
+        errno_t opening_request_rc;
         async_wait_for(opening_request, &opening_request_rc);
 
         if (opening_request_rc)
-                return (int) opening_request_rc;
+                return (errno_t) opening_request_rc;
 
         usb_pipe_desc_t dest;
@@ -166 +166 @@
         }
 
-        const int ret = async_data_write_start(exch, pipe_desc, sizeof(*pipe_desc));
+        const errno_t ret = async_data_write_start(exch, pipe_desc, sizeof(*pipe_desc));
         if (ret != EOK) {
                 async_forget(opening_request);
@@ -173 +173 @@
 
         /* Wait for the answer. */
-        int opening_request_rc;
+        errno_t opening_request_rc;
         async_wait_for(opening_request, &opening_request_rc);
 
-        return (int) opening_request_rc;
+        return (errno_t) opening_request_rc;
 }
 
@@ -313 +313 @@
 
         const bool reserve = IPC_GET_ARG2(*call);
-        const int ret = usbhc_iface->default_address_reservation(fun, reserve);
+        const errno_t ret = usbhc_iface->default_address_reservation(fun, reserve);
         async_answer_0(callid, ret);
 }
@@ -330 +330 @@
         const unsigned port = DEV_IPC_GET_ARG1(*call);
         usb_speed_t speed = DEV_IPC_GET_ARG2(*call);
-        const int ret = usbhc_iface->device_enumerate(fun, port, speed);
+        const errno_t ret = usbhc_iface->device_enumerate(fun, port, speed);
         async_answer_0(callid, ret);
 }
@@ -345 +345 @@
 
         const unsigned port = DEV_IPC_GET_ARG1(*call);
-        const int ret = usbhc_iface->device_remove(fun, port);
+        const errno_t ret = usbhc_iface->device_remove(fun, port);
         async_answer_0(callid, ret);
 }
@@ -376 +376 @@
         usb_pipe_desc_t pipe_desc;
 
-        const int rc = usbhc_iface->register_endpoint(fun, &pipe_desc, &ep_desc);
+        const errno_t rc = usbhc_iface->register_endpoint(fun, &pipe_desc, &ep_desc);
         async_answer_0(callid, rc);
 
@@ -411 +411 @@
         async_data_write_finalize(data_callid, &pipe_desc, sizeof(pipe_desc));
 
-        const int rc = usbhc_iface->unregister_endpoint(fun, &pipe_desc);
+        const errno_t rc = usbhc_iface->unregister_endpoint(fun, &pipe_desc);
         async_answer_0(callid, rc);
 }
@@ -440 +440 @@
 }
 
-static errno_t transfer_finished(void *arg, int error, size_t transferred_size)
+static errno_t transfer_finished(void *arg, errno_t error, size_t transferred_size)
 {
         async_transaction_t *trans = arg;

uspace/lib/drv/include/usbhc_iface.h

@@ -160 +160 @@
 /** USB device communication interface. */
 typedef struct {
-        int (*default_address_reservation)(ddf_fun_t *, bool);
+        errno_t (*default_address_reservation)(ddf_fun_t *, bool);
 
-        int (*device_enumerate)(ddf_fun_t *, unsigned, usb_speed_t);
-        int (*device_remove)(ddf_fun_t *, unsigned);
+        errno_t (*device_enumerate)(ddf_fun_t *, unsigned, usb_speed_t);
+        errno_t (*device_remove)(ddf_fun_t *, unsigned);
 
-        int (*register_endpoint)(ddf_fun_t *, usb_pipe_desc_t *, const usb_endpoint_descriptors_t *);
-        int (*unregister_endpoint)(ddf_fun_t *, const usb_pipe_desc_t *);
+        errno_t (*register_endpoint)(ddf_fun_t *, usb_pipe_desc_t *, const usb_endpoint_descriptors_t *);
+        errno_t (*unregister_endpoint)(ddf_fun_t *, const usb_pipe_desc_t *);
 
         errno_t (*transfer)(ddf_fun_t *, usb_target_t,