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

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/uhci

Files:

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

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

@@ -146 +146 @@
 /** Take action based on the interrupt cause.
  *
- * @param[in] instance UHCI structure to use.
+ * @param[in] hcd HCD structure to use.
  * @param[in] status Value of the status register at the time of interrupt.
  *
@@ -154 +154 @@
  * - resume from suspend state (not implemented)
  */
-void hc_interrupt(hc_t *instance, uint16_t status)
-{
+void hc_interrupt(hcd_t *hcd, uint32_t status)
+{
+        assert(hcd);
+        hc_t *instance = hcd->driver.data;
         assert(instance);
         /* Lower 2 bits are transaction error and transaction complete */

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

@@ -127 +127 @@
 int hc_gen_irq_code(irq_code_t *code, const hw_res_list_parsed_t *hw_res);
 
-void hc_interrupt(hc_t *instance, uint16_t status);
+void hc_interrupt(hcd_t *hcd, uint32_t status);
 int hc_status(hcd_t *hcd, uint32_t *status);
 int hc_schedule(hcd_t *hcd, usb_transfer_batch_t *batch);

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

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