Changeset 8820544 in mainline for uspace/drv/bus

Timestamp:

2014-08-16T00:02:04Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

35b8bfe, 8cd680c

Parents:

83f29e0

Message:

support for kernel notification multiplexing in the async framework

• rename SYS_EVENT_* and SYS_IRQ_* syscalls to unify the terminology
• add SYS_IPC_EVENT_UNSUBSCRIBE
• remove IRQ handler multiplexing from DDF, the generic mechanism replaces it (unfortunatelly the order of arguments used by interrupt_handler_t needs to be permutated to align with the async framework conventions)

Location:

uspace/drv/bus/usb

Files:

• ohci/ohci.c (modified) (2 diffs)
• uhci/hc.c (modified) (2 diffs)
• uhci/uhci.c (modified) (2 diffs)

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

@@ -59 +59 @@
 /** IRQ handling callback, identifies device
  *
- * @param[in] dev DDF instance of the device to use.
  * @param[in] iid (Unused).
  * @param[in] call Pointer to the call that represents interrupt.
- */
-static void irq_handler(ddf_dev_t *dev, ipc_callid_t iid, ipc_call_t *call)
+ * @param[in] dev DDF instance of the device to use.
+ *
+ */
+static void irq_handler(ipc_callid_t iid, ipc_call_t *call, ddf_dev_t *dev)
 {
         assert(dev);
-
+        
         ohci_t *ohci = dev_to_ohci(dev);
         if (!ohci) {
@@ -72 +73 @@
                 return;
         }
+        
         const uint16_t status = IPC_GET_ARG1(*call);
         hc_interrupt(&ohci->hc, status);

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

@@ -151 +151 @@
                 return rc;
         }
-
+        
         irq_code_t irq_code = {
                 .rangecount = hc_irq_pio_range_count,
@@ -158 +158 @@
                 .cmds = irq_cmds
         };
-
-        /* 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;
-        }
-
+        
+        /* 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;
 }

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

@@ -69 +69 @@
 /** IRQ handling callback, forward status from call to diver structure.
  *
- * @param[in] dev DDF instance of the device to use.
  * @param[in] iid (Unused).
  * @param[in] call Pointer to the call from kernel.
- */
-static void irq_handler(ddf_dev_t *dev, ipc_callid_t iid, ipc_call_t *call)
+ * @param[in] dev DDF instance of the device to use.
+ *
+ */
+static void irq_handler(ipc_callid_t iid, ipc_call_t *call, ddf_dev_t *dev)
 {
         assert(dev);
+        
         uhci_t *uhci = dev_to_uhci(dev);
         if (!uhci) {
@@ -81 +83 @@
                 return;
         }
+        
         const uint16_t status = IPC_GET_ARG1(*call);
         hc_interrupt(&uhci->hc, status);