Refactor part 1

xtldr2/console.c

@@ -18,7 +18,7 @@
  */
 XTCDECL
 VOID
-BmClearScreen()
+BlConsoleClearScreen()
 {
     /* Clear screen */
     EfiSystemTable->ConOut->ClearScreen(EfiSystemTable->ConOut);
@@ -33,7 +33,7 @@ BmClearScreen()
  */
 XTCDECL
 VOID
-BmDisableCursor()
+BlConsoleDisableCursor()
 {
     EfiSystemTable->ConOut->EnableCursor(EfiSystemTable->ConOut, FALSE);
 }
@@ -47,7 +47,7 @@ BmDisableCursor()
  */
 XTCDECL
 VOID
-BmEnableCursor()
+BlConsoleEnableCursor()
 {
     EfiSystemTable->ConOut->EnableCursor(EfiSystemTable->ConOut, TRUE);
 }
@@ -61,7 +61,7 @@ BmEnableCursor()
  */
 XTCDECL
 VOID
-BmInitializeConsole()
+BlConsoleInitialize()
 {
     /* Clear console buffers */
     EfiSystemTable->ConIn->Reset(EfiSystemTable->ConIn, TRUE);
@@ -69,8 +69,8 @@ BmInitializeConsole()
     EfiSystemTable->StdErr->Reset(EfiSystemTable->StdErr, TRUE);
 
     /* Clear screen and enable cursor */
-    BmClearScreen();
-    BmEnableCursor();
+    BlConsoleClearScreen();
+    BlConsoleEnableCursor();
 }
 
 /**
@@ -88,8 +88,8 @@ BmInitializeConsole()
  */
 XTCDECL
 VOID
-BmPrint(IN PUINT16 Format,
-        IN ...)
+BlConsolePrint(IN PUINT16 Format,
+               IN ...)
 {
     VA_LIST Arguments;
 
@@ -97,7 +97,7 @@ BmPrint(IN PUINT16 Format,
     VA_START(Arguments, Format);
 
     /* Format and print the string to the stdout */
-    BmPrintString(BmPrintChar, Format, Arguments);
+    BlpStringPrint(BlpConsolePrintChar, Format, Arguments);
 
     /* Clean up the va_list */
     VA_END(Arguments);
@@ -115,7 +115,7 @@ BmPrint(IN PUINT16 Format,
  */
 XTCDECL
 VOID
-BmPrintChar(IN USHORT Character)
+BlpConsolePrintChar(IN USHORT Character)
 {
     USHORT Buffer[2];