Changeset 171f9a1 in mainline for kernel/generic/src/console/console.c

Timestamp:

2009-04-03T20:39:33Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

cb01e1e

Parents:

7a2c479

Message:

Character encoding/decoding un uspace. Partially fix klog application.

File:

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

kernel/generic/src/console/console.c

@@ -54 +54 @@
 
 #define KLOG_SIZE     PAGE_SIZE
+#define KLOG_LENGTH   (KLOG_SIZE / sizeof(wchar_t))
 #define KLOG_LATENCY  8
 
 /** Kernel log cyclic buffer */
-static wchar_t klog[KLOG_SIZE] __attribute__ ((aligned (PAGE_SIZE)));
+static wchar_t klog[KLOG_LENGTH] __attribute__ ((aligned (PAGE_SIZE)));
 
 /** Kernel log initialized */
@@ -258 +259 @@
                 index_t i;
                 for (i = klog_len - klog_stored; i < klog_len; i++)
-                        stdout->op->write(stdout, klog[(klog_start + i) % KLOG_SIZE], silent);
+                        stdout->op->write(stdout, klog[(klog_start + i) % KLOG_LENGTH], silent);
                 klog_stored = 0;
         }
         
         /* Store character in the cyclic kernel log */
-        klog[(klog_start + klog_len) % KLOG_SIZE] = ch;
-        if (klog_len < KLOG_SIZE)
+        klog[(klog_start + klog_len) % KLOG_LENGTH] = ch;
+        if (klog_len < KLOG_LENGTH)
                 klog_len++;
         else
-                klog_start = (klog_start + 1) % KLOG_SIZE;
+                klog_start = (klog_start + 1) % KLOG_LENGTH;
         
         if ((stdout) && (stdout->op->write))