Changeset b7fd2a0 in mainline for uspace/drv/bus/usb/ehci/hc.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/drv/bus/usb/ehci/hc.c (modified) (8 diffs)

uspace/drv/bus/usb/ehci/hc.c

@@ -90 +90 @@
 
 static void hc_start(hc_t *instance);
-static int hc_init_memory(hc_t *instance);
+static errno_t hc_init_memory(hc_t *instance);
 
 /** Generate IRQ code.
@@ -100 +100 @@
  * @return Error code.
  */
-int ehci_hc_gen_irq_code(irq_code_t *code, const hw_res_list_parsed_t *hw_res, int *irq)
+errno_t ehci_hc_gen_irq_code(irq_code_t *code, const hw_res_list_parsed_t *hw_res, int *irq)
 {
         assert(code);
@@ -132 +132 @@
         ehci_caps_regs_t *caps = NULL;
 
-        int ret = pio_enable_range(&regs, (void**)&caps);
+        errno_t ret = pio_enable_range(&regs, (void**)&caps);
         if (ret != EOK) {
                 free(code->ranges);
@@ -159 +159 @@
  * @return Error code
  */
-int hc_init(hc_t *instance, const hw_res_list_parsed_t *hw_res, bool interrupts)
+errno_t hc_init(hc_t *instance, const hw_res_list_parsed_t *hw_res, bool interrupts)
 {
         assert(instance);
@@ -168 +168 @@
             return EINVAL;
 
-        int ret = pio_enable_range(&hw_res->mem_ranges.ranges[0],
+        errno_t ret = pio_enable_range(&hw_res->mem_ranges.ranges[0],
             (void **)&instance->caps);
         if (ret != EOK) {
@@ -273 +273 @@
 }
 
-int ehci_hc_status(hcd_t *hcd, uint32_t *status)
+errno_t ehci_hc_status(hcd_t *hcd, uint32_t *status)
 {
         assert(hcd);
@@ -294 +294 @@
  * @return Error code.
  */
-int ehci_hc_schedule(hcd_t *hcd, usb_transfer_batch_t *batch)
+errno_t ehci_hc_schedule(hcd_t *hcd, usb_transfer_batch_t *batch)
 {
         assert(hcd);
@@ -445 +445 @@
  * @return Error code.
  */
-int hc_init_memory(hc_t *instance)
+errno_t hc_init_memory(hc_t *instance)
 {
         assert(instance);
         usb_log_debug2("HC(%p): Initializing Async list(%p).", instance,
             &instance->async_list);
-        int ret = endpoint_list_init(&instance->async_list, "ASYNC");
+        errno_t ret = endpoint_list_init(&instance->async_list, "ASYNC");
         if (ret != EOK) {
                 usb_log_error("HC(%p): Failed to setup ASYNC list: %s",