1 files changed, 19 insertions, 32 deletions
diff --git a/EdkModulePkg/Universal/UserInterface/DriverSample/DriverSample.msa b/EdkModulePkg/Universal/UserInterface/DriverSample/DriverSample.msa
index cf44d1a8ab..4c96b5eedb 100644
--- a/EdkModulePkg/Universal/UserInterface/DriverSample/DriverSample.msa
+++ b/EdkModulePkg/Universal/UserInterface/DriverSample/DriverSample.msa
@@ -7,7 +7,7 @@
     <Version>1.0</Version>
     <Abstract>Component description file for DriverSample module.</Abstract>
     <Description>This is an example driver to introduce how to export data to the HII protocol to be later utilized by the Setup Protocol. </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
@@ -28,23 +28,19 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">
       <Keyword>UefiRuntimeServicesTableLib</Keyword>
     </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
+    <LibraryClass Usage="ALWAYS_CONSUMED" RecommendedInstanceGuid="bda39d3a-451b-4350-8266-81ab10fa0523">
       <Keyword>DebugLib</Keyword>
+      <HelpText>Recommended libary Instance is PeiDxeDebugLibReportStatusCode instance in MdePkg.</HelpText>
     </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">
+    <LibraryClass Usage="ALWAYS_CONSUMED" RecommendedInstanceGuid="a86fbfca-0183-4eeb-aa8a-762e3b7da1f3">
       <Keyword>PrintLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>EdkGraphicsLib</Keyword>
+      <HelpText>Recommended libary Instance is BasePrintLib instance in MdePkg.</HelpText>
     </LibraryClass>
     <LibraryClass Usage="ALWAYS_CONSUMED">
       <Keyword>EdkIfrSupportLib</Keyword>
@@ -77,33 +73,24 @@
     <Protocol Usage="ALWAYS_CONSUMED">
       <ProtocolCName>gEfiHiiProtocolGuid</ProtocolCName>
     </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiUgaDrawProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiOEMBadgingProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiFirmwareVolumeProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiConsoleControlProtocolGuid</ProtocolCName>
-    </Protocol>
     <Protocol Usage="ALWAYS_PRODUCED">
       <ProtocolCName>gEfiFormCallbackProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
-  <Variables>
-    <Variable Usage="ALWAYS_PRODUCED">
-      <VariableName>0x0032 0x0035</VariableName>
-      <GuidC_Name>g25Guid</GuidC_Name>
-    </Variable>
-  </Variables>
-  <Guids>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiGlobalVariableGuid</GuidCName>
-    </GuidCNames>
-  </Guids>
+  <HiiPackages>
+    <HiiPackage Usage="ALWAYS_PRODUCED">
+      <HiiCName>DriverSampleStrings</HiiCName>
+      <HelpText>EFI_HII_STRING type string package from UNI file.</HelpText>
+    </HiiPackage>
+    <HiiPackage Usage="ALWAYS_PRODUCED">
+      <HiiCName>InventoryBin</HiiCName>
+      <HelpText>EFI_HII_IFR type form package from VFR file.</HelpText>
+    </HiiPackage>
+    <HiiPackage Usage="ALWAYS_PRODUCED">
+      <HiiCName>VfrBin</HiiCName>
+      <HelpText>EFI_HII_IFR type form package from VFR file.</HelpText>
+    </HiiPackage>
+  </HiiPackages>
   <Externs>
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>