From 73bd43d16d1ce9aebe4c36dc44dff98f6e747ac9 Mon Sep 17 00:00:00 2001
From: Rafal Kupiec <belliash@codingworkshop.eu.org>
Date: Thu, 25 Jan 2024 22:25:23 +0100
Subject: [PATCH] Unify naming convention

---
 xtldr/modules/chainldr/chainldr.c         | 4 ++--
 xtldr/modules/chainldr/globals.c          | 2 +-
 xtldr/modules/chainldr/includes/globals.h | 2 +-
 xtldr/modules/dummy/dummy.c               | 4 ++--
 xtldr/modules/dummy/includes/dummy.h      | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/xtldr/modules/chainldr/chainldr.c b/xtldr/modules/chainldr/chainldr.c
index 2ba93aca..b66408c9 100644
--- a/xtldr/modules/chainldr/chainldr.c
+++ b/xtldr/modules/chainldr/chainldr.c
@@ -150,11 +150,11 @@ XtLdrModuleMain(IN EFI_HANDLE ImageHandle,
     }
 
     /* Set routines available via ChainLoader boot protocol */
-    ChBootProtocol.BootSystem = ChBootSystem;
+    ChpBootProtocol.BootSystem = ChBootSystem;
 
     /* Register XTOS boot protocol */
     XtLdrProtocol->Boot.RegisterProtocol(L"CHAINLOADER", &Guid);
 
     /* Install XTOS protocol */
-    return XtLdrProtocol->Protocol.Install(&ChBootProtocol, &Guid);
+    return XtLdrProtocol->Protocol.Install(&ChpBootProtocol, &Guid);
 }
diff --git a/xtldr/modules/chainldr/globals.c b/xtldr/modules/chainldr/globals.c
index fb3e1c1c..7380ca34 100644
--- a/xtldr/modules/chainldr/globals.c
+++ b/xtldr/modules/chainldr/globals.c
@@ -10,7 +10,7 @@
 
 
 /* ChainLoader Boot Protocol */
-XTBL_BOOT_PROTOCOL ChBootProtocol;
+XTBL_BOOT_PROTOCOL ChpBootProtocol;
 
 /* XTLDR protocol handler */
 PXTBL_LOADER_PROTOCOL XtLdrProtocol;
diff --git a/xtldr/modules/chainldr/includes/globals.h b/xtldr/modules/chainldr/includes/globals.h
index b47c0328..89f379ba 100644
--- a/xtldr/modules/chainldr/includes/globals.h
+++ b/xtldr/modules/chainldr/includes/globals.h
@@ -13,7 +13,7 @@
 
 
 /* ChainLoader Boot Protocol */
-EXTERN XTBL_BOOT_PROTOCOL ChBootProtocol;
+EXTERN XTBL_BOOT_PROTOCOL ChpBootProtocol;
 
 /* XTLDR protocol handler */
 EXTERN PXTBL_LOADER_PROTOCOL XtLdrProtocol;
diff --git a/xtldr/modules/dummy/dummy.c b/xtldr/modules/dummy/dummy.c
index 5d806f0e..9d7e6773 100644
--- a/xtldr/modules/dummy/dummy.c
+++ b/xtldr/modules/dummy/dummy.c
@@ -24,7 +24,7 @@ XTBL_MODINFO = L"XTLDR Dummy Module";
  */
 XTCDECL
 EFI_STATUS
-BlBootDummyOS(IN PXTBL_BOOT_PARAMETERS Parameters)
+DmBootSystem(IN PXTBL_BOOT_PARAMETERS Parameters)
 {
     return STATUS_EFI_SUCCESS;
 }
@@ -59,7 +59,7 @@ XtLdrModuleMain(IN EFI_HANDLE ImageHandle,
     }
 
     /* Set boot protocol routines */
-    BlpDummyProtocol.BootSystem = BlBootDummyOS;
+    BlpDummyProtocol.BootSystem = DmBootSystem;
 
     /* Register XTOS boot protocol */
     XtLdrProtocol->Boot.RegisterProtocol(L"XTOS", &DummyGuid);
diff --git a/xtldr/modules/dummy/includes/dummy.h b/xtldr/modules/dummy/includes/dummy.h
index 675bdbc1..f027427d 100644
--- a/xtldr/modules/dummy/includes/dummy.h
+++ b/xtldr/modules/dummy/includes/dummy.h
@@ -16,7 +16,7 @@
 /* Dummy module routines forward references */
 XTCDECL
 EFI_STATUS
-BlBootDummyOS(IN PXTBL_BOOT_PARAMETERS Parameters);
+DmBootSystem(IN PXTBL_BOOT_PARAMETERS Parameters);
 
 XTCDECL
 EFI_STATUS