Rewrite core of the XTLDR boot loader

Reviewed-on: #7
Reviewed-by: Piotr Likoski <likoski@noreply.codingworkshop.git>
Co-authored-by: Rafal Kupiec <belliash@codingworkshop.eu.org>
Co-committed-by: Rafal Kupiec <belliash@codingworkshop.eu.org>

xtldr/console.c

@@ -6,9 +6,37 @@
  * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
  */
 
-#include <xtbl.h>
+#include <xtldr.h>
 
 
+/**
+ * Clears a specified line on the UEFI text console.
+ *
+ * @param LineNo
+ *        Supplies a line number to clear.
+ *
+ * @return This routine does not return any value.
+ *
+ * @since XT 1.0
+ */
+XTCDECL
+VOID
+BlClearConsoleLine(IN ULONGLONG LineNo)
+{
+    UINT_PTR Index, ResX, ResY;
+
+    /* Query console mode */
+    BlQueryConsoleMode(&ResX, &ResY);
+
+    /* Set cursor position and clear line */
+    BlSetCursorPosition(0, LineNo);
+    for(Index = 0; Index < ResX; Index++)
+    {
+        /* Clear line */
+        BlConsoleWrite(L" ");
+    }
+}
+
 /**
  * This routine clears the UEFI console screen.
  *
@@ -18,32 +46,233 @@
  */
 XTCDECL
 VOID
-BlConsoleClearScreen()
+BlClearConsoleScreen()
 {
+    /* Clear screen */
     EfiSystemTable->ConOut->ClearScreen(EfiSystemTable->ConOut);
 }
 
 /**
- * This routine initializes the EFI console.
- * 
- * @return This routine returns status code.
- * 
+ * Disables the cursor on the UEFI console.
+ *
+ * @return This routine does not return any value.
+ *
  * @since XT 1.0
  */
 XTCDECL
 VOID
-BlConsoleInitialize()
+BlDisableConsoleCursor()
+{
+    EfiSystemTable->ConOut->EnableCursor(EfiSystemTable->ConOut, FALSE);
+}
+
+/**
+ * Enables the cursor on the UEFI console.
+ *
+ * @return This routine does not return any value.
+ *
+ * @since XT 1.0
+ */
+XTCDECL
+VOID
+BlEnableConsoleCursor()
+{
+    EfiSystemTable->ConOut->EnableCursor(EfiSystemTable->ConOut, TRUE);
+}
+
+/**
+ * This routine formats the input string and prints it out to the stdout and serial console.
+ *
+ * @param Format
+ *        The formatted string that is to be written to the output.
+ *
+ * @param ...
+ *        Depending on the format string, this routine might expect a sequence of additional arguments.
+ *
+ * @return This routine does not return any value.
+ *
+ * @since XT 1.0
+ */
+XTCDECL
+VOID
+BlConsolePrint(IN PUINT16 Format,
+               IN ...)
+{
+    VA_LIST Arguments;
+
+    /* Initialise the va_list */
+    VA_START(Arguments, Format);
+
+    /* Format and print the string to the stdout */
+    BlpStringPrint(BlpConsolePrintChar, Format, Arguments);
+
+    /* Print to serial console only if not running under OVMF */
+    if(RtlCompareWideString(EfiSystemTable->FirmwareVendor, L"EDK II", 6) != 0)
+    {
+        /* Check if debugging enabled and if EFI serial port is fully initialized */
+        if(DEBUG && (BlpStatus.SerialPort.Flags & COMPORT_FLAG_INIT))
+        {
+            /* Format and print the string to the serial console */
+            BlpStringPrint(BlpDebugPutChar, Format, Arguments);
+        }
+    }
+
+    /* Clean up the va_list */
+    VA_END(Arguments);
+}
+
+/**
+ * Displays the string on the device at the current cursor location.
+ *
+ * @param String
+ *        The string to be displayed.
+ *
+ * @return This routine does not return any value.
+ *
+ * @since XT 1.0
+ */
+XTCDECL
+VOID
+BlConsoleWrite(IN PUSHORT String)
+{
+    EfiSystemTable->ConOut->OutputString(EfiSystemTable->ConOut, String);
+}
+
+/**
+ * This routine initializes the EFI console.
+ *
+ * @return This routine returns status code.
+ *
+ * @since XT 1.0
+ */
+XTCDECL
+VOID
+BlInitializeConsole()
 {
     /* Clear console buffers */
     EfiSystemTable->ConIn->Reset(EfiSystemTable->ConIn, TRUE);
     EfiSystemTable->ConOut->Reset(EfiSystemTable->ConOut, TRUE);
     EfiSystemTable->StdErr->Reset(EfiSystemTable->StdErr, TRUE);
 
-    /* Clear screen */
-    BlConsoleClearScreen();
+    /* Make sure that current console mode is 80x25 characters, as some broken EFI implementations might
+     * set different mode that do not fit on the screen, causing a text to be displayed offscreen */
+    if(EfiSystemTable->ConOut->Mode->Mode != 0)
+    {
+        /* Set console mode to 0, which is standard, 80x25 text mode */
+        BlSetConsoleMode(0);
+    }
 
-    /* Enable cursor */
-    EfiSystemTable->ConOut->EnableCursor(EfiSystemTable->ConOut, TRUE);
+    /* Clear screen and enable cursor */
+    BlSetConsoleAttributes(EFI_TEXT_BGCOLOR_BLACK | EFI_TEXT_FGCOLOR_LIGHTGRAY);
+    BlClearConsoleScreen();
+    BlEnableConsoleCursor();
+}
+
+/**
+ * Queries information concerning the output device’s supported text mode.
+ *
+ * @param ResX
+ *        Supplies a buffer to receive the horizontal resolution.
+ *
+ * @param ResY
+ *        Supplies a buffer to receive the vertical resolution.
+ *
+ * @return This routine does not return any value.
+ *
+ * @since XT 1.0
+ */
+XTCDECL
+VOID
+BlQueryConsoleMode(OUT PUINT_PTR ResX,
+                   OUT PUINT_PTR ResY)
+{
+    EfiSystemTable->ConOut->QueryMode(EfiSystemTable->ConOut, EfiSystemTable->ConOut->Mode->Mode, ResX, ResY);
+}
+
+/**
+ * Reads a keystroke from the input device.
+ *
+ * @param Key
+ *        Supplies a pointer to the EFI_INPUT_KEY structure that will receive the keystroke.
+ *
+ * @return This routine does not return any value.
+ *
+ * @since XT 1.0
+ */
+XTCDECL
+VOID
+BlReadKeyStroke(OUT PEFI_INPUT_KEY Key)
+{
+    EfiSystemTable->ConIn->ReadKeyStroke(EfiSystemTable->ConIn, Key);
+}
+
+/**
+ * Resets the console input device and clears its input buffer.
+ *
+ * @return This routine does not return any value.
+ *
+ * @since XT 1.0
+ */
+XTCDECL
+VOID
+BlResetConsoleInputBuffer()
+{
+    EfiSystemTable->ConIn->Reset(EfiSystemTable->ConIn, FALSE);
+}
+
+/**
+ * Sets the foreground and background colors.
+ *
+ * @param Attribute
+ *        Specifies the foreground and background colors (bits 0..3 are fg, and bits 4..6 are bg color).
+ *
+ * @return This routine does not return any value.
+ *
+ * @since XT 1.0
+ */
+XTCDECL
+VOID
+BlSetConsoleAttributes(IN ULONGLONG Attributes)
+{
+    EfiSystemTable->ConOut->SetAttribute(EfiSystemTable->ConOut, Attributes);
+}
+
+/**
+ * Sets the output console device to the requested mode.
+ *
+ * @param Mode
+ *        Supplies a text mode number to set.
+ *
+ * @return This routine returns a status code.
+ *
+ * @since XT 1.0
+ */
+XTCDECL
+EFI_STATUS
+BlSetConsoleMode(IN ULONGLONG Mode)
+{
+    return EfiSystemTable->ConOut->SetMode(EfiSystemTable->ConOut, Mode);
+}
+
+/**
+ * Sets new coordinates of the console cursor position.
+ *
+ * @param PosX
+ *        Specifies the new X coordinate of the cursor.
+ *
+ * @param PosY
+ *        Specifies the new Y coordinate of the cursor.
+ *
+ * @return This routine does not return any value.
+ *
+ * @since XT 1.0
+ */
+XTCDECL
+VOID
+BlSetCursorPosition(IN ULONGLONG PosX,
+                    IN ULONGLONG PosY)
+{
+    EfiSystemTable->ConOut->SetCursorPosition(EfiSystemTable->ConOut, PosX, PosY);
 }
 
 /**
@@ -58,7 +287,7 @@ BlConsoleInitialize()
  */
 XTCDECL
 VOID
-BlConsolePutChar(IN USHORT Character)
+BlpConsolePrintChar(IN USHORT Character)
 {
     USHORT Buffer[2];