Changes in kernel/generic/src/console/console.c [da52547:9c70ed6] in mainline

File:

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

kernel/generic/src/console/console.c

@@ -39 +39 @@
 #include <synch/waitq.h>
 #include <synch/spinlock.h>
-#include <typedefs.h>
+#include <arch/types.h>
 #include <ddi/irq.h>
 #include <ddi/ddi.h>
@@ -45 +45 @@
 #include <ipc/irq.h>
 #include <arch.h>
-#include <panic.h>
 #include <print.h>
 #include <putchar.h>
@@ -51 +50 @@
 #include <syscall/copy.h>
 #include <errno.h>
-#include <str.h>
+#include <string.h>
 
 #define KLOG_PAGES    4
@@ -62 +61 @@
 /** Kernel log initialized */
 static bool klog_inited = false;
-
 /** First kernel log characters */
 static size_t klog_start = 0;
-
 /** Number of valid kernel log characters */
 static size_t klog_len = 0;
-
 /** Number of stored (not printed) kernel log characters */
 static size_t klog_stored = 0;
-
 /** Number of stored kernel log characters for uspace */
 static size_t klog_uspace = 0;
@@ -88 +83 @@
 };
 
-static void stdout_write(outdev_t *, wchar_t, bool);
-static void stdout_redraw(outdev_t *);
+static void stdout_write(outdev_t *dev, wchar_t ch, bool silent);
+static void stdout_redraw(outdev_t *dev);
 
 static outdev_operations_t stdout_ops = {
@@ -178 +173 @@
                 stdout->op->redraw(stdout);
         
-        if ((stdin) && (prev)) {
-                /*
-                 * Force the console to print the prompt.
-                 */
+        /* Force the console to print the prompt */
+        if ((stdin) && (prev))
                 indev_push_character(stdin, '\n');
-        }
 }
 
@@ -294 +286 @@
                 stdout->op->write(stdout, ch, silent);
         else {
-                /*
-                 * No standard output routine defined yet.
-                 * The character is still stored in the kernel log
-                 * for possible future output.
-                 *
-                 * The early_putchar() function is used to output
-                 * the character for low-level debugging purposes.
-                 * Note that the early_putc() function might be
-                 * a no-op on certain hardware configurations.
-                 *
-                 */
-                early_putchar(ch);
-                
+                /* The character is just in the kernel log */
                 if (klog_stored < klog_len)
                         klog_stored++;