X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=EdkNt32Pkg%2FDxe%2FWinNtThunk%2FCpu%2FCpu.msa;h=f0f22f9540cfa26e246794e0341a18ea94b5b6cd;hp=b7d252f96f25ef7c35fa3e6320b4f6c05385d13f;hb=5d01b0f7046dc698e66019d78c9143f0f3702382;hpb=2d52720093851dcc3f0ffd30ac9854cc775300a9

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.msa
index b7d252f96f..f0f22f9540 100644
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.msa
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.msa
@@ -1,47 +1,33 @@
 <?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">
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <MsaHeader>
     <ModuleName>Cpu</ModuleName>
     <ModuleType>DXE_DRIVER</ModuleType>
     <GuidValue>ee993080-5197-4d4e-b63c-f1f7413e33ce</GuidValue>
     <Version>1.0</Version>
     <Abstract>Component description file for Cpu module.</Abstract>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2004-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,
+    <Description>This CPU module abstracts the interrupt subsystem of a platform and the CPU-specific setjump-long pair.</Description>
+    <Copyright>Copyright (c) 2006 - 2007, 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>
   <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
+    <SupportedArchitectures>IA32</SupportedArchitectures>
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>Cpu</OutputFileBasename>
   </ModuleDefinitions>
   <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
     <LibraryClass Usage="ALWAYS_CONSUMED">
       <Keyword>DebugLib</Keyword>
     </LibraryClass>
     <LibraryClass Usage="ALWAYS_CONSUMED">
       <Keyword>HiiLib</Keyword>
     </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
     <LibraryClass Usage="ALWAYS_CONSUMED">
       <Keyword>UefiDriverEntryPoint</Keyword>
     </LibraryClass>
@@ -64,24 +50,26 @@ 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="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>Cpu</ProtocolCName>
+      <ProtocolCName>gEfiCpuArchProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>CpuIo</ProtocolCName>
+      <ProtocolCName>gEfiCpuIoProtocolGuid</ProtocolCName>
+    </Protocol>
+    <Protocol Usage="ALWAYS_CONSUMED">
+      <ProtocolCName>gEfiWinNtIoProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="SOMETIMES_CONSUMED">
-      <ProtocolCName>Hii</ProtocolCName>
+      <ProtocolCName>gEfiHiiProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="SOMETIMES_CONSUMED">
-      <ProtocolCName>DataHub</ProtocolCName>
+      <ProtocolCName>gEfiDataHubProtocolGuid</ProtocolCName>
     </Protocol>
     <ProtocolNotify Usage="SOMETIMES_CONSUMED">
-      <ProtocolNotifyCName>WinNtIo</ProtocolNotifyCName>
+      <ProtocolNotifyCName>gEfiWinNtIoProtocolGuid</ProtocolNotifyCName>
     </ProtocolNotify>
   </Protocols>
   <DataHubs>
@@ -94,21 +82,21 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </DataHubs>
   <Guids>
     <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>ProcessorProducer</GuidCName>
+      <GuidCName>gEfiProcessorProducerGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>ProcessorSubClass</GuidCName>
+      <GuidCName>gEfiProcessorSubClassGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>WinNtCPUModel</GuidCName>
+      <GuidCName>gEfiWinNtCPUModelGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>WinNtCPUSpeed</GuidCName>
+      <GuidCName>gEfiWinNtCPUSpeedGuid</GuidCName>
     </GuidCNames>
   </Guids>
   <Externs>
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>
+    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
     <Extern>
       <ModuleEntryPoint>InitializeCpu</ModuleEntryPoint>
     </Extern>