Main file for BCFG command.\r
\r
(C) Copyright 2014-2015 Hewlett-Packard Development Company, L.P.<BR>\r
- Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r
+ Copyright (c) 2010 - 2018, 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
**/\r
EFI_STATUS\r
UpdateOptionalData(\r
- UINT16 Index, \r
- UINTN DataSize, \r
+ UINT16 Index,\r
+ UINTN DataSize,\r
UINT8 *Data,\r
IN CONST BCFG_OPERATION_TARGET Target\r
)\r
UINTN OriginalOptionDataSize;\r
\r
UnicodeSPrint(VariableName, sizeof(VariableName), L"%s%04x", Target == BcfgTargetBootOrder?L"Boot":L"Driver", Index);\r
- \r
+\r
OriginalSize = 0;\r
OriginalData = NULL;\r
NewData = NULL;\r
OriginalOptionDataSize += (*(UINT16*)(OriginalData + sizeof(UINT32)));\r
OriginalOptionDataSize -= OriginalSize;\r
NewSize = OriginalSize - OriginalOptionDataSize + DataSize;\r
- NewData = AllocateCopyPool(NewSize, OriginalData);\r
+ NewData = AllocatePool(NewSize);\r
if (NewData == NULL) {\r
Status = EFI_OUT_OF_RESOURCES;\r
} else {\r
+ CopyMem (NewData, OriginalData, OriginalSize - OriginalOptionDataSize);\r
CopyMem(NewData + OriginalSize - OriginalOptionDataSize, Data, DataSize);\r
}\r
}\r
// put the data back under the variable\r
//\r
Status = gRT->SetVariable(\r
- VariableName, \r
+ VariableName,\r
(EFI_GUID*)&gEfiGlobalVariableGuid,\r
EFI_VARIABLE_NON_VOLATILE|EFI_VARIABLE_BOOTSERVICE_ACCESS|EFI_VARIABLE_RUNTIME_ACCESS,\r
NewSize,\r
**/\r
EFI_STATUS\r
GetBootOptionCrc(\r
- UINT32 *Crc, \r
+ UINT32 *Crc,\r
UINT16 BootIndex\r
)\r
{\r
ShellStatus = SHELL_SUCCESS;\r
FileList = NULL;\r
DevicePath = NULL;\r
+ DevicePathBuffer = NULL;\r
\r
ZeroMem (&LoadOption, sizeof(EFI_BOOT_MANAGER_LOAD_OPTION));\r
\r
(VOID**)&FilePath);\r
}\r
if (EFI_ERROR (Status)) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_HANDLE), gShellBcfgHiiHandle, L"bcfg", HandleNumber); \r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_HANDLE), gShellBcfgHiiHandle, L"bcfg", HandleNumber);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
}\r
} else {\r
|| ParentControllerHandleCount > 0\r
|| ChildControllerHandleCount > 0\r
|| !EFI_ERROR(Status) ) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellBcfgHiiHandle, L"bcfg", L"Handle Number"); \r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellBcfgHiiHandle, L"bcfg", L"Handle Number");\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
//\r
//\r
// If filename matched nothing fail\r
//\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_OPEN_FAIL), gShellBcfgHiiHandle, L"bcfg", File); \r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_OPEN_FAIL), gShellBcfgHiiHandle, L"bcfg", File);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else if (FileList->Link.ForwardLink != FileList->Link.BackLink) {\r
//\r
// If filename expanded to multiple names, fail\r
//\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_FILE), gShellBcfgHiiHandle, L"bcfg", File); \r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_FILE), gShellBcfgHiiHandle, L"bcfg", File);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
Arg = (EFI_SHELL_FILE_INFO*)GetFirstNode(&FileList->Link);\r
if (EFI_ERROR(Arg->Status)) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_FILE_OPEN), gShellBcfgHiiHandle, L"bcfg", File); \r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_FILE_OPEN), gShellBcfgHiiHandle, L"bcfg", File);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
//\r
//\r
DevicePath = gEfiShellProtocol->GetDevicePathFromFilePath(Arg->FullName);\r
if (DevicePath == NULL) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_FILE_DP), gShellBcfgHiiHandle, L"bcfg", Arg->FullName); \r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_FILE_DP), gShellBcfgHiiHandle, L"bcfg", Arg->FullName);\r
ShellStatus = SHELL_UNSUPPORTED;\r
} else {\r
if (UsePath) {\r
}\r
\r
if (TargetLocation == 0xFFFF) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_TARGET_NF), gShellBcfgHiiHandle, L"bcfg"); \r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_TARGET_NF), gShellBcfgHiiHandle, L"bcfg");\r
} else {\r
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_TARGET), gShellBcfgHiiHandle, TargetLocation);\r
}\r
}\r
\r
if (EFI_ERROR(Status)) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_SET_VAR_FAIL), gShellBcfgHiiHandle, L"bcfg", OptionStr); \r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_SET_VAR_FAIL), gShellBcfgHiiHandle, L"bcfg", OptionStr);\r
} else {\r
NewOrder = AllocateZeroPool ((OrderCount + 1) * sizeof (NewOrder[0]));\r
if (NewOrder != NULL) {\r
0,\r
NULL);\r
if (EFI_ERROR(Status)) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_WRITE_FAIL), gShellBcfgHiiHandle, L"bcfg", VariableName); \r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_WRITE_FAIL), gShellBcfgHiiHandle, L"bcfg", VariableName);\r
return (SHELL_INVALID_PARAMETER);\r
}\r
NewOrder = AllocateZeroPool(OrderCount*sizeof(CurrentOrder[0]));\r
Status = EFI_OUT_OF_RESOURCES;\r
}\r
if (EFI_ERROR(Status)) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_WRITE_FAIL), gShellBcfgHiiHandle, L"bcfg", Target == BcfgTargetBootOrder?(CHAR16*)L"BootOrder":(CHAR16*)L"DriverOrder"); \r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_WRITE_FAIL), gShellBcfgHiiHandle, L"bcfg", Target == BcfgTargetBootOrder?(CHAR16*)L"BootOrder":(CHAR16*)L"DriverOrder");\r
return (SHELL_INVALID_PARAMETER);\r
}\r
return (SHELL_SUCCESS);\r
FreePool(NewOrder);\r
\r
if (EFI_ERROR(Status)) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_WRITE_FAIL), gShellBcfgHiiHandle, L"bcfg", Target == BcfgTargetBootOrder?(CHAR16*)L"BootOrder":(CHAR16*)L"DriverOrder"); \r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_WRITE_FAIL), gShellBcfgHiiHandle, L"bcfg", Target == BcfgTargetBootOrder?(CHAR16*)L"BootOrder":(CHAR16*)L"DriverOrder");\r
return (SHELL_INVALID_PARAMETER);\r
}\r
return (SHELL_SUCCESS);\r
//\r
Status = ShellConvertStringToUint64(Walker, &Intermediate, FALSE, TRUE);\r
if (EFI_ERROR(Status) || (((UINT16)Intermediate) != Intermediate) || StrStr(Walker, L" ") == NULL || ((UINT16)Intermediate) > ((UINT16)OrderCount)) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellBcfgHiiHandle, L"bcfg", L"Option Index"); \r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellBcfgHiiHandle, L"bcfg", L"Option Index");\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
return (ShellStatus);\r
}\r
}\r
\r
//\r
- // determine whether we have file with data, quote delimited information, or a hot-key \r
+ // determine whether we have file with data, quote delimited information, or a hot-key\r
//\r
if (Walker[0] == L'\"') {\r
//\r
//\r
Temp = StrStr(Walker+1, L"\"");\r
if (Temp == NULL || StrLen(Temp) != 1) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellBcfgHiiHandle, L"bcfg", Walker); \r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellBcfgHiiHandle, L"bcfg", Walker);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
FileName = StrnCatGrow(&FileName, NULL, Walker+1, 0);\r
if (FileName == NULL) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_OUT_MEM), gShellBcfgHiiHandle, L"bcfg"); \r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_OUT_MEM), gShellBcfgHiiHandle, L"bcfg");\r
ShellStatus = SHELL_OUT_OF_RESOURCES;\r
return (ShellStatus);\r
}\r
Temp2[0] = CHAR_NULL;\r
Temp2++;\r
if (StrLen(Temp2)>0) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellBcfgHiiHandle, L"bcfg", Walker); \r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellBcfgHiiHandle, L"bcfg", Walker);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
}\r
if (EFI_ERROR(ShellFileExists(Walker))) {\r
// filename\r
//\r
if (EFI_ERROR(ShellFileExists(Walker))) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FIND_FAIL), gShellBcfgHiiHandle, L"bcfg", Walker); \r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FIND_FAIL), gShellBcfgHiiHandle, L"bcfg", Walker);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
FileName = StrnCatGrow(&FileName, NULL, Walker, 0);\r
}\r
} else {\r
if (Target != BcfgTargetBootOrder) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_BOOT_ONLY), gShellBcfgHiiHandle, L"bcfg"); \r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_BOOT_ONLY), gShellBcfgHiiHandle, L"bcfg");\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
}\r
\r
//\r
Status = ShellConvertStringToUint64(Walker, &Intermediate, FALSE, TRUE);\r
if (EFI_ERROR(Status) || (((UINT32)Intermediate) != Intermediate) || StrStr(Walker, L" ") == NULL) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellBcfgHiiHandle, L"bcfg", Walker); \r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellBcfgHiiHandle, L"bcfg", Walker);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
}\r
NewKeyOption.KeyData.PackedValue = (UINT32)Intermediate;\r
\r
if (ShellStatus == SHELL_SUCCESS) {\r
//\r
- // Now we know how many EFI_INPUT_KEY structs we need to attach to the end of the EFI_KEY_OPTION struct. \r
+ // Now we know how many EFI_INPUT_KEY structs we need to attach to the end of the EFI_KEY_OPTION struct.\r
// Re-allocate with the added information.\r
//\r
- KeyOptionBuffer = AllocateCopyPool(sizeof(EFI_KEY_OPTION) + (sizeof(EFI_INPUT_KEY) * NewKeyOption.KeyData.Options.InputKeyCount), &NewKeyOption);\r
+ KeyOptionBuffer = AllocatePool (sizeof(EFI_KEY_OPTION) + (sizeof(EFI_INPUT_KEY) * NewKeyOption.KeyData.Options.InputKeyCount));\r
if (KeyOptionBuffer == NULL) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_MEM), gShellBcfgHiiHandle, L"bcfg"); \r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_MEM), gShellBcfgHiiHandle, L"bcfg");\r
ShellStatus = SHELL_OUT_OF_RESOURCES;\r
+ return ShellStatus;\r
}\r
+ CopyMem (KeyOptionBuffer, &NewKeyOption, sizeof(EFI_KEY_OPTION));\r
}\r
for (LoopCounter = 0 ; ShellStatus == SHELL_SUCCESS && LoopCounter < NewKeyOption.KeyData.Options.InputKeyCount; LoopCounter++) {\r
//\r
//\r
Status = ShellConvertStringToUint64(Walker, &Intermediate, FALSE, TRUE);\r
if (EFI_ERROR(Status) || (((UINT16)Intermediate) != Intermediate) || StrStr(Walker, L" ") == NULL) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellBcfgHiiHandle, L"bcfg", Walker); \r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellBcfgHiiHandle, L"bcfg", Walker);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
}\r
((EFI_INPUT_KEY*)(((UINT8*)KeyOptionBuffer) + sizeof(EFI_KEY_OPTION)))[LoopCounter].ScanCode = (UINT16)Intermediate;\r
//\r
Status = ShellConvertStringToUint64(Walker, &Intermediate, FALSE, TRUE);\r
if (EFI_ERROR(Status) || (((UINT16)Intermediate) != Intermediate)) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellBcfgHiiHandle, L"bcfg", Walker); \r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellBcfgHiiHandle, L"bcfg", Walker);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
}\r
((EFI_INPUT_KEY*)(((UINT8*)KeyOptionBuffer) + sizeof(EFI_KEY_OPTION)))[LoopCounter].UnicodeChar = (UINT16)Intermediate;\r
KeyOptionBuffer->BootOption = CurrentOrder[OptionIndex];\r
Status = GetBootOptionCrc(&(KeyOptionBuffer->BootOptionCrc), KeyOptionBuffer->BootOption);\r
if (EFI_ERROR(Status)) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellBcfgHiiHandle, L"bcfg", L"Option Index"); \r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellBcfgHiiHandle, L"bcfg", L"Option Index");\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
- } \r
+ }\r
}\r
\r
if (ShellStatus == SHELL_SUCCESS) {\r
sizeof(EFI_KEY_OPTION) + (sizeof(EFI_INPUT_KEY) * NewKeyOption.KeyData.Options.InputKeyCount),\r
KeyOptionBuffer);\r
if (EFI_ERROR(Status)) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_SET_VAR_FAIL), gShellBcfgHiiHandle, L"bcfg", VariableName); \r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_SET_VAR_FAIL), gShellBcfgHiiHandle, L"bcfg", VariableName);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
- } \r
+ }\r
} else {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_VAR_NO_NUM), gShellBcfgHiiHandle, L"bcfg"); \r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_VAR_NO_NUM), gShellBcfgHiiHandle, L"bcfg");\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
}\r
ASSERT(FileName == NULL && Data == NULL);\r
}\r
Data = AllocateZeroPool((UINTN)Intermediate);\r
if (Data == NULL) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_MEM), gShellBcfgHiiHandle, L"bcfg"); \r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_MEM), gShellBcfgHiiHandle, L"bcfg");\r
ShellStatus = SHELL_OUT_OF_RESOURCES;\r
}\r
if (!EFI_ERROR(Status)) {\r
if (!EFI_ERROR(Status) && ShellStatus == SHELL_SUCCESS && Data != NULL) {\r
Status = UpdateOptionalData(CurrentOrder[OptionIndex], (UINTN)Intermediate, (UINT8*)Data, Target);\r
if (EFI_ERROR(Status)) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_SET_VAR_FAIL), gShellBcfgHiiHandle, L"bcfg", VariableName); \r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_SET_VAR_FAIL), gShellBcfgHiiHandle, L"bcfg", VariableName);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
- } \r
+ }\r
}\r
if (EFI_ERROR(Status) && ShellStatus == SHELL_SUCCESS) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_SET_VAR_FAIL), gShellBcfgHiiHandle, L"bcfg", VariableName); \r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_SET_VAR_FAIL), gShellBcfgHiiHandle, L"bcfg", VariableName);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
- } \r
+ }\r
}\r
\r
SHELL_FREE_NON_NULL(Data);\r
UINTN OptionalDataOffset;\r
\r
if (OrderCount == 0) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN(STR_BCFG_NONE), gShellBcfgHiiHandle, L"bcfg"); \r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN(STR_BCFG_NONE), gShellBcfgHiiHandle, L"bcfg");\r
return (SHELL_SUCCESS);\r
}\r
\r
}\r
\r
if (EFI_ERROR(Status) || Buffer == NULL) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_READ_FAIL), gShellBcfgHiiHandle, L"bcfg", VariableName); \r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_READ_FAIL), gShellBcfgHiiHandle, L"bcfg", VariableName);\r
++Errors;\r
goto Cleanup;\r
}\r
Status = ShellCommandLineParse (ParamList, &Package, &ProblemParam, TRUE);\r
if (EFI_ERROR(Status)) {\r
if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellBcfgHiiHandle, L"bcfg", ProblemParam); \r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellBcfgHiiHandle, L"bcfg", ProblemParam);\r
FreePool(ProblemParam);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
if (ShellCommandLineGetFlag(Package, L"-opt")) {\r
CurrentOperation.OptData = ShellCommandLineGetValue(Package, L"-opt");\r
if (CurrentOperation.OptData == NULL) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellBcfgHiiHandle, L"bcfg", L"-opt"); \r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellBcfgHiiHandle, L"bcfg", L"-opt");\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
}\r
CurrentOperation.Type = BcfgTypeOpt;\r
if ((ShellCommandLineGetCount(Package) < 3 && CurrentOperation.Type != BcfgTypeOpt) ||\r
(ShellCommandLineGetCount(Package) < 2 && CurrentOperation.Type == BcfgTypeOpt)\r
){\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellBcfgHiiHandle, L"bcfg"); \r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellBcfgHiiHandle, L"bcfg");\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else if (gUnicodeCollation->StriColl(gUnicodeCollation, (CHAR16*)ShellCommandLineGetRawValue(Package, 1), L"driver") == 0) {\r
CurrentOperation.Target = BcfgTargetDriverOrder;\r
} else if (gUnicodeCollation->StriColl(gUnicodeCollation, (CHAR16*)ShellCommandLineGetRawValue(Package, 1), L"boot") == 0) {\r
CurrentOperation.Target = BcfgTargetBootOrder;\r
} else {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_DRIVER_BOOT), gShellBcfgHiiHandle, L"bcfg"); \r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_DRIVER_BOOT), gShellBcfgHiiHandle, L"bcfg");\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
}\r
\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
}\r
} else if (ShellCommandLineGetFlag(Package, L"-v")) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellBcfgHiiHandle, L"bcfg", L"-v (without dump)"); \r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellBcfgHiiHandle, L"bcfg", L"-v (without dump)");\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else if (gUnicodeCollation->StriColl(gUnicodeCollation, (CHAR16*)CurrentParam, L"add") == 0) {\r
if ((ParamNumber + 3) >= ShellCommandLineGetCount(Package)) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellBcfgHiiHandle, L"bcfg"); \r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellBcfgHiiHandle, L"bcfg");\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
}\r
CurrentOperation.Type = BcfgTypeAdd;\r
CurrentParam = ShellCommandLineGetRawValue(Package, ++ParamNumber);\r
if (CurrentParam == NULL || !ShellIsHexOrDecimalNumber(CurrentParam, TRUE, FALSE)) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellBcfgHiiHandle, L"bcfg", CurrentParam); \r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellBcfgHiiHandle, L"bcfg", CurrentParam);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
Status = ShellConvertStringToUint64(CurrentParam, &Intermediate, TRUE, FALSE);\r
}\r
} else if (gUnicodeCollation->StriColl(gUnicodeCollation, (CHAR16*)CurrentParam, L"addp") == 0) {\r
if ((ParamNumber + 3) >= ShellCommandLineGetCount(Package)) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellBcfgHiiHandle, L"bcfg"); \r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellBcfgHiiHandle, L"bcfg");\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
}\r
CurrentOperation.Type = BcfgTypeAddp;\r
CurrentParam = ShellCommandLineGetRawValue(Package, ++ParamNumber);\r
if (CurrentParam == NULL || !ShellIsHexOrDecimalNumber(CurrentParam, TRUE, FALSE)) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellBcfgHiiHandle, L"bcfg", CurrentParam); \r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellBcfgHiiHandle, L"bcfg", CurrentParam);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
Status = ShellConvertStringToUint64(CurrentParam, &Intermediate, TRUE, FALSE);\r
}\r
} else if (gUnicodeCollation->StriColl(gUnicodeCollation, (CHAR16*)CurrentParam, L"addh") == 0) {\r
if ((ParamNumber + 3) >= ShellCommandLineGetCount(Package)) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellBcfgHiiHandle, L"bcfg"); \r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellBcfgHiiHandle, L"bcfg");\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
}\r
CurrentOperation.Type = BcfgTypeAddh;\r
CurrentParam = ShellCommandLineGetRawValue(Package, ++ParamNumber);\r
if (CurrentParam == NULL || !ShellIsHexOrDecimalNumber(CurrentParam, TRUE, FALSE)) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellBcfgHiiHandle, L"bcfg", CurrentParam); \r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellBcfgHiiHandle, L"bcfg", CurrentParam);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
Status = ShellConvertStringToUint64(CurrentParam, &Intermediate, TRUE, FALSE);\r
CurrentOperation.Number1 = (UINT16)Intermediate;\r
CurrentParam = ShellCommandLineGetRawValue(Package, ++ParamNumber);\r
if (CurrentParam == NULL || !ShellIsHexOrDecimalNumber(CurrentParam, TRUE, FALSE)) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellBcfgHiiHandle, L"bcfg", CurrentParam); \r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellBcfgHiiHandle, L"bcfg", CurrentParam);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
Status = ShellConvertStringToUint64(CurrentParam, &Intermediate, TRUE, FALSE);\r
}\r
} else if (gUnicodeCollation->StriColl(gUnicodeCollation, (CHAR16*)CurrentParam, L"rm") == 0) {\r
if ((ParamNumber + 1) >= ShellCommandLineGetCount(Package)) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellBcfgHiiHandle, L"bcfg"); \r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellBcfgHiiHandle, L"bcfg");\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
}\r
CurrentOperation.Type = BcfgTypeRm;\r
CurrentParam = ShellCommandLineGetRawValue(Package, ++ParamNumber);\r
if (CurrentParam == NULL || !ShellIsHexOrDecimalNumber(CurrentParam, TRUE, FALSE)) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellBcfgHiiHandle, L"bcfg", CurrentParam); \r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellBcfgHiiHandle, L"bcfg", CurrentParam);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
Status = ShellConvertStringToUint64(CurrentParam, &Intermediate, TRUE, FALSE);\r
CurrentOperation.Number1 = (UINT16)Intermediate;\r
if (CurrentOperation.Number1 >= Count){\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_NUMB_RANGE), gShellBcfgHiiHandle, L"bcfg", Count); \r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_NUMB_RANGE), gShellBcfgHiiHandle, L"bcfg", Count);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
}\r
}\r
} else if (gUnicodeCollation->StriColl(gUnicodeCollation, (CHAR16*)CurrentParam, L"mv") == 0) {\r
if ((ParamNumber + 2) >= ShellCommandLineGetCount(Package)) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellBcfgHiiHandle, L"bcfg"); \r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellBcfgHiiHandle, L"bcfg");\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
}\r
CurrentOperation.Type = BcfgTypeMv;\r
CurrentParam = ShellCommandLineGetRawValue(Package, ++ParamNumber);\r
if (CurrentParam == NULL || !ShellIsHexOrDecimalNumber(CurrentParam, TRUE, FALSE)) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellBcfgHiiHandle, L"bcfg", CurrentParam); \r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellBcfgHiiHandle, L"bcfg", CurrentParam);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
Status = ShellConvertStringToUint64(CurrentParam, &Intermediate, TRUE, FALSE);\r
CurrentOperation.Number1 = (UINT16)Intermediate;\r
if (CurrentOperation.Number1 >= Count){\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_NUMB_RANGE), gShellBcfgHiiHandle, L"bcfg", Count); \r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_NUMB_RANGE), gShellBcfgHiiHandle, L"bcfg", Count);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
CurrentParam = ShellCommandLineGetRawValue(Package, ++ParamNumber);\r
if (CurrentParam == NULL || !ShellIsHexOrDecimalNumber(CurrentParam, TRUE, FALSE)) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellBcfgHiiHandle, L"bcfg", CurrentParam); \r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellBcfgHiiHandle, L"bcfg", CurrentParam);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
Status = ShellConvertStringToUint64(CurrentParam, &Intermediate, TRUE, FALSE);\r
if (CurrentOperation.Number2 == CurrentOperation.Number1\r
||CurrentOperation.Number2 >= Count\r
){\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_NUMB_RANGE), gShellBcfgHiiHandle, L"bcfg", Count); \r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_NUMB_RANGE), gShellBcfgHiiHandle, L"bcfg", Count);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
}\r
}\r
}\r
}\r
} else {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellBcfgHiiHandle, L"bcfg", CurrentParam); \r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellBcfgHiiHandle, L"bcfg", CurrentParam);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
}\r
}\r