From f2887dba1fc22f6de81589684a7dd943bdfb6993 Mon Sep 17 00:00:00 2001
From: Rafal Kupiec <belliash@codingworkshop.eu.org>
Date: Tue, 23 Jan 2024 15:17:39 +0100
Subject: [PATCH] Rename XtLdrProtocol variable

---
 xtldr/modules/beep/beep.c              | 6 +++---
 xtldr/modules/beep/globals.c           | 2 +-
 xtldr/modules/beep/includes/globals.h  | 2 +-
 xtldr/modules/dummy/dummy.c            | 6 +++---
 xtldr/modules/dummy/globals.c          | 2 +-
 xtldr/modules/dummy/includes/globals.h | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/xtldr/modules/beep/beep.c b/xtldr/modules/beep/beep.c
index 0123052..ca583d4 100644
--- a/xtldr/modules/beep/beep.c
+++ b/xtldr/modules/beep/beep.c
@@ -126,7 +126,7 @@ BpPlayTune(IN PWCHAR Arguments)
             }
 
             /* Wait for duration time */
-            XtLdrProto->Util.SleepExecution(60000 * Duration / Tempo);
+            XtLdrProtocol->Util.SleepExecution(60000 * Duration / Tempo);
 
             /* Reset pitch and duration */
             Pitch = -1;
@@ -195,7 +195,7 @@ XtLdrModuleMain(IN EFI_HANDLE ImageHandle,
     EFI_STATUS Status;
 
     /* Open the XTLDR protocol */
-    Status = BlGetXtLdrProtocol(SystemTable, ImageHandle, &XtLdrProto);
+    Status = BlGetXtLdrProtocol(SystemTable, ImageHandle, &XtLdrProtocol);
     if(Status != STATUS_EFI_SUCCESS)
     {
         /* Failed to open the protocol, return error */
@@ -203,7 +203,7 @@ XtLdrModuleMain(IN EFI_HANDLE ImageHandle,
     }
 
     /* Play the tune set in the configuration */
-    BpPlayTune(XtLdrProto->Config.GetValue(L"TUNE"));
+    BpPlayTune(XtLdrProtocol->Config.GetValue(L"TUNE"));
 
 	/* Return success */
     return STATUS_EFI_SUCCESS;
diff --git a/xtldr/modules/beep/globals.c b/xtldr/modules/beep/globals.c
index eb8e3cc..857eb33 100644
--- a/xtldr/modules/beep/globals.c
+++ b/xtldr/modules/beep/globals.c
@@ -10,4 +10,4 @@
 
 
 /* XTLDR protocol handler */
-PXTBL_LOADER_PROTOCOL XtLdrProto;
+PXTBL_LOADER_PROTOCOL XtLdrProtocol;
diff --git a/xtldr/modules/beep/includes/globals.h b/xtldr/modules/beep/includes/globals.h
index ee5bff0..abd4894 100644
--- a/xtldr/modules/beep/includes/globals.h
+++ b/xtldr/modules/beep/includes/globals.h
@@ -13,6 +13,6 @@
 
 
 /* XTLDR protocol handler */
-EXTERN PXTBL_LOADER_PROTOCOL XtLdrProto;
+EXTERN PXTBL_LOADER_PROTOCOL XtLdrProtocol;
 
 #endif/* __XTLDR_BEEP_GLOBALS_H */
diff --git a/xtldr/modules/dummy/dummy.c b/xtldr/modules/dummy/dummy.c
index 0628827..5d806f0 100644
--- a/xtldr/modules/dummy/dummy.c
+++ b/xtldr/modules/dummy/dummy.c
@@ -51,7 +51,7 @@ XtLdrModuleMain(IN EFI_HANDLE ImageHandle,
     EFI_STATUS Status;
 
     /* Open the XTLDR protocol */
-    Status = BlGetXtLdrProtocol(SystemTable, ImageHandle, &XtLdrProto);
+    Status = BlGetXtLdrProtocol(SystemTable, ImageHandle, &XtLdrProtocol);
     if(Status != STATUS_EFI_SUCCESS)
     {
         /* Failed to open the protocol, return error */
@@ -62,8 +62,8 @@ XtLdrModuleMain(IN EFI_HANDLE ImageHandle,
     BlpDummyProtocol.BootSystem = BlBootDummyOS;
 
     /* Register XTOS boot protocol */
-    XtLdrProto->Boot.RegisterProtocol(L"XTOS", &DummyGuid);
+    XtLdrProtocol->Boot.RegisterProtocol(L"XTOS", &DummyGuid);
 
     /* Register DUMMY protocol as XTOS boot protocol */
-    return XtLdrProto->Protocol.Install(&BlpDummyProtocol, &DummyGuid);
+    return XtLdrProtocol->Protocol.Install(&BlpDummyProtocol, &DummyGuid);
 }
diff --git a/xtldr/modules/dummy/globals.c b/xtldr/modules/dummy/globals.c
index 595be67..071747c 100644
--- a/xtldr/modules/dummy/globals.c
+++ b/xtldr/modules/dummy/globals.c
@@ -10,7 +10,7 @@
 
 
 /* XTLDR protocol handler */
-PXTBL_LOADER_PROTOCOL XtLdrProto;
+PXTBL_LOADER_PROTOCOL XtLdrProtocol;
 
 /* Dummy Boot Protocol handler */
 XTBL_BOOT_PROTOCOL BlpDummyProtocol;
diff --git a/xtldr/modules/dummy/includes/globals.h b/xtldr/modules/dummy/includes/globals.h
index 8fd8446..aab86ed 100644
--- a/xtldr/modules/dummy/includes/globals.h
+++ b/xtldr/modules/dummy/includes/globals.h
@@ -13,7 +13,7 @@
 
 
 /* XTLDR protocol handler */
-EXTERN PXTBL_LOADER_PROTOCOL XtLdrProto;
+EXTERN PXTBL_LOADER_PROTOCOL XtLdrProtocol;
 
 /* Dummy Boot Protocol handler */
 EXTERN XTBL_BOOT_PROTOCOL BlpDummyProtocol;