1 files changed, 122 insertions, 72 deletions
diff --git a/EdkNt32Pkg/Dxe/Nt32Platform/MiscSubclass/MiscSubclassDriver.msa b/EdkNt32Pkg/Dxe/Nt32Platform/MiscSubclass/MiscSubclassDriver.msa
index 3c47d82ced..5f5d0160e2 100644
--- a/EdkNt32Pkg/Dxe/Nt32Platform/MiscSubclass/MiscSubclassDriver.msa
+++ b/EdkNt32Pkg/Dxe/Nt32Platform/MiscSubclass/MiscSubclassDriver.msa
@@ -1,46 +1,62 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
+<!--Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
+<ModuleSurfaceArea xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd" xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <MsaHeader>
-    <BaseName>MiscSubclass</BaseName>
+    <ModuleName>MiscSubclass</ModuleName>
     <ModuleType>DXE_DRIVER</ModuleType>
-    <ComponentType>BS_DRIVER</ComponentType>
-    <Guid>4A9B9DB8-EC62-4A92-818F-8AA0246D246E</Guid>
-    <Version>0</Version>
+    <GuidValue>4A9B9DB8-EC62-4A92-818F-8AA0246D246E</GuidValue>
+    <Version>1.0</Version>
     <Abstract>Component description file for MiscSubclass Driver module</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
-    <License>
-      All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    </License>
-    <Created>2006-03-13 17:07</Created>
-    <Updated>2006-03-23 13:50</Updated>
-    <Specification>0</Specification>
+    <License>All rights reserved. This program and the accompanying materials
+      are licensed and made available under the terms and conditions of the BSD License
+      which accompanies this distribution.  The full text of the license may be found at
+      http://opensource.org/licenses/bsd-license.php
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </MsaHeader>
+  <ModuleDefinitions>
+    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
+    <BinaryModule>false</BinaryModule>
+    <OutputFileBasename>MiscSubclass</OutputFileBasename>
+  </ModuleDefinitions>
   <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">DebugLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">HiiLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiDriverEntryPoint</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseMemoryLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">MemoryAllocationLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiBootServicesTableLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">DevicePathLib</LibraryClass>
+    <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>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>BaseMemoryLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>MemoryAllocationLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiBootServicesTableLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>DevicePathLib</Keyword>
+    </LibraryClass>
   </LibraryClassDefinitions>
   <SourceFiles>
     <Filename>MiscSubclassDriver.uni</Filename>
@@ -64,51 +80,85 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Filename>MiscPortInternalConnectorDesignatorFunction.c</Filename>
     <Filename>MiscSubclassDriver.dxs</Filename>
   </SourceFiles>
-  <Includes>
-    <PackageName>MdePkg</PackageName>
-    <PackageName>EdkModulePkg</PackageName>
-    <PackageName>EdkNt32Pkg</PackageName>
-  </Includes>
+  <PackageDependencies>
+    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+    <Package PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+    <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>
+  </PackageDependencies>
   <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED">DataHub</Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">Hii</Protocol>
-    <ProtocolNotify Usage="SOMETIMES_CONSUMED">WinNtIo</ProtocolNotify>
+    <Protocol Usage="ALWAYS_CONSUMED">
+      <ProtocolCName>DataHub</ProtocolCName>
+    </Protocol>
+    <Protocol Usage="ALWAYS_CONSUMED">
+      <ProtocolCName>Hii</ProtocolCName>
+    </Protocol>
+    <ProtocolNotify Usage="SOMETIMES_CONSUMED">
+      <ProtocolNotifyCName>WinNtIo</ProtocolNotifyCName>
+    </ProtocolNotify>
   </Protocols>
   <DataHubs>
-    <DataHubRecord Usage="ALWAYS_PRODUCED">MiscPortKeyboard</DataHubRecord>
-    <DataHubRecord Usage="ALWAYS_PRODUCED">MiscPortMouse</DataHubRecord>
-    <DataHubRecord Usage="ALWAYS_PRODUCED">MiscPortCom1</DataHubRecord>
-    <DataHubRecord Usage="ALWAYS_PRODUCED">MiscPortCom2</DataHubRecord>
-    <DataHubRecord Usage="ALWAYS_PRODUCED">MiscBiosVendor</DataHubRecord>
-    <DataHubRecord Usage="ALWAYS_PRODUCED">MiscSystemManufacturer</DataHubRecord>
-    <DataHubRecord Usage="ALWAYS_PRODUCED">MiscBaseBoardManufacturer</DataHubRecord>
-    <DataHubRecord Usage="ALWAYS_PRODUCED">MiscChassisManufacturer</DataHubRecord>
-    <DataHubRecord Usage="ALWAYS_PRODUCED">MiscSystemSlotDesignation</DataHubRecord>
-    <DataHubRecord Usage="ALWAYS_PRODUCED">OemString</DataHubRecord>
-    <DataHubRecord Usage="ALWAYS_PRODUCED">SystemOptionString</DataHubRecord>
-    <DataHubRecord Usage="SOMETIMES_CONSUMED">ProcessorSubClassData</DataHubRecord>
-    <DataHubRecord Usage="SOMETIMES_PRODUCED">MemorySubClassData</DataHubRecord>
+    <DataHubRecord Usage="ALWAYS_PRODUCED">
+      <DataHubCName>MiscPortKeyboard</DataHubCName>
+    </DataHubRecord>
+    <DataHubRecord Usage="ALWAYS_PRODUCED">
+      <DataHubCName>MiscPortMouse</DataHubCName>
+    </DataHubRecord>
+    <DataHubRecord Usage="ALWAYS_PRODUCED">
+      <DataHubCName>MiscPortCom1</DataHubCName>
+    </DataHubRecord>
+    <DataHubRecord Usage="ALWAYS_PRODUCED">
+      <DataHubCName>MiscPortCom2</DataHubCName>
+    </DataHubRecord>
+    <DataHubRecord Usage="ALWAYS_PRODUCED">
+      <DataHubCName>MiscBiosVendor</DataHubCName>
+    </DataHubRecord>
+    <DataHubRecord Usage="ALWAYS_PRODUCED">
+      <DataHubCName>MiscSystemManufacturer</DataHubCName>
+    </DataHubRecord>
+    <DataHubRecord Usage="ALWAYS_PRODUCED">
+      <DataHubCName>MiscBaseBoardManufacturer</DataHubCName>
+    </DataHubRecord>
+    <DataHubRecord Usage="ALWAYS_PRODUCED">
+      <DataHubCName>MiscChassisManufacturer</DataHubCName>
+    </DataHubRecord>
+    <DataHubRecord Usage="ALWAYS_PRODUCED">
+      <DataHubCName>MiscSystemSlotDesignation</DataHubCName>
+    </DataHubRecord>
+    <DataHubRecord Usage="ALWAYS_PRODUCED">
+      <DataHubCName>OemString</DataHubCName>
+    </DataHubRecord>
+    <DataHubRecord Usage="ALWAYS_PRODUCED">
+      <DataHubCName>SystemOptionString</DataHubCName>
+    </DataHubRecord>
+    <DataHubRecord Usage="SOMETIMES_CONSUMED">
+      <DataHubCName>ProcessorSubClassData</DataHubCName>
+    </DataHubRecord>
+    <DataHubRecord Usage="SOMETIMES_PRODUCED">
+      <DataHubCName>MemorySubClassData</DataHubCName>
+    </DataHubRecord>
   </DataHubs>
   <Guids>
-    <GuidEntry Usage="ALWAYS_CONSUMED">
-      <C_Name>MiscSubClass</C_Name>
-    </GuidEntry>
-    <GuidEntry Usage="SOMETIMES_CONSUMED">
-      <C_Name>ProcessorSubClass</C_Name>
-    </GuidEntry>
-    <GuidEntry Usage="SOMETIMES_CONSUMED">
-      <C_Name>MemoryProducer</C_Name>
-    </GuidEntry>
-    <GuidEntry Usage="SOMETIMES_CONSUMED">
-      <C_Name>MemorySubClass</C_Name>
-    </GuidEntry>
-    <GuidEntry Usage="SOMETIMES_CONSUMED">
-      <C_Name>WinNtMemory</C_Name>
-    </GuidEntry>
+    <GuidCNames Usage="ALWAYS_CONSUMED">
+      <GuidCName>MiscSubClass</GuidCName>
+    </GuidCNames>
+    <GuidCNames Usage="SOMETIMES_CONSUMED">
+      <GuidCName>ProcessorSubClass</GuidCName>
+    </GuidCNames>
+    <GuidCNames Usage="SOMETIMES_CONSUMED">
+      <GuidCName>MemoryProducer</GuidCName>
+    </GuidCNames>
+    <GuidCNames Usage="SOMETIMES_CONSUMED">
+      <GuidCName>MemorySubClass</GuidCName>
+    </GuidCNames>
+    <GuidCNames Usage="SOMETIMES_CONSUMED">
+      <GuidCName>WinNtMemory</GuidCName>
+    </GuidCNames>
   </Guids>
   <Externs>
+    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
+    <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>
     <Extern>
       <ModuleEntryPoint>MiscSubclassDriverEntryPoint</ModuleEntryPoint>
     </Extern>
   </Externs>
-</ModuleSurfaceArea>
+</ModuleSurfaceArea>
+\ No newline at end of file