Synchronize fork

xtldr2/includes/bootman.h

@@ -1,7 +1,7 @@
 /**
  * PROJECT:         ExectOS
  * COPYRIGHT:       See COPYING.md in the top level directory
- * FILE:            xtldr/includes/xtbm.h
+ * FILE:            xtldr/includes/bootman.h
  * DESCRIPTION:     XTLDR Boot Loader related structures and routines forward references
  * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
  */
@@ -9,23 +9,27 @@
 #ifndef __XTLDR_BOOTMAN_H
 #define __XTLDR_BOOTMAN_H
 
-#include <xtbmapi.h>
+#include <xtblapi.h>
 
 
 /* XTLDR routine callbacks */
 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,
-                   OUT PEFI_PHYSICAL_ADDRESS Memory);
+                      OUT PEFI_PHYSICAL_ADDRESS Memory);
 
 XTCDECL
 EFI_STATUS
 BlMemoryAllocatePool(IN UINT_PTR Size,
-                  OUT PVOID *Memory);
+                     OUT PVOID *Memory);
 
-/* XTLDR routines forward references */
 XTCDECL
 VOID
 BlConsoleClearScreen();
@@ -38,24 +42,54 @@ XTCDECL
 VOID
 BlConsoleEnableCursor();
 
+XTCDECL
+VOID
+BlConsolePrint(IN PUINT16 Format,
+               IN ...);
+
+XTCDECL
+VOID
+BlDebugPrint(IN PUINT16 Format,
+             IN ...);
+
 XTCDECL
 EFI_STATUS
-BlMemoreFreePages(IN UINT64 Pages,
-               IN EFI_PHYSICAL_ADDRESS Memory);
+BlMemoryFreePages(IN UINT64 Pages,
+                  IN EFI_PHYSICAL_ADDRESS Memory);
 
 XTCDECL
 EFI_STATUS
 BlMemoryFreePool(IN PVOID Memory);
 
+XTCDECL
+EFI_STATUS
+BlOpenXtProtocol(OUT PVOID *ProtocolHandler,
+                 IN PEFI_GUID ProtocolGuid);
 
 XTCDECL
 VOID
-BlConsoleInitialize();
+BlSleepExecution(IN ULONG_PTR Milliseconds);
+
+XTCDECL
+EFI_STATUS
+BlStartXtLoader(IN EFI_HANDLE ImageHandle,
+                IN PEFI_SYSTEM_TABLE SystemTable);
+
+XTCDECL
+EFI_STATUS
+BlpActivateSerialIOController();
 
 XTCDECL
 VOID
-BlConsolePrint(IN PUINT16 Format,
-        IN ...);
+BlpParseCommandLineOptions(VOID);
+
+XTCDECL
+VOID
+BlpUpdateGlobalConfiguration(IN PWCHAR Options);
+
+XTCDECL
+VOID
+BlpConsoleInitialize();
 
 XTCDECL
 VOID
@@ -63,15 +97,25 @@ BlpConsolePrintChar(IN USHORT Character);
 
 XTCDECL
 VOID
-BlpStringPrint(IN IN BMPRINTCHAR PrintCharRoutine,
-              IN PUINT16 Format,
-              IN VA_LIST Arguments);
+BlpDebugPutChar(IN USHORT Character);
 
 XTCDECL
 EFI_STATUS
-BmStartXtLoader(IN EFI_HANDLE ImageHandle,
-                IN PEFI_SYSTEM_TABLE SystemTable);
+BlpInitializeDebugConsole();
 
+XTCDECL
+VOID
+BlpInitializeEfiBootLoader();
+
+XTCDECL
+EFI_STATUS
+BlpInitializeSerialPort(IN ULONG PortNumber,
+                        IN ULONG PortAddress,
+                        IN ULONG BaudRate);
+
+XTCDECL
+EFI_STATUS
+BlpRegisterXtLoaderProtocol();
 
 XTCDECL
 VOID
@@ -86,7 +130,9 @@ BlConfigParseIniFile(IN PWCHAR FileContents,
 
 XTCDECL
 VOID
-BlpConfigParseCommandLine(VOID);
+BlpStringPrint(IN IN BMPRINTCHAR PrintCharRoutine,
+               IN PUINT16 Format,
+               IN VA_LIST Arguments);
 
 XTCDECL
 VOID
@@ -118,8 +164,4 @@ XTCDECL
 UINT64
 BlpStringReadPadding(IN PUINT16 *Format);
 
-XTCDECL
-VOID
-BlpConfigUpdateGlobalConfiguration(IN PWCHAR Options);
-
 #endif /* __XTLDR_BOOTMAN_H */

xtldr2/includes/globals.h

@@ -1,7 +1,7 @@
 /**
  * PROJECT:         ExectOS
  * COPYRIGHT:       See COPYING.md in the top level directory
- * FILE:            xtldr/includes/xtbm.h
+ * FILE:            xtldr/includes/globals.h
  * DESCRIPTION:     XTLDR global variables
  * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
  */
@@ -9,10 +9,10 @@
 #ifndef __XTLDR_GLOBALS_H
 #define __XTLDR_GLOBALS_H
 
-#include <xtbmapi.h>
+#include <xtblapi.h>
 
 /* XT Boot Loader configuration data */
-EXTERN XTBM_CONFIGURATION BlpConfiguration;
+EXTERN XTBL_CONFIGURATION BlpConfiguration;
 
 /* XT Boot Loader hex table */
 EXTERN PUINT16 BlpHexTable;
@@ -20,6 +20,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;
 

xtldr2/includes/xtldr.h

@@ -1,18 +1,18 @@
 /**
  * PROJECT:         ExectOS
  * COPYRIGHT:       See COPYING.md in the top level directory
- * FILE:            xtldr/includes/xtbm.h
+ * FILE:            xtldr/includes/xtldr.h
  * DESCRIPTION:     Top level header for XTLDR
  * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
  */
 
-#ifndef __XTLDR_XTBM_H
-#define __XTLDR_XTBM_H
+#ifndef __XTLDR_XTLDR_H
+#define __XTLDR_XTLDR_H
 
-#include <xtbmapi.h>
+#include <xtblapi.h>
 #include <xtver.h>
 
 #include <globals.h>
 #include <bootman.h>
 
-#endif /* __XTLDR_XTBM_H */
+#endif /* __XTLDR_XTLDR_H */