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

File:

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

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

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