]> git.proxmox.com Git - mirror_edk2.git/blobdiff - MdePkg/MdePkg.spd
Add PcdPciExpressBaseAddress info to MdePkg.spd
[mirror_edk2.git] / MdePkg / MdePkg.spd
index 9fbb8a6ed11cb1a766fef743123f2679ba76b1d1..89c1f2b2fc9db02a31eb02ce9b51c8cf7b102a7d 100644 (file)
-<?xml version="1.0" encoding="UTF-8"?>\r
-<PackageSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">\r
+<?xml version="1.0" encoding="UTF-8"?>\r
+<!--\r
+Copyright (c) 2006, Intel Corporation\r
+All rights reserved. This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+-->\r
+<PackageSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
   <SpdHeader>\r
     <PackageName>MdePkg</PackageName>\r
-    <Guid>5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec</Guid>\r
+    <GuidValue>5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec</GuidValue>\r
     <Version>0.3</Version>\r
     <Abstract>Framework Module Development Environment Industry Standards</Abstract>\r
     <Description>This Package provides headers and libraries that conform to EFI/Framework Industry standards.</Description>\r
-    <Copyright>Copyright (c) 2006,  Intel Corporation.</Copyright>\r
-    <License>\r
-      All rights reserved.\r
-      This program and the accompanying materials are licensed and made available under \r
-      the terms and conditions of the BSD License which accompanies this distribution. \r
-      The full text of the license may be found at \r
-      http://opensource.org/licenses/bsd-license.php \r
-\r
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, \r
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-     </License>\r
-    <Created>2006-03-18 19:02</Created>\r
-    <Updated>2006-03-19 15:18</Updated>\r
-    <URL>http://www.TianoCore.org</URL>\r
-    <PackageType>SOURCE</PackageType>\r
+    <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>\r
+    <License>All rights reserved.
+      This program and the accompanying materials are licensed and made available under 
+      the terms and conditions of the BSD License which accompanies this distribution. 
+      The full text of the license may be found at 
+      http://opensource.org/licenses/bsd-license.php 
+
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>\r
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
+  </SpdHeader>\r
+  <PackageDefinitions>\r
     <ReadOnly>true</ReadOnly>\r
     <RePackage>false</RePackage>\r
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION     0x00000052</Specification>\r
-  </SpdHeader>\r
+  </PackageDefinitions>\r
   <LibraryClassDeclarations>\r
-    <LibraryClassDeclaration>\r
-      <LibraryClass>BaseLib</LibraryClass>\r
+    <LibraryClass Name="BaseLib">\r
       <IncludeHeader>Include/Library/BaseLib.h</IncludeHeader>\r
-    </LibraryClassDeclaration>\r
-    <LibraryClassDeclaration>\r
-      <LibraryClass>BaseMemoryLib</LibraryClass>\r
+      <HelpText/>\r
+    </LibraryClass>\r
+    <LibraryClass Name="BaseMemoryLib">\r
       <IncludeHeader>Include/Library/BaseMemoryLib.h</IncludeHeader>\r
-    </LibraryClassDeclaration>\r
-    <LibraryClassDeclaration>\r
-      <LibraryClass>CacheMaintenanceLib</LibraryClass>\r
+      <HelpText/>\r
+    </LibraryClass>\r
+    <LibraryClass Name="CacheMaintenanceLib">\r
       <IncludeHeader>Include/Library/CacheMaintenanceLib.h</IncludeHeader>\r
-    </LibraryClassDeclaration>\r
-    <LibraryClassDeclaration>\r
-      <LibraryClass>CpuLib</LibraryClass>\r
+      <HelpText/>\r
+    </LibraryClass>\r
+    <LibraryClass Name="CpuLib">\r
       <IncludeHeader>Include/Library/CpuLib.h</IncludeHeader>\r
-    </LibraryClassDeclaration>\r
-    <LibraryClassDeclaration>\r
-      <LibraryClass>DebugLib</LibraryClass>\r
+      <HelpText/>\r
+    </LibraryClass>\r
+    <LibraryClass Name="DebugLib">\r
       <IncludeHeader>Include/Library/DebugLib.h</IncludeHeader>\r
-    </LibraryClassDeclaration>\r
-    <LibraryClassDeclaration>\r
-      <LibraryClass>DevicePathLib</LibraryClass>\r
+      <HelpText/>\r
+    </LibraryClass>\r
+    <LibraryClass Name="DevicePathLib">\r
       <IncludeHeader>Include/Library/DevicePathLib.h</IncludeHeader>\r
-    </LibraryClassDeclaration>\r
-    <LibraryClassDeclaration>\r
-      <LibraryClass>DxeCoreEntryPoint</LibraryClass>\r
+      <HelpText/>\r
+    </LibraryClass>\r
+    <LibraryClass Name="DxeCoreEntryPoint">\r
       <IncludeHeader>Include/Library/DxeCoreEntryPoint.h</IncludeHeader>\r
-    </LibraryClassDeclaration>\r
-    <LibraryClassDeclaration>\r
-      <LibraryClass>DxeRuntimeDriverLib</LibraryClass>\r
-      <IncludeHeader>Include/Library/DxeRuntimeDriverLib.h</IncludeHeader>\r
-    </LibraryClassDeclaration>\r
-    <LibraryClassDeclaration>\r
-      <LibraryClass>DxeServicesTableLib</LibraryClass>\r
+      <HelpText/>\r
+    </LibraryClass>\r
+    <LibraryClass Name="UefiRuntimeLib">\r
+      <IncludeHeader>Include/Library/UefiRuntimeLib.h</IncludeHeader>\r
+      <HelpText/>\r
+    </LibraryClass>\r
+    <LibraryClass Name="DxeServicesTableLib">\r
       <IncludeHeader>Include/Library/DxeServicesTableLib.h</IncludeHeader>\r
-    </LibraryClassDeclaration>\r
-    <LibraryClassDeclaration>\r
-      <LibraryClass>DxeSmmDriverEntryPoint</LibraryClass>\r
+      <HelpText/>\r
+    </LibraryClass>\r
+    <LibraryClass Name="DxeSmmDriverEntryPoint">\r
       <IncludeHeader>Include/Library/DxeSmmDriverEntryPoint.h</IncludeHeader>\r
-    </LibraryClassDeclaration>\r
-    <LibraryClassDeclaration>\r
-      <LibraryClass>HiiLib</LibraryClass>\r
+      <HelpText/>\r
+    </LibraryClass>\r
+    <LibraryClass Name="HiiLib">\r
       <IncludeHeader>Include/Library/HiiLib.h</IncludeHeader>\r
-    </LibraryClassDeclaration>\r
-    <LibraryClassDeclaration>\r
-      <LibraryClass>HobLib</LibraryClass>\r
+      <HelpText/>\r
+    </LibraryClass>\r
+    <LibraryClass Name="HobLib">\r
       <IncludeHeader>Include/Library/HobLib.h</IncludeHeader>\r
-    </LibraryClassDeclaration>\r
-    <LibraryClassDeclaration>\r
-      <LibraryClass>IoLib</LibraryClass>\r
+      <HelpText/>\r
+    </LibraryClass>\r
+    <LibraryClass Name="IoLib">\r
       <IncludeHeader>Include/Library/IoLib.h</IncludeHeader>\r
-    </LibraryClassDeclaration>\r
-    <LibraryClassDeclaration>\r
-      <LibraryClass>MemoryAllocationLib</LibraryClass>\r
+      <HelpText/>\r
+    </LibraryClass>\r
+    <LibraryClass Name="MemoryAllocationLib">\r
       <IncludeHeader>Include/Library/MemoryAllocationLib.h</IncludeHeader>\r
-    </LibraryClassDeclaration>\r
-    <LibraryClassDeclaration>\r
-      <LibraryClass>PcdLib</LibraryClass>\r
+      <HelpText/>\r
+    </LibraryClass>\r
+    <LibraryClass Name="PcdLib">\r
       <IncludeHeader>Include/Library/PcdLib.h</IncludeHeader>\r
-    </LibraryClassDeclaration>\r
-    <LibraryClassDeclaration>\r
-      <LibraryClass>PciCf8Lib</LibraryClass>\r
+      <HelpText/>\r
+    </LibraryClass>\r
+    <LibraryClass Name="PciCf8Lib">\r
       <IncludeHeader>Include/Library/PciCf8Lib.h</IncludeHeader>\r
-    </LibraryClassDeclaration>\r
-    <LibraryClassDeclaration>\r
-      <LibraryClass>PciExpressLib</LibraryClass>\r
+      <HelpText/>\r
+    </LibraryClass>\r
+    <LibraryClass Name="PciExpressLib">\r
       <IncludeHeader>Include/Library/PciExpressLib.h</IncludeHeader>\r
-    </LibraryClassDeclaration>\r
-    <LibraryClassDeclaration>\r
-      <LibraryClass>PciLib</LibraryClass>\r
+      <HelpText/>\r
+    </LibraryClass>\r
+    <LibraryClass Name="PciLib">\r
       <IncludeHeader>Include/Library/PciLib.h</IncludeHeader>\r
-    </LibraryClassDeclaration>\r
-    <LibraryClassDeclaration>\r
-      <LibraryClass>PciSegmentLib</LibraryClass>\r
+      <HelpText/>\r
+    </LibraryClass>\r
+    <LibraryClass Name="PciSegmentLib">\r
       <IncludeHeader>Include/Library/PciSegmentLib.h</IncludeHeader>\r
-    </LibraryClassDeclaration>\r
-    <LibraryClassDeclaration>\r
-      <LibraryClass>PeCoffGetEntryPointLib</LibraryClass>\r
+      <HelpText/>\r
+    </LibraryClass>\r
+    <LibraryClass Name="PeCoffGetEntryPointLib">\r
       <IncludeHeader>Include/Library/PeCoffGetEntryPointLib.h</IncludeHeader>\r
-    </LibraryClassDeclaration>\r
-    <LibraryClassDeclaration>\r
-      <LibraryClass>PeCoffLib</LibraryClass>\r
+      <HelpText/>\r
+    </LibraryClass>\r
+    <LibraryClass Name="PeCoffLib">\r
       <IncludeHeader>Include/Library/PeCoffLib.h</IncludeHeader>\r
-    </LibraryClassDeclaration>\r
-    <LibraryClassDeclaration>\r
-      <LibraryClass>PeiCoreEntryPoint</LibraryClass>\r
+      <HelpText/>\r
+    </LibraryClass>\r
+    <LibraryClass Name="PeiCoreEntryPoint">\r
       <IncludeHeader>Include/Library/PeiCoreEntryPoint.h</IncludeHeader>\r
-    </LibraryClassDeclaration>\r
-    <LibraryClassDeclaration>\r
-      <LibraryClass>PeiCoreLib</LibraryClass>\r
-      <IncludeHeader>Include/Library/PeiCoreLib.h</IncludeHeader>\r
-    </LibraryClassDeclaration>\r
-    <LibraryClassDeclaration>\r
-      <LibraryClass>PeimEntryPoint</LibraryClass>\r
+      <HelpText/>\r
+    </LibraryClass>\r
+    <LibraryClass Name="PeiServicesLib">\r
+      <IncludeHeader>Include/Library/PeiServicesLib.h</IncludeHeader>\r
+      <HelpText/>\r
+    </LibraryClass>\r
+    <LibraryClass Name="PeimEntryPoint">\r
       <IncludeHeader>Include/Library/PeimEntryPoint.h</IncludeHeader>\r
-    </LibraryClassDeclaration>\r
-    <LibraryClassDeclaration>\r
-      <LibraryClass>PeiServicesTablePointerLib</LibraryClass>\r
+      <HelpText/>\r
+    </LibraryClass>\r
+    <LibraryClass Name="PeiServicesTablePointerLib">\r
       <IncludeHeader>Include/Library/PeiServicesTablePointerLib.h</IncludeHeader>\r
-    </LibraryClassDeclaration>\r
-    <LibraryClassDeclaration>\r
-      <LibraryClass>PerformanceLib</LibraryClass>\r
+      <HelpText/>\r
+    </LibraryClass>\r
+    <LibraryClass Name="PerformanceLib">\r
       <IncludeHeader>Include/Library/PerformanceLib.h</IncludeHeader>\r
-    </LibraryClassDeclaration>\r
-    <LibraryClassDeclaration>\r
-      <LibraryClass>PrintLib</LibraryClass>\r
+      <HelpText/>\r
+    </LibraryClass>\r
+    <LibraryClass Name="PrintLib">\r
       <IncludeHeader>Include/Library/PrintLib.h</IncludeHeader>\r
-    </LibraryClassDeclaration>\r
-    <LibraryClassDeclaration>\r
-      <LibraryClass>ReportStatusCodeLib</LibraryClass>\r
+      <HelpText/>\r
+    </LibraryClass>\r
+    <LibraryClass Name="ReportStatusCodeLib">\r
       <IncludeHeader>Include/Library/ReportStatusCodeLib.h</IncludeHeader>\r
-    </LibraryClassDeclaration>\r
-    <LibraryClassDeclaration>\r
-      <LibraryClass>ResourcePublicationLib</LibraryClass>\r
+      <HelpText/>\r
+    </LibraryClass>\r
+    <LibraryClass Name="PostCodeLib">\r
+      <IncludeHeader>Include/Library/PostCodeLib.h</IncludeHeader>\r
+      <HelpText/>\r
+    </LibraryClass>\r
+    <LibraryClass Name="ResourcePublicationLib">\r
       <IncludeHeader>Include/Library/ResourcePublicationLib.h</IncludeHeader>\r
-    </LibraryClassDeclaration>\r
-    <LibraryClassDeclaration>\r
-      <LibraryClass>SmbusLib</LibraryClass>\r
+      <HelpText/>\r
+    </LibraryClass>\r
+    <LibraryClass Name="SmbusLib">\r
       <IncludeHeader>Include/Library/SmbusLib.h</IncludeHeader>\r
-    </LibraryClassDeclaration>\r
-    <LibraryClassDeclaration>\r
-      <LibraryClass>TimerLib</LibraryClass>\r
+      <HelpText/>\r
+    </LibraryClass>\r
+    <LibraryClass Name="TimerLib">\r
       <IncludeHeader>Include/Library/TimerLib.h</IncludeHeader>\r
-    </LibraryClassDeclaration>\r
-    <LibraryClassDeclaration>\r
-      <LibraryClass>Uefi2PortLib</LibraryClass>\r
+      <HelpText/>\r
+    </LibraryClass>\r
+    <LibraryClass Name="Uefi2PortLib">\r
       <IncludeHeader>Include/Library/Uefi2PortLib.h</IncludeHeader>\r
-    </LibraryClassDeclaration>\r
-    <LibraryClassDeclaration>\r
-      <LibraryClass>UefiBootServicesTableLib</LibraryClass>\r
+      <HelpText/>\r
+    </LibraryClass>\r
+    <LibraryClass Name="UefiBootServicesTableLib">\r
       <IncludeHeader>Include/Library/UefiBootServicesTableLib.h</IncludeHeader>\r
-    </LibraryClassDeclaration>\r
-    <LibraryClassDeclaration>\r
-      <LibraryClass>UefiDecompressLib</LibraryClass>\r
+      <HelpText/>\r
+    </LibraryClass>\r
+    <LibraryClass Name="UefiDecompressLib">\r
       <IncludeHeader>Include/Library/UefiDecompressLib.h</IncludeHeader>\r
-    </LibraryClassDeclaration>\r
-    <LibraryClassDeclaration>\r
-      <LibraryClass>UefiDriverEntryPoint</LibraryClass>\r
+      <HelpText/>\r
+    </LibraryClass>\r
+    <LibraryClass Name="UefiDriverEntryPoint">\r
       <IncludeHeader>Include/Library/UefiDriverEntryPoint.h</IncludeHeader>\r
-    </LibraryClassDeclaration>\r
-    <LibraryClassDeclaration>\r
-      <LibraryClass>UefiDriverModelLib</LibraryClass>\r
+      <HelpText/>\r
+    </LibraryClass>\r
+    <LibraryClass Name="UefiDriverModelLib">\r
       <IncludeHeader>Include/Library/UefiDriverModelLib.h</IncludeHeader>\r
-    </LibraryClassDeclaration>\r
-    <LibraryClassDeclaration>\r
-      <LibraryClass>UefiLib</LibraryClass>\r
+      <HelpText/>\r
+    </LibraryClass>\r
+    <LibraryClass Name="UefiLib">\r
       <IncludeHeader>Include/Library/UefiLib.h</IncludeHeader>\r
-    </LibraryClassDeclaration>\r
-    <LibraryClassDeclaration>\r
-      <LibraryClass>UefiRuntimeServicesTableLib</LibraryClass>\r
+      <HelpText/>\r
+    </LibraryClass>\r
+    <LibraryClass Name="UefiRuntimeServicesTableLib">\r
       <IncludeHeader>Include/Library/UefiRuntimeServicesTableLib.h</IncludeHeader>\r
-    </LibraryClassDeclaration>\r
+      <HelpText/>\r
+    </LibraryClass>\r
   </LibraryClassDeclarations>\r
+  <IndustryStdIncludes>\r
+    <IndustryStdHeader Name="BaseTypes">\r
+      <IncludeHeader>Include/Common/BaseTypes.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="BootMode">\r
+      <IncludeHeader>Include/Common/BootMode.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="BootScript">\r
+      <IncludeHeader>Include/Common/BootScript.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="Capsule">\r
+      <IncludeHeader>Include/Common/Capsule.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="DataHubRecords">\r
+      <IncludeHeader>Include/Common/DataHubRecords.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="Dependency">\r
+      <IncludeHeader>Include/Common/Dependency.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="EfiImage">\r
+      <IncludeHeader>Include/Common/EfiImage.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="FirmwareFileSystem">\r
+      <IncludeHeader>Include/Common/FirmwareFileSystem.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="FirmwareVolumeHeader">\r
+      <IncludeHeader>Include/Common/FirmwareVolumeHeader.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="FirmwareVolumeImageFormat">\r
+      <IncludeHeader>Include/Common/FirmwareVolumeImageFormat.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="Hob">\r
+      <IncludeHeader>Include/Common/Hob.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="InternalFormRepresentation">\r
+      <IncludeHeader>Include/Common/InternalFormRepresentation.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="Legacy16">\r
+      <IncludeHeader>Include/Common/Legacy16.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="MultiPhase">\r
+      <IncludeHeader>Include/Common/MultiPhase.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="StatusCode">\r
+      <IncludeHeader>Include/Common/StatusCode.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="StatusCodeDataTypeId">\r
+      <IncludeHeader>Include/Common/StatusCodeDataTypeId.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="UefiBaseTypes">\r
+      <IncludeHeader>Include/Common/UefiBaseTypes.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="Bds">\r
+      <IncludeHeader>Include/Dxe/ArchProtocol/Bds.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="Cpu">\r
+      <IncludeHeader>Include/Dxe/ArchProtocol/Cpu.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="Metronome">\r
+      <IncludeHeader>Include/Dxe/ArchProtocol/Metronome.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="MonotonicCounter">\r
+      <IncludeHeader>Include/Dxe/ArchProtocol/MonotonicCounter.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="RealTimeClock">\r
+      <IncludeHeader>Include/Dxe/ArchProtocol/RealTimeClock.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="Reset">\r
+      <IncludeHeader>Include/Dxe/ArchProtocol/Reset.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="Runtime">\r
+      <IncludeHeader>Include/Dxe/ArchProtocol/Runtime.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="Security">\r
+      <IncludeHeader>Include/Dxe/ArchProtocol/Security.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="SecurityPolicy">\r
+      <IncludeHeader>Include/Dxe/ArchProtocol/SecurityPolicy.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="StatusCode">\r
+      <IncludeHeader>Include/Dxe/ArchProtocol/StatusCode.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="Timer">\r
+      <IncludeHeader>Include/Dxe/ArchProtocol/Timer.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="Variable">\r
+      <IncludeHeader>Include/Dxe/ArchProtocol/Variable.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="VariableWrite">\r
+      <IncludeHeader>Include/Dxe/ArchProtocol/VariableWrite.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="WatchdogTimer">\r
+      <IncludeHeader>Include/Dxe/ArchProtocol/WatchdogTimer.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="DxeCis">\r
+      <IncludeHeader>Include/Dxe/DxeCis.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="SmmCis">\r
+      <IncludeHeader>Include/Dxe/SmmCis.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="ProcessorBind">\r
+      <IncludeHeader>Include/Ebc/ProcessorBind.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="Acpi">\r
+      <IncludeHeader>Include/Guid/Acpi.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="AcpiTableStorage">\r
+      <IncludeHeader>Include/Guid/AcpiTableStorage.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="Apriori">\r
+      <IncludeHeader>Include/Guid/Apriori.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="Capsule">\r
+      <IncludeHeader>Include/Guid/Capsule.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="DataHubRecords">\r
+      <IncludeHeader>Include/Guid/DataHubRecords.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="DebugImageInfoTable">\r
+      <IncludeHeader>Include/Guid/DebugImageInfoTable.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="DxeServices">\r
+      <IncludeHeader>Include/Guid/DxeServices.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="EventGroup">\r
+      <IncludeHeader>Include/Guid/EventGroup.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="EventLegacyBios">\r
+      <IncludeHeader>Include/Guid/EventLegacyBios.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="FirmwareFileSystem">\r
+      <IncludeHeader>Include/Guid/FirmwareFileSystem.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="FileInfo">\r
+      <IncludeHeader>Include/Guid/FileInfo.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="FileSystemInfo">\r
+      <IncludeHeader>Include/Guid/FileSystemInfo.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="FileSystemVolumeLabelInfo">\r
+      <IncludeHeader>Include/Guid/FileSystemVolumeLabelInfo.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="FrameworkDevicePath">\r
+      <IncludeHeader>Include/Guid/FrameworkDevicePath.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="GlobalVariable">\r
+      <IncludeHeader>Include/Guid/GlobalVariable.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="Gpt">\r
+      <IncludeHeader>Include/Guid/Gpt.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="HobList">\r
+      <IncludeHeader>Include/Guid/HobList.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="MemoryAllocationHob">\r
+      <IncludeHeader>Include/Guid/MemoryAllocationHob.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="Mps">\r
+      <IncludeHeader>Include/Guid/Mps.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="PcAnsi">\r
+      <IncludeHeader>Include/Guid/PcAnsi.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="SalSystemTable">\r
+      <IncludeHeader>Include/Guid/SalSystemTable.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="SmBios">\r
+      <IncludeHeader>Include/Guid/SmBios.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="SmmCommunicate">\r
+      <IncludeHeader>Include/Guid/SmmCommunicate.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="SmramMemoryReserve">\r
+      <IncludeHeader>Include/Guid/SmramMemoryReserve.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="StatusCodeDataTypeId">\r
+      <IncludeHeader>Include/Guid/StatusCodeDataTypeId.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="ProcessorBind">\r
+      <IncludeHeader>Include/Ia32/ProcessorBind.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="Acpi">\r
+      <IncludeHeader>Include/IndustryStandard/Acpi.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="pci22">\r
+      <IncludeHeader>Include/IndustryStandard/pci22.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="scsi">\r
+      <IncludeHeader>Include/IndustryStandard/scsi.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="Usb">\r
+      <IncludeHeader>Include/IndustryStandard/Usb.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="IpfDefines">\r
+      <IncludeHeader>Include/Ipf/IpfDefines.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="IpfMacro">\r
+      <IncludeHeader>Include/Ipf/IpfMacro.i</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="ProcessorBind">\r
+      <IncludeHeader>Include/Ipf/ProcessorBind.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="SalApi">\r
+      <IncludeHeader>Include/Ipf/SalApi.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="BaseLib">\r
+      <IncludeHeader>Include/Library/BaseLib.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="BaseMemoryLib">\r
+      <IncludeHeader>Include/Library/BaseMemoryLib.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="CacheMaintenanceLib">\r
+      <IncludeHeader>Include/Library/CacheMaintenanceLib.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="CpuLib">\r
+      <IncludeHeader>Include/Library/CpuLib.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="DebugLib">\r
+      <IncludeHeader>Include/Library/DebugLib.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="DevicePathLib">\r
+      <IncludeHeader>Include/Library/DevicePathLib.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="DxeCoreEntryPoint">\r
+      <IncludeHeader>Include/Library/DxeCoreEntryPoint.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="UefiRuntimeLib">\r
+      <IncludeHeader>Include/Library/UefiRuntimeLib.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="DxeServicesTableLib">\r
+      <IncludeHeader>Include/Library/DxeServicesTableLib.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="DxeSmmDriverEntryPoint">\r
+      <IncludeHeader>Include/Library/DxeSmmDriverEntryPoint.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="HiiLib">\r
+      <IncludeHeader>Include/Library/HiiLib.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="HobLib">\r
+      <IncludeHeader>Include/Library/HobLib.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="IoLib">\r
+      <IncludeHeader>Include/Library/IoLib.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="MemoryAllocationLib">\r
+      <IncludeHeader>Include/Library/MemoryAllocationLib.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="PcdLib">\r
+      <IncludeHeader>Include/Library/PcdLib.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="PciCf8Lib">\r
+      <IncludeHeader>Include/Library/PciCf8Lib.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="PciExpressLib">\r
+      <IncludeHeader>Include/Library/PciExpressLib.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="PciLib">\r
+      <IncludeHeader>Include/Library/PciLib.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="PciSegmentLib">\r
+      <IncludeHeader>Include/Library/PciSegmentLib.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="PeCoffGetEntryPointLib">\r
+      <IncludeHeader>Include/Library/PeCoffGetEntryPointLib.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="PeCoffLib">\r
+      <IncludeHeader>Include/Library/PeCoffLib.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="PeiCoreEntryPoint">\r
+      <IncludeHeader>Include/Library/PeiCoreEntryPoint.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="PeimEntryPoint">\r
+      <IncludeHeader>Include/Library/PeimEntryPoint.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="PeiServicesLib">\r
+      <IncludeHeader>Include/Library/PeiServicesLib.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="PeiServicesTablePointerLib">\r
+      <IncludeHeader>Include/Library/PeiServicesTablePointerLib.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="PerformanceLib">\r
+      <IncludeHeader>Include/Library/PerformanceLib.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="PostCodeLib">\r
+      <IncludeHeader>Include/Library/PostCodeLib.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="PrintLib">\r
+      <IncludeHeader>Include/Library/PrintLib.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="ReportStatusCodeLib">\r
+      <IncludeHeader>Include/Library/ReportStatusCodeLib.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="ResourcePublicationLib">\r
+      <IncludeHeader>Include/Library/ResourcePublicationLib.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="SmbusLib">\r
+      <IncludeHeader>Include/Library/SmbusLib.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="TimerLib">\r
+      <IncludeHeader>Include/Library/TimerLib.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="UefiBootServicesTableLib">\r
+      <IncludeHeader>Include/Library/UefiBootServicesTableLib.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="UefiDecompressLib">\r
+      <IncludeHeader>Include/Library/UefiDecompressLib.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="UefiDriverEntryPoint">\r
+      <IncludeHeader>Include/Library/UefiDriverEntryPoint.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="UefiDriverModelLib">\r
+      <IncludeHeader>Include/Library/UefiDriverModelLib.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="UefiLib">\r
+      <IncludeHeader>Include/Library/UefiLib.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="UefiRuntimeServicesTableLib">\r
+      <IncludeHeader>Include/Library/UefiRuntimeServicesTableLib.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="PeiCis">\r
+      <IncludeHeader>Include/Peim/PeiCis.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="BlockIo">\r
+      <IncludeHeader>Include/Ppi/BlockIo.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="BootInRecoveryMode">\r
+      <IncludeHeader>Include/Ppi/BootInRecoveryMode.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="BootScriptExecuter">\r
+      <IncludeHeader>Include/Ppi/BootScriptExecuter.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="CpuIo">\r
+      <IncludeHeader>Include/Ppi/CpuIo.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="DeviceRecoveryModule">\r
+      <IncludeHeader>Include/Ppi/DeviceRecoveryModule.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="DxeIpl">\r
+      <IncludeHeader>Include/Ppi/DxeIpl.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="EndOfPeiPhase">\r
+      <IncludeHeader>Include/Ppi/EndOfPeiPhase.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="FindFv">\r
+      <IncludeHeader>Include/Ppi/FindFv.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="LoadFile">\r
+      <IncludeHeader>Include/Ppi/LoadFile.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="MasterBootMode">\r
+      <IncludeHeader>Include/Ppi/MasterBootMode.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="MemoryDiscovered">\r
+      <IncludeHeader>Include/Ppi/MemoryDiscovered.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="Pcd">\r
+      <IncludeHeader>Include/Ppi/Pcd.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="PciCfg">\r
+      <IncludeHeader>Include/Ppi/PciCfg.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="ReadOnlyVariable">\r
+      <IncludeHeader>Include/Ppi/ReadOnlyVariable.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="RecoveryModule">\r
+      <IncludeHeader>Include/Ppi/RecoveryModule.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="Reset">\r
+      <IncludeHeader>Include/Ppi/Reset.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="S3Resume">\r
+      <IncludeHeader>Include/Ppi/S3Resume.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="SecPlatformInformation">\r
+      <IncludeHeader>Include/Ppi/SecPlatformInformation.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="SectionExtraction">\r
+      <IncludeHeader>Include/Ppi/SectionExtraction.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="Security">\r
+      <IncludeHeader>Include/Ppi/Security.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="Smbus">\r
+      <IncludeHeader>Include/Ppi/Smbus.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="Stall">\r
+      <IncludeHeader>Include/Ppi/Stall.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="StatusCode">\r
+      <IncludeHeader>Include/Ppi/StatusCode.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="AcpiSupport">\r
+      <IncludeHeader>Include/Protocol/AcpiSupport.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="Arp">\r
+      <IncludeHeader>Include/Protocol/Arp.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="AuthenticationInfo">\r
+      <IncludeHeader>Include/Protocol/AuthenticationInfo.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="Bis">\r
+      <IncludeHeader>Include/Protocol/Bis.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="BlockIo">\r
+      <IncludeHeader>Include/Protocol/BlockIo.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="BootScriptSave">\r
+      <IncludeHeader>Include/Protocol/BootScriptSave.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="BusSpecificDriverOverride">\r
+      <IncludeHeader>Include/Protocol/BusSpecificDriverOverride.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="ComponentName">\r
+      <IncludeHeader>Include/Protocol/ComponentName.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="CpuIo">\r
+      <IncludeHeader>Include/Protocol/CpuIo.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="DataHub">\r
+      <IncludeHeader>Include/Protocol/DataHub.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="DebugPort">\r
+      <IncludeHeader>Include/Protocol/DebugPort.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="DebugSupport">\r
+      <IncludeHeader>Include/Protocol/DebugSupport.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="Decompress">\r
+      <IncludeHeader>Include/Protocol/Decompress.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="DeviceIo">\r
+      <IncludeHeader>Include/Protocol/DeviceIo.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="DevicePath">\r
+      <IncludeHeader>Include/Protocol/DevicePath.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="DevicePathFromText">\r
+      <IncludeHeader>Include/Protocol/DevicePathFromText.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="DevicePathToText">\r
+      <IncludeHeader>Include/Protocol/DevicePathToText.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="DevicePathUtilities">\r
+      <IncludeHeader>Include/Protocol/DevicePathUtilities.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="Dhcp4">\r
+      <IncludeHeader>Include/Protocol/Dhcp4.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="DiskIo">\r
+      <IncludeHeader>Include/Protocol/DiskIo.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="DriverBinding">\r
+      <IncludeHeader>Include/Protocol/DriverBinding.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="DriverConfiguration">\r
+      <IncludeHeader>Include/Protocol/DriverConfiguration.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="DriverDiagnostics">\r
+      <IncludeHeader>Include/Protocol/DriverDiagnostics.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="Ebc">\r
+      <IncludeHeader>Include/Protocol/Ebc.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="EdidActive">\r
+      <IncludeHeader>Include/Protocol/EdidActive.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="EdidDiscovered">\r
+      <IncludeHeader>Include/Protocol/EdidDiscovered.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="EdidOverride">\r
+      <IncludeHeader>Include/Protocol/EdidOverride.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="EfiNetworkInterfaceIdentifier">\r
+      <IncludeHeader>Include/Protocol/EfiNetworkInterfaceIdentifier.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="FirmwareVolume">\r
+      <IncludeHeader>Include/Protocol/FirmwareVolume.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="FirmwareVolumeBlock">\r
+      <IncludeHeader>Include/Protocol/FirmwareVolumeBlock.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="FirmwareVolumeDispatch">\r
+      <IncludeHeader>Include/Protocol/FirmwareVolumeDispatch.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="FormBrowser">\r
+      <IncludeHeader>Include/Protocol/FormBrowser.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="FormCallback">\r
+      <IncludeHeader>Include/Protocol/FormCallback.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="GraphicsOutput">\r
+      <IncludeHeader>Include/Protocol/GraphicsOutput.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="GuidedSectionExtraction">\r
+      <IncludeHeader>Include/Protocol/GuidedSectionExtraction.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="Hash">\r
+      <IncludeHeader>Include/Protocol/Hash.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="Hii">\r
+      <IncludeHeader>Include/Protocol/Hii.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="IdeControllerInit">\r
+      <IncludeHeader>Include/Protocol/IdeControllerInit.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="IncompatiblePciDeviceSupport">\r
+      <IncludeHeader>Include/Protocol/IncompatiblePciDeviceSupport.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="IP4">\r
+      <IncludeHeader>Include/Protocol/IP4.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="IP4Config">\r
+      <IncludeHeader>Include/Protocol/IP4Config.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="IScsiInitatorName">\r
+      <IncludeHeader>Include/Protocol/IScsiInitatorName.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="Legacy8259">\r
+      <IncludeHeader>Include/Protocol/Legacy8259.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="LegacyBios">\r
+      <IncludeHeader>Include/Protocol/LegacyBios.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="LegacyBiosPlatform">\r
+      <IncludeHeader>Include/Protocol/LegacyBiosPlatform.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="LegacyInterrupt">\r
+      <IncludeHeader>Include/Protocol/LegacyInterrupt.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="LegacyRegion">\r
+      <IncludeHeader>Include/Protocol/LegacyRegion.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="LoadedImage">\r
+      <IncludeHeader>Include/Protocol/LoadedImage.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="LoadFile">\r
+      <IncludeHeader>Include/Protocol/LoadFile.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="ManagedNetwork">\r
+      <IncludeHeader>Include/Protocol/ManagedNetwork.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="Mtftp4">\r
+      <IncludeHeader>Include/Protocol/Mtftp4.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="Pcd">\r
+      <IncludeHeader>Include/Protocol/Pcd.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="PciHostBridgeResourceAllocation">\r
+      <IncludeHeader>Include/Protocol/PciHostBridgeResourceAllocation.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="PciHotPlugInit">\r
+      <IncludeHeader>Include/Protocol/PciHotPlugInit.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="PciIo">\r
+      <IncludeHeader>Include/Protocol/PciIo.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="PciPlatform">\r
+      <IncludeHeader>Include/Protocol/PciPlatform.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="PciRootBridgeIo">\r
+      <IncludeHeader>Include/Protocol/PciRootBridgeIo.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="PlatformDriverOverride">\r
+      <IncludeHeader>Include/Protocol/PlatformDriverOverride.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="PxeBaseCode">\r
+      <IncludeHeader>Include/Protocol/PxeBaseCode.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="PxeBaseCodeCallBack">\r
+      <IncludeHeader>Include/Protocol/PxeBaseCodeCallBack.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="ScsiIoExt">\r
+      <IncludeHeader>Include/Protocol/ScsiIoExt.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="ScsiPassThru">\r
+      <IncludeHeader>Include/Protocol/ScsiPassThru.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="ScsiPassThruExt">\r
+      <IncludeHeader>Include/Protocol/ScsiPassThruExt.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="SectionExtraction">\r
+      <IncludeHeader>Include/Protocol/SectionExtraction.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="SerialIo">\r
+      <IncludeHeader>Include/Protocol/SerialIo.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="ServiceBinding">\r
+      <IncludeHeader>Include/Protocol/ServiceBinding.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="SimpleFileSystem">\r
+      <IncludeHeader>Include/Protocol/SimpleFileSystem.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="SimpleNetwork">\r
+      <IncludeHeader>Include/Protocol/SimpleNetwork.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="SimplePointer">\r
+      <IncludeHeader>Include/Protocol/SimplePointer.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="SimpleTextIn">\r
+      <IncludeHeader>Include/Protocol/SimpleTextIn.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="SimpleTextOut">\r
+      <IncludeHeader>Include/Protocol/SimpleTextOut.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="Smbus">\r
+      <IncludeHeader>Include/Protocol/Smbus.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="SmmAccess">\r
+      <IncludeHeader>Include/Protocol/SmmAccess.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="SmmBase">\r
+      <IncludeHeader>Include/Protocol/SmmBase.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="SmmControl">\r
+      <IncludeHeader>Include/Protocol/SmmControl.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="SmmGpiDispatch">\r
+      <IncludeHeader>Include/Protocol/SmmGpiDispatch.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="SmmIchnDispatch">\r
+      <IncludeHeader>Include/Protocol/SmmIchnDispatch.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="SmmPeriodicTimerDispatch">\r
+      <IncludeHeader>Include/Protocol/SmmPeriodicTimerDispatch.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="SmmPowerButtonDispatch">\r
+      <IncludeHeader>Include/Protocol/SmmPowerButtonDispatch.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="SmmStandbyButtonDispatch">\r
+      <IncludeHeader>Include/Protocol/SmmStandbyButtonDispatch.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="SmmStatusCode">\r
+      <IncludeHeader>Include/Protocol/SmmStatusCode.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="SmmSwDispatch">\r
+      <IncludeHeader>Include/Protocol/SmmSwDispatch.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="SmmSxDispatch">\r
+      <IncludeHeader>Include/Protocol/SmmSxDispatch.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="SmmUsbDispatch">\r
+      <IncludeHeader>Include/Protocol/SmmUsbDispatch.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="TapeIo">\r
+      <IncludeHeader>Include/Protocol/TapeIo.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="Tcp4">\r
+      <IncludeHeader>Include/Protocol/Tcp4.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="Udp4">\r
+      <IncludeHeader>Include/Protocol/Udp4.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="UgaDraw">\r
+      <IncludeHeader>Include/Protocol/UgaDraw.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="UnicodeCollation">\r
+      <IncludeHeader>Include/Protocol/UnicodeCollation.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="Usb2HostController">\r
+      <IncludeHeader>Include/Protocol/Usb2HostController.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="UsbHostController">\r
+      <IncludeHeader>Include/Protocol/UsbHostController.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="UsbIo">\r
+      <IncludeHeader>Include/Protocol/UsbIo.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="EfiPxe">\r
+      <IncludeHeader>Include/Uefi/EfiPxe.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="Errors">\r
+      <IncludeHeader>Include/Uefi/Errors.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="UefiSpec">\r
+      <IncludeHeader>Include/Uefi/UefiSpec.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="ProcessorBind">\r
+      <IncludeHeader>Include/x64/ProcessorBind.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="Base">\r
+      <IncludeHeader>Include/Base.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="Dxe">\r
+      <IncludeHeader>Include/Dxe.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="DxeCore">\r
+      <IncludeHeader>Include/DxeCore.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="DxeDepex">\r
+      <IncludeHeader>Include/DxeDepex.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="PeiCore">\r
+      <IncludeHeader>Include/PeiCore.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="Peim">\r
+      <IncludeHeader>Include/Peim.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="PeimDepex">\r
+      <IncludeHeader>Include/PeimDepex.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="PiwgDxe">\r
+      <IncludeHeader>Include/PiwgDxe.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="PiwgPeim">\r
+      <IncludeHeader>Include/PiwgPeim.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="Uefi">\r
+      <IncludeHeader>Include/Uefi.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+  </IndustryStdIncludes>\r
   <MsaFiles>\r
-    <MsaFile>\r
-      <Filename>Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/BaseDebugLibNull/BaseDebugLibNull.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/BaseDebugLibReportStatusCode/BaseDebugLibReportStatusCode.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/BasePerformanceLibNull/BasePerformanceLibNull.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/BasePcdLibNull/BasePcdLibNull.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/BaseLib/BaseLib.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/BaseMemoryLib/BaseMemoryLib.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/BaseMemoryLibMmx/BaseMemoryLibMmx.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/BaseMemoryLibSse2/BaseMemoryLibSse2.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/BasePeCoffLib/BasePeCoffLib.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/BasePrintLib/BasePrintLib.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/BaseSmbusLib/BaseSmbusLib.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/PeiSmbusLib/PeiSmbusLib.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/DxeSmbusLib/DxeSmbusLib.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/BaseUefiDecompressLib/BaseUefiDecompressLib.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/BasePciCf8Lib/BasePciCf8Lib.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/BasePciExpressLib/BasePciExpressLib.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/BasePciLibCf8/BasePciLibCf8.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/BasePciLibPciExpress/BasePciLibPciExpress.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/BaseTimerLibLocalApic/BaseTimerLibLocalApic.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/DxeCoreEntryPoint/DxeCoreEntryPoint.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/DxeCoreHobLib/DxeCoreHobLib.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/DxeHobLib/DxeHobLib.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/DxeIoLibCpuIo/DxeIoLibCpuIo.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/PeiIoLibCpuIo/PeiIoLibCpuIo.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/DxeMemoryAllocationLib/DxeMemoryAllocationLib.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/DxePcdLib/DxePcdLib.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/DxeServicesTableLib/DxeServicesTableLib.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/DxeSmmDriverEntryPoint/DxeSmmDriverEntryPoint.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/HiiLib/HiiLib.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/PeiCoreEntryPoint/PeiCoreEntryPoint.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/PeiCoreLib/PeiCoreLib.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/PeiHobLib/PeiHobLib.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/PeiMemoryLib/PeiMemoryLib.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/PeimEntryPoint/PeimEntryPoint.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/PeiPcdLib/PeiPcdLib.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/PeiResourcePublicationLib/PeiResourcePublicationLib.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/PeiServicesTablePointerLibMm7/PeiServicesTablePointerLibMm7.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/UefiBootServicesTableLib/UefiBootServicesTableLib.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/UefiDebugLibConOut/UefiDebugLibConOut.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/UefiDebugLibStdErr/UefiDebugLibStdErr.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/UefiDevicePathLib/UefiDevicePathLib.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/UefiDriverEntryPoint/UefiDriverEntryPoint.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/UefiDriverModelLib/UefiDriverModelLib.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/UefiLib/UefiLib.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/UefiMemoryLib/UefiMemoryLib.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.msa</Filename>\r
-    </MsaFile>\r
+    <Filename>Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.msa</Filename>\r
+    <Filename>Library/BaseDebugLibNull/BaseDebugLibNull.msa</Filename>\r
+    <Filename>Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.msa</Filename>\r
+    <Filename>Library/BasePerformanceLibNull/BasePerformanceLibNull.msa</Filename>\r
+    <Filename>Library/BasePcdLibNull/BasePcdLibNull.msa</Filename>\r
+    <Filename>Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.msa</Filename>\r
+    <Filename>Library/BaseLib/BaseLib.msa</Filename>\r
+    <Filename>Library/BaseMemoryLib/BaseMemoryLib.msa</Filename>\r
+    <Filename>Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.msa</Filename>\r
+    <Filename>Library/BaseMemoryLibMmx/BaseMemoryLibMmx.msa</Filename>\r
+    <Filename>Library/BaseMemoryLibSse2/BaseMemoryLibSse2.msa</Filename>\r
+    <Filename>Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.msa</Filename>\r
+    <Filename>Library/BasePeCoffLib/BasePeCoffLib.msa</Filename>\r
+    <Filename>Library/BasePrintLib/BasePrintLib.msa</Filename>\r
+    <Filename>Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.msa</Filename>\r
+    <Filename>Library/BasePostCodeLibPort80/BasePostCodeLibPort80.msa</Filename>\r
+    <Filename>Library/BasePostCodeLibDebug/BasePostCodeLibDebug.msa</Filename>\r
+    <Filename>Library/PeiDxePostCodeLibReportStatusCode/PeiDxePostCodeLibReportStatusCode.msa</Filename>\r
+    <Filename>Library/PeiSmbusLib/PeiSmbusLib.msa</Filename>\r
+    <Filename>Library/DxeSmbusLib/DxeSmbusLib.msa</Filename>\r
+    <Filename>Library/BaseUefiDecompressLib/BaseUefiDecompressLib.msa</Filename>\r
+    <Filename>Library/BasePciCf8Lib/BasePciCf8Lib.msa</Filename>\r
+    <Filename>Library/BasePciExpressLib/BasePciExpressLib.msa</Filename>\r
+    <Filename>Library/BasePciLibCf8/BasePciLibCf8.msa</Filename>\r
+    <Filename>Library/BasePciLibPciExpress/BasePciLibPciExpress.msa</Filename>\r
+    <Filename>Library/BaseTimerLibLocalApic/BaseTimerLibLocalApic.msa</Filename>\r
+    <Filename>Library/DxeCoreEntryPoint/DxeCoreEntryPoint.msa</Filename>\r
+    <Filename>Library/DxeCoreHobLib/DxeCoreHobLib.msa</Filename>\r
+    <Filename>Library/DxeHobLib/DxeHobLib.msa</Filename>\r
+    <Filename>Library/DxeIoLibCpuIo/DxeIoLibCpuIo.msa</Filename>\r
+    <Filename>Library/PeiIoLibCpuIo/PeiIoLibCpuIo.msa</Filename>\r
+    <Filename>Library/DxeMemoryAllocationLib/DxeMemoryAllocationLib.msa</Filename>\r
+    <Filename>Library/DxePcdLib/DxePcdLib.msa</Filename>\r
+    <Filename>Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.msa</Filename>\r
+    <Filename>Library/DxeServicesTableLib/DxeServicesTableLib.msa</Filename>\r
+    <Filename>Library/DxeSmmDriverEntryPoint/DxeSmmDriverEntryPoint.msa</Filename>\r
+    <Filename>Library/HiiLib/HiiLib.msa</Filename>\r
+    <Filename>Library/PeiCoreEntryPoint/PeiCoreEntryPoint.msa</Filename>\r
+    <Filename>Library/PeiServicesLib/PeiServicesLib.msa</Filename>\r
+    <Filename>Library/PeiHobLib/PeiHobLib.msa</Filename>\r
+    <Filename>Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.msa</Filename>\r
+    <Filename>Library/PeiMemoryLib/PeiMemoryLib.msa</Filename>\r
+    <Filename>Library/PeimEntryPoint/PeimEntryPoint.msa</Filename>\r
+    <Filename>Library/PeiPcdLib/PeiPcdLib.msa</Filename>\r
+    <Filename>Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.msa</Filename>\r
+    <Filename>Library/PeiResourcePublicationLib/PeiResourcePublicationLib.msa</Filename>\r
+    <Filename>Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.msa</Filename>\r
+    <Filename>Library/PeiServicesTablePointerLibMm7/PeiServicesTablePointerLibMm7.msa</Filename>\r
+    <Filename>Library/UefiBootServicesTableLib/UefiBootServicesTableLib.msa</Filename>\r
+    <Filename>Library/UefiDebugLibConOut/UefiDebugLibConOut.msa</Filename>\r
+    <Filename>Library/UefiDebugLibStdErr/UefiDebugLibStdErr.msa</Filename>\r
+    <Filename>Library/UefiDevicePathLib/UefiDevicePathLib.msa</Filename>\r
+    <Filename>Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.msa</Filename>\r
+    <Filename>Library/UefiDriverEntryPoint/UefiDriverEntryPoint.msa</Filename>\r
+    <Filename>Library/UefiDriverModelLib/UefiDriverModelLib.msa</Filename>\r
+    <Filename>Library/UefiLib/UefiLib.msa</Filename>\r
+    <Filename>Library/DxeMemoryLib/DxeMemoryLib.msa</Filename>\r
+    <Filename>Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.msa</Filename>\r
   </MsaFiles>\r
   <PackageHeaders>\r
-    <IncludeHeader ModuleType="BASE">Include/Base.h</IncludeHeader>\r
-    <IncludeHeader ModuleType="SEC">Include/Peim.h</IncludeHeader>\r
-    <IncludeHeader ModuleType="PEI_CORE">Include/PeiCore.h</IncludeHeader>\r
-    <IncludeHeader ModuleType="PEIM">Include/Peim.h</IncludeHeader>\r
-    <IncludeHeader ModuleType="DXE_CORE">Include/DxeCore.h</IncludeHeader>\r
-    <IncludeHeader ModuleType="DXE_DRIVER">Include/Dxe.h</IncludeHeader>\r
-    <IncludeHeader ModuleType="DXE_RUNTIME_DRIVER">Include/Dxe.h</IncludeHeader>\r
-    <IncludeHeader ModuleType="DXE_SMM_DRIVER">Include/Dxe.h</IncludeHeader>\r
-    <IncludeHeader ModuleType="DXE_SAL_DRIVER">Include/Dxe.h</IncludeHeader>\r
-    <IncludeHeader ModuleType="UEFI_DRIVER">Include/Uefi.h</IncludeHeader>\r
-    <IncludeHeader ModuleType="UEFI_APPLICATION">Include/Uefi.h</IncludeHeader>\r
+    <IncludePkgHeader ModuleType="BASE">Include/Base.h</IncludePkgHeader>\r
+    <IncludePkgHeader ModuleType="SEC">Include/Peim.h</IncludePkgHeader>\r
+    <IncludePkgHeader ModuleType="PEI_CORE">Include/PeiCore.h</IncludePkgHeader>\r
+    <IncludePkgHeader ModuleType="PEIM">Include/Peim.h</IncludePkgHeader>\r
+    <IncludePkgHeader ModuleType="DXE_CORE">Include/DxeCore.h</IncludePkgHeader>\r
+    <IncludePkgHeader ModuleType="DXE_DRIVER">Include/Dxe.h</IncludePkgHeader>\r
+    <IncludePkgHeader ModuleType="DXE_RUNTIME_DRIVER">Include/Dxe.h</IncludePkgHeader>\r
+    <IncludePkgHeader ModuleType="DXE_SMM_DRIVER">Include/Dxe.h</IncludePkgHeader>\r
+    <IncludePkgHeader ModuleType="DXE_SAL_DRIVER">Include/Dxe.h</IncludePkgHeader>\r
+    <IncludePkgHeader ModuleType="UEFI_DRIVER">Include/Uefi.h</IncludePkgHeader>\r
+    <IncludePkgHeader ModuleType="UEFI_APPLICATION">Include/Uefi.h</IncludePkgHeader>\r
+    <IncludePkgHeader ModuleType="USER_DEFINED">Include/Peim.h</IncludePkgHeader>\r
   </PackageHeaders>\r
   <GuidDeclarations>\r
+    <Entry Name="MdePkgTokenSpace">\r
+      <C_Name>gEfiMdePkgTokenSpaceGuid</C_Name>\r
+      <GuidValue>914AEBE7-4635-459b-AA1C-11E219B03A10</GuidValue>\r
+      <HelpText>All PCD define in MdePkg is in this token space scope</HelpText>\r
+    </Entry>\r
     <Entry Name="Acpi10Table">\r
       <C_Name>gEfiAcpi10TableGuid</C_Name>\r
-      <Guid>0xeb9d2d30, 0x2d88, 0x11d3, 0x9a, 0x16, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d</Guid>\r
+      <GuidValue>EB9D2D30-2D88-11D3-9A16-0090273FC14D</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="Acpi20Table">\r
       <C_Name>gEfiAcpi20TableGuid</C_Name>\r
-      <Guid>0x8868e871, 0xe4f1, 0x11d3, 0xbc, 0x22, 0x00, 0x80, 0xc7, 0x3c, 0x88, 0x81</Guid>\r
+      <GuidValue>8868E871-E4F1-11D3-BC22-0080C73C8881</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="Acpi30Table">\r
       <C_Name>gEfiAcpi30TableGuid</C_Name>\r
-      <Guid>0x8868e871, 0xe4f1, 0x11d3, 0xbc, 0x22, 0x00, 0x80, 0xc7, 0x3c, 0x88, 0x81</Guid>\r
+      <GuidValue>8868E871-E4F1-11D3-BC22-0080C73C8881</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="DebugImageInfoTable">\r
       <C_Name>gEfiDebugImageInfoTableGuid</C_Name>\r
-      <Guid>0x49152e77, 0x1ada, 0x4764, 0xb7, 0xa2, 0x7a, 0xfe, 0xfe, 0xd9, 0x5e, 0x8b</Guid>\r
+      <GuidValue>49152E77-1ADA-4764-B7A2-7AFEFED95E8B</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="GlobalVariable">\r
       <C_Name>gEfiGlobalVariableGuid</C_Name>\r
-      <Guid>0x8BE4DF61, 0x93CA, 0x11d2, 0xAA, 0x0D, 0x00, 0xE0, 0x98, 0x03, 0x2B, 0x8C</Guid>\r
+      <GuidValue>8BE4DF61-93CA-11D2-AA0D-00E098032B8C</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="PartTypeUnused">\r
       <C_Name>gEfiPartTypeUnusedGuid</C_Name>\r
-      <Guid>0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00</Guid>\r
+      <GuidValue>00000000-0000-0000-0000-000000000000</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="PartTypeSystemPart">\r
       <C_Name>gEfiPartTypeSystemPartGuid</C_Name>\r
-      <Guid>0xc12a7328, 0xf81f, 0x11d2, 0xba, 0x4b, 0x00, 0xa0, 0xc9, 0x3e, 0xc9, 0x3b</Guid>\r
+      <GuidValue>C12A7328-F81F-11D2-BA4B-00A0C93EC93B</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="PartTypeLegacyMbr">\r
       <C_Name>gEfiPartTypeLegacyMbrGuid</C_Name>\r
-      <Guid>0x024dee41, 0x33e7, 0x11d3, 0x9d, 0x69, 0x00, 0x08, 0xc7, 0x81, 0xf3, 0x9f</Guid>\r
+      <GuidValue>024DEE41-33E7-11D3-9D69-0008C781F39F</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="MpsTable">\r
       <C_Name>gEfiMpsTableGuid</C_Name>\r
-      <Guid>0xeb9d2d2f, 0x2d88, 0x11d3, 0x9a, 0x16, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d</Guid>\r
+      <GuidValue>EB9D2D2F-2D88-11D3-9A16-0090273FC14D</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="PcAnsi">\r
       <C_Name>gEfiPcAnsiGuid</C_Name>\r
-      <Guid>0xe0c14753, 0xf9be, 0x11d2, 0x9a, 0x0c, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d</Guid>\r
+      <GuidValue>E0C14753-F9BE-11D2-9A0C-0090273FC14D</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="VT100">\r
       <C_Name>gEfiVT100Guid</C_Name>\r
-      <Guid>0xdfa66065, 0xb419, 0x11d3, 0x9a, 0x2d, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d</Guid>\r
+      <GuidValue>DFA66065-B419-11D3-9A2D-0090273FC14D</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="VT100Plus">\r
       <C_Name>gEfiVT100PlusGuid</C_Name>\r
-      <Guid>0x7baec70b, 0x57e0, 0x4c76, 0x8e, 0x87, 0x2f, 0x9e, 0x28, 0x08, 0x83, 0x43</Guid>\r
+      <GuidValue>7BAEC70B-57E0-4C76-8E87-2F9E28088343</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="VTUTF8">\r
       <C_Name>gEfiVTUTF8Guid</C_Name>\r
-      <Guid>0xad15a0d6, 0x8bec, 0x4acf, 0xa0, 0x73, 0xd0, 0x1d, 0xe7, 0x7e, 0x2d, 0x88</Guid>\r
+      <GuidValue>AD15A0D6-8BEC-4ACF-A073-D01DE77E2D88</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="SalSystemTable">\r
       <C_Name>gEfiSalSystemTableGuid</C_Name>\r
-      <Guid>0xeb9d2d32, 0x2d88, 0x11d3, 0x9a, 0x16, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d</Guid>\r
+      <GuidValue>EB9D2D32-2D88-11D3-9A16-0090273FC14D</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="SmbiosTable">\r
       <C_Name>gEfiSmbiosTableGuid</C_Name>\r
-      <Guid>0xeb9d2d31, 0x2d88, 0x11d3, 0x9a, 0x16, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d</Guid>\r
+      <GuidValue>EB9D2D31-2D88-11D3-9A16-0090273FC14D</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="Apriori">\r
       <C_Name>gAprioriGuid</C_Name>\r
-      <Guid>0xfc510ee7, 0xffdc, 0x11d4, 0xbd, 0x41, 0x00, 0x80, 0xc7, 0x3c, 0x88, 0x81</Guid>\r
+      <GuidValue>FC510EE7-FFDC-11D4-BD41-0080C73C8881</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="DxeServicesTable">\r
       <C_Name>gEfiDxeServicesTableGuid</C_Name>\r
-      <Guid>0x5ad34ba, 0x6f02, 0x4214, 0x95, 0x2e, 0x4d, 0xa0, 0x39, 0x8e, 0x2b, 0xb9</Guid>\r
+      <GuidValue>05AD34BA-6F02-4214-952E-4DA0398E2BB9</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="FirmwareFileSystem">\r
       <C_Name>gEfiFirmwareFileSystemGuid</C_Name>\r
-      <Guid>0x7A9354D9, 0x0468, 0x444a, 0x81, 0xCE, 0x0B, 0xF6, 0x17, 0xD8, 0x90, 0xDF</Guid>\r
+      <GuidValue>7A9354D9-0468-444A-81CE-0BF617D890DF</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="FirmwareVolumeTopFile">\r
       <C_Name>gEfiFirmwareVolumeTopFileGuid</C_Name>\r
-      <Guid>0x1BA0062E, 0xC779, 0x4582, 0x85, 0x66, 0x33, 0x6A, 0xE8, 0xF7, 0x8F, 0x09</Guid>\r
+      <GuidValue>1BA0062E-C779-4582-8566-336AE8F78F09</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="HobList">\r
       <C_Name>gEfiHobListGuid</C_Name>\r
-      <Guid>0x7739f24c, 0x93d7, 0x11d4, 0x9a, 0x3a, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d</Guid>\r
+      <GuidValue>7739F24C-93D7-11D4-9A3A-0090273FC14D</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="HobMemoryAllocBspStore">\r
       <C_Name>gEfiHobMemoryAllocBspStoreGuid</C_Name>\r
-      <Guid>0x564b33cd, 0xc92a, 0x4593, 0x90, 0xbf, 0x24, 0x73, 0xe4, 0x3c, 0x63, 0x22</Guid>\r
+      <GuidValue>564B33CD-C92A-4593-90BF-2473E43C6322</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="HobMemoryAllocStack">\r
       <C_Name>gEfiHobMemoryAllocStackGuid</C_Name>\r
-      <Guid>0x4ed4bf27, 0x4092, 0x42e9, 0x80, 0x7d, 0x52, 0x7b, 0x1d, 0x00, 0xc9, 0xbd</Guid>\r
+      <GuidValue>4ED4BF27-4092-42E9-807D-527B1D00C9BD</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="HobMemoryAllocModule">\r
       <C_Name>gEfiHobMemoryAllocModuleGuid</C_Name>\r
-      <Guid>0xf8e21975, 0x0899, 0x4f58, 0xa4, 0xbe, 0x55, 0x25, 0xa9, 0xc6, 0xd7, 0x7a</Guid>\r
+      <GuidValue>F8E21975-0899-4F58-A4BE-5525A9C6D77A</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="FileInfo">\r
       <C_Name>gEfiFileInfoGuid</C_Name>\r
-      <Guid>0x9576e92, 0x6d3f, 0x11d2, 0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b</Guid>\r
+      <GuidValue>09576E92-6D3F-11D2-8E39-00A0C969723B</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="FileSystemInfo">\r
       <C_Name>gEfiFileSystemInfoGuid</C_Name>\r
-      <Guid>0x9576e93, 0x6d3f, 0x11d2, 0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b</Guid>\r
+      <GuidValue>09576E93-6D3F-11D2-8E39-00A0C969723B</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="FileSystemVolumeLabelInfoId">\r
       <C_Name>gEfiFileSystemVolumeLabelInfoIdGuid</C_Name>\r
-      <Guid>0xDB47D7D3, 0xFE81, 0x11d3, 0x9A, 0x35, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D</Guid>\r
+      <GuidValue>DB47D7D3-FE81-11D3-9A35-0090273FC14D</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="ProcessorProducer">\r
       <C_Name>gEfiProcessorProducerGuid</C_Name>\r
-      <Guid>0x1bf06aea, 0x5bec, 0x4a8d, 0x95, 0x76, 0x74, 0x9b, 0x09, 0x56, 0x2d, 0x30</Guid>\r
+      <GuidValue>1BF06AEA-5BEC-4A8D-9576-749B09562D30</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="ProcessorSubClass">\r
       <C_Name>gEfiProcessorSubClassGuid</C_Name>\r
-      <Guid>0x26fdeb7e, 0xb8af, 0x4ccf, 0xaa, 0x97, 0x02, 0x63, 0x3c, 0xe4, 0x8c, 0xa7</Guid>\r
+      <GuidValue>26FDEB7E-B8AF-4CCF-AA97-02633CE48CA7</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="CacheSubClass">\r
       <C_Name>gEfiCacheSubClassGuid</C_Name>\r
-      <Guid>0x7f0013a7, 0xdc79, 0x4b22, 0x80, 0x99, 0x11, 0xf7, 0x5f, 0xdc, 0x82, 0x9d</Guid>\r
+      <GuidValue>7F0013A7-DC79-4B22-8099-11F75FDC829D</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="MemoryProducer">\r
       <C_Name>gEfiMemoryProducerGuid</C_Name>\r
-      <Guid>0x772484B2, 0x7482, 0x4b91, 0x9F, 0x9A, 0xAD, 0x43, 0xF8, 0x1C, 0x58, 0x81</Guid>\r
+      <GuidValue>772484B2-7482-4B91-9F9A-AD43F81C5881</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="MemorySubClass">\r
       <C_Name>gEfiMemorySubClassGuid</C_Name>\r
-      <Guid>0x4E8F4EBB, 0x64B9, 0x4e05, 0x9B, 0x18, 0x4C, 0xFE, 0x49, 0x23, 0x50, 0x97</Guid>\r
+      <GuidValue>4E8F4EBB-64B9-4E05-9B18-4CFE49235097</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="MiscProducer">\r
       <C_Name>gEfiMiscProducerGuid</C_Name>\r
-      <Guid>0x62512c92, 0x63c4, 0x4d80, 0x82, 0xb1, 0xc1, 0xa4, 0xdc, 0x44, 0x80, 0xe5</Guid>\r
+      <GuidValue>62512C92-63C4-4D80-82B1-C1A4DC4480E5</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="MiscSubClass">\r
       <C_Name>gEfiMiscSubClassGuid</C_Name>\r
-      <Guid>0x772484B2, 0x7482, 0x4b91, 0x9F, 0x9A, 0xAD, 0x43, 0xF8, 0x1C, 0x58, 0x81</Guid>\r
+      <GuidValue>772484B2-7482-4B91-9F9A-AD43F81C5881</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="StatusCodeDataTypeString">\r
       <C_Name>gEfiStatusCodeDataTypeStringGuid</C_Name>\r
-      <Guid>0x92D11080, 0x496F, 0x4D95, 0xBE, 0x7E, 0x03, 0x74, 0x88, 0x38, 0x2B, 0x0A</Guid>\r
+      <GuidValue>92D11080-496F-4D95-BE7E-037488382B0A</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="StatusCodeSpecificData">\r
       <C_Name>gEfiStatusCodeSpecificDataGuid</C_Name>\r
-      <Guid>0x335984bd, 0xe805, 0x409a, 0xb8, 0xf8, 0xd2, 0x7e, 0xce, 0x5f, 0xf7, 0xa6</Guid>\r
+      <GuidValue>335984BD-E805-409A-B8F8-D27ECE5FF7A6</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="StatusCodeDataTypeAssert">\r
       <C_Name>gEfiStatusCodeDataTypeAssertGuid</C_Name>\r
-      <Guid>0xDA571595, 0x4D99, 0x487C, 0x82, 0x7C, 0x26, 0x22, 0x67, 0x7D, 0x33, 0x07</Guid>\r
+      <GuidValue>DA571595-4D99-487C-827C-2622677D3307</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="StatusCodeDataTypeExceptionHandler">\r
       <C_Name>gEfiStatusCodeDataTypeExceptionHandlerGuid</C_Name>\r
-      <Guid>0x3BC2BD12, 0xAD2E, 0x11D5, 0x87, 0xDD, 0x00, 0x06, 0x29, 0x45, 0xC3, 0xB9</Guid>\r
+      <GuidValue>3BC2BD12-AD2E-11D5-87DD-00062945C3B9</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="StatusCodeDataTypeDebug">\r
       <C_Name>gEfiStatusCodeDataTypeDebugGuid</C_Name>\r
-      <Guid>0x9A4E9246, 0xD553, 0x11D5, 0x87, 0xE2, 0x00, 0x06, 0x29, 0x45, 0xC3, 0xb9</Guid>\r
+      <GuidValue>9A4E9246-D553-11D5-87E2-00062945C3B9</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="StatusCodeDataTypeError">\r
       <C_Name>gEfiStatusCodeDataTypeErrorGuid</C_Name>\r
-      <Guid>0xAB359CE3, 0x99B3, 0xAE18, 0xC8, 0x9D, 0x95, 0xD3, 0xB0, 0x72, 0xE1, 0x9B</Guid>\r
+      <GuidValue>AB359CE3-99B3-AE18-C89D-95D3B072E19B</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="StatusCodeDataTypeProgressCode">\r
       <C_Name>gEfiStatusCodeDataTypeProgressCodeGuid</C_Name>\r
-      <Guid>0xA356AB39, 0x35C4, 0x35DA, 0xB3, 0x7A, 0xF8, 0xEA, 0x9E, 0x8B, 0x36, 0xA3</Guid>\r
+      <GuidValue>A356AB39-35C4-35DA-B37A-F8EA9E8B36A3</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="AuthenticationChapRadius">\r
       <C_Name>gEfiAuthenticationChapRadiusGuid</C_Name>\r
-      <Guid>0xd6062b50, 0x15ca, 0x11da, 0x92, 0x19, 0x00, 0x10, 0x83, 0xff, 0xca, 0x4d</Guid>\r
+      <GuidValue>D6062B50-15CA-11DA-9219-001083FFCA4D</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="AuthenticationChapLocal">\r
       <C_Name>gEfiAuthenticationChapLocalGuid</C_Name>\r
-      <Guid>0xc280c73e, 0x15ca, 0x11da, 0xb0, 0xca, 0x00, 0x10, 0x83, 0xff, 0xca, 0x4d</Guid>\r
+      <GuidValue>C280C73E-15CA-11DA-B0CA-001083FFCA4D</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="HashAlgorithmSha1">\r
       <C_Name>gEfiHashAlgorithmSha1Guid</C_Name>\r
-      <Guid>0x2ae9d80f, 0x3fb2, 0x4095, 0xb7, 0xb1, 0xe9, 0x31, 0x57, 0xb9, 0x46, 0xb6</Guid>\r
+      <GuidValue>2AE9D80F-3FB2-4095-B7B1-E93157B946B6</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="HashAlgorithmSha224">\r
       <C_Name>gEfiHashAlgorithmSha224Guid</C_Name>\r
-      <Guid>0x8df01a06, 0x9bd5, 0x4bf7, 0xb0, 0x21, 0xdb, 0x4f, 0xd9, 0xcc, 0xf4, 0x5b</Guid>\r
+      <GuidValue>8DF01A06-9BD5-4BF7-B021-DB4FD9CCF45B</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="HashAlgorithmSha256">\r
       <C_Name>gEfiHashAlgorithmSha256Guid</C_Name>\r
-      <Guid>0x51aa59de, 0xfdf2, 0x4ea3, 0xbc, 0x63, 0x87, 0x5f, 0xb7, 0x84, 0x2e, 0xe9</Guid>\r
+      <GuidValue>51AA59DE-FDF2-4EA3-BC63-875FB7842EE9</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="HashAlgorithmSha384">\r
       <C_Name>gEfiHashAlgorithmSha384Guid</C_Name>\r
-      <Guid>0xefa96432, 0xde33, 0x4dd2, 0xae, 0xe6, 0x32, 0x8c, 0x33, 0xdf, 0x77, 0x7a</Guid>\r
+      <GuidValue>EFA96432-DE33-4DD2-AEE6-328C33DF777A</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="HashAlgorithmSha512">\r
       <C_Name>gEfiHashAlgorithmSha512Guid</C_Name>\r
-      <Guid>0xcaa4381e, 0x750c, 0x4770, 0xb8, 0x70, 0x7a, 0x23, 0xb4, 0xe4, 0x21, 0x30</Guid>\r
+      <GuidValue>CAA4381E-750C-4770-B870-7A23B4E42130</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="HashAlgorithmMD5">\r
       <C_Name>gEfiHashAlgorithmMD5Guid</C_Name>\r
-      <Guid>0xaf7c79c, 0x65b5, 0x4319, 0xb0, 0xae, 0x44, 0xec, 0x48, 0x4e, 0x4a, 0xd7</Guid>\r
+      <GuidValue>0AF7C79C-65B5-4319-B0AE-44EC484E4AD7</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="BootObjectAuthorizationParmset">\r
       <C_Name>gBootObjectAuthorizationParmsetGuid</C_Name>\r
-      <Guid>0xedd35e31, 0x7b9, 0x11d2, 0x83, 0xa3, 0x00, 0xa0, 0xc9, 0x1f, 0xad, 0xcf</Guid>\r
+      <GuidValue>EDD35E31-07B9-11D2-83A3-00A0C91FADCF</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="AcpiTableStorage">\r
       <C_Name>gEfiAcpiTableStorageGuid</C_Name>\r
-      <Guid>0x7e374e25, 0x8e01, 0x4fee, 0x87, 0xf2, 0x39, 0x0c, 0x23, 0xc6, 0x06, 0xcd</Guid>\r
+      <GuidValue>7E374E25-8E01-4FEE-87F2-390C23C606CD</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="SmmPeiSmramMemoryReserve">\r
-      <C_Name>gEfiSmmPeiSmramMemoryReserve</C_Name>\r
-      <Guid>0x6dadf1d1, 0xd4cc, 0x4910, 0xbb, 0x6e, 0x82, 0xb1, 0xfd, 0x80, 0xff, 0x3d</Guid>\r
+      <C_Name>gEfiSmmPeiSmramMemoryReserveGuid</C_Name>\r
+      <GuidValue>6DADF1D1-D4CC-4910-BB6E-82B1FD80FF3D</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="SmmCpuIo">\r
       <C_Name>gEfiSmmCpuIoGuid</C_Name>\r
-      <Guid>0x5f439a0b, 0x45d8, 0x4682, 0xa4, 0xf4, 0xf0, 0x57, 0x6b, 0x51, 0x34, 0x41</Guid>\r
+      <GuidValue>5F439A0B-45D8-4682-A4F4-F0576B513441</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="SmmCommunicateHeader">\r
       <C_Name>gSmmCommunicateHeaderGuid</C_Name>\r
-      <Guid>0xf328e36c, 0x23b6, 0x4a95, 0x85, 0x4b, 0x32, 0xe1, 0x95, 0x34, 0xcd, 0x75</Guid>\r
+      <GuidValue>F328E36C-23B6-4A95-854B-32E19534CD75</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="Capsule">\r
       <C_Name>gEfiCapsuleGuid</C_Name>\r
-      <Guid>0x3B6686BD, 0x0D76, 0x4030, 0xB7, 0x0E, 0xB5, 0x51, 0x9E, 0x2F, 0xC5, 0xA0</Guid>\r
+      <GuidValue>3B6686BD-0D76-4030-B70E-B5519E2FC5A0</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="ConfigFileName">\r
       <C_Name>gEfiConfigFileNameGuid</C_Name>\r
-      <Guid>0x98B8D59B, 0xE8BA, 0x48EE, 0x98, 0xDD, 0xC2, 0x95, 0x39, 0x2F, 0x1E, 0xDB</Guid>\r
+      <GuidValue>98B8D59B-E8BA-48EE-98DD-C295392F1EDB</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="EventLegacyBoot">\r
       <C_Name>gEfiEventLegacyBootGuid</C_Name>\r
-      <Guid>0x2a571201, 0x4966, 0x47f6, 0x8b, 0x86, 0xf3, 0x1e, 0x41, 0xf3, 0x2f, 0x10</Guid>\r
+      <GuidValue>2A571201-4966-47F6-8B86-F31E41F32F10</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="EventExitBootServices">\r
       <C_Name>gEfiEventExitBootServicesGuid</C_Name>\r
-      <Guid>0x27abf055, 0xb1b8, 0x4c26, 0x80, 0x48, 0x74, 0x8f, 0x37, 0xba, 0xa2, 0xdf</Guid>\r
+      <GuidValue>27ABF055-B1B8-4C26-8048-748F37BAA2DF</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="EventVirtualAddressChange">\r
       <C_Name>gEfiEventVirtualAddressChangeGuid</C_Name>\r
-      <Guid>0x13fa7698, 0xc831, 0x49c7, 0x87, 0xea, 0x8f, 0x43, 0xfc, 0xc2, 0x51, 0x96</Guid>\r
+      <GuidValue>13FA7698-C831-49C7-87EA-8F43FCC25196</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="EventMemoryMapChange">\r
       <C_Name>gEfiEventMemoryMapChangeGuid</C_Name>\r
-      <Guid>0x78bee926, 0x692f, 0x48fd, 0x9e, 0xdb, 0x01, 0x42, 0x2e, 0xf0, 0xd7, 0xab</Guid>\r
+      <GuidValue>78BEE926-692F-48FD-9EDB-01422EF0D7AB</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="EventReadyToBoot">\r
       <C_Name>gEfiEventReadyToBootGuid</C_Name>\r
-      <Guid>0x7ce88fb3, 0x4bd7, 0x4679, 0x87, 0xa8, 0xa8, 0xd8, 0xde, 0xe5, 0x0d, 0x2b</Guid>\r
+      <GuidValue>7CE88FB3-4BD7-4679-87A8-A8D8DEE50D2B</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="FrameworkDevicePath">\r
       <C_Name>gEfiFrameworkDevicePathGuid</C_Name>\r
-      <Guid>0xb7084e63, 0x46b7, 0x4d1a, 0x86, 0x77, 0xe3, 0x0b, 0x53, 0xdb, 0xf0, 0x50</Guid>\r
+      <GuidValue>B7084E63-46B7-4D1A-8677-E30B53DBF050</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
   </GuidDeclarations>\r
   <ProtocolDeclarations>\r
     <Entry Name="Bds">\r
       <C_Name>gEfiBdsArchProtocolGuid</C_Name>\r
-      <Guid>0x665E3FF6, 0x46CC, 0x11d4, 0x9A, 0x38, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D</Guid>\r
+      <GuidValue>665E3FF6-46CC-11D4-9A38-0090273FC14D</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="Cpu">\r
       <C_Name>gEfiCpuArchProtocolGuid</C_Name>\r
-      <Guid>0x26baccb1, 0x6f42, 0x11d4, 0xbc, 0xe7, 0x00, 0x80, 0xc7, 0x3c, 0x88, 0x81</Guid>\r
+      <GuidValue>26BACCB1-6F42-11D4-BCE7-0080C73C8881</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="Metronome">\r
       <C_Name>gEfiMetronomeArchProtocolGuid</C_Name>\r
-      <Guid>0x26baccb2, 0x6f42, 0x11d4, 0xbc, 0xe7, 0x00, 0x80, 0xc7, 0x3c, 0x88, 0x81</Guid>\r
+      <GuidValue>26BACCB2-6F42-11D4-BCE7-0080C73C8881</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="MonotonicCounter">\r
       <C_Name>gEfiMonotonicCounterArchProtocolGuid</C_Name>\r
-      <Guid>0x1da97072, 0xbddc, 0x4b30, 0x99, 0xf1, 0x72, 0xa0, 0xb5, 0x6f, 0xff, 0x2a</Guid>\r
+      <GuidValue>1DA97072-BDDC-4B30-99F1-72A0B56FFF2A</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="RealTimeClock">\r
       <C_Name>gEfiRealTimeClockArchProtocolGuid</C_Name>\r
-      <Guid>0x27CFAC87, 0x46CC, 0x11d4, 0x9A, 0x38, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D</Guid>\r
+      <GuidValue>27CFAC87-46CC-11D4-9A38-0090273FC14D</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="Reset">\r
       <C_Name>gEfiResetArchProtocolGuid</C_Name>\r
-      <Guid>0x27CFAC88, 0x46CC, 0x11d4, 0x9A, 0x38, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D</Guid>\r
+      <GuidValue>27CFAC88-46CC-11D4-9A38-0090273FC14D</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="Runtime">\r
       <C_Name>gEfiRuntimeArchProtocolGuid</C_Name>\r
-      <Guid>0x96d08253, 0x8483, 0x11d4, 0xbc, 0xf1, 0x00, 0x80, 0xc7, 0x3c, 0x88, 0x81</Guid>\r
+      <GuidValue>96D08253-8483-11D4-BCF1-0080C73C8881</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="Security">\r
       <C_Name>gEfiSecurityArchProtocolGuid</C_Name>\r
-      <Guid>0xA46423E3, 0x4617, 0x49f1, 0xB9, 0xFF, 0xD1, 0xBF, 0xA9, 0x11, 0x58, 0x39</Guid>\r
+      <GuidValue>A46423E3-4617-49F1-B9FF-D1BFA9115839</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="StatusCode">\r
       <C_Name>gEfiStatusCodeRuntimeProtocolGuid</C_Name>\r
-      <Guid>0xd2b2b828, 0x826, 0x48a7, 0xb3, 0xdf, 0x98, 0x3c, 0x0, 0x60, 0x24, 0xf0</Guid>\r
+      <GuidValue>D2B2B828-0826-48A7-B3DF-983C006024F0</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="Timer">\r
       <C_Name>gEfiTimerArchProtocolGuid</C_Name>\r
-      <Guid>0x26baccb3, 0x6f42, 0x11d4, 0xbc, 0xe7, 0x00, 0x80, 0xc7, 0x3c, 0x88, 0x81</Guid>\r
+      <GuidValue>26BACCB3-6F42-11D4-BCE7-0080C73C8881</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="Variable">\r
       <C_Name>gEfiVariableArchProtocolGuid</C_Name>\r
-      <Guid>0x1e5668e2, 0x8481, 0x11d4, 0xbc, 0xf1, 0x00, 0x80, 0xc7, 0x3c, 0x88, 0x81</Guid>\r
+      <GuidValue>1E5668E2-8481-11D4-BCF1-0080C73C8881</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="VariableWrite">\r
       <C_Name>gEfiVariableWriteArchProtocolGuid</C_Name>\r
-      <Guid>0x6441f818, 0x6362, 0x4e44, 0xb5, 0x70, 0x7d, 0xba, 0x31, 0xdd, 0x24, 0x53</Guid>\r
+      <GuidValue>6441F818-6362-4E44-B570-7DBA31DD2453</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="WatchdogTimer">\r
       <C_Name>gEfiWatchdogTimerArchProtocolGuid</C_Name>\r
-      <Guid>0x665E3FF5, 0x46CC, 0x11d4, 0x9A, 0x38, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D</Guid>\r
+      <GuidValue>665E3FF5-46CC-11D4-9A38-0090273FC14D</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="CpuIo">\r
       <C_Name>gEfiCpuIoProtocolGuid</C_Name>\r
-      <Guid>0xB0732526, 0x38C8, 0x4b40, 0x88, 0x77, 0x61, 0xC7, 0xB0, 0x6A, 0xAC, 0x45</Guid>\r
+      <GuidValue>B0732526-38C8-4B40-8877-61C7B06AAC45</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="DataHub">\r
       <C_Name>gEfiDataHubProtocolGuid</C_Name>\r
-      <Guid>0xae80d021, 0x618e, 0x11d4, 0xbc, 0xd7, 0x00, 0x80, 0xc7, 0x3c, 0x88, 0x81</Guid>\r
+      <GuidValue>AE80D021-618E-11D4-BCD7-0080C73C8881</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="FirmwareVolume">\r
       <C_Name>gEfiFirmwareVolumeProtocolGuid</C_Name>\r
-      <Guid>0x389F751F, 0x1838, 0x4388, 0x83, 0x90, 0xCD, 0x81, 0x54, 0xBD, 0x27, 0xF8</Guid>\r
+      <GuidValue>389F751F-1838-4388-8390-CD8154BD27F8</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="FirmwareVolumeBlock">\r
       <C_Name>gEfiFirmwareVolumeBlockProtocolGuid</C_Name>\r
-      <Guid>0xDE28BC59, 0x6228, 0x41BD, 0xBD, 0xF6, 0xA3, 0xB9, 0xAD, 0xB5, 0x8D, 0xA1</Guid>\r
+      <GuidValue>DE28BC59-6228-41BD-BDF6-A3B9ADB58DA1</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="FirmwareVolumeDispatch">\r
       <C_Name>gEfiFirmwareVolumeDispatchProtocolGuid</C_Name>\r
-      <Guid>0x7aa35a69, 0x506c, 0x444f, 0xa7, 0xaf, 0x69, 0x4b, 0xf5, 0x6f, 0x71, 0xc8</Guid>\r
+      <GuidValue>7AA35A69-506C-444F-A7AF-694BF56F71C8</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="FormBrowser">\r
       <C_Name>gEfiFormBrowserProtocolGuid</C_Name>\r
-      <Guid>0xe5a1333e, 0xe1b4, 0x4d55, 0xce, 0xeb, 0x35, 0xc3, 0xef, 0x13, 0x34, 0x43</Guid>\r
+      <GuidValue>E5A1333E-E1B4-4D55-CEEB-35C3EF133443</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="FormCallback">\r
       <C_Name>gEfiFormCallbackProtocolGuid</C_Name>\r
-      <Guid>0xf3e4543d, 0xcf35, 0x6cef, 0x35, 0xc4, 0x4f, 0xe6, 0x34, 0x4d, 0xfc, 0x54</Guid>\r
+      <GuidValue>F3E4543D-CF35-6CEF-35C4-4FE6344DFC54</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="Crc32GuidedSectionExtraction">\r
       <C_Name>gEfiCrc32GuidedSectionExtractionProtocolGuid</C_Name>\r
-      <Guid>0xFC1BCDB0, 0x7D31, 0x49aa, 0x93, 0x6A, 0xA4, 0x60, 0x0D, 0x9D, 0xD0, 0x83</Guid>\r
+      <GuidValue>FC1BCDB0-7D31-49AA-936A-A4600D9DD083</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="Hii">\r
       <C_Name>gEfiHiiProtocolGuid</C_Name>\r
-      <Guid>0xea816d2c, 0xcee5, 0x4f02, 0x99, 0xb5, 0xd3, 0x90, 0x5c, 0xbb, 0xd0, 0x77</Guid>\r
+      <GuidValue>EA816D2C-CEE5-4F02-99B5-D3905CBBD077</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
-    <Entry Name="Pcd">\r
+    <Entry Name="PcdProtocol">\r
       <C_Name>gPcdProtocolGuid</C_Name>\r
-      <Guid>0x11b34006, 0xd85b, 0x4d0a, 0xa2, 0x90, 0xd5, 0xa5, 0x71, 0x31, 0x0e, 0xf7</Guid>\r
+      <GuidValue>11B34006-D85B-4D0A-A290-D5A571310EF7</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="SectionExtraction">\r
       <C_Name>gEfiSectionExtractionProtocolGuid</C_Name>\r
-      <Guid>0x448F5DA4, 0x6DD7, 0x4FE1, 0x93, 0x07, 0x69, 0x22, 0x41, 0x92, 0x21, 0x5D</Guid>\r
+      <GuidValue>448F5DA4-6DD7-4FE1-9307-69224192215D</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="Bis">\r
       <C_Name>gEfiBisProtocolGuid</C_Name>\r
-      <Guid>0x0b64aab0, 0x5429, 0x11d4, 0x98, 0x16, 0x00, 0xa0, 0xc9, 0x1f, 0xad, 0xcf</Guid>\r
+      <GuidValue>0B64AAB0-5429-11D4-9816-00A0C91FADCF</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="BlockIo">\r
       <C_Name>gEfiBlockIoProtocolGuid</C_Name>\r
-      <Guid>0x964e5b21, 0x6459, 0x11d2, 0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b</Guid>\r
+      <GuidValue>964E5B21-6459-11D2-8E39-00A0C969723B</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="BusSpecificDriverOverride">\r
       <C_Name>gEfiBusSpecificDriverOverrideProtocolGuid</C_Name>\r
-      <Guid>0x3bc1b285, 0x8a15, 0x4a82, 0xaa, 0xbf, 0x4d, 0x7d, 0x13, 0xfb, 0x32, 0x65</Guid>\r
+      <GuidValue>3BC1B285-8A15-4A82-AABF-4D7D13FB3265</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="ComponentName">\r
       <C_Name>gEfiComponentNameProtocolGuid</C_Name>\r
-      <Guid>0x107a772c, 0xd5e1, 0x11d4, 0x9a, 0x46, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d</Guid>\r
+      <GuidValue>107A772C-D5E1-11D4-9A46-0090273FC14D</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="DebugPort">\r
       <C_Name>gEfiDebugPortProtocolGuid</C_Name>\r
-      <Guid>0xEBA4E8D2, 0x3858, 0x41EC, 0xA2, 0x81, 0x26, 0x47, 0xBA, 0x96, 0x60, 0xD0</Guid>\r
+      <GuidValue>EBA4E8D2-3858-41EC-A281-2647BA9660D0</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="DebugSupport">\r
       <C_Name>gEfiDebugSupportProtocolGuid</C_Name>\r
-      <Guid>0x2755590C, 0x6F3C, 0x42FA, 0x9E, 0xA4, 0xA3, 0xBA, 0x54, 0x3C, 0xDA, 0x25</Guid>\r
+      <GuidValue>2755590C-6F3C-42FA-9EA4-A3BA543CDA25</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="Decompress">\r
       <C_Name>gEfiDecompressProtocolGuid</C_Name>\r
-      <Guid>0xd8117cfe, 0x94a6, 0x11d4, 0x9a, 0x3a, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d</Guid>\r
+      <GuidValue>D8117CFE-94A6-11D4-9A3A-0090273FC14D</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="DevicePath">\r
       <C_Name>gEfiDevicePathProtocolGuid</C_Name>\r
-      <Guid>0x9576e91, 0x6d3f, 0x11d2, 0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b</Guid>\r
+      <GuidValue>09576E91-6D3F-11D2-8E39-00A0C969723B</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="DiskIo">\r
       <C_Name>gEfiDiskIoProtocolGuid</C_Name>\r
-      <Guid>0xce345171, 0xba0b, 0x11d2, 0x8e, 0x4f, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b</Guid>\r
+      <GuidValue>CE345171-BA0B-11D2-8E4F-00A0C969723B</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="DriverBinding">\r
       <C_Name>gEfiDriverBindingProtocolGuid</C_Name>\r
-      <Guid>0x18a031ab, 0xb443, 0x4d1a, 0xa5, 0xc0, 0x0c, 0x09, 0x26, 0x1e, 0x9f, 0x71</Guid>\r
+      <GuidValue>18A031AB-B443-4D1A-A5C0-0C09261E9F71</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="DriverConfiguration">\r
       <C_Name>gEfiDriverConfigurationProtocolGuid</C_Name>\r
-      <Guid>0x107a772b, 0xd5e1, 0x11d4, 0x9a, 0x46, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d</Guid>\r
+      <GuidValue>107A772B-D5E1-11D4-9A46-0090273FC14D</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="UefiDriverConfiguration">\r
       <C_Name>gUefiDriverConfigurationProtocolGuid</C_Name>\r
-      <Guid>0xbfd7dc1d, 0x24f1, 0x40d9, 0x82, 0xe7, 0x2e, 0x09, 0xbb, 0x6b, 0x4e, 0xbe</Guid>\r
+      <GuidValue>BFD7DC1D-24F1-40D9-82E7-2E09BB6B4EBE</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="DriverDiagnostics">\r
       <C_Name>gEfiDriverDiagnosticsProtocolGuid</C_Name>\r
-      <Guid>0x0784924f, 0xe296, 0x11d4, 0x9a, 0x49, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d</Guid>\r
+      <GuidValue>0784924F-E296-11D4-9A49-0090273FC14D</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="UefiDriverDiagnostics">\r
       <C_Name>gUefiDriverDiagnosticsProtocolGuid</C_Name>\r
-      <Guid>0x4d330321, 0x025f, 0x4aac, 0x90, 0xd8, 0x5e, 0xd9, 0x00, 0x17, 0x3b, 0x63</Guid>\r
+      <GuidValue>4D330321-025F-4AAC-90D8-5ED900173B63</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="Ebc">\r
       <C_Name>gEfiEbcProtocolGuid</C_Name>\r
-      <Guid>0x13AC6DD1, 0x73D0, 0x11D4, 0xB0, 0x6B, 0x00, 0xAA, 0x00, 0xBD, 0x6D, 0xE7</Guid>\r
+      <GuidValue>13AC6DD1-73D0-11D4-B06B-00AA00BD6DE7</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="NetworkInterfaceIdentifier">\r
       <C_Name>gEfiNetworkInterfaceIdentifierProtocolGuid</C_Name>\r
-      <Guid>0xE18541CD, 0xF755, 0x4f73, 0x92, 0x8D, 0x64, 0x3C, 0x8A, 0x79, 0xB2, 0x29</Guid>\r
+      <GuidValue>E18541CD-F755-4F73-928D-643C8A79B229</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="NetworkInterfaceIdentifier31">\r
       <C_Name>gEfiNetworkInterfaceIdentifierProtocolGuid_31</C_Name>\r
-      <Guid>0x1ACED566, 0x76ED, 0x4218, 0xBC, 0x81, 0x76, 0x7F, 0x1F, 0x97, 0x7A, 0x89</Guid>\r
+      <GuidValue>1ACED566-76ED-4218-BC81-767F1F977A89</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="NetworkInterfaceIdentifier2">\r
       <C_Name>gEfiNetworkInterfaceIdentifierProtocolGuid_31</C_Name>\r
-      <Guid>0x1ACED566, 0x76ED, 0x4218, 0xBC, 0x81, 0x76, 0x7F, 0x1F, 0x97, 0x7A, 0x89</Guid>\r
+      <GuidValue>1ACED566-76ED-4218-BC81-767F1F977A89</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="LoadedImage">\r
       <C_Name>gEfiLoadedImageProtocolGuid</C_Name>\r
-      <Guid>0x5B1B31A1, 0x9562, 0x11d2, 0x8E, 0x3F, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B</Guid>\r
+      <GuidValue>5B1B31A1-9562-11D2-8E3F-00A0C969723B</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="LoadFile">\r
       <C_Name>gEfiLoadFileProtocolGuid</C_Name>\r
-      <Guid>0x56EC3091, 0x954C, 0x11d2, 0x8E, 0x3F, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B</Guid>\r
+      <GuidValue>56EC3091-954C-11D2-8E3F-00A0C969723B</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="PciIo">\r
       <C_Name>gEfiPciIoProtocolGuid</C_Name>\r
-      <Guid>0x4cf5b200, 0x68b8, 0x4ca5, 0x9e, 0xec, 0xb2, 0x3e, 0x3f, 0x50, 0x02, 0x9a</Guid>\r
+      <GuidValue>4CF5B200-68B8-4CA5-9EEC-B23E3F50029A</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="PciRootBridgeIo">\r
       <C_Name>gEfiPciRootBridgeIoProtocolGuid</C_Name>\r
-      <Guid>0x2f707ebb, 0x4a1a, 0x11d4, 0x9a, 0x38, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d</Guid>\r
+      <GuidValue>2F707EBB-4A1A-11D4-9A38-0090273FC14D</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="PlatformDriverOverride">\r
       <C_Name>gEfiPlatformDriverOverrideProtocolGuid</C_Name>\r
-      <Guid>0x6b30c738, 0xa391, 0x11d4, 0x9a, 0x3b, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d</Guid>\r
+      <GuidValue>6B30C738-A391-11D4-9A3B-0090273FC14D</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="PxeBaseCode">\r
       <C_Name>gEfiPxeBaseCodeProtocolGuid</C_Name>\r
-      <Guid>0x03c4e603, 0xac28, 0x11d3, 0x9a, 0x2d, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d</Guid>\r
+      <GuidValue>03C4E603-AC28-11D3-9A2D-0090273FC14D</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="PxeBaseCodeCallBack">\r
       <C_Name>gEfiPxeBaseCodeCallbackProtocolGuid</C_Name>\r
-      <Guid>0x245dca21, 0xfb7b, 0x11d3, 0x8f, 0x01, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b</Guid>\r
+      <GuidValue>245DCA21-FB7B-11D3-8F01-00A0C969723B</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="ScsiPassThru">\r
       <C_Name>gEfiScsiPassThruProtocolGuid</C_Name>\r
-      <Guid>0xa59e8fcf, 0xbda0, 0x43bb, 0x90, 0xb1, 0xd3, 0x73, 0x2e, 0xca, 0xa8, 0x77</Guid>\r
+      <GuidValue>A59E8FCF-BDA0-43BB-90B1-D3732ECAA877</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="SerialIo">\r
       <C_Name>gEfiSerialIoProtocolGuid</C_Name>\r
-      <Guid>0xBB25CF6F, 0xF1D4, 0x11D2, 0x9A, 0x0C, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0xFD</Guid>\r
+      <GuidValue>BB25CF6F-F1D4-11D2-9A0C-0090273FC1FD</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="SimpleFileSystem">\r
       <C_Name>gEfiSimpleFileSystemProtocolGuid</C_Name>\r
-      <Guid>0x964e5b22, 0x6459, 0x11d2, 0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b</Guid>\r
+      <GuidValue>964E5B22-6459-11D2-8E39-00A0C969723B</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="SimpleNetwork">\r
       <C_Name>gEfiSimpleNetworkProtocolGuid</C_Name>\r
-      <Guid>0xA19832B9, 0xAC25, 0x11D3, 0x9A, 0x2D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D</Guid>\r
+      <GuidValue>A19832B9-AC25-11D3-9A2D-0090273FC14D</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="SimplePointer">\r
       <C_Name>gEfiSimplePointerProtocolGuid</C_Name>\r
-      <Guid>0x31878c87, 0x0b75, 0x11d5, 0x9a, 0x4f, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d</Guid>\r
+      <GuidValue>31878C87-0B75-11D5-9A4F-0090273FC14D</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="SimpleTextIn">\r
       <C_Name>gEfiSimpleTextInProtocolGuid</C_Name>\r
-      <Guid>0x387477c1, 0x69c7, 0x11d2, 0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b</Guid>\r
+      <GuidValue>387477C1-69C7-11D2-8E39-00A0C969723B</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="SimpleTextOut">\r
       <C_Name>gEfiSimpleTextOutProtocolGuid</C_Name>\r
-      <Guid>0x387477c2, 0x69c7, 0x11d2, 0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b</Guid>\r
+      <GuidValue>387477C2-69C7-11D2-8E39-00A0C969723B</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="UgaDraw">\r
       <C_Name>gEfiUgaDrawProtocolGuid</C_Name>\r
-      <Guid>0x982c298b, 0xf4fa, 0x41cb, 0xb8, 0x38, 0x77, 0xaa, 0x68, 0x8f, 0xb8, 0x39</Guid>\r
+      <GuidValue>982C298B-F4FA-41CB-B838-77AA688FB839</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="UnicodeCollation">\r
       <C_Name>gEfiUnicodeCollationProtocolGuid</C_Name>\r
-      <Guid>0x1d85cd7f, 0xf43d, 0x11d2, 0x9a, 0x0c, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d</Guid>\r
+      <GuidValue>1D85CD7F-F43D-11D2-9A0C-0090273FC14D</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="UsbHc">\r
       <C_Name>gEfiUsbHcProtocolGuid</C_Name>\r
-      <Guid>0xf5089266, 0x1aa0, 0x4953, 0x97, 0xd8, 0x56, 0x2f, 0x8a, 0x73, 0xb5, 0x19</Guid>\r
+      <GuidValue>F5089266-1AA0-4953-97D8-562F8A73B519</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="PciPlatform">\r
       <C_Name>gEfiPciPlatformProtocolGuid</C_Name>\r
-      <Guid>0x7d75280, 0x27d4, 0x4d69, 0x90, 0xd0, 0x56, 0x43, 0xe2, 0x38, 0xb3, 0x41</Guid>\r
+      <GuidValue>07D75280-27D4-4D69-90D0-5643E238B341</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="IncompatiblePciDeviceSupport">\r
       <C_Name>gEfiIncompatiblePciDeviceSupportProtocolGuid</C_Name>\r
-      <Guid>0xeb23f55a, 0x7863, 0x4ac2, 0x8d, 0x3d, 0x95, 0x65, 0x35, 0xde, 0x03, 0x75</Guid>\r
+      <GuidValue>EB23F55A-7863-4AC2-8D3D-956535DE0375</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="PciHotPlugInit">\r
       <C_Name>gEfiPciHotPlugInitProtocolGuid</C_Name>\r
-      <Guid>0xaa0e8bc1, 0xdabc, 0x46b0, 0xa8, 0x44, 0x37, 0xb8, 0x16, 0x9b, 0x2b, 0xea</Guid>\r
+      <GuidValue>AA0E8BC1-DABC-46B0-A844-37B8169B2BEA</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="PciHostBridgeResourceAllocation">\r
       <C_Name>gEfiPciHostBridgeResourceAllocationProtocolGuid</C_Name>\r
-      <Guid>0xCF8034BE, 0x6768, 0x4d8b, 0xb7, 0x39, 0x7c, 0xce, 0x68, 0x3a, 0x9f, 0xbe</Guid>\r
+      <GuidValue>CF8034BE-6768-4D8B-B739-7CCE683A9FBE</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="IdeControllerInit">\r
       <C_Name>gEfiIdeControllerInitProtocolGuid</C_Name>\r
-      <Guid>0xa1e37052, 0x80d9, 0x4e65, 0xa3, 0x17, 0x3e, 0x9a, 0x55, 0xc4, 0x3e, 0xc9</Guid>\r
+      <GuidValue>A1E37052-80D9-4E65-A317-3E9A55C43EC9</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="UsbIo">\r
       <C_Name>gEfiUsbIoProtocolGuid</C_Name>\r
-      <Guid>0x2B2F68D6, 0x0CD2, 0x44cf, 0x8E, 0x8B, 0xBB, 0xA2, 0x0B, 0x1B, 0x5B, 0x75</Guid>\r
+      <GuidValue>2B2F68D6-0CD2-44CF-8E8B-BBA20B1B5B75</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="Arp">\r
       <C_Name>gEfiArpProtocolGuid</C_Name>\r
-      <Guid>0xf4b427bb, 0xba21, 0x4f16, 0xbc, 0x4e, 0x43, 0xe4, 0x16, 0xab, 0x61, 0x9c</Guid>\r
+      <GuidValue>F4B427BB-BA21-4F16-BC4E-43E416AB619C</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="ArpServiceBinding">\r
       <C_Name>gEfiArpServiceBindingProtocolGuid</C_Name>\r
-      <Guid>0xf44c00ee, 0x1f2c, 0x4a00, 0xaa, 0x09, 0x1c, 0x9f, 0x3e, 0x08, 0x00, 0xa3</Guid>\r
+      <GuidValue>F44C00EE-1F2C-4A00-AA09-1C9F3E0800A3</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="Dhcp4">\r
       <C_Name>gEfiDhcp4ProtocolGuid</C_Name>\r
-      <Guid>0x8a219718, 0x4ef5, 0x4761, 0x91, 0xc8, 0xc0, 0xf0, 0x4b, 0xda, 0x9e, 0x56</Guid>\r
+      <GuidValue>8A219718-4EF5-4761-91C8-C0F04BDA9E56</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="Dhcp4ServiceBinding">\r
       <C_Name>gEfiDhcp4ServiceBindingProtocolGuid</C_Name>\r
-      <Guid>0x9d9a39d8, 0xbd42, 0x4a73, 0xa4, 0xd5, 0x8e, 0xe9, 0x4b, 0xe1, 0x13, 0x80</Guid>\r
+      <GuidValue>9D9A39D8-BD42-4A73-A4D5-8EE94BE11380</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="Ip4">\r
       <C_Name>gEfiIp4ProtocolGuid</C_Name>\r
-      <Guid>0x41d94cd2, 0x35b6, 0x455a, 0x82, 0x58, 0xd4, 0xe5, 0x13, 0x34, 0xaa, 0xdd</Guid>\r
+      <GuidValue>41D94CD2-35B6-455A-8258-D4E51334AADD</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="Ip4ServiceBinding">\r
       <C_Name>gEfiIp4ServiceBindingProtocolGuid</C_Name>\r
-      <Guid>0xc51711e7, 0xb4bf, 0x404a, 0xbf, 0xb8, 0x0a, 0x04, 0x8e, 0xf1, 0xff, 0xe4</Guid>\r
+      <GuidValue>C51711E7-B4BF-404A-BFB8-0A048EF1FFE4</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="Ip4Config">\r
       <C_Name>gEfiIp4ConfigProtocolGuid</C_Name>\r
-      <Guid>0x3b95aa31, 0x3793, 0x434b, 0x86, 0x67, 0xc8, 0x07, 0x08, 0x92, 0xe0, 0x5e</Guid>\r
+      <GuidValue>3B95AA31-3793-434B-8667-C8070892E05E</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="ManagedNetwork">\r
       <C_Name>gEfiManagedNetworkProtocolGuid</C_Name>\r
-      <Guid>0x3b95aa31, 0x3793, 0x434b, 0x86, 0x67, 0xc8, 0x07, 0x08, 0x92, 0xe0, 0x5e</Guid>\r
+      <GuidValue>3B95AA31-3793-434B-8667-C8070892E05E</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="ManagedNetworkServiceBinding">\r
       <C_Name>gEfiManagedNetworkServiceBindingProtocolGuid</C_Name>\r
-      <Guid>0xf36ff770, 0xa7e1, 0x42cf, 0x9e, 0xd2, 0x56, 0xf0, 0xf2, 0x71, 0xf4, 0x4c</Guid>\r
+      <GuidValue>F36FF770-A7E1-42CF-9ED2-56F0F271F44C</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="Mtftp4">\r
       <C_Name>gEfiMtftp4ProtocolGuid</C_Name>\r
-      <Guid>0x3ad9df29, 0x4501, 0x478d, 0xb1, 0xf8, 0x7f, 0x7f, 0xe7, 0x0e, 0x50, 0xf3</Guid>\r
+      <GuidValue>3AD9DF29-4501-478D-B1F8-7F7FE70E50F3</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="Mtftp4ServiceBinding">\r
       <C_Name>gEfiMtftp4ServiceBindingProtocolGuid</C_Name>\r
-      <Guid>0x2FE800BE, 0x8F01, 0x4aa6, 0x94, 0x6B, 0xD7, 0x13, 0x88, 0xE1, 0x83, 0x3F</Guid>\r
+      <GuidValue>2FE800BE-8F01-4AA6-946B-D71388E1833F</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="Tcp4">\r
       <C_Name>gEfiTcp4ProtocolGuid</C_Name>\r
-      <Guid>0x65530BC7, 0xA359, 0x410f, 0xB0, 0x10, 0x5A, 0xAD, 0xC7, 0xEC, 0x2B, 0x62</Guid>\r
+      <GuidValue>65530BC7-A359-410F-B010-5AADC7EC2B62</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="Tcp4ServiceBinding">\r
       <C_Name>gEfiTcp4ServiceBindingProtocolGuid</C_Name>\r
-      <Guid>0x00720665, 0x67EB, 0x4a99, 0xBA, 0xF7, 0xD3, 0xC3, 0x3A, 0x1C, 0x7C, 0xC9</Guid>\r
+      <GuidValue>00720665-67EB-4A99-BAF7-D3C33A1C7CC9</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="Udp4">\r
       <C_Name>gEfiUdp4ProtocolGuid</C_Name>\r
-      <Guid>0x3ad9df29, 0x4501, 0x478d, 0xb1, 0xf8, 0x7f, 0x7f, 0xe7, 0x0e, 0x50, 0xf3</Guid>\r
+      <GuidValue>3AD9DF29-4501-478D-B1F8-7F7FE70E50F3</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="Udp4ServiceBinding">\r
       <C_Name>gEfiUdp4ServiceBindingProtocolGuid</C_Name>\r
-      <Guid>0x83f01464, 0x99bd, 0x45e5, 0xb3, 0x83, 0xaf, 0x63, 0x05, 0xd8, 0xe9, 0xe6</Guid>\r
+      <GuidValue>83F01464-99BD-45E5-B383-AF6305D8E9E6</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="AuthenticationInfo">\r
       <C_Name>gEfiAuthenticationInfoProtocolGuid</C_Name>\r
-      <Guid>0x7671d9d0, 0x53db, 0x4173, 0xaa, 0x69, 0x23, 0x27, 0xf2, 0x1f, 0x0b, 0xc7</Guid>\r
+      <GuidValue>7671D9D0-53DB-4173-AA69-2327F21F0BC7</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="DevicePathFromText">\r
       <C_Name>gEfiDevicePathFromTextProtocolGuid</C_Name>\r
-      <Guid>0x5c99a21, 0xc70f, 0x4ad2, 0x8a, 0x5f, 0x35, 0xdf, 0x33, 0x43, 0xf5, 0x1e</Guid>\r
+      <GuidValue>05C99A21-C70F-4AD2-8A5F-35DF3343F51E</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="DevicePathToText">\r
       <C_Name>gEfiDevicePathToTextProtocolGuid</C_Name>\r
-      <Guid>0x8b843e20, 0x8132, 0x4852, 0x90, 0xcc, 0x55, 0x1a, 0x4e, 0x4a, 0x7f, 0x1c</Guid>\r
+      <GuidValue>8B843E20-8132-4852-90CC-551A4E4A7F1C</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="DevicePathUtilities">\r
       <C_Name>gEfiDevicePathUtilitiesProtocolGuid</C_Name>\r
-      <Guid>0x379be4e, 0xd706, 0x437d, 0xb0, 0x37, 0xed, 0xb8, 0x2f, 0xb7, 0x72, 0xa4</Guid>\r
+      <GuidValue>0379BE4E-D706-437D-B037-EDB82FB772A4</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="EdidActive">\r
       <C_Name>gEfiEdidActiveProtocolGuid</C_Name>\r
-      <Guid>0xbd8c1056, 0x9f36, 0x44ec, 0x92, 0xa8, 0xa6, 0x33, 0x7f, 0x81, 0x79, 0x86</Guid>\r
+      <GuidValue>BD8C1056-9F36-44EC-92A8-A6337F817986</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="EdidDiscovered">\r
       <C_Name>gEfiEdidDiscoveredProtocolGuid</C_Name>\r
-      <Guid>0x1c0c34f6, 0xd380, 0x41fa, 0xa0, 0x49, 0x8a, 0xd0, 0x6c, 0x1a, 0x66, 0xaa</Guid>\r
+      <GuidValue>1C0C34F6-D380-41FA-A049-8AD06C1A66AA</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="EdidOverride">\r
       <C_Name>gEfiEdidOverrideProtocolGuid</C_Name>\r
-      <Guid>0x48ecb431, 0xfb72, 0x45c0, 0xa9, 0x22, 0xf4, 0x58, 0xfe, 0x04, 0x0b, 0xd5</Guid>\r
+      <GuidValue>48ECB431-FB72-45C0-A922-F458FE040BD5</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="GraphicsOutput">\r
       <C_Name>gEfiGraphicsOutputProtocolGuid</C_Name>\r
-      <Guid>0x9042a9de, 0x23dc, 0x4a38, 0x96, 0xfb, 0x7a, 0xde, 0xd0, 0x80, 0x51, 0x6a</Guid>\r
+      <GuidValue>9042A9DE-23DC-4A38-96FB-7ADED080516A</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="Hash">\r
       <C_Name>gEfiHashProtocolGuid</C_Name>\r
-      <Guid>0xc5184932, 0xdba5, 0x46db, 0xa5, 0xba, 0xcc, 0x0b, 0xda, 0x9c, 0x14, 0x35</Guid>\r
+      <GuidValue>C5184932-DBA5-46DB-A5BA-CC0BDA9C1435</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="HashServiceBinding">\r
       <C_Name>gEfiHashServiceBindingProtocolGuid</C_Name>\r
-      <Guid>0x42881c98, 0xa4f3, 0x44b0, 0xa3, 0x9d, 0xdf, 0xa1, 0x86, 0x67, 0xd8, 0xcd</Guid>\r
+      <GuidValue>42881C98-A4F3-44B0-A39D-DFA18667D8CD</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="IScsiInitiatorName">\r
       <C_Name>gEfiIScsiInitiatorNameProtocolGuid</C_Name>\r
-      <Guid>0xa6a72875, 0x2962, 0x4c18, 0x9f, 0x46, 0x8d, 0xa6, 0x44, 0xcc, 0xfe, 0x00</Guid>\r
+      <GuidValue>A6A72875-2962-4C18-9F46-8DA644CCFE00</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
-    <Entry Name="ScsiIo">\r
+    <Entry Name="ScsiIoExt">\r
       <C_Name>gEfiScsiIoProtocolGuid</C_Name>\r
-      <Guid>0x932f4736, 0x2362, 0x4002, 0x80, 0x3e, 0x3c, 0xd5, 0x4b, 0x13, 0x8f, 0x85</Guid>\r
+      <GuidValue>932F4736-2362-4002-803E-3CD54B138F85</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="ExtScsiPassThru">\r
       <C_Name>gEfiExtScsiPassThruProtocolGuid</C_Name>\r
-      <Guid>0x1d3de7f0, 0x0807, 0x424f, 0xaa, 0x69, 0x11, 0xa5, 0x4e, 0x19, 0xa4, 0x6f</Guid>\r
+      <GuidValue>1D3DE7F0-0807-424F-AA69-11A54E19A46F</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="TapeIo">\r
       <C_Name>gEfiTapeIoProtocolGuid</C_Name>\r
-      <Guid>0x1e93e633, 0xd65a, 0x459e, 0xab, 0x84, 0x93, 0xd9, 0xec, 0x26, 0x6d, 0x18</Guid>\r
+      <GuidValue>1E93E633-D65A-459E-AB84-93D9EC266D18</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="Usb2Hc">\r
       <C_Name>gEfiUsb2HcProtocolGuid</C_Name>\r
-      <Guid>0x3e745226, 0x9818, 0x45b6, 0xa2, 0xac, 0xd7, 0xcd, 0x0e, 0x8b, 0xa2, 0xbc</Guid>\r
+      <GuidValue>3E745226-9818-45B6-A2AC-D7CD0E8BA2BC</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="SecurityPolicy">\r
       <C_Name>gEfiSecurityPolicyProtocolGuid</C_Name>\r
-      <Guid>0x78E4D245, 0xCD4D, 0x4a05, 0xA2, 0xBA, 0x47, 0x43, 0xE8, 0x6C, 0xFC, 0xAB</Guid>\r
+      <GuidValue>78E4D245-CD4D-4A05-A2BA-4743E86CFCAB</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="AcpiSupport">\r
       <C_Name>gEfiAcpiSupportProtocolGuid</C_Name>\r
-      <Guid>0xdbff9d55, 0x89b7, 0x46da, 0xbd, 0xdf, 0x67, 0x7d, 0x3d, 0xc0, 0x24, 0x1d</Guid>\r
+      <GuidValue>DBFF9D55-89B7-46DA-BDDF-677D3DC0241D</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="BootScriptSave">\r
       <C_Name>gEfiBootScriptSaveProtocolGuid</C_Name>\r
-      <Guid>0x470e1529, 0xb79e, 0x4e32, 0xa0, 0xfe, 0x6a, 0x15, 0x6d, 0x29, 0xf9, 0xb2</Guid>\r
+      <GuidValue>470E1529-B79E-4E32-A0FE-6A156D29F9B2</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="Smbus">\r
       <C_Name>gEfiSmbusProtocolGuid</C_Name>\r
-      <Guid>0xe49d33ed, 0x513d, 0x4634, 0xb6, 0x98, 0x6f, 0x55, 0xaa, 0x75, 0x1c, 0x1b</Guid>\r
+      <GuidValue>E49D33ED-513D-4634-B698-6F55AA751C1B</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="LegacyBios">\r
       <C_Name>gEfiLegacyBiosProtocolGuid</C_Name>\r
-      <Guid>0xdb9a1e3d, 0x45cb, 0x4abb, 0x85, 0x3b, 0xe5, 0x38, 0x7f, 0xdb, 0x2e, 0x2d</Guid>\r
+      <GuidValue>DB9A1E3D-45CB-4ABB-853B-E5387FDB2E2D</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="Legacy8259">\r
       <C_Name>gEfiLegacy8259ProtocolGuid</C_Name>\r
-      <Guid>0x38321dba, 0x4fe0, 0x4e17, 0x8a, 0xec, 0x41, 0x30, 0x55, 0xea, 0xed, 0xc1</Guid>\r
+      <GuidValue>38321DBA-4FE0-4E17-8AEC-413055EAEDC1</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="LegacyBiosPlatform">\r
       <C_Name>gEfiLegacyBiosPlatformProtocolGuid</C_Name>\r
-      <Guid>0x783658a3, 0x4172, 0x4421, 0xa2, 0x99, 0xe0, 0x09, 0x07, 0x9c, 0x0c, 0xb4</Guid>\r
+      <GuidValue>783658A3-4172-4421-A299-E009079C0CB4</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="LegacyInterrupt">\r
       <C_Name>gEfiLegacyInterruptProtocolGuid</C_Name>\r
-      <Guid>0x31ce593d, 0x108a, 0x485d, 0xad, 0xb2, 0x78, 0xf2, 0x1f, 0x29, 0x66, 0xbe</Guid>\r
+      <GuidValue>31CE593D-108A-485D-ADB2-78F21F2966BE</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="LegacyRegion">\r
       <C_Name>gEfiLegacyRegionProtocolGuid</C_Name>\r
-      <Guid>0xfc9013a, 0x0568, 0x4ba9, 0x9b, 0x7e, 0xc9, 0xc3, 0x90, 0xa6, 0x60, 0x9b</Guid>\r
+      <GuidValue>0FC9013A-0568-4BA9-9B7E-C9C390A6609B</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="SmmAccess">\r
       <C_Name>gEfiSmmAccessProtocolGuid</C_Name>\r
-      <Guid>0x3792095a, 0xe309, 0x4c1e, 0xaa, 0x01, 0x85, 0xf5, 0x65, 0x5a, 0x17, 0xf1</Guid>\r
+      <GuidValue>3792095A-E309-4C1E-AA01-85F5655A17F1</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="SmmBase">\r
       <C_Name>gEfiSmmBaseProtocolGuid</C_Name>\r
-      <Guid>0x1390954D, 0xda95, 0x4227, 0x93, 0x28, 0x72, 0x82, 0xc2, 0x17, 0xda, 0xa8</Guid>\r
+      <GuidValue>1390954D-DA95-4227-9328-7282C217DAA8</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="SmmControl">\r
       <C_Name>gEfiSmmControlProtocolGuid</C_Name>\r
-      <Guid>0x8d12e231, 0xc667, 0x4fd1, 0x98, 0xf2, 0x24, 0x49, 0xa7, 0xe7, 0xb2, 0xe5</Guid>\r
+      <GuidValue>8D12E231-C667-4FD1-98F2-2449A7E7B2E5</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="SmmGpiDispatch">\r
       <C_Name>gEfiSmmGpiDispatchProtocolGuid</C_Name>\r
-      <Guid>0xe0744b81, 0x9513, 0x49cd, 0x8c, 0xea, 0xe9, 0x24, 0x5e, 0x70, 0x39, 0xda</Guid>\r
+      <GuidValue>E0744B81-9513-49CD-8CEA-E9245E7039DA</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="SmmIchnDispatch">\r
       <C_Name>gEfiSmmIchnDispatchProtocolGuid</C_Name>\r
-      <Guid>0xc50b323e, 0x9075, 0x4f2a, 0xac, 0x8e, 0xd2, 0x59, 0x6a, 0x10, 0x85, 0xcc</Guid>\r
+      <GuidValue>C50B323E-9075-4F2A-AC8E-D2596A1085CC</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="SmmPeriodicTimerDispatch">\r
       <C_Name>gEfiSmmPeriodicTimerDispatchProtocolGuid</C_Name>\r
-      <Guid>0x9cca03fc, 0x4c9e, 0x4a19, 0x9b, 0x06, 0xed, 0x7b, 0x47, 0x9b, 0xde, 0x55</Guid>\r
+      <GuidValue>9CCA03FC-4C9E-4A19-9B06-ED7B479BDE55</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="SmmPowerButtonDispatch">\r
       <C_Name>gEfiSmmPowerButtonDispatchProtocolGuid</C_Name>\r
-      <Guid>0xb709efa0, 0x47a6, 0x4b41, 0xb9, 0x31, 0x12, 0xec, 0xe7, 0xa8, 0xee, 0x56</Guid>\r
+      <GuidValue>B709EFA0-47A6-4B41-B931-12ECE7A8EE56</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="SmmStandbyButtonDispatch">\r
       <C_Name>gEfiSmmStandbyButtonDispatchProtocolGuid</C_Name>\r
-      <Guid>0x78965b98, 0xb0bf, 0x449e, 0x8b, 0x22, 0xd2, 0x91, 0x4e, 0x49, 0x8a, 0x98</Guid>\r
+      <GuidValue>78965B98-B0BF-449E-8B22-D2914E498A98</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="SmmStatusCode">\r
       <C_Name>gEfiSmmStatusCodeProtocolGuid</C_Name>\r
-      <Guid>0x6afd2b77, 0x98c1, 0x4acd, 0xa6, 0xf9, 0x8a, 0x94, 0x39, 0xde, 0x0f, 0xb1</Guid>\r
+      <GuidValue>6AFD2B77-98C1-4ACD-A6F9-8A9439DE0FB1</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="SmmSwDispatch">\r
       <C_Name>gEfiSmmSwDispatchProtocolGuid</C_Name>\r
-      <Guid>0xe541b773, 0xdd11, 0x420c, 0xb0, 0x26, 0xdf, 0x99, 0x36, 0x53, 0xf8, 0xbf</Guid>\r
+      <GuidValue>E541B773-DD11-420C-B026-DF993653F8BF</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="SmmSxDispatch">\r
       <C_Name>gEfiSmmSxDispatchProtocolGuid</C_Name>\r
-      <Guid>0x14fc52be, 0x01dc, 0x426c, 0x91, 0xae, 0xa2, 0x3c, 0x3e, 0x22, 0x0a, 0xe8</Guid>\r
+      <GuidValue>14FC52BE-01DC-426C-91AE-A23C3E220AE8</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="SmmUsbDispatch">\r
       <C_Name>gEfiSmmUsbDispatchProtocolGuid</C_Name>\r
-      <Guid>0xa05b6ffd, 0x87af, 0x4e42, 0x95, 0xc9, 0x62, 0x28, 0xb6, 0x3c, 0xf3, 0xf3</Guid>\r
+      <GuidValue>A05B6FFD-87AF-4E42-95C9-6228B63CF3F3</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="DeviceIo">\r
       <C_Name>gEfiDeviceIoProtocolGuid</C_Name>\r
-      <Guid>0xaf6ac311, 0x84c3, 0x11d2, 0x8e, 0x3c, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b</Guid>\r
+      <GuidValue>AF6AC311-84C3-11D2-8E3C-00A0C969723B</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
   </ProtocolDeclarations>\r
   <PpiDeclarations>\r
     <Entry Name="BootInRecoveryMode">\r
       <C_Name>gEfiPeiBootInRecoveryModePpiGuid</C_Name>\r
-      <Guid>0x17ee496a, 0xd8e4, 0x4b9a, 0x94, 0xd1, 0xce, 0x82, 0x72, 0x30, 0x08, 0x50</Guid>\r
+      <GuidValue>17EE496A-D8E4-4B9A-94D1-CE8272300850</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="CpuIo">\r
       <C_Name>gEfiPeiCpuIoPpiInServiceTableGuid</C_Name>\r
-      <Guid>0xe6af1f7b, 0xfc3f, 0x46da, 0xa8, 0x28, 0xa3, 0xb4, 0x57, 0xa4, 0x42, 0x82</Guid>\r
+      <GuidValue>E6AF1F7B-FC3F-46DA-A828-A3B457A44282</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="DxeIpl">\r
       <C_Name>gEfiDxeIplPpiGuid</C_Name>\r
-      <Guid>0xae8ce5d, 0xe448, 0x4437, 0xa8, 0xd7, 0xeb, 0xf5, 0xf1, 0x94, 0xf7, 0x31</Guid>\r
+      <GuidValue>0AE8CE5D-E448-4437-A8D7-EBF5F194F731</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="EndOfPeiSignal">\r
       <C_Name>gEfiEndOfPeiSignalPpiGuid</C_Name>\r
-      <Guid>0x605EA650, 0xC65C, 0x42e1, 0xBA, 0x80, 0x91, 0xA5, 0x2A, 0xB6, 0x18, 0xC6</Guid>\r
+      <GuidValue>605EA650-C65C-42E1-BA80-91A52AB618C6</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="FindFv">\r
       <C_Name>gEfiFindFvPpiGuid</C_Name>\r
-      <Guid>0x36164812, 0xa023, 0x44e5, 0xbd, 0x85, 0x05, 0xbf, 0x3c, 0x77, 0x00, 0xaa</Guid>\r
+      <GuidValue>36164812-A023-44E5-BD85-05BF3C7700AA</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="FvFileLoader">\r
       <C_Name>gEfiPeiFvFileLoaderPpiGuid</C_Name>\r
-      <Guid>0x7e1f0d85, 0x04ff, 0x4bb2, 0x86, 0x6a, 0x31, 0xa2, 0x99, 0x6a, 0x48, 0xa8</Guid>\r
+      <GuidValue>7E1F0D85-04FF-4BB2-866A-31A2996A48A8</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="MasterBootMode">\r
       <C_Name>gEfiPeiMasterBootModePpiGuid</C_Name>\r
-      <Guid>0x7408d748, 0xfc8c, 0x4ee6, 0x92, 0x88, 0xc4, 0xbe, 0xc0, 0x92, 0xa4, 0x10</Guid>\r
+      <GuidValue>7408D748-FC8C-4EE6-9288-C4BEC092A410</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="MemoryDiscovered">\r
       <C_Name>gEfiPeiMemoryDiscoveredPpiGuid</C_Name>\r
-      <Guid>0xf894643d, 0xc449, 0x42d1, 0x8e, 0xa8, 0x85, 0xbd, 0xd8, 0xc6, 0x5b, 0xde</Guid>\r
+      <GuidValue>F894643D-C449-42D1-8EA8-85BDD8C65BDE</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="PciCfg">\r
       <C_Name>gEfiPciCfgPpiInServiceTableGuid</C_Name>\r
-      <Guid>0xe1f2eba0, 0xf7b9, 0x4a26, 0x86, 0x20, 0x13, 0x12, 0x21, 0x64, 0x2a, 0x90</Guid>\r
+      <GuidValue>E1F2EBA0-F7B9-4A26-8620-131221642A90</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="ReadOnlyVariable">\r
       <C_Name>gEfiPeiReadOnlyVariablePpiGuid</C_Name>\r
-      <Guid>0x3cdc90c6, 0x13fb, 0x4a75, 0x9e, 0x79, 0x59, 0xe9, 0xdd, 0x78, 0xb9, 0xfa</Guid>\r
+      <GuidValue>3CDC90C6-13FB-4A75-9E79-59E9DD78B9FA</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="RecoveryModule">\r
       <C_Name>gEfiPeiRecoveryModulePpiGuid</C_Name>\r
-      <Guid>0xFB6D9542, 0x612D, 0x4f45, 0x87, 0x2F, 0x5C, 0xFF, 0x52, 0xE9, 0x3D, 0xCF</Guid>\r
+      <GuidValue>FB6D9542-612D-4F45-872F-5CFF52E93DCF</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="Reset">\r
       <C_Name>gEfiPeiResetPpiGuid</C_Name>\r
-      <Guid>0xef398d58, 0x9dfd, 0x4103, 0xbf, 0x94, 0x78, 0xc6, 0xf4, 0xfe, 0x71, 0x2f</Guid>\r
+      <GuidValue>EF398D58-9DFD-4103-BF94-78C6F4FE712F</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="S3Resume">\r
       <C_Name>gEfiPeiS3ResumePpiGuid</C_Name>\r
-      <Guid>0x4426CCB2, 0xE684, 0x4a8a, 0xAE, 0x40, 0x20, 0xD4, 0xB0, 0x25, 0xB7, 0x10</Guid>\r
+      <GuidValue>4426CCB2-E684-4A8A-AE40-20D4B025B710</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="SecPlatformInformation">\r
       <C_Name>gEfiSecPlatformInformationPpiGuid</C_Name>\r
-      <Guid>0x6f8c2b35, 0xfef4, 0x448d, 0x82, 0x56, 0xe1, 0x1b, 0x19, 0xd6, 0x10, 0x77</Guid>\r
+      <GuidValue>6F8C2B35-FEF4-448D-8256-E11B19D61077</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="SectionExtraction">\r
       <C_Name>gEfiPeiSectionExtractionPpiGuid</C_Name>\r
-      <Guid>0x4F89E208, 0xE144, 0x4804, 0x9E, 0xC8, 0x0F, 0x89, 0x4F, 0x7E, 0x36, 0xD7</Guid>\r
+      <GuidValue>4F89E208-E144-4804-9EC8-0F894F7E36D7</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="Security">\r
       <C_Name>gEfiPeiSecurityPpiGuid</C_Name>\r
-      <Guid>0x1388066e, 0x3a57, 0x4efa, 0x98, 0xf3, 0xc1, 0x2f, 0x3a, 0x95, 0x8a, 0x29</Guid>\r
+      <GuidValue>1388066E-3A57-4EFA-98F3-C12F3A958A29</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="StatusCode">\r
       <C_Name>gEfiPeiStatusCodePpiGuid</C_Name>\r
-      <Guid>0x229832d3, 0x7a30, 0x4b36, 0xb8, 0x27, 0xf4, 0x0c, 0xb7, 0xd4, 0x54, 0x36</Guid>\r
+      <GuidValue>229832D3-7A30-4B36-B827-F40CB7D45436</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
-    <Entry Name="Pcd">\r
+    <Entry Name="PcdPpi">\r
       <C_Name>gPcdPpiGuid</C_Name>\r
-      <Guid>0x5d5c0e21, 0x749c, 0x4063, 0x81, 0xaf, 0xbc, 0x74, 0xfc, 0x79, 0xab, 0x5c</Guid>\r
+      <GuidValue>06E81C58-4AD7-44BC-8390-F10265F72480</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="BootScriptExecuter">\r
       <C_Name>gEfiPeiBootScriptExecuterPpiGuid</C_Name>\r
-      <Guid>0xabd42895, 0x78cf, 0x4872, 0x84, 0x44, 0x1b, 0x5c, 0x18, 0x0b, 0xfb, 0xff</Guid>\r
+      <GuidValue>ABD42895-78CF-4872-8444-1B5C180BFBFF</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="Smbus">\r
       <C_Name>gEfiPeiSmbusPpiGuid</C_Name>\r
-      <Guid>0xabd42895, 0x78cf, 0x4872, 0x84, 0x44, 0x1b, 0x5c, 0x18, 0x0b, 0xfb, 0xda</Guid>\r
+      <GuidValue>ABD42895-78CF-4872-8444-1B5C180BFBDA</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="BlockIo">\r
       <C_Name>gEfiPeiBlockIoPpiGuid</C_Name>\r
-      <Guid>0x695d8aa1, 0x42ee, 0x4c46, 0x80, 0x5c, 0x6e, 0xa6, 0xbc, 0xe7, 0x99, 0xe3</Guid>\r
+      <GuidValue>695D8AA1-42EE-4C46-805C-6EA6BCE799E3</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="DeviceRecoveryModule">\r
       <C_Name>gEfiPeiDeviceRecoveryModulePpiGuid</C_Name>\r
-      <Guid>0x0DE2CE25, 0x446A, 0x45a7, 0xBF, 0xC9, 0x37, 0xDA, 0x26, 0x34, 0x4B, 0x37</Guid>\r
+      <GuidValue>0DE2CE25-446A-45A7-BFC9-37DA26344B37</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
     <Entry Name="Stall">\r
       <C_Name>gEfiPeiStallPpiGuid</C_Name>\r
-      <Guid>0x1f4c6f90, 0xb06b, 0x48d8, 0xa2, 0x01, 0xba, 0xe5, 0xf1, 0xcd, 0x7d, 0x56</Guid>\r
+      <GuidValue>1F4C6F90-B06B-48D8-A201-BAE5F1CD7D56</GuidValue>\r
+      <HelpText/>\r
     </Entry>\r
   </PpiDeclarations>\r
-  <PcdDefinitions>\r
-    <PcdEntry ItemType="FIXED_AT_BUILD">\r
+  <PcdDeclarations>\r
+    <PcdEntry>\r
       <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
       <Token>0x00000001</Token>\r
+      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <DatumType>UINT32</DatumType>\r
+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>\r
       <DefaultValue>1000000</DefaultValue>\r
+      <HelpText>If PcdMaximumUnicodeStringLength is not zero, the maximum\r
+                number of characters (not counting the NULL-terminator) in a\r
+                Unicode string cannot exceed it.</HelpText>\r
     </PcdEntry>\r
-    <PcdEntry ItemType="FIXED_AT_BUILD">\r
+    <PcdEntry>\r
       <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
       <Token>0x00000002</Token>\r
+      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <DatumType>UINT32</DatumType>\r
+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>\r
       <DefaultValue>1000000</DefaultValue>\r
+      <HelpText>If PcdMaximumAsciiStringLength is not zero, the maximum number\r
+                of characters (not counting the NULL-terminator) in an ASCII\r
+                string cannot exceed it.</HelpText>\r
     </PcdEntry>\r
-    <PcdEntry ItemType="FIXED_AT_BUILD">\r
+    <PcdEntry>\r
       <C_Name>PcdMaximumLinkedListLength</C_Name>\r
       <Token>0x00000003</Token>\r
+      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <DatumType>UINT32</DatumType>\r
+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>\r
       <DefaultValue>1000000</DefaultValue>\r
+      <HelpText>If PcdMaximumLinkedListLength is not zero, the maximum number\r
+                of nodes (not counting the list header) in a linked list\r
+                cannot exceed it.</HelpText>\r
     </PcdEntry>\r
-    <PcdEntry ItemType="FIXED_AT_BUILD">\r
+    <PcdEntry>\r
       <C_Name>PcdSpinLockTimeout</C_Name>\r
       <Token>0x00000004</Token>\r
+      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <DatumType>UINT32</DatumType>\r
+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>\r
       <DefaultValue>10000000</DefaultValue>\r
+      <HelpText>If PcdSpinLockTimeout is not zero, it stands for the timeout\r
+                value (unit: millisecond) for spin lock.</HelpText>\r
     </PcdEntry>\r
-    <PcdEntry ItemType="FIXED_AT_BUILD">\r
+    <PcdEntry>\r
       <C_Name>PcdDebugPropertyMask</C_Name>\r
       <Token>0x00000005</Token>\r
+      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <DatumType>UINT8</DatumType>\r
-      <DefaultValue>0</DefaultValue>\r
+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>\r
+      <DefaultValue>0x0f</DefaultValue>\r
+      <HelpText>The bitmask of flags that specify the enable/disable of Debug\r
+                Assert, Debug Print, Debug Code, Clear Memory, Assert\r
+                Breakpoint and Assert Deadloop.</HelpText>\r
     </PcdEntry>\r
-    <PcdEntry ItemType="PATCHABLE_IN_MODULE">\r
+    <PcdEntry>\r
       <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
       <Token>0x00000006</Token>\r
+      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <DatumType>UINT32</DatumType>\r
+      <ValidUsage>PATCHABLE_IN_MODULE</ValidUsage>\r
       <DefaultValue>0x80000000</DefaultValue>\r
+      <HelpText>The bitmask of flags that specify the kind of debug message\r
+                output when Debug Print is enabled.</HelpText>\r
     </PcdEntry>\r
-    <PcdEntry ItemType="FIXED_AT_BUILD">\r
+    <PcdEntry>\r
       <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
       <Token>0x00000007</Token>\r
+      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <DatumType>UINT8</DatumType>\r
-      <DefaultValue>0</DefaultValue>\r
+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>\r
+      <DefaultValue>0x06</DefaultValue>\r
+      <HelpText>The bitmask of flags that specify the enable/disable of\r
+                Progress Code, Error Code and Debug Code.</HelpText>\r
     </PcdEntry>\r
-    <PcdEntry ItemType="FIXED_AT_BUILD">\r
+    <PcdEntry>\r
       <C_Name>PcdDebugClearMemoryValue</C_Name>\r
       <Token>0x00000008</Token>\r
+      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <DatumType>UINT8</DatumType>\r
+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>\r
       <DefaultValue>0xAF</DefaultValue>\r
+      <HelpText>The value used by DebugClearMemory () to fill a certain range\r
+                of memory.</HelpText>\r
     </PcdEntry>\r
-    <PcdEntry ItemType="FIXED_AT_BUILD">\r
+    <PcdEntry>\r
       <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
       <Token>0x00000009</Token>\r
+      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <DatumType>UINT8</DatumType>\r
-      <DefaultValue>0x0</DefaultValue>\r
+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>\r
+      <DefaultValue>0</DefaultValue>\r
+      <HelpText>The bitmask of flags that specify the enable/disable of\r
+                Performance Measurement.</HelpText>\r
+    </PcdEntry>\r
+    <PcdEntry>\r
+      <C_Name>PcdPostCodePropertyMask</C_Name>\r
+      <Token>0x0000000b</Token>\r
+      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+      <DatumType>UINT8</DatumType>\r
+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>\r
+      <DefaultValue>0</DefaultValue>\r
+      <HelpText>The bitmask of flags that specify the enable/disable of Post\r
+                Code, Post Code Description.</HelpText>\r
+    </PcdEntry>\r
+    <PcdEntry>\r
+      <C_Name>PcdPciExpressBaseAddress</C_Name>\r
+      <Token>0x0000000a</Token>\r
+      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+      <DatumType>UINT64</DatumType>\r
+      <ValidUsage>FIXED_AT_BUILD PATCHABLE_IN_MODULE</ValidUsage>\r
+      <DefaultValue>0xE0000000</DefaultValue>\r
+      <HelpText>The base address of PCI Express MMIO window.</HelpText>\r
     </PcdEntry>\r
-  </PcdDefinitions>\r
-</PackageSurfaceArea>\r
+  </PcdDeclarations>\r
+</PackageSurfaceArea>
\ No newline at end of file