clean up MSA/SPD files.

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

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/BlockIo/WinNtBlockIo.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/BlockIo/WinNtBlockIo.msa
index c4446f47b1fdfbc340b4b54458ac93b906f9e8aa..305184531c4fcb4686d6ee7e23db26936d393523 100644 (file)
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/BlockIo/WinNtBlockIo.msa
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/BlockIo/WinNtBlockIo.msa
@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <?xml version="1.0" encoding="UTF-8"?>\r

-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r

   <MsaHeader>\r
     <ModuleName>WinNtBlockIo</ModuleName>\r
     <ModuleType>UEFI_DRIVER</ModuleType>\r
     <GuidValue>F479E147-A125-11d4-BCFC-0080C73C8881</GuidValue>\r
     <Version>1.0</Version>\r
     <Abstract>Block Io driver</Abstract>\r
   <MsaHeader>\r
     <ModuleName>WinNtBlockIo</ModuleName>\r
     <ModuleType>UEFI_DRIVER</ModuleType>\r
     <GuidValue>F479E147-A125-11d4-BCFC-0080C73C8881</GuidValue>\r
     <Version>1.0</Version>\r
     <Abstract>Block Io driver</Abstract>\r

-    <Description>\r
-      Produce block IO abstractions for real devices on your PC using Win32 APIs.\r
+    <Description>Produce block IO abstractions for real devices on your PC using Win32 APIs.\r

       The configuration of what devices to mount or emulate comes from NT\r
       environment variables. The variables must be visible to the Microsoft*\r
       The configuration of what devices to mount or emulate comes from NT\r
       environment variables. The variables must be visible to the Microsoft*\r

-      Developer Studio for them to work.\r
-    </Description>\r
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
+      Developer Studio for them to work.</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
     <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


@@ -45,9 +43,6 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>BaseMemoryLib</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
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiBootServicesTableLib</Keyword>\r
     </LibraryClass>\r


@@ -61,7 +56,6 @@
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r

-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>\r

     <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>\r
   </PackageDependencies>\r
   <Protocols>\r
     <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>\r
   </PackageDependencies>\r
   <Protocols>\r

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Console/WinNtConsole.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Console/WinNtConsole.msa
index 2273adeda4ec4e0ec2d43ec6a44500079b7c42d7..8d8375b9d67c22423d9e18d64ed2b3fa4a625dc8 100644 (file)
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Console/WinNtConsole.msa
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Console/WinNtConsole.msa
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <?xml version="1.0" encoding="UTF-8"?>\r

-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r

   <MsaHeader>\r
     <ModuleName>WinNtConsole</ModuleName>\r
     <ModuleType>UEFI_DRIVER</ModuleType>\r
   <MsaHeader>\r
     <ModuleName>WinNtConsole</ModuleName>\r
     <ModuleType>UEFI_DRIVER</ModuleType>\r


@@ -7,7 +7,7 @@
     <Version>1.0</Version>\r
     <Abstract>Console Dxe driver</Abstract>\r
     <Description>Simulate console with WinAPI</Description>\r
     <Version>1.0</Version>\r
     <Abstract>Console Dxe driver</Abstract>\r
     <Description>Simulate console with WinAPI</Description>\r

-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\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
     <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


@@ -40,9 +40,6 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>BaseMemoryLib</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
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiBootServicesTableLib</Keyword>\r
     </LibraryClass>\r


@@ -56,7 +53,6 @@
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r

-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>\r

     <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>\r
   </PackageDependencies>\r
   <Protocols>\r
     <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>\r
   </PackageDependencies>\r
   <Protocols>\r

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Gop/WinNtGop.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Gop/WinNtGop.msa
index a373ff80b3cb80bd0060e69b7f3b05592624734a..d820d9aea94342f7197dad8a9f7f2bedb096c441 100644 (file)
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Gop/WinNtGop.msa
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Gop/WinNtGop.msa
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>\r

 <ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r
   <MsaHeader>\r
     <ModuleName>WinNtGop</ModuleName>\r
 <ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r
   <MsaHeader>\r
     <ModuleName>WinNtGop</ModuleName>\r


@@ -5,13 +6,11 @@
     <GuidValue>29b3c4c6-e5aa-49e4-8ce0-2772f782ddc2</GuidValue>\r
     <Version>1.0</Version>\r
     <Abstract>Gop Driver</Abstract>\r
     <GuidValue>29b3c4c6-e5aa-49e4-8ce0-2772f782ddc2</GuidValue>\r
     <Version>1.0</Version>\r
     <Abstract>Gop Driver</Abstract>\r

-    <Description>\r
-      GOP is short hand for UEFI Graphics Output protocol.\r
+    <Description>GOP is short hand for UEFI Graphics Output protocol.\r

       This file is a verision of GopIo the uses WinNtThunk system calls as an IO\r
       abstraction. For a PCI device WinNtIo would be replaced with\r
       This file is a verision of GopIo the uses WinNtThunk system calls as an IO\r
       abstraction. For a PCI device WinNtIo would be replaced with\r

-      a PCI IO abstraction that abstracted a specific PCI device.\r
-    </Description>\r
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
+      a PCI IO abstraction that abstracted a specific PCI device.</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
     <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


@@ -44,9 +43,6 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>BaseMemoryLib</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
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiBootServicesTableLib</Keyword>\r
     </LibraryClass>\r


@@ -60,7 +56,6 @@
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r

-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>\r

     <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>\r
   </PackageDependencies>\r
   <Protocols>\r
     <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>\r
   </PackageDependencies>\r
   <Protocols>\r

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SerialIo/WinNtSerialIo.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SerialIo/WinNtSerialIo.msa
index 30b585f8392ee515ee233deb50b3c2c484b38eb6..63614a1d1ac38da49405b0baaa44375e6a4047d5 100644 (file)
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SerialIo/WinNtSerialIo.msa
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SerialIo/WinNtSerialIo.msa
@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <?xml version="1.0" encoding="UTF-8"?>\r

-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r

   <MsaHeader>\r
     <ModuleName>WinNtSerialIo</ModuleName>\r
     <ModuleType>UEFI_DRIVER</ModuleType>\r
     <GuidValue>6B41B553-A649-11d4-BD02-0080C73C8881</GuidValue>\r
     <Version>1.0</Version>\r
     <Abstract>Serial I/O driver</Abstract>\r
   <MsaHeader>\r
     <ModuleName>WinNtSerialIo</ModuleName>\r
     <ModuleType>UEFI_DRIVER</ModuleType>\r
     <GuidValue>6B41B553-A649-11d4-BD02-0080C73C8881</GuidValue>\r
     <Version>1.0</Version>\r
     <Abstract>Serial I/O driver</Abstract>\r

-    <Description>\r
-      Our DriverBinding member functions operate on the handles\r
-      created by the NT Bus drive\r
-    </Description>\r
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
+    <Description>Our DriverBinding member functions operate on the handles\r
+      created by the NT Bus drive</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
     <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


@@ -43,9 +41,6 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>BaseMemoryLib</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
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiBootServicesTableLib</Keyword>\r
     </LibraryClass>\r


@@ -60,7 +55,6 @@
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r

-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>\r

     <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>\r
   </PackageDependencies>\r
   <Protocols>\r
     <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>\r
   </PackageDependencies>\r
   <Protocols>\r

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SimpleFileSystem/WinNtSimpleFileSystem.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SimpleFileSystem/WinNtSimpleFileSystem.msa
index ed41b4567e808e5f4fcd1a5ffee7666672836978..725d7d0dd29e3e2a6860db452e6c99af7df49e17 100644 (file)
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SimpleFileSystem/WinNtSimpleFileSystem.msa
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SimpleFileSystem/WinNtSimpleFileSystem.msa
@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <?xml version="1.0" encoding="UTF-8"?>\r

-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r

   <MsaHeader>\r
     <ModuleName>WinNtSimpleFileSystem</ModuleName>\r
     <ModuleType>UEFI_DRIVER</ModuleType>\r
     <GuidValue>9C25E18B-76BA-43da-A132-DBB0997CEFEF</GuidValue>\r
     <Version>1.0</Version>\r
     <Abstract>Simple filesystem driver</Abstract>\r
   <MsaHeader>\r
     <ModuleName>WinNtSimpleFileSystem</ModuleName>\r
     <ModuleType>UEFI_DRIVER</ModuleType>\r
     <GuidValue>9C25E18B-76BA-43da-A132-DBB0997CEFEF</GuidValue>\r
     <Version>1.0</Version>\r
     <Abstract>Simple filesystem driver</Abstract>\r

-    <Description>\r
-      Produce Simple File System abstractions for directories on your PC using Win32 APIs.\r
+    <Description>Produce Simple File System abstractions for directories on your PC using Win32 APIs.\r

       The configuration of what devices to mount or emulate comes from NT\r
       environment variables. The variables must be visible to the Microsoft*\r
       The configuration of what devices to mount or emulate comes from NT\r
       environment variables. The variables must be visible to the Microsoft*\r

-      Developer Studio for them to work.\r
-    </Description>\r
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
+      Developer Studio for them to work.</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
     <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


@@ -45,9 +43,6 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>BaseMemoryLib</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
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiBootServicesTableLib</Keyword>\r
     </LibraryClass>\r


@@ -59,7 +54,6 @@
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r

-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>\r

     <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>\r
   </PackageDependencies>\r
   <Protocols>\r
     <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>\r
   </PackageDependencies>\r
   <Protocols>\r

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/WinNtUga.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/WinNtUga.msa
index 0168f36b9978bc7ef96af35815221c4ff17ba8d0..13c38296c35bb8d7e5214f125ebcba0671b03819 100644 (file)
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/WinNtUga.msa
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/WinNtUga.msa
@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <?xml version="1.0" encoding="UTF-8"?>\r

-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r

   <MsaHeader>\r
     <ModuleName>WinNtUga</ModuleName>\r
     <ModuleType>UEFI_DRIVER</ModuleType>\r
     <GuidValue>AB248E8D-ABE1-11d4-BD0D-0080C73C8881</GuidValue>\r
     <Version>1.0</Version>\r
     <Abstract>Uga driver</Abstract>\r
   <MsaHeader>\r
     <ModuleName>WinNtUga</ModuleName>\r
     <ModuleType>UEFI_DRIVER</ModuleType>\r
     <GuidValue>AB248E8D-ABE1-11d4-BD0D-0080C73C8881</GuidValue>\r
     <Version>1.0</Version>\r
     <Abstract>Uga driver</Abstract>\r

-    <Description>\r
-      UGA is short hand for Universal Graphics Abstraction protocol.\r
+    <Description>UGA is short hand for Universal Graphics Abstraction protocol.\r

       This file is a verision of UgaIo the uses WinNtThunk system calls as an IO\r
       abstraction. For a PCI device WinNtIo would be replaced with\r
       This file is a verision of UgaIo the uses WinNtThunk system calls as an IO\r
       abstraction. For a PCI device WinNtIo would be replaced with\r

-      a PCI IO abstraction that abstracted a specific PCI device.\r
-    </Description>\r
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
+      a PCI IO abstraction that abstracted a specific PCI device.</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
     <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


@@ -30,9 +28,6 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>DebugLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>DebugLib</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>BaseLib</Keyword>\r
-    </LibraryClass>\r

     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiDriverModelLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiDriverModelLib</Keyword>\r
     </LibraryClass>\r


@@ -45,9 +40,6 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>BaseMemoryLib</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
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiBootServicesTableLib</Keyword>\r
     </LibraryClass>\r


@@ -61,7 +53,6 @@
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r

-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>\r

     <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>\r
   </PackageDependencies>\r
   <Protocols>\r
     <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>\r
   </PackageDependencies>\r
   <Protocols>\r

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.c b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.c
index 5eddc08bb420750a13233b1bd0cbe5f9b3c458b4..bc4822d7247dc3aebc55c6f675df8d6ee69143d4 100644 (file)
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.c
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.c
@@ -1,13 +1,13 @@
 /*+++\r
 \r
 /*+++\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
+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
 \r
 Module Name:\r
 \r


@@ -15,12 +15,12 @@ Module Name:
 \r
 Abstract:\r
 \r
 \r
 Abstract:\r
 \r

-This following section documents the envirnoment variables for the Win NT \r
-build.  These variables are used to define the (virtual) hardware \r
+This following section documents the envirnoment variables for the Win NT\r
+build.  These variables are used to define the (virtual) hardware\r

 configuration of the NT environment\r
 \r
 configuration of the NT environment\r
 \r

-A ! can be used to seperate multiple instances in a variable. Each \r
-instance represents a seperate hardware device. \r
+A ! can be used to seperate multiple instances in a variable. Each\r
+instance represents a seperate hardware device.\r

 \r
 EFI_WIN_NT_PHYSICAL_DISKS - maps to drives on your system\r
 EFI_WIN_NT_VIRTUAL_DISKS  - maps to a device emulated by a file\r
 \r
 EFI_WIN_NT_PHYSICAL_DISKS - maps to drives on your system\r
 EFI_WIN_NT_VIRTUAL_DISKS  - maps to a device emulated by a file\r


@@ -36,20 +36,20 @@ EFI_WIN_NT_SERIAL_PORT    - maps physical serial ports
  <block count> - Decimal number of blocks a device supports.\r
  <block size>  - Decimal number of bytes per block.\r
 \r
  <block count> - Decimal number of blocks a device supports.\r
  <block size>  - Decimal number of bytes per block.\r
 \r

- NT envirnonment variable contents. '<' and '>' are not part of the variable, \r
- they are just used to make this help more readable. There should be no \r
- spaces between the ';'. Extra spaces will break the variable. A '!' is  \r
+ NT envirnonment variable contents. '<' and '>' are not part of the variable,\r
+ they are just used to make this help more readable. There should be no\r
+ spaces between the ';'. Extra spaces will break the variable. A '!' is\r

  used to seperate multiple devices in a variable.\r
 \r
  used to seperate multiple devices in a variable.\r
 \r

- EFI_WIN_NT_VIRTUAL_DISKS = \r
+ EFI_WIN_NT_VIRTUAL_DISKS =\r

    <F | R><O | W>;<block count>;<block size>[!...]\r
 \r
  EFI_WIN_NT_PHYSICAL_DISKS =\r
    <drive letter>:<F | R><O | W>;<block count>;<block size>[!...]\r
 \r
  Virtual Disks: These devices use a file to emulate a hard disk or removable\r
    <F | R><O | W>;<block count>;<block size>[!...]\r
 \r
  EFI_WIN_NT_PHYSICAL_DISKS =\r
    <drive letter>:<F | R><O | W>;<block count>;<block size>[!...]\r
 \r
  Virtual Disks: These devices use a file to emulate a hard disk or removable\r

-                media device. \r
-                \r
+                media device.\r
+\r

    Thus a 20 MB emulated hard drive would look like:\r
    EFI_WIN_NT_VIRTUAL_DISKS=FW;40960;512\r
 \r
    Thus a 20 MB emulated hard drive would look like:\r
    EFI_WIN_NT_VIRTUAL_DISKS=FW;40960;512\r
 \r


@@ -64,25 +64,25 @@ EFI_WIN_NT_SERIAL_PORT    - maps physical serial ports
    Thus a standard CD-ROM floppy would look like:\r
    EFI_WIN_NT_PHYSICAL_DISKS=Z:RO;307200;2048\r
 \r
    Thus a standard CD-ROM floppy would look like:\r
    EFI_WIN_NT_PHYSICAL_DISKS=Z:RO;307200;2048\r
 \r

- EFI_WIN_NT_FILE_SYSTEM = \r
+ EFI_WIN_NT_FILE_SYSTEM =\r

    <directory path>[!...]\r
 \r
    Mounting the two directories C:\FOO and C:\BAR would look like:\r
    EFI_WIN_NT_FILE_SYSTEM=c:\foo!c:\bar\r
 \r
    <directory path>[!...]\r
 \r
    Mounting the two directories C:\FOO and C:\BAR would look like:\r
    EFI_WIN_NT_FILE_SYSTEM=c:\foo!c:\bar\r
 \r

- EFI_WIN_NT_CONSOLE = \r
+ EFI_WIN_NT_CONSOLE =\r

    <window title>\r
 \r
    Declaring a text console window with the title "My EFI Console" woild look like:\r
    EFI_WIN_NT_CONSOLE=My EFI Console\r
 \r
    <window title>\r
 \r
    Declaring a text console window with the title "My EFI Console" woild look like:\r
    EFI_WIN_NT_CONSOLE=My EFI Console\r
 \r

- EFI_WIN_NT_UGA = \r
+ EFI_WIN_NT_UGA =\r

    <width> <height>[!...]\r
 \r
    Declaring a two UGA windows with resolutions of 800x600 and 1024x768 would look like:\r
    Example : EFI_WIN_NT_UGA=800 600!1024 768\r
 \r
    <width> <height>[!...]\r
 \r
    Declaring a two UGA windows with resolutions of 800x600 and 1024x768 would look like:\r
    Example : EFI_WIN_NT_UGA=800 600!1024 768\r
 \r

- EFI_WIN_NT_SERIAL_PORT = \r
+ EFI_WIN_NT_SERIAL_PORT =\r

    <port name>[!...]\r
 \r
    Declaring two serial ports on COM1 and COM2 would look like:\r
    <port name>[!...]\r
 \r
    Declaring two serial ports on COM1 and COM2 would look like:\r


@@ -98,15 +98,8 @@ EFI_WIN_NT_SERIAL_PORT    - maps physical serial ports
 ---*/\r
 \r
 #include "WinNtBusDriver.h"\r
 ---*/\r
 \r
 #include "WinNtBusDriver.h"\r

-//#include "PciHostBridge.h"\r
-\r
-//\r
-// Define GUID for the WinNt Bus Driver\r
-//\r
-static EFI_GUID gWinNtBusDriverGuid = {\r
-  0x419f582, 0x625, 0x4531, 0x8a, 0x33, 0x85, 0xa9, 0x96, 0x5c, 0x95, 0xbc\r
-};\r

 \r
 \r

+extern EFI_GUID gWinNtBusDriverGuid;\r

 //\r
 // DriverBinding protocol global\r
 //\r
 //\r
 // DriverBinding protocol global\r
 //\r


@@ -213,7 +206,7 @@ Returns:
       return EFI_UNSUPPORTED;\r
     }\r
   }\r
       return EFI_UNSUPPORTED;\r
     }\r
   }\r

-  \r
+\r

   //\r
   // Open the IO Abstraction(s) needed to perform the supported test\r
   //\r
   //\r
   // Open the IO Abstraction(s) needed to perform the supported test\r
   //\r


@@ -699,7 +692,7 @@ Arguments:
 \r
 Returns:\r
 \r
 \r
 Returns:\r
 \r

-  EFI_DEVICE_PATH_PROTOCOL \r
+  EFI_DEVICE_PATH_PROTOCOL\r

 \r
 --*/\r
 {\r
 \r
 --*/\r
 {\r

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.msa
index fb5615dda253b72e337df49cc60135a9197db2c4..2e24262547713fd817190c715bfcc0d6a2aa021a 100644 (file)
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.msa
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.msa
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <?xml version="1.0" encoding="UTF-8"?>\r

-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r

   <MsaHeader>\r
     <ModuleName>WinNtBusDriver</ModuleName>\r
     <ModuleType>UEFI_DRIVER</ModuleType>\r
     <GuidValue>BD7E9A27-D6C5-416a-B245-5F507D95B2BD</GuidValue>\r
     <Version>1.0</Version>\r
     <Abstract>Win NT Bus driver</Abstract>\r
   <MsaHeader>\r
     <ModuleName>WinNtBusDriver</ModuleName>\r
     <ModuleType>UEFI_DRIVER</ModuleType>\r
     <GuidValue>BD7E9A27-D6C5-416a-B245-5F507D95B2BD</GuidValue>\r
     <Version>1.0</Version>\r
     <Abstract>Win NT Bus driver</Abstract>\r

-    <Description>\r
-      This following section documents the envirnoment variables for the Win NT\r
+    <Description>This following section documents the envirnoment variables for the Win NT\r

       build.  These variables are used to define the (virtual) hardware\r
       build.  These variables are used to define the (virtual) hardware\r

-      configuration of the NT environment\r
-    </Description>\r
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
+      configuration of the NT environment</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
     <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


@@ -47,9 +45,6 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>BaseMemoryLib</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
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiBootServicesTableLib</Keyword>\r
     </LibraryClass>\r


@@ -64,7 +59,6 @@
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r

-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>\r

     <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>\r
   </PackageDependencies>\r
   <Protocols>\r
     <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>\r
   </PackageDependencies>\r
   <Protocols>\r


@@ -77,9 +71,6 @@
     <Protocol Usage="TO_START">\r
       <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>\r
     </Protocol>\r
     <Protocol Usage="TO_START">\r
       <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>\r
     </Protocol>\r

-    <Protocol Usage="ALWAYS_CONSUMED">\r
-      <ProtocolCName>gPcdProtocolGuid</ProtocolCName>\r
-    </Protocol>\r

   </Protocols>\r
   <Guids>\r
     <GuidCNames Usage="ALWAYS_CONSUMED">\r
   </Protocols>\r
   <Guids>\r
     <GuidCNames Usage="ALWAYS_CONSUMED">\r


@@ -112,6 +103,9 @@
     <GuidCNames Usage="ALWAYS_CONSUMED">\r
       <GuidCName>gEfiWinNtCPUSpeedGuid</GuidCName>\r
     </GuidCNames>\r
     <GuidCNames Usage="ALWAYS_CONSUMED">\r
       <GuidCName>gEfiWinNtCPUSpeedGuid</GuidCName>\r
     </GuidCNames>\r

+    <GuidCNames Usage="ALWAYS_CONSUMED">\r
+      <GuidCName>gWinNtBusDriverGuid</GuidCName>\r
+    </GuidCNames>\r

   </Guids>\r
   <Externs>\r
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r
   </Guids>\r
   <Externs>\r
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r


@@ -121,69 +115,4 @@
       <ComponentName>gWinNtBusDriverComponentName</ComponentName>\r
     </Extern>\r
   </Externs>\r
       <ComponentName>gWinNtBusDriverComponentName</ComponentName>\r
     </Extern>\r
   </Externs>\r

-  <PcdCoded>\r
-    <PcdEntry PcdItemType="DYNAMIC">\r
-      <C_Name>PcdWinNtConsole</C_Name>\r
-      <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-      <HelpText>This PCD declares the title string of the text console window.\r
-        such as "My EFI Console".\r
-        The item type of this PCD can only be "DYNAMIC".</HelpText>\r
-    </PcdEntry>\r
-    <PcdEntry PcdItemType="DYNAMIC">\r
-      <C_Name>PcdWinNtUga</C_Name>\r
-      <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-      <HelpText>This PCD declares the resolutions for the UGA windows.\r
-        The item type of this PCD can only be "DYNAMIC".</HelpText>\r
-    </PcdEntry>\r
-    <PcdEntry PcdItemType="DYNAMIC">\r
-      <C_Name>PcdWinNtGop</C_Name>\r
-      <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-      <HelpText>This PCD declares the resolutions for the GOP windows.\r
-        The item type of this PCD can only be "DYNAMIC".</HelpText>\r
-    </PcdEntry>\r
-    <PcdEntry PcdItemType="DYNAMIC">\r
-      <C_Name>PcdWinNtSerialPort</C_Name>\r
-      <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-      <HelpText>This Pcd declares two serial port for simulated environment.\r
-        The item type of this PCD can only be "DYNAMIC".</HelpText>\r
-    </PcdEntry>\r
-    <PcdEntry PcdItemType="DYNAMIC">\r
-      <C_Name>PcdWinNtFileSystem</C_Name>\r
-      <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-      <HelpText>This PCD defines the windows directory who will be mounted as\r
-        harddisk in simulator.\r
-        The item type of this PCD can only be "DYNAMIC".</HelpText>\r
-    </PcdEntry>\r
-    <PcdEntry PcdItemType="DYNAMIC">\r
-      <C_Name>PcdWinNtVirtualDisk</C_Name>\r
-      <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-      <HelpText>This PCD defines the devices which use a file to emulate a hard disk or\r
-        removable media device\r
-        The item type if this PCD can only be "DYNAMIC".</HelpText>\r
-    </PcdEntry>\r
-    <PcdEntry PcdItemType="DYNAMIC">\r
-      <C_Name>PcdWinNtPhysicalDisk</C_Name>\r
-      <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-      <HelpText>This PCD defines physical disk which will be simualted as a\r
-        harddisk in simulator.\r
-        The item type of this PCD can only be "DYNAMIC".</HelpText>\r
-    </PcdEntry>\r
-    <PcdEntry PcdItemType="DYNAMIC">\r
-      <C_Name>PcdWinNtCpuModel</C_Name>\r
-      <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-      <HelpText>This PCD defines simulated CPU model string.\r
-        The item type of this PCD can only be "DYNAMIC".</HelpText>\r
-    </PcdEntry>\r
-    <PcdEntry PcdItemType="DYNAMIC">\r
-      <C_Name>PcdWinNtCpuSpeed</C_Name>\r
-      <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-      <HelpText>This PCD defines simulated CPU speed string.</HelpText>\r
-    </PcdEntry>\r
-    <PcdEntry PcdItemType="DYNAMIC">\r
-      <C_Name>PcdWinNtMemorySize</C_Name>\r
-      <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-      <HelpText>This PCD defines the size of simulated memory size.\r
-        The item type of this PCD can only be "DYNAMIC".</HelpText>\r
-    </PcdEntry>\r
-  </PcdCoded>\r

 </ModuleSurfaceArea>
\ No newline at end of file
 </ModuleSurfaceArea>
\ No newline at end of file

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Metronome/Metronome.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Metronome/Metronome.msa
index 56de8a41fd738ee03882e81a812e65e910ca6dbf..b0b3d81830422d993c09f55d3c202d4ddd6870cc 100644 (file)
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Metronome/Metronome.msa
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Metronome/Metronome.msa
@@ -7,7 +7,7 @@
     <Version>1.0</Version>\r
     <Abstract>NT Emulation Metronome Architectural Protocol Driver as defined in DXE CIS</Abstract>\r
     <Description>This metronome module simulates metronome by Sleep WinAPI.</Description>\r
     <Version>1.0</Version>\r
     <Abstract>NT Emulation Metronome Architectural Protocol Driver as defined in DXE CIS</Abstract>\r
     <Description>This metronome module simulates metronome by Sleep WinAPI.</Description>\r

-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
+    <Copyright>Copyright (c) 2006 - 2007, 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
     <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


@@ -45,7 +45,6 @@
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r

-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>\r

     <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>\r
   </PackageDependencies>\r
   <Protocols>\r
     <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>\r
   </PackageDependencies>\r
   <Protocols>\r

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/RealTimeClock/RealTimeClock.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/RealTimeClock/RealTimeClock.msa
index e03c080d5cdfda192c9af1d75174de1e8605162d..45d0e6dba8d6d2006924096f51e5ec34d5e0a436 100644 (file)
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/RealTimeClock/RealTimeClock.msa
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/RealTimeClock/RealTimeClock.msa
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <?xml version="1.0" encoding="UTF-8"?>\r

-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r

   <MsaHeader>\r
     <ModuleName>RealTimeClock</ModuleName>\r
     <ModuleType>DXE_DRIVER</ModuleType>\r
     <GuidValue>27F05AF5-1644-4EF4-8944-48C4F75675A0</GuidValue>\r
     <Version>1.0</Version>\r
     <Abstract>NT Emulation Real time clock Architectural Protocol Driver as defined in TIANO</Abstract>\r
   <MsaHeader>\r
     <ModuleName>RealTimeClock</ModuleName>\r
     <ModuleType>DXE_DRIVER</ModuleType>\r
     <GuidValue>27F05AF5-1644-4EF4-8944-48C4F75675A0</GuidValue>\r
     <Version>1.0</Version>\r
     <Abstract>NT Emulation Real time clock Architectural Protocol Driver as defined in TIANO</Abstract>\r

-    <Description>\r
-      This real time clock module simulates virtual device by time WinAPI.\r
-    </Description>\r
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
+    <Description>This real time clock module simulates virtual device by time WinAPI.</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
     <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


@@ -24,24 +22,15 @@
     <OutputFileBasename>RealTimeClock</OutputFileBasename>\r
   </ModuleDefinitions>\r
   <LibraryClassDefinitions>\r
     <OutputFileBasename>RealTimeClock</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
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>DebugLib</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>UefiLib</Keyword>\r
-    </LibraryClass>\r

     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiDriverEntryPoint</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>WinNtLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiDriverEntryPoint</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>WinNtLib</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
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiBootServicesTableLib</Keyword>\r
     </LibraryClass>\r


@@ -52,7 +41,6 @@
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r

-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>\r

     <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>\r
   </PackageDependencies>\r
   <Protocols>\r
     <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>\r
   </PackageDependencies>\r
   <Protocols>\r

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Reset/Reset.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Reset/Reset.msa
index a4acc6cc7a52790f9a2c9ba070180859764d80d7..6c03ec37639d77289e57a7990b5b0b9176539537 100644 (file)
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Reset/Reset.msa
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Reset/Reset.msa
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <?xml version="1.0" encoding="UTF-8"?>\r

-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r

   <MsaHeader>\r
     <ModuleName>Reset</ModuleName>\r
     <ModuleType>DXE_DRIVER</ModuleType>\r
     <GuidValue>BA929954-35B0-4dd3-90CD-9634BD7E1CF1</GuidValue>\r
     <Version>1.0</Version>\r
     <Abstract>NT Emulation Reset Architectural Protocol Driver as defined in TIANO</Abstract>\r
   <MsaHeader>\r
     <ModuleName>Reset</ModuleName>\r
     <ModuleType>DXE_DRIVER</ModuleType>\r
     <GuidValue>BA929954-35B0-4dd3-90CD-9634BD7E1CF1</GuidValue>\r
     <Version>1.0</Version>\r
     <Abstract>NT Emulation Reset Architectural Protocol Driver as defined in TIANO</Abstract>\r

-    <Description>\r
-      This Reset module simulates system reset by process exit on NT.\r
-    </Description>\r
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
+    <Description>This Reset module simulates system reset by process exit on NT.</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
     <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


@@ -24,24 +22,15 @@
     <OutputFileBasename>Reset</OutputFileBasename>\r
   </ModuleDefinitions>\r
   <LibraryClassDefinitions>\r
     <OutputFileBasename>Reset</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
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>DebugLib</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>UefiLib</Keyword>\r
-    </LibraryClass>\r

     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiDriverEntryPoint</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>WinNtLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiDriverEntryPoint</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>WinNtLib</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
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiBootServicesTableLib</Keyword>\r
     </LibraryClass>\r


@@ -52,7 +41,6 @@
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r

-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>\r

     <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>\r
   </PackageDependencies>\r
   <Protocols>\r
     <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>\r
   </PackageDependencies>\r
   <Protocols>\r

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Timer/Timer.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Timer/Timer.msa
index 34fecc9a4f4dda28519bfe134fd7069960e4a080..f163548f4ed1209c7aed9476cd65ef29bc2a06d1 100644 (file)
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Timer/Timer.msa
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Timer/Timer.msa
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <?xml version="1.0" encoding="UTF-8"?>\r

-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r

   <MsaHeader>\r
     <ModuleName>Timer</ModuleName>\r
     <ModuleType>DXE_DRIVER</ModuleType>\r
     <GuidValue>C3811036-710B-4E39-8CF1-0AF9BE3A8198</GuidValue>\r
     <Version>1.0</Version>\r
     <Abstract>NT Emulation Timer Architectural Protocol Driver as defined in DXE CIS</Abstract>\r
   <MsaHeader>\r
     <ModuleName>Timer</ModuleName>\r
     <ModuleType>DXE_DRIVER</ModuleType>\r
     <GuidValue>C3811036-710B-4E39-8CF1-0AF9BE3A8198</GuidValue>\r
     <Version>1.0</Version>\r
     <Abstract>NT Emulation Timer Architectural Protocol Driver as defined in DXE CIS</Abstract>\r

-    <Description>\r
-      This Timer module uses an NT Thread to simulate the timer-tick driven\r
+    <Description>This Timer module uses an NT Thread to simulate the timer-tick driven\r

       timer service.  In the future, the Thread creation should possibly be \r
       timer service.  In the future, the Thread creation should possibly be \r

-      abstracted by the CPU architectural protocol\r
-    </Description>\r
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
+      abstracted by the CPU architectural protocol</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
     <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


@@ -26,24 +24,15 @@
     <OutputFileBasename>Timer</OutputFileBasename>\r
   </ModuleDefinitions>\r
   <LibraryClassDefinitions>\r
     <OutputFileBasename>Timer</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
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>DebugLib</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>UefiLib</Keyword>\r
-    </LibraryClass>\r

     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiDriverEntryPoint</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>WinNtLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiDriverEntryPoint</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>WinNtLib</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
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiBootServicesTableLib</Keyword>\r
     </LibraryClass>\r


@@ -55,7 +44,6 @@
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r

-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>\r

     <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>\r
   </PackageDependencies>\r
   <Protocols>\r
     <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>\r
   </PackageDependencies>\r
   <Protocols>\r

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.msa
index cb4d0b07c4e36e981157fdeb3271dc7c1b4a15ef..b96caa2cf35d95457b649f3ea532f1d78a869ff4 100644 (file)
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.msa
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.msa
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <?xml version="1.0" encoding="UTF-8"?>\r

-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r

   <MsaHeader>\r
     <ModuleName>Cpu</ModuleName>\r
     <ModuleType>DXE_DRIVER</ModuleType>\r
   <MsaHeader>\r
     <ModuleName>Cpu</ModuleName>\r
     <ModuleType>DXE_DRIVER</ModuleType>\r


@@ -7,7 +7,7 @@
     <Version>1.0</Version>\r
     <Abstract>Component description file for Cpu module.</Abstract>\r
     <Description>This CPU module abstracts the interrupt subsystem of a platform and the CPU-specific setjump-long pair.</Description>\r
     <Version>1.0</Version>\r
     <Abstract>Component description file for Cpu module.</Abstract>\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, Intel Corporation</Copyright>\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
     <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


@@ -22,18 +22,12 @@
     <OutputFileBasename>Cpu</OutputFileBasename>\r
   </ModuleDefinitions>\r
   <LibraryClassDefinitions>\r
     <OutputFileBasename>Cpu</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
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>HiiLib</Keyword>\r
     </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>UefiLib</Keyword>\r
-    </LibraryClass>\r

     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiDriverEntryPoint</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiDriverEntryPoint</Keyword>\r
     </LibraryClass>\r


@@ -56,7 +50,6 @@
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r

-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>\r

     <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>\r
   </PackageDependencies>\r
   <Protocols>\r
     <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>\r
   </PackageDependencies>\r
   <Protocols>\r


@@ -66,6 +59,9 @@
     <Protocol Usage="ALWAYS_PRODUCED">\r
       <ProtocolCName>gEfiCpuIoProtocolGuid</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>gEfiHiiProtocolGuid</ProtocolCName>\r
     </Protocol>\r

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/WinNtThunk/WinNtThunk.msa b/EdkNt32Pkg/Dxe/WinNtThunk/WinNtThunk/WinNtThunk.msa
index 158a43d07acddee5954fe69d7b7b2684410bdccf..5f79138e799a01445d102c1005284cb9a1f4f200 100644 (file)
--- a/EdkNt32Pkg/Dxe/WinNtThunk/WinNtThunk/WinNtThunk.msa
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/WinNtThunk/WinNtThunk.msa
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <?xml version="1.0" encoding="UTF-8"?>\r

-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r

   <MsaHeader>\r
     <ModuleName>WinNtThunk</ModuleName>\r
     <ModuleType>DXE_DRIVER</ModuleType>\r
   <MsaHeader>\r
     <ModuleName>WinNtThunk</ModuleName>\r
     <ModuleType>DXE_DRIVER</ModuleType>\r


@@ -7,7 +7,7 @@
     <Version>1.0</Version>\r
     <Abstract>A DXE driver to produce EFI_WIN_NT_THUNK_PROTOCOL</Abstract>\r
     <Description>EFI_WIN_NT_THUNK_PROTOCOL is a table of pointers to various Windows APIs used by various drivers to accomplish certain task in an NT32 emulator.</Description>\r
     <Version>1.0</Version>\r
     <Abstract>A DXE driver to produce EFI_WIN_NT_THUNK_PROTOCOL</Abstract>\r
     <Description>EFI_WIN_NT_THUNK_PROTOCOL is a table of pointers to various Windows APIs used by various drivers to accomplish certain task in an NT32 emulator.</Description>\r

-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\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
     <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


@@ -25,18 +25,12 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>DebugLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>DebugLib</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>UefiLib</Keyword>\r
-    </LibraryClass>\r

     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiDriverEntryPoint</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>WinNtLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiDriverEntryPoint</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>WinNtLib</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
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiBootServicesTableLib</Keyword>\r
     </LibraryClass>\r


@@ -48,7 +42,6 @@
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r

-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>\r

     <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>\r
   </PackageDependencies>\r
   <Protocols>\r
     <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>\r
   </PackageDependencies>\r
   <Protocols>\r

diff --git a/EdkNt32Pkg/EdkNt32Pkg.spd b/EdkNt32Pkg/EdkNt32Pkg.spd
index 2044857192d427b68c967b868d3861c903f7b419..614a3994d048fdf450b85a8cf48a0f6e9e867bb2 100644 (file)
--- a/EdkNt32Pkg/EdkNt32Pkg.spd
+++ b/EdkNt32Pkg/EdkNt32Pkg.spd
@@ -1,24 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>\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
+<PackageSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r

   <SpdHeader>\r
     <PackageName>EdkNt32Pkg</PackageName>\r
     <GuidValue>0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3</GuidValue>\r
     <Version>0.3</Version>\r
     <Abstract>This is the NT32 Emulation Environment Platform</Abstract>\r
     <Description>Reference platform implementation using an emulator.</Description>\r
   <SpdHeader>\r
     <PackageName>EdkNt32Pkg</PackageName>\r
     <GuidValue>0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3</GuidValue>\r
     <Version>0.3</Version>\r
     <Abstract>This is the NT32 Emulation Environment Platform</Abstract>\r
     <Description>Reference platform implementation using an emulator.</Description>\r

-    <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>\r
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation.</Copyright>\r

     <License>All rights reserved.
     <License>All rights reserved.

-      This program and the accompanying materials are licensed and made available 
+      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
       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


@@ -134,7 +124,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <C_Name>gEfiEdkNt32PkgTokenSpaceGuid</C_Name>\r
       <GuidValue>0D79A645-1D91-40a6-A81F-61E6982B32B4</GuidValue>\r
       <HelpText>All PCD define in EdkNt32Pkg is in this token space scope</HelpText>\r
       <C_Name>gEfiEdkNt32PkgTokenSpaceGuid</C_Name>\r
       <GuidValue>0D79A645-1D91-40a6-A81F-61E6982B32B4</GuidValue>\r
       <HelpText>All PCD define in EdkNt32Pkg is in this token space scope</HelpText>\r

-    </Entry>  \r
+    </Entry>\r

     <Entry Name="WinNtVirtualDisks">\r
       <C_Name>gEfiWinNtVirtualDisksGuid</C_Name>\r
       <GuidValue>0C95A928-A006-11D4-BCFA-0080C73C8881</GuidValue>\r
     <Entry Name="WinNtVirtualDisks">\r
       <C_Name>gEfiWinNtVirtualDisksGuid</C_Name>\r
       <GuidValue>0C95A928-A006-11D4-BCFA-0080C73C8881</GuidValue>\r


@@ -195,6 +185,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <GuidValue>582E7CA1-68CD-4D44-B43B-F298ED587BA6</GuidValue>\r
       <HelpText/>\r
     </Entry>\r
       <GuidValue>582E7CA1-68CD-4D44-B43B-F298ED587BA6</GuidValue>\r
       <HelpText/>\r
     </Entry>\r

+    <Entry Name="WinNtBusDriver">\r
+      <C_Name>gWinNtBusDriverGuid</C_Name>\r
+      <GuidValue>0419f582-0625-4531-8a33-85a9965c95bc</GuidValue>\r
+      <HelpText/>\r
+    </Entry>\r

   </GuidDeclarations>\r
   <ProtocolDeclarations>\r
     <Entry Name="WinNtIo">\r
   </GuidDeclarations>\r
   <ProtocolDeclarations>\r
     <Entry Name="WinNtIo">\r


@@ -238,7 +233,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <DatumType>VOID*</DatumType>\r
       <ValidUsage>DYNAMIC</ValidUsage>\r
       <DefaultValue>L"E:RW;245760;512"</DefaultValue>\r
       <DatumType>VOID*</DatumType>\r
       <ValidUsage>DYNAMIC</ValidUsage>\r
       <DefaultValue>L"E:RW;245760;512"</DefaultValue>\r

-      <HelpText>This PCD defines physical disk which will be simualted as a \r
+      <HelpText>This PCD defines physical disk which will be simualted as a\r

         harddisk in simulator. The item type of this PCD can only be "DYNAMIC".</HelpText>\r
     </PcdEntry>\r
     <PcdEntry>\r
         harddisk in simulator. The item type of this PCD can only be "DYNAMIC".</HelpText>\r
     </PcdEntry>\r
     <PcdEntry>\r


@@ -248,7 +243,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <DatumType>VOID*</DatumType>\r
       <ValidUsage>DYNAMIC</ValidUsage>\r
       <DefaultValue>L"FW;40960;512"</DefaultValue>\r
       <DatumType>VOID*</DatumType>\r
       <ValidUsage>DYNAMIC</ValidUsage>\r
       <DefaultValue>L"FW;40960;512"</DefaultValue>\r

-      <HelpText>This PCD defines the devices which use a file to emulate a hard disk or \r
+      <HelpText>This PCD defines the devices which use a file to emulate a hard disk or\r

         removable media device.The item type of this PCD can only be "DYNAMIC".</HelpText>\r
     </PcdEntry>\r
     <PcdEntry>\r
         removable media device.The item type of this PCD can only be "DYNAMIC".</HelpText>\r
     </PcdEntry>\r
     <PcdEntry>\r


@@ -278,7 +273,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <DatumType>VOID*</DatumType>\r
       <ValidUsage>DYNAMIC</ValidUsage>\r
       <DefaultValue>L".!..\\..\\..\\..\\..\\EdkShellBinPkg\\bin\\ia32\\Apps"</DefaultValue>\r
       <DatumType>VOID*</DatumType>\r
       <ValidUsage>DYNAMIC</ValidUsage>\r
       <DefaultValue>L".!..\\..\\..\\..\\..\\EdkShellBinPkg\\bin\\ia32\\Apps"</DefaultValue>\r

-      <HelpText>This PCD defines the windows directory who will be mounted as \r
+      <HelpText>This PCD defines the windows directory who will be mounted as\r

         harddisk in simulator.\r
         The item type of this PCD can only be "DYNAMIC".</HelpText>\r
     </PcdEntry>\r
         harddisk in simulator.\r
         The item type of this PCD can only be "DYNAMIC".</HelpText>\r
     </PcdEntry>\r


@@ -300,7 +295,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <DatumType>UINT32</DatumType>\r
       <ValidUsage>FIXED_AT_BUILD PATCHABLE_IN_MODULE</ValidUsage>\r
       <DefaultValue>1</DefaultValue>\r
       <DatumType>UINT32</DatumType>\r
       <ValidUsage>FIXED_AT_BUILD PATCHABLE_IN_MODULE</ValidUsage>\r
       <DefaultValue>1</DefaultValue>\r

-      <HelpText>This PCD defines the boot mode for simualtor. \r
+      <HelpText>This PCD defines the boot mode for simualtor.\r

         The boot mode can be set as following value:\r
           0x0:  Boot with full configuration.\r
           0x1:  Boot with minimal configuration.\r
         The boot mode can be set as following value:\r
           0x0:  Boot with full configuration.\r
           0x1:  Boot with minimal configuration.\r


@@ -309,7 +304,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           0x4:  Boot with default settings.\r
           0x5:  Boot on S4 resume.\r
           0x6:  Boot on S5 resume.\r
           0x4:  Boot with default settings.\r
           0x5:  Boot on S4 resume.\r
           0x6:  Boot on S5 resume.\r

-          0x10: Boot on S2 resume. \r
+          0x10: Boot on S2 resume.\r

           0x11: Boot on S3 resume.\r
           0x12: Boot on flash update.\r
           0x20: Boot in reovery mode.</HelpText>\r
           0x11: Boot on S3 resume.\r
           0x12: Boot on flash update.\r
           0x20: Boot in reovery mode.</HelpText>\r


@@ -350,7 +345,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <DatumType>VOID*</DatumType>\r
       <ValidUsage>DYNAMIC</ValidUsage>\r
       <DefaultValue>L"Bus Driver Console Window"</DefaultValue>\r
       <DatumType>VOID*</DatumType>\r
       <ValidUsage>DYNAMIC</ValidUsage>\r
       <DefaultValue>L"Bus Driver Console Window"</DefaultValue>\r

-      <HelpText>This PCD declares the title string of the text console window. \r
+      <HelpText>This PCD declares the title string of the text console window.\r

         such as "My EFI Console".\r
         The item type of this PCD can only be "DYNAMIC".</HelpText>\r
     </PcdEntry>\r
         such as "My EFI Console".\r
         The item type of this PCD can only be "DYNAMIC".</HelpText>\r
     </PcdEntry>\r

diff --git a/EdkNt32Pkg/Library/DxeWinNtLib/DxeWinNtLib.msa b/EdkNt32Pkg/Library/DxeWinNtLib/DxeWinNtLib.msa
index 768e41ed37033c5bba031319216dc8206974e012..23d7157d8b015b9f16d9daf96a304a1c5aa378c2 100644 (file)
--- a/EdkNt32Pkg/Library/DxeWinNtLib/DxeWinNtLib.msa
+++ b/EdkNt32Pkg/Library/DxeWinNtLib/DxeWinNtLib.msa
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <?xml version="1.0" encoding="UTF-8"?>\r

-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r

   <MsaHeader>\r
     <ModuleName>DxeWinNtLib</ModuleName>\r
     <ModuleType>DXE_DRIVER</ModuleType>\r
   <MsaHeader>\r
     <ModuleName>DxeWinNtLib</ModuleName>\r
     <ModuleType>DXE_DRIVER</ModuleType>\r


@@ -7,7 +7,7 @@
     <Version>1.0</Version>\r
     <Abstract>A library to produce the global variable 'gWinNt'</Abstract>\r
     <Description>This library contains a single global variable 'gWinNt' along with a constructor to initialize that global.</Description>\r
     <Version>1.0</Version>\r
     <Abstract>A library to produce the global variable 'gWinNt'</Abstract>\r
     <Description>This library contains a single global variable 'gWinNt' along with a constructor to initialize that global.</Description>\r

-    <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>\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
     <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


@@ -37,7 +37,6 @@
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r

-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>\r

     <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>\r
   </PackageDependencies>\r
   <Protocols>\r
     <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>\r
   </PackageDependencies>\r
   <Protocols>\r

diff --git a/EdkNt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.msa b/EdkNt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.msa
index af0c7e0d77db34f27e0fb16d97a8e4e39407046a..0357fcb69c4eec74ac6a9c8b4934d889e758ab45 100644 (file)
--- a/EdkNt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.msa
+++ b/EdkNt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.msa
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <?xml version="1.0" encoding="UTF-8"?>\r

-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r

   <MsaHeader>\r
     <ModuleName>EdkGenericBdsLib</ModuleName>\r
     <ModuleType>DXE_DRIVER</ModuleType>\r
   <MsaHeader>\r
     <ModuleName>EdkGenericBdsLib</ModuleName>\r
     <ModuleType>DXE_DRIVER</ModuleType>\r


@@ -9,9 +9,8 @@
     <Description>The library instance provides common library routines help in \r
     performance measurement, device path debug print, boot device selections,\r
     boot device connection, console supports in BDS phase and boot from boot\r
     <Description>The library instance provides common library routines help in \r
     performance measurement, device path debug print, boot device selections,\r
     boot device connection, console supports in BDS phase and boot from boot\r

-    device.\r
-    </Description>\r
-    <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>\r
+    device.</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
     <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


@@ -65,6 +64,9 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>PerformanceLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>PerformanceLib</Keyword>\r
     </LibraryClass>\r

+    <LibraryClass Usage="ALWAYS_CONSUMED">\r
+      <Keyword>PeCoffLib</Keyword>\r
+    </LibraryClass>\r

   </LibraryClassDefinitions>\r
   <SourceFiles>\r
     <Filename>BdsBoot.c</Filename>\r
   </LibraryClassDefinitions>\r
   <SourceFiles>\r
     <Filename>BdsBoot.c</Filename>\r


@@ -100,6 +102,30 @@
     <Protocol Usage="ALWAYS_CONSUMED">\r
       <ProtocolCName>gEfiSimpleNetworkProtocolGuid</ProtocolCName>\r
     </Protocol>\r
     <Protocol Usage="ALWAYS_CONSUMED">\r
       <ProtocolCName>gEfiSimpleNetworkProtocolGuid</ProtocolCName>\r
     </Protocol>\r

+    <Protocol Usage="ALWAYS_CONSUMED">\r
+      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>\r
+    </Protocol>\r
+    <Protocol Usage="ALWAYS_CONSUMED">\r
+      <ProtocolCName>gEfiCpuArchProtocolGuid</ProtocolCName>\r
+    </Protocol>\r
+    <Protocol Usage="ALWAYS_CONSUMED">\r
+      <ProtocolCName>gEfiLegacyBiosProtocolGuid</ProtocolCName>\r
+    </Protocol>\r
+    <Protocol Usage="ALWAYS_CONSUMED">\r
+      <ProtocolCName>gEfiBlockIoProtocolGuid</ProtocolCName>\r
+    </Protocol>\r
+    <Protocol Usage="ALWAYS_CONSUMED">\r
+      <ProtocolCName>gEfiDriverBindingProtocolGuid</ProtocolCName>\r
+    </Protocol>\r
+    <Protocol Usage="ALWAYS_CONSUMED">\r
+      <ProtocolCName>gEfiFormBrowserProtocolGuid</ProtocolCName>\r
+    </Protocol>\r
+    <Protocol Usage="ALWAYS_CONSUMED">\r
+      <ProtocolCName>gEfiLoadFileProtocolGuid</ProtocolCName>\r
+    </Protocol>\r
+    <Protocol Usage="ALWAYS_CONSUMED">\r
+      <ProtocolCName>gEfiSimpleFileSystemProtocolGuid</ProtocolCName>\r
+    </Protocol>\r

   </Protocols>\r
   <Guids>\r
     <GuidCNames Usage="ALWAYS_CONSUMED">\r
   </Protocols>\r
   <Guids>\r
     <GuidCNames Usage="ALWAYS_CONSUMED">\r


@@ -108,6 +134,9 @@
     <GuidCNames Usage="ALWAYS_CONSUMED">\r
       <GuidCName>gEfiGenericPlatformVariableGuid</GuidCName>\r
     </GuidCNames>\r
     <GuidCNames Usage="ALWAYS_CONSUMED">\r
       <GuidCName>gEfiGenericPlatformVariableGuid</GuidCName>\r
     </GuidCNames>\r

+    <GuidCNames Usage="ALWAYS_CONSUMED">\r
+      <GuidCName>gEfiGlobalVariableGuid</GuidCName>\r
+    </GuidCNames>\r

   </Guids>\r
   <Externs>\r
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r
   </Guids>\r
   <Externs>\r
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r

diff --git a/EdkNt32Pkg/Library/EdkNt32PeiPeCoffGetEntryPointLib/EdkNt32PeiPeCoffGetEntryPointLib.msa b/EdkNt32Pkg/Library/EdkNt32PeiPeCoffGetEntryPointLib/EdkNt32PeiPeCoffGetEntryPointLib.msa
index 2a9d4b03d6afc09d2410e0a61a35cd640cb38f93..624f928e7d3d09e2f4420ecc0a25635f11ce1de4 100644 (file)
--- a/EdkNt32Pkg/Library/EdkNt32PeiPeCoffGetEntryPointLib/EdkNt32PeiPeCoffGetEntryPointLib.msa
+++ b/EdkNt32Pkg/Library/EdkNt32PeiPeCoffGetEntryPointLib/EdkNt32PeiPeCoffGetEntryPointLib.msa
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <?xml version="1.0" encoding="UTF-8"?>\r

-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r

   <MsaHeader>\r
     <ModuleName>EdkNt32PeiPeCoffGetEntryPointLib</ModuleName>\r
     <ModuleType>PEIM</ModuleType>\r
   <MsaHeader>\r
     <ModuleName>EdkNt32PeiPeCoffGetEntryPointLib</ModuleName>\r
     <ModuleType>PEIM</ModuleType>\r


@@ -7,7 +7,7 @@
     <Version>1.0</Version>\r
     <Abstract>Component description file for the EdkNt32PeiPeCoffGetEntryPointLib library.</Abstract>\r
     <Description>PeCoffGetEntryPointLib library class for NT32 instance implemented by use NTPeiLoadFile PPI.</Description>\r
     <Version>1.0</Version>\r
     <Abstract>Component description file for the EdkNt32PeiPeCoffGetEntryPointLib library.</Abstract>\r
     <Description>PeCoffGetEntryPointLib library class for NT32 instance implemented by use NTPeiLoadFile PPI.</Description>\r

-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\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
     <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

diff --git a/EdkNt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.msa b/EdkNt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.msa
index 0cd1fbc8f323cdf430e05b420a0d25aced66c5cc..e57dff1dc81a1d7646e9bcd746285be143484a95 100644 (file)
--- a/EdkNt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.msa
+++ b/EdkNt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.msa
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <?xml version="1.0" encoding="UTF-8"?>\r

-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r

   <MsaHeader>\r
     <ModuleName>Nt32PeCoffLoaderLib</ModuleName>\r
     <ModuleType>PEIM</ModuleType>\r
   <MsaHeader>\r
     <ModuleName>Nt32PeCoffLoaderLib</ModuleName>\r
     <ModuleType>PEIM</ModuleType>\r


@@ -7,7 +7,7 @@
     <Version>1.0</Version>\r
     <Abstract>Component description file for the Nt32PeCoffLoaderLib library.</Abstract>\r
     <Description>EdkPeCoffLoaderLib library class for NT32 instance implemented by PeiPeCoffLoader PPI.</Description>\r
     <Version>1.0</Version>\r
     <Abstract>Component description file for the Nt32PeCoffLoaderLib library.</Abstract>\r
     <Description>EdkPeCoffLoaderLib library class for NT32 instance implemented by PeiPeCoffLoader PPI.</Description>\r

-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\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
     <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


@@ -32,7 +32,6 @@
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
     <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
     <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>\r

-    <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>\r

   </PackageDependencies>\r
   <Guids>\r
     <GuidCNames Usage="SOMETIMES_CONSUMED">\r
   </PackageDependencies>\r
   <Guids>\r
     <GuidCNames Usage="SOMETIMES_CONSUMED">\r

diff --git a/EdkNt32Pkg/Logo/Logo.msa b/EdkNt32Pkg/Logo/Logo.msa
index 965f141fe914913403284a7fe6b46475d9902ace..dd9f167eb91c1e67911b0acd687851084976523a 100644 (file)
--- a/EdkNt32Pkg/Logo/Logo.msa
+++ b/EdkNt32Pkg/Logo/Logo.msa
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <?xml version="1.0" encoding="UTF-8"?>\r

-<ModuleSurfaceArea  xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r

   <MsaHeader>\r
     <ModuleName>Logo</ModuleName>\r
     <ModuleType>BASE</ModuleType>\r
   <MsaHeader>\r
     <ModuleName>Logo</ModuleName>\r
     <ModuleType>BASE</ModuleType>\r


@@ -7,7 +7,7 @@
     <Version>1.0</Version>\r
     <Abstract>Component description file for creating a Logo file.</Abstract>\r
     <Description>This module provides the logo bitmap picture shown on setup screen.</Description>\r
     <Version>1.0</Version>\r
     <Abstract>Component description file for creating a Logo file.</Abstract>\r
     <Description>This module provides the logo bitmap picture shown on setup screen.</Description>\r

-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\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
     <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


@@ -24,9 +24,6 @@
   <SourceFiles>\r
     <Filename>logo.bmp</Filename>\r
   </SourceFiles>\r
   <SourceFiles>\r
     <Filename>logo.bmp</Filename>\r
   </SourceFiles>\r

-  <PackageDependencies>\r
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
-  </PackageDependencies>\r

   <Externs>\r
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>\r
   <Externs>\r
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>\r

diff --git a/EdkNt32Pkg/Pei/Autoscan/WinNtAutoScan.msa b/EdkNt32Pkg/Pei/Autoscan/WinNtAutoScan.msa
index 87f2c606f931a6dfaa363bcda44aaa04fb68a261..dc3e7c1499737a8873312304e1edcb5c7b06eee6 100644 (file)
--- a/EdkNt32Pkg/Pei/Autoscan/WinNtAutoScan.msa
+++ b/EdkNt32Pkg/Pei/Autoscan/WinNtAutoScan.msa
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <?xml version="1.0" encoding="UTF-8"?>\r

-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r

   <MsaHeader>\r
     <ModuleName>WinNtAutoScan</ModuleName>\r
     <ModuleType>PEIM</ModuleType>\r
   <MsaHeader>\r
     <ModuleName>WinNtAutoScan</ModuleName>\r
     <ModuleType>PEIM</ModuleType>\r


@@ -7,7 +7,7 @@
     <Version>1.0</Version>\r
     <Abstract>Component description file for WinNtAutoScan module</Abstract>\r
     <Description>This module abstracts memory auto-scan in a Windows NT environment.</Description>\r
     <Version>1.0</Version>\r
     <Abstract>Component description file for WinNtAutoScan module</Abstract>\r
     <Description>This module abstracts memory auto-scan in a Windows NT environment.</Description>\r

-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\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
     <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


@@ -28,21 +28,9 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>PeimEntryPoint</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>PeimEntryPoint</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>BaseLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>BaseMemoryLib</Keyword>\r
-    </LibraryClass>\r

     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>HobLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>HobLib</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>PeiServicesLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>PeiServicesTablePointerLib</Keyword>\r
-    </LibraryClass>\r

   </LibraryClassDefinitions>\r
   <SourceFiles>\r
     <Filename>WinntAutoscan.c</Filename>\r
   </LibraryClassDefinitions>\r
   <SourceFiles>\r
     <Filename>WinntAutoscan.c</Filename>\r


@@ -60,9 +48,6 @@
     <Ppi Usage="ALWAYS_CONSUMED">\r
       <PpiCName>gPeiBaseMemoryTestPpiGuid</PpiCName>\r
     </Ppi>\r
     <Ppi Usage="ALWAYS_CONSUMED">\r
       <PpiCName>gPeiBaseMemoryTestPpiGuid</PpiCName>\r
     </Ppi>\r

-    <Ppi Usage="ALWAYS_PRODUCED">\r
-      <PpiCName>gEfiPeiMemoryDiscoveredPpiGuid</PpiCName>\r
-    </Ppi>\r

   </PPIs>\r
   <Externs>\r
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r
   </PPIs>\r
   <Externs>\r
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r

diff --git a/EdkNt32Pkg/Pei/BootMode/BootMode.msa b/EdkNt32Pkg/Pei/BootMode/BootMode.msa
index b812ab9a87ac87e738987bbcd40ce0134ff72c90..e8225a8a855b6e67149d2043a3c161d5c002db77 100644 (file)
--- a/EdkNt32Pkg/Pei/BootMode/BootMode.msa
+++ b/EdkNt32Pkg/Pei/BootMode/BootMode.msa
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <?xml version="1.0" encoding="UTF-8"?>\r

-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r

   <MsaHeader>\r
     <ModuleName>BootMode</ModuleName>\r
     <ModuleType>PEIM</ModuleType>\r
   <MsaHeader>\r
     <ModuleName>BootMode</ModuleName>\r
     <ModuleType>PEIM</ModuleType>\r


@@ -7,7 +7,7 @@
     <Version>1.0</Version>\r
     <Abstract>Component description file for BootMode module</Abstract>\r
     <Description>This module provides platform specific function to detect boot mode.</Description>\r
     <Version>1.0</Version>\r
     <Abstract>Component description file for BootMode module</Abstract>\r
     <Description>This module provides platform specific function to detect boot mode.</Description>\r

-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\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
     <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


@@ -28,15 +28,6 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>PeimEntryPoint</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>PeimEntryPoint</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>BaseLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>PeiServicesLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>PeiServicesTablePointerLib</Keyword>\r
-    </LibraryClass>\r

   </LibraryClassDefinitions>\r
   <SourceFiles>\r
     <Filename>BootMode.c</Filename>\r
   </LibraryClassDefinitions>\r
   <SourceFiles>\r
     <Filename>BootMode.c</Filename>\r


@@ -44,8 +35,6 @@
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r

-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>\r
-    <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>\r

   </PackageDependencies>\r
   <PPIs>\r
     <Ppi Usage="SOMETIMES_PRODUCED">\r
   </PackageDependencies>\r
   <PPIs>\r
     <Ppi Usage="SOMETIMES_PRODUCED">\r

diff --git a/EdkNt32Pkg/Pei/FirmwareVolume/WinNtFwh.msa b/EdkNt32Pkg/Pei/FirmwareVolume/WinNtFwh.msa
index c4434bbdac4a138e5eec0d145c2a8abdc068e99e..9d600f2f1caf86905318320777ee5568bde64797 100644 (file)
--- a/EdkNt32Pkg/Pei/FirmwareVolume/WinNtFwh.msa
+++ b/EdkNt32Pkg/Pei/FirmwareVolume/WinNtFwh.msa
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <?xml version="1.0" encoding="UTF-8"?>\r

-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r

   <MsaHeader>\r
     <ModuleName>WinNtFwh</ModuleName>\r
     <ModuleType>PEIM</ModuleType>\r
   <MsaHeader>\r
     <ModuleName>WinNtFwh</ModuleName>\r
     <ModuleType>PEIM</ModuleType>\r


@@ -8,7 +8,7 @@
     <Abstract>Component description file for WinNtFwh module</Abstract>\r
     <Description>This PEIM will produce the HOB to describe Firmware Volume, Firmware Devices\r
     on the NT32 emulator.</Description>\r
     <Abstract>Component description file for WinNtFwh module</Abstract>\r
     <Description>This PEIM will produce the HOB to describe Firmware Volume, Firmware Devices\r
     on the NT32 emulator.</Description>\r

-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\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
     <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


@@ -32,12 +32,6 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>HobLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>HobLib</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>PeiServicesLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>PeiServicesTablePointerLib</Keyword>\r
-    </LibraryClass>\r

   </LibraryClassDefinitions>\r
   <SourceFiles>\r
     <Filename>WinntFwh.c</Filename>\r
   </LibraryClassDefinitions>\r
   <SourceFiles>\r
     <Filename>WinntFwh.c</Filename>\r


@@ -45,7 +39,6 @@
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r

-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>\r

     <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>\r
   </PackageDependencies>\r
   <PPIs>\r
     <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>\r
   </PackageDependencies>\r
   <PPIs>\r

diff --git a/EdkNt32Pkg/Pei/FlashMap/FlashMap.msa b/EdkNt32Pkg/Pei/FlashMap/FlashMap.msa
index bedabe810b0c4599203b7a101926faf26db59a9c..5a0503e5cc527b22653fe8c72087d22f7a46514c 100644 (file)
--- a/EdkNt32Pkg/Pei/FlashMap/FlashMap.msa
+++ b/EdkNt32Pkg/Pei/FlashMap/FlashMap.msa
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <?xml version="1.0" encoding="UTF-8"?>\r

-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r

   <MsaHeader>\r
     <ModuleName>PeiFlashMap</ModuleName>\r
     <ModuleType>PEIM</ModuleType>\r
   <MsaHeader>\r
     <ModuleName>PeiFlashMap</ModuleName>\r
     <ModuleType>PEIM</ModuleType>\r


@@ -7,7 +7,7 @@
     <Version>1.0</Version>\r
     <Abstract>Component description file for FlashMap PEI module</Abstract>\r
     <Description>This module installs FlashMap PPI which is used to get flash layout information.</Description>\r
     <Version>1.0</Version>\r
     <Abstract>Component description file for FlashMap PEI module</Abstract>\r
     <Description>This module installs FlashMap PPI which is used to get flash layout information.</Description>\r

-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\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
     <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


@@ -34,9 +34,6 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>PeiServicesLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>PeiServicesLib</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>PeiServicesTablePointerLib</Keyword>\r
-    </LibraryClass>\r

     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>BaseMemoryLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>BaseMemoryLib</Keyword>\r
     </LibraryClass>\r


@@ -73,9 +70,6 @@
     <GuidCNames Usage="ALWAYS_CONSUMED">\r
       <GuidCName>gEfiFirmwareFileSystemGuid</GuidCName>\r
     </GuidCNames>\r
     <GuidCNames Usage="ALWAYS_CONSUMED">\r
       <GuidCName>gEfiFirmwareFileSystemGuid</GuidCName>\r
     </GuidCNames>\r

-    <GuidCNames Usage="ALWAYS_CONSUMED">\r
-      <GuidCName>gEfiSystemNvDataHobGuid</GuidCName>\r
-    </GuidCNames>\r

   </Guids>\r
   <Externs>\r
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r
   </Guids>\r
   <Externs>\r
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r


@@ -92,15 +86,12 @@
         This base address point to an EFI_FIRMWARE_VOLUMN_HEADER struct. Variable PEIM\r
         will get the base address from this PCD. In NT emulator, this PCD is a DYNAMIC\r
         type, as FD is mapped to process space by WinNT OS. On real platform, it is \r
         This base address point to an EFI_FIRMWARE_VOLUMN_HEADER struct. Variable PEIM\r
         will get the base address from this PCD. In NT emulator, this PCD is a DYNAMIC\r
         type, as FD is mapped to process space by WinNT OS. On real platform, it is \r

-        normally a FIXED_AT_BUILD type as system memory map is fixed to BIOS.\r
-      </HelpText>\r
+        normally a FIXED_AT_BUILD type as system memory map is fixed to BIOS.</HelpText>\r

     </PcdEntry>\r
     <PcdEntry PcdItemType="DYNAMIC">\r
       <C_Name>PcdFlashNvStorageVariableSize</C_Name>\r
       <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>\r
     </PcdEntry>\r
     <PcdEntry PcdItemType="DYNAMIC">\r
       <C_Name>PcdFlashNvStorageVariableSize</C_Name>\r
       <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>\r

-      <HelpText>\r
-        To get the NvStorage Variable size from this PCD.\r
-      </HelpText>\r
+      <HelpText>To get the NvStorage Variable size from this PCD.</HelpText>\r

     </PcdEntry>\r
     <PcdEntry PcdItemType="DYNAMIC" Usage="ALWAYS_CONSUMED">\r
       <C_Name>PcdFlashNvStorageFtwSpareBase</C_Name>\r
     </PcdEntry>\r
     <PcdEntry PcdItemType="DYNAMIC" Usage="ALWAYS_CONSUMED">\r
       <C_Name>PcdFlashNvStorageFtwSpareBase</C_Name>\r

diff --git a/EdkNt32Pkg/Pei/WinNtStuff/WinNtStuff.msa b/EdkNt32Pkg/Pei/WinNtStuff/WinNtStuff.msa
index 92a65ef314fdd4a580bfb71989d005ccb8b66211..d0b5bb2e12f888d87e97a9b04fdd484cfe760c80 100644 (file)
--- a/EdkNt32Pkg/Pei/WinNtStuff/WinNtStuff.msa
+++ b/EdkNt32Pkg/Pei/WinNtStuff/WinNtStuff.msa
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <?xml version="1.0" encoding="UTF-8"?>\r

-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r

   <MsaHeader>\r
     <ModuleName>WinNtStuff</ModuleName>\r
     <ModuleType>PEIM</ModuleType>\r
     <GuidValue>D3AAD8DC-3A48-46ac-B1C7-28A9D3CF6755</GuidValue>\r
     <Version>1.0</Version>\r
     <Abstract>Stuff driver</Abstract>\r
   <MsaHeader>\r
     <ModuleName>WinNtStuff</ModuleName>\r
     <ModuleType>PEIM</ModuleType>\r
     <GuidValue>D3AAD8DC-3A48-46ac-B1C7-28A9D3CF6755</GuidValue>\r
     <Version>1.0</Version>\r
     <Abstract>Stuff driver</Abstract>\r

-    <Description>\r
-      Tiano PEIM to abstract construction of firmware volume in a Windows NT environment.\r
-    </Description>\r
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
+    <Description>Tiano PEIM to abstract construction of firmware volume in a Windows NT environment.</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
     <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


@@ -33,12 +31,6 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>HobLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>HobLib</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>PeiServicesLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>PeiServicesTablePointerLib</Keyword>\r
-    </LibraryClass>\r

   </LibraryClassDefinitions>\r
   <SourceFiles>\r
     <Filename>winntstuff.c</Filename>\r
   </LibraryClassDefinitions>\r
   <SourceFiles>\r
     <Filename>winntstuff.c</Filename>\r


@@ -46,7 +38,6 @@
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r

-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>\r

     <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>\r
   </PackageDependencies>\r
   <Protocols>\r
     <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>\r
   </PackageDependencies>\r
   <Protocols>\r

diff --git a/EdkNt32Pkg/Sec/SecMain.msa b/EdkNt32Pkg/Sec/SecMain.msa
index 322e011f8acad08b5eb9e733bf94f30605103b91..e276e3f5b02608aa6d93de91fd88d4243c30f8ab 100644 (file)
--- a/EdkNt32Pkg/Sec/SecMain.msa
+++ b/EdkNt32Pkg/Sec/SecMain.msa
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <?xml version="1.0" encoding="UTF-8"?>\r

-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r

   <MsaHeader>\r
     <ModuleName>SecMain</ModuleName>\r
     <ModuleType>SEC</ModuleType>\r
   <MsaHeader>\r
     <ModuleName>SecMain</ModuleName>\r
     <ModuleType>SEC</ModuleType>\r


@@ -7,7 +7,7 @@
     <Version>1.0</Version>\r
     <Abstract>Entry Point of NT32 Emulator</Abstract>\r
     <Description>Main executable file of NT32 Emulator that loads PEI core after initialization finished.</Description>\r
     <Version>1.0</Version>\r
     <Abstract>Entry Point of NT32 Emulator</Abstract>\r
     <Description>Main executable file of NT32 Emulator that loads PEI core after initialization finished.</Description>\r

-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\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
     <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


@@ -91,7 +91,7 @@
       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <HelpText>This PCD defines the FD file windows path string. Simulator will load the FD file and execute.</HelpText>\r
     </PcdEntry>\r
       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <HelpText>This PCD defines the FD file windows path string. Simulator will load the FD file and execute.</HelpText>\r
     </PcdEntry>\r

-    <PcdEntry PcdItemType="DYNAMIC">\r
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r

       <C_Name>PcdWinNtBootMode</C_Name>\r
       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <HelpText>This PCD defines the boot mode for simualtor. \r
       <C_Name>PcdWinNtBootMode</C_Name>\r
       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <HelpText>This PCD defines the boot mode for simualtor. \r