Changeset b7fd2a0 in mainline for uspace/drv/bus/usb

Timestamp:

2018-01-13T03:10:29Z (8 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.

Location:

uspace/drv/bus/usb

Files:

• ehci/ehci_endpoint.c (modified) (1 diff)
• ehci/ehci_endpoint.h (modified) (1 diff)
• ehci/ehci_rh.c (modified) (12 diffs)
• ehci/ehci_rh.h (modified) (1 diff)
• ehci/endpoint_list.c (modified) (1 diff)
• ehci/endpoint_list.h (modified) (1 diff)
• ehci/hc.c (modified) (8 diffs)
• ehci/hc.h (modified) (2 diffs)
• ehci/hw_struct/transfer_descriptor.c (modified) (1 diff)
• ehci/hw_struct/transfer_descriptor.h (modified) (1 diff)
• ehci/main.c (modified) (4 diffs)
• ehci/res.c (modified) (4 diffs)
• ehci/res.h (modified) (1 diff)
• ohci/endpoint_list.c (modified) (1 diff)
• ohci/endpoint_list.h (modified) (1 diff)
• ohci/hc.c (modified) (10 diffs)
• ohci/hc.h (modified) (2 diffs)
• ohci/hw_struct/completion_codes.h (modified) (1 diff)
• ohci/hw_struct/transfer_descriptor.h (modified) (1 diff)
• ohci/main.c (modified) (4 diffs)
• ohci/ohci_endpoint.c (modified) (1 diff)
• ohci/ohci_endpoint.h (modified) (1 diff)
• ohci/ohci_rh.c (modified) (9 diffs)
• ohci/ohci_rh.h (modified) (1 diff)
• uhci/hc.c (modified) (10 diffs)
• uhci/hc.h (modified) (1 diff)
• uhci/hw_struct/transfer_descriptor.c (modified) (1 diff)
• uhci/hw_struct/transfer_descriptor.h (modified) (1 diff)
• uhci/main.c (modified) (5 diffs)
• uhci/transfer_list.c (modified) (1 diff)
• uhci/transfer_list.h (modified) (1 diff)
• uhci/uhci_rh.c (modified) (7 diffs)
• uhci/uhci_rh.h (modified) (1 diff)
• usbflbk/main.c (modified) (2 diffs)
• usbhub/port.c (modified) (20 diffs)
• usbhub/port.h (modified) (1 diff)
• usbhub/usbhub.c (modified) (16 diffs)
• usbhub/usbhub.h (modified) (1 diff)
• usbmid/explore.c (modified) (4 diffs)
• usbmid/main.c (modified) (7 diffs)
• usbmid/usbmid.c (modified) (5 diffs)
• usbmid/usbmid.h (modified) (1 diff)
• vhc/conndev.c (modified) (2 diffs)
• vhc/devconn.c (modified) (2 diffs)
• vhc/hub/hub.c (modified) (3 diffs)
• vhc/hub/hub.h (modified) (1 diff)
• vhc/hub/virthub.c (modified) (2 diffs)
• vhc/hub/virthub.h (modified) (1 diff)
• vhc/hub/virthubops.c (modified) (9 diffs)
• vhc/main.c (modified) (3 diffs)
• vhc/transfer.c (modified) (7 diffs)
• vhc/vhcd.h (modified) (1 diff)

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

@@ -77 +77 @@
  * @return Error code.
  */
-int ehci_endpoint_init(hcd_t *hcd, endpoint_t *ep)
+errno_t ehci_endpoint_init(hcd_t *hcd, endpoint_t *ep)
 {
         assert(ep);

uspace/drv/bus/usb/ehci/ehci_endpoint.h

@@ -51 +51 @@
 } ehci_endpoint_t;
 
-int ehci_endpoint_init(hcd_t *hcd, endpoint_t *ep);
+errno_t ehci_endpoint_init(hcd_t *hcd, endpoint_t *ep);
 void ehci_endpoint_fini(hcd_t *hcd, endpoint_t *ep);
 

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

@@ -99 +99 @@
  * initializes internal virtual hub.
  */
-int ehci_rh_init(ehci_rh_t *instance, ehci_caps_regs_t *caps, ehci_regs_t *regs,
+errno_t ehci_rh_init(ehci_rh_t *instance, ehci_caps_regs_t *caps, ehci_regs_t *regs,
     const char *name)
 {
@@ -140 +140 @@
  * status change requests might be postponed until there is something to report.
  */
-int ehci_rh_schedule(ehci_rh_t *instance, usb_transfer_batch_t *batch)
+errno_t ehci_rh_schedule(ehci_rh_t *instance, usb_transfer_batch_t *batch)
 {
         assert(instance);
@@ -175 +175 @@
  * processing of a postponed request.
  */
-int ehci_rh_interrupt(ehci_rh_t *instance)
+errno_t ehci_rh_interrupt(ehci_rh_t *instance)
 {
         //TODO atomic swap needed
@@ -217 +217 @@
  * @return Error code.
  */
-static int req_get_status(usbvirt_device_t *device,
+static errno_t req_get_status(usbvirt_device_t *device,
     const usb_device_request_setup_packet_t *setup_packet,
     uint8_t *data, size_t *act_size)
@@ -240 +240 @@
  * @return Error code.
  */
-static int req_clear_hub_feature(usbvirt_device_t *device,
+static errno_t req_clear_hub_feature(usbvirt_device_t *device,
     const usb_device_request_setup_packet_t *setup_packet,
     uint8_t *data, size_t *act_size)
@@ -268 +268 @@
  * @return Error code.
  */
-static int req_get_port_status(usbvirt_device_t *device,
+static errno_t req_get_port_status(usbvirt_device_t *device,
     const usb_device_request_setup_packet_t *setup_packet,
     uint8_t *data, size_t *act_size)
@@ -311 +311 @@
 } ehci_rh_job_t;
 
-static int stop_reset(void *arg)
+static errno_t stop_reset(void *arg)
 {
         ehci_rh_job_t *job = arg;
@@ -340 +340 @@
 }
 
-static int stop_resume(void *arg)
+static errno_t stop_resume(void *arg)
 {
         ehci_rh_job_t *job = arg;
@@ -353 +353 @@
 }
 
-static int delayed_job(int (*func)(void*), ehci_rh_t *rh, unsigned port)
+static errno_t delayed_job(errno_t (*func)(void*), ehci_rh_t *rh, unsigned port)
 {
         ehci_rh_job_t *job = malloc(sizeof(*job));
@@ -379 +379 @@
  * @return Error code.
  */
-static int req_clear_port_feature(usbvirt_device_t *device,
+static errno_t req_clear_port_feature(usbvirt_device_t *device,
     const usb_device_request_setup_packet_t *setup_packet,
     uint8_t *data, size_t *act_size)
@@ -458 +458 @@
  * @return Error code.
  */
-static int req_set_port_feature(usbvirt_device_t *device,
+static errno_t req_set_port_feature(usbvirt_device_t *device,
     const usb_device_request_setup_packet_t *setup_packet,
     uint8_t *data, size_t *act_size)
@@ -507 +507 @@
  * only need 1 byte.
  */
-static int req_status_change_handler(usbvirt_device_t *device,
+static errno_t req_status_change_handler(usbvirt_device_t *device,
     usb_endpoint_t endpoint, usb_transfer_type_t tr_type,
     void *buffer, size_t buffer_size, size_t *actual_size)

uspace/drv/bus/usb/ehci/ehci_rh.h

@@ -67 +67 @@
 } ehci_rh_t;
 
-int ehci_rh_init(ehci_rh_t *instance, ehci_caps_regs_t *caps, ehci_regs_t *regs,
+errno_t ehci_rh_init(ehci_rh_t *instance, ehci_caps_regs_t *caps, ehci_regs_t *regs,
     const char *name);
-int ehci_rh_schedule(ehci_rh_t *instance, usb_transfer_batch_t *batch);
-int ehci_rh_interrupt(ehci_rh_t *instance);
+errno_t ehci_rh_schedule(ehci_rh_t *instance, usb_transfer_batch_t *batch);
+errno_t ehci_rh_interrupt(ehci_rh_t *instance);
 
 /** Get EHCI rh address.

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

@@ -50 +50 @@
  * Allocates memory for internal ed_t structure.
  */
-int endpoint_list_init(endpoint_list_t *instance, const char *name)
+errno_t endpoint_list_init(endpoint_list_t *instance, const char *name)
 {
         assert(instance);

uspace/drv/bus/usb/ehci/endpoint_list.h

@@ -68 +68 @@
 }
 
-int endpoint_list_init(endpoint_list_t *instance, const char *name);
+errno_t endpoint_list_init(endpoint_list_t *instance, const char *name);
 void endpoint_list_chain(endpoint_list_t *instance, const endpoint_list_t *next);
 void endpoint_list_append_ep(endpoint_list_t *instance, ehci_endpoint_t *ep);

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",

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

@@ -82 +82 @@
 } hc_t;
 
-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);
 void hc_fini(hc_t *instance);
 
@@ -88 +88 @@
 void hc_dequeue_endpoint(hc_t *instance, const endpoint_t *ep);
 
-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);
 
 void ehci_hc_interrupt(hcd_t *hcd, uint32_t status);
-int ehci_hc_status(hcd_t *hcd, uint32_t *status);
-int ehci_hc_schedule(hcd_t *hcd, usb_transfer_batch_t *batch);
+errno_t ehci_hc_status(hcd_t *hcd, uint32_t *status);
+errno_t ehci_hc_schedule(hcd_t *hcd, usb_transfer_batch_t *batch);
 #endif
 /**

uspace/drv/bus/usb/ehci/hw_struct/transfer_descriptor.c

@@ -45 +45 @@
 
 
-int td_error(const td_t *td)
+errno_t td_error(const td_t *td)
 {
         assert(td);

uspace/drv/bus/usb/ehci/hw_struct/transfer_descriptor.h

@@ -90 +90 @@
 }
 
-int td_error(const td_t *td);
+errno_t td_error(const td_t *td);
 
 void td_init(td_t *td, const td_t *next, usb_direction_t dir, const void * buf,

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

@@ -52 +52 @@
 #define NAME "ehci"
 
-static int ehci_driver_init(hcd_t *, const hw_res_list_parsed_t *, bool);
+static errno_t ehci_driver_init(hcd_t *, const hw_res_list_parsed_t *, bool);
 static void ehci_driver_fini(hcd_t *);
 
@@ -72 +72 @@
 
 
-static int ehci_driver_init(hcd_t *hcd, const hw_res_list_parsed_t *res,
+static errno_t ehci_driver_init(hcd_t *hcd, const hw_res_list_parsed_t *res,
     bool irq)
 {
@@ -82 +82 @@
                 return ENOMEM;
 
-        const int ret = hc_init(instance, res, irq);
+        const errno_t ret = hc_init(instance, res, irq);
         if (ret == EOK) {
                 hcd_set_implementation(hcd, instance, &ehci_hc_driver.ops);
@@ -107 +107 @@
  * @return Error code.
  */
-static int ehci_dev_add(ddf_dev_t *device)
+static errno_t ehci_dev_add(ddf_dev_t *device)
 {
         usb_log_debug("ehci_dev_add() called\n");

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

@@ -62 +62 @@
  * @return Error code.
  */
-static int disable_extended_caps(async_sess_t *parent_sess, unsigned eecp)
+static errno_t disable_extended_caps(async_sess_t *parent_sess, unsigned eecp)
 {
         /* nothing to do */
@@ -70 +70 @@
         /* Read the first EEC. i.e. Legacy Support register */
         uint32_t usblegsup;
-        int ret = pci_config_space_read_32(parent_sess,
+        errno_t ret = pci_config_space_read_32(parent_sess,
             eecp + USBLEGSUP_OFFSET, &usblegsup);
         if (ret != EOK) {
@@ -172 +172 @@
 }
 
-int disable_legacy(ddf_dev_t *device)
+errno_t disable_legacy(ddf_dev_t *device)
 {
         assert(device);
@@ -184 +184 @@
         hw_res_list_parsed_t res;
         hw_res_list_parsed_init(&res);
-        int ret = hw_res_get_list_parsed(parent_sess, &res, 0);
+        errno_t ret = hw_res_get_list_parsed(parent_sess, &res, 0);
         if (ret != EOK) {
                 usb_log_error("Failed to get resource list: %s\n",

uspace/drv/bus/usb/ehci/res.h

@@ -39 +39 @@
 #include <device/hw_res_parsed.h>
 
-extern int disable_legacy(ddf_dev_t *);
+extern errno_t disable_legacy(ddf_dev_t *);
 
 #endif

uspace/drv/bus/usb/ohci/endpoint_list.c

@@ -51 +51 @@
  * Allocates memory for internal ed_t structure.
  */
-int endpoint_list_init(endpoint_list_t *instance, const char *name)
+errno_t endpoint_list_init(endpoint_list_t *instance, const char *name)
 {
         assert(instance);

uspace/drv/bus/usb/ohci/endpoint_list.h

@@ -71 +71 @@
 }
 
-int endpoint_list_init(endpoint_list_t *instance, const char *name);
+errno_t endpoint_list_init(endpoint_list_t *instance, const char *name);
 void endpoint_list_set_next(
     const endpoint_list_t *instance, const endpoint_list_t *next);

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

@@ -91 +91 @@
 static void hc_gain_control(hc_t *instance);
 static void hc_start(hc_t *instance);
-static int hc_init_transfer_lists(hc_t *instance);
-static int hc_init_memory(hc_t *instance);
+static errno_t hc_init_transfer_lists(hc_t *instance);
+static errno_t hc_init_memory(hc_t *instance);
 
 /** Generate IRQ code.
@@ -103 +103 @@
  * @return Error code.
  */
-int ohci_hc_gen_irq_code(irq_code_t *code, const hw_res_list_parsed_t *hw_res, int *irq)
+errno_t ohci_hc_gen_irq_code(irq_code_t *code, const hw_res_list_parsed_t *hw_res, int *irq)
 {
         assert(code);
@@ -152 +152 @@
  * @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);
@@ -160 +160 @@
             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->registers);
         if (ret != EOK) {
@@ -269 +269 @@
 }
 
-int ohci_hc_status(hcd_t *hcd, uint32_t *status)
+errno_t ohci_hc_status(hcd_t *hcd, uint32_t *status)
 {
         assert(hcd);
@@ -289 +289 @@
  * @return Error code.
  */
-int ohci_hc_schedule(hcd_t *hcd, usb_transfer_batch_t *batch)
+errno_t ohci_hc_schedule(hcd_t *hcd, usb_transfer_batch_t *batch)
 {
         assert(hcd);
@@ -518 +518 @@
  * @return Error code
  */
-int hc_init_transfer_lists(hc_t *instance)
+errno_t hc_init_transfer_lists(hc_t *instance)
 {
         assert(instance);
@@ -524 +524 @@
 do { \
         const char *name = usb_str_transfer_type(type); \
-        const int ret = endpoint_list_init(&instance->lists[type], name); \
+        const errno_t ret = endpoint_list_init(&instance->lists[type], name); \
         if (ret != EOK) { \
                 usb_log_error("Failed to setup %s endpoint list: %s.\n", \
@@ -552 +552 @@
  * @return Error code.
  */
-int hc_init_memory(hc_t *instance)
+errno_t hc_init_memory(hc_t *instance)
 {
         assert(instance);
@@ -558 +558 @@
         memset(&instance->rh, 0, sizeof(instance->rh));
         /* Init queues */
-        const int ret = hc_init_transfer_lists(instance);
+        const errno_t ret = hc_init_transfer_lists(instance);
         if (ret != EOK) {
                 return ret;

uspace/drv/bus/usb/ohci/hc.h

@@ -80 +80 @@
 } hc_t;
 
-extern int hc_init(hc_t *, const hw_res_list_parsed_t *, bool);
+extern errno_t hc_init(hc_t *, const hw_res_list_parsed_t *, bool);
 extern void hc_fini(hc_t *);
 
@@ -86 +86 @@
 extern void hc_dequeue_endpoint(hc_t *, const endpoint_t *);
 
-int ohci_hc_gen_irq_code(irq_code_t *code, const hw_res_list_parsed_t *hw_res, int *irq);
+errno_t ohci_hc_gen_irq_code(irq_code_t *code, const hw_res_list_parsed_t *hw_res, int *irq);
 
 extern void ohci_hc_interrupt(hcd_t *, uint32_t);
-extern int ohci_hc_status(hcd_t *, uint32_t *);
-extern int ohci_hc_schedule(hcd_t *, usb_transfer_batch_t *);
+extern errno_t ohci_hc_status(hcd_t *, uint32_t *);
+extern errno_t ohci_hc_schedule(hcd_t *, usb_transfer_batch_t *);
 
 #endif

uspace/drv/bus/usb/ohci/hw_struct/completion_codes.h

@@ -54 +54 @@
 };
 
-inline static int cc_to_rc(unsigned int cc)
+inline static errno_t cc_to_rc(unsigned int cc)
 {
         switch (cc) {

uspace/drv/bus/usb/ohci/hw_struct/transfer_descriptor.h

@@ -119 +119 @@
  * @return Error code.
  */
-static inline int td_error(const td_t *instance)
+static inline errno_t td_error(const td_t *instance)
 {
         assert(instance);

uspace/drv/bus/usb/ohci/main.c

@@ -47 +47 @@
 
 #define NAME "ohci"
-static int ohci_driver_init(hcd_t *, const hw_res_list_parsed_t *, bool);
+static errno_t ohci_driver_init(hcd_t *, const hw_res_list_parsed_t *, bool);
 static void ohci_driver_fini(hcd_t *);
 
@@ -66 +66 @@
 
 
-static int ohci_driver_init(hcd_t *hcd, const hw_res_list_parsed_t *res, bool irq)
+static errno_t ohci_driver_init(hcd_t *hcd, const hw_res_list_parsed_t *res, bool irq)
 {
         assert(hcd);
@@ -75 +75 @@
                 return ENOMEM;
 
-        const int ret = hc_init(instance, res, irq);
+        const errno_t ret = hc_init(instance, res, irq);
         if (ret == EOK) {
                 hcd_set_implementation(hcd, instance, &ohci_hc_driver.ops);
@@ -100 +100 @@
  * @return Error code.
  */
-static int ohci_dev_add(ddf_dev_t *device)
+static errno_t ohci_dev_add(ddf_dev_t *device)
 {
         usb_log_debug("ohci_dev_add() called\n");

uspace/drv/bus/usb/ohci/ohci_endpoint.c

@@ -72 +72 @@
  * @return Error code.
  */
-int ohci_endpoint_init(hcd_t *hcd, endpoint_t *ep)
+errno_t ohci_endpoint_init(hcd_t *hcd, endpoint_t *ep)
 {
         assert(ep);

uspace/drv/bus/usb/ohci/ohci_endpoint.h

@@ -53 +53 @@
 } ohci_endpoint_t;
 
-int ohci_endpoint_init(hcd_t *hcd, endpoint_t *ep);
+errno_t ohci_endpoint_init(hcd_t *hcd, endpoint_t *ep);
 void ohci_endpoint_fini(hcd_t *hcd, endpoint_t *ep);
 

uspace/drv/bus/usb/ohci/ohci_rh.c

@@ -109 +109 @@
  * initializes internal virtual hub.
  */
-int ohci_rh_init(ohci_rh_t *instance, ohci_regs_t *regs, const char *name)
+errno_t ohci_rh_init(ohci_rh_t *instance, ohci_regs_t *regs, const char *name)
 {
         assert(instance);
@@ -174 +174 @@
  * status change requests might be postponed until there is something to report.
  */
-int ohci_rh_schedule(ohci_rh_t *instance, usb_transfer_batch_t *batch)
+errno_t ohci_rh_schedule(ohci_rh_t *instance, usb_transfer_batch_t *batch)
 {
         assert(instance);
@@ -205 +205 @@
  * processing of a postponed request.
  */
-int ohci_rh_interrupt(ohci_rh_t *instance)
+errno_t ohci_rh_interrupt(ohci_rh_t *instance)
 {
         //TODO atomic swap needed
@@ -245 +245 @@
  * @return Error code.
  */
-static int req_get_status(usbvirt_device_t *device,
+static errno_t req_get_status(usbvirt_device_t *device,
     const usb_device_request_setup_packet_t *setup_packet,
     uint8_t *data, size_t *act_size)
@@ -268 +268 @@
  * @return Error code.
  */
-static int req_clear_hub_feature(usbvirt_device_t *device,
+static errno_t req_clear_hub_feature(usbvirt_device_t *device,
     const usb_device_request_setup_packet_t *setup_packet,
     uint8_t *data, size_t *act_size)
@@ -298 +298 @@
  * @return Error code.
  */
-static int req_get_port_status(usbvirt_device_t *device,
+static errno_t req_get_port_status(usbvirt_device_t *device,
     const usb_device_request_setup_packet_t *setup_packet,
     uint8_t *data, size_t *act_size)
@@ -322 +322 @@
  * @return Error code.
  */
-static int req_clear_port_feature(usbvirt_device_t *device,
+static errno_t req_clear_port_feature(usbvirt_device_t *device,
     const usb_device_request_setup_packet_t *setup_packet,
     uint8_t *data, size_t *act_size)
@@ -386 +386 @@
  * @return Error code.
  */
-static int req_set_port_feature(usbvirt_device_t *device,
+static errno_t req_set_port_feature(usbvirt_device_t *device,
     const usb_device_request_setup_packet_t *setup_packet,
     uint8_t *data, size_t *act_size)
@@ -437 +437 @@
  * only need 1 byte.
  */
-static int req_status_change_handler(usbvirt_device_t *device,
+static errno_t req_status_change_handler(usbvirt_device_t *device,
     usb_endpoint_t endpoint, usb_transfer_type_t tr_type,
     void *buffer, size_t buffer_size, size_t *actual_size)

uspace/drv/bus/usb/ohci/ohci_rh.h

@@ -65 +65 @@
 } ohci_rh_t;
 
-int ohci_rh_init(ohci_rh_t *instance, ohci_regs_t *regs, const char *name);
-int ohci_rh_schedule(ohci_rh_t *instance, usb_transfer_batch_t *batch);
-int ohci_rh_interrupt(ohci_rh_t *instance);
+errno_t ohci_rh_init(ohci_rh_t *instance, ohci_regs_t *regs, const char *name);
+errno_t ohci_rh_schedule(ohci_rh_t *instance, usb_transfer_batch_t *batch);
+errno_t ohci_rh_interrupt(ohci_rh_t *instance);
 
 /** Get OHCI rh address.

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

@@ -94 +94 @@
 
 static void hc_init_hw(const hc_t *instance);
-static int hc_init_mem_structures(hc_t *instance);
-static int hc_init_transfer_lists(hc_t *instance);
-
-static int hc_debug_checker(void *arg);
+static errno_t hc_init_mem_structures(hc_t *instance);
+static errno_t hc_init_transfer_lists(hc_t *instance);
+
+static errno_t hc_debug_checker(void *arg);
 
 
@@ -107 +107 @@
  * @return Error code.
  */
-int uhci_hc_gen_irq_code(irq_code_t *code, const hw_res_list_parsed_t *hw_res, int *irq)
+errno_t uhci_hc_gen_irq_code(irq_code_t *code, const hw_res_list_parsed_t *hw_res, int *irq)
 {
         assert(code);
@@ -216 +216 @@
  * interrupt fibrils.
  */
-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);
@@ -228 +228 @@
 
         /* allow access to hc control registers */
-        int ret = pio_enable_range(&hw_res->io_ranges.ranges[0],
+        errno_t ret = pio_enable_range(&hw_res->io_ranges.ranges[0],
             (void **) &instance->registers);
         if (ret != EOK) {
@@ -318 +318 @@
  *  - frame list page (needs to be one UHCI hw accessible 4K page)
  */
-int hc_init_mem_structures(hc_t *instance)
+errno_t hc_init_mem_structures(hc_t *instance)
 {
         assert(instance);
@@ -330 +330 @@
 
         /* Init transfer lists */
-        int ret = hc_init_transfer_lists(instance);
+        errno_t ret = hc_init_transfer_lists(instance);
         if (ret != EOK) {
                 usb_log_error("Failed to initialize transfer lists.\n");
@@ -359 +359 @@
  * USB scheduling. Sets pointer table for quick access.
  */
-int hc_init_transfer_lists(hc_t *instance)
+errno_t hc_init_transfer_lists(hc_t *instance)
 {
         assert(instance);
 #define SETUP_TRANSFER_LIST(type, name) \
 do { \
-        int ret = transfer_list_init(&instance->transfers_##type, name); \
+        errno_t ret = transfer_list_init(&instance->transfers_##type, name); \
         if (ret != EOK) { \
                 usb_log_error("Failed to setup %s transfer list: %s.\n", \
@@ -411 +411 @@
 }
 
-int uhci_hc_status(hcd_t *hcd, uint32_t *status)
+errno_t uhci_hc_status(hcd_t *hcd, uint32_t *status)
 {
         assert(hcd);
@@ -435 +435 @@
  * Checks for bandwidth availability and appends the batch to the proper queue.
  */
-int uhci_hc_schedule(hcd_t *hcd, usb_transfer_batch_t *batch)
+errno_t uhci_hc_schedule(hcd_t *hcd, usb_transfer_batch_t *batch)
 {
         assert(hcd);
@@ -464 +464 @@
  * @return EOK (should never return)
  */
-int hc_debug_checker(void *arg)
+errno_t hc_debug_checker(void *arg)
 {
         hc_t *instance = arg;

uspace/drv/bus/usb/uhci/hc.h

@@ -124 +124 @@
 } hc_t;
 
-extern int hc_init(hc_t *, const hw_res_list_parsed_t *, bool);
+extern errno_t hc_init(hc_t *, const hw_res_list_parsed_t *, bool);
 extern void hc_fini(hc_t *);
 
-extern int uhci_hc_gen_irq_code(irq_code_t *, const hw_res_list_parsed_t *, int *);
+extern errno_t uhci_hc_gen_irq_code(irq_code_t *, const hw_res_list_parsed_t *, int *);
 
 extern void uhci_hc_interrupt(hcd_t *, uint32_t);
-extern int uhci_hc_status(hcd_t *, uint32_t *);
-extern int uhci_hc_schedule(hcd_t *, usb_transfer_batch_t *);
+extern errno_t uhci_hc_status(hcd_t *, uint32_t *);
+extern errno_t uhci_hc_schedule(hcd_t *, usb_transfer_batch_t *);
 
 #endif

uspace/drv/bus/usb/uhci/hw_struct/transfer_descriptor.c

@@ -119 +119 @@
  * @return Error code.
  */
-int td_status(const td_t *instance)
+errno_t td_status(const td_t *instance)
 {
         assert(instance);

uspace/drv/bus/usb/uhci/hw_struct/transfer_descriptor.h

@@ -102 +102 @@
     const void *buffer, const td_t *next);
 
-int td_status(const td_t *instance);
+errno_t td_status(const td_t *instance);
 
 void td_print_status(const td_t *instance);

uspace/drv/bus/usb/uhci/main.c

@@ -49 +49 @@
 #define NAME "uhci"
 
-static int uhci_driver_init(hcd_t *, const hw_res_list_parsed_t *, bool);
+static errno_t uhci_driver_init(hcd_t *, const hw_res_list_parsed_t *, bool);
 static void uhci_driver_fini(hcd_t *);
-static int disable_legacy(ddf_dev_t *);
+static errno_t disable_legacy(ddf_dev_t *);
 
 static const ddf_hc_driver_t uhci_hc_driver = {
@@ -67 +67 @@
 };
 
-static int uhci_driver_init(hcd_t *hcd, const hw_res_list_parsed_t *res, bool irq)
+static errno_t uhci_driver_init(hcd_t *hcd, const hw_res_list_parsed_t *res, bool irq)
 {
         assert(hcd);
@@ -76 +76 @@
                 return ENOMEM;
 
-        const int ret = hc_init(instance, res, irq);
+        const errno_t ret = hc_init(instance, res, irq);
         if (ret == EOK) {
                 hcd_set_implementation(hcd, instance, &uhci_hc_driver.ops);
@@ -101 +101 @@
  * @return Error code.
  */
-static int disable_legacy(ddf_dev_t *device)
+static errno_t disable_legacy(ddf_dev_t *device)
 {
         assert(device);
@@ -119 +119 @@
  * @return Error code.
  */
-static int uhci_dev_add(ddf_dev_t *device)
+static errno_t uhci_dev_add(ddf_dev_t *device)
 {
         usb_log_debug2("uhci_dev_add() called\n");

uspace/drv/bus/usb/uhci/transfer_list.c

@@ -56 +56 @@
  * Allocates memory for internal qh_t structure.
  */
-int transfer_list_init(transfer_list_t *instance, const char *name)
+errno_t transfer_list_init(transfer_list_t *instance, const char *name)
 {
         assert(instance);

uspace/drv/bus/usb/uhci/transfer_list.h

@@ -57 +57 @@
 
 void transfer_list_fini(transfer_list_t *instance);
-int transfer_list_init(transfer_list_t *instance, const char *name);
+errno_t transfer_list_init(transfer_list_t *instance, const char *name);
 void transfer_list_set_next(transfer_list_t *instance, transfer_list_t *next);
 void transfer_list_add_batch(

uspace/drv/bus/usb/uhci/uhci_rh.c

@@ -78 +78 @@
  * @return Error code, EOK on success.
  */
-int uhci_rh_init(uhci_rh_t *instance, ioport16_t *ports, const char *name)
+errno_t uhci_rh_init(uhci_rh_t *instance, ioport16_t *ports, const char *name)
 {
         assert(instance);
@@ -98 +98 @@
  * not have to be.
  */
-int uhci_rh_schedule(uhci_rh_t *instance, usb_transfer_batch_t *batch)
+errno_t uhci_rh_schedule(uhci_rh_t *instance, usb_transfer_batch_t *batch)
 {
         assert(instance);
@@ -193 +193 @@
  * it is usefull for debuging purposes only.
  */
-static int req_get_port_state(usbvirt_device_t *device,
+static errno_t req_get_port_state(usbvirt_device_t *device,
     const usb_device_request_setup_packet_t *setup_packet,
     uint8_t *data, size_t *act_size)
@@ -228 +228 @@
  * @note: reset change status needs to be handled in sw.
  */
-static int req_get_port_status(usbvirt_device_t *device,
+static errno_t req_get_port_status(usbvirt_device_t *device,
     const usb_device_request_setup_packet_t *setup_packet,
     uint8_t *data, size_t *act_size)
@@ -267 +267 @@
  * @return Error code.
  */
-static int req_clear_port_feature(usbvirt_device_t *device,
+static errno_t req_clear_port_feature(usbvirt_device_t *device,
     const usb_device_request_setup_packet_t *setup_packet,
     uint8_t *data, size_t *act_size)
@@ -340 +340 @@
  * @return Error code.
  */
-static int req_set_port_feature(usbvirt_device_t *device,
+static errno_t req_set_port_feature(usbvirt_device_t *device,
     const usb_device_request_setup_packet_t *setup_packet,
     uint8_t *data, size_t *act_size)
@@ -402 +402 @@
  * only need 1 byte.
  */
-static int req_status_change_handler(usbvirt_device_t *device,
+static errno_t req_status_change_handler(usbvirt_device_t *device,
     usb_endpoint_t endpoint, usb_transfer_type_t tr_type,
     void *buffer, size_t buffer_size, size_t *actual_size)

uspace/drv/bus/usb/uhci/uhci_rh.h

@@ -56 +56 @@
 } uhci_rh_t;
 
-int uhci_rh_init(uhci_rh_t *instance, ioport16_t *ports, const char *name);
-int uhci_rh_schedule(uhci_rh_t *instance, usb_transfer_batch_t *batch);
+errno_t uhci_rh_init(uhci_rh_t *instance, ioport16_t *ports, const char *name);
+errno_t uhci_rh_schedule(uhci_rh_t *instance, usb_transfer_batch_t *batch);
 
 /** Get UHCI rh address.

uspace/drv/bus/usb/usbflbk/main.c

@@ -46 +46 @@
  * @return Error code.
  */
-static int usbfallback_device_add(usb_device_t *dev)
+static errno_t usbfallback_device_add(usb_device_t *dev)
 {
         usb_log_info("Pretending to control %s `%s'.\n",
@@ -59 +59 @@
  * @return Error code.
  */
-static int usbfallback_device_gone(usb_device_t *dev)
+static errno_t usbfallback_device_gone(usb_device_t *dev)
 {
         assert(dev);

uspace/drv/bus/usb/usbhub/port.c

@@ -54 +54 @@
 };
 
-static int usb_hub_port_device_gone(usb_hub_port_t *port, usb_hub_dev_t *hub);
+static errno_t usb_hub_port_device_gone(usb_hub_port_t *port, usb_hub_dev_t *hub);
 static void usb_hub_port_reset_completed(usb_hub_port_t *port,
     usb_hub_dev_t *hub, usb_port_status_t status);
-static int get_port_status(usb_hub_port_t *port, usb_port_status_t *status);
-static int add_device_phase1_worker_fibril(void *arg);
-static int create_add_device_fibril(usb_hub_port_t *port, usb_hub_dev_t *hub,
+static errno_t get_port_status(usb_hub_port_t *port, usb_port_status_t *status);
+static errno_t add_device_phase1_worker_fibril(void *arg);
+static errno_t create_add_device_fibril(usb_hub_port_t *port, usb_hub_dev_t *hub,
     usb_speed_t speed);
 
-int usb_hub_port_fini(usb_hub_port_t *port, usb_hub_dev_t *hub)
+errno_t usb_hub_port_fini(usb_hub_port_t *port, usb_hub_dev_t *hub)
 {
         assert(port);
@@ -77 +77 @@
  * @return Operation result
  */
-int usb_hub_port_clear_feature(
+errno_t usb_hub_port_clear_feature(
     usb_hub_port_t *port, usb_hub_class_feature_t feature)
 {
@@ -99 +99 @@
  * @return Operation result
  */
-int usb_hub_port_set_feature(
+errno_t usb_hub_port_set_feature(
     usb_hub_port_t *port, usb_hub_class_feature_t feature)
 {
@@ -143 +143 @@
 
         usb_port_status_t status = 0;
-        const int opResult = get_port_status(port, &status);
+        const errno_t opResult = get_port_status(port, &status);
         if (opResult != EOK) {
                 usb_log_error("(%p-%u): Failed to get port status: %s.\n", hub,
@@ -158 +158 @@
 
                 /* ACK the change */
-                const int opResult = usb_hub_port_clear_feature(port,
+                const errno_t opResult = usb_hub_port_clear_feature(port,
                     USB_HUB_FEATURE_C_PORT_CONNECTION);
                 if (opResult != EOK) {
@@ -167 +167 @@
 
                 if (connected) {
-                        const int opResult = create_add_device_fibril(port, hub,
+                        const errno_t opResult = create_add_device_fibril(port, hub,
                             usb_port_speed(status));
                         if (opResult != EOK) {
@@ -191 +191 @@
                    port->port_number);
                 usb_hub_port_device_gone(port, hub);
-                const int rc = usb_hub_port_clear_feature(port,
+                const errno_t rc = usb_hub_port_clear_feature(port,
                         USB_HUB_FEATURE_C_PORT_ENABLE);
                 if (rc != EOK) {
@@ -206 +206 @@
                     " NOT happen as we do not support suspend state!", hub,
                     port->port_number);
-                const int rc = usb_hub_port_clear_feature(port,
+                const errno_t rc = usb_hub_port_clear_feature(port,
                         USB_HUB_FEATURE_C_PORT_SUSPEND);
                 if (rc != EOK) {
@@ -224 +224 @@
                  * mode. USB system software is responsible for powering port
                  * back on when the over-current condition is gone */
-                const int rc = usb_hub_port_clear_feature(port,
+                const errno_t rc = usb_hub_port_clear_feature(port,
                     USB_HUB_FEATURE_C_PORT_OVER_CURRENT);
                 if (rc != EOK) {
@@ -232 +232 @@
                 }
                 if (!(status & ~USB_HUB_PORT_STATUS_OC)) {
-                        const int rc = usb_hub_port_set_feature(
+                        const errno_t rc = usb_hub_port_set_feature(
                             port, USB_HUB_FEATURE_PORT_POWER);
                         if (rc != EOK) {
@@ -260 +260 @@
  * @param hub hub representation
  */
-int usb_hub_port_device_gone(usb_hub_port_t *port, usb_hub_dev_t *hub)
+errno_t usb_hub_port_device_gone(usb_hub_port_t *port, usb_hub_dev_t *hub)
 {
         assert(port);
@@ -267 +267 @@
         if (!exch)
                 return ENOMEM;
-        const int rc = usb_device_remove(exch, port->port_number);
+        const errno_t rc = usb_device_remove(exch, port->port_number);
         usb_device_bus_exchange_end(exch);
         if (rc == EOK)
@@ -304 +304 @@
 
         /* Clear the port reset change. */
-        int rc = usb_hub_port_clear_feature(port, USB_HUB_FEATURE_C_PORT_RESET);
+        errno_t rc = usb_hub_port_clear_feature(port, USB_HUB_FEATURE_C_PORT_RESET);
         if (rc != EOK) {
                 usb_log_error("(%p-%u): Failed to clear port reset change: %s.",
@@ -317 +317 @@
  * @return Error code.
  */
-static int get_port_status(usb_hub_port_t *port, usb_port_status_t *status)
+static errno_t get_port_status(usb_hub_port_t *port, usb_port_status_t *status)
 {
         assert(port);
@@ -333 +333 @@
         usb_port_status_t status_tmp;
 
-        const int rc = usb_pipe_control_read(port->control_pipe,
+        const errno_t rc = usb_pipe_control_read(port->control_pipe,
             &request, sizeof(usb_device_request_setup_packet_t),
             &status_tmp, sizeof(status_tmp), &recv_size);
@@ -351 +351 @@
 }
 
-static int port_enable(usb_hub_port_t *port, usb_hub_dev_t *hub, bool enable)
+static errno_t port_enable(usb_hub_port_t *port, usb_hub_dev_t *hub, bool enable)
 {
         if (enable) {
-                int rc =
+                errno_t rc =
                     usb_hub_port_set_feature(port, USB_HUB_FEATURE_PORT_RESET);
                 if (rc != EOK) {
@@ -383 +383 @@
  * @return 0 Always.
  */
-int add_device_phase1_worker_fibril(void *arg)
+errno_t add_device_phase1_worker_fibril(void *arg)
 {
         struct add_device_phase1 *params = arg;
         assert(params);
 
-        int ret = EOK;
+        errno_t ret = EOK;
         usb_hub_dev_t *hub = params->hub;
         usb_hub_port_t *port = params->port;
@@ -434 +434 @@
                 usb_log_error("(%p-%u): Failed to enumerate device: %s", hub,
                     port->port_number, str_error(ret));
-                const int ret = port_enable(port, hub, false);
+                const errno_t ret = port_enable(port, hub, false);
                 if (ret != EOK) {
                         usb_log_warning("(%p-%u)Failed to disable port (%s), "
@@ -440 +440 @@
                             port->port_number, str_error(ret));
                 } else {
-                        const int ret = usb_release_default_address(exch);
+                        const errno_t ret = usb_release_default_address(exch);
                         if (ret != EOK)
                                 usb_log_warning("(%p-%u): Failed to release "
@@ -475 +475 @@
  * @return Error code.
  */
-static int create_add_device_fibril(usb_hub_port_t *port, usb_hub_dev_t *hub,
+static errno_t create_add_device_fibril(usb_hub_port_t *port, usb_hub_dev_t *hub,
     usb_speed_t speed)
 {

uspace/drv/bus/usb/usbhub/port.h

@@ -83 +83 @@
 }
 
-int usb_hub_port_fini(usb_hub_port_t *port, usb_hub_dev_t *hub);
-int usb_hub_port_clear_feature(
+errno_t usb_hub_port_fini(usb_hub_port_t *port, usb_hub_dev_t *hub);
+errno_t usb_hub_port_clear_feature(
     usb_hub_port_t *port, usb_hub_class_feature_t feature);
-int usb_hub_port_set_feature(
+errno_t usb_hub_port_set_feature(
     usb_hub_port_t *port, usb_hub_class_feature_t feature);
 void usb_hub_port_reset_fail(usb_hub_port_t *port);

uspace/drv/bus/usb/usbhub/usbhub.c

@@ -81 +81 @@
 };
 
-static int usb_set_first_configuration(usb_device_t *usb_device);
-static int usb_hub_process_hub_specific_info(usb_hub_dev_t *hub_dev);
+static errno_t usb_set_first_configuration(usb_device_t *usb_device);
+static errno_t usb_hub_process_hub_specific_info(usb_hub_dev_t *hub_dev);
 static void usb_hub_over_current(const usb_hub_dev_t *hub_dev,
     usb_hub_status_t status);
@@ -97 +97 @@
  * @return error code
  */
-int usb_hub_device_add(usb_device_t *usb_dev)
+errno_t usb_hub_device_add(usb_device_t *usb_dev)
 {
         assert(usb_dev);
@@ -114 +114 @@
 
         /* Set hub's first configuration. (There should be only one) */
-        int opResult = usb_set_first_configuration(usb_dev);
+        errno_t opResult = usb_set_first_configuration(usb_dev);
         if (opResult != EOK) {
                 usb_log_error("Could not set hub configuration: %s\n",
@@ -174 +174 @@
  * @return error code
  */
-int usb_hub_device_remove(usb_device_t *usb_dev)
+errno_t usb_hub_device_remove(usb_device_t *usb_dev)
 {
         return ENOTSUP;
@@ -184 +184 @@
  * @return error code
  */
-int usb_hub_device_gone(usb_device_t *usb_dev)
+errno_t usb_hub_device_gone(usb_device_t *usb_dev)
 {
         assert(usb_dev);
@@ -202 +202 @@
 
         for (size_t port = 0; port < hub->port_count; ++port) {
-                const int ret = usb_hub_port_fini(&hub->ports[port], hub);
+                const errno_t ret = usb_hub_port_fini(&hub->ports[port], hub);
                 if (ret != EOK)
                         return ret;
@@ -208 +208 @@
         free(hub->ports);
 
-        const int ret = ddf_fun_unbind(hub->hub_fun);
+        const errno_t ret = ddf_fun_unbind(hub->hub_fun);
         if (ret != EOK) {
                 usb_log_error("(%p) Failed to unbind '%s' function: %s.",
@@ -266 +266 @@
  * @return error code
  */
-static int usb_hub_process_hub_specific_info(usb_hub_dev_t *hub_dev)
+static errno_t usb_hub_process_hub_specific_info(usb_hub_dev_t *hub_dev)
 {
         assert(hub_dev);
@@ -277 +277 @@
         usb_hub_descriptor_header_t descriptor;
         size_t received_size;
-        int opResult = usb_request_get_descriptor(control_pipe,
+        errno_t opResult = usb_request_get_descriptor(control_pipe,
             USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_DEVICE,
             USB_DESCTYPE_HUB, 0, 0, &descriptor,
@@ -317 +317 @@
         for (unsigned int port = 0; port < hub_dev->port_count; ++port) {
                 usb_log_debug("(%p): Powering port %u.", hub_dev, port);
-                const int ret = usb_hub_port_set_feature(
+                const errno_t ret = usb_hub_port_set_feature(
                     &hub_dev->ports[port], USB_HUB_FEATURE_PORT_POWER);
 
@@ -343 +343 @@
  * @return error code
  */
-static int usb_set_first_configuration(usb_device_t *usb_device)
+static errno_t usb_set_first_configuration(usb_device_t *usb_device)
 {
         assert(usb_device);
@@ -369 +369 @@
         /* Set configuration. Use the configuration that was in
          * usb_device->descriptors.configuration i.e. The first one. */
-        const int opResult = usb_request_set_configuration(
+        const errno_t opResult = usb_request_set_configuration(
             usb_device_get_default_pipe(usb_device),
             config_descriptor->configuration_number);
@@ -406 +406 @@
         /* Over-current condition is gone, it is safe to turn the ports on. */
         for (size_t port = 0; port < hub_dev->port_count; ++port) {
-                const int ret = usb_hub_port_set_feature(
+                const errno_t ret = usb_hub_port_set_feature(
                     &hub_dev->ports[port], USB_HUB_FEATURE_PORT_POWER);
                 if (ret != EOK) {
@@ -438 +438 @@
         /* NOTE: We can't use standard USB GET_STATUS request, because
          * hubs reply is 4byte instead of 2 */
-        const int opResult = usb_pipe_control_read(control_pipe,
+        const errno_t opResult = usb_pipe_control_read(control_pipe,
             &get_hub_status_request, sizeof(get_hub_status_request),
             &status, sizeof(usb_hub_status_t), &rcvd_size);
@@ -456 +456 @@
                 usb_hub_over_current(hub_dev, status);
                 /* Ack change in hub OC flag */
-                const int ret = usb_request_clear_feature(
+                const errno_t ret = usb_request_clear_feature(
                     control_pipe, USB_REQUEST_TYPE_CLASS,
                     USB_REQUEST_RECIPIENT_DEVICE,
@@ -480 +480 @@
                  * Just ACK the change.
                  */
-                const int ret = usb_request_clear_feature(
+                const errno_t ret = usb_request_clear_feature(
                     control_pipe, USB_REQUEST_TYPE_CLASS,
                     USB_REQUEST_RECIPIENT_DEVICE,

uspace/drv/bus/usb/usbhub/usbhub.h

@@ -83 +83 @@
 extern const usb_endpoint_description_t hub_status_change_endpoint_description;
 
-extern int usb_hub_device_add(usb_device_t *);
-extern int usb_hub_device_remove(usb_device_t *);
-extern int usb_hub_device_gone(usb_device_t *);
+extern errno_t usb_hub_device_add(usb_device_t *);
+extern errno_t usb_hub_device_remove(usb_device_t *);
+extern errno_t usb_hub_device_gone(usb_device_t *);
 
 extern bool hub_port_changes_callback(usb_device_t *, uint8_t *, size_t,

uspace/drv/bus/usb/usbmid/explore.c

@@ -66 +66 @@
  * @param list List where to add the interfaces.
  */
-static int create_interfaces(const uint8_t *config_descriptor,
+static errno_t create_interfaces(const uint8_t *config_descriptor,
     size_t config_descriptor_size, list_t *list, usb_device_t *usb_dev)
 {
@@ -111 +111 @@
 
                 usbmid_interface_t *iface = NULL;
-                const int rc = usbmid_spawn_interface_child(usb_dev, &iface,
+                const errno_t rc = usbmid_spawn_interface_child(usb_dev, &iface,
                         &usb_device_descriptors(usb_dev)->device, interface);
                 if (rc != EOK) {
@@ -134 +134 @@
  * @return Whether to accept this device.
  */
-int usbmid_explore_device(usb_device_t *dev)
+errno_t usbmid_explore_device(usb_device_t *dev)
 {
         assert(dev);
@@ -157 +157 @@
 
         /* Select the first configuration */
-        int rc = usb_request_set_configuration(usb_device_get_default_pipe(dev),
+        errno_t rc = usb_request_set_configuration(usb_device_get_default_pipe(dev),
             config_descriptor->configuration_number);
         if (rc != EOK) {

uspace/drv/bus/usb/usbmid/main.c

@@ -49 +49 @@
  * @return Error code.
  */
-static int usbmid_device_add(usb_device_t *dev)
+static errno_t usbmid_device_add(usb_device_t *dev)
 {
         usb_log_info("Taking care of new MID `%s'.\n", usb_device_get_name(dev));
@@ -61 +61 @@
  * @return Error code.
  */
-static int usbmid_device_remove(usb_device_t *dev)
+static errno_t usbmid_device_remove(usb_device_t *dev)
 {
         assert(dev);
@@ -68 +68 @@
 
         /* Remove ctl function */
-        int ret = ddf_fun_unbind(usb_mid->ctl_fun);
+        errno_t ret = ddf_fun_unbind(usb_mid->ctl_fun);
         if (ret != EOK) {
                 usb_log_error("Failed to unbind USB MID ctl function: %s.\n",
@@ -87 +87 @@
 
                 /* Tell the child to go off-line. */
-                int pret = ddf_fun_offline(iface->fun);
+                errno_t pret = ddf_fun_offline(iface->fun);
                 if (pret != EOK) {
                         usb_log_warning("Failed to turn off child `%s': %s\n",
@@ -110 +110 @@
  * @return Error code.
  */
-static int usbmid_device_gone(usb_device_t *dev)
+static errno_t usbmid_device_gone(usb_device_t *dev)
 {
         assert(dev);
@@ -119 +119 @@
 
         /* Remove ctl function */
-        int ret = ddf_fun_unbind(usb_mid->ctl_fun);
+        errno_t ret = ddf_fun_unbind(usb_mid->ctl_fun);
         if (ret != EOK) {
                 usb_log_error("Failed to unbind USB MID ctl function: %s.\n",
@@ -137 +137 @@
                     ddf_fun_get_name(iface->fun));
 
-                const int pret = usbmid_interface_destroy(iface);
+                const errno_t pret = usbmid_interface_destroy(iface);
                 if (pret != EOK) {
                         usb_log_error("Failed to remove child `%s': %s\n",

uspace/drv/bus/usb/usbmid/usbmid.c

@@ -51 +51 @@
  * @return Error code.
  */
-static int usb_iface_device_handle(ddf_fun_t *fun, devman_handle_t *handle)
+static errno_t usb_iface_device_handle(ddf_fun_t *fun, devman_handle_t *handle)
 {
         assert(fun);
@@ -61 +61 @@
 
 /** Callback for DDF USB get interface. */
-static int usb_iface_iface_no(ddf_fun_t *fun, int *iface_no)
+static errno_t usb_iface_iface_no(ddf_fun_t *fun, int *iface_no)
 {
         usbmid_interface_t *iface = ddf_fun_data_get(fun);
@@ -83 +83 @@
 };
 
-int usbmid_interface_destroy(usbmid_interface_t *mid_iface)
+errno_t usbmid_interface_destroy(usbmid_interface_t *mid_iface)
 {
         assert(mid_iface);
         assert_link_not_used(&mid_iface->link);
-        const int ret = ddf_fun_unbind(mid_iface->fun);
+        const errno_t ret = ddf_fun_unbind(mid_iface->fun);
         if (ret != EOK) {
                 return ret;
@@ -103 +103 @@
  * @return Error code.
  */
-int usbmid_spawn_interface_child(usb_device_t *parent,
+errno_t usbmid_spawn_interface_child(usb_device_t *parent,
     usbmid_interface_t **iface_ret,
     const usb_standard_device_descriptor_t *device_descriptor,
@@ -110 +110 @@
         ddf_fun_t *child = NULL;
         char *child_name = NULL;
-        int rc;
+        errno_t rc;
 
         /*

uspace/drv/bus/usb/usbmid/usbmid.h

@@ -62 +62 @@
 } usb_mid_t;
 
-extern int usbmid_explore_device(usb_device_t *);
-extern int usbmid_spawn_interface_child(usb_device_t *, usbmid_interface_t **,
+extern errno_t usbmid_explore_device(usb_device_t *);
+extern errno_t usbmid_spawn_interface_child(usb_device_t *, usbmid_interface_t **,
     const usb_standard_device_descriptor_t *,
     const usb_standard_interface_descriptor_t *);
 extern void usbmid_dump_descriptors(uint8_t *, size_t);
-extern int usbmid_interface_destroy(usbmid_interface_t *mid_iface);
+extern errno_t usbmid_interface_destroy(usbmid_interface_t *mid_iface);
 
 static inline usbmid_interface_t * usbmid_interface_from_link(link_t *item)

uspace/drv/bus/usb/vhc/conndev.c

@@ -75 +75 @@
         }
         
-        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);
@@ -102 +102 @@
         
         if (callback) {
-                int rc = vhc_virtdev_plug(vhc, callback, &plugged_device_handle);
+                errno_t rc = vhc_virtdev_plug(vhc, callback, &plugged_device_handle);
                 if (rc != EOK) {
                         async_answer_0(icallid, rc);

uspace/drv/bus/usb/vhc/devconn.c

@@ -49 +49 @@
 }
 
-static int vhc_virtdev_plug_generic(vhc_data_t *vhc,
+static errno_t vhc_virtdev_plug_generic(vhc_data_t *vhc,
     async_sess_t *sess, usbvirt_device_t *virtdev,
     uintptr_t *handle, bool connect, usb_address_t address)
@@ -85 +85 @@
 }
 
-int vhc_virtdev_plug(vhc_data_t *vhc, async_sess_t *sess, uintptr_t *handle)
+errno_t vhc_virtdev_plug(vhc_data_t *vhc, async_sess_t *sess, uintptr_t *handle)
 {
         return vhc_virtdev_plug_generic(vhc, sess, NULL, handle, true, 0);
 }
 
-int vhc_virtdev_plug_local(vhc_data_t *vhc, usbvirt_device_t *dev, uintptr_t *handle)
+errno_t vhc_virtdev_plug_local(vhc_data_t *vhc, usbvirt_device_t *dev, uintptr_t *handle)
 {
         return vhc_virtdev_plug_generic(vhc, NULL, dev, handle, true, 0);
 }
 
-int vhc_virtdev_plug_hub(vhc_data_t *vhc, usbvirt_device_t *dev,
+errno_t vhc_virtdev_plug_hub(vhc_data_t *vhc, usbvirt_device_t *dev,
     uintptr_t *handle, usb_address_t address)
 {

uspace/drv/bus/usb/vhc/hub/hub.c

@@ -63 +63 @@
 static void set_port_status_change(hub_port_t *, hub_status_change_t);
 static void clear_port_status_change(hub_port_t *, uint16_t);
-static int set_port_state_delayed_fibril(void *);
+static errno_t set_port_state_delayed_fibril(void *);
 static void set_port_state_delayed(hub_t *, size_t, suseconds_t,
     hub_port_state_t, hub_port_state_t);
@@ -163 +163 @@
  * @return Error code.
  */
-int hub_disconnect_device(hub_t *hub, void *device)
+errno_t hub_disconnect_device(hub_t *hub, void *device)
 {
         size_t index = hub_find_device(hub, device);
@@ -461 +461 @@
  * @return Always EOK.
  */
-static int set_port_state_delayed_fibril(void *arg)
+static errno_t set_port_state_delayed_fibril(void *arg)
 {
         struct delay_port_state_change *change

uspace/drv/bus/usb/vhc/hub/hub.h

@@ -102 +102 @@
 void hub_init(hub_t *);
 size_t hub_connect_device(hub_t *, void *);
-int hub_disconnect_device(hub_t *, void *);
+errno_t hub_disconnect_device(hub_t *, void *);
 size_t hub_find_device(hub_t *, void *);
 void hub_acquire(hub_t *);

uspace/drv/bus/usb/vhc/hub/virthub.c

@@ -147 +147 @@
  * @return Error code.
  */
-int virthub_init(usbvirt_device_t *dev, const char* name)
+errno_t virthub_init(usbvirt_device_t *dev, const char* name)
 {
         if (dev == NULL) {
@@ -197 +197 @@
  * @return Error code.
  */
-int virthub_disconnect_device(usbvirt_device_t *dev, vhc_virtdev_t *conn)
+errno_t virthub_disconnect_device(usbvirt_device_t *dev, vhc_virtdev_t *conn)
 {
         assert(dev != NULL);

uspace/drv/bus/usb/vhc/hub/virthub.h

@@ -80 +80 @@
 extern hub_descriptor_t hub_descriptor;
 
-int virthub_init(usbvirt_device_t *, const char *name);
+errno_t virthub_init(usbvirt_device_t *, const char *name);
 int virthub_connect_device(usbvirt_device_t *, vhc_virtdev_t *);
-int virthub_disconnect_device(usbvirt_device_t *, vhc_virtdev_t *);
+errno_t virthub_disconnect_device(usbvirt_device_t *, vhc_virtdev_t *);
 bool virthub_is_device_enabled(usbvirt_device_t *, vhc_virtdev_t *);
 void virthub_get_status(usbvirt_device_t *, char *, size_t);

uspace/drv/bus/usb/vhc/hub/virthubops.c

@@ -63 +63 @@
 
 /** Callback for data request. */
-static int req_on_status_change_pipe(usbvirt_device_t *dev,
+static errno_t req_on_status_change_pipe(usbvirt_device_t *dev,
     usb_endpoint_t endpoint, usb_transfer_type_t tr_type,
     void *buffer, size_t buffer_size, size_t *actual_size)
@@ -109 +109 @@
  * @return Error code.
  */
-static int req_clear_hub_feature(usbvirt_device_t *dev,
+static errno_t req_clear_hub_feature(usbvirt_device_t *dev,
     const usb_device_request_setup_packet_t *request, uint8_t *data,
     size_t *act_size)
@@ -123 +123 @@
  * @return Error code.
  */
-static int req_clear_port_feature(usbvirt_device_t *dev,
-    const usb_device_request_setup_packet_t *request, uint8_t *data,
-    size_t *act_size)
-{
-        int rc;
+static errno_t req_clear_port_feature(usbvirt_device_t *dev,
+    const usb_device_request_setup_packet_t *request, uint8_t *data,
+    size_t *act_size)
+{
+        errno_t rc;
         size_t port = request->index - 1;
         usb_hub_class_feature_t feature = request->value;
@@ -203 +203 @@
  * @return Error code.
  */
-static int req_get_bus_state(usbvirt_device_t *dev,
+static errno_t req_get_bus_state(usbvirt_device_t *dev,
     const usb_device_request_setup_packet_t *request, uint8_t *data,
     size_t *act_size)
@@ -217 +217 @@
  * @return Error code.
  */
-static int req_get_descriptor(usbvirt_device_t *dev,
+static errno_t req_get_descriptor(usbvirt_device_t *dev,
     const usb_device_request_setup_packet_t *request, uint8_t *data,
     size_t *act_size)
@@ -238 +238 @@
  * @return Error code.
  */
-static int req_get_hub_status(usbvirt_device_t *dev,
+static errno_t req_get_hub_status(usbvirt_device_t *dev,
     const usb_device_request_setup_packet_t *request, uint8_t *data,
     size_t *act_size)
@@ -257 +257 @@
  * @return Error code.
  */
-static int req_get_port_status(usbvirt_device_t *dev,
+static errno_t req_get_port_status(usbvirt_device_t *dev,
     const usb_device_request_setup_packet_t *request, uint8_t *data,
     size_t *act_size)
@@ -282 +282 @@
  * @return Error code.
  */
-static int req_set_hub_feature(usbvirt_device_t *dev,
+static errno_t req_set_hub_feature(usbvirt_device_t *dev,
     const usb_device_request_setup_packet_t *request, uint8_t *data,
     size_t *act_size)
@@ -296 +296 @@
  * @return Error code.
  */
-static int req_set_port_feature(usbvirt_device_t *dev,
-    const usb_device_request_setup_packet_t *request, uint8_t *data,
-    size_t *act_size)
-{
-        int rc = ENOTSUP;
+static errno_t req_set_port_feature(usbvirt_device_t *dev,
+    const usb_device_request_setup_packet_t *request, uint8_t *data,
+    size_t *act_size)
+{
+        errno_t rc = ENOTSUP;
         size_t port = request->index - 1;
         usb_hub_class_feature_t feature = request->value;

uspace/drv/bus/usb/vhc/main.c

@@ -49 +49 @@
 };
 
-static int vhc_control_node(ddf_dev_t *dev, ddf_fun_t **fun)
+static errno_t vhc_control_node(ddf_dev_t *dev, ddf_fun_t **fun)
 {
         assert(dev);
@@ -63 +63 @@
         }
         ddf_fun_set_ops(*fun, &vhc_ops);
-        const int ret = ddf_fun_bind(*fun);
+        const errno_t ret = ddf_fun_bind(*fun);
         if (ret != EOK) {
                 ddf_fun_destroy(*fun);
@@ -77 +77 @@
 };
 
-static int vhc_dev_add(ddf_dev_t *dev)
+static errno_t vhc_dev_add(ddf_dev_t *dev)
 {
         /* Initialize virtual structure */
         ddf_fun_t *ctl_fun = NULL;
-        int ret = vhc_control_node(dev, &ctl_fun);
+        errno_t ret = vhc_control_node(dev, &ctl_fun);
         if (ret != EOK) {
                 usb_log_error("Failed to setup control node.\n");

uspace/drv/bus/usb/vhc/transfer.c

@@ -58 +58 @@
 }
 
-static int process_transfer_local(usb_transfer_batch_t *batch,
+static errno_t process_transfer_local(usb_transfer_batch_t *batch,
     usbvirt_device_t *dev, size_t *actual_data_size)
 {
-        int rc;
+        errno_t rc;
         
         const usb_direction_t dir = usb_transfer_batch_direction(batch);
@@ -94 +94 @@
 }
 
-static int process_transfer_remote(usb_transfer_batch_t *batch,
+static errno_t process_transfer_remote(usb_transfer_batch_t *batch,
     async_sess_t *sess, size_t *actual_data_size)
 {
-        int rc;
+        errno_t rc;
 
         const usb_direction_t dir = usb_transfer_batch_direction(batch);
@@ -143 +143 @@
 
 static void execute_transfer_callback_and_free(vhc_transfer_t *transfer,
-    size_t data_transfer_size, int outcome)
+    size_t data_transfer_size, errno_t outcome)
 {
         assert(outcome != ENAK);
@@ -154 +154 @@
 }
 
-int vhc_init(vhc_data_t *instance)
+errno_t vhc_init(vhc_data_t *instance)
 {
         assert(instance);
@@ -163 +163 @@
 }
 
-int vhc_schedule(hcd_t *hcd, usb_transfer_batch_t *batch)
+errno_t vhc_schedule(hcd_t *hcd, usb_transfer_batch_t *batch)
 {
         assert(hcd);
@@ -199 +199 @@
 }
 
-int vhc_transfer_queue_processor(void *arg)
+errno_t vhc_transfer_queue_processor(void *arg)
 {
         vhc_virtdev_t *dev = arg;
@@ -214 +214 @@
                 fibril_mutex_unlock(&dev->guard);
 
-                int rc = EOK;
+                errno_t rc = EOK;
                 size_t data_transfer_size = 0;
                 if (dev->dev_sess) {

uspace/drv/bus/usb/vhc/vhcd.h

@@ -71 +71 @@
     ipc_call_t *icall);
 
-int vhc_virtdev_plug(vhc_data_t *, async_sess_t *, uintptr_t *);
-int vhc_virtdev_plug_local(vhc_data_t *, usbvirt_device_t *, uintptr_t *);
-int vhc_virtdev_plug_hub(vhc_data_t *, usbvirt_device_t *, uintptr_t *, usb_address_t address);
+errno_t vhc_virtdev_plug(vhc_data_t *, async_sess_t *, uintptr_t *);
+errno_t vhc_virtdev_plug_local(vhc_data_t *, usbvirt_device_t *, uintptr_t *);
+errno_t vhc_virtdev_plug_hub(vhc_data_t *, usbvirt_device_t *, uintptr_t *, usb_address_t address);
 void vhc_virtdev_unplug(vhc_data_t *, uintptr_t);
 
-int vhc_init(vhc_data_t *instance);
-int vhc_schedule(hcd_t *hcd, usb_transfer_batch_t *batch);
-int vhc_transfer_queue_processor(void *arg);
+errno_t vhc_init(vhc_data_t *instance);
+errno_t vhc_schedule(hcd_t *hcd, usb_transfer_batch_t *batch);
+errno_t vhc_transfer_queue_processor(void *arg);
 
 #endif