From 490501763f3ed21e829ff6fd04a812d50e8b6ef9 Mon Sep 17 00:00:00 2001
From: Rafal Kupiec <belliash@codingworkshop.eu.org>
Date: Tue, 2 Jan 2024 13:28:58 +0100
Subject: [PATCH] Cleanup dummy module a bit #2

---
 xtldr2/modules/dummy/dummy.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/xtldr2/modules/dummy/dummy.c b/xtldr2/modules/dummy/dummy.c
index 4aa9d65..1dfce92 100644
--- a/xtldr2/modules/dummy/dummy.c
+++ b/xtldr2/modules/dummy/dummy.c
@@ -7,21 +7,16 @@
  */
 
 #include <xtblapi.h>
+#include <globals.h>
 
 
 /* Dummy module information */
 XTBL_MODINFO = L"Dummy XTLDR module";
 // XTBL_MODDEPS = {L"dummy2"};
 
-/* XTLDR protocol handler */
-PXTBL_LOADER_PROTOCOL XtLdrProto;
-
-/* Dummy Boot Protocol handler */
-XTBL_BOOT_PROTOCOL DummyProtocol;
-
 XTCDECL
 EFI_STATUS
-BootDummyOS(IN PXTBL_BOOT_PARAMETERS Parameters)
+BlBootDummyOS(IN PXTBL_BOOT_PARAMETERS Parameters)
 {
     return STATUS_EFI_SUCCESS;
 }
@@ -56,11 +51,11 @@ XtLdrModuleMain(IN EFI_HANDLE ImageHandle,
     }
 
     /* Set boot protocol routines */
-    DummyProtocol.BootSystem = BootDummyOS;
+    BlpDummyProtocol.BootSystem = BlBootDummyOS;
 
     /* Register XTOS boot protocol */
     XtLdrProto->Boot.RegisterProtocol(L"XTOS", &DummyGuid);
 
     /* Register DUMMY protocol as XTOS boot protocol */
-    return XtLdrProto->Protocol.Register(&DummyGuid, &DummyProtocol);
+    return XtLdrProto->Protocol.Register(&DummyGuid, &BlpDummyProtocol);
 }