Changeset 04803bf in mainline for kernel/generic/include/console/console.h

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/include/console/console.h (modified) (2 diffs)

kernel/generic/include/console/console.h

@@ -36 +36 @@
 #define KERN_CONSOLE_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
+#include <print.h>
 #include <console/chardev.h>
+
+#define PAGING(counter, increment, before, after) \
+        do { \
+                (counter) += (increment); \
+                if ((counter) > 23) { \
+                        before; \
+                        printf(" -- Press any key to continue -- "); \
+                        indev_pop_character(stdin); \
+                        after; \
+                        printf("\n"); \
+                        (counter) = 0; \
+                } \
+        } while (0)
 
 extern indev_t *stdin;
 extern outdev_t *stdout;
-extern bool silent;
+
+extern void early_putchar(wchar_t);
 
 extern indev_t *stdin_wire(void);
@@ -52 +67 @@
 extern wchar_t getc(indev_t *indev);
 extern size_t gets(indev_t *indev, char *buf, size_t buflen);
-extern unative_t sys_klog(int fd, const void *buf, size_t size);
+extern sysarg_t sys_klog(int fd, const void *buf, size_t size);
 
 extern void grab_console(void);
 extern void release_console(void);
 
-extern unative_t sys_debug_enable_console(void);
-extern unative_t sys_debug_disable_console(void);
+extern sysarg_t sys_debug_enable_console(void);
+extern sysarg_t sys_debug_disable_console(void);
 
 #endif /* KERN_CONSOLE_H_ */