Unify naming convention

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);
 }

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;

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;

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);

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