/** @file\r
- Main file for bcfg shell install1 function.\r
+ Main file for bcfg shell Debug1 function.\r
\r
- Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>\r
+ Copyright (c) 2010 - 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
#include <Library/DevicePathLib.h>\r
\r
typedef enum {\r
- BCFG_TARGET_BOOT_ORDER = 0,\r
- BCFG_TARGET_DRIVER_ORDER = 1,\r
- BCFG_TARGET_MAX = 2\r
+ BcfgTargetBootOrder = 0,\r
+ BcfgTargetDriverOrder = 1,\r
+ BcfgTargetMax = 2\r
} BCFG_OPERATION_TARGET;\r
\r
typedef enum {\r
- BCFG_TYPE_DUMP = 0,\r
- BCFG_TYPE_ADD = 1,\r
- BCFG_TYPE_ADDP = 2,\r
- BCFG_TYPE_ADDH = 3,\r
- BCFG_TYPE_RM = 4,\r
- BCFG_TYPE_MV = 5,\r
- BCFG_TYPE_OPT = 6,\r
- BCFG_TYPE_MAX = 7\r
+ BcfgTypeDump = 0,\r
+ BcfgTypeAdd = 1,\r
+ BcfgTypeAddp = 2,\r
+ BcfgTypeAddh = 3,\r
+ BcfgTypeRm = 4,\r
+ BcfgTypeMv = 5,\r
+ BcfgTypeOpt = 6,\r
+ BcfgTypeMax = 7\r
} BCFG_OPERATION_TYPE;\r
\r
typedef struct {\r
CONST CHAR16 *OptData;\r
} BGFG_OPERATION;\r
\r
+/**\r
+ Function to add a option.\r
+\r
+ @param[in] Position The position to add Target at.\r
+ @param[in] File The file to make the target.\r
+ @param[in] Desc The description text.\r
+ @param[in] CurrentOrder The pointer to the current order of items.\r
+ @param[in] OrderCount The number if items in CurrentOrder.\r
+ @param[in] Target The info on the option to add.\r
+ @param[in] UseHandle TRUE to use HandleNumber, FALSE to use File and Desc.\r
+ @param[in] UsePath TRUE to convert to devicepath.\r
+ @param[in] HandleNumber The handle number to add.\r
+\r
+ @retval SHELL_SUCCESS The operation was successful.\r
+ @retval SHELL_INVALID_PARAMETER A parameter was invalid.\r
+**/\r
SHELL_STATUS\r
EFIAPI\r
-BcfgAdd (\r
+BcfgAddDebug1(\r
IN UINTN Position,\r
IN CONST CHAR16 *File,\r
IN CONST CHAR16 *Desc,\r
)\r
{\r
EFI_STATUS Status;\r
- EFI_DEVICE_PATH_PROTOCOL *DevicePath, *FilePath, *FileNode, *DevPath;\r
+ EFI_DEVICE_PATH_PROTOCOL *DevicePath;\r
+ EFI_DEVICE_PATH_PROTOCOL *FilePath;\r
+ EFI_DEVICE_PATH_PROTOCOL *FileNode;\r
+ EFI_DEVICE_PATH_PROTOCOL *DevPath;\r
CHAR16 *Str;\r
- CONST CHAR16 *p;\r
- UINT8 *p8;\r
+ CONST CHAR16 *StringWalker;\r
+ UINT8 *TempByteBuffer;\r
+ UINT8 *TempByteStart;\r
EFI_SHELL_FILE_INFO *Arg;\r
EFI_SHELL_FILE_INFO *FileList;\r
CHAR16 OptionStr[40];\r
UINTN ChildControllerHandleCount;\r
SHELL_STATUS ShellStatus;\r
UINT16 *NewOrder;\r
+ UINT64 Intermediate;\r
\r
if (!UseHandle) {\r
- ASSERT(File != NULL);\r
- ASSERT(Desc != NULL);\r
+ if (File == NULL || Desc == NULL) {\r
+ return (SHELL_INVALID_PARAMETER);\r
+ }\r
} else {\r
- ASSERT(HandleNumber != 0);\r
+ if (HandleNumber == 0) {\r
+ return (SHELL_INVALID_PARAMETER);\r
+ }\r
}\r
\r
- ASSERT(Position <= (OrderCount+1));\r
+ if (Position > OrderCount) {\r
+ Position = OrderCount;\r
+ }\r
\r
Str = NULL;\r
FilePath = NULL;\r
ShellStatus = SHELL_SUCCESS;\r
TargetLocation = 0xFFFF;\r
\r
-// if (Position > 0) {\r
-// Position--;\r
-// }\r
-\r
if (UseHandle) {\r
- CurHandle = ConvertHandleIndexToHandle(StrHexToUintn(File));\r
- if (CurHandle == NULL) {\r
+ Status = ShellConvertStringToUint64(File, &Intermediate, TRUE, FALSE);\r
+ CurHandle = ConvertHandleIndexToHandle((UINTN)Intermediate);\r
+ if (CurHandle == NULL || EFI_ERROR(Status)) {\r
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDebug1HiiHandle, File);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
(VOID**)&FilePath);\r
}\r
if (EFI_ERROR (Status)) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_HANDLE), gShellDebug1HiiHandle, StrHexToUintn(File));\r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_HANDLE), gShellDebug1HiiHandle, Intermediate);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
}\r
}\r
//\r
ShellOpenFileMetaArg ((CHAR16*)File, EFI_FILE_MODE_READ, &FileList);\r
\r
- //\r
- // If filename expanded to multiple names, fail\r
- //\r
- if (FileList == NULL || FileList->Link.ForwardLink != FileList->Link.BackLink) {\r
+ if (FileList == NULL) {\r
+ //\r
+ // If filename matched nothing fail\r
+ //\r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_OPEN_FAIL), gShellDebug1HiiHandle, 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), gShellDebug1HiiHandle, File);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
// get the device path\r
//\r
DevicePath = mEfiShellProtocol->GetDevicePathFromFilePath(Arg->FullName);\r
- if (DevicePath != NULL) {\r
+ if (DevicePath == NULL) {\r
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_FILE_DP), gShellDebug1HiiHandle, Arg->FullName);\r
ShellStatus = SHELL_UNSUPPORTED;\r
} else {\r
//\r
// append the file\r
//\r
- for(p=Arg->FullName; *p != CHAR_NULL && *p != ':'; p++);\r
- FileNode = FileDevicePath(NULL, p+1);\r
+ for(StringWalker=Arg->FullName; *StringWalker != CHAR_NULL && *StringWalker != ':'; StringWalker++);\r
+ FileNode = FileDevicePath(NULL, StringWalker+1);\r
FilePath = AppendDevicePath(DevicePath, FileNode);\r
FreePool(FileNode);\r
} else {\r
// Find a free target ,a brute force implementation\r
//\r
Found = FALSE;\r
- for (TargetLocation=1; TargetLocation < 0xFFFF; TargetLocation++) {\r
+ for (TargetLocation=0; TargetLocation < 0xFFFF; TargetLocation++) {\r
Found = TRUE;\r
for (Index=0; Index < OrderCount; Index++) {\r
if (CurrentOrder[Index] == TargetLocation) {\r
DescSize = StrSize(Desc);\r
FilePathSize = GetDevicePathSize (FilePath);\r
\r
- p8 = AllocatePool(sizeof(UINT32) + sizeof(UINT16) + DescSize + FilePathSize);\r
- *((UINT32 *) p8) = LOAD_OPTION_ACTIVE; // Attributes\r
- p8 += sizeof (UINT32);\r
+ TempByteBuffer = AllocateZeroPool(sizeof(UINT32) + sizeof(UINT16) + DescSize + FilePathSize);\r
+ TempByteStart = TempByteBuffer;\r
+ *((UINT32 *) TempByteBuffer) = LOAD_OPTION_ACTIVE; // Attributes\r
+ TempByteBuffer += sizeof (UINT32);\r
\r
- *((UINT16 *) p8) = (UINT16)FilePathSize; // FilePathListLength\r
- p8 += sizeof (UINT16);\r
+ *((UINT16 *) TempByteBuffer) = (UINT16)FilePathSize; // FilePathListLength\r
+ TempByteBuffer += sizeof (UINT16);\r
\r
- CopyMem (p8, Desc, DescSize);\r
- p8 += DescSize;\r
- CopyMem (p8, FilePath, FilePathSize);\r
+ CopyMem (TempByteBuffer, Desc, DescSize);\r
+ TempByteBuffer += DescSize;\r
+ CopyMem (TempByteBuffer, FilePath, FilePathSize);\r
\r
- UnicodeSPrint (OptionStr, sizeof(OptionStr), L"%s%04x", Target == BCFG_TARGET_BOOT_ORDER?L"Boot":L"Driver", TargetLocation);\r
+ UnicodeSPrint (OptionStr, sizeof(OptionStr), L"%s%04x", Target == BcfgTargetBootOrder?L"Boot":L"Driver", TargetLocation);\r
Status = gRT->SetVariable (\r
OptionStr,\r
&gEfiGlobalVariableGuid,\r
EFI_VARIABLE_NON_VOLATILE|EFI_VARIABLE_BOOTSERVICE_ACCESS|EFI_VARIABLE_RUNTIME_ACCESS,\r
sizeof(UINT32) + sizeof(UINT16) + DescSize + FilePathSize,\r
- p8\r
+ TempByteStart\r
);\r
\r
- FreePool(p8);\r
+ FreePool(TempByteStart);\r
\r
if (EFI_ERROR(Status)) {\r
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_SET_VAR_FAIL), gShellDebug1HiiHandle, OptionStr, Status);\r
} else {\r
- NewOrder = AllocatePool((OrderCount+1)*sizeof(NewOrder[0]));\r
+ NewOrder = AllocateZeroPool((OrderCount+1)*sizeof(NewOrder[0]));\r
ASSERT(NewOrder != NULL);\r
CopyMem(NewOrder, CurrentOrder, (OrderCount)*sizeof(NewOrder[0]));\r
\r
\r
NewOrder[Position] = (UINT16) TargetLocation;\r
Status = gRT->SetVariable (\r
- Target == BCFG_TARGET_BOOT_ORDER?L"BootOrder":L"DriverOrder",\r
+ Target == BcfgTargetBootOrder?L"BootOrder":L"DriverOrder",\r
&gEfiGlobalVariableGuid,\r
EFI_VARIABLE_NON_VOLATILE|EFI_VARIABLE_BOOTSERVICE_ACCESS|EFI_VARIABLE_RUNTIME_ACCESS,\r
(OrderCount+1) * sizeof(UINT16),\r
FreePool(NewOrder);\r
\r
if (EFI_ERROR(Status)) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_WRITE_FAIL), gShellDebug1HiiHandle, Target == BCFG_TARGET_BOOT_ORDER?L"BootOrder":L"DriverOrder", Status);\r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_WRITE_FAIL), gShellDebug1HiiHandle, Target == BcfgTargetBootOrder?L"BootOrder":L"DriverOrder", Status);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
Print (L"bcfg: Add %s as %x\n", OptionStr, Position);\r
return (ShellStatus);\r
}\r
\r
+/**\r
+ Funciton to remove an item.\r
+\r
+ @param[in] Target The target item to move.\r
+ @param[in] CurrentOrder The pointer to the current order of items.\r
+ @param[in] OrderCount The number if items in CurrentOrder.\r
+ @param[in] Location The current location of the Target.\r
+\r
+ @retval SHELL_SUCCESS The operation was successful.\r
+ @retval SHELL_INVALID_PARAMETER A parameter was invalid.\r
+**/\r
SHELL_STATUS\r
EFIAPI\r
-BcfgRemove(\r
+BcfgRemoveDebug1(\r
IN CONST BCFG_OPERATION_TARGET Target,\r
IN CONST UINT16 *CurrentOrder,\r
IN CONST UINTN OrderCount,\r
UINTN LoopVar;\r
UINTN NewCount;\r
\r
- UnicodeSPrint(VariableName, sizeof(VariableName), L"%s%04x", Target == BCFG_TARGET_BOOT_ORDER?L"Boot":L"Driver", Location);\r
+ UnicodeSPrint(VariableName, sizeof(VariableName), L"%s%04x", Target == BcfgTargetBootOrder?L"Boot":L"Driver", Location);\r
Status = gRT->SetVariable(\r
VariableName,\r
(EFI_GUID*)&gEfiGlobalVariableGuid,\r
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_WRITE_FAIL), gShellDebug1HiiHandle, VariableName, Status);\r
return (SHELL_INVALID_PARAMETER);\r
}\r
- NewOrder = AllocatePool(OrderCount*sizeof(CurrentOrder[0]));\r
+ NewOrder = AllocateZeroPool(OrderCount*sizeof(CurrentOrder[0]));\r
NewCount = OrderCount;\r
CopyMem(NewOrder, CurrentOrder, OrderCount*sizeof(CurrentOrder[0]));\r
for (LoopVar = 0 ; LoopVar < OrderCount ; LoopVar++){\r
}\r
}\r
Status = gRT->SetVariable(\r
- Target == BCFG_TARGET_BOOT_ORDER?(CHAR16*)L"BootOrder":(CHAR16*)L"DriverOrder",\r
+ Target == BcfgTargetBootOrder?(CHAR16*)L"BootOrder":(CHAR16*)L"DriverOrder",\r
(EFI_GUID*)&gEfiGlobalVariableGuid,\r
EFI_VARIABLE_NON_VOLATILE|EFI_VARIABLE_BOOTSERVICE_ACCESS|EFI_VARIABLE_RUNTIME_ACCESS,\r
NewCount*sizeof(NewOrder[0]),\r
FreePool(NewOrder);\r
\r
if (EFI_ERROR(Status)) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_WRITE_FAIL), gShellDebug1HiiHandle, Target == BCFG_TARGET_BOOT_ORDER?(CHAR16*)L"BootOrder":(CHAR16*)L"DriverOrder", Status);\r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_WRITE_FAIL), gShellDebug1HiiHandle, Target == BcfgTargetBootOrder?(CHAR16*)L"BootOrder":(CHAR16*)L"DriverOrder", Status);\r
return (SHELL_INVALID_PARAMETER);\r
}\r
return (SHELL_SUCCESS);\r
}\r
\r
+/**\r
+ Funciton to move a item to another location.\r
+\r
+ @param[in] Target The target item to move.\r
+ @param[in] CurrentOrder The pointer to the current order of items.\r
+ @param[in] OrderCount The number if items in CurrentOrder.\r
+ @param[in] OldLocation The current location of the Target.\r
+ @param[in] NewLocation The desired location of the Target.\r
+\r
+ @retval SHELL_SUCCESS The operation was successful.\r
+ @retval SHELL_INVALID_PARAMETER A parameter was invalid.\r
+**/\r
SHELL_STATUS\r
EFIAPI\r
-BcfgMove(\r
+BcfgMoveDebug1(\r
IN CONST BCFG_OPERATION_TARGET Target,\r
IN CONST UINT16 *CurrentOrder,\r
IN CONST UINTN OrderCount,\r
EFI_STATUS Status;\r
UINT16 Temp;\r
\r
- NewOrder = AllocatePool(OrderCount*sizeof(CurrentOrder[0]));\r
+ NewOrder = AllocateZeroPool(OrderCount*sizeof(CurrentOrder[0]));\r
ASSERT(NewOrder != NULL);\r
\r
Temp = CurrentOrder[OldLocation];\r
\r
\r
Status = gRT->SetVariable(\r
- Target == BCFG_TARGET_BOOT_ORDER?(CHAR16*)L"BootOrder":(CHAR16*)L"DriverOrder",\r
+ Target == BcfgTargetBootOrder?(CHAR16*)L"BootOrder":(CHAR16*)L"DriverOrder",\r
(EFI_GUID*)&gEfiGlobalVariableGuid,\r
EFI_VARIABLE_NON_VOLATILE|EFI_VARIABLE_BOOTSERVICE_ACCESS|EFI_VARIABLE_RUNTIME_ACCESS,\r
OrderCount*sizeof(CurrentOrder[0]),\r
FreePool(NewOrder);\r
\r
if (EFI_ERROR(Status)) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_WRITE_FAIL), gShellDebug1HiiHandle, Target == BCFG_TARGET_BOOT_ORDER?(CHAR16*)L"BootOrder":(CHAR16*)L"DriverOrder", Status);\r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_WRITE_FAIL), gShellDebug1HiiHandle, Target == BcfgTargetBootOrder?(CHAR16*)L"BootOrder":(CHAR16*)L"DriverOrder", Status);\r
return (SHELL_INVALID_PARAMETER);\r
}\r
return (SHELL_SUCCESS);\r
\r
SHELL_STATUS\r
EFIAPI\r
-BcfgDisplayDump(\r
+BcfgAddOptDebug1(\r
+ IN CONST CHAR16 *OptData,\r
+ IN CONST BCFG_OPERATION_TARGET Target\r
+ )\r
+{\r
+ ASSERT(OptData != NULL);\r
+ return SHELL_SUCCESS;\r
+}\r
+\r
+/**\r
+ Function to dump the Bcfg information.\r
+\r
+ @param[in] Op The operation.\r
+ @param[in] OrderCount How many to dump.\r
+ @param[in] CurrentOrder The pointer to the current order of items.\r
+ @param[in] VerboseOutput TRUE for extra output. FALSE otherwise.\r
+\r
+ @retval SHELL_SUCCESS The dump was successful.\r
+ @retval SHELL_INVALID_PARAMETER A parameter was invalid.\r
+**/\r
+SHELL_STATUS\r
+EFIAPI\r
+BcfgDisplayDumpDebug1(\r
IN CONST CHAR16 *Op,\r
- IN CONST UINTN OrderCount,\r
+ IN CONST UINTN OrderCount,\r
+ IN CONST UINT16 *CurrentOrder,\r
IN CONST BOOLEAN VerboseOutput\r
)\r
{\r
CHAR16 *DevPathString;\r
VOID *DevPath;\r
\r
+ if (OrderCount == 0) {\r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN(STR_BCFG_NONE), gShellDebug1HiiHandle);\r
+ return (SHELL_SUCCESS);\r
+ }\r
+\r
for (LoopVar = 0 ; LoopVar < OrderCount ; LoopVar++) {\r
Buffer = NULL;\r
BufferSize = 0;\r
- UnicodeSPrint(VariableName, sizeof(VariableName), L"%s%04x", Op, LoopVar);\r
+ UnicodeSPrint(VariableName, sizeof(VariableName), L"%s%04x", Op, CurrentOrder[LoopVar]);\r
\r
Status = gRT->GetVariable(\r
VariableName,\r
&BufferSize,\r
Buffer);\r
if (Status == EFI_BUFFER_TOO_SMALL) {\r
- Buffer = AllocatePool(BufferSize);\r
+ Buffer = AllocateZeroPool(BufferSize);\r
Status = gRT->GetVariable(\r
VariableName,\r
(EFI_GUID*)&gEfiGlobalVariableGuid,\r
return (SHELL_INVALID_PARAMETER);\r
}\r
\r
- DevPath = AllocatePool(*(UINT16*)(Buffer+4));\r
+ DevPath = AllocateZeroPool(*(UINT16*)(Buffer+4));\r
CopyMem(DevPath, Buffer+6+StrSize((CHAR16*)(Buffer+6)), *(UINT16*)(Buffer+4));\r
DevPathString = gDevPathToText->ConvertDevicePathToText(DevPath, TRUE, FALSE);\r
ShellPrintHiiEx(\r
NULL,\r
STRING_TOKEN(STR_BCFG_LOAD_OPTIONS),\r
gShellDebug1HiiHandle,\r
+ LoopVar,\r
VariableName,\r
(CHAR16*)(Buffer+6),\r
DevPathString,\r
return (SHELL_SUCCESS);\r
}\r
\r
+/**\r
+ Function to initialize the BCFG operation structure.\r
+\r
+ @param[in] Struct The stuct to initialize.\r
+**/\r
VOID\r
EFIAPI\r
-InitBcfgStruct(\r
+InitBcfgStructDebug1(\r
IN BGFG_OPERATION *Struct\r
)\r
{\r
ASSERT(Struct != NULL);\r
- Struct->Target = BCFG_TARGET_MAX;\r
- Struct->Type = BCFG_TYPE_MAX;\r
+ Struct->Target = BcfgTargetMax;\r
+ Struct->Type = BcfgTypeMax;\r
Struct->Number1 = 0;\r
Struct->Number2 = 0;\r
Struct->HandleIndex = 0;\r
CONST CHAR16 *CurrentParam;\r
BGFG_OPERATION CurrentOperation;\r
UINTN Length;\r
+ UINT64 Intermediate;\r
\r
Length = 0;\r
ProblemParam = NULL;\r
Package = NULL;\r
ShellStatus = SHELL_SUCCESS;\r
\r
- InitBcfgStruct(&CurrentOperation);\r
+ InitBcfgStructDebug1(&CurrentOperation);\r
\r
//\r
// initialize the shell lib (we must be in non-auto-init...)\r
ASSERT(FALSE);\r
}\r
} else {\r
+ //\r
+ // Read in if we are doing -OPT\r
+ //\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_PROBLEM_VAL), gShellDebug1HiiHandle, L"-opt");\r
+ ShellStatus = SHELL_INVALID_PARAMETER;\r
+ }\r
+ CurrentOperation.Type = BcfgTypeOpt;\r
+ }\r
+\r
//\r
// small block to read the target of the operation\r
//\r
- if (ShellCommandLineGetCount(Package) < 3) {\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), gShellDebug1HiiHandle);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else if (gUnicodeCollation->StriColl(gUnicodeCollation, (CHAR16*)ShellCommandLineGetRawValue(Package, 1), L"driver") == 0) {\r
- CurrentOperation.Target = BCFG_TARGET_DRIVER_ORDER;\r
+ CurrentOperation.Target = BcfgTargetDriverOrder;\r
} else if (gUnicodeCollation->StriColl(gUnicodeCollation, (CHAR16*)ShellCommandLineGetRawValue(Package, 1), L"boot") == 0) {\r
- CurrentOperation.Target = BCFG_TARGET_BOOT_ORDER;\r
+ CurrentOperation.Target = BcfgTargetBootOrder;\r
} else {\r
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_DRIVER_BOOT), gShellDebug1HiiHandle);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
}\r
\r
- //\r
- // Read in if we are doing -OPT\r
- //\r
- if (ShellStatus == SHELL_SUCCESS && CurrentOperation.Target < BCFG_TARGET_MAX && ShellCommandLineGetFlag(Package, L"-opt")) {\r
- CurrentOperation.OptData = ShellCommandLineGetValue(Package, L"-opt");\r
- CurrentOperation.Type = BCFG_TYPE_OPT;\r
- }\r
\r
//\r
// Read in the boot or driver order environment variable (not needed for opt)\r
//\r
- if (ShellStatus == SHELL_SUCCESS && CurrentOperation.Target < BCFG_TARGET_MAX && CurrentOperation.Type != BCFG_TYPE_OPT) {\r
+ if (ShellStatus == SHELL_SUCCESS && CurrentOperation.Target < BcfgTargetMax && CurrentOperation.Type != BcfgTypeOpt) {\r
Length = 0;\r
Status = gRT->GetVariable(\r
- CurrentOperation.Target == BCFG_TARGET_BOOT_ORDER?(CHAR16*)L"BootOrder":(CHAR16*)L"DriverOrder",\r
+ CurrentOperation.Target == BcfgTargetBootOrder?(CHAR16*)L"BootOrder":(CHAR16*)L"DriverOrder",\r
(EFI_GUID*)&gEfiGlobalVariableGuid,\r
NULL,\r
&Length,\r
CurrentOperation.Order);\r
if (Status == EFI_BUFFER_TOO_SMALL) {\r
- CurrentOperation.Order = AllocatePool(Length+(4*sizeof(CurrentOperation.Order[0])));\r
+ CurrentOperation.Order = AllocateZeroPool(Length+(4*sizeof(CurrentOperation.Order[0])));\r
Status = gRT->GetVariable(\r
- CurrentOperation.Target == BCFG_TARGET_BOOT_ORDER?(CHAR16*)L"BootOrder":(CHAR16*)L"DriverOrder",\r
+ CurrentOperation.Target == BcfgTargetBootOrder?(CHAR16*)L"BootOrder":(CHAR16*)L"DriverOrder",\r
(EFI_GUID*)&gEfiGlobalVariableGuid,\r
NULL,\r
&Length,\r
//\r
// large block to read the type of operation and verify parameter types for the info.\r
//\r
- if (ShellStatus == SHELL_SUCCESS && CurrentOperation.Target < BCFG_TARGET_MAX) {\r
+ if (ShellStatus == SHELL_SUCCESS && CurrentOperation.Target < BcfgTargetMax) {\r
for (ParamNumber = 2 ; ParamNumber < ShellCommandLineGetCount(Package) && ShellStatus == SHELL_SUCCESS; ParamNumber++) {\r
CurrentParam = ShellCommandLineGetRawValue(Package, ParamNumber);\r
if (gUnicodeCollation->StriColl(gUnicodeCollation, (CHAR16*)CurrentParam, L"dump") == 0) {\r
- CurrentOperation.Type = BCFG_TYPE_DUMP;\r
+ CurrentOperation.Type = BcfgTypeDump;\r
} else if (ShellCommandLineGetFlag(Package, L"-v")) {\r
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDebug1HiiHandle, L"-v (without dump)");\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDebug1HiiHandle);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
}\r
- CurrentOperation.Type = BCFG_TYPE_ADD;\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_PROBLEM), gShellDebug1HiiHandle, CurrentParam);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
- CurrentOperation.Number1 = (UINT16)StrHexToUintn(CurrentParam);\r
+ Status = ShellConvertStringToUint64(CurrentParam, &Intermediate, TRUE, FALSE);\r
+ CurrentOperation.Number1 = (UINT16)Intermediate;\r
ASSERT(CurrentOperation.FileName == NULL);\r
CurrentOperation.FileName = StrnCatGrow(&CurrentOperation.FileName , NULL, ShellCommandLineGetRawValue(Package, ++ParamNumber), 0);\r
ASSERT(CurrentOperation.Description == NULL);\r
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDebug1HiiHandle);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
}\r
- CurrentOperation.Type = BCFG_TYPE_ADDP;\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_PROBLEM), gShellDebug1HiiHandle, CurrentParam);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
- CurrentOperation.Number1 = (UINT16)StrHexToUintn(CurrentParam);\r
+ Status = ShellConvertStringToUint64(CurrentParam, &Intermediate, TRUE, FALSE);\r
+ CurrentOperation.Number1 = (UINT16)Intermediate;\r
ASSERT(CurrentOperation.FileName == NULL);\r
CurrentOperation.FileName = StrnCatGrow(&CurrentOperation.FileName , NULL, ShellCommandLineGetRawValue(Package, ++ParamNumber), 0);\r
ASSERT(CurrentOperation.Description == NULL);\r
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDebug1HiiHandle);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
}\r
- CurrentOperation.Type = BCFG_TYPE_ADDH;\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_PROBLEM), gShellDebug1HiiHandle, CurrentParam);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
- CurrentOperation.Number1 = (UINT16)StrHexToUintn(CurrentParam);\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_PROBLEM), gShellDebug1HiiHandle, CurrentParam);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
- CurrentOperation.HandleIndex = (UINT16)StrHexToUintn(CurrentParam);\r
+ Status = ShellConvertStringToUint64(CurrentParam, &Intermediate, TRUE, FALSE);\r
+ CurrentOperation.HandleIndex = (UINT16)Intermediate;\r
ASSERT(CurrentOperation.Description == NULL);\r
CurrentOperation.Description = StrnCatGrow(&CurrentOperation.Description, NULL, ShellCommandLineGetRawValue(Package, ++ParamNumber), 0);\r
}\r
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDebug1HiiHandle);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
}\r
- CurrentOperation.Type = BCFG_TYPE_RM;\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_PROBLEM), gShellDebug1HiiHandle, CurrentParam);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
- CurrentOperation.Number1 = (UINT16)StrHexToUintn(CurrentParam);\r
+ Status = ShellConvertStringToUint64(CurrentParam, &Intermediate, TRUE, FALSE);\r
+ CurrentOperation.Number1 = (UINT16)Intermediate;\r
if (CurrentOperation.Number1 > (Length / sizeof(CurrentOperation.Order[0]))){\r
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_NUMB_RANGE), gShellDebug1HiiHandle, Length / sizeof(CurrentOperation.Order[0]));\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDebug1HiiHandle);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
}\r
- CurrentOperation.Type = BCFG_TYPE_MV;\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_PROBLEM), gShellDebug1HiiHandle, CurrentParam);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
- CurrentOperation.Number1 = (UINT16)StrHexToUintn(CurrentParam);\r
+ Status = ShellConvertStringToUint64(CurrentParam, &Intermediate, TRUE, FALSE);\r
+ CurrentOperation.Number1 = (UINT16)Intermediate;\r
if (CurrentOperation.Number1 > (Length / sizeof(CurrentOperation.Order[0]))){\r
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_NUMB_RANGE), gShellDebug1HiiHandle, Length / sizeof(CurrentOperation.Order[0]));\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDebug1HiiHandle, CurrentParam);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
- CurrentOperation.Number2 = (UINT16)StrHexToUintn(CurrentParam);\r
+ Status = ShellConvertStringToUint64(CurrentParam, &Intermediate, TRUE, FALSE);\r
+ CurrentOperation.Number2 = (UINT16)Intermediate;\r
}\r
if (CurrentOperation.Number2 == CurrentOperation.Number1\r
||CurrentOperation.Number1 > (Length / sizeof(CurrentOperation.Order[0]))\r
}\r
}\r
}\r
- if (ShellStatus == SHELL_SUCCESS && CurrentOperation.Target < BCFG_TARGET_MAX && CurrentOperation.Type < BCFG_TYPE_MAX) {\r
+ if (ShellStatus == SHELL_SUCCESS && CurrentOperation.Target < BcfgTargetMax && CurrentOperation.Type < BcfgTypeMax) {\r
//\r
// we have all the info. Do the work\r
//\r
switch (CurrentOperation.Type) {\r
- case BCFG_TYPE_DUMP:\r
- ShellStatus = BcfgDisplayDump(\r
- CurrentOperation.Target == BCFG_TARGET_BOOT_ORDER?L"Boot":L"Driver",\r
+ case BcfgTypeDump:\r
+ ShellStatus = BcfgDisplayDumpDebug1(\r
+ CurrentOperation.Target == BcfgTargetBootOrder?L"Boot":L"Driver",\r
Length / sizeof(CurrentOperation.Order[0]),\r
+ CurrentOperation.Order,\r
ShellCommandLineGetFlag(Package, L"-v"));\r
break;\r
- case BCFG_TYPE_MV:\r
- ShellStatus = BcfgMove(\r
+ case BcfgTypeMv:\r
+ ShellStatus = BcfgMoveDebug1(\r
CurrentOperation.Target,\r
CurrentOperation.Order,\r
Length / sizeof(CurrentOperation.Order[0]),\r
CurrentOperation.Number1,\r
CurrentOperation.Number2);\r
break;\r
- case BCFG_TYPE_RM:\r
- ShellStatus = BcfgRemove(\r
+ case BcfgTypeRm:\r
+ ShellStatus = BcfgRemoveDebug1(\r
CurrentOperation.Target,\r
CurrentOperation.Order,\r
Length / sizeof(CurrentOperation.Order[0]),\r
CurrentOperation.Number1);\r
break;\r
- case BCFG_TYPE_ADD:\r
- case BCFG_TYPE_ADDP:\r
- case BCFG_TYPE_ADDH:\r
- ShellStatus = BcfgAdd(\r
+ case BcfgTypeAdd:\r
+ case BcfgTypeAddp:\r
+ case BcfgTypeAddh:\r
+ ShellStatus = BcfgAddDebug1(\r
CurrentOperation.Number1,\r
CurrentOperation.FileName,\r
CurrentOperation.Description,\r
CurrentOperation.Order,\r
- Length,\r
+ Length / sizeof(CurrentOperation.Order[0]),\r
CurrentOperation.Target,\r
- (BOOLEAN)(CurrentOperation.Type == BCFG_TYPE_ADDH),\r
- (BOOLEAN)(CurrentOperation.Type == BCFG_TYPE_ADDP),\r
+ (BOOLEAN)(CurrentOperation.Type == BcfgTypeAddh),\r
+ (BOOLEAN)(CurrentOperation.Type == BcfgTypeAddp),\r
CurrentOperation.HandleIndex);\r
break;\r
- case BCFG_TYPE_OPT:\r
+ case BcfgTypeOpt:\r
+ ShellStatus = BcfgAddOptDebug1(\r
+ CurrentOperation.OptData,\r
+ CurrentOperation.Target);\r
+ break;\r
default:\r
ASSERT(FALSE);\r
}\r
projects / mirror_edk2.git / blobdiff