Add in OFFSET_OF macro as defined in MDE Library spec

[mirror_edk2.git] / EdkNt32Pkg / Dxe / WinNtThunk / Cpu / Cpu.msa

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.msa
index 36fbd12401d00665bb9ab052ffa731606f020fa9..b96caa2cf35d95457b649f3ea532f1d78a869ff4 100644 (file)
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.msa
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.msa
@@ -1,45 +1,45 @@
 <?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
-<ModuleSurfaceArea 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
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r
   <MsaHeader>\r
-    <BaseName>Cpu</BaseName>\r
+    <ModuleName>Cpu</ModuleName>\r
     <ModuleType>DXE_DRIVER</ModuleType>\r
-    <ComponentType>BS_DRIVER</ComponentType>\r
-    <Guid>ee993080-5197-4d4e-b63c-f1f7413e33ce</Guid>\r
-    <Version>0</Version>\r
+    <GuidValue>ee993080-5197-4d4e-b63c-f1f7413e33ce</GuidValue>\r
+    <Version>1.0</Version>\r
     <Abstract>Component description file for Cpu module.</Abstract>\r
-    <Description>FIX ME!</Description>\r
-    <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>\r
-    <License>\r
-      All rights reserved. This program and the accompanying materials\r
+    <Description>This CPU module abstracts the interrupt subsystem of a platform and the CPU-specific setjump-long pair.</Description>\r
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>\r
+    <License>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
       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
-    <Specification>0</Specification>\r
-    <Created>2006-03-14 17:04</Created>\r
-    <Updated>2006-03-23 16:17</Updated>\r
+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>\r
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r
+  <ModuleDefinitions>\r
+    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
+    <BinaryModule>false</BinaryModule>\r
+    <OutputFileBasename>Cpu</OutputFileBasename>\r
+  </ModuleDefinitions>\r
   <LibraryClassDefinitions>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseLib</LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">DebugLib</LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">HiiLib</LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiLib</LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiDriverEntryPoint</LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseMemoryLib</LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">MemoryAllocationLib</LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiBootServicesTableLib</LibraryClass>\r
+    <LibraryClass Usage="ALWAYS_CONSUMED">\r
+      <Keyword>DebugLib</Keyword>\r
+    </LibraryClass>\r
+    <LibraryClass Usage="ALWAYS_CONSUMED">\r
+      <Keyword>HiiLib</Keyword>\r
+    </LibraryClass>\r
+    <LibraryClass Usage="ALWAYS_CONSUMED">\r
+      <Keyword>UefiDriverEntryPoint</Keyword>\r
+    </LibraryClass>\r
+    <LibraryClass Usage="ALWAYS_CONSUMED">\r
+      <Keyword>BaseMemoryLib</Keyword>\r
+    </LibraryClass>\r
+    <LibraryClass Usage="ALWAYS_CONSUMED">\r
+      <Keyword>MemoryAllocationLib</Keyword>\r
+    </LibraryClass>\r
+    <LibraryClass Usage="ALWAYS_CONSUMED">\r
+      <Keyword>UefiBootServicesTableLib</Keyword>\r
+    </LibraryClass>\r
   </LibraryClassDefinitions>\r
   <SourceFiles>\r
     <Filename>Strings.uni</Filename>\r
@@ -48,39 +48,57 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Filename>CpuIo.c</Filename>\r
     <Filename>Cpu.dxs</Filename>\r
   </SourceFiles>\r
-  <Includes>\r
-    <PackageName>MdePkg</PackageName>\r
-    <PackageName>EdkModulePkg</PackageName>\r
-    <PackageName>EdkNt32Pkg</PackageName>\r
-  </Includes>\r
+  <PackageDependencies>\r
+    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
+    <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>\r
+  </PackageDependencies>\r
   <Protocols>\r
-    <Protocol Usage="ALWAYS_PRODUCED">Cpu</Protocol>\r
-    <Protocol Usage="ALWAYS_PRODUCED">CpuIo</Protocol>\r
-    <Protocol Usage="SOMETIMES_CONSUMED">Hii</Protocol>\r
-    <Protocol Usage="SOMETIMES_CONSUMED">DataHub</Protocol>\r
-    <ProtocolNotify Usage="SOMETIMES_CONSUMED">WinNtIo</ProtocolNotify>\r
+    <Protocol Usage="ALWAYS_PRODUCED">\r
+      <ProtocolCName>gEfiCpuArchProtocolGuid</ProtocolCName>\r
+    </Protocol>\r
+    <Protocol Usage="ALWAYS_PRODUCED">\r
+      <ProtocolCName>gEfiCpuIoProtocolGuid</ProtocolCName>\r
+    </Protocol>\r
+    <Protocol Usage="ALWAYS_CONSUMED">\r
+      <ProtocolCName>gEfiWinNtIoProtocolGuid</ProtocolCName>\r
+    </Protocol>\r
+    <Protocol Usage="SOMETIMES_CONSUMED">\r
+      <ProtocolCName>gEfiHiiProtocolGuid</ProtocolCName>\r
+    </Protocol>\r
+    <Protocol Usage="SOMETIMES_CONSUMED">\r
+      <ProtocolCName>gEfiDataHubProtocolGuid</ProtocolCName>\r
+    </Protocol>\r
+    <ProtocolNotify Usage="SOMETIMES_CONSUMED">\r
+      <ProtocolNotifyCName>gEfiWinNtIoProtocolGuid</ProtocolNotifyCName>\r
+    </ProtocolNotify>\r
   </Protocols>\r
   <DataHubs>\r
-    <DataHubRecord Usage="SOMETIMES_PRODUCED">ProcessorVersion</DataHubRecord>\r
-    <DataHubRecord Usage="SOMETIMES_PRODUCED">ProcessorCoreFrequency</DataHubRecord>\r
+    <DataHubRecord Usage="SOMETIMES_PRODUCED">\r
+      <DataHubCName>ProcessorVersion</DataHubCName>\r
+    </DataHubRecord>\r
+    <DataHubRecord Usage="SOMETIMES_PRODUCED">\r
+      <DataHubCName>ProcessorCoreFrequency</DataHubCName>\r
+    </DataHubRecord>\r
   </DataHubs>\r
   <Guids>\r
-    <GuidEntry Usage="SOMETIMES_CONSUMED">\r
-      <C_Name>ProcessorProducer</C_Name>\r
-    </GuidEntry>\r
-    <GuidEntry Usage="SOMETIMES_CONSUMED">\r
-      <C_Name>ProcessorSubClass</C_Name>\r
-    </GuidEntry>\r
-    <GuidEntry Usage="SOMETIMES_CONSUMED">\r
-      <C_Name>WinNtCPUModel</C_Name>\r
-    </GuidEntry>\r
-    <GuidEntry Usage="SOMETIMES_CONSUMED">\r
-      <C_Name>WinNtCPUSpeed</C_Name>\r
-    </GuidEntry>\r
+    <GuidCNames Usage="SOMETIMES_CONSUMED">\r
+      <GuidCName>gEfiProcessorProducerGuid</GuidCName>\r
+    </GuidCNames>\r
+    <GuidCNames Usage="SOMETIMES_CONSUMED">\r
+      <GuidCName>gEfiProcessorSubClassGuid</GuidCName>\r
+    </GuidCNames>\r
+    <GuidCNames Usage="SOMETIMES_CONSUMED">\r
+      <GuidCName>gEfiWinNtCPUModelGuid</GuidCName>\r
+    </GuidCNames>\r
+    <GuidCNames Usage="SOMETIMES_CONSUMED">\r
+      <GuidCName>gEfiWinNtCPUSpeedGuid</GuidCName>\r
+    </GuidCNames>\r
   </Guids>\r
   <Externs>\r
+    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r
+    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>\r
     <Extern>\r
       <ModuleEntryPoint>InitializeCpu</ModuleEntryPoint>\r
     </Extern>\r
   </Externs>\r
-</ModuleSurfaceArea>\r
+</ModuleSurfaceArea>
\ No newline at end of file