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

Timestamp:

2018-01-13T03:10:29Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

a53ed3a

Parents:

36f0738

Message:

Use errno_t in all uspace and kernel code.

Change type of every variable, parameter and return value that holds an
<errno.h> constant to either errno_t (the usual case), or sys_errno_t
(some places in kernel). This is for the purpose of self-documentation,
as well as for type-checking with a bit of type definition hackery.

Although this is a massive commit, it is a simple text replacement, and thus
is very easy to verify. Simply do the following:

`
git checkout <this commit's hash>
git reset HEAD
<sup>git add .
tools/srepl '\berrno_t\b' int
git add .
tools/srepl '\bsys_errno_t\b' sysarg_t
git reset
git diff
`</sup>

While this doesn't ensure that the replacements are correct, it does ensure
that the commit doesn't do anything except those replacements. Since errno_t
is typedef'd to int in the usual case (and sys_errno_t to sysarg_t), even if
incorrect, this commit cannot change behavior.

File:

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

uspace/lib/drv/generic/remote_usbhc.c

@@ -96 +96 @@
 } usbhc_iface_funcs_t;
 
-int usbhc_read(async_exch_t *exch, usb_address_t address,
+errno_t usbhc_read(async_exch_t *exch, usb_address_t address,
     usb_endpoint_t endpoint, uint64_t setup, void *data, size_t size,
     size_t *rec_size)
@@ -131 +131 @@
 
         /* Wait for the answer. */
-        int data_request_rc;
-        int opening_request_rc;
+        errno_t data_request_rc;
+        errno_t opening_request_rc;
         async_wait_for(data_request, &data_request_rc);
         async_wait_for(opening_request, &opening_request_rc);
@@ -139 +139 @@
                 /* Prefer the return code of the opening request. */
                 if (opening_request_rc != EOK) {
-                        return (int) opening_request_rc;
+                        return (errno_t) opening_request_rc;
                 } else {
-                        return (int) data_request_rc;
+                        return (errno_t) data_request_rc;
                 }
         }
         if (opening_request_rc != EOK) {
-                return (int) opening_request_rc;
+                return (errno_t) opening_request_rc;
         }
 
@@ -152 +152 @@
 }
 
-int usbhc_write(async_exch_t *exch, usb_address_t address,
+errno_t usbhc_write(async_exch_t *exch, usb_address_t address,
     usb_endpoint_t endpoint, uint64_t setup, const void *data, size_t size)
 {
@@ -174 +174 @@
         /* Send the data if any. */
         if (size > 0) {
-                const int ret = async_data_write_start(exch, data, size);
+                const errno_t ret = async_data_write_start(exch, data, size);
                 if (ret != EOK) {
                         async_forget(opening_request);
@@ -182 +182 @@
 
         /* 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;
 }
 
@@ -235 +235 @@
 }
 
-static void callback_out(int outcome, void *arg)
+static void callback_out(errno_t outcome, void *arg)
 {
         async_transaction_t *trans = arg;
@@ -244 +244 @@
 }
 
-static void callback_in(int outcome, size_t actual_size, void *arg)
+static void callback_in(errno_t outcome, size_t actual_size, void *arg)
 {
         async_transaction_t *trans = (async_transaction_t *)arg;
@@ -306 +306 @@
         }
 
-        const int rc = hc_iface->read(
+        const errno_t rc = hc_iface->read(
             fun, target, setup, trans->buffer, size, callback_in, trans);
 
@@ -344 +344 @@
         size_t size = 0;
         if (data_buffer_len > 0) {
-                const int rc = async_data_write_accept(&trans->buffer, false,
+                const errno_t rc = async_data_write_accept(&trans->buffer, false,
                     1, USB_MAX_PAYLOAD_SIZE,
                     0, &size);
@@ -355 +355 @@
         }
 
-        const int rc = hc_iface->write(
+        const errno_t rc = hc_iface->write(
             fun, target, setup, trans->buffer, size, callback_out, trans);