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

File:

• uspace/drv/bus/usb/ohci/hc.c (modified) (11 diffs)

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)
+errno_t ohci_hc_gen_irq_code(irq_code_t *code, const hw_res_list_parsed_t *hw_res, int *irq)
 {
         assert(code);
@@ -141 +141 @@
             RNGABSPTR(regs), RNGSZ(regs), hw_res->irqs.irqs[0]);
 
-        return hw_res->irqs.irqs[0];
+        *irq = hw_res->irqs.irqs[0];
+        return EOK;
 }
 
@@ -151 +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);
@@ -159 +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) {
@@ -268 +269 @@
 }
 
-int ohci_hc_status(hcd_t *hcd, uint32_t *status)
+errno_t ohci_hc_status(hcd_t *hcd, uint32_t *status)
 {
         assert(hcd);
@@ -288 +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);
@@ -517 +518 @@
  * @return Error code
  */
-int hc_init_transfer_lists(hc_t *instance)
+errno_t hc_init_transfer_lists(hc_t *instance)
 {
         assert(instance);
@@ -523 +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", \
@@ -551 +552 @@
  * @return Error code.
  */
-int hc_init_memory(hc_t *instance)
+errno_t hc_init_memory(hc_t *instance)
 {
         assert(instance);
@@ -557 +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;