sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up the following module msa files.

Browse Source 
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2579 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
lgao4
2007-04-20 01:29:05 +00:00
parent ebb9ce7a06
commit 627c1d22d9
12 changed files with 106 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
EdkModulePkg/EdkModulePkg.spd
View File

@ -491,41 +491,6 @@
<GuidValue>B091E7D2-05A0-4198-94F0-74B7B8C55459</GuidValue> <GuidValue>B091E7D2-05A0-4198-94F0-74B7B8C55459</GuidValue>
<HelpText/> <HelpText/>
</Entry> </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"> <Entry Name="SystemNvDataHob">
<C_Name>gEfiSystemNvDataHobGuid</C_Name> <C_Name>gEfiSystemNvDataHobGuid</C_Name>
<GuidValue>D6E5092D-C7B2-4872-AF66-FDC0E6F95E78</GuidValue> <GuidValue>D6E5092D-C7B2-4872-AF66-FDC0E6F95E78</GuidValue>

6
EdkModulePkg/Universal/Console/Terminal/Dxe/Terminal.msa
View File

@ -80,6 +80,9 @@
<Protocol Usage="TO_START"> <Protocol Usage="TO_START">
<ProtocolCName>gEfiSerialIoProtocolGuid</ProtocolCName> <ProtocolCName>gEfiSerialIoProtocolGuid</ProtocolCName>
</Protocol> </Protocol>
<Protocol Usage="SOMETIMES_CONSUMED">
<ProtocolCName>gEfiHotPlugDeviceGuid</ProtocolCName>
</Protocol>
</Protocols> </Protocols>
<Variables> <Variables>
<Variable Usage="SOMETIMES_CONSUMED"> <Variable Usage="SOMETIMES_CONSUMED">
@ -99,9 +102,6 @@
</Variable> </Variable>
</Variables> </Variables>
<Guids> <Guids>
<GuidCNames Usage="SOMETIMES_CONSUMED">
<GuidCName>gEfiHotPlugDeviceGuid</GuidCName>
</GuidCNames>
<GuidCNames Usage="SOMETIMES_CONSUMED"> <GuidCNames Usage="SOMETIMES_CONSUMED">
<GuidCName>gEfiGlobalVariableGuid</GuidCName> <GuidCName>gEfiGlobalVariableGuid</GuidCName>
</GuidCNames> </GuidCNames>

81
EdkModulePkg/Universal/Network/PxeBc/Dxe/Print.c
View File

@ -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;
}

29
EdkModulePkg/Universal/Runtime/RuntimeDxe/Runtime.msa
View File

@ -6,8 +6,8 @@
<GuidValue>B601F8C4-43B7-4784-95B1-F4226CB40CEE</GuidValue> <GuidValue>B601F8C4-43B7-4784-95B1-F4226CB40CEE</GuidValue>
<Version>1.0</Version> <Version>1.0</Version>
<Abstract>Component description file for Runtime module.</Abstract> <Abstract>Component description file for Runtime module.</Abstract>
<Description>This module is used to produce the EFI runtime virtual switch over.</Description> <Description>This module is used to produce the EFI runtime virtual switch over services.</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 <License>All rights reserved. This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -25,14 +25,12 @@
<LibraryClass Usage="ALWAYS_CONSUMED"> <LibraryClass Usage="ALWAYS_CONSUMED">
<Keyword>BaseLib</Keyword> <Keyword>BaseLib</Keyword>
</LibraryClass> </LibraryClass>
<LibraryClass Usage="ALWAYS_CONSUMED">
<Keyword>UefiRuntimeLib</Keyword>
</LibraryClass>
<LibraryClass Usage="ALWAYS_CONSUMED"> <LibraryClass Usage="ALWAYS_CONSUMED">
<Keyword>UefiDriverEntryPoint</Keyword> <Keyword>UefiDriverEntryPoint</Keyword>
</LibraryClass> </LibraryClass>
<LibraryClass Usage="ALWAYS_CONSUMED"> <LibraryClass Usage="ALWAYS_CONSUMED" RecommendedInstanceGuid="bda39d3a-451b-4350-8266-81ab10fa0523">
<Keyword>DebugLib</Keyword> <Keyword>DebugLib</Keyword>
<HelpText>Recommended libary Instance is PeiDxeDebugLibReportStatusCode instance in MdePkg.</HelpText>
</LibraryClass> </LibraryClass>
<LibraryClass Usage="ALWAYS_CONSUMED"> <LibraryClass Usage="ALWAYS_CONSUMED">
<Keyword>ReportStatusCodeLib</Keyword> <Keyword>ReportStatusCodeLib</Keyword>
@ -40,9 +38,6 @@
<LibraryClass Usage="ALWAYS_CONSUMED"> <LibraryClass Usage="ALWAYS_CONSUMED">
<Keyword>BaseMemoryLib</Keyword> <Keyword>BaseMemoryLib</Keyword>
</LibraryClass> </LibraryClass>
<LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IPF">
<Keyword>EdkDxeSalLib</Keyword>
</LibraryClass>
<LibraryClass Usage="ALWAYS_CONSUMED"> <LibraryClass Usage="ALWAYS_CONSUMED">
<Keyword>UefiRuntimeServicesTableLib</Keyword> <Keyword>UefiRuntimeServicesTableLib</Keyword>
</LibraryClass> </LibraryClass>
@ -70,18 +65,18 @@
<Protocol Usage="ALWAYS_CONSUMED"> <Protocol Usage="ALWAYS_CONSUMED">
<ProtocolCName>gEfiLoadedImageProtocolGuid</ProtocolCName> <ProtocolCName>gEfiLoadedImageProtocolGuid</ProtocolCName>
</Protocol> </Protocol>
<Protocol Usage="SOMETIMES_CONSUMED">
<ProtocolCName>gEfiUgaIoProtocolGuid</ProtocolCName>
</Protocol>
<Protocol Usage="ALWAYS_PRODUCED"> <Protocol Usage="ALWAYS_PRODUCED">
<ProtocolCName>gEfiRuntimeArchProtocolGuid</ProtocolCName> <ProtocolCName>gEfiRuntimeArchProtocolGuid</ProtocolCName>
</Protocol> </Protocol>
</Protocols> </Protocols>
<Guids> <SystemTables>
<GuidCNames Usage="SOMETIMES_CONSUMED"> <SystemTableCNames Usage="SOMETIMES_CONSUMED">
<GuidCName>gEfiCapsuleGuid</GuidCName> <SystemTableCName>gEfiUgaIoProtocolGuid</SystemTableCName>
</GuidCNames> </SystemTableCNames>
</Guids> <SystemTableCNames Usage="SOMETIMES_CONSUMED">
<SystemTableCName>gEfiCapsuleGuid</SystemTableCName>
</SystemTableCNames>
</SystemTables>
<Externs> <Externs>
<Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification> <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
<Specification>EDK_RELEASE_VERSION 0x00020000</Specification> <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>

5
EdkModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.msa
View File

@ -7,7 +7,7 @@
<Version>1.0</Version> <Version>1.0</Version>
<Abstract>Component description file for SecurityStub module</Abstract> <Abstract>Component description file for SecurityStub module</Abstract>
<Description>This driver supports platform security service.</Description> <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 <License>All rights reserved. This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -22,8 +22,9 @@
<OutputFileBasename>SecurityStub</OutputFileBasename> <OutputFileBasename>SecurityStub</OutputFileBasename>
</ModuleDefinitions> </ModuleDefinitions>
<LibraryClassDefinitions> <LibraryClassDefinitions>
<LibraryClass Usage="ALWAYS_CONSUMED"> <LibraryClass Usage="ALWAYS_CONSUMED" RecommendedInstanceGuid="bda39d3a-451b-4350-8266-81ab10fa0523">
<Keyword>DebugLib</Keyword> <Keyword>DebugLib</Keyword>
<HelpText>Recommended libary Instance is PeiDxeDebugLibReportStatusCode instance in MdePkg.</HelpText>
</LibraryClass> </LibraryClass>
<LibraryClass Usage="ALWAYS_CONSUMED"> <LibraryClass Usage="ALWAYS_CONSUMED">
<Keyword>UefiBootServicesTableLib</Keyword> <Keyword>UefiBootServicesTableLib</Keyword>

138
EdkModulePkg/Universal/UserInterface/DriverSample/DriverSample.c
View File

@ -1,5 +1,5 @@
/*++ /*++
Copyright (c) 2006, Intel Corporation Copyright (c) 2006 - 2007, Intel Corporation
All rights reserved. This program and the accompanying materials All rights reserved. This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -61,7 +61,6 @@ Returns:
{ {
EFI_CALLBACK_INFO *Private; EFI_CALLBACK_INFO *Private;
EFI_HII_UPDATE_DATA *UpdateData; EFI_HII_UPDATE_DATA *UpdateData;
EFI_STATUS Status;
UINT8 *Location; UINT8 *Location;
EFI_HII_CALLBACK_PACKET *DataPacket; EFI_HII_CALLBACK_PACKET *DataPacket;
UINT16 Value; UINT16 Value;
@ -159,8 +158,8 @@ Returns:
UpdateData UpdateData
); );
gBS->FreePool (UpdateData); FreePool (UpdateData);
gBS->FreePool (OptionList); FreePool (OptionList);
break; break;
case 0x0002: case 0x0002:
@ -235,8 +234,8 @@ Returns:
UpdateData UpdateData
); );
gBS->FreePool (UpdateData); FreePool (UpdateData);
gBS->FreePool (OptionList); FreePool (OptionList);
break; break;
case 0x1234: case 0x1234:
@ -244,14 +243,8 @@ Returns:
// Allocate space for creation of Buffer // Allocate space for creation of Buffer
// //
QuestionId = (UINT16) ((UINTN) (&NVStruc.DynamicCheck) - (UINTN) (&NVStruc)); QuestionId = (UINT16) ((UINTN) (&NVStruc.DynamicCheck) - (UINTN) (&NVStruc));
Status = gBS->AllocatePool ( UpdateData = AllocateZeroPool (0x1000);
EfiBootServicesData, ASSERT (UpdateData != NULL);
0x1000,
(VOID **) &UpdateData
);
ASSERT_EFI_ERROR (Status);
ZeroMem (UpdateData, 0x1000);
Location = (UINT8 *) &UpdateData->Data; Location = (UINT8 *) &UpdateData->Data;
@ -290,7 +283,7 @@ Returns:
UpdateData UpdateData
); );
gBS->FreePool (UpdateData); FreePool (UpdateData);
QuestionId++; QuestionId++;
break; break;
@ -298,14 +291,8 @@ Returns:
// //
// Allocate space for creation of Buffer // Allocate space for creation of Buffer
// //
Status = gBS->AllocatePool ( UpdateData = AllocateZeroPool (0x1000);
EfiBootServicesData, ASSERT (UpdateData != NULL);
0x1000,
(VOID **)&UpdateData
);
ASSERT_EFI_ERROR (Status);
ZeroMem (UpdateData, 0x1000);
// //
// Initialize DataPacket with information intended to remove all // Initialize DataPacket with information intended to remove all
@ -355,7 +342,7 @@ Returns:
UpdateData UpdateData
); );
gBS->FreePool (UpdateData); FreePool (UpdateData);
break; break;
case 0x1236: case 0x1236:
@ -368,14 +355,8 @@ Returns:
// an error and fill in the string parameter, otherwise, I will return information in the DataArray structure. // an error and fill in the string parameter, otherwise, I will return information in the DataArray structure.
// The browser will free this packet structure // The browser will free this packet structure
// //
Status = gBS->AllocatePool ( *Packet = AllocateZeroPool (sizeof (EFI_HII_CALLBACK_PACKET) + sizeof (SAMPLE_STRING) + 2);
EfiBootServicesData, ASSERT (*Packet != NULL);
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);
// //
// Assign the buffer address to DataPacket // Assign the buffer address to DataPacket
@ -387,14 +368,8 @@ Returns:
case 0x1237: case 0x1237:
Status = gBS->AllocatePool ( *Packet = AllocateZeroPool (sizeof (EFI_HII_CALLBACK_PACKET) + 2);
EfiBootServicesData, ASSERT (*Packet != NULL);
sizeof (EFI_HII_CALLBACK_PACKET) + 2,
(VOID **) Packet
);
ASSERT_EFI_ERROR (Status);
ZeroMem (*Packet, sizeof (EFI_HII_CALLBACK_PACKET) + 2);
// //
// Assign the buffer address to DataPacket // Assign the buffer address to DataPacket
@ -410,39 +385,39 @@ Returns:
Value = 0x0001; Value = 0x0001;
UnicodeSPrint (VariableName, 0x80, (CHAR16 *) L"%d", VAR_EQ_TEST_NAME); UnicodeSPrint (VariableName, 0x80, (CHAR16 *) L"%d", VAR_EQ_TEST_NAME);
Status = gRT->SetVariable ( gRT->SetVariable (
VariableName, VariableName,
&mFormSetGuid, &mFormSetGuid,
EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS, EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,
2, 2,
(VOID *) &Value (VOID *) &Value
); );
break; break;
case 0x1556: case 0x1556:
Value = 0x1000; Value = 0x1000;
UnicodeSPrint (VariableName, 0x80, (CHAR16 *) L"%d", VAR_EQ_TEST_NAME); UnicodeSPrint (VariableName, 0x80, (CHAR16 *) L"%d", VAR_EQ_TEST_NAME);
Status = gRT->SetVariable ( gRT->SetVariable (
VariableName, VariableName,
&mFormSetGuid, &mFormSetGuid,
EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS, EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,
2, 2,
(VOID *) &Value (VOID *) &Value
); );
break; break;
case 0x1557: case 0x1557:
Value = 0x0000; Value = 0x0000;
UnicodeSPrint (VariableName, 0x80, (CHAR16 *) L"%d", VAR_EQ_TEST_NAME); UnicodeSPrint (VariableName, 0x80, (CHAR16 *) L"%d", VAR_EQ_TEST_NAME);
Status = gRT->SetVariable ( gRT->SetVariable (
VariableName, VariableName,
&mFormSetGuid, &mFormSetGuid,
EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS, EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,
2, 2,
(VOID *) &Value (VOID *) &Value
); );
break; break;
default: default:
@ -497,26 +472,9 @@ DriverSampleInit (
return Status;; return Status;;
} }
/* CallbackInfo = AllocatePool (sizeof (EFI_CALLBACK_INFO));
// if (CallbackInfo == NULL) {
// There should only be one Form Configuration protocol return EFI_OUT_OF_RESOURCES;
//
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->Signature = EFI_CALLBACK_INFO_SIGNATURE; CallbackInfo->Signature = EFI_CALLBACK_INFO_SIGNATURE;
@ -546,15 +504,15 @@ DriverSampleInit (
PackageList = PreparePackages (1, &mStringPackGuid, DriverSampleStrings); PackageList = PreparePackages (1, &mStringPackGuid, DriverSampleStrings);
Status = Hii->NewPack (Hii, PackageList, &HiiHandle); Status = Hii->NewPack (Hii, PackageList, &HiiHandle);
gBS->FreePool (PackageList); FreePool (PackageList);
PackageList = PreparePackages (1, &mStringPackGuid, InventoryBin); PackageList = PreparePackages (1, &mStringPackGuid, InventoryBin);
Status = Hii->NewPack (Hii, PackageList, &HiiHandle); Status = Hii->NewPack (Hii, PackageList, &HiiHandle);
gBS->FreePool (PackageList); FreePool (PackageList);
PackageList = PreparePackages (1, &mStringPackGuid, VfrBin); PackageList = PreparePackages (1, &mStringPackGuid, VfrBin);
Status = Hii->NewPack (Hii, PackageList, &HiiHandle); Status = Hii->NewPack (Hii, PackageList, &HiiHandle);
gBS->FreePool (PackageList); FreePool (PackageList);
CallbackInfo->RegisteredHandle = HiiHandle; CallbackInfo->RegisteredHandle = HiiHandle;
@ -589,14 +547,8 @@ DriverSampleInit (
// //
// Allocate space for creation of Buffer // Allocate space for creation of Buffer
// //
Status = gBS->AllocatePool ( UpdateData = AllocateZeroPool (0x1000);
EfiBootServicesData, ASSERT (UpdateData != NULL);
0x1000,
(VOID **) &UpdateData
);
ASSERT_EFI_ERROR (Status);
ZeroMem (UpdateData, 0x1000);
// //
// Flag update pending in FormSet // Flag update pending in FormSet
@ -614,7 +566,7 @@ DriverSampleInit (
Hii->UpdateForm (Hii, HiiHandle, (EFI_FORM_LABEL) 100, TRUE, UpdateData); 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 // Example of how to display only the item we sent to HII

51
EdkModulePkg/Universal/UserInterface/DriverSample/DriverSample.msa
View File

@ -7,7 +7,7 @@
<Version>1.0</Version> <Version>1.0</Version>
<Abstract>Component description file for DriverSample module.</Abstract> <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> <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 <License>All rights reserved. This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -28,23 +28,19 @@
<LibraryClass Usage="ALWAYS_CONSUMED"> <LibraryClass Usage="ALWAYS_CONSUMED">
<Keyword>UefiRuntimeServicesTableLib</Keyword> <Keyword>UefiRuntimeServicesTableLib</Keyword>
</LibraryClass> </LibraryClass>
<LibraryClass Usage="ALWAYS_CONSUMED"> <LibraryClass Usage="ALWAYS_CONSUMED" RecommendedInstanceGuid="bda39d3a-451b-4350-8266-81ab10fa0523">
<Keyword>DebugLib</Keyword> <Keyword>DebugLib</Keyword>
<HelpText>Recommended libary Instance is PeiDxeDebugLibReportStatusCode instance in MdePkg.</HelpText>
</LibraryClass> </LibraryClass>
<LibraryClass Usage="ALWAYS_CONSUMED"> <LibraryClass Usage="ALWAYS_CONSUMED">
<Keyword>UefiDriverEntryPoint</Keyword> <Keyword>UefiDriverEntryPoint</Keyword>
</LibraryClass> </LibraryClass>
<LibraryClass Usage="ALWAYS_CONSUMED">
<Keyword>UefiLib</Keyword>
</LibraryClass>
<LibraryClass Usage="ALWAYS_CONSUMED"> <LibraryClass Usage="ALWAYS_CONSUMED">
<Keyword>BaseLib</Keyword> <Keyword>BaseLib</Keyword>
</LibraryClass> </LibraryClass>
<LibraryClass Usage="ALWAYS_CONSUMED"> <LibraryClass Usage="ALWAYS_CONSUMED" RecommendedInstanceGuid="a86fbfca-0183-4eeb-aa8a-762e3b7da1f3">
<Keyword>PrintLib</Keyword> <Keyword>PrintLib</Keyword>
</LibraryClass> <HelpText>Recommended libary Instance is BasePrintLib instance in MdePkg.</HelpText>
<LibraryClass Usage="ALWAYS_CONSUMED">
<Keyword>EdkGraphicsLib</Keyword>
</LibraryClass> </LibraryClass>
<LibraryClass Usage="ALWAYS_CONSUMED"> <LibraryClass Usage="ALWAYS_CONSUMED">
<Keyword>EdkIfrSupportLib</Keyword> <Keyword>EdkIfrSupportLib</Keyword>
@ -77,33 +73,24 @@
<Protocol Usage="ALWAYS_CONSUMED"> <Protocol Usage="ALWAYS_CONSUMED">
<ProtocolCName>gEfiHiiProtocolGuid</ProtocolCName> <ProtocolCName>gEfiHiiProtocolGuid</ProtocolCName>
</Protocol> </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"> <Protocol Usage="ALWAYS_PRODUCED">
<ProtocolCName>gEfiFormCallbackProtocolGuid</ProtocolCName> <ProtocolCName>gEfiFormCallbackProtocolGuid</ProtocolCName>
</Protocol> </Protocol>
</Protocols> </Protocols>
<Variables> <HiiPackages>
<Variable Usage="ALWAYS_PRODUCED"> <HiiPackage Usage="ALWAYS_PRODUCED">
<VariableName>0x0032 0x0035</VariableName> <HiiCName>DriverSampleStrings</HiiCName>
<GuidC_Name>g25Guid</GuidC_Name> <HelpText>EFI_HII_STRING type string package from UNI file.</HelpText>
</Variable> </HiiPackage>
</Variables> <HiiPackage Usage="ALWAYS_PRODUCED">
<Guids> <HiiCName>InventoryBin</HiiCName>
<GuidCNames Usage="ALWAYS_CONSUMED"> <HelpText>EFI_HII_IFR type form package from VFR file.</HelpText>
<GuidCName>gEfiGlobalVariableGuid</GuidCName> </HiiPackage>
</GuidCNames> <HiiPackage Usage="ALWAYS_PRODUCED">
</Guids> <HiiCName>VfrBin</HiiCName>
<HelpText>EFI_HII_IFR type form package from VFR file.</HelpText>
</HiiPackage>
</HiiPackages>
<Externs> <Externs>
<Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification> <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
<Specification>EDK_RELEASE_VERSION 0x00020000</Specification> <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>

6
EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Forms.c
View File

@ -991,7 +991,7 @@ HiiGetDefaultImagePopulateMap (
// Either Defaults/Manufacturing variable exists and appears to be valid. // Either Defaults/Manufacturing variable exists and appears to be valid.
// The map is read, exit w/ success now. // The map is read, exit w/ success now.
// //
gBS->FreePool (Name16); FreePool (Name16);
return; 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 // Free the old buffer, and assign into our database the latest buffer
// //
gBS->FreePool (HandleDatabase->Buffer); FreePool (HandleDatabase->Buffer);
HandleDatabase->Buffer = OrigTempBuffer; HandleDatabase->Buffer = OrigTempBuffer;
return EFI_SUCCESS; return EFI_SUCCESS;

4
EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/HiiDatabase.c
View File

@ -1,6 +1,6 @@
/*++ /*++
Copyright (c) 2006, Intel Corporation Copyright (c) 2006 - 2007, Intel Corporation
All rights reserved. This program and the accompanying materials All rights reserved. This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -67,7 +67,7 @@ Returns:
// //
if (!EFI_ERROR (Status)) { if (!EFI_ERROR (Status)) {
if (HandleBuffer != NULL) { if (HandleBuffer != NULL) {
gBS->FreePool (HandleBuffer); FreePool (HandleBuffer);
} }
return EFI_DEVICE_ERROR; return EFI_DEVICE_ERROR;

21
EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/HiiDatabase.msa
View File

@ -7,7 +7,7 @@
<Version>1.0</Version> <Version>1.0</Version>
<Abstract>Component description file for HiiDatabase module.</Abstract> <Abstract>Component description file for HiiDatabase module.</Abstract>
<Description>This module inits HII database and installs HII protocol.</Description> <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 <License>All rights reserved. This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -25,8 +25,9 @@
<LibraryClass Usage="ALWAYS_CONSUMED"> <LibraryClass Usage="ALWAYS_CONSUMED">
<Keyword>BaseLib</Keyword> <Keyword>BaseLib</Keyword>
</LibraryClass> </LibraryClass>
<LibraryClass Usage="ALWAYS_CONSUMED"> <LibraryClass Usage="ALWAYS_CONSUMED" RecommendedInstanceGuid="bda39d3a-451b-4350-8266-81ab10fa0523">
<Keyword>DebugLib</Keyword> <Keyword>DebugLib</Keyword>
<HelpText>Recommended libary Instance is PeiDxeDebugLibReportStatusCode instance in MdePkg.</HelpText>
</LibraryClass> </LibraryClass>
<LibraryClass Usage="ALWAYS_CONSUMED"> <LibraryClass Usage="ALWAYS_CONSUMED">
<Keyword>UefiDriverEntryPoint</Keyword> <Keyword>UefiDriverEntryPoint</Keyword>
@ -62,24 +63,20 @@
<Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/> <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
</PackageDependencies> </PackageDependencies>
<Protocols> <Protocols>
<Protocol Usage="ALWAYS_CONSUMED"> <Protocol Usage="ALWAYS_PRODUCED">
<ProtocolCName>gEfiHiiProtocolGuid</ProtocolCName> <ProtocolCName>gEfiHiiProtocolGuid</ProtocolCName>
</Protocol> </Protocol>
<Protocol Usage="ALWAYS_CONSUMED"> <Protocol Usage="SOMETIMES_CONSUMED">
<ProtocolCName>gEfiFormCallbackProtocolGuid</ProtocolCName> <ProtocolCName>gEfiFormCallbackProtocolGuid</ProtocolCName>
</Protocol> </Protocol>
</Protocols> </Protocols>
<Variables> <Variables>
<Variable Usage="ALWAYS_CONSUMED"> <Variable Usage="SOMETIMES_CONSUMED">
<VariableName>0x004C 0x0061 0x006E</VariableName> <VariableName>0x004C 0x0061 0x006E 0x0067</VariableName>
<GuidC_Name>gLanGuid</GuidC_Name> <GuidC_Name>gEfiGlobalVariableGuid</GuidC_Name>
<HelpText>L"Lang" global variable is used as system default language.</HelpText>
</Variable> </Variable>
</Variables> </Variables>
<Guids>
<GuidCNames Usage="ALWAYS_CONSUMED">
<GuidCName>gEfiGlobalVariableGuid</GuidCName>
</GuidCNames>
</Guids>
<Externs> <Externs>
<Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification> <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
<Specification>EDK_RELEASE_VERSION 0x00020000</Specification> <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>

6
EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Package.c
View File

@ -1,6 +1,6 @@
/*++ /*++
Copyright (c) 2006, Intel Corporation Copyright (c) 2006 - 2007, Intel Corporation
All rights reserved. This program and the accompanying materials All rights reserved. This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -642,7 +642,7 @@ Returns:
// //
// Free the Package Instance // Free the Package Instance
// //
gBS->FreePool (PackageInstance); FreePool (PackageInstance);
// //
// If this was the only Handle in the database // If this was the only Handle in the database
@ -654,7 +654,7 @@ Returns:
// Make the parent->Next point to the current->Next // Make the parent->Next point to the current->Next
// //
PreviousHandleDatabase->NextHandleDatabase = HandleDatabase->NextHandleDatabase; PreviousHandleDatabase->NextHandleDatabase = HandleDatabase->NextHandleDatabase;
gBS->FreePool (HandleDatabase); FreePool (HandleDatabase);
return EFI_SUCCESS; return EFI_SUCCESS;
} }
// //

14
EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Strings.c
View File

@ -349,7 +349,7 @@ Returns:
// If the token value is not valid, error out // If the token value is not valid, error out
// //
if ((*Reference >= TotalStringCount) && !ResetStrings) { if ((*Reference >= TotalStringCount) && !ResetStrings) {
gBS->FreePool (NewBuffer); FreePool (NewBuffer);
return EFI_INVALID_PARAMETER; 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 // 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; HandleDatabase->Buffer = NewBuffer;
break; break;
} }
@ -710,7 +710,7 @@ Returns:
); );
} }
gBS->FreePool (LangCodes); FreePool (LangCodes);
} }
return Status; return Status;
@ -764,7 +764,7 @@ Returns:
ASSERT_EFI_ERROR (Status); ASSERT_EFI_ERROR (Status);
} }
gBS->FreePool (LangCodes); FreePool (LangCodes);
return EFI_SUCCESS; return EFI_SUCCESS;
} }
@ -1240,7 +1240,7 @@ HiiCompareLanguage (
// If the Language is the same return success // If the Language is the same return success
// //
if (CompareMem (LanguageStringLocation, Language, 6) == 0) { if (CompareMem (LanguageStringLocation, Language, 6) == 0) {
gBS->FreePool (InputString); FreePool (InputString);
return EFI_SUCCESS; return EFI_SUCCESS;
} }
// //
@ -1258,14 +1258,14 @@ HiiCompareLanguage (
// Getting in here means we have a secondary language // Getting in here means we have a secondary language
// //
if (CompareMem (&InputString[Index], Language, 6) == 0) { if (CompareMem (&InputString[Index], Language, 6) == 0) {
gBS->FreePool (InputString); FreePool (InputString);
return EFI_SUCCESS; return EFI_SUCCESS;
} }
} }
// //
// If nothing was found, return the error // If nothing was found, return the error
// //
gBS->FreePool (OriginalInputString); FreePool (OriginalInputString);
return EFI_NOT_FOUND; return EFI_NOT_FOUND;
} }