X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=EdkModulePkg%2FCore%2FDxe%2FDxeMain.msa;h=8d0c48425fa243edd1baebc0d2a4fcd01a498bef;hp=d2a7f66746221e223a93dd8bd3286192f4eb2ce3;hb=6b039a51452527f35520922b40dd4226243d3f94;hpb=1f86f0814aadbb8cedf6747fabc43ed163bff524

diff --git a/EdkModulePkg/Core/Dxe/DxeMain.msa b/EdkModulePkg/Core/Dxe/DxeMain.msa
index d2a7f66746..8d0c48425f 100644
--- a/EdkModulePkg/Core/Dxe/DxeMain.msa
+++ b/EdkModulePkg/Core/Dxe/DxeMain.msa
@@ -1,21 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--Copyright (c) 2006, Intel Corporation
-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.-->
-<ModuleSurfaceArea xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd" xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0" encoding="UTF-8"?>
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
   <MsaHeader>
     <ModuleName>DxeMain</ModuleName>
     <ModuleType>DXE_CORE</ModuleType>
     <GuidValue>D6A2CB7F-6A18-4e2f-B43B-9920A733700A</GuidValue>
     <Version>1.0</Version>
-    <Abstract>Component description file for DxeMain.</Abstract>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
+    <Abstract>Component description file for DxeMain module.</Abstract>
+    <Description>This module provide an DXE CIS compliant implementation.</Description>
+    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
     <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>
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </MsaHeader>
@@ -107,138 +99,141 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </SourceFiles>
   <PackageDependencies>
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="SOMETIMES_CONSUMED">
-      <ProtocolCName>Ebc</ProtocolCName>
+      <ProtocolCName>gEfiEbcProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>LoadedImage</ProtocolCName>
+      <ProtocolCName>gEfiLoadedImageProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>DevicePath</ProtocolCName>
+      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>Cpu</ProtocolCName>
+      <ProtocolCName>gEfiCpuArchProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>FirmwareVolume</ProtocolCName>
+      <ProtocolCName>gEfiFirmwareVolumeProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>FirmwareVolumeDispatch</ProtocolCName>
+      <ProtocolCName>gEfiFirmwareVolumeDispatchProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>FirmwareVolumeBlock</ProtocolCName>
+      <ProtocolCName>gEfiFirmwareVolumeBlockProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>SectionExtraction</ProtocolCName>
+      <ProtocolCName>gEfiSectionExtractionProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="SOMETIMES_CONSUMED">
-      <ProtocolCName>DriverBinding</ProtocolCName>
+      <ProtocolCName>gEfiDriverBindingProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>PlatformDriverOverride</ProtocolCName>
+      <ProtocolCName>gEfiPlatformDriverOverrideProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>BusSpecificDriverOverride</ProtocolCName>
+      <ProtocolCName>gEfiBusSpecificDriverOverrideProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>Timer</ProtocolCName>
+      <ProtocolCName>gEfiTimerArchProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>Metronome</ProtocolCName>
+      <ProtocolCName>gEfiMetronomeArchProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>MonotonicCounter</ProtocolCName>
+      <ProtocolCName>gEfiMonotonicCounterArchProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>VariableWrite</ProtocolCName>
+      <ProtocolCName>gEfiVariableWriteArchProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>Bds</ProtocolCName>
+      <ProtocolCName>gEfiBdsArchProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>Variable</ProtocolCName>
+      <ProtocolCName>gEfiVariableArchProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>Security</ProtocolCName>
+      <ProtocolCName>gEfiSecurityArchProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>WatchdogTimer</ProtocolCName>
+      <ProtocolCName>gEfiWatchdogTimerArchProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>Runtime</ProtocolCName>
+      <ProtocolCName>gEfiRuntimeArchProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>RealTimeClock</ProtocolCName>
+      <ProtocolCName>gEfiRealTimeClockArchProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>Reset</ProtocolCName>
+      <ProtocolCName>gEfiResetArchProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>LoadFile</ProtocolCName>
+      <ProtocolCName>gEfiLoadFileProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>SimpleFileSystem</ProtocolCName>
+      <ProtocolCName>gEfiSimpleFileSystemProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>LoadPeImage</ProtocolCName>
+      <ProtocolCName>gEfiLoadPeImageProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>Decompress</ProtocolCName>
+      <ProtocolCName>gEfiDecompressProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>CustomizedDecompress</ProtocolCName>
+      <ProtocolCName>gEfiCustomizedDecompressProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>TianoDecompress</ProtocolCName>
+      <ProtocolCName>gEfiTianoDecompressProtocolGuid</ProtocolCName>
+    </Protocol>
+    <Protocol Usage="ALWAYS_CONSUMED">
+      <ProtocolCName>gEfiCapsuleArchProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Guids>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>MemoryTypeInformation</GuidCName>
+      <GuidCName>gEfiMemoryTypeInformationGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>DxeServicesTable</GuidCName>
+      <GuidCName>gEfiDxeServicesTableGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>HobList</GuidCName>
+      <GuidCName>gEfiHobListGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>DebugImageInfoTable</GuidCName>
+      <GuidCName>gEfiDebugImageInfoTableGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>Apriori</GuidCName>
+      <GuidCName>gAprioriGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>FirmwareFileSystem</GuidCName>
+      <GuidCName>gEfiFirmwareFileSystemGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>FileInfo</GuidCName>
+      <GuidCName>gEfiFileInfoGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>HobMemoryAllocModule</GuidCName>
+      <GuidCName>gEfiHobMemoryAllocModuleGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>PeiPeCoffLoader</GuidCName>
+      <GuidCName>gEfiPeiPeCoffLoaderGuid</GuidCName>
     </GuidCNames>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
+    <!--<GuidCNames Usage="ALWAYS_CONSUMED">
       <GuidCName>LoadPeImage</GuidCName>
-    </GuidCNames>
+    </GuidCNames>-->
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>EventExitBootServices</GuidCName>
+      <GuidCName>gEfiEventExitBootServicesGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>EventVirtualAddressChange</GuidCName>
+      <GuidCName>gEfiEventVirtualAddressChangeGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>EventMemoryMapChange</GuidCName>
+      <GuidCName>gEfiEventMemoryMapChangeGuid</GuidCName>
     </GuidCNames>
   </Guids>
   <Externs>
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>
+    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
     <Extern>
       <ModuleEntryPoint>DxeMain</ModuleEntryPoint>
     </Extern>