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

Timestamp:

2009-03-24T14:43:25Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

8f29e336

Parents:

74c8da2c

Message:

Unicode aware printf and family functions
(this breaks some things, but will be fixed soon)

File:

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

kernel/generic/src/console/console.c

@@ -47 +47 @@
 #include <func.h>
 #include <print.h>
+#include <putchar.h>
 #include <atomic.h>
 #include <syscall/copy.h>
 #include <errno.h>
 
-#define KLOG_SIZE PAGE_SIZE
-#define KLOG_LATENCY 8
+#define KLOG_SIZE     PAGE_SIZE
+#define KLOG_LATENCY  8
 
 /** Kernel log cyclic buffer */
-static char klog[KLOG_SIZE] __attribute__ ((aligned (PAGE_SIZE)));
+static wchar_t klog[KLOG_SIZE] __attribute__ ((aligned (PAGE_SIZE)));
 
 /** Kernel log initialized */
@@ -96 +97 @@
         
         klog_parea.pbase = (uintptr_t) faddr;
-        klog_parea.frames = SIZE2FRAMES(KLOG_SIZE);
+        klog_parea.frames = SIZE2FRAMES(sizeof(klog));
         ddi_parea_register(&klog_parea);
         
         sysinfo_set_item_val("klog.faddr", NULL, (unative_t) faddr);
-        sysinfo_set_item_val("klog.pages", NULL, SIZE2FRAMES(KLOG_SIZE));
+        sysinfo_set_item_val("klog.pages", NULL, SIZE2FRAMES(sizeof(klog)));
         
         spinlock_lock(&klog_lock);
@@ -246 +247 @@
 }
 
-void putchar(char c)
+void putchar(const wchar_t ch)
 {
         spinlock_lock(&klog_lock);
@@ -259 +260 @@
         
         /* Store character in the cyclic kernel log */
-        klog[(klog_start + klog_len) % KLOG_SIZE] = c;
+        klog[(klog_start + klog_len) % KLOG_SIZE] = ch;
         if (klog_len < KLOG_SIZE)
                 klog_len++;
@@ -266 +267 @@
         
         if ((stdout) && (stdout->op->write))
-                stdout->op->write(stdout, c, silent);
+                stdout->op->write(stdout, ch, silent);
         else {
                 /* The character is just in the kernel log */
@@ -279 +280 @@
         /* Check notify uspace to update */
         bool update;
-        if ((klog_uspace > KLOG_LATENCY) || (c == '\n'))
+        if ((klog_uspace > KLOG_LATENCY) || (ch == '\n'))
                 update = true;
         else
@@ -295 +296 @@
  *
  */
-unative_t sys_klog(int fd, const void * buf, size_t count) 
+unative_t sys_klog(int fd, const void * buf, size_t count)
 {
         char *data;
         int rc;
-
+        
         if (count > PAGE_SIZE)
                 return ELIMIT;