Clean up the following module msa files.

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

12 files changed, 106 insertions, 290 deletions

diff --git a/EdkModulePkg/EdkModulePkg.spd b/EdkModulePkg/EdkModulePkg.spd
index 6aef854ed5..c6121cf276 100644
--- a/EdkModulePkg/EdkModulePkg.spd
+++ b/EdkModulePkg/EdkModulePkg.spd
@@ -491,41 +491,6 @@
       <GuidValue>B091E7D2-05A0-4198-94F0-74B7B8C55459</GuidValue>

       <HelpText/>

     </Entry>

-    <Entry Name="StatusCodeDataTypeString">

-      <C_Name>gEfiStatusCodeDataTypeStringGuid</C_Name>

-      <GuidValue>92D11080-496F-4D95-BE7E-037488382B0A</GuidValue>

-      <HelpText/>

-    </Entry>

-    <Entry Name="StatusCodeDataTypeDebug">

-      <C_Name>gEfiStatusCodeDataTypeDebugGuid</C_Name>

-      <GuidValue>9A4E9246-D553-11D5-87E2-00062945C3B9</GuidValue>

-      <HelpText/>

-    </Entry>

-    <Entry Name="StatusCodeDataTypeAssert">

-      <C_Name>gEfiStatusCodeDataTypeAssertGuid</C_Name>

-      <GuidValue>DA571595-4D99-487C-827C-2622677D3307</GuidValue>

-      <HelpText/>

-    </Entry>

-    <Entry Name="StatusCodeDataTypeExceptionHandler">

-      <C_Name>gEfiStatusCodeDataTypeExceptionHandlerGuid</C_Name>

-      <GuidValue>3BC2BD12-AD2E-11D5-87DD-00062945C3B9</GuidValue>

-      <HelpText/>

-    </Entry>

-    <Entry Name="StatusCodeDataTypeError">

-      <C_Name>gEfiStatusCodeDataTypeErrorGuid</C_Name>

-      <GuidValue>AB359CE3-99B3-AE18-C89D-95D3B072E19B</GuidValue>

-      <HelpText/>

-    </Entry>

-    <Entry Name="StatusCodeDataTypeProgressCode">

-      <C_Name>gEfiStatusCodeDataTypeProgressCodeGuid</C_Name>

-      <GuidValue>A356AB39-35C4-35DA-B37A-F8EA9E8B36A3</GuidValue>

-      <HelpText/>

-    </Entry>

-    <Entry Name="StatusCodeSpecificData">

-      <C_Name>gEfiStatusCodeSpecificDataGuid</C_Name>

-      <GuidValue>335984BD-E805-409A-B8F8-D27ECE5FF7A6</GuidValue>

-      <HelpText/>

-    </Entry>

     <Entry Name="SystemNvDataHob">

       <C_Name>gEfiSystemNvDataHobGuid</C_Name>

       <GuidValue>D6E5092D-C7B2-4872-AF66-FDC0E6F95E78</GuidValue>

diff --git a/EdkModulePkg/Universal/Console/Terminal/Dxe/Terminal.msa b/EdkModulePkg/Universal/Console/Terminal/Dxe/Terminal.msa
index 8a281d763e..1c1dc0680d 100644
--- a/EdkModulePkg/Universal/Console/Terminal/Dxe/Terminal.msa
+++ b/EdkModulePkg/Universal/Console/Terminal/Dxe/Terminal.msa
@@ -80,6 +80,9 @@
     <Protocol Usage="TO_START">

       <ProtocolCName>gEfiSerialIoProtocolGuid</ProtocolCName>

     </Protocol>

+    <Protocol Usage="SOMETIMES_CONSUMED">

+      <ProtocolCName>gEfiHotPlugDeviceGuid</ProtocolCName>

+    </Protocol>

   </Protocols>

   <Variables>

     <Variable Usage="SOMETIMES_CONSUMED">

@@ -100,9 +103,6 @@
   </Variables>

   <Guids>

     <GuidCNames Usage="SOMETIMES_CONSUMED">

-      <GuidCName>gEfiHotPlugDeviceGuid</GuidCName>

-    </GuidCNames>

-    <GuidCNames Usage="SOMETIMES_CONSUMED">

       <GuidCName>gEfiGlobalVariableGuid</GuidCName>

     </GuidCNames>

     <GuidCNames Usage="SOMETIMES_CONSUMED">

diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/Print.c b/EdkModulePkg/Universal/Network/PxeBc/Dxe/Print.c
deleted file mode 100644
index 4ea5cbadab..0000000000
--- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/Print.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*++

-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:

-        Print.c

-

-Abstract:

-

---*/

-

-

-#include <Bc.h>

-

-UINTN

-EFIAPI

-AsciiPrint (

-  IN CONST CHAR8 *Format,

-  ...

-  )

-/*++

-

-Routine Description:

-

-  Print function for a maximum of PXE_MAX_PRINT_BUFFER ascii 

-  characters.

-

-Arguments:

-

-  Format - Ascii format string see file header for more details.

-

-  ...    - Vararg list consumed by processing Format.

-

-Returns: 

-

-  Number of characters printed.

-

---*/

-{

-  UINTN   Return;

-  VA_LIST Marker;

-  UINTN   Index;

-  UINTN   MaxIndex;

-  CHAR16  Buffer[PXE_MAX_PRINT_BUFFER];

-  CHAR16  UnicodeFormat[PXE_MAX_PRINT_BUFFER];

-

-  MaxIndex = AsciiStrLen ((CHAR8 *) Format);

-  if (MaxIndex > PXE_MAX_PRINT_BUFFER) {

-    //

-    // Format string was too long for use to process.

-    //

-    return 0;

-  }

-

-  for (Index = 0; Index < PXE_MAX_PRINT_BUFFER; Index++) {

-    UnicodeFormat[Index] = (CHAR16) Format[Index];

-  }

-

-  VA_START (Marker, Format);

-  Return = UnicodeVSPrint (Buffer, sizeof (Buffer), UnicodeFormat, Marker);

-  VA_END (Marker);

-

-  //

-  // Need to convert to Unicode to do an OutputString

-  //

-

-  if (gST->ConOut != NULL) {

-    //

-    // To be extra safe make sure ConOut has been initialized

-    //

-    gST->ConOut->OutputString (gST->ConOut, Buffer);

-  }

-

-  return Return;

-}

diff --git a/EdkModulePkg/Universal/Runtime/RuntimeDxe/Runtime.msa b/EdkModulePkg/Universal/Runtime/RuntimeDxe/Runtime.msa
index 44dfacc5da..207b44c4d9 100644
--- a/EdkModulePkg/Universal/Runtime/RuntimeDxe/Runtime.msa
+++ b/EdkModulePkg/Universal/Runtime/RuntimeDxe/Runtime.msa
@@ -6,8 +6,8 @@
     <GuidValue>B601F8C4-43B7-4784-95B1-F4226CB40CEE</GuidValue>

     <Version>1.0</Version>

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

-    <Description>This module is used to produce the EFI runtime virtual switch over.</Description>

-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>

+    <Description>This module is used to produce the EFI runtime virtual switch over services.</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,13 +26,11 @@
       <Keyword>BaseLib</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>UefiRuntimeLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>UefiDriverEntryPoint</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>ReportStatusCodeLib</Keyword>

@@ -40,9 +38,6 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>BaseMemoryLib</Keyword>

     </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IPF">

-      <Keyword>EdkDxeSalLib</Keyword>

-    </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>UefiRuntimeServicesTableLib</Keyword>

     </LibraryClass>

@@ -70,18 +65,18 @@
     <Protocol Usage="ALWAYS_CONSUMED">

       <ProtocolCName>gEfiLoadedImageProtocolGuid</ProtocolCName>

     </Protocol>

-    <Protocol Usage="SOMETIMES_CONSUMED">

-      <ProtocolCName>gEfiUgaIoProtocolGuid</ProtocolCName>

-    </Protocol> 

     <Protocol Usage="ALWAYS_PRODUCED">

       <ProtocolCName>gEfiRuntimeArchProtocolGuid</ProtocolCName>

     </Protocol>

   </Protocols>

-  <Guids>

-    <GuidCNames Usage="SOMETIMES_CONSUMED">

-      <GuidCName>gEfiCapsuleGuid</GuidCName>

-    </GuidCNames>

-  </Guids>

+  <SystemTables>

+    <SystemTableCNames Usage="SOMETIMES_CONSUMED">

+      <SystemTableCName>gEfiUgaIoProtocolGuid</SystemTableCName>

+    </SystemTableCNames>

+    <SystemTableCNames Usage="SOMETIMES_CONSUMED">

+      <SystemTableCName>gEfiCapsuleGuid</SystemTableCName>

+    </SystemTableCNames>

+  </SystemTables>

   <Externs>

     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>

     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>

diff --git a/EdkModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.msa b/EdkModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.msa
index 591641fd21..7bf5d22d00 100644
--- a/EdkModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.msa
+++ b/EdkModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.msa
@@ -7,7 +7,7 @@
     <Version>1.0</Version>

     <Abstract>Component description file for SecurityStub module</Abstract>

     <Description>This driver supports platform security service.</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,8 +22,9 @@
     <OutputFileBasename>SecurityStub</OutputFileBasename>

   </ModuleDefinitions>

   <LibraryClassDefinitions>

-    <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>UefiBootServicesTableLib</Keyword>

diff --git a/EdkModulePkg/Universal/UserInterface/DriverSample/DriverSample.c b/EdkModulePkg/Universal/UserInterface/DriverSample/DriverSample.c
index f78d4226e5..0de1fca414 100644
--- a/EdkModulePkg/Universal/UserInterface/DriverSample/DriverSample.c
+++ b/EdkModulePkg/Universal/UserInterface/DriverSample/DriverSample.c
@@ -1,5 +1,5 @@
 /*++

-Copyright (c) 2006, Intel Corporation                                                         

+Copyright (c) 2006 - 2007, 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        

@@ -61,7 +61,6 @@ Returns:
 {

   EFI_CALLBACK_INFO       *Private;

   EFI_HII_UPDATE_DATA     *UpdateData;

-  EFI_STATUS              Status;

   UINT8                   *Location;

   EFI_HII_CALLBACK_PACKET *DataPacket;

   UINT16                  Value;

@@ -159,8 +158,8 @@ Returns:
                     UpdateData

                     );

 

-    gBS->FreePool (UpdateData);

-    gBS->FreePool (OptionList);

+    FreePool (UpdateData);

+    FreePool (OptionList);

     break;

 

   case 0x0002:

@@ -235,8 +234,8 @@ Returns:
                     UpdateData

                     );

 

-    gBS->FreePool (UpdateData);

-    gBS->FreePool (OptionList);

+    FreePool (UpdateData);

+    FreePool (OptionList);

     break;

 

   case 0x1234:

@@ -244,14 +243,8 @@ Returns:
     // Allocate space for creation of Buffer

     //

     QuestionId = (UINT16) ((UINTN) (&NVStruc.DynamicCheck) - (UINTN) (&NVStruc));

-    Status = gBS->AllocatePool (

-                    EfiBootServicesData,

-                    0x1000,

-                    (VOID **) &UpdateData

-                    );

-    ASSERT_EFI_ERROR (Status);

-

-    ZeroMem (UpdateData, 0x1000);

+    UpdateData = AllocateZeroPool (0x1000);

+    ASSERT (UpdateData != NULL);

 

     Location                        = (UINT8 *) &UpdateData->Data;

 

@@ -290,7 +283,7 @@ Returns:
                     UpdateData

                     );

 

-    gBS->FreePool (UpdateData);

+    FreePool (UpdateData);

     QuestionId++;

     break;

 

@@ -298,14 +291,8 @@ Returns:
     //

     // Allocate space for creation of Buffer

     //

-    Status = gBS->AllocatePool (

-                    EfiBootServicesData,

-                    0x1000,

-                    (VOID **)&UpdateData

-                    );

-    ASSERT_EFI_ERROR (Status);

-

-    ZeroMem (UpdateData, 0x1000);

+    UpdateData = AllocateZeroPool (0x1000);

+    ASSERT (UpdateData != NULL);

 

     //

     // Initialize DataPacket with information intended to remove all

@@ -355,7 +342,7 @@ Returns:
                     UpdateData

                     );

 

-    gBS->FreePool (UpdateData);

+    FreePool (UpdateData);

     break;

 

   case 0x1236:

@@ -368,14 +355,8 @@ Returns:
     // an error and fill in the string parameter, otherwise, I will return information in the DataArray structure.

     // The browser will free this packet structure

     //

-    Status = gBS->AllocatePool (

-                    EfiBootServicesData,

-                    sizeof (EFI_HII_CALLBACK_PACKET) + sizeof (SAMPLE_STRING) + 2,

-                    (VOID **) Packet

-                    );

-    ASSERT_EFI_ERROR (Status);

-

-    ZeroMem (*Packet, sizeof (EFI_HII_CALLBACK_PACKET) + sizeof (SAMPLE_STRING) + 2);

+    *Packet = AllocateZeroPool (sizeof (EFI_HII_CALLBACK_PACKET) + sizeof (SAMPLE_STRING) + 2);

+    ASSERT (*Packet != NULL);

 

     //

     // Assign the buffer address to DataPacket

@@ -387,14 +368,8 @@ Returns:
 

   case 0x1237:

 

-    Status = gBS->AllocatePool (

-                    EfiBootServicesData,

-                    sizeof (EFI_HII_CALLBACK_PACKET) + 2,

-                    (VOID **) Packet

-                    );

-    ASSERT_EFI_ERROR (Status);

-

-    ZeroMem (*Packet, sizeof (EFI_HII_CALLBACK_PACKET) + 2);

+    *Packet = AllocateZeroPool (sizeof (EFI_HII_CALLBACK_PACKET) + 2);

+    ASSERT (*Packet != NULL);

 

     //

     // Assign the buffer address to DataPacket

@@ -410,39 +385,39 @@ Returns:
     Value = 0x0001;

     UnicodeSPrint (VariableName, 0x80, (CHAR16 *) L"%d", VAR_EQ_TEST_NAME);

 

-    Status = gRT->SetVariable (

-                    VariableName,

-                    &mFormSetGuid,

-                    EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,

-                    2,

-                    (VOID *) &Value

-                    );

+    gRT->SetVariable (

+          VariableName,

+          &mFormSetGuid,

+          EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,

+          2,

+          (VOID *) &Value

+          );

     break;

 

   case 0x1556:

     Value = 0x1000;

     UnicodeSPrint (VariableName, 0x80, (CHAR16 *) L"%d", VAR_EQ_TEST_NAME);

 

-    Status = gRT->SetVariable (

-                    VariableName,

-                    &mFormSetGuid,

-                    EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,

-                    2,

-                    (VOID *) &Value

-                    );

+    gRT->SetVariable (

+          VariableName,

+          &mFormSetGuid,

+          EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,

+          2,

+          (VOID *) &Value

+          );

     break;

 

   case 0x1557:

     Value = 0x0000;

     UnicodeSPrint (VariableName, 0x80, (CHAR16 *) L"%d", VAR_EQ_TEST_NAME);

 

-    Status = gRT->SetVariable (

-                    VariableName,

-                    &mFormSetGuid,

-                    EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,

-                    2,

-                    (VOID *) &Value

-                    );

+    gRT->SetVariable (

+          VariableName,

+          &mFormSetGuid,

+          EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,

+          2,

+          (VOID *) &Value

+          );

     break;

 

   default:

@@ -497,26 +472,9 @@ DriverSampleInit (
     return Status;;

   }

 

-  /*

-  //

-  // There should only be one Form Configuration protocol

-  //

-  Status = gBS->LocateProtocol (

-                 &gEfiFormBrowserProtocolGuid, 

-                 NULL, 

-                 &FormConfig

-                 );

-  if (EFI_ERROR (Status)) {

-    return Status;;

-  }

-*/

-  Status = gBS->AllocatePool (

-                  EfiBootServicesData,

-                  sizeof (EFI_CALLBACK_INFO),

-                  (VOID **) &CallbackInfo

-                  );

-  if (EFI_ERROR (Status)) {

-    return Status;

+  CallbackInfo = AllocatePool (sizeof (EFI_CALLBACK_INFO));

+  if (CallbackInfo == NULL) {

+    return EFI_OUT_OF_RESOURCES;

   }

 

   CallbackInfo->Signature = EFI_CALLBACK_INFO_SIGNATURE;

@@ -546,15 +504,15 @@ DriverSampleInit (
 

   PackageList                   = PreparePackages (1, &mStringPackGuid, DriverSampleStrings);

   Status                        = Hii->NewPack (Hii, PackageList, &HiiHandle);

-  gBS->FreePool (PackageList);

+  FreePool (PackageList);

 

   PackageList = PreparePackages (1, &mStringPackGuid, InventoryBin);

   Status      = Hii->NewPack (Hii, PackageList, &HiiHandle);

-  gBS->FreePool (PackageList);

+  FreePool (PackageList);

 

   PackageList = PreparePackages (1, &mStringPackGuid, VfrBin);

   Status      = Hii->NewPack (Hii, PackageList, &HiiHandle);

-  gBS->FreePool (PackageList);

+  FreePool (PackageList);

 

   CallbackInfo->RegisteredHandle = HiiHandle;

 

@@ -589,14 +547,8 @@ DriverSampleInit (
   //

   // Allocate space for creation of Buffer

   //

-  Status = gBS->AllocatePool (

-                  EfiBootServicesData,

-                  0x1000,

-                  (VOID **) &UpdateData

-                  );

-  ASSERT_EFI_ERROR (Status);

-

-  ZeroMem (UpdateData, 0x1000);

+  UpdateData = AllocateZeroPool (0x1000);

+  ASSERT (UpdateData != NULL);

 

   //

   // Flag update pending in FormSet

@@ -614,7 +566,7 @@ DriverSampleInit (
 

   Hii->UpdateForm (Hii, HiiHandle, (EFI_FORM_LABEL) 100, TRUE, UpdateData);

 

-  gBS->FreePool (UpdateData);

+  FreePool (UpdateData);

 

   //

   // Example of how to display only the item we sent to HII

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>

diff --git a/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Forms.c b/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Forms.c
index b7b02a85f8..c0c08f33a5 100644
--- a/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Forms.c
+++ b/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Forms.c
@@ -991,7 +991,7 @@ HiiGetDefaultImagePopulateMap (
     // Either Defaults/Manufacturing variable exists and appears to be valid. 

     // The map is read, exit w/ success now.

     //

-    gBS->FreePool (Name16);

+    FreePool (Name16);

     return;

   }

 

@@ -1149,7 +1149,7 @@ HiiGetDefaultImagePopulateMap (
     }

   }

 

-  gBS->FreePool (Name16);

+  FreePool (Name16);

 

 }

 

@@ -1570,7 +1570,7 @@ Returns:
   //

   // Free the old buffer, and assign into our database the latest buffer

   //

-  gBS->FreePool (HandleDatabase->Buffer);

+  FreePool (HandleDatabase->Buffer);

   HandleDatabase->Buffer = OrigTempBuffer;

 

   return EFI_SUCCESS;

diff --git a/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/HiiDatabase.c b/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/HiiDatabase.c
index bcec42b24e..1889d70581 100644
--- a/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/HiiDatabase.c
+++ b/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/HiiDatabase.c
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2006, Intel Corporation                                                         

+Copyright (c) 2006 - 2007, 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        

@@ -67,7 +67,7 @@ Returns:
   //

   if (!EFI_ERROR (Status)) {

     if (HandleBuffer != NULL) {

-      gBS->FreePool (HandleBuffer);

+      FreePool (HandleBuffer);

     }

 

     return EFI_DEVICE_ERROR;

diff --git a/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/HiiDatabase.msa b/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/HiiDatabase.msa
index f43977b6c3..f91338d925 100644
--- a/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/HiiDatabase.msa
+++ b/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/HiiDatabase.msa
@@ -7,7 +7,7 @@
     <Version>1.0</Version>

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

     <Description>This module inits HII database and installs HII 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

@@ -25,8 +25,9 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>BaseLib</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>

@@ -62,24 +63,20 @@
     <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>

   </PackageDependencies>

   <Protocols>

-    <Protocol Usage="ALWAYS_CONSUMED">

+    <Protocol Usage="ALWAYS_PRODUCED">

       <ProtocolCName>gEfiHiiProtocolGuid</ProtocolCName>

     </Protocol>

-    <Protocol Usage="ALWAYS_CONSUMED">

+    <Protocol Usage="SOMETIMES_CONSUMED">

       <ProtocolCName>gEfiFormCallbackProtocolGuid</ProtocolCName>

     </Protocol>

   </Protocols>

   <Variables>

-    <Variable Usage="ALWAYS_CONSUMED">

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

-      <GuidC_Name>gLanGuid</GuidC_Name>

+    <Variable Usage="SOMETIMES_CONSUMED">

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

+      <GuidC_Name>gEfiGlobalVariableGuid</GuidC_Name>

+      <HelpText>L"Lang" global variable is used as system default language.</HelpText>

     </Variable>

   </Variables>

-  <Guids>

-    <GuidCNames Usage="ALWAYS_CONSUMED">

-      <GuidCName>gEfiGlobalVariableGuid</GuidCName>

-    </GuidCNames>

-  </Guids>

   <Externs>

     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>

     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>

diff --git a/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Package.c b/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Package.c
index ec3f49c5dc..f4696e7724 100644
--- a/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Package.c
+++ b/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Package.c
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2006, Intel Corporation                                                         

+Copyright (c) 2006 - 2007, 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        

@@ -642,7 +642,7 @@ Returns:
       //

       // Free the Package Instance

       //

-      gBS->FreePool (PackageInstance);

+      FreePool (PackageInstance);

 

       //

       // If this was the only Handle in the database

@@ -654,7 +654,7 @@ Returns:
       // Make the parent->Next point to the current->Next

       //

       PreviousHandleDatabase->NextHandleDatabase = HandleDatabase->NextHandleDatabase;

-      gBS->FreePool (HandleDatabase);

+      FreePool (HandleDatabase);

       return EFI_SUCCESS;

     }

     //

diff --git a/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Strings.c b/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Strings.c
index 0dbcd33884..4c56ab0619 100644
--- a/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Strings.c
+++ b/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Strings.c
@@ -349,7 +349,7 @@ Returns:
   // If the token value is not valid, error out

   //

   if ((*Reference >= TotalStringCount) && !ResetStrings) {

-    gBS->FreePool (NewBuffer);

+    FreePool (NewBuffer);

     return EFI_INVALID_PARAMETER;

   }

   //

@@ -631,7 +631,7 @@ Returns:
       //

       // Free the previous buffer associated with this handle, and assign the new buffer to the handle

       //

-      gBS->FreePool (HandleDatabase->Buffer);

+      FreePool (HandleDatabase->Buffer);

       HandleDatabase->Buffer = NewBuffer;

       break;

     }

@@ -710,7 +710,7 @@ Returns:
                 );

     }

 

-    gBS->FreePool (LangCodes);

+    FreePool (LangCodes);

   }

 

   return Status;

@@ -764,7 +764,7 @@ Returns:
     ASSERT_EFI_ERROR (Status);

   }

 

-  gBS->FreePool (LangCodes);

+  FreePool (LangCodes);

   return EFI_SUCCESS;

 }

 

@@ -1240,7 +1240,7 @@ HiiCompareLanguage (
   // If the Language is the same return success

   //

   if (CompareMem (LanguageStringLocation, Language, 6) == 0) {

-    gBS->FreePool (InputString);

+    FreePool (InputString);

     return EFI_SUCCESS;

   }

   //

@@ -1258,14 +1258,14 @@ HiiCompareLanguage (
     // Getting in here means we have a secondary language

     //

     if (CompareMem (&InputString[Index], Language, 6) == 0) {

-      gBS->FreePool (InputString);

+      FreePool (InputString);

       return EFI_SUCCESS;

     }

   }

   //

   // If nothing was found, return the error

   //

-  gBS->FreePool (OriginalInputString);

+  FreePool (OriginalInputString);

   return EFI_NOT_FOUND;

 

 }