Add GLOBAL_REMOVE_IF_UNREFERENCED modifier in the array and change the protocol UI...

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5672 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Core/Dxe/DxeMain/DxeProtocolNotify.c b/MdeModulePkg/Core/Dxe/DxeMain/DxeProtocolNotify.c
index 3b0c6eb3efd2aac0386a9a7f055e6885d632ed4f..7bce6185c689159cd37401550c57a46824ff8787 100644 (file)
--- a/MdeModulePkg/Core/Dxe/DxeMain/DxeProtocolNotify.c
+++ b/MdeModulePkg/Core/Dxe/DxeMain/DxeProtocolNotify.c
@@ -212,24 +212,24 @@ CoreNotifyOnArchProtocolInstallation (
 // Following is needed to display missing architectural protocols in debug builds\r
 //\r
 typedef struct {\r
-  EFI_GUID                    *ProtocolGuid;\r
-  CHAR16                       *GuidString;\r
+  EFI_GUID                     *ProtocolGuid;\r
+  CHAR8                        *GuidString;\r
 } GUID_TO_STRING_PROTOCOL_ENTRY;\r
 \r
-CONST GUID_TO_STRING_PROTOCOL_ENTRY MissingProtocols[] = {\r
-  { &gEfiSecurityArchProtocolGuid,         (CHAR16 *)L"Security"           },\r
-  { &gEfiCpuArchProtocolGuid,              (CHAR16 *)L"CPU"                },\r
-  { &gEfiMetronomeArchProtocolGuid,        (CHAR16 *)L"Metronome"          },\r
-  { &gEfiTimerArchProtocolGuid,            (CHAR16 *)L"Timer"              },\r
-  { &gEfiBdsArchProtocolGuid,              (CHAR16 *)L"Bds"                },\r
-  { &gEfiWatchdogTimerArchProtocolGuid,    (CHAR16 *)L"Watchdog Timer"     },\r
-  { &gEfiRuntimeArchProtocolGuid,          (CHAR16 *)L"Runtime"            },\r
-  { &gEfiVariableArchProtocolGuid,         (CHAR16 *)L"Variable"           },\r
-  { &gEfiVariableWriteArchProtocolGuid,    (CHAR16 *)L"Variable Write"     },\r
-  { &gEfiCapsuleArchProtocolGuid,          (CHAR16 *)L"Capsule"            },\r
-  { &gEfiMonotonicCounterArchProtocolGuid, (CHAR16 *)L"Monotonic Counter"  },\r
-  { &gEfiResetArchProtocolGuid,            (CHAR16 *)L"Reset"              },\r
-  { &gEfiRealTimeClockArchProtocolGuid,    (CHAR16 *)L"Real Time Clock"    }\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST GUID_TO_STRING_PROTOCOL_ENTRY MissingProtocols[] = {\r
+  { &gEfiSecurityArchProtocolGuid,         "Security"           },\r
+  { &gEfiCpuArchProtocolGuid,              "CPU"                },\r
+  { &gEfiMetronomeArchProtocolGuid,        "Metronome"          },\r
+  { &gEfiTimerArchProtocolGuid,            "Timer"              },\r
+  { &gEfiBdsArchProtocolGuid,              "Bds"                },\r
+  { &gEfiWatchdogTimerArchProtocolGuid,    "Watchdog Timer"     },\r
+  { &gEfiRuntimeArchProtocolGuid,          "Runtime"            },\r
+  { &gEfiVariableArchProtocolGuid,         "Variable"           },\r
+  { &gEfiVariableWriteArchProtocolGuid,    "Variable Write"     },\r
+  { &gEfiCapsuleArchProtocolGuid,          "Capsule"            },\r
+  { &gEfiMonotonicCounterArchProtocolGuid, "Monotonic Counter"  },\r
+  { &gEfiResetArchProtocolGuid,            "Reset"              },\r
+  { &gEfiRealTimeClockArchProtocolGuid,    "Real Time Clock"    }\r
 };\r
 \r
 \r
@@ -248,10 +248,9 @@ CoreDisplayMissingArchProtocols (
 \r
   for (Entry = mArchProtocols; Entry->ProtocolGuid != NULL; Entry++) {\r
     if (!Entry->Present) {\r
-      MissingEntry = MissingProtocols;\r
       for (MissingEntry = MissingProtocols; TRUE ; MissingEntry++) {\r
         if (CompareGuid (Entry->ProtocolGuid, MissingEntry->ProtocolGuid)) {\r
-          DEBUG ((DEBUG_ERROR, "\n%s Arch Protocol not present!!\n", MissingEntry->GuidString));\r
+          DEBUG ((DEBUG_ERROR, "\n%a Arch Protocol not present!!\n", MissingEntry->GuidString));\r
           break;\r
         }\r
       }\r