Changeset 371bd7d in mainline for kernel/generic/include/console

Timestamp:

2010-03-27T09:22:17Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

36a75a2

Parents:

cd82bb1 (diff), eaf22d4 (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.

Location:

kernel/generic/include/console

Files:

• chardev.h (modified) (4 diffs)
• console.h (modified) (1 diff)
• kconsole.h (modified) (1 diff)

kernel/generic/include/console/chardev.h

@@ -37 +37 @@
 
 #include <adt/list.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <synch/waitq.h>
 #include <synch/spinlock.h>
@@ -53 +53 @@
 /** Character input device. */
 typedef struct indev {
-        char *name;
+        const char *name;
         waitq_t wq;
         
@@ -81 +81 @@
 /** Character output device. */
 typedef struct outdev {
-        char *name;
+        const char *name;
         
         /** Protects everything below. */
@@ -95 +95 @@
 } outdev_t;
 
-extern void indev_initialize(char *name, indev_t *indev,
+extern void indev_initialize(const char *name, indev_t *indev,
     indev_operations_t *op);
 extern void indev_push_character(indev_t *indev, wchar_t ch);
 extern wchar_t indev_pop_character(indev_t *indev);
 
-extern void outdev_initialize(char *name, outdev_t *outdev,
+extern void outdev_initialize(const char *name, outdev_t *outdev,
     outdev_operations_t *op);
 

kernel/generic/include/console/console.h

@@ -36 +36 @@
 #define KERN_CONSOLE_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <console/chardev.h>
 
 extern indev_t *stdin;
 extern outdev_t *stdout;
-extern bool silent;
 
 extern indev_t *stdin_wire(void);

kernel/generic/include/console/kconsole.h

@@ -94 +94 @@
 extern void kconsole_notify_init(void);
 extern bool kconsole_check_poll(void);
-extern void kconsole(char *prompt, char *msg, bool kcon);
+extern void kconsole(const char *prompt, const char *msg, bool kcon);
 extern void kconsole_thread(void *data);