Changeset 04803bf in mainline for kernel/generic/src/console/console.c

Timestamp:

2011-03-21T22:00:17Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e

Parents:

b50b5af2 (diff), 7308e84 (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:

Merge mainline changes (needs fixes).

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 <arch/types.h>
+#include <typedefs.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>
@@ -50 +51 @@
 #include <syscall/copy.h>
 #include <errno.h>
-#include <string.h>
+#include <str.h>
 
 #define KLOG_PAGES    4
@@ -61 +62 @@
 /** 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;
@@ -83 +88 @@
 };
 
-static void stdout_write(outdev_t *dev, wchar_t ch, bool silent);
-static void stdout_redraw(outdev_t *dev);
+static void stdout_write(outdev_t *, wchar_t, bool);
+static void stdout_redraw(outdev_t *);
 
 static outdev_operations_t stdout_ops = {
@@ -155 +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);
         
@@ -173 +179 @@
                 stdout->op->redraw(stdout);
         
-        /* Force the console to print the prompt */
-        if ((stdin) && (prev))
+        if ((stdin) && (prev)) {
+                /*
+                 * Force the console to print the prompt.
+                 */
                 indev_push_character(stdin, '\n');
+        }
 }
 
@@ -185 +194 @@
 
 /** 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
@@ -196 +205 @@
 
 /** Tell kernel to relinquish keyboard/console access */
-unative_t sys_debug_disable_console(void)
+sysarg_t sys_debug_disable_console(void)
 {
         release_console();
@@ -286 +295 @@
                 stdout->op->write(stdout, ch, silent);
         else {
-                /* The character is just in the kernel log */
+                /*
+                 * 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);
+                
                 if (klog_stored < klog_len)
                         klog_stored++;
@@ -313 +334 @@
  *
  */
-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;
@@ -319 +340 @@
         
         if (size > PAGE_SIZE)
-                return ELIMIT;
+                return (sysarg_t) ELIMIT;
         
         if (size > 0) {
                 data = (char *) malloc(size + 1, 0);
                 if (!data)
-                        return ENOMEM;
+                        return (sysarg_t) ENOMEM;
                 
                 rc = copy_from_uspace(data, buf, size);
                 if (rc) {
                         free(data);
-                        return rc;
+                        return (sysarg_t) rc;
                 }
                 data[size] = 0;