Main file for DrvDiag shell Driver1 function.\r
\r
(C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>\r
- Copyright (c) 2010 - 2016, 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 "UefiShellDriver1CommandsLib.h"\r
\r
-STATIC CONST EFI_GUID *DiagGuidList[] = {&gEfiDriverDiagnosticsProtocolGuid, &gEfiDriverDiagnostics2ProtocolGuid, NULL};\r
+STATIC CONST EFI_GUID *DiagGuidList[] = { &gEfiDriverDiagnosticsProtocolGuid, &gEfiDriverDiagnostics2ProtocolGuid, NULL };\r
//\r
// We need 1 more item on the list...\r
//\r
**/\r
EFI_STATUS\r
DoDiagnostics (\r
- IN CONST DRV_DIAG_TEST_MODE Mode,\r
- IN CONST CHAR8 *Lang,\r
- IN CONST BOOLEAN AllChilds,\r
- IN CONST EFI_HANDLE DriverHandle,\r
- IN CONST EFI_HANDLE ControllerHandle,\r
- IN CONST EFI_HANDLE ChildHandle\r
+ IN CONST DRV_DIAG_TEST_MODE Mode,\r
+ IN CONST CHAR8 *Lang,\r
+ IN CONST BOOLEAN AllChilds,\r
+ IN CONST EFI_HANDLE DriverHandle,\r
+ IN CONST EFI_HANDLE ControllerHandle,\r
+ IN CONST EFI_HANDLE ChildHandle\r
)\r
{\r
- EFI_DRIVER_DIAGNOSTICS_PROTOCOL *DriverDiagnostics;\r
- EFI_DRIVER_DIAGNOSTICS2_PROTOCOL *DriverDiagnostics2;\r
- EFI_HANDLE *DriverHandleList;\r
- EFI_HANDLE *ControllerHandleList;\r
- EFI_HANDLE *ChildHandleList;\r
- EFI_HANDLE *Walker;\r
- UINTN DriverHandleListCount;\r
- UINTN ControllerHandleListCount;\r
- UINTN ChildHandleListCount;\r
- UINTN DriverHandleListLoop;\r
- UINTN ControllerHandleListLoop;\r
- UINTN ChildHandleListLoop;\r
- EFI_STATUS Status;\r
- EFI_STATUS Status2;\r
- EFI_GUID *ErrorType;\r
- UINTN OutBufferSize;\r
- CHAR16 *OutBuffer;\r
- UINTN HandleIndex1;\r
- UINTN HandleIndex2;\r
- CHAR8 *Language;\r
- BOOLEAN Found;\r
-\r
- if ((ChildHandle != NULL && AllChilds) || (Mode >= TestModeMax)){\r
+ EFI_DRIVER_DIAGNOSTICS_PROTOCOL *DriverDiagnostics;\r
+ EFI_DRIVER_DIAGNOSTICS2_PROTOCOL *DriverDiagnostics2;\r
+ EFI_HANDLE *DriverHandleList;\r
+ EFI_HANDLE *ControllerHandleList;\r
+ EFI_HANDLE *ChildHandleList;\r
+ EFI_HANDLE *Walker;\r
+ UINTN DriverHandleListCount;\r
+ UINTN ControllerHandleListCount;\r
+ UINTN ChildHandleListCount;\r
+ UINTN DriverHandleListLoop;\r
+ UINTN ControllerHandleListLoop;\r
+ UINTN ChildHandleListLoop;\r
+ EFI_STATUS Status;\r
+ EFI_STATUS Status2;\r
+ EFI_GUID *ErrorType;\r
+ UINTN OutBufferSize;\r
+ CHAR16 *OutBuffer;\r
+ UINTN HandleIndex1;\r
+ UINTN HandleIndex2;\r
+ CHAR8 *Language;\r
+ BOOLEAN Found;\r
+\r
+ if (((ChildHandle != NULL) && AllChilds) || (Mode >= TestModeMax)) {\r
return (EFI_INVALID_PARAMETER);\r
}\r
\r
- DriverDiagnostics = NULL;\r
- DriverDiagnostics2 = NULL;\r
- Status = EFI_SUCCESS;\r
- Status2 = EFI_SUCCESS;\r
- DriverHandleList = NULL;\r
- ControllerHandleList = NULL;\r
- ChildHandleList = NULL;\r
- Language = NULL;\r
- OutBuffer = NULL;\r
- ErrorType = NULL;\r
- DriverHandleListCount = 0;\r
- ControllerHandleListCount = 0;\r
- ChildHandleListCount = 0;\r
+ DriverDiagnostics = NULL;\r
+ DriverDiagnostics2 = NULL;\r
+ Status = EFI_SUCCESS;\r
+ Status2 = EFI_SUCCESS;\r
+ DriverHandleList = NULL;\r
+ ControllerHandleList = NULL;\r
+ ChildHandleList = NULL;\r
+ Language = NULL;\r
+ OutBuffer = NULL;\r
+ ErrorType = NULL;\r
+ DriverHandleListCount = 0;\r
+ ControllerHandleListCount = 0;\r
+ ChildHandleListCount = 0;\r
\r
if (DriverHandle != NULL) {\r
- DriverHandleList = AllocateZeroPool(2*sizeof(EFI_HANDLE));\r
+ DriverHandleList = AllocateZeroPool (2*sizeof (EFI_HANDLE));\r
if (DriverHandleList == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
- DriverHandleList[0] = DriverHandle;\r
+\r
+ DriverHandleList[0] = DriverHandle;\r
DriverHandleListCount = 1;\r
} else {\r
- DriverHandleList = GetHandleListByProtocolList(DiagGuidList);\r
+ DriverHandleList = GetHandleListByProtocolList (DiagGuidList);\r
if (DriverHandleList == NULL) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROTOCOL_NF), gShellDriver1HiiHandle, L"drvdiag", L"gEfiDriverDiagnosticsProtocolGuid", &gEfiDriverDiagnosticsProtocolGuid); \r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROTOCOL_NF), gShellDriver1HiiHandle, L"drvdiag", L"gEfiDriverDiagnostics2ProtocolGuid", &gEfiDriverDiagnostics2ProtocolGuid); \r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PROTOCOL_NF), gShellDriver1HiiHandle, L"drvdiag", L"gEfiDriverDiagnosticsProtocolGuid", &gEfiDriverDiagnosticsProtocolGuid);\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PROTOCOL_NF), gShellDriver1HiiHandle, L"drvdiag", L"gEfiDriverDiagnostics2ProtocolGuid", &gEfiDriverDiagnostics2ProtocolGuid);\r
return (EFI_NOT_FOUND);\r
- } \r
- for (Walker = DriverHandleList ; Walker != NULL && *Walker != NULL ; DriverHandleListCount++, Walker++);\r
+ }\r
+\r
+ for (Walker = DriverHandleList; Walker != NULL && *Walker != NULL; DriverHandleListCount++, Walker++) {\r
+ }\r
}\r
\r
if (ControllerHandle != NULL) {\r
- ControllerHandleList = AllocateZeroPool(2*sizeof(EFI_HANDLE));\r
+ ControllerHandleList = AllocateZeroPool (2*sizeof (EFI_HANDLE));\r
if (ControllerHandleList == NULL) {\r
SHELL_FREE_NON_NULL (DriverHandleList);\r
return EFI_OUT_OF_RESOURCES;\r
}\r
- ControllerHandleList[0] = ControllerHandle;\r
+\r
+ ControllerHandleList[0] = ControllerHandle;\r
ControllerHandleListCount = 1;\r
} else {\r
ControllerHandleList = NULL;\r
}\r
\r
if (ChildHandle != NULL) {\r
- ChildHandleList = AllocateZeroPool(2*sizeof(EFI_HANDLE));\r
+ ChildHandleList = AllocateZeroPool (2*sizeof (EFI_HANDLE));\r
if (ChildHandleList == NULL) {\r
SHELL_FREE_NON_NULL (ControllerHandleList);\r
SHELL_FREE_NON_NULL (DriverHandleList);\r
return EFI_OUT_OF_RESOURCES;\r
}\r
- ChildHandleList[0] = ChildHandle;\r
+\r
+ ChildHandleList[0] = ChildHandle;\r
ChildHandleListCount = 1;\r
} else if (AllChilds) {\r
ChildHandleList = NULL;\r
}\r
\r
if (Mode == TestModeList) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_DRVDIAG_HEADER), gShellDriver1HiiHandle);\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_DRVDIAG_HEADER), gShellDriver1HiiHandle);\r
}\r
+\r
for (DriverHandleListLoop = 0\r
- ; DriverHandleListLoop < DriverHandleListCount\r
- ; DriverHandleListLoop++\r
- ){\r
+ ; DriverHandleListLoop < DriverHandleListCount\r
+ ; DriverHandleListLoop++\r
+ )\r
+ {\r
if (Mode == TestModeList) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_DRVDIAG_DRIVER_HEADER), gShellDriver1HiiHandle, ConvertHandleToHandleIndex(DriverHandleList[DriverHandleListLoop]));\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_DRVDIAG_DRIVER_HEADER), gShellDriver1HiiHandle, ConvertHandleToHandleIndex (DriverHandleList[DriverHandleListLoop]));\r
}\r
+\r
if (ControllerHandle == NULL) {\r
- PARSE_HANDLE_DATABASE_DEVICES(DriverHandleList[DriverHandleListLoop], &ControllerHandleListCount, &ControllerHandleList);\r
- } \r
+ PARSE_HANDLE_DATABASE_DEVICES (DriverHandleList[DriverHandleListLoop], &ControllerHandleListCount, &ControllerHandleList);\r
+ }\r
+\r
if (ControllerHandleListCount == 0) {\r
if (Mode == TestModeList) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_DRVDIAG_DRIVER_NO_HANDLES), gShellDriver1HiiHandle);\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_DRVDIAG_DRIVER_NO_HANDLES), gShellDriver1HiiHandle);\r
}\r
} else {\r
if (Mode == TestModeList) {\r
- ShellPrintEx(-1, -1, L"\r\n");\r
+ ShellPrintEx (-1, -1, L"\r\n");\r
}\r
+\r
for (ControllerHandleListLoop = 0\r
- ; ControllerHandleListLoop < ControllerHandleListCount\r
- ; ControllerHandleListLoop++\r
- ){\r
+ ; ControllerHandleListLoop < ControllerHandleListCount\r
+ ; ControllerHandleListLoop++\r
+ )\r
+ {\r
if (AllChilds) {\r
- ASSERT(ChildHandleList == NULL);\r
- PARSE_HANDLE_DATABASE_MANAGED_CHILDREN(\r
- DriverHandleList[DriverHandleListLoop], \r
+ ASSERT (ChildHandleList == NULL);\r
+ PARSE_HANDLE_DATABASE_MANAGED_CHILDREN (\r
+ DriverHandleList[DriverHandleListLoop],\r
ControllerHandleList[ControllerHandleListLoop],\r
&ChildHandleListCount,\r
- &ChildHandleList);\r
+ &ChildHandleList\r
+ );\r
}\r
+\r
for (ChildHandleListLoop = 0\r
- ; (ChildHandleListLoop < ChildHandleListCount || ChildHandleList == NULL)\r
- ; ChildHandleListLoop++\r
- ){\r
+ ; (ChildHandleListLoop < ChildHandleListCount || ChildHandleList == NULL)\r
+ ; ChildHandleListLoop++\r
+ )\r
+ {\r
Found = FALSE;\r
if (Mode != TestModeList) {\r
- if (Lang == NULL || Lang[2] == '-') {\r
+ if ((Lang == NULL) || (Lang[2] == '-')) {\r
//\r
// Get the protocol pointer and call the function\r
//\r
- Status = gBS->OpenProtocol(\r
- DriverHandleList[DriverHandleListLoop],\r
- &gEfiDriverDiagnostics2ProtocolGuid,\r
- (VOID**)&DriverDiagnostics2,\r
- gImageHandle,\r
- NULL,\r
- EFI_OPEN_PROTOCOL_GET_PROTOCOL);\r
- if (!EFI_ERROR(Status) && (DriverDiagnostics2 != NULL)) {\r
- Language = GetBestLanguageForDriver(DriverDiagnostics2->SupportedLanguages, Lang, FALSE);\r
- Found = TRUE;\r
- Status = DriverDiagnostics2->RunDiagnostics(\r
- DriverDiagnostics2,\r
- ControllerHandleList[ControllerHandleListLoop],\r
- ChildHandleList == NULL?NULL:ChildHandleList[ChildHandleListLoop],\r
- (EFI_DRIVER_DIAGNOSTIC_TYPE)Mode,\r
- Language,\r
- &ErrorType,\r
- &OutBufferSize,\r
- &OutBuffer);\r
- FreePool(Language);\r
+ Status = gBS->OpenProtocol (\r
+ DriverHandleList[DriverHandleListLoop],\r
+ &gEfiDriverDiagnostics2ProtocolGuid,\r
+ (VOID **)&DriverDiagnostics2,\r
+ gImageHandle,\r
+ NULL,\r
+ EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
+ );\r
+ if (!EFI_ERROR (Status) && (DriverDiagnostics2 != NULL)) {\r
+ Language = GetBestLanguageForDriver (DriverDiagnostics2->SupportedLanguages, Lang, FALSE);\r
+ Found = TRUE;\r
+ Status = DriverDiagnostics2->RunDiagnostics (\r
+ DriverDiagnostics2,\r
+ ControllerHandleList[ControllerHandleListLoop],\r
+ ChildHandleList == NULL ? NULL : ChildHandleList[ChildHandleListLoop],\r
+ (EFI_DRIVER_DIAGNOSTIC_TYPE)Mode,\r
+ Language,\r
+ &ErrorType,\r
+ &OutBufferSize,\r
+ &OutBuffer\r
+ );\r
+ FreePool (Language);\r
}\r
- } \r
- if (!Found && (Lang == NULL||(Lang!=NULL&&(Lang[2]!='-')))){\r
- Status = gBS->OpenProtocol(\r
- DriverHandleList[DriverHandleListLoop],\r
- &gEfiDriverDiagnosticsProtocolGuid,\r
- (VOID**)&DriverDiagnostics,\r
- gImageHandle,\r
- NULL,\r
- EFI_OPEN_PROTOCOL_GET_PROTOCOL);\r
- if (!EFI_ERROR(Status)) {\r
- Language = GetBestLanguageForDriver(DriverDiagnostics->SupportedLanguages, Lang, FALSE);\r
- Status = DriverDiagnostics->RunDiagnostics(\r
- DriverDiagnostics,\r
- ControllerHandleList[ControllerHandleListLoop],\r
- ChildHandleList == NULL?NULL:ChildHandleList[ChildHandleListLoop],\r
- (EFI_DRIVER_DIAGNOSTIC_TYPE)Mode,\r
- Language,\r
- &ErrorType,\r
- &OutBufferSize,\r
- &OutBuffer);\r
- FreePool(Language);\r
+ }\r
+\r
+ if (!Found && ((Lang == NULL) || ((Lang != NULL) && (Lang[2] != '-')))) {\r
+ Status = gBS->OpenProtocol (\r
+ DriverHandleList[DriverHandleListLoop],\r
+ &gEfiDriverDiagnosticsProtocolGuid,\r
+ (VOID **)&DriverDiagnostics,\r
+ gImageHandle,\r
+ NULL,\r
+ EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
+ );\r
+ if (!EFI_ERROR (Status)) {\r
+ Language = GetBestLanguageForDriver (DriverDiagnostics->SupportedLanguages, Lang, FALSE);\r
+ Status = DriverDiagnostics->RunDiagnostics (\r
+ DriverDiagnostics,\r
+ ControllerHandleList[ControllerHandleListLoop],\r
+ ChildHandleList == NULL ? NULL : ChildHandleList[ChildHandleListLoop],\r
+ (EFI_DRIVER_DIAGNOSTIC_TYPE)Mode,\r
+ Language,\r
+ &ErrorType,\r
+ &OutBufferSize,\r
+ &OutBuffer\r
+ );\r
+ FreePool (Language);\r
}\r
}\r
- if (EFI_ERROR(Status)) {\r
+\r
+ if (EFI_ERROR (Status)) {\r
Status2 = Status;\r
}\r
- HandleIndex1 = ConvertHandleToHandleIndex(DriverHandleList[DriverHandleListLoop]);\r
- HandleIndex2 = ConvertHandleToHandleIndex(ControllerHandleList[ControllerHandleListLoop]);\r
- ShellPrintHiiEx(\r
+\r
+ HandleIndex1 = ConvertHandleToHandleIndex (DriverHandleList[DriverHandleListLoop]);\r
+ HandleIndex2 = ConvertHandleToHandleIndex (ControllerHandleList[ControllerHandleListLoop]);\r
+ ShellPrintHiiEx (\r
-1,\r
-1,\r
NULL,\r
L"DrvDiag",\r
HandleIndex1,\r
HandleIndex2,\r
- ChildHandleList == NULL?0:ConvertHandleToHandleIndex(ChildHandleList[ChildHandleListLoop]),\r
- Status);\r
- if (OutBuffer!=NULL) {\r
- FreePool(OutBuffer);\r
+ ChildHandleList == NULL ? 0 : ConvertHandleToHandleIndex (ChildHandleList[ChildHandleListLoop]),\r
+ Status\r
+ );\r
+ if (OutBuffer != NULL) {\r
+ FreePool (OutBuffer);\r
OutBuffer = NULL;\r
}\r
- if (ErrorType!=NULL) {\r
- FreePool(ErrorType);\r
+\r
+ if (ErrorType != NULL) {\r
+ FreePool (ErrorType);\r
ErrorType = NULL;\r
}\r
} else {\r
- HandleIndex1 = ConvertHandleToHandleIndex(DriverHandleList[DriverHandleListLoop]);\r
- HandleIndex2 = ConvertHandleToHandleIndex(ControllerHandleList[ControllerHandleListLoop]);\r
+ HandleIndex1 = ConvertHandleToHandleIndex (DriverHandleList[DriverHandleListLoop]);\r
+ HandleIndex2 = ConvertHandleToHandleIndex (ControllerHandleList[ControllerHandleListLoop]);\r
//\r
// Print out the information that this set can be tested\r
//\r
- ShellPrintHiiEx(\r
+ ShellPrintHiiEx (\r
-1,\r
-1,\r
NULL,\r
gShellDriver1HiiHandle,\r
HandleIndex1,\r
HandleIndex2,\r
- ChildHandleList == NULL?0:ConvertHandleToHandleIndex(ChildHandleList[ChildHandleListLoop])\r
- );\r
+ ChildHandleList == NULL ? 0 : ConvertHandleToHandleIndex (ChildHandleList[ChildHandleListLoop])\r
+ );\r
}\r
\r
//\r
break;\r
}\r
}\r
+\r
if (AllChilds) {\r
- SHELL_FREE_NON_NULL(ChildHandleList);\r
- ChildHandleList = NULL;\r
- ChildHandleListCount = 0;\r
+ SHELL_FREE_NON_NULL (ChildHandleList);\r
+ ChildHandleList = NULL;\r
+ ChildHandleListCount = 0;\r
}\r
}\r
+\r
if (ControllerHandle == NULL) {\r
- SHELL_FREE_NON_NULL(ControllerHandleList);\r
+ SHELL_FREE_NON_NULL (ControllerHandleList);\r
ControllerHandleList = NULL;\r
ControllerHandleListCount = 0;\r
}\r
- }\r
+ }\r
}\r
\r
if (DriverHandleList != NULL) {\r
- FreePool(DriverHandleList);\r
+ FreePool (DriverHandleList);\r
}\r
+\r
if (ControllerHandleList != NULL) {\r
- FreePool(ControllerHandleList);\r
+ FreePool (ControllerHandleList);\r
}\r
+\r
if (ChildHandleList != NULL) {\r
- FreePool(ChildHandleList);\r
+ FreePool (ChildHandleList);\r
}\r
+\r
return (Status2);\r
}\r
\r
-\r
-STATIC CONST SHELL_PARAM_ITEM ParamList[] = {\r
- {L"-c", TypeFlag},\r
- {L"-s", TypeFlag},\r
- {L"-e", TypeFlag},\r
- {L"-m", TypeFlag},\r
- {L"-l", TypeValue},\r
- {NULL, TypeMax}\r
- };\r
+STATIC CONST SHELL_PARAM_ITEM ParamList[] = {\r
+ { L"-c", TypeFlag },\r
+ { L"-s", TypeFlag },\r
+ { L"-e", TypeFlag },\r
+ { L"-m", TypeFlag },\r
+ { L"-l", TypeValue },\r
+ { NULL, TypeMax }\r
+};\r
\r
/**\r
Function for 'drvdiag' command.\r
EFI_HANDLE Handle3;\r
UINT64 Intermediate;\r
\r
- ShellStatus = SHELL_SUCCESS;\r
- Mode = TestModeMax;\r
- Language = NULL;\r
+ ShellStatus = SHELL_SUCCESS;\r
+ Mode = TestModeMax;\r
+ Language = 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 (ParamList, &Package, &ProblemParam, TRUE);\r
- if (EFI_ERROR(Status)) {\r
- if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, L"drvdiag", 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"drvdiag", ProblemParam);\r
+ FreePool (ProblemParam);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
- ASSERT(FALSE);\r
+ ASSERT (FALSE);\r
}\r
} else {\r
//\r
// if more than 3 'value' parameters (plus the name one) or we have any 2 mode flags\r
//\r
- if ((ShellCommandLineGetCount(Package) > 4)\r
- ||(ShellCommandLineGetFlag(Package, L"-s") && ShellCommandLineGetFlag(Package, L"-e"))\r
- ||(ShellCommandLineGetFlag(Package, L"-s") && ShellCommandLineGetFlag(Package, L"-m"))\r
- ||(ShellCommandLineGetFlag(Package, L"-e") && ShellCommandLineGetFlag(Package, L"-m"))\r
- ){\r
+ if ( (ShellCommandLineGetCount (Package) > 4)\r
+ || (ShellCommandLineGetFlag (Package, L"-s") && ShellCommandLineGetFlag (Package, L"-e"))\r
+ || (ShellCommandLineGetFlag (Package, L"-s") && ShellCommandLineGetFlag (Package, L"-m"))\r
+ || (ShellCommandLineGetFlag (Package, L"-e") && ShellCommandLineGetFlag (Package, L"-m"))\r
+ )\r
+ {\r
//\r
// error for too many parameters\r
//\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"drvdiag"); \r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"drvdiag");\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
- } else if ((ShellCommandLineGetFlag(Package, L"-s"))\r
- || (ShellCommandLineGetFlag(Package, L"-e"))\r
- || (ShellCommandLineGetFlag(Package, L"-m"))\r
- ){\r
+ } else if ( (ShellCommandLineGetFlag (Package, L"-s"))\r
+ || (ShellCommandLineGetFlag (Package, L"-e"))\r
+ || (ShellCommandLineGetFlag (Package, L"-m"))\r
+ )\r
+ {\r
//\r
// Run the appropriate test\r
//\r
- if (ShellCommandLineGetFlag(Package, L"-s")) {\r
+ if (ShellCommandLineGetFlag (Package, L"-s")) {\r
Mode = TestModeStandard;\r
- } else if (ShellCommandLineGetFlag(Package, L"-e")) {\r
+ } else if (ShellCommandLineGetFlag (Package, L"-e")) {\r
Mode = TestModeExtended;\r
- } else if (ShellCommandLineGetFlag(Package, L"-m")) {\r
+ } else if (ShellCommandLineGetFlag (Package, L"-m")) {\r
Mode = TestModeManufacturing;\r
} else {\r
- ASSERT(FALSE);\r
+ ASSERT (FALSE);\r
}\r
} else {\r
//\r
Mode = TestModeList;\r
}\r
\r
- Lang = ShellCommandLineGetValue(Package, L"-l");\r
- if (ShellCommandLineGetFlag(Package, L"-l") && Lang == NULL) {\r
- ASSERT(Language == NULL);\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"drvdiag", L"-l"); \r
+ Lang = ShellCommandLineGetValue (Package, L"-l");\r
+ if (ShellCommandLineGetFlag (Package, L"-l") && (Lang == NULL)) {\r
+ ASSERT (Language == NULL);\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"drvdiag", L"-l");\r
ShellCommandLineFreeVarList (Package);\r
return (SHELL_INVALID_PARAMETER);\r
} else if (Lang != NULL) {\r
- Language = AllocateZeroPool(StrSize(Lang));\r
- AsciiSPrint(Language, StrSize(Lang), "%S", Lang);\r
+ Language = AllocateZeroPool (StrSize (Lang));\r
+ AsciiSPrint (Language, StrSize (Lang), "%S", Lang);\r
}\r
\r
- DriverHandleStr = ShellCommandLineGetRawValue(Package, 1);\r
- ControllerHandleStr = ShellCommandLineGetRawValue(Package, 2);\r
- ChildHandleStr = ShellCommandLineGetRawValue(Package, 3);\r
+ DriverHandleStr = ShellCommandLineGetRawValue (Package, 1);\r
+ ControllerHandleStr = ShellCommandLineGetRawValue (Package, 2);\r
+ ChildHandleStr = ShellCommandLineGetRawValue (Package, 3);\r
\r
if (DriverHandleStr == NULL) {\r
Handle1 = NULL;\r
} else {\r
- ShellConvertStringToUint64(DriverHandleStr, &Intermediate, TRUE, FALSE);\r
- Handle1 = ConvertHandleIndexToHandle((UINTN)Intermediate);\r
+ ShellConvertStringToUint64 (DriverHandleStr, &Intermediate, TRUE, FALSE);\r
+ Handle1 = ConvertHandleIndexToHandle ((UINTN)Intermediate);\r
}\r
+\r
if (ControllerHandleStr == NULL) {\r
Handle2 = NULL;\r
} else {\r
- ShellConvertStringToUint64(ControllerHandleStr, &Intermediate, TRUE, FALSE);\r
- Handle2 = ConvertHandleIndexToHandle((UINTN)Intermediate);\r
+ ShellConvertStringToUint64 (ControllerHandleStr, &Intermediate, TRUE, FALSE);\r
+ Handle2 = ConvertHandleIndexToHandle ((UINTN)Intermediate);\r
}\r
+\r
if (ChildHandleStr == NULL) {\r
Handle3 = NULL;\r
} else {\r
- ShellConvertStringToUint64(ChildHandleStr, &Intermediate, TRUE, FALSE);\r
- Handle3 = ConvertHandleIndexToHandle((UINTN)Intermediate);\r
+ ShellConvertStringToUint64 (ChildHandleStr, &Intermediate, TRUE, FALSE);\r
+ Handle3 = ConvertHandleIndexToHandle ((UINTN)Intermediate);\r
}\r
\r
Status = DoDiagnostics (\r
- Mode,\r
- Language,\r
- ShellCommandLineGetFlag(Package, L"-c"),\r
- Handle1, \r
- Handle2, \r
- Handle3\r
- );\r
-\r
- SHELL_FREE_NON_NULL(Language);\r
- ShellCommandLineFreeVarList (Package);\r
+ Mode,\r
+ Language,\r
+ ShellCommandLineGetFlag (Package, L"-c"),\r
+ Handle1,\r
+ Handle2,\r
+ Handle3\r
+ );\r
\r
+ SHELL_FREE_NON_NULL (Language);\r
+ ShellCommandLineFreeVarList (Package);\r
}\r
+\r
if (ShellStatus == SHELL_SUCCESS) {\r
if (Status == EFI_SECURITY_VIOLATION) {\r
ShellStatus = SHELL_SECURITY_VIOLATION;\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else if (Status == EFI_NOT_FOUND) {\r
ShellStatus = SHELL_NOT_FOUND;\r
- } else if (EFI_ERROR(Status)) {\r
+ } else if (EFI_ERROR (Status)) {\r
ShellStatus = SHELL_NOT_FOUND;\r
}\r
}\r
projects / mirror_edk2.git / blobdiff