Changeset 549 for Whitix/branches/hybrid/video/console.c

Timestamp:

05/24/08 09:58:45 (6 months ago)

Author:

mwhitworth

Message:

Add earlyconsole driver.

Files:

• Whitix/branches/hybrid/video/console.c (modified) (7 diffs)

Whitix/branches/hybrid/video/console.c

@@ -118 +118 @@
 }
 
-int printf(char* str,...)
-{
-        DWORD flags;
-        char printBuf[512];
-        int len;
-        va_list args;
-
-        IrqSaveFlags(flags);
-
-        va_start(args,str);
-        len=vsprintf(printBuf,str,args);
-        va_end(args);
-
-        ConsoleWriteString(currConsole,printBuf,len);
-        IrqRestoreFlags(flags);
-
-        return len;
-}
-
-SYMBOL_EXPORT(printf);
-
 void putc(int c)
 {
@@ -146 +125 @@
 unsigned char colorTable[] = {0, 4, 2, 6, 1, 5, 3, 7};
 
-static int ConsoleWriteString(int console,char* str,int length)
+int ConsoleWriteString(int console, char* str, int length)
 {
         struct Console* currCons=&consoles[console];
@@ -297 +276 @@
 }
 
+SYMBOL_EXPORT(ConsoleWriteString);
+
 extern void KeyboardDoAlarm();
 
@@ -376 +357 @@
 }
 
+void ConsoleWriteOutput(char* message, int length)
+{
+        ConsoleWriteString(currConsole, message, length);
+}
+
 static void ConsoleClearScreen(int index)
 {
@@ -426 +412 @@
 }
 
+static void ConsoleGetCursorPos()
+{
+        DWORD flags;
+        WORD position;
+
+        IrqSaveFlags(flags);
+
+        outb(0x3D4, 14);
+        position=inb(0x3D5) << 8;
+        outb(0x3D4, 15);
+        position |= inb(0x3D5);
+
+        IrqRestoreFlags(flags);
+
+        curX=position % 80;
+        curY=position/80;
+}
+
 static void ConsoleNewLine(int index)
 {
@@ -581 +585 @@
         if (item->events & POLL_OUT)
                 item->revents |= POLL_OUT;
-
-//      printf("ConsolePoll(%u)\n", ListEmpty(&cons->waitQueue.list));
 
         PollAddWait(pollQueue, &cons->waitQueue);
@@ -622 +624 @@
         }
 
+        /* Get the current cursor position, and take over from the early console driver. */
+        ConsoleGetCursorPos();
+
+        KeSetOutput(ConsoleWriteOutput);
+
         return 0;
 }