ShellPkg: Apply uncrustify changes
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3737 Apply uncrustify changes to .c/.h files in the ShellPkg package Cc: Andrew Fish <afish@apple.com> Cc: Leif Lindholm <leif@nuviainc.com> Cc: Michael D Kinney <michael.d.kinney@intel.com> Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com> Reviewed-by: Ray Ni <ray.ni@intel.com>
This commit is contained in:
Michael Kubacki
committed by
mergify[bot]
mergify[bot]
parent
c411b485b6
commit
47d20b54f9
@ -23,7 +23,7 @@
|
||||
**/
|
||||
EFI_STATUS
|
||||
ShellConnectDevicePath (
|
||||
IN EFI_DEVICE_PATH_PROTOCOL *DevicePathToConnect
|
||||
IN EFI_DEVICE_PATH_PROTOCOL *DevicePathToConnect
|
||||
)
|
||||
{
|
||||
EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath;
|
||||
@ -36,23 +36,21 @@ ShellConnectDevicePath (
|
||||
}
|
||||
|
||||
PreviousHandle = NULL;
|
||||
do{
|
||||
do {
|
||||
RemainingDevicePath = DevicePathToConnect;
|
||||
Status = gBS->LocateDevicePath (&gEfiDevicePathProtocolGuid, &RemainingDevicePath, &Handle);
|
||||
Status = gBS->LocateDevicePath (&gEfiDevicePathProtocolGuid, &RemainingDevicePath, &Handle);
|
||||
|
||||
if (!EFI_ERROR (Status) && (Handle != NULL)) {
|
||||
if (PreviousHandle == Handle) {
|
||||
Status = EFI_NOT_FOUND;
|
||||
} else {
|
||||
PreviousHandle = Handle;
|
||||
Status = gBS->ConnectController (Handle, NULL, RemainingDevicePath, FALSE);
|
||||
Status = gBS->ConnectController (Handle, NULL, RemainingDevicePath, FALSE);
|
||||
}
|
||||
}
|
||||
|
||||
} while (!EFI_ERROR (Status) && !IsDevicePathEnd (RemainingDevicePath) );
|
||||
} while (!EFI_ERROR (Status) && !IsDevicePathEnd (RemainingDevicePath));
|
||||
|
||||
return Status;
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
@ -67,20 +65,20 @@ ShellConnectPciRootBridge (
|
||||
VOID
|
||||
)
|
||||
{
|
||||
UINTN RootBridgeHandleCount;
|
||||
EFI_HANDLE *RootBridgeHandleBuffer;
|
||||
UINTN RootBridgeIndex;
|
||||
EFI_STATUS Status;
|
||||
UINTN RootBridgeHandleCount;
|
||||
EFI_HANDLE *RootBridgeHandleBuffer;
|
||||
UINTN RootBridgeIndex;
|
||||
EFI_STATUS Status;
|
||||
|
||||
RootBridgeHandleCount = 0;
|
||||
|
||||
Status = gBS->LocateHandleBuffer (
|
||||
ByProtocol,
|
||||
&gEfiPciRootBridgeIoProtocolGuid,
|
||||
NULL,
|
||||
&RootBridgeHandleCount,
|
||||
&RootBridgeHandleBuffer
|
||||
);
|
||||
ByProtocol,
|
||||
&gEfiPciRootBridgeIoProtocolGuid,
|
||||
NULL,
|
||||
&RootBridgeHandleCount,
|
||||
&RootBridgeHandleBuffer
|
||||
);
|
||||
if (EFI_ERROR (Status)) {
|
||||
return Status;
|
||||
}
|
||||
@ -94,7 +92,6 @@ ShellConnectPciRootBridge (
|
||||
return EFI_SUCCESS;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
Connect controller(s) and driver(s).
|
||||
|
||||
@ -108,22 +105,22 @@ ShellConnectPciRootBridge (
|
||||
**/
|
||||
EFI_STATUS
|
||||
ConnectControllers (
|
||||
IN CONST EFI_HANDLE ControllerHandle OPTIONAL,
|
||||
IN CONST EFI_HANDLE DriverHandle OPTIONAL,
|
||||
IN CONST BOOLEAN Recursive,
|
||||
IN CONST BOOLEAN Output,
|
||||
IN CONST BOOLEAN AlwaysOutput
|
||||
IN CONST EFI_HANDLE ControllerHandle OPTIONAL,
|
||||
IN CONST EFI_HANDLE DriverHandle OPTIONAL,
|
||||
IN CONST BOOLEAN Recursive,
|
||||
IN CONST BOOLEAN Output,
|
||||
IN CONST BOOLEAN AlwaysOutput
|
||||
)
|
||||
{
|
||||
EFI_STATUS Status;
|
||||
EFI_STATUS Status2;
|
||||
EFI_HANDLE *ControllerHandleList;
|
||||
EFI_HANDLE *DriverHandleList;
|
||||
EFI_HANDLE *HandleWalker;
|
||||
EFI_STATUS Status;
|
||||
EFI_STATUS Status2;
|
||||
EFI_HANDLE *ControllerHandleList;
|
||||
EFI_HANDLE *DriverHandleList;
|
||||
EFI_HANDLE *HandleWalker;
|
||||
|
||||
ControllerHandleList = NULL;
|
||||
Status = EFI_NOT_FOUND;
|
||||
Status2 = EFI_NOT_FOUND;
|
||||
ControllerHandleList = NULL;
|
||||
Status = EFI_NOT_FOUND;
|
||||
Status2 = EFI_NOT_FOUND;
|
||||
|
||||
//
|
||||
// If we have a single handle to connect make that a 'list'
|
||||
@ -131,10 +128,11 @@ ConnectControllers (
|
||||
if (DriverHandle == NULL) {
|
||||
DriverHandleList = NULL;
|
||||
} else {
|
||||
DriverHandleList = AllocateZeroPool(2*sizeof(EFI_HANDLE));
|
||||
DriverHandleList = AllocateZeroPool (2*sizeof (EFI_HANDLE));
|
||||
if (DriverHandleList == NULL) {
|
||||
return (EFI_OUT_OF_RESOURCES);
|
||||
}
|
||||
|
||||
DriverHandleList[0] = DriverHandle;
|
||||
DriverHandleList[1] = NULL;
|
||||
}
|
||||
@ -144,26 +142,29 @@ ConnectControllers (
|
||||
// This is where we call the gBS->ConnectController function.
|
||||
//
|
||||
if (ControllerHandle == NULL) {
|
||||
ControllerHandleList = GetHandleListByProtocol(&gEfiDevicePathProtocolGuid);
|
||||
ControllerHandleList = GetHandleListByProtocol (&gEfiDevicePathProtocolGuid);
|
||||
for (HandleWalker = ControllerHandleList
|
||||
; HandleWalker != NULL && *HandleWalker != NULL
|
||||
; HandleWalker++
|
||||
){
|
||||
Status = gBS->ConnectController(*HandleWalker, DriverHandleList, NULL, Recursive);
|
||||
if (!EFI_ERROR(Status)) {
|
||||
; HandleWalker != NULL && *HandleWalker != NULL
|
||||
; HandleWalker++
|
||||
)
|
||||
{
|
||||
Status = gBS->ConnectController (*HandleWalker, DriverHandleList, NULL, Recursive);
|
||||
if (!EFI_ERROR (Status)) {
|
||||
Status2 = EFI_SUCCESS;
|
||||
}
|
||||
if ((Output && !EFI_ERROR(Status)) || AlwaysOutput) {
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN(STR_HANDLE_RESULT), gShellDriver1HiiHandle, L"Connect", ConvertHandleToHandleIndex(*HandleWalker), Status);
|
||||
|
||||
if ((Output && !EFI_ERROR (Status)) || AlwaysOutput) {
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_HANDLE_RESULT), gShellDriver1HiiHandle, L"Connect", ConvertHandleToHandleIndex (*HandleWalker), Status);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
Status = gBS->ConnectController(ControllerHandle, DriverHandleList, NULL, Recursive);
|
||||
if (!EFI_ERROR(Status)) {
|
||||
Status = gBS->ConnectController (ControllerHandle, DriverHandleList, NULL, Recursive);
|
||||
if (!EFI_ERROR (Status)) {
|
||||
Status2 = EFI_SUCCESS;
|
||||
}
|
||||
if ((Output && !EFI_ERROR(Status)) || AlwaysOutput) {
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN(STR_HANDLE_RESULT), gShellDriver1HiiHandle, L"Connect", ConvertHandleToHandleIndex(ControllerHandle), Status);
|
||||
|
||||
if ((Output && !EFI_ERROR (Status)) || AlwaysOutput) {
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_HANDLE_RESULT), gShellDriver1HiiHandle, L"Connect", ConvertHandleToHandleIndex (ControllerHandle), Status);
|
||||
}
|
||||
}
|
||||
|
||||
@ -171,11 +172,13 @@ ConnectControllers (
|
||||
// Free any memory we allocated.
|
||||
//
|
||||
if (ControllerHandleList != NULL) {
|
||||
FreePool(ControllerHandleList);
|
||||
FreePool (ControllerHandleList);
|
||||
}
|
||||
|
||||
if (DriverHandleList != NULL) {
|
||||
FreePool(DriverHandleList);
|
||||
FreePool (DriverHandleList);
|
||||
}
|
||||
|
||||
return (Status2);
|
||||
}
|
||||
|
||||
@ -188,7 +191,7 @@ ConnectControllers (
|
||||
**/
|
||||
EFI_STATUS
|
||||
ShellConnectFromDevPaths (
|
||||
IN CONST CHAR16 *Key
|
||||
IN CONST CHAR16 *Key
|
||||
)
|
||||
{
|
||||
EFI_DEVICE_PATH_PROTOCOL *DevPath;
|
||||
@ -205,24 +208,26 @@ ShellConnectFromDevPaths (
|
||||
EFI_PCI_IO_PROTOCOL *PciIo;
|
||||
UINT8 Class[3];
|
||||
|
||||
DevPath = NULL;
|
||||
Length = 0;
|
||||
DevPath = NULL;
|
||||
Length = 0;
|
||||
AtLeastOneConnected = FALSE;
|
||||
|
||||
//
|
||||
// Get the DevicePath buffer from the variable...
|
||||
//
|
||||
Status = gRT->GetVariable((CHAR16*)Key, (EFI_GUID*)&gEfiGlobalVariableGuid, NULL, &Length, DevPath);
|
||||
Status = gRT->GetVariable ((CHAR16 *)Key, (EFI_GUID *)&gEfiGlobalVariableGuid, NULL, &Length, DevPath);
|
||||
if (Status == EFI_BUFFER_TOO_SMALL) {
|
||||
DevPath = AllocateZeroPool(Length);
|
||||
DevPath = AllocateZeroPool (Length);
|
||||
if (DevPath == NULL) {
|
||||
return EFI_OUT_OF_RESOURCES;
|
||||
}
|
||||
Status = gRT->GetVariable((CHAR16*)Key, (EFI_GUID*)&gEfiGlobalVariableGuid, NULL, &Length, DevPath);
|
||||
|
||||
Status = gRT->GetVariable ((CHAR16 *)Key, (EFI_GUID *)&gEfiGlobalVariableGuid, NULL, &Length, DevPath);
|
||||
if (EFI_ERROR (Status)) {
|
||||
if (DevPath != NULL) {
|
||||
FreePool (DevPath);
|
||||
}
|
||||
|
||||
return Status;
|
||||
}
|
||||
} else if (EFI_ERROR (Status)) {
|
||||
@ -244,6 +249,7 @@ ShellConnectFromDevPaths (
|
||||
if (DevPath != NULL) {
|
||||
FreePool (DevPath);
|
||||
}
|
||||
|
||||
return EFI_UNSUPPORTED;
|
||||
}
|
||||
|
||||
@ -257,45 +263,46 @@ ShellConnectFromDevPaths (
|
||||
// connect short form device path
|
||||
//
|
||||
if ((DevicePathType (Instance) == MESSAGING_DEVICE_PATH) &&
|
||||
((DevicePathSubType (Instance) == MSG_USB_CLASS_DP)
|
||||
|| (DevicePathSubType (Instance) == MSG_USB_WWID_DP)
|
||||
)) {
|
||||
|
||||
( (DevicePathSubType (Instance) == MSG_USB_CLASS_DP)
|
||||
|| (DevicePathSubType (Instance) == MSG_USB_WWID_DP)
|
||||
))
|
||||
{
|
||||
Status = ShellConnectPciRootBridge ();
|
||||
if (EFI_ERROR(Status)) {
|
||||
FreePool(Instance);
|
||||
FreePool(DevPath);
|
||||
if (EFI_ERROR (Status)) {
|
||||
FreePool (Instance);
|
||||
FreePool (DevPath);
|
||||
return Status;
|
||||
}
|
||||
|
||||
Status = gBS->LocateHandleBuffer (
|
||||
ByProtocol,
|
||||
&gEfiPciIoProtocolGuid,
|
||||
NULL,
|
||||
&HandleArrayCount,
|
||||
&HandleArray
|
||||
);
|
||||
ByProtocol,
|
||||
&gEfiPciIoProtocolGuid,
|
||||
NULL,
|
||||
&HandleArrayCount,
|
||||
&HandleArray
|
||||
);
|
||||
|
||||
if (!EFI_ERROR (Status)) {
|
||||
for (Index = 0; Index < HandleArrayCount; Index++) {
|
||||
Status = gBS->HandleProtocol (
|
||||
HandleArray[Index],
|
||||
&gEfiPciIoProtocolGuid,
|
||||
(VOID **)&PciIo
|
||||
);
|
||||
HandleArray[Index],
|
||||
&gEfiPciIoProtocolGuid,
|
||||
(VOID **)&PciIo
|
||||
);
|
||||
|
||||
if (!EFI_ERROR (Status)) {
|
||||
Status = PciIo->Pci.Read (PciIo, EfiPciIoWidthUint8, 0x09, 3, &Class);
|
||||
if (!EFI_ERROR (Status)) {
|
||||
if ((PCI_CLASS_SERIAL == Class[2]) &&
|
||||
(PCI_CLASS_SERIAL_USB == Class[1])) {
|
||||
(PCI_CLASS_SERIAL_USB == Class[1]))
|
||||
{
|
||||
Status = gBS->ConnectController (
|
||||
HandleArray[Index],
|
||||
NULL,
|
||||
Instance,
|
||||
FALSE
|
||||
);
|
||||
if (!EFI_ERROR(Status)) {
|
||||
HandleArray[Index],
|
||||
NULL,
|
||||
Instance,
|
||||
FALSE
|
||||
);
|
||||
if (!EFI_ERROR (Status)) {
|
||||
AtLeastOneConnected = TRUE;
|
||||
}
|
||||
}
|
||||
@ -316,12 +323,12 @@ ShellConnectFromDevPaths (
|
||||
AtLeastOneConnected = TRUE;
|
||||
}
|
||||
}
|
||||
FreePool (Instance);
|
||||
|
||||
FreePool (Instance);
|
||||
} while (CopyOfDevPath != NULL);
|
||||
|
||||
if (DevPath != NULL) {
|
||||
FreePool(DevPath);
|
||||
FreePool (DevPath);
|
||||
}
|
||||
|
||||
if (AtLeastOneConnected) {
|
||||
@ -329,7 +336,6 @@ ShellConnectFromDevPaths (
|
||||
} else {
|
||||
return EFI_NOT_FOUND;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
@ -355,16 +361,17 @@ ConvertAndConnectControllers (
|
||||
//
|
||||
// if only one is NULL verify it's the proper one...
|
||||
//
|
||||
if ( (Handle1 == NULL && Handle2 != NULL)
|
||||
|| (Handle1 != NULL && Handle2 == NULL)
|
||||
){
|
||||
if ( ((Handle1 == NULL) && (Handle2 != NULL))
|
||||
|| ((Handle1 != NULL) && (Handle2 == NULL))
|
||||
)
|
||||
{
|
||||
//
|
||||
// Figure out which one should be NULL and move the handle to the right place.
|
||||
// If Handle1 is NULL then test Handle2 and vise versa.
|
||||
// The one that DOES has driver binding must be Handle2
|
||||
//
|
||||
if (Handle1 == NULL) {
|
||||
if (EFI_ERROR(gBS->OpenProtocol(Handle2, &gEfiDriverBindingProtocolGuid, NULL, NULL, gImageHandle, EFI_OPEN_PROTOCOL_TEST_PROTOCOL))) {
|
||||
if (EFI_ERROR (gBS->OpenProtocol (Handle2, &gEfiDriverBindingProtocolGuid, NULL, NULL, gImageHandle, EFI_OPEN_PROTOCOL_TEST_PROTOCOL))) {
|
||||
// swap
|
||||
Handle1 = Handle2;
|
||||
Handle2 = NULL;
|
||||
@ -372,7 +379,7 @@ ConvertAndConnectControllers (
|
||||
// We're all good...
|
||||
}
|
||||
} else {
|
||||
if (EFI_ERROR(gBS->OpenProtocol(Handle1, &gEfiDriverBindingProtocolGuid, NULL, NULL, gImageHandle, EFI_OPEN_PROTOCOL_TEST_PROTOCOL))) {
|
||||
if (EFI_ERROR (gBS->OpenProtocol (Handle1, &gEfiDriverBindingProtocolGuid, NULL, NULL, gImageHandle, EFI_OPEN_PROTOCOL_TEST_PROTOCOL))) {
|
||||
// We're all good...
|
||||
} else {
|
||||
// swap
|
||||
@ -382,14 +389,14 @@ ConvertAndConnectControllers (
|
||||
}
|
||||
}
|
||||
|
||||
return (ConnectControllers(Handle1, Handle2, Recursive, Output, (BOOLEAN)(Handle2 != NULL && Handle1 != NULL)));
|
||||
return (ConnectControllers (Handle1, Handle2, Recursive, Output, (BOOLEAN)(Handle2 != NULL && Handle1 != NULL)));
|
||||
}
|
||||
|
||||
STATIC CONST SHELL_PARAM_ITEM ParamList[] = {
|
||||
{L"-c", TypeFlag},
|
||||
{L"-r", TypeFlag},
|
||||
{NULL, TypeMax}
|
||||
};
|
||||
STATIC CONST SHELL_PARAM_ITEM ParamList[] = {
|
||||
{ L"-c", TypeFlag },
|
||||
{ L"-r", TypeFlag },
|
||||
{ NULL, TypeMax }
|
||||
};
|
||||
|
||||
/**
|
||||
Function for 'connect' command.
|
||||
@ -404,101 +411,107 @@ ShellCommandRunConnect (
|
||||
IN EFI_SYSTEM_TABLE *SystemTable
|
||||
)
|
||||
{
|
||||
EFI_STATUS Status;
|
||||
LIST_ENTRY *Package;
|
||||
CHAR16 *ProblemParam;
|
||||
SHELL_STATUS ShellStatus;
|
||||
CONST CHAR16 *Param1;
|
||||
CONST CHAR16 *Param2;
|
||||
UINTN Count;
|
||||
EFI_HANDLE Handle1;
|
||||
EFI_HANDLE Handle2;
|
||||
UINT64 Intermediate;
|
||||
EFI_STATUS Status;
|
||||
LIST_ENTRY *Package;
|
||||
CHAR16 *ProblemParam;
|
||||
SHELL_STATUS ShellStatus;
|
||||
CONST CHAR16 *Param1;
|
||||
CONST CHAR16 *Param2;
|
||||
UINTN Count;
|
||||
EFI_HANDLE Handle1;
|
||||
EFI_HANDLE Handle2;
|
||||
UINT64 Intermediate;
|
||||
|
||||
ShellStatus = SHELL_SUCCESS;
|
||||
ShellStatus = SHELL_SUCCESS;
|
||||
//
|
||||
// initialize the shell lib (we must be in non-auto-init...)
|
||||
//
|
||||
Status = ShellInitialize();
|
||||
ASSERT_EFI_ERROR(Status);
|
||||
Status = ShellInitialize ();
|
||||
ASSERT_EFI_ERROR (Status);
|
||||
|
||||
Status = CommandInit();
|
||||
ASSERT_EFI_ERROR(Status);
|
||||
Status = CommandInit ();
|
||||
ASSERT_EFI_ERROR (Status);
|
||||
|
||||
//
|
||||
// parse the command line
|
||||
//
|
||||
Status = ShellCommandLineParse (ParamList, &Package, &ProblemParam, TRUE);
|
||||
if (EFI_ERROR(Status)) {
|
||||
if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, L"connect", ProblemParam);
|
||||
FreePool(ProblemParam);
|
||||
if (EFI_ERROR (Status)) {
|
||||
if ((Status == EFI_VOLUME_CORRUPTED) && (ProblemParam != NULL)) {
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, L"connect", ProblemParam);
|
||||
FreePool (ProblemParam);
|
||||
ShellStatus = SHELL_INVALID_PARAMETER;
|
||||
} else {
|
||||
ASSERT(FALSE);
|
||||
ASSERT (FALSE);
|
||||
}
|
||||
} else {
|
||||
//
|
||||
// if more than 2 'value' parameters (plus the name one) or either -r or -c with any value parameters we have too many parameters
|
||||
//
|
||||
Count = (gInReconnect?0x4:0x3);
|
||||
if ((ShellCommandLineGetCount(Package) > Count)
|
||||
||(ShellCommandLineGetFlag(Package, L"-c") && ShellCommandLineGetCount(Package)>1)
|
||||
||(ShellCommandLineGetFlag(Package, L"-r") && ShellCommandLineGetCount(Package)>2)
|
||||
||(ShellCommandLineGetFlag(Package, L"-r") && ShellCommandLineGetFlag(Package, L"-c") )
|
||||
){
|
||||
Count = (gInReconnect ? 0x4 : 0x3);
|
||||
if ( (ShellCommandLineGetCount (Package) > Count)
|
||||
|| (ShellCommandLineGetFlag (Package, L"-c") && (ShellCommandLineGetCount (Package) > 1))
|
||||
|| (ShellCommandLineGetFlag (Package, L"-r") && (ShellCommandLineGetCount (Package) > 2))
|
||||
|| (ShellCommandLineGetFlag (Package, L"-r") && ShellCommandLineGetFlag (Package, L"-c"))
|
||||
)
|
||||
{
|
||||
//
|
||||
// error for too many parameters
|
||||
//
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"connect");
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"connect");
|
||||
ShellStatus = SHELL_INVALID_PARAMETER;
|
||||
} else if (ShellCommandLineGetFlag(Package, L"-c")) {
|
||||
} else if (ShellCommandLineGetFlag (Package, L"-c")) {
|
||||
//
|
||||
// do the conin and conout from EFI variables
|
||||
// if the first fails dont 'loose' the error
|
||||
//
|
||||
Status = ShellConnectFromDevPaths(L"ConInDev");
|
||||
if (EFI_ERROR(Status)) {
|
||||
ShellConnectFromDevPaths(L"ConOutDev");
|
||||
Status = ShellConnectFromDevPaths (L"ConInDev");
|
||||
if (EFI_ERROR (Status)) {
|
||||
ShellConnectFromDevPaths (L"ConOutDev");
|
||||
} else {
|
||||
Status = ShellConnectFromDevPaths(L"ConOutDev");
|
||||
Status = ShellConnectFromDevPaths (L"ConOutDev");
|
||||
}
|
||||
if (EFI_ERROR(Status)) {
|
||||
ShellConnectFromDevPaths(L"ErrOutDev");
|
||||
|
||||
if (EFI_ERROR (Status)) {
|
||||
ShellConnectFromDevPaths (L"ErrOutDev");
|
||||
} else {
|
||||
Status = ShellConnectFromDevPaths(L"ErrOutDev");
|
||||
Status = ShellConnectFromDevPaths (L"ErrOutDev");
|
||||
}
|
||||
if (EFI_ERROR(Status)) {
|
||||
ShellConnectFromDevPaths(L"ErrOut");
|
||||
|
||||
if (EFI_ERROR (Status)) {
|
||||
ShellConnectFromDevPaths (L"ErrOut");
|
||||
} else {
|
||||
Status = ShellConnectFromDevPaths(L"ErrOut");
|
||||
Status = ShellConnectFromDevPaths (L"ErrOut");
|
||||
}
|
||||
if (EFI_ERROR(Status)) {
|
||||
ShellConnectFromDevPaths(L"ConIn");
|
||||
|
||||
if (EFI_ERROR (Status)) {
|
||||
ShellConnectFromDevPaths (L"ConIn");
|
||||
} else {
|
||||
Status = ShellConnectFromDevPaths(L"ConIn");
|
||||
Status = ShellConnectFromDevPaths (L"ConIn");
|
||||
}
|
||||
if (EFI_ERROR(Status)) {
|
||||
ShellConnectFromDevPaths(L"ConOut");
|
||||
|
||||
if (EFI_ERROR (Status)) {
|
||||
ShellConnectFromDevPaths (L"ConOut");
|
||||
} else {
|
||||
Status = ShellConnectFromDevPaths(L"ConOut");
|
||||
Status = ShellConnectFromDevPaths (L"ConOut");
|
||||
}
|
||||
if (EFI_ERROR(Status)) {
|
||||
|
||||
if (EFI_ERROR (Status)) {
|
||||
ShellStatus = SHELL_DEVICE_ERROR;
|
||||
}
|
||||
} else {
|
||||
//
|
||||
// 0, 1, or 2 specific handles and possibly recursive
|
||||
//
|
||||
Param1 = ShellCommandLineGetRawValue(Package, 1);
|
||||
Param2 = ShellCommandLineGetRawValue(Package, 2);
|
||||
Count = ShellCommandLineGetCount(Package);
|
||||
Param1 = ShellCommandLineGetRawValue (Package, 1);
|
||||
Param2 = ShellCommandLineGetRawValue (Package, 2);
|
||||
Count = ShellCommandLineGetCount (Package);
|
||||
|
||||
if (Param1 != NULL) {
|
||||
Status = ShellConvertStringToUint64(Param1, &Intermediate, TRUE, FALSE);
|
||||
Handle1 = ConvertHandleIndexToHandle((UINTN)Intermediate);
|
||||
if (EFI_ERROR(Status)) {
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"connect", Param1);
|
||||
Status = ShellConvertStringToUint64 (Param1, &Intermediate, TRUE, FALSE);
|
||||
Handle1 = ConvertHandleIndexToHandle ((UINTN)Intermediate);
|
||||
if (EFI_ERROR (Status)) {
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"connect", Param1);
|
||||
ShellStatus = SHELL_INVALID_PARAMETER;
|
||||
}
|
||||
} else {
|
||||
@ -506,10 +519,10 @@ ShellCommandRunConnect (
|
||||
}
|
||||
|
||||
if (Param2 != NULL) {
|
||||
Status = ShellConvertStringToUint64(Param2, &Intermediate, TRUE, FALSE);
|
||||
Handle2 = ConvertHandleIndexToHandle((UINTN)Intermediate);
|
||||
if (EFI_ERROR(Status)) {
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"connect", Param2);
|
||||
Status = ShellConvertStringToUint64 (Param2, &Intermediate, TRUE, FALSE);
|
||||
Handle2 = ConvertHandleIndexToHandle ((UINTN)Intermediate);
|
||||
if (EFI_ERROR (Status)) {
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"connect", Param2);
|
||||
ShellStatus = SHELL_INVALID_PARAMETER;
|
||||
}
|
||||
} else {
|
||||
@ -517,19 +530,19 @@ ShellCommandRunConnect (
|
||||
}
|
||||
|
||||
if (ShellStatus == SHELL_SUCCESS) {
|
||||
if (Param1 != NULL && Handle1 == NULL){
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"connect", Param1);
|
||||
if ((Param1 != NULL) && (Handle1 == NULL)) {
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"connect", Param1);
|
||||
ShellStatus = SHELL_INVALID_PARAMETER;
|
||||
} else if (Param2 != NULL && Handle2 == NULL) {
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"connect", Param2);
|
||||
} else if ((Param2 != NULL) && (Handle2 == NULL)) {
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"connect", Param2);
|
||||
ShellStatus = SHELL_INVALID_PARAMETER;
|
||||
} else if (Handle2 != NULL && Handle1 != NULL && EFI_ERROR(gBS->OpenProtocol(Handle2, &gEfiDriverBindingProtocolGuid, NULL, gImageHandle, NULL, EFI_OPEN_PROTOCOL_TEST_PROTOCOL))) {
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"connect", Param2);
|
||||
} else if ((Handle2 != NULL) && (Handle1 != NULL) && EFI_ERROR (gBS->OpenProtocol (Handle2, &gEfiDriverBindingProtocolGuid, NULL, gImageHandle, NULL, EFI_OPEN_PROTOCOL_TEST_PROTOCOL))) {
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"connect", Param2);
|
||||
ShellStatus = SHELL_INVALID_PARAMETER;
|
||||
} else {
|
||||
Status = ConvertAndConnectControllers(Handle1, Handle2, ShellCommandLineGetFlag(Package, L"-r"), (BOOLEAN)(Count!=0));
|
||||
if (EFI_ERROR(Status)) {
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_CONNECT_NONE), gShellDriver1HiiHandle);
|
||||
Status = ConvertAndConnectControllers (Handle1, Handle2, ShellCommandLineGetFlag (Package, L"-r"), (BOOLEAN)(Count != 0));
|
||||
if (EFI_ERROR (Status)) {
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_CONNECT_NONE), gShellDriver1HiiHandle);
|
||||
ShellStatus = SHELL_DEVICE_ERROR;
|
||||
}
|
||||
}
|
||||
@ -538,6 +551,6 @@ ShellCommandRunConnect (
|
||||
|
||||
ShellCommandLineFreeVarList (Package);
|
||||
}
|
||||
|
||||
return (ShellStatus);
|
||||
}
|
||||
|
||||
|
||||
@ -9,11 +9,11 @@
|
||||
|
||||
#include "UefiShellDriver1CommandsLib.h"
|
||||
|
||||
STATIC CONST SHELL_PARAM_ITEM ParamList[] = {
|
||||
{L"-d", TypeFlag},
|
||||
{L"-l", TypeValue},
|
||||
{NULL, TypeMax}
|
||||
};
|
||||
STATIC CONST SHELL_PARAM_ITEM ParamList[] = {
|
||||
{ L"-d", TypeFlag },
|
||||
{ L"-l", TypeValue },
|
||||
{ NULL, TypeMax }
|
||||
};
|
||||
|
||||
/**
|
||||
Display a tree starting from this handle.
|
||||
@ -28,32 +28,32 @@ STATIC CONST SHELL_PARAM_ITEM ParamList[] = {
|
||||
@retval SHELL_SUCCESS The operation was successful.
|
||||
**/
|
||||
SHELL_STATUS
|
||||
DoDevTreeForHandle(
|
||||
IN CONST EFI_HANDLE TheHandle,
|
||||
IN CONST CHAR8 *Lang OPTIONAL,
|
||||
IN CONST BOOLEAN UseDevPaths,
|
||||
IN CONST UINTN IndentCharCount,
|
||||
IN CONST CHAR16 *HiiString
|
||||
DoDevTreeForHandle (
|
||||
IN CONST EFI_HANDLE TheHandle,
|
||||
IN CONST CHAR8 *Lang OPTIONAL,
|
||||
IN CONST BOOLEAN UseDevPaths,
|
||||
IN CONST UINTN IndentCharCount,
|
||||
IN CONST CHAR16 *HiiString
|
||||
)
|
||||
{
|
||||
SHELL_STATUS ShellStatus;
|
||||
EFI_STATUS Status;
|
||||
CHAR16 *FormatString;
|
||||
CHAR16 *Name;
|
||||
EFI_HANDLE *ChildHandleBuffer;
|
||||
UINTN ChildCount;
|
||||
UINTN LoopVar;
|
||||
SHELL_STATUS ShellStatus;
|
||||
EFI_STATUS Status;
|
||||
CHAR16 *FormatString;
|
||||
CHAR16 *Name;
|
||||
EFI_HANDLE *ChildHandleBuffer;
|
||||
UINTN ChildCount;
|
||||
UINTN LoopVar;
|
||||
|
||||
Status = EFI_SUCCESS;
|
||||
ShellStatus = SHELL_SUCCESS;
|
||||
Name = NULL;
|
||||
ChildHandleBuffer = NULL;
|
||||
ChildCount = 0;
|
||||
Status = EFI_SUCCESS;
|
||||
ShellStatus = SHELL_SUCCESS;
|
||||
Name = NULL;
|
||||
ChildHandleBuffer = NULL;
|
||||
ChildCount = 0;
|
||||
|
||||
ASSERT (TheHandle != NULL);
|
||||
ASSERT (HiiString != NULL);
|
||||
|
||||
if (ShellGetExecutionBreakFlag()) {
|
||||
if (ShellGetExecutionBreakFlag ()) {
|
||||
ShellStatus = SHELL_ABORTED;
|
||||
return ShellStatus;
|
||||
}
|
||||
@ -62,30 +62,30 @@ DoDevTreeForHandle(
|
||||
// We want controller handles. they will not have LoadedImage or DriverBinding (or others...)
|
||||
//
|
||||
Status = gBS->OpenProtocol (
|
||||
TheHandle,
|
||||
&gEfiDriverBindingProtocolGuid,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
EFI_OPEN_PROTOCOL_TEST_PROTOCOL
|
||||
);
|
||||
TheHandle,
|
||||
&gEfiDriverBindingProtocolGuid,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
EFI_OPEN_PROTOCOL_TEST_PROTOCOL
|
||||
);
|
||||
if (!EFI_ERROR (Status)) {
|
||||
return SHELL_SUCCESS;
|
||||
}
|
||||
|
||||
Status = gBS->OpenProtocol (
|
||||
TheHandle,
|
||||
&gEfiLoadedImageProtocolGuid,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
EFI_OPEN_PROTOCOL_TEST_PROTOCOL
|
||||
);
|
||||
TheHandle,
|
||||
&gEfiLoadedImageProtocolGuid,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
EFI_OPEN_PROTOCOL_TEST_PROTOCOL
|
||||
);
|
||||
if (!EFI_ERROR (Status)) {
|
||||
return SHELL_SUCCESS;
|
||||
}
|
||||
|
||||
FormatString = AllocateZeroPool(StrSize(HiiString) + (10)*sizeof(FormatString[0]));
|
||||
FormatString = AllocateZeroPool (StrSize (HiiString) + (10)*sizeof (FormatString[0]));
|
||||
if (FormatString == NULL) {
|
||||
return SHELL_OUT_OF_RESOURCES;
|
||||
}
|
||||
@ -96,37 +96,38 @@ DoDevTreeForHandle(
|
||||
// handles the indenting.
|
||||
//
|
||||
|
||||
UnicodeSPrint(FormatString, StrSize(HiiString) + (10)*sizeof(FormatString[0]), L"%%%ds %s", IndentCharCount, HiiString);
|
||||
gEfiShellProtocol->GetDeviceName((EFI_HANDLE)TheHandle, !UseDevPaths?EFI_DEVICE_NAME_USE_COMPONENT_NAME|EFI_DEVICE_NAME_USE_DEVICE_PATH:EFI_DEVICE_NAME_USE_DEVICE_PATH, (CHAR8*)Lang, &Name);
|
||||
UnicodeSPrint (FormatString, StrSize (HiiString) + (10)*sizeof (FormatString[0]), L"%%%ds %s", IndentCharCount, HiiString);
|
||||
gEfiShellProtocol->GetDeviceName ((EFI_HANDLE)TheHandle, !UseDevPaths ? EFI_DEVICE_NAME_USE_COMPONENT_NAME|EFI_DEVICE_NAME_USE_DEVICE_PATH : EFI_DEVICE_NAME_USE_DEVICE_PATH, (CHAR8 *)Lang, &Name);
|
||||
//
|
||||
// print out the information for ourselves
|
||||
//
|
||||
ShellPrintEx(
|
||||
ShellPrintEx (
|
||||
-1,
|
||||
-1,
|
||||
FormatString,
|
||||
L"",
|
||||
ConvertHandleToHandleIndex(TheHandle),
|
||||
Name==NULL?L"Unknown":Name);
|
||||
ConvertHandleToHandleIndex (TheHandle),
|
||||
Name == NULL ? L"Unknown" : Name
|
||||
);
|
||||
|
||||
FreePool(FormatString);
|
||||
FreePool (FormatString);
|
||||
if (Name != NULL) {
|
||||
FreePool(Name);
|
||||
FreePool (Name);
|
||||
}
|
||||
|
||||
//
|
||||
// recurse on each child handle with IndentCharCount + 2
|
||||
//
|
||||
ParseHandleDatabaseForChildControllers(TheHandle, &ChildCount, &ChildHandleBuffer);
|
||||
for (LoopVar = 0 ; LoopVar < ChildCount && ShellStatus == SHELL_SUCCESS; LoopVar++){
|
||||
ShellStatus = DoDevTreeForHandle(ChildHandleBuffer[LoopVar], Lang, UseDevPaths, IndentCharCount+2, HiiString);
|
||||
ParseHandleDatabaseForChildControllers (TheHandle, &ChildCount, &ChildHandleBuffer);
|
||||
for (LoopVar = 0; LoopVar < ChildCount && ShellStatus == SHELL_SUCCESS; LoopVar++) {
|
||||
ShellStatus = DoDevTreeForHandle (ChildHandleBuffer[LoopVar], Lang, UseDevPaths, IndentCharCount+2, HiiString);
|
||||
if (ShellStatus == SHELL_ABORTED) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (ChildHandleBuffer != NULL) {
|
||||
FreePool(ChildHandleBuffer);
|
||||
FreePool (ChildHandleBuffer);
|
||||
}
|
||||
|
||||
return (ShellStatus);
|
||||
@ -145,74 +146,76 @@ ShellCommandRunDevTree (
|
||||
IN EFI_SYSTEM_TABLE *SystemTable
|
||||
)
|
||||
{
|
||||
EFI_STATUS Status;
|
||||
LIST_ENTRY *Package;
|
||||
CHAR16 *ProblemParam;
|
||||
SHELL_STATUS ShellStatus;
|
||||
CHAR8 *Language;
|
||||
CONST CHAR16 *Lang;
|
||||
CHAR16 *HiiString;
|
||||
UINTN LoopVar;
|
||||
EFI_HANDLE TheHandle;
|
||||
BOOLEAN FlagD;
|
||||
UINT64 Intermediate;
|
||||
UINTN ParentControllerHandleCount;
|
||||
EFI_HANDLE *ParentControllerHandleBuffer;
|
||||
EFI_STATUS Status;
|
||||
LIST_ENTRY *Package;
|
||||
CHAR16 *ProblemParam;
|
||||
SHELL_STATUS ShellStatus;
|
||||
CHAR8 *Language;
|
||||
CONST CHAR16 *Lang;
|
||||
CHAR16 *HiiString;
|
||||
UINTN LoopVar;
|
||||
EFI_HANDLE TheHandle;
|
||||
BOOLEAN FlagD;
|
||||
UINT64 Intermediate;
|
||||
UINTN ParentControllerHandleCount;
|
||||
EFI_HANDLE *ParentControllerHandleBuffer;
|
||||
|
||||
ShellStatus = SHELL_SUCCESS;
|
||||
Status = EFI_SUCCESS;
|
||||
Language = NULL;
|
||||
ShellStatus = SHELL_SUCCESS;
|
||||
Status = EFI_SUCCESS;
|
||||
Language = NULL;
|
||||
|
||||
//
|
||||
// initialize the shell lib (we must be in non-auto-init...)
|
||||
//
|
||||
Status = ShellInitialize();
|
||||
ASSERT_EFI_ERROR(Status);
|
||||
Status = ShellInitialize ();
|
||||
ASSERT_EFI_ERROR (Status);
|
||||
|
||||
Status = CommandInit();
|
||||
ASSERT_EFI_ERROR(Status);
|
||||
Status = CommandInit ();
|
||||
ASSERT_EFI_ERROR (Status);
|
||||
|
||||
//
|
||||
// parse the command line
|
||||
//
|
||||
Status = ShellCommandLineParse (ParamList, &Package, &ProblemParam, TRUE);
|
||||
if (EFI_ERROR(Status)) {
|
||||
if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, L"devtree", ProblemParam);
|
||||
FreePool(ProblemParam);
|
||||
if (EFI_ERROR (Status)) {
|
||||
if ((Status == EFI_VOLUME_CORRUPTED) && (ProblemParam != NULL)) {
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, L"devtree", ProblemParam);
|
||||
FreePool (ProblemParam);
|
||||
ShellStatus = SHELL_INVALID_PARAMETER;
|
||||
} else {
|
||||
ASSERT(FALSE);
|
||||
ASSERT (FALSE);
|
||||
}
|
||||
} else {
|
||||
if (ShellCommandLineGetCount(Package) > 2) {
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"devtree");
|
||||
if (ShellCommandLineGetCount (Package) > 2) {
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"devtree");
|
||||
ShellCommandLineFreeVarList (Package);
|
||||
return (SHELL_INVALID_PARAMETER);
|
||||
}
|
||||
Lang = ShellCommandLineGetValue(Package, L"-l");
|
||||
if (Lang != NULL) {
|
||||
Language = AllocateZeroPool(StrSize(Lang));
|
||||
AsciiSPrint(Language, StrSize(Lang), "%S", Lang);
|
||||
} else if (!ShellCommandLineGetFlag(Package, L"-l")){
|
||||
ASSERT(Language == NULL);
|
||||
// Language = AllocateZeroPool(10);
|
||||
// AsciiSPrint(Language, 10, "en-us");
|
||||
} else {
|
||||
ASSERT(Language == NULL);
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"devtree", L"-l");
|
||||
ShellCommandLineFreeVarList (Package);
|
||||
return (SHELL_INVALID_PARAMETER);
|
||||
}
|
||||
FlagD = ShellCommandLineGetFlag(Package, L"-d");
|
||||
|
||||
Lang = ShellCommandLineGetRawValue(Package, 1);
|
||||
HiiString = HiiGetString(gShellDriver1HiiHandle, STRING_TOKEN (STR_DEV_TREE_OUTPUT), Language);
|
||||
Lang = ShellCommandLineGetValue (Package, L"-l");
|
||||
if (Lang != NULL) {
|
||||
Language = AllocateZeroPool (StrSize (Lang));
|
||||
AsciiSPrint (Language, StrSize (Lang), "%S", Lang);
|
||||
} else if (!ShellCommandLineGetFlag (Package, L"-l")) {
|
||||
ASSERT (Language == NULL);
|
||||
// Language = AllocateZeroPool(10);
|
||||
// AsciiSPrint(Language, 10, "en-us");
|
||||
} else {
|
||||
ASSERT (Language == NULL);
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"devtree", L"-l");
|
||||
ShellCommandLineFreeVarList (Package);
|
||||
return (SHELL_INVALID_PARAMETER);
|
||||
}
|
||||
|
||||
FlagD = ShellCommandLineGetFlag (Package, L"-d");
|
||||
|
||||
Lang = ShellCommandLineGetRawValue (Package, 1);
|
||||
HiiString = HiiGetString (gShellDriver1HiiHandle, STRING_TOKEN (STR_DEV_TREE_OUTPUT), Language);
|
||||
|
||||
if (Lang == NULL) {
|
||||
for (LoopVar = 1 ; ; LoopVar++){
|
||||
TheHandle = ConvertHandleIndexToHandle(LoopVar);
|
||||
if (TheHandle == NULL){
|
||||
for (LoopVar = 1; ; LoopVar++) {
|
||||
TheHandle = ConvertHandleIndexToHandle (LoopVar);
|
||||
if (TheHandle == NULL) {
|
||||
break;
|
||||
}
|
||||
|
||||
@ -220,13 +223,13 @@ ShellCommandRunDevTree (
|
||||
// Skip handles that do not have device path protocol
|
||||
//
|
||||
Status = gBS->OpenProtocol (
|
||||
TheHandle,
|
||||
&gEfiDevicePathProtocolGuid,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
EFI_OPEN_PROTOCOL_TEST_PROTOCOL
|
||||
);
|
||||
TheHandle,
|
||||
&gEfiDevicePathProtocolGuid,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
EFI_OPEN_PROTOCOL_TEST_PROTOCOL
|
||||
);
|
||||
if (EFI_ERROR (Status)) {
|
||||
continue;
|
||||
}
|
||||
@ -235,11 +238,11 @@ ShellCommandRunDevTree (
|
||||
// Skip handles that do have parents
|
||||
//
|
||||
ParentControllerHandleBuffer = NULL;
|
||||
Status = PARSE_HANDLE_DATABASE_PARENTS (
|
||||
TheHandle,
|
||||
&ParentControllerHandleCount,
|
||||
&ParentControllerHandleBuffer
|
||||
);
|
||||
Status = PARSE_HANDLE_DATABASE_PARENTS (
|
||||
TheHandle,
|
||||
&ParentControllerHandleCount,
|
||||
&ParentControllerHandleBuffer
|
||||
);
|
||||
SHELL_FREE_NON_NULL (ParentControllerHandleBuffer);
|
||||
if (ParentControllerHandleCount > 0) {
|
||||
continue;
|
||||
@ -248,22 +251,23 @@ ShellCommandRunDevTree (
|
||||
//
|
||||
// Start a devtree from TheHandle that has a device path and no parents
|
||||
//
|
||||
ShellStatus = DoDevTreeForHandle(TheHandle, Language, FlagD, 0, HiiString);
|
||||
ShellStatus = DoDevTreeForHandle (TheHandle, Language, FlagD, 0, HiiString);
|
||||
}
|
||||
} else {
|
||||
Status = ShellConvertStringToUint64(Lang, &Intermediate, TRUE, FALSE);
|
||||
if (EFI_ERROR(Status) || ConvertHandleIndexToHandle((UINTN)Intermediate) == NULL) {
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"devtree", Lang);
|
||||
Status = ShellConvertStringToUint64 (Lang, &Intermediate, TRUE, FALSE);
|
||||
if (EFI_ERROR (Status) || (ConvertHandleIndexToHandle ((UINTN)Intermediate) == NULL)) {
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"devtree", Lang);
|
||||
ShellStatus = SHELL_INVALID_PARAMETER;
|
||||
} else {
|
||||
ShellStatus = DoDevTreeForHandle(ConvertHandleIndexToHandle((UINTN)Intermediate), Language, FlagD, 0, HiiString);
|
||||
ShellStatus = DoDevTreeForHandle (ConvertHandleIndexToHandle ((UINTN)Intermediate), Language, FlagD, 0, HiiString);
|
||||
}
|
||||
}
|
||||
|
||||
if (HiiString != NULL) {
|
||||
FreePool(HiiString);
|
||||
FreePool (HiiString);
|
||||
}
|
||||
SHELL_FREE_NON_NULL(Language);
|
||||
|
||||
SHELL_FREE_NON_NULL (Language);
|
||||
ShellCommandLineFreeVarList (Package);
|
||||
}
|
||||
|
||||
|
||||
@ -48,70 +48,75 @@ GetDeviceHandleInfo (
|
||||
IN CONST CHAR8 *Language
|
||||
)
|
||||
{
|
||||
EFI_STATUS Status;
|
||||
EFI_HANDLE *HandleBuffer;
|
||||
UINTN Count;
|
||||
EFI_STATUS Status;
|
||||
EFI_HANDLE *HandleBuffer;
|
||||
UINTN Count;
|
||||
|
||||
if (TheHandle == NULL
|
||||
|| Type == NULL
|
||||
|| Cfg == NULL
|
||||
|| Diag == NULL
|
||||
|| Parents == NULL
|
||||
|| Devices == NULL
|
||||
|| Children == NULL
|
||||
|| Name == NULL ) {
|
||||
if ( (TheHandle == NULL)
|
||||
|| (Type == NULL)
|
||||
|| (Cfg == NULL)
|
||||
|| (Diag == NULL)
|
||||
|| (Parents == NULL)
|
||||
|| (Devices == NULL)
|
||||
|| (Children == NULL)
|
||||
|| (Name == NULL))
|
||||
{
|
||||
return (EFI_INVALID_PARAMETER);
|
||||
}
|
||||
|
||||
*Cfg = FALSE;
|
||||
*Diag = FALSE;
|
||||
*Children = 0;
|
||||
*Parents = 0;
|
||||
*Devices = 0;
|
||||
*Type = L' ';
|
||||
*Name = CHAR_NULL;
|
||||
HandleBuffer = NULL;
|
||||
Status = EFI_SUCCESS;
|
||||
*Cfg = FALSE;
|
||||
*Diag = FALSE;
|
||||
*Children = 0;
|
||||
*Parents = 0;
|
||||
*Devices = 0;
|
||||
*Type = L' ';
|
||||
*Name = CHAR_NULL;
|
||||
HandleBuffer = NULL;
|
||||
Status = EFI_SUCCESS;
|
||||
|
||||
gEfiShellProtocol->GetDeviceName(TheHandle, EFI_DEVICE_NAME_USE_COMPONENT_NAME|EFI_DEVICE_NAME_USE_DEVICE_PATH, (CHAR8*)Language, Name);
|
||||
gEfiShellProtocol->GetDeviceName (TheHandle, EFI_DEVICE_NAME_USE_COMPONENT_NAME|EFI_DEVICE_NAME_USE_DEVICE_PATH, (CHAR8 *)Language, Name);
|
||||
|
||||
Status = ParseHandleDatabaseForChildControllers(TheHandle, Children, NULL);
|
||||
// if (!EFI_ERROR(Status)) {
|
||||
Status = PARSE_HANDLE_DATABASE_PARENTS(TheHandle, Parents, NULL);
|
||||
if (/*!EFI_ERROR(Status) && */Parents != NULL && Children != NULL) {
|
||||
if (*Parents == 0) {
|
||||
*Type = L'R';
|
||||
} else if (*Children > 0) {
|
||||
*Type = L'B';
|
||||
} else {
|
||||
*Type = L'D';
|
||||
}
|
||||
Status = ParseHandleDatabaseForChildControllers (TheHandle, Children, NULL);
|
||||
// if (!EFI_ERROR(Status)) {
|
||||
Status = PARSE_HANDLE_DATABASE_PARENTS (TheHandle, Parents, NULL);
|
||||
if (/*!EFI_ERROR(Status) && */ (Parents != NULL) && (Children != NULL)) {
|
||||
if (*Parents == 0) {
|
||||
*Type = L'R';
|
||||
} else if (*Children > 0) {
|
||||
*Type = L'B';
|
||||
} else {
|
||||
*Type = L'D';
|
||||
}
|
||||
// }
|
||||
Status = PARSE_HANDLE_DATABASE_UEFI_DRIVERS(TheHandle, Devices, &HandleBuffer);
|
||||
if (!EFI_ERROR(Status) && Devices != NULL && HandleBuffer != NULL) {
|
||||
for (Count = 0 ; Count < *Devices ; Count++) {
|
||||
if (!EFI_ERROR(gBS->OpenProtocol(HandleBuffer[Count], &gEfiDriverConfigurationProtocolGuid, NULL, NULL, gImageHandle, EFI_OPEN_PROTOCOL_TEST_PROTOCOL))) {
|
||||
}
|
||||
|
||||
// }
|
||||
Status = PARSE_HANDLE_DATABASE_UEFI_DRIVERS (TheHandle, Devices, &HandleBuffer);
|
||||
if (!EFI_ERROR (Status) && (Devices != NULL) && (HandleBuffer != NULL)) {
|
||||
for (Count = 0; Count < *Devices; Count++) {
|
||||
if (!EFI_ERROR (gBS->OpenProtocol (HandleBuffer[Count], &gEfiDriverConfigurationProtocolGuid, NULL, NULL, gImageHandle, EFI_OPEN_PROTOCOL_TEST_PROTOCOL))) {
|
||||
*Cfg = TRUE;
|
||||
}
|
||||
if (!EFI_ERROR(gBS->OpenProtocol(HandleBuffer[Count], &gEfiDriverDiagnosticsProtocolGuid, NULL, NULL, gImageHandle, EFI_OPEN_PROTOCOL_TEST_PROTOCOL))) {
|
||||
|
||||
if (!EFI_ERROR (gBS->OpenProtocol (HandleBuffer[Count], &gEfiDriverDiagnosticsProtocolGuid, NULL, NULL, gImageHandle, EFI_OPEN_PROTOCOL_TEST_PROTOCOL))) {
|
||||
*Diag = TRUE;
|
||||
}
|
||||
if (!EFI_ERROR(gBS->OpenProtocol(HandleBuffer[Count], &gEfiDriverDiagnostics2ProtocolGuid, NULL, NULL, gImageHandle, EFI_OPEN_PROTOCOL_TEST_PROTOCOL))) {
|
||||
|
||||
if (!EFI_ERROR (gBS->OpenProtocol (HandleBuffer[Count], &gEfiDriverDiagnostics2ProtocolGuid, NULL, NULL, gImageHandle, EFI_OPEN_PROTOCOL_TEST_PROTOCOL))) {
|
||||
*Diag = TRUE;
|
||||
}
|
||||
}
|
||||
SHELL_FREE_NON_NULL(HandleBuffer);
|
||||
|
||||
SHELL_FREE_NON_NULL (HandleBuffer);
|
||||
}
|
||||
|
||||
return (Status);
|
||||
}
|
||||
|
||||
STATIC CONST SHELL_PARAM_ITEM ParamList[] = {
|
||||
{L"-sfo", TypeFlag},
|
||||
{L"-l", TypeValue},
|
||||
{NULL, TypeMax}
|
||||
};
|
||||
STATIC CONST SHELL_PARAM_ITEM ParamList[] = {
|
||||
{ L"-sfo", TypeFlag },
|
||||
{ L"-l", TypeValue },
|
||||
{ NULL, TypeMax }
|
||||
};
|
||||
|
||||
/**
|
||||
Function for 'devices' command.
|
||||
@ -126,78 +131,77 @@ ShellCommandRunDevices (
|
||||
IN EFI_SYSTEM_TABLE *SystemTable
|
||||
)
|
||||
{
|
||||
EFI_STATUS Status;
|
||||
LIST_ENTRY *Package;
|
||||
CHAR16 *ProblemParam;
|
||||
SHELL_STATUS ShellStatus;
|
||||
CHAR8 *Language;
|
||||
EFI_HANDLE *HandleList;
|
||||
EFI_HANDLE *HandleListWalker;
|
||||
CHAR16 Type;
|
||||
BOOLEAN Cfg;
|
||||
BOOLEAN Diag;
|
||||
UINTN Parents;
|
||||
UINTN Devices;
|
||||
UINTN Children;
|
||||
CHAR16 *Name;
|
||||
CONST CHAR16 *Lang;
|
||||
BOOLEAN SfoFlag;
|
||||
EFI_STATUS Status;
|
||||
LIST_ENTRY *Package;
|
||||
CHAR16 *ProblemParam;
|
||||
SHELL_STATUS ShellStatus;
|
||||
CHAR8 *Language;
|
||||
EFI_HANDLE *HandleList;
|
||||
EFI_HANDLE *HandleListWalker;
|
||||
CHAR16 Type;
|
||||
BOOLEAN Cfg;
|
||||
BOOLEAN Diag;
|
||||
UINTN Parents;
|
||||
UINTN Devices;
|
||||
UINTN Children;
|
||||
CHAR16 *Name;
|
||||
CONST CHAR16 *Lang;
|
||||
BOOLEAN SfoFlag;
|
||||
|
||||
ShellStatus = SHELL_SUCCESS;
|
||||
Language = NULL;
|
||||
SfoFlag = FALSE;
|
||||
ShellStatus = SHELL_SUCCESS;
|
||||
Language = NULL;
|
||||
SfoFlag = FALSE;
|
||||
|
||||
//
|
||||
// initialize the shell lib (we must be in non-auto-init...)
|
||||
//
|
||||
Status = ShellInitialize();
|
||||
ASSERT_EFI_ERROR(Status);
|
||||
Status = ShellInitialize ();
|
||||
ASSERT_EFI_ERROR (Status);
|
||||
|
||||
Status = CommandInit();
|
||||
ASSERT_EFI_ERROR(Status);
|
||||
Status = CommandInit ();
|
||||
ASSERT_EFI_ERROR (Status);
|
||||
|
||||
//
|
||||
// parse the command line
|
||||
//
|
||||
Status = ShellCommandLineParse (ParamList, &Package, &ProblemParam, TRUE);
|
||||
if (EFI_ERROR(Status)) {
|
||||
if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, L"devices", ProblemParam);
|
||||
FreePool(ProblemParam);
|
||||
if (EFI_ERROR (Status)) {
|
||||
if ((Status == EFI_VOLUME_CORRUPTED) && (ProblemParam != NULL)) {
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, L"devices", ProblemParam);
|
||||
FreePool (ProblemParam);
|
||||
ShellStatus = SHELL_INVALID_PARAMETER;
|
||||
} else {
|
||||
ASSERT(FALSE);
|
||||
ASSERT (FALSE);
|
||||
}
|
||||
} else {
|
||||
//
|
||||
// if more than 0 'value' parameters we have too many parameters
|
||||
//
|
||||
if (ShellCommandLineGetRawValue(Package, 1) != NULL){
|
||||
if (ShellCommandLineGetRawValue (Package, 1) != NULL) {
|
||||
//
|
||||
// error for too many parameters
|
||||
//
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"devices");
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"devices");
|
||||
ShellStatus = SHELL_INVALID_PARAMETER;
|
||||
} else {
|
||||
//
|
||||
// get the language if necessary
|
||||
//
|
||||
Lang = ShellCommandLineGetValue(Package, L"-l");
|
||||
Lang = ShellCommandLineGetValue (Package, L"-l");
|
||||
if (Lang != NULL) {
|
||||
Language = AllocateZeroPool(StrSize(Lang));
|
||||
AsciiSPrint(Language, StrSize(Lang), "%S", Lang);
|
||||
} else if (!ShellCommandLineGetFlag(Package, L"-l")){
|
||||
ASSERT(Language == NULL);
|
||||
// Language = AllocateZeroPool(10);
|
||||
// AsciiSPrint(Language, 10, "en-us");
|
||||
Language = AllocateZeroPool (StrSize (Lang));
|
||||
AsciiSPrint (Language, StrSize (Lang), "%S", Lang);
|
||||
} else if (!ShellCommandLineGetFlag (Package, L"-l")) {
|
||||
ASSERT (Language == NULL);
|
||||
// Language = AllocateZeroPool(10);
|
||||
// AsciiSPrint(Language, 10, "en-us");
|
||||
} else {
|
||||
ASSERT(Language == NULL);
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"devices", L"-l");
|
||||
ASSERT (Language == NULL);
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"devices", L"-l");
|
||||
ShellCommandLineFreeVarList (Package);
|
||||
return (SHELL_INVALID_PARAMETER);
|
||||
}
|
||||
|
||||
|
||||
//
|
||||
// Print Header
|
||||
|
||||
@ -212,52 +216,54 @@ ShellCommandRunDevices (
|
||||
//
|
||||
// loop through each handle
|
||||
//
|
||||
HandleList = GetHandleListByProtocol(NULL);
|
||||
ASSERT(HandleList != NULL);
|
||||
HandleList = GetHandleListByProtocol (NULL);
|
||||
ASSERT (HandleList != NULL);
|
||||
for (HandleListWalker = HandleList
|
||||
; HandleListWalker != NULL && *HandleListWalker != NULL /*&& !EFI_ERROR(Status)*/
|
||||
; HandleListWalker++
|
||||
){
|
||||
|
||||
; HandleListWalker != NULL && *HandleListWalker != NULL /*&& !EFI_ERROR(Status)*/
|
||||
; HandleListWalker++
|
||||
)
|
||||
{
|
||||
//
|
||||
// get all the info on each handle
|
||||
//
|
||||
Name = NULL;
|
||||
Status = GetDeviceHandleInfo(*HandleListWalker, &Type, &Cfg, &Diag, &Parents, &Devices, &Children, &Name, Language);
|
||||
if (Name != NULL && (Parents != 0 || Devices != 0 || Children != 0)) {
|
||||
Name = NULL;
|
||||
Status = GetDeviceHandleInfo (*HandleListWalker, &Type, &Cfg, &Diag, &Parents, &Devices, &Children, &Name, Language);
|
||||
if ((Name != NULL) && ((Parents != 0) || (Devices != 0) || (Children != 0))) {
|
||||
ShellPrintHiiEx (
|
||||
-1,
|
||||
-1,
|
||||
Language,
|
||||
SfoFlag?STRING_TOKEN (STR_DEVICES_ITEM_LINE_SFO):STRING_TOKEN (STR_DEVICES_ITEM_LINE),
|
||||
SfoFlag ? STRING_TOKEN (STR_DEVICES_ITEM_LINE_SFO) : STRING_TOKEN (STR_DEVICES_ITEM_LINE),
|
||||
gShellDriver1HiiHandle,
|
||||
ConvertHandleToHandleIndex (*HandleListWalker),
|
||||
Type,
|
||||
Cfg?(SfoFlag?L'Y':L'X'):(SfoFlag?L'N':L'-'),
|
||||
Diag?(SfoFlag?L'Y':L'X'):(SfoFlag?L'N':L'-'),
|
||||
Cfg ? (SfoFlag ? L'Y' : L'X') : (SfoFlag ? L'N' : L'-'),
|
||||
Diag ? (SfoFlag ? L'Y' : L'X') : (SfoFlag ? L'N' : L'-'),
|
||||
Parents,
|
||||
Devices,
|
||||
Children,
|
||||
Name!=NULL?Name:L"<UNKNOWN>");
|
||||
Name != NULL ? Name : L"<UNKNOWN>"
|
||||
);
|
||||
}
|
||||
|
||||
if (Name != NULL) {
|
||||
FreePool(Name);
|
||||
FreePool (Name);
|
||||
}
|
||||
|
||||
if (ShellGetExecutionBreakFlag ()) {
|
||||
ShellStatus = SHELL_ABORTED;
|
||||
break;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if (HandleList != NULL) {
|
||||
FreePool(HandleList);
|
||||
FreePool (HandleList);
|
||||
}
|
||||
|
||||
}
|
||||
SHELL_FREE_NON_NULL(Language);
|
||||
|
||||
SHELL_FREE_NON_NULL (Language);
|
||||
ShellCommandLineFreeVarList (Package);
|
||||
}
|
||||
|
||||
return (ShellStatus);
|
||||
}
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -10,11 +10,11 @@
|
||||
|
||||
#include "UefiShellDriver1CommandsLib.h"
|
||||
|
||||
STATIC CONST SHELL_PARAM_ITEM ParamList[] = {
|
||||
{L"-r", TypeFlag},
|
||||
{L"-nc", TypeFlag},
|
||||
{NULL, TypeMax}
|
||||
};
|
||||
STATIC CONST SHELL_PARAM_ITEM ParamList[] = {
|
||||
{ L"-r", TypeFlag },
|
||||
{ L"-nc", TypeFlag },
|
||||
{ NULL, TypeMax }
|
||||
};
|
||||
|
||||
/**
|
||||
Disconnect everything.
|
||||
@ -22,7 +22,7 @@ STATIC CONST SHELL_PARAM_ITEM ParamList[] = {
|
||||
@retval EFI_SUCCESS The operation was successful.
|
||||
**/
|
||||
EFI_STATUS
|
||||
DisconnectAll(
|
||||
DisconnectAll (
|
||||
VOID
|
||||
)
|
||||
{
|
||||
@ -37,34 +37,37 @@ DisconnectAll(
|
||||
// The following example recusively disconnects all drivers from all
|
||||
// controllers in a platform.
|
||||
//
|
||||
EFI_STATUS Status;
|
||||
// EFI_BOOT_SERVICES *gBS;
|
||||
UINTN HandleCount;
|
||||
EFI_HANDLE *HandleBuffer;
|
||||
UINTN HandleIndex;
|
||||
EFI_STATUS Status;
|
||||
// EFI_BOOT_SERVICES *gBS;
|
||||
UINTN HandleCount;
|
||||
EFI_HANDLE *HandleBuffer;
|
||||
UINTN HandleIndex;
|
||||
|
||||
//
|
||||
// Retrieve the list of all handles from the handle database
|
||||
//
|
||||
Status = gBS->LocateHandleBuffer (
|
||||
AllHandles,
|
||||
NULL,
|
||||
NULL,
|
||||
&HandleCount,
|
||||
&HandleBuffer
|
||||
);
|
||||
AllHandles,
|
||||
NULL,
|
||||
NULL,
|
||||
&HandleCount,
|
||||
&HandleBuffer
|
||||
);
|
||||
if (!EFI_ERROR (Status)) {
|
||||
for (HandleIndex = 0; HandleIndex < HandleCount; HandleIndex++) {
|
||||
Status = gBS->DisconnectController (
|
||||
HandleBuffer[HandleIndex],
|
||||
NULL,
|
||||
NULL
|
||||
);
|
||||
HandleBuffer[HandleIndex],
|
||||
NULL,
|
||||
NULL
|
||||
);
|
||||
}
|
||||
gBS->FreePool(HandleBuffer);
|
||||
|
||||
gBS->FreePool (HandleBuffer);
|
||||
//
|
||||
// end of stealing
|
||||
//
|
||||
}
|
||||
|
||||
return (EFI_SUCCESS);
|
||||
}
|
||||
|
||||
@ -81,118 +84,120 @@ ShellCommandRunDisconnect (
|
||||
IN EFI_SYSTEM_TABLE *SystemTable
|
||||
)
|
||||
{
|
||||
EFI_STATUS Status;
|
||||
LIST_ENTRY *Package;
|
||||
CHAR16 *ProblemParam;
|
||||
SHELL_STATUS ShellStatus;
|
||||
CONST CHAR16 *Param1;
|
||||
CONST CHAR16 *Param2;
|
||||
CONST CHAR16 *Param3;
|
||||
EFI_HANDLE Handle1;
|
||||
EFI_HANDLE Handle2;
|
||||
EFI_HANDLE Handle3;
|
||||
UINT64 Intermediate1;
|
||||
UINT64 Intermediate2;
|
||||
UINT64 Intermediate3;
|
||||
EFI_STATUS Status;
|
||||
LIST_ENTRY *Package;
|
||||
CHAR16 *ProblemParam;
|
||||
SHELL_STATUS ShellStatus;
|
||||
CONST CHAR16 *Param1;
|
||||
CONST CHAR16 *Param2;
|
||||
CONST CHAR16 *Param3;
|
||||
EFI_HANDLE Handle1;
|
||||
EFI_HANDLE Handle2;
|
||||
EFI_HANDLE Handle3;
|
||||
UINT64 Intermediate1;
|
||||
UINT64 Intermediate2;
|
||||
UINT64 Intermediate3;
|
||||
|
||||
ShellStatus = SHELL_SUCCESS;
|
||||
ShellStatus = SHELL_SUCCESS;
|
||||
|
||||
//
|
||||
// initialize the shell lib (we must be in non-auto-init...)
|
||||
//
|
||||
Status = ShellInitialize();
|
||||
ASSERT_EFI_ERROR(Status);
|
||||
Status = ShellInitialize ();
|
||||
ASSERT_EFI_ERROR (Status);
|
||||
|
||||
Status = CommandInit();
|
||||
ASSERT_EFI_ERROR(Status);
|
||||
Status = CommandInit ();
|
||||
ASSERT_EFI_ERROR (Status);
|
||||
|
||||
//
|
||||
// parse the command line
|
||||
//
|
||||
Status = ShellCommandLineParse (ParamList, &Package, &ProblemParam, TRUE);
|
||||
if (EFI_ERROR(Status)) {
|
||||
if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, L"disconnect", ProblemParam);
|
||||
FreePool(ProblemParam);
|
||||
if (EFI_ERROR (Status)) {
|
||||
if ((Status == EFI_VOLUME_CORRUPTED) && (ProblemParam != NULL)) {
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, L"disconnect", ProblemParam);
|
||||
FreePool (ProblemParam);
|
||||
ShellStatus = SHELL_INVALID_PARAMETER;
|
||||
} else {
|
||||
ASSERT(FALSE);
|
||||
ASSERT (FALSE);
|
||||
}
|
||||
} else {
|
||||
if (ShellCommandLineGetFlag(Package, L"-r")){
|
||||
if (ShellCommandLineGetCount(Package) > 1){
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"disconnect");
|
||||
if (ShellCommandLineGetFlag (Package, L"-r")) {
|
||||
if (ShellCommandLineGetCount (Package) > 1) {
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"disconnect");
|
||||
ShellStatus = SHELL_INVALID_PARAMETER;
|
||||
} else if (ShellCommandLineGetCount(Package) < 1) {
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDriver1HiiHandle, L"disconnect");
|
||||
} else if (ShellCommandLineGetCount (Package) < 1) {
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDriver1HiiHandle, L"disconnect");
|
||||
ShellStatus = SHELL_INVALID_PARAMETER;
|
||||
} else {
|
||||
Status = DisconnectAll ();
|
||||
//
|
||||
// Reconnect all consoles if -nc is not provided
|
||||
//
|
||||
if (!ShellCommandLineGetFlag (Package, L"-nc")){
|
||||
ShellConnectFromDevPaths (L"ConInDev");
|
||||
ShellConnectFromDevPaths (L"ConOutDev");
|
||||
ShellConnectFromDevPaths (L"ErrOutDev");
|
||||
ShellConnectFromDevPaths (L"ErrOut");
|
||||
ShellConnectFromDevPaths (L"ConIn");
|
||||
ShellConnectFromDevPaths (L"ConOut");
|
||||
}
|
||||
Status = DisconnectAll ();
|
||||
//
|
||||
// Reconnect all consoles if -nc is not provided
|
||||
//
|
||||
if (!ShellCommandLineGetFlag (Package, L"-nc")) {
|
||||
ShellConnectFromDevPaths (L"ConInDev");
|
||||
ShellConnectFromDevPaths (L"ConOutDev");
|
||||
ShellConnectFromDevPaths (L"ErrOutDev");
|
||||
ShellConnectFromDevPaths (L"ErrOut");
|
||||
ShellConnectFromDevPaths (L"ConIn");
|
||||
ShellConnectFromDevPaths (L"ConOut");
|
||||
}
|
||||
}
|
||||
} else if (ShellCommandLineGetFlag (Package, L"-nc")) {
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDriver1HiiHandle, L"disconnect");
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDriver1HiiHandle, L"disconnect");
|
||||
ShellStatus = SHELL_INVALID_PARAMETER;
|
||||
} else {
|
||||
if (ShellCommandLineGetCount(Package) > 4){
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"disconnect");
|
||||
if (ShellCommandLineGetCount (Package) > 4) {
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"disconnect");
|
||||
ShellStatus = SHELL_INVALID_PARAMETER;
|
||||
} else if (ShellCommandLineGetCount(Package) < 2) {
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDriver1HiiHandle, L"disconnect");
|
||||
} else if (ShellCommandLineGetCount (Package) < 2) {
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDriver1HiiHandle, L"disconnect");
|
||||
ShellStatus = SHELL_INVALID_PARAMETER;
|
||||
} else {
|
||||
//
|
||||
// must have between 1 and 3 handles passed in ...
|
||||
//
|
||||
Param1 = ShellCommandLineGetRawValue(Package, 1);
|
||||
Param2 = ShellCommandLineGetRawValue(Package, 2);
|
||||
Param3 = ShellCommandLineGetRawValue(Package, 3);
|
||||
ShellConvertStringToUint64(Param1, &Intermediate1, TRUE, FALSE);
|
||||
Handle1 = Param1!=NULL?ConvertHandleIndexToHandle((UINTN)Intermediate1):NULL;
|
||||
ShellConvertStringToUint64(Param2, &Intermediate2, TRUE, FALSE);
|
||||
Handle2 = Param2!=NULL?ConvertHandleIndexToHandle((UINTN)Intermediate2):NULL;
|
||||
ShellConvertStringToUint64(Param3, &Intermediate3, TRUE, FALSE);
|
||||
Handle3 = Param3!=NULL?ConvertHandleIndexToHandle((UINTN)Intermediate3):NULL;
|
||||
Param1 = ShellCommandLineGetRawValue (Package, 1);
|
||||
Param2 = ShellCommandLineGetRawValue (Package, 2);
|
||||
Param3 = ShellCommandLineGetRawValue (Package, 3);
|
||||
ShellConvertStringToUint64 (Param1, &Intermediate1, TRUE, FALSE);
|
||||
Handle1 = Param1 != NULL ? ConvertHandleIndexToHandle ((UINTN)Intermediate1) : NULL;
|
||||
ShellConvertStringToUint64 (Param2, &Intermediate2, TRUE, FALSE);
|
||||
Handle2 = Param2 != NULL ? ConvertHandleIndexToHandle ((UINTN)Intermediate2) : NULL;
|
||||
ShellConvertStringToUint64 (Param3, &Intermediate3, TRUE, FALSE);
|
||||
Handle3 = Param3 != NULL ? ConvertHandleIndexToHandle ((UINTN)Intermediate3) : NULL;
|
||||
|
||||
if (Param1 != NULL && Handle1 == NULL) {
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"disconnect", Param1);
|
||||
if ((Param1 != NULL) && (Handle1 == NULL)) {
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"disconnect", Param1);
|
||||
ShellStatus = SHELL_INVALID_PARAMETER;
|
||||
} else if (Param2 != NULL && Handle2 == NULL) {
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"disconnect", Param2);
|
||||
} else if ((Param2 != NULL) && (Handle2 == NULL)) {
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"disconnect", Param2);
|
||||
ShellStatus = SHELL_INVALID_PARAMETER;
|
||||
} else if (Param3 != NULL && Handle3 == NULL) {
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"disconnect", Param3);
|
||||
} else if ((Param3 != NULL) && (Handle3 == NULL)) {
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"disconnect", Param3);
|
||||
ShellStatus = SHELL_INVALID_PARAMETER;
|
||||
} else if (Handle2 != NULL && EFI_ERROR(gBS->OpenProtocol(Handle2, &gEfiDriverBindingProtocolGuid, NULL, gImageHandle, NULL, EFI_OPEN_PROTOCOL_TEST_PROTOCOL))) {
|
||||
ASSERT(Param2 != NULL);
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_HANDLE_NOT), gShellDriver1HiiHandle, L"disconnect", ShellStrToUintn(Param2), L"driver handle");
|
||||
} else if ((Handle2 != NULL) && EFI_ERROR (gBS->OpenProtocol (Handle2, &gEfiDriverBindingProtocolGuid, NULL, gImageHandle, NULL, EFI_OPEN_PROTOCOL_TEST_PROTOCOL))) {
|
||||
ASSERT (Param2 != NULL);
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_HANDLE_NOT), gShellDriver1HiiHandle, L"disconnect", ShellStrToUintn (Param2), L"driver handle");
|
||||
ShellStatus = SHELL_INVALID_PARAMETER;
|
||||
} else {
|
||||
ASSERT(Param1 != NULL);
|
||||
Status = gBS->DisconnectController(Handle1, Handle2, Handle3);
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_3P_RESULT), gShellDriver1HiiHandle, L"Disconnect", (UINTN)Intermediate1, (UINTN)Intermediate2, (UINTN)Intermediate3, Status);
|
||||
ASSERT (Param1 != NULL);
|
||||
Status = gBS->DisconnectController (Handle1, Handle2, Handle3);
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_3P_RESULT), gShellDriver1HiiHandle, L"Disconnect", (UINTN)Intermediate1, (UINTN)Intermediate2, (UINTN)Intermediate3, Status);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (ShellStatus == SHELL_SUCCESS) {
|
||||
if (Status == EFI_SECURITY_VIOLATION) {
|
||||
ShellStatus = SHELL_SECURITY_VIOLATION;
|
||||
} else if (Status == EFI_INVALID_PARAMETER) {
|
||||
ShellStatus = SHELL_INVALID_PARAMETER;
|
||||
} else if (EFI_ERROR(Status)) {
|
||||
} else if (EFI_ERROR (Status)) {
|
||||
ShellStatus = SHELL_NOT_FOUND;
|
||||
}
|
||||
}
|
||||
|
||||
return (ShellStatus);
|
||||
}
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
#include "UefiShellDriver1CommandsLib.h"
|
||||
|
||||
#define MAX_LEN_DRIVER_NAME 35
|
||||
#define MAX_LEN_DRIVER_NAME 35
|
||||
|
||||
STATIC CONST SHELL_PARAM_ITEM ParamList[] = {
|
||||
{L"-sfo", TypeFlag},
|
||||
{L"-l", TypeValue},
|
||||
{NULL, TypeMax}
|
||||
};
|
||||
STATIC CONST SHELL_PARAM_ITEM ParamList[] = {
|
||||
{ L"-sfo", TypeFlag },
|
||||
{ L"-l", TypeValue },
|
||||
{ NULL, TypeMax }
|
||||
};
|
||||
|
||||
/**
|
||||
Get a device path (in text format) for a given handle.
|
||||
@ -26,59 +26,64 @@ STATIC CONST SHELL_PARAM_ITEM ParamList[] = {
|
||||
@return A pointer to the driver path as a string. The callee must
|
||||
free this memory.
|
||||
**/
|
||||
CHAR16*
|
||||
GetDevicePathTextForHandle(
|
||||
IN EFI_HANDLE TheHandle
|
||||
CHAR16 *
|
||||
GetDevicePathTextForHandle (
|
||||
IN EFI_HANDLE TheHandle
|
||||
)
|
||||
{
|
||||
EFI_STATUS Status;
|
||||
EFI_LOADED_IMAGE_PROTOCOL *LoadedImage;
|
||||
EFI_DEVICE_PATH_PROTOCOL *ImageDevicePath;
|
||||
EFI_DEVICE_PATH_PROTOCOL *FinalPath;
|
||||
CHAR16 *RetVal;
|
||||
EFI_STATUS Status;
|
||||
EFI_LOADED_IMAGE_PROTOCOL *LoadedImage;
|
||||
EFI_DEVICE_PATH_PROTOCOL *ImageDevicePath;
|
||||
EFI_DEVICE_PATH_PROTOCOL *FinalPath;
|
||||
CHAR16 *RetVal;
|
||||
|
||||
FinalPath = NULL;
|
||||
|
||||
Status = gBS->OpenProtocol (
|
||||
TheHandle,
|
||||
&gEfiLoadedImageProtocolGuid,
|
||||
(VOID**)&LoadedImage,
|
||||
gImageHandle,
|
||||
NULL,
|
||||
EFI_OPEN_PROTOCOL_GET_PROTOCOL
|
||||
);
|
||||
if (!EFI_ERROR (Status)) {
|
||||
Status = gBS->OpenProtocol (
|
||||
LoadedImage->DeviceHandle,
|
||||
&gEfiDevicePathProtocolGuid,
|
||||
(VOID**)&ImageDevicePath,
|
||||
TheHandle,
|
||||
&gEfiLoadedImageProtocolGuid,
|
||||
(VOID **)&LoadedImage,
|
||||
gImageHandle,
|
||||
NULL,
|
||||
EFI_OPEN_PROTOCOL_GET_PROTOCOL
|
||||
);
|
||||
);
|
||||
if (!EFI_ERROR (Status)) {
|
||||
Status = gBS->OpenProtocol (
|
||||
LoadedImage->DeviceHandle,
|
||||
&gEfiDevicePathProtocolGuid,
|
||||
(VOID **)&ImageDevicePath,
|
||||
gImageHandle,
|
||||
NULL,
|
||||
EFI_OPEN_PROTOCOL_GET_PROTOCOL
|
||||
);
|
||||
if (!EFI_ERROR (Status)) {
|
||||
FinalPath = AppendDevicePath (ImageDevicePath, LoadedImage->FilePath);
|
||||
gBS->CloseProtocol(
|
||||
LoadedImage->DeviceHandle,
|
||||
&gEfiDevicePathProtocolGuid,
|
||||
gImageHandle,
|
||||
NULL);
|
||||
gBS->CloseProtocol (
|
||||
LoadedImage->DeviceHandle,
|
||||
&gEfiDevicePathProtocolGuid,
|
||||
gImageHandle,
|
||||
NULL
|
||||
);
|
||||
}
|
||||
gBS->CloseProtocol(
|
||||
TheHandle,
|
||||
&gEfiLoadedImageProtocolGuid,
|
||||
gImageHandle,
|
||||
NULL);
|
||||
|
||||
gBS->CloseProtocol (
|
||||
TheHandle,
|
||||
&gEfiLoadedImageProtocolGuid,
|
||||
gImageHandle,
|
||||
NULL
|
||||
);
|
||||
}
|
||||
|
||||
if (FinalPath == NULL) {
|
||||
return (NULL);
|
||||
}
|
||||
RetVal = gEfiShellProtocol->GetFilePathFromDevicePath(FinalPath);
|
||||
|
||||
RetVal = gEfiShellProtocol->GetFilePathFromDevicePath (FinalPath);
|
||||
if (RetVal == NULL) {
|
||||
RetVal = ConvertDevicePathToText(FinalPath, TRUE, TRUE);
|
||||
RetVal = ConvertDevicePathToText (FinalPath, TRUE, TRUE);
|
||||
}
|
||||
FreePool(FinalPath);
|
||||
|
||||
FreePool (FinalPath);
|
||||
return (RetVal);
|
||||
}
|
||||
|
||||
@ -91,15 +96,17 @@ GetDevicePathTextForHandle(
|
||||
@retval FALSE The driver does not have Driver Configuration.
|
||||
**/
|
||||
BOOLEAN
|
||||
ReturnDriverConfig(
|
||||
IN CONST EFI_HANDLE TheHandle
|
||||
ReturnDriverConfig (
|
||||
IN CONST EFI_HANDLE TheHandle
|
||||
)
|
||||
{
|
||||
EFI_STATUS Status;
|
||||
Status = gBS->OpenProtocol((EFI_HANDLE)TheHandle, &gEfiDriverConfigurationProtocolGuid, NULL, gImageHandle, NULL, EFI_OPEN_PROTOCOL_TEST_PROTOCOL);
|
||||
if (EFI_ERROR(Status)) {
|
||||
EFI_STATUS Status;
|
||||
|
||||
Status = gBS->OpenProtocol ((EFI_HANDLE)TheHandle, &gEfiDriverConfigurationProtocolGuid, NULL, gImageHandle, NULL, EFI_OPEN_PROTOCOL_TEST_PROTOCOL);
|
||||
if (EFI_ERROR (Status)) {
|
||||
return (FALSE);
|
||||
}
|
||||
|
||||
return (TRUE);
|
||||
}
|
||||
|
||||
@ -112,18 +119,20 @@ ReturnDriverConfig(
|
||||
@retval FALSE The driver does not have Driver Diagnostics.
|
||||
**/
|
||||
BOOLEAN
|
||||
ReturnDriverDiag(
|
||||
IN CONST EFI_HANDLE TheHandle
|
||||
ReturnDriverDiag (
|
||||
IN CONST EFI_HANDLE TheHandle
|
||||
)
|
||||
{
|
||||
EFI_STATUS Status;
|
||||
Status = gBS->OpenProtocol((EFI_HANDLE)TheHandle, &gEfiDriverDiagnostics2ProtocolGuid, NULL, gImageHandle, NULL, EFI_OPEN_PROTOCOL_TEST_PROTOCOL);
|
||||
if (EFI_ERROR(Status)) {
|
||||
Status = gBS->OpenProtocol((EFI_HANDLE)TheHandle, &gEfiDriverDiagnosticsProtocolGuid, NULL, gImageHandle, NULL, EFI_OPEN_PROTOCOL_TEST_PROTOCOL);
|
||||
if (EFI_ERROR(Status)) {
|
||||
EFI_STATUS Status;
|
||||
|
||||
Status = gBS->OpenProtocol ((EFI_HANDLE)TheHandle, &gEfiDriverDiagnostics2ProtocolGuid, NULL, gImageHandle, NULL, EFI_OPEN_PROTOCOL_TEST_PROTOCOL);
|
||||
if (EFI_ERROR (Status)) {
|
||||
Status = gBS->OpenProtocol ((EFI_HANDLE)TheHandle, &gEfiDriverDiagnosticsProtocolGuid, NULL, gImageHandle, NULL, EFI_OPEN_PROTOCOL_TEST_PROTOCOL);
|
||||
if (EFI_ERROR (Status)) {
|
||||
return (FALSE);
|
||||
}
|
||||
}
|
||||
|
||||
return (TRUE);
|
||||
}
|
||||
|
||||
@ -136,21 +145,22 @@ ReturnDriverDiag(
|
||||
@retval 0xFFFFFFFF An error ocurred.
|
||||
**/
|
||||
UINT32
|
||||
ReturnDriverVersion(
|
||||
IN CONST EFI_HANDLE TheHandle
|
||||
ReturnDriverVersion (
|
||||
IN CONST EFI_HANDLE TheHandle
|
||||
)
|
||||
{
|
||||
EFI_DRIVER_BINDING_PROTOCOL *DriverBinding;
|
||||
EFI_STATUS Status;
|
||||
UINT32 RetVal;
|
||||
EFI_DRIVER_BINDING_PROTOCOL *DriverBinding;
|
||||
EFI_STATUS Status;
|
||||
UINT32 RetVal;
|
||||
|
||||
RetVal = (UINT32)-1;
|
||||
|
||||
Status = gBS->OpenProtocol((EFI_HANDLE)TheHandle, &gEfiDriverBindingProtocolGuid, (VOID**)&DriverBinding, gImageHandle, NULL, EFI_OPEN_PROTOCOL_GET_PROTOCOL);
|
||||
if (!EFI_ERROR(Status)) {
|
||||
Status = gBS->OpenProtocol ((EFI_HANDLE)TheHandle, &gEfiDriverBindingProtocolGuid, (VOID **)&DriverBinding, gImageHandle, NULL, EFI_OPEN_PROTOCOL_GET_PROTOCOL);
|
||||
if (!EFI_ERROR (Status)) {
|
||||
RetVal = DriverBinding->Version;
|
||||
gBS->CloseProtocol(TheHandle, &gEfiDriverBindingProtocolGuid, gImageHandle, NULL);
|
||||
gBS->CloseProtocol (TheHandle, &gEfiDriverBindingProtocolGuid, gImageHandle, NULL);
|
||||
}
|
||||
|
||||
return (RetVal);
|
||||
}
|
||||
|
||||
@ -163,18 +173,18 @@ ReturnDriverVersion(
|
||||
**/
|
||||
CHAR16 *
|
||||
GetImageNameFromHandle (
|
||||
IN CONST EFI_HANDLE Handle
|
||||
IN CONST EFI_HANDLE Handle
|
||||
)
|
||||
{
|
||||
EFI_STATUS Status;
|
||||
EFI_DRIVER_BINDING_PROTOCOL *DriverBinding;
|
||||
EFI_LOADED_IMAGE_PROTOCOL *LoadedImage;
|
||||
EFI_DEVICE_PATH_PROTOCOL *DevPathNode;
|
||||
EFI_GUID *NameGuid;
|
||||
CHAR16 *ImageName;
|
||||
UINTN BufferSize;
|
||||
UINT32 AuthenticationStatus;
|
||||
EFI_FIRMWARE_VOLUME2_PROTOCOL *Fv2;
|
||||
EFI_STATUS Status;
|
||||
EFI_DRIVER_BINDING_PROTOCOL *DriverBinding;
|
||||
EFI_LOADED_IMAGE_PROTOCOL *LoadedImage;
|
||||
EFI_DEVICE_PATH_PROTOCOL *DevPathNode;
|
||||
EFI_GUID *NameGuid;
|
||||
CHAR16 *ImageName;
|
||||
UINTN BufferSize;
|
||||
UINT32 AuthenticationStatus;
|
||||
EFI_FIRMWARE_VOLUME2_PROTOCOL *Fv2;
|
||||
|
||||
LoadedImage = NULL;
|
||||
DriverBinding = NULL;
|
||||
@ -183,18 +193,19 @@ GetImageNameFromHandle (
|
||||
Status = gBS->OpenProtocol (
|
||||
Handle,
|
||||
&gEfiDriverBindingProtocolGuid,
|
||||
(VOID **) &DriverBinding,
|
||||
(VOID **)&DriverBinding,
|
||||
NULL,
|
||||
NULL,
|
||||
EFI_OPEN_PROTOCOL_GET_PROTOCOL
|
||||
);
|
||||
if (EFI_ERROR (Status)) {
|
||||
return NULL;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
Status = gBS->OpenProtocol (
|
||||
DriverBinding->ImageHandle,
|
||||
&gEfiLoadedImageProtocolGuid,
|
||||
(VOID**)&LoadedImage,
|
||||
(VOID **)&LoadedImage,
|
||||
gImageHandle,
|
||||
NULL,
|
||||
EFI_OPEN_PROTOCOL_GET_PROTOCOL
|
||||
@ -204,6 +215,7 @@ GetImageNameFromHandle (
|
||||
if (DevPathNode == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
while (!IsDevicePathEnd (DevPathNode)) {
|
||||
NameGuid = EfiGetNameGuidFromFwVolDevicePathNode ((MEDIA_FW_VOL_FILEPATH_DEVICE_PATH *)DevPathNode);
|
||||
if (NameGuid != NULL) {
|
||||
@ -225,18 +237,22 @@ GetImageNameFromHandle (
|
||||
if (!EFI_ERROR (Status)) {
|
||||
break;
|
||||
}
|
||||
|
||||
ImageName = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
//
|
||||
// Next device path node
|
||||
//
|
||||
DevPathNode = NextDevicePathNode (DevPathNode);
|
||||
}
|
||||
|
||||
if (ImageName == NULL) {
|
||||
ImageName = ConvertDevicePathToText (LoadedImage->FilePath, TRUE, TRUE);
|
||||
}
|
||||
}
|
||||
|
||||
return ImageName;
|
||||
}
|
||||
|
||||
@ -253,75 +269,75 @@ ShellCommandRunDrivers (
|
||||
IN EFI_SYSTEM_TABLE *SystemTable
|
||||
)
|
||||
{
|
||||
EFI_STATUS Status;
|
||||
LIST_ENTRY *Package;
|
||||
CHAR16 *ProblemParam;
|
||||
SHELL_STATUS ShellStatus;
|
||||
CHAR8 *Language;
|
||||
CONST CHAR16 *Lang;
|
||||
EFI_HANDLE *HandleList;
|
||||
EFI_HANDLE *HandleWalker;
|
||||
UINTN ChildCount;
|
||||
UINTN DeviceCount;
|
||||
CHAR16 ChildCountStr[21];
|
||||
CHAR16 DeviceCountStr[21];
|
||||
CHAR16 *Temp2;
|
||||
CONST CHAR16 *FullDriverName;
|
||||
CHAR16 *TruncatedDriverName;
|
||||
CHAR16 *ImageName;
|
||||
CHAR16 *FormatString;
|
||||
UINT32 DriverVersion;
|
||||
BOOLEAN DriverConfig;
|
||||
BOOLEAN DriverDiag;
|
||||
BOOLEAN SfoFlag;
|
||||
EFI_STATUS Status;
|
||||
LIST_ENTRY *Package;
|
||||
CHAR16 *ProblemParam;
|
||||
SHELL_STATUS ShellStatus;
|
||||
CHAR8 *Language;
|
||||
CONST CHAR16 *Lang;
|
||||
EFI_HANDLE *HandleList;
|
||||
EFI_HANDLE *HandleWalker;
|
||||
UINTN ChildCount;
|
||||
UINTN DeviceCount;
|
||||
CHAR16 ChildCountStr[21];
|
||||
CHAR16 DeviceCountStr[21];
|
||||
CHAR16 *Temp2;
|
||||
CONST CHAR16 *FullDriverName;
|
||||
CHAR16 *TruncatedDriverName;
|
||||
CHAR16 *ImageName;
|
||||
CHAR16 *FormatString;
|
||||
UINT32 DriverVersion;
|
||||
BOOLEAN DriverConfig;
|
||||
BOOLEAN DriverDiag;
|
||||
BOOLEAN SfoFlag;
|
||||
|
||||
ShellStatus = SHELL_SUCCESS;
|
||||
Status = EFI_SUCCESS;
|
||||
Language = NULL;
|
||||
FormatString = NULL;
|
||||
SfoFlag = FALSE;
|
||||
ShellStatus = SHELL_SUCCESS;
|
||||
Status = EFI_SUCCESS;
|
||||
Language = NULL;
|
||||
FormatString = NULL;
|
||||
SfoFlag = FALSE;
|
||||
|
||||
//
|
||||
// initialize the shell lib (we must be in non-auto-init...)
|
||||
//
|
||||
Status = ShellInitialize();
|
||||
ASSERT_EFI_ERROR(Status);
|
||||
Status = ShellInitialize ();
|
||||
ASSERT_EFI_ERROR (Status);
|
||||
|
||||
Status = CommandInit();
|
||||
ASSERT_EFI_ERROR(Status);
|
||||
Status = CommandInit ();
|
||||
ASSERT_EFI_ERROR (Status);
|
||||
|
||||
//
|
||||
// parse the command line
|
||||
//
|
||||
Status = ShellCommandLineParse (ParamList, &Package, &ProblemParam, TRUE);
|
||||
if (EFI_ERROR(Status)) {
|
||||
if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, L"drivers", ProblemParam);
|
||||
FreePool(ProblemParam);
|
||||
if (EFI_ERROR (Status)) {
|
||||
if ((Status == EFI_VOLUME_CORRUPTED) && (ProblemParam != NULL)) {
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, L"drivers", ProblemParam);
|
||||
FreePool (ProblemParam);
|
||||
ShellStatus = SHELL_INVALID_PARAMETER;
|
||||
} else {
|
||||
ASSERT(FALSE);
|
||||
ASSERT (FALSE);
|
||||
}
|
||||
} else {
|
||||
if (ShellCommandLineGetCount(Package) > 1) {
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"drivers");
|
||||
if (ShellCommandLineGetCount (Package) > 1) {
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"drivers");
|
||||
ShellStatus = SHELL_INVALID_PARAMETER;
|
||||
} else {
|
||||
if (ShellCommandLineGetFlag(Package, L"-l")){
|
||||
Lang = ShellCommandLineGetValue(Package, L"-l");
|
||||
if (ShellCommandLineGetFlag (Package, L"-l")) {
|
||||
Lang = ShellCommandLineGetValue (Package, L"-l");
|
||||
if (Lang != NULL) {
|
||||
Language = AllocateZeroPool(StrSize(Lang));
|
||||
AsciiSPrint(Language, StrSize(Lang), "%S", Lang);
|
||||
Language = AllocateZeroPool (StrSize (Lang));
|
||||
AsciiSPrint (Language, StrSize (Lang), "%S", Lang);
|
||||
} else {
|
||||
ASSERT(Language == NULL);
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"drivers", L"-l");
|
||||
ASSERT (Language == NULL);
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"drivers", L"-l");
|
||||
ShellCommandLineFreeVarList (Package);
|
||||
return (SHELL_INVALID_PARAMETER);
|
||||
}
|
||||
}
|
||||
|
||||
if (ShellCommandLineGetFlag (Package, L"-sfo")) {
|
||||
SfoFlag = TRUE;
|
||||
SfoFlag = TRUE;
|
||||
FormatString = HiiGetString (gShellDriver1HiiHandle, STRING_TOKEN (STR_DRIVERS_ITEM_LINE_SFO), Language);
|
||||
//
|
||||
// print the SFO header
|
||||
@ -332,34 +348,36 @@ ShellCommandRunDrivers (
|
||||
Language,
|
||||
STRING_TOKEN (STR_GEN_SFO_HEADER),
|
||||
gShellDriver1HiiHandle,
|
||||
L"drivers");
|
||||
L"drivers"
|
||||
);
|
||||
} else {
|
||||
FormatString = HiiGetString (gShellDriver1HiiHandle, STRING_TOKEN (STR_DRIVERS_ITEM_LINE), Language);
|
||||
//
|
||||
// print the header row
|
||||
//
|
||||
ShellPrintHiiEx(
|
||||
ShellPrintHiiEx (
|
||||
-1,
|
||||
-1,
|
||||
Language,
|
||||
STRING_TOKEN (STR_DRIVERS_HEADER_LINES),
|
||||
gShellDriver1HiiHandle);
|
||||
gShellDriver1HiiHandle
|
||||
);
|
||||
}
|
||||
|
||||
HandleList = GetHandleListByProtocol(&gEfiDriverBindingProtocolGuid);
|
||||
for (HandleWalker = HandleList ; HandleWalker != NULL && *HandleWalker != NULL ; HandleWalker++){
|
||||
HandleList = GetHandleListByProtocol (&gEfiDriverBindingProtocolGuid);
|
||||
for (HandleWalker = HandleList; HandleWalker != NULL && *HandleWalker != NULL; HandleWalker++) {
|
||||
ChildCount = 0;
|
||||
DeviceCount = 0;
|
||||
Status = ParseHandleDatabaseForChildDevices (*HandleWalker, &ChildCount , NULL);
|
||||
Status = PARSE_HANDLE_DATABASE_DEVICES (*HandleWalker, &DeviceCount, NULL);
|
||||
Temp2 = GetDevicePathTextForHandle(*HandleWalker);
|
||||
DriverVersion = ReturnDriverVersion(*HandleWalker);
|
||||
DriverConfig = ReturnDriverConfig(*HandleWalker);
|
||||
DriverDiag = ReturnDriverDiag (*HandleWalker);
|
||||
FullDriverName = GetStringNameFromHandle(*HandleWalker, Language);
|
||||
Status = ParseHandleDatabaseForChildDevices (*HandleWalker, &ChildCount, NULL);
|
||||
Status = PARSE_HANDLE_DATABASE_DEVICES (*HandleWalker, &DeviceCount, NULL);
|
||||
Temp2 = GetDevicePathTextForHandle (*HandleWalker);
|
||||
DriverVersion = ReturnDriverVersion (*HandleWalker);
|
||||
DriverConfig = ReturnDriverConfig (*HandleWalker);
|
||||
DriverDiag = ReturnDriverDiag (*HandleWalker);
|
||||
FullDriverName = GetStringNameFromHandle (*HandleWalker, Language);
|
||||
ImageName = GetImageNameFromHandle (*HandleWalker);
|
||||
|
||||
UnicodeValueToStringS (ChildCountStr, sizeof (ChildCountStr), 0, ChildCount, 0);
|
||||
UnicodeValueToStringS (ChildCountStr, sizeof (ChildCountStr), 0, ChildCount, 0);
|
||||
UnicodeValueToStringS (DeviceCountStr, sizeof (DeviceCountStr), 0, DeviceCount, 0);
|
||||
TruncatedDriverName = NULL;
|
||||
if (!SfoFlag && (FullDriverName != NULL)) {
|
||||
@ -398,12 +416,15 @@ ShellCommandRunDrivers (
|
||||
Temp2 == NULL ? L"" : Temp2
|
||||
);
|
||||
}
|
||||
|
||||
if (TruncatedDriverName != NULL) {
|
||||
FreePool (TruncatedDriverName);
|
||||
}
|
||||
|
||||
if (Temp2 != NULL) {
|
||||
FreePool(Temp2);
|
||||
FreePool (Temp2);
|
||||
}
|
||||
|
||||
if (ImageName != NULL) {
|
||||
FreePool (ImageName);
|
||||
}
|
||||
@ -414,9 +435,10 @@ ShellCommandRunDrivers (
|
||||
}
|
||||
}
|
||||
}
|
||||
SHELL_FREE_NON_NULL(Language);
|
||||
|
||||
SHELL_FREE_NON_NULL (Language);
|
||||
ShellCommandLineFreeVarList (Package);
|
||||
SHELL_FREE_NON_NULL(FormatString);
|
||||
SHELL_FREE_NON_NULL (FormatString);
|
||||
}
|
||||
|
||||
return (ShellStatus);
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -9,7 +9,7 @@
|
||||
|
||||
#include "UefiShellDriver1CommandsLib.h"
|
||||
|
||||
STATIC CONST EFI_GUID *DiagGuidList[] = {&gEfiDriverDiagnosticsProtocolGuid, &gEfiDriverDiagnostics2ProtocolGuid, NULL};
|
||||
STATIC CONST EFI_GUID *DiagGuidList[] = { &gEfiDriverDiagnosticsProtocolGuid, &gEfiDriverDiagnostics2ProtocolGuid, NULL };
|
||||
//
|
||||
// We need 1 more item on the list...
|
||||
//
|
||||
@ -37,91 +37,96 @@ typedef enum {
|
||||
**/
|
||||
EFI_STATUS
|
||||
DoDiagnostics (
|
||||
IN CONST DRV_DIAG_TEST_MODE Mode,
|
||||
IN CONST CHAR8 *Lang,
|
||||
IN CONST BOOLEAN AllChilds,
|
||||
IN CONST EFI_HANDLE DriverHandle,
|
||||
IN CONST EFI_HANDLE ControllerHandle,
|
||||
IN CONST EFI_HANDLE ChildHandle
|
||||
IN CONST DRV_DIAG_TEST_MODE Mode,
|
||||
IN CONST CHAR8 *Lang,
|
||||
IN CONST BOOLEAN AllChilds,
|
||||
IN CONST EFI_HANDLE DriverHandle,
|
||||
IN CONST EFI_HANDLE ControllerHandle,
|
||||
IN CONST EFI_HANDLE ChildHandle
|
||||
)
|
||||
{
|
||||
EFI_DRIVER_DIAGNOSTICS_PROTOCOL *DriverDiagnostics;
|
||||
EFI_DRIVER_DIAGNOSTICS2_PROTOCOL *DriverDiagnostics2;
|
||||
EFI_HANDLE *DriverHandleList;
|
||||
EFI_HANDLE *ControllerHandleList;
|
||||
EFI_HANDLE *ChildHandleList;
|
||||
EFI_HANDLE *Walker;
|
||||
UINTN DriverHandleListCount;
|
||||
UINTN ControllerHandleListCount;
|
||||
UINTN ChildHandleListCount;
|
||||
UINTN DriverHandleListLoop;
|
||||
UINTN ControllerHandleListLoop;
|
||||
UINTN ChildHandleListLoop;
|
||||
EFI_STATUS Status;
|
||||
EFI_STATUS Status2;
|
||||
EFI_GUID *ErrorType;
|
||||
UINTN OutBufferSize;
|
||||
CHAR16 *OutBuffer;
|
||||
UINTN HandleIndex1;
|
||||
UINTN HandleIndex2;
|
||||
CHAR8 *Language;
|
||||
BOOLEAN Found;
|
||||
EFI_DRIVER_DIAGNOSTICS_PROTOCOL *DriverDiagnostics;
|
||||
EFI_DRIVER_DIAGNOSTICS2_PROTOCOL *DriverDiagnostics2;
|
||||
EFI_HANDLE *DriverHandleList;
|
||||
EFI_HANDLE *ControllerHandleList;
|
||||
EFI_HANDLE *ChildHandleList;
|
||||
EFI_HANDLE *Walker;
|
||||
UINTN DriverHandleListCount;
|
||||
UINTN ControllerHandleListCount;
|
||||
UINTN ChildHandleListCount;
|
||||
UINTN DriverHandleListLoop;
|
||||
UINTN ControllerHandleListLoop;
|
||||
UINTN ChildHandleListLoop;
|
||||
EFI_STATUS Status;
|
||||
EFI_STATUS Status2;
|
||||
EFI_GUID *ErrorType;
|
||||
UINTN OutBufferSize;
|
||||
CHAR16 *OutBuffer;
|
||||
UINTN HandleIndex1;
|
||||
UINTN HandleIndex2;
|
||||
CHAR8 *Language;
|
||||
BOOLEAN Found;
|
||||
|
||||
if ((ChildHandle != NULL && AllChilds) || (Mode >= TestModeMax)){
|
||||
if (((ChildHandle != NULL) && AllChilds) || (Mode >= TestModeMax)) {
|
||||
return (EFI_INVALID_PARAMETER);
|
||||
}
|
||||
|
||||
DriverDiagnostics = NULL;
|
||||
DriverDiagnostics2 = NULL;
|
||||
Status = EFI_SUCCESS;
|
||||
Status2 = EFI_SUCCESS;
|
||||
DriverHandleList = NULL;
|
||||
ControllerHandleList = NULL;
|
||||
ChildHandleList = NULL;
|
||||
Language = NULL;
|
||||
OutBuffer = NULL;
|
||||
ErrorType = NULL;
|
||||
DriverHandleListCount = 0;
|
||||
ControllerHandleListCount = 0;
|
||||
ChildHandleListCount = 0;
|
||||
DriverDiagnostics = NULL;
|
||||
DriverDiagnostics2 = NULL;
|
||||
Status = EFI_SUCCESS;
|
||||
Status2 = EFI_SUCCESS;
|
||||
DriverHandleList = NULL;
|
||||
ControllerHandleList = NULL;
|
||||
ChildHandleList = NULL;
|
||||
Language = NULL;
|
||||
OutBuffer = NULL;
|
||||
ErrorType = NULL;
|
||||
DriverHandleListCount = 0;
|
||||
ControllerHandleListCount = 0;
|
||||
ChildHandleListCount = 0;
|
||||
|
||||
if (DriverHandle != NULL) {
|
||||
DriverHandleList = AllocateZeroPool(2*sizeof(EFI_HANDLE));
|
||||
DriverHandleList = AllocateZeroPool (2*sizeof (EFI_HANDLE));
|
||||
if (DriverHandleList == NULL) {
|
||||
return EFI_OUT_OF_RESOURCES;
|
||||
}
|
||||
DriverHandleList[0] = DriverHandle;
|
||||
|
||||
DriverHandleList[0] = DriverHandle;
|
||||
DriverHandleListCount = 1;
|
||||
} else {
|
||||
DriverHandleList = GetHandleListByProtocolList(DiagGuidList);
|
||||
DriverHandleList = GetHandleListByProtocolList (DiagGuidList);
|
||||
if (DriverHandleList == NULL) {
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROTOCOL_NF), gShellDriver1HiiHandle, L"drvdiag", L"gEfiDriverDiagnosticsProtocolGuid", &gEfiDriverDiagnosticsProtocolGuid);
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROTOCOL_NF), gShellDriver1HiiHandle, L"drvdiag", L"gEfiDriverDiagnostics2ProtocolGuid", &gEfiDriverDiagnostics2ProtocolGuid);
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PROTOCOL_NF), gShellDriver1HiiHandle, L"drvdiag", L"gEfiDriverDiagnosticsProtocolGuid", &gEfiDriverDiagnosticsProtocolGuid);
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PROTOCOL_NF), gShellDriver1HiiHandle, L"drvdiag", L"gEfiDriverDiagnostics2ProtocolGuid", &gEfiDriverDiagnostics2ProtocolGuid);
|
||||
return (EFI_NOT_FOUND);
|
||||
}
|
||||
for (Walker = DriverHandleList ; Walker != NULL && *Walker != NULL ; DriverHandleListCount++, Walker++);
|
||||
|
||||
for (Walker = DriverHandleList; Walker != NULL && *Walker != NULL; DriverHandleListCount++, Walker++) {
|
||||
}
|
||||
}
|
||||
|
||||
if (ControllerHandle != NULL) {
|
||||
ControllerHandleList = AllocateZeroPool(2*sizeof(EFI_HANDLE));
|
||||
ControllerHandleList = AllocateZeroPool (2*sizeof (EFI_HANDLE));
|
||||
if (ControllerHandleList == NULL) {
|
||||
SHELL_FREE_NON_NULL (DriverHandleList);
|
||||
return EFI_OUT_OF_RESOURCES;
|
||||
}
|
||||
ControllerHandleList[0] = ControllerHandle;
|
||||
|
||||
ControllerHandleList[0] = ControllerHandle;
|
||||
ControllerHandleListCount = 1;
|
||||
} else {
|
||||
ControllerHandleList = NULL;
|
||||
}
|
||||
|
||||
if (ChildHandle != NULL) {
|
||||
ChildHandleList = AllocateZeroPool(2*sizeof(EFI_HANDLE));
|
||||
ChildHandleList = AllocateZeroPool (2*sizeof (EFI_HANDLE));
|
||||
if (ChildHandleList == NULL) {
|
||||
SHELL_FREE_NON_NULL (ControllerHandleList);
|
||||
SHELL_FREE_NON_NULL (DriverHandleList);
|
||||
return EFI_OUT_OF_RESOURCES;
|
||||
}
|
||||
ChildHandleList[0] = ChildHandle;
|
||||
|
||||
ChildHandleList[0] = ChildHandle;
|
||||
ChildHandleListCount = 1;
|
||||
} else if (AllChilds) {
|
||||
ChildHandleList = NULL;
|
||||
@ -133,98 +138,114 @@ DoDiagnostics (
|
||||
}
|
||||
|
||||
if (Mode == TestModeList) {
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_DRVDIAG_HEADER), gShellDriver1HiiHandle);
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_DRVDIAG_HEADER), gShellDriver1HiiHandle);
|
||||
}
|
||||
|
||||
for (DriverHandleListLoop = 0
|
||||
; DriverHandleListLoop < DriverHandleListCount
|
||||
; DriverHandleListLoop++
|
||||
){
|
||||
; DriverHandleListLoop < DriverHandleListCount
|
||||
; DriverHandleListLoop++
|
||||
)
|
||||
{
|
||||
if (Mode == TestModeList) {
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_DRVDIAG_DRIVER_HEADER), gShellDriver1HiiHandle, ConvertHandleToHandleIndex(DriverHandleList[DriverHandleListLoop]));
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_DRVDIAG_DRIVER_HEADER), gShellDriver1HiiHandle, ConvertHandleToHandleIndex (DriverHandleList[DriverHandleListLoop]));
|
||||
}
|
||||
|
||||
if (ControllerHandle == NULL) {
|
||||
PARSE_HANDLE_DATABASE_DEVICES(DriverHandleList[DriverHandleListLoop], &ControllerHandleListCount, &ControllerHandleList);
|
||||
PARSE_HANDLE_DATABASE_DEVICES (DriverHandleList[DriverHandleListLoop], &ControllerHandleListCount, &ControllerHandleList);
|
||||
}
|
||||
|
||||
if (ControllerHandleListCount == 0) {
|
||||
if (Mode == TestModeList) {
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_DRVDIAG_DRIVER_NO_HANDLES), gShellDriver1HiiHandle);
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_DRVDIAG_DRIVER_NO_HANDLES), gShellDriver1HiiHandle);
|
||||
}
|
||||
} else {
|
||||
if (Mode == TestModeList) {
|
||||
ShellPrintEx(-1, -1, L"\r\n");
|
||||
ShellPrintEx (-1, -1, L"\r\n");
|
||||
}
|
||||
|
||||
for (ControllerHandleListLoop = 0
|
||||
; ControllerHandleListLoop < ControllerHandleListCount
|
||||
; ControllerHandleListLoop++
|
||||
){
|
||||
; ControllerHandleListLoop < ControllerHandleListCount
|
||||
; ControllerHandleListLoop++
|
||||
)
|
||||
{
|
||||
if (AllChilds) {
|
||||
ASSERT(ChildHandleList == NULL);
|
||||
PARSE_HANDLE_DATABASE_MANAGED_CHILDREN(
|
||||
ASSERT (ChildHandleList == NULL);
|
||||
PARSE_HANDLE_DATABASE_MANAGED_CHILDREN (
|
||||
DriverHandleList[DriverHandleListLoop],
|
||||
ControllerHandleList[ControllerHandleListLoop],
|
||||
&ChildHandleListCount,
|
||||
&ChildHandleList);
|
||||
&ChildHandleList
|
||||
);
|
||||
}
|
||||
|
||||
for (ChildHandleListLoop = 0
|
||||
; (ChildHandleListLoop < ChildHandleListCount || ChildHandleList == NULL)
|
||||
; ChildHandleListLoop++
|
||||
){
|
||||
; (ChildHandleListLoop < ChildHandleListCount || ChildHandleList == NULL)
|
||||
; ChildHandleListLoop++
|
||||
)
|
||||
{
|
||||
Found = FALSE;
|
||||
if (Mode != TestModeList) {
|
||||
if (Lang == NULL || Lang[2] == '-') {
|
||||
if ((Lang == NULL) || (Lang[2] == '-')) {
|
||||
//
|
||||
// Get the protocol pointer and call the function
|
||||
//
|
||||
Status = gBS->OpenProtocol(
|
||||
DriverHandleList[DriverHandleListLoop],
|
||||
&gEfiDriverDiagnostics2ProtocolGuid,
|
||||
(VOID**)&DriverDiagnostics2,
|
||||
gImageHandle,
|
||||
NULL,
|
||||
EFI_OPEN_PROTOCOL_GET_PROTOCOL);
|
||||
if (!EFI_ERROR(Status) && (DriverDiagnostics2 != NULL)) {
|
||||
Language = GetBestLanguageForDriver(DriverDiagnostics2->SupportedLanguages, Lang, FALSE);
|
||||
Found = TRUE;
|
||||
Status = DriverDiagnostics2->RunDiagnostics(
|
||||
DriverDiagnostics2,
|
||||
ControllerHandleList[ControllerHandleListLoop],
|
||||
ChildHandleList == NULL?NULL:ChildHandleList[ChildHandleListLoop],
|
||||
(EFI_DRIVER_DIAGNOSTIC_TYPE)Mode,
|
||||
Language,
|
||||
&ErrorType,
|
||||
&OutBufferSize,
|
||||
&OutBuffer);
|
||||
FreePool(Language);
|
||||
Status = gBS->OpenProtocol (
|
||||
DriverHandleList[DriverHandleListLoop],
|
||||
&gEfiDriverDiagnostics2ProtocolGuid,
|
||||
(VOID **)&DriverDiagnostics2,
|
||||
gImageHandle,
|
||||
NULL,
|
||||
EFI_OPEN_PROTOCOL_GET_PROTOCOL
|
||||
);
|
||||
if (!EFI_ERROR (Status) && (DriverDiagnostics2 != NULL)) {
|
||||
Language = GetBestLanguageForDriver (DriverDiagnostics2->SupportedLanguages, Lang, FALSE);
|
||||
Found = TRUE;
|
||||
Status = DriverDiagnostics2->RunDiagnostics (
|
||||
DriverDiagnostics2,
|
||||
ControllerHandleList[ControllerHandleListLoop],
|
||||
ChildHandleList == NULL ? NULL : ChildHandleList[ChildHandleListLoop],
|
||||
(EFI_DRIVER_DIAGNOSTIC_TYPE)Mode,
|
||||
Language,
|
||||
&ErrorType,
|
||||
&OutBufferSize,
|
||||
&OutBuffer
|
||||
);
|
||||
FreePool (Language);
|
||||
}
|
||||
}
|
||||
if (!Found && (Lang == NULL||(Lang!=NULL&&(Lang[2]!='-')))){
|
||||
Status = gBS->OpenProtocol(
|
||||
DriverHandleList[DriverHandleListLoop],
|
||||
&gEfiDriverDiagnosticsProtocolGuid,
|
||||
(VOID**)&DriverDiagnostics,
|
||||
gImageHandle,
|
||||
NULL,
|
||||
EFI_OPEN_PROTOCOL_GET_PROTOCOL);
|
||||
if (!EFI_ERROR(Status)) {
|
||||
Language = GetBestLanguageForDriver(DriverDiagnostics->SupportedLanguages, Lang, FALSE);
|
||||
Status = DriverDiagnostics->RunDiagnostics(
|
||||
DriverDiagnostics,
|
||||
ControllerHandleList[ControllerHandleListLoop],
|
||||
ChildHandleList == NULL?NULL:ChildHandleList[ChildHandleListLoop],
|
||||
(EFI_DRIVER_DIAGNOSTIC_TYPE)Mode,
|
||||
Language,
|
||||
&ErrorType,
|
||||
&OutBufferSize,
|
||||
&OutBuffer);
|
||||
FreePool(Language);
|
||||
|
||||
if (!Found && ((Lang == NULL) || ((Lang != NULL) && (Lang[2] != '-')))) {
|
||||
Status = gBS->OpenProtocol (
|
||||
DriverHandleList[DriverHandleListLoop],
|
||||
&gEfiDriverDiagnosticsProtocolGuid,
|
||||
(VOID **)&DriverDiagnostics,
|
||||
gImageHandle,
|
||||
NULL,
|
||||
EFI_OPEN_PROTOCOL_GET_PROTOCOL
|
||||
);
|
||||
if (!EFI_ERROR (Status)) {
|
||||
Language = GetBestLanguageForDriver (DriverDiagnostics->SupportedLanguages, Lang, FALSE);
|
||||
Status = DriverDiagnostics->RunDiagnostics (
|
||||
DriverDiagnostics,
|
||||
ControllerHandleList[ControllerHandleListLoop],
|
||||
ChildHandleList == NULL ? NULL : ChildHandleList[ChildHandleListLoop],
|
||||
(EFI_DRIVER_DIAGNOSTIC_TYPE)Mode,
|
||||
Language,
|
||||
&ErrorType,
|
||||
&OutBufferSize,
|
||||
&OutBuffer
|
||||
);
|
||||
FreePool (Language);
|
||||
}
|
||||
}
|
||||
if (EFI_ERROR(Status)) {
|
||||
|
||||
if (EFI_ERROR (Status)) {
|
||||
Status2 = Status;
|
||||
}
|
||||
HandleIndex1 = ConvertHandleToHandleIndex(DriverHandleList[DriverHandleListLoop]);
|
||||
HandleIndex2 = ConvertHandleToHandleIndex(ControllerHandleList[ControllerHandleListLoop]);
|
||||
ShellPrintHiiEx(
|
||||
|
||||
HandleIndex1 = ConvertHandleToHandleIndex (DriverHandleList[DriverHandleListLoop]);
|
||||
HandleIndex2 = ConvertHandleToHandleIndex (ControllerHandleList[ControllerHandleListLoop]);
|
||||
ShellPrintHiiEx (
|
||||
-1,
|
||||
-1,
|
||||
NULL,
|
||||
@ -233,23 +254,25 @@ DoDiagnostics (
|
||||
L"DrvDiag",
|
||||
HandleIndex1,
|
||||
HandleIndex2,
|
||||
ChildHandleList == NULL?0:ConvertHandleToHandleIndex(ChildHandleList[ChildHandleListLoop]),
|
||||
Status);
|
||||
if (OutBuffer!=NULL) {
|
||||
FreePool(OutBuffer);
|
||||
ChildHandleList == NULL ? 0 : ConvertHandleToHandleIndex (ChildHandleList[ChildHandleListLoop]),
|
||||
Status
|
||||
);
|
||||
if (OutBuffer != NULL) {
|
||||
FreePool (OutBuffer);
|
||||
OutBuffer = NULL;
|
||||
}
|
||||
if (ErrorType!=NULL) {
|
||||
FreePool(ErrorType);
|
||||
|
||||
if (ErrorType != NULL) {
|
||||
FreePool (ErrorType);
|
||||
ErrorType = NULL;
|
||||
}
|
||||
} else {
|
||||
HandleIndex1 = ConvertHandleToHandleIndex(DriverHandleList[DriverHandleListLoop]);
|
||||
HandleIndex2 = ConvertHandleToHandleIndex(ControllerHandleList[ControllerHandleListLoop]);
|
||||
HandleIndex1 = ConvertHandleToHandleIndex (DriverHandleList[DriverHandleListLoop]);
|
||||
HandleIndex2 = ConvertHandleToHandleIndex (ControllerHandleList[ControllerHandleListLoop]);
|
||||
//
|
||||
// Print out the information that this set can be tested
|
||||
//
|
||||
ShellPrintHiiEx(
|
||||
ShellPrintHiiEx (
|
||||
-1,
|
||||
-1,
|
||||
NULL,
|
||||
@ -257,8 +280,8 @@ DoDiagnostics (
|
||||
gShellDriver1HiiHandle,
|
||||
HandleIndex1,
|
||||
HandleIndex2,
|
||||
ChildHandleList == NULL?0:ConvertHandleToHandleIndex(ChildHandleList[ChildHandleListLoop])
|
||||
);
|
||||
ChildHandleList == NULL ? 0 : ConvertHandleToHandleIndex (ChildHandleList[ChildHandleListLoop])
|
||||
);
|
||||
}
|
||||
|
||||
//
|
||||
@ -268,41 +291,45 @@ DoDiagnostics (
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (AllChilds) {
|
||||
SHELL_FREE_NON_NULL(ChildHandleList);
|
||||
ChildHandleList = NULL;
|
||||
ChildHandleListCount = 0;
|
||||
SHELL_FREE_NON_NULL (ChildHandleList);
|
||||
ChildHandleList = NULL;
|
||||
ChildHandleListCount = 0;
|
||||
}
|
||||
}
|
||||
|
||||
if (ControllerHandle == NULL) {
|
||||
SHELL_FREE_NON_NULL(ControllerHandleList);
|
||||
SHELL_FREE_NON_NULL (ControllerHandleList);
|
||||
ControllerHandleList = NULL;
|
||||
ControllerHandleListCount = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (DriverHandleList != NULL) {
|
||||
FreePool(DriverHandleList);
|
||||
FreePool (DriverHandleList);
|
||||
}
|
||||
|
||||
if (ControllerHandleList != NULL) {
|
||||
FreePool(ControllerHandleList);
|
||||
FreePool (ControllerHandleList);
|
||||
}
|
||||
|
||||
if (ChildHandleList != NULL) {
|
||||
FreePool(ChildHandleList);
|
||||
FreePool (ChildHandleList);
|
||||
}
|
||||
|
||||
return (Status2);
|
||||
}
|
||||
|
||||
|
||||
STATIC CONST SHELL_PARAM_ITEM ParamList[] = {
|
||||
{L"-c", TypeFlag},
|
||||
{L"-s", TypeFlag},
|
||||
{L"-e", TypeFlag},
|
||||
{L"-m", TypeFlag},
|
||||
{L"-l", TypeValue},
|
||||
{NULL, TypeMax}
|
||||
};
|
||||
STATIC CONST SHELL_PARAM_ITEM ParamList[] = {
|
||||
{ L"-c", TypeFlag },
|
||||
{ L"-s", TypeFlag },
|
||||
{ L"-e", TypeFlag },
|
||||
{ L"-m", TypeFlag },
|
||||
{ L"-l", TypeValue },
|
||||
{ NULL, TypeMax }
|
||||
};
|
||||
|
||||
/**
|
||||
Function for 'drvdiag' command.
|
||||
@ -332,60 +359,62 @@ ShellCommandRunDrvDiag (
|
||||
EFI_HANDLE Handle3;
|
||||
UINT64 Intermediate;
|
||||
|
||||
ShellStatus = SHELL_SUCCESS;
|
||||
Mode = TestModeMax;
|
||||
Language = NULL;
|
||||
ShellStatus = SHELL_SUCCESS;
|
||||
Mode = TestModeMax;
|
||||
Language = NULL;
|
||||
|
||||
//
|
||||
// initialize the shell lib (we must be in non-auto-init...)
|
||||
//
|
||||
Status = ShellInitialize();
|
||||
ASSERT_EFI_ERROR(Status);
|
||||
Status = ShellInitialize ();
|
||||
ASSERT_EFI_ERROR (Status);
|
||||
|
||||
Status = CommandInit();
|
||||
ASSERT_EFI_ERROR(Status);
|
||||
Status = CommandInit ();
|
||||
ASSERT_EFI_ERROR (Status);
|
||||
|
||||
//
|
||||
// parse the command line
|
||||
//
|
||||
Status = ShellCommandLineParse (ParamList, &Package, &ProblemParam, TRUE);
|
||||
if (EFI_ERROR(Status)) {
|
||||
if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, L"drvdiag", ProblemParam);
|
||||
FreePool(ProblemParam);
|
||||
if (EFI_ERROR (Status)) {
|
||||
if ((Status == EFI_VOLUME_CORRUPTED) && (ProblemParam != NULL)) {
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, L"drvdiag", ProblemParam);
|
||||
FreePool (ProblemParam);
|
||||
ShellStatus = SHELL_INVALID_PARAMETER;
|
||||
} else {
|
||||
ASSERT(FALSE);
|
||||
ASSERT (FALSE);
|
||||
}
|
||||
} else {
|
||||
//
|
||||
// if more than 3 'value' parameters (plus the name one) or we have any 2 mode flags
|
||||
//
|
||||
if ((ShellCommandLineGetCount(Package) > 4)
|
||||
||(ShellCommandLineGetFlag(Package, L"-s") && ShellCommandLineGetFlag(Package, L"-e"))
|
||||
||(ShellCommandLineGetFlag(Package, L"-s") && ShellCommandLineGetFlag(Package, L"-m"))
|
||||
||(ShellCommandLineGetFlag(Package, L"-e") && ShellCommandLineGetFlag(Package, L"-m"))
|
||||
){
|
||||
if ( (ShellCommandLineGetCount (Package) > 4)
|
||||
|| (ShellCommandLineGetFlag (Package, L"-s") && ShellCommandLineGetFlag (Package, L"-e"))
|
||||
|| (ShellCommandLineGetFlag (Package, L"-s") && ShellCommandLineGetFlag (Package, L"-m"))
|
||||
|| (ShellCommandLineGetFlag (Package, L"-e") && ShellCommandLineGetFlag (Package, L"-m"))
|
||||
)
|
||||
{
|
||||
//
|
||||
// error for too many parameters
|
||||
//
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"drvdiag");
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"drvdiag");
|
||||
ShellStatus = SHELL_INVALID_PARAMETER;
|
||||
} else if ((ShellCommandLineGetFlag(Package, L"-s"))
|
||||
|| (ShellCommandLineGetFlag(Package, L"-e"))
|
||||
|| (ShellCommandLineGetFlag(Package, L"-m"))
|
||||
){
|
||||
} else if ( (ShellCommandLineGetFlag (Package, L"-s"))
|
||||
|| (ShellCommandLineGetFlag (Package, L"-e"))
|
||||
|| (ShellCommandLineGetFlag (Package, L"-m"))
|
||||
)
|
||||
{
|
||||
//
|
||||
// Run the appropriate test
|
||||
//
|
||||
if (ShellCommandLineGetFlag(Package, L"-s")) {
|
||||
if (ShellCommandLineGetFlag (Package, L"-s")) {
|
||||
Mode = TestModeStandard;
|
||||
} else if (ShellCommandLineGetFlag(Package, L"-e")) {
|
||||
} else if (ShellCommandLineGetFlag (Package, L"-e")) {
|
||||
Mode = TestModeExtended;
|
||||
} else if (ShellCommandLineGetFlag(Package, L"-m")) {
|
||||
} else if (ShellCommandLineGetFlag (Package, L"-m")) {
|
||||
Mode = TestModeManufacturing;
|
||||
} else {
|
||||
ASSERT(FALSE);
|
||||
ASSERT (FALSE);
|
||||
}
|
||||
} else {
|
||||
//
|
||||
@ -394,53 +423,55 @@ ShellCommandRunDrvDiag (
|
||||
Mode = TestModeList;
|
||||
}
|
||||
|
||||
Lang = ShellCommandLineGetValue(Package, L"-l");
|
||||
if (ShellCommandLineGetFlag(Package, L"-l") && Lang == NULL) {
|
||||
ASSERT(Language == NULL);
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"drvdiag", L"-l");
|
||||
Lang = ShellCommandLineGetValue (Package, L"-l");
|
||||
if (ShellCommandLineGetFlag (Package, L"-l") && (Lang == NULL)) {
|
||||
ASSERT (Language == NULL);
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"drvdiag", L"-l");
|
||||
ShellCommandLineFreeVarList (Package);
|
||||
return (SHELL_INVALID_PARAMETER);
|
||||
} else if (Lang != NULL) {
|
||||
Language = AllocateZeroPool(StrSize(Lang));
|
||||
AsciiSPrint(Language, StrSize(Lang), "%S", Lang);
|
||||
Language = AllocateZeroPool (StrSize (Lang));
|
||||
AsciiSPrint (Language, StrSize (Lang), "%S", Lang);
|
||||
}
|
||||
|
||||
DriverHandleStr = ShellCommandLineGetRawValue(Package, 1);
|
||||
ControllerHandleStr = ShellCommandLineGetRawValue(Package, 2);
|
||||
ChildHandleStr = ShellCommandLineGetRawValue(Package, 3);
|
||||
DriverHandleStr = ShellCommandLineGetRawValue (Package, 1);
|
||||
ControllerHandleStr = ShellCommandLineGetRawValue (Package, 2);
|
||||
ChildHandleStr = ShellCommandLineGetRawValue (Package, 3);
|
||||
|
||||
if (DriverHandleStr == NULL) {
|
||||
Handle1 = NULL;
|
||||
} else {
|
||||
ShellConvertStringToUint64(DriverHandleStr, &Intermediate, TRUE, FALSE);
|
||||
Handle1 = ConvertHandleIndexToHandle((UINTN)Intermediate);
|
||||
ShellConvertStringToUint64 (DriverHandleStr, &Intermediate, TRUE, FALSE);
|
||||
Handle1 = ConvertHandleIndexToHandle ((UINTN)Intermediate);
|
||||
}
|
||||
|
||||
if (ControllerHandleStr == NULL) {
|
||||
Handle2 = NULL;
|
||||
} else {
|
||||
ShellConvertStringToUint64(ControllerHandleStr, &Intermediate, TRUE, FALSE);
|
||||
Handle2 = ConvertHandleIndexToHandle((UINTN)Intermediate);
|
||||
ShellConvertStringToUint64 (ControllerHandleStr, &Intermediate, TRUE, FALSE);
|
||||
Handle2 = ConvertHandleIndexToHandle ((UINTN)Intermediate);
|
||||
}
|
||||
|
||||
if (ChildHandleStr == NULL) {
|
||||
Handle3 = NULL;
|
||||
} else {
|
||||
ShellConvertStringToUint64(ChildHandleStr, &Intermediate, TRUE, FALSE);
|
||||
Handle3 = ConvertHandleIndexToHandle((UINTN)Intermediate);
|
||||
ShellConvertStringToUint64 (ChildHandleStr, &Intermediate, TRUE, FALSE);
|
||||
Handle3 = ConvertHandleIndexToHandle ((UINTN)Intermediate);
|
||||
}
|
||||
|
||||
Status = DoDiagnostics (
|
||||
Mode,
|
||||
Language,
|
||||
ShellCommandLineGetFlag(Package, L"-c"),
|
||||
Handle1,
|
||||
Handle2,
|
||||
Handle3
|
||||
);
|
||||
Mode,
|
||||
Language,
|
||||
ShellCommandLineGetFlag (Package, L"-c"),
|
||||
Handle1,
|
||||
Handle2,
|
||||
Handle3
|
||||
);
|
||||
|
||||
SHELL_FREE_NON_NULL(Language);
|
||||
SHELL_FREE_NON_NULL (Language);
|
||||
ShellCommandLineFreeVarList (Package);
|
||||
|
||||
}
|
||||
|
||||
if (ShellStatus == SHELL_SUCCESS) {
|
||||
if (Status == EFI_SECURITY_VIOLATION) {
|
||||
ShellStatus = SHELL_SECURITY_VIOLATION;
|
||||
@ -448,7 +479,7 @@ ShellCommandRunDrvDiag (
|
||||
ShellStatus = SHELL_INVALID_PARAMETER;
|
||||
} else if (Status == EFI_NOT_FOUND) {
|
||||
ShellStatus = SHELL_NOT_FOUND;
|
||||
} else if (EFI_ERROR(Status)) {
|
||||
} else if (EFI_ERROR (Status)) {
|
||||
ShellStatus = SHELL_NOT_FOUND;
|
||||
}
|
||||
}
|
||||
|
||||
@ -9,14 +9,14 @@
|
||||
|
||||
#include "UefiShellDriver1CommandsLib.h"
|
||||
|
||||
STATIC CONST CHAR16 StringHandProt[] = L"HandProt ";
|
||||
STATIC CONST CHAR16 StringGetProt[] = L"GetProt ";
|
||||
STATIC CONST CHAR16 StringTestProt[] = L"TestProt ";
|
||||
STATIC CONST CHAR16 StringChild[] = L"Child ";
|
||||
STATIC CONST CHAR16 StringDriver[] = L"Driver ";
|
||||
STATIC CONST CHAR16 StringExclusive[] = L"Exclusive";
|
||||
STATIC CONST CHAR16 StringDriverEx[] = L"DriverEx ";
|
||||
STATIC CONST CHAR16 StringUnknown[] = L"Unknown ";
|
||||
STATIC CONST CHAR16 StringHandProt[] = L"HandProt ";
|
||||
STATIC CONST CHAR16 StringGetProt[] = L"GetProt ";
|
||||
STATIC CONST CHAR16 StringTestProt[] = L"TestProt ";
|
||||
STATIC CONST CHAR16 StringChild[] = L"Child ";
|
||||
STATIC CONST CHAR16 StringDriver[] = L"Driver ";
|
||||
STATIC CONST CHAR16 StringExclusive[] = L"Exclusive";
|
||||
STATIC CONST CHAR16 StringDriverEx[] = L"DriverEx ";
|
||||
STATIC CONST CHAR16 StringUnknown[] = L"Unknown ";
|
||||
|
||||
/**
|
||||
Open the database and print out all the info about TheHandle.
|
||||
@ -28,21 +28,21 @@ STATIC CONST CHAR16 StringUnknown[] = L"Unknown ";
|
||||
**/
|
||||
EFI_STATUS
|
||||
TraverseHandleDatabase (
|
||||
IN CONST EFI_HANDLE TheHandle
|
||||
IN CONST EFI_HANDLE TheHandle
|
||||
)
|
||||
{
|
||||
EFI_STATUS Status;
|
||||
EFI_GUID **ProtocolGuidArray;
|
||||
UINTN ArrayCount;
|
||||
UINTN ProtocolIndex;
|
||||
EFI_OPEN_PROTOCOL_INFORMATION_ENTRY *OpenInfo;
|
||||
UINTN OpenInfoCount;
|
||||
UINTN OpenInfoIndex;
|
||||
CONST CHAR16 *OpenTypeString;
|
||||
CHAR16 *TempString;
|
||||
UINTN HandleIndex;
|
||||
CONST CHAR16 *Name;
|
||||
UINTN ControllerIndex;
|
||||
EFI_STATUS Status;
|
||||
EFI_GUID **ProtocolGuidArray;
|
||||
UINTN ArrayCount;
|
||||
UINTN ProtocolIndex;
|
||||
EFI_OPEN_PROTOCOL_INFORMATION_ENTRY *OpenInfo;
|
||||
UINTN OpenInfoCount;
|
||||
UINTN OpenInfoIndex;
|
||||
CONST CHAR16 *OpenTypeString;
|
||||
CHAR16 *TempString;
|
||||
UINTN HandleIndex;
|
||||
CONST CHAR16 *Name;
|
||||
UINTN ControllerIndex;
|
||||
|
||||
if (TheHandle == NULL) {
|
||||
return (EFI_INVALID_PARAMETER);
|
||||
@ -52,80 +52,91 @@ TraverseHandleDatabase (
|
||||
// Retrieve the list of all the protocols on the handle
|
||||
//
|
||||
Status = gBS->ProtocolsPerHandle (
|
||||
TheHandle,
|
||||
&ProtocolGuidArray,
|
||||
&ArrayCount
|
||||
);
|
||||
ASSERT_EFI_ERROR(Status);
|
||||
TheHandle,
|
||||
&ProtocolGuidArray,
|
||||
&ArrayCount
|
||||
);
|
||||
ASSERT_EFI_ERROR (Status);
|
||||
if (!EFI_ERROR (Status)) {
|
||||
|
||||
for (ProtocolIndex = 0; ProtocolIndex < ArrayCount; ProtocolIndex++) {
|
||||
//
|
||||
// print out the human readable name for this one.
|
||||
//
|
||||
TempString = GetStringNameFromGuid(ProtocolGuidArray[ProtocolIndex], NULL);
|
||||
TempString = GetStringNameFromGuid (ProtocolGuidArray[ProtocolIndex], NULL);
|
||||
if (TempString == NULL) {
|
||||
continue;
|
||||
}
|
||||
ShellPrintEx(-1, -1, L"%H%s%N\r\n", TempString);
|
||||
FreePool(TempString);
|
||||
|
||||
ShellPrintEx (-1, -1, L"%H%s%N\r\n", TempString);
|
||||
FreePool (TempString);
|
||||
|
||||
//
|
||||
// Retrieve the list of agents that have opened each protocol
|
||||
//
|
||||
Status = gBS->OpenProtocolInformation (
|
||||
TheHandle,
|
||||
ProtocolGuidArray[ProtocolIndex],
|
||||
&OpenInfo,
|
||||
&OpenInfoCount
|
||||
);
|
||||
ASSERT_EFI_ERROR(Status);
|
||||
TheHandle,
|
||||
ProtocolGuidArray[ProtocolIndex],
|
||||
&OpenInfo,
|
||||
&OpenInfoCount
|
||||
);
|
||||
ASSERT_EFI_ERROR (Status);
|
||||
if (!EFI_ERROR (Status)) {
|
||||
for (OpenInfoIndex = 0; OpenInfoIndex < OpenInfoCount; OpenInfoIndex++) {
|
||||
switch (OpenInfo[OpenInfoIndex].Attributes) {
|
||||
case EFI_OPEN_PROTOCOL_BY_HANDLE_PROTOCOL: OpenTypeString = StringHandProt; break;
|
||||
case EFI_OPEN_PROTOCOL_GET_PROTOCOL: OpenTypeString = StringGetProt; break;
|
||||
case EFI_OPEN_PROTOCOL_TEST_PROTOCOL: OpenTypeString = StringTestProt; break;
|
||||
case EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER: OpenTypeString = StringChild; break;
|
||||
case EFI_OPEN_PROTOCOL_BY_DRIVER: OpenTypeString = StringDriver; break;
|
||||
case EFI_OPEN_PROTOCOL_EXCLUSIVE: OpenTypeString = StringExclusive; break;
|
||||
case EFI_OPEN_PROTOCOL_BY_HANDLE_PROTOCOL: OpenTypeString = StringHandProt;
|
||||
break;
|
||||
case EFI_OPEN_PROTOCOL_GET_PROTOCOL: OpenTypeString = StringGetProt;
|
||||
break;
|
||||
case EFI_OPEN_PROTOCOL_TEST_PROTOCOL: OpenTypeString = StringTestProt;
|
||||
break;
|
||||
case EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER: OpenTypeString = StringChild;
|
||||
break;
|
||||
case EFI_OPEN_PROTOCOL_BY_DRIVER: OpenTypeString = StringDriver;
|
||||
break;
|
||||
case EFI_OPEN_PROTOCOL_EXCLUSIVE: OpenTypeString = StringExclusive;
|
||||
break;
|
||||
case EFI_OPEN_PROTOCOL_BY_DRIVER|EFI_OPEN_PROTOCOL_EXCLUSIVE:
|
||||
OpenTypeString = StringDriverEx; break;
|
||||
default: OpenTypeString = StringUnknown; break;
|
||||
OpenTypeString = StringDriverEx;
|
||||
break;
|
||||
default: OpenTypeString = StringUnknown;
|
||||
break;
|
||||
}
|
||||
HandleIndex = ConvertHandleToHandleIndex(OpenInfo[OpenInfoIndex].AgentHandle);
|
||||
Name = GetStringNameFromHandle(OpenInfo[OpenInfoIndex].AgentHandle, NULL);
|
||||
ControllerIndex = ConvertHandleToHandleIndex(OpenInfo[OpenInfoIndex].ControllerHandle);
|
||||
|
||||
HandleIndex = ConvertHandleToHandleIndex (OpenInfo[OpenInfoIndex].AgentHandle);
|
||||
Name = GetStringNameFromHandle (OpenInfo[OpenInfoIndex].AgentHandle, NULL);
|
||||
ControllerIndex = ConvertHandleToHandleIndex (OpenInfo[OpenInfoIndex].ControllerHandle);
|
||||
if (ControllerIndex != 0) {
|
||||
ShellPrintHiiEx(
|
||||
ShellPrintHiiEx (
|
||||
-1,
|
||||
-1,
|
||||
NULL,
|
||||
STRING_TOKEN(STR_OPENINFO_LINE),
|
||||
STRING_TOKEN (STR_OPENINFO_LINE),
|
||||
gShellDriver1HiiHandle,
|
||||
HandleIndex,
|
||||
ControllerIndex,
|
||||
OpenInfo[OpenInfoIndex].OpenCount,
|
||||
OpenTypeString,
|
||||
Name
|
||||
);
|
||||
);
|
||||
} else {
|
||||
ShellPrintHiiEx(
|
||||
ShellPrintHiiEx (
|
||||
-1,
|
||||
-1,
|
||||
NULL,
|
||||
STRING_TOKEN(STR_OPENINFO_MIN_LINE),
|
||||
STRING_TOKEN (STR_OPENINFO_MIN_LINE),
|
||||
gShellDriver1HiiHandle,
|
||||
HandleIndex,
|
||||
OpenInfo[OpenInfoIndex].OpenCount,
|
||||
OpenTypeString,
|
||||
Name
|
||||
);
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
FreePool (OpenInfo);
|
||||
}
|
||||
}
|
||||
|
||||
FreePool (ProtocolGuidArray);
|
||||
}
|
||||
|
||||
@ -145,66 +156,67 @@ ShellCommandRunOpenInfo (
|
||||
IN EFI_SYSTEM_TABLE *SystemTable
|
||||
)
|
||||
{
|
||||
EFI_STATUS Status;
|
||||
LIST_ENTRY *Package;
|
||||
CHAR16 *ProblemParam;
|
||||
SHELL_STATUS ShellStatus;
|
||||
EFI_HANDLE TheHandle;
|
||||
CONST CHAR16 *Param1;
|
||||
UINT64 Intermediate;
|
||||
EFI_STATUS Status;
|
||||
LIST_ENTRY *Package;
|
||||
CHAR16 *ProblemParam;
|
||||
SHELL_STATUS ShellStatus;
|
||||
EFI_HANDLE TheHandle;
|
||||
CONST CHAR16 *Param1;
|
||||
UINT64 Intermediate;
|
||||
|
||||
ShellStatus = SHELL_SUCCESS;
|
||||
ShellStatus = SHELL_SUCCESS;
|
||||
|
||||
//
|
||||
// initialize the shell lib (we must be in non-auto-init...)
|
||||
//
|
||||
Status = ShellInitialize();
|
||||
ASSERT_EFI_ERROR(Status);
|
||||
Status = ShellInitialize ();
|
||||
ASSERT_EFI_ERROR (Status);
|
||||
|
||||
Status = CommandInit();
|
||||
ASSERT_EFI_ERROR(Status);
|
||||
Status = CommandInit ();
|
||||
ASSERT_EFI_ERROR (Status);
|
||||
|
||||
//
|
||||
// parse the command line
|
||||
//
|
||||
Status = ShellCommandLineParse (EmptyParamList, &Package, &ProblemParam, TRUE);
|
||||
if (EFI_ERROR(Status)) {
|
||||
if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, L"openinfo", ProblemParam);
|
||||
FreePool(ProblemParam);
|
||||
if (EFI_ERROR (Status)) {
|
||||
if ((Status == EFI_VOLUME_CORRUPTED) && (ProblemParam != NULL)) {
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, L"openinfo", ProblemParam);
|
||||
FreePool (ProblemParam);
|
||||
ShellStatus = SHELL_INVALID_PARAMETER;
|
||||
} else {
|
||||
ASSERT(FALSE);
|
||||
ASSERT (FALSE);
|
||||
}
|
||||
} else {
|
||||
if (ShellCommandLineGetCount(Package) > 2){
|
||||
if (ShellCommandLineGetCount (Package) > 2) {
|
||||
//
|
||||
// error for too many parameters
|
||||
//
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"openinfo");
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"openinfo");
|
||||
ShellStatus = SHELL_INVALID_PARAMETER;
|
||||
} else if (ShellCommandLineGetCount(Package) == 0) {
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDriver1HiiHandle, L"openinfo");
|
||||
} else if (ShellCommandLineGetCount (Package) == 0) {
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDriver1HiiHandle, L"openinfo");
|
||||
ShellStatus = SHELL_INVALID_PARAMETER;
|
||||
} else {
|
||||
Param1 = ShellCommandLineGetRawValue(Package, 1);
|
||||
Status = ShellConvertStringToUint64(Param1, &Intermediate, TRUE, FALSE);
|
||||
if (EFI_ERROR(Status) || Param1 == NULL || ConvertHandleIndexToHandle((UINTN)Intermediate) == NULL){
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"openinfo", Param1);
|
||||
Param1 = ShellCommandLineGetRawValue (Package, 1);
|
||||
Status = ShellConvertStringToUint64 (Param1, &Intermediate, TRUE, FALSE);
|
||||
if (EFI_ERROR (Status) || (Param1 == NULL) || (ConvertHandleIndexToHandle ((UINTN)Intermediate) == NULL)) {
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"openinfo", Param1);
|
||||
ShellStatus = SHELL_INVALID_PARAMETER;
|
||||
} else {
|
||||
TheHandle = ConvertHandleIndexToHandle((UINTN)Intermediate);
|
||||
ASSERT(TheHandle != NULL);
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_OPENINFO_HEADER_LINE), gShellDriver1HiiHandle, (UINTN)Intermediate, TheHandle);
|
||||
TheHandle = ConvertHandleIndexToHandle ((UINTN)Intermediate);
|
||||
ASSERT (TheHandle != NULL);
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_OPENINFO_HEADER_LINE), gShellDriver1HiiHandle, (UINTN)Intermediate, TheHandle);
|
||||
|
||||
Status = TraverseHandleDatabase (TheHandle);
|
||||
if (!EFI_ERROR(Status)) {
|
||||
if (!EFI_ERROR (Status)) {
|
||||
} else {
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"openinfo", Param1);
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"openinfo", Param1);
|
||||
ShellStatus = SHELL_NOT_FOUND;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return (ShellStatus);
|
||||
}
|
||||
|
||||
@ -10,10 +10,10 @@
|
||||
|
||||
#include "UefiShellDriver1CommandsLib.h"
|
||||
|
||||
STATIC CONST SHELL_PARAM_ITEM ParamList[] = {
|
||||
{L"-r", TypeFlag},
|
||||
{NULL, TypeMax}
|
||||
};
|
||||
STATIC CONST SHELL_PARAM_ITEM ParamList[] = {
|
||||
{ L"-r", TypeFlag },
|
||||
{ NULL, TypeMax }
|
||||
};
|
||||
|
||||
/**
|
||||
Connect all the possible console devices.
|
||||
@ -24,16 +24,15 @@ ConnectAllConsoles (
|
||||
VOID
|
||||
)
|
||||
{
|
||||
ShellConnectFromDevPaths(L"ConInDev");
|
||||
ShellConnectFromDevPaths(L"ConOutDev");
|
||||
ShellConnectFromDevPaths(L"ErrOutDev");
|
||||
ShellConnectFromDevPaths (L"ConInDev");
|
||||
ShellConnectFromDevPaths (L"ConOutDev");
|
||||
ShellConnectFromDevPaths (L"ErrOutDev");
|
||||
|
||||
ShellConnectFromDevPaths(L"ErrOut");
|
||||
ShellConnectFromDevPaths(L"ConIn");
|
||||
ShellConnectFromDevPaths(L"ConOut");
|
||||
ShellConnectFromDevPaths (L"ErrOut");
|
||||
ShellConnectFromDevPaths (L"ConIn");
|
||||
ShellConnectFromDevPaths (L"ConOut");
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
Function for 'reconnect' command.
|
||||
|
||||
@ -47,42 +46,43 @@ ShellCommandRunReconnect (
|
||||
IN EFI_SYSTEM_TABLE *SystemTable
|
||||
)
|
||||
{
|
||||
SHELL_STATUS ShellStatus;
|
||||
LIST_ENTRY *Package;
|
||||
CHAR16 *ProblemParam;
|
||||
EFI_STATUS Status;
|
||||
SHELL_STATUS ShellStatus;
|
||||
LIST_ENTRY *Package;
|
||||
CHAR16 *ProblemParam;
|
||||
EFI_STATUS Status;
|
||||
|
||||
gInReconnect = TRUE;
|
||||
ShellStatus = SHELL_SUCCESS;
|
||||
ShellStatus = SHELL_SUCCESS;
|
||||
|
||||
//
|
||||
// initialize the shell lib (we must be in non-auto-init...)
|
||||
//
|
||||
Status = ShellInitialize();
|
||||
ASSERT_EFI_ERROR(Status);
|
||||
Status = ShellInitialize ();
|
||||
ASSERT_EFI_ERROR (Status);
|
||||
|
||||
Status = CommandInit();
|
||||
ASSERT_EFI_ERROR(Status);
|
||||
Status = CommandInit ();
|
||||
ASSERT_EFI_ERROR (Status);
|
||||
|
||||
//
|
||||
// parse the command line
|
||||
//
|
||||
Status = ShellCommandLineParse (ParamList, &Package, &ProblemParam, TRUE);
|
||||
if (EFI_ERROR(Status)) {
|
||||
if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, L"reconnect", ProblemParam);
|
||||
FreePool(ProblemParam);
|
||||
if (EFI_ERROR (Status)) {
|
||||
if ((Status == EFI_VOLUME_CORRUPTED) && (ProblemParam != NULL)) {
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, L"reconnect", ProblemParam);
|
||||
FreePool (ProblemParam);
|
||||
ShellStatus = SHELL_INVALID_PARAMETER;
|
||||
} else {
|
||||
ASSERT(FALSE);
|
||||
ASSERT (FALSE);
|
||||
}
|
||||
} else {
|
||||
ShellStatus = ShellCommandRunDisconnect(ImageHandle, SystemTable);
|
||||
ShellStatus = ShellCommandRunDisconnect (ImageHandle, SystemTable);
|
||||
if (ShellStatus == SHELL_SUCCESS) {
|
||||
if (ShellCommandLineGetFlag(Package, L"-r")) {
|
||||
ConnectAllConsoles();
|
||||
if (ShellCommandLineGetFlag (Package, L"-r")) {
|
||||
ConnectAllConsoles ();
|
||||
}
|
||||
ShellStatus = ShellCommandRunConnect(ImageHandle, SystemTable);
|
||||
|
||||
ShellStatus = ShellCommandRunConnect (ImageHandle, SystemTable);
|
||||
}
|
||||
}
|
||||
|
||||
@ -90,4 +90,3 @@ ShellCommandRunReconnect (
|
||||
|
||||
return (ShellStatus);
|
||||
}
|
||||
|
||||
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
#include "UefiShellDriver1CommandsLib.h"
|
||||
|
||||
STATIC CONST CHAR16 mFileName[] = L"Driver1Commands";
|
||||
EFI_HII_HANDLE gShellDriver1HiiHandle = NULL;
|
||||
BOOLEAN gInReconnect = FALSE;
|
||||
STATIC CONST CHAR16 mFileName[] = L"Driver1Commands";
|
||||
EFI_HII_HANDLE gShellDriver1HiiHandle = NULL;
|
||||
BOOLEAN gInReconnect = FALSE;
|
||||
|
||||
/**
|
||||
Function to return the name of the file containing help if HII will not be used.
|
||||
|
||||
@return The filename.
|
||||
**/
|
||||
CONST CHAR16*
|
||||
CONST CHAR16 *
|
||||
EFIAPI
|
||||
ShellCommandGetManFileNameDriver1 (
|
||||
VOID
|
||||
@ -45,7 +45,7 @@ UefiShellDriver1CommandsLibConstructor (
|
||||
//
|
||||
// check our bit of the profiles mask
|
||||
//
|
||||
if ((PcdGet8(PcdShellProfileMask) & BIT0) == 0) {
|
||||
if ((PcdGet8 (PcdShellProfileMask) & BIT0) == 0) {
|
||||
return (EFI_SUCCESS);
|
||||
}
|
||||
|
||||
@ -60,17 +60,17 @@ UefiShellDriver1CommandsLibConstructor (
|
||||
//
|
||||
// install our shell command handlers that are always installed
|
||||
//
|
||||
ShellCommandRegisterCommandName(L"connect", ShellCommandRunConnect , ShellCommandGetManFileNameDriver1, 0, L"Driver1", TRUE, gShellDriver1HiiHandle, STRING_TOKEN(STR_GET_HELP_CONNECT) );
|
||||
ShellCommandRegisterCommandName(L"devices", ShellCommandRunDevices , ShellCommandGetManFileNameDriver1, 0, L"Driver1", TRUE, gShellDriver1HiiHandle, STRING_TOKEN(STR_GET_HELP_DEVICES) );
|
||||
ShellCommandRegisterCommandName(L"openinfo", ShellCommandRunOpenInfo , ShellCommandGetManFileNameDriver1, 0, L"Driver1", TRUE, gShellDriver1HiiHandle, STRING_TOKEN(STR_GET_HELP_OPENINFO) );
|
||||
ShellCommandRegisterCommandName(L"disconnect", ShellCommandRunDisconnect , ShellCommandGetManFileNameDriver1, 0, L"Driver1", TRUE, gShellDriver1HiiHandle, STRING_TOKEN(STR_GET_HELP_DISCONNECT));
|
||||
ShellCommandRegisterCommandName(L"reconnect", ShellCommandRunReconnect , ShellCommandGetManFileNameDriver1, 0, L"Driver1", TRUE, gShellDriver1HiiHandle, STRING_TOKEN(STR_GET_HELP_RECONNECT) );
|
||||
ShellCommandRegisterCommandName(L"unload", ShellCommandRunUnload , ShellCommandGetManFileNameDriver1, 0, L"Driver1", TRUE, gShellDriver1HiiHandle, STRING_TOKEN(STR_GET_HELP_UNLOAD) );
|
||||
ShellCommandRegisterCommandName(L"drvdiag", ShellCommandRunDrvDiag , ShellCommandGetManFileNameDriver1, 0, L"Driver1", TRUE, gShellDriver1HiiHandle, STRING_TOKEN(STR_GET_HELP_DRVDIAG) );
|
||||
ShellCommandRegisterCommandName(L"dh", ShellCommandRunDh , ShellCommandGetManFileNameDriver1, 0, L"Driver1", TRUE, gShellDriver1HiiHandle, STRING_TOKEN(STR_GET_HELP_DH) );
|
||||
ShellCommandRegisterCommandName(L"drivers", ShellCommandRunDrivers , ShellCommandGetManFileNameDriver1, 0, L"Driver1", TRUE, gShellDriver1HiiHandle, STRING_TOKEN(STR_GET_HELP_DRIVERS) );
|
||||
ShellCommandRegisterCommandName(L"devtree", ShellCommandRunDevTree , ShellCommandGetManFileNameDriver1, 0, L"Driver1", TRUE, gShellDriver1HiiHandle, STRING_TOKEN(STR_GET_HELP_DEVTREE) );
|
||||
ShellCommandRegisterCommandName(L"drvcfg", ShellCommandRunDrvCfg , ShellCommandGetManFileNameDriver1, 0, L"Driver1", TRUE, gShellDriver1HiiHandle, STRING_TOKEN(STR_GET_HELP_DRVCFG) );
|
||||
ShellCommandRegisterCommandName (L"connect", ShellCommandRunConnect, ShellCommandGetManFileNameDriver1, 0, L"Driver1", TRUE, gShellDriver1HiiHandle, STRING_TOKEN (STR_GET_HELP_CONNECT));
|
||||
ShellCommandRegisterCommandName (L"devices", ShellCommandRunDevices, ShellCommandGetManFileNameDriver1, 0, L"Driver1", TRUE, gShellDriver1HiiHandle, STRING_TOKEN (STR_GET_HELP_DEVICES));
|
||||
ShellCommandRegisterCommandName (L"openinfo", ShellCommandRunOpenInfo, ShellCommandGetManFileNameDriver1, 0, L"Driver1", TRUE, gShellDriver1HiiHandle, STRING_TOKEN (STR_GET_HELP_OPENINFO));
|
||||
ShellCommandRegisterCommandName (L"disconnect", ShellCommandRunDisconnect, ShellCommandGetManFileNameDriver1, 0, L"Driver1", TRUE, gShellDriver1HiiHandle, STRING_TOKEN (STR_GET_HELP_DISCONNECT));
|
||||
ShellCommandRegisterCommandName (L"reconnect", ShellCommandRunReconnect, ShellCommandGetManFileNameDriver1, 0, L"Driver1", TRUE, gShellDriver1HiiHandle, STRING_TOKEN (STR_GET_HELP_RECONNECT));
|
||||
ShellCommandRegisterCommandName (L"unload", ShellCommandRunUnload, ShellCommandGetManFileNameDriver1, 0, L"Driver1", TRUE, gShellDriver1HiiHandle, STRING_TOKEN (STR_GET_HELP_UNLOAD));
|
||||
ShellCommandRegisterCommandName (L"drvdiag", ShellCommandRunDrvDiag, ShellCommandGetManFileNameDriver1, 0, L"Driver1", TRUE, gShellDriver1HiiHandle, STRING_TOKEN (STR_GET_HELP_DRVDIAG));
|
||||
ShellCommandRegisterCommandName (L"dh", ShellCommandRunDh, ShellCommandGetManFileNameDriver1, 0, L"Driver1", TRUE, gShellDriver1HiiHandle, STRING_TOKEN (STR_GET_HELP_DH));
|
||||
ShellCommandRegisterCommandName (L"drivers", ShellCommandRunDrivers, ShellCommandGetManFileNameDriver1, 0, L"Driver1", TRUE, gShellDriver1HiiHandle, STRING_TOKEN (STR_GET_HELP_DRIVERS));
|
||||
ShellCommandRegisterCommandName (L"devtree", ShellCommandRunDevTree, ShellCommandGetManFileNameDriver1, 0, L"Driver1", TRUE, gShellDriver1HiiHandle, STRING_TOKEN (STR_GET_HELP_DEVTREE));
|
||||
ShellCommandRegisterCommandName (L"drvcfg", ShellCommandRunDrvCfg, ShellCommandGetManFileNameDriver1, 0, L"Driver1", TRUE, gShellDriver1HiiHandle, STRING_TOKEN (STR_GET_HELP_DRVCFG));
|
||||
|
||||
return (EFI_SUCCESS);
|
||||
}
|
||||
@ -89,10 +89,8 @@ UefiShellDriver1CommandsLibDestructor (
|
||||
)
|
||||
{
|
||||
if (gShellDriver1HiiHandle != NULL) {
|
||||
HiiRemovePackages(gShellDriver1HiiHandle);
|
||||
HiiRemovePackages (gShellDriver1HiiHandle);
|
||||
}
|
||||
|
||||
return (EFI_SUCCESS);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
@ -57,9 +57,8 @@
|
||||
#include <Library/PeCoffGetEntryPointLib.h>
|
||||
#include <Library/HandleParsingLib.h>
|
||||
|
||||
|
||||
extern EFI_HII_HANDLE gShellDriver1HiiHandle;
|
||||
extern BOOLEAN gInReconnect;
|
||||
extern EFI_HII_HANDLE gShellDriver1HiiHandle;
|
||||
extern BOOLEAN gInReconnect;
|
||||
|
||||
/**
|
||||
Function for 'connect' command.
|
||||
@ -213,10 +212,7 @@ ShellCommandRunUnload (
|
||||
**/
|
||||
EFI_STATUS
|
||||
ShellConnectFromDevPaths (
|
||||
IN CONST CHAR16 *Key
|
||||
IN CONST CHAR16 *Key
|
||||
);
|
||||
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
@ -19,26 +19,26 @@
|
||||
**/
|
||||
EFI_STATUS
|
||||
DumpLoadedImageProtocolInfo (
|
||||
IN EFI_HANDLE TheHandle
|
||||
IN EFI_HANDLE TheHandle
|
||||
)
|
||||
{
|
||||
CHAR16 *TheString;
|
||||
CHAR16 *TheString;
|
||||
|
||||
TheString = GetProtocolInformationDump(TheHandle, &gEfiLoadedImageProtocolGuid, TRUE);
|
||||
TheString = GetProtocolInformationDump (TheHandle, &gEfiLoadedImageProtocolGuid, TRUE);
|
||||
|
||||
ShellPrintEx(-1, -1, L"%s", TheString);
|
||||
ShellPrintEx (-1, -1, L"%s", TheString);
|
||||
|
||||
SHELL_FREE_NON_NULL(TheString);
|
||||
SHELL_FREE_NON_NULL (TheString);
|
||||
|
||||
return (EFI_SUCCESS);
|
||||
}
|
||||
|
||||
STATIC CONST SHELL_PARAM_ITEM ParamList[] = {
|
||||
{L"-n", TypeFlag},
|
||||
{L"-v", TypeFlag},
|
||||
{L"-verbose", TypeFlag},
|
||||
{NULL, TypeMax}
|
||||
};
|
||||
STATIC CONST SHELL_PARAM_ITEM ParamList[] = {
|
||||
{ L"-n", TypeFlag },
|
||||
{ L"-v", TypeFlag },
|
||||
{ L"-verbose", TypeFlag },
|
||||
{ NULL, TypeMax }
|
||||
};
|
||||
|
||||
/**
|
||||
Function for 'unload' command.
|
||||
@ -53,89 +53,92 @@ ShellCommandRunUnload (
|
||||
IN EFI_SYSTEM_TABLE *SystemTable
|
||||
)
|
||||
{
|
||||
EFI_STATUS Status;
|
||||
LIST_ENTRY *Package;
|
||||
CHAR16 *ProblemParam;
|
||||
SHELL_STATUS ShellStatus;
|
||||
EFI_HANDLE TheHandle;
|
||||
CONST CHAR16 *Param1;
|
||||
SHELL_PROMPT_RESPONSE *Resp;
|
||||
UINT64 Value;
|
||||
EFI_STATUS Status;
|
||||
LIST_ENTRY *Package;
|
||||
CHAR16 *ProblemParam;
|
||||
SHELL_STATUS ShellStatus;
|
||||
EFI_HANDLE TheHandle;
|
||||
CONST CHAR16 *Param1;
|
||||
SHELL_PROMPT_RESPONSE *Resp;
|
||||
UINT64 Value;
|
||||
|
||||
ShellStatus = SHELL_SUCCESS;
|
||||
Package = NULL;
|
||||
Resp = NULL;
|
||||
Value = 0;
|
||||
TheHandle = NULL;
|
||||
ShellStatus = SHELL_SUCCESS;
|
||||
Package = NULL;
|
||||
Resp = NULL;
|
||||
Value = 0;
|
||||
TheHandle = NULL;
|
||||
|
||||
//
|
||||
// initialize the shell lib (we must be in non-auto-init...)
|
||||
//
|
||||
Status = ShellInitialize();
|
||||
ASSERT_EFI_ERROR(Status);
|
||||
Status = ShellInitialize ();
|
||||
ASSERT_EFI_ERROR (Status);
|
||||
|
||||
//
|
||||
// parse the command line
|
||||
//
|
||||
Status = ShellCommandLineParse (ParamList, &Package, &ProblemParam, TRUE);
|
||||
if (EFI_ERROR(Status)) {
|
||||
if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle,L"unload", ProblemParam);
|
||||
FreePool(ProblemParam);
|
||||
if (EFI_ERROR (Status)) {
|
||||
if ((Status == EFI_VOLUME_CORRUPTED) && (ProblemParam != NULL)) {
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, L"unload", ProblemParam);
|
||||
FreePool (ProblemParam);
|
||||
ShellStatus = SHELL_INVALID_PARAMETER;
|
||||
} else {
|
||||
ASSERT(FALSE);
|
||||
ASSERT (FALSE);
|
||||
}
|
||||
} else {
|
||||
if (ShellCommandLineGetCount(Package) > 2){
|
||||
if (ShellCommandLineGetCount (Package) > 2) {
|
||||
//
|
||||
// error for too many parameters
|
||||
//
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"unload");
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"unload");
|
||||
ShellStatus = SHELL_INVALID_PARAMETER;
|
||||
} else if (ShellCommandLineGetCount(Package) < 2) {
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDriver1HiiHandle, L"unload");
|
||||
} else if (ShellCommandLineGetCount (Package) < 2) {
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDriver1HiiHandle, L"unload");
|
||||
ShellStatus = SHELL_INVALID_PARAMETER;
|
||||
} else {
|
||||
Param1 = ShellCommandLineGetRawValue(Package, 1);
|
||||
Param1 = ShellCommandLineGetRawValue (Package, 1);
|
||||
if (Param1 != NULL) {
|
||||
Status = ShellConvertStringToUint64(Param1, &Value, TRUE, FALSE);
|
||||
TheHandle = ConvertHandleIndexToHandle((UINTN)Value);
|
||||
Status = ShellConvertStringToUint64 (Param1, &Value, TRUE, FALSE);
|
||||
TheHandle = ConvertHandleIndexToHandle ((UINTN)Value);
|
||||
}
|
||||
|
||||
if (EFI_ERROR(Status) || Param1 == NULL || TheHandle == NULL){
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"unload", Param1);
|
||||
if (EFI_ERROR (Status) || (Param1 == NULL) || (TheHandle == NULL)) {
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"unload", Param1);
|
||||
ShellStatus = SHELL_INVALID_PARAMETER;
|
||||
} else {
|
||||
ASSERT(TheHandle != NULL);
|
||||
if (ShellCommandLineGetFlag(Package, L"-v") || ShellCommandLineGetFlag(Package, L"-verbose")) {
|
||||
DumpLoadedImageProtocolInfo(TheHandle);
|
||||
ASSERT (TheHandle != NULL);
|
||||
if (ShellCommandLineGetFlag (Package, L"-v") || ShellCommandLineGetFlag (Package, L"-verbose")) {
|
||||
DumpLoadedImageProtocolInfo (TheHandle);
|
||||
}
|
||||
|
||||
if (!ShellCommandLineGetFlag(Package, L"-n")) {
|
||||
Status = ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN(STR_UNLOAD_CONF), gShellDriver1HiiHandle, (UINTN)TheHandle);
|
||||
Status = ShellPromptForResponse(ShellPromptResponseTypeYesNo, NULL, (VOID**)&Resp);
|
||||
if (!ShellCommandLineGetFlag (Package, L"-n")) {
|
||||
Status = ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_UNLOAD_CONF), gShellDriver1HiiHandle, (UINTN)TheHandle);
|
||||
Status = ShellPromptForResponse (ShellPromptResponseTypeYesNo, NULL, (VOID **)&Resp);
|
||||
}
|
||||
if (ShellCommandLineGetFlag(Package, L"-n") || (Resp != NULL && *Resp == ShellPromptResponseYes)) {
|
||||
Status = gBS->UnloadImage(TheHandle);
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_HANDLE_RESULT), gShellDriver1HiiHandle, L"Unload", (UINTN)TheHandle, Status);
|
||||
|
||||
if (ShellCommandLineGetFlag (Package, L"-n") || ((Resp != NULL) && (*Resp == ShellPromptResponseYes))) {
|
||||
Status = gBS->UnloadImage (TheHandle);
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_HANDLE_RESULT), gShellDriver1HiiHandle, L"Unload", (UINTN)TheHandle, Status);
|
||||
}
|
||||
SHELL_FREE_NON_NULL(Resp);
|
||||
|
||||
SHELL_FREE_NON_NULL (Resp);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (ShellStatus == SHELL_SUCCESS) {
|
||||
if (Status == EFI_SECURITY_VIOLATION) {
|
||||
ShellStatus = SHELL_SECURITY_VIOLATION;
|
||||
} else if (Status == EFI_INVALID_PARAMETER) {
|
||||
ShellStatus = SHELL_INVALID_PARAMETER;
|
||||
} else if (EFI_ERROR(Status)) {
|
||||
} else if (EFI_ERROR (Status)) {
|
||||
ShellStatus = SHELL_NOT_FOUND;
|
||||
}
|
||||
}
|
||||
|
||||
if (Package != NULL) {
|
||||
ShellCommandLineFreeVarList(Package);
|
||||
ShellCommandLineFreeVarList (Package);
|
||||
}
|
||||
|
||||
return (ShellStatus);
|
||||
|
||||
Reference in New Issue
Block a user