diff options
Diffstat (limited to 'ShellPkg/Library/UefiShellDriver1CommandsLib/DrvCfg.c')
| -rw-r--r-- | ShellPkg/Library/UefiShellDriver1CommandsLib/DrvCfg.c | 1111 |
1 files changed, 592 insertions, 519 deletions
diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvCfg.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvCfg.c index f23f2fd7e8..9bbbb1444d 100644 --- a/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvCfg.c +++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvCfg.c @@ -11,7 +11,7 @@ #include <Protocol/HiiConfigAccess.h>
#include <Protocol/HiiDatabase.h>
-STATIC CONST EFI_GUID *CfgGuidList[] = {&gEfiDriverConfigurationProtocolGuid, &gEfiDriverConfiguration2ProtocolGuid, NULL};
+STATIC CONST EFI_GUID *CfgGuidList[] = { &gEfiDriverConfigurationProtocolGuid, &gEfiDriverConfiguration2ProtocolGuid, NULL };
/**
Find the EFI_HII_HANDLE by device path.
@@ -24,40 +24,41 @@ STATIC CONST EFI_GUID *CfgGuidList[] = {&gEfiDriverConfigurationProtocolGuid, &g @retval EFI_NOT_FOUND There was no EFI_HII_HANDLE found for that deviec path.
**/
EFI_STATUS
-FindHiiHandleViaDevPath(
- IN CONST EFI_DEVICE_PATH_PROTOCOL *DevPath1,
- OUT EFI_HII_HANDLE *HiiHandle,
- IN EFI_HII_DATABASE_PROTOCOL *HiiDb
+FindHiiHandleViaDevPath (
+ IN CONST EFI_DEVICE_PATH_PROTOCOL *DevPath1,
+ OUT EFI_HII_HANDLE *HiiHandle,
+ IN EFI_HII_DATABASE_PROTOCOL *HiiDb
)
{
- EFI_HII_HANDLE *HandleBuffer;
- UINTN HandleBufferSize;
- VOID *MainBuffer;
- UINTN MainBufferSize;
- EFI_HII_PACKAGE_LIST_HEADER *PackageListHeader;
- EFI_HII_PACKAGE_HEADER *PackageHeader;
- UINTN LoopVariable;
- EFI_DEVICE_PATH_PROTOCOL *DevPath2;
- EFI_STATUS Status;
-
- ASSERT(DevPath1 != NULL);
- ASSERT(HiiHandle != NULL);
- ASSERT(*HiiHandle == NULL);
- ASSERT(HiiDb != NULL);
-
- HandleBufferSize = 0;
- HandleBuffer = NULL;
- Status = HiiDb->ListPackageLists(HiiDb, EFI_HII_PACKAGE_DEVICE_PATH, NULL, &HandleBufferSize, HandleBuffer);
+ EFI_HII_HANDLE *HandleBuffer;
+ UINTN HandleBufferSize;
+ VOID *MainBuffer;
+ UINTN MainBufferSize;
+ EFI_HII_PACKAGE_LIST_HEADER *PackageListHeader;
+ EFI_HII_PACKAGE_HEADER *PackageHeader;
+ UINTN LoopVariable;
+ EFI_DEVICE_PATH_PROTOCOL *DevPath2;
+ EFI_STATUS Status;
+
+ ASSERT (DevPath1 != NULL);
+ ASSERT (HiiHandle != NULL);
+ ASSERT (*HiiHandle == NULL);
+ ASSERT (HiiDb != NULL);
+
+ HandleBufferSize = 0;
+ HandleBuffer = NULL;
+ Status = HiiDb->ListPackageLists (HiiDb, EFI_HII_PACKAGE_DEVICE_PATH, NULL, &HandleBufferSize, HandleBuffer);
if (Status == EFI_BUFFER_TOO_SMALL) {
- HandleBuffer = AllocateZeroPool(HandleBufferSize);
+ HandleBuffer = AllocateZeroPool (HandleBufferSize);
if (HandleBuffer == NULL) {
Status = EFI_OUT_OF_RESOURCES;
} else {
Status = HiiDb->ListPackageLists (HiiDb, EFI_HII_PACKAGE_DEVICE_PATH, NULL, &HandleBufferSize, HandleBuffer);
}
}
- if (EFI_ERROR(Status)) {
- SHELL_FREE_NON_NULL(HandleBuffer);
+
+ if (EFI_ERROR (Status)) {
+ SHELL_FREE_NON_NULL (HandleBuffer);
return (Status);
}
@@ -65,45 +66,52 @@ FindHiiHandleViaDevPath( return EFI_NOT_FOUND;
}
- for (LoopVariable = 0 ; LoopVariable < (HandleBufferSize/sizeof(HandleBuffer[0])) && *HiiHandle == NULL ; LoopVariable++) {
- MainBufferSize = 0;
- MainBuffer = NULL;
- Status = HiiDb->ExportPackageLists(HiiDb, HandleBuffer[LoopVariable], &MainBufferSize, MainBuffer);
+ for (LoopVariable = 0; LoopVariable < (HandleBufferSize/sizeof (HandleBuffer[0])) && *HiiHandle == NULL; LoopVariable++) {
+ MainBufferSize = 0;
+ MainBuffer = NULL;
+ Status = HiiDb->ExportPackageLists (HiiDb, HandleBuffer[LoopVariable], &MainBufferSize, MainBuffer);
if (Status == EFI_BUFFER_TOO_SMALL) {
- MainBuffer = AllocateZeroPool(MainBufferSize);
+ MainBuffer = AllocateZeroPool (MainBufferSize);
if (MainBuffer != NULL) {
Status = HiiDb->ExportPackageLists (HiiDb, HandleBuffer[LoopVariable], &MainBufferSize, MainBuffer);
}
}
+
if (EFI_ERROR (Status)) {
continue;
}
+
//
// Enumerate through the block of returned memory.
// This should actually be a small block, but we need to be sure.
//
- for (PackageListHeader = (EFI_HII_PACKAGE_LIST_HEADER*)MainBuffer
- ; PackageListHeader != NULL && ((CHAR8*)PackageListHeader) < (((CHAR8*)MainBuffer)+MainBufferSize) && *HiiHandle == NULL
- ; PackageListHeader = (EFI_HII_PACKAGE_LIST_HEADER*)(((CHAR8*)(PackageListHeader)) + PackageListHeader->PackageLength )) {
- for (PackageHeader = (EFI_HII_PACKAGE_HEADER*)(((CHAR8*)(PackageListHeader))+sizeof(EFI_HII_PACKAGE_LIST_HEADER))
- ; PackageHeader != NULL && ((CHAR8*)PackageHeader) < (((CHAR8*)MainBuffer)+MainBufferSize) && PackageHeader->Type != EFI_HII_PACKAGE_END && *HiiHandle == NULL
- ; PackageHeader = (EFI_HII_PACKAGE_HEADER*)(((CHAR8*)(PackageHeader))+PackageHeader->Length)) {
- if (PackageHeader->Type == EFI_HII_PACKAGE_DEVICE_PATH) {
- DevPath2 = (EFI_DEVICE_PATH_PROTOCOL*)(((CHAR8*)PackageHeader) + sizeof(EFI_HII_PACKAGE_HEADER));
- if (DevicePathCompare(&DevPath1, &DevPath2) == 0) {
- *HiiHandle = HandleBuffer[LoopVariable];
- break;
- }
- }
+ for (PackageListHeader = (EFI_HII_PACKAGE_LIST_HEADER *)MainBuffer
+ ; PackageListHeader != NULL && ((CHAR8 *)PackageListHeader) < (((CHAR8 *)MainBuffer)+MainBufferSize) && *HiiHandle == NULL
+ ; PackageListHeader = (EFI_HII_PACKAGE_LIST_HEADER *)(((CHAR8 *)(PackageListHeader)) + PackageListHeader->PackageLength))
+ {
+ for (PackageHeader = (EFI_HII_PACKAGE_HEADER *)(((CHAR8 *)(PackageListHeader))+sizeof (EFI_HII_PACKAGE_LIST_HEADER))
+ ; PackageHeader != NULL && ((CHAR8 *)PackageHeader) < (((CHAR8 *)MainBuffer)+MainBufferSize) && PackageHeader->Type != EFI_HII_PACKAGE_END && *HiiHandle == NULL
+ ; PackageHeader = (EFI_HII_PACKAGE_HEADER *)(((CHAR8 *)(PackageHeader))+PackageHeader->Length))
+ {
+ if (PackageHeader->Type == EFI_HII_PACKAGE_DEVICE_PATH) {
+ DevPath2 = (EFI_DEVICE_PATH_PROTOCOL *)(((CHAR8 *)PackageHeader) + sizeof (EFI_HII_PACKAGE_HEADER));
+ if (DevicePathCompare (&DevPath1, &DevPath2) == 0) {
+ *HiiHandle = HandleBuffer[LoopVariable];
+ break;
+ }
}
+ }
}
- SHELL_FREE_NON_NULL(MainBuffer);
+
+ SHELL_FREE_NON_NULL (MainBuffer);
}
- SHELL_FREE_NON_NULL(HandleBuffer);
+
+ SHELL_FREE_NON_NULL (HandleBuffer);
if (*HiiHandle == NULL) {
return (EFI_NOT_FOUND);
}
+
return (EFI_SUCCESS);
}
@@ -117,18 +125,19 @@ FindHiiHandleViaDevPath( @retval EFI_SUCCESS The operation was successful.
**/
EFI_STATUS
-ConvertHandleToHiiHandle(
+ConvertHandleToHiiHandle (
IN CONST EFI_HANDLE Handle,
OUT EFI_HII_HANDLE *HiiHandle,
IN EFI_HII_DATABASE_PROTOCOL *HiiDb
)
{
- EFI_STATUS Status;
- EFI_DEVICE_PATH_PROTOCOL *DevPath1;
+ EFI_STATUS Status;
+ EFI_DEVICE_PATH_PROTOCOL *DevPath1;
- if (HiiHandle == NULL || HiiDb == NULL) {
+ if ((HiiHandle == NULL) || (HiiDb == NULL)) {
return (EFI_INVALID_PARAMETER);
}
+
*HiiHandle = NULL;
if (Handle == NULL) {
@@ -136,12 +145,12 @@ ConvertHandleToHiiHandle( }
DevPath1 = NULL;
- Status = gBS->OpenProtocol(Handle, &gEfiDevicePathProtocolGuid, (VOID**)&DevPath1, gImageHandle, NULL, EFI_OPEN_PROTOCOL_GET_PROTOCOL);
- if (EFI_ERROR(Status) || DevPath1 == NULL) {
+ Status = gBS->OpenProtocol (Handle, &gEfiDevicePathProtocolGuid, (VOID **)&DevPath1, gImageHandle, NULL, EFI_OPEN_PROTOCOL_GET_PROTOCOL);
+ if (EFI_ERROR (Status) || (DevPath1 == NULL)) {
return (EFI_NOT_FOUND);
}
- return (FindHiiHandleViaDevPath(DevPath1, HiiHandle, HiiDb));
+ return (FindHiiHandleViaDevPath (DevPath1, HiiHandle, HiiDb));
}
/**
@@ -151,34 +160,35 @@ ConvertHandleToHiiHandle( @param[in] FileName The filename to rwite the info to.
**/
SHELL_STATUS
-ConfigToFile(
- IN CONST EFI_HANDLE Handle,
- IN CONST CHAR16 *FileName
+ConfigToFile (
+ IN CONST EFI_HANDLE Handle,
+ IN CONST CHAR16 *FileName
)
{
- EFI_HII_DATABASE_PROTOCOL *HiiDatabase;
- EFI_STATUS Status;
- VOID *MainBuffer;
- UINTN MainBufferSize;
- EFI_HII_HANDLE HiiHandle;
- SHELL_FILE_HANDLE FileHandle;
-
- HiiDatabase = NULL;
- MainBufferSize = 0;
- MainBuffer = NULL;
- FileHandle = NULL;
-
- Status = ShellOpenFileByName(FileName, &FileHandle, EFI_FILE_MODE_READ|EFI_FILE_MODE_WRITE|EFI_FILE_MODE_CREATE, 0);
- if (EFI_ERROR(Status)) {
- ShellPrintHiiEx(
+ EFI_HII_DATABASE_PROTOCOL *HiiDatabase;
+ EFI_STATUS Status;
+ VOID *MainBuffer;
+ UINTN MainBufferSize;
+ EFI_HII_HANDLE HiiHandle;
+ SHELL_FILE_HANDLE FileHandle;
+
+ HiiDatabase = NULL;
+ MainBufferSize = 0;
+ MainBuffer = NULL;
+ FileHandle = NULL;
+
+ Status = ShellOpenFileByName (FileName, &FileHandle, EFI_FILE_MODE_READ|EFI_FILE_MODE_WRITE|EFI_FILE_MODE_CREATE, 0);
+ if (EFI_ERROR (Status)) {
+ ShellPrintHiiEx (
-1,
-1,
NULL,
- STRING_TOKEN(STR_GEN_FILE_OPEN_FAIL),
+ STRING_TOKEN (STR_GEN_FILE_OPEN_FAIL),
gShellDriver1HiiHandle,
L"drvcfg",
FileName,
- Status);
+ Status
+ );
return (SHELL_DEVICE_ERROR);
}
@@ -188,67 +198,72 @@ ConfigToFile( Status = gBS->LocateProtocol (
&gEfiHiiDatabaseProtocolGuid,
NULL,
- (VOID **) &HiiDatabase
+ (VOID **)&HiiDatabase
);
- if (EFI_ERROR(Status) || HiiDatabase == NULL) {
- ShellPrintHiiEx(
+ if (EFI_ERROR (Status) || (HiiDatabase == NULL)) {
+ ShellPrintHiiEx (
-1,
-1,
NULL,
- STRING_TOKEN(STR_GEN_PROTOCOL_NF),
+ STRING_TOKEN (STR_GEN_PROTOCOL_NF),
gShellDriver1HiiHandle,
L"drvcfg",
L"EfiHiiDatabaseProtocol",
- &gEfiHiiDatabaseProtocolGuid);
- ShellCloseFile(&FileHandle);
+ &gEfiHiiDatabaseProtocolGuid
+ );
+ ShellCloseFile (&FileHandle);
return (SHELL_NOT_FOUND);
}
HiiHandle = NULL;
- Status = ConvertHandleToHiiHandle(Handle, &HiiHandle, HiiDatabase);
- if (EFI_ERROR(Status)) {
- ShellPrintHiiEx(
+ Status = ConvertHandleToHiiHandle (Handle, &HiiHandle, HiiDatabase);
+ if (EFI_ERROR (Status)) {
+ ShellPrintHiiEx (
-1,
-1,
NULL,
- STRING_TOKEN(STR_GEN_HANDLE_NOT),
+ STRING_TOKEN (STR_GEN_HANDLE_NOT),
gShellDriver1HiiHandle,
L"drvcfg",
- ConvertHandleToHandleIndex(Handle),
- L"Device");
- ShellCloseFile(&FileHandle);
+ ConvertHandleToHandleIndex (Handle),
+ L"Device"
+ );
+ ShellCloseFile (&FileHandle);
return (SHELL_DEVICE_ERROR);
}
- Status = HiiDatabase->ExportPackageLists(HiiDatabase, HiiHandle, &MainBufferSize, MainBuffer);
+ Status = HiiDatabase->ExportPackageLists (HiiDatabase, HiiHandle, &MainBufferSize, MainBuffer);
if (Status == EFI_BUFFER_TOO_SMALL) {
- MainBuffer = AllocateZeroPool(MainBufferSize);
- Status = HiiDatabase->ExportPackageLists(HiiDatabase, HiiHandle, &MainBufferSize, MainBuffer);
+ MainBuffer = AllocateZeroPool (MainBufferSize);
+ Status = HiiDatabase->ExportPackageLists (HiiDatabase, HiiHandle, &MainBufferSize, MainBuffer);
}
- Status = ShellWriteFile(FileHandle, &MainBufferSize, MainBuffer);
+ Status = ShellWriteFile (FileHandle, &MainBufferSize, MainBuffer);
- ShellCloseFile(&FileHandle);
- SHELL_FREE_NON_NULL(MainBuffer);
+ ShellCloseFile (&FileHandle);
+ SHELL_FREE_NON_NULL (MainBuffer);
- if (EFI_ERROR(Status)) {
- ShellPrintHiiEx(
+ if (EFI_ERROR (Status)) {
+ ShellPrintHiiEx (
-1,
-1,
NULL,
- STRING_TOKEN(STR_FILE_WRITE_FAIL),
+ STRING_TOKEN (STR_FILE_WRITE_FAIL),
gShellDriver1HiiHandle,
L"drvcfg",
- FileName);
+ FileName
+ );
return (SHELL_DEVICE_ERROR);
}
- ShellPrintHiiEx(
+
+ ShellPrintHiiEx (
-1,
-1,
NULL,
- STRING_TOKEN(STR_DRVCFG_COMP),
- gShellDriver1HiiHandle);
+ STRING_TOKEN (STR_DRVCFG_COMP),
+ gShellDriver1HiiHandle
+ );
return (SHELL_SUCCESS);
}
@@ -260,40 +275,41 @@ ConfigToFile( @param[in] FileName The filename to read the info from.
**/
SHELL_STATUS
-ConfigFromFile(
- IN EFI_HANDLE Handle,
- IN CONST CHAR16 *FileName
+ConfigFromFile (
+ IN EFI_HANDLE Handle,
+ IN CONST CHAR16 *FileName
)
{
- EFI_HII_DATABASE_PROTOCOL *HiiDatabase;
- EFI_STATUS Status;
- VOID *MainBuffer;
- UINT64 Temp;
- UINTN MainBufferSize;
- EFI_HII_HANDLE HiiHandle;
- SHELL_FILE_HANDLE FileHandle;
- CHAR16 *TempDevPathString;
- EFI_HII_PACKAGE_LIST_HEADER *PackageListHeader;
- EFI_HII_PACKAGE_HEADER *PackageHeader;
- EFI_DEVICE_PATH_PROTOCOL *DevPath;
- UINTN HandleIndex;
-
- HiiDatabase = NULL;
- MainBufferSize = 0;
- MainBuffer = NULL;
- FileHandle = NULL;
-
- Status = ShellOpenFileByName(FileName, &FileHandle, EFI_FILE_MODE_READ, 0);
- if (EFI_ERROR(Status)) {
- ShellPrintHiiEx(
+ EFI_HII_DATABASE_PROTOCOL *HiiDatabase;
+ EFI_STATUS Status;
+ VOID *MainBuffer;
+ UINT64 Temp;
+ UINTN MainBufferSize;
+ EFI_HII_HANDLE HiiHandle;
+ SHELL_FILE_HANDLE FileHandle;
+ CHAR16 *TempDevPathString;
+ EFI_HII_PACKAGE_LIST_HEADER *PackageListHeader;
+ EFI_HII_PACKAGE_HEADER *PackageHeader;
+ EFI_DEVICE_PATH_PROTOCOL *DevPath;
+ UINTN HandleIndex;
+
+ HiiDatabase = NULL;
+ MainBufferSize = 0;
+ MainBuffer = NULL;
+ FileHandle = NULL;
+
+ Status = ShellOpenFileByName (FileName, &FileHandle, EFI_FILE_MODE_READ, 0);
+ if (EFI_ERROR (Status)) {
+ ShellPrintHiiEx (
-1,
-1,
NULL,
- STRING_TOKEN(STR_GEN_FILE_OPEN_FAIL),
+ STRING_TOKEN (STR_GEN_FILE_OPEN_FAIL),
gShellDriver1HiiHandle,
L"drvcfg",
FileName,
- Status);
+ Status
+ );
return (SHELL_DEVICE_ERROR);
}
@@ -303,96 +319,107 @@ ConfigFromFile( Status = gBS->LocateProtocol (
&gEfiHiiDatabaseProtocolGuid,
NULL,
- (VOID **) &HiiDatabase
+ (VOID **)&HiiDatabase
);
- if (EFI_ERROR(Status) || HiiDatabase == NULL) {
- ShellPrintHiiEx(
+ if (EFI_ERROR (Status) || (HiiDatabase == NULL)) {
+ ShellPrintHiiEx (
-1,
-1,
NULL,
- STRING_TOKEN(STR_GEN_PROTOCOL_NF),
+ STRING_TOKEN (STR_GEN_PROTOCOL_NF),
gShellDriver1HiiHandle,
L"drvcfg",
L"EfiHiiDatabaseProtocol",
- &gEfiHiiDatabaseProtocolGuid);
- ShellCloseFile(&FileHandle);
+ &gEfiHiiDatabaseProtocolGuid
+ );
+ ShellCloseFile (&FileHandle);
return (SHELL_NOT_FOUND);
}
- Status = ShellGetFileSize(FileHandle, &Temp);
+ Status = ShellGetFileSize (FileHandle, &Temp);
MainBufferSize = (UINTN)Temp;
- if (EFI_ERROR(Status)) {
- ShellPrintHiiEx(
+ if (EFI_ERROR (Status)) {
+ ShellPrintHiiEx (
-1,
-1,
NULL,
- STRING_TOKEN(STR_FILE_READ_FAIL),
+ STRING_TOKEN (STR_FILE_READ_FAIL),
gShellDriver1HiiHandle,
L"drvcfg",
- FileName);
+ FileName
+ );
- ShellCloseFile(&FileHandle);
+ ShellCloseFile (&FileHandle);
return (SHELL_DEVICE_ERROR);
}
- MainBuffer = AllocateZeroPool((UINTN)MainBufferSize);
- if (EFI_ERROR(Status)) {
- ShellPrintHiiEx(
+
+ MainBuffer = AllocateZeroPool ((UINTN)MainBufferSize);
+ if (EFI_ERROR (Status)) {
+ ShellPrintHiiEx (
-1,
-1,
NULL,
- STRING_TOKEN(STR_GEN_OUT_MEM),
- gShellDriver1HiiHandle, L"drvcfg");
- ShellCloseFile(&FileHandle);
+ STRING_TOKEN (STR_GEN_OUT_MEM),
+ gShellDriver1HiiHandle,
+ L"drvcfg"
+ );
+ ShellCloseFile (&FileHandle);
return (SHELL_DEVICE_ERROR);
}
- Status = ShellReadFile(FileHandle, &MainBufferSize, MainBuffer);
- if (EFI_ERROR(Status)) {
- ShellPrintHiiEx(
+
+ Status = ShellReadFile (FileHandle, &MainBufferSize, MainBuffer);
+ if (EFI_ERROR (Status)) {
+ ShellPrintHiiEx (
-1,
-1,
NULL,
- STRING_TOKEN(STR_FILE_READ_FAIL),
+ STRING_TOKEN (STR_FILE_READ_FAIL),
gShellDriver1HiiHandle,
L"drvcfg",
- FileName);
+ FileName
+ );
- ShellCloseFile(&FileHandle);
- SHELL_FREE_NON_NULL(MainBuffer);
+ ShellCloseFile (&FileHandle);
+ SHELL_FREE_NON_NULL (MainBuffer);
return (SHELL_DEVICE_ERROR);
}
- ShellCloseFile(&FileHandle);
+ ShellCloseFile (&FileHandle);
if (Handle != NULL) {
//
// User override in place. Just do it.
//
- HiiHandle = NULL;
- Status = ConvertHandleToHiiHandle(Handle, &HiiHandle, HiiDatabase);
- if (EFI_ERROR(Status)) {
- ShellPrintHiiEx(
+ HiiHandle = NULL;
+ Status = ConvertHandleToHiiHandle (Handle, &HiiHandle, HiiDatabase);
+ if (EFI_ERROR (Status)) {
+ ShellPrintHiiEx (
-1,
-1,
NULL,
- STRING_TOKEN(STR_GEN_HANDLE_NOT),
- gShellDriver1HiiHandle, L"drvcfg",
- ConvertHandleToHandleIndex(Handle),
- L"Device");
- ShellCloseFile(&FileHandle);
+ STRING_TOKEN (STR_GEN_HANDLE_NOT),
+ gShellDriver1HiiHandle,
+ L"drvcfg",
+ ConvertHandleToHandleIndex (Handle),
+ L"Device"
+ );
+ ShellCloseFile (&FileHandle);
return (SHELL_DEVICE_ERROR);
}
- Status = HiiDatabase->UpdatePackageList(HiiDatabase, HiiHandle, MainBuffer);
- if (EFI_ERROR(Status)) {
- ShellPrintHiiEx(
+
+ Status = HiiDatabase->UpdatePackageList (HiiDatabase, HiiHandle, MainBuffer);
+ if (EFI_ERROR (Status)) {
+ ShellPrintHiiEx (
-1,
-1,
NULL,
- STRING_TOKEN(STR_GEN_UEFI_FUNC_WARN),
+ STRING_TOKEN (STR_GEN_UEFI_FUNC_WARN),
gShellDriver1HiiHandle,
L"drvcfg",
L"HiiDatabase->UpdatePackageList",
- Status);
+ Status
+ );
return (SHELL_DEVICE_ERROR);
}
} else {
@@ -400,68 +427,73 @@ ConfigFromFile( // we need to parse the buffer and try to match the device paths for each item to try to find it's device path.
//
- for (PackageListHeader = (EFI_HII_PACKAGE_LIST_HEADER*)MainBuffer
- ; PackageListHeader != NULL && ((CHAR8*)PackageListHeader) < (((CHAR8*)MainBuffer)+MainBufferSize)
- ; PackageListHeader = (EFI_HII_PACKAGE_LIST_HEADER*)(((CHAR8*)(PackageListHeader)) + PackageListHeader->PackageLength )) {
- for (PackageHeader = (EFI_HII_PACKAGE_HEADER*)(((CHAR8*)(PackageListHeader))+sizeof(EFI_HII_PACKAGE_LIST_HEADER))
- ; PackageHeader != NULL && ((CHAR8*)PackageHeader) < (((CHAR8*)MainBuffer)+MainBufferSize) && PackageHeader->Type != EFI_HII_PACKAGE_END
- ; PackageHeader = (EFI_HII_PACKAGE_HEADER*)(((CHAR8*)(PackageHeader))+PackageHeader->Length)) {
- if (PackageHeader->Type == EFI_HII_PACKAGE_DEVICE_PATH) {
- HiiHandle = NULL;
- Status = FindHiiHandleViaDevPath((EFI_DEVICE_PATH_PROTOCOL*)(((CHAR8*)PackageHeader) + sizeof(EFI_HII_PACKAGE_HEADER)), &HiiHandle, HiiDatabase);
- if (EFI_ERROR(Status)) {
- //
- // print out an error.
- //
- TempDevPathString = ConvertDevicePathToText((EFI_DEVICE_PATH_PROTOCOL*)(((CHAR8*)PackageHeader) + sizeof(EFI_HII_PACKAGE_HEADER)), TRUE, TRUE);
- ShellPrintHiiEx(
- -1,
- -1,
- NULL,
- STRING_TOKEN(STR_DRVCFG_IN_FILE_NF),
- gShellDriver1HiiHandle,
- TempDevPathString);
- SHELL_FREE_NON_NULL(TempDevPathString);
- } else {
- Status = HiiDatabase->UpdatePackageList(HiiDatabase, HiiHandle, PackageListHeader);
- if (EFI_ERROR(Status)) {
- ShellPrintHiiEx(
- -1,
- -1,
- NULL,
- STRING_TOKEN(STR_GEN_UEFI_FUNC_WARN),
- gShellDriver1HiiHandle,
- L"drvcfg",
- L"HiiDatabase->UpdatePackageList",
- Status);
- return (SHELL_DEVICE_ERROR);
- } else {
- DevPath = (EFI_DEVICE_PATH_PROTOCOL*)(((CHAR8*)PackageHeader) + sizeof(EFI_HII_PACKAGE_HEADER));
- gBS->LocateDevicePath(&gEfiHiiConfigAccessProtocolGuid, &DevPath, &Handle);
- HandleIndex = ConvertHandleToHandleIndex(Handle);
- ShellPrintHiiEx(
- -1,
- -1,
- NULL,
- STRING_TOKEN(STR_DRVCFG_DONE_HII),
- gShellDriver1HiiHandle,
- HandleIndex);
- }
- }
+ for (PackageListHeader = (EFI_HII_PACKAGE_LIST_HEADER *)MainBuffer
+ ; PackageListHeader != NULL && ((CHAR8 *)PackageListHeader) < (((CHAR8 *)MainBuffer)+MainBufferSize)
+ ; PackageListHeader = (EFI_HII_PACKAGE_LIST_HEADER *)(((CHAR8 *)(PackageListHeader)) + PackageListHeader->PackageLength))
+ {
+ for (PackageHeader = (EFI_HII_PACKAGE_HEADER *)(((CHAR8 *)(PackageListHeader))+sizeof (EFI_HII_PACKAGE_LIST_HEADER))
+ ; PackageHeader != NULL && ((CHAR8 *)PackageHeader) < (((CHAR8 *)MainBuffer)+MainBufferSize) && PackageHeader->Type != EFI_HII_PACKAGE_END
+ ; PackageHeader = (EFI_HII_PACKAGE_HEADER *)(((CHAR8 *)(PackageHeader))+PackageHeader->Length))
+ {
+ if (PackageHeader->Type == EFI_HII_PACKAGE_DEVICE_PATH) {
+ HiiHandle = NULL;
+ Status = FindHiiHandleViaDevPath ((EFI_DEVICE_PATH_PROTOCOL *)(((CHAR8 *)PackageHeader) + sizeof (EFI_HII_PACKAGE_HEADER)), &HiiHandle, HiiDatabase);
+ if (EFI_ERROR (Status)) {
+ //
+ // print out an error.
+ //
+ TempDevPathString = ConvertDevicePathToText ((EFI_DEVICE_PATH_PROTOCOL *)(((CHAR8 *)PackageHeader) + sizeof (EFI_HII_PACKAGE_HEADER)), TRUE, TRUE);
+ ShellPrintHiiEx (
+ -1,
+ -1,
+ NULL,
+ STRING_TOKEN (STR_DRVCFG_IN_FILE_NF),
+ gShellDriver1HiiHandle,
+ TempDevPathString
+ );
+ SHELL_FREE_NON_NULL (TempDevPathString);
+ } else {
+ Status = HiiDatabase->UpdatePackageList (HiiDatabase, HiiHandle, PackageListHeader);
+ if (EFI_ERROR (Status)) {
+ ShellPrintHiiEx (
+ -1,
+ -1,
+ NULL,
+ STRING_TOKEN (STR_GEN_UEFI_FUNC_WARN),
+ gShellDriver1HiiHandle,
+ L"drvcfg",
+ L"HiiDatabase->UpdatePackageList",
+ Status
+ );
+ return (SHELL_DEVICE_ERROR);
+ } else {
+ DevPath = (EFI_DEVICE_PATH_PROTOCOL *)(((CHAR8 *)PackageHeader) + sizeof (EFI_HII_PACKAGE_HEADER));
+ gBS->LocateDevicePath (&gEfiHiiConfigAccessProtocolGuid, &DevPath, &Handle);
+ HandleIndex = ConvertHandleToHandleIndex (Handle);
+ ShellPrintHiiEx (
+ -1,
+ -1,
+ NULL,
+ STRING_TOKEN (STR_DRVCFG_DONE_HII),
+ gShellDriver1HiiHandle,
+ HandleIndex
+ );
}
+ }
}
+ }
}
}
- SHELL_FREE_NON_NULL(MainBuffer);
-
+ SHELL_FREE_NON_NULL (MainBuffer);
- ShellPrintHiiEx(
+ ShellPrintHiiEx (
-1,
-1,
NULL,
- STRING_TOKEN(STR_DRVCFG_COMP),
- gShellDriver1HiiHandle);
+ STRING_TOKEN (STR_DRVCFG_COMP),
+ gShellDriver1HiiHandle
+ );
return (SHELL_SUCCESS);
}
@@ -486,41 +518,41 @@ ShellCmdDriverConfigurationProcessActionRequired ( EFI_HANDLE ConnectControllerContextOverride[2];
switch (ActionRequired) {
- case EfiDriverConfigurationActionNone:
- ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_DRVCFG_NONE), gShellDriver1HiiHandle);
- break;
-
- case EfiDriverConfigurationActionStopController:
- ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_DRVCFG_STOP), gShellDriver1HiiHandle);
- ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_DRVCFG_ENTER_S), gShellDriver1HiiHandle, L"stop controller");
- ShellPromptForResponse(ShellPromptResponseTypeEnterContinue, NULL, NULL);
-
- gBS->DisconnectController (ControllerHandle, DriverImageHandle, ChildHandle);
- ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_DRVCFG_CTLR_S), gShellDriver1HiiHandle, L"stopped");
- break;
-
- case EfiDriverConfigurationActionRestartController:
- ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_DRVCFG_RESTART_S), gShellDriver1HiiHandle, L"controller");
- ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_DRVCFG_ENTER_S), gShellDriver1HiiHandle, L"restart controller");
- ShellPromptForResponse(ShellPromptResponseTypeEnterContinue, NULL, NULL);
-
- gBS->DisconnectController (ControllerHandle, DriverImageHandle, ChildHandle);
- ConnectControllerContextOverride[0] = DriverImageHandle;
- ConnectControllerContextOverride[1] = NULL;
- gBS->ConnectController (ControllerHandle, ConnectControllerContextOverride, NULL, TRUE);
- ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_DRVCFG_CTLR_S), gShellDriver1HiiHandle, L"restarted");
- break;
-
- case EfiDriverConfigurationActionRestartPlatform:
- ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_DRVCFG_RESTART_S), gShellDriver1HiiHandle, L"platform");
- ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_DRVCFG_ENTER_S), gShellDriver1HiiHandle, L"restart platform");
- ShellPromptForResponse(ShellPromptResponseTypeEnterContinue, NULL, NULL);
-
- gRT->ResetSystem (EfiResetCold, EFI_SUCCESS, 0, NULL);
- break;
-
- default:
- return (EFI_INVALID_PARAMETER);
+ case EfiDriverConfigurationActionNone:
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_DRVCFG_NONE), gShellDriver1HiiHandle);
+ break;
+
+ case EfiDriverConfigurationActionStopController:
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_DRVCFG_STOP), gShellDriver1HiiHandle);
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_DRVCFG_ENTER_S), gShellDriver1HiiHandle, L"stop controller");
+ ShellPromptForResponse (ShellPromptResponseTypeEnterContinue, NULL, NULL);
+
+ gBS->DisconnectController (ControllerHandle, DriverImageHandle, ChildHandle);
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_DRVCFG_CTLR_S), gShellDriver1HiiHandle, L"stopped");
+ break;
+
+ case EfiDriverConfigurationActionRestartController:
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_DRVCFG_RESTART_S), gShellDriver1HiiHandle, L"controller");
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_DRVCFG_ENTER_S), gShellDriver1HiiHandle, L"restart controller");
+ ShellPromptForResponse (ShellPromptResponseTypeEnterContinue, NULL, NULL);
+
+ gBS->DisconnectController (ControllerHandle, DriverImageHandle, ChildHandle);
+ ConnectControllerContextOverride[0] = DriverImageHandle;
+ ConnectControllerContextOverride[1] = NULL;
+ gBS->ConnectController (ControllerHandle, ConnectControllerContextOverride, NULL, TRUE);
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_DRVCFG_CTLR_S), gShellDriver1HiiHandle, L"restarted");
+ break;
+
+ case EfiDriverConfigurationActionRestartPlatform:
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_DRVCFG_RESTART_S), gShellDriver1HiiHandle, L"platform");
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_DRVCFG_ENTER_S), gShellDriver1HiiHandle, L"restart platform");
+ ShellPromptForResponse (ShellPromptResponseTypeEnterContinue, NULL, NULL);
+
+ gRT->ResetSystem (EfiResetCold, EFI_SUCCESS, 0, NULL);
+ break;
+
+ default:
+ return (EFI_INVALID_PARAMETER);
}
return EFI_SUCCESS;
@@ -544,15 +576,15 @@ ShellCmdDriverConfigurationProcessActionRequired ( **/
SHELL_STATUS
PreHiiDrvCfg (
- IN CONST CHAR8 *Language,
- IN BOOLEAN ForceDefaults,
- IN UINT32 DefaultType,
- IN BOOLEAN AllChildren,
- IN BOOLEAN ValidateOptions,
- IN BOOLEAN SetOptions,
- IN EFI_HANDLE DriverImageHandle,
- IN EFI_HANDLE DeviceHandle,
- IN EFI_HANDLE ChildHandle
+ IN CONST CHAR8 *Language,
+ IN BOOLEAN ForceDefaults,
+ IN UINT32 DefaultType,
+ IN BOOLEAN AllChildren,
+ IN BOOLEAN ValidateOptions,
+ IN BOOLEAN SetOptions,
+ IN EFI_HANDLE DriverImageHandle,
+ IN EFI_HANDLE DeviceHandle,
+ IN EFI_HANDLE ChildHandle
)
{
EFI_STATUS Status;
@@ -578,44 +610,50 @@ PreHiiDrvCfg ( ShellStatus = SHELL_SUCCESS;
- if (ChildHandle == NULL && AllChildren) {
+ if ((ChildHandle == NULL) && AllChildren) {
SetOptions = FALSE;
}
if (ForceDefaults) {
- ShellPrintHiiEx(
+ ShellPrintHiiEx (
-1,
-1,
NULL,
STRING_TOKEN (STR_DRVCFG_FORCE_D),
gShellDriver1HiiHandle,
- DefaultType);
+ DefaultType
+ );
} else if (ValidateOptions) {
- ShellPrintHiiEx(
+ ShellPrintHiiEx (
-1,
-1,
NULL,
STRING_TOKEN (STR_DRVCFG_VALIDATE),
- gShellDriver1HiiHandle);
+ gShellDriver1HiiHandle
+ );
} else if (SetOptions) {
- ShellPrintHiiEx(
+ ShellPrintHiiEx (
-1,
-1,
NULL,
STRING_TOKEN (STR_DRVCFG_SET),
- gShellDriver1HiiHandle);
+ gShellDriver1HiiHandle
+ );
}
if (DriverImageHandle == 0) {
- DriverImageHandleBuffer = GetHandleListByProtocolList(CfgGuidList);
+ DriverImageHandleBuffer = GetHandleListByProtocolList (CfgGuidList);
if (DriverImageHandleBuffer == NULL) {
ShellStatus = SHELL_NOT_FOUND;
goto Done;
}
+
for (
- HandleBuffer = DriverImageHandleBuffer, DriverImageHandleCount = 0
- ; HandleBuffer != NULL && *HandleBuffer != NULL
- ; HandleBuffer++,DriverImageHandleCount++);
+ HandleBuffer = DriverImageHandleBuffer, DriverImageHandleCount = 0
+ ; HandleBuffer != NULL && *HandleBuffer != NULL
+ ; HandleBuffer++, DriverImageHandleCount++)
+ {
+ }
} else {
DriverImageHandleCount = 1;
//
@@ -629,47 +667,48 @@ PreHiiDrvCfg ( for (OuterLoopCounter = 0; OuterLoopCounter < DriverImageHandleCount; OuterLoopCounter++) {
Iso639Language = FALSE;
- Status = gBS->OpenProtocol (
- DriverImageHandleBuffer[OuterLoopCounter],
- &gEfiDriverConfiguration2ProtocolGuid,
- (VOID **) &DriverConfiguration,
- NULL,
- NULL,
- EFI_OPEN_PROTOCOL_GET_PROTOCOL
- );
+ Status = gBS->OpenProtocol (
+ DriverImageHandleBuffer[OuterLoopCounter],
+ &gEfiDriverConfiguration2ProtocolGuid,
+ (VOID **)&DriverConfiguration,
+ NULL,
+ NULL,
+ EFI_OPEN_PROTOCOL_GET_PROTOCOL
+ );
if (EFI_ERROR (Status)) {
Iso639Language = TRUE;
- Status = gBS->OpenProtocol (
- DriverImageHandleBuffer[OuterLoopCounter],
- &gEfiDriverConfigurationProtocolGuid,
- (VOID **) &DriverConfiguration,
- NULL,
- NULL,
- EFI_OPEN_PROTOCOL_GET_PROTOCOL
- );
+ Status = gBS->OpenProtocol (
+ DriverImageHandleBuffer[OuterLoopCounter],
+ &gEfiDriverConfigurationProtocolGuid,
+ (VOID **)&DriverConfiguration,
+ NULL,
+ NULL,
+ EFI_OPEN_PROTOCOL_GET_PROTOCOL
+ );
}
+
if (EFI_ERROR (Status)) {
-// ShellPrintHiiEx(
-// -1,
-// -1,
-// NULL,
-// STRING_TOKEN (STR_DRVCFG_NOT_SUPPORT),
-// gShellDriver1HiiHandle,
-// ConvertHandleToHandleIndex (DriverImageHandleBuffer[OuterLoopCounter])
-// );
+ // ShellPrintHiiEx(
+ // -1,
+ // -1,
+ // NULL,
+ // STRING_TOKEN (STR_DRVCFG_NOT_SUPPORT),
+ // gShellDriver1HiiHandle,
+ // ConvertHandleToHandleIndex (DriverImageHandleBuffer[OuterLoopCounter])
+ // );
ShellStatus = SHELL_UNSUPPORTED;
continue;
}
BestLanguage = GetBestLanguage (
- DriverConfiguration->SupportedLanguages,
- Iso639Language,
- Language!=NULL?Language:"",
- DriverConfiguration->SupportedLanguages,
- NULL
- );
+ DriverConfiguration->SupportedLanguages,
+ Iso639Language,
+ Language != NULL ? Language : "",
+ DriverConfiguration->SupportedLanguages,
+ NULL
+ );
if (BestLanguage == NULL) {
- ShellPrintHiiEx(
+ ShellPrintHiiEx (
-1,
-1,
NULL,
@@ -683,18 +722,17 @@ PreHiiDrvCfg ( }
Status = ParseHandleDatabaseByRelationshipWithType (
- DriverImageHandleBuffer[OuterLoopCounter],
- NULL,
- &HandleCount,
- &HandleBuffer,
- &HandleType
- );
+ DriverImageHandleBuffer[OuterLoopCounter],
+ NULL,
+ &HandleCount,
+ &HandleBuffer,
+ &HandleType
+ );
if (EFI_ERROR (Status)) {
continue;
}
- if (SetOptions && DeviceHandle == NULL) {
-
+ if (SetOptions && (DeviceHandle == NULL)) {
gST->ConOut->ClearScreen (gST->ConOut);
Status = DriverConfiguration->SetOptions (
DriverConfiguration,
@@ -705,7 +743,7 @@ PreHiiDrvCfg ( );
gST->ConOut->ClearScreen (gST->ConOut);
- ShellPrintHiiEx(
+ ShellPrintHiiEx (
-1,
-1,
NULL,
@@ -715,12 +753,13 @@ PreHiiDrvCfg ( DriverConfiguration->SupportedLanguages
);
if (!EFI_ERROR (Status)) {
- ShellPrintHiiEx(
+ ShellPrintHiiEx (
-1,
-1,
NULL,
STRING_TOKEN (STR_DRVCFG_OPTIONS_SET),
- gShellDriver1HiiHandle);
+ gShellDriver1HiiHandle
+ );
for (LoopCounter = 0; LoopCounter < HandleCount; LoopCounter++) {
if ((HandleType[LoopCounter] & HR_CONTROLLER_HANDLE) == HR_CONTROLLER_HANDLE) {
ShellCmdDriverConfigurationProcessActionRequired (
@@ -732,14 +771,16 @@ PreHiiDrvCfg ( }
}
} else {
- ShellPrintHiiEx(
+ ShellPrintHiiEx (
-1,
-1,
NULL,
STRING_TOKEN (STR_DRVCFG_NOT_SET),
gShellDriver1HiiHandle,
- Status);
+ Status
+ );
}
+
continue;
}
@@ -747,13 +788,15 @@ PreHiiDrvCfg ( if ((HandleType[LoopCounter] & HR_CONTROLLER_HANDLE) != HR_CONTROLLER_HANDLE) {
continue;
}
- if (DeviceHandle != NULL && DeviceHandle != HandleBuffer[LoopCounter]) {
+
+ if ((DeviceHandle != NULL) && (DeviceHandle != HandleBuffer[LoopCounter])) {
continue;
}
+
if (ChildHandle == NULL) {
HandleIndex1 = ConvertHandleToHandleIndex (DriverImageHandleBuffer[OuterLoopCounter]);
HandleIndex2 = ConvertHandleToHandleIndex (HandleBuffer[LoopCounter]);
- ShellPrintHiiEx(
+ ShellPrintHiiEx (
-1,
-1,
NULL,
@@ -774,12 +817,13 @@ PreHiiDrvCfg ( );
if (!EFI_ERROR (Status)) {
- ShellPrintHiiEx(
+ ShellPrintHiiEx (
-1,
-1,
NULL,
STRING_TOKEN (STR_DRVCFG_DEF_FORCED),
- gShellDriver1HiiHandle);
+ gShellDriver1HiiHandle
+ );
ShellCmdDriverConfigurationProcessActionRequired (
DriverImageHandleBuffer[OuterLoopCounter],
HandleBuffer[LoopCounter],
@@ -787,15 +831,16 @@ PreHiiDrvCfg ( ActionRequired
);
} else {
- ShellPrintHiiEx(
+ ShellPrintHiiEx (
-1,
-1,
NULL,
STRING_TOKEN (STR_DRVCFG_FORCE_FAILED),
gShellDriver1HiiHandle,
- Status);
- ShellStatus = SHELL_DEVICE_ERROR;
- }
+ Status
+ );
+ ShellStatus = SHELL_DEVICE_ERROR;
+ }
} else if (ValidateOptions) {
Status = DriverConfiguration->OptionsValid (
DriverConfiguration,
@@ -804,20 +849,22 @@ PreHiiDrvCfg ( );
if (!EFI_ERROR (Status)) {
- ShellPrintHiiEx(
+ ShellPrintHiiEx (
-1,
-1,
NULL,
STRING_TOKEN (STR_DRVCFG_OPTIONS_VALID),
- gShellDriver1HiiHandle);
+ gShellDriver1HiiHandle
+ );
} else {
- ShellPrintHiiEx(
+ ShellPrintHiiEx (
-1,
-1,
NULL,
STRING_TOKEN (STR_DRVCFG_OPTIONS_INV),
gShellDriver1HiiHandle,
- Status);
+ Status
+ );
ShellStatus = SHELL_DEVICE_ERROR;
}
} else if (SetOptions) {
@@ -832,7 +879,7 @@ PreHiiDrvCfg ( gST->ConOut->ClearScreen (gST->ConOut);
HandleIndex1 = ConvertHandleToHandleIndex (DriverImageHandleBuffer[OuterLoopCounter]);
HandleIndex2 = ConvertHandleToHandleIndex (HandleBuffer[LoopCounter]);
- ShellPrintHiiEx(
+ ShellPrintHiiEx (
-1,
-1,
NULL,
@@ -843,12 +890,13 @@ PreHiiDrvCfg ( DriverConfiguration->SupportedLanguages
);
if (!EFI_ERROR (Status)) {
- ShellPrintHiiEx(
+ ShellPrintHiiEx (
-1,
-1,
NULL,
STRING_TOKEN (STR_DRVCFG_OPTIONS_SET),
- gShellDriver1HiiHandle);
+ gShellDriver1HiiHandle
+ );
ShellCmdDriverConfigurationProcessActionRequired (
DriverImageHandleBuffer[OuterLoopCounter],
@@ -856,15 +904,15 @@ PreHiiDrvCfg ( NULL,
ActionRequired
);
-
} else {
- ShellPrintHiiEx(
+ ShellPrintHiiEx (
-1,
-1,
NULL,
STRING_TOKEN (STR_DRVCFG_NOT_SET),
gShellDriver1HiiHandle,
- Status);
+ Status
+ );
ShellStatus = SHELL_DEVICE_ERROR;
}
} else {
@@ -872,35 +920,34 @@ PreHiiDrvCfg ( }
}
- if (ChildHandle == NULL && !AllChildren) {
+ if ((ChildHandle == NULL) && !AllChildren) {
continue;
}
Status = ParseHandleDatabaseByRelationshipWithType (
- DriverImageHandleBuffer[OuterLoopCounter],
- HandleBuffer[LoopCounter],
- &ChildHandleCount,
- &ChildHandleBuffer,
- &ChildHandleType
- );
+ DriverImageHandleBuffer[OuterLoopCounter],
+ HandleBuffer[LoopCounter],
+ &ChildHandleCount,
+ &ChildHandleBuffer,
+ &ChildHandleType
+ );
if (EFI_ERROR (Status)) {
continue;
}
for (ChildIndex = 0; ChildIndex < ChildHandleCount; ChildIndex++) {
-
if ((ChildHandleType[ChildIndex] & HR_CHILD_HANDLE) != HR_CHILD_HANDLE) {
continue;
}
- if (ChildHandle != NULL && ChildHandle != ChildHandleBuffer[ChildIndex]) {
+ if ((ChildHandle != NULL) && (ChildHandle != ChildHandleBuffer[ChildIndex])) {
continue;
}
HandleIndex1 = ConvertHandleToHandleIndex (DriverImageHandleBuffer[OuterLoopCounter]);
HandleIndex2 = ConvertHandleToHandleIndex (HandleBuffer[LoopCounter]);
HandleIndex3 = ConvertHandleToHandleIndex (ChildHandleBuffer[ChildIndex]);
- ShellPrintHiiEx(
+ ShellPrintHiiEx (
-1,
-1,
NULL,
@@ -909,7 +956,8 @@ PreHiiDrvCfg ( HandleIndex1,
HandleIndex2,
HandleIndex3,
- DriverConfiguration->SupportedLanguages);
+ DriverConfiguration->SupportedLanguages
+ );
if (ForceDefaults) {
Status = DriverConfiguration->ForceDefaults (
@@ -921,12 +969,13 @@ PreHiiDrvCfg ( );
if (!EFI_ERROR (Status)) {
- ShellPrintHiiEx(
+ ShellPrintHiiEx (
-1,
-1,
NULL,
STRING_TOKEN (STR_DRVCFG_DEF_FORCED),
- gShellDriver1HiiHandle);
+ gShellDriver1HiiHandle
+ );
ShellCmdDriverConfigurationProcessActionRequired (
DriverImageHandleBuffer[OuterLoopCounter],
@@ -934,15 +983,15 @@ PreHiiDrvCfg ( ChildHandleBuffer[ChildIndex],
ActionRequired
);
-
} else {
- ShellPrintHiiEx(
+ ShellPrintHiiEx (
-1,
-1,
NULL,
STRING_TOKEN (STR_DRVCFG_FORCE_FAILED),
gShellDriver1HiiHandle,
- Status);
+ Status
+ );
ShellStatus = SHELL_DEVICE_ERROR;
}
} else if (ValidateOptions) {
@@ -953,20 +1002,22 @@ PreHiiDrvCfg ( );
if (!EFI_ERROR (Status)) {
- ShellPrintHiiEx(
+ ShellPrintHiiEx (
-1,
-1,
NULL,
STRING_TOKEN (STR_DRVCFG_OPTIONS_VALID),
- gShellDriver1HiiHandle);
+ gShellDriver1HiiHandle
+ );
} else {
- ShellPrintHiiEx(
+ ShellPrintHiiEx (
-1,
-1,
NULL,
STRING_TOKEN (STR_DRVCFG_OPTIONS_INV),
gShellDriver1HiiHandle,
- Status);
+ Status
+ );
ShellStatus = SHELL_DEVICE_ERROR;
}
} else if (SetOptions) {
@@ -982,7 +1033,7 @@ PreHiiDrvCfg ( HandleIndex1 = ConvertHandleToHandleIndex (DriverImageHandleBuffer[OuterLoopCounter]);
HandleIndex2 = ConvertHandleToHandleIndex (HandleBuffer[LoopCounter]);
HandleIndex3 = ConvertHandleToHandleIndex (ChildHandleBuffer[ChildIndex]);
- ShellPrintHiiEx(
+ ShellPrintHiiEx (
-1,
-1,
NULL,
@@ -994,12 +1045,13 @@ PreHiiDrvCfg ( DriverConfiguration->SupportedLanguages
);
if (!EFI_ERROR (Status)) {
- ShellPrintHiiEx(
+ ShellPrintHiiEx (
-1,
-1,
NULL,
STRING_TOKEN (STR_DRVCFG_OPTIONS_SET),
- gShellDriver1HiiHandle);
+ gShellDriver1HiiHandle
+ );
ShellCmdDriverConfigurationProcessActionRequired (
DriverImageHandleBuffer[OuterLoopCounter],
@@ -1007,15 +1059,15 @@ PreHiiDrvCfg ( ChildHandleBuffer[ChildIndex],
ActionRequired
);
-
} else {
- ShellPrintHiiEx(
+ ShellPrintHiiEx (
-1,
-1,
NULL,
STRING_TOKEN (STR_DRVCFG_NOT_SET),
gShellDriver1HiiHandle,
- Status);
+ Status
+ );
ShellStatus = SHELL_DEVICE_ERROR;
}
} else {
@@ -1032,7 +1084,7 @@ PreHiiDrvCfg ( FreePool (HandleType);
}
- if (DriverImageHandle != NULL && DriverImageHandleCount != 0) {
+ if ((DriverImageHandle != NULL) && (DriverImageHandleCount != 0)) {
FreePool (DriverImageHandleBuffer);
}
@@ -1050,31 +1102,30 @@ Done: @retval SHELL_SUCCESS The operation was successful.
**/
SHELL_STATUS
-PrintConfigInfoOnAll(
- IN CONST BOOLEAN ChildrenToo,
- IN CONST CHAR8 *Language,
- IN CONST BOOLEAN UseHii
+PrintConfigInfoOnAll (
+ IN CONST BOOLEAN ChildrenToo,
+ IN CONST CHAR8 *Language,
+ IN CONST BOOLEAN UseHii
)
{
- EFI_HANDLE *HandleList;
- EFI_HANDLE *CurrentHandle;
- BOOLEAN Found;
- UINTN Index2;
+ EFI_HANDLE *HandleList;
+ EFI_HANDLE *CurrentHandle;
+ BOOLEAN Found;
+ UINTN Index2;
-
- Found = FALSE;
- HandleList = NULL;
- CurrentHandle = NULL;
+ Found = FALSE;
+ HandleList = NULL;
+ CurrentHandle = NULL;
if (UseHii) {
//
// HII method
//
- HandleList = GetHandleListByProtocol(&gEfiHiiConfigAccessProtocolGuid);
- for (CurrentHandle = HandleList ; CurrentHandle != NULL && *CurrentHandle != NULL; CurrentHandle++){
- Found = TRUE;
- Index2 = *CurrentHandle == NULL ? 0 : ConvertHandleToHandleIndex(*CurrentHandle);
- ShellPrintHiiEx(
+ HandleList = GetHandleListByProtocol (&gEfiHiiConfigAccessProtocolGuid);
+ for (CurrentHandle = HandleList; CurrentHandle != NULL && *CurrentHandle != NULL; CurrentHandle++) {
+ Found = TRUE;
+ Index2 = *CurrentHandle == NULL ? 0 : ConvertHandleToHandleIndex (*CurrentHandle);
+ ShellPrintHiiEx (
-1,
-1,
NULL,
@@ -1083,46 +1134,49 @@ PrintConfigInfoOnAll( Index2
);
}
- SHELL_FREE_NON_NULL(HandleList);
+
+ SHELL_FREE_NON_NULL (HandleList);
}
if (PreHiiDrvCfg (
- Language,
- FALSE,
- 0,
- ChildrenToo,
- FALSE,
- FALSE,
- 0,
- 0,
- 0) == SHELL_SUCCESS) {
- Found = TRUE;
+ Language,
+ FALSE,
+ 0,
+ ChildrenToo,
+ FALSE,
+ FALSE,
+ 0,
+ 0,
+ 0
+ ) == SHELL_SUCCESS)
+ {
+ Found = TRUE;
}
if (!Found) {
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_DRVCFG_NONE_FOUND), gShellDriver1HiiHandle);
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_DRVCFG_NONE_FOUND), gShellDriver1HiiHandle);
return (SHELL_SUCCESS);
}
return (SHELL_SUCCESS);
}
-STATIC CONST SHELL_PARAM_ITEM ParamListHii[] = {
- {L"-s", TypeFlag},
- {L"-l", TypeValue},
- {L"-f", TypeValue},
- {L"-o", TypeValue},
- {L"-i", TypeValue},
- {NULL, TypeMax}
- };
-STATIC CONST SHELL_PARAM_ITEM ParamListPreHii[] = {
- {L"-c", TypeFlag},
- {L"-s", TypeFlag},
- {L"-v", TypeFlag},
- {L"-l", TypeValue},
- {L"-f", TypeValue},
- {NULL, TypeMax}
- };
+STATIC CONST SHELL_PARAM_ITEM ParamListHii[] = {
+ { L"-s", TypeFlag },
+ { L"-l", TypeValue },
+ { L"-f", TypeValue },
+ { L"-o", TypeValue },
+ { L"-i", TypeValue },
+ { NULL, TypeMax }
+};
+STATIC CONST SHELL_PARAM_ITEM ParamListPreHii[] = {
+ { L"-c", TypeFlag },
+ { L"-s", TypeFlag },
+ { L"-v", TypeFlag },
+ { L"-l", TypeValue },
+ { L"-f", TypeValue },
+ { NULL, TypeMax }
+};
/**
Function for 'drvcfg' command.
@@ -1137,150 +1191,161 @@ ShellCommandRunDrvCfg ( IN EFI_SYSTEM_TABLE *SystemTable
)
{
- EFI_STATUS Status;
- LIST_ENTRY *Package;
- CHAR16 *ProblemParam;
- SHELL_STATUS ShellStatus;
- CHAR8 *Language;
- CONST CHAR16 *Lang;
- CONST CHAR16 *HandleIndex1;
- CONST CHAR16 *HandleIndex2;
- CONST CHAR16 *HandleIndex3;
- CONST CHAR16 *ForceTypeString;
- BOOLEAN Force;
- BOOLEAN Set;
- BOOLEAN Validate;
- BOOLEAN InFromFile;
- BOOLEAN OutToFile;
- BOOLEAN AllChildren;
- BOOLEAN UseHii;
- UINT32 ForceType;
- UINT64 Intermediate;
- EFI_HANDLE Handle1;
- EFI_HANDLE Handle2;
- EFI_HANDLE Handle3;
- CONST CHAR16 *FileName;
-
- ShellStatus = SHELL_SUCCESS;
- Status = EFI_SUCCESS;
- Language = NULL;
- UseHii = TRUE;
- ProblemParam = NULL;
+ EFI_STATUS Status;
+ LIST_ENTRY *Package;
+ CHAR16 *ProblemParam;
+ SHELL_STATUS ShellStatus;
+ CHAR8 *Language;
+ CONST CHAR16 *Lang;
+ CONST CHAR16 *HandleIndex1;
+ CONST CHAR16 *HandleIndex2;
+ CONST CHAR16 *HandleIndex3;
+ CONST CHAR16 *ForceTypeString;
+ BOOLEAN Force;
+ BOOLEAN Set;
+ BOOLEAN Validate;
+ BOOLEAN InFromFile;
+ BOOLEAN OutToFile;
+ BOOLEAN AllChildren;
+ BOOLEAN UseHii;
+ UINT32 ForceType;
+ UINT64 Intermediate;
+ EFI_HANDLE Handle1;
+ EFI_HANDLE Handle2;
+ EFI_HANDLE Handle3;
+ CONST CHAR16 *FileName;
+
+ ShellStatus = SHELL_SUCCESS;
+ Status = EFI_SUCCESS;
+ Language = NULL;
+ UseHii = TRUE;
+ ProblemParam = NULL;
//
// initialize the shell lib (we must be in non-auto-init...)
//
- Status = ShellInitialize();
- ASSERT_EFI_ERROR(Status);
+ Status = ShellInitialize ();
+ ASSERT_EFI_ERROR (Status);
- Status = CommandInit();
- ASSERT_EFI_ERROR(Status);
+ Status = CommandInit ();
+ ASSERT_EFI_ERROR (Status);
//
// parse the command line
//
Status = ShellCommandLineParse (ParamListHii, &Package, &ProblemParam, TRUE);
- if (EFI_ERROR(Status) || ShellCommandLineGetCount(Package) > 2) {
+ if (EFI_ERROR (Status) || (ShellCommandLineGetCount (Package) > 2)) {
UseHii = FALSE;
if (Package != NULL) {
ShellCommandLineFreeVarList (Package);
}
- SHELL_FREE_NON_NULL(ProblemParam);
+
+ SHELL_FREE_NON_NULL (ProblemParam);
Status = ShellCommandLineParse (ParamListPreHii, &Package, &ProblemParam, TRUE);
- if (EFI_ERROR(Status)) {
- if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, L"drvcfg", ProblemParam);
- FreePool(ProblemParam);
+ if (EFI_ERROR (Status)) {
+ if ((Status == EFI_VOLUME_CORRUPTED) && (ProblemParam != NULL)) {
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, L"drvcfg", ProblemParam);
+ FreePool (ProblemParam);
ShellStatus = SHELL_INVALID_PARAMETER;
goto Done;
} else {
- ASSERT(FALSE);
+ ASSERT (FALSE);
}
}
}
+
if (ShellStatus == SHELL_SUCCESS) {
- if (ShellCommandLineGetCount(Package) > 4) {
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"drvcfg");
+ if (ShellCommandLineGetCount (Package) > 4) {
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"drvcfg");
ShellStatus = SHELL_INVALID_PARAMETER;
goto Done;
}
- Lang = ShellCommandLineGetValue(Package, L"-l");
+
+ Lang = ShellCommandLineGetValue (Package, L"-l");
if (Lang != NULL) {
- Language = AllocateZeroPool(StrSize(Lang));
- AsciiSPrint(Language, StrSize(Lang), "%S", Lang);
- } else if (ShellCommandLineGetFlag(Package, L"-l")){
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"drvcfg", L"-l");
+ Language = AllocateZeroPool (StrSize (Lang));
+ AsciiSPrint (Language, StrSize (Lang), "%S", Lang);
+ } else if (ShellCommandLineGetFlag (Package, L"-l")) {
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"drvcfg", L"-l");
ShellStatus = SHELL_INVALID_PARAMETER;
goto Done;
}
- Set = ShellCommandLineGetFlag (Package, L"-s");
- Validate = ShellCommandLineGetFlag (Package, L"-v");
- InFromFile = ShellCommandLineGetFlag (Package, L"-i");
- OutToFile = ShellCommandLineGetFlag (Package, L"-o");
- AllChildren = ShellCommandLineGetFlag (Package, L"-c");
- Force = ShellCommandLineGetFlag (Package, L"-f");
- ForceTypeString = ShellCommandLineGetValue(Package, L"-f");
+
+ Set = ShellCommandLineGetFlag (Package, L"-s");
+ Validate = ShellCommandLineGetFlag (Package, L"-v");
+ InFromFile = ShellCommandLineGetFlag (Package, L"-i");
+ OutToFile = ShellCommandLineGetFlag (Package, L"-o");
+ AllChildren = ShellCommandLineGetFlag (Package, L"-c");
+ Force = ShellCommandLineGetFlag (Package, L"-f");
+ ForceTypeString = ShellCommandLineGetValue (Package, L"-f");
if (OutToFile) {
- FileName = ShellCommandLineGetValue(Package, L"-o");
+ FileName = ShellCommandLineGetValue (Package, L"-o");
} else if (InFromFile) {
- FileName = ShellCommandLineGetValue(Package, L"-i");
+ FileName = ShellCommandLineGetValue (Package, L"-i");
} else {
FileName = NULL;
}
- if (InFromFile && EFI_ERROR(ShellFileExists(FileName))) {
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FIND_FAIL), gShellDriver1HiiHandle, L"drvcfg", FileName);
+ if (InFromFile && EFI_ERROR (ShellFileExists (FileName))) {
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_FIND_FAIL), gShellDriver1HiiHandle, L"drvcfg", FileName);
ShellStatus = SHELL_INVALID_PARAMETER;
goto Done;
}
- if (OutToFile && !EFI_ERROR(ShellFileExists(FileName))) {
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_EXIST), gShellDriver1HiiHandle, L"drvcfg", FileName);
+
+ if (OutToFile && !EFI_ERROR (ShellFileExists (FileName))) {
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_EXIST), gShellDriver1HiiHandle, L"drvcfg", FileName);
ShellStatus = SHELL_INVALID_PARAMETER;
goto Done;
}
- if (Force && ForceTypeString == NULL) {
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"drvcfg", L"-f");
+
+ if (Force && (ForceTypeString == NULL)) {
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"drvcfg", L"-f");
ShellStatus = SHELL_INVALID_PARAMETER;
goto Done;
}
+
if (Force) {
- Status = ShellConvertStringToUint64(ForceTypeString, &Intermediate, FALSE, FALSE);
- if (EFI_ERROR(Status)) {
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM_VAL), gShellDriver1HiiHandle, L"drvcfg", ForceTypeString, L"-f");
+ Status = ShellConvertStringToUint64 (ForceTypeString, &Intermediate, FALSE, FALSE);
+ if (EFI_ERROR (Status)) {
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM_VAL), gShellDriver1HiiHandle, L"drvcfg", ForceTypeString, L"-f");
ShellStatus = SHELL_INVALID_PARAMETER;
goto Done;
}
+
ForceType = (UINT32)Intermediate;
} else {
ForceType = 0;
}
- HandleIndex1 = ShellCommandLineGetRawValue(Package, 1);
- Handle1 = NULL;
- if (HandleIndex1 != NULL && !EFI_ERROR(ShellConvertStringToUint64(HandleIndex1, &Intermediate, TRUE, FALSE))) {
- Handle1 = ConvertHandleIndexToHandle((UINTN)Intermediate);
- if (Handle1 == NULL || (UINT64)(UINTN)Intermediate != Intermediate) {
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"drvcfg", HandleIndex1);
+
+ HandleIndex1 = ShellCommandLineGetRawValue (Package, 1);
+ Handle1 = NULL;
+ if ((HandleIndex1 != NULL) && !EFI_ERROR (ShellConvertStringToUint64 (HandleIndex1, &Intermediate, TRUE, FALSE))) {
+ Handle1 = ConvertHandleIndexToHandle ((UINTN)Intermediate);
+ if ((Handle1 == NULL) || ((UINT64)(UINTN)Intermediate != Intermediate)) {
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"drvcfg", HandleIndex1);
ShellStatus = SHELL_INVALID_PARAMETER;
goto Done;
}
}
- HandleIndex2 = ShellCommandLineGetRawValue(Package, 2);
- Handle2 = NULL;
- if (HandleIndex2 != NULL && !EFI_ERROR(ShellConvertStringToUint64(HandleIndex2, &Intermediate, TRUE, FALSE))) {
- Handle2 = ConvertHandleIndexToHandle((UINTN)Intermediate);
- if (Handle2 == NULL || (UINT64)(UINTN)Intermediate != Intermediate) {
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"drvcfg", HandleIndex2);
+
+ HandleIndex2 = ShellCommandLineGetRawValue (Package, 2);
+ Handle2 = NULL;
+ if ((HandleIndex2 != NULL) && !EFI_ERROR (ShellConvertStringToUint64 (HandleIndex2, &Intermediate, TRUE, FALSE))) {
+ Handle2 = ConvertHandleIndexToHandle ((UINTN)Intermediate);
+ if ((Handle2 == NULL) || ((UINT64)(UINTN)Intermediate != Intermediate)) {
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"drvcfg", HandleIndex2);
ShellStatus = SHELL_INVALID_PARAMETER;
goto Done;
}
}
- HandleIndex3 = ShellCommandLineGetRawValue(Package, 3);
- Handle3 = NULL;
- if (HandleIndex3 != NULL && !EFI_ERROR(ShellConvertStringToUint64(HandleIndex3, &Intermediate, TRUE, FALSE))) {
- Handle3 = ConvertHandleIndexToHandle((UINTN)Intermediate);
- if (Handle3 == NULL || (UINT64)(UINTN)Intermediate != Intermediate) {
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"drvcfg", HandleIndex3);
+
+ HandleIndex3 = ShellCommandLineGetRawValue (Package, 3);
+ Handle3 = NULL;
+ if ((HandleIndex3 != NULL) && !EFI_ERROR (ShellConvertStringToUint64 (HandleIndex3, &Intermediate, TRUE, FALSE))) {
+ Handle3 = ConvertHandleIndexToHandle ((UINTN)Intermediate);
+ if ((Handle3 == NULL) || ((UINT64)(UINTN)Intermediate != Intermediate)) {
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"drvcfg", HandleIndex3);
ShellStatus = SHELL_INVALID_PARAMETER;
goto Done;
}
@@ -1288,42 +1353,49 @@ ShellCommandRunDrvCfg ( if ((InFromFile || OutToFile) && (FileName == NULL)) {
if (FileName == NULL) {
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"drvcfg", InFromFile?L"-i":L"-o");
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"drvcfg", InFromFile ? L"-i" : L"-o");
} else {
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_HANDLE_REQ), gShellDriver1HiiHandle, L"drvcfg");
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_HANDLE_REQ), gShellDriver1HiiHandle, L"drvcfg");
}
+
ShellStatus = SHELL_INVALID_PARAMETER;
goto Done;
}
+
if (!UseHii && (InFromFile || OutToFile)) {
if (InFromFile) {
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellDriver1HiiHandle, L"drvcfg", L"-i");
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellDriver1HiiHandle, L"drvcfg", L"-i");
ShellStatus = SHELL_INVALID_PARAMETER;
goto Done;
}
+
if (OutToFile) {
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellDriver1HiiHandle, L"drvcfg", L"-o");
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellDriver1HiiHandle, L"drvcfg", L"-o");
ShellStatus = SHELL_INVALID_PARAMETER;
goto Done;
}
}
+
if (Validate && Force) {
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CONFLICT), gShellDriver1HiiHandle, L"drvcfg", L"-v", L"-f");
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CONFLICT), gShellDriver1HiiHandle, L"drvcfg", L"-v", L"-f");
ShellStatus = SHELL_INVALID_PARAMETER;
goto Done;
}
+
if (Validate && Set) {
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CONFLICT), gShellDriver1HiiHandle, L"drvcfg", L"-v", L"-s");
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CONFLICT), gShellDriver1HiiHandle, L"drvcfg", L"-v", L"-s");
ShellStatus = SHELL_INVALID_PARAMETER;
goto Done;
}
+
if (Set && Force) {
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CONFLICT), gShellDriver1HiiHandle, L"drvcfg", L"-s", L"-f");
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CONFLICT), gShellDriver1HiiHandle, L"drvcfg", L"-s", L"-f");
ShellStatus = SHELL_INVALID_PARAMETER;
goto Done;
}
+
if (OutToFile && InFromFile) {
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CONFLICT), gShellDriver1HiiHandle, L"drvcfg", L"-i", L"-o");
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CONFLICT), gShellDriver1HiiHandle, L"drvcfg", L"-i", L"-o");
ShellStatus = SHELL_INVALID_PARAMETER;
goto Done;
}
@@ -1332,7 +1404,7 @@ ShellCommandRunDrvCfg ( // We do HII first.
//
if (UseHii) {
- if (Handle1 != NULL && EFI_ERROR(gBS->OpenProtocol(Handle1, &gEfiHiiConfigAccessProtocolGuid, NULL, gImageHandle, NULL, EFI_OPEN_PROTOCOL_TEST_PROTOCOL))) {
+ if ((Handle1 != NULL) && EFI_ERROR (gBS->OpenProtocol (Handle1, &gEfiHiiConfigAccessProtocolGuid, NULL, gImageHandle, NULL, EFI_OPEN_PROTOCOL_TEST_PROTOCOL))) {
//
// no HII on this handle.
//
@@ -1341,30 +1413,30 @@ ShellCommandRunDrvCfg ( } else if (Force) {
} else if (Set) {
} else if (InFromFile) {
- ShellStatus = ConfigFromFile(Handle1, FileName);
- if (Handle1 != NULL && ShellStatus == SHELL_SUCCESS) {
+ ShellStatus = ConfigFromFile (Handle1, FileName);
+ if ((Handle1 != NULL) && (ShellStatus == SHELL_SUCCESS)) {
goto Done;
}
} else if (OutToFile) {
- ShellStatus = ConfigToFile(Handle1, FileName);
- if (Handle1 != NULL && ShellStatus == SHELL_SUCCESS) {
+ ShellStatus = ConfigToFile (Handle1, FileName);
+ if ((Handle1 != NULL) && (ShellStatus == SHELL_SUCCESS)) {
goto Done;
}
} else if (HandleIndex1 == NULL) {
//
// display all that are configurable
//
- ShellStatus = PrintConfigInfoOnAll(AllChildren, Language, UseHii);
+ ShellStatus = PrintConfigInfoOnAll (AllChildren, Language, UseHii);
goto Done;
} else {
- if (!EFI_ERROR(gBS->OpenProtocol(Handle1, &gEfiHiiConfigAccessProtocolGuid, NULL, gImageHandle, NULL, EFI_OPEN_PROTOCOL_TEST_PROTOCOL))) {
- ShellPrintHiiEx(
+ if (!EFI_ERROR (gBS->OpenProtocol (Handle1, &gEfiHiiConfigAccessProtocolGuid, NULL, gImageHandle, NULL, EFI_OPEN_PROTOCOL_TEST_PROTOCOL))) {
+ ShellPrintHiiEx (
-1,
-1,
NULL,
STRING_TOKEN (STR_DRVCFG_LINE_HII),
gShellDriver1HiiHandle,
- ConvertHandleToHandleIndex(Handle1)
+ ConvertHandleToHandleIndex (Handle1)
);
goto Done;
}
@@ -1376,31 +1448,32 @@ ShellCommandRunDrvCfg ( //
if (!InFromFile && !OutToFile) {
ShellStatus = PreHiiDrvCfg (
- Language,
- Force,
- ForceType,
- AllChildren,
- Validate,
- Set,
- Handle1,
- Handle2,
- Handle3);
+ Language,
+ Force,
+ ForceType,
+ AllChildren,
+ Validate,
+ Set,
+ Handle1,
+ Handle2,
+ Handle3
+ );
}
if (ShellStatus == SHELL_UNSUPPORTED) {
- ShellPrintHiiEx(
+ ShellPrintHiiEx (
-1,
-1,
NULL,
STRING_TOKEN (STR_DRVCFG_NOT_SUPPORT),
gShellDriver1HiiHandle,
- ConvertHandleToHandleIndex(Handle1)
+ ConvertHandleToHandleIndex (Handle1)
);
}
}
Done:
ShellCommandLineFreeVarList (Package);
- SHELL_FREE_NON_NULL(Language);
+ SHELL_FREE_NON_NULL (Language);
return (ShellStatus);
}
|