Changeset 8820544 in mainline for uspace/app/kio/kio.c

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)

File:

• uspace/app/kio/kio.c (modified) (6 diffs)

uspace/app/kio/kio.c

@@ -39 +39 @@
 #include <as.h>
 #include <ddi.h>
-#include <event.h>
 #include <errno.h>
 #include <str_error.h>
@@ -149 +148 @@
  *
  */
-static void notification_received(ipc_callid_t callid, ipc_call_t *call)
+static void kio_notification_handler(ipc_callid_t callid, ipc_call_t *call,
+    void *arg)
 {
         /*
@@ -181 +181 @@
                 producer(kio_stored, kio + offset);
         
-        event_unmask(EVENT_KIO);
+        async_event_unmask(EVENT_KIO);
         fibril_mutex_unlock(&mtx);
 }
@@ -214 +214 @@
         
         prodcons_initialize(&pc);
-        async_set_interrupt_received(notification_received);
-        rc = event_subscribe(EVENT_KIO, 0);
+        rc = async_event_subscribe(EVENT_KIO, kio_notification_handler, NULL);
         if (rc != EOK) {
                 fprintf(stderr, "%s: Unable to register kio notifications\n",
@@ -233 +232 @@
                 fprintf(stderr, "%s: Could not create input\n", NAME);
                 return ENOMEM;
-        }       
+        }
 
         fibril_add_ready(fid);
-        event_unmask(EVENT_KIO);
+        async_event_unmask(EVENT_KIO);
         kio_update();
         
@@ -251 +250 @@
                 free(str);
         }
- 
+
         if (rc == ENOENT)
-                rc = EOK;       
+                rc = EOK;
 
         return EOK;