Add necessary files (such as *.h) in module msa and remove unused msa files.

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

diff --git a/EdkModulePkg/Bus/Pci/IdeBus/Dxe/idebusLite.msa b/EdkModulePkg/Bus/Pci/IdeBus/Dxe/idebusLite.msa
deleted file mode 100644 (file)
index 07972e8..0000000
--- a/EdkModulePkg/Bus/Pci/IdeBus/Dxe/idebusLite.msa
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<!--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.-->\r
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
-  <MsaHeader>\r
-    <ModuleName>IdeBusLite</ModuleName>\r
-    <ModuleType>DXE_DRIVER</ModuleType>\r
-    <GuidValue>5db1d982-602b-4f27-9457-0513fd96ef00</GuidValue>\r
-    <Version>1.0</Version>\r
-    <Abstract>Component description file for PS2 keyboard module.</Abstract>\r
-    <Description>FIX ME!</Description>\r
-    <Copyright>Copyright (c) 2004-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
-  </MsaHeader>\r
-  <ModuleDefinitions>\r
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
-    <BinaryModule>false</BinaryModule>\r
-    <OutputFileBasename>IdeBusLite</OutputFileBasename>\r
-  </ModuleDefinitions>\r
-  <LibraryClassDefinitions>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>DebugLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>UefiDriverModelLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>UefiDriverEntryPoint</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>BaseLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>UefiLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>BaseMemoryLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>PerformanceLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>UefiBootServicesTableLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>UefiRuntimeServicesTableLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>DevicePathLib</Keyword>\r
-    </LibraryClass>\r
-  </LibraryClassDefinitions>\r
-  <SourceFiles>\r
-    <Filename>idebus.h</Filename>\r
-    <Filename>ide.h</Filename>\r
-    <Filename>idedata.h</Filename>\r
-    <Filename>idebus.c</Filename>\r
-    <Filename>ide.c</Filename>\r
-    <Filename>ata.c</Filename>\r
-    <Filename>atapi.c</Filename>\r
-  </SourceFiles>\r
-  <PackageDependencies>\r
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
-    <Package PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>\r
-  </PackageDependencies>\r
-  <Protocols>\r
-    <Protocol Usage="ALWAYS_CONSUMED">\r
-      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>\r
-    </Protocol>\r
-    <Protocol Usage="ALWAYS_CONSUMED">\r
-      <ProtocolCName>gEfiPciIoProtocolGuid</ProtocolCName>\r
-    </Protocol>\r
-    <Protocol Usage="ALWAYS_CONSUMED">\r
-      <ProtocolCName>gEfiIdeControllerInitProtocolGuid</ProtocolCName>\r
-    </Protocol>\r
-    <Protocol Usage="ALWAYS_CONSUMED">\r
-      <ProtocolCName>gEfiBlockIoProtocolGuid</ProtocolCName>\r
-    </Protocol>\r
-    <Protocol Usage="ALWAYS_CONSUMED">\r
-      <ProtocolCName>gEfiDiskInfoProtocolGuid</ProtocolCName>\r
-    </Protocol>\r
-  </Protocols>\r
-  <Guids>\r
-    <GuidCNames Usage="ALWAYS_CONSUMED">\r
-      <GuidCName>gEfiDiskInfoIdeInterfaceGuid</GuidCName>\r
-    </GuidCNames>\r
-    <GuidCNames Usage="ALWAYS_CONSUMED">\r
-      <GuidCName>gEfiDiskInfoScsiInterfaceGuid</GuidCName>\r
-    </GuidCNames>\r
-    <GuidCNames Usage="ALWAYS_CONSUMED">\r
-      <GuidCName>gEfiDiskInfoUsbInterfaceGuid</GuidCName>\r
-    </GuidCNames>\r
-  </Guids>\r
-  <Externs>\r
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>\r
-    <Extern>\r
-      <DriverBinding>gIDEBusDriverBinding</DriverBinding>\r
-    </Extern>\r
-    <Extern>\r
-      <ComponentName>gIDEBusComponentName</ComponentName>\r
-    </Extern>\r
-  </Externs>\r
-</ModuleSurfaceArea>
\ No newline at end of file

diff --git a/EdkModulePkg/Bus/Pci/PciBus/Dxe/LightPciBus.msa b/EdkModulePkg/Bus/Pci/PciBus/Dxe/LightPciBus.msa
deleted file mode 100644 (file)
index 95c4632..0000000
--- a/EdkModulePkg/Bus/Pci/PciBus/Dxe/LightPciBus.msa
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<!--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.-->\r
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
-  <MsaHeader>\r
-    <ModuleName>LightPciBusPciBus</ModuleName>\r
-    <ModuleType>DXE_DRIVER</ModuleType>\r
-    <GuidValue>C0734D12-7927-432b-986B-A7E3A35BA005</GuidValue>\r
-    <Version>1.0</Version>\r
-    <Abstract>Component description file for LightPciBus module.</Abstract>\r
-    <Description>FIX ME!</Description>\r
-    <Copyright>Copyright (c) 2004-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
-  </MsaHeader>\r
-  <ModuleDefinitions>\r
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
-    <BinaryModule>false</BinaryModule>\r
-    <OutputFileBasename>LightPciBusPciBus</OutputFileBasename>\r
-  </ModuleDefinitions>\r
-  <LibraryClassDefinitions>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>DebugLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>UefiDriverModelLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>UefiDriverEntryPoint</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>BaseLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>UefiLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>BaseMemoryLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>ReportStatusCodeLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>UefiBootServicesTableLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>DevicePathLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>MemoryAllocationLib</Keyword>\r
-    </LibraryClass>\r
-  </LibraryClassDefinitions>\r
-  <SourceFiles>\r
-    <Filename>PciBus.h</Filename>\r
-    <Filename>PciIo.h</Filename>\r
-    <Filename>PciCommand.h</Filename>\r
-    <Filename>PciDeviceSupport.h</Filename>\r
-    <Filename>PciResourceSupport.h</Filename>\r
-    <Filename>PciEnumerator.h</Filename>\r
-    <Filename>PciEnumeratorSupport.h</Filename>\r
-    <Filename>PciOptionRomSupport.h</Filename>\r
-    <Filename>PciRomTable.h</Filename>\r
-    <Filename>PciLib.h</Filename>\r
-    <Filename>PciRomTable.c</Filename>\r
-    <Filename>PciDriverOverride.h</Filename>\r
-    <Filename>PciPowerManagement.h</Filename>\r
-    <Filename>PciPowerManagement.c</Filename>\r
-    <Filename>PciDriverOverride.c</Filename>\r
-    <Filename>PciOptionRomSupport.c</Filename>\r
-    <Filename>PciEnumerator.c</Filename>\r
-    <Filename>PciEnumeratorSupport.c</Filename>\r
-    <Filename>PciResourceSupport.c</Filename>\r
-    <Filename>PciCommand.c</Filename>\r
-    <Filename>ComponentName.c</Filename>\r
-    <Filename>PciDeviceSupport.c</Filename>\r
-    <Filename>PciHotPlugSupport.c</Filename>\r
-    <Filename>pcibus.c</Filename>\r
-    <Filename>PciIo.c</Filename>\r
-    <Filename>LightPciLib.c</Filename>\r
-  </SourceFiles>\r
-  <PackageDependencies>\r
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
-    <Package PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>\r
-  </PackageDependencies>\r
-  <Protocols>\r
-    <Protocol Usage="ALWAYS_CONSUMED">\r
-      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>\r
-    </Protocol>\r
-    <Protocol Usage="ALWAYS_CONSUMED">\r
-      <ProtocolCName>gEfiPciRootBridgeIoProtocolGuid</ProtocolCName>\r
-    </Protocol>\r
-    <Protocol Usage="ALWAYS_CONSUMED">\r
-      <ProtocolCName>gEfiDecompressProtocolGuid</ProtocolCName>\r
-    </Protocol>\r
-    <Protocol Usage="ALWAYS_CONSUMED">\r
-      <ProtocolCName>gEfiUgaIoProtocolGuid</ProtocolCName>\r
-    </Protocol>\r
-    <Protocol Usage="ALWAYS_CONSUMED">\r
-      <ProtocolCName>gEfiPciPlatformProtocolGuid</ProtocolCName>\r
-    </Protocol>\r
-    <Protocol Usage="ALWAYS_CONSUMED">\r
-      <ProtocolCName>gEfiPciIoProtocolGuid</ProtocolCName>\r
-    </Protocol>\r
-    <Protocol Usage="ALWAYS_CONSUMED">\r
-      <ProtocolCName>gEfiBusSpecificDriverOverrideProtocolGuid</ProtocolCName>\r
-    </Protocol>\r
-    <Protocol Usage="ALWAYS_CONSUMED">\r
-      <ProtocolCName>gEfiPciHotPlugRequestProtocolGuid</ProtocolCName>\r
-    </Protocol>\r
-    <Protocol Usage="ALWAYS_CONSUMED">\r
-      <ProtocolCName>gEfiIncompatiblePciDeviceSupportProtocolGuid</ProtocolCName>\r
-    </Protocol>\r
-    <Protocol Usage="ALWAYS_CONSUMED">\r
-      <ProtocolCName>gEfiPciHotPlugInitProtocolGuid</ProtocolCName>\r
-    </Protocol>\r
-    <Protocol Usage="ALWAYS_CONSUMED">\r
-      <ProtocolCName>gEfiPciHostBridgeResourceAllocationProtocolGuid</ProtocolCName>\r
-    </Protocol>\r
-    <Protocol Usage="ALWAYS_CONSUMED">\r
-      <ProtocolCName>gEfiLoadedImageProtocolGuid</ProtocolCName>\r
-    </Protocol>\r
-  </Protocols>\r
-  <Guids>\r
-    <GuidCNames Usage="ALWAYS_CONSUMED">\r
-      <GuidCName>gEfiPciOptionRomTableGuid</GuidCName>\r
-    </GuidCNames>\r
-    <GuidCNames Usage="ALWAYS_CONSUMED">\r
-      <GuidCName>gEfiPciHotplugDeviceGuid</GuidCName>\r
-    </GuidCNames>\r
-    <GuidCNames Usage="ALWAYS_CONSUMED">\r
-      <GuidCName>gEfiStatusCodeSpecificDataGuid</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>PciBusEntryPoint</ModuleEntryPoint>\r
-    </Extern>\r
-    <Extern>\r
-      <DriverBinding>gPciBusDriverBinding</DriverBinding>\r
-    </Extern>\r
-    <Extern>\r
-      <ComponentName>gPciBusComponentName</ComponentName>\r
-    </Extern>\r
-  </Externs>\r
-</ModuleSurfaceArea>
\ No newline at end of file

diff --git a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBus.msa b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBus.msa
index 5cfb3847fa7e44d4a38cb6c7d18b89443f4babd6..2f38891f363bb3a0c9df75324da77fd9b6c0c27f 100644 (file)
--- a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBus.msa
+++ b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBus.msa
@@ -84,6 +84,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Filename>PciEnumeratorSupport.c</Filename>\r
     <Filename>PciResourceSupport.c</Filename>\r
     <Filename>PciCommand.c</Filename>\r
+    <Filename>ComponentName.h</Filename>\r
     <Filename>ComponentName.c</Filename>\r
     <Filename>PciDeviceSupport.c</Filename>\r
     <Filename>pcibus.c</Filename>\r

diff --git a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBusLite.msa b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBusLite.msa
deleted file mode 100644 (file)
index 588d78c..0000000
--- a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBusLite.msa
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<!--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.-->\r
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
-  <MsaHeader>\r
-    <ModuleName>PciBusPciBusLite</ModuleName>\r
-    <ModuleType>DXE_DRIVER</ModuleType>\r
-    <GuidValue>4b186349-7da2-454d-8187-99d85fa03b5c</GuidValue>\r
-    <Version>1.0</Version>\r
-    <Abstract>Component description file for LightPciBus module.</Abstract>\r
-    <Description>FIX ME!</Description>\r
-    <Copyright>Copyright (c) 2004-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
-  </MsaHeader>\r
-  <ModuleDefinitions>\r
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
-    <BinaryModule>false</BinaryModule>\r
-    <OutputFileBasename>PciBusPciBusLite</OutputFileBasename>\r
-  </ModuleDefinitions>\r
-  <LibraryClassDefinitions>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>DebugLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>UefiDriverModelLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>UefiDriverEntryPoint</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>BaseLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>UefiLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>BaseMemoryLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>ReportStatusCodeLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>UefiBootServicesTableLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>DevicePathLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>MemoryAllocationLib</Keyword>\r
-    </LibraryClass>\r
-  </LibraryClassDefinitions>\r
-  <SourceFiles>\r
-    <Filename>PciBus.h</Filename>\r
-    <Filename>PciIo.h</Filename>\r
-    <Filename>PciCommand.h</Filename>\r
-    <Filename>PciDeviceSupport.h</Filename>\r
-    <Filename>PciResourceSupport.h</Filename>\r
-    <Filename>PciEnumerator.h</Filename>\r
-    <Filename>PciEnumeratorSupport.h</Filename>\r
-    <Filename>PciOptionRomSupport.h</Filename>\r
-    <Filename>PciRomTable.h</Filename>\r
-    <Filename>PciLib.h</Filename>\r
-    <Filename>PciRomTable.c</Filename>\r
-    <Filename>PciDriverOverride.h</Filename>\r
-    <Filename>PciPowerManagement.h</Filename>\r
-    <Filename>PciPowerManagement.c</Filename>\r
-    <Filename>PciDriverOverride.c</Filename>\r
-    <Filename>PciOptionRomSupport.c</Filename>\r
-    <Filename>PciEnumerator.c</Filename>\r
-    <Filename>PciEnumeratorSupport.c</Filename>\r
-    <Filename>PciResourceSupport.c</Filename>\r
-    <Filename>PciCommand.c</Filename>\r
-    <Filename>PciDeviceSupport.c</Filename>\r
-    <Filename>PciHotPlugSupport.c</Filename>\r
-    <Filename>pcibus.c</Filename>\r
-    <Filename>PciIo.c</Filename>\r
-    <Filename>LightPciLib.c</Filename>\r
-  </SourceFiles>\r
-  <PackageDependencies>\r
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
-    <Package PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>\r
-  </PackageDependencies>\r
-  <Protocols>\r
-    <Protocol Usage="ALWAYS_CONSUMED">\r
-      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>\r
-    </Protocol>\r
-    <Protocol Usage="ALWAYS_CONSUMED">\r
-      <ProtocolCName>gEfiPciRootBridgeIoProtocolGuid</ProtocolCName>\r
-    </Protocol>\r
-    <Protocol Usage="ALWAYS_CONSUMED">\r
-      <ProtocolCName>gEfiDecompressProtocolGuid</ProtocolCName>\r
-    </Protocol>\r
-    <Protocol Usage="ALWAYS_CONSUMED">\r
-      <ProtocolCName>gEfiUgaIoProtocolGuid</ProtocolCName>\r
-    </Protocol>\r
-    <Protocol Usage="ALWAYS_CONSUMED">\r
-      <ProtocolCName>gEfiPciPlatformProtocolGuid</ProtocolCName>\r
-    </Protocol>\r
-    <Protocol Usage="ALWAYS_CONSUMED">\r
-      <ProtocolCName>gEfiPciIoProtocolGuid</ProtocolCName>\r
-    </Protocol>\r
-    <Protocol Usage="ALWAYS_CONSUMED">\r
-      <ProtocolCName>gEfiBusSpecificDriverOverrideProtocolGuid</ProtocolCName>\r
-    </Protocol>\r
-    <Protocol Usage="ALWAYS_CONSUMED">\r
-      <ProtocolCName>gEfiPciHotPlugRequestProtocolGuid</ProtocolCName>\r
-    </Protocol>\r
-    <Protocol Usage="ALWAYS_CONSUMED">\r
-      <ProtocolCName>gEfiIncompatiblePciDeviceSupportProtocolGuid</ProtocolCName>\r
-    </Protocol>\r
-    <Protocol Usage="ALWAYS_CONSUMED">\r
-      <ProtocolCName>gEfiPciHotPlugInitProtocolGuid</ProtocolCName>\r
-    </Protocol>\r
-    <Protocol Usage="ALWAYS_CONSUMED">\r
-      <ProtocolCName>gEfiPciHostBridgeResourceAllocationProtocolGuid</ProtocolCName>\r
-    </Protocol>\r
-    <Protocol Usage="ALWAYS_CONSUMED">\r
-      <ProtocolCName>gEfiLoadedImageProtocolGuid</ProtocolCName>\r
-    </Protocol>\r
-  </Protocols>\r
-  <Guids>\r
-    <GuidCNames Usage="ALWAYS_CONSUMED">\r
-      <GuidCName>gEfiPciOptionRomTableGuid</GuidCName>\r
-    </GuidCNames>\r
-    <GuidCNames Usage="ALWAYS_CONSUMED">\r
-      <GuidCName>gEfiPciHotplugDeviceGuid</GuidCName>\r
-    </GuidCNames>\r
-    <GuidCNames Usage="ALWAYS_CONSUMED">\r
-      <GuidCName>gEfiStatusCodeSpecificDataGuid</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>PciBusEntryPoint</ModuleEntryPoint>\r
-    </Extern>\r
-    <Extern>\r
-      <DriverBinding>gPciBusDriverBinding</DriverBinding>\r
-    </Extern>\r
-    <Extern>\r
-      <ComponentName>gPciBusComponentName</ComponentName>\r
-    </Extern>\r
-  </Externs>\r
-</ModuleSurfaceArea>
\ No newline at end of file

diff --git a/EdkModulePkg/Core/DxeIplPeim/build_X64.xml b/EdkModulePkg/Core/DxeIplPeim/build_X64.xml
deleted file mode 100644 (file)
index aef68ec..0000000
--- a/EdkModulePkg/Core/DxeIplPeim/build_X64.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- 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
-<project basedir="." default="DxeIpl"><!--Apply external ANT tasks-->\r
-   <taskdef resource="GenBuild.tasks"/>\r
-   <property environment="env"/>\r
-   <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>\r
-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->\r
-   <property name="MODULE_RELATIVE_PATH" value="Core\DxeIplPeim"/>\r
-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>\r
-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>\r
-   <target name="DxeIpl">\r
-      <GenBuild baseName="DxeIpl" mbdFilename="${MODULE_DIR}\DxeIplX64.mbd" msaFilename="${MODULE_DIR}\DxeIplX64.msa"/>\r
-   </target>\r
-   <target depends="DxeIpl_clean" name="clean"/>\r
-   <target depends="DxeIpl_cleanAll" name="cleanAll"/>\r
-   <target name="DxeIpl_clean">\r
-      <OutputDirSetup baseName="DxeIpl" mbdFilename="${MODULE_DIR}\DxeIplX64.mbd" msaFilename="${MODULE_DIR}\DxeIplX64.msa"/>\r
-      <if>\r
-         <available file="${DEST_DIR_OUTPUT}\DxeIpl_build.xml"/>\r
-         <then>\r
-            <ant antfile="${DEST_DIR_OUTPUT}\DxeIpl_build.xml" target="clean"/>\r
-         </then>\r
-      </if>\r
-      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>\r
-   </target>\r
-   <target name="DxeIpl_cleanAll">\r
-      <OutputDirSetup baseName="DxeIpl" mbdFilename="${MODULE_DIR}\DxeIplX64.mbd" msaFilename="${MODULE_DIR}\DxeIplX64.msa"/>\r
-      <if>\r
-         <available file="${DEST_DIR_OUTPUT}\DxeIpl_build.xml"/>\r
-         <then>\r
-            <ant antfile="${DEST_DIR_OUTPUT}\DxeIpl_build.xml" target="cleanAll"/>\r
-         </then>\r
-      </if>\r
-      <delete dir="${DEST_DIR_OUTPUT}"/>\r
-      <delete dir="${DEST_DIR_DEBUG}"/>\r
-      <delete>\r
-         <fileset dir="${BIN_DIR}" includes="**DxeIpl*"/>\r
-      </delete>\r
-   </target>\r
-</project>
\ No newline at end of file

diff --git a/EdkModulePkg/Core/Pei/PeiMain.msa b/EdkModulePkg/Core/Pei/PeiMain.msa
index fe5e67eabdc314d3e32a45c51955076c57e08e2c..7c4ce5874b4cfd4fb99be71f52a6732ef9b6a5b6 100644 (file)
--- a/EdkModulePkg/Core/Pei/PeiMain.msa
+++ b/EdkModulePkg/Core/Pei/PeiMain.msa
@@ -64,6 +64,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   <SourceFiles>\r
     <Filename>PeiMain.h</Filename>\r
     <Filename>BootMode/BootMode.c</Filename>\r
+    <Filename>Dependency/dependency.h</Filename>\r
     <Filename>Dependency/dependency.c</Filename>\r
     <Filename>Dispatcher/Dispatcher.c</Filename>\r
     <Filename>FwVol/FwVol.c</Filename>\r

diff --git a/EdkModulePkg/EdkModulePkg.spd b/EdkModulePkg/EdkModulePkg.spd
index 84234060d17df4cc8008ffb8a649640d8d766706..2d2b2a8e1cd9c23e6b8ba0aef836b03568c33bd7 100644 (file)
--- a/EdkModulePkg/EdkModulePkg.spd
+++ b/EdkModulePkg/EdkModulePkg.spd
@@ -82,10 +82,7 @@
     <Filename>Bus/Pci/AtapiPassThru/Dxe/AtapiPassThru.msa</Filename>\r
     <Filename>Bus/Pci/CirrusLogic/Dxe/CirrusLogic5430.msa</Filename>\r
     <Filename>Bus/Pci/IdeBus/Dxe/idebus.msa</Filename>\r
-    <Filename>Bus/Pci/IdeBus/Dxe/idebusLite.msa</Filename>\r
-    <Filename>Bus/Pci/PciBus/Dxe/LightPciBus.msa</Filename>\r
     <Filename>Bus/Pci/PciBus/Dxe/PciBus.msa</Filename>\r
-    <Filename>Bus/Pci/PciBus/Dxe/PciBusLite.msa</Filename>\r
     <Filename>Bus/Pci/Uhci/Dxe/Uhci.msa</Filename>\r
     <Filename>Bus/Pci/Undi/RuntimeDxe/Undi.msa</Filename>\r
     <Filename>Bus/Scsi/ScsiBus/Dxe/ScsiBus.msa</Filename>\r

diff --git a/EdkModulePkg/Library/EdkDxeRuntimeDriverLib/EdkDxeRuntimeDriverLib.msa b/EdkModulePkg/Library/EdkDxeRuntimeDriverLib/EdkDxeRuntimeDriverLib.msa
index 2f68b56c1e13a4b71f626fa89744ed204b3b29a4..6cb8fdb3f8565d1bc89d90fe97faad415ee29dfd 100644 (file)
--- a/EdkModulePkg/Library/EdkDxeRuntimeDriverLib/EdkDxeRuntimeDriverLib.msa
+++ b/EdkModulePkg/Library/EdkDxeRuntimeDriverLib/EdkDxeRuntimeDriverLib.msa
@@ -42,6 +42,7 @@
     </LibraryClass>\r
   </LibraryClassDefinitions>\r
   <SourceFiles>\r
+    <Filename>RuntimeLibInternal.h</Filename>\r
     <Filename SupArchList="IA32">Common/RuntimeLib.c</Filename>\r
     <Filename SupArchList="IA32">Common/RuntimeService.c</Filename>\r
     <Filename SupArchList="X64">Common/RuntimeLib.c</Filename>\r

diff --git a/EdkModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.msa b/EdkModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.msa
index c4937f71ade6fc4bfaa1e6cbfbe19b91558f1543..d3a17442160fef7e67ba68896535268b999defb0 100644 (file)
--- a/EdkModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.msa
+++ b/EdkModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.msa
@@ -54,6 +54,7 @@
     </LibraryClass>\r
   </LibraryClassDefinitions>\r
   <SourceFiles>\r
+    <Filename>Fvb.h</Filename>\r
     <Filename SupArchList="IA32">Ia32/Fvb.c</Filename>\r
     <Filename SupArchList="X64">x64/Fvb.c</Filename>\r
     <Filename SupArchList="IPF">Ipf/Fvb.c</Filename>\r

diff --git a/EdkModulePkg/Library/EdkNullCustomizedDecompressLib/EdkNullCustomizedDecompressLib.msa b/EdkModulePkg/Library/EdkNullCustomizedDecompressLib/EdkNullCustomizedDecompressLib.msa
index a3c9a79d1f01799629148a107a88b92c432a2ef9..4f98c8468748cec33034cc2c13d90e2a9dd6b759 100644 (file)
--- a/EdkModulePkg/Library/EdkNullCustomizedDecompressLib/EdkNullCustomizedDecompressLib.msa
+++ b/EdkModulePkg/Library/EdkNullCustomizedDecompressLib/EdkNullCustomizedDecompressLib.msa
@@ -27,6 +27,7 @@
     </LibraryClass>\r
   </LibraryClassDefinitions>\r
   <SourceFiles>\r
+    <Filename>CustomizedDecompress.h</Filename>\r
     <Filename>CustomizedDecompress.c</Filename>\r
   </SourceFiles>\r
   <PackageDependencies>\r

diff --git a/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.msa b/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.msa
index efa9173c4c016b2bd65dc6999165d0b7416b428d..57a57fa0179860a48a1a5fc3f578cff573423f62 100644 (file)
--- a/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.msa
+++ b/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.msa
@@ -62,6 +62,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Filename>GraphicsConsole.h</Filename>\r
     <Filename>GraphicsConsole.c</Filename>\r
     <Filename>LaffStd.c</Filename>\r
+    <Filename>ComponentName.h</Filename>\r
     <Filename>ComponentName.c</Filename>\r
   </SourceFiles>\r
   <PackageDependencies>\r

diff --git a/EdkModulePkg/Universal/DebugSupport/Dxe/DebugSupport.msa b/EdkModulePkg/Universal/DebugSupport/Dxe/DebugSupport.msa
index 55b2f6f8b940cc35e3cfd674007d2afc553deb42..a922c0aeb4730b12f2dd20421f30158d258ad93a 100644 (file)
--- a/EdkModulePkg/Universal/DebugSupport/Dxe/DebugSupport.msa
+++ b/EdkModulePkg/Universal/DebugSupport/Dxe/DebugSupport.msa
@@ -50,6 +50,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Filename>DebugSupport.c</Filename>\r
     <Filename>DebugSupport.dxs</Filename>\r
     <Filename SupArchList="IA32">Ia32/AsmFuncs.asm</Filename>\r
+    <Filename SupArchList="IA32">Ia32/plDebugSupport.h</Filename>\r
     <Filename SupArchList="IA32">Ia32/plDebugSupport.c</Filename>\r
     <Filename SupArchList="IPF">ipf/AsmFuncs.s</Filename>\r
     <Filename SupArchList="IPF">ipf/common.i</Filename>\r

diff --git a/EdkModulePkg/Universal/Disk/UnicodeCollation/English/Dxe/English.msa b/EdkModulePkg/Universal/Disk/UnicodeCollation/English/Dxe/English.msa
index c87e198dac92345304d75a252dea5480114f7b62..abd5246ce33ae7e66571d0dc315b83758cc2aba7 100644 (file)
--- a/EdkModulePkg/Universal/Disk/UnicodeCollation/English/Dxe/English.msa
+++ b/EdkModulePkg/Universal/Disk/UnicodeCollation/English/Dxe/English.msa
@@ -41,6 +41,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     </LibraryClass>\r
   </LibraryClassDefinitions>\r
   <SourceFiles>\r
+    <Filename>UnicodeCollationEng.h</Filename>\r
     <Filename>UnicodeCollationEng.c</Filename>\r
   </SourceFiles>\r
   <PackageDependencies>\r

diff --git a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.msa b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.msa
index 12f070c301cb4af458610b8324bcca9c7c0d69ca..b874f593b776691ad768a61552882e2c437a47ec 100644 (file)
--- a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.msa
+++ b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.msa
@@ -56,6 +56,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     </LibraryClass>\r
   </LibraryClassDefinitions>\r
   <SourceFiles>\r
+    <Filename>Variable.h</Filename>\r
     <Filename>EmuVariable.c</Filename>\r
     <Filename>EmuVariable.dxs</Filename>\r
     <Filename SupArchList="IA32">InitVariable.c</Filename>\r

diff --git a/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.msa b/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.msa
index c98455f3efe4a76082f32a38209a1caa2cc3af58..cfb4c831e1e2f95b2a745952d82653bdcc8faef0 100644 (file)
--- a/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.msa
+++ b/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.msa
@@ -56,6 +56,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     </LibraryClass>\r
   </LibraryClassDefinitions>\r
   <SourceFiles>\r
+    <Filename>FtwLite.h</Filename>\r
     <Filename>FtwLite.c</Filename>\r
     <Filename>FtwMisc.c</Filename>\r
     <Filename>FtwWorkSpace.c</Filename>\r

diff --git a/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.msa b/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.msa
index 94530998bf4d7fd27872120dbec2ed67b9257e06..3e9fa817118a5225a586f634a2e1c7b50bc5ae4a 100644 (file)
--- a/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.msa
+++ b/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.msa
@@ -54,6 +54,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Filename>Crc32SectionExtract.h</Filename>\r
     <Filename>GuidedSection.c</Filename>\r
     <Filename>GuidedSection.h</Filename>\r
+    <Filename>Crc32SectionExtract.dxs</Filename>\r
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r

diff --git a/EdkModulePkg/Universal/GenericMemoryTest/Pei/BaseMemoryTest.msa b/EdkModulePkg/Universal/GenericMemoryTest/Pei/BaseMemoryTest.msa
index a1282a27aaa257f11e2afbdc3b1492160f142209..27d47a16ae90b361397acffce73094966a16e5e5 100644 (file)
--- a/EdkModulePkg/Universal/GenericMemoryTest/Pei/BaseMemoryTest.msa
+++ b/EdkModulePkg/Universal/GenericMemoryTest/Pei/BaseMemoryTest.msa
@@ -41,6 +41,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     </LibraryClass>\r
   </LibraryClassDefinitions>\r
   <SourceFiles>\r
+    <Filename>BaseMemoryTest.h</Filename>\r
     <Filename>BaseMemoryTest.c</Filename>\r
   </SourceFiles>\r
   <PackageDependencies>\r

diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/BC.msa b/EdkModulePkg/Universal/Network/PxeBc/Dxe/BC.msa
index 8557cc494e567cf592150ef246638c1c14f45918..66290569f9af6ec8507ef5f146d7046c2ca401b2 100644 (file)
--- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/BC.msa
+++ b/EdkModulePkg/Universal/Network/PxeBc/Dxe/BC.msa
@@ -67,6 +67,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Filename>pxe_bc_mtftp.c</Filename>\r
     <Filename>pxe_bc_udp.c</Filename>\r
     <Filename>pxe_loadfile.c</Filename>\r
+    <Filename>hton.h</Filename>\r
+    <Filename>tftp.h</Filename>\r
     <Filename>dhcp.h</Filename>\r
     <Filename>bc.h</Filename>\r
     <Filename>ip.h</Filename>\r

diff --git a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/DriverSample/DriverSample.msa b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/DriverSample/DriverSample.msa
index 322abc884306e6dd30266045c0640bfbb2d081c5..1b99a17ee64d5958e8f3e21e377c29b52f90ca33 100644 (file)
--- a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/DriverSample/DriverSample.msa
+++ b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/DriverSample/DriverSample.msa
@@ -73,6 +73,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Filename>VfrStrings.uni</Filename>\r
     <Filename>Vfr.vfr</Filename>\r
     <Filename>DriverSample.c</Filename>\r
+    <Filename>NVDataStruc.h</Filename>\r
     <Filename>DriverSample.h</Filename>\r
   </SourceFiles>\r
   <PackageDependencies>\r

diff --git a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/SetupBrowser.msa b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/SetupBrowser.msa
index d2d3c42cc212426b32889eea3ea8ea2fe3dfbad2..beb4f81d655a393fb6c0bc591fdaf0d7c1f486b6 100644 (file)
--- a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/SetupBrowser.msa
+++ b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/SetupBrowser.msa
@@ -76,6 +76,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Filename>ProcessOptions.c</Filename>\r
     <Filename>Ui.c</Filename>\r
     <Filename>Ui.h</Filename>\r
+    <Filename>Colors.h</Filename>\r
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r

diff --git a/EdkModulePkg/Universal/Variable/Pei/Ebc/VarMachine.h b/EdkModulePkg/Universal/Variable/Pei/Ebc/VarMachine.h
new file mode 100644 (file)
index 0000000..83031e9
--- /dev/null
+++ b/EdkModulePkg/Universal/Variable/Pei/Ebc/VarMachine.h
@@ -0,0 +1,27 @@
+/*++\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
+Module Name:\r
+\r
+  VarMachine.h\r
+  \r
+Abstract:\r
+\r
+  Variable Machine Type\r
+\r
+--*/\r
+\r
+#ifndef _VAR_MACHINE_H\r
+#define _VAR_MACHINE_H\r
+\r
+#define ALIGNMENT 1\r
+\r
+#endif\r

diff --git a/EdkModulePkg/Universal/Variable/Pei/Variable.c b/EdkModulePkg/Universal/Variable/Pei/Variable.c
index b2286c18604f3f884b52cf26c1285893fcfad9ed..9561ad13d6f7aacd83d3063a48f08f8f05e9e231 100644 (file)
--- a/EdkModulePkg/Universal/Variable/Pei/Variable.c
+++ b/EdkModulePkg/Universal/Variable/Pei/Variable.c
@@ -19,10 +19,7 @@ Abstract:
 \r
 --*/\r
 \r
-\r
-#include <Ppi/ReadOnlyVariable.h>\r
 #include <Variable.h>\r
-#include <Library/BaseLib.h>\r
 \r
 //\r
 // Module globals\r

diff --git a/EdkModulePkg/Universal/Variable/Pei/Variable.h b/EdkModulePkg/Universal/Variable/Pei/Variable.h
index 2a6f861defb5d58bc557a4437064e446ab623234..ac7c579029422e767aab7ddbd5cbd01f0ca44f62 100644 (file)
--- a/EdkModulePkg/Universal/Variable/Pei/Variable.h
+++ b/EdkModulePkg/Universal/Variable/Pei/Variable.h
@@ -26,8 +26,7 @@ Abstract:
 // BugBug: We need relcate the head file.\r
 // \r
 #include <Common/Variable.h>\r
-\r
-#define ALIGNMENT 1\r
+#include <VarMachine.h>\r
 \r
 //\r
 // Define GET_PAD_SIZE to optimize compiler\r

diff --git a/EdkModulePkg/Universal/Variable/Pei/Variable.msa b/EdkModulePkg/Universal/Variable/Pei/Variable.msa
index 3889f0deaf6c508c63c37f76184d92069cb09d41..88adcda4a9af6e24cda2a345a6c5fe5ccaa83431 100644 (file)
--- a/EdkModulePkg/Universal/Variable/Pei/Variable.msa
+++ b/EdkModulePkg/Universal/Variable/Pei/Variable.msa
@@ -30,6 +30,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <OutputFileBasename>PeiVariable</OutputFileBasename>\r
   </ModuleDefinitions>\r
   <LibraryClassDefinitions>\r
+    <LibraryClass Usage="ALWAYS_CONSUMED">\r
+      <Keyword>BaseLib</Keyword>\r
+    </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>DebugLib</Keyword>\r
     </LibraryClass>\r
@@ -44,8 +47,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     </LibraryClass>\r
   </LibraryClassDefinitions>\r
   <SourceFiles>\r
+    <Filename>Variable.h</Filename>\r
     <Filename>Variable.c</Filename>\r
     <Filename>Variable.dxs</Filename>\r
+    <Filename SupArchList="IA32">Ia32/VarMachine.h</Filename>\r
+    <Filename SupArchList="EBC">Ebc/VarMachine.h</Filename>\r
+    <Filename SupArchList="X64">x64/VarMachine.h</Filename>\r
+    <Filename SupArchList="IPF">Ipf/VarMachine.h</Filename>\r
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r

diff --git a/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.msa b/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.msa
index 99691f4943aae68573d6257cdddc53701fd77479..12248a5b3f42b6525be547845513647c9c711b5c 100644 (file)
--- a/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.msa
+++ b/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.msa
@@ -65,7 +65,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     </LibraryClass>\r
   </LibraryClassDefinitions>\r
   <SourceFiles>\r
+    <Filename>Variable.h</Filename>\r
     <Filename>Variable.c</Filename>\r
+    <Filename>reclaim.h</Filename>\r
     <Filename>reclaim.c</Filename>\r
     <Filename SupArchList="IA32">InitVariable.c</Filename>\r
     <Filename SupArchList="IA32">Ia32Variable.dxs</Filename>\r

diff --git a/EdkNt32Pkg/Build/Nt32Common.xml b/EdkNt32Pkg/Build/Nt32Common.xml
deleted file mode 100644 (file)
index 7d996fe..0000000
--- a/EdkNt32Pkg/Build/Nt32Common.xml
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" ?>\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
-<root>\r
-  <Ffs type="APPLICATION">\r
-    <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_APPLICATION"/>\r
-    <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>\r
-    <Sections EncapsulationType="Compress">\r
-      <Sections EncapsulationType="Guid-Defined">\r
-        <Section SectionType="EFI_SECTION_PE32"/>\r
-        <Section SectionType="EFI_SECTION_USER_INTERFACE"/>\r
-        <Section SectionType="EFI_SECTION_VERSION"/>\r
-      </Sections>\r
-    </Sections>\r
-  </Ffs>\r
-  <Ffs type="FILE">\r
-    <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_FREEFORM"/>\r
-    <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>\r
-    <Sections>\r
-      <Section SectionType="EFI_SECTION_RAW"/>\r
-    </Sections>\r
-  </Ffs>\r
-  <Ffs type="Apriori">\r
-    <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_FREEFORM"/>\r
-    <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>\r
-    <Sections>\r
-      <Section SectionType="EFI_SECTION_RAW"/>\r
-    </Sections>\r
-  </Ffs>\r
-  <Ffs type="Logo, Logo.Logo">\r
-    <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_FREEFORM"/>\r
-    <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>\r
-    <Sections EncapsulationType="Compress">\r
-      <Sections EncapsulationType="Guid-Defined">\r
-        <Section SectionType="EFI_SECTION_RAW"/>\r
-      </Sections>\r
-    </Sections>\r
-  </Ffs>\r
-  <Ffs type="RAWFILE">\r
-    <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_RAW"/>\r
-    <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>\r
-    <Sections>\r
-      <Section SectionType="EFI_SECTION_RAW"/>\r
-    </Sections>\r
-  </Ffs>\r
-  <Ffs type="Legacy16">\r
-    <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_FREEFORM"/>\r
-    <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>\r
-    <Sections EncapsulationType="Compress">\r
-      <Sections EncapsulationType="Guid-Defined">\r
-        <Section SectionType="EFI_SECTION_RAW"/>\r
-      </Sections>\r
-    </Sections>\r
-  </Ffs>\r
-  <Ffs type="BINARY">\r
-    <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_FREEFORM"/>\r
-    <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>\r
-    <Sections EncapsulationType="Compress">\r
-      <Sections EncapsulationType="Guid-Defined">\r
-        <Section SectionType="EFI_SECTION_RAW"/>\r
-      </Sections>\r
-    </Sections>\r
-  </Ffs>\r
-  <Ffs type="PE32_PEIM.TE_PEIM">\r
-    <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_PEIM"/>\r
-    <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>\r
-    <Sections>\r
-      <Section SectionType="EFI_SECTION_PEI_DEPEX"/>\r
-      <Section SectionType="EFI_SECTION_TE"/>\r
-      <Section SectionType="EFI_SECTION_USER_INTERFACE"/>\r
-      <Section SectionType="EFI_SECTION_VERSION"/>\r
-    </Sections>\r
-  </Ffs>\r
-  <Ffs type="Config.Config">\r
-    <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_RAW"/>\r
-    <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>\r
-    <Sections>\r
-      <Section SectionType="EFI_SECTION_RAW"/>\r
-    </Sections>\r
-  </Ffs>\r
-  <Ffs type="BS_DRIVER.Ifr_Bin">\r
-    <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_DRIVER"/>\r
-    <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>\r
-    <Sections EncapsulationType="Compress">\r
-      <Sections EncapsulationType="Guid-Defined">\r
-        <Section SectionType="EFI_SECTION_PEI_DEPEX"/>\r
-        <Section SectionType="EFI_SECTION_PE32"/>\r
-        <Section SectionType="EFI_SECTION_USER_INTERFACE"/>\r
-        <Section SectionType="EFI_SECTION_VERSION"/>\r
-        <Section SectionType="EFI_SECTION_RAW"/>\r
-      </Sections>\r
-    </Sections>\r
-  </Ffs>\r
-\r
-\r
-  <Ffs type="PEI_CORE">\r
-    <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_PEI_CORE"/>\r
-    <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>\r
-    <Sections>\r
-      <Section SectionType="EFI_SECTION_PE32"/>\r
-      <Section SectionType="EFI_SECTION_USER_INTERFACE"/>\r
-      <Section SectionType="EFI_SECTION_VERSION"/>\r
-    </Sections>\r
-  </Ffs>\r
-  <Ffs type="PE32_PEIM">\r
-    <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_PEIM"/>\r
-    <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>\r
-    <Sections>\r
-      <Section SectionType="EFI_SECTION_PEI_DEPEX"/>\r
-      <Section SectionType="EFI_SECTION_PE32"/>\r
-      <Section SectionType="EFI_SECTION_USER_INTERFACE"/>\r
-      <Section SectionType="EFI_SECTION_VERSION"/>\r
-    </Sections>\r
-  </Ffs>\r
-  <Ffs type="PE32_PEIM.Relocatable">\r
-    <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_PEIM"/>\r
-    <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>\r
-    <Sections>\r
-      <Section SectionType="EFI_SECTION_PEI_DEPEX"/>\r
-      <Section SectionType="EFI_SECTION_PE32"/>\r
-    </Sections>\r
-  </Ffs>\r
-  <Ffs type="PE32_PEIM.CompressPEIM">\r
-    <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_PEIM"/>\r
-    <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>\r
-    <Sections>\r
-      <Section SectionType="EFI_SECTION_PEI_DEPEX"/>\r
-      <Sections EncapsulationType="Compress">\r
-        <Section SectionType="EFI_SECTION_PE32"/>\r
-        <Section SectionType="EFI_SECTION_USER_INTERFACE"/>\r
-        <Section SectionType="EFI_SECTION_VERSION"/>\r
-      </Sections>\r
-    </Sections>\r
-  </Ffs>\r
-  <Ffs type="COMBINED_PEIM_DRIVER">\r
-    <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_COMBINED_PEIM_DRIVER"/>\r
-    <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>\r
-    <Sections>\r
-      <Section SectionType="EFI_SECTION_PEI_DEPEX"/>\r
-      <Section SectionType="EFI_SECTION_UNKNOW"/>\r
-      <Section SectionType="EFI_SECTION_PE32"/>\r
-      <Section SectionType="EFI_SECTION_USER_INTERFACE"/>\r
-      <Section SectionType="EFI_SECTION_VERSION"/>\r
-    </Sections>\r
-  </Ffs>\r
-  <Ffs type="DXE_CORE">\r
-    <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_DXE_CORE"/>\r
-    <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>\r
-    <Sections EncapsulationType="Compress">\r
-      <Section SectionType="EFI_SECTION_PE32"/>\r
-      <Section SectionType="EFI_SECTION_USER_INTERFACE"/>\r
-      <Section SectionType="EFI_SECTION_VERSION"/>\r
-    </Sections>\r
-  </Ffs>\r
-  <Ffs type="BS_DRIVER, RT_DRIVER, SAL_RT_DRIVER, BS_DRIVER_EFI, RT_DRIVER_EFI, APPLICATION_EFI">\r
-    <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_DRIVER"/>\r
-    <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>\r
-    <Sections EncapsulationType="Compress">\r
-      <Sections EncapsulationType="Guid-Defined">\r
-        <Section SectionType="EFI_SECTION_DXE_DEPEX"/>\r
-        <Section SectionType="EFI_SECTION_PE32"/>\r
-        <Section SectionType="EFI_SECTION_USER_INTERFACE"/>\r
-        <Section SectionType="EFI_SECTION_VERSION"/>\r
-      </Sections>\r
-    </Sections>\r
-  </Ffs>\r
-\r
-  <Ffs type="Microcode">\r
-    <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_RAW"/>\r
-    <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>\r
-    <Sections>\r
-      <Section SectionType="EFI_SECTION_RAW"/>\r
-    </Sections>\r
-  </Ffs>\r
-</root>\r

diff --git a/EdkNt32Pkg/Dxe/ConPlatform/ConPlatform.msa b/EdkNt32Pkg/Dxe/ConPlatform/ConPlatform.msa
index 36bdc1563fcb0d36ce70521b649795ac3ef085f0..758bdd3e5e16e24b7cbba9a6e2a055da6fd9f8b8 100644 (file)
--- a/EdkNt32Pkg/Dxe/ConPlatform/ConPlatform.msa
+++ b/EdkNt32Pkg/Dxe/ConPlatform/ConPlatform.msa
@@ -64,6 +64,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   <SourceFiles>\r
     <Filename>ConPlatform.c</Filename>\r
     <Filename>ConPlatform.h</Filename>\r
+    <Filename>ComponentName.h</Filename>\r
     <Filename>ComponentName.c</Filename>\r
   </SourceFiles>\r
   <PackageDependencies>\r

diff --git a/EdkNt32Pkg/Dxe/Nt32Platform/MiscSubclass/MiscSubclassDriver.msa b/EdkNt32Pkg/Dxe/Nt32Platform/MiscSubclass/MiscSubclassDriver.msa
index 93da24c99978d696e60a5d06d92a0ed79d619656..5dd917081662330f0d37599c7472ac9048c4604b 100644 (file)
--- a/EdkNt32Pkg/Dxe/Nt32Platform/MiscSubclass/MiscSubclassDriver.msa
+++ b/EdkNt32Pkg/Dxe/Nt32Platform/MiscSubclass/MiscSubclassDriver.msa
@@ -60,6 +60,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </LibraryClassDefinitions>\r
   <SourceFiles>\r
     <Filename>MiscSubclassDriver.uni</Filename>\r
+    <Filename>MiscDevicePath.h</Filename>\r
     <Filename>MiscSubclassDriver.h</Filename>\r
     <Filename>MiscSubclassDriverEntryPoint.c</Filename>\r
     <Filename>MiscSubclassDriverDataTable.c</Filename>\r

diff --git a/EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.msa b/EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.msa
index 077c5b32b125d17d1846d80b546ca7fe5e43005e..07373a2d6c708d85ee0dc7f321caaa5ea5e65e3d 100644 (file)
--- a/EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.msa
+++ b/EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.msa
@@ -90,18 +90,26 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </LibraryClassDefinitions>\r
   <SourceFiles>\r
     <Filename>PlatformData.c</Filename>\r
+    <Filename>BdsPlatform.h</Filename>\r
     <Filename>BdsPlatform.c</Filename>\r
+    <Filename>Generic\Bds.h</Filename>\r
     <Filename>Generic\BdsEntry.c</Filename>\r
+    <Filename>Generic\FrontPage.h</Filename>\r
     <Filename>Generic\FrontPage.c</Filename>\r
     <Filename>Generic\FrontPageStrings.uni</Filename>\r
     <Filename>Generic\FrontPageVfr.vfr</Filename>\r
+    <Filename>Generic\Language.h</Filename>\r
     <Filename>Generic\Language.c</Filename>\r
+    <Filename>Generic\String.h</Filename>\r
     <Filename>Generic\String.c</Filename>\r
     <Filename>Generic\Strings.uni</Filename>\r
     <Filename>Generic\Capsules.c</Filename>\r
     <Filename>Generic\MemoryTest.c</Filename>\r
     <Filename>Generic\BootMaint\BmString.uni</Filename>\r
     <Filename>Generic\BootMaint\bm.vfr</Filename>\r
+    <Filename>Generic\BootMaint\BBSsupport.h</Filename>\r
+    <Filename>Generic\BootMaint\BootMaint.h</Filename>\r
+    <Filename>Generic\BootMaint\FormGuid.h</Filename>\r
     <Filename>Generic\BootMaint\BmLib.c</Filename>\r
     <Filename>Generic\BootMaint\BootOption.c</Filename>\r
     <Filename>Generic\BootMaint\ConsoleOption.c</Filename>\r
@@ -112,9 +120,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Filename>Generic\BootMaint\BootMaint.c</Filename>\r
     <Filename>Generic\BootMaint\FileExplorer.c</Filename>\r
     <Filename>Generic\BootMaint\FE.vfr</Filename>\r
+    <Filename>Generic\BootMngr\BootManager.h</Filename>\r
     <Filename>Generic\BootMngr\BootManager.c</Filename>\r
     <Filename>Generic\BootMngr\BootManagerStrings.uni</Filename>\r
     <Filename>Generic\BootMngr\BootManagerVfr.vfr</Filename>\r
+    <Filename>Generic\DeviceMngr\DeviceManager.h</Filename>\r
     <Filename>Generic\DeviceMngr\DeviceManager.c</Filename>\r
     <Filename>Generic\DeviceMngr\DeviceManagerStrings.uni</Filename>\r
     <Filename>Generic\DeviceMngr\DeviceManagerVfr.vfr</Filename>\r

diff --git a/EdkNt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.msa b/EdkNt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.msa
index c0e117afefa538b5cea2f87d1f31403df252fe60..d5147233200acf6e2c07deb1a366a17262dc7144 100644 (file)
--- a/EdkNt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.msa
+++ b/EdkNt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.msa
@@ -67,6 +67,7 @@
     <Filename>BdsConsole.c</Filename>\r
     <Filename>BdsConnect.c</Filename>\r
     <Filename>DevicePath.c</Filename>\r
+    <Filename>Performance.h</Filename>\r
     <Filename>Performance.c</Filename>\r
     <Filename>BdsMisc.c</Filename>\r
     <Filename SupArchList="IPF">Ipf\ShadowRom.c</Filename>\r

diff --git a/EdkNt32Pkg/Pei/MonoStatusCode/MonoStatusCode.msa b/EdkNt32Pkg/Pei/MonoStatusCode/MonoStatusCode.msa
index 87d8529be593dd3c8cf96d52f5b40efad8565f42..bb58d03ec50fbdf0c4126e60f76e56de9fd820ab 100644 (file)
--- a/EdkNt32Pkg/Pei/MonoStatusCode/MonoStatusCode.msa
+++ b/EdkNt32Pkg/Pei/MonoStatusCode/MonoStatusCode.msa
@@ -45,6 +45,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </LibraryClassDefinitions>\r
   <SourceFiles>\r
     <Filename>MonoStatusCode.dxs</Filename>\r
+    <Filename>MonoStatusCode.h</Filename>\r
     <Filename>MonoStatusCode.c</Filename>\r
     <Filename>PlatformStatusCode.c</Filename>\r
   </SourceFiles>\r