Changeset 13a638d in mainline for kernel/generic/src/console

Timestamp:

2009-04-06T19:32:22Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

3636964

Parents:

149d14e5

Message:

move event notification to the ipc directory (where it probably belogs to, side-by-side to IRQ notifications)
cleanup the notification code a little bit (there is probably no need to allocate two structured dynamically)

Location:

kernel/generic/src/console

Files:

• cmd.c (modified) (1 diff)
• console.c (modified) (4 diffs)

kernel/generic/src/console/cmd.c

@@ -65 +65 @@
 #include <ipc/ipc.h>
 #include <ipc/irq.h>
-#include <event/event.h>
+#include <ipc/event.h>
 #include <symtab.h>
 #include <errno.h>

kernel/generic/src/console/console.c

@@ -42 +42 @@
 #include <ddi/irq.h>
 #include <ddi/ddi.h>
-#include <event/event.h>
+#include <ipc/event.h>
 #include <ipc/irq.h>
 #include <arch.h>
@@ -53 +53 @@
 #include <string.h>
 
-#define KLOG_SIZE     PAGE_SIZE
-#define KLOG_LENGTH   (KLOG_SIZE / sizeof(wchar_t))
+#define KLOG_PAGES    4
+#define KLOG_LENGTH   (KLOG_PAGES * PAGE_SIZE / sizeof(wchar_t))
 #define KLOG_LATENCY  8
 
@@ -96 +96 @@
         
         ASSERT((uintptr_t) faddr % FRAME_SIZE == 0);
-        ASSERT(KLOG_SIZE % FRAME_SIZE == 0);
         
         klog_parea.pbase = (uintptr_t) faddr;
@@ -103 +102 @@
         
         sysinfo_set_item_val("klog.faddr", NULL, (unative_t) faddr);
-        sysinfo_set_item_val("klog.pages", NULL, SIZE2FRAMES(sizeof(klog)));
+        sysinfo_set_item_val("klog.pages", NULL, KLOG_PAGES);
         
         spinlock_lock(&klog_lock);