/** @file\r
Implementation of interfaces function for EFI_HII_CONFIG_ROUTING_PROTOCOL.\r
\r
-Copyright (c) 2007 - 2008, Intel Corporation\r
-All rights reserved. This program and the accompanying materials\r
+Copyright (c) 2007 - 2011, Intel Corporation. All rights reserved.<BR>\r
+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
This is a internal function.\r
\r
@param String UEFI configuration string\r
- @param DevicePath binary of a UEFI device path.\r
+ @param DevicePathData Binary of a UEFI device path.\r
\r
+ @retval EFI_NOT_FOUND The device path is not invalid.\r
@retval EFI_INVALID_PARAMETER Any incoming parameter is invalid.\r
@retval EFI_OUT_OF_RESOURCES Lake of resources to store neccesary structures.\r
@retval EFI_SUCCESS The device path is retrieved and translated to\r
EFI_STATUS\r
GetDevicePath (\r
IN EFI_STRING String,\r
- OUT UINT8 **DevicePath\r
+ OUT UINT8 **DevicePathData\r
)\r
{\r
- UINTN Length;\r
- EFI_STRING PathHdr;\r
- EFI_STRING DevicePathString;\r
- UINT8 *DevicePathBuffer;\r
- CHAR16 TemStr[2];\r
- UINTN Index;\r
- UINT8 DigitUint8;\r
-\r
- if (String == NULL || DevicePath == NULL) {\r
+ UINTN Length;\r
+ EFI_STRING PathHdr;\r
+ UINT8 *DevicePathBuffer;\r
+ CHAR16 TemStr[2];\r
+ UINTN Index;\r
+ UINT8 DigitUint8;\r
+ EFI_DEVICE_PATH_PROTOCOL *DevicePath;\r
+\r
+\r
+ if (String == NULL || DevicePathData == NULL) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
if (*String == 0) {\r
return EFI_INVALID_PARAMETER;\r
}\r
-\r
+ //\r
+ // Check whether path data does exist.\r
+ //\r
String += StrLen (L"PATH=");\r
+ if (*String == 0) {\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
PathHdr = String;\r
\r
//\r
// of UEFI device path.\r
//\r
for (Length = 0; *String != 0 && *String != L'&'; String++, Length++);\r
- DevicePathString = (EFI_STRING) AllocateZeroPool ((Length + 1) * sizeof (CHAR16));\r
- if (DevicePathString == NULL) {\r
- return EFI_OUT_OF_RESOURCES;\r
+ //\r
+ // Check DevicePath Length\r
+ //\r
+ if (((Length + 1) / 2) < sizeof (EFI_DEVICE_PATH_PROTOCOL)) {\r
+ return EFI_NOT_FOUND;\r
}\r
- StrnCpy (DevicePathString, PathHdr, Length);\r
- *(DevicePathString + Length) = 0;\r
-\r
+ \r
//\r
// The data in <PathHdr> is encoded as hex UNICODE %02x bytes in the same order\r
// as the device path resides in RAM memory.\r
//\r
DevicePathBuffer = (UINT8 *) AllocateZeroPool ((Length + 1) / 2);\r
if (DevicePathBuffer == NULL) {\r
- FreePool (DevicePathString);\r
return EFI_OUT_OF_RESOURCES;\r
}\r
-\r
+ \r
+ //\r
+ // Convert DevicePath\r
+ //\r
ZeroMem (TemStr, sizeof (TemStr));\r
- for (Index = 0; DevicePathString[Index] != L'\0'; Index ++) {\r
- TemStr[0] = DevicePathString[Index];\r
+ for (Index = 0; Index < Length; Index ++) {\r
+ TemStr[0] = PathHdr[Index];\r
DigitUint8 = (UINT8) StrHexToUint64 (TemStr);\r
if ((Index & 1) == 0) {\r
DevicePathBuffer [Index/2] = DigitUint8;\r
DevicePathBuffer [Index/2] = (UINT8) ((DevicePathBuffer [Index/2] << 4) + DigitUint8);\r
}\r
}\r
-\r
- FreePool (DevicePathString);\r
\r
- *DevicePath = DevicePathBuffer;\r
+ //\r
+ // Validate DevicePath\r
+ //\r
+ DevicePath = (EFI_DEVICE_PATH_PROTOCOL *) DevicePathBuffer;\r
+ while (!IsDevicePathEnd (DevicePath)) {\r
+ if ((DevicePath->Type == 0) || (DevicePath->SubType == 0) || (DevicePathNodeLength (DevicePath) < sizeof (EFI_DEVICE_PATH_PROTOCOL))) {\r
+ //\r
+ // Invalid device path\r
+ //\r
+ FreePool (DevicePathBuffer);\r
+ return EFI_NOT_FOUND;\r
+ }\r
+ DevicePath = NextDevicePathNode (DevicePath);\r
+ }\r
\r
+ //\r
+ // return the device path\r
+ //\r
+ *DevicePathData = DevicePathBuffer;\r
return EFI_SUCCESS;\r
-\r
}\r
\r
/**\r
Converts the unicode character of the string from uppercase to lowercase.\r
This is a internal function.\r
\r
- @param Str String to be converted\r
+ @param ConfigString String to be converted\r
\r
**/\r
VOID\r
UINTN Index;\r
CHAR16 TemStr[2];\r
\r
- ASSERT (StringPtr != NULL && Number != NULL && Len != NULL);\r
- ASSERT (*StringPtr != L'\0');\r
+ if (StringPtr == NULL || *StringPtr == L'\0' || Number == NULL || Len == NULL) {\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
\r
Buf = NULL;\r
\r
return EFI_SUCCESS; \r
}\r
\r
-/**\r
- This function finds the matched DefaultName for the input DefaultId\r
-\r
- @param DefaultIdArray Array stores the map table between DefaultId and DefaultName.\r
- @param VarDefaultId Default Id\r
- @param VarDefaultName Default Name string ID for the input default ID.\r
- \r
- @retval EFI_SUCCESS The mapped default name string ID is found.\r
- @retval EFI_NOT_FOUND The mapped default name string ID is not found.\r
-**/\r
-EFI_STATUS\r
-FindDefaultName (\r
- IN IFR_DEFAULT_DATA *DefaultIdArray, \r
- IN UINT16 VarDefaultId, \r
- OUT EFI_STRING_ID *VarDefaultName\r
- )\r
-{\r
- LIST_ENTRY *Link;\r
- IFR_DEFAULT_DATA *DefaultData;\r
-\r
- for (Link = DefaultIdArray->Entry.ForwardLink; Link != &DefaultIdArray->Entry; Link = Link->ForwardLink) {\r
- DefaultData = BASE_CR (Link, IFR_DEFAULT_DATA, Entry);\r
- if (DefaultData->DefaultId == VarDefaultId) {\r
- *VarDefaultName = DefaultData->DefaultName;\r
- return EFI_SUCCESS;\r
- }\r
- }\r
- \r
- return EFI_NOT_FOUND;\r
-}\r
-\r
/**\r
This function inserts new DefaultValueData into the BlockData DefaultValue array.\r
\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 RequestBlockArray The block array is to be checked. \r
@param VarOffset Offset of var to the structure\r
@param VarWidth Width of var.\r
\r
EFIAPI\r
ParseIfrData (\r
IN UINT8 *Package,\r
- IN UINT32 PackageLenth,\r
+ IN UINT32 PackageLength,\r
IN EFI_STRING ConfigHdr,\r
IN IFR_BLOCK_DATA *RequestBlockArray,\r
IN OUT IFR_VARSTORAGE_DATA *VarStorageData,\r
EFI_STRING NameStr;\r
EFI_STRING TempStr;\r
UINTN LengthString;\r
+ BOOLEAN FirstOneOfOption;\r
\r
LengthString = 0;\r
Status = EFI_SUCCESS;\r
TempStr = NULL;\r
BlockData = NULL;\r
DefaultData = NULL;\r
+ VarDefaultName = 0;\r
+ FirstOneOfOption = FALSE;\r
\r
//\r
// Go through the form package to parse OpCode one by one.\r
//\r
IfrOffset = sizeof (EFI_HII_PACKAGE_HEADER);\r
- while (IfrOffset < PackageLenth) {\r
+ while (IfrOffset < PackageLength) {\r
IfrOpHdr = (EFI_IFR_OP_HEADER *) (Package + IfrOffset);\r
\r
switch (IfrOpHdr->OpCode) {\r
goto Done;\r
}\r
DefaultData->DefaultId = ((EFI_IFR_DEFAULTSTORE *) IfrOpHdr)->DefaultId;\r
- DefaultData->DefaultName = ((EFI_IFR_DEFAULTSTORE *) IfrOpHdr)->DefaultName;\r
InsertTailList (&DefaultIdArray->Entry, &DefaultData->Entry);\r
DefaultData = NULL;\r
break;\r
\r
case EFI_IFR_FORM_OP:\r
+ case EFI_IFR_FORM_MAP_OP:\r
//\r
// No matched varstore is found and directly return.\r
//\r
// Add Block Data into VarStorageData BlockEntry\r
//\r
InsertBlockData (&VarStorageData->BlockEntry, &BlockData);\r
+ \r
+ if (IfrOpHdr->OpCode == EFI_IFR_ONE_OF_OP) {\r
+ //\r
+ // Set this flag to TRUE for the first oneof option.\r
+ //\r
+ FirstOneOfOption = TRUE;\r
+ } else if (IfrOpHdr->OpCode == EFI_IFR_NUMERIC_OP) {\r
+ //\r
+ // Numeric minimum value will be used as default value when no default is specified. \r
+ //\r
+\r
+ //\r
+ // Set standard ID\r
+ //\r
+ VarDefaultId = EFI_HII_DEFAULT_CLASS_STANDARD;\r
+ //\r
+ // Prepare new DefaultValue\r
+ //\r
+ DefaultData = (IFR_DEFAULT_DATA *) AllocateZeroPool (sizeof (IFR_DEFAULT_DATA));\r
+ if (DefaultData == NULL) {\r
+ Status = EFI_OUT_OF_RESOURCES;\r
+ goto Done;\r
+ }\r
+ DefaultData->OpCode = IfrOpHdr->OpCode;\r
+ DefaultData->DefaultId = VarDefaultId;\r
+\r
+ switch (IfrOneOf->Flags & EFI_IFR_NUMERIC_SIZE) {\r
+ case EFI_IFR_NUMERIC_SIZE_1:\r
+ DefaultData->Value = (UINT64) IfrOneOf->data.u8.MinValue;\r
+ break;\r
+ \r
+ case EFI_IFR_NUMERIC_SIZE_2:\r
+ CopyMem (&DefaultData->Value, &IfrOneOf->data.u16.MinValue, sizeof (UINT16));\r
+ break;\r
+ \r
+ case EFI_IFR_NUMERIC_SIZE_4:\r
+ CopyMem (&DefaultData->Value, &IfrOneOf->data.u32.MinValue, sizeof (UINT32));\r
+ break;\r
+ \r
+ case EFI_IFR_NUMERIC_SIZE_8:\r
+ CopyMem (&DefaultData->Value, &IfrOneOf->data.u64.MinValue, sizeof (UINT64));\r
+ break;\r
+ }\r
+ //\r
+ // Add DefaultValue into current BlockData\r
+ //\r
+ InsertDefaultValue (BlockData, DefaultData); \r
+ }\r
break;\r
\r
case EFI_IFR_ORDERED_LIST_OP:\r
//\r
IfrOrderedList = (EFI_IFR_ORDERED_LIST *) IfrOpHdr;\r
if (IfrOrderedList->Question.VarStoreId != VarStorageData->VarStoreId) {\r
+ BlockData = NULL;\r
break;\r
}\r
- \r
+\r
//\r
// Get Offset/Width by Question header and OneOf Flags\r
//\r
VarOffset = IfrOrderedList->Question.VarStoreInfo.VarOffset;\r
VarWidth = IfrOrderedList->MaxContainers;\r
-\r
- //\r
- // Check whether this question is in requested block array.\r
- //\r
- if (!BlockArrayCheck (RequestBlockArray, VarOffset, VarWidth)) {\r
- //\r
- // This question is not in the requested string. Skip it.\r
- //\r
- break;\r
- }\r
-\r
- //\r
- // Check this var question is in the var storage \r
- //\r
- if ((VarOffset + VarWidth) > VarStorageData->Size) {\r
- Status = EFI_INVALID_PARAMETER;\r
- goto Done;\r
- }\r
\r
//\r
// Set Block Data\r
BlockData->OpCode = IfrOpHdr->OpCode;\r
BlockData->Scope = IfrOpHdr->Scope;\r
InitializeListHead (&BlockData->DefaultValueEntry);\r
- \r
- //\r
- // Add Block Data into VarStorageData BlockEntry\r
- //\r
- InsertBlockData (&VarStorageData->BlockEntry, &BlockData);\r
break;\r
\r
case EFI_IFR_CHECKBOX_OP:\r
// Get Offset/Width by Question header and OneOf Flags\r
//\r
VarOffset = IfrCheckBox->Question.VarStoreInfo.VarOffset;\r
- VarWidth = sizeof (BOOLEAN);\r
+ VarWidth = (UINT16) sizeof (BOOLEAN);\r
\r
//\r
// Check whether this question is in requested block array.\r
//\r
if ((IfrCheckBox->Flags & EFI_IFR_CHECKBOX_DEFAULT) == EFI_IFR_CHECKBOX_DEFAULT) {\r
//\r
- // Set standard ID to Manufacture ID and Get DefaultName String ID\r
+ // Set standard ID to Manufacture ID\r
//\r
VarDefaultId = EFI_HII_DEFAULT_CLASS_STANDARD;\r
- Status = FindDefaultName (DefaultIdArray, VarDefaultId, &VarDefaultName);\r
- if (EFI_ERROR (Status)) {\r
- goto Done;\r
- }\r
//\r
// Prepare new DefaultValue\r
//\r
}\r
DefaultData->OpCode = IfrOpHdr->OpCode;\r
DefaultData->DefaultId = VarDefaultId;\r
- DefaultData->DefaultName = VarDefaultName;\r
DefaultData->Value = 1;\r
//\r
// Add DefaultValue into current BlockData\r
\r
if ((IfrCheckBox->Flags & EFI_IFR_CHECKBOX_DEFAULT_MFG) == EFI_IFR_CHECKBOX_DEFAULT_MFG) {\r
//\r
- // Set standard ID to Manufacture ID and Get DefaultName String ID\r
+ // Set standard ID to Manufacture ID\r
//\r
VarDefaultId = EFI_HII_DEFAULT_CLASS_MANUFACTURING;\r
- Status = FindDefaultName (DefaultIdArray, VarDefaultId, &VarDefaultName);\r
- if (EFI_ERROR (Status)) {\r
- goto Done;\r
- }\r
//\r
// Prepare new DefaultValue\r
//\r
}\r
DefaultData->OpCode = IfrOpHdr->OpCode;\r
DefaultData->DefaultId = VarDefaultId;\r
- DefaultData->DefaultName = VarDefaultName;\r
DefaultData->Value = 1;\r
//\r
// Add DefaultValue into current BlockData\r
// Invalid ordered list option data type.\r
//\r
Status = EFI_INVALID_PARAMETER;\r
+ FreePool (BlockData);\r
goto Done;\r
}\r
+\r
//\r
// Calculate Ordered list QuestionId width.\r
//\r
BlockData->Width = (UINT16) (BlockData->Width * VarWidth);\r
+ //\r
+ // Check whether this question is in requested block array.\r
+ //\r
+ if (!BlockArrayCheck (RequestBlockArray, BlockData->Offset, BlockData->Width)) {\r
+ //\r
+ // This question is not in the requested string. Skip it.\r
+ //\r
+ FreePool (BlockData);\r
+ BlockData = NULL;\r
+ break;\r
+ }\r
+ //\r
+ // Check this var question is in the var storage \r
+ //\r
+ if ((BlockData->Offset + BlockData->Width) > VarStorageData->Size) {\r
+ Status = EFI_INVALID_PARAMETER;\r
+ FreePool (BlockData);\r
+ goto Done;\r
+ }\r
+ //\r
+ // Add Block Data into VarStorageData BlockEntry\r
+ //\r
+ InsertBlockData (&VarStorageData->BlockEntry, &BlockData);\r
+ //\r
+ // No default data for OrderedList.\r
+ //\r
BlockData = NULL;\r
break;\r
}\r
\r
- if ((IfrOneOfOption->Flags & EFI_IFR_OPTION_DEFAULT) == EFI_IFR_OPTION_DEFAULT) {\r
+ if (((IfrOneOfOption->Flags & EFI_IFR_OPTION_DEFAULT) == EFI_IFR_OPTION_DEFAULT) ||\r
+ (BlockData->OpCode == EFI_IFR_ONE_OF_OP && FirstOneOfOption)) {\r
//\r
- // Set standard ID to Manufacture ID and Get DefaultName String ID\r
+ // This flag is used to specify whether this option is the first. Set it to FALSE for the following options. \r
+ // The first oneof option value will be used as default value when no default value is specified. \r
+ //\r
+ FirstOneOfOption = FALSE;\r
+ //\r
+ // Set standard ID to Manufacture ID\r
//\r
VarDefaultId = EFI_HII_DEFAULT_CLASS_STANDARD;\r
- Status = FindDefaultName (DefaultIdArray, VarDefaultId, &VarDefaultName);\r
- if (EFI_ERROR (Status)) {\r
- goto Done;\r
- }\r
//\r
// Prepare new DefaultValue\r
//\r
}\r
DefaultData->OpCode = IfrOpHdr->OpCode;\r
DefaultData->DefaultId = VarDefaultId;\r
- DefaultData->DefaultName = VarDefaultName;\r
DefaultData->Value = IfrOneOfOption->Value.u64;\r
//\r
// Add DefaultValue into current BlockData\r
\r
if ((IfrOneOfOption->Flags & EFI_IFR_OPTION_DEFAULT_MFG) == EFI_IFR_OPTION_DEFAULT_MFG) {\r
//\r
- // Set default ID to Manufacture ID and Get DefaultName String ID\r
+ // Set default ID to Manufacture ID\r
//\r
VarDefaultId = EFI_HII_DEFAULT_CLASS_MANUFACTURING;\r
- Status = FindDefaultName (DefaultIdArray, VarDefaultId, &VarDefaultName);\r
- if (EFI_ERROR (Status)) {\r
- goto Done;\r
- }\r
//\r
// Prepare new DefaultValue\r
//\r
}\r
DefaultData->OpCode = IfrOpHdr->OpCode;\r
DefaultData->DefaultId = VarDefaultId;\r
- DefaultData->DefaultName = VarDefaultName;\r
DefaultData->Value = IfrOneOfOption->Value.u64;\r
//\r
// Add DefaultValue into current BlockData\r
break;\r
}\r
//\r
- // Get the DefaultId and DefaultName String ID\r
+ // Get the DefaultId\r
//\r
IfrDefault = (EFI_IFR_DEFAULT *) IfrOpHdr;\r
VarDefaultId = IfrDefault->DefaultId;\r
- Status = FindDefaultName (DefaultIdArray, VarDefaultId, &VarDefaultName);\r
- if (EFI_ERROR (Status)) {\r
- goto Done;\r
- }\r
//\r
// Prepare new DefaultValue\r
//\r
}\r
DefaultData->OpCode = IfrOpHdr->OpCode;\r
DefaultData->DefaultId = VarDefaultId;\r
- DefaultData->DefaultName = VarDefaultName;\r
DefaultData->Value = IfrDefault->Value.u64;\r
//\r
// Add DefaultValue into current BlockData\r
When Request points to NULL, the default value string \r
for each varstore in form package will be merged into \r
a <MultiConfigAltResp> format string and return.\r
+ @param PointerProgress Optional parameter, it can be be NULL. \r
+ When it is not NULL, if Request is NULL, it returns NULL. \r
+ On return, points to a character in the Request\r
+ string. Points to the string's null terminator if\r
+ request was successful. Points to the most recent\r
+ & before the first failing name / value pair (or\r
+ the beginning of the string if the failure is in\r
+ the first name / value pair) if the request was\r
+ not successful.\r
@retval EFI_SUCCESS The Results string is set to the full request string.\r
And AltCfgResp contains all default value string.\r
@retval EFI_OUT_OF_RESOURCES Not enough memory for the return string.\r
@retval EFI_NOT_FOUND The varstore (Guid and Name) in Request string \r
can't be found in Form package.\r
@retval EFI_NOT_FOUND HiiPackage can't be got on the input HiiHandle.\r
- @retval EFI_INVALID_PARAMETER *Request points to NULL.\r
+ @retval EFI_INVALID_PARAMETER Request points to NULL.\r
\r
**/\r
EFI_STATUS\r
IN HII_DATABASE_RECORD *DataBaseRecord,\r
IN EFI_DEVICE_PATH_PROTOCOL *DevicePath,\r
IN OUT EFI_STRING *Request,\r
- IN OUT EFI_STRING *AltCfgResp\r
+ IN OUT EFI_STRING *AltCfgResp,\r
+ OUT EFI_STRING *PointerProgress OPTIONAL\r
)\r
{\r
EFI_STATUS Status;\r
EFI_STRING NameStr;\r
EFI_STRING PathStr;\r
EFI_STRING StringPtr;\r
+ EFI_STRING Progress;\r
UINTN Length;\r
UINT8 *TmpBuffer;\r
UINT16 Offset;\r
LIST_ENTRY *LinkDefault;\r
BOOLEAN DataExist;\r
\r
+ if (DataBaseRecord == NULL || DevicePath == NULL || Request == NULL || AltCfgResp == NULL) {\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+\r
//\r
// Initialize the local variables.\r
//\r
ResultSize = 0;\r
PackageSize = 0;\r
DataExist = FALSE;\r
+ Progress = *Request;\r
\r
//\r
// 0. Get Hii Form Package by HiiHandle\r
//\r
StringPtr = NULL;\r
if (*Request != NULL) {\r
- StringPtr = StrStr (*Request, L"&OFFSET=");\r
+ StringPtr = *Request;\r
+ //\r
+ // Jump <ConfigHdr>\r
+ //\r
+ if (StrnCmp (StringPtr, L"GUID=", StrLen (L"GUID=")) != 0) {\r
+ Status = EFI_INVALID_PARAMETER;\r
+ goto Done;\r
+ }\r
+ StringPtr += StrLen (L"GUID=");\r
+ while (*StringPtr != L'\0' && StrnCmp (StringPtr, L"&NAME=", StrLen (L"&NAME=")) != 0) {\r
+ StringPtr++;\r
+ }\r
+ if (*StringPtr == L'\0') {\r
+ Status = EFI_INVALID_PARAMETER;\r
+ goto Done;\r
+ }\r
+ StringPtr += StrLen (L"&NAME=");\r
+ while (*StringPtr != L'\0' && StrnCmp (StringPtr, L"&PATH=", StrLen (L"&PATH=")) != 0) {\r
+ StringPtr++;\r
+ }\r
+ if (*StringPtr == L'\0') {\r
+ Status = EFI_INVALID_PARAMETER;\r
+ goto Done;\r
+ }\r
+ StringPtr += StrLen (L"&PATH=");\r
+ while (*StringPtr != L'\0' && *StringPtr != L'&') {\r
+ StringPtr ++;\r
+ }\r
+ //\r
+ // Check the following string &OFFSET=\r
+ //\r
+ if (*StringPtr != L'\0' && StrnCmp (StringPtr, L"&OFFSET=", StrLen (L"&OFFSET=")) != 0) {\r
+ Progress = StringPtr;\r
+ Status = EFI_INVALID_PARAMETER;\r
+ goto Done;\r
+ } else if (*StringPtr == L'\0') {\r
+ //\r
+ // No request block is found.\r
+ //\r
+ StringPtr = NULL;\r
+ }\r
}\r
if (StringPtr != NULL) {\r
//\r
while (*StringPtr != 0 && StrnCmp (StringPtr, L"&OFFSET=", StrLen (L"&OFFSET=")) == 0) {\r
//\r
// Skip the OFFSET string\r
- // \r
+ //\r
+ Progress = StringPtr;\r
StringPtr += StrLen (L"&OFFSET=");\r
//\r
// Get Offset\r
// Compute the length of the entire request starting with <ConfigHdr> and a \r
// Null-terminator\r
//\r
- DataExist = FALSE;\r
- Length = StrLen (ConfigHdr) + 1;\r
+ DataExist = FALSE;\r
+ Length = StrLen (ConfigHdr) + 1;\r
\r
for (Link = VarStorageData->BlockEntry.ForwardLink; Link != &VarStorageData->BlockEntry; Link = Link->ForwardLink) {\r
//\r
(1 + StrLen (ConfigHdr) + 8 + 4 + 1) * sizeof (CHAR16), \r
L"&%s&ALTCFG=%04X", \r
ConfigHdr, \r
- DefaultId->DefaultName\r
+ DefaultId->DefaultId\r
);\r
StringPtr += StrLen (StringPtr);\r
\r
FreePool (HiiFormPackage);\r
}\r
\r
+ if (PointerProgress != NULL) {\r
+ if (*Request == NULL) {\r
+ *PointerProgress = NULL;\r
+ } else if (EFI_ERROR (Status)) {\r
+ *PointerProgress = Progress;\r
+ } else {\r
+ *PointerProgress = *Request + StrLen (*Request);\r
+ }\r
+ }\r
+\r
return Status;\r
}\r
\r
Link = Link->ForwardLink\r
) {\r
Database = CR (Link, HII_DATABASE_RECORD, DatabaseEntry, HII_DATABASE_RECORD_SIGNATURE);\r
- \r
if ((DevicePathPkg = Database->PackageList->DevicePathPkg) != NULL) {\r
CurrentDevicePath = DevicePathPkg + sizeof (EFI_HII_PACKAGE_HEADER);\r
if (CompareMem (\r
// Get the full request string from IFR when HiiPackage is registered to HiiHandle \r
//\r
IfrDataParsedFlag = TRUE;\r
- Status = GetFullStringFromHiiFormPackages (Database, DevicePath, &ConfigRequest, &DefaultResults);\r
+ Status = GetFullStringFromHiiFormPackages (Database, DevicePath, &ConfigRequest, &DefaultResults, &AccessProgress);\r
if (EFI_ERROR (Status)) {\r
+ //\r
+ // AccessProgress indicates the parsing progress on <ConfigRequest>.\r
+ // Map it to the progress on <MultiConfigRequest> then return it.\r
+ //\r
+ *Progress = StrStr (StringPtr, AccessProgress);\r
goto Done;\r
}\r
//\r
//\r
// Update AccessResults by getting default setting from IFR when HiiPackage is registered to HiiHandle \r
//\r
- if (HiiHandle != NULL) {\r
- if (!IfrDataParsedFlag) {\r
- Status = GetFullStringFromHiiFormPackages (Database, DevicePath, &ConfigRequest, &AccessResults);\r
- } else if (DefaultResults != NULL) {\r
- Status = MergeDefaultString (&AccessResults, DefaultResults);\r
- FreePool (DefaultResults);\r
- DefaultResults = NULL;\r
- }\r
+ if (!IfrDataParsedFlag && HiiHandle != NULL) {\r
+ Status = GetFullStringFromHiiFormPackages (Database, DevicePath, &ConfigRequest, &DefaultResults, NULL);\r
+ ASSERT_EFI_ERROR (Status);\r
}\r
+\r
FreePool (DevicePath);\r
DevicePath = NULL;\r
- \r
- if (EFI_ERROR (Status)) {\r
- goto Done;\r
- }\r
\r
+ if (DefaultResults != NULL) {\r
+ Status = MergeDefaultString (&AccessResults, DefaultResults);\r
+ ASSERT_EFI_ERROR (Status);\r
+ FreePool (DefaultResults);\r
+ DefaultResults = NULL;\r
+ }\r
+ \r
NextConfigString: \r
if (!FirstElement) {\r
Status = AppendToMultiString (Results, L"&");\r
EFI_STRING AccessResults;\r
EFI_STRING Progress;\r
EFI_STRING StringPtr;\r
+ EFI_STRING ConfigRequest;\r
UINTN Index;\r
EFI_HANDLE *ConfigAccessHandles;\r
UINTN NumberConfigAccessHandles;\r
HII_DATABASE_RECORD *Database;\r
UINT8 *DevicePathPkg;\r
UINT8 *CurrentDevicePath;\r
+ BOOLEAN IfrDataParsedFlag;\r
\r
if (This == NULL || Results == NULL) {\r
return EFI_INVALID_PARAMETER;\r
//\r
// Get DevicePath and HiiHandle for this ConfigAccess driver handle\r
//\r
+ IfrDataParsedFlag = FALSE;\r
Progress = NULL;\r
HiiHandle = NULL;\r
DefaultResults = NULL;\r
Database = NULL;\r
+ ConfigRequest = NULL;\r
DevicePath = DevicePathFromHandle (ConfigAccessHandles[Index]);\r
if (DevicePath != NULL) {\r
for (Link = Private->DatabaseList.ForwardLink;\r
&Progress,\r
&AccessResults\r
);\r
- if (!EFI_ERROR (Status)) {\r
+ if (EFI_ERROR (Status)) {\r
//\r
// Update AccessResults by getting default setting from IFR when HiiPackage is registered to HiiHandle \r
//\r
if (HiiHandle != NULL && DevicePath != NULL) {\r
+ IfrDataParsedFlag = TRUE;\r
+ Status = GetFullStringFromHiiFormPackages (Database, DevicePath, &ConfigRequest, &DefaultResults, NULL);\r
+ //\r
+ // Get the full request string to get the Current setting again.\r
+ //\r
+ if (!EFI_ERROR (Status) && ConfigRequest != NULL) {\r
+ Status = ConfigAccess->ExtractConfig (\r
+ ConfigAccess,\r
+ ConfigRequest,\r
+ &Progress,\r
+ &AccessResults\r
+ );\r
+ FreePool (ConfigRequest);\r
+ } else {\r
+ Status = EFI_NOT_FOUND;\r
+ }\r
+ }\r
+ }\r
+\r
+ if (!EFI_ERROR (Status)) {\r
+ //\r
+ // Update AccessResults by getting default setting from IFR when HiiPackage is registered to HiiHandle \r
+ //\r
+ if (!IfrDataParsedFlag && HiiHandle != NULL && DevicePath != NULL) {\r
StringPtr = StrStr (AccessResults, L"&GUID=");\r
if (StringPtr != NULL) {\r
*StringPtr = 0;\r
}\r
if (StrStr (AccessResults, L"&OFFSET=") != NULL) {\r
- Status = GetFullStringFromHiiFormPackages (Database, DevicePath, &AccessResults, &DefaultResults);\r
+ Status = GetFullStringFromHiiFormPackages (Database, DevicePath, &AccessResults, &DefaultResults, NULL);\r
+ ASSERT_EFI_ERROR (Status);\r
}\r
if (StringPtr != NULL) {\r
*StringPtr = L'&';\r
// Get Offset\r
//\r
Status = GetValueOfNumber (StringPtr, &TmpBuffer, &Length);\r
- if (Status == EFI_OUT_OF_RESOURCES) {\r
+ if (EFI_ERROR (Status)) {\r
*Progress = ConfigRequest;\r
goto Exit;\r
}\r
// Get Width\r
//\r
Status = GetValueOfNumber (StringPtr, &TmpBuffer, &Length);\r
- if (Status == EFI_OUT_OF_RESOURCES) {\r
+ if (EFI_ERROR (Status)) {\r
*Progress = ConfigRequest;\r
goto Exit;\r
}\r
@param This A pointer to the EFI_HII_CONFIG_ROUTING_PROTOCOL\r
instance.\r
@param ConfigResp A null-terminated Unicode string in <ConfigResp>\r
- format. It can be ConfigAltResp format string.\r
+ format.\r
@param Block A possibly null array of bytes representing the\r
current block. Only bytes referenced in the\r
ConfigResp string in the block are modified. If\r
value pair. Block is left updated and\r
Progress points at the '&' preceding the first\r
non-<BlockName>.\r
+ @retval EFI_DEVICE_ERROR Block not large enough. Progress undefined.\r
+ @retval EFI_NOT_FOUND Target for the specified routing data was not found.\r
+ Progress points to the "G" in "GUID" of the errant\r
+ routing data.\r
\r
**/\r
EFI_STATUS\r
UINTN Width;\r
UINT8 *Value;\r
UINTN BufferSize;\r
+ UINTN MaxBlockSize;\r
\r
if (This == NULL || BlockSize == NULL || Progress == NULL) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
- if (ConfigResp == NULL || Block == NULL) {\r
- *Progress = ConfigResp;\r
+ *Progress = ConfigResp;\r
+ if (ConfigResp == NULL) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
StringPtr = ConfigResp;\r
BufferSize = *BlockSize;\r
Value = NULL;\r
+ MaxBlockSize = 0;\r
\r
//\r
// Jump <ConfigHdr>\r
// Get Width\r
//\r
Status = GetValueOfNumber (StringPtr, &TmpBuffer, &Length);\r
- if (Status == EFI_OUT_OF_RESOURCES) {\r
+ if (EFI_ERROR (Status)) {\r
*Progress = ConfigResp;\r
goto Exit;\r
}\r
//\r
// Update the Block with configuration info\r
//\r
-\r
- if (Offset + Width > BufferSize) {\r
- return EFI_DEVICE_ERROR;\r
+ if ((Block != NULL) && (Offset + Width <= BufferSize)) {\r
+ CopyMem (Block + Offset, Value, Width);\r
+ }\r
+ if (Offset + Width > MaxBlockSize) {\r
+ MaxBlockSize = Offset + Width;\r
}\r
-\r
- CopyMem (Block + Offset, Value, Width);\r
- *BlockSize = Offset + Width - 1;\r
\r
FreePool (Value);\r
Value = NULL;\r
}\r
\r
*Progress = StringPtr + StrLen (StringPtr);\r
+ *BlockSize = MaxBlockSize - 1;\r
+\r
+ if (MaxBlockSize > BufferSize) {\r
+ *BlockSize = MaxBlockSize;\r
+ if (Block != NULL) {\r
+ return EFI_DEVICE_ERROR;\r
+ }\r
+ }\r
+\r
+ if (Block == NULL) {\r
+ *Progress = ConfigResp;\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+\r
return EFI_SUCCESS;\r
\r
Exit:\r
@param This A pointer to the EFI_HII_CONFIG_ROUTING_PROTOCOL\r
instance.\r
@param Configuration A null-terminated Unicode string in\r
- <MultiConfigAltResp> format. It is <ConfigAltResp> format.\r
+ <MultiConfigAltResp> format.\r
@param Guid A pointer to the GUID value to search for in the\r
routing portion of the ConfigResp string when\r
retrieving the requested data. If Guid is NULL,\r