Changes in kernel/generic/src/console/console.c [d7533c7:a71c158] in mainline

File:

• kernel/generic/src/console/console.c (modified) (12 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 = {
@@ -160 +155 @@
         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, (sysarg_t) faddr);
+        sysinfo_set_item_val("klog.faddr", NULL, (unative_t) faddr);
         sysinfo_set_item_val("klog.pages", NULL, KLOG_PAGES);
         
@@ -179 +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');
-        }
 }
 
@@ -194 +185 @@
 
 /** Tell kernel to get keyboard/console access again */
-sysarg_t sys_debug_enable_console(void)
+unative_t sys_debug_enable_console(void)
 {
 #ifdef CONFIG_KCONSOLE
@@ -205 +196 @@
 
 /** Tell kernel to relinquish keyboard/console access */
-sysarg_t sys_debug_disable_console(void)
+unative_t sys_debug_disable_console(void)
 {
         release_console();
@@ -295 +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++;
@@ -334 +313 @@
  *
  */
-sysarg_t sys_klog(int fd, const void *buf, size_t size)
+unative_t sys_klog(int fd, const void *buf, size_t size)
 {
         char *data;
@@ -340 +319 @@
         
         if (size > PAGE_SIZE)
-                return (sysarg_t) ELIMIT;
+                return ELIMIT;
         
         if (size > 0) {
                 data = (char *) malloc(size + 1, 0);
                 if (!data)
-                        return (sysarg_t) ENOMEM;
+                        return ENOMEM;
                 
                 rc = copy_from_uspace(data, buf, size);
                 if (rc) {
                         free(data);
-                        return (sysarg_t) rc;
+                        return rc;
                 }
                 data[size] = 0;