Changeset 05641a9e in mainline for uspace

Timestamp:

2009-03-23T21:46:40Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c3ebc47

Parents:

a5e5030

Message:

Revive kernel notifications.

Location:

uspace

Files:

• app/klog/klog.c (modified) (2 diffs)
• app/trace/syscalls.c (modified) (1 diff)
• lib/libc/Makefile (modified) (1 diff)
• lib/libc/generic/event.c (added)
• lib/libc/include/event.h (added)
• srv/console/console.c (modified) (2 diffs)

uspace/app/klog/klog.c

@@ -43 +43 @@
 #include <io/stream.h>
 #include <console.h>
+#include <event.h>
 #include <errno.h>
 
@@ -83 +84 @@
         }
         
-//      int inr = sysinfo_value("klog.inr");
-//      if (ipc_register_irq(inr, devno, 0, NULL) != EOK) {
-//              printf(NAME ": Error registering klog notifications\n");
-//              return -1;
-//      }
+        if (event_subscribe(EVENT_KLOG, 0) != EOK) {
+                printf(NAME ": Error registering klog notifications\n");
+                return -1;
+        }
         
         async_set_interrupt_received(interrupt_received);

uspace/app/trace/syscalls.c

@@ -66 +66 @@
     [SYS_IPC_UNREGISTER_IRQ] = { "ipc_unregister_irq",  2,      V_ERRNO },
 
+    [SYS_EVENT_SUBSCRIBE] = { "event_subscribe",        2,      V_ERRNO },
+
     [SYS_CAP_GRANT] = { "cap_grant",                    2,      V_ERRNO },
     [SYS_CAP_REVOKE] = { "cap_revoke",                  2,      V_ERRNO },

uspace/lib/libc/Makefile

@@ -48 +48 @@
         generic/cap.c \
         generic/console.c \
+        generic/event.c \
         generic/mem.c \
         generic/string.c \

uspace/srv/console/console.c

@@ -50 +50 @@
 #include <stdio.h>
 #include <sysinfo.h>
+#include <event.h>
 
 #include "console.h"
@@ -730 +731 @@
         
         /* Receive kernel notifications */
-//      if (sysinfo_value("kconsole.present")) {
-//              int inr = sysinfo_value("kconsole.inr");
-//              if (ipc_register_irq(inr, device_assign_devno(), 0, NULL) != EOK)
-//                      printf(NAME ": Error registering kconsole notifications\n");
-//              
-//              async_set_interrupt_received(interrupt_received);
-//      }
+        if (event_subscribe(EVENT_KCONSOLE, 0) != EOK)
+                printf(NAME ": Error registering kconsole notifications\n");
+                
+        async_set_interrupt_received(interrupt_received);
         
         // FIXME: avoid connectiong to itself, keep using klog