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

diff --git a/EdkModulePkg/EdkModulePkg.spd b/EdkModulePkg/EdkModulePkg.spd
index 6aef854ed53b7c343039fd4d9a8796161f4924b2..c6121cf276592c7514d7319a5de1905db9503aef 100644 (file)
--- a/EdkModulePkg/EdkModulePkg.spd
+++ b/EdkModulePkg/EdkModulePkg.spd
@@ -491,41 +491,6 @@
       <GuidValue>B091E7D2-05A0-4198-94F0-74B7B8C55459</GuidValue>\r
       <HelpText/>\r
     </Entry>\r
       <GuidValue>B091E7D2-05A0-4198-94F0-74B7B8C55459</GuidValue>\r
       <HelpText/>\r
     </Entry>\r

-    <Entry Name="StatusCodeDataTypeString">\r
-      <C_Name>gEfiStatusCodeDataTypeStringGuid</C_Name>\r
-      <GuidValue>92D11080-496F-4D95-BE7E-037488382B0A</GuidValue>\r
-      <HelpText/>\r
-    </Entry>\r
-    <Entry Name="StatusCodeDataTypeDebug">\r
-      <C_Name>gEfiStatusCodeDataTypeDebugGuid</C_Name>\r
-      <GuidValue>9A4E9246-D553-11D5-87E2-00062945C3B9</GuidValue>\r
-      <HelpText/>\r
-    </Entry>\r
-    <Entry Name="StatusCodeDataTypeAssert">\r
-      <C_Name>gEfiStatusCodeDataTypeAssertGuid</C_Name>\r
-      <GuidValue>DA571595-4D99-487C-827C-2622677D3307</GuidValue>\r
-      <HelpText/>\r
-    </Entry>\r
-    <Entry Name="StatusCodeDataTypeExceptionHandler">\r
-      <C_Name>gEfiStatusCodeDataTypeExceptionHandlerGuid</C_Name>\r
-      <GuidValue>3BC2BD12-AD2E-11D5-87DD-00062945C3B9</GuidValue>\r
-      <HelpText/>\r
-    </Entry>\r
-    <Entry Name="StatusCodeDataTypeError">\r
-      <C_Name>gEfiStatusCodeDataTypeErrorGuid</C_Name>\r
-      <GuidValue>AB359CE3-99B3-AE18-C89D-95D3B072E19B</GuidValue>\r
-      <HelpText/>\r
-    </Entry>\r
-    <Entry Name="StatusCodeDataTypeProgressCode">\r
-      <C_Name>gEfiStatusCodeDataTypeProgressCodeGuid</C_Name>\r
-      <GuidValue>A356AB39-35C4-35DA-B37A-F8EA9E8B36A3</GuidValue>\r
-      <HelpText/>\r
-    </Entry>\r
-    <Entry Name="StatusCodeSpecificData">\r
-      <C_Name>gEfiStatusCodeSpecificDataGuid</C_Name>\r
-      <GuidValue>335984BD-E805-409A-B8F8-D27ECE5FF7A6</GuidValue>\r
-      <HelpText/>\r
-    </Entry>\r

     <Entry Name="SystemNvDataHob">\r
       <C_Name>gEfiSystemNvDataHobGuid</C_Name>\r
       <GuidValue>D6E5092D-C7B2-4872-AF66-FDC0E6F95E78</GuidValue>\r
     <Entry Name="SystemNvDataHob">\r
       <C_Name>gEfiSystemNvDataHobGuid</C_Name>\r
       <GuidValue>D6E5092D-C7B2-4872-AF66-FDC0E6F95E78</GuidValue>\r

diff --git a/EdkModulePkg/Universal/Console/Terminal/Dxe/Terminal.msa b/EdkModulePkg/Universal/Console/Terminal/Dxe/Terminal.msa
index 8a281d763e773d6558dd6f02b4203d04335c8f4c..1c1dc0680d92c6d02c59af26591890ff19750f63 100644 (file)
--- a/EdkModulePkg/Universal/Console/Terminal/Dxe/Terminal.msa
+++ b/EdkModulePkg/Universal/Console/Terminal/Dxe/Terminal.msa
@@ -80,6 +80,9 @@
     <Protocol Usage="TO_START">\r
       <ProtocolCName>gEfiSerialIoProtocolGuid</ProtocolCName>\r
     </Protocol>\r
     <Protocol Usage="TO_START">\r
       <ProtocolCName>gEfiSerialIoProtocolGuid</ProtocolCName>\r
     </Protocol>\r

+    <Protocol Usage="SOMETIMES_CONSUMED">\r
+      <ProtocolCName>gEfiHotPlugDeviceGuid</ProtocolCName>\r
+    </Protocol>\r

   </Protocols>\r
   <Variables>\r
     <Variable Usage="SOMETIMES_CONSUMED">\r
   </Protocols>\r
   <Variables>\r
     <Variable Usage="SOMETIMES_CONSUMED">\r


@@ -99,9 +102,6 @@
     </Variable>\r
   </Variables>\r
   <Guids>\r
     </Variable>\r
   </Variables>\r
   <Guids>\r

-    <GuidCNames Usage="SOMETIMES_CONSUMED">\r
-      <GuidCName>gEfiHotPlugDeviceGuid</GuidCName>\r
-    </GuidCNames>\r

     <GuidCNames Usage="SOMETIMES_CONSUMED">\r
       <GuidCName>gEfiGlobalVariableGuid</GuidCName>\r
     </GuidCNames>\r
     <GuidCNames Usage="SOMETIMES_CONSUMED">\r
       <GuidCName>gEfiGlobalVariableGuid</GuidCName>\r
     </GuidCNames>\r

diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/Print.c b/EdkModulePkg/Universal/Network/PxeBc/Dxe/Print.c
deleted file mode 100644 (file)
index 4ea5cba..0000000
--- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/Print.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*++\r
-Copyright (c) 2006, Intel Corporation                                                         \r
-All rights reserved. This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
-\r
-Module Name:\r
-        Print.c\r
-\r
-Abstract:\r
-\r
---*/\r
-\r
-\r
-#include <Bc.h>\r
-\r
-UINTN\r
-EFIAPI\r
-AsciiPrint (\r
-  IN CONST CHAR8 *Format,\r
-  ...\r
-  )\r
-/*++\r
-\r
-Routine Description:\r
-\r
-  Print function for a maximum of PXE_MAX_PRINT_BUFFER ascii \r
-  characters.\r
-\r
-Arguments:\r
-\r
-  Format - Ascii format string see file header for more details.\r
-\r
-  ...    - Vararg list consumed by processing Format.\r
-\r
-Returns: \r
-\r
-  Number of characters printed.\r
-\r
---*/\r
-{\r
-  UINTN   Return;\r
-  VA_LIST Marker;\r
-  UINTN   Index;\r
-  UINTN   MaxIndex;\r
-  CHAR16  Buffer[PXE_MAX_PRINT_BUFFER];\r
-  CHAR16  UnicodeFormat[PXE_MAX_PRINT_BUFFER];\r
-\r
-  MaxIndex = AsciiStrLen ((CHAR8 *) Format);\r
-  if (MaxIndex > PXE_MAX_PRINT_BUFFER) {\r
-    //\r
-    // Format string was too long for use to process.\r
-    //\r
-    return 0;\r
-  }\r
-\r
-  for (Index = 0; Index < PXE_MAX_PRINT_BUFFER; Index++) {\r
-    UnicodeFormat[Index] = (CHAR16) Format[Index];\r
-  }\r
-\r
-  VA_START (Marker, Format);\r
-  Return = UnicodeVSPrint (Buffer, sizeof (Buffer), UnicodeFormat, Marker);\r
-  VA_END (Marker);\r
-\r
-  //\r
-  // Need to convert to Unicode to do an OutputString\r
-  //\r
-\r
-  if (gST->ConOut != NULL) {\r
-    //\r
-    // To be extra safe make sure ConOut has been initialized\r
-    //\r
-    gST->ConOut->OutputString (gST->ConOut, Buffer);\r
-  }\r
-\r
-  return Return;\r
-}\r

diff --git a/EdkModulePkg/Universal/Runtime/RuntimeDxe/Runtime.msa b/EdkModulePkg/Universal/Runtime/RuntimeDxe/Runtime.msa
index 44dfacc5dabd62b954819d25f279612f24c3dbe6..207b44c4d9748af448735166f5e6713eb41a6b24 100644 (file)
--- 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>\r
     <Version>1.0</Version>\r
     <Abstract>Component description file for Runtime module.</Abstract>\r
     <GuidValue>B601F8C4-43B7-4784-95B1-F4226CB40CEE</GuidValue>\r
     <Version>1.0</Version>\r
     <Abstract>Component description file for Runtime module.</Abstract>\r

-    <Description>This module is used to produce the EFI runtime virtual switch over.</Description>\r
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
+    <Description>This module is used to produce the EFI runtime virtual switch over services.</Description>\r
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>\r

     <License>All rights reserved. This program and the accompanying materials\r
       are licensed and made available under the terms and conditions of the BSD License\r
       which accompanies this distribution.  The full text of the license may be found at\r
     <License>All rights reserved. This program and the accompanying materials\r
       are licensed and made available under the terms and conditions of the BSD License\r
       which accompanies this distribution.  The full text of the license may be found at\r


@@ -25,14 +25,12 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>BaseLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>BaseLib</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>UefiRuntimeLib</Keyword>\r
-    </LibraryClass>\r

     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiDriverEntryPoint</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiDriverEntryPoint</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
+    <LibraryClass Usage="ALWAYS_CONSUMED" RecommendedInstanceGuid="bda39d3a-451b-4350-8266-81ab10fa0523">\r

       <Keyword>DebugLib</Keyword>\r
       <Keyword>DebugLib</Keyword>\r

+      <HelpText>Recommended libary Instance is PeiDxeDebugLibReportStatusCode instance in MdePkg.</HelpText>\r

     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>ReportStatusCodeLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>ReportStatusCodeLib</Keyword>\r


@@ -40,9 +38,6 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>BaseMemoryLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>BaseMemoryLib</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IPF">\r
-      <Keyword>EdkDxeSalLib</Keyword>\r
-    </LibraryClass>\r

     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiRuntimeServicesTableLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiRuntimeServicesTableLib</Keyword>\r
     </LibraryClass>\r


@@ -70,18 +65,18 @@
     <Protocol Usage="ALWAYS_CONSUMED">\r
       <ProtocolCName>gEfiLoadedImageProtocolGuid</ProtocolCName>\r
     </Protocol>\r
     <Protocol Usage="ALWAYS_CONSUMED">\r
       <ProtocolCName>gEfiLoadedImageProtocolGuid</ProtocolCName>\r
     </Protocol>\r

-    <Protocol Usage="SOMETIMES_CONSUMED">\r
-      <ProtocolCName>gEfiUgaIoProtocolGuid</ProtocolCName>\r
-    </Protocol> \r

     <Protocol Usage="ALWAYS_PRODUCED">\r
       <ProtocolCName>gEfiRuntimeArchProtocolGuid</ProtocolCName>\r
     </Protocol>\r
   </Protocols>\r
     <Protocol Usage="ALWAYS_PRODUCED">\r
       <ProtocolCName>gEfiRuntimeArchProtocolGuid</ProtocolCName>\r
     </Protocol>\r
   </Protocols>\r

-  <Guids>\r
-    <GuidCNames Usage="SOMETIMES_CONSUMED">\r
-      <GuidCName>gEfiCapsuleGuid</GuidCName>\r
-    </GuidCNames>\r
-  </Guids>\r
+  <SystemTables>\r
+    <SystemTableCNames Usage="SOMETIMES_CONSUMED">\r
+      <SystemTableCName>gEfiUgaIoProtocolGuid</SystemTableCName>\r
+    </SystemTableCNames>\r
+    <SystemTableCNames Usage="SOMETIMES_CONSUMED">\r
+      <SystemTableCName>gEfiCapsuleGuid</SystemTableCName>\r
+    </SystemTableCNames>\r
+  </SystemTables>\r

   <Externs>\r
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>\r
   <Externs>\r
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>\r

diff --git a/EdkModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.msa b/EdkModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.msa
index 591641fd213207a58cb9a9d10032ebeebfe084e7..7bf5d22d00548ee509d893d6186d3d4e9e37c914 100644 (file)
--- a/EdkModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.msa
+++ b/EdkModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.msa
@@ -7,7 +7,7 @@
     <Version>1.0</Version>\r
     <Abstract>Component description file for SecurityStub module</Abstract>\r
     <Description>This driver supports platform security service.</Description>\r
     <Version>1.0</Version>\r
     <Abstract>Component description file for SecurityStub module</Abstract>\r
     <Description>This driver supports platform security service.</Description>\r

-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>\r

     <License>All rights reserved. This program and the accompanying materials\r
       are licensed and made available under the terms and conditions of the BSD License\r
       which accompanies this distribution.  The full text of the license may be found at\r
     <License>All rights reserved. This program and the accompanying materials\r
       are licensed and made available under the terms and conditions of the BSD License\r
       which accompanies this distribution.  The full text of the license may be found at\r


@@ -22,8 +22,9 @@
     <OutputFileBasename>SecurityStub</OutputFileBasename>\r
   </ModuleDefinitions>\r
   <LibraryClassDefinitions>\r
     <OutputFileBasename>SecurityStub</OutputFileBasename>\r
   </ModuleDefinitions>\r
   <LibraryClassDefinitions>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
+    <LibraryClass Usage="ALWAYS_CONSUMED" RecommendedInstanceGuid="bda39d3a-451b-4350-8266-81ab10fa0523">\r

       <Keyword>DebugLib</Keyword>\r
       <Keyword>DebugLib</Keyword>\r

+      <HelpText>Recommended libary Instance is PeiDxeDebugLibReportStatusCode instance in MdePkg.</HelpText>\r

     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiBootServicesTableLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiBootServicesTableLib</Keyword>\r

diff --git a/EdkModulePkg/Universal/UserInterface/DriverSample/DriverSample.c b/EdkModulePkg/Universal/UserInterface/DriverSample/DriverSample.c
index f78d4226e5bcdb342c50f2c2c7d71b16266399a1..0de1fca414d3775387812ceb0ceaa95a7cb8360a 100644 (file)
--- a/EdkModulePkg/Universal/UserInterface/DriverSample/DriverSample.c
+++ b/EdkModulePkg/Universal/UserInterface/DriverSample/DriverSample.c
@@ -1,5 +1,5 @@
 /*++\r
 /*++\r

-Copyright (c) 2006, Intel Corporation                                                         \r
+Copyright (c) 2006 - 2007, Intel Corporation                                                         \r

 All rights reserved. This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
 All rights reserved. This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r


@@ -61,7 +61,6 @@ Returns:
 {\r
   EFI_CALLBACK_INFO       *Private;\r
   EFI_HII_UPDATE_DATA     *UpdateData;\r
 {\r
   EFI_CALLBACK_INFO       *Private;\r
   EFI_HII_UPDATE_DATA     *UpdateData;\r

-  EFI_STATUS              Status;\r

   UINT8                   *Location;\r
   EFI_HII_CALLBACK_PACKET *DataPacket;\r
   UINT16                  Value;\r
   UINT8                   *Location;\r
   EFI_HII_CALLBACK_PACKET *DataPacket;\r
   UINT16                  Value;\r


@@ -159,8 +158,8 @@ Returns:
                     UpdateData\r
                     );\r
 \r
                     UpdateData\r
                     );\r
 \r

-    gBS->FreePool (UpdateData);\r
-    gBS->FreePool (OptionList);\r
+    FreePool (UpdateData);\r
+    FreePool (OptionList);\r

     break;\r
 \r
   case 0x0002:\r
     break;\r
 \r
   case 0x0002:\r


@@ -235,8 +234,8 @@ Returns:
                     UpdateData\r
                     );\r
 \r
                     UpdateData\r
                     );\r
 \r

-    gBS->FreePool (UpdateData);\r
-    gBS->FreePool (OptionList);\r
+    FreePool (UpdateData);\r
+    FreePool (OptionList);\r

     break;\r
 \r
   case 0x1234:\r
     break;\r
 \r
   case 0x1234:\r


@@ -244,14 +243,8 @@ Returns:
     // Allocate space for creation of Buffer\r
     //\r
     QuestionId = (UINT16) ((UINTN) (&NVStruc.DynamicCheck) - (UINTN) (&NVStruc));\r
     // Allocate space for creation of Buffer\r
     //\r
     QuestionId = (UINT16) ((UINTN) (&NVStruc.DynamicCheck) - (UINTN) (&NVStruc));\r

-    Status = gBS->AllocatePool (\r
-                    EfiBootServicesData,\r
-                    0x1000,\r
-                    (VOID **) &UpdateData\r
-                    );\r
-    ASSERT_EFI_ERROR (Status);\r
-\r
-    ZeroMem (UpdateData, 0x1000);\r
+    UpdateData = AllocateZeroPool (0x1000);\r
+    ASSERT (UpdateData != NULL);\r

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


@@ -290,7 +283,7 @@ Returns:
                     UpdateData\r
                     );\r
 \r
                     UpdateData\r
                     );\r
 \r

-    gBS->FreePool (UpdateData);\r
+    FreePool (UpdateData);\r

     QuestionId++;\r
     break;\r
 \r
     QuestionId++;\r
     break;\r
 \r


@@ -298,14 +291,8 @@ Returns:
     //\r
     // Allocate space for creation of Buffer\r
     //\r
     //\r
     // Allocate space for creation of Buffer\r
     //\r

-    Status = gBS->AllocatePool (\r
-                    EfiBootServicesData,\r
-                    0x1000,\r
-                    (VOID **)&UpdateData\r
-                    );\r
-    ASSERT_EFI_ERROR (Status);\r
-\r
-    ZeroMem (UpdateData, 0x1000);\r
+    UpdateData = AllocateZeroPool (0x1000);\r
+    ASSERT (UpdateData != NULL);\r

 \r
     //\r
     // Initialize DataPacket with information intended to remove all\r
 \r
     //\r
     // Initialize DataPacket with information intended to remove all\r


@@ -355,7 +342,7 @@ Returns:
                     UpdateData\r
                     );\r
 \r
                     UpdateData\r
                     );\r
 \r

-    gBS->FreePool (UpdateData);\r
+    FreePool (UpdateData);\r

     break;\r
 \r
   case 0x1236:\r
     break;\r
 \r
   case 0x1236:\r


@@ -368,14 +355,8 @@ Returns:
     // an error and fill in the string parameter, otherwise, I will return information in the DataArray structure.\r
     // The browser will free this packet structure\r
     //\r
     // an error and fill in the string parameter, otherwise, I will return information in the DataArray structure.\r
     // The browser will free this packet structure\r
     //\r

-    Status = gBS->AllocatePool (\r
-                    EfiBootServicesData,\r
-                    sizeof (EFI_HII_CALLBACK_PACKET) + sizeof (SAMPLE_STRING) + 2,\r
-                    (VOID **) Packet\r
-                    );\r
-    ASSERT_EFI_ERROR (Status);\r
-\r
-    ZeroMem (*Packet, sizeof (EFI_HII_CALLBACK_PACKET) + sizeof (SAMPLE_STRING) + 2);\r
+    *Packet = AllocateZeroPool (sizeof (EFI_HII_CALLBACK_PACKET) + sizeof (SAMPLE_STRING) + 2);\r
+    ASSERT (*Packet != NULL);\r

 \r
     //\r
     // Assign the buffer address to DataPacket\r
 \r
     //\r
     // Assign the buffer address to DataPacket\r


@@ -387,14 +368,8 @@ Returns:
 \r
   case 0x1237:\r
 \r
 \r
   case 0x1237:\r
 \r

-    Status = gBS->AllocatePool (\r
-                    EfiBootServicesData,\r
-                    sizeof (EFI_HII_CALLBACK_PACKET) + 2,\r
-                    (VOID **) Packet\r
-                    );\r
-    ASSERT_EFI_ERROR (Status);\r
-\r
-    ZeroMem (*Packet, sizeof (EFI_HII_CALLBACK_PACKET) + 2);\r
+    *Packet = AllocateZeroPool (sizeof (EFI_HII_CALLBACK_PACKET) + 2);\r
+    ASSERT (*Packet != NULL);\r

 \r
     //\r
     // Assign the buffer address to DataPacket\r
 \r
     //\r
     // Assign the buffer address to DataPacket\r


@@ -410,39 +385,39 @@ Returns:
     Value = 0x0001;\r
     UnicodeSPrint (VariableName, 0x80, (CHAR16 *) L"%d", VAR_EQ_TEST_NAME);\r
 \r
     Value = 0x0001;\r
     UnicodeSPrint (VariableName, 0x80, (CHAR16 *) L"%d", VAR_EQ_TEST_NAME);\r
 \r

-    Status = gRT->SetVariable (\r
-                    VariableName,\r
-                    &mFormSetGuid,\r
-                    EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,\r
-                    2,\r
-                    (VOID *) &Value\r
-                    );\r
+    gRT->SetVariable (\r
+          VariableName,\r
+          &mFormSetGuid,\r
+          EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,\r
+          2,\r
+          (VOID *) &Value\r
+          );\r

     break;\r
 \r
   case 0x1556:\r
     Value = 0x1000;\r
     UnicodeSPrint (VariableName, 0x80, (CHAR16 *) L"%d", VAR_EQ_TEST_NAME);\r
 \r
     break;\r
 \r
   case 0x1556:\r
     Value = 0x1000;\r
     UnicodeSPrint (VariableName, 0x80, (CHAR16 *) L"%d", VAR_EQ_TEST_NAME);\r
 \r

-    Status = gRT->SetVariable (\r
-                    VariableName,\r
-                    &mFormSetGuid,\r
-                    EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,\r
-                    2,\r
-                    (VOID *) &Value\r
-                    );\r
+    gRT->SetVariable (\r
+          VariableName,\r
+          &mFormSetGuid,\r
+          EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,\r
+          2,\r
+          (VOID *) &Value\r
+          );\r

     break;\r
 \r
   case 0x1557:\r
     Value = 0x0000;\r
     UnicodeSPrint (VariableName, 0x80, (CHAR16 *) L"%d", VAR_EQ_TEST_NAME);\r
 \r
     break;\r
 \r
   case 0x1557:\r
     Value = 0x0000;\r
     UnicodeSPrint (VariableName, 0x80, (CHAR16 *) L"%d", VAR_EQ_TEST_NAME);\r
 \r

-    Status = gRT->SetVariable (\r
-                    VariableName,\r
-                    &mFormSetGuid,\r
-                    EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,\r
-                    2,\r
-                    (VOID *) &Value\r
-                    );\r
+    gRT->SetVariable (\r
+          VariableName,\r
+          &mFormSetGuid,\r
+          EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,\r
+          2,\r
+          (VOID *) &Value\r
+          );\r

     break;\r
 \r
   default:\r
     break;\r
 \r
   default:\r


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

-  /*\r
-  //\r
-  // There should only be one Form Configuration protocol\r
-  //\r
-  Status = gBS->LocateProtocol (\r
-                 &gEfiFormBrowserProtocolGuid, \r
-                 NULL, \r
-                 &FormConfig\r
-                 );\r
-  if (EFI_ERROR (Status)) {\r
-    return Status;;\r
-  }\r
-*/\r
-  Status = gBS->AllocatePool (\r
-                  EfiBootServicesData,\r
-                  sizeof (EFI_CALLBACK_INFO),\r
-                  (VOID **) &CallbackInfo\r
-                  );\r
-  if (EFI_ERROR (Status)) {\r
-    return Status;\r
+  CallbackInfo = AllocatePool (sizeof (EFI_CALLBACK_INFO));\r
+  if (CallbackInfo == NULL) {\r
+    return EFI_OUT_OF_RESOURCES;\r

   }\r
 \r
   CallbackInfo->Signature = EFI_CALLBACK_INFO_SIGNATURE;\r
   }\r
 \r
   CallbackInfo->Signature = EFI_CALLBACK_INFO_SIGNATURE;\r


@@ -546,15 +504,15 @@ DriverSampleInit (
 \r
   PackageList                   = PreparePackages (1, &mStringPackGuid, DriverSampleStrings);\r
   Status                        = Hii->NewPack (Hii, PackageList, &HiiHandle);\r
 \r
   PackageList                   = PreparePackages (1, &mStringPackGuid, DriverSampleStrings);\r
   Status                        = Hii->NewPack (Hii, PackageList, &HiiHandle);\r

-  gBS->FreePool (PackageList);\r
+  FreePool (PackageList);\r

 \r
   PackageList = PreparePackages (1, &mStringPackGuid, InventoryBin);\r
   Status      = Hii->NewPack (Hii, PackageList, &HiiHandle);\r
 \r
   PackageList = PreparePackages (1, &mStringPackGuid, InventoryBin);\r
   Status      = Hii->NewPack (Hii, PackageList, &HiiHandle);\r

-  gBS->FreePool (PackageList);\r
+  FreePool (PackageList);\r

 \r
   PackageList = PreparePackages (1, &mStringPackGuid, VfrBin);\r
   Status      = Hii->NewPack (Hii, PackageList, &HiiHandle);\r
 \r
   PackageList = PreparePackages (1, &mStringPackGuid, VfrBin);\r
   Status      = Hii->NewPack (Hii, PackageList, &HiiHandle);\r

-  gBS->FreePool (PackageList);\r
+  FreePool (PackageList);\r

 \r
   CallbackInfo->RegisteredHandle = HiiHandle;\r
 \r
 \r
   CallbackInfo->RegisteredHandle = HiiHandle;\r
 \r


@@ -589,14 +547,8 @@ DriverSampleInit (
   //\r
   // Allocate space for creation of Buffer\r
   //\r
   //\r
   // Allocate space for creation of Buffer\r
   //\r

-  Status = gBS->AllocatePool (\r
-                  EfiBootServicesData,\r
-                  0x1000,\r
-                  (VOID **) &UpdateData\r
-                  );\r
-  ASSERT_EFI_ERROR (Status);\r
-\r
-  ZeroMem (UpdateData, 0x1000);\r
+  UpdateData = AllocateZeroPool (0x1000);\r
+  ASSERT (UpdateData != NULL);\r

 \r
   //\r
   // Flag update pending in FormSet\r
 \r
   //\r
   // Flag update pending in FormSet\r


@@ -614,7 +566,7 @@ DriverSampleInit (
 \r
   Hii->UpdateForm (Hii, HiiHandle, (EFI_FORM_LABEL) 100, TRUE, UpdateData);\r
 \r
 \r
   Hii->UpdateForm (Hii, HiiHandle, (EFI_FORM_LABEL) 100, TRUE, UpdateData);\r
 \r

-  gBS->FreePool (UpdateData);\r
+  FreePool (UpdateData);\r

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

diff --git a/EdkModulePkg/Universal/UserInterface/DriverSample/DriverSample.msa b/EdkModulePkg/Universal/UserInterface/DriverSample/DriverSample.msa
index cf44d1a8ab1ca05d00d19b936f2a7aaa7b896c80..4c96b5eedb74912fc0cd88b9bc1fdf7ce8b8d559 100644 (file)
--- a/EdkModulePkg/Universal/UserInterface/DriverSample/DriverSample.msa
+++ b/EdkModulePkg/Universal/UserInterface/DriverSample/DriverSample.msa
@@ -7,7 +7,7 @@
     <Version>1.0</Version>\r
     <Abstract>Component description file for DriverSample module.</Abstract>\r
     <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>\r
     <Version>1.0</Version>\r
     <Abstract>Component description file for DriverSample module.</Abstract>\r
     <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>\r

-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>\r

     <License>All rights reserved. This program and the accompanying materials\r
       are licensed and made available under the terms and conditions of the BSD License\r
       which accompanies this distribution.  The full text of the license may be found at\r
     <License>All rights reserved. This program and the accompanying materials\r
       are licensed and made available under the terms and conditions of the BSD License\r
       which accompanies this distribution.  The full text of the license may be found at\r


@@ -28,23 +28,19 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiRuntimeServicesTableLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiRuntimeServicesTableLib</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
+    <LibraryClass Usage="ALWAYS_CONSUMED" RecommendedInstanceGuid="bda39d3a-451b-4350-8266-81ab10fa0523">\r

       <Keyword>DebugLib</Keyword>\r
       <Keyword>DebugLib</Keyword>\r

+      <HelpText>Recommended libary Instance is PeiDxeDebugLibReportStatusCode instance in MdePkg.</HelpText>\r

     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiDriverEntryPoint</Keyword>\r
     </LibraryClass>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiDriverEntryPoint</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>UefiLib</Keyword>\r
-    </LibraryClass>\r

     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>BaseLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>BaseLib</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
+    <LibraryClass Usage="ALWAYS_CONSUMED" RecommendedInstanceGuid="a86fbfca-0183-4eeb-aa8a-762e3b7da1f3">\r

       <Keyword>PrintLib</Keyword>\r
       <Keyword>PrintLib</Keyword>\r

-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>EdkGraphicsLib</Keyword>\r
+      <HelpText>Recommended libary Instance is BasePrintLib instance in MdePkg.</HelpText>\r

     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>EdkIfrSupportLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>EdkIfrSupportLib</Keyword>\r


@@ -77,33 +73,24 @@
     <Protocol Usage="ALWAYS_CONSUMED">\r
       <ProtocolCName>gEfiHiiProtocolGuid</ProtocolCName>\r
     </Protocol>\r
     <Protocol Usage="ALWAYS_CONSUMED">\r
       <ProtocolCName>gEfiHiiProtocolGuid</ProtocolCName>\r
     </Protocol>\r

-    <Protocol Usage="ALWAYS_CONSUMED">\r
-      <ProtocolCName>gEfiUgaDrawProtocolGuid</ProtocolCName>\r
-    </Protocol>\r
-    <Protocol Usage="ALWAYS_CONSUMED">\r
-      <ProtocolCName>gEfiOEMBadgingProtocolGuid</ProtocolCName>\r
-    </Protocol>\r
-    <Protocol Usage="ALWAYS_CONSUMED">\r
-      <ProtocolCName>gEfiFirmwareVolumeProtocolGuid</ProtocolCName>\r
-    </Protocol>\r
-    <Protocol Usage="ALWAYS_CONSUMED">\r
-      <ProtocolCName>gEfiConsoleControlProtocolGuid</ProtocolCName>\r
-    </Protocol>\r

     <Protocol Usage="ALWAYS_PRODUCED">\r
       <ProtocolCName>gEfiFormCallbackProtocolGuid</ProtocolCName>\r
     </Protocol>\r
   </Protocols>\r
     <Protocol Usage="ALWAYS_PRODUCED">\r
       <ProtocolCName>gEfiFormCallbackProtocolGuid</ProtocolCName>\r
     </Protocol>\r
   </Protocols>\r

-  <Variables>\r
-    <Variable Usage="ALWAYS_PRODUCED">\r
-      <VariableName>0x0032 0x0035</VariableName>\r
-      <GuidC_Name>g25Guid</GuidC_Name>\r
-    </Variable>\r
-  </Variables>\r
-  <Guids>\r
-    <GuidCNames Usage="ALWAYS_CONSUMED">\r
-      <GuidCName>gEfiGlobalVariableGuid</GuidCName>\r
-    </GuidCNames>\r
-  </Guids>\r
+  <HiiPackages>\r
+    <HiiPackage Usage="ALWAYS_PRODUCED">\r
+      <HiiCName>DriverSampleStrings</HiiCName>\r
+      <HelpText>EFI_HII_STRING type string package from UNI file.</HelpText>\r
+    </HiiPackage>\r
+    <HiiPackage Usage="ALWAYS_PRODUCED">\r
+      <HiiCName>InventoryBin</HiiCName>\r
+      <HelpText>EFI_HII_IFR type form package from VFR file.</HelpText>\r
+    </HiiPackage>\r
+    <HiiPackage Usage="ALWAYS_PRODUCED">\r
+      <HiiCName>VfrBin</HiiCName>\r
+      <HelpText>EFI_HII_IFR type form package from VFR file.</HelpText>\r
+    </HiiPackage>\r
+  </HiiPackages>\r

   <Externs>\r
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>\r
   <Externs>\r
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>\r

diff --git a/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Forms.c b/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Forms.c
index b7b02a85f8919a7d606372fdfdf69dc2d9cf8367..c0c08f33a50f5f42ba5557527fc7d792ecce26af 100644 (file)
--- 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. \r
     // The map is read, exit w/ success now.\r
     //\r
     // Either Defaults/Manufacturing variable exists and appears to be valid. \r
     // The map is read, exit w/ success now.\r
     //\r

-    gBS->FreePool (Name16);\r
+    FreePool (Name16);\r

     return;\r
   }\r
 \r
     return;\r
   }\r
 \r


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

-  gBS->FreePool (Name16);\r
+  FreePool (Name16);\r

 \r
 }\r
 \r
 \r
 }\r
 \r


@@ -1570,7 +1570,7 @@ Returns:
   //\r
   // Free the old buffer, and assign into our database the latest buffer\r
   //\r
   //\r
   // Free the old buffer, and assign into our database the latest buffer\r
   //\r

-  gBS->FreePool (HandleDatabase->Buffer);\r
+  FreePool (HandleDatabase->Buffer);\r

   HandleDatabase->Buffer = OrigTempBuffer;\r
 \r
   return EFI_SUCCESS;\r
   HandleDatabase->Buffer = OrigTempBuffer;\r
 \r
   return EFI_SUCCESS;\r

diff --git a/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/HiiDatabase.c b/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/HiiDatabase.c
index bcec42b24ebde508b581c8830bc943d26c393d2f..1889d705818c97deae0263e9f05c7cd1960ea675 100644 (file)
--- a/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/HiiDatabase.c
+++ b/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/HiiDatabase.c
@@ -1,6 +1,6 @@
 /*++\r
 \r
 /*++\r
 \r

-Copyright (c) 2006, Intel Corporation                                                         \r
+Copyright (c) 2006 - 2007, Intel Corporation                                                         \r

 All rights reserved. This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
 All rights reserved. This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r


@@ -67,7 +67,7 @@ Returns:
   //\r
   if (!EFI_ERROR (Status)) {\r
     if (HandleBuffer != NULL) {\r
   //\r
   if (!EFI_ERROR (Status)) {\r
     if (HandleBuffer != NULL) {\r

-      gBS->FreePool (HandleBuffer);\r
+      FreePool (HandleBuffer);\r

     }\r
 \r
     return EFI_DEVICE_ERROR;\r
     }\r
 \r
     return EFI_DEVICE_ERROR;\r

diff --git a/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/HiiDatabase.msa b/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/HiiDatabase.msa
index f43977b6c38f5612b345a5995fe3b1b4a98f7f41..f91338d925e60cd952033e54c6d2f450db5d962e 100644 (file)
--- a/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/HiiDatabase.msa
+++ b/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/HiiDatabase.msa
@@ -7,7 +7,7 @@
     <Version>1.0</Version>\r
     <Abstract>Component description file for HiiDatabase module.</Abstract>\r
     <Description>This module inits HII database and installs HII protocol.</Description>\r
     <Version>1.0</Version>\r
     <Abstract>Component description file for HiiDatabase module.</Abstract>\r
     <Description>This module inits HII database and installs HII protocol.</Description>\r

-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>\r

     <License>All rights reserved. This program and the accompanying materials\r
       are licensed and made available under the terms and conditions of the BSD License\r
       which accompanies this distribution.  The full text of the license may be found at\r
     <License>All rights reserved. This program and the accompanying materials\r
       are licensed and made available under the terms and conditions of the BSD License\r
       which accompanies this distribution.  The full text of the license may be found at\r


@@ -25,8 +25,9 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>BaseLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>BaseLib</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
+    <LibraryClass Usage="ALWAYS_CONSUMED" RecommendedInstanceGuid="bda39d3a-451b-4350-8266-81ab10fa0523">\r

       <Keyword>DebugLib</Keyword>\r
       <Keyword>DebugLib</Keyword>\r

+      <HelpText>Recommended libary Instance is PeiDxeDebugLibReportStatusCode instance in MdePkg.</HelpText>\r

     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiDriverEntryPoint</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiDriverEntryPoint</Keyword>\r


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

-    <Protocol Usage="ALWAYS_CONSUMED">\r
+    <Protocol Usage="ALWAYS_PRODUCED">\r

       <ProtocolCName>gEfiHiiProtocolGuid</ProtocolCName>\r
     </Protocol>\r
       <ProtocolCName>gEfiHiiProtocolGuid</ProtocolCName>\r
     </Protocol>\r

-    <Protocol Usage="ALWAYS_CONSUMED">\r
+    <Protocol Usage="SOMETIMES_CONSUMED">\r

       <ProtocolCName>gEfiFormCallbackProtocolGuid</ProtocolCName>\r
     </Protocol>\r
   </Protocols>\r
   <Variables>\r
       <ProtocolCName>gEfiFormCallbackProtocolGuid</ProtocolCName>\r
     </Protocol>\r
   </Protocols>\r
   <Variables>\r

-    <Variable Usage="ALWAYS_CONSUMED">\r
-      <VariableName>0x004C 0x0061 0x006E</VariableName>\r
-      <GuidC_Name>gLanGuid</GuidC_Name>\r
+    <Variable Usage="SOMETIMES_CONSUMED">\r
+      <VariableName>0x004C 0x0061 0x006E 0x0067</VariableName>\r
+      <GuidC_Name>gEfiGlobalVariableGuid</GuidC_Name>\r
+      <HelpText>L"Lang" global variable is used as system default language.</HelpText>\r

     </Variable>\r
   </Variables>\r
     </Variable>\r
   </Variables>\r

-  <Guids>\r
-    <GuidCNames Usage="ALWAYS_CONSUMED">\r
-      <GuidCName>gEfiGlobalVariableGuid</GuidCName>\r
-    </GuidCNames>\r
-  </Guids>\r

   <Externs>\r
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>\r
   <Externs>\r
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>\r

diff --git a/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Package.c b/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Package.c
index ec3f49c5dc3f7a714d088a376eb19471702b316a..f4696e77242ae6384becb36e78af3077643ce0e9 100644 (file)
--- a/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Package.c
+++ b/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Package.c
@@ -1,6 +1,6 @@
 /*++\r
 \r
 /*++\r
 \r

-Copyright (c) 2006, Intel Corporation                                                         \r
+Copyright (c) 2006 - 2007, Intel Corporation                                                         \r

 All rights reserved. This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
 All rights reserved. This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r


@@ -642,7 +642,7 @@ Returns:
       //\r
       // Free the Package Instance\r
       //\r
       //\r
       // Free the Package Instance\r
       //\r

-      gBS->FreePool (PackageInstance);\r
+      FreePool (PackageInstance);\r

 \r
       //\r
       // If this was the only Handle in the database\r
 \r
       //\r
       // If this was the only Handle in the database\r


@@ -654,7 +654,7 @@ Returns:
       // Make the parent->Next point to the current->Next\r
       //\r
       PreviousHandleDatabase->NextHandleDatabase = HandleDatabase->NextHandleDatabase;\r
       // Make the parent->Next point to the current->Next\r
       //\r
       PreviousHandleDatabase->NextHandleDatabase = HandleDatabase->NextHandleDatabase;\r

-      gBS->FreePool (HandleDatabase);\r
+      FreePool (HandleDatabase);\r

       return EFI_SUCCESS;\r
     }\r
     //\r
       return EFI_SUCCESS;\r
     }\r
     //\r

diff --git a/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Strings.c b/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Strings.c
index 0dbcd3388494e2b8e68f4289fb14fcdbe9fb30ed..4c56ab0619cff4c1f2f19286cfb82780bd12ba0e 100644 (file)
--- 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\r
   //\r
   if ((*Reference >= TotalStringCount) && !ResetStrings) {\r
   // If the token value is not valid, error out\r
   //\r
   if ((*Reference >= TotalStringCount) && !ResetStrings) {\r

-    gBS->FreePool (NewBuffer);\r
+    FreePool (NewBuffer);\r

     return EFI_INVALID_PARAMETER;\r
   }\r
   //\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   //\r


@@ -631,7 +631,7 @@ Returns:
       //\r
       // Free the previous buffer associated with this handle, and assign the new buffer to the handle\r
       //\r
       //\r
       // Free the previous buffer associated with this handle, and assign the new buffer to the handle\r
       //\r

-      gBS->FreePool (HandleDatabase->Buffer);\r
+      FreePool (HandleDatabase->Buffer);\r

       HandleDatabase->Buffer = NewBuffer;\r
       break;\r
     }\r
       HandleDatabase->Buffer = NewBuffer;\r
       break;\r
     }\r


@@ -710,7 +710,7 @@ Returns:
                 );\r
     }\r
 \r
                 );\r
     }\r
 \r

-    gBS->FreePool (LangCodes);\r
+    FreePool (LangCodes);\r

   }\r
 \r
   return Status;\r
   }\r
 \r
   return Status;\r


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

-  gBS->FreePool (LangCodes);\r
+  FreePool (LangCodes);\r

   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r


@@ -1240,7 +1240,7 @@ HiiCompareLanguage (
   // If the Language is the same return success\r
   //\r
   if (CompareMem (LanguageStringLocation, Language, 6) == 0) {\r
   // If the Language is the same return success\r
   //\r
   if (CompareMem (LanguageStringLocation, Language, 6) == 0) {\r

-    gBS->FreePool (InputString);\r
+    FreePool (InputString);\r

     return EFI_SUCCESS;\r
   }\r
   //\r
     return EFI_SUCCESS;\r
   }\r
   //\r


@@ -1258,14 +1258,14 @@ HiiCompareLanguage (
     // Getting in here means we have a secondary language\r
     //\r
     if (CompareMem (&InputString[Index], Language, 6) == 0) {\r
     // Getting in here means we have a secondary language\r
     //\r
     if (CompareMem (&InputString[Index], Language, 6) == 0) {\r

-      gBS->FreePool (InputString);\r
+      FreePool (InputString);\r

       return EFI_SUCCESS;\r
     }\r
   }\r
   //\r
   // If nothing was found, return the error\r
   //\r
       return EFI_SUCCESS;\r
     }\r
   }\r
   //\r
   // If nothing was found, return the error\r
   //\r

-  gBS->FreePool (OriginalInputString);\r
+  FreePool (OriginalInputString);\r

   return EFI_NOT_FOUND;\r
 \r
 }\r
   return EFI_NOT_FOUND;\r
 \r
 }\r