converted all surface area description files to new schema

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

3 files changed, 235 insertions, 151 deletions

diff --git a/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/HiiDatabase.msa b/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/HiiDatabase.msa
index 9193278..8513fbd 100644
--- a/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/HiiDatabase.msa
+++ b/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/HiiDatabase.msa
@@ -1,45 +1,59 @@
 <?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>HiiDatabase</BaseName>

+    <ModuleName>HiiDatabase</ModuleName>

     <ModuleType>DXE_DRIVER</ModuleType>

-    <ComponentType>BS_DRIVER</ComponentType>

-    <Guid>FCD337AB-B1D3-4EF8-957C-8048606FF670</Guid>

-    <Version>0</Version>

+    <GuidValue>FCD337AB-B1D3-4EF8-957C-8048606FF670</GuidValue>

+    <Version>1.0</Version>

     <Abstract>Component description file for DiskIo module.</Abstract>

     <Description>FIX ME!</Description>

     <Copyright>Copyright (c) 2004-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-12 17:09</Created>

-    <Updated>2006-03-19 15:19</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>HiiDatabase</OutputFileBasename>

+  </ModuleDefinitions>

   <LibraryClassDefinitions>

-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">DebugLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiDriverEntryPoint</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">MemoryAllocationLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseMemoryLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiBootServicesTableLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiRuntimeServicesTableLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">EdkIfrSupportLib</LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>BaseLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>DebugLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>UefiDriverEntryPoint</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>MemoryAllocationLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>BaseMemoryLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>UefiBootServicesTableLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>UefiRuntimeServicesTableLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>EdkIfrSupportLib</Keyword>

+    </LibraryClass>

   </LibraryClassDefinitions>

   <SourceFiles>

     <Filename>HiiDatabase.c</Filename>

@@ -51,30 +65,34 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Filename>Keyboard.c</Filename>

     <Filename>HiiDatabase.dxs</Filename>

   </SourceFiles>

-  <Includes>

-    <PackageName>MdePkg</PackageName>

-    <PackageName>EdkModulePkg</PackageName>

-  </Includes>

+  <PackageDependencies>

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

+    <Package PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>

+  </PackageDependencies>

   <Protocols>

-    <Protocol Usage="ALWAYS_CONSUMED">Hii</Protocol>

-    <Protocol Usage="ALWAYS_CONSUMED">FormCallback</Protocol>

+    <Protocol Usage="ALWAYS_CONSUMED">

+      <ProtocolCName>Hii</ProtocolCName>

+    </Protocol>

+    <Protocol Usage="ALWAYS_CONSUMED">

+      <ProtocolCName>FormCallback</ProtocolCName>

+    </Protocol>

   </Protocols>

   <Variables>

     <Variable Usage="ALWAYS_CONSUMED">

-      <String>L"Lang"</String>

-      <Guid Usage="ALWAYS_CONSUMED">

-        0x8BE4DF61, 0x93CA, 0x11d2, {0xAA, 0x0D, 0x00, 0xE0, 0x98, 0x03, 0x2B, 0x8C }

-      </Guid>

+      <VariableName>0x004C 0x0061 0x006E</VariableName>

+      <GuidC_Name>gLanGuid</GuidC_Name>

     </Variable>

   </Variables>

   <Guids>

-    <GuidEntry Usage="ALWAYS_CONSUMED">

-      <C_Name>GlobalVariable</C_Name>

-    </GuidEntry>

+    <GuidCNames Usage="ALWAYS_CONSUMED">

+      <GuidCName>GlobalVariable</GuidCName>

+    </GuidCNames>

   </Guids>

   <Externs>

+    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>

+    <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>

     <Extern>

       <ModuleEntryPoint>InitializeHiiDatabase</ModuleEntryPoint>

     </Extern>

   </Externs>

-</ModuleSurfaceArea>

+</ModuleSurfaceArea>
\ No newline at end of file
diff --git a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/DriverSample/DriverSample.msa b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/DriverSample/DriverSample.msa
index ab43a63..0a91cb1 100644
--- a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/DriverSample/DriverSample.msa
+++ b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/DriverSample/DriverSample.msa
@@ -1,49 +1,71 @@
 <?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>DriverSample</BaseName>

+    <ModuleName>DriverSample</ModuleName>

     <ModuleType>DXE_DRIVER</ModuleType>

-    <ComponentType>BS_DRIVER</ComponentType>

-    <Guid>FE3542FE-C1D3-4EF8-657C-8048606FF670</Guid>

-    <Version>0</Version>

+    <GuidValue>FE3542FE-C1D3-4EF8-657C-8048606FF670</GuidValue>

+    <Version>1.0</Version>

     <Abstract>Component description file for DiskIo 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-12 17:09</Created>

-    <Updated>2006-03-19 15:19</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>DriverSample</OutputFileBasename>

+  </ModuleDefinitions>

   <LibraryClassDefinitions>

-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiBootServicesTableLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiRuntimeServicesTableLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">DebugLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiDriverEntryPoint</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">PrintLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">EdkGraphicsLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">EdkIfrSupportLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseMemoryLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">MemoryAllocationLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">HiiLib</LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>UefiBootServicesTableLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>UefiRuntimeServicesTableLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>DebugLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>UefiDriverEntryPoint</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>UefiLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>BaseLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>PrintLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>EdkGraphicsLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>EdkIfrSupportLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>BaseMemoryLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>MemoryAllocationLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>HiiLib</Keyword>

+    </LibraryClass>

   </LibraryClassDefinitions>

   <SourceFiles>

     <Filename>InventoryStrings.uni</Filename>

@@ -53,32 +75,46 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Filename>DriverSample.c</Filename>

     <Filename>DriverSample.h</Filename>

   </SourceFiles>

-  <Includes>

-    <PackageName>MdePkg</PackageName>

-    <PackageName>EdkModulePkg</PackageName>

-  </Includes>

+  <PackageDependencies>

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

+    <Package PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>

+  </PackageDependencies>

   <Protocols>

-    <Protocol Usage="ALWAYS_CONSUMED">Hii</Protocol>

-    <Protocol Usage="ALWAYS_CONSUMED">UgaDraw</Protocol>

-    <Protocol Usage="ALWAYS_CONSUMED">OEMBadging</Protocol>

-    <Protocol Usage="ALWAYS_CONSUMED">FirmwareVolume</Protocol>

-    <Protocol Usage="ALWAYS_CONSUMED">ConsoleControl</Protocol>

-    <Protocol Usage="ALWAYS_PRODUCED">FormCallback</Protocol>

+    <Protocol Usage="ALWAYS_CONSUMED">

+      <ProtocolCName>Hii</ProtocolCName>

+    </Protocol>

+    <Protocol Usage="ALWAYS_CONSUMED">

+      <ProtocolCName>UgaDraw</ProtocolCName>

+    </Protocol>

+    <Protocol Usage="ALWAYS_CONSUMED">

+      <ProtocolCName>OEMBadging</ProtocolCName>

+    </Protocol>

+    <Protocol Usage="ALWAYS_CONSUMED">

+      <ProtocolCName>FirmwareVolume</ProtocolCName>

+    </Protocol>

+    <Protocol Usage="ALWAYS_CONSUMED">

+      <ProtocolCName>ConsoleControl</ProtocolCName>

+    </Protocol>

+    <Protocol Usage="ALWAYS_PRODUCED">

+      <ProtocolCName>FormCallback</ProtocolCName>

+    </Protocol>

   </Protocols>

   <Variables>

     <Variable Usage="ALWAYS_PRODUCED">

-      <String>L"256"</String>

-      <Guid>0xA04A27f4, 0xDF00, 0x4D42, { 0xB5, 0x52, 0x39, 0x51, 0x13, 0x02, 0x11, 0x3D }</Guid>

+      <VariableName>0x0032 0x0035</VariableName>

+      <GuidC_Name>g25Guid</GuidC_Name>

     </Variable>

   </Variables>

   <Guids>

-    <GuidEntry Usage="ALWAYS_CONSUMED">

-      <C_Name>GlobalVariable</C_Name>

-    </GuidEntry>

+    <GuidCNames Usage="ALWAYS_CONSUMED">

+      <GuidCName>GlobalVariable</GuidCName>

+    </GuidCNames>

   </Guids>

   <Externs>

+    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>

+    <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>

     <Extern>

       <ModuleEntryPoint>DriverSampleInit</ModuleEntryPoint>

     </Extern>

   </Externs>

-</ModuleSurfaceArea>

+</ModuleSurfaceArea>
\ No newline at end of file
diff --git a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/SetupBrowser.msa b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/SetupBrowser.msa
index ec9e5d6..bf82961 100644
--- a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/SetupBrowser.msa
+++ b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/SetupBrowser.msa
@@ -1,48 +1,68 @@
 <?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>SetupBrowser</BaseName>

+    <ModuleName>SetupBrowser</ModuleName>

     <ModuleType>DXE_DRIVER</ModuleType>

-    <ComponentType>BS_DRIVER</ComponentType>

-    <Guid>EBf342FE-B1D3-4EF8-957C-8048606FF670</Guid>

-    <Version>0</Version>

+    <GuidValue>EBf342FE-B1D3-4EF8-957C-8048606FF670</GuidValue>

+    <Version>1.0</Version>

     <Abstract>Component description file for DiskIo 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-12 17:09</Created>

-    <Updated>2006-03-19 15:19</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>SetupBrowser</OutputFileBasename>

+  </ModuleDefinitions>

   <LibraryClassDefinitions>

-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">DebugLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseMemoryLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">MemoryAllocationLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiDriverEntryPoint</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">EdkIfrSupportLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">PrintLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiBootServicesTableLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiRuntimeServicesTableLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">HiiLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">EdkGraphicsLib</LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>BaseLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>DebugLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>BaseMemoryLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>MemoryAllocationLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>UefiDriverEntryPoint</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>EdkIfrSupportLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>PrintLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>UefiBootServicesTableLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>UefiRuntimeServicesTableLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>HiiLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>EdkGraphicsLib</Keyword>

+    </LibraryClass>

   </LibraryClassDefinitions>

   <SourceFiles>

     <Filename>SetupBrowserStr.uni</Filename>

@@ -57,26 +77,36 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Filename>Ui.c</Filename>

     <Filename>Ui.h</Filename>

   </SourceFiles>

-  <Includes>

-    <PackageName>MdePkg</PackageName>

-    <PackageName>EdkModulePkg</PackageName>

-  </Includes>

+  <PackageDependencies>

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

+    <Package PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>

+  </PackageDependencies>

   <Protocols>

-    <Protocol Usage="ALWAYS_CONSUMED">Hii</Protocol>

-    <Protocol Usage="ALWAYS_CONSUMED">FormCallback</Protocol>

-    <Protocol Usage="ALWAYS_PRODUCED">FormBrowser</Protocol>

-    <Protocol Usage="ALWAYS_PRODUCED">Print</Protocol>

+    <Protocol Usage="ALWAYS_CONSUMED">

+      <ProtocolCName>Hii</ProtocolCName>

+    </Protocol>

+    <Protocol Usage="ALWAYS_CONSUMED">

+      <ProtocolCName>FormCallback</ProtocolCName>

+    </Protocol>

+    <Protocol Usage="ALWAYS_PRODUCED">

+      <ProtocolCName>FormBrowser</ProtocolCName>

+    </Protocol>

+    <Protocol Usage="ALWAYS_PRODUCED">

+      <ProtocolCName>Print</ProtocolCName>

+    </Protocol>

   </Protocols>

   <Events>

     <CreateEvents>

-      <Event>

-        <C_Name>EFI_EVENT_TIMER</C_Name>

-      </Event>

+      <EventTypes EventGuidCName="EFI_EVENT_TIMER" Usage="ALWAYS_CONSUMED">

+        <EventType>EVENT_GROUP_GUID</EventType>

+      </EventTypes>

     </CreateEvents>

   </Events>

   <Externs>

+    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>

+    <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>

     <Extern>

       <ModuleEntryPoint>InitializeSetup</ModuleEntryPoint>

     </Extern>

   </Externs>

-</ModuleSurfaceArea>

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