Changeset 5a6cc679 in mainline for uspace/drv/bus/usb

Timestamp:

2018-01-31T02:21:24Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

a0a9cc2

Parents:

132ab5d1

Message:

Merge commit '50f19b7ee8e94570b5c63896736c4eb49cfa18db' into forwardport

Not all ints are converted to errno_t in xhci tree yet, however it compiles and works

Location:

uspace/drv/bus/usb

Files:

• ehci/ehci_bus.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) (7 diffs)
• ehci/hc.h (modified) (1 diff)
• ehci/hw_struct/transfer_descriptor.c (modified) (1 diff)
• ehci/hw_struct/transfer_descriptor.h (modified) (1 diff)
• 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) (1 diff)
• ohci/hw_struct/completion_codes.h (modified) (1 diff)
• ohci/hw_struct/transfer_descriptor.h (modified) (1 diff)
• ohci/ohci_bus.h (modified) (1 diff)
• ohci/ohci_rh.c (modified) (9 diffs)
• ohci/ohci_rh.h (modified) (1 diff)
• uhci/hc.c (modified) (12 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) (2 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) (4 diffs)
• usbhub/usbhub.c (modified) (14 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_bus.h

@@ -72 +72 @@
 void ehci_bus_prepare_ops(void);
 
-int ehci_bus_init(ehci_bus_t *, hc_t *);
+errno_t ehci_bus_init(ehci_bus_t *, hc_t *);
 
 /** Get and convert assigned ehci_endpoint_t structure

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,
     fibril_mutex_t *guard, const char *name)
 {
@@ -141 +141 @@
  * 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);
@@ -184 +184 @@
  * processing of a postponed request.
  */
-int ehci_rh_interrupt(ehci_rh_t *instance)
+errno_t ehci_rh_interrupt(ehci_rh_t *instance)
 {
         fibril_mutex_lock(instance->guard);
@@ -231 +231 @@
  * @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)
@@ -254 +254 @@
  * @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)
@@ -282 +282 @@
  * @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)
@@ -325 +325 @@
 } ehci_rh_job_t;
 
-static int stop_reset(void *arg)
+static errno_t stop_reset(void *arg)
 {
         ehci_rh_job_t *job = arg;
@@ -354 +354 @@
 }
 
-static int stop_resume(void *arg)
+static errno_t stop_resume(void *arg)
 {
         ehci_rh_job_t *job = arg;
@@ -367 +367 @@
 }
 
-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));
@@ -393 +393 @@
  * @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)
@@ -472 +472 @@
  * @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)
@@ -521 +521 @@
  * 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

@@ -79 +79 @@
 } 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,
     fibril_mutex_t *guard, 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

@@ -89 +89 @@
 };
 
-static int hc_init_memory(hc_t *instance);
+static errno_t hc_init_memory(hc_t *instance);
 
 /** Generate IRQ code.
@@ -99 +99 @@
  * @return Error code.
  */
-int hc_gen_irq_code(irq_code_t *code, hc_device_t *hcd, const hw_res_list_parsed_t *hw_res, int *irq)
+errno_t hc_gen_irq_code(irq_code_t *code, hc_device_t *hcd, const hw_res_list_parsed_t *hw_res, int *irq)
 {
         assert(code);
@@ -151 +151 @@
  * @return Error code
  */
-int hc_add(hc_device_t *hcd, const hw_res_list_parsed_t *hw_res)
+errno_t hc_add(hc_device_t *hcd, const hw_res_list_parsed_t *hw_res)
 {
         hc_t *instance = hcd_to_hc(hcd);
@@ -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->caps);
         if (ret != EOK) {
@@ -265 +265 @@
 }
 
-int ehci_hc_status(bus_t *bus_base, uint32_t *status)
+errno_t ehci_hc_status(bus_t *bus_base, uint32_t *status)
 {
         assert(bus_base);
@@ -289 +289 @@
  * @return Error code.
  */
-int ehci_hc_schedule(usb_transfer_batch_t *batch)
+errno_t ehci_hc_schedule(usb_transfer_batch_t *batch)
 {
         assert(batch);
@@ -477 +477 @@
  * @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

@@ -100 +100 @@
 
 /* Boottime operations */
-extern int hc_add(hc_device_t *, const hw_res_list_parsed_t *);
-extern int hc_start(hc_device_t *);
-extern int hc_setup_roothub(hc_device_t *);
-extern int hc_gen_irq_code(irq_code_t *, hc_device_t *, const hw_res_list_parsed_t *, int *);
-extern int hc_gone(hc_device_t *);
+extern errno_t hc_add(hc_device_t *, const hw_res_list_parsed_t *);
+extern errno_t hc_start(hc_device_t *);
+extern errno_t hc_setup_roothub(hc_device_t *);
+extern errno_t hc_gen_irq_code(irq_code_t *, hc_device_t *, const hw_res_list_parsed_t *, int *);
+extern errno_t hc_gone(hc_device_t *);
 
 /** Runtime operations */
 extern void ehci_hc_interrupt(bus_t *, uint32_t);
-extern int ehci_hc_status(bus_t *, uint32_t *);
-extern int ehci_hc_schedule(usb_transfer_batch_t *);
+extern errno_t ehci_hc_status(bus_t *, uint32_t *);
+extern errno_t ehci_hc_schedule(usb_transfer_batch_t *);
 
 #endif

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

@@ -44 +44 @@
 
 
-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

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

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

@@ -63 +63 @@
  * @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 */
@@ -71 +71 @@
         /* 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) {
@@ -173 +173 @@
 }
 
-int disable_legacy(hc_device_t *hcd)
+errno_t disable_legacy(hc_device_t *hcd)
 {
         hc_t *hc = hcd_to_hc(hcd);
@@ -182 +182 @@
 
         usb_log_debug("Disabling EHCI legacy support.");
-
 
         const uint32_t hcc_params = EHCI_RD(hc->caps->hccparams);

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

@@ -38 +38 @@
 typedef struct hc_device hc_device_t;
 
-extern int disable_legacy(hc_device_t *);
+extern errno_t disable_legacy(hc_device_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

@@ -90 +90 @@
 };
 
-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.
@@ -102 +102 @@
  * @return Error code.
  */
-int hc_gen_irq_code(irq_code_t *code, hc_device_t *hcd, const hw_res_list_parsed_t *hw_res, int *irq)
+errno_t hc_gen_irq_code(irq_code_t *code, hc_device_t *hcd, const hw_res_list_parsed_t *hw_res, int *irq)
 {
         assert(code);
@@ -151 +151 @@
  * @return Error code
  */
-int hc_add(hc_device_t *hcd, const hw_res_list_parsed_t *hw_res)
+errno_t hc_add(hc_device_t *hcd, const hw_res_list_parsed_t *hw_res)
 {
         hc_t *instance = hcd_to_hc(hcd);
@@ -159 +159 @@
             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) {
@@ -263 +263 @@
 }
 
-int ohci_hc_status(bus_t *bus_base, uint32_t *status)
+errno_t ohci_hc_status(bus_t *bus_base, uint32_t *status)
 {
         assert(bus_base);
@@ -285 +285 @@
  * @return Error code.
  */
-int ohci_hc_schedule(usb_transfer_batch_t *batch)
+errno_t ohci_hc_schedule(usb_transfer_batch_t *batch)
 {
         assert(batch);
@@ -547 +547 @@
  * @return Error code
  */
-int hc_init_transfer_lists(hc_t *instance)
+errno_t hc_init_transfer_lists(hc_t *instance)
 {
         assert(instance);
@@ -553 +553 @@
 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.", \
@@ -581 +581 @@
  * @return Error code.
  */
-int hc_init_memory(hc_t *instance)
+errno_t hc_init_memory(hc_t *instance)
 {
         assert(instance);
@@ -587 +587 @@
         memset(&instance->rh, 0, sizeof(instance->rh));
         /* Init queues */
-        int ret = hc_init_transfer_lists(instance);
+        errno_t ret = hc_init_transfer_lists(instance);
         if (ret != EOK) {
                 return ret;

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

@@ -89 +89 @@
 }
 
-extern int hc_add(hc_device_t *, const hw_res_list_parsed_t *);
-extern int hc_gen_irq_code(irq_code_t *, hc_device_t *, const hw_res_list_parsed_t *, int *);
-extern int hc_gain_control(hc_device_t *);
-extern int hc_start(hc_device_t *);
-extern int hc_setup_roothub(hc_device_t *);
-extern int hc_gone(hc_device_t *);
+extern errno_t hc_add(hc_device_t *, const hw_res_list_parsed_t *);
+extern errno_t hc_gen_irq_code(irq_code_t *, hc_device_t *, const hw_res_list_parsed_t *, int *);
+extern errno_t hc_gain_control(hc_device_t *);
+extern errno_t hc_start(hc_device_t *);
+extern errno_t hc_setup_roothub(hc_device_t *);
+extern errno_t hc_gone(hc_device_t *);
 
 extern void hc_enqueue_endpoint(hc_t *, const endpoint_t *);
 extern void hc_dequeue_endpoint(hc_t *, const endpoint_t *);
 
-extern int ohci_hc_schedule(usb_transfer_batch_t *);
-extern int ohci_hc_status(bus_t *, uint32_t *);
+extern errno_t ohci_hc_schedule(usb_transfer_batch_t *);
+extern errno_t ohci_hc_status(bus_t *, uint32_t *);
 extern void ohci_hc_interrupt(bus_t *, uint32_t);
 

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/ohci_bus.h

@@ -65 +65 @@
 } ohci_bus_t;
 
-int ohci_bus_init(ohci_bus_t *, hc_t *);
+errno_t ohci_bus_init(ohci_bus_t *, hc_t *);
 void ohci_ep_toggle_reset(endpoint_t *);
 

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,
+errno_t ohci_rh_init(ohci_rh_t *instance, ohci_regs_t *regs,
     fibril_mutex_t *guard, const char *name)
 {
@@ -176 +176 @@
  * 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);
@@ -214 +214 @@
  * processing of a postponed request.
  */
-int ohci_rh_interrupt(ohci_rh_t *instance)
+errno_t ohci_rh_interrupt(ohci_rh_t *instance)
 {
         fibril_mutex_lock(instance->guard);
@@ -259 +259 @@
  * @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)
@@ -282 +282 @@
  * @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)
@@ -312 +312 @@
  * @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)
@@ -336 +336 @@
  * @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)
@@ -400 +400 @@
  * @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)
@@ -451 +451 @@
  * 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

@@ -66 +66 @@
 } ohci_rh_t;
 
-int ohci_rh_init(ohci_rh_t *, ohci_regs_t *, fibril_mutex_t *, const char *);
-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 *, ohci_regs_t *, fibril_mutex_t *, const char *);
+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

@@ -97 +97 @@
 
 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);
 
 
@@ -110 +110 @@
  * @return Error code.
  */
-int hc_gen_irq_code(irq_code_t *code, hc_device_t *hcd, const hw_res_list_parsed_t *hw_res, int *irq)
+errno_t hc_gen_irq_code(irq_code_t *code, hc_device_t *hcd, const hw_res_list_parsed_t *hw_res, int *irq)
 {
         assert(code);
@@ -207 +207 @@
  * interrupt fibrils.
  */
-int hc_add(hc_device_t *hcd, const hw_res_list_parsed_t *hw_res)
+errno_t hc_add(hc_device_t *hcd, const hw_res_list_parsed_t *hw_res)
 {
         hc_t *instance = hcd_to_hc(hcd);
@@ -218 +218 @@
 
         /* 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) {
@@ -327 +327 @@
 }
 
-static int endpoint_register(endpoint_t *ep)
+static errno_t endpoint_register(endpoint_t *ep)
 {
         hc_t * const hc = bus_to_hc(endpoint_get_bus(ep));
 
-        const int err = usb2_bus_endpoint_register(&hc->bus_helper, ep);
+        const errno_t err = usb2_bus_endpoint_register(&hc->bus_helper, ep);
         if (err)
                 return err;
@@ -449 +449 @@
  *  - 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);
@@ -468 +468 @@
 
         /* 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.");
@@ -498 +498 @@
  * 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.", \
@@ -550 +550 @@
 }
 
-static int hc_status(bus_t *bus, uint32_t *status)
+static errno_t hc_status(bus_t *bus, uint32_t *status)
 {
         hc_t *instance = bus_to_hc(bus);
@@ -571 +571 @@
  * @return Error code
  */
-static int hc_schedule(usb_transfer_batch_t *batch)
+static errno_t hc_schedule(usb_transfer_batch_t *batch)
 {
         uhci_transfer_batch_t *uhci_batch = uhci_transfer_batch_get(batch);
@@ -586 +586 @@
                 return ENOTSUP;
 
-        int err;
+        errno_t err;
         if ((err = uhci_transfer_batch_prepare(uhci_batch)))
                 return err;
@@ -598 +598 @@
  * @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

@@ -157 +157 @@
 int hc_unschedule_batch(usb_transfer_batch_t *);
 
-extern int hc_add(hc_device_t *, const hw_res_list_parsed_t *);
-extern int hc_gen_irq_code(irq_code_t *, hc_device_t *, const hw_res_list_parsed_t *, int *);
-extern int hc_start(hc_device_t *);
-extern int hc_setup_roothub(hc_device_t *);
-extern int hc_gone(hc_device_t *);
+extern errno_t hc_add(hc_device_t *, const hw_res_list_parsed_t *);
+extern errno_t hc_gen_irq_code(irq_code_t *, hc_device_t *, const hw_res_list_parsed_t *, int *);
+extern errno_t hc_start(hc_device_t *);
+extern errno_t hc_setup_roothub(hc_device_t *);
+extern errno_t hc_gone(hc_device_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 disable_legacy(hc_device_t *);
+static errno_t disable_legacy(hc_device_t *);
 
 static const hc_driver_t uhci_driver = {
@@ -67 +67 @@
  * @return Error code.
  */
-static int disable_legacy(hc_device_t *hcd)
+static errno_t disable_legacy(hc_device_t *hcd)
 {
         assert(hcd);

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

@@ -55 +55 @@
  * 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 *);
-int transfer_list_init(transfer_list_t *, const char *);
+errno_t transfer_list_init(transfer_list_t *, const char *);
 void transfer_list_set_next(transfer_list_t *, transfer_list_t *);
-int transfer_list_add_batch(transfer_list_t *, uhci_transfer_batch_t *);
+errno_t transfer_list_add_batch(transfer_list_t *, uhci_transfer_batch_t *);
 void transfer_list_remove_batch(transfer_list_t *, uhci_transfer_batch_t *);
 void transfer_list_check_finished(transfer_list_t *);

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

@@ -79 +79 @@
  * @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);
@@ -99 +99 @@
  * 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);
@@ -189 +189 @@
  * 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)
@@ -224 +224 @@
  * @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)
@@ -263 +263 @@
  * @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)
@@ -336 +336 @@
  * @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)
@@ -398 +398 @@
  * 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'.",
@@ -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

@@ -101 +101 @@
  * Routine for adding a new device in USB2.
  */
-static int enumerate_device_usb2(usb_hub_port_t *port, async_exch_t *exch)
-{
-        int err;
+static errno_t enumerate_device_usb2(usb_hub_port_t *port, async_exch_t *exch)
+{
+        errno_t err;
 
         port_log(debug, port, "Requesting default address.");
@@ -145 +145 @@
  * Routine for adding a new device in USB 3.
  */
-static int enumerate_device_usb3(usb_hub_port_t *port, async_exch_t *exch)
-{
-        int err;
+static errno_t enumerate_device_usb3(usb_hub_port_t *port, async_exch_t *exch)
+{
+        errno_t err;
 
         port_log(debug, port, "Issuing a warm reset.");
@@ -170 +170 @@
 }
 
-static int enumerate_device(usb_port_t *port_base)
+static errno_t enumerate_device(usb_port_t *port_base)
 {
         usb_hub_port_t *port = get_hub_port(port_base);
@@ -181 +181 @@
         }
 
-        const int err = port->hub->speed == USB_SPEED_SUPER
+        const errno_t err = port->hub->speed == USB_SPEED_SUPER
                 ? enumerate_device_usb3(port, exch)
                 : enumerate_device_usb2(port, exch);

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

@@ -99 +99 @@
 };
 
-static int usb_set_first_configuration(usb_device_t *);
-static int usb_hub_process_hub_specific_info(usb_hub_dev_t *);
+static errno_t usb_set_first_configuration(usb_device_t *);
+static errno_t usb_hub_process_hub_specific_info(usb_hub_dev_t *);
 static void usb_hub_over_current(const usb_hub_dev_t *, usb_hub_status_t);
-static int usb_hub_polling_init(usb_hub_dev_t *, usb_endpoint_mapping_t *);
+static errno_t usb_hub_polling_init(usb_hub_dev_t *, usb_endpoint_mapping_t *);
 static void usb_hub_global_interrupt(const usb_hub_dev_t *);
 
 static bool usb_hub_polling_error_callback(usb_device_t *dev,
-        int err_code, void *arg)
+        errno_t err_code, void *arg)
 {
         assert(dev);
@@ -125 +125 @@
  * @return error code
  */
-int usb_hub_device_add(usb_device_t *usb_dev)
+errno_t usb_hub_device_add(usb_device_t *usb_dev)
 {
         int err;
@@ -198 +198 @@
 }
 
-static int usb_hub_cleanup(usb_hub_dev_t *hub)
+static errno_t usb_hub_cleanup(usb_hub_dev_t *hub)
 {
         free(hub->polling.buffer);
@@ -228 +228 @@
  * @return error code
  */
-int usb_hub_device_remove(usb_device_t *usb_dev)
+errno_t usb_hub_device_remove(usb_device_t *usb_dev)
 {
         assert(usb_dev);
@@ -249 +249 @@
  * @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);
@@ -270 +270 @@
  * @param mapping The mapping of Status Change Endpoint
  */
-static int usb_hub_polling_init(usb_hub_dev_t *hub_dev,
+static errno_t usb_hub_polling_init(usb_hub_dev_t *hub_dev,
         usb_endpoint_mapping_t *mapping)
 {
-        int err;
+        errno_t err;
         usb_polling_t *polling = &hub_dev->polling;
 
@@ -369 +369 @@
  * @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);
@@ -382 +382 @@
         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,
             desc_type, 0, 0, &descriptor,
@@ -436 +436 @@
  * @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);
@@ -462 +462 @@
         /* Set configuration. Use the configuration that was in
          * usb_device->descriptors.configuration i.e. The first one. */
-        int opResult = usb_request_set_configuration(
+        errno_t opResult = usb_request_set_configuration(
             usb_device_get_default_pipe(usb_device),
             config_descriptor->configuration_number);
@@ -500 +500 @@
         /* 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_set_port_feature(hub_dev, port,
+                const errno_t ret = usb_hub_set_port_feature(hub_dev, port,
                     USB_HUB_FEATURE_PORT_POWER);
                 if (ret != EOK) {
@@ -637 +637 @@
         /* 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);
@@ -655 +655 @@
                 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,
@@ -679 +679 @@
                  * 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

@@ -78 +78 @@
 extern const usb_endpoint_description_t *usb_hub_endpoints [];
 
-int usb_hub_device_add(usb_device_t *);
-int usb_hub_device_remove(usb_device_t *);
-int usb_hub_device_gone(usb_device_t *);
+errno_t usb_hub_device_add(usb_device_t *);
+errno_t usb_hub_device_remove(usb_device_t *);
+errno_t usb_hub_device_gone(usb_device_t *);
 
-int usb_hub_set_depth(const usb_hub_dev_t *);
-int usb_hub_get_port_status(const usb_hub_dev_t *, size_t, usb_port_status_t *);
-int usb_hub_set_port_feature(const usb_hub_dev_t *, size_t, usb_hub_class_feature_t);
-int usb_hub_clear_port_feature(const usb_hub_dev_t *, size_t, usb_hub_class_feature_t);
+errno_t usb_hub_set_depth(const usb_hub_dev_t *);
+errno_t usb_hub_get_port_status(const usb_hub_dev_t *, size_t, usb_port_status_t *);
+errno_t usb_hub_set_port_feature(const usb_hub_dev_t *, size_t, usb_hub_class_feature_t);
+errno_t usb_hub_clear_port_feature(const usb_hub_dev_t *, size_t, usb_hub_class_feature_t);
 
 bool hub_port_changes_callback(usb_device_t *, uint8_t *, size_t, void *);
 
-int usb_hub_reserve_default_address(usb_hub_dev_t *, async_exch_t *, usb_port_t *);
-int usb_hub_release_default_address(usb_hub_dev_t *, async_exch_t *);
+errno_t usb_hub_reserve_default_address(usb_hub_dev_t *, async_exch_t *, usb_port_t *);
+errno_t usb_hub_release_default_address(usb_hub_dev_t *, async_exch_t *);
 
 #endif

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'.", usb_device_get_name(dev));
@@ -82 +82 @@
  * @return Error code.
  */
-static int usbmid_device_remove(usb_device_t *dev)
+static errno_t usbmid_device_remove(usb_device_t *dev)
 {
         assert(dev);
@@ -89 +89 @@
 
         /* 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.",
@@ -103 +103 @@
 
                 /* Tell the child to go offline. */
-                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",
@@ -118 +118 @@
  * @return Error code.
  */
-static int usbmid_device_gone(usb_device_t *dev)
+static errno_t usbmid_device_gone(usb_device_t *dev)
 {
         assert(dev);
@@ -127 +127 @@
 
         /* 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.",
@@ -149 +149 @@
 }
 
-static int usbmid_function_offline(ddf_fun_t *fun)
+static errno_t usbmid_function_offline(ddf_fun_t *fun)
 {
         usb_device_t *usb_dev = ddf_dev_data_get(ddf_fun_get_dev(fun));

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

@@ -52 +52 @@
  * @return Error code.
  */
-static int usb_iface_description(ddf_fun_t *fun, usb_device_desc_t *desc)
+static errno_t usb_iface_description(ddf_fun_t *fun, usb_device_desc_t *desc)
 {
         usbmid_interface_t *iface = ddf_fun_data_get(fun);
@@ -64 +64 @@
 
         usb_device_desc_t tmp_desc;
-        const int ret = usb_get_my_description(exch, &tmp_desc);
+        const errno_t ret = usb_get_my_description(exch, &tmp_desc);
 
         if (ret == EOK && desc) {
@@ -86 +86 @@
 };
 
-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;
@@ -106 +106 @@
  * @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,
@@ -113 +113 @@
         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

@@ -50 +50 @@
 };
 
-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);
@@ -64 +64 @@
         }
         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);
@@ -73 +73 @@
 }
 
-static int vhc_dev_add(ddf_dev_t *dev)
+static errno_t vhc_dev_add(ddf_dev_t *dev)
 {
         /* Initialize generic structures */
-        int ret = hcd_ddf_setup_hc(dev, sizeof(vhc_data_t));
+        errno_t ret = hcd_ddf_setup_hc(dev, sizeof(vhc_data_t));
         if (ret != EOK) {
                 usb_log_error("Failed to init HCD structures: %s.",

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

@@ -61 +61 @@
 }
 
-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 = batch->dir;
@@ -97 +97 @@
 }
 
-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 = batch->dir;
@@ -146 +146 @@
 
 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);
@@ -192 +192 @@
 };
 
-int vhc_init(vhc_data_t *instance)
+errno_t vhc_init(vhc_data_t *instance)
 {
         assert(instance);
@@ -203 +203 @@
 }
 
-int vhc_schedule(usb_transfer_batch_t *batch)
+errno_t vhc_schedule(usb_transfer_batch_t *batch)
 {
         assert(batch);
@@ -233 +233 @@
 }
 
-int vhc_transfer_queue_processor(void *arg)
+errno_t vhc_transfer_queue_processor(void *arg)
 {
         vhc_virtdev_t *dev = arg;
@@ -248 +248 @@
                 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

@@ -90 +90 @@
     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 *);
-int vhc_schedule(usb_transfer_batch_t *);
-int vhc_transfer_queue_processor(void *arg);
+errno_t vhc_init(vhc_data_t *);
+errno_t vhc_schedule(usb_transfer_batch_t *);
+errno_t vhc_transfer_queue_processor(void *arg);
 
 #endif