Refactor part 1

xtldr2/includes/bootman.h

@@ -2,7 +2,7 @@
  * PROJECT:         ExectOS
  * COPYRIGHT:       See COPYING.md in the top level directory
  * FILE:            xtldr/includes/xtbm.h
- * DESCRIPTION:     XTLDR Boot Manager related structures and routines forward references
+ * DESCRIPTION:     XTLDR Boot Loader related structures and routines forward references
  * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
  */
 
@@ -17,53 +17,53 @@ typedef VOID (BMPRINTCHAR)(IN USHORT Character);
 
 XTCDECL
 EFI_STATUS
-BmAllocateEfiPages(IN UINT64 Pages,
+BlMemoryAllocatePages(IN UINT64 Pages,
                    OUT PEFI_PHYSICAL_ADDRESS Memory);
 
 XTCDECL
 EFI_STATUS
-BmAllocateEfiPool(IN UINT_PTR Size,
+BlMemoryAllocatePool(IN UINT_PTR Size,
                   OUT PVOID *Memory);
 
 /* XTLDR routines forward references */
 XTCDECL
 VOID
-BmClearScreen();
+BlConsoleClearScreen();
 
 XTCDECL
 VOID
-BmDisableCursor();
+BlConsoleDisableCursor();
 
 XTCDECL
 VOID
-BmEnableCursor();
+BlConsoleEnableCursor();
 
 XTCDECL
 EFI_STATUS
-BmFreeEfiPages(IN UINT64 Pages,
+BlMemoreFreePages(IN UINT64 Pages,
                IN EFI_PHYSICAL_ADDRESS Memory);
 
 XTCDECL
 EFI_STATUS
-BmFreeEfiPool(IN PVOID Memory);
+BlMemoryFreePool(IN PVOID Memory);
 
 
 XTCDECL
 VOID
-BmInitializeConsole();
+BlConsoleInitialize();
 
 XTCDECL
 VOID
-BmPrint(IN PUINT16 Format,
+BlConsolePrint(IN PUINT16 Format,
         IN ...);
 
 XTCDECL
 VOID
-BmPrintChar(IN USHORT Character);
+BlpConsolePrintChar(IN USHORT Character);
 
 XTCDECL
 VOID
-BmPrintString(IN IN BMPRINTCHAR PrintCharRoutine,
+BlpStringPrint(IN IN BMPRINTCHAR PrintCharRoutine,
               IN PUINT16 Format,
               IN VA_LIST Arguments);
 
@@ -75,46 +75,46 @@ BmStartXtLoader(IN EFI_HANDLE ImageHandle,
 
 XTCDECL
 VOID
-BmpFormatString(IN BMPRINTCHAR PrintCharRoutine,
+BlpStringFormat(IN BMPRINTCHAR PrintCharRoutine,
                 IN PUINT16 Format,
                 IN ...);
 
 XTCDECL
 VOID
-BmpParseCommandLineOptions(VOID);
+BlpConfigParseCommandLine(VOID);
 
 XTCDECL
 VOID
-BmpPrintSigned32String(IN BMPRINTCHAR PrintCharRoutine,
+BlpStringPrintSigned32(IN BMPRINTCHAR PrintCharRoutine,
                        IN INT Number,
                        IN UINT Base);
 
 XTCDECL
 VOID
-BmpPrintSigned64String(IN BMPRINTCHAR PrintCharRoutine,
+BlpStringPrintSigned64(IN BMPRINTCHAR PrintCharRoutine,
                        IN INT_PTR Number,
                        IN UINT_PTR Base);
 
 XTCDECL
 VOID
-BmpPrintUnsigned32String(IN BMPRINTCHAR PrintCharRoutine,
+BlpStringPrintUnsigned32(IN BMPRINTCHAR PrintCharRoutine,
                          IN UINT Number,
                          IN UINT Base,
                          IN UINT Padding);
 
 XTCDECL
 VOID
-BmpPrintUnsigned64String(IN BMPRINTCHAR PrintCharRoutine,
+BlpStringPrintUnsigned64(IN BMPRINTCHAR PrintCharRoutine,
                          IN UINT_PTR Number,
                          IN UINT_PTR Base,
                          IN UINT_PTR Padding);
 
 XTCDECL
 UINT64
-BmpReadStringPadding(IN PUINT16 *Format);
+BlpStringReadPadding(IN PUINT16 *Format);
 
 XTCDECL
 VOID
-BmpUpdateGlobalConfiguration(IN PWCHAR Options);
+BlpConfigUpdateGlobalConfiguration(IN PWCHAR Options);
 
 #endif /* __XTLDR_BOOTMAN_H */

xtldr2/includes/globals.h

@@ -13,13 +13,13 @@
 
 
 /* XT Boot Loader configuration data */
-EXTERN XTBM_CONFIGURATION BmpConfiguration;
+EXTERN XTBM_CONFIGURATION BlpConfiguration;
 
 /* XT Boot Loader hex table */
-EXTERN PUINT16 BmpHexTable;
+EXTERN PUINT16 BlpHexTable;
 
 /* Serial port configuration */
-EXTERN CPPORT BmpSerialPort;
+EXTERN CPPORT BlpSerialPort;
 
 /* EFI Image Handle */
 EXTERN EFI_HANDLE EfiImageHandle;