/** @file\r
Main file for connect shell Driver1 function.\r
\r
- Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>\r
+ Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.<BR>\r
This program and the accompanying materials\r
are licensed and made available under the terms and conditions of the BSD License\r
which accompanies this distribution. The full text of the license may be found at\r
**/\r
\r
#include "UefiShellDriver1CommandsLib.h"\r
-#include <Guid/GlobalVariable.h>\r
-#include <Guid/ConsoleInDevice.h>\r
-#include <Guid/ConsoleOutDevice.h>\r
\r
+/**\r
+ Connect controller(s) and driver(s).\r
+\r
+ @param[in] ControllerHandle The handle to the controller. Should have driver binding on it.\r
+ @param[in] DriverHandle The handle to the driver. Should have driver binding.\r
+ @param[in] Recursive TRUE to connect recursively, FALSE otherwise.\r
+ @param[in] Output TRUE to have info on the screen, FALSE otherwise.\r
+ @param[in] AlwaysOutput Override Output for errors.\r
+\r
+ @retval EFI_SUCCESS The operation was successful.\r
+**/\r
EFI_STATUS\r
EFIAPI\r
ConnectControllers (\r
- IN CONST EFI_HANDLE ControllerHandle,\r
- IN CONST EFI_HANDLE DriverHandle,\r
+ IN CONST EFI_HANDLE ControllerHandle OPTIONAL,\r
+ IN CONST EFI_HANDLE DriverHandle OPTIONAL,\r
IN CONST BOOLEAN Recursive,\r
- IN CONST BOOLEAN Output\r
- ){\r
+ IN CONST BOOLEAN Output,\r
+ IN CONST BOOLEAN AlwaysOutput\r
+ )\r
+{\r
EFI_STATUS Status;\r
+ EFI_STATUS Status2;\r
EFI_HANDLE *ControllerHandleList;\r
EFI_HANDLE *DriverHandleList;\r
EFI_HANDLE *HandleWalker;\r
\r
ControllerHandleList = NULL;\r
Status = EFI_NOT_FOUND;\r
+ Status2 = EFI_NOT_FOUND;\r
\r
//\r
// If we have a single handle to connect make that a 'list'\r
if (DriverHandle == NULL) {\r
DriverHandleList = NULL;\r
} else {\r
- DriverHandleList = AllocatePool(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
DriverHandleList[1] = NULL;\r
}\r
// This is where we call the gBS->ConnectController function.\r
//\r
if (ControllerHandle == NULL) {\r
- ControllerHandleList = GetHandleListByPotocol(&gEfiDevicePathProtocolGuid);\r
+ ControllerHandleList = GetHandleListByProtocol(&gEfiDevicePathProtocolGuid);\r
for (HandleWalker = ControllerHandleList\r
; HandleWalker != NULL && *HandleWalker != NULL\r
; HandleWalker++\r
- ){\r
+ ){\r
Status = gBS->ConnectController(*HandleWalker, DriverHandleList, NULL, Recursive);\r
- if (Output) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN(STR_CON_RESULT), gShellDriver1HiiHandle, *HandleWalker, Status);\r
+ if (!EFI_ERROR(Status)) {\r
+ Status2 = EFI_SUCCESS;\r
+ }\r
+ if ((Output && !EFI_ERROR(Status)) || AlwaysOutput) {\r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN(STR_HANDLE_RESULT), gShellDriver1HiiHandle, L"Connect", ConvertHandleToHandleIndex(*HandleWalker), Status);\r
}\r
}\r
} else {\r
Status = gBS->ConnectController(ControllerHandle, DriverHandleList, NULL, Recursive);\r
- ASSERT(Output == FALSE);\r
+ if (!EFI_ERROR(Status)) {\r
+ Status2 = EFI_SUCCESS;\r
+ }\r
+ if ((Output && !EFI_ERROR(Status)) || AlwaysOutput) {\r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN(STR_HANDLE_RESULT), gShellDriver1HiiHandle, L"Connect", ConvertHandleToHandleIndex(ControllerHandle), Status);\r
+ }\r
}\r
\r
//\r
if (DriverHandleList != NULL) {\r
FreePool(DriverHandleList);\r
}\r
- return (Status);\r
+ return (Status2);\r
}\r
\r
+/**\r
+ Do a connect from an EFI variable via it's key name.\r
+\r
+ @param[in] Key The name of the EFI Variable.\r
+\r
+ @retval EFI_SUCCESS The operation was successful.\r
+**/\r
EFI_STATUS\r
EFIAPI\r
ConnectFromDevPaths (\r
IN CONST CHAR16 *Key\r
- ){\r
+ )\r
+{\r
EFI_DEVICE_PATH_PROTOCOL *DevPath;\r
EFI_DEVICE_PATH_PROTOCOL *DevPathWalker;\r
UINTN Length;\r
//\r
Status = gRT->GetVariable((CHAR16*)Key, (EFI_GUID*)&gEfiGlobalVariableGuid, NULL, &Length, DevPath);\r
if (Status == EFI_BUFFER_TOO_SMALL) {\r
- DevPath = AllocatePool(Length);\r
+ DevPath = AllocateZeroPool(Length);\r
Status = gRT->GetVariable((CHAR16*)Key, (EFI_GUID*)&gEfiGlobalVariableGuid, NULL, &Length, DevPath);\r
}\r
\r
+ Status = EFI_NOT_FOUND;\r
//\r
// walk the list of devices and connect them\r
//\r
for (DevPathWalker = DevPath\r
- ; DevPathWalker < (DevPath + Length) && !EFI_ERROR(Status) && DevPath != NULL\r
+ ; DevPathWalker < (DevPath + Length) && EFI_ERROR(Status) && DevPath != NULL\r
; DevPathWalker += GetDevicePathSize(DevPathWalker)\r
- ){\r
+ ){\r
//\r
// get the correct handle from a given device path\r
//\r
- if (StrCmp(Key, L"ConInDev") == 0) {\r
+ if ((StrCmp(Key, L"ConInDev") == 0)\r
+ ||(StrCmp(Key, L"ConIn") == 0)\r
+ ){\r
Status = gBS->LocateDevicePath((EFI_GUID*)&gEfiConsoleInDeviceGuid, &DevPathWalker, &Handle);\r
- } else if (StrCmp(Key, L"ConOutDev") == 0) {\r
+ if (!EFI_ERROR(Status)) {\r
+ Status = ConnectControllers(NULL, Handle, FALSE, TRUE, FALSE);\r
+ }\r
+ } else if ((StrCmp(Key, L"ConOutDev") == 0) \r
+ || (StrCmp(Key, L"ErrOutDev") == 0) \r
+ || (StrCmp(Key, L"ConOut") == 0) \r
+ || (StrCmp(Key, L"ErrOut") == 0)\r
+ ){\r
Status = gBS->LocateDevicePath((EFI_GUID*)&gEfiConsoleOutDeviceGuid, &DevPathWalker, &Handle);\r
- } else {\r
- Handle = NULL;\r
- Status = EFI_INVALID_PARAMETER;\r
- ASSERT(FALSE);\r
- }\r
- if (!EFI_ERROR(Status)) {\r
- Status = ConnectControllers(Handle, NULL, FALSE, FALSE);\r
+ if (!EFI_ERROR(Status)) {\r
+ Status = ConnectControllers(NULL, Handle, FALSE, TRUE, FALSE);\r
+ }\r
}\r
}\r
\r
return (Status);\r
}\r
\r
+/**\r
+ Convert the handle identifiers from strings and then connect them.\r
+\r
+ One of them should have driver binding and either can be NULL.\r
+\r
+ @param[in] Handle1 The first handle.\r
+ @param[in] Handle2 The second handle.\r
+ @param[in] Recursive TRUE to do connect recursively. FALSE otherwise.\r
+ @param[in] Output TRUE to have output to screen. FALSE otherwise.\r
+\r
+ @retval EFI_SUCCESS The operation was successful.\r
+**/\r
EFI_STATUS\r
EFIAPI\r
ConvertAndConnectControllers (\r
- IN CONST CHAR16 *StringHandle1,\r
- IN CONST CHAR16 *StringHandle2 OPTIONAL,\r
+ IN EFI_HANDLE *Handle1 OPTIONAL,\r
+ IN EFI_HANDLE *Handle2 OPTIONAL,\r
IN CONST BOOLEAN Recursive,\r
IN CONST BOOLEAN Output\r
- ){\r
- EFI_HANDLE Handle1;\r
- EFI_HANDLE Handle2;\r
-\r
- //\r
- // Convert the command line parameters to HANDLES. They must be in HEX according to spec.\r
- //\r
- if (StringHandle1 != NULL) {\r
- Handle1 = (EFI_HANDLE)StrHexToUintn(StringHandle1);\r
- } else {\r
- Handle1 = NULL;\r
- }\r
- if (StringHandle2 != NULL) {\r
- Handle2 = (EFI_HANDLE)StrHexToUintn(StringHandle2);\r
- } else {\r
- Handle2 = NULL;\r
- }\r
-\r
+ )\r
+{\r
//\r
// if only one is NULL verify it's the proper one...\r
//\r
if ( (Handle1 == NULL && Handle2 != NULL)\r
|| (Handle1 != NULL && Handle2 == NULL)\r
- ){\r
+ ){\r
//\r
// Figure out which one should be NULL and move the handle to the right place.\r
// If Handle1 is NULL then test Handle2 and vise versa.\r
}\r
}\r
\r
- return (ConnectControllers(Handle1, Handle2, Recursive, Output));\r
+ return (ConnectControllers(Handle1, Handle2, Recursive, Output, (BOOLEAN)(Handle2 != NULL && Handle1 != NULL)));\r
}\r
\r
STATIC CONST SHELL_PARAM_ITEM ParamList[] = {\r
{NULL, TypeMax}\r
};\r
\r
+/**\r
+ Function for 'connect' command.\r
+\r
+ @param[in] ImageHandle Handle to the Image (NULL if Internal).\r
+ @param[in] SystemTable Pointer to the System Table (NULL if Internal).\r
+**/\r
SHELL_STATUS\r
EFIAPI\r
ShellCommandRunConnect (\r
- VOID *RESERVED\r
- ) {\r
+ IN EFI_HANDLE ImageHandle,\r
+ IN EFI_SYSTEM_TABLE *SystemTable\r
+ )\r
+{\r
EFI_STATUS Status;\r
LIST_ENTRY *Package;\r
CHAR16 *ProblemParam;\r
SHELL_STATUS ShellStatus;\r
+ CONST CHAR16 *Param1;\r
+ CONST CHAR16 *Param2;\r
+ UINTN Count;\r
+ EFI_HANDLE Handle1;\r
+ EFI_HANDLE Handle2;\r
+ UINT64 Intermediate;\r
\r
ShellStatus = SHELL_SUCCESS;\r
\r
// parse the command line\r
//\r
Status = ShellCommandLineParse (ParamList, &Package, &ProblemParam, TRUE);\r
- if EFI_ERROR(Status) {\r
+ if (EFI_ERROR(Status)) {\r
if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {\r
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, ProblemParam);\r
FreePool(ProblemParam);\r
//\r
// if more than 2 'value' parameters (plus the name one) or either -r or -c with any value parameters we have too many parameters\r
//\r
- if ((ShellCommandLineGetCount() > 3)\r
- ||((ShellCommandLineGetFlag(Package, L"-r") != FALSE || ShellCommandLineGetFlag(Package, L"-c") != FALSE) && ShellCommandLineGetCount()!=0)\r
- ){\r
+ Count = (gInReconnect?0x4:0x3);\r
+ if ((ShellCommandLineGetCount(Package) > Count)\r
+ ||((ShellCommandLineGetFlag(Package, L"-r") || ShellCommandLineGetFlag(Package, L"-c")) && ShellCommandLineGetCount(Package)>1)\r
+ ||(ShellCommandLineGetFlag(Package, L"-r") && ShellCommandLineGetFlag(Package, L"-c") )\r
+ ){\r
//\r
// error for too many parameters\r
//\r
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
- } else if (ShellCommandLineGetFlag(Package, L"-c") != FALSE) {\r
+ } else if (ShellCommandLineGetFlag(Package, L"-c")) {\r
//\r
// do the conin and conout from EFI variables\r
// if the first fails dont 'loose' the error\r
} else {\r
Status = ConnectFromDevPaths(L"ConOutDev");\r
}\r
- ShellStatus = Status & (~MAX_BIT);\r
+ if (EFI_ERROR(Status)) {\r
+ ConnectFromDevPaths(L"ErrOutDev");\r
+ } else {\r
+ Status = ConnectFromDevPaths(L"ErrOutDev");\r
+ }\r
+ if (EFI_ERROR(Status)) {\r
+ ConnectFromDevPaths(L"ErrOut");\r
+ } else {\r
+ Status = ConnectFromDevPaths(L"ErrOut");\r
+ }\r
+ if (EFI_ERROR(Status)) {\r
+ ConnectFromDevPaths(L"ConIn");\r
+ } else {\r
+ Status = ConnectFromDevPaths(L"ConIn");\r
+ }\r
+ if (EFI_ERROR(Status)) {\r
+ ConnectFromDevPaths(L"ConOut");\r
+ } else {\r
+ Status = ConnectFromDevPaths(L"ConOut");\r
+ }\r
+ if (EFI_ERROR(Status)) {\r
+ ShellStatus = SHELL_DEVICE_ERROR;\r
+ }\r
} else {\r
//\r
// 0, 1, or 2 specific handles and possibly recursive\r
//\r
- if (ShellCommandLineGetRawValue(Package, 1) != NULL && CommandLibGetHandleValue(StrHexToUintn(ShellCommandLineGetRawValue(Package, 1))) == NULL){\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, ShellCommandLineGetRawValue(Package, 1));\r
- ShellStatus = SHELL_INVALID_PARAMETER;\r
- } else if (ShellCommandLineGetRawValue(Package, 2) != NULL && CommandLibGetHandleValue(StrHexToUintn(ShellCommandLineGetRawValue(Package, 2))) == NULL) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, ShellCommandLineGetRawValue(Package, 2));\r
- ShellStatus = SHELL_INVALID_PARAMETER;\r
+ Param1 = ShellCommandLineGetRawValue(Package, 1);\r
+ Param2 = ShellCommandLineGetRawValue(Package, 2);\r
+ Count = ShellCommandLineGetCount(Package);\r
+\r
+ if (Param1 != NULL) {\r
+ Status = ShellConvertStringToUint64(Param1, &Intermediate, TRUE, FALSE);\r
+ Handle1 = ConvertHandleIndexToHandle((UINTN)Intermediate);\r
+ if (EFI_ERROR(Status)) {\r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, Param1);\r
+ ShellStatus = SHELL_INVALID_PARAMETER;\r
+ }\r
} else {\r
- Status = ConvertAndConnectControllers(ShellCommandLineGetRawValue(Package, 1), ShellCommandLineGetRawValue(Package, 2), ShellCommandLineGetFlag(Package, L"-r"), (BOOLEAN)(ShellCommandLineGetCount()!=0));\r
- ShellStatus = Status & (~MAX_BIT);\r
+ Handle1 = NULL;\r
+ }\r
+\r
+ if (Param2 != NULL) {\r
+ Status = ShellConvertStringToUint64(Param2, &Intermediate, TRUE, FALSE);\r
+ Handle2 = ConvertHandleIndexToHandle((UINTN)Intermediate);\r
+ if (EFI_ERROR(Status)) {\r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, Param2);\r
+ ShellStatus = SHELL_INVALID_PARAMETER;\r
+ }\r
+ } else {\r
+ Handle2 = NULL;\r
+ }\r
+ \r
+ if (ShellStatus == SHELL_SUCCESS) {\r
+ if (Param1 != NULL && Handle1 == NULL){\r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, Param1);\r
+ ShellStatus = SHELL_INVALID_PARAMETER;\r
+ } else if (Param2 != NULL && Handle2 == NULL) {\r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, Param2);\r
+ ShellStatus = SHELL_INVALID_PARAMETER;\r
+ } else if (Handle2 != NULL && Handle1 != NULL && EFI_ERROR(gBS->OpenProtocol(Handle2, &gEfiDriverBindingProtocolGuid, NULL, gImageHandle, NULL, EFI_OPEN_PROTOCOL_TEST_PROTOCOL))) {\r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, Param2);\r
+ ShellStatus = SHELL_INVALID_PARAMETER;\r
+ } else {\r
+ Status = ConvertAndConnectControllers(Handle1, Handle2, ShellCommandLineGetFlag(Package, L"-r"), (BOOLEAN)(Count!=0));\r
+ if (EFI_ERROR(Status)) {\r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_CONNECT_NONE), gShellDriver1HiiHandle);\r
+ ShellStatus = SHELL_DEVICE_ERROR;\r
+ }\r
+ }\r
}\r
}\r
\r
projects / mirror_edk2.git / blobdiff