diff --git a/src/sys/kernel/tty.c b/src/sys/kernel/tty.c index a05f0fc..3f04ac9 100644 --- a/src/sys/kernel/tty.c +++ b/src/sys/kernel/tty.c @@ -40,7 +40,7 @@ int tty_init() { int i = 0x0; - + /* Allocate memory for terminals */ terms = (tty_term *)kmalloc(sizeof(tty_term)*TTY_MAX_TERMS); if (terms == 0x0) @@ -167,6 +167,9 @@ /*** $Log$ + Revision 1.8 2004/09/07 21:50:25 apwillia + Make kprintf stay on tty0 + Revision 1.7 2004/09/06 21:39:21 reddawg Fixes: Changed the order in which tasks are deleted from the queues. Also fixed backspace to work in the virtual ttys.... diff --git a/src/sys/sys/video.c b/src/sys/sys/video.c index fd4dc0d..56b019b 100644 --- a/src/sys/sys/video.c +++ b/src/sys/sys/video.c @@ -65,10 +65,10 @@ unsigned int bufferOffset = 0x0, character = 0x0, i = 0x0; /* Short circuit if we're in tty mode */ - if (0 != tty_foreground) + if (NULL != tty_foreground) { - //tty_print(string,tty_find(0)); - //return; + tty_print(string,tty_find(0)); + return; } /* We Need To Get The Y Position */ @@ -127,6 +127,9 @@ /*** $Log$ + Revision 1.13 2004/09/08 22:04:10 apwillia + Added calling of static constructors, commented out tty_printf in kprintf (due to deadlock) + Revision 1.12 2004/09/07 22:00:20 apwillia Fix gcc 2.95 being retarded and not follwing the C99 specs