Changeset 8e7c9fe in mainline for uspace/srv/klog/klog.c

Timestamp:

2014-09-12T03:45:25Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

• uspace/srv/klog/klog.c (modified) (5 diffs)

uspace/srv/klog/klog.c

@@ -40 +40 @@
 #include <as.h>
 #include <ddi.h>
-#include <event.h>
 #include <errno.h>
 #include <str_error.h>
@@ -193 +192 @@
  *
  */
-static void notification_received(ipc_callid_t callid, ipc_call_t *call)
+static void klog_notification_received(ipc_callid_t callid, ipc_call_t *call,
+    void *arg)
 {
         /*
@@ -205 +205 @@
         producer();
         
-        event_unmask(EVENT_KLOG);
+        async_event_unmask(EVENT_KLOG);
         fibril_mutex_unlock(&mtx);
 }
@@ -229 +229 @@
         
         prodcons_initialize(&pc);
-        async_set_interrupt_received(notification_received);
-        rc = event_subscribe(EVENT_KLOG, 0);
+        rc = async_event_subscribe(EVENT_KLOG, klog_notification_received, NULL);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR,
@@ -245 +244 @@
         
         fibril_add_ready(fid);
-        event_unmask(EVENT_KLOG);
+        async_event_unmask(EVENT_KLOG);
         
         fibril_mutex_lock(&mtx);