Changeset 772a172 in mainline

Timestamp:

2013-09-21T05:22:43Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

f65d9cc

Parents:

19d21728

Message:

ohci,uhci: Switch to library provided irq setup routine.

Location:

uspace/drv/bus/usb

Files:

• ohci/hc.c (modified) (1 diff)
• ohci/hc.h (modified) (1 diff)
• ohci/ohci.c (modified) (4 diffs)
• uhci/hc.c (modified) (1 diff)
• uhci/hc.h (modified) (1 diff)
• uhci/uhci.c (modified) (2 diffs)

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

@@ -125 +125 @@
         code->cmds[3].addr = (void *) &registers->interrupt_status;
         OHCI_WR(code->cmds[1].value, OHCI_USED_INTERRUPTS);
-
-        return EOK;
-}
-
-/** Register interrupt handler.
- *
- * @param[in] device Host controller DDF device
- * @param[in] regs Register range
- * @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, addr_range_t *regs, int irq,
-    interrupt_handler_t handler)
-{
-        irq_code_t irq_code = { 0 };
-
-        int ret = hc_gen_irq_code(&irq_code, regs);
-        if (ret != EOK) {
-                usb_log_error("Failed to generate IRQ code: %s.\n",
-                    str_error(ret));
-                return ret;
-        }
-
-        //TODO we leak memory here
-
-        /* Register handler to avoid interrupt lockup */
-        ret = register_interrupt_handler(device, irq, handler, &irq_code);
-        if (ret != EOK) {
-                usb_log_error("Failed to register interrupt handler: %s.\n",
-                    str_error(ret));
-                return ret;
-        }
 
         return EOK;

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

@@ -73 +73 @@
 
 int hc_gen_irq_code(irq_code_t *code, addr_range_t *regs);
-int hc_register_irq_handler(ddf_dev_t *, addr_range_t *, int,
-    interrupt_handler_t);
 int hc_register_hub(hc_t *instance, ddf_fun_t *hub_fun);
 int hc_init(hc_t *instance, addr_range_t *regs, bool interrupts);

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

@@ -103 +103 @@
         }
 
-        ret = hc_register_irq_handler(device, &regs, irq, irq_handler);
-        if (ret != EOK) {
-                usb_log_error("Failed to register interrupt handler: %s.\n",
-                    str_error(ret));
+        hc_t *hc = malloc(sizeof(hc_t));
+        if (!hc) {
+                usb_log_error("Failed to allocate driver structure.\n");
+                ret = ENOMEM;
                 goto ddf_hc_clean;
         }
@@ -112 +112 @@
         /* Try to enable interrupts */
         bool interrupts = false;
-        ret = hcd_ddf_enable_interrupts(device);
+        ret = hcd_ddf_setup_interrupts(device, &regs, irq, irq_handler,
+            hc_gen_irq_code);
         if (ret != EOK) {
                 usb_log_warning("Failed to enable interrupts: %s."
@@ -123 +124 @@
         }
 
-        hc_t *hc = malloc(sizeof(hc_t));
-        if (!hc) {
-                usb_log_error("Failed to allocate driver structure.\n");
-                ret = ENOMEM;
-                goto unregister_irq;
-        }
-
         /* Initialize OHCI HC */
         ret = hc_init(hc, &regs, interrupts);
         if (ret != EOK) {
                 usb_log_error("Failed to init hc: %s.\n", str_error(ret));
-                goto hc_free;
+                goto unregister_irq;
         }
 
@@ -147 +141 @@
                     str_error(ret));
                 hc_fini(hc);
-hc_free:
-                free(hc);
 unregister_irq:
                 unregister_interrupt_handler(device, irq);
+                free(hc);
 ddf_hc_clean:
                 hcd_ddf_clean_hc(device);

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

@@ -127 +127 @@
 }
 
-/** Register interrupt handler.
- *
- * @param[in] device Host controller DDF device
- * @param[in] regs Register range
- * @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, addr_range_t *regs, int irq,
-    interrupt_handler_t handler)
-{
-        assert(device);
-
-        irq_code_t irq_code = { 0 };
-
-        int ret = hc_gen_irq_code(&irq_code, regs);
-        if (ret != EOK) {
-                usb_log_error("Failed to generate IRQ commands: %s.\n",
-                    str_error(ret));
-                return ret;
-        }
-        //TODO we leak memory here
-
-        /* Register handler to avoid interrupt lockup */
-        ret = register_interrupt_handler(device, irq, handler, &irq_code);
-        if (ret != EOK) {
-                usb_log_error("Failed to register interrupt handler: %s.\n",
-                    str_error(ret));
-                return ret;
-        }
-
-        return EOK;
-}
-
 /** Take action based on the interrupt cause.
  *

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

@@ -124 +124 @@
 } hc_t;
 
-int hc_register_irq_handler(ddf_dev_t *, addr_range_t *, int,
-    interrupt_handler_t);
 int hc_gen_irq_code(irq_code_t *code, addr_range_t *regs);
 void hc_interrupt(hc_t *instance, uint16_t status);

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

@@ -109 +109 @@
         }
 
-        ret = hc_register_irq_handler(device, &regs, irq, irq_handler);
-        if (ret != EOK) {
-                usb_log_error("Failed to register interrupt handler: %s.\n",
-                    str_error(ret));
-                goto hc_free;
-        }
-
         bool interrupts = false;
-        ret = hcd_ddf_enable_interrupts(device);
+        ret = hcd_ddf_setup_interrupts(device, &regs, irq, irq_handler,
+            hc_gen_irq_code);
         if (ret != EOK) {
                 usb_log_warning("Failed to enable interrupts: %s."
@@ -154 +148 @@
 irq_unregister:
                 unregister_interrupt_handler(device, irq);
-hc_free:
                 free(hc);
 ddf_hc_clean: