Changes in uspace/drv/bus/usb/ehci/hc.c [8d2dd7f2:b7fd2a0] in mainline

File:

• uspace/drv/bus/usb/ehci/hc.c (modified) (9 diffs)

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

@@ -90 +90 @@
 
 static void hc_start(hc_t *instance);
-static int hc_init_memory(hc_t *instance);
+static errno_t hc_init_memory(hc_t *instance);
 
 /** Generate IRQ code.
@@ -96 +96 @@
  * @param[in] hw_res Device's resources.
  *
+ * @param[out] irq
+ *
  * @return Error code.
  */
-int ehci_hc_gen_irq_code(irq_code_t *code, const hw_res_list_parsed_t *hw_res)
+errno_t ehci_hc_gen_irq_code(irq_code_t *code, const hw_res_list_parsed_t *hw_res, int *irq)
 {
         assert(code);
@@ -130 +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);
@@ -146 +148 @@
             RNGABSPTR(regs), RNGSZ(regs), hw_res->irqs.irqs[0]);
 
-        return hw_res->irqs.irqs[0];
+        *irq = hw_res->irqs.irqs[0];
+        return EOK;
 }
 
@@ -156 +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);
@@ -165 +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) {
@@ -270 +273 @@
 }
 
-int ehci_hc_status(hcd_t *hcd, uint32_t *status)
+errno_t ehci_hc_status(hcd_t *hcd, uint32_t *status)
 {
         assert(hcd);
@@ -291 +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);
@@ -442 +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",