Changes in uspace/drv/bus/usb/ohci/hc.c [507c6f3:acdb5bac] in mainline

File:

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

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

@@ -83 +83 @@
 };
 
-enum {
-        /** Number of PIO ranges used in IRQ code */
-        hc_irq_pio_range_count = 
-            sizeof(ohci_pio_ranges) / sizeof(irq_pio_range_t),
-
-        /** Number of commands used in IRQ code */
-        hc_irq_cmd_count =
-            sizeof(ohci_irq_commands) / sizeof(irq_cmd_t)
-};
-
 static void hc_gain_control(hc_t *instance);
 static void hc_start(hc_t *instance);
@@ -99 +89 @@
 static int interrupt_emulator(hc_t *instance);
 static int hc_schedule(hcd_t *hcd, usb_transfer_batch_t *batch);
+
+/** Get number of PIO ranges used in IRQ code.
+ * @return Number of ranges.
+ */
+size_t hc_irq_pio_range_count(void)
+{
+        return sizeof(ohci_pio_ranges) / sizeof(irq_pio_range_t);
+}
+
+/** Get number of commands used in IRQ code.
+ * @return Number of commands.
+ */
+size_t hc_irq_cmd_count(void)
+{
+        return sizeof(ohci_irq_commands) / sizeof(irq_cmd_t);
+}
 
 /** Generate IRQ code.
@@ -127 +133 @@
         cmds[3].addr = (void *) &registers->interrupt_status;
         OHCI_WR(cmds[1].value, OHCI_USED_INTERRUPTS);
-
-        return EOK;
-}
-
-/** Register interrupt handler.
- *
- * @param[in] device Host controller DDF device
- * @param[in] reg_base Register range base
- * @param[in] reg_size Register range size
- * @param[in] irq Interrupt number
- * @paran[in] handler Interrupt handler
- *
- * @return EOK on success or negative error code
- */
-int hc_register_irq_handler(ddf_dev_t *device, uintptr_t reg_base, size_t reg_size,
-    int irq, interrupt_handler_t handler)
-{
-        int rc;
-
-        irq_pio_range_t irq_ranges[hc_irq_pio_range_count];
-        irq_cmd_t irq_cmds[hc_irq_cmd_count];
-
-        irq_code_t irq_code = {
-                .rangecount = hc_irq_pio_range_count,
-                .ranges = irq_ranges,
-                .cmdcount = hc_irq_cmd_count,
-                .cmds = irq_cmds
-        };
-
-        rc = hc_get_irq_code(irq_ranges, sizeof(irq_ranges), irq_cmds,
-            sizeof(irq_cmds), reg_base, reg_size);
-        if (rc != EOK) {
-                usb_log_error("Failed to generate IRQ code: %s.\n",
-                    str_error(rc));
-                return rc;
-        }
-
-        /* Register handler to avoid interrupt lockup */
-        rc = register_interrupt_handler(device, irq, handler, &irq_code);
-        if (rc != EOK) {
-                usb_log_error("Failed to register interrupt handler: %s.\n",
-                    str_error(rc));
-                return rc;
-        }
 
         return EOK;