From 87dceb0ba79b82d109ea8465acb534f7e32757b7 Mon Sep 17 00:00:00 2001
From: Rafal Kupiec <belliash@codingworkshop.eu.org>
Date: Fri, 8 Dec 2023 22:24:33 +0100
Subject: [PATCH] Reorganise bootman.h

---
 xtldr2/includes/bootman.h | 96 +++++++++++++++++++--------------------
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/xtldr2/includes/bootman.h b/xtldr2/includes/bootman.h
index 07aa835..c01b55c 100644
--- a/xtldr2/includes/bootman.h
+++ b/xtldr2/includes/bootman.h
@@ -20,6 +20,28 @@ XTCDECL
 EFI_STATUS
 BlCloseVolume(IN PEFI_HANDLE VolumeHandle);
 
+XTCDECL
+VOID
+BlConsoleClearScreen();
+
+XTCDECL
+VOID
+BlConsoleDisableCursor();
+
+XTCDECL
+VOID
+BlConsoleEnableCursor();
+
+XTCDECL
+VOID
+BlConsolePrint(IN PUINT16 Format,
+               IN ...);
+
+XTCDECL
+VOID
+BlDebugPrint(IN PUINT16 Format,
+             IN ...);
+
 XTCDECL
 EFI_STATUS
 BlEnumerateBlockDevices();
@@ -64,28 +86,6 @@ BlReadFile(IN PEFI_FILE_HANDLE DirHandle,
            OUT PVOID *FileData,
            OUT PSIZE_T FileSize);
 
-XTCDECL
-VOID
-BlConsoleClearScreen();
-
-XTCDECL
-VOID
-BlConsoleDisableCursor();
-
-XTCDECL
-VOID
-BlConsoleEnableCursor();
-
-XTCDECL
-VOID
-BlConsolePrint(IN PUINT16 Format,
-               IN ...);
-
-XTCDECL
-VOID
-BlDebugPrint(IN PUINT16 Format,
-             IN ...);
-
 XTCDECL
 EFI_STATUS
 BlMemoryFreePages(IN UINT64 Pages,
@@ -113,6 +113,18 @@ XTCDECL
 EFI_STATUS
 BlpActivateSerialIOController();
 
+XTCDECL
+VOID
+BlpConsoleInitialize();
+
+XTCDECL
+VOID
+BlpConsolePrintChar(IN USHORT Character);
+
+XTCDECL
+VOID
+BlpDebugPutChar(IN USHORT Character);
+
 XTCDECL
 EFI_STATUS
 BlpDiscoverEfiBlockDevices(OUT PLIST_ENTRY BlockDevices);
@@ -141,32 +153,6 @@ BlpFindParentBlockDevice(IN PLIST_ENTRY BlockDevices,
                          IN PEFI_BLOCK_DEVICE_DATA ChildNode,
                          OUT PEFI_BLOCK_DEVICE_DATA ParentNode);
 
-XTCDECL
-EFI_STATUS
-BlpLoadConfigurationFile(IN CONST PWCHAR ConfigDirectory,
-                         IN CONST PWCHAR ConfigFile,
-                         OUT PCHAR *ConfigData);
-
-XTCDECL
-VOID
-BlpParseCommandLineOptions(VOID);
-
-XTCDECL
-VOID
-BlpUpdateGlobalConfiguration(IN PWCHAR Options);
-
-XTCDECL
-VOID
-BlpConsoleInitialize();
-
-XTCDECL
-VOID
-BlpConsolePrintChar(IN USHORT Character);
-
-XTCDECL
-VOID
-BlpDebugPutChar(IN USHORT Character);
-
 XTCDECL
 EFI_STATUS
 BlpInitializeDebugConsole();
@@ -181,6 +167,16 @@ BlpInitializeSerialPort(IN ULONG PortNumber,
                         IN ULONG PortAddress,
                         IN ULONG BaudRate);
 
+XTCDECL
+EFI_STATUS
+BlpLoadConfigurationFile(IN CONST PWCHAR ConfigDirectory,
+                         IN CONST PWCHAR ConfigFile,
+                         OUT PCHAR *ConfigData);
+
+XTCDECL
+VOID
+BlpParseCommandLineOptions(VOID);
+
 XTCDECL
 EFI_STATUS
 BlpRegisterXtLoaderProtocol();
@@ -227,4 +223,8 @@ XTCDECL
 UINT64
 BlpStringReadPadding(IN PUINT16 *Format);
 
+XTCDECL
+VOID
+BlpUpdateGlobalConfiguration(IN PWCHAR Options);
+
 #endif /* __XTLDR_BOOTMAN_H */