Changeset 4bfcf22 in mainline for uspace/drv/bus/usb/ehci

Timestamp:

2014-01-18T22:01:10Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9f6cb910

Parents:

a5361fb

Message:

ehci,ohci,uhci: Remove interrupt handler wrappers

Location:

uspace/drv/bus/usb/ehci

Files:

• hc.c (modified) (1 diff)
• hc.h (modified) (1 diff)
• main.c (modified) (2 diffs)

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

@@ -240 +240 @@
  * @param[in] status Value of the status register at the time of interrupt.
  */
-void hc_interrupt(hc_t *instance, uint32_t status)
-{
+void hc_interrupt(hcd_t *hcd, uint32_t status)
+{
+        assert(hcd);
+        hc_t *instance = hcd->driver.data;
         status = EHCI_RD(status);
         assert(instance);

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

@@ -78 +78 @@
 void hc_enqueue_endpoint(hc_t *instance, const endpoint_t *ep);
 void hc_dequeue_endpoint(hc_t *instance, const endpoint_t *ep);
+
 int hc_schedule(hcd_t *hcd, usb_transfer_batch_t *batch);
-
-void hc_interrupt(hc_t *instance, uint32_t status);
+void hc_interrupt(hcd_t *hcd, uint32_t status);
 #endif
 /**

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

@@ -47 +47 @@
 
 #define NAME "ehci"
-// TODO: This should be merged to hc_interrupt
-static void ehci_interrupt(hcd_t *hcd, uint32_t status)
-{
-        assert(hcd);
-        if (hcd->driver.data)
-                hc_interrupt(hcd->driver.data, status);
-}
 
 static int ehci_driver_init(hcd_t *hcd, const hw_res_list_parsed_t *res, bool irq)
@@ -67 +60 @@
         if (ret == EOK)
                 hcd_set_implementation(hcd, instance, hc_schedule,
-                    NULL, NULL, ehci_interrupt, NULL);
+                    NULL, NULL, hc_interrupt, NULL);
         return ret;
 }