Rename Protocol->Register() to Protocol->Install()

xtldr/includes/xtldr.h

@@ -204,7 +204,7 @@ BlRegisterBootProtocol(IN PWCHAR SystemType,
 
 XTCDECL
 EFI_STATUS
-BlRegisterProtocol(IN PEFI_GUID Guid,
+BlInstallProtocol(IN PEFI_GUID Guid,
                    IN PVOID Interface);
 
 XTCDECL
@@ -345,6 +345,10 @@ BlpInitializeSerialPort(IN ULONG PortNumber,
                         IN ULONG PortAddress,
                         IN ULONG BaudRate);
 
+XTCDECL
+EFI_STATUS
+BlpInstallXtLoaderProtocol();
+
 XTCDECL
 EFI_STATUS
 BlpLoadConfiguration();
@@ -368,10 +372,6 @@ BlpReadConfigFile(IN CONST PWCHAR ConfigDirectory,
                   IN CONST PWCHAR ConfigFile,
                   OUT PCHAR *ConfigData);
 
-XTCDECL
-EFI_STATUS
-BlpRegisterXtLoaderProtocol();
-
 XTCDECL
 VOID
 BlpStringFormat(IN BLPRINTCHAR PrintCharRoutine,

xtldr/modules/dummy/dummy.c

@@ -56,5 +56,5 @@ XtLdrModuleMain(IN EFI_HANDLE ImageHandle,
     XtLdrProto->Boot.RegisterProtocol(L"XTOS", &DummyGuid);
 
     /* Register DUMMY protocol as XTOS boot protocol */
-    return XtLdrProto->Protocol.Register(&DummyGuid, &BlpDummyProtocol);
+    return XtLdrProto->Protocol.Install(&DummyGuid, &BlpDummyProtocol);
 }

xtldr/modules/fb_o/framebuf.c

@@ -251,5 +251,5 @@ XtLdrModuleMain(IN EFI_HANDLE ImageHandle,
     XtFramebufferProtocol.PrintDisplayInformation = FbPrintDisplayInformation;
 
     /* Register XTOS boot protocol */
-    return XtLdrProtocol->Protocol.Register(&Guid, &XtFramebufferProtocol);
+    return XtLdrProtocol->Protocol.Install(&Guid, &XtFramebufferProtocol);
 }

xtldr/modules/pecoff_o/pecoff.c

@@ -603,5 +603,5 @@ XtLdrModuleMain(IN EFI_HANDLE ImageHandle,
     XtPeCoffProtocol.RelocateImage = PeRelocateImage;
 
     /* Register PE/COFF protocol */
-    return XtLdrProtocol->Protocol.Register(&Guid, &XtPeCoffProtocol);
+    return XtLdrProtocol->Protocol.Install(&Guid, &XtPeCoffProtocol);
 }

xtldr/modules/xtos_o/xtos.c

@@ -542,5 +542,5 @@ XtLdrModuleMain(IN EFI_HANDLE ImageHandle,
     XtLdrProtocol->Boot.RegisterProtocol(L"XTOS", &Guid);
 
     /* Install XTOS protocol */
-    return XtLdrProtocol->Protocol.Register(&Guid, &XtBootProtocol);
+    return XtLdrProtocol->Protocol.Install(&Guid, &XtBootProtocol);
 }

xtldr/protocol.c

@@ -506,7 +506,7 @@ BlRegisterBootProtocol(IN PWCHAR SystemType,
  */
 XTCDECL
 EFI_STATUS
-BlRegisterProtocol(IN PEFI_GUID Guid,
+BlInstallProtocol(IN PEFI_GUID Guid,
                    IN PVOID Interface)
 {
     EFI_HANDLE Handle = NULL;
@@ -516,7 +516,7 @@ BlRegisterProtocol(IN PEFI_GUID Guid,
 }
 
 /**
- * This routine registers XTLDR protocol for further usage by modules.
+ * This routine installs XTLDR protocol for further usage by modules.
  *
  * @return This routine returns a status code.
  *
@@ -524,7 +524,7 @@ BlRegisterProtocol(IN PEFI_GUID Guid,
  */
 XTCDECL
 EFI_STATUS
-BlpRegisterXtLoaderProtocol()
+BlpInstallXtLoaderProtocol()
 {
     EFI_GUID Guid = XT_BOOT_LOADER_PROTOCOL_GUID;
 
@@ -556,7 +556,7 @@ BlpRegisterXtLoaderProtocol()
     BlpLdrProtocol.Memory.GetMemoryMap = BlGetMemoryMap;
     BlpLdrProtocol.Protocol.GetModulesList = BlGetModulesList;
     BlpLdrProtocol.Protocol.Open = BlOpenProtocol;
-    BlpLdrProtocol.Protocol.Register = BlRegisterProtocol;
+    BlpLdrProtocol.Protocol.Install = BlInstallProtocol;
     BlpLdrProtocol.Tui.DisplayErrorDialog = BlDisplayErrorDialog;
     BlpLdrProtocol.Tui.DisplayInfoDialog = BlDisplayInfoDialog;
     BlpLdrProtocol.Tui.DisplayInputDialog = BlDisplayInputDialog;
@@ -569,5 +569,5 @@ BlpRegisterXtLoaderProtocol()
 
     /* Register XTLDR loader protocol */
     BlDebugPrint(L"Registering XT loader protocol\n");
-    return BlRegisterProtocol(&Guid, &BlpLdrProtocol);
+    return BlInstallProtocol(&Guid, &BlpLdrProtocol);
 }

xtldr/xtldr.c

@@ -347,12 +347,12 @@ BlStartXtLoader(IN EFI_HANDLE ImageHandle,
         BlDebugPrint(L"WARNING: Failed to disable watchdog timer (Status Code: 0x%lx)\n", Status);
     }
 
-    /* Register loader protocol */
+    /* Install loader protocol */
-    Status = BlpRegisterXtLoaderProtocol();
+    Status = BlpInstallXtLoaderProtocol();
     if(Status != STATUS_EFI_SUCCESS)
     {
         /* Failed to register loader protocol */
-        BlDebugPrint(L"ERROR: Failed to register XTLDR boot protocol (Status Code: 0x%lx)\n", Status);
+        BlDebugPrint(L"ERROR: Failed to register XTLDR loader protocol (Status Code: 0x%lx)\n", Status);
         return Status;
     }