Implement more wrappers and refactoring

xtldr2/includes/bootman.h

@@ -16,32 +16,19 @@
 typedef VOID (BMPRINTCHAR)(IN USHORT Character);
 
 /* XTLDR routines forward references */
+XTCDECL
+VOID
+BlClearConsoleScreen();
+
 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
-BlConsoleQueryMode(OUT PUINT_PTR ResX,
-                   OUT PUINT_PTR ResY);
-
 XTCDECL
 VOID
 BlConsoleWrite(IN PUSHORT String);
@@ -51,6 +38,14 @@ VOID
 BlDebugPrint(IN PUINT16 Format,
              IN ...);
 
+XTCDECL
+VOID
+BlDisableConsoleCursor();
+
+XTCDECL
+VOID
+BlEnableConsoleCursor();
+
 XTCDECL
 EFI_STATUS
 BlEnumerateBlockDevices();
@@ -96,6 +91,11 @@ BlOpenVolume(IN PEFI_DEVICE_PATH_PROTOCOL DevicePath,
              OUT PEFI_HANDLE DiskHandle,
              OUT PEFI_FILE_HANDLE *FsHandle);
 
+XTCDECL
+VOID
+BlQueryConsoleMode(OUT PUINT_PTR ResX,
+                   OUT PUINT_PTR ResY);
+
 XTCDECL
 EFI_STATUS
 BlReadFile(IN PEFI_FILE_HANDLE DirHandle,
@@ -103,6 +103,14 @@ BlReadFile(IN PEFI_FILE_HANDLE DirHandle,
            OUT PVOID *FileData,
            OUT PSIZE_T FileSize);
 
+XTCDECL
+VOID
+BlReadKeyStroke(OUT PEFI_INPUT_KEY Key);
+
+XTCDECL
+VOID
+BlResetConsoleInputBuffer();
+
 XTCDECL
 EFI_STATUS
 BlMemoryFreePages(IN UINT64 Pages,
@@ -140,6 +148,12 @@ EFI_STATUS
 BlStartXtLoader(IN EFI_HANDLE ImageHandle,
                 IN PEFI_SYSTEM_TABLE SystemTable);
 
+XTCDECL
+EFI_STATUS
+BlWaitForEfiEvent(IN UINT_PTR NumberOfEvents,
+                  IN PEFI_EVENT Event,
+                  OUT PUINT_PTR Index);
+
 XTCDECL
 EFI_STATUS
 BlpActivateSerialIOController();