Changeset 8820544 in mainline for uspace/drv/char

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

Files:

• i8042/i8042.c (modified) (3 diffs)
• i8042/i8042.h (modified) (1 diff)
• i8042/main.c (modified) (1 diff)
• ns8250/ns8250.c (modified) (1 diff)

uspace/drv/char/i8042/i8042.c

@@ -64 +64 @@
 #define i8042_KBD_TRANSLATE  0x40  /* Use this to switch to XT scancodes */
 
-void default_handler(ddf_fun_t *, ipc_callid_t, ipc_call_t *);
+static void default_handler(ddf_fun_t *, ipc_callid_t, ipc_call_t *);
 
 /** Port function operations. */
 static ddf_dev_ops_t ops = {
-        .default_handler = default_handler,
+        .default_handler = default_handler
 };
 
@@ -123 +123 @@
  * Write new data to the corresponding buffer.
  *
- * @param dev  Device that caued the interrupt.
  * @param iid  Call id.
  * @param call pointerr to call data.
- *
- */
-static void i8042_irq_handler(ddf_dev_t *dev, ipc_callid_t iid,
-    ipc_call_t *call)
+ * @param dev  Device that caued the interrupt.
+ *
+ */
+static void i8042_irq_handler(ipc_callid_t iid, ipc_call_t *call,
+    ddf_dev_t *dev)
 {
         i8042_t *controller = dev_i8042(dev);
@@ -361 +361 @@
  *
  */
-void default_handler(ddf_fun_t *fun, ipc_callid_t id, ipc_call_t *call)
+static void default_handler(ddf_fun_t *fun, ipc_callid_t id, ipc_call_t *call)
 {
         const sysarg_t method = IPC_GET_IMETHOD(*call);

uspace/drv/char/i8042/i8042.h

@@ -68 +68 @@
 } i8042_t;
 
-int i8042_init(i8042_t *, addr_range_t *, int, int, ddf_dev_t *);
+extern int i8042_init(i8042_t *, addr_range_t *, int, int, ddf_dev_t *);
 
 #endif

uspace/drv/char/i8042/main.c

@@ -157 +157 @@
          * interrupt storms when the default large stacks are used.
          */
-        async_set_interrupt_handler_stack_size(PAGE_SIZE);
+        async_set_notification_handler_stack_size(PAGE_SIZE);
 
         return ddf_driver_main(&i8042_driver);

uspace/drv/char/ns8250/ns8250.c

@@ -764 +764 @@
  * data and reading the line status register.
  *
- * @param dev           The serial port device.
- */
-static inline void ns8250_interrupt_handler(ddf_dev_t *dev, ipc_callid_t iid,
-    ipc_call_t *icall)
+ * @param dev The serial port device.
+ *
+ */
+static inline void ns8250_interrupt_handler(ipc_callid_t iid, ipc_call_t *icall,
+    ddf_dev_t *dev)
 {
         ns8250_t *ns = dev_ns8250(dev);