Refactor part 6

xtldr2/includes/bootman.h

@@ -16,6 +16,10 @@
 typedef VOID (BMPRINTCHAR)(IN USHORT Character);
 
 /* XTLDR routines forward references */
+XTCDECL
+EFI_STATUS
+BlExitBootServices(IN UINT_PTR MapKey);
+
 XTCDECL
 EFI_STATUS
 BlMemoryAllocatePages(IN UINT64 Pages,
@@ -87,18 +91,22 @@ VOID
 BlpConsolePrintChar(IN USHORT Character);
 
 XTCDECL
-EFI_STATUS
-BlpDebugInitializeComPort(IN ULONG PortNumber,
-                          IN ULONG PortAddress,
-                          IN ULONG BaudRate);
+VOID
+BlpDebugPutChar(IN USHORT Character);
 
 XTCDECL
 EFI_STATUS
-BlpDebugInitializeConsole();
+BlpInitializeDebugConsole();
 
 XTCDECL
 VOID
-BlpDebugPutChar(IN USHORT Character);
+BlpInitializeEfiBootLoader();
+
+XTCDECL
+EFI_STATUS
+BlpInitializeSerialPort(IN ULONG PortNumber,
+                        IN ULONG PortAddress,
+                        IN ULONG BaudRate);
 
 XTCDECL
 VOID

xtldr2/includes/globals.h

@@ -13,7 +13,7 @@
 
 
 /* XT Boot Loader configuration data */
-EXTERN XTBM_CONFIGURATION BlpConfiguration;
+EXTERN XTBL_CONFIGURATION BlpConfiguration;
 
 /* XT Boot Loader hex table */
 EXTERN PUINT16 BlpHexTable;
@@ -21,6 +21,9 @@ EXTERN PUINT16 BlpHexTable;
 /* Serial port configuration */
 EXTERN CPPORT BlpSerialPort;
 
+/* XT Boot Loader status data */
+EXTERN XTBL_STATUS BlpStatus;
+
 /* EFI Image Handle */
 EXTERN EFI_HANDLE EfiImageHandle;