Update Guid Value format.

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

29 files changed, 31 insertions, 31 deletions

diff --git a/EdkCompatibilityPkg/Foundation/Guid/AcpiDescription/AcpiDescription.h b/EdkCompatibilityPkg/Foundation/Guid/AcpiDescription/AcpiDescription.h
index 43adf0191b..b0b8e87c09 100644
--- a/EdkCompatibilityPkg/Foundation/Guid/AcpiDescription/AcpiDescription.h
+++ b/EdkCompatibilityPkg/Foundation/Guid/AcpiDescription/AcpiDescription.h
@@ -25,7 +25,7 @@ Abstract:
 

 #define EFI_ACPI_DESCRIPTION_GUID \

   { \

-    0x3c699197, 0x93c, 0x4c69, 0xb0, 0x6b, 0x12, 0x8a, 0xe3, 0x48, 0x1d, 0xc9 \

+    0x3c699197, 0x93c, 0x4c69, {0xb0, 0x6b, 0x12, 0x8a, 0xe3, 0x48, 0x1d, 0xc9} \

   }

 

 typedef struct {

diff --git a/EdkCompatibilityPkg/Foundation/Guid/AlternateFvBlock/AlternateFvBlock.h b/EdkCompatibilityPkg/Foundation/Guid/AlternateFvBlock/AlternateFvBlock.h
index 53340eaa04..5f6d2a6448 100644
--- a/EdkCompatibilityPkg/Foundation/Guid/AlternateFvBlock/AlternateFvBlock.h
+++ b/EdkCompatibilityPkg/Foundation/Guid/AlternateFvBlock/AlternateFvBlock.h
@@ -24,7 +24,7 @@ Abstract:
 

 #define EFI_ALTERNATE_FV_BLOCK_GUID \

   { \

-    0xf496922d, 0x172f, 0x4bbc, 0xa1, 0xeb, 0xe, 0xeb, 0x94, 0x9c, 0x34, 0x86 \

+    0xf496922d, 0x172f, 0x4bbc, {0xa1, 0xeb, 0xe, 0xeb, 0x94, 0x9c, 0x34, 0x86} \

   }

 

 extern EFI_GUID gEfiAlternateFvBlockGuid;

diff --git a/EdkCompatibilityPkg/Foundation/Guid/Bmp/Bmp.h b/EdkCompatibilityPkg/Foundation/Guid/Bmp/Bmp.h
index e095d2a929..4b2d71c8c3 100644
--- a/EdkCompatibilityPkg/Foundation/Guid/Bmp/Bmp.h
+++ b/EdkCompatibilityPkg/Foundation/Guid/Bmp/Bmp.h
@@ -55,7 +55,7 @@ typedef struct {
 #pragma pack()

 

 #define EFI_DEFAULT_BMP_LOGO_GUID \

-  {0x7BB28B99,0x61BB,0x11d5,0x9A,0x5D,0x00,0x90,0x27,0x3F,0xC1,0x4D}

+  {0x7BB28B99,0x61BB,0x11d5,{0x9A,0x5D,0x00,0x90,0x27,0x3F,0xC1,0x4D}}

 

 extern EFI_GUID gEfiDefaultBmpLogoGuid;

 

diff --git a/EdkCompatibilityPkg/Foundation/Guid/BootState/BootState.h b/EdkCompatibilityPkg/Foundation/Guid/BootState/BootState.h
index e0aeba41b4..48baffb8f7 100644
--- a/EdkCompatibilityPkg/Foundation/Guid/BootState/BootState.h
+++ b/EdkCompatibilityPkg/Foundation/Guid/BootState/BootState.h
@@ -32,7 +32,7 @@ typedef UINT32 EFI_BOOT_STATE;
 #define BOOT_STATE_VARIABLE_NAME  L"BootState"

 

 #define  EFI_BOOT_STATE_VARIABLE_GUID  \

-  {0x60b5e939, 0xfcf, 0x4227, 0xba, 0x83, 0x6b, 0xbe, 0xd4, 0x5b, 0xc0, 0xe3}

+  {0x60b5e939, 0xfcf, 0x4227, {0xba, 0x83, 0x6b, 0xbe, 0xd4, 0x5b, 0xc0, 0xe3}}

 

 extern EFI_GUID gEfiBootStateGuid;

 #endif

diff --git a/EdkCompatibilityPkg/Foundation/Guid/Capsule/Capsule.h b/EdkCompatibilityPkg/Foundation/Guid/Capsule/Capsule.h
index 8c61f5e725..1ae9019351 100644
--- a/EdkCompatibilityPkg/Foundation/Guid/Capsule/Capsule.h
+++ b/EdkCompatibilityPkg/Foundation/Guid/Capsule/Capsule.h
@@ -28,7 +28,7 @@ Abstract:
 // via a variable.

 //

 #define EFI_CAPSULE_VENDOR_GUID  \

-  { 0x711C703F, 0xC285, 0x4B10, 0xA3, 0xB0, 0x36, 0xEC, 0xBD, 0x3C, 0x8B, 0xE2 }

+  { 0x711C703F, 0xC285, 0x4B10, {0xA3, 0xB0, 0x36, 0xEC, 0xBD, 0x3C, 0x8B, 0xE2} }

   

 extern EFI_GUID gEfiCapsuleVendorGuid;

 

diff --git a/EdkCompatibilityPkg/Foundation/Guid/CompatibleMemoryTested/CompatibleMemoryTested.h b/EdkCompatibilityPkg/Foundation/Guid/CompatibleMemoryTested/CompatibleMemoryTested.h
index 2223776fb2..7524a413ae 100644
--- a/EdkCompatibilityPkg/Foundation/Guid/CompatibleMemoryTested/CompatibleMemoryTested.h
+++ b/EdkCompatibilityPkg/Foundation/Guid/CompatibleMemoryTested/CompatibleMemoryTested.h
@@ -24,7 +24,7 @@ Abstract:
 

 #define EFI_COMPATIBLE_MEMORY_TESTED_PROTOCOL_GUID \

   { \

-    0x64c475ef, 0x344b, 0x492c, 0x93, 0xad, 0xab, 0x9e, 0xb4, 0x39, 0x50, 0x4 \

+    0x64c475ef, 0x344b, 0x492c, {0x93, 0xad, 0xab, 0x9e, 0xb4, 0x39, 0x50, 0x4} \

   }

 

 extern EFI_GUID gEfiCompatibleMemoryTestedGuid;

diff --git a/EdkCompatibilityPkg/Foundation/Guid/ConsoleInDevice/ConsoleInDevice.h b/EdkCompatibilityPkg/Foundation/Guid/ConsoleInDevice/ConsoleInDevice.h
index 7fc1b90594..d5ef215226 100644
--- a/EdkCompatibilityPkg/Foundation/Guid/ConsoleInDevice/ConsoleInDevice.h
+++ b/EdkCompatibilityPkg/Foundation/Guid/ConsoleInDevice/ConsoleInDevice.h
@@ -22,7 +22,7 @@ Abstract:
 #define _CONSOLE_IN_DEVICE_H_

 

 #define EFI_CONSOLE_IN_DEVICE_GUID    \

-    { 0xd3b36f2b, 0xd551, 0x11d4, 0x9a, 0x46, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d }

+    { 0xd3b36f2b, 0xd551, 0x11d4, {0x9a, 0x46, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d} }

 

 extern EFI_GUID gEfiConsoleInDeviceGuid;

 

diff --git a/EdkCompatibilityPkg/Foundation/Guid/ConsoleOutDevice/ConsoleOutDevice.h b/EdkCompatibilityPkg/Foundation/Guid/ConsoleOutDevice/ConsoleOutDevice.h
index 7eff36a842..e62d6c6029 100644
--- a/EdkCompatibilityPkg/Foundation/Guid/ConsoleOutDevice/ConsoleOutDevice.h
+++ b/EdkCompatibilityPkg/Foundation/Guid/ConsoleOutDevice/ConsoleOutDevice.h
@@ -22,7 +22,7 @@ Abstract:
 #define _CONSOLE_OUT_DEVICE_H_

 

 #define EFI_CONSOLE_OUT_DEVICE_GUID    \

-    { 0xd3b36f2c, 0xd551, 0x11d4, 0x9a, 0x46, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d }

+    { 0xd3b36f2c, 0xd551, 0x11d4, {0x9a, 0x46, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d} }

 

 extern EFI_GUID gEfiConsoleOutDeviceGuid;

 

diff --git a/EdkCompatibilityPkg/Foundation/Guid/EfiShell/EfiShell.h b/EdkCompatibilityPkg/Foundation/Guid/EfiShell/EfiShell.h
index a3b76d3c29..07b7cdfc8a 100644
--- a/EdkCompatibilityPkg/Foundation/Guid/EfiShell/EfiShell.h
+++ b/EdkCompatibilityPkg/Foundation/Guid/EfiShell/EfiShell.h
@@ -23,10 +23,10 @@ Abstract:
 #define _EFI_SHELL_H_

 

 #define EFI_SHELL_FILE_GUID  \

-  { 0xc57ad6b7, 0x0515, 0x40a8, 0x9d, 0x21, 0x55, 0x16, 0x52, 0x85, 0x4e, 0x37 }

+  { 0xc57ad6b7, 0x0515, 0x40a8, {0x9d, 0x21, 0x55, 0x16, 0x52, 0x85, 0x4e, 0x37} }

 

 #define EFI_MINI_SHELL_FILE_GUID  \

-  { 0x86ad232b, 0xd33a, 0x465c, 0xbf, 0x5f, 0x41, 0x37, 0xb, 0xa9, 0x2f, 0xe2 }

+  { 0x86ad232b, 0xd33a, 0x465c, {0xbf, 0x5f, 0x41, 0x37, 0xb, 0xa9, 0x2f, 0xe2} }

 

 extern EFI_GUID gEfiShellFileGuid;

 extern EFI_GUID gEfiMiniShellFileGuid;

diff --git a/EdkCompatibilityPkg/Foundation/Guid/EventLegacyBios/EventLegacyBios.h b/EdkCompatibilityPkg/Foundation/Guid/EventLegacyBios/EventLegacyBios.h
index 648e2549f8..0c5b5630c2 100644
--- a/EdkCompatibilityPkg/Foundation/Guid/EventLegacyBios/EventLegacyBios.h
+++ b/EdkCompatibilityPkg/Foundation/Guid/EventLegacyBios/EventLegacyBios.h
@@ -21,7 +21,7 @@
 #define __EVENT_LEGACY_BIOS_GUID_H__

 

 #define EFI_EVENT_LEGACY_BOOT_GUID \

-   { 0x2a571201, 0x4966, 0x47f6, 0x8b, 0x86, 0xf3, 0x1e, 0x41, 0xf3, 0x2f, 0x10 }

+   { 0x2a571201, 0x4966, 0x47f6, {0x8b, 0x86, 0xf3, 0x1e, 0x41, 0xf3, 0x2f, 0x10} }

 

 extern EFI_GUID gEfiEventLegacyBootGuid;

 

diff --git a/EdkCompatibilityPkg/Foundation/Guid/FlashMapHob/FlashMapHob.h b/EdkCompatibilityPkg/Foundation/Guid/FlashMapHob/FlashMapHob.h
index 1676df2a5e..5fa41caf1a 100644
--- a/EdkCompatibilityPkg/Foundation/Guid/FlashMapHob/FlashMapHob.h
+++ b/EdkCompatibilityPkg/Foundation/Guid/FlashMapHob/FlashMapHob.h
@@ -26,7 +26,7 @@ Abstract:
 // Definitions for Flash Map

 //

 #define EFI_FLASH_MAP_HOB_GUID \

-  { 0xb091e7d2, 0x5a0, 0x4198, 0x94, 0xf0, 0x74, 0xb7, 0xb8, 0xc5, 0x54, 0x59 }

+  { 0xb091e7d2, 0x5a0, 0x4198, {0x94, 0xf0, 0x74, 0xb7, 0xb8, 0xc5, 0x54, 0x59} }

 

 extern EFI_GUID gEfiFlashMapHobGuid;

 

diff --git a/EdkCompatibilityPkg/Foundation/Guid/GenericVariable/GenericVariable.h b/EdkCompatibilityPkg/Foundation/Guid/GenericVariable/GenericVariable.h
index d6b4f3e570..658bf6038b 100644
--- a/EdkCompatibilityPkg/Foundation/Guid/GenericVariable/GenericVariable.h
+++ b/EdkCompatibilityPkg/Foundation/Guid/GenericVariable/GenericVariable.h
@@ -24,7 +24,7 @@ Abstract:
 

 #define EFI_GENERIC_VARIABLE_GUID \

   { \

-    0x59d1c24f, 0x50f1, 0x401a, 0xb1, 0x01, 0xf3, 0x3e, 0x0d, 0xae, 0xd4, 0x43 \

+    0x59d1c24f, 0x50f1, 0x401a, {0xb1, 0x01, 0xf3, 0x3e, 0x0d, 0xae, 0xd4, 0x43} \

   }

 

 extern EFI_GUID gEfiGenericVariableGuid;

diff --git a/EdkCompatibilityPkg/Foundation/Guid/HotPlugDevice/HotPlugDevice.h b/EdkCompatibilityPkg/Foundation/Guid/HotPlugDevice/HotPlugDevice.h
index 0e7ebdea72..0427cb9827 100644
--- a/EdkCompatibilityPkg/Foundation/Guid/HotPlugDevice/HotPlugDevice.h
+++ b/EdkCompatibilityPkg/Foundation/Guid/HotPlugDevice/HotPlugDevice.h
@@ -22,7 +22,7 @@ Abstract:
 #define _HOT_PLUG_DEVICE_H_

 

 #define HOT_PLUG_DEVICE_GUID    \

-    { 0x220ac432, 0x1d43, 0x49e5, 0xa7, 0x4f, 0x4c, 0x9d, 0xa6, 0x7a, 0xd2, 0x3b }

+    { 0x220ac432, 0x1d43, 0x49e5, {0xa7, 0x4f, 0x4c, 0x9d, 0xa6, 0x7a, 0xd2, 0x3b} }

 

 extern EFI_GUID gEfiHotPlugDeviceGuid;

 #endif

diff --git a/EdkCompatibilityPkg/Foundation/Guid/IoBaseHob/IoBaseHob.h b/EdkCompatibilityPkg/Foundation/Guid/IoBaseHob/IoBaseHob.h
index e55f2b129c..63e2eb6bc1 100644
--- a/EdkCompatibilityPkg/Foundation/Guid/IoBaseHob/IoBaseHob.h
+++ b/EdkCompatibilityPkg/Foundation/Guid/IoBaseHob/IoBaseHob.h
@@ -23,7 +23,7 @@ Abstract:
 #define _IOBASE_GUID_H_

 

 #define EFI_IOBASE_HOB_GUID \

-{ 0xd4a28a3e, 0xdcf2, 0x43cf, 0xa2, 0xb7, 0xf3, 0x57, 0x2a, 0x7c, 0xab, 0x9 }

+{ 0xd4a28a3e, 0xdcf2, 0x43cf, {0xa2, 0xb7, 0xf3, 0x57, 0x2a, 0x7c, 0xab, 0x9} }

 

 extern EFI_GUID gEfiIoBaseHobGuid;

 

diff --git a/EdkCompatibilityPkg/Foundation/Guid/MemoryTypeInformation/MemoryTypeInformation.h b/EdkCompatibilityPkg/Foundation/Guid/MemoryTypeInformation/MemoryTypeInformation.h
index d85c84374e..08c04ded68 100644
--- a/EdkCompatibilityPkg/Foundation/Guid/MemoryTypeInformation/MemoryTypeInformation.h
+++ b/EdkCompatibilityPkg/Foundation/Guid/MemoryTypeInformation/MemoryTypeInformation.h
@@ -23,7 +23,7 @@ Abstract:
 #define _MEMORY_TYPE_INFORMATION_GUID_H_

 

 #define EFI_MEMORY_TYPE_INFORMATION_GUID \

-  { 0x4c19049f,0x4137,0x4dd3,0x9c,0x10,0x8b,0x97,0xa8,0x3f,0xfd,0xfa }

+  { 0x4c19049f,0x4137,0x4dd3,{0x9c,0x10,0x8b,0x97,0xa8,0x3f,0xfd,0xfa} }

 

 #define EFI_MEMORY_TYPE_INFORMATION_VARIABLE_NAME L"MemoryTypeInformation"

 

diff --git a/EdkCompatibilityPkg/Foundation/Guid/PciExpressBaseAddress/PciExpressBaseAddress.h b/EdkCompatibilityPkg/Foundation/Guid/PciExpressBaseAddress/PciExpressBaseAddress.h
index 0625b3e147..2abcbff9d6 100644
--- a/EdkCompatibilityPkg/Foundation/Guid/PciExpressBaseAddress/PciExpressBaseAddress.h
+++ b/EdkCompatibilityPkg/Foundation/Guid/PciExpressBaseAddress/PciExpressBaseAddress.h
@@ -25,7 +25,7 @@ Abstract:
 

 #define EFI_PCI_EXPRESS_BASE_ADDRESS_GUID \

   { \

-    0x3677d529, 0x326f, 0x4603, 0xa9, 0x26, 0xea, 0xac, 0xe0, 0x1d, 0xcb, 0xb0 \

+    0x3677d529, 0x326f, 0x4603, {0xa9, 0x26, 0xea, 0xac, 0xe0, 0x1d, 0xcb, 0xb0} \

   }

 

 //

diff --git a/EdkCompatibilityPkg/Foundation/Guid/PciHotPlugDevice/PciHotPlugDevice.h b/EdkCompatibilityPkg/Foundation/Guid/PciHotPlugDevice/PciHotPlugDevice.h
index dafcf1e6cf..d2b8963c9d 100644
--- a/EdkCompatibilityPkg/Foundation/Guid/PciHotPlugDevice/PciHotPlugDevice.h
+++ b/EdkCompatibilityPkg/Foundation/Guid/PciHotPlugDevice/PciHotPlugDevice.h
@@ -23,7 +23,7 @@ Abstract:
 #define _PCI_HOTPLUG_DEVICE_GUID_H_

 

 #define EFI_PCI_HOTPLUG_DEVICE_GUID \

-  { 0x0b280816, 0x52e7, 0x4e51, 0xaa, 0x57, 0x11, 0xbd, 0x41, 0xcb, 0xef, 0xc3 }

+  { 0x0b280816, 0x52e7, 0x4e51, {0xaa, 0x57, 0x11, 0xbd, 0x41, 0xcb, 0xef, 0xc3} }

 

 extern EFI_GUID gEfiPciHotplugDeviceGuid;

 

diff --git a/EdkCompatibilityPkg/Foundation/Guid/PciOptionRomTable/PciOptionRomTable.h b/EdkCompatibilityPkg/Foundation/Guid/PciOptionRomTable/PciOptionRomTable.h
index 5055ccc649..385f43f448 100644
--- a/EdkCompatibilityPkg/Foundation/Guid/PciOptionRomTable/PciOptionRomTable.h
+++ b/EdkCompatibilityPkg/Foundation/Guid/PciOptionRomTable/PciOptionRomTable.h
@@ -22,7 +22,7 @@ Abstract:
 #ifndef _PCI_OPTION_ROM_TABLE_GUID_H_

 

 #define EFI_PCI_OPTION_ROM_TABLE_GUID \

-  { 0x7462660f, 0x1cbd, 0x48da, 0xad, 0x11, 0x91, 0x71, 0x79, 0x13, 0x83, 0x1c }

+  { 0x7462660f, 0x1cbd, 0x48da, {0xad, 0x11, 0x91, 0x71, 0x79, 0x13, 0x83, 0x1c} }

 

 extern EFI_GUID gEfiPciOptionRomTableGuid;

 

diff --git a/EdkCompatibilityPkg/Foundation/Guid/PeiFlushInstructionCache/PeiFlushInstructionCache.h b/EdkCompatibilityPkg/Foundation/Guid/PeiFlushInstructionCache/PeiFlushInstructionCache.h
index 132d206dd1..2e1b3db116 100644
--- a/EdkCompatibilityPkg/Foundation/Guid/PeiFlushInstructionCache/PeiFlushInstructionCache.h
+++ b/EdkCompatibilityPkg/Foundation/Guid/PeiFlushInstructionCache/PeiFlushInstructionCache.h
@@ -23,7 +23,7 @@ Abstract:
 #define _PEI_FLUSH_INSTRUCTION_CACHE_GUID_H_

 

 #define EFI_PEI_FLUSH_INSTRUCTION_CACHE_GUID  \

-  { 0xd8117cfc, 0x94a6, 0x11d4, 0x9a, 0x3a, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d }

+  { 0xd8117cfc, 0x94a6, 0x11d4, {0x9a, 0x3a, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d} }

 

 EFI_FORWARD_DECLARATION (EFI_PEI_FLUSH_INSTRUCTION_CACHE_PROTOCOL);

 

diff --git a/EdkCompatibilityPkg/Foundation/Guid/PeiPeCoffLoader/PeiPeCoffLoader.h b/EdkCompatibilityPkg/Foundation/Guid/PeiPeCoffLoader/PeiPeCoffLoader.h
index 02fa1c2223..32c2947760 100644
--- a/EdkCompatibilityPkg/Foundation/Guid/PeiPeCoffLoader/PeiPeCoffLoader.h
+++ b/EdkCompatibilityPkg/Foundation/Guid/PeiPeCoffLoader/PeiPeCoffLoader.h
@@ -25,7 +25,7 @@ Abstract:
 #include "EfiImage.h"

 

 #define EFI_PEI_PE_COFF_LOADER_GUID  \

-  { 0xd8117cff, 0x94a6, 0x11d4, 0x9a, 0x3a, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d }

+  { 0xd8117cff, 0x94a6, 0x11d4, {0x9a, 0x3a, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d} }

 

 EFI_FORWARD_DECLARATION (EFI_PEI_PE_COFF_LOADER_PROTOCOL);

 

diff --git a/EdkCompatibilityPkg/Foundation/Guid/PeiPerformanceHob/PeiPerformanceHob.h b/EdkCompatibilityPkg/Foundation/Guid/PeiPerformanceHob/PeiPerformanceHob.h
index 7f9104fedf..6f315a905d 100644
--- a/EdkCompatibilityPkg/Foundation/Guid/PeiPerformanceHob/PeiPerformanceHob.h
+++ b/EdkCompatibilityPkg/Foundation/Guid/PeiPerformanceHob/PeiPerformanceHob.h
@@ -23,7 +23,7 @@ Abstract:
 

 

 #define EFI_PEI_PERFORMANCE_HOB_GUID  \

-{0x10f432de, 0xdeec, 0x4631, 0x80, 0xcd, 0x47, 0xf6, 0x5d, 0x8f, 0x80, 0xbb}

+{0x10f432de, 0xdeec, 0x4631, {0x80, 0xcd, 0x47, 0xf6, 0x5d, 0x8f, 0x80, 0xbb}}

 

 #define PEI_PERF_MAX_DESC_STRING 8

 

diff --git a/EdkCompatibilityPkg/Foundation/Guid/PeiTransferControl/PeiTransferControl.h b/EdkCompatibilityPkg/Foundation/Guid/PeiTransferControl/PeiTransferControl.h
index 0035b49cce..85e5af4b03 100644
--- a/EdkCompatibilityPkg/Foundation/Guid/PeiTransferControl/PeiTransferControl.h
+++ b/EdkCompatibilityPkg/Foundation/Guid/PeiTransferControl/PeiTransferControl.h
@@ -23,7 +23,7 @@ Abstract:
 #define _PEI_TRANSFER_CONTROL_H_

 

 #define EFI_PEI_TRANSFER_CONTROL_GUID  \

-  { 0xd8117d02, 0x94a6, 0x11d4, 0x9a, 0x3a, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d }

+  { 0xd8117d02, 0x94a6, 0x11d4, {0x9a, 0x3a, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d} }

 

 

 EFI_FORWARD_DECLARATION (EFI_PEI_TRANSFER_CONTROL_PROTOCOL);

diff --git a/EdkCompatibilityPkg/Foundation/Guid/PrimaryConsoleInDevice/PrimaryConsoleInDevice.h b/EdkCompatibilityPkg/Foundation/Guid/PrimaryConsoleInDevice/PrimaryConsoleInDevice.h
index 3681ef573f..f9cf99cead 100644
--- a/EdkCompatibilityPkg/Foundation/Guid/PrimaryConsoleInDevice/PrimaryConsoleInDevice.h
+++ b/EdkCompatibilityPkg/Foundation/Guid/PrimaryConsoleInDevice/PrimaryConsoleInDevice.h
@@ -22,7 +22,7 @@ Abstract:
 #define _PRIMARY_CONSOLE_IN_DEVICE_H_

 

 #define EFI_PRIMARY_CONSOLE_IN_DEVICE_GUID    \

-  { 0xe451dcbe, 0x96a1, 0x4729, 0xa5, 0xcf, 0x6b, 0x9c, 0x2c, 0xff, 0x47, 0xfd }

+  { 0xe451dcbe, 0x96a1, 0x4729, {0xa5, 0xcf, 0x6b, 0x9c, 0x2c, 0xff, 0x47, 0xfd} }

 

 extern EFI_GUID gEfiPrimaryConsoleInDeviceGuid;

 

diff --git a/EdkCompatibilityPkg/Foundation/Guid/PrimaryConsoleOutDevice/PrimaryConsoleOutDevice.h b/EdkCompatibilityPkg/Foundation/Guid/PrimaryConsoleOutDevice/PrimaryConsoleOutDevice.h
index d87cbbcdcb..bb8cab8f88 100644
--- a/EdkCompatibilityPkg/Foundation/Guid/PrimaryConsoleOutDevice/PrimaryConsoleOutDevice.h
+++ b/EdkCompatibilityPkg/Foundation/Guid/PrimaryConsoleOutDevice/PrimaryConsoleOutDevice.h
@@ -21,7 +21,7 @@ Abstract:
 #define _PRIMARY_CONSOLE_OUT_DEVICE_H_

 

 #define EFI_PRIMARY_CONSOLE_OUT_DEVICE_GUID    \

-  { 0x62bdf38a, 0xe3d5, 0x492c, 0x95, 0xc, 0x23, 0xa7, 0xf6, 0x6e, 0x67, 0x2e }

+  { 0x62bdf38a, 0xe3d5, 0x492c, {0x95, 0xc, 0x23, 0xa7, 0xf6, 0x6e, 0x67, 0x2e} }

 

 extern EFI_GUID gEfiPrimaryConsoleOutDeviceGuid;

 

diff --git a/EdkCompatibilityPkg/Foundation/Guid/PrimaryStandardErrorDevice/PrimaryStandardErrorDevice.h b/EdkCompatibilityPkg/Foundation/Guid/PrimaryStandardErrorDevice/PrimaryStandardErrorDevice.h
index 15d53dfb7e..486ea04a47 100644
--- a/EdkCompatibilityPkg/Foundation/Guid/PrimaryStandardErrorDevice/PrimaryStandardErrorDevice.h
+++ b/EdkCompatibilityPkg/Foundation/Guid/PrimaryStandardErrorDevice/PrimaryStandardErrorDevice.h
@@ -21,7 +21,7 @@ Abstract:
 #define _PRIMARY_STANDARD_ERROR_DEVICE_H_

 

 #define EFI_PRIMARY_STANDARD_ERROR_DEVICE_GUID    \

-  { 0x5a68191b, 0x9b97, 0x4752, 0x99, 0x46, 0xe3, 0x6a, 0x5d, 0xa9, 0x42, 0xb1 }

+  { 0x5a68191b, 0x9b97, 0x4752, {0x99, 0x46, 0xe3, 0x6a, 0x5d, 0xa9, 0x42, 0xb1} }

 

 extern EFI_GUID gEfiPrimaryStandardErrorDeviceGuid;

 

diff --git a/EdkCompatibilityPkg/Foundation/Guid/StandardErrorDevice/StandardErrorDevice.h b/EdkCompatibilityPkg/Foundation/Guid/StandardErrorDevice/StandardErrorDevice.h
index b8cadfdebb..76d85c60c5 100644
--- a/EdkCompatibilityPkg/Foundation/Guid/StandardErrorDevice/StandardErrorDevice.h
+++ b/EdkCompatibilityPkg/Foundation/Guid/StandardErrorDevice/StandardErrorDevice.h
@@ -22,7 +22,7 @@ Abstract:
 #define _STANDARD_ERROR_DEVICE_H_

 

 #define EFI_STANDARD_ERROR_DEVICE_GUID    \

-    { 0xd3b36f2d, 0xd551, 0x11d4, 0x9a, 0x46, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d }

+    { 0xd3b36f2d, 0xd551, 0x11d4, {0x9a, 0x46, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d} }

 

 extern EFI_GUID gEfiStandardErrorDeviceGuid;

 

diff --git a/EdkCompatibilityPkg/Foundation/Guid/StatusCode/StatusCode.h b/EdkCompatibilityPkg/Foundation/Guid/StatusCode/StatusCode.h
index 8953bb040e..d49d98a76e 100644
--- a/EdkCompatibilityPkg/Foundation/Guid/StatusCode/StatusCode.h
+++ b/EdkCompatibilityPkg/Foundation/Guid/StatusCode/StatusCode.h
@@ -25,7 +25,7 @@ Abstract:
 

 #define EFI_STATUS_CODE_GUID \

   { \

-    0xd083e94c, 0x6560, 0x42e4, 0xb6, 0xd4, 0x2d, 0xf7, 0x5a, 0xdf, 0x6a, 0x2a \

+    0xd083e94c, 0x6560, 0x42e4, {0xb6, 0xd4, 0x2d, 0xf7, 0x5a, 0xdf, 0x6a, 0x2a} \

   }

 

 extern EFI_GUID gEfiStatusCodeGuid;

diff --git a/EdkCompatibilityPkg/Foundation/Guid/StatusCodeCallerId/StatusCodeCallerId.h b/EdkCompatibilityPkg/Foundation/Guid/StatusCodeCallerId/StatusCodeCallerId.h
index 964bb83129..270900d827 100644
--- a/EdkCompatibilityPkg/Foundation/Guid/StatusCodeCallerId/StatusCodeCallerId.h
+++ b/EdkCompatibilityPkg/Foundation/Guid/StatusCodeCallerId/StatusCodeCallerId.h
@@ -27,7 +27,7 @@ Abstract:
 #ifndef EFI_STANDARD_CALLER_ID_GUID

 

 #define EFI_STANDARD_CALLER_ID_GUID \

-  {0xC9DCF469, 0xA7C4, 0x11D5, 0x87, 0xDA, 0x00, 0x06, 0x29, 0x45, 0xC3, 0xB9}

+  {0xC9DCF469, 0xA7C4, 0x11D5, {0x87, 0xDA, 0x00, 0x06, 0x29, 0x45, 0xC3, 0xB9}}

 

 #endif

 

diff --git a/EdkCompatibilityPkg/Foundation/Guid/SystemNvDataGuid/SystemNvDataGuid.h b/EdkCompatibilityPkg/Foundation/Guid/SystemNvDataGuid/SystemNvDataGuid.h
index ce3358d147..5ca3316d45 100644
--- a/EdkCompatibilityPkg/Foundation/Guid/SystemNvDataGuid/SystemNvDataGuid.h
+++ b/EdkCompatibilityPkg/Foundation/Guid/SystemNvDataGuid/SystemNvDataGuid.h
@@ -24,10 +24,10 @@ Abstract:
 #define _SYSTEM_NV_DATA_GUID_H_

 

 #define EFI_SYSTEM_NV_DATA_FV_GUID \

-  {0xfff12b8d, 0x7696, 0x4c8b, 0xa9, 0x85, 0x27, 0x47, 0x7, 0x5b, 0x4f, 0x50}

+  {0xfff12b8d, 0x7696, 0x4c8b, {0xa9, 0x85, 0x27, 0x47, 0x7, 0x5b, 0x4f, 0x50}}

 

 #define EFI_SYSTEM_NV_DATA_HOB_GUID \

-  {0xd6e5092d, 0xc7b2, 0x4872, 0xaf, 0x66, 0xfd, 0xc0, 0xe6, 0xf9, 0x5e, 0x78}

+  {0xd6e5092d, 0xc7b2, 0x4872, {0xaf, 0x66, 0xfd, 0xc0, 0xe6, 0xf9, 0x5e, 0x78}}

 

 typedef struct {

   EFI_GUID                  SystemNvDataHobGuid;