Changeset eb522e8 in mainline for kernel/generic/src/console/console.c

Timestamp:

2011-06-01T08:43:42Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

8d6c1f1

Parents:

9e2e715 (diff), e51a514 (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:

Huuuuuge merge from development - all the work actually

File:

• kernel/generic/src/console/console.c (modified) (7 diffs)

kernel/generic/src/console/console.c

@@ -53 +53 @@
 #include <str.h>
 
-#define KLOG_PAGES    4
+#define KLOG_PAGES    8
 #define KLOG_LENGTH   (KLOG_PAGES * PAGE_SIZE / sizeof(wchar_t))
 #define KLOG_LATENCY  8
@@ -160 +160 @@
         klog_parea.pbase = (uintptr_t) faddr;
         klog_parea.frames = SIZE2FRAMES(sizeof(klog));
+        klog_parea.unpriv = false;
         ddi_parea_register(&klog_parea);
         
-        sysinfo_set_item_val("klog.faddr", NULL, (unative_t) faddr);
+        sysinfo_set_item_val("klog.faddr", NULL, (sysarg_t) faddr);
         sysinfo_set_item_val("klog.pages", NULL, KLOG_PAGES);
+
+        event_set_unmask_callback(EVENT_KLOG, klog_update);
         
         spinlock_lock(&klog_lock);
@@ -193 +196 @@
 
 /** Tell kernel to get keyboard/console access again */
-unative_t sys_debug_enable_console(void)
+sysarg_t sys_debug_enable_console(void)
 {
 #ifdef CONFIG_KCONSOLE
@@ -204 +207 @@
 
 /** Tell kernel to relinquish keyboard/console access */
-unative_t sys_debug_disable_console(void)
+sysarg_t sys_debug_disable_console(void)
 {
         release_console();
@@ -264 +267 @@
         spinlock_lock(&klog_lock);
         
-        if ((klog_inited) && (event_is_subscribed(EVENT_KLOG)) && (klog_uspace > 0)) {
-                event_notify_3(EVENT_KLOG, klog_start, klog_len, klog_uspace);
-                klog_uspace = 0;
+        if ((klog_inited) && (klog_uspace > 0)) {
+                if (event_notify_3(EVENT_KLOG, true, klog_start, klog_len,
+                    klog_uspace) == EOK)
+                        klog_uspace = 0;
         }
         
@@ -333 +337 @@
  *
  */
-unative_t sys_klog(int fd, const void *buf, size_t size)
+sysarg_t sys_klog(int fd, const void *buf, size_t size)
 {
         char *data;
@@ -339 +343 @@
         
         if (size > PAGE_SIZE)
-                return (unative_t) ELIMIT;
+                return (sysarg_t) ELIMIT;
         
         if (size > 0) {
                 data = (char *) malloc(size + 1, 0);
                 if (!data)
-                        return (unative_t) ENOMEM;
+                        return (sysarg_t) ENOMEM;
                 
                 rc = copy_from_uspace(data, buf, size);
                 if (rc) {
                         free(data);
-                        return (unative_t) rc;
+                        return (sysarg_t) rc;
                 }
                 data[size] = 0;