Main file for DrvCfg shell Driver1 function.\r
\r
(C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>\r
- Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>\r
- This program and the accompanying materials\r
- are licensed and made available under the terms and conditions of the BSD License\r
- which accompanies this distribution. The full text of the license may be found at\r
- http://opensource.org/licenses/bsd-license.php\r
-\r
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+ Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r
+ SPDX-License-Identifier: BSD-2-Clause-Patent\r
\r
**/\r
\r
#include <Protocol/HiiConfigAccess.h>\r
#include <Protocol/HiiDatabase.h>\r
\r
-STATIC CONST EFI_GUID *CfgGuidList[] = {&gEfiDriverConfigurationProtocolGuid, &gEfiDriverConfiguration2ProtocolGuid, NULL};\r
+STATIC CONST EFI_GUID *CfgGuidList[] = { &gEfiDriverConfigurationProtocolGuid, &gEfiDriverConfiguration2ProtocolGuid, NULL };\r
\r
/**\r
Find the EFI_HII_HANDLE by device path.\r
@retval EFI_NOT_FOUND There was no EFI_HII_HANDLE found for that deviec path.\r
**/\r
EFI_STATUS\r
-EFIAPI\r
-FindHiiHandleViaDevPath(\r
- IN CONST EFI_DEVICE_PATH_PROTOCOL *DevPath1,\r
- OUT EFI_HII_HANDLE *HiiHandle,\r
- IN EFI_HII_DATABASE_PROTOCOL *HiiDb\r
+FindHiiHandleViaDevPath (\r
+ IN CONST EFI_DEVICE_PATH_PROTOCOL *DevPath1,\r
+ OUT EFI_HII_HANDLE *HiiHandle,\r
+ IN EFI_HII_DATABASE_PROTOCOL *HiiDb\r
)\r
{\r
- EFI_HII_HANDLE *HandleBuffer;\r
- UINTN HandleBufferSize;\r
- VOID *MainBuffer;\r
- UINTN MainBufferSize;\r
- EFI_HII_PACKAGE_LIST_HEADER *PackageListHeader;\r
- EFI_HII_PACKAGE_HEADER *PackageHeader;\r
- UINTN LoopVariable;\r
- EFI_DEVICE_PATH_PROTOCOL *DevPath2;\r
- EFI_STATUS Status;\r
-\r
- ASSERT(DevPath1 != NULL);\r
- ASSERT(HiiHandle != NULL);\r
- ASSERT(*HiiHandle == NULL);\r
- ASSERT(HiiDb != NULL);\r
-\r
- HandleBufferSize = 0;\r
- HandleBuffer = NULL;\r
- Status = HiiDb->ListPackageLists(HiiDb, EFI_HII_PACKAGE_DEVICE_PATH, NULL, &HandleBufferSize, HandleBuffer);\r
+ EFI_HII_HANDLE *HandleBuffer;\r
+ UINTN HandleBufferSize;\r
+ VOID *MainBuffer;\r
+ UINTN MainBufferSize;\r
+ EFI_HII_PACKAGE_LIST_HEADER *PackageListHeader;\r
+ EFI_HII_PACKAGE_HEADER *PackageHeader;\r
+ UINTN LoopVariable;\r
+ EFI_DEVICE_PATH_PROTOCOL *DevPath2;\r
+ EFI_STATUS Status;\r
+\r
+ ASSERT (DevPath1 != NULL);\r
+ ASSERT (HiiHandle != NULL);\r
+ ASSERT (*HiiHandle == NULL);\r
+ ASSERT (HiiDb != NULL);\r
+\r
+ HandleBufferSize = 0;\r
+ HandleBuffer = NULL;\r
+ Status = HiiDb->ListPackageLists (HiiDb, EFI_HII_PACKAGE_DEVICE_PATH, NULL, &HandleBufferSize, HandleBuffer);\r
if (Status == EFI_BUFFER_TOO_SMALL) {\r
- HandleBuffer = AllocateZeroPool(HandleBufferSize);\r
- ASSERT (HandleBuffer != NULL);\r
- Status = HiiDb->ListPackageLists(HiiDb, EFI_HII_PACKAGE_DEVICE_PATH, NULL, &HandleBufferSize, HandleBuffer);\r
+ HandleBuffer = AllocateZeroPool (HandleBufferSize);\r
+ if (HandleBuffer == NULL) {\r
+ Status = EFI_OUT_OF_RESOURCES;\r
+ } else {\r
+ Status = HiiDb->ListPackageLists (HiiDb, EFI_HII_PACKAGE_DEVICE_PATH, NULL, &HandleBufferSize, HandleBuffer);\r
+ }\r
}\r
- if (EFI_ERROR(Status)) {\r
- SHELL_FREE_NON_NULL(HandleBuffer);\r
+\r
+ if (EFI_ERROR (Status)) {\r
+ SHELL_FREE_NON_NULL (HandleBuffer);\r
return (Status);\r
}\r
\r
return EFI_NOT_FOUND;\r
}\r
\r
- for (LoopVariable = 0 ; LoopVariable < (HandleBufferSize/sizeof(HandleBuffer[0])) && *HiiHandle == NULL ; LoopVariable++) {\r
- MainBufferSize = 0;\r
- MainBuffer = NULL;\r
- Status = HiiDb->ExportPackageLists(HiiDb, HandleBuffer[LoopVariable], &MainBufferSize, MainBuffer);\r
+ for (LoopVariable = 0; LoopVariable < (HandleBufferSize/sizeof (HandleBuffer[0])) && *HiiHandle == NULL; LoopVariable++) {\r
+ MainBufferSize = 0;\r
+ MainBuffer = NULL;\r
+ Status = HiiDb->ExportPackageLists (HiiDb, HandleBuffer[LoopVariable], &MainBufferSize, MainBuffer);\r
if (Status == EFI_BUFFER_TOO_SMALL) {\r
- MainBuffer = AllocateZeroPool(MainBufferSize);\r
- ASSERT (MainBuffer != NULL);\r
- Status = HiiDb->ExportPackageLists(HiiDb, HandleBuffer[LoopVariable], &MainBufferSize, MainBuffer);\r
+ MainBuffer = AllocateZeroPool (MainBufferSize);\r
+ if (MainBuffer != NULL) {\r
+ Status = HiiDb->ExportPackageLists (HiiDb, HandleBuffer[LoopVariable], &MainBufferSize, MainBuffer);\r
+ }\r
}\r
+\r
+ if (EFI_ERROR (Status)) {\r
+ continue;\r
+ }\r
+\r
//\r
// Enumerate through the block of returned memory.\r
// This should actually be a small block, but we need to be sure.\r
//\r
- for (PackageListHeader = (EFI_HII_PACKAGE_LIST_HEADER*)MainBuffer\r
- ; PackageListHeader != NULL && ((CHAR8*)PackageListHeader) < (((CHAR8*)MainBuffer)+MainBufferSize) && *HiiHandle == NULL\r
- ; PackageListHeader = (EFI_HII_PACKAGE_LIST_HEADER*)(((CHAR8*)(PackageListHeader)) + PackageListHeader->PackageLength )) {\r
- for (PackageHeader = (EFI_HII_PACKAGE_HEADER*)(((CHAR8*)(PackageListHeader))+sizeof(EFI_HII_PACKAGE_LIST_HEADER))\r
- ; PackageHeader != NULL && ((CHAR8*)PackageHeader) < (((CHAR8*)MainBuffer)+MainBufferSize) && PackageHeader->Type != EFI_HII_PACKAGE_END && *HiiHandle == NULL\r
- ; PackageHeader = (EFI_HII_PACKAGE_HEADER*)(((CHAR8*)(PackageHeader))+PackageHeader->Length)) {\r
- if (PackageHeader->Type == EFI_HII_PACKAGE_DEVICE_PATH) {\r
- DevPath2 = (EFI_DEVICE_PATH_PROTOCOL*)(((CHAR8*)PackageHeader) + sizeof(EFI_HII_PACKAGE_HEADER));\r
- if (DevicePathCompare(&DevPath1, &DevPath2) == 0) {\r
- *HiiHandle = HandleBuffer[LoopVariable];\r
- break;\r
- }\r
- }\r
+ for (PackageListHeader = (EFI_HII_PACKAGE_LIST_HEADER *)MainBuffer\r
+ ; PackageListHeader != NULL && ((CHAR8 *)PackageListHeader) < (((CHAR8 *)MainBuffer)+MainBufferSize) && *HiiHandle == NULL\r
+ ; PackageListHeader = (EFI_HII_PACKAGE_LIST_HEADER *)(((CHAR8 *)(PackageListHeader)) + PackageListHeader->PackageLength))\r
+ {\r
+ for (PackageHeader = (EFI_HII_PACKAGE_HEADER *)(((CHAR8 *)(PackageListHeader))+sizeof (EFI_HII_PACKAGE_LIST_HEADER))\r
+ ; PackageHeader != NULL && ((CHAR8 *)PackageHeader) < (((CHAR8 *)MainBuffer)+MainBufferSize) && PackageHeader->Type != EFI_HII_PACKAGE_END && *HiiHandle == NULL\r
+ ; PackageHeader = (EFI_HII_PACKAGE_HEADER *)(((CHAR8 *)(PackageHeader))+PackageHeader->Length))\r
+ {\r
+ if (PackageHeader->Type == EFI_HII_PACKAGE_DEVICE_PATH) {\r
+ DevPath2 = (EFI_DEVICE_PATH_PROTOCOL *)(((CHAR8 *)PackageHeader) + sizeof (EFI_HII_PACKAGE_HEADER));\r
+ if (DevicePathCompare (&DevPath1, &DevPath2) == 0) {\r
+ *HiiHandle = HandleBuffer[LoopVariable];\r
+ break;\r
+ }\r
}\r
+ }\r
}\r
- SHELL_FREE_NON_NULL(MainBuffer);\r
+\r
+ SHELL_FREE_NON_NULL (MainBuffer);\r
}\r
- SHELL_FREE_NON_NULL(HandleBuffer);\r
+\r
+ SHELL_FREE_NON_NULL (HandleBuffer);\r
\r
if (*HiiHandle == NULL) {\r
return (EFI_NOT_FOUND);\r
}\r
+\r
return (EFI_SUCCESS);\r
}\r
\r
@retval EFI_SUCCESS The operation was successful.\r
**/\r
EFI_STATUS\r
-EFIAPI\r
-ConvertHandleToHiiHandle(\r
+ConvertHandleToHiiHandle (\r
IN CONST EFI_HANDLE Handle,\r
OUT EFI_HII_HANDLE *HiiHandle,\r
IN EFI_HII_DATABASE_PROTOCOL *HiiDb\r
)\r
{\r
- EFI_STATUS Status;\r
- EFI_DEVICE_PATH_PROTOCOL *DevPath1;\r
+ EFI_STATUS Status;\r
+ EFI_DEVICE_PATH_PROTOCOL *DevPath1;\r
\r
- if (HiiHandle == NULL || HiiDb == NULL) {\r
+ if ((HiiHandle == NULL) || (HiiDb == NULL)) {\r
return (EFI_INVALID_PARAMETER);\r
}\r
+\r
*HiiHandle = NULL;\r
\r
if (Handle == NULL) {\r
}\r
\r
DevPath1 = NULL;\r
- Status = gBS->OpenProtocol(Handle, &gEfiDevicePathProtocolGuid, (VOID**)&DevPath1, gImageHandle, NULL, EFI_OPEN_PROTOCOL_GET_PROTOCOL);\r
- if (EFI_ERROR(Status) || DevPath1 == NULL) {\r
+ Status = gBS->OpenProtocol (Handle, &gEfiDevicePathProtocolGuid, (VOID **)&DevPath1, gImageHandle, NULL, EFI_OPEN_PROTOCOL_GET_PROTOCOL);\r
+ if (EFI_ERROR (Status) || (DevPath1 == NULL)) {\r
return (EFI_NOT_FOUND);\r
}\r
\r
- return (FindHiiHandleViaDevPath(DevPath1, HiiHandle, HiiDb));\r
+ return (FindHiiHandleViaDevPath (DevPath1, HiiHandle, HiiDb));\r
}\r
\r
/**\r
@param[in] FileName The filename to rwite the info to.\r
**/\r
SHELL_STATUS\r
-EFIAPI\r
-ConfigToFile(\r
- IN CONST EFI_HANDLE Handle,\r
- IN CONST CHAR16 *FileName\r
+ConfigToFile (\r
+ IN CONST EFI_HANDLE Handle,\r
+ IN CONST CHAR16 *FileName\r
)\r
{\r
- EFI_HII_DATABASE_PROTOCOL *HiiDatabase;\r
- EFI_STATUS Status;\r
- VOID *MainBuffer;\r
- UINTN MainBufferSize;\r
- EFI_HII_HANDLE HiiHandle;\r
- SHELL_FILE_HANDLE FileHandle;\r
-\r
- HiiDatabase = NULL;\r
- MainBufferSize = 0;\r
- MainBuffer = NULL;\r
- FileHandle = NULL;\r
-\r
- Status = ShellOpenFileByName(FileName, &FileHandle, EFI_FILE_MODE_READ|EFI_FILE_MODE_WRITE|EFI_FILE_MODE_CREATE, 0);\r
- if (EFI_ERROR(Status)) {\r
- ShellPrintHiiEx(\r
+ EFI_HII_DATABASE_PROTOCOL *HiiDatabase;\r
+ EFI_STATUS Status;\r
+ VOID *MainBuffer;\r
+ UINTN MainBufferSize;\r
+ EFI_HII_HANDLE HiiHandle;\r
+ SHELL_FILE_HANDLE FileHandle;\r
+\r
+ HiiDatabase = NULL;\r
+ MainBufferSize = 0;\r
+ MainBuffer = NULL;\r
+ FileHandle = NULL;\r
+\r
+ Status = ShellOpenFileByName (FileName, &FileHandle, EFI_FILE_MODE_READ|EFI_FILE_MODE_WRITE|EFI_FILE_MODE_CREATE, 0);\r
+ if (EFI_ERROR (Status)) {\r
+ ShellPrintHiiEx (\r
-1,\r
-1,\r
NULL,\r
- STRING_TOKEN(STR_GEN_FILE_OPEN_FAIL),\r
+ STRING_TOKEN (STR_GEN_FILE_OPEN_FAIL),\r
gShellDriver1HiiHandle,\r
L"drvcfg",\r
- FileName, \r
- Status);\r
+ FileName,\r
+ Status\r
+ );\r
return (SHELL_DEVICE_ERROR);\r
}\r
\r
Status = gBS->LocateProtocol (\r
&gEfiHiiDatabaseProtocolGuid,\r
NULL,\r
- (VOID **) &HiiDatabase\r
+ (VOID **)&HiiDatabase\r
);\r
\r
- if (EFI_ERROR(Status) || HiiDatabase == NULL) {\r
- ShellPrintHiiEx(\r
- -1, \r
- -1, \r
+ if (EFI_ERROR (Status) || (HiiDatabase == NULL)) {\r
+ ShellPrintHiiEx (\r
+ -1,\r
+ -1,\r
NULL,\r
- STRING_TOKEN(STR_GEN_PROTOCOL_NF), \r
+ STRING_TOKEN (STR_GEN_PROTOCOL_NF),\r
gShellDriver1HiiHandle,\r
L"drvcfg",\r
- L"EfiHiiDatabaseProtocol", \r
- &gEfiHiiDatabaseProtocolGuid);\r
- ShellCloseFile(&FileHandle);\r
+ L"EfiHiiDatabaseProtocol",\r
+ &gEfiHiiDatabaseProtocolGuid\r
+ );\r
+ ShellCloseFile (&FileHandle);\r
return (SHELL_NOT_FOUND);\r
}\r
\r
- Status = ConvertHandleToHiiHandle(Handle, &HiiHandle, HiiDatabase);\r
- if (EFI_ERROR(Status)) {\r
- ShellPrintHiiEx(\r
- -1, \r
- -1, \r
- NULL, \r
- STRING_TOKEN(STR_GEN_HANDLE_NOT), \r
+ HiiHandle = NULL;\r
+ Status = ConvertHandleToHiiHandle (Handle, &HiiHandle, HiiDatabase);\r
+ if (EFI_ERROR (Status)) {\r
+ ShellPrintHiiEx (\r
+ -1,\r
+ -1,\r
+ NULL,\r
+ STRING_TOKEN (STR_GEN_HANDLE_NOT),\r
gShellDriver1HiiHandle,\r
L"drvcfg",\r
- ConvertHandleToHandleIndex(Handle), \r
- L"Device");\r
- ShellCloseFile(&FileHandle);\r
- return (SHELL_DEVICE_ERROR); \r
+ ConvertHandleToHandleIndex (Handle),\r
+ L"Device"\r
+ );\r
+ ShellCloseFile (&FileHandle);\r
+ return (SHELL_DEVICE_ERROR);\r
}\r
\r
- Status = HiiDatabase->ExportPackageLists(HiiDatabase, HiiHandle, &MainBufferSize, MainBuffer);\r
+ Status = HiiDatabase->ExportPackageLists (HiiDatabase, HiiHandle, &MainBufferSize, MainBuffer);\r
if (Status == EFI_BUFFER_TOO_SMALL) {\r
- MainBuffer = AllocateZeroPool(MainBufferSize);\r
- Status = HiiDatabase->ExportPackageLists(HiiDatabase, HiiHandle, &MainBufferSize, MainBuffer);\r
+ MainBuffer = AllocateZeroPool (MainBufferSize);\r
+ Status = HiiDatabase->ExportPackageLists (HiiDatabase, HiiHandle, &MainBufferSize, MainBuffer);\r
}\r
\r
- Status = ShellWriteFile(FileHandle, &MainBufferSize, MainBuffer);\r
+ Status = ShellWriteFile (FileHandle, &MainBufferSize, MainBuffer);\r
\r
- ShellCloseFile(&FileHandle);\r
- SHELL_FREE_NON_NULL(MainBuffer);\r
+ ShellCloseFile (&FileHandle);\r
+ SHELL_FREE_NON_NULL (MainBuffer);\r
\r
- if (EFI_ERROR(Status)) {\r
- ShellPrintHiiEx(\r
- -1, \r
+ if (EFI_ERROR (Status)) {\r
+ ShellPrintHiiEx (\r
+ -1,\r
-1,\r
NULL,\r
- STRING_TOKEN(STR_FILE_WRITE_FAIL), \r
+ STRING_TOKEN (STR_FILE_WRITE_FAIL),\r
gShellDriver1HiiHandle,\r
L"drvcfg",\r
- FileName);\r
- return (SHELL_DEVICE_ERROR); \r
+ FileName\r
+ );\r
+ return (SHELL_DEVICE_ERROR);\r
}\r
- ShellPrintHiiEx(\r
- -1, \r
+\r
+ ShellPrintHiiEx (\r
+ -1,\r
-1,\r
NULL,\r
- STRING_TOKEN(STR_DRVCFG_COMP), \r
- gShellDriver1HiiHandle);\r
+ STRING_TOKEN (STR_DRVCFG_COMP),\r
+ gShellDriver1HiiHandle\r
+ );\r
\r
return (SHELL_SUCCESS);\r
}\r
@param[in] FileName The filename to read the info from.\r
**/\r
SHELL_STATUS\r
-EFIAPI\r
-ConfigFromFile(\r
- IN EFI_HANDLE Handle,\r
- IN CONST CHAR16 *FileName\r
+ConfigFromFile (\r
+ IN EFI_HANDLE Handle,\r
+ IN CONST CHAR16 *FileName\r
)\r
{\r
- EFI_HII_DATABASE_PROTOCOL *HiiDatabase;\r
- EFI_STATUS Status;\r
- VOID *MainBuffer;\r
- UINT64 Temp;\r
- UINTN MainBufferSize;\r
- EFI_HII_HANDLE HiiHandle;\r
- SHELL_FILE_HANDLE FileHandle;\r
- CHAR16 *TempDevPathString;\r
- EFI_HII_PACKAGE_LIST_HEADER *PackageListHeader;\r
- EFI_HII_PACKAGE_HEADER *PackageHeader;\r
- EFI_DEVICE_PATH_PROTOCOL *DevPath;\r
- UINTN HandleIndex;\r
-\r
- HiiDatabase = NULL;\r
- MainBufferSize = 0;\r
- MainBuffer = NULL;\r
- FileHandle = NULL;\r
-\r
- Status = ShellOpenFileByName(FileName, &FileHandle, EFI_FILE_MODE_READ, 0);\r
- if (EFI_ERROR(Status)) {\r
- ShellPrintHiiEx(\r
+ EFI_HII_DATABASE_PROTOCOL *HiiDatabase;\r
+ EFI_STATUS Status;\r
+ VOID *MainBuffer;\r
+ UINT64 Temp;\r
+ UINTN MainBufferSize;\r
+ EFI_HII_HANDLE HiiHandle;\r
+ SHELL_FILE_HANDLE FileHandle;\r
+ CHAR16 *TempDevPathString;\r
+ EFI_HII_PACKAGE_LIST_HEADER *PackageListHeader;\r
+ EFI_HII_PACKAGE_HEADER *PackageHeader;\r
+ EFI_DEVICE_PATH_PROTOCOL *DevPath;\r
+ UINTN HandleIndex;\r
+\r
+ HiiDatabase = NULL;\r
+ MainBufferSize = 0;\r
+ MainBuffer = NULL;\r
+ FileHandle = NULL;\r
+\r
+ Status = ShellOpenFileByName (FileName, &FileHandle, EFI_FILE_MODE_READ, 0);\r
+ if (EFI_ERROR (Status)) {\r
+ ShellPrintHiiEx (\r
-1,\r
-1,\r
NULL,\r
- STRING_TOKEN(STR_GEN_FILE_OPEN_FAIL),\r
- gShellDriver1HiiHandle, \r
+ STRING_TOKEN (STR_GEN_FILE_OPEN_FAIL),\r
+ gShellDriver1HiiHandle,\r
L"drvcfg",\r
- FileName, \r
- Status);\r
+ FileName,\r
+ Status\r
+ );\r
return (SHELL_DEVICE_ERROR);\r
}\r
\r
Status = gBS->LocateProtocol (\r
&gEfiHiiDatabaseProtocolGuid,\r
NULL,\r
- (VOID **) &HiiDatabase\r
+ (VOID **)&HiiDatabase\r
);\r
\r
- if (EFI_ERROR(Status) || HiiDatabase == NULL) {\r
- ShellPrintHiiEx(\r
- -1, \r
- -1, \r
+ if (EFI_ERROR (Status) || (HiiDatabase == NULL)) {\r
+ ShellPrintHiiEx (\r
+ -1,\r
+ -1,\r
NULL,\r
- STRING_TOKEN(STR_GEN_PROTOCOL_NF), \r
- gShellDriver1HiiHandle, \r
+ STRING_TOKEN (STR_GEN_PROTOCOL_NF),\r
+ gShellDriver1HiiHandle,\r
L"drvcfg",\r
- L"EfiHiiDatabaseProtocol", \r
- &gEfiHiiDatabaseProtocolGuid);\r
- ShellCloseFile(&FileHandle);\r
+ L"EfiHiiDatabaseProtocol",\r
+ &gEfiHiiDatabaseProtocolGuid\r
+ );\r
+ ShellCloseFile (&FileHandle);\r
return (SHELL_NOT_FOUND);\r
}\r
\r
- Status = ShellGetFileSize(FileHandle, &Temp);\r
+ Status = ShellGetFileSize (FileHandle, &Temp);\r
MainBufferSize = (UINTN)Temp;\r
- if (EFI_ERROR(Status)) {\r
- ShellPrintHiiEx(\r
- -1, \r
- -1, \r
- NULL, \r
- STRING_TOKEN(STR_FILE_READ_FAIL), \r
+ if (EFI_ERROR (Status)) {\r
+ ShellPrintHiiEx (\r
+ -1,\r
+ -1,\r
+ NULL,\r
+ STRING_TOKEN (STR_FILE_READ_FAIL),\r
gShellDriver1HiiHandle,\r
L"drvcfg",\r
- FileName);\r
+ FileName\r
+ );\r
\r
- ShellCloseFile(&FileHandle);\r
- return (SHELL_DEVICE_ERROR); \r
+ ShellCloseFile (&FileHandle);\r
+ return (SHELL_DEVICE_ERROR);\r
}\r
- MainBuffer = AllocateZeroPool((UINTN)MainBufferSize); \r
- if (EFI_ERROR(Status)) {\r
- ShellPrintHiiEx(\r
- -1, \r
- -1, \r
- NULL, \r
- STRING_TOKEN(STR_GEN_OUT_MEM), \r
- gShellDriver1HiiHandle, L"drvcfg");\r
- ShellCloseFile(&FileHandle);\r
- return (SHELL_DEVICE_ERROR); \r
+\r
+ MainBuffer = AllocateZeroPool ((UINTN)MainBufferSize);\r
+ if (EFI_ERROR (Status)) {\r
+ ShellPrintHiiEx (\r
+ -1,\r
+ -1,\r
+ NULL,\r
+ STRING_TOKEN (STR_GEN_OUT_MEM),\r
+ gShellDriver1HiiHandle,\r
+ L"drvcfg"\r
+ );\r
+ ShellCloseFile (&FileHandle);\r
+ return (SHELL_DEVICE_ERROR);\r
}\r
- Status = ShellReadFile(FileHandle, &MainBufferSize, MainBuffer);\r
- if (EFI_ERROR(Status)) {\r
- ShellPrintHiiEx(\r
- -1, \r
- -1, \r
- NULL, \r
- STRING_TOKEN(STR_FILE_READ_FAIL), \r
- gShellDriver1HiiHandle, \r
+\r
+ Status = ShellReadFile (FileHandle, &MainBufferSize, MainBuffer);\r
+ if (EFI_ERROR (Status)) {\r
+ ShellPrintHiiEx (\r
+ -1,\r
+ -1,\r
+ NULL,\r
+ STRING_TOKEN (STR_FILE_READ_FAIL),\r
+ gShellDriver1HiiHandle,\r
L"drvcfg",\r
- FileName);\r
+ FileName\r
+ );\r
\r
- ShellCloseFile(&FileHandle);\r
- SHELL_FREE_NON_NULL(MainBuffer);\r
- return (SHELL_DEVICE_ERROR); \r
+ ShellCloseFile (&FileHandle);\r
+ SHELL_FREE_NON_NULL (MainBuffer);\r
+ return (SHELL_DEVICE_ERROR);\r
}\r
\r
- ShellCloseFile(&FileHandle);\r
+ ShellCloseFile (&FileHandle);\r
\r
if (Handle != NULL) {\r
//\r
// User override in place. Just do it.\r
//\r
- HiiHandle = NULL;\r
- Status = ConvertHandleToHiiHandle(Handle, &HiiHandle, HiiDatabase);\r
- if (EFI_ERROR(Status)) {\r
- ShellPrintHiiEx(\r
- -1, \r
- -1, \r
- NULL, \r
- STRING_TOKEN(STR_GEN_HANDLE_NOT), \r
- gShellDriver1HiiHandle, L"drvcfg",\r
- ConvertHandleToHandleIndex(Handle), \r
- L"Device");\r
- ShellCloseFile(&FileHandle);\r
- return (SHELL_DEVICE_ERROR); \r
+ HiiHandle = NULL;\r
+ Status = ConvertHandleToHiiHandle (Handle, &HiiHandle, HiiDatabase);\r
+ if (EFI_ERROR (Status)) {\r
+ ShellPrintHiiEx (\r
+ -1,\r
+ -1,\r
+ NULL,\r
+ STRING_TOKEN (STR_GEN_HANDLE_NOT),\r
+ gShellDriver1HiiHandle,\r
+ L"drvcfg",\r
+ ConvertHandleToHandleIndex (Handle),\r
+ L"Device"\r
+ );\r
+ ShellCloseFile (&FileHandle);\r
+ return (SHELL_DEVICE_ERROR);\r
}\r
- Status = HiiDatabase->UpdatePackageList(HiiDatabase, HiiHandle, MainBuffer);\r
- if (EFI_ERROR(Status)) {\r
- ShellPrintHiiEx(\r
- -1, \r
- -1, \r
- NULL, \r
- STRING_TOKEN(STR_GEN_UEFI_FUNC_WARN),\r
+\r
+ Status = HiiDatabase->UpdatePackageList (HiiDatabase, HiiHandle, MainBuffer);\r
+ if (EFI_ERROR (Status)) {\r
+ ShellPrintHiiEx (\r
+ -1,\r
+ -1,\r
+ NULL,\r
+ STRING_TOKEN (STR_GEN_UEFI_FUNC_WARN),\r
gShellDriver1HiiHandle,\r
L"drvcfg",\r
- L"HiiDatabase->UpdatePackageList", \r
- Status);\r
- return (SHELL_DEVICE_ERROR); \r
+ L"HiiDatabase->UpdatePackageList",\r
+ Status\r
+ );\r
+ return (SHELL_DEVICE_ERROR);\r
}\r
} else {\r
//\r
// we need to parse the buffer and try to match the device paths for each item to try to find it's device path.\r
//\r
\r
- for (PackageListHeader = (EFI_HII_PACKAGE_LIST_HEADER*)MainBuffer\r
- ; PackageListHeader != NULL && ((CHAR8*)PackageListHeader) < (((CHAR8*)MainBuffer)+MainBufferSize)\r
- ; PackageListHeader = (EFI_HII_PACKAGE_LIST_HEADER*)(((CHAR8*)(PackageListHeader)) + PackageListHeader->PackageLength )) {\r
- for (PackageHeader = (EFI_HII_PACKAGE_HEADER*)(((CHAR8*)(PackageListHeader))+sizeof(EFI_HII_PACKAGE_LIST_HEADER))\r
- ; PackageHeader != NULL && ((CHAR8*)PackageHeader) < (((CHAR8*)MainBuffer)+MainBufferSize) && PackageHeader->Type != EFI_HII_PACKAGE_END\r
- ; PackageHeader = (EFI_HII_PACKAGE_HEADER*)(((CHAR8*)(PackageHeader))+PackageHeader->Length)) {\r
- if (PackageHeader->Type == EFI_HII_PACKAGE_DEVICE_PATH) {\r
- HiiHandle = NULL;\r
- Status = FindHiiHandleViaDevPath((EFI_DEVICE_PATH_PROTOCOL*)(((CHAR8*)PackageHeader) + sizeof(EFI_HII_PACKAGE_HEADER)), &HiiHandle, HiiDatabase);\r
- if (EFI_ERROR(Status)) {\r
- //\r
- // print out an error.\r
- //\r
- TempDevPathString = ConvertDevicePathToText((EFI_DEVICE_PATH_PROTOCOL*)(((CHAR8*)PackageHeader) + sizeof(EFI_HII_PACKAGE_HEADER)), TRUE, TRUE);\r
- ShellPrintHiiEx(\r
- -1, \r
- -1, \r
- NULL, \r
- STRING_TOKEN(STR_DRVCFG_IN_FILE_NF), \r
- gShellDriver1HiiHandle, \r
- TempDevPathString);\r
- SHELL_FREE_NON_NULL(TempDevPathString);\r
- } else {\r
- Status = HiiDatabase->UpdatePackageList(HiiDatabase, HiiHandle, PackageListHeader);\r
- if (EFI_ERROR(Status)) {\r
- ShellPrintHiiEx(\r
- -1, \r
- -1, \r
- NULL, \r
- STRING_TOKEN(STR_GEN_UEFI_FUNC_WARN),\r
- gShellDriver1HiiHandle, \r
- L"drvcfg",\r
- L"HiiDatabase->UpdatePackageList", \r
- Status);\r
- return (SHELL_DEVICE_ERROR);\r
- } else {\r
- DevPath = (EFI_DEVICE_PATH_PROTOCOL*)(((CHAR8*)PackageHeader) + sizeof(EFI_HII_PACKAGE_HEADER));\r
- gBS->LocateDevicePath(&gEfiHiiConfigAccessProtocolGuid, &DevPath, &Handle);\r
- HandleIndex = ConvertHandleToHandleIndex(Handle);\r
- ShellPrintHiiEx(\r
- -1, \r
- -1, \r
- NULL, \r
- STRING_TOKEN(STR_DRVCFG_DONE_HII), \r
- gShellDriver1HiiHandle, \r
- HandleIndex);\r
- }\r
- } \r
+ for (PackageListHeader = (EFI_HII_PACKAGE_LIST_HEADER *)MainBuffer\r
+ ; PackageListHeader != NULL && ((CHAR8 *)PackageListHeader) < (((CHAR8 *)MainBuffer)+MainBufferSize)\r
+ ; PackageListHeader = (EFI_HII_PACKAGE_LIST_HEADER *)(((CHAR8 *)(PackageListHeader)) + PackageListHeader->PackageLength))\r
+ {\r
+ for (PackageHeader = (EFI_HII_PACKAGE_HEADER *)(((CHAR8 *)(PackageListHeader))+sizeof (EFI_HII_PACKAGE_LIST_HEADER))\r
+ ; PackageHeader != NULL && ((CHAR8 *)PackageHeader) < (((CHAR8 *)MainBuffer)+MainBufferSize) && PackageHeader->Type != EFI_HII_PACKAGE_END\r
+ ; PackageHeader = (EFI_HII_PACKAGE_HEADER *)(((CHAR8 *)(PackageHeader))+PackageHeader->Length))\r
+ {\r
+ if (PackageHeader->Type == EFI_HII_PACKAGE_DEVICE_PATH) {\r
+ HiiHandle = NULL;\r
+ Status = FindHiiHandleViaDevPath ((EFI_DEVICE_PATH_PROTOCOL *)(((CHAR8 *)PackageHeader) + sizeof (EFI_HII_PACKAGE_HEADER)), &HiiHandle, HiiDatabase);\r
+ if (EFI_ERROR (Status)) {\r
+ //\r
+ // print out an error.\r
+ //\r
+ TempDevPathString = ConvertDevicePathToText ((EFI_DEVICE_PATH_PROTOCOL *)(((CHAR8 *)PackageHeader) + sizeof (EFI_HII_PACKAGE_HEADER)), TRUE, TRUE);\r
+ ShellPrintHiiEx (\r
+ -1,\r
+ -1,\r
+ NULL,\r
+ STRING_TOKEN (STR_DRVCFG_IN_FILE_NF),\r
+ gShellDriver1HiiHandle,\r
+ TempDevPathString\r
+ );\r
+ SHELL_FREE_NON_NULL (TempDevPathString);\r
+ } else {\r
+ Status = HiiDatabase->UpdatePackageList (HiiDatabase, HiiHandle, PackageListHeader);\r
+ if (EFI_ERROR (Status)) {\r
+ ShellPrintHiiEx (\r
+ -1,\r
+ -1,\r
+ NULL,\r
+ STRING_TOKEN (STR_GEN_UEFI_FUNC_WARN),\r
+ gShellDriver1HiiHandle,\r
+ L"drvcfg",\r
+ L"HiiDatabase->UpdatePackageList",\r
+ Status\r
+ );\r
+ return (SHELL_DEVICE_ERROR);\r
+ } else {\r
+ DevPath = (EFI_DEVICE_PATH_PROTOCOL *)(((CHAR8 *)PackageHeader) + sizeof (EFI_HII_PACKAGE_HEADER));\r
+ gBS->LocateDevicePath (&gEfiHiiConfigAccessProtocolGuid, &DevPath, &Handle);\r
+ HandleIndex = ConvertHandleToHandleIndex (Handle);\r
+ ShellPrintHiiEx (\r
+ -1,\r
+ -1,\r
+ NULL,\r
+ STRING_TOKEN (STR_DRVCFG_DONE_HII),\r
+ gShellDriver1HiiHandle,\r
+ HandleIndex\r
+ );\r
}\r
+ }\r
}\r
+ }\r
}\r
}\r
\r
- SHELL_FREE_NON_NULL(MainBuffer);\r
-\r
+ SHELL_FREE_NON_NULL (MainBuffer);\r
\r
- ShellPrintHiiEx(\r
- -1, \r
+ ShellPrintHiiEx (\r
+ -1,\r
-1,\r
NULL,\r
- STRING_TOKEN(STR_DRVCFG_COMP), \r
- gShellDriver1HiiHandle);\r
+ STRING_TOKEN (STR_DRVCFG_COMP),\r
+ gShellDriver1HiiHandle\r
+ );\r
return (SHELL_SUCCESS);\r
}\r
\r
@retval SHELL_INVALID_PARAMETER A parameter has a invalid value.\r
**/\r
EFI_STATUS\r
-EFIAPI\r
ShellCmdDriverConfigurationProcessActionRequired (\r
EFI_HANDLE DriverImageHandle,\r
EFI_HANDLE ControllerHandle,\r
EFI_HANDLE ConnectControllerContextOverride[2];\r
\r
switch (ActionRequired) {\r
- case EfiDriverConfigurationActionNone:\r
- ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_DRVCFG_NONE), gShellDriver1HiiHandle);\r
- break;\r
-\r
- case EfiDriverConfigurationActionStopController:\r
- ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_DRVCFG_STOP), gShellDriver1HiiHandle);\r
- ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_DRVCFG_ENTER_S), gShellDriver1HiiHandle, L"stop controller");\r
- ShellPromptForResponse(ShellPromptResponseTypeEnterContinue, NULL, NULL);\r
-\r
- gBS->DisconnectController (ControllerHandle, DriverImageHandle, ChildHandle);\r
- ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_DRVCFG_CTLR_S), gShellDriver1HiiHandle, L"stopped");\r
- break;\r
-\r
- case EfiDriverConfigurationActionRestartController:\r
- ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_DRVCFG_RESTART_S), gShellDriver1HiiHandle, L"controller");\r
- ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_DRVCFG_ENTER_S), gShellDriver1HiiHandle, L"restart controller");\r
- ShellPromptForResponse(ShellPromptResponseTypeEnterContinue, NULL, NULL);\r
-\r
- gBS->DisconnectController (ControllerHandle, DriverImageHandle, ChildHandle);\r
- ConnectControllerContextOverride[0] = DriverImageHandle;\r
- ConnectControllerContextOverride[1] = NULL;\r
- gBS->ConnectController (ControllerHandle, ConnectControllerContextOverride, NULL, TRUE);\r
- ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_DRVCFG_CTLR_S), gShellDriver1HiiHandle, L"restarted");\r
- break;\r
-\r
- case EfiDriverConfigurationActionRestartPlatform:\r
- ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_DRVCFG_RESTART_S), gShellDriver1HiiHandle, L"platform");\r
- ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_DRVCFG_ENTER_S), gShellDriver1HiiHandle, L"restart platform");\r
- ShellPromptForResponse(ShellPromptResponseTypeEnterContinue, NULL, NULL);\r
-\r
- gRT->ResetSystem (EfiResetCold, EFI_SUCCESS, 0, NULL);\r
- break;\r
-\r
- default:\r
- return (EFI_INVALID_PARAMETER);\r
+ case EfiDriverConfigurationActionNone:\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_DRVCFG_NONE), gShellDriver1HiiHandle);\r
+ break;\r
+\r
+ case EfiDriverConfigurationActionStopController:\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_DRVCFG_STOP), gShellDriver1HiiHandle);\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_DRVCFG_ENTER_S), gShellDriver1HiiHandle, L"stop controller");\r
+ ShellPromptForResponse (ShellPromptResponseTypeEnterContinue, NULL, NULL);\r
+\r
+ gBS->DisconnectController (ControllerHandle, DriverImageHandle, ChildHandle);\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_DRVCFG_CTLR_S), gShellDriver1HiiHandle, L"stopped");\r
+ break;\r
+\r
+ case EfiDriverConfigurationActionRestartController:\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_DRVCFG_RESTART_S), gShellDriver1HiiHandle, L"controller");\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_DRVCFG_ENTER_S), gShellDriver1HiiHandle, L"restart controller");\r
+ ShellPromptForResponse (ShellPromptResponseTypeEnterContinue, NULL, NULL);\r
+\r
+ gBS->DisconnectController (ControllerHandle, DriverImageHandle, ChildHandle);\r
+ ConnectControllerContextOverride[0] = DriverImageHandle;\r
+ ConnectControllerContextOverride[1] = NULL;\r
+ gBS->ConnectController (ControllerHandle, ConnectControllerContextOverride, NULL, TRUE);\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_DRVCFG_CTLR_S), gShellDriver1HiiHandle, L"restarted");\r
+ break;\r
+\r
+ case EfiDriverConfigurationActionRestartPlatform:\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_DRVCFG_RESTART_S), gShellDriver1HiiHandle, L"platform");\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_DRVCFG_ENTER_S), gShellDriver1HiiHandle, L"restart platform");\r
+ ShellPromptForResponse (ShellPromptResponseTypeEnterContinue, NULL, NULL);\r
+\r
+ gRT->ResetSystem (EfiResetCold, EFI_SUCCESS, 0, NULL);\r
+ break;\r
+\r
+ default:\r
+ return (EFI_INVALID_PARAMETER);\r
}\r
\r
return EFI_SUCCESS;\r
@retval SHELL_INVALID_PARAMETER A parameter has a invalid value.\r
**/\r
SHELL_STATUS\r
-EFIAPI\r
PreHiiDrvCfg (\r
- IN CONST CHAR8 *Language,\r
- IN BOOLEAN ForceDefaults,\r
- IN UINT32 DefaultType,\r
- IN BOOLEAN AllChildren,\r
- IN BOOLEAN ValidateOptions,\r
- IN BOOLEAN SetOptions,\r
- IN EFI_HANDLE DriverImageHandle,\r
- IN EFI_HANDLE DeviceHandle,\r
- IN EFI_HANDLE ChildHandle\r
+ IN CONST CHAR8 *Language,\r
+ IN BOOLEAN ForceDefaults,\r
+ IN UINT32 DefaultType,\r
+ IN BOOLEAN AllChildren,\r
+ IN BOOLEAN ValidateOptions,\r
+ IN BOOLEAN SetOptions,\r
+ IN EFI_HANDLE DriverImageHandle,\r
+ IN EFI_HANDLE DeviceHandle,\r
+ IN EFI_HANDLE ChildHandle\r
)\r
{\r
EFI_STATUS Status;\r
\r
ShellStatus = SHELL_SUCCESS;\r
\r
- if (ChildHandle == NULL && AllChildren) {\r
+ if ((ChildHandle == NULL) && AllChildren) {\r
SetOptions = FALSE;\r
}\r
\r
if (ForceDefaults) {\r
- ShellPrintHiiEx(\r
+ ShellPrintHiiEx (\r
-1,\r
-1,\r
NULL,\r
- STRING_TOKEN (STR_DRVCFG_FORCE_D), \r
- gShellDriver1HiiHandle, \r
- DefaultType);\r
+ STRING_TOKEN (STR_DRVCFG_FORCE_D),\r
+ gShellDriver1HiiHandle,\r
+ DefaultType\r
+ );\r
} else if (ValidateOptions) {\r
- ShellPrintHiiEx(\r
+ ShellPrintHiiEx (\r
-1,\r
-1,\r
NULL,\r
- STRING_TOKEN (STR_DRVCFG_VALIDATE), \r
- gShellDriver1HiiHandle);\r
+ STRING_TOKEN (STR_DRVCFG_VALIDATE),\r
+ gShellDriver1HiiHandle\r
+ );\r
} else if (SetOptions) {\r
- ShellPrintHiiEx(\r
+ ShellPrintHiiEx (\r
-1,\r
-1,\r
NULL,\r
- STRING_TOKEN (STR_DRVCFG_SET), \r
- gShellDriver1HiiHandle);\r
+ STRING_TOKEN (STR_DRVCFG_SET),\r
+ gShellDriver1HiiHandle\r
+ );\r
}\r
\r
if (DriverImageHandle == 0) {\r
- DriverImageHandleBuffer = GetHandleListByProtocolList(CfgGuidList);\r
+ DriverImageHandleBuffer = GetHandleListByProtocolList (CfgGuidList);\r
if (DriverImageHandleBuffer == NULL) {\r
ShellStatus = SHELL_NOT_FOUND;\r
goto Done;\r
}\r
+\r
for (\r
- HandleBuffer = DriverImageHandleBuffer, DriverImageHandleCount = 0 \r
- ; HandleBuffer != NULL && *HandleBuffer != NULL \r
- ; HandleBuffer++,DriverImageHandleCount++);\r
+ HandleBuffer = DriverImageHandleBuffer, DriverImageHandleCount = 0\r
+ ; HandleBuffer != NULL && *HandleBuffer != NULL\r
+ ; HandleBuffer++, DriverImageHandleCount++)\r
+ {\r
+ }\r
} else {\r
DriverImageHandleCount = 1;\r
//\r
\r
for (OuterLoopCounter = 0; OuterLoopCounter < DriverImageHandleCount; OuterLoopCounter++) {\r
Iso639Language = FALSE;\r
- Status = gBS->OpenProtocol (\r
- DriverImageHandleBuffer[OuterLoopCounter],\r
- &gEfiDriverConfiguration2ProtocolGuid,\r
- (VOID **) &DriverConfiguration,\r
- NULL,\r
- NULL,\r
- EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
- );\r
+ Status = gBS->OpenProtocol (\r
+ DriverImageHandleBuffer[OuterLoopCounter],\r
+ &gEfiDriverConfiguration2ProtocolGuid,\r
+ (VOID **)&DriverConfiguration,\r
+ NULL,\r
+ NULL,\r
+ EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
+ );\r
if (EFI_ERROR (Status)) {\r
Iso639Language = TRUE;\r
- Status = gBS->OpenProtocol (\r
- DriverImageHandleBuffer[OuterLoopCounter],\r
- &gEfiDriverConfigurationProtocolGuid,\r
- (VOID **) &DriverConfiguration,\r
- NULL,\r
- NULL,\r
- EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
- );\r
+ Status = gBS->OpenProtocol (\r
+ DriverImageHandleBuffer[OuterLoopCounter],\r
+ &gEfiDriverConfigurationProtocolGuid,\r
+ (VOID **)&DriverConfiguration,\r
+ NULL,\r
+ NULL,\r
+ EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
+ );\r
}\r
+\r
if (EFI_ERROR (Status)) {\r
-// ShellPrintHiiEx(\r
-// -1,\r
-// -1,\r
-// NULL,\r
-// STRING_TOKEN (STR_DRVCFG_NOT_SUPPORT),\r
-// gShellDriver1HiiHandle,\r
-// ConvertHandleToHandleIndex (DriverImageHandleBuffer[OuterLoopCounter])\r
-// );\r
+ // ShellPrintHiiEx(\r
+ // -1,\r
+ // -1,\r
+ // NULL,\r
+ // STRING_TOKEN (STR_DRVCFG_NOT_SUPPORT),\r
+ // gShellDriver1HiiHandle,\r
+ // ConvertHandleToHandleIndex (DriverImageHandleBuffer[OuterLoopCounter])\r
+ // );\r
ShellStatus = SHELL_UNSUPPORTED;\r
continue;\r
}\r
- \r
+\r
BestLanguage = GetBestLanguage (\r
- DriverConfiguration->SupportedLanguages,\r
- Iso639Language,\r
- Language!=NULL?Language:"",\r
- DriverConfiguration->SupportedLanguages,\r
- NULL\r
- );\r
+ DriverConfiguration->SupportedLanguages,\r
+ Iso639Language,\r
+ Language != NULL ? Language : "",\r
+ DriverConfiguration->SupportedLanguages,\r
+ NULL\r
+ );\r
if (BestLanguage == NULL) {\r
- ShellPrintHiiEx(\r
+ ShellPrintHiiEx (\r
-1,\r
-1,\r
NULL,\r
}\r
\r
Status = ParseHandleDatabaseByRelationshipWithType (\r
- DriverImageHandleBuffer[OuterLoopCounter],\r
- NULL,\r
- &HandleCount,\r
- &HandleBuffer,\r
- &HandleType\r
- );\r
+ DriverImageHandleBuffer[OuterLoopCounter],\r
+ NULL,\r
+ &HandleCount,\r
+ &HandleBuffer,\r
+ &HandleType\r
+ );\r
if (EFI_ERROR (Status)) {\r
continue;\r
}\r
\r
- if (SetOptions && DeviceHandle == NULL) {\r
-\r
+ if (SetOptions && (DeviceHandle == NULL)) {\r
gST->ConOut->ClearScreen (gST->ConOut);\r
Status = DriverConfiguration->SetOptions (\r
DriverConfiguration,\r
);\r
gST->ConOut->ClearScreen (gST->ConOut);\r
\r
- ShellPrintHiiEx(\r
+ ShellPrintHiiEx (\r
-1,\r
-1,\r
NULL,\r
DriverConfiguration->SupportedLanguages\r
);\r
if (!EFI_ERROR (Status)) {\r
- ShellPrintHiiEx(\r
+ ShellPrintHiiEx (\r
-1,\r
-1,\r
NULL,\r
- STRING_TOKEN (STR_DRVCFG_OPTIONS_SET), \r
- gShellDriver1HiiHandle);\r
+ STRING_TOKEN (STR_DRVCFG_OPTIONS_SET),\r
+ gShellDriver1HiiHandle\r
+ );\r
for (LoopCounter = 0; LoopCounter < HandleCount; LoopCounter++) {\r
if ((HandleType[LoopCounter] & HR_CONTROLLER_HANDLE) == HR_CONTROLLER_HANDLE) {\r
ShellCmdDriverConfigurationProcessActionRequired (\r
}\r
}\r
} else {\r
- ShellPrintHiiEx(\r
+ ShellPrintHiiEx (\r
-1,\r
-1,\r
NULL,\r
- STRING_TOKEN (STR_DRVCFG_NOT_SET), \r
- gShellDriver1HiiHandle, \r
- Status);\r
+ STRING_TOKEN (STR_DRVCFG_NOT_SET),\r
+ gShellDriver1HiiHandle,\r
+ Status\r
+ );\r
}\r
+\r
continue;\r
}\r
\r
if ((HandleType[LoopCounter] & HR_CONTROLLER_HANDLE) != HR_CONTROLLER_HANDLE) {\r
continue;\r
}\r
- if (DeviceHandle != NULL && DeviceHandle != HandleBuffer[LoopCounter]) {\r
+\r
+ if ((DeviceHandle != NULL) && (DeviceHandle != HandleBuffer[LoopCounter])) {\r
continue;\r
}\r
+\r
if (ChildHandle == NULL) {\r
HandleIndex1 = ConvertHandleToHandleIndex (DriverImageHandleBuffer[OuterLoopCounter]);\r
HandleIndex2 = ConvertHandleToHandleIndex (HandleBuffer[LoopCounter]);\r
- ShellPrintHiiEx(\r
+ ShellPrintHiiEx (\r
-1,\r
-1,\r
NULL,\r
);\r
\r
if (!EFI_ERROR (Status)) {\r
- ShellPrintHiiEx(\r
+ ShellPrintHiiEx (\r
-1,\r
-1,\r
NULL,\r
- STRING_TOKEN (STR_DRVCFG_DEF_FORCED), \r
- gShellDriver1HiiHandle);\r
+ STRING_TOKEN (STR_DRVCFG_DEF_FORCED),\r
+ gShellDriver1HiiHandle\r
+ );\r
ShellCmdDriverConfigurationProcessActionRequired (\r
DriverImageHandleBuffer[OuterLoopCounter],\r
HandleBuffer[LoopCounter],\r
ActionRequired\r
);\r
} else {\r
- ShellPrintHiiEx(\r
+ ShellPrintHiiEx (\r
-1,\r
-1,\r
NULL,\r
- STRING_TOKEN (STR_DRVCFG_FORCE_FAILED), \r
- gShellDriver1HiiHandle, \r
- Status);\r
- ShellStatus = SHELL_DEVICE_ERROR;\r
- }\r
+ STRING_TOKEN (STR_DRVCFG_FORCE_FAILED),\r
+ gShellDriver1HiiHandle,\r
+ Status\r
+ );\r
+ ShellStatus = SHELL_DEVICE_ERROR;\r
+ }\r
} else if (ValidateOptions) {\r
Status = DriverConfiguration->OptionsValid (\r
DriverConfiguration,\r
);\r
\r
if (!EFI_ERROR (Status)) {\r
- ShellPrintHiiEx(\r
+ ShellPrintHiiEx (\r
-1,\r
-1,\r
NULL,\r
- STRING_TOKEN (STR_DRVCFG_OPTIONS_VALID), \r
- gShellDriver1HiiHandle);\r
+ STRING_TOKEN (STR_DRVCFG_OPTIONS_VALID),\r
+ gShellDriver1HiiHandle\r
+ );\r
} else {\r
- ShellPrintHiiEx(\r
+ ShellPrintHiiEx (\r
-1,\r
-1,\r
NULL,\r
- STRING_TOKEN (STR_DRVCFG_OPTIONS_INV), \r
- gShellDriver1HiiHandle, \r
- Status);\r
+ STRING_TOKEN (STR_DRVCFG_OPTIONS_INV),\r
+ gShellDriver1HiiHandle,\r
+ Status\r
+ );\r
ShellStatus = SHELL_DEVICE_ERROR;\r
}\r
} else if (SetOptions) {\r
gST->ConOut->ClearScreen (gST->ConOut);\r
HandleIndex1 = ConvertHandleToHandleIndex (DriverImageHandleBuffer[OuterLoopCounter]);\r
HandleIndex2 = ConvertHandleToHandleIndex (HandleBuffer[LoopCounter]);\r
- ShellPrintHiiEx(\r
+ ShellPrintHiiEx (\r
-1,\r
-1,\r
NULL,\r
DriverConfiguration->SupportedLanguages\r
);\r
if (!EFI_ERROR (Status)) {\r
- ShellPrintHiiEx(\r
+ ShellPrintHiiEx (\r
-1,\r
-1,\r
NULL,\r
- STRING_TOKEN (STR_DRVCFG_OPTIONS_SET), \r
- gShellDriver1HiiHandle);\r
+ STRING_TOKEN (STR_DRVCFG_OPTIONS_SET),\r
+ gShellDriver1HiiHandle\r
+ );\r
\r
ShellCmdDriverConfigurationProcessActionRequired (\r
DriverImageHandleBuffer[OuterLoopCounter],\r
NULL,\r
ActionRequired\r
);\r
-\r
} else {\r
- ShellPrintHiiEx(\r
+ ShellPrintHiiEx (\r
-1,\r
-1,\r
NULL,\r
- STRING_TOKEN (STR_DRVCFG_NOT_SET), \r
- gShellDriver1HiiHandle, \r
- Status);\r
+ STRING_TOKEN (STR_DRVCFG_NOT_SET),\r
+ gShellDriver1HiiHandle,\r
+ Status\r
+ );\r
ShellStatus = SHELL_DEVICE_ERROR;\r
}\r
} else {\r
}\r
}\r
\r
- if (ChildHandle == NULL && !AllChildren) {\r
+ if ((ChildHandle == NULL) && !AllChildren) {\r
continue;\r
}\r
\r
Status = ParseHandleDatabaseByRelationshipWithType (\r
- DriverImageHandleBuffer[OuterLoopCounter],\r
- HandleBuffer[LoopCounter],\r
- &ChildHandleCount,\r
- &ChildHandleBuffer,\r
- &ChildHandleType\r
- );\r
+ DriverImageHandleBuffer[OuterLoopCounter],\r
+ HandleBuffer[LoopCounter],\r
+ &ChildHandleCount,\r
+ &ChildHandleBuffer,\r
+ &ChildHandleType\r
+ );\r
if (EFI_ERROR (Status)) {\r
continue;\r
}\r
\r
for (ChildIndex = 0; ChildIndex < ChildHandleCount; ChildIndex++) {\r
-\r
if ((ChildHandleType[ChildIndex] & HR_CHILD_HANDLE) != HR_CHILD_HANDLE) {\r
continue;\r
}\r
\r
- if (ChildHandle != NULL && ChildHandle != ChildHandleBuffer[ChildIndex]) {\r
+ if ((ChildHandle != NULL) && (ChildHandle != ChildHandleBuffer[ChildIndex])) {\r
continue;\r
}\r
\r
HandleIndex1 = ConvertHandleToHandleIndex (DriverImageHandleBuffer[OuterLoopCounter]);\r
HandleIndex2 = ConvertHandleToHandleIndex (HandleBuffer[LoopCounter]);\r
HandleIndex3 = ConvertHandleToHandleIndex (ChildHandleBuffer[ChildIndex]);\r
- ShellPrintHiiEx(\r
+ ShellPrintHiiEx (\r
-1,\r
-1,\r
NULL,\r
HandleIndex1,\r
HandleIndex2,\r
HandleIndex3,\r
- DriverConfiguration->SupportedLanguages);\r
+ DriverConfiguration->SupportedLanguages\r
+ );\r
\r
if (ForceDefaults) {\r
Status = DriverConfiguration->ForceDefaults (\r
);\r
\r
if (!EFI_ERROR (Status)) {\r
- ShellPrintHiiEx(\r
+ ShellPrintHiiEx (\r
-1,\r
-1,\r
NULL,\r
- STRING_TOKEN (STR_DRVCFG_DEF_FORCED), \r
- gShellDriver1HiiHandle);\r
+ STRING_TOKEN (STR_DRVCFG_DEF_FORCED),\r
+ gShellDriver1HiiHandle\r
+ );\r
\r
ShellCmdDriverConfigurationProcessActionRequired (\r
DriverImageHandleBuffer[OuterLoopCounter],\r
ChildHandleBuffer[ChildIndex],\r
ActionRequired\r
);\r
-\r
} else {\r
- ShellPrintHiiEx(\r
+ ShellPrintHiiEx (\r
-1,\r
-1,\r
NULL,\r
- STRING_TOKEN (STR_DRVCFG_FORCE_FAILED), \r
- gShellDriver1HiiHandle, \r
- Status);\r
+ STRING_TOKEN (STR_DRVCFG_FORCE_FAILED),\r
+ gShellDriver1HiiHandle,\r
+ Status\r
+ );\r
ShellStatus = SHELL_DEVICE_ERROR;\r
}\r
} else if (ValidateOptions) {\r
);\r
\r
if (!EFI_ERROR (Status)) {\r
- ShellPrintHiiEx(\r
+ ShellPrintHiiEx (\r
-1,\r
-1,\r
NULL,\r
- STRING_TOKEN (STR_DRVCFG_OPTIONS_VALID), \r
- gShellDriver1HiiHandle);\r
+ STRING_TOKEN (STR_DRVCFG_OPTIONS_VALID),\r
+ gShellDriver1HiiHandle\r
+ );\r
} else {\r
- ShellPrintHiiEx(\r
+ ShellPrintHiiEx (\r
-1,\r
-1,\r
NULL,\r
- STRING_TOKEN (STR_DRVCFG_OPTIONS_INV), \r
- gShellDriver1HiiHandle, \r
- Status);\r
+ STRING_TOKEN (STR_DRVCFG_OPTIONS_INV),\r
+ gShellDriver1HiiHandle,\r
+ Status\r
+ );\r
ShellStatus = SHELL_DEVICE_ERROR;\r
}\r
} else if (SetOptions) {\r
HandleIndex1 = ConvertHandleToHandleIndex (DriverImageHandleBuffer[OuterLoopCounter]);\r
HandleIndex2 = ConvertHandleToHandleIndex (HandleBuffer[LoopCounter]);\r
HandleIndex3 = ConvertHandleToHandleIndex (ChildHandleBuffer[ChildIndex]);\r
- ShellPrintHiiEx(\r
+ ShellPrintHiiEx (\r
-1,\r
-1,\r
NULL,\r
DriverConfiguration->SupportedLanguages\r
);\r
if (!EFI_ERROR (Status)) {\r
- ShellPrintHiiEx(\r
+ ShellPrintHiiEx (\r
-1,\r
-1,\r
NULL,\r
- STRING_TOKEN (STR_DRVCFG_OPTIONS_SET), \r
- gShellDriver1HiiHandle);\r
+ STRING_TOKEN (STR_DRVCFG_OPTIONS_SET),\r
+ gShellDriver1HiiHandle\r
+ );\r
\r
ShellCmdDriverConfigurationProcessActionRequired (\r
DriverImageHandleBuffer[OuterLoopCounter],\r
ChildHandleBuffer[ChildIndex],\r
ActionRequired\r
);\r
-\r
} else {\r
- ShellPrintHiiEx(\r
+ ShellPrintHiiEx (\r
-1,\r
-1,\r
NULL,\r
- STRING_TOKEN (STR_DRVCFG_NOT_SET), \r
- gShellDriver1HiiHandle, \r
- Status);\r
+ STRING_TOKEN (STR_DRVCFG_NOT_SET),\r
+ gShellDriver1HiiHandle,\r
+ Status\r
+ );\r
ShellStatus = SHELL_DEVICE_ERROR;\r
}\r
} else {\r
FreePool (HandleType);\r
}\r
\r
- if (DriverImageHandle != NULL && DriverImageHandleCount != 0) {\r
+ if ((DriverImageHandle != NULL) && (DriverImageHandleCount != 0)) {\r
FreePool (DriverImageHandleBuffer);\r
}\r
\r
@retval SHELL_SUCCESS The operation was successful.\r
**/\r
SHELL_STATUS\r
-EFIAPI\r
-PrintConfigInfoOnAll(\r
- IN CONST BOOLEAN ChildrenToo,\r
- IN CONST CHAR8 *Language,\r
- IN CONST BOOLEAN UseHii\r
+PrintConfigInfoOnAll (\r
+ IN CONST BOOLEAN ChildrenToo,\r
+ IN CONST CHAR8 *Language,\r
+ IN CONST BOOLEAN UseHii\r
)\r
{\r
- EFI_HANDLE *HandleList;\r
- EFI_HANDLE *CurrentHandle;\r
- BOOLEAN Found;\r
- UINTN Index2;\r
-\r
+ EFI_HANDLE *HandleList;\r
+ EFI_HANDLE *CurrentHandle;\r
+ BOOLEAN Found;\r
+ UINTN Index2;\r
\r
- Found = FALSE;\r
- HandleList = NULL;\r
- CurrentHandle = NULL;\r
+ Found = FALSE;\r
+ HandleList = NULL;\r
+ CurrentHandle = NULL;\r
\r
if (UseHii) {\r
//\r
// HII method\r
//\r
- HandleList = GetHandleListByProtocol(&gEfiHiiConfigAccessProtocolGuid);\r
- for (CurrentHandle = HandleList ; CurrentHandle != NULL && *CurrentHandle != NULL; CurrentHandle++){\r
- Found = TRUE;\r
- Index2 = *CurrentHandle == NULL ? 0 : ConvertHandleToHandleIndex(*CurrentHandle);\r
- ShellPrintHiiEx(\r
- -1, \r
- -1, \r
- NULL, \r
- STRING_TOKEN (STR_DRVCFG_LINE_HII), \r
- gShellDriver1HiiHandle, \r
+ HandleList = GetHandleListByProtocol (&gEfiHiiConfigAccessProtocolGuid);\r
+ for (CurrentHandle = HandleList; CurrentHandle != NULL && *CurrentHandle != NULL; CurrentHandle++) {\r
+ Found = TRUE;\r
+ Index2 = *CurrentHandle == NULL ? 0 : ConvertHandleToHandleIndex (*CurrentHandle);\r
+ ShellPrintHiiEx (\r
+ -1,\r
+ -1,\r
+ NULL,\r
+ STRING_TOKEN (STR_DRVCFG_LINE_HII),\r
+ gShellDriver1HiiHandle,\r
Index2\r
);\r
}\r
- SHELL_FREE_NON_NULL(HandleList);\r
+\r
+ SHELL_FREE_NON_NULL (HandleList);\r
}\r
\r
if (PreHiiDrvCfg (\r
- Language,\r
- FALSE,\r
- 0,\r
- ChildrenToo,\r
- FALSE,\r
- FALSE,\r
- 0,\r
- 0,\r
- 0) == SHELL_SUCCESS) {\r
- Found = TRUE;\r
+ Language,\r
+ FALSE,\r
+ 0,\r
+ ChildrenToo,\r
+ FALSE,\r
+ FALSE,\r
+ 0,\r
+ 0,\r
+ 0\r
+ ) == SHELL_SUCCESS)\r
+ {\r
+ Found = TRUE;\r
}\r
\r
if (!Found) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_DRVCFG_NONE_FOUND), gShellDriver1HiiHandle);\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_DRVCFG_NONE_FOUND), gShellDriver1HiiHandle);\r
return (SHELL_SUCCESS);\r
}\r
\r
return (SHELL_SUCCESS);\r
}\r
\r
-STATIC CONST SHELL_PARAM_ITEM ParamListHii[] = {\r
- {L"-s", TypeFlag},\r
- {L"-l", TypeValue},\r
- {L"-f", TypeValue},\r
- {L"-o", TypeValue},\r
- {L"-i", TypeValue},\r
- {NULL, TypeMax}\r
- };\r
-STATIC CONST SHELL_PARAM_ITEM ParamListPreHii[] = {\r
- {L"-c", TypeFlag},\r
- {L"-s", TypeFlag},\r
- {L"-v", TypeFlag},\r
- {L"-l", TypeValue},\r
- {L"-f", TypeValue},\r
- {NULL, TypeMax}\r
- };\r
+STATIC CONST SHELL_PARAM_ITEM ParamListHii[] = {\r
+ { L"-s", TypeFlag },\r
+ { L"-l", TypeValue },\r
+ { L"-f", TypeValue },\r
+ { L"-o", TypeValue },\r
+ { L"-i", TypeValue },\r
+ { NULL, TypeMax }\r
+};\r
+STATIC CONST SHELL_PARAM_ITEM ParamListPreHii[] = {\r
+ { L"-c", TypeFlag },\r
+ { L"-s", TypeFlag },\r
+ { L"-v", TypeFlag },\r
+ { L"-l", TypeValue },\r
+ { L"-f", TypeValue },\r
+ { NULL, TypeMax }\r
+};\r
\r
/**\r
Function for 'drvcfg' command.\r
IN EFI_SYSTEM_TABLE *SystemTable\r
)\r
{\r
- EFI_STATUS Status;\r
- LIST_ENTRY *Package;\r
- CHAR16 *ProblemParam;\r
- SHELL_STATUS ShellStatus;\r
- CHAR8 *Language;\r
- CONST CHAR16 *Lang;\r
- CONST CHAR16 *HandleIndex1;\r
- CONST CHAR16 *HandleIndex2;\r
- CONST CHAR16 *HandleIndex3;\r
- CONST CHAR16 *ForceTypeString;\r
- BOOLEAN Force;\r
- BOOLEAN Set;\r
- BOOLEAN Validate;\r
- BOOLEAN InFromFile;\r
- BOOLEAN OutToFile;\r
- BOOLEAN AllChildren;\r
- BOOLEAN UseHii;\r
- UINT32 ForceType;\r
- UINT64 Intermediate;\r
- EFI_HANDLE Handle1;\r
- EFI_HANDLE Handle2;\r
- EFI_HANDLE Handle3;\r
- CONST CHAR16 *FileName;\r
-\r
- ShellStatus = SHELL_SUCCESS;\r
- Status = EFI_SUCCESS;\r
- Language = NULL;\r
- UseHii = TRUE;\r
+ EFI_STATUS Status;\r
+ LIST_ENTRY *Package;\r
+ CHAR16 *ProblemParam;\r
+ SHELL_STATUS ShellStatus;\r
+ CHAR8 *Language;\r
+ CONST CHAR16 *Lang;\r
+ CONST CHAR16 *HandleIndex1;\r
+ CONST CHAR16 *HandleIndex2;\r
+ CONST CHAR16 *HandleIndex3;\r
+ CONST CHAR16 *ForceTypeString;\r
+ BOOLEAN Force;\r
+ BOOLEAN Set;\r
+ BOOLEAN Validate;\r
+ BOOLEAN InFromFile;\r
+ BOOLEAN OutToFile;\r
+ BOOLEAN AllChildren;\r
+ BOOLEAN UseHii;\r
+ UINT32 ForceType;\r
+ UINT64 Intermediate;\r
+ EFI_HANDLE Handle1;\r
+ EFI_HANDLE Handle2;\r
+ EFI_HANDLE Handle3;\r
+ CONST CHAR16 *FileName;\r
+\r
+ ShellStatus = SHELL_SUCCESS;\r
+ Status = EFI_SUCCESS;\r
+ Language = NULL;\r
+ UseHii = TRUE;\r
+ ProblemParam = NULL;\r
\r
//\r
// initialize the shell lib (we must be in non-auto-init...)\r
//\r
- Status = ShellInitialize();\r
- ASSERT_EFI_ERROR(Status);\r
+ Status = ShellInitialize ();\r
+ ASSERT_EFI_ERROR (Status);\r
\r
- Status = CommandInit();\r
- ASSERT_EFI_ERROR(Status);\r
+ Status = CommandInit ();\r
+ ASSERT_EFI_ERROR (Status);\r
\r
//\r
// parse the command line\r
//\r
Status = ShellCommandLineParse (ParamListHii, &Package, &ProblemParam, TRUE);\r
- if (EFI_ERROR(Status) || ShellCommandLineGetCount(Package) > 2) {\r
+ if (EFI_ERROR (Status) || (ShellCommandLineGetCount (Package) > 2)) {\r
UseHii = FALSE;\r
if (Package != NULL) {\r
ShellCommandLineFreeVarList (Package);\r
}\r
- SHELL_FREE_NON_NULL(ProblemParam);\r
+\r
+ SHELL_FREE_NON_NULL (ProblemParam);\r
Status = ShellCommandLineParse (ParamListPreHii, &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), gShellDriver1HiiHandle, L"drvcfg", ProblemParam);\r
- FreePool(ProblemParam);\r
+ if (EFI_ERROR (Status)) {\r
+ if ((Status == EFI_VOLUME_CORRUPTED) && (ProblemParam != NULL)) {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, L"drvcfg", ProblemParam);\r
+ FreePool (ProblemParam);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
goto Done;\r
} else {\r
- ASSERT(FALSE);\r
+ ASSERT (FALSE);\r
}\r
}\r
- } \r
+ }\r
+\r
if (ShellStatus == SHELL_SUCCESS) {\r
- Lang = ShellCommandLineGetValue(Package, L"-l");\r
+ if (ShellCommandLineGetCount (Package) > 4) {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"drvcfg");\r
+ ShellStatus = SHELL_INVALID_PARAMETER;\r
+ goto Done;\r
+ }\r
+\r
+ Lang = ShellCommandLineGetValue (Package, L"-l");\r
if (Lang != NULL) {\r
- Language = AllocateZeroPool(StrSize(Lang));\r
- AsciiSPrint(Language, StrSize(Lang), "%S", Lang);\r
- } else if (ShellCommandLineGetFlag(Package, L"-l")){\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"drvcfg", L"-l");\r
+ Language = AllocateZeroPool (StrSize (Lang));\r
+ AsciiSPrint (Language, StrSize (Lang), "%S", Lang);\r
+ } else if (ShellCommandLineGetFlag (Package, L"-l")) {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"drvcfg", L"-l");\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
goto Done;\r
}\r
- Set = ShellCommandLineGetFlag (Package, L"-s");\r
- Validate = ShellCommandLineGetFlag (Package, L"-v");\r
- InFromFile = ShellCommandLineGetFlag (Package, L"-i");\r
- OutToFile = ShellCommandLineGetFlag (Package, L"-o");\r
- AllChildren = ShellCommandLineGetFlag (Package, L"-c");\r
- Force = ShellCommandLineGetFlag (Package, L"-f");\r
- ForceTypeString = ShellCommandLineGetValue(Package, L"-f");\r
+\r
+ Set = ShellCommandLineGetFlag (Package, L"-s");\r
+ Validate = ShellCommandLineGetFlag (Package, L"-v");\r
+ InFromFile = ShellCommandLineGetFlag (Package, L"-i");\r
+ OutToFile = ShellCommandLineGetFlag (Package, L"-o");\r
+ AllChildren = ShellCommandLineGetFlag (Package, L"-c");\r
+ Force = ShellCommandLineGetFlag (Package, L"-f");\r
+ ForceTypeString = ShellCommandLineGetValue (Package, L"-f");\r
\r
if (OutToFile) {\r
- FileName = ShellCommandLineGetValue(Package, L"-o");\r
+ FileName = ShellCommandLineGetValue (Package, L"-o");\r
} else if (InFromFile) {\r
- FileName = ShellCommandLineGetValue(Package, L"-i");\r
+ FileName = ShellCommandLineGetValue (Package, L"-i");\r
} else {\r
FileName = NULL;\r
}\r
\r
- if (InFromFile && EFI_ERROR(ShellFileExists(FileName))) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FIND_FAIL), gShellDriver1HiiHandle, L"drvcfg", FileName); \r
+ if (InFromFile && EFI_ERROR (ShellFileExists (FileName))) {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_FIND_FAIL), gShellDriver1HiiHandle, L"drvcfg", FileName);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
- goto Done; \r
+ goto Done;\r
}\r
- if (OutToFile && !EFI_ERROR(ShellFileExists(FileName))) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_EXIST), gShellDriver1HiiHandle, L"drvcfg", FileName); \r
+\r
+ if (OutToFile && !EFI_ERROR (ShellFileExists (FileName))) {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_EXIST), gShellDriver1HiiHandle, L"drvcfg", FileName);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
- goto Done; \r
+ goto Done;\r
}\r
- if (Force && ForceTypeString == NULL) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"drvcfg", L"-f"); \r
+\r
+ if (Force && (ForceTypeString == NULL)) {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"drvcfg", L"-f");\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
goto Done;\r
- } \r
+ }\r
+\r
if (Force) {\r
- Status = ShellConvertStringToUint64(ForceTypeString, &Intermediate, FALSE, FALSE);\r
- if (EFI_ERROR(Status)) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM_VAL), gShellDriver1HiiHandle, L"drvcfg", ForceTypeString, L"-f"); \r
+ Status = ShellConvertStringToUint64 (ForceTypeString, &Intermediate, FALSE, FALSE);\r
+ if (EFI_ERROR (Status)) {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM_VAL), gShellDriver1HiiHandle, L"drvcfg", ForceTypeString, L"-f");\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
goto Done;\r
}\r
+\r
ForceType = (UINT32)Intermediate;\r
} else {\r
ForceType = 0;\r
}\r
- HandleIndex1 = ShellCommandLineGetRawValue(Package, 1);\r
- Handle1 = NULL;\r
- if (HandleIndex1 != NULL && !EFI_ERROR(ShellConvertStringToUint64(HandleIndex1, &Intermediate, TRUE, FALSE))) {\r
- Handle1 = ConvertHandleIndexToHandle((UINTN)Intermediate);\r
- if (Handle1 == NULL || (UINT64)(UINTN)Intermediate != Intermediate) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"drvcfg", HandleIndex1); \r
+\r
+ HandleIndex1 = ShellCommandLineGetRawValue (Package, 1);\r
+ Handle1 = NULL;\r
+ if ((HandleIndex1 != NULL) && !EFI_ERROR (ShellConvertStringToUint64 (HandleIndex1, &Intermediate, TRUE, FALSE))) {\r
+ Handle1 = ConvertHandleIndexToHandle ((UINTN)Intermediate);\r
+ if ((Handle1 == NULL) || ((UINT64)(UINTN)Intermediate != Intermediate)) {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"drvcfg", HandleIndex1);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
goto Done;\r
}\r
}\r
- HandleIndex2 = ShellCommandLineGetRawValue(Package, 2);\r
- Handle2 = NULL;\r
- if (HandleIndex2 != NULL && !EFI_ERROR(ShellConvertStringToUint64(HandleIndex2, &Intermediate, TRUE, FALSE))) {\r
- Handle2 = ConvertHandleIndexToHandle((UINTN)Intermediate);\r
- if (Handle2 == NULL || (UINT64)(UINTN)Intermediate != Intermediate) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"drvcfg", HandleIndex2); \r
+\r
+ HandleIndex2 = ShellCommandLineGetRawValue (Package, 2);\r
+ Handle2 = NULL;\r
+ if ((HandleIndex2 != NULL) && !EFI_ERROR (ShellConvertStringToUint64 (HandleIndex2, &Intermediate, TRUE, FALSE))) {\r
+ Handle2 = ConvertHandleIndexToHandle ((UINTN)Intermediate);\r
+ if ((Handle2 == NULL) || ((UINT64)(UINTN)Intermediate != Intermediate)) {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"drvcfg", HandleIndex2);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
goto Done;\r
}\r
}\r
- HandleIndex3 = ShellCommandLineGetRawValue(Package, 3);\r
- Handle3 = NULL;\r
- if (HandleIndex3 != NULL && !EFI_ERROR(ShellConvertStringToUint64(HandleIndex3, &Intermediate, TRUE, FALSE))) {\r
- Handle3 = ConvertHandleIndexToHandle((UINTN)Intermediate);\r
- if (Handle3 == NULL || (UINT64)(UINTN)Intermediate != Intermediate) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"drvcfg", HandleIndex3); \r
+\r
+ HandleIndex3 = ShellCommandLineGetRawValue (Package, 3);\r
+ Handle3 = NULL;\r
+ if ((HandleIndex3 != NULL) && !EFI_ERROR (ShellConvertStringToUint64 (HandleIndex3, &Intermediate, TRUE, FALSE))) {\r
+ Handle3 = ConvertHandleIndexToHandle ((UINTN)Intermediate);\r
+ if ((Handle3 == NULL) || ((UINT64)(UINTN)Intermediate != Intermediate)) {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"drvcfg", HandleIndex3);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
goto Done;\r
}\r
\r
if ((InFromFile || OutToFile) && (FileName == NULL)) {\r
if (FileName == NULL) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"drvcfg", InFromFile?L"-i":L"-o"); \r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"drvcfg", InFromFile ? L"-i" : L"-o");\r
} else {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_HANDLE_REQ), gShellDriver1HiiHandle, L"drvcfg"); \r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_HANDLE_REQ), gShellDriver1HiiHandle, L"drvcfg");\r
}\r
+\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
goto Done;\r
}\r
+\r
if (!UseHii && (InFromFile || OutToFile)) {\r
if (InFromFile) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellDriver1HiiHandle, L"drvcfg", L"-i"); \r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellDriver1HiiHandle, L"drvcfg", L"-i");\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
goto Done;\r
- } \r
+ }\r
+\r
if (OutToFile) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellDriver1HiiHandle, L"drvcfg", L"-o"); \r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellDriver1HiiHandle, L"drvcfg", L"-o");\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
goto Done;\r
}\r
}\r
+\r
if (Validate && Force) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CONFLICT), gShellDriver1HiiHandle, L"drvcfg", L"-v", L"-f"); \r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CONFLICT), gShellDriver1HiiHandle, L"drvcfg", L"-v", L"-f");\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
goto Done;\r
- } \r
+ }\r
+\r
if (Validate && Set) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CONFLICT), gShellDriver1HiiHandle, L"drvcfg", L"-v", L"-s"); \r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CONFLICT), gShellDriver1HiiHandle, L"drvcfg", L"-v", L"-s");\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
goto Done;\r
- } \r
+ }\r
+\r
if (Set && Force) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CONFLICT), gShellDriver1HiiHandle, L"drvcfg", L"-s", L"-f"); \r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CONFLICT), gShellDriver1HiiHandle, L"drvcfg", L"-s", L"-f");\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
goto Done;\r
}\r
+\r
if (OutToFile && InFromFile) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CONFLICT), gShellDriver1HiiHandle, L"drvcfg", L"-i", L"-o"); \r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CONFLICT), gShellDriver1HiiHandle, L"drvcfg", L"-i", L"-o");\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
goto Done;\r
}\r
// We do HII first.\r
//\r
if (UseHii) {\r
- if (Handle1 != NULL && EFI_ERROR(gBS->OpenProtocol(Handle1, &gEfiHiiConfigAccessProtocolGuid, NULL, gImageHandle, NULL, EFI_OPEN_PROTOCOL_TEST_PROTOCOL))) {\r
+ if ((Handle1 != NULL) && EFI_ERROR (gBS->OpenProtocol (Handle1, &gEfiHiiConfigAccessProtocolGuid, NULL, gImageHandle, NULL, EFI_OPEN_PROTOCOL_TEST_PROTOCOL))) {\r
//\r
// no HII on this handle.\r
//\r
} else if (Force) {\r
} else if (Set) {\r
} else if (InFromFile) {\r
- ShellStatus = ConfigFromFile(Handle1, FileName);\r
- if (Handle1 != NULL && ShellStatus == SHELL_SUCCESS) {\r
+ ShellStatus = ConfigFromFile (Handle1, FileName);\r
+ if ((Handle1 != NULL) && (ShellStatus == SHELL_SUCCESS)) {\r
goto Done;\r
}\r
} else if (OutToFile) {\r
- ShellStatus = ConfigToFile(Handle1, FileName);\r
- if (Handle1 != NULL && ShellStatus == SHELL_SUCCESS) {\r
+ ShellStatus = ConfigToFile (Handle1, FileName);\r
+ if ((Handle1 != NULL) && (ShellStatus == SHELL_SUCCESS)) {\r
goto Done;\r
}\r
} else if (HandleIndex1 == NULL) {\r
//\r
// display all that are configurable\r
//\r
- ShellStatus = PrintConfigInfoOnAll(AllChildren, Language, UseHii);\r
+ ShellStatus = PrintConfigInfoOnAll (AllChildren, Language, UseHii);\r
goto Done;\r
} else {\r
- if (!EFI_ERROR(gBS->OpenProtocol(Handle1, &gEfiHiiConfigAccessProtocolGuid, NULL, gImageHandle, NULL, EFI_OPEN_PROTOCOL_TEST_PROTOCOL))) {\r
- ShellPrintHiiEx(\r
- -1, \r
- -1, \r
- NULL, \r
- STRING_TOKEN (STR_DRVCFG_LINE_HII), \r
- gShellDriver1HiiHandle, \r
- ConvertHandleToHandleIndex(Handle1)\r
+ if (!EFI_ERROR (gBS->OpenProtocol (Handle1, &gEfiHiiConfigAccessProtocolGuid, NULL, gImageHandle, NULL, EFI_OPEN_PROTOCOL_TEST_PROTOCOL))) {\r
+ ShellPrintHiiEx (\r
+ -1,\r
+ -1,\r
+ NULL,\r
+ STRING_TOKEN (STR_DRVCFG_LINE_HII),\r
+ gShellDriver1HiiHandle,\r
+ ConvertHandleToHandleIndex (Handle1)\r
);\r
goto Done;\r
}\r
//\r
if (!InFromFile && !OutToFile) {\r
ShellStatus = PreHiiDrvCfg (\r
- Language,\r
- Force,\r
- ForceType,\r
- AllChildren,\r
- Validate,\r
- Set,\r
- Handle1,\r
- Handle2,\r
- Handle3);\r
+ Language,\r
+ Force,\r
+ ForceType,\r
+ AllChildren,\r
+ Validate,\r
+ Set,\r
+ Handle1,\r
+ Handle2,\r
+ Handle3\r
+ );\r
}\r
\r
if (ShellStatus == SHELL_UNSUPPORTED) {\r
- ShellPrintHiiEx(\r
+ ShellPrintHiiEx (\r
-1,\r
-1,\r
NULL,\r
STRING_TOKEN (STR_DRVCFG_NOT_SUPPORT),\r
- gShellDriver1HiiHandle, \r
- ConvertHandleToHandleIndex(Handle1)\r
+ gShellDriver1HiiHandle,\r
+ ConvertHandleToHandleIndex (Handle1)\r
);\r
}\r
}\r
\r
Done:\r
ShellCommandLineFreeVarList (Package);\r
- SHELL_FREE_NON_NULL(Language);\r
+ SHELL_FREE_NON_NULL (Language);\r
return (ShellStatus);\r
}\r
projects / mirror_edk2.git / blobdiff