/** @file\r
HII Library implementation that uses DXE protocols and services.\r
\r
- Copyright (c) 2006 - 2008, Intel Corporation<BR>\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
+ Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+ SPDX-License-Identifier: BSD-2-Clause-Patent\r
\r
**/\r
\r
UINT8 Scope;\r
} IFR_BLOCK_DATA;\r
\r
+typedef struct {\r
+ EFI_VARSTORE_ID VarStoreId;\r
+ UINT16 Size;\r
+} IFR_VARSTORAGE_DATA;\r
+\r
//\r
// <ConfigHdr> Template\r
//\r
EFI_FORM_BROWSER2_PROTOCOL *mUefiFormBrowser2 = NULL;\r
\r
//\r
-// Template used to mark the end of a list of packages \r
+// Template used to mark the end of a list of packages\r
//\r
GLOBAL_REMOVE_IF_UNREFERENCED CONST EFI_HII_PACKAGE_HEADER mEndOfPakageList = {\r
sizeof (EFI_HII_PACKAGE_HEADER),\r
\r
Status = gHiiDatabase->ExportPackageLists (gHiiDatabase, Handle, &BufferSize, HiiPackageList);\r
ASSERT (Status != EFI_NOT_FOUND);\r
- \r
+\r
if (Status == EFI_BUFFER_TOO_SMALL) {\r
HiiPackageList = AllocatePool (BufferSize);\r
ASSERT (HiiPackageList != NULL);\r
/**\r
Registers a list of packages in the HII Database and returns the HII Handle\r
associated with that registration. If an HII Handle has already been registered\r
- with the same PackageListGuid, then NULL is returned. If there are not enough \r
- resources to perform the registration, then NULL is returned. If an empty list \r
- of packages is passed in, then NULL is returned. If the size of the list of \r
- package is 0, then NULL is returned.\r
+ with the same PackageListGuid and DeviceHandle, then NULL is returned. If there\r
+ are not enough resources to perform the registration, then NULL is returned.\r
+ If an empty list of packages is passed in, then NULL is returned. If the size of\r
+ the list of package is 0, then NULL is returned.\r
\r
- The variable arguments are pointers which point to package header that defined \r
+ The variable arguments are pointers which point to package header that defined\r
by UEFI VFR compiler and StringGather tool.\r
\r
#pragma pack (push, 1)\r
EFI_HII_PACKAGE_HEADER PackageHeader;\r
} EDKII_AUTOGEN_PACKAGES_HEADER;\r
#pragma pack (pop)\r
- \r
+\r
@param[in] PackageListGuid The GUID of the package list.\r
- @param[in] DeviceHandle If not NULL, the Device Handle on which \r
+ @param[in] DeviceHandle If not NULL, the Device Handle on which\r
an instance of DEVICE_PATH_PROTOCOL is installed.\r
- This Device Handle uniquely defines the device that \r
+ This Device Handle uniquely defines the device that\r
the added packages are associated with.\r
- @param[in] ... The variable argument list that contains pointers \r
+ @param[in] ... The variable argument list that contains pointers\r
to packages terminated by a NULL.\r
\r
@retval NULL A HII Handle has already been registered in the HII Database with\r
- the same PackageListGuid.\r
+ the same PackageListGuid and DeviceHandle.\r
@retval NULL The HII Handle could not be created.\r
@retval NULL An empty list of packages was passed in.\r
@retval NULL All packages are empty.\r
)\r
{\r
EFI_STATUS Status;\r
- EFI_HII_HANDLE *HiiHandleBuffer;\r
VA_LIST Args;\r
UINT32 *Package;\r
EFI_HII_PACKAGE_LIST_HEADER *PackageListHeader;\r
\r
ASSERT (PackageListGuid != NULL);\r
\r
- //\r
- // Check to see if an HII Handle has already been registered with the same \r
- // PackageListGuid\r
- //\r
- HiiHandleBuffer = HiiGetHiiHandles (PackageListGuid);\r
- if (HiiHandleBuffer != NULL) {\r
- FreePool (HiiHandleBuffer);\r
- return NULL;\r
- }\r
-\r
//\r
// Calculate the length of all the packages in the variable argument list\r
//\r
VA_END (Args);\r
\r
//\r
- // If there are no packages in the variable argument list or all the packages \r
+ // If there are no packages in the variable argument list or all the packages\r
// are empty, then return a NULL HII Handle\r
//\r
if (Length == 0) {\r
}\r
\r
//\r
- // Add the length of the Package List Header and the terminating Package Header \r
+ // Add the length of the Package List Header and the terminating Package Header\r
//\r
Length += sizeof (EFI_HII_PACKAGE_LIST_HEADER) + sizeof (EFI_HII_PACKAGE_HEADER);\r
\r
PackageListHeader = AllocateZeroPool (Length);\r
\r
//\r
- // If the Packahge List can not be allocated, then return a NULL HII Handle\r
+ // If the Package List can not be allocated, then return a NULL HII Handle\r
//\r
if (PackageListHeader == NULL) {\r
return NULL;\r
// Register the package list with the HII Database\r
//\r
Status = gHiiDatabase->NewPackageList (\r
- gHiiDatabase, \r
- PackageListHeader, \r
- DeviceHandle, \r
+ gHiiDatabase,\r
+ PackageListHeader,\r
+ DeviceHandle,\r
&HiiHandle\r
);\r
if (EFI_ERROR (Status)) {\r
\r
\r
/**\r
- Retrieves the array of all the HII Handles or the HII handle of a specific\r
- package list in the HII Database.\r
+ Retrieves the array of all the HII Handles or the HII handles of a specific\r
+ package list GUID in the HII Database.\r
This array is terminated with a NULL HII Handle.\r
This function allocates the returned array using AllocatePool().\r
The caller is responsible for freeing the array with FreePool().\r
\r
- @param[in] PackageListGuid An optional parameter that is used to request \r
- an HII Handle that is associatd with a specific\r
- Package List GUID. If this parameter is NULL\r
+ @param[in] PackageListGuid An optional parameter that is used to request\r
+ HII Handles associated with a specific\r
+ Package List GUID. If this parameter is NULL,\r
then all the HII Handles in the HII Database\r
- are returned. If this parameter is not NULL\r
- then at most 1 HII Handle is returned.\r
+ are returned. If this parameter is not NULL,\r
+ then zero or more HII Handles associated with\r
+ PackageListGuid are returned.\r
\r
@retval NULL No HII handles were found in the HII database\r
@retval NULL The array of HII Handles could not be retrieved\r
EFI_HII_HANDLE TempHiiHandleBuffer;\r
EFI_HII_HANDLE *HiiHandleBuffer;\r
EFI_GUID Guid;\r
- UINTN Index;\r
+ UINTN Index1;\r
+ UINTN Index2;\r
\r
//\r
// Retrieve the size required for the buffer of all HII handles.\r
);\r
\r
//\r
- // If ListPackageLists() returns EFI_SUCCESS for a zero size, \r
- // then there are no HII handles in the HII database. If ListPackageLists() \r
- // returns an error other than EFI_BUFFER_TOO_SMALL, then there are no HII \r
+ // If ListPackageLists() returns EFI_SUCCESS for a zero size,\r
+ // then there are no HII handles in the HII database. If ListPackageLists()\r
+ // returns an error other than EFI_BUFFER_TOO_SMALL, then there are no HII\r
// handles in the HII database.\r
//\r
if (Status != EFI_BUFFER_TOO_SMALL) {\r
//\r
- // Return NULL if the size can not be retrieved, or if there are no HII \r
+ // Return NULL if the size can not be retrieved, or if there are no HII\r
// handles in the HII Database\r
//\r
return NULL;\r
//\r
return HiiHandleBuffer;\r
} else {\r
- for (Index = 0; HiiHandleBuffer[Index] != NULL; Index++) {\r
- Status = InternalHiiExtractGuidFromHiiHandle (HiiHandleBuffer[Index], &Guid);\r
+ for (Index1 = 0, Index2 = 0; HiiHandleBuffer[Index1] != NULL; Index1++) {\r
+ Status = InternalHiiExtractGuidFromHiiHandle (HiiHandleBuffer[Index1], &Guid);\r
ASSERT_EFI_ERROR (Status);\r
if (CompareGuid (&Guid, PackageListGuid)) {\r
- HiiHandleBuffer[0] = HiiHandleBuffer[Index];\r
- HiiHandleBuffer[1] = NULL;\r
- return HiiHandleBuffer;\r
+ HiiHandleBuffer[Index2++] = HiiHandleBuffer[Index1];\r
}\r
}\r
- FreePool (HiiHandleBuffer);\r
- return NULL;\r
+ if (Index2 > 0) {\r
+ HiiHandleBuffer[Index2] = NULL;\r
+ return HiiHandleBuffer;\r
+ } else {\r
+ FreePool (HiiHandleBuffer);\r
+ return NULL;\r
+ }\r
+ }\r
+}\r
+\r
+/**\r
+ This function allows a caller to extract the form set opcode form the Hii Handle.\r
+ The returned buffer is allocated using AllocatePool().The caller is responsible\r
+ for freeing the allocated buffer using FreePool().\r
+\r
+ @param Handle The HII handle.\r
+ @param Buffer On return, points to a pointer which point to the buffer that contain the formset opcode.\r
+ @param BufferSize On return, points to the length of the buffer.\r
+\r
+ @retval EFI_OUT_OF_RESOURCES No enough memory resource is allocated.\r
+ @retval EFI_NOT_FOUND Can't find the package data for the input Handle.\r
+ @retval EFI_INVALID_PARAMETER The input parameters are not correct.\r
+ @retval EFI_SUCCESS Get the formset opcode from the hii handle successfully.\r
+\r
+**/\r
+EFI_STATUS\r
+EFIAPI\r
+HiiGetFormSetFromHiiHandle(\r
+ IN EFI_HII_HANDLE Handle,\r
+ OUT EFI_IFR_FORM_SET **Buffer,\r
+ OUT UINTN *BufferSize\r
+ )\r
+{\r
+ EFI_STATUS Status;\r
+ UINTN PackageListSize;\r
+ UINTN TempSize;\r
+ EFI_HII_PACKAGE_LIST_HEADER *HiiPackageList;\r
+ UINT8 *Package;\r
+ UINT8 *OpCodeData;\r
+ UINT8 *FormSetBuffer;\r
+ UINT8 *TempBuffer;\r
+ UINT32 Offset;\r
+ UINT32 Offset2;\r
+ UINT32 PackageListLength;\r
+ EFI_HII_PACKAGE_HEADER PackageHeader;\r
+\r
+ TempSize = 0;\r
+ FormSetBuffer = NULL;\r
+ TempBuffer = NULL;\r
+\r
+ //\r
+ // Get HII PackageList\r
+ //\r
+ PackageListSize = 0;\r
+ HiiPackageList = NULL;\r
+ Status = gHiiDatabase->ExportPackageLists (gHiiDatabase, Handle, &PackageListSize, HiiPackageList);\r
+ if (EFI_ERROR (Status) && (Status != EFI_BUFFER_TOO_SMALL)) {\r
+ return Status;\r
+ }\r
+\r
+ HiiPackageList = AllocatePool (PackageListSize);\r
+ if (HiiPackageList == NULL) {\r
+ return EFI_OUT_OF_RESOURCES;\r
+ }\r
+\r
+ Status = gHiiDatabase->ExportPackageLists (gHiiDatabase, Handle, &PackageListSize, HiiPackageList);\r
+ ASSERT_EFI_ERROR (Status);\r
+\r
+ //\r
+ // Get Form package from this HII package List\r
+ //\r
+ Status = EFI_NOT_FOUND;\r
+ Offset = sizeof (EFI_HII_PACKAGE_LIST_HEADER);\r
+ PackageListLength = ReadUnaligned32 (&HiiPackageList->PackageLength);\r
+\r
+ while (Offset < PackageListLength) {\r
+ Package = ((UINT8 *) HiiPackageList) + Offset;\r
+ CopyMem (&PackageHeader, Package, sizeof (EFI_HII_PACKAGE_HEADER));\r
+ Offset += PackageHeader.Length;\r
+\r
+ if (PackageHeader.Type != EFI_HII_PACKAGE_FORMS) {\r
+ continue;\r
+ }\r
+\r
+ //\r
+ // Search FormSet Opcode in this Form Package\r
+ //\r
+ Offset2 = sizeof (EFI_HII_PACKAGE_HEADER);\r
+ while (Offset2 < PackageHeader.Length) {\r
+ OpCodeData = Package + Offset2;\r
+ Offset2 += ((EFI_IFR_OP_HEADER *) OpCodeData)->Length;\r
+\r
+ if (((EFI_IFR_OP_HEADER *) OpCodeData)->OpCode != EFI_IFR_FORM_SET_OP) {\r
+ continue;\r
+ }\r
+\r
+ if (FormSetBuffer != NULL){\r
+ TempBuffer = ReallocatePool (\r
+ TempSize,\r
+ TempSize + ((EFI_IFR_OP_HEADER *) OpCodeData)->Length,\r
+ FormSetBuffer\r
+ );\r
+ if (TempBuffer == NULL) {\r
+ Status = EFI_OUT_OF_RESOURCES;\r
+ goto Done;\r
+ }\r
+ CopyMem (TempBuffer + TempSize, OpCodeData, ((EFI_IFR_OP_HEADER *) OpCodeData)->Length);\r
+ FormSetBuffer = NULL;\r
+ } else {\r
+ TempBuffer = AllocatePool (TempSize + ((EFI_IFR_OP_HEADER *) OpCodeData)->Length);\r
+ if (TempBuffer == NULL) {\r
+ Status = EFI_OUT_OF_RESOURCES;\r
+ goto Done;\r
+ }\r
+ CopyMem (TempBuffer, OpCodeData, ((EFI_IFR_OP_HEADER *) OpCodeData)->Length);\r
+ }\r
+ TempSize += ((EFI_IFR_OP_HEADER *) OpCodeData)->Length;\r
+ FormSetBuffer = TempBuffer;\r
+\r
+ Status = EFI_SUCCESS;\r
+ //\r
+ //One form package has one formset, exit current form package to search other form package in the packagelist.\r
+ //\r
+ break;\r
+ }\r
}\r
+Done:\r
+ FreePool (HiiPackageList);\r
+\r
+ *BufferSize = TempSize;\r
+ *Buffer = (EFI_IFR_FORM_SET *)FormSetBuffer;\r
+\r
+ return Status;\r
}\r
\r
/**\r
- Converts all hex dtring characters in range ['A'..'F'] to ['a'..'f'] for \r
+ Converts all hex dtring characters in range ['A'..'F'] to ['a'..'f'] for\r
hex digits that appear between a '=' and a '&' in a config string.\r
\r
- If String is NULL, then ASSERT().\r
+ If ConfigString is NULL, then ASSERT().\r
\r
- @param[in] String Pointer to a Null-terminated Unicode string.\r
+ @param[in] ConfigString Pointer to a Null-terminated Unicode string.\r
\r
@return Pointer to the Null-terminated Unicode result string.\r
\r
}\r
\r
/**\r
- Uses the BlockToConfig() service of the Config Routing Protocol to \r
+ Uses the BlockToConfig() service of the Config Routing Protocol to\r
convert <ConfigRequest> and a buffer to a <ConfigResp>\r
\r
If ConfigRequest is NULL, then ASSERT().\r
}\r
\r
/**\r
- Uses the BrowserCallback() service of the Form Browser Protocol to retrieve \r
- or set uncommitted data. If sata i being retrieved, then the buffer is \r
- allocated using AllocatePool(). The caller is then responsible for freeing \r
+ Uses the BrowserCallback() service of the Form Browser Protocol to retrieve\r
+ or set uncommitted data. If sata i being retrieved, then the buffer is\r
+ allocated using AllocatePool(). The caller is then responsible for freeing\r
the buffer using FreePool().\r
\r
- @param[in] VariableName Pointer to a Null-terminated Unicode string. This \r
- is an optional parameter that may be NULL.\r
- @param[in] VariableGuid Pointer to an EFI_GUID structure. This is an optional \r
+ @param[in] VariableGuid Pointer to an EFI_GUID structure. This is an optional\r
parameter that may be NULL.\r
+ @param[in] VariableName Pointer to a Null-terminated Unicode string. This\r
+ is an optional parameter that may be NULL.\r
@param[in] SetResultsData If not NULL, then this parameter specified the buffer\r
of uncommited data to set. If this parameter is NULL,\r
then the caller is requesting to get the uncommited data\r
VariableGuid,\r
VariableName\r
);\r
- \r
+\r
if (!EFI_ERROR (Status)) {\r
//\r
// No Resluts Data, only allocate one char for '\0'\r
}\r
\r
/**\r
- Allocates and returns a Null-terminated Unicode <ConfigHdr> string using routing \r
+ Allocates and returns a Null-terminated Unicode <ConfigHdr> string using routing\r
information that includes a GUID, an optional Unicode string name, and a device\r
- path. The string returned is allocated with AllocatePool(). The caller is \r
+ path. The string returned is allocated with AllocatePool(). The caller is\r
responsible for freeing the allocated string with FreePool().\r
- \r
+\r
The format of a <ConfigHdr> is as follows:\r
\r
GUID=<HexCh>32&NAME=<Char>NameLength&PATH=<HexChar>DevicePathSize<Null>\r
\r
@param[in] Guid Pointer to an EFI_GUID that is the routing information\r
- GUID. Each of the 16 bytes in Guid is converted to \r
- a 2 Unicode character hexidecimal string. This is \r
+ GUID. Each of the 16 bytes in Guid is converted to\r
+ a 2 Unicode character hexadecimal string. This is\r
an optional parameter that may be NULL.\r
- @param[in] Name Pointer to a Null-terminated Unicode string that is \r
- the routing information NAME. This is an optional \r
- parameter that may be NULL. Each 16-bit Unicode \r
- character in Name is converted to a 4 character Unicode \r
- hexidecimal string. \r
+ @param[in] Name Pointer to a Null-terminated Unicode string that is\r
+ the routing information NAME. This is an optional\r
+ parameter that may be NULL. Each 16-bit Unicode\r
+ character in Name is converted to a 4 character Unicode\r
+ hexadecimal string.\r
@param[in] DriverHandle The driver handle which supports a Device Path Protocol\r
that is the routing information PATH. Each byte of\r
the Device Path associated with DriverHandle is converted\r
- to a 2 Unicode character hexidecimal string.\r
+ to a 2 Unicode character hexadecimal string.\r
\r
@retval NULL DriverHandle does not support the Device Path Protocol.\r
@retval Other A pointer to the Null-terminate Unicode <ConfigHdr> string\r
CHAR16 *ReturnString;\r
UINTN Index;\r
UINT8 *Buffer;\r
+ UINTN MaxLen;\r
\r
//\r
- // Compute the length of Name in Unicode characters. \r
+ // Compute the length of Name in Unicode characters.\r
// If Name is NULL, then the length is 0.\r
//\r
NameLength = 0;\r
// GUID=<HexCh>32&NAME=<Char>NameLength&PATH=<HexChar>DevicePathSize <Null>\r
// | 5 | sizeof (EFI_GUID) * 2 | 6 | NameStrLen*4 | 6 | DevicePathSize * 2 | 1 |\r
//\r
- String = AllocateZeroPool ((5 + sizeof (EFI_GUID) * 2 + 6 + NameLength * 4 + 6 + DevicePathSize * 2 + 1) * sizeof (CHAR16));\r
+ MaxLen = 5 + sizeof (EFI_GUID) * 2 + 6 + NameLength * 4 + 6 + DevicePathSize * 2 + 1;\r
+ String = AllocateZeroPool (MaxLen * sizeof (CHAR16));\r
if (String == NULL) {\r
return NULL;\r
}\r
//\r
// Start with L"GUID="\r
//\r
- ReturnString = StrCpy (String, L"GUID=");\r
+ StrCpyS (String, MaxLen, L"GUID=");\r
+ ReturnString = String;\r
String += StrLen (String);\r
\r
if (Guid != NULL) {\r
// Append Guid converted to <HexCh>32\r
//\r
for (Index = 0, Buffer = (UINT8 *)Guid; Index < sizeof (EFI_GUID); Index++) {\r
- String += UnicodeValueToString (String, PREFIX_ZERO | RADIX_HEX, *(Buffer++), 2);\r
+ UnicodeValueToStringS (\r
+ String,\r
+ MaxLen * sizeof (CHAR16) - ((UINTN)String - (UINTN)ReturnString),\r
+ PREFIX_ZERO | RADIX_HEX,\r
+ *(Buffer++),\r
+ 2\r
+ );\r
+ String += StrnLenS (String, MaxLen - ((UINTN)String - (UINTN)ReturnString) / sizeof (CHAR16));\r
}\r
}\r
- \r
+\r
//\r
// Append L"&NAME="\r
//\r
- StrCpy (String, L"&NAME=");\r
+ StrCatS (ReturnString, MaxLen, L"&NAME=");\r
String += StrLen (String);\r
\r
if (Name != NULL) {\r
// Append Name converted to <Char>NameLength\r
//\r
for (; *Name != L'\0'; Name++) {\r
- String += UnicodeValueToString (String, PREFIX_ZERO | RADIX_HEX, *Name, 4);\r
+ UnicodeValueToStringS (\r
+ String,\r
+ sizeof (CHAR16) * MaxLen - ((UINTN)String - (UINTN)ReturnString),\r
+ PREFIX_ZERO | RADIX_HEX,\r
+ *Name,\r
+ 4\r
+ );\r
+ String += StrnLenS (String, MaxLen - ((UINTN)String - (UINTN)ReturnString) / sizeof (CHAR16));\r
}\r
}\r
\r
//\r
// Append L"&PATH="\r
//\r
- StrCpy (String, L"&PATH=");\r
+ StrCatS (ReturnString, MaxLen, L"&PATH=");\r
String += StrLen (String);\r
\r
//\r
// Append the device path associated with DriverHandle converted to <HexChar>DevicePathSize\r
//\r
for (Index = 0, Buffer = (UINT8 *)DevicePath; Index < DevicePathSize; Index++) {\r
- String += UnicodeValueToString (String, PREFIX_ZERO | RADIX_HEX, *(Buffer++), 2);\r
+ UnicodeValueToStringS (\r
+ String,\r
+ sizeof (CHAR16) * MaxLen - ((UINTN)String - (UINTN)ReturnString),\r
+ PREFIX_ZERO | RADIX_HEX,\r
+ *(Buffer++),\r
+ 2\r
+ );\r
+ String += StrnLenS (String, MaxLen - ((UINTN)String - (UINTN)ReturnString) / sizeof (CHAR16));\r
}\r
\r
//\r
}\r
\r
/**\r
- Convert the hex UNICODE encoding string of UEFI GUID, NAME or device path \r
+ Convert the hex UNICODE encoding string of UEFI GUID, NAME or device path\r
to binary buffer from <ConfigHdr>.\r
\r
This is a internal function.\r
if (String == NULL || Buffer == NULL) {\r
return EFI_INVALID_PARAMETER;\r
}\r
- \r
+\r
DataBuffer = NULL;\r
StringPtr = NULL;\r
ConfigHdr = String;\r
DataBuffer [Index/2] = (UINT8) ((DataBuffer [Index/2] << 4) + DigitUint8);\r
}\r
}\r
- \r
+\r
*Buffer = DataBuffer;\r
break;\r
\r
case NAME_CONFIG_STRING_TYPE:\r
//\r
// Convert Config String to Unicode String, e.g. "0041004200430044" => "ABCD"\r
- // \r
+ //\r
\r
//\r
// Add the tailling char L'\0'\r
StringPtr = (CHAR16 *) DataBuffer;\r
ZeroMem (TemStr, sizeof (TemStr));\r
for (Index = 0; Index < Length; Index += 4) {\r
- StrnCpy (TemStr, ConfigHdr + Index, 4);\r
+ StrnCpyS (TemStr, sizeof (TemStr) / sizeof (CHAR16), ConfigHdr + Index, 4);\r
StringPtr[Index/4] = (CHAR16) StrHexToUint64 (TemStr);\r
}\r
//\r
\r
default:\r
return EFI_INVALID_PARAMETER;\r
- break;\r
}\r
\r
return EFI_SUCCESS;\r
/**\r
This function checks VarOffset and VarWidth is in the block range.\r
\r
- @param BlockArray The block array is to be checked. \r
+ @param BlockArray The block array is to be checked.\r
@param VarOffset Offset of var to the structure\r
@param VarWidth Width of var.\r
- \r
+\r
@retval TRUE This Var is in the block range.\r
@retval FALSE This Var is not in the block range.\r
**/\r
{\r
LIST_ENTRY *Link;\r
IFR_BLOCK_DATA *BlockData;\r
- \r
+\r
//\r
// No Request Block array, all vars are got.\r
//\r
if (BlockArray == NULL) {\r
return TRUE;\r
}\r
- \r
+\r
//\r
// Check the input var is in the request block range.\r
//\r
StringPtr++;\r
}\r
Length = StringPtr - ValueString;\r
- \r
+\r
//\r
// Allocate buffer to store the value\r
//\r
if (Buf == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
- \r
+\r
//\r
// Convert character one by one to the value buffer\r
//\r
Buf [Index/2] = (UINT8) ((DigitUint8 << 4) + Buf [Index/2]);\r
}\r
}\r
- \r
+\r
//\r
// Set the converted value and string length.\r
//\r
return EFI_SUCCESS;\r
}\r
\r
+/**\r
+ Get value from config request resp string.\r
+\r
+ @param ConfigElement ConfigResp string contains the current setting.\r
+ @param VarName The variable name which need to get value.\r
+ @param VarValue The return value.\r
+\r
+ @retval EFI_SUCCESS Get the value for the VarName\r
+ @retval EFI_OUT_OF_RESOURCES The memory is not enough.\r
+**/\r
+EFI_STATUS\r
+GetValueFromRequest (\r
+ IN CHAR16 *ConfigElement,\r
+ IN CHAR16 *VarName,\r
+ OUT UINT64 *VarValue\r
+ )\r
+{\r
+ UINT8 *TmpBuffer;\r
+ CHAR16 *StringPtr;\r
+ UINTN Length;\r
+ EFI_STATUS Status;\r
+\r
+ //\r
+ // Find VarName related string.\r
+ //\r
+ StringPtr = StrStr (ConfigElement, VarName);\r
+ ASSERT (StringPtr != NULL);\r
+\r
+ //\r
+ // Skip the "VarName=" string\r
+ //\r
+ StringPtr += StrLen (VarName) + 1;\r
+\r
+ //\r
+ // Get Offset\r
+ //\r
+ Status = InternalHiiGetValueOfNumber (StringPtr, &TmpBuffer, &Length);\r
+ if (EFI_ERROR (Status)) {\r
+ return Status;\r
+ }\r
+\r
+ *VarValue = 0;\r
+ CopyMem (VarValue, TmpBuffer, (((Length + 1) / 2) < sizeof (UINT64)) ? ((Length + 1) / 2) : sizeof (UINT64));\r
+\r
+ FreePool (TmpBuffer);\r
+\r
+ return EFI_SUCCESS;\r
+}\r
+\r
/**\r
This internal function parses IFR data to validate current setting.\r
\r
- @param ConfigResp ConfigResp string contains the current setting.\r
+ Base on the NameValueType, if it is TRUE, RequestElement and HiiHandle is valid;\r
+ else the VarBuffer and CurrentBlockArray is valid.\r
+\r
@param HiiPackageList Point to Hii package list.\r
@param PackageListLength The length of the pacakge.\r
@param VarGuid Guid of the buffer storage.\r
@param VarName Name of the buffer storage.\r
- \r
+ @param VarBuffer The data buffer for the storage.\r
+ @param CurrentBlockArray The block array from the config Requst string.\r
+ @param RequestElement The config string for this storage.\r
+ @param HiiHandle The HiiHandle for this formset.\r
+ @param NameValueType Whether current storage is name/value varstore or not.\r
+\r
@retval EFI_SUCCESS The current setting is valid.\r
@retval EFI_OUT_OF_RESOURCES The memory is not enough.\r
@retval EFI_INVALID_PARAMETER The config string or the Hii package is invalid.\r
**/\r
EFI_STATUS\r
-EFIAPI\r
-InternalHiiValidateCurrentSetting (\r
- IN EFI_STRING ConfigResp,\r
+ValidateQuestionFromVfr (\r
IN EFI_HII_PACKAGE_LIST_HEADER *HiiPackageList,\r
IN UINTN PackageListLength,\r
IN EFI_GUID *VarGuid,\r
- IN CHAR16 *VarName\r
+ IN CHAR16 *VarName,\r
+ IN UINT8 *VarBuffer,\r
+ IN IFR_BLOCK_DATA *CurrentBlockArray,\r
+ IN CHAR16 *RequestElement,\r
+ IN EFI_HII_HANDLE HiiHandle,\r
+ IN BOOLEAN NameValueType\r
)\r
-{ \r
- IFR_BLOCK_DATA *CurrentBlockArray;\r
- IFR_BLOCK_DATA *BlockData;\r
- IFR_BLOCK_DATA *NewBlockData;\r
+{\r
IFR_BLOCK_DATA VarBlockData;\r
- EFI_STRING StringPtr;\r
- UINTN Length;\r
- UINT8 *TmpBuffer;\r
UINT16 Offset;\r
UINT16 Width;\r
UINT64 VarValue;\r
- LIST_ENTRY *Link;\r
- UINT8 *VarBuffer;\r
- UINTN MaxBufferSize;\r
+ EFI_IFR_TYPE_VALUE TmpValue;\r
EFI_STATUS Status;\r
- EFI_HII_PACKAGE_HEADER PacakgeHeader;\r
+ EFI_HII_PACKAGE_HEADER PackageHeader;\r
UINT32 PackageOffset;\r
UINT8 *PackageData;\r
UINTN IfrOffset;\r
EFI_IFR_OP_HEADER *IfrOpHdr;\r
EFI_IFR_VARSTORE *IfrVarStore;\r
+ EFI_IFR_VARSTORE_NAME_VALUE *IfrNameValueStore;\r
+ EFI_IFR_VARSTORE_EFI *IfrEfiVarStore;\r
+ IFR_VARSTORAGE_DATA VarStoreData;\r
EFI_IFR_ONE_OF *IfrOneOf;\r
EFI_IFR_NUMERIC *IfrNumeric;\r
EFI_IFR_ONE_OF_OPTION *IfrOneOfOption;\r
EFI_IFR_STRING *IfrString;\r
CHAR8 *VarStoreName;\r
UINTN Index;\r
- \r
- //\r
- // 1. Get the current setting to current block data array and Convert them into VarBuffer\r
- //\r
+ CHAR16 *QuestionName;\r
+ CHAR16 *StringPtr;\r
+ UINT16 BitOffset;\r
+ UINT16 BitWidth;\r
+ UINT16 TotalBits;\r
+ UINTN StartBit;\r
+ UINTN EndBit;\r
+ BOOLEAN QuestionReferBitField;\r
+ UINT32 BufferValue;\r
\r
- //\r
- // Skip ConfigHdr string\r
- //\r
- StringPtr = ConfigResp;\r
- StringPtr = StrStr (ConfigResp, L"&OFFSET");\r
- if (StringPtr == NULL) {\r
- //\r
- // No ConfigBlock value is requied to be validated.\r
- // EFI_SUCCESS directly return.\r
- //\r
- return EFI_SUCCESS;\r
- }\r
- \r
//\r
// Initialize the local variables.\r
//\r
- Index = 0;\r
- VarStoreName = NULL;\r
- Status = EFI_SUCCESS;\r
- BlockData = NULL;\r
- NewBlockData = NULL;\r
- TmpBuffer = NULL;\r
- MaxBufferSize = HII_LIB_DEFAULT_VARSTORE_SIZE;\r
- VarBuffer = AllocateZeroPool (MaxBufferSize);\r
- if (VarBuffer == NULL) {\r
- return EFI_OUT_OF_RESOURCES;\r
- }\r
+ Index = 0;\r
+ VarStoreName = NULL;\r
+ Status = EFI_SUCCESS;\r
+ VarValue = 0;\r
+ IfrVarStore = NULL;\r
+ IfrNameValueStore = NULL;\r
+ IfrEfiVarStore = NULL;\r
+ ZeroMem (&VarStoreData, sizeof (IFR_VARSTORAGE_DATA));\r
+ ZeroMem (&VarBlockData, sizeof (VarBlockData));\r
+ BitOffset = 0;\r
+ BitWidth = 0;\r
+ QuestionReferBitField = FALSE;\r
\r
//\r
- // Init CurrentBlockArray\r
- //\r
- CurrentBlockArray = (IFR_BLOCK_DATA *) AllocateZeroPool (sizeof (IFR_BLOCK_DATA));\r
- if (CurrentBlockArray == NULL) {\r
- Status = EFI_OUT_OF_RESOURCES;\r
- goto Done;\r
- }\r
- InitializeListHead (&CurrentBlockArray->Entry);\r
- \r
- //\r
- // Parse each <RequestElement> if exists\r
- // Only <BlockName> format is supported by this help function.\r
- // <BlockName> ::= &'OFFSET='<Number>&'WIDTH='<Number>\r
+ // Check IFR value is in block data, then Validate Value\r
//\r
- while (*StringPtr != 0 && StrnCmp (StringPtr, L"&OFFSET=", StrLen (L"&OFFSET=")) == 0) {\r
- //\r
- // Skip the &OFFSET= string\r
- // \r
- StringPtr += StrLen (L"&OFFSET=");\r
+ PackageOffset = sizeof (EFI_HII_PACKAGE_LIST_HEADER);\r
+ while (PackageOffset < PackageListLength) {\r
+ CopyMem (&PackageHeader, (UINT8 *) HiiPackageList + PackageOffset, sizeof (PackageHeader));\r
\r
//\r
- // Get Offset\r
+ // Parse IFR opcode from the form package.\r
//\r
- Status = InternalHiiGetValueOfNumber (StringPtr, &TmpBuffer, &Length);\r
- if (EFI_ERROR (Status)) {\r
- goto Done;\r
- }\r
- Offset = 0;\r
- CopyMem (\r
- &Offset,\r
- TmpBuffer,\r
- (((Length + 1) / 2) < sizeof (UINT16)) ? ((Length + 1) / 2) : sizeof (UINT16)\r
- );\r
- FreePool (TmpBuffer);\r
- TmpBuffer = NULL;\r
+ if (PackageHeader.Type == EFI_HII_PACKAGE_FORMS) {\r
+ IfrOffset = sizeof (PackageHeader);\r
+ PackageData = (UINT8 *) HiiPackageList + PackageOffset;\r
+ while (IfrOffset < PackageHeader.Length) {\r
+ IfrOpHdr = (EFI_IFR_OP_HEADER *) (PackageData + IfrOffset);\r
+ //\r
+ // Validate current setting to the value built in IFR opcode\r
+ //\r
+ switch (IfrOpHdr->OpCode) {\r
+ case EFI_IFR_VARSTORE_OP:\r
+ //\r
+ // VarStoreId has been found. No further found.\r
+ //\r
+ if (VarStoreData.VarStoreId != 0) {\r
+ break;\r
+ }\r
+ //\r
+ // Find the matched VarStoreId to the input VarGuid and VarName\r
+ //\r
+ IfrVarStore = (EFI_IFR_VARSTORE *) IfrOpHdr;\r
+ if (CompareGuid ((EFI_GUID *) (VOID *) &IfrVarStore->Guid, VarGuid)) {\r
+ VarStoreName = (CHAR8 *) IfrVarStore->Name;\r
+ for (Index = 0; VarStoreName[Index] != 0; Index ++) {\r
+ if ((CHAR16) VarStoreName[Index] != VarName[Index]) {\r
+ break;\r
+ }\r
+ }\r
+ //\r
+ // The matched VarStore is found.\r
+ //\r
+ if ((VarStoreName[Index] != 0) || (VarName[Index] != 0)) {\r
+ IfrVarStore = NULL;\r
+ }\r
+ } else {\r
+ IfrVarStore = NULL;\r
+ }\r
\r
- StringPtr += Length;\r
- if (StrnCmp (StringPtr, L"&WIDTH=", StrLen (L"&WIDTH=")) != 0) {\r
- Status = EFI_INVALID_PARAMETER;\r
- goto Done;\r
- }\r
- StringPtr += StrLen (L"&WIDTH=");\r
+ if (IfrVarStore != NULL) {\r
+ VarStoreData.VarStoreId = IfrVarStore->VarStoreId;\r
+ VarStoreData.Size = IfrVarStore->Size;\r
+ }\r
+ break;\r
+ case EFI_IFR_VARSTORE_NAME_VALUE_OP:\r
+ //\r
+ // VarStoreId has been found. No further found.\r
+ //\r
+ if (VarStoreData.VarStoreId != 0) {\r
+ break;\r
+ }\r
+ //\r
+ // Find the matched VarStoreId to the input VarGuid\r
+ //\r
+ IfrNameValueStore = (EFI_IFR_VARSTORE_NAME_VALUE *) IfrOpHdr;\r
+ if (!CompareGuid ((EFI_GUID *) (VOID *) &IfrNameValueStore->Guid, VarGuid)) {\r
+ IfrNameValueStore = NULL;\r
+ }\r
\r
- //\r
- // Get Width\r
- //\r
- Status = InternalHiiGetValueOfNumber (StringPtr, &TmpBuffer, &Length);\r
- if (EFI_ERROR (Status)) {\r
- goto Done;\r
- }\r
- Width = 0;\r
- CopyMem (\r
- &Width,\r
- TmpBuffer,\r
- (((Length + 1) / 2) < sizeof (UINT16)) ? ((Length + 1) / 2) : sizeof (UINT16)\r
- );\r
- FreePool (TmpBuffer);\r
- TmpBuffer = NULL;\r
+ if (IfrNameValueStore != NULL) {\r
+ VarStoreData.VarStoreId = IfrNameValueStore->VarStoreId;\r
+ }\r
+ break;\r
+ case EFI_IFR_VARSTORE_EFI_OP:\r
+ //\r
+ // VarStore is found. Don't need to search any more.\r
+ //\r
+ if (VarStoreData.VarStoreId != 0) {\r
+ break;\r
+ }\r
\r
- StringPtr += Length;\r
- if (*StringPtr != 0 && *StringPtr != L'&') {\r
- Status = EFI_INVALID_PARAMETER;\r
+ IfrEfiVarStore = (EFI_IFR_VARSTORE_EFI *) IfrOpHdr;\r
+\r
+ //\r
+ // If the length is small than the structure, this is from old efi\r
+ // varstore definition. Old efi varstore get config directly from\r
+ // GetVariable function.\r
+ //\r
+ if (IfrOpHdr->Length < sizeof (EFI_IFR_VARSTORE_EFI)) {\r
+ break;\r
+ }\r
+\r
+ if (CompareGuid ((EFI_GUID *) (VOID *) &IfrEfiVarStore->Guid, VarGuid)) {\r
+ VarStoreName = (CHAR8 *) IfrEfiVarStore->Name;\r
+ for (Index = 0; VarStoreName[Index] != 0; Index ++) {\r
+ if ((CHAR16) VarStoreName[Index] != VarName[Index]) {\r
+ break;\r
+ }\r
+ }\r
+ //\r
+ // The matched VarStore is found.\r
+ //\r
+ if ((VarStoreName[Index] != 0) || (VarName[Index] != 0)) {\r
+ IfrEfiVarStore = NULL;\r
+ }\r
+ } else {\r
+ IfrEfiVarStore = NULL;\r
+ }\r
+\r
+ if (IfrEfiVarStore != NULL) {\r
+ //\r
+ // Find the matched VarStore\r
+ //\r
+ VarStoreData.VarStoreId = IfrEfiVarStore->VarStoreId;\r
+ VarStoreData.Size = IfrEfiVarStore->Size;\r
+ }\r
+ break;\r
+ case EFI_IFR_FORM_OP:\r
+ case EFI_IFR_FORM_MAP_OP:\r
+ //\r
+ // Check the matched VarStoreId is found.\r
+ //\r
+ if (VarStoreData.VarStoreId == 0) {\r
+ return EFI_SUCCESS;\r
+ }\r
+ break;\r
+ case EFI_IFR_ONE_OF_OP:\r
+ //\r
+ // Check whether current value is the one of option.\r
+ //\r
+\r
+ //\r
+ // OneOf question is not in IFR Form. This IFR form is not valid.\r
+ //\r
+ if (VarStoreData.VarStoreId == 0) {\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+ //\r
+ // Check whether this question is for the requested varstore.\r
+ //\r
+ IfrOneOf = (EFI_IFR_ONE_OF *) IfrOpHdr;\r
+ if (IfrOneOf->Question.VarStoreId != VarStoreData.VarStoreId) {\r
+ break;\r
+ }\r
+\r
+ if (NameValueType) {\r
+ QuestionName = HiiGetString (HiiHandle, IfrOneOf->Question.VarStoreInfo.VarName, NULL);\r
+ ASSERT (QuestionName != NULL);\r
+\r
+ if (StrStr (RequestElement, QuestionName) == NULL) {\r
+ //\r
+ // This question is not in the current configuration string. Skip it.\r
+ //\r
+ break;\r
+ }\r
+\r
+ Status = GetValueFromRequest (RequestElement, QuestionName, &VarValue);\r
+ if (EFI_ERROR (Status)) {\r
+ return Status;\r
+ }\r
+ } else {\r
+ //\r
+ // Get Offset by Question header and Width by DataType Flags\r
+ //\r
+ if (QuestionReferBitField) {\r
+ //\r
+ // Get the byte offset/width for bit field.\r
+ //\r
+ BitOffset = IfrOneOf->Question.VarStoreInfo.VarOffset;\r
+ BitWidth = IfrOneOf->Flags & EDKII_IFR_NUMERIC_SIZE_BIT;\r
+ Offset = BitOffset / 8;\r
+ TotalBits = BitOffset % 8 + BitWidth;\r
+ Width = (TotalBits % 8 == 0 ? TotalBits / 8: TotalBits / 8 + 1);\r
+ } else {\r
+ Offset = IfrOneOf->Question.VarStoreInfo.VarOffset;\r
+ Width = (UINT16) (1 << (IfrOneOf->Flags & EFI_IFR_NUMERIC_SIZE));\r
+ }\r
+ //\r
+ // Check whether this question is in current block array.\r
+ //\r
+ if (!BlockArrayCheck (CurrentBlockArray, Offset, Width)) {\r
+ //\r
+ // This question is not in the current configuration string. Skip it.\r
+ //\r
+ break;\r
+ }\r
+ //\r
+ // Check this var question is in the var storage\r
+ //\r
+ if ((Offset + Width) > VarStoreData.Size) {\r
+ //\r
+ // This question exceeds the var store size.\r
+ //\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+\r
+ //\r
+ // Get the current value for oneof opcode\r
+ //\r
+ VarValue = 0;\r
+ if (QuestionReferBitField) {\r
+ //\r
+ // Get the value in bit fields.\r
+ //\r
+ StartBit = BitOffset % 8;\r
+ EndBit = StartBit + BitWidth - 1;\r
+ CopyMem ((UINT8 *) &BufferValue, VarBuffer + Offset, Width);\r
+ VarValue = BitFieldRead32 (BufferValue, StartBit, EndBit);\r
+ } else {\r
+ CopyMem (&VarValue, VarBuffer + Offset, Width);\r
+ }\r
+ }\r
+ //\r
+ // Set Block Data, to be checked in the following Oneof option opcode.\r
+ //\r
+ VarBlockData.OpCode = IfrOpHdr->OpCode;\r
+ VarBlockData.Scope = IfrOpHdr->Scope;\r
+ break;\r
+ case EFI_IFR_NUMERIC_OP:\r
+ //\r
+ // Check the current value is in the numeric range.\r
+ //\r
+\r
+ //\r
+ // Numeric question is not in IFR Form. This IFR form is not valid.\r
+ //\r
+ if (VarStoreData.VarStoreId == 0) {\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+ //\r
+ // Check whether this question is for the requested varstore.\r
+ //\r
+ IfrNumeric = (EFI_IFR_NUMERIC *) IfrOpHdr;\r
+ if (IfrNumeric->Question.VarStoreId != VarStoreData.VarStoreId) {\r
+ break;\r
+ }\r
+\r
+ if (NameValueType) {\r
+ QuestionName = HiiGetString (HiiHandle, IfrNumeric->Question.VarStoreInfo.VarName, NULL);\r
+ ASSERT (QuestionName != NULL);\r
+\r
+ if (StrStr (RequestElement, QuestionName) == NULL) {\r
+ //\r
+ // This question is not in the current configuration string. Skip it.\r
+ //\r
+ break;\r
+ }\r
+\r
+ Status = GetValueFromRequest (RequestElement, QuestionName, &VarValue);\r
+ if (EFI_ERROR (Status)) {\r
+ return Status;\r
+ }\r
+ } else {\r
+ //\r
+ // Get Offset by Question header and Width by DataType Flags\r
+ //\r
+ if (QuestionReferBitField) {\r
+ //\r
+ // Get the byte offset/width for bit field.\r
+ //\r
+ BitOffset = IfrNumeric->Question.VarStoreInfo.VarOffset;\r
+ BitWidth = IfrNumeric->Flags & EDKII_IFR_NUMERIC_SIZE_BIT;\r
+ Offset = BitOffset / 8;\r
+ TotalBits = BitOffset % 8 + BitWidth;\r
+ Width = (TotalBits % 8 == 0 ? TotalBits / 8: TotalBits / 8 + 1);\r
+ } else {\r
+ Offset = IfrNumeric->Question.VarStoreInfo.VarOffset;\r
+ Width = (UINT16) (1 << (IfrNumeric->Flags & EFI_IFR_NUMERIC_SIZE));\r
+ }\r
+ //\r
+ // Check whether this question is in current block array.\r
+ //\r
+ if (!BlockArrayCheck (CurrentBlockArray, Offset, Width)) {\r
+ //\r
+ // This question is not in the current configuration string. Skip it.\r
+ //\r
+ break;\r
+ }\r
+ //\r
+ // Check this var question is in the var storage\r
+ //\r
+ if ((Offset + Width) > VarStoreData.Size) {\r
+ //\r
+ // This question exceeds the var store size.\r
+ //\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+\r
+ //\r
+ // Check the current value is in the numeric range.\r
+ //\r
+ VarValue = 0;\r
+ if (QuestionReferBitField) {\r
+ //\r
+ // Get the value in the bit fields.\r
+ //\r
+ StartBit = BitOffset % 8;\r
+ EndBit = StartBit + BitWidth - 1;\r
+ CopyMem ((UINT8 *) &BufferValue, VarBuffer + Offset, Width);\r
+ VarValue = BitFieldRead32 (BufferValue, StartBit, EndBit);\r
+ } else {\r
+ CopyMem (&VarValue, VarBuffer + Offset, Width);\r
+ }\r
+ }\r
+ if ( QuestionReferBitField) {\r
+ //\r
+ // Value in bit fields was stored as UINt32 type.\r
+ //\r
+ if ((IfrNumeric->Flags & EDKII_IFR_DISPLAY_BIT) == 0) {\r
+ if ((INT32) VarValue < (INT32) IfrNumeric->data.u32.MinValue || (INT32) VarValue > (INT32) IfrNumeric->data.u32.MaxValue) {\r
+ //\r
+ // Not in the valid range.\r
+ //\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+ } else {\r
+ if (VarValue < IfrNumeric->data.u32.MinValue || VarValue > IfrNumeric->data.u32.MaxValue) {\r
+ //\r
+ // Not in the valid range.\r
+ //\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+ }\r
+ } else {\r
+ if ((IfrNumeric->Flags & EFI_IFR_DISPLAY) == 0) {\r
+ switch (IfrNumeric->Flags & EFI_IFR_NUMERIC_SIZE) {\r
+ case EFI_IFR_NUMERIC_SIZE_1:\r
+ if ((INT8) VarValue < (INT8) IfrNumeric->data.u8.MinValue || (INT8) VarValue > (INT8) IfrNumeric->data.u8.MaxValue) {\r
+ //\r
+ // Not in the valid range.\r
+ //\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+ break;\r
+ case EFI_IFR_NUMERIC_SIZE_2:\r
+ if ((INT16) VarValue < (INT16) IfrNumeric->data.u16.MinValue || (INT16) VarValue > (INT16) IfrNumeric->data.u16.MaxValue) {\r
+ //\r
+ // Not in the valid range.\r
+ //\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+ break;\r
+ case EFI_IFR_NUMERIC_SIZE_4:\r
+ if ((INT32) VarValue < (INT32) IfrNumeric->data.u32.MinValue || (INT32) VarValue > (INT32) IfrNumeric->data.u32.MaxValue) {\r
+ //\r
+ // Not in the valid range.\r
+ //\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+ break;\r
+ case EFI_IFR_NUMERIC_SIZE_8:\r
+ if ((INT64) VarValue < (INT64) IfrNumeric->data.u64.MinValue || (INT64) VarValue > (INT64) IfrNumeric->data.u64.MaxValue) {\r
+ //\r
+ // Not in the valid range.\r
+ //\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+ break;\r
+ }\r
+ } else {\r
+ switch (IfrNumeric->Flags & EFI_IFR_NUMERIC_SIZE) {\r
+ case EFI_IFR_NUMERIC_SIZE_1:\r
+ if ((UINT8) VarValue < IfrNumeric->data.u8.MinValue || (UINT8) VarValue > IfrNumeric->data.u8.MaxValue) {\r
+ //\r
+ // Not in the valid range.\r
+ //\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+ break;\r
+ case EFI_IFR_NUMERIC_SIZE_2:\r
+ if ((UINT16) VarValue < IfrNumeric->data.u16.MinValue || (UINT16) VarValue > IfrNumeric->data.u16.MaxValue) {\r
+ //\r
+ // Not in the valid range.\r
+ //\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+ break;\r
+ case EFI_IFR_NUMERIC_SIZE_4:\r
+ if ((UINT32) VarValue < IfrNumeric->data.u32.MinValue || (UINT32) VarValue > IfrNumeric->data.u32.MaxValue) {\r
+ //\r
+ // Not in the valid range.\r
+ //\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+ break;\r
+ case EFI_IFR_NUMERIC_SIZE_8:\r
+ if ((UINT64) VarValue < IfrNumeric->data.u64.MinValue || (UINT64) VarValue > IfrNumeric->data.u64.MaxValue) {\r
+ //\r
+ // Not in the valid range.\r
+ //\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+ break;\r
+ }\r
+ }\r
+ }\r
+ break;\r
+ case EFI_IFR_CHECKBOX_OP:\r
+ //\r
+ // Check value is BOOLEAN type, only 0 and 1 is valid.\r
+ //\r
+\r
+ //\r
+ // CheckBox question is not in IFR Form. This IFR form is not valid.\r
+ //\r
+ if (VarStoreData.VarStoreId == 0) {\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+\r
+ //\r
+ // Check whether this question is for the requested varstore.\r
+ //\r
+ IfrCheckBox = (EFI_IFR_CHECKBOX *) IfrOpHdr;\r
+ if (IfrCheckBox->Question.VarStoreId != VarStoreData.VarStoreId) {\r
+ break;\r
+ }\r
+\r
+ if (NameValueType) {\r
+ QuestionName = HiiGetString (HiiHandle, IfrCheckBox->Question.VarStoreInfo.VarName, NULL);\r
+ ASSERT (QuestionName != NULL);\r
+\r
+ if (StrStr (RequestElement, QuestionName) == NULL) {\r
+ //\r
+ // This question is not in the current configuration string. Skip it.\r
+ //\r
+ break;\r
+ }\r
+\r
+ Status = GetValueFromRequest (RequestElement, QuestionName, &VarValue);\r
+ if (EFI_ERROR (Status)) {\r
+ return Status;\r
+ }\r
+ } else {\r
+ //\r
+ // Get Offset by Question header\r
+ //\r
+ if (QuestionReferBitField) {\r
+ //\r
+ // Get the byte offset/width for bit field.\r
+ //\r
+ BitOffset = IfrCheckBox->Question.VarStoreInfo.VarOffset;\r
+ BitWidth = 1;\r
+ Offset = BitOffset / 8;\r
+ TotalBits = BitOffset % 8 + BitWidth;\r
+ Width = (TotalBits % 8 == 0 ? TotalBits / 8: TotalBits / 8 + 1);\r
+ } else {\r
+ Offset = IfrCheckBox->Question.VarStoreInfo.VarOffset;\r
+ Width = (UINT16) sizeof (BOOLEAN);\r
+ }\r
+ //\r
+ // Check whether this question is in current block array.\r
+ //\r
+ if (!BlockArrayCheck (CurrentBlockArray, Offset, Width)) {\r
+ //\r
+ // This question is not in the current configuration string. Skip it.\r
+ //\r
+ break;\r
+ }\r
+ //\r
+ // Check this var question is in the var storage\r
+ //\r
+ if ((Offset + Width) > VarStoreData.Size) {\r
+ //\r
+ // This question exceeds the var store size.\r
+ //\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+ //\r
+ // Check the current value is in the numeric range.\r
+ //\r
+ VarValue = 0;\r
+ if (QuestionReferBitField) {\r
+ //\r
+ // Get the value in bit fields.\r
+ //\r
+ StartBit = BitOffset % 8;\r
+ EndBit = StartBit + BitWidth - 1;\r
+ CopyMem ((UINT8 *) &BufferValue, VarBuffer + Offset, Width);\r
+ VarValue = BitFieldRead32 (BufferValue, StartBit, EndBit);\r
+ } else {\r
+ CopyMem (&VarValue, VarBuffer + Offset, Width);\r
+ }\r
+ }\r
+ //\r
+ // Boolean type, only 1 and 0 is valid.\r
+ //\r
+ if (VarValue > 1) {\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+ break;\r
+ case EFI_IFR_STRING_OP:\r
+ //\r
+ // Check current string length is less than maxsize\r
+ //\r
+\r
+ //\r
+ // CheckBox question is not in IFR Form. This IFR form is not valid.\r
+ //\r
+ if (VarStoreData.VarStoreId == 0) {\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+\r
+ //\r
+ // Check whether this question is for the requested varstore.\r
+ //\r
+ IfrString = (EFI_IFR_STRING *) IfrOpHdr;\r
+ if (IfrString->Question.VarStoreId != VarStoreData.VarStoreId) {\r
+ break;\r
+ }\r
+ //\r
+ // Get the Max size of the string.\r
+ //\r
+ Width = (UINT16) (IfrString->MaxSize * sizeof (UINT16));\r
+ if (NameValueType) {\r
+ QuestionName = HiiGetString (HiiHandle, IfrString->Question.VarStoreInfo.VarName, NULL);\r
+ ASSERT (QuestionName != NULL);\r
+\r
+ StringPtr = StrStr (RequestElement, QuestionName);\r
+ if (StringPtr == NULL) {\r
+ //\r
+ // This question is not in the current configuration string. Skip it.\r
+ //\r
+ break;\r
+ }\r
+ //\r
+ // Skip the VarName.\r
+ //\r
+ StringPtr += StrLen (QuestionName);\r
+\r
+ //\r
+ // Skip the "=".\r
+ //\r
+ StringPtr += 1;\r
+\r
+ //\r
+ // Check current string length is less than maxsize\r
+ // e.g Config String: "0041004200430044", Unicode String: "ABCD". Unicode String length = Config String length / 4.\r
+ // Config string format in UEFI spec.\r
+ // <NvConfig> ::= <Label>'='<String>\r
+ // <String> ::= [<Char>]+\r
+ // <Char> ::= <HexCh>4\r
+ //\r
+ if (StrLen (StringPtr) / 4 > IfrString->MaxSize) {\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+ } else {\r
+ //\r
+ // Get Offset/Width by Question header and OneOf Flags\r
+ //\r
+ Offset = IfrString->Question.VarStoreInfo.VarOffset;\r
+ //\r
+ // Check whether this question is in current block array.\r
+ //\r
+ if (!BlockArrayCheck (CurrentBlockArray, Offset, Width)) {\r
+ //\r
+ // This question is not in the current configuration string. Skip it.\r
+ //\r
+ break;\r
+ }\r
+ //\r
+ // Check this var question is in the var storage\r
+ //\r
+ if ((Offset + Width) > VarStoreData.Size) {\r
+ //\r
+ // This question exceeds the var store size.\r
+ //\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+\r
+ //\r
+ // Check current string length is less than maxsize\r
+ //\r
+ if (StrLen ((CHAR16 *) (VarBuffer + Offset)) > IfrString->MaxSize) {\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+ }\r
+ break;\r
+ case EFI_IFR_ONE_OF_OPTION_OP:\r
+ //\r
+ // Opcode Scope is zero. This one of option is not to be checked.\r
+ //\r
+ if (VarBlockData.Scope == 0) {\r
+ break;\r
+ }\r
+\r
+ //\r
+ // Only check for OneOf and OrderList opcode\r
+ //\r
+ IfrOneOfOption = (EFI_IFR_ONE_OF_OPTION *) IfrOpHdr;\r
+ if (VarBlockData.OpCode == EFI_IFR_ONE_OF_OP) {\r
+ //\r
+ // Check current value is the value of one of option.\r
+ //\r
+ ASSERT (IfrOneOfOption->Type <= EFI_IFR_TYPE_NUM_SIZE_64);\r
+ ZeroMem (&TmpValue, sizeof (EFI_IFR_TYPE_VALUE));\r
+ CopyMem (&TmpValue, &IfrOneOfOption->Value, IfrOneOfOption->Header.Length - OFFSET_OF (EFI_IFR_ONE_OF_OPTION, Value));\r
+ if (VarValue == TmpValue.u64) {\r
+ //\r
+ // The value is one of option value.\r
+ // Set OpCode to Zero, don't need check again.\r
+ //\r
+ VarBlockData.OpCode = 0;\r
+ }\r
+ }\r
+ break;\r
+ case EFI_IFR_END_OP:\r
+ QuestionReferBitField = FALSE;\r
+ //\r
+ // Decrease opcode scope for the validated opcode\r
+ //\r
+ if (VarBlockData.Scope > 0) {\r
+ VarBlockData.Scope --;\r
+ }\r
+\r
+ //\r
+ // OneOf value doesn't belong to one of option value.\r
+ //\r
+ if ((VarBlockData.Scope == 0) && (VarBlockData.OpCode == EFI_IFR_ONE_OF_OP)) {\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+ break;\r
+ case EFI_IFR_GUID_OP:\r
+ if (CompareGuid ((EFI_GUID *)((UINT8*)IfrOpHdr + sizeof (EFI_IFR_OP_HEADER)), &gEdkiiIfrBitVarstoreGuid)) {\r
+ QuestionReferBitField = TRUE;\r
+ }\r
+ break;\r
+ default:\r
+ //\r
+ // Increase Scope for the validated opcode\r
+ //\r
+ if (VarBlockData.Scope > 0) {\r
+ VarBlockData.Scope = (UINT8) (VarBlockData.Scope + IfrOpHdr->Scope);\r
+ }\r
+ break;\r
+ }\r
+ //\r
+ // Go to the next opcode\r
+ //\r
+ IfrOffset += IfrOpHdr->Length;\r
+ }\r
+ //\r
+ // Only one form is in a package list.\r
+ //\r
+ break;\r
+ }\r
+\r
+ //\r
+ // Go to next package.\r
+ //\r
+ PackageOffset += PackageHeader.Length;\r
+ }\r
+\r
+ return EFI_SUCCESS;\r
+}\r
+\r
+/**\r
+ This internal function parses IFR data to validate current setting.\r
+\r
+ @param ConfigElement ConfigResp element string contains the current setting.\r
+ @param CurrentBlockArray Current block array.\r
+ @param VarBuffer Data buffer for this varstore.\r
+\r
+ @retval EFI_SUCCESS The current setting is valid.\r
+ @retval EFI_OUT_OF_RESOURCES The memory is not enough.\r
+ @retval EFI_INVALID_PARAMETER The config string or the Hii package is invalid.\r
+**/\r
+EFI_STATUS\r
+GetBlockDataInfo (\r
+ IN CHAR16 *ConfigElement,\r
+ OUT IFR_BLOCK_DATA **CurrentBlockArray,\r
+ OUT UINT8 **VarBuffer\r
+ )\r
+{\r
+ IFR_BLOCK_DATA *BlockData;\r
+ IFR_BLOCK_DATA *NewBlockData;\r
+ EFI_STRING StringPtr;\r
+ UINTN Length;\r
+ UINT8 *TmpBuffer;\r
+ UINT16 Offset;\r
+ UINT16 Width;\r
+ LIST_ENTRY *Link;\r
+ UINTN MaxBufferSize;\r
+ EFI_STATUS Status;\r
+ IFR_BLOCK_DATA *BlockArray;\r
+ UINT8 *DataBuffer;\r
+\r
+ //\r
+ // Initialize the local variables.\r
+ //\r
+ Status = EFI_SUCCESS;\r
+ BlockData = NULL;\r
+ NewBlockData = NULL;\r
+ TmpBuffer = NULL;\r
+ BlockArray = NULL;\r
+ MaxBufferSize = HII_LIB_DEFAULT_VARSTORE_SIZE;\r
+ DataBuffer = AllocateZeroPool (MaxBufferSize);\r
+ if (DataBuffer == NULL) {\r
+ return EFI_OUT_OF_RESOURCES;\r
+ }\r
+\r
+ //\r
+ // Init BlockArray\r
+ //\r
+ BlockArray = (IFR_BLOCK_DATA *) AllocateZeroPool (sizeof (IFR_BLOCK_DATA));\r
+ if (BlockArray == NULL) {\r
+ Status = EFI_OUT_OF_RESOURCES;\r
+ goto Done;\r
+ }\r
+ InitializeListHead (&BlockArray->Entry);\r
+\r
+ StringPtr = StrStr (ConfigElement, L"&OFFSET=");\r
+ ASSERT (StringPtr != NULL);\r
+\r
+ //\r
+ // Parse each <RequestElement> if exists\r
+ // Only <BlockName> format is supported by this help function.\r
+ // <BlockName> ::= &'OFFSET='<Number>&'WIDTH='<Number>\r
+ //\r
+ while (*StringPtr != 0 && StrnCmp (StringPtr, L"&OFFSET=", StrLen (L"&OFFSET=")) == 0) {\r
+ //\r
+ // Skip the &OFFSET= string\r
+ //\r
+ StringPtr += StrLen (L"&OFFSET=");\r
+\r
+ //\r
+ // Get Offset\r
+ //\r
+ Status = InternalHiiGetValueOfNumber (StringPtr, &TmpBuffer, &Length);\r
+ if (EFI_ERROR (Status)) {\r
+ goto Done;\r
+ }\r
+ Offset = 0;\r
+ CopyMem (\r
+ &Offset,\r
+ TmpBuffer,\r
+ (((Length + 1) / 2) < sizeof (UINT16)) ? ((Length + 1) / 2) : sizeof (UINT16)\r
+ );\r
+ FreePool (TmpBuffer);\r
+ TmpBuffer = NULL;\r
+\r
+ StringPtr += Length;\r
+ if (StrnCmp (StringPtr, L"&WIDTH=", StrLen (L"&WIDTH=")) != 0) {\r
+ Status = EFI_INVALID_PARAMETER;\r
+ goto Done;\r
+ }\r
+ StringPtr += StrLen (L"&WIDTH=");\r
+\r
+ //\r
+ // Get Width\r
+ //\r
+ Status = InternalHiiGetValueOfNumber (StringPtr, &TmpBuffer, &Length);\r
+ if (EFI_ERROR (Status)) {\r
+ goto Done;\r
+ }\r
+ Width = 0;\r
+ CopyMem (\r
+ &Width,\r
+ TmpBuffer,\r
+ (((Length + 1) / 2) < sizeof (UINT16)) ? ((Length + 1) / 2) : sizeof (UINT16)\r
+ );\r
+ FreePool (TmpBuffer);\r
+ TmpBuffer = NULL;\r
+\r
+ StringPtr += Length;\r
+ if (*StringPtr != 0 && *StringPtr != L'&') {\r
+ Status = EFI_INVALID_PARAMETER;\r
goto Done;\r
}\r
\r
//\r
// Check whether VarBuffer is enough\r
//\r
- if ((UINTN) (Offset + Width) > MaxBufferSize) {\r
- VarBuffer = ReallocatePool (\r
+ if ((UINT32)Offset + Width > MaxBufferSize) {\r
+ DataBuffer = ReallocatePool (\r
MaxBufferSize,\r
Offset + Width + HII_LIB_DEFAULT_VARSTORE_SIZE,\r
- VarBuffer\r
+ DataBuffer\r
);\r
- if (VarBuffer == NULL) {\r
+ if (DataBuffer == NULL) {\r
Status = EFI_OUT_OF_RESOURCES;\r
goto Done;\r
}\r
//\r
// Update the Block with configuration info\r
//\r
- CopyMem (VarBuffer + Offset, TmpBuffer, Width);\r
+ CopyMem (DataBuffer + Offset, TmpBuffer, Width);\r
FreePool (TmpBuffer);\r
TmpBuffer = NULL;\r
\r
//\r
// Insert the new block data into the block data array.\r
//\r
- for (Link = CurrentBlockArray->Entry.ForwardLink; Link != &CurrentBlockArray->Entry; Link = Link->ForwardLink) {\r
+ for (Link = BlockArray->Entry.ForwardLink; Link != &BlockArray->Entry; Link = Link->ForwardLink) {\r
BlockData = BASE_CR (Link, IFR_BLOCK_DATA, Entry);\r
if (NewBlockData->Offset == BlockData->Offset) {\r
if (NewBlockData->Width > BlockData->Width) {\r
//\r
// Insert new block data into the array tail.\r
//\r
- if (Link == &CurrentBlockArray->Entry) {\r
+ if (Link == &BlockArray->Entry) {\r
InsertTailList (Link, &NewBlockData->Entry);\r
}\r
\r
//\r
- // If '\0', parsing is finished. \r
+ // If '\0', parsing is finished.\r
//\r
if (*StringPtr == 0) {\r
break;\r
}\r
//\r
- // Go to next ConfigBlock \r
+ // Go to next ConfigBlock\r
//\r
}\r
\r
//\r
// Merge the aligned block data into the single block data.\r
//\r
- Link = CurrentBlockArray->Entry.ForwardLink;\r
- while ((Link != &CurrentBlockArray->Entry) && (Link->ForwardLink != &CurrentBlockArray->Entry)) {\r
+ Link = BlockArray->Entry.ForwardLink;\r
+ while ((Link != &BlockArray->Entry) && (Link->ForwardLink != &BlockArray->Entry)) {\r
BlockData = BASE_CR (Link, IFR_BLOCK_DATA, Entry);\r
NewBlockData = BASE_CR (Link->ForwardLink, IFR_BLOCK_DATA, Entry);\r
if ((NewBlockData->Offset >= BlockData->Offset) && (NewBlockData->Offset <= (BlockData->Offset + BlockData->Width))) {\r
RemoveEntryList (Link->ForwardLink);\r
FreePool (NewBlockData);\r
continue;\r
- }\r
- Link = Link->ForwardLink; \r
- }\r
- \r
- if (IsListEmpty (&CurrentBlockArray->Entry)) {\r
- Status = EFI_SUCCESS;\r
- goto Done;\r
- }\r
-\r
- //\r
- // 2. Check IFR value is in block data, then Validate Vaule\r
- //\r
- ZeroMem (&VarBlockData, sizeof (VarBlockData));\r
- VarValue = 0;\r
- IfrVarStore = NULL;\r
- PackageOffset = sizeof (EFI_HII_PACKAGE_LIST_HEADER);\r
- while (PackageOffset < PackageListLength) {\r
- CopyMem (&PacakgeHeader, (UINT8 *) HiiPackageList + PackageOffset, sizeof (PacakgeHeader));\r
- \r
- //\r
- // Parse IFR opcode from the form package.\r
- //\r
- if (PacakgeHeader.Type == EFI_HII_PACKAGE_FORMS) {\r
- IfrOffset = sizeof (PacakgeHeader);\r
- PackageData = (UINT8 *) HiiPackageList + PackageOffset;\r
- while (IfrOffset < PacakgeHeader.Length) {\r
- IfrOpHdr = (EFI_IFR_OP_HEADER *) (PackageData + IfrOffset);\r
- //\r
- // Validate current setting to the value built in IFR opcode\r
- //\r
- switch (IfrOpHdr->OpCode) {\r
- case EFI_IFR_VARSTORE_OP: \r
- //\r
- // VarStoreId has been found. No further found.\r
- //\r
- if (IfrVarStore != NULL) {\r
- break;\r
- }\r
- //\r
- // Find the matched VarStoreId to the input VarGuid and VarName\r
- //\r
- IfrVarStore = (EFI_IFR_VARSTORE *) IfrOpHdr;\r
- if (CompareGuid ((EFI_GUID *) (VOID *) &IfrVarStore->Guid, VarGuid)) {\r
- VarStoreName = (CHAR8 *) IfrVarStore->Name;\r
- for (Index = 0; VarStoreName[Index] != 0; Index ++) {\r
- if ((CHAR16) VarStoreName[Index] != VarName[Index]) {\r
- break;\r
- }\r
- }\r
- //\r
- // The matched VarStore is found.\r
- //\r
- if ((VarStoreName[Index] != 0) || (VarName[Index] != 0)) {\r
- IfrVarStore = NULL;\r
- }\r
- } else {\r
- IfrVarStore = NULL;\r
- }\r
- break;\r
- case EFI_IFR_FORM_OP:\r
- //\r
- // Check the matched VarStoreId is found.\r
- //\r
- if (IfrVarStore == NULL) {\r
- Status = EFI_SUCCESS;\r
- goto Done;\r
- }\r
- break;\r
- case EFI_IFR_ONE_OF_OP:\r
- //\r
- // Check whether current value is the one of option.\r
- //\r
-\r
- //\r
- // OneOf question is not in IFR Form. This IFR form is not valid. \r
- //\r
- if (IfrVarStore == NULL) {\r
- Status = EFI_INVALID_PARAMETER;\r
- goto Done;\r
- }\r
- // \r
- // Check whether this question is for the requested varstore.\r
- //\r
- IfrOneOf = (EFI_IFR_ONE_OF *) IfrOpHdr;\r
- if (IfrOneOf->Question.VarStoreId != IfrVarStore->VarStoreId) {\r
- break;\r
- }\r
- \r
- //\r
- // Get Offset by Question header and Width by DataType Flags\r
- //\r
- Offset = IfrOneOf->Question.VarStoreInfo.VarOffset;\r
- Width = (UINT16) (1 << (IfrOneOf->Flags & EFI_IFR_NUMERIC_SIZE));\r
- //\r
- // Check whether this question is in current block array.\r
- //\r
- if (!BlockArrayCheck (CurrentBlockArray, Offset, Width)) {\r
- //\r
- // This question is not in the current configuration string. Skip it.\r
- //\r
- break;\r
- }\r
- //\r
- // Check this var question is in the var storage \r
- //\r
- if ((Offset + Width) > IfrVarStore->Size) {\r
- //\r
- // This question exceeds the var store size. \r
- //\r
- Status = EFI_INVALID_PARAMETER;\r
- goto Done;\r
- }\r
-\r
- //\r
- // Get the current value for oneof opcode\r
- //\r
- VarValue = 0;\r
- CopyMem (&VarValue, VarBuffer + Offset, Width);\r
- //\r
- // Set Block Data, to be checked in the following Oneof option opcode.\r
- //\r
- VarBlockData.Offset = Offset;\r
- VarBlockData.Width = Width;\r
- VarBlockData.OpCode = IfrOpHdr->OpCode;\r
- VarBlockData.Scope = IfrOpHdr->Scope;\r
- break;\r
- case EFI_IFR_NUMERIC_OP:\r
- //\r
- // Check the current value is in the numeric range.\r
- //\r
-\r
- //\r
- // Numeric question is not in IFR Form. This IFR form is not valid. \r
- //\r
- if (IfrVarStore == NULL) {\r
- Status = EFI_INVALID_PARAMETER;\r
- goto Done;\r
- }\r
- //\r
- // Check whether this question is for the requested varstore.\r
- //\r
- IfrNumeric = (EFI_IFR_NUMERIC *) IfrOpHdr;\r
- if (IfrNumeric->Question.VarStoreId != IfrVarStore->VarStoreId) {\r
- break;\r
- }\r
- \r
- //\r
- // Get Offset by Question header and Width by DataType Flags\r
- //\r
- Offset = IfrNumeric->Question.VarStoreInfo.VarOffset;\r
- Width = (UINT16) (1 << (IfrNumeric->Flags & EFI_IFR_NUMERIC_SIZE));\r
- //\r
- // Check whether this question is in current block array.\r
- //\r
- if (!BlockArrayCheck (CurrentBlockArray, Offset, Width)) {\r
- //\r
- // This question is not in the current configuration string. Skip it.\r
- //\r
- break;\r
- }\r
- //\r
- // Check this var question is in the var storage \r
- //\r
- if ((Offset + Width) > IfrVarStore->Size) {\r
- //\r
- // This question exceeds the var store size. \r
- //\r
- Status = EFI_INVALID_PARAMETER;\r
- goto Done;\r
- }\r
+ }\r
+ Link = Link->ForwardLink;\r
+ }\r
\r
- //\r
- // Check the current value is in the numeric range.\r
- //\r
- VarValue = 0;\r
- CopyMem (&VarValue, VarBuffer + Offset, Width);\r
- switch (IfrNumeric->Flags & EFI_IFR_NUMERIC_SIZE) {\r
- case EFI_IFR_NUMERIC_SIZE_1:\r
- if ((UINT8) VarValue < IfrNumeric->data.u8.MinValue || (UINT8) VarValue > IfrNumeric->data.u8.MaxValue) {\r
- //\r
- // Not in the valid range.\r
- //\r
- Status = EFI_INVALID_PARAMETER;\r
- goto Done;\r
- }\r
- break;\r
- case EFI_IFR_NUMERIC_SIZE_2:\r
- if ((UINT16) VarValue < IfrNumeric->data.u16.MinValue || (UINT16) VarValue > IfrNumeric->data.u16.MaxValue) {\r
- //\r
- // Not in the valid range.\r
- //\r
- Status = EFI_INVALID_PARAMETER;\r
- goto Done;\r
- }\r
- break;\r
- case EFI_IFR_NUMERIC_SIZE_4:\r
- if ((UINT32) VarValue < IfrNumeric->data.u32.MinValue || (UINT32) VarValue > IfrNumeric->data.u32.MaxValue) {\r
- //\r
- // Not in the valid range.\r
- //\r
- Status = EFI_INVALID_PARAMETER;\r
- goto Done;\r
- }\r
- break;\r
- case EFI_IFR_NUMERIC_SIZE_8:\r
- if ((UINT64) VarValue < IfrNumeric->data.u64.MinValue || (UINT64) VarValue > IfrNumeric->data.u64.MaxValue) {\r
- //\r
- // Not in the valid range.\r
- //\r
- Status = EFI_INVALID_PARAMETER;\r
- goto Done;\r
- }\r
- break;\r
- }\r
+ *VarBuffer = DataBuffer;\r
+ *CurrentBlockArray = BlockArray;\r
+ return EFI_SUCCESS;\r
\r
- break;\r
- case EFI_IFR_CHECKBOX_OP:\r
- //\r
- // Check value is BOOLEAN type, only 0 and 1 is valid.\r
- //\r
+Done:\r
+ if (DataBuffer != NULL) {\r
+ FreePool (DataBuffer);\r
+ }\r
\r
- //\r
- // CheckBox question is not in IFR Form. This IFR form is not valid. \r
- //\r
- if (IfrVarStore == NULL) {\r
- Status = EFI_INVALID_PARAMETER;\r
- goto Done;\r
- }\r
+ if (BlockArray != NULL) {\r
+ //\r
+ // Free Link Array CurrentBlockArray\r
+ //\r
+ while (!IsListEmpty (&BlockArray->Entry)) {\r
+ BlockData = BASE_CR (BlockArray->Entry.ForwardLink, IFR_BLOCK_DATA, Entry);\r
+ RemoveEntryList (&BlockData->Entry);\r
+ FreePool (BlockData);\r
+ }\r
+ FreePool (BlockArray);\r
+ }\r
\r
- //\r
- // Check whether this question is for the requested varstore.\r
- //\r
- IfrCheckBox = (EFI_IFR_CHECKBOX *) IfrOpHdr;\r
- if (IfrCheckBox->Question.VarStoreId != IfrVarStore->VarStoreId) {\r
- break;\r
- }\r
- \r
- //\r
- // Get Offset by Question header\r
- //\r
- Offset = IfrCheckBox->Question.VarStoreInfo.VarOffset;\r
- Width = sizeof (BOOLEAN);\r
- //\r
- // Check whether this question is in current block array.\r
- //\r
- if (!BlockArrayCheck (CurrentBlockArray, Offset, Width)) {\r
- //\r
- // This question is not in the current configuration string. Skip it.\r
- //\r
- break;\r
- }\r
- //\r
- // Check this var question is in the var storage \r
- //\r
- if ((Offset + Width) > IfrVarStore->Size) {\r
- //\r
- // This question exceeds the var store size. \r
- //\r
- Status = EFI_INVALID_PARAMETER;\r
- goto Done;\r
- }\r
+ return Status;\r
+}\r
\r
- //\r
- // Boolean type, only 1 and 0 is valid.\r
- //\r
- if (*(VarBuffer + Offset) > 1) {\r
- Status = EFI_INVALID_PARAMETER;\r
- goto Done; \r
- }\r
- \r
- break;\r
- case EFI_IFR_STRING_OP:\r
- //\r
- // Check current string length is less than maxsize\r
- //\r
+/**\r
+ This internal function parses IFR data to validate current setting.\r
\r
- //\r
- // CheckBox question is not in IFR Form. This IFR form is not valid. \r
- //\r
- if (IfrVarStore == NULL) {\r
- Status = EFI_INVALID_PARAMETER;\r
- goto Done;\r
- }\r
+ @param ConfigResp ConfigResp string contains the current setting.\r
+ @param HiiPackageList Point to Hii package list.\r
+ @param PackageListLength The length of the pacakge.\r
+ @param VarGuid Guid of the buffer storage.\r
+ @param VarName Name of the buffer storage.\r
+ @param HiiHandle The HiiHandle for this package.\r
\r
- //\r
- // Check whether this question is for the requested varstore.\r
- //\r
- IfrString = (EFI_IFR_STRING *) IfrOpHdr;\r
- if (IfrString->Question.VarStoreId != IfrVarStore->VarStoreId) {\r
- break;\r
- }\r
- \r
- //\r
- // Get Offset/Width by Question header and OneOf Flags\r
- //\r
- Offset = IfrString->Question.VarStoreInfo.VarOffset;\r
- Width = (UINT16) (IfrString->MaxSize * sizeof (UINT16));\r
- //\r
- // Check whether this question is in current block array.\r
- //\r
- if (!BlockArrayCheck (CurrentBlockArray, Offset, Width)) {\r
- //\r
- // This question is not in the current configuration string. Skip it.\r
- //\r
- break;\r
- }\r
- //\r
- // Check this var question is in the var storage \r
- //\r
- if ((Offset + Width) > IfrVarStore->Size) {\r
- //\r
- // This question exceeds the var store size. \r
- //\r
- Status = EFI_INVALID_PARAMETER;\r
- goto Done;\r
- }\r
- \r
- //\r
- // Check current string length is less than maxsize\r
- //\r
- if (StrSize ((CHAR16 *) (VarBuffer + Offset)) > Width) {\r
- Status = EFI_INVALID_PARAMETER;\r
- goto Done; \r
- }\r
- break;\r
- case EFI_IFR_ONE_OF_OPTION_OP:\r
- //\r
- // Opcode Scope is zero. This one of option is not to be checked. \r
- //\r
- if (VarBlockData.Scope == 0) {\r
- break;\r
- }\r
+ @retval EFI_SUCCESS The current setting is valid.\r
+ @retval EFI_OUT_OF_RESOURCES The memory is not enough.\r
+ @retval EFI_INVALID_PARAMETER The config string or the Hii package is invalid.\r
+**/\r
+EFI_STATUS\r
+EFIAPI\r
+InternalHiiValidateCurrentSetting (\r
+ IN EFI_STRING ConfigResp,\r
+ IN EFI_HII_PACKAGE_LIST_HEADER *HiiPackageList,\r
+ IN UINTN PackageListLength,\r
+ IN EFI_GUID *VarGuid,\r
+ IN CHAR16 *VarName,\r
+ IN EFI_HII_HANDLE HiiHandle\r
+ )\r
+{\r
+ CHAR16 *StringPtr;\r
+ EFI_STATUS Status;\r
+ IFR_BLOCK_DATA *CurrentBlockArray;\r
+ IFR_BLOCK_DATA *BlockData;\r
+ UINT8 *VarBuffer;\r
+ BOOLEAN NameValueType;\r
\r
- //\r
- // Only check for OneOf and OrderList opcode\r
- //\r
- IfrOneOfOption = (EFI_IFR_ONE_OF_OPTION *) IfrOpHdr;\r
- if (VarBlockData.OpCode == EFI_IFR_ONE_OF_OP) {\r
- //\r
- // Check current value is the value of one of option.\r
- //\r
- if (VarValue == IfrOneOfOption->Value.u64) {\r
- //\r
- // The value is one of option value.\r
- // Set OpCode to Zero, don't need check again.\r
- //\r
- VarBlockData.OpCode = 0;\r
- }\r
- }\r
+ CurrentBlockArray = NULL;\r
+ VarBuffer = NULL;\r
+ StringPtr = NULL;\r
+ Status = EFI_SUCCESS;\r
\r
- break;\r
- case EFI_IFR_END_OP:\r
- //\r
- // Decrease opcode scope for the validated opcode\r
- //\r
- if (VarBlockData.Scope > 0) {\r
- VarBlockData.Scope --;\r
- }\r
+ //\r
+ // If StringPtr != NULL, get the request elements.\r
+ //\r
+ if (StrStr (ConfigResp, L"&OFFSET=") != NULL) {\r
+ Status = GetBlockDataInfo(ConfigResp, &CurrentBlockArray, &VarBuffer);\r
+ if (EFI_ERROR (Status)) {\r
+ return Status;\r
+ }\r
+ NameValueType = FALSE;\r
+ } else {\r
+ //\r
+ // Skip header part.\r
+ //\r
+ StringPtr = StrStr (ConfigResp, L"PATH=");\r
+ ASSERT (StringPtr != NULL);\r
\r
- //\r
- // OneOf value doesn't belong to one of option value. \r
- //\r
- if (VarBlockData.OpCode == EFI_IFR_ONE_OF_OP) {\r
- Status = EFI_INVALID_PARAMETER;\r
- goto Done;\r
- }\r
- break;\r
- default:\r
- //\r
- // Increase Scope for the validated opcode\r
- //\r
- if (VarBlockData.Scope > 0) {\r
- VarBlockData.Scope = (UINT8) (VarBlockData.Scope + IfrOpHdr->Scope);\r
- }\r
- break;\r
- }\r
- //\r
- // Go to the next opcode\r
- //\r
- IfrOffset += IfrOpHdr->Length;\r
- }\r
+ if (StrStr (StringPtr, L"&") != NULL) {\r
+ NameValueType = TRUE;\r
+ } else {\r
//\r
- // Only one form is in a package list.\r
+ // Not found Request element, return success.\r
//\r
- break;\r
+ return EFI_SUCCESS;\r
}\r
- \r
- //\r
- // Go to next package.\r
- //\r
- PackageOffset += PacakgeHeader.Length; \r
}\r
\r
-Done:\r
+ Status = ValidateQuestionFromVfr(\r
+ HiiPackageList,\r
+ PackageListLength,\r
+ VarGuid,\r
+ VarName,\r
+ VarBuffer,\r
+ CurrentBlockArray,\r
+ ConfigResp,\r
+ HiiHandle,\r
+ NameValueType\r
+ );\r
+\r
if (VarBuffer != NULL) {\r
FreePool (VarBuffer);\r
}\r
- \r
+\r
if (CurrentBlockArray != NULL) {\r
//\r
// Free Link Array CurrentBlockArray\r
RemoveEntryList (&BlockData->Entry);\r
FreePool (BlockData);\r
}\r
- FreePool (CurrentBlockArray); \r
+ FreePool (CurrentBlockArray);\r
}\r
\r
return Status;\r
}\r
\r
+/**\r
+ Check whether the ConfigRequest string has the request elements.\r
+ For EFI_HII_VARSTORE_BUFFER type, the request has "&OFFSET=****&WIDTH=****..." format.\r
+ For EFI_HII_VARSTORE_NAME_VALUE type, the request has "&NAME1**&NAME2..." format.\r
+\r
+ @param ConfigRequest The input config request string.\r
+\r
+ @retval TRUE The input include config request elements.\r
+ @retval FALSE The input string not includes.\r
+\r
+**/\r
+BOOLEAN\r
+GetElementsFromRequest (\r
+ IN EFI_STRING ConfigRequest\r
+ )\r
+{\r
+ EFI_STRING TmpRequest;\r
+\r
+ TmpRequest = StrStr (ConfigRequest, L"PATH=");\r
+ ASSERT (TmpRequest != NULL);\r
+\r
+ if ((StrStr (TmpRequest, L"&OFFSET=") != NULL) || (StrStr (TmpRequest, L"&") != NULL)) {\r
+ return TRUE;\r
+ }\r
+\r
+ return FALSE;\r
+}\r
+\r
/**\r
This function parses the input ConfigRequest string and its matched IFR code\r
string for setting default value and validating current setting.\r
\r
- 1. For setting default action, Reset the default value specified by DefaultId \r
+ 1. For setting default action, Reset the default value specified by DefaultId\r
to the driver configuration got by Request string.\r
- 2. For validating current setting, Validate the current configuration \r
+ 2. For validating current setting, Validate the current configuration\r
by parsing HII form IFR opcode.\r
\r
NULL request string support depends on the ExportConfig interface of\r
HiiConfigRouting protocol in UEFI specification.\r
- \r
- @param Request A null-terminated Unicode string in \r
+\r
+ @param Request A null-terminated Unicode string in\r
<MultiConfigRequest> format. It can be NULL.\r
If it is NULL, all current configuration for the\r
entirety of the current HII database will be validated.\r
entirety of the current HII database will be reset.\r
@param DefaultId Specifies the type of defaults to retrieve only for setting default action.\r
@param ActionType Action supports setting defaults and validate current setting.\r
- \r
- @retval TURE Action runs successfully.\r
+\r
+ @retval TRUE Action runs successfully.\r
@retval FALSE Action is not valid or Action can't be executed successfully..\r
**/\r
BOOLEAN\r
UINT32 Index;\r
EFI_GUID *VarGuid;\r
EFI_STRING VarName;\r
- EFI_STRING_ID DefaultName;\r
\r
- UINT8 *PackageData;\r
- UINTN IfrOffset;\r
- EFI_IFR_OP_HEADER *IfrOpHdr;\r
EFI_HII_PACKAGE_LIST_HEADER *HiiPackageList;\r
- UINT32 PackageOffset; \r
UINTN PackageListLength;\r
- EFI_HII_PACKAGE_HEADER PacakgeHeader;\r
+ UINTN MaxLen;\r
EFI_DEVICE_PATH_PROTOCOL *DevicePath;\r
EFI_DEVICE_PATH_PROTOCOL *TempDevicePath;\r
- \r
+\r
ConfigAltResp = NULL;\r
ConfigResp = NULL;\r
VarGuid = NULL;\r
Index = 0;\r
TempDriverHandle = NULL;\r
HiiHandle = NULL;\r
- PackageData = NULL;\r
HiiPackageList = NULL;\r
- \r
+\r
//\r
// Only support set default and validate setting action.\r
//\r
&ConfigAltResp\r
);\r
}\r
- \r
+\r
if (EFI_ERROR (Status)) {\r
return FALSE;\r
}\r
- \r
+\r
StringPtr = ConfigAltResp;\r
- \r
- while (StringPtr != L'\0') {\r
+ ASSERT (StringPtr != NULL);\r
+\r
+ while (*StringPtr != L'\0') {\r
//\r
// 1. Find <ConfigHdr> GUID=...&NAME=...&PATH=...\r
//\r
if (EFI_ERROR (Status)) {\r
goto Done;\r
}\r
- \r
+\r
//\r
// Get Path value DevicePath\r
//\r
if (EFI_ERROR (Status)) {\r
goto Done;\r
}\r
- \r
+\r
//\r
// Find the matched Hii Handle for the found Driver handle\r
//\r
//\r
// This request string has no its Hii package.\r
// Its default value and validating can't execute by parsing IFR data.\r
- // Directly jump into the next ConfigAltResp string for another pair Guid, Name, and Path. \r
+ // Directly jump into the next ConfigAltResp string for another pair Guid, Name, and Path.\r
//\r
- Status = EFI_SUCCESS;\r
+ Status = EFI_SUCCESS;\r
goto NextConfigAltResp;\r
}\r
- \r
- //\r
- // 2. Get DefaultName string ID by parsing the PacakgeList \r
- //\r
\r
//\r
- // Get HiiPackage by HiiHandle\r
+ // 2. Get HiiPackage by HiiHandle\r
//\r
PackageListLength = 0;\r
HiiPackageList = NULL;\r
Status = gHiiDatabase->ExportPackageLists (gHiiDatabase, HiiHandle, &PackageListLength, HiiPackageList);\r
- \r
- //\r
- // The return status should always be EFI_BUFFER_TOO_SMALL as input buffer's size is 0.\r
- //\r
- if (Status != EFI_BUFFER_TOO_SMALL) {\r
- Status = EFI_INVALID_PARAMETER;\r
- goto Done;\r
- }\r
- \r
- HiiPackageList = AllocatePool (PackageListLength);\r
- if (HiiPackageList == NULL) {\r
- Status = EFI_OUT_OF_RESOURCES;\r
- goto Done;\r
- }\r
- \r
- //\r
- // Get PackageList on HiiHandle\r
- //\r
- Status = gHiiDatabase->ExportPackageLists (gHiiDatabase, HiiHandle, &PackageListLength, HiiPackageList);\r
- if (EFI_ERROR (Status)) {\r
- goto Done;\r
- }\r
- \r
- //\r
- // Parse the form package and get the default name string ID.\r
- //\r
- if (ActionType == ACTION_SET_DEFAUTL_VALUE) {\r
- PackageOffset = sizeof (EFI_HII_PACKAGE_LIST_HEADER);\r
- Status = EFI_NOT_FOUND;\r
- while (PackageOffset < PackageListLength) {\r
- CopyMem (&PacakgeHeader, (UINT8 *) HiiPackageList + PackageOffset, sizeof (PacakgeHeader));\r
- \r
- //\r
- // Parse IFR opcode to get default store opcode\r
- //\r
- if (PacakgeHeader.Type == EFI_HII_PACKAGE_FORMS) {\r
- IfrOffset = sizeof (PacakgeHeader);\r
- PackageData = (UINT8 *) HiiPackageList + PackageOffset;\r
- while (IfrOffset < PacakgeHeader.Length) {\r
- IfrOpHdr = (EFI_IFR_OP_HEADER *) (PackageData + IfrOffset);\r
- //\r
- // Match DefaultId to find its DefaultName\r
- //\r
- if (IfrOpHdr->OpCode == EFI_IFR_DEFAULTSTORE_OP) {\r
- if (((EFI_IFR_DEFAULTSTORE *) IfrOpHdr)->DefaultId == DefaultId) {\r
- DefaultName = ((EFI_IFR_DEFAULTSTORE *) IfrOpHdr)->DefaultName;\r
- Status = EFI_SUCCESS;\r
- break;\r
- }\r
- }\r
- IfrOffset += IfrOpHdr->Length;\r
- }\r
- //\r
- // Only one form is in a package list.\r
- //\r
- break;\r
- }\r
- \r
- //\r
- // Go to next package.\r
- //\r
- PackageOffset += PacakgeHeader.Length; \r
- }\r
- \r
- //\r
- // Not found the matched default string ID\r
- //\r
- if (EFI_ERROR (Status)) {\r
- Status = EFI_SUCCESS;\r
- goto NextConfigAltResp;\r
- }\r
+\r
+ //\r
+ // The return status should always be EFI_BUFFER_TOO_SMALL as input buffer's size is 0.\r
+ //\r
+ if (Status != EFI_BUFFER_TOO_SMALL) {\r
+ Status = EFI_INVALID_PARAMETER;\r
+ goto Done;\r
+ }\r
+\r
+ HiiPackageList = AllocatePool (PackageListLength);\r
+ if (HiiPackageList == NULL) {\r
+ Status = EFI_OUT_OF_RESOURCES;\r
+ goto Done;\r
+ }\r
+\r
+ //\r
+ // Get PackageList on HiiHandle\r
+ //\r
+ Status = gHiiDatabase->ExportPackageLists (gHiiDatabase, HiiHandle, &PackageListLength, HiiPackageList);\r
+ if (EFI_ERROR (Status)) {\r
+ goto Done;\r
}\r
- \r
+\r
//\r
// 3. Call ConfigRouting GetAltCfg(ConfigRoute, <ConfigResponse>, Guid, Name, DevicePath, AltCfgId, AltCfgResp)\r
- // Get the default configuration string according to the found defaultname string ID.\r
+ // Get the default configuration string according to the default ID.\r
//\r
Status = gHiiConfigRouting->GetAltConfig (\r
gHiiConfigRouting,\r
VarGuid,\r
VarName,\r
DevicePath,\r
- (ActionType == ACTION_SET_DEFAUTL_VALUE) ? &DefaultName:NULL, // it can be NULL to get the current setting.\r
+ (ActionType == ACTION_SET_DEFAUTL_VALUE) ? &DefaultId:NULL, // it can be NULL to get the current setting.\r
&ConfigResp\r
);\r
- \r
+\r
//\r
// The required setting can't be found. So, it is not required to be validated and set.\r
//\r
//\r
// Only the ConfigHdr is found. Not any block data is found. No data is required to be validated and set.\r
//\r
- if (StrStr (ConfigResp, L"&OFFSET=") == NULL) {\r
+ if (!GetElementsFromRequest (ConfigResp)) {\r
goto NextConfigAltResp;\r
}\r
- \r
+\r
//\r
// 4. Set the default configuration information or Validate current setting by parse IFR code.\r
// Current Setting is in ConfigResp, will be set into buffer, then check it again.\r
//\r
// Current Setting is in ConfigResp, will be set into buffer, then check it again.\r
//\r
- Status = InternalHiiValidateCurrentSetting (ConfigResp, HiiPackageList, PackageListLength, VarGuid, VarName);\r
+ Status = InternalHiiValidateCurrentSetting (ConfigResp, HiiPackageList, PackageListLength, VarGuid, VarName, HiiHandle);\r
}\r
\r
if (EFI_ERROR (Status)) {\r
FreePool (HiiPackageList);\r
HiiPackageList = NULL;\r
}\r
- \r
- if (ConfigResp != NULL) {\r
- FreePool (ConfigResp);\r
- ConfigResp = NULL;\r
- }\r
+\r
+ if (ConfigResp != NULL) {\r
+ FreePool (ConfigResp);\r
+ ConfigResp = NULL;\r
+ }\r
\r
//\r
// Free the allocated buffer.\r
//\r
FreePool (VarGuid);\r
VarGuid = NULL;\r
- \r
+\r
FreePool (VarName);\r
VarName = NULL;\r
- \r
+\r
FreePool (DevicePath);\r
DevicePath = NULL;\r
\r
if (*StringPtr == L'\0') {\r
break;\r
}\r
- \r
+\r
//\r
- // Construct ConfigAltHdr string "&<ConfigHdr>&ALTCFG=\0" \r
+ // Construct ConfigAltHdr string "&<ConfigHdr>&ALTCFG=\0"\r
// | 1 | StrLen (ConfigHdr) | 8 | 1 |\r
//\r
- ConfigAltHdr = AllocateZeroPool ((1 + StringPtr - StringHdr + 8 + 1) * sizeof (CHAR16));\r
+ MaxLen = 1 + StringPtr - StringHdr + 8 + 1;\r
+ ConfigAltHdr = AllocateZeroPool ( MaxLen * sizeof (CHAR16));\r
if (ConfigAltHdr == NULL) {\r
Status = EFI_OUT_OF_RESOURCES;\r
goto Done;\r
}\r
- StrCpy (ConfigAltHdr, L"&");\r
- StrnCat (ConfigAltHdr, StringHdr, StringPtr - StringHdr);\r
- StrCat (ConfigAltHdr, L"&ALTCFG=");\r
- \r
+ StrCpyS (ConfigAltHdr, MaxLen, L"&");\r
+ StrnCatS (ConfigAltHdr, MaxLen, StringHdr, StringPtr - StringHdr);\r
+ StrCatS (ConfigAltHdr, MaxLen, L"&ALTCFG=");\r
+\r
//\r
// Skip all AltResp (AltConfigHdr ConfigBody) for the same ConfigHdr\r
//\r
break;\r
}\r
}\r
- \r
+\r
//\r
// Free the allocated ConfigAltHdr string\r
//\r
if (*StringPtr == L'\0') {\r
break;\r
}\r
- \r
+\r
//\r
// Find &GUID as the next ConfigHdr\r
//\r
//\r
StringPtr ++;\r
}\r
- \r
+\r
Done:\r
if (VarGuid != NULL) {\r
FreePool (VarGuid);\r
if (ConfigAltResp != NULL) {\r
FreePool (ConfigAltResp);\r
}\r
- \r
+\r
if (HiiPackageList != NULL) {\r
FreePool (HiiPackageList);\r
}\r
- \r
+\r
if (EFI_ERROR (Status)) {\r
return FALSE;\r
}\r
/**\r
Validate the current configuration by parsing HII form IFR opcode.\r
\r
- NULL request string support depends on the ExtractConfig interface of\r
+ NULL request string support depends on the ExportConfig interface of\r
HiiConfigRouting protocol in UEFI specification.\r
- \r
- @param Request A null-terminated Unicode string in \r
+\r
+ @param Request A null-terminated Unicode string in\r
<MultiConfigRequest> format. It can be NULL.\r
If it is NULL, all current configuration for the\r
entirety of the current HII database will be validated.\r
- \r
- @retval TURE Current configuration is valid.\r
+\r
+ @retval TRUE Current configuration is valid.\r
@retval FALSE Current configuration is invalid.\r
**/\r
BOOLEAN\r
-EFIAPI \r
+EFIAPI\r
HiiValidateSettings (\r
IN CONST EFI_STRING Request OPTIONAL\r
)\r
\r
/**\r
Reset the default value specified by DefaultId to the driver\r
- configuration got by Request string. \r
+ configuration got by Request string.\r
\r
NULL request string support depends on the ExportConfig interface of\r
HiiConfigRouting protocol in UEFI specification.\r
- \r
- @param Request A null-terminated Unicode string in \r
+\r
+ @param Request A null-terminated Unicode string in\r
<MultiConfigRequest> format. It can be NULL.\r
If it is NULL, all configuration for the\r
entirety of the current HII database will be reset.\r
@param DefaultId Specifies the type of defaults to retrieve.\r
- \r
- @retval TURE The default value is set successfully.\r
+\r
+ @retval TRUE The default value is set successfully.\r
@retval FALSE The default value can't be found and set.\r
**/\r
BOOLEAN\r
/**\r
Determines if two values in config strings match.\r
\r
- Compares the substring between StartSearchString and StopSearchString in \r
- FirstString to the substring between StartSearchString and StopSearchString \r
+ Compares the substring between StartSearchString and StopSearchString in\r
+ FirstString to the substring between StartSearchString and StopSearchString\r
in SecondString. If the two substrings match, then TRUE is returned. If the\r
two substrings do not match, then FALSE is returned.\r
\r
\r
@param FirstString Pointer to the first Null-terminated Unicode string.\r
@param SecondString Pointer to the second Null-terminated Unicode string.\r
- @param StartSearchString Pointer to the Null-terminated Unicode string that \r
+ @param StartSearchString Pointer to the Null-terminated Unicode string that\r
marks the start of the value string to compare.\r
- @param StopSearchString Pointer to the Null-terminated Unicode string that \r
- marks the end of the vakue string to compare.\r
+ @param StopSearchString Pointer to the Null-terminated Unicode string that\r
+ marks the end of the value string to compare.\r
\r
- @retval FALSE StartSearchString is not present in FirstString. \r
+ @retval FALSE StartSearchString is not present in FirstString.\r
@retval FALSE StartSearchString is not present in SecondString.\r
- @retval FALSE StopSearchString is not present in FirstString. \r
+ @retval FALSE StopSearchString is not present in FirstString.\r
@retval FALSE StopSearchString is not present in SecondString.\r
- @retval FALSE The length of the substring in FirstString is not the \r
+ @retval FALSE The length of the substring in FirstString is not the\r
same length as the substring in SecondString.\r
- @retval FALSE The value string in FirstString does not matche the \r
+ @retval FALSE The value string in FirstString does not matche the\r
value string in SecondString.\r
- @retval TRUE The value string in FirstString matches the value \r
+ @retval TRUE The value string in FirstString matches the value\r
string in SecondString.\r
\r
**/\r
}\r
\r
/**\r
- Retrieves uncommited data from the Form Browser and converts it to a binary\r
+ Retrieves uncommitted data from the Form Browser and converts it to a binary\r
buffer.\r
\r
- @param[in] VariableName Pointer to a Null-terminated Unicode string. This \r
- is an optional parameter that may be NULL.\r
- @param[in] VariableGuid Pointer to an EFI_GUID structure. This is an optional \r
+ @param[in] VariableGuid Pointer to an EFI_GUID structure. This is an optional\r
parameter that may be NULL.\r
- @param[in] BufferSize Length in bytes of buffer to hold retrived data. \r
- @param[out] Block Buffer of data to be updated.\r
+ @param[in] VariableName Pointer to a Null-terminated Unicode string. This\r
+ is an optional parameter that may be NULL.\r
+ @param[in] BufferSize Length in bytes of buffer to hold retrieved data.\r
+ @param[out] Buffer Buffer of data to be updated.\r
\r
@retval FALSE The uncommitted data could not be retrieved.\r
@retval TRUE The uncommitted data was retrieved.\r
HiiGetBrowserData (\r
IN CONST EFI_GUID *VariableGuid, OPTIONAL\r
IN CONST CHAR16 *VariableName, OPTIONAL\r
- IN UINTN BlockSize,\r
- OUT UINT8 *Block\r
+ IN UINTN BufferSize,\r
+ OUT UINT8 *Buffer\r
)\r
{\r
EFI_STRING ResultsData;\r
Size = Size + (StrLen (ResultsData) + 1) * sizeof (CHAR16);\r
ConfigResp = AllocateZeroPool (Size);\r
UnicodeSPrint (ConfigResp, Size, L"%s&%s", mConfigHdrTemplate, ResultsData);\r
- \r
+\r
//\r
// Free the allocated buffer\r
//\r
Status = gHiiConfigRouting->ConfigToBlock (\r
gHiiConfigRouting,\r
ConfigResp,\r
- Block,\r
- &BlockSize,\r
+ Buffer,\r
+ &BufferSize,\r
&Progress\r
);\r
//\r
\r
If Buffer is NULL, then ASSERT().\r
\r
- @param[in] VariableName Pointer to a Null-terminated Unicode string. This\r
- is an optional parameter that may be NULL.\r
@param[in] VariableGuid Pointer to an EFI_GUID structure. This is an optional\r
parameter that may be NULL.\r
+ @param[in] VariableName Pointer to a Null-terminated Unicode string. This\r
+ is an optional parameter that may be NULL.\r
@param[in] BufferSize Length, in bytes, of Buffer.\r
@param[in] Buffer Buffer of data to commit.\r
@param[in] RequestElement An optional field to specify which part of the\r
buffer data will be send back to Browser. If NULL,\r
the whole buffer of data will be committed to\r
- Browser. \r
+ Browser.\r
<RequestElement> ::= &OFFSET=<Number>&WIDTH=<Number>*\r
\r
@retval FALSE The uncommitted data could not be updated.\r
//\r
if (RequestElement == NULL) {\r
//\r
- // Allocate and fill a buffer large enough to hold the <ConfigHdr> template \r
+ // Allocate and fill a buffer large enough to hold the <ConfigHdr> template\r
// followed by "&OFFSET=0&WIDTH=WWWWWWWWWWWWWWWW" followed by a Null-terminator\r
//\r
Size = (StrLen (mConfigHdrTemplate) + 32 + 1) * sizeof (CHAR16);\r
UnicodeSPrint (ConfigRequest, Size, L"%s&OFFSET=0&WIDTH=%016LX", mConfigHdrTemplate, (UINT64)BufferSize);\r
} else {\r
//\r
- // Allocate and fill a buffer large enough to hold the <ConfigHdr> template \r
+ // Allocate and fill a buffer large enough to hold the <ConfigHdr> template\r
// followed by <RequestElement> followed by a Null-terminator\r
//\r
Size = StrLen (mConfigHdrTemplate) * sizeof (CHAR16);\r
};\r
\r
/**\r
- Allocates and returns a new OpCode Handle. OpCode Handles must be freed with \r
+ Allocates and returns a new OpCode Handle. OpCode Handles must be freed with\r
HiiFreeOpCodeHandle().\r
\r
@retval NULL There are not enough resources to allocate a new OpCode Handle.\r
}\r
\r
/**\r
- Frees an OpCode Handle that was peviously allocated with HiiAllocateOpCodeHandle().\r
+ Frees an OpCode Handle that was previously allocated with HiiAllocateOpCodeHandle().\r
When an OpCode Handle is freed, all of the opcodes associated with the OpCode\r
Handle are also freed.\r
\r
If OpCodeHandle is NULL, then ASSERT().\r
\r
+ @param[in] OpCodeHandle Handle to the buffer of opcodes.\r
+\r
**/\r
VOID\r
EFIAPI\r
FreePool (OpCodeBuffer);\r
}\r
\r
+/**\r
+ Internal function gets the current position of opcode buffer.\r
+\r
+ @param[in] OpCodeHandle Handle to the buffer of opcodes.\r
+\r
+ @return Current position of opcode buffer.\r
+**/\r
UINTN\r
EFIAPI\r
InternalHiiOpCodeHandlePosition (\r
return ((HII_LIB_OPCODE_BUFFER *)OpCodeHandle)->Position;\r
}\r
\r
+/**\r
+ Internal function gets the start pointer of opcode buffer.\r
+\r
+ @param[in] OpCodeHandle Handle to the buffer of opcodes.\r
+\r
+ @return Pointer to the opcode buffer base.\r
+**/\r
UINT8 *\r
EFIAPI\r
InternalHiiOpCodeHandleBuffer (\r
return ((HII_LIB_OPCODE_BUFFER *)OpCodeHandle)->Buffer;\r
}\r
\r
+/**\r
+ Internal function reserves the enough buffer for current opcode.\r
+ When the buffer is not enough, Opcode buffer will be extended.\r
+\r
+ @param[in] OpCodeHandle Handle to the buffer of opcodes.\r
+ @param[in] Size Size of current opcode.\r
+\r
+ @return Pointer to the current opcode.\r
+**/\r
UINT8 *\r
EFIAPI\r
InternalHiiGrowOpCodeHandle (\r
- VOID *OpCodeHandle,\r
- UINTN Size\r
+ IN VOID *OpCodeHandle,\r
+ IN UINTN Size\r
)\r
{\r
HII_LIB_OPCODE_BUFFER *OpCodeBuffer;\r
OpCodeBuffer = (HII_LIB_OPCODE_BUFFER *)OpCodeHandle;\r
if (OpCodeBuffer->Position + Size > OpCodeBuffer->BufferSize) {\r
Buffer = ReallocatePool (\r
- OpCodeBuffer->BufferSize, \r
+ OpCodeBuffer->BufferSize,\r
OpCodeBuffer->BufferSize + (Size + HII_LIB_OPCODE_ALLOCATION_SIZE),\r
OpCodeBuffer->Buffer\r
);\r
- if (Buffer == NULL) {\r
- return NULL;\r
- }\r
+ ASSERT (Buffer != NULL);\r
OpCodeBuffer->Buffer = Buffer;\r
OpCodeBuffer->BufferSize += (Size + HII_LIB_OPCODE_ALLOCATION_SIZE);\r
}\r
return Buffer;\r
}\r
\r
+/**\r
+ Internal function creates opcode based on the template opcode.\r
+\r
+ @param[in] OpCodeHandle Handle to the buffer of opcodes.\r
+ @param[in] OpCodeTemplate Pointer to the template buffer of opcode.\r
+ @param[in] OpCode OpCode IFR value.\r
+ @param[in] OpCodeSize Size of opcode.\r
+ @param[in] ExtensionSize Size of extended opcode.\r
+ @param[in] Scope Scope bit of opcode.\r
+\r
+ @return Pointer to the current opcode with opcode data.\r
+**/\r
UINT8 *\r
EFIAPI\r
InternalHiiCreateOpCodeExtended (\r
return (UINT8 *)CopyMem (Buffer, Header, OpCodeSize);\r
}\r
\r
+/**\r
+ Internal function creates opcode based on the template opcode for the normal opcode.\r
+\r
+ @param[in] OpCodeHandle Handle to the buffer of opcodes.\r
+ @param[in] OpCodeTemplate Pointer to the template buffer of opcode.\r
+ @param[in] OpCode OpCode IFR value.\r
+ @param[in] OpCodeSize Size of opcode.\r
+\r
+ @return Pointer to the current opcode with opcode data.\r
+**/\r
UINT8 *\r
EFIAPI\r
InternalHiiCreateOpCode (\r
OpCode.Type = Type;\r
CopyMem (&OpCode.Value, &Value, mHiiDefaultTypeToWidth[Type]);\r
\r
- return InternalHiiCreateOpCode (OpCodeHandle, &OpCode, EFI_IFR_ONE_OF_OPTION_OP, sizeof (OpCode));\r
+ return InternalHiiCreateOpCode (OpCodeHandle, &OpCode, EFI_IFR_ONE_OF_OPTION_OP, OFFSET_OF(EFI_IFR_ONE_OF_OPTION, Value) + mHiiDefaultTypeToWidth[Type]);\r
}\r
\r
/**\r
OpCode.DefaultId = DefaultId;\r
CopyMem (&OpCode.Value, &Value, mHiiDefaultTypeToWidth[Type]);\r
\r
- return InternalHiiCreateOpCode (OpCodeHandle, &OpCode, EFI_IFR_DEFAULT_OP, sizeof (OpCode));\r
+ return InternalHiiCreateOpCode (OpCodeHandle, &OpCode, EFI_IFR_DEFAULT_OP, OFFSET_OF(EFI_IFR_DEFAULT, Value) + mHiiDefaultTypeToWidth[Type]);\r
}\r
\r
/**\r
\r
@param[in] OpCodeHandle Handle to the buffer of opcodes.\r
@param[in] Guid Pointer to EFI_GUID of this guided opcode.\r
- @param[in] GuidOpCode Pointer to an EFI_IFR_GUID opcode. This is an \r
+ @param[in] GuidOpCode Pointer to an EFI_IFR_GUID opcode. This is an\r
optional parameter that may be NULL. If this\r
- parameter is NULL, then the GUID extension \r
+ parameter is NULL, then the GUID extension\r
region of the created opcode is filled with zeros.\r
- If this parameter is not NULL, then the GUID \r
- extension region of GuidData will be copied to \r
+ If this parameter is not NULL, then the GUID\r
+ extension region of GuidData will be copied to\r
the GUID extension region of the created opcode.\r
- @param[in] OpCodeSize The size, in bytes, of created opcode. This value \r
+ @param[in] OpCodeSize The size, in bytes, of created opcode. This value\r
must be >= sizeof(EFI_IFR_GUID).\r
\r
@retval NULL There is not enough space left in Buffer to add the opcode.\r
CopyGuid ((EFI_GUID *)(VOID *)&OpCode.Guid, Guid);\r
\r
OpCodePointer = (EFI_IFR_GUID *)InternalHiiCreateOpCodeExtended (\r
- OpCodeHandle, \r
+ OpCodeHandle,\r
&OpCode,\r
EFI_IFR_GUID_OP,\r
sizeof (OpCode),\r
{\r
EFI_IFR_ACTION OpCode;\r
\r
- ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBACK | EFI_IFR_FLAG_RESET_REQUIRED | EFI_IFR_FLAG_OPTIONS_ONLY))) == 0);\r
+ ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBACK | EFI_IFR_FLAG_RESET_REQUIRED))) == 0);\r
\r
ZeroMem (&OpCode, sizeof (OpCode));\r
OpCode.Question.QuestionId = QuestionId;\r
OpCode.Flags = Flags;\r
\r
return InternalHiiCreateOpCodeExtended (\r
- OpCodeHandle, \r
+ OpCodeHandle,\r
&OpCode,\r
- EFI_IFR_SUBTITLE_OP, \r
- sizeof (OpCode), \r
- 0, \r
+ EFI_IFR_SUBTITLE_OP,\r
+ sizeof (OpCode),\r
+ 0,\r
Scope\r
);\r
}\r
{\r
EFI_IFR_REF OpCode;\r
\r
- ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBACK | EFI_IFR_FLAG_RESET_REQUIRED | EFI_IFR_FLAG_OPTIONS_ONLY))) == 0);\r
+ ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBACK | EFI_IFR_FLAG_RESET_REQUIRED))) == 0);\r
\r
ZeroMem (&OpCode, sizeof (OpCode));\r
OpCode.Question.Header.Prompt = Prompt;\r
return InternalHiiCreateOpCode (OpCodeHandle, &OpCode, EFI_IFR_REF_OP, sizeof (OpCode));\r
}\r
\r
+/**\r
+ Create EFI_IFR_REF_OP, EFI_IFR_REF2_OP, EFI_IFR_REF3_OP and EFI_IFR_REF4_OP opcode.\r
+\r
+ When RefDevicePath is not zero, EFI_IFR_REF4 opcode will be created.\r
+ When RefDevicePath is zero and RefFormSetId is not NULL, EFI_IFR_REF3 opcode will be created.\r
+ When RefDevicePath is zero, RefFormSetId is NULL and RefQuestionId is not zero, EFI_IFR_REF2 opcode will be created.\r
+ When RefDevicePath is zero, RefFormSetId is NULL and RefQuestionId is zero, EFI_IFR_REF opcode will be created.\r
+\r
+ If OpCodeHandle is NULL, then ASSERT().\r
+ If any reserved bits are set in QuestionFlags, then ASSERT().\r
+\r
+ @param[in] OpCodeHandle The handle to the buffer of opcodes.\r
+ @param[in] RefFormId The Destination Form ID.\r
+ @param[in] Prompt The string ID for Prompt.\r
+ @param[in] Help The string ID for Help.\r
+ @param[in] QuestionFlags The flags in Question Header\r
+ @param[in] QuestionId Question ID.\r
+ @param[in] RefQuestionId The question on the form to which this link is referring.\r
+ If its value is zero, then the link refers to the top of the form.\r
+ @param[in] RefFormSetId The form set to which this link is referring. If its value is NULL, and RefDevicePath is\r
+ zero, then the link is to the current form set.\r
+ @param[in] RefDevicePath The string identifier that specifies the string containing the text representation of\r
+ the device path to which the form set containing the form specified by FormId.\r
+ If its value is zero, then the link refers to the current page.\r
+\r
+ @retval NULL There is not enough space left in Buffer to add the opcode.\r
+ @retval Other A pointer to the created opcode.\r
+\r
+**/\r
+UINT8 *\r
+EFIAPI\r
+HiiCreateGotoExOpCode (\r
+ IN VOID *OpCodeHandle,\r
+ IN EFI_FORM_ID RefFormId,\r
+ IN EFI_STRING_ID Prompt,\r
+ IN EFI_STRING_ID Help,\r
+ IN UINT8 QuestionFlags,\r
+ IN EFI_QUESTION_ID QuestionId,\r
+ IN EFI_QUESTION_ID RefQuestionId,\r
+ IN EFI_GUID *RefFormSetId, OPTIONAL\r
+ IN EFI_STRING_ID RefDevicePath\r
+ )\r
+{\r
+ EFI_IFR_REF4 OpCode;\r
+ UINTN OpCodeSize;\r
+\r
+ ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBACK | EFI_IFR_FLAG_RESET_REQUIRED))) == 0);\r
+\r
+ ZeroMem (&OpCode, sizeof (OpCode));\r
+ OpCode.Question.Header.Prompt = Prompt;\r
+ OpCode.Question.Header.Help = Help;\r
+ OpCode.Question.QuestionId = QuestionId;\r
+ OpCode.Question.Flags = QuestionFlags;\r
+ OpCode.FormId = RefFormId;\r
+ OpCode.QuestionId = RefQuestionId;\r
+ OpCode.DevicePath = RefDevicePath;\r
+ if (RefFormSetId != NULL) {\r
+ CopyMem (&OpCode.FormSetId, RefFormSetId, sizeof (OpCode.FormSetId));\r
+ }\r
+\r
+ //\r
+ // Cacluate OpCodeSize based on the input Ref value.\r
+ // Try to use the small OpCode to save size.\r
+ //\r
+ OpCodeSize = sizeof (EFI_IFR_REF);\r
+ if (RefDevicePath != 0) {\r
+ OpCodeSize = sizeof (EFI_IFR_REF4);\r
+ } else if (RefFormSetId != NULL) {\r
+ OpCodeSize = sizeof (EFI_IFR_REF3);\r
+ } else if (RefQuestionId != 0) {\r
+ OpCodeSize = sizeof (EFI_IFR_REF2);\r
+ }\r
+\r
+ return InternalHiiCreateOpCode (OpCodeHandle, &OpCode, EFI_IFR_REF_OP, OpCodeSize);\r
+}\r
+\r
/**\r
Create EFI_IFR_CHECKBOX_OP opcode.\r
\r
@param[in] OpCodeHandle Handle to the buffer of opcodes.\r
@param[in] QuestionId Question ID\r
@param[in] VarStoreId Storage ID\r
- @param[in] VarOffset Offset in Storage\r
+ @param[in] VarOffset Offset in Storage or String ID of the name (VarName)\r
+ for this name/value pair.\r
@param[in] Prompt String ID for Prompt\r
@param[in] Help String ID for Help\r
@param[in] QuestionFlags Flags in Question Header\r
EFI_IFR_CHECKBOX OpCode;\r
UINTN Position;\r
\r
- ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBACK | EFI_IFR_FLAG_RESET_REQUIRED | EFI_IFR_FLAG_OPTIONS_ONLY))) == 0);\r
+ ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBACK | EFI_IFR_FLAG_RESET_REQUIRED))) == 0);\r
\r
ZeroMem (&OpCode, sizeof (OpCode));\r
OpCode.Question.QuestionId = QuestionId;\r
@param[in] OpCodeHandle Handle to the buffer of opcodes.\r
@param[in] QuestionId Question ID\r
@param[in] VarStoreId Storage ID\r
- @param[in] VarOffset Offset in Storage\r
+ @param[in] VarOffset Offset in Storage or String ID of the name (VarName)\r
+ for this name/value pair.\r
@param[in] Prompt String ID for Prompt\r
@param[in] Help String ID for Help\r
@param[in] QuestionFlags Flags in Question Header\r
{\r
EFI_IFR_NUMERIC OpCode;\r
UINTN Position;\r
+ UINTN Length;\r
\r
- ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBACK | EFI_IFR_FLAG_RESET_REQUIRED | EFI_IFR_FLAG_OPTIONS_ONLY))) == 0);\r
+ ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBACK | EFI_IFR_FLAG_RESET_REQUIRED))) == 0);\r
\r
+ Length = 0;\r
ZeroMem (&OpCode, sizeof (OpCode));\r
OpCode.Question.QuestionId = QuestionId;\r
OpCode.Question.VarStoreId = VarStoreId;\r
OpCode.data.u8.MinValue = (UINT8)Minimum;\r
OpCode.data.u8.MaxValue = (UINT8)Maximum;\r
OpCode.data.u8.Step = (UINT8)Step;\r
+ Length = 3;\r
break;\r
\r
case EFI_IFR_NUMERIC_SIZE_2:\r
OpCode.data.u16.MinValue = (UINT16)Minimum;\r
OpCode.data.u16.MaxValue = (UINT16)Maximum;\r
OpCode.data.u16.Step = (UINT16)Step;\r
+ Length = 6;\r
break;\r
\r
case EFI_IFR_NUMERIC_SIZE_4:\r
OpCode.data.u32.MinValue = (UINT32)Minimum;\r
OpCode.data.u32.MaxValue = (UINT32)Maximum;\r
OpCode.data.u32.Step = (UINT32)Step;\r
+ Length = 12;\r
break;\r
\r
case EFI_IFR_NUMERIC_SIZE_8:\r
OpCode.data.u64.MinValue = Minimum;\r
OpCode.data.u64.MaxValue = Maximum;\r
OpCode.data.u64.Step = Step;\r
+ Length = 24;\r
break;\r
}\r
\r
+ Length += OFFSET_OF (EFI_IFR_NUMERIC, data);\r
+\r
if (DefaultsOpCodeHandle == NULL) {\r
- return InternalHiiCreateOpCode (OpCodeHandle, &OpCode, EFI_IFR_NUMERIC_OP, sizeof (OpCode));\r
+ return InternalHiiCreateOpCode (OpCodeHandle, &OpCode, EFI_IFR_NUMERIC_OP, Length);\r
}\r
\r
Position = InternalHiiOpCodeHandlePosition (OpCodeHandle);\r
- InternalHiiCreateOpCodeExtended (OpCodeHandle, &OpCode, EFI_IFR_NUMERIC_OP, sizeof (OpCode), 0, 1);\r
+ InternalHiiCreateOpCodeExtended (OpCodeHandle, &OpCode, EFI_IFR_NUMERIC_OP, Length, 0, 1);\r
InternalHiiAppendOpCodes (OpCodeHandle, DefaultsOpCodeHandle);\r
HiiCreateEndOpCode (OpCodeHandle);\r
return InternalHiiOpCodeHandleBuffer (OpCodeHandle) + Position;\r
@param[in] OpCodeHandle Handle to the buffer of opcodes.\r
@param[in] QuestionId Question ID\r
@param[in] VarStoreId Storage ID\r
- @param[in] VarOffset Offset in Storage\r
+ @param[in] VarOffset Offset in Storage or String ID of the name (VarName)\r
+ for this name/value pair.\r
@param[in] Prompt String ID for Prompt\r
@param[in] Help String ID for Help\r
@param[in] QuestionFlags Flags in Question Header\r
EFI_IFR_STRING OpCode;\r
UINTN Position;\r
\r
- ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBACK | EFI_IFR_FLAG_RESET_REQUIRED | EFI_IFR_FLAG_OPTIONS_ONLY))) == 0);\r
+ ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBACK | EFI_IFR_FLAG_RESET_REQUIRED))) == 0);\r
\r
ZeroMem (&OpCode, sizeof (OpCode));\r
OpCode.Question.Header.Prompt = Prompt;\r
@param[in] OpCodeHandle Handle to the buffer of opcodes.\r
@param[in] QuestionId Question ID\r
@param[in] VarStoreId Storage ID\r
- @param[in] VarOffset Offset in Storage\r
+ @param[in] VarOffset Offset in Storage or String ID of the name (VarName)\r
+ for this name/value pair.\r
@param[in] Prompt String ID for Prompt\r
@param[in] Help String ID for Help\r
@param[in] QuestionFlags Flags in Question Header\r
{\r
EFI_IFR_ONE_OF OpCode;\r
UINTN Position;\r
+ UINTN Length;\r
\r
ASSERT (OptionsOpCodeHandle != NULL);\r
ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBACK | EFI_IFR_FLAG_RESET_REQUIRED | EFI_IFR_FLAG_OPTIONS_ONLY))) == 0);\r
OpCode.Question.Flags = QuestionFlags;\r
OpCode.Flags = OneOfFlags;\r
\r
+ Length = OFFSET_OF (EFI_IFR_ONE_OF, data);\r
+ Length += (1 << (OneOfFlags & EFI_IFR_NUMERIC_SIZE)) * 3;\r
+\r
Position = InternalHiiOpCodeHandlePosition (OpCodeHandle);\r
- InternalHiiCreateOpCodeExtended (OpCodeHandle, &OpCode, EFI_IFR_ONE_OF_OP, sizeof (OpCode), 0, 1);\r
+ InternalHiiCreateOpCodeExtended (OpCodeHandle, &OpCode, EFI_IFR_ONE_OF_OP, Length, 0, 1);\r
InternalHiiAppendOpCodes (OpCodeHandle, OptionsOpCodeHandle);\r
if (DefaultsOpCodeHandle != NULL) {\r
InternalHiiAppendOpCodes (OpCodeHandle, DefaultsOpCodeHandle);\r
@param[in] OpCodeHandle Handle to the buffer of opcodes.\r
@param[in] QuestionId Question ID\r
@param[in] VarStoreId Storage ID\r
- @param[in] VarOffset Offset in Storage\r
+ @param[in] VarOffset Offset in Storage or String ID of the name (VarName)\r
+ for this name/value pair.\r
@param[in] Prompt String ID for Prompt\r
@param[in] Help String ID for Help\r
@param[in] QuestionFlags Flags in Question Header\r
return InternalHiiOpCodeHandleBuffer (OpCodeHandle) + Position;\r
}\r
\r
+/**\r
+ Create EFI_IFR_TEXT_OP opcode.\r
+\r
+ If OpCodeHandle is NULL, then ASSERT().\r
+\r
+ @param[in] OpCodeHandle Handle to the buffer of opcodes.\r
+ @param[in] Prompt String ID for Prompt.\r
+ @param[in] Help String ID for Help.\r
+ @param[in] TextTwo String ID for TextTwo.\r
+\r
+ @retval NULL There is not enough space left in Buffer to add the opcode.\r
+ @retval Other A pointer to the created opcode.\r
+\r
+**/\r
+UINT8 *\r
+EFIAPI\r
+HiiCreateTextOpCode (\r
+ IN VOID *OpCodeHandle,\r
+ IN EFI_STRING_ID Prompt,\r
+ IN EFI_STRING_ID Help,\r
+ IN EFI_STRING_ID TextTwo\r
+ )\r
+{\r
+ EFI_IFR_TEXT OpCode;\r
+\r
+ ZeroMem (&OpCode, sizeof (OpCode));\r
+ OpCode.Statement.Prompt = Prompt;\r
+ OpCode.Statement.Help = Help;\r
+ OpCode.TextTwo = TextTwo;\r
+\r
+ return InternalHiiCreateOpCode (OpCodeHandle, &OpCode, EFI_IFR_TEXT_OP, sizeof (OpCode));\r
+}\r
+\r
+/**\r
+ Create EFI_IFR_DATE_OP opcode.\r
+\r
+ If OpCodeHandle is NULL, then ASSERT().\r
+ If any reserved bits are set in QuestionFlags, then ASSERT().\r
+ If any reserved bits are set in DateFlags, then ASSERT().\r
+\r
+ @param[in] OpCodeHandle Handle to the buffer of opcodes.\r
+ @param[in] QuestionId Question ID\r
+ @param[in] VarStoreId Storage ID, optional. If DateFlags is not\r
+ QF_DATE_STORAGE_NORMAL, this parameter is ignored.\r
+ @param[in] VarOffset Offset in Storage or String ID of the name (VarName)\r
+ for this name/value pair, optional. If DateFlags is not\r
+ QF_DATE_STORAGE_NORMAL, this parameter is ignored.\r
+ @param[in] Prompt String ID for Prompt\r
+ @param[in] Help String ID for Help\r
+ @param[in] QuestionFlags Flags in Question Header\r
+ @param[in] DateFlags Flags for date opcode\r
+ @param[in] DefaultsOpCodeHandle Handle for a buffer of DEFAULT opcodes. This\r
+ is an optional parameter that may be NULL.\r
+\r
+ @retval NULL There is not enough space left in Buffer to add the opcode.\r
+ @retval Other A pointer to the created opcode.\r
+\r
+**/\r
+UINT8 *\r
+EFIAPI\r
+HiiCreateDateOpCode (\r
+ IN VOID *OpCodeHandle,\r
+ IN EFI_QUESTION_ID QuestionId,\r
+ IN EFI_VARSTORE_ID VarStoreId, OPTIONAL\r
+ IN UINT16 VarOffset, OPTIONAL\r
+ IN EFI_STRING_ID Prompt,\r
+ IN EFI_STRING_ID Help,\r
+ IN UINT8 QuestionFlags,\r
+ IN UINT8 DateFlags,\r
+ IN VOID *DefaultsOpCodeHandle OPTIONAL\r
+ )\r
+{\r
+ EFI_IFR_DATE OpCode;\r
+ UINTN Position;\r
+\r
+ ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBACK | EFI_IFR_FLAG_RESET_REQUIRED))) == 0);\r
+ ASSERT ((DateFlags & (~(EFI_QF_DATE_YEAR_SUPPRESS | EFI_QF_DATE_MONTH_SUPPRESS | EFI_QF_DATE_DAY_SUPPRESS | EFI_QF_DATE_STORAGE))) == 0);\r
+\r
+ ZeroMem (&OpCode, sizeof (OpCode));\r
+ OpCode.Question.Header.Prompt = Prompt;\r
+ OpCode.Question.Header.Help = Help;\r
+ OpCode.Question.QuestionId = QuestionId;\r
+ OpCode.Question.VarStoreId = VarStoreId;\r
+ OpCode.Question.VarStoreInfo.VarOffset = VarOffset;\r
+ OpCode.Question.Flags = QuestionFlags;\r
+ OpCode.Flags = DateFlags;\r
+\r
+ if (DefaultsOpCodeHandle == NULL) {\r
+ return InternalHiiCreateOpCode (OpCodeHandle, &OpCode, EFI_IFR_DATE_OP, sizeof (OpCode));\r
+ }\r
+\r
+ Position = InternalHiiOpCodeHandlePosition (OpCodeHandle);\r
+ InternalHiiCreateOpCodeExtended (OpCodeHandle, &OpCode, EFI_IFR_DATE_OP, sizeof (OpCode), 0, 1);\r
+ InternalHiiAppendOpCodes (OpCodeHandle, DefaultsOpCodeHandle);\r
+ HiiCreateEndOpCode (OpCodeHandle);\r
+ return InternalHiiOpCodeHandleBuffer (OpCodeHandle) + Position;\r
+}\r
+\r
+/**\r
+ Create EFI_IFR_TIME_OP opcode.\r
+\r
+ If OpCodeHandle is NULL, then ASSERT().\r
+ If any reserved bits are set in QuestionFlags, then ASSERT().\r
+ If any reserved bits are set in TimeFlags, then ASSERT().\r
+\r
+ @param[in] OpCodeHandle Handle to the buffer of opcodes.\r
+ @param[in] QuestionId Question ID\r
+ @param[in] VarStoreId Storage ID, optional. If TimeFlags is not\r
+ QF_TIME_STORAGE_NORMAL, this parameter is ignored.\r
+ @param[in] VarOffset Offset in Storage or String ID of the name (VarName)\r
+ for this name/value pair, optional. If TimeFlags is not\r
+ QF_TIME_STORAGE_NORMAL, this parameter is ignored.\r
+ @param[in] Prompt String ID for Prompt\r
+ @param[in] Help String ID for Help\r
+ @param[in] QuestionFlags Flags in Question Header\r
+ @param[in] TimeFlags Flags for time opcode\r
+ @param[in] DefaultsOpCodeHandle Handle for a buffer of DEFAULT opcodes. This\r
+ is an optional parameter that may be NULL.\r
+\r
+ @retval NULL There is not enough space left in Buffer to add the opcode.\r
+ @retval Other A pointer to the created opcode.\r
+\r
+**/\r
+UINT8 *\r
+EFIAPI\r
+HiiCreateTimeOpCode (\r
+ IN VOID *OpCodeHandle,\r
+ IN EFI_QUESTION_ID QuestionId,\r
+ IN EFI_VARSTORE_ID VarStoreId, OPTIONAL\r
+ IN UINT16 VarOffset, OPTIONAL\r
+ IN EFI_STRING_ID Prompt,\r
+ IN EFI_STRING_ID Help,\r
+ IN UINT8 QuestionFlags,\r
+ IN UINT8 TimeFlags,\r
+ IN VOID *DefaultsOpCodeHandle OPTIONAL\r
+ )\r
+{\r
+ EFI_IFR_TIME OpCode;\r
+ UINTN Position;\r
+\r
+ ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBACK | EFI_IFR_FLAG_RESET_REQUIRED))) == 0);\r
+ ASSERT ((TimeFlags & (~(QF_TIME_HOUR_SUPPRESS | QF_TIME_MINUTE_SUPPRESS | QF_TIME_SECOND_SUPPRESS | QF_TIME_STORAGE))) == 0);\r
+\r
+ ZeroMem (&OpCode, sizeof (OpCode));\r
+ OpCode.Question.Header.Prompt = Prompt;\r
+ OpCode.Question.Header.Help = Help;\r
+ OpCode.Question.QuestionId = QuestionId;\r
+ OpCode.Question.VarStoreId = VarStoreId;\r
+ OpCode.Question.VarStoreInfo.VarOffset = VarOffset;\r
+ OpCode.Question.Flags = QuestionFlags;\r
+ OpCode.Flags = TimeFlags;\r
+\r
+ if (DefaultsOpCodeHandle == NULL) {\r
+ return InternalHiiCreateOpCode (OpCodeHandle, &OpCode, EFI_IFR_TIME_OP, sizeof (OpCode));\r
+ }\r
+\r
+ Position = InternalHiiOpCodeHandlePosition (OpCodeHandle);\r
+ InternalHiiCreateOpCodeExtended (OpCodeHandle, &OpCode, EFI_IFR_TIME_OP, sizeof (OpCode), 0, 1);\r
+ InternalHiiAppendOpCodes (OpCodeHandle, DefaultsOpCodeHandle);\r
+ HiiCreateEndOpCode (OpCodeHandle);\r
+ return InternalHiiOpCodeHandleBuffer (OpCodeHandle) + Position;\r
+}\r
+\r
/**\r
This is the internal worker function to update the data in\r
a form specified by FormSetGuid, FormId and Label.\r
\r
- @param FormSetGuid The optional Formset GUID.\r
- @param FormId The Form ID.\r
- @param Package The package header.\r
-\r
- @param TempPacakge The resultant package.\r
+ @param[in] FormSetGuid The optional Formset GUID.\r
+ @param[in] FormId The Form ID.\r
+ @param[in] Package The package header.\r
+ @param[in] OpCodeBufferStart An OpCode buffer that contains the set of IFR\r
+ opcodes to be inserted or replaced in the form.\r
+ @param[in] OpCodeBufferEnd An OpCcode buffer that contains the IFR opcode\r
+ that marks the end of a replace operation in the form.\r
+ @param[out] TempPackage The resultant package.\r
\r
@retval EFI_SUCCESS The function completes successfully.\r
+ @retval EFI_NOT_FOUND The updated opcode or endopcode is not found.\r
\r
**/\r
EFI_STATUS\r
CopyMem (BufferPos, IfrOpHdr, IfrOpHdr->Length);\r
BufferPos += IfrOpHdr->Length;\r
UpdatePackageLength += IfrOpHdr->Length;\r
- \r
+\r
//\r
// Find the matched FormSet and Form\r
//\r
} else {\r
GetFormSet = FALSE;\r
}\r
- } else if (IfrOpHdr->OpCode == EFI_IFR_FORM_OP) {\r
+ } else if (IfrOpHdr->OpCode == EFI_IFR_FORM_OP || IfrOpHdr->OpCode == EFI_IFR_FORM_MAP_OP) {\r
if (CompareMem (&((EFI_IFR_FORM *) IfrOpHdr)->FormId, &FormId, sizeof (EFI_FORM_ID)) == 0) {\r
GetForm = TRUE;\r
} else {\r
GetForm = FALSE;\r
}\r
}\r
- \r
+\r
//\r
// The matched Form is found, and Update data in this form\r
//\r
Offset += IfrOpHdr->Length;\r
IfrOpHdr = (EFI_IFR_OP_HEADER *) ((UINT8 *) (IfrOpHdr) + IfrOpHdr->Length);\r
}\r
- \r
+\r
if (Offset >= PackageHeader.Length) {\r
//\r
// The end opcode is not found.\r
Offset += IfrOpHdr->Length;\r
IfrOpHdr = (EFI_IFR_OP_HEADER *) ((CHAR8 *) (IfrOpHdr) + IfrOpHdr->Length);\r
}\r
- \r
+\r
if (!Updated) {\r
//\r
// The updated opcode buffer is not found.\r
}\r
\r
/**\r
- This function updates a form that has previously been registered with the HII \r
+ This function updates a form that has previously been registered with the HII\r
Database. This function will perform at most one update operation.\r
- \r
- The form to update is specified by Handle, FormSetGuid, and FormId. Binary \r
- comparisons of IFR opcodes are performed from the beginning of the form being \r
- updated until an IFR opcode is found that exactly matches the first IFR opcode \r
- specifed by StartOpCodeHandle. The following rules are used to determine if\r
+\r
+ The form to update is specified by Handle, FormSetGuid, and FormId. Binary\r
+ comparisons of IFR opcodes are performed from the beginning of the form being\r
+ updated until an IFR opcode is found that exactly matches the first IFR opcode\r
+ specified by StartOpCodeHandle. The following rules are used to determine if\r
an insert, replace, or delete operation is performed.\r
- \r
- 1) If no matches are found, then NULL is returned. \r
+\r
+ 1) If no matches are found, then NULL is returned.\r
2) If a match is found, and EndOpCodeHandle is NULL, then all of the IFR opcodes\r
- from StartOpcodeHandle except the first opcode are inserted immediately after \r
- the matching IFR opcode in the form beng updated.\r
- 3) If a match is found, and EndOpCodeHandle is not NULL, then a search is made \r
- from the matching IFR opcode until an IFR opcode exatly matches the first \r
+ from StartOpCodeHandle except the first opcode are inserted immediately after\r
+ the matching IFR opcode in the form to be updated.\r
+ 3) If a match is found, and EndOpCodeHandle is not NULL, then a search is made\r
+ from the matching IFR opcode until an IFR opcode exactly matches the first\r
IFR opcode specified by EndOpCodeHandle. If no match is found for the first\r
IFR opcode specified by EndOpCodeHandle, then NULL is returned. If a match\r
- is found, then all of the IFR opcodes between the start match and the end \r
+ is found, then all of the IFR opcodes between the start match and the end\r
match are deleted from the form being updated and all of the IFR opcodes\r
- from StartOpcodeHandle except the first opcode are inserted immediately after \r
+ from StartOpCodeHandle except the first opcode are inserted immediately after\r
the matching start IFR opcode. If StartOpCcodeHandle only contains one\r
- IFR instruction, then the result of ths operation will delete all of the IFR\r
+ IFR instruction, then the result of this operation will delete all of the IFR\r
opcodes between the start end matches.\r
\r
If HiiHandle is NULL, then ASSERT().\r
is an optional parameter that may be NULL.\r
If it is NULL, all FormSet will be updated.\r
@param[in] FormId The ID of the form to update.\r
- @param[in] StartOpCodeHandle An OpCode Handle that contains the set of IFR \r
+ @param[in] StartOpCodeHandle An OpCode Handle that contains the set of IFR\r
opcodes to be inserted or replaced in the form.\r
- The first IFR instruction in StartOpCodeHandle \r
- is used to find matching IFR opcode in the \r
- form. \r
+ The first IFR instruction in StartOpCodeHandle\r
+ is used to find matching IFR opcode in the\r
+ form.\r
@param[in] EndOpCodeHandle An OpCcode Handle that contains the IFR opcode\r
that marks the end of a replace operation in\r
the form. This is an optional parameter that\r
may be NULL. If it is NULL, then an the IFR\r
- opcodes specified by StartOpCodeHandle are \r
+ opcodes specified by StartOpCodeHandle are\r
inserted into the form.\r
- \r
+\r
@retval EFI_OUT_OF_RESOURCES No enough memory resource is allocated.\r
@retval EFI_NOT_FOUND The following cases will return EFI_NOT_FOUND.\r
- 1) The form specified by HiiHandle, FormSetGuid, \r
+ 1) The form specified by HiiHandle, FormSetGuid,\r
and FormId could not be found in the HII Database.\r
2) No IFR opcodes in the target form match the first\r
IFR opcode in StartOpCodeHandle.\r
- 3) EndOpCOde is not NULL, and no IFR opcodes in the \r
- target form following a matching start opcode match \r
+ 3) EndOpCOde is not NULL, and no IFR opcodes in the\r
+ target form following a matching start opcode match\r
the first IFR opcode in EndOpCodeHandle.\r
@retval EFI_SUCCESS The matched form is updated by StartOpcode.\r
\r
EFI_STATUS\r
EFIAPI\r
HiiUpdateForm (\r
- IN EFI_HII_HANDLE HiiHandle, \r
+ IN EFI_HII_HANDLE HiiHandle,\r
IN EFI_GUID *FormSetGuid, OPTIONAL\r
IN EFI_FORM_ID FormId,\r
- IN VOID *StartOpcodeHandle,\r
- IN VOID *EndOpcodeHandle OPTIONAL\r
+ IN VOID *StartOpCodeHandle,\r
+ IN VOID *EndOpCodeHandle OPTIONAL\r
)\r
{\r
EFI_STATUS Status;\r
EFI_HII_PACKAGE_LIST_HEADER *HiiPackageList;\r
- UINT32 PackageListLength; \r
+ UINT32 PackageListLength;\r
UINT32 Offset;\r
EFI_HII_PACKAGE_LIST_HEADER *UpdatePackageList;\r
UINTN BufferSize;\r
UINT8 *UpdateBufferPos;\r
EFI_HII_PACKAGE_HEADER *Package;\r
- EFI_HII_PACKAGE_HEADER *TempPacakge;\r
+ EFI_HII_PACKAGE_HEADER *TempPackage;\r
EFI_HII_PACKAGE_HEADER PackageHeader;\r
BOOLEAN Updated;\r
HII_LIB_OPCODE_BUFFER *OpCodeBufferStart;\r
HII_LIB_OPCODE_BUFFER *OpCodeBufferEnd;\r
- \r
+\r
//\r
// Input update data can't be NULL.\r
//\r
ASSERT (HiiHandle != NULL);\r
- ASSERT (StartOpcodeHandle != NULL);\r
+ ASSERT (StartOpCodeHandle != NULL);\r
UpdatePackageList = NULL;\r
- TempPacakge = NULL;\r
+ TempPackage = NULL;\r
HiiPackageList = NULL;\r
- \r
+\r
//\r
- // Restrive buffer data from Opcode Handle\r
+ // Retrieve buffer data from Opcode Handle\r
//\r
- OpCodeBufferStart = (HII_LIB_OPCODE_BUFFER *) StartOpcodeHandle;\r
- OpCodeBufferEnd = (HII_LIB_OPCODE_BUFFER *) EndOpcodeHandle;\r
- \r
+ OpCodeBufferStart = (HII_LIB_OPCODE_BUFFER *) StartOpCodeHandle;\r
+ OpCodeBufferEnd = (HII_LIB_OPCODE_BUFFER *) EndOpCodeHandle;\r
+\r
//\r
- // Get the orginal package list\r
+ // Get the original package list\r
//\r
BufferSize = 0;\r
HiiPackageList = NULL;\r
Status = EFI_OUT_OF_RESOURCES;\r
goto Finish;\r
}\r
- \r
+\r
//\r
// Allocate temp buffer to store the temp updated package buffer\r
//\r
- TempPacakge = AllocateZeroPool (BufferSize);\r
- if (TempPacakge == NULL) {\r
+ TempPackage = AllocateZeroPool (BufferSize);\r
+ if (TempPackage == NULL) {\r
Status = EFI_OUT_OF_RESOURCES;\r
goto Finish;\r
}\r
//\r
CopyMem (UpdateBufferPos, HiiPackageList, sizeof (EFI_HII_PACKAGE_LIST_HEADER));\r
UpdateBufferPos += sizeof (EFI_HII_PACKAGE_LIST_HEADER);\r
- \r
+\r
//\r
- // Go through each package to find the matched pacakge and update one by one\r
+ // Go through each package to find the matched package and update one by one\r
//\r
Updated = FALSE;\r
Offset = sizeof (EFI_HII_PACKAGE_LIST_HEADER);\r
//\r
// Check this package is the matched package.\r
//\r
- Status = InternalHiiUpdateFormPackageData (FormSetGuid, FormId, Package, OpCodeBufferStart, OpCodeBufferEnd, TempPacakge);\r
+ Status = InternalHiiUpdateFormPackageData (FormSetGuid, FormId, Package, OpCodeBufferStart, OpCodeBufferEnd, TempPackage);\r
//\r
- // The matched package is found. Its pacakge buffer will be updated by the input new data.\r
+ // The matched package is found. Its package buffer will be updated by the input new data.\r
//\r
if (!EFI_ERROR(Status)) {\r
//\r
// Set Update Flag\r
- // \r
+ //\r
Updated = TRUE;\r
//\r
// Add updated package buffer\r
//\r
- Package = TempPacakge;\r
+ Package = TempPackage;\r
}\r
}\r
\r
CopyMem (UpdateBufferPos, Package, PackageHeader.Length);\r
UpdateBufferPos += PackageHeader.Length;\r
}\r
- \r
+\r
if (Updated) {\r
//\r
// Update package list length\r
//\r
BufferSize = UpdateBufferPos - (UINT8 *) UpdatePackageList;\r
WriteUnaligned32 (&UpdatePackageList->PackageLength, (UINT32) BufferSize);\r
- \r
+\r
//\r
- // Update Pacakge to show form\r
+ // Update Package to show form\r
//\r
Status = gHiiDatabase->UpdatePackageList (gHiiDatabase, HiiHandle, UpdatePackageList);\r
} else {\r
if (HiiPackageList != NULL) {\r
FreePool (HiiPackageList);\r
}\r
- \r
+\r
if (UpdatePackageList != NULL) {\r
FreePool (UpdatePackageList);\r
}\r
- \r
- if (TempPacakge != NULL) {\r
- FreePool (TempPacakge);\r
+\r
+ if (TempPackage != NULL) {\r
+ FreePool (TempPackage);\r
}\r
\r
- return Status; \r
+ return Status;\r
}\r
projects / mirror_edk2.git / blobdiff