Changeset b7fd2a0 in mainline for uspace/lib/usbhost/src/hcd.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/usbhost/src/hcd.c (modified) (13 diffs)

uspace/lib/usbhost/src/hcd.c

@@ -49 +49 @@
  * @return Error code.
  */
-static int register_helper(endpoint_t *ep, void *arg)
+static errno_t register_helper(endpoint_t *ep, void *arg)
 {
         hcd_t *hcd = arg;
@@ -102 +102 @@
 }
 
-int hcd_request_address(hcd_t *hcd, usb_speed_t speed, usb_address_t *address)
+errno_t hcd_request_address(hcd_t *hcd, usb_speed_t speed, usb_address_t *address)
 {
         assert(hcd);
@@ -108 +108 @@
 }
 
-int hcd_release_address(hcd_t *hcd, usb_address_t address)
+errno_t hcd_release_address(hcd_t *hcd, usb_address_t address)
 {
         assert(hcd);
@@ -115 +115 @@
 }
 
-int hcd_reserve_default_address(hcd_t *hcd, usb_speed_t speed)
+errno_t hcd_reserve_default_address(hcd_t *hcd, usb_speed_t speed)
 {
         assert(hcd);
@@ -122 +122 @@
 }
 
-int hcd_add_ep(hcd_t *hcd, usb_target_t target, usb_direction_t dir,
+errno_t hcd_add_ep(hcd_t *hcd, usb_target_t target, usb_direction_t dir,
     usb_transfer_type_t type, size_t max_packet_size, unsigned packets,
     size_t size, usb_address_t tt_address, unsigned tt_port)
@@ -132 +132 @@
 }
 
-int hcd_remove_ep(hcd_t *hcd, usb_target_t target, usb_direction_t dir)
+errno_t hcd_remove_ep(hcd_t *hcd, usb_target_t target, usb_direction_t dir)
 {
         assert(hcd);
@@ -147 +147 @@
 } toggle_t;
 
-static void toggle_reset_callback(int retval, void *arg)
+static void toggle_reset_callback(errno_t retval, void *arg)
 {
         assert(arg);
@@ -172 +172 @@
  * @return Error code.
  */
-int hcd_send_batch(
+errno_t hcd_send_batch(
     hcd_t *hcd, usb_target_t target, usb_direction_t direction,
     void *data, size_t size, uint64_t setup_data,
@@ -232 +232 @@
         }
 
-        const int ret = hcd->ops.schedule(hcd, batch);
+        const errno_t ret = hcd->ops.schedule(hcd, batch);
         if (ret != EOK)
                 usb_transfer_batch_destroy(batch);
@@ -244 +244 @@
 typedef struct {
         volatile unsigned done;
-        int ret;
+        errno_t ret;
         size_t size;
 } sync_data_t;
 
-static void transfer_in_cb(int ret, size_t size, void* data)
+static void transfer_in_cb(errno_t ret, size_t size, void* data)
 {
         sync_data_t *d = data;
@@ -257 +257 @@
 }
 
-static void transfer_out_cb(int ret, void* data)
+static void transfer_out_cb(errno_t ret, void* data)
 {
         sync_data_t *d = data;
@@ -266 +266 @@
 
 /** this is really ugly version of sync usb communication */
-int hcd_send_batch_sync(
+errno_t hcd_send_batch_sync(
     hcd_t *hcd, usb_target_t target, usb_direction_t dir,
     void *data, size_t size, uint64_t setup_data, const char* name, size_t *out_size)
@@ -273 +273 @@
         sync_data_t sd = { .done = 0, .ret = EBUSY, .size = size };
 
-        const int ret = hcd_send_batch(hcd, target, dir, data, size, setup_data,
+        const errno_t ret = hcd_send_batch(hcd, target, dir, data, size, setup_data,
             dir == USB_DIRECTION_IN ? transfer_in_cb : NULL,
             dir == USB_DIRECTION_OUT ? transfer_out_cb : NULL, &sd, name);