clean up MSA/SPD files.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2403 6f19259b-4bc3-4df7-8a09-765794883524
2007-02-27 06:25:05 +00:00
parent 3bd0d8f8a9
commit 7f0ceb225d
26 changed files with 144 additions and 338 deletions
--- 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"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
  <MsaHeader>
    <ModuleName>WinNtBlockIo</ModuleName>
    <ModuleType>UEFI_DRIVER</ModuleType>
    <GuidValue>F479E147-A125-11d4-BCFC-0080C73C8881</GuidValue>
    <Version>1.0</Version>
    <Abstract>Block Io driver</Abstract>
-    <Description>
-      Produce block IO abstractions for real devices on your PC using Win32 APIs.
+    <Description>Produce block IO abstractions for real devices on your PC using Win32 APIs.
      The configuration of what devices to mount or emulate comes from NT
      environment variables. The variables must be visible to the Microsoft*
-      Developer Studio for them to work.
-    </Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
+      Developer Studio for them to work.</Description>
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>
    <License>All rights reserved. This program and the accompanying materials
      are licensed and made available under the terms and conditions of the BSD License
      which accompanies this distribution.  The full text of the license may be found at
@@ -45,9 +43,6 @@
    <LibraryClass Usage="ALWAYS_CONSUMED">
      <Keyword>BaseMemoryLib</Keyword>
    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
    <LibraryClass Usage="ALWAYS_CONSUMED">
      <Keyword>UefiBootServicesTableLib</Keyword>
    </LibraryClass>
@@ -61,7 +56,6 @@
  </SourceFiles>
  <PackageDependencies>
    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
    <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>
  </PackageDependencies>
  <Protocols>
--- 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"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
  <MsaHeader>
    <ModuleName>WinNtConsole</ModuleName>
    <ModuleType>UEFI_DRIVER</ModuleType>
@@ -7,7 +7,7 @@
    <Version>1.0</Version>
    <Abstract>Console Dxe driver</Abstract>
    <Description>Simulate console with WinAPI</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>
    <License>All rights reserved. This program and the accompanying materials
      are licensed and made available under the terms and conditions of the BSD License
      which accompanies this distribution.  The full text of the license may be found at
@@ -40,9 +40,6 @@
    <LibraryClass Usage="ALWAYS_CONSUMED">
      <Keyword>BaseMemoryLib</Keyword>
    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
    <LibraryClass Usage="ALWAYS_CONSUMED">
      <Keyword>UefiBootServicesTableLib</Keyword>
    </LibraryClass>
@@ -56,7 +53,6 @@
  </SourceFiles>
  <PackageDependencies>
    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
    <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>
  </PackageDependencies>
  <Protocols>
--- 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"?>
 <ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
  <MsaHeader>
    <ModuleName>WinNtGop</ModuleName>
@@ -5,13 +6,11 @@
    <GuidValue>29b3c4c6-e5aa-49e4-8ce0-2772f782ddc2</GuidValue>
    <Version>1.0</Version>
    <Abstract>Gop Driver</Abstract>
-    <Description>
-      GOP is short hand for UEFI Graphics Output protocol.
+    <Description>GOP is short hand for UEFI Graphics Output protocol.
      This file is a verision of GopIo the uses WinNtThunk system calls as an IO
      abstraction. For a PCI device WinNtIo would be replaced with
-      a PCI IO abstraction that abstracted a specific PCI device.
-    </Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
+      a PCI IO abstraction that abstracted a specific PCI device.</Description>
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>
    <License>All rights reserved. This program and the accompanying materials
      are licensed and made available under the terms and conditions of the BSD License
      which accompanies this distribution.  The full text of the license may be found at
@@ -44,9 +43,6 @@
    <LibraryClass Usage="ALWAYS_CONSUMED">
      <Keyword>BaseMemoryLib</Keyword>
    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
    <LibraryClass Usage="ALWAYS_CONSUMED">
      <Keyword>UefiBootServicesTableLib</Keyword>
    </LibraryClass>
@@ -60,7 +56,6 @@
  </SourceFiles>
  <PackageDependencies>
    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
    <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>
  </PackageDependencies>
  <Protocols>
--- 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"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
  <MsaHeader>
    <ModuleName>WinNtSerialIo</ModuleName>
    <ModuleType>UEFI_DRIVER</ModuleType>
    <GuidValue>6B41B553-A649-11d4-BD02-0080C73C8881</GuidValue>
    <Version>1.0</Version>
    <Abstract>Serial I/O driver</Abstract>
-    <Description>
-      Our DriverBinding member functions operate on the handles
-      created by the NT Bus drive
-    </Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
+    <Description>Our DriverBinding member functions operate on the handles
+      created by the NT Bus drive</Description>
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>
    <License>All rights reserved. This program and the accompanying materials
      are licensed and made available under the terms and conditions of the BSD License
      which accompanies this distribution.  The full text of the license may be found at
@@ -43,9 +41,6 @@
    <LibraryClass Usage="ALWAYS_CONSUMED">
      <Keyword>BaseMemoryLib</Keyword>
    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
    <LibraryClass Usage="ALWAYS_CONSUMED">
      <Keyword>UefiBootServicesTableLib</Keyword>
    </LibraryClass>
@@ -60,7 +55,6 @@
  </SourceFiles>
  <PackageDependencies>
    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
    <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>
  </PackageDependencies>
  <Protocols>
--- 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"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
  <MsaHeader>
    <ModuleName>WinNtSimpleFileSystem</ModuleName>
    <ModuleType>UEFI_DRIVER</ModuleType>
    <GuidValue>9C25E18B-76BA-43da-A132-DBB0997CEFEF</GuidValue>
    <Version>1.0</Version>
    <Abstract>Simple filesystem driver</Abstract>
-    <Description>
-      Produce Simple File System abstractions for directories on your PC using Win32 APIs.
+    <Description>Produce Simple File System abstractions for directories on your PC using Win32 APIs.
      The configuration of what devices to mount or emulate comes from NT
      environment variables. The variables must be visible to the Microsoft*
-      Developer Studio for them to work.
-    </Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
+      Developer Studio for them to work.</Description>
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>
    <License>All rights reserved. This program and the accompanying materials
      are licensed and made available under the terms and conditions of the BSD License
      which accompanies this distribution.  The full text of the license may be found at
@@ -45,9 +43,6 @@
    <LibraryClass Usage="ALWAYS_CONSUMED">
      <Keyword>BaseMemoryLib</Keyword>
    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
    <LibraryClass Usage="ALWAYS_CONSUMED">
      <Keyword>UefiBootServicesTableLib</Keyword>
    </LibraryClass>
@@ -59,7 +54,6 @@
  </SourceFiles>
  <PackageDependencies>
    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
    <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>
  </PackageDependencies>
  <Protocols>
--- 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"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
  <MsaHeader>
    <ModuleName>WinNtUga</ModuleName>
    <ModuleType>UEFI_DRIVER</ModuleType>
    <GuidValue>AB248E8D-ABE1-11d4-BD0D-0080C73C8881</GuidValue>
    <Version>1.0</Version>
    <Abstract>Uga driver</Abstract>
-    <Description>
-      UGA is short hand for Universal Graphics Abstraction protocol.
+    <Description>UGA is short hand for Universal Graphics Abstraction protocol.
      This file is a verision of UgaIo the uses WinNtThunk system calls as an IO
      abstraction. For a PCI device WinNtIo would be replaced with
-      a PCI IO abstraction that abstracted a specific PCI device.
-    </Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
+      a PCI IO abstraction that abstracted a specific PCI device.</Description>
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>
    <License>All rights reserved. This program and the accompanying materials
      are licensed and made available under the terms and conditions of the BSD License
      which accompanies this distribution.  The full text of the license may be found at
@@ -30,9 +28,6 @@
    <LibraryClass Usage="ALWAYS_CONSUMED">
      <Keyword>DebugLib</Keyword>
    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
    <LibraryClass Usage="ALWAYS_CONSUMED">
      <Keyword>UefiDriverModelLib</Keyword>
    </LibraryClass>
@@ -45,9 +40,6 @@
    <LibraryClass Usage="ALWAYS_CONSUMED">
      <Keyword>BaseMemoryLib</Keyword>
    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
    <LibraryClass Usage="ALWAYS_CONSUMED">
      <Keyword>UefiBootServicesTableLib</Keyword>
    </LibraryClass>
@@ -61,7 +53,6 @@
  </SourceFiles>
  <PackageDependencies>
    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
    <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>
  </PackageDependencies>
  <Protocols>
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.c
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.c
@@ -1,13 +1,13 @@
 /*+++

-Copyright (c) 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
-are licensed and made available under the terms and conditions of the BSD License         
-which accompanies this distribution.  The full text of the license may be found at        
-http://opensource.org/licenses/bsd-license.php                                            
-                                                                                          
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 Module Name:

@@ -15,12 +15,12 @@ Module Name:

 Abstract:

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

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

 EFI_WIN_NT_PHYSICAL_DISKS - maps to drives on your system
 EFI_WIN_NT_VIRTUAL_DISKS  - maps to a device emulated by a file
@@ -36,20 +36,20 @@ EFI_WIN_NT_SERIAL_PORT    - maps physical serial ports
 <block count> - Decimal number of blocks a device supports.
 <block size>  - Decimal number of bytes per block.

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

- EFI_WIN_NT_VIRTUAL_DISKS = 
+ EFI_WIN_NT_VIRTUAL_DISKS =
   <F | R><O | W>;<block count>;<block size>[!...]

 EFI_WIN_NT_PHYSICAL_DISKS =
   <drive letter>:<F | R><O | W>;<block count>;<block size>[!...]

 Virtual Disks: These devices use a file to emulate a hard disk or removable
-                media device. 
-                
+                media device.
+
   Thus a 20 MB emulated hard drive would look like:
   EFI_WIN_NT_VIRTUAL_DISKS=FW;40960;512

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

- EFI_WIN_NT_FILE_SYSTEM = 
+ EFI_WIN_NT_FILE_SYSTEM =
   <directory path>[!...]

   Mounting the two directories C:\FOO and C:\BAR would look like:
   EFI_WIN_NT_FILE_SYSTEM=c:\foo!c:\bar

- EFI_WIN_NT_CONSOLE = 
+ EFI_WIN_NT_CONSOLE =
   <window title>

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

- EFI_WIN_NT_UGA = 
+ EFI_WIN_NT_UGA =
   <width> <height>[!...]

   Declaring a two UGA windows with resolutions of 800x600 and 1024x768 would look like:
   Example : EFI_WIN_NT_UGA=800 600!1024 768

- EFI_WIN_NT_SERIAL_PORT = 
+ EFI_WIN_NT_SERIAL_PORT =
   <port name>[!...]

   Declaring two serial ports on COM1 and COM2 would look like:
@@ -98,15 +98,8 @@ EFI_WIN_NT_SERIAL_PORT    - maps physical serial ports
 ---*/

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

+extern EFI_GUID gWinNtBusDriverGuid;
 //
 // DriverBinding protocol global
 //
@@ -213,7 +206,7 @@ Returns:
      return EFI_UNSUPPORTED;
    }
  }
-  
+
  //
  // Open the IO Abstraction(s) needed to perform the supported test
  //
@@ -699,7 +692,7 @@ Arguments:

 Returns:

-  EFI_DEVICE_PATH_PROTOCOL 
+  EFI_DEVICE_PATH_PROTOCOL

 --*/
 {
--- 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"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
  <MsaHeader>
    <ModuleName>WinNtBusDriver</ModuleName>
    <ModuleType>UEFI_DRIVER</ModuleType>
    <GuidValue>BD7E9A27-D6C5-416a-B245-5F507D95B2BD</GuidValue>
    <Version>1.0</Version>
    <Abstract>Win NT Bus driver</Abstract>
-    <Description>
-      This following section documents the envirnoment variables for the Win NT
+    <Description>This following section documents the envirnoment variables for the Win NT
      build.  These variables are used to define the (virtual) hardware
-      configuration of the NT environment
-    </Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
+      configuration of the NT environment</Description>
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>
    <License>All rights reserved. This program and the accompanying materials
      are licensed and made available under the terms and conditions of the BSD License
      which accompanies this distribution.  The full text of the license may be found at
@@ -47,9 +45,6 @@
    <LibraryClass Usage="ALWAYS_CONSUMED">
      <Keyword>BaseMemoryLib</Keyword>
    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
    <LibraryClass Usage="ALWAYS_CONSUMED">
      <Keyword>UefiBootServicesTableLib</Keyword>
    </LibraryClass>
@@ -64,7 +59,6 @@
  </SourceFiles>
  <PackageDependencies>
    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
    <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>
  </PackageDependencies>
  <Protocols>
@@ -77,9 +71,6 @@
    <Protocol Usage="TO_START">
      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gPcdProtocolGuid</ProtocolCName>
-    </Protocol>
  </Protocols>
  <Guids>
    <GuidCNames Usage="ALWAYS_CONSUMED">
@@ -112,6 +103,9 @@
    <GuidCNames Usage="ALWAYS_CONSUMED">
      <GuidCName>gEfiWinNtCPUSpeedGuid</GuidCName>
    </GuidCNames>
+    <GuidCNames Usage="ALWAYS_CONSUMED">
+      <GuidCName>gWinNtBusDriverGuid</GuidCName>
+    </GuidCNames>
  </Guids>
  <Externs>
    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
@@ -121,69 +115,4 @@
      <ComponentName>gWinNtBusDriverComponentName</ComponentName>
    </Extern>
  </Externs>
-  <PcdCoded>
-    <PcdEntry PcdItemType="DYNAMIC">
-      <C_Name>PcdWinNtConsole</C_Name>
-      <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>This PCD declares the title string of the text console window.
-        such as "My EFI Console".
-        The item type of this PCD can only be "DYNAMIC".</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="DYNAMIC">
-      <C_Name>PcdWinNtUga</C_Name>
-      <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>This PCD declares the resolutions for the UGA windows.
-        The item type of this PCD can only be "DYNAMIC".</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="DYNAMIC">
-      <C_Name>PcdWinNtGop</C_Name>
-      <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>This PCD declares the resolutions for the GOP windows.
-        The item type of this PCD can only be "DYNAMIC".</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="DYNAMIC">
-      <C_Name>PcdWinNtSerialPort</C_Name>
-      <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>This Pcd declares two serial port for simulated environment.
-        The item type of this PCD can only be "DYNAMIC".</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="DYNAMIC">
-      <C_Name>PcdWinNtFileSystem</C_Name>
-      <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>This PCD defines the windows directory who will be mounted as
-        harddisk in simulator.
-        The item type of this PCD can only be "DYNAMIC".</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="DYNAMIC">
-      <C_Name>PcdWinNtVirtualDisk</C_Name>
-      <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>This PCD defines the devices which use a file to emulate a hard disk or
-        removable media device
-        The item type if this PCD can only be "DYNAMIC".</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="DYNAMIC">
-      <C_Name>PcdWinNtPhysicalDisk</C_Name>
-      <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>This PCD defines physical disk which will be simualted as a
-        harddisk in simulator.
-        The item type of this PCD can only be "DYNAMIC".</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="DYNAMIC">
-      <C_Name>PcdWinNtCpuModel</C_Name>
-      <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>This PCD defines simulated CPU model string.
-        The item type of this PCD can only be "DYNAMIC".</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="DYNAMIC">
-      <C_Name>PcdWinNtCpuSpeed</C_Name>
-      <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>This PCD defines simulated CPU speed string.</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="DYNAMIC">
-      <C_Name>PcdWinNtMemorySize</C_Name>
-      <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>This PCD defines the size of simulated memory size.
-        The item type of this PCD can only be "DYNAMIC".</HelpText>
-    </PcdEntry>
-  </PcdCoded>
 </ModuleSurfaceArea>
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Metronome/Metronome.msa
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Metronome/Metronome.msa
@@ -7,7 +7,7 @@
    <Version>1.0</Version>
    <Abstract>NT Emulation Metronome Architectural Protocol Driver as defined in DXE CIS</Abstract>
    <Description>This metronome module simulates metronome by Sleep WinAPI.</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>
    <License>All rights reserved. This program and the accompanying materials
      are licensed and made available under the terms and conditions of the BSD License
      which accompanies this distribution.  The full text of the license may be found at
@@ -45,7 +45,6 @@
  </SourceFiles>
  <PackageDependencies>
    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
    <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>
  </PackageDependencies>
  <Protocols>
--- 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"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
  <MsaHeader>
    <ModuleName>RealTimeClock</ModuleName>
    <ModuleType>DXE_DRIVER</ModuleType>
    <GuidValue>27F05AF5-1644-4EF4-8944-48C4F75675A0</GuidValue>
    <Version>1.0</Version>
    <Abstract>NT Emulation Real time clock Architectural Protocol Driver as defined in TIANO</Abstract>
-    <Description>
-      This real time clock module simulates virtual device by time WinAPI.
-    </Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
+    <Description>This real time clock module simulates virtual device by time WinAPI.</Description>
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>
    <License>All rights reserved. This program and the accompanying materials
      are licensed and made available under the terms and conditions of the BSD License
      which accompanies this distribution.  The full text of the license may be found at
@@ -24,24 +22,15 @@
    <OutputFileBasename>RealTimeClock</OutputFileBasename>
  </ModuleDefinitions>
  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
    <LibraryClass Usage="ALWAYS_CONSUMED">
      <Keyword>DebugLib</Keyword>
    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
    <LibraryClass Usage="ALWAYS_CONSUMED">
      <Keyword>UefiDriverEntryPoint</Keyword>
    </LibraryClass>
    <LibraryClass Usage="ALWAYS_CONSUMED">
      <Keyword>WinNtLib</Keyword>
    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
    <LibraryClass Usage="ALWAYS_CONSUMED">
      <Keyword>UefiBootServicesTableLib</Keyword>
    </LibraryClass>
@@ -52,7 +41,6 @@
  </SourceFiles>
  <PackageDependencies>
    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
    <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>
  </PackageDependencies>
  <Protocols>
--- 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"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
  <MsaHeader>
    <ModuleName>Reset</ModuleName>
    <ModuleType>DXE_DRIVER</ModuleType>
    <GuidValue>BA929954-35B0-4dd3-90CD-9634BD7E1CF1</GuidValue>
    <Version>1.0</Version>
    <Abstract>NT Emulation Reset Architectural Protocol Driver as defined in TIANO</Abstract>
-    <Description>
-      This Reset module simulates system reset by process exit on NT.
-    </Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
+    <Description>This Reset module simulates system reset by process exit on NT.</Description>
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>
    <License>All rights reserved. This program and the accompanying materials
      are licensed and made available under the terms and conditions of the BSD License
      which accompanies this distribution.  The full text of the license may be found at
@@ -24,24 +22,15 @@
    <OutputFileBasename>Reset</OutputFileBasename>
  </ModuleDefinitions>
  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
    <LibraryClass Usage="ALWAYS_CONSUMED">
      <Keyword>DebugLib</Keyword>
    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
    <LibraryClass Usage="ALWAYS_CONSUMED">
      <Keyword>UefiDriverEntryPoint</Keyword>
    </LibraryClass>
    <LibraryClass Usage="ALWAYS_CONSUMED">
      <Keyword>WinNtLib</Keyword>
    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
    <LibraryClass Usage="ALWAYS_CONSUMED">
      <Keyword>UefiBootServicesTableLib</Keyword>
    </LibraryClass>
@@ -52,7 +41,6 @@
  </SourceFiles>
  <PackageDependencies>
    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
    <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>
  </PackageDependencies>
  <Protocols>
--- 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"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
  <MsaHeader>
    <ModuleName>Timer</ModuleName>
    <ModuleType>DXE_DRIVER</ModuleType>
    <GuidValue>C3811036-710B-4E39-8CF1-0AF9BE3A8198</GuidValue>
    <Version>1.0</Version>
    <Abstract>NT Emulation Timer Architectural Protocol Driver as defined in DXE CIS</Abstract>
-    <Description>
-      This Timer module uses an NT Thread to simulate the timer-tick driven
+    <Description>This Timer module uses an NT Thread to simulate the timer-tick driven
      timer service.  In the future, the Thread creation should possibly be 
-      abstracted by the CPU architectural protocol
-    </Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
+      abstracted by the CPU architectural protocol</Description>
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>
    <License>All rights reserved. This program and the accompanying materials
      are licensed and made available under the terms and conditions of the BSD License
      which accompanies this distribution.  The full text of the license may be found at
@@ -26,24 +24,15 @@
    <OutputFileBasename>Timer</OutputFileBasename>
  </ModuleDefinitions>
  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
    <LibraryClass Usage="ALWAYS_CONSUMED">
      <Keyword>DebugLib</Keyword>
    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
    <LibraryClass Usage="ALWAYS_CONSUMED">
      <Keyword>UefiDriverEntryPoint</Keyword>
    </LibraryClass>
    <LibraryClass Usage="ALWAYS_CONSUMED">
      <Keyword>WinNtLib</Keyword>
    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
    <LibraryClass Usage="ALWAYS_CONSUMED">
      <Keyword>UefiBootServicesTableLib</Keyword>
    </LibraryClass>
@@ -55,7 +44,6 @@
  </SourceFiles>
  <PackageDependencies>
    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
    <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>
  </PackageDependencies>
  <Protocols>
--- 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"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
  <MsaHeader>
    <ModuleName>Cpu</ModuleName>
    <ModuleType>DXE_DRIVER</ModuleType>
@@ -7,7 +7,7 @@
    <Version>1.0</Version>
    <Abstract>Component description file for Cpu module.</Abstract>
    <Description>This CPU module abstracts the interrupt subsystem of a platform and the CPU-specific setjump-long pair.</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>
    <License>All rights reserved. This program and the accompanying materials
      are licensed and made available under the terms and conditions of the BSD License
      which accompanies this distribution.  The full text of the license may be found at
@@ -22,18 +22,12 @@
    <OutputFileBasename>Cpu</OutputFileBasename>
  </ModuleDefinitions>
  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
    <LibraryClass Usage="ALWAYS_CONSUMED">
      <Keyword>DebugLib</Keyword>
    </LibraryClass>
    <LibraryClass Usage="ALWAYS_CONSUMED">
      <Keyword>HiiLib</Keyword>
    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
    <LibraryClass Usage="ALWAYS_CONSUMED">
      <Keyword>UefiDriverEntryPoint</Keyword>
    </LibraryClass>
@@ -56,7 +50,6 @@
  </SourceFiles>
  <PackageDependencies>
    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
    <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>
  </PackageDependencies>
  <Protocols>
@@ -66,6 +59,9 @@
    <Protocol Usage="ALWAYS_PRODUCED">
      <ProtocolCName>gEfiCpuIoProtocolGuid</ProtocolCName>
    </Protocol>
+    <Protocol Usage="ALWAYS_CONSUMED">
+      <ProtocolCName>gEfiWinNtIoProtocolGuid</ProtocolCName>
+    </Protocol>
    <Protocol Usage="SOMETIMES_CONSUMED">
      <ProtocolCName>gEfiHiiProtocolGuid</ProtocolCName>
    </Protocol>
--- 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"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
  <MsaHeader>
    <ModuleName>WinNtThunk</ModuleName>
    <ModuleType>DXE_DRIVER</ModuleType>
@@ -7,7 +7,7 @@
    <Version>1.0</Version>
    <Abstract>A DXE driver to produce EFI_WIN_NT_THUNK_PROTOCOL</Abstract>
    <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>
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>
    <License>All rights reserved. This program and the accompanying materials
      are licensed and made available under the terms and conditions of the BSD License
      which accompanies this distribution.  The full text of the license may be found at
@@ -25,18 +25,12 @@
    <LibraryClass Usage="ALWAYS_CONSUMED">
      <Keyword>DebugLib</Keyword>
    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
    <LibraryClass Usage="ALWAYS_CONSUMED">
      <Keyword>UefiDriverEntryPoint</Keyword>
    </LibraryClass>
    <LibraryClass Usage="ALWAYS_CONSUMED">
      <Keyword>WinNtLib</Keyword>
    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
    <LibraryClass Usage="ALWAYS_CONSUMED">
      <Keyword>UefiBootServicesTableLib</Keyword>
    </LibraryClass>
@@ -48,7 +42,6 @@
  </SourceFiles>
  <PackageDependencies>
    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
    <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>
  </PackageDependencies>
  <Protocols>