diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvCfg.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvCfg.c index 074a49c3be..bd5a825ad4 100644 --- a/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvCfg.c +++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvCfg.c @@ -16,287 +16,1074 @@ #include #include +STATIC CONST EFI_GUID *CfgGuidList[] = {&gEfiDriverConfigurationProtocolGuid, &gEfiDriverConfiguration2ProtocolGuid, NULL}; + /** - Function to validate configuration information on a configurable handle. + Find the EFI_HII_HANDLE by device path. - @param[in] Handle The handle to validate info on. - @param[in] HiiDb A pointer to the HII Database protocol. + @param[in] DevPath1 The Device Path to match. + @param[out] HiiHandle The EFI_HII_HANDLE after the converstion. + @param[in] HiiDb The Hii database protocol - @retval EFI_SUCCESS The operation was successful. + @retval EFI_SUCCESS The operation was successful. + @retval EFI_NOT_FOUND There was no EFI_HII_HANDLE found for that deviec path. **/ EFI_STATUS EFIAPI -ValidateConfigInfoOnSingleHandleHii( - IN CONST EFI_HANDLE Handle, - IN EFI_HII_DATABASE_PROTOCOL *HiiDb +FindHiiHandleViaDevPath( + IN CONST EFI_DEVICE_PATH_PROTOCOL *DevPath1, + OUT EFI_HII_HANDLE *HiiHandle, + IN EFI_HII_DATABASE_PROTOCOL *HiiDb ) { - EFI_STATUS Status; - UINTN Size; - EFI_HII_HANDLE *HiiHandle; - EFI_HII_HANDLE *CurrentHandle; - EFI_HANDLE NormalHandle; + EFI_HII_HANDLE *HandleBuffer; + UINTN HandleBufferSize; + VOID *MainBuffer; + UINTN MainBufferSize; + EFI_HII_PACKAGE_LIST_HEADER *PackageListHeader; + EFI_HII_PACKAGE_HEADER *PackageHeader; + UINTN LoopVariable; + EFI_DEVICE_PATH_PROTOCOL *DevPath2; + EFI_STATUS Status; - if (HiiDb == NULL || Handle == NULL) { - return (EFI_INVALID_PARAMETER); - } - - Size = 0; - HiiHandle = NULL; - - Status = HiiDb->ListPackageLists( - HiiDb, - EFI_HII_PACKAGE_TYPE_ALL, - NULL, - &Size, - HiiHandle); + ASSERT(DevPath1 != NULL); + ASSERT(HiiHandle != NULL); + ASSERT(*HiiHandle == NULL); + ASSERT(HiiDb != NULL); + HandleBufferSize = 0; + HandleBuffer = NULL; + Status = HiiDb->ListPackageLists(HiiDb, EFI_HII_PACKAGE_DEVICE_PATH, NULL, &HandleBufferSize, HandleBuffer); if (Status == EFI_BUFFER_TOO_SMALL) { - HiiHandle = AllocateZeroPool(Size); - if (HiiHandle == NULL) { - return (EFI_OUT_OF_RESOURCES); - } - Status = HiiDb->ListPackageLists( - HiiDb, - EFI_HII_PACKAGE_TYPE_ALL, - NULL, - &Size, - HiiHandle); + HandleBuffer = AllocateZeroPool(HandleBufferSize); + Status = HiiDb->ListPackageLists(HiiDb, EFI_HII_PACKAGE_DEVICE_PATH, NULL, &HandleBufferSize, HandleBuffer); } if (EFI_ERROR(Status)) { - SHELL_FREE_NON_NULL(HiiHandle); + SHELL_FREE_NON_NULL(HandleBuffer); return (Status); } - for (CurrentHandle = HiiHandle ; CurrentHandle != NULL && *CurrentHandle != NULL ; CurrentHandle++) { - NormalHandle = NULL; - Status = HiiDb->GetPackageListHandle( - HiiDb, - *CurrentHandle, - &NormalHandle); - if (NormalHandle == Handle) { - break; + for (LoopVariable = 0 ; LoopVariable < (HandleBufferSize/sizeof(HandleBuffer[0])) && *HiiHandle == NULL ; LoopVariable++) { + MainBufferSize = 0; + MainBuffer = NULL; + Status = HiiDb->ExportPackageLists(HiiDb, HandleBuffer[LoopVariable], &MainBufferSize, MainBuffer); + if (Status == EFI_BUFFER_TOO_SMALL) { + MainBuffer = AllocateZeroPool(MainBufferSize); + Status = HiiDb->ExportPackageLists(HiiDb, HandleBuffer[LoopVariable], &MainBufferSize, MainBuffer); } + // + // Enumerate through the block of returned memory. + // This should actually be a small block, but we need to be sure. + // + for (PackageListHeader = (EFI_HII_PACKAGE_LIST_HEADER*)MainBuffer + ; PackageListHeader != NULL && ((CHAR8*)PackageListHeader) < (((CHAR8*)MainBuffer)+MainBufferSize) && *HiiHandle == NULL + ; PackageListHeader = (EFI_HII_PACKAGE_LIST_HEADER*)(((CHAR8*)(PackageListHeader)) + PackageListHeader->PackageLength )) { + for (PackageHeader = (EFI_HII_PACKAGE_HEADER*)(((CHAR8*)(PackageListHeader))+sizeof(EFI_HII_PACKAGE_LIST_HEADER)) + ; PackageHeader != NULL && ((CHAR8*)PackageHeader) < (((CHAR8*)MainBuffer)+MainBufferSize) && PackageHeader->Type != EFI_HII_PACKAGE_END && *HiiHandle == NULL + ; PackageHeader = (EFI_HII_PACKAGE_HEADER*)(((CHAR8*)(PackageHeader))+PackageHeader->Length)) { + if (PackageHeader->Type == EFI_HII_PACKAGE_DEVICE_PATH) { + DevPath2 = (EFI_DEVICE_PATH_PROTOCOL*)(((CHAR8*)PackageHeader) + sizeof(EFI_HII_PACKAGE_HEADER)); + if (DevicePathCompare(&DevPath1, &DevPath2) == 0) { + *HiiHandle = HandleBuffer[LoopVariable]; + break; + } + } + } + } + SHELL_FREE_NON_NULL(MainBuffer); } + SHELL_FREE_NON_NULL(HandleBuffer); - - - - - SHELL_FREE_NON_NULL(HiiHandle); - return (Status); + if (*HiiHandle == NULL) { + return (EFI_NOT_FOUND); + } + return (EFI_SUCCESS); } /** - Function to validate configuration information on all configurable handles. + Convert a EFI_HANDLE to a EFI_HII_HANDLE. - @param[in] ChildrenToo TRUE to tewst for children. + @param[in] Handle The EFI_HANDLE to convert. + @param[out] HiiHandle The EFI_HII_HANDLE after the converstion. + @param[in] HiiDb The Hii database protocol - @retval SHELL_SUCCESS The operation was successful. + @retval EFI_SUCCESS The operation was successful. +**/ +EFI_STATUS +EFIAPI +ConvertHandleToHiiHandle( + IN CONST EFI_HANDLE Handle, + OUT EFI_HII_HANDLE *HiiHandle, + IN EFI_HII_DATABASE_PROTOCOL *HiiDb + ) +{ + EFI_STATUS Status; + EFI_DEVICE_PATH_PROTOCOL *DevPath1; + + if (HiiHandle == NULL || HiiDb == NULL) { + return (EFI_INVALID_PARAMETER); + } + *HiiHandle = NULL; + + if (Handle == NULL) { + return (EFI_SUCCESS); + } + + DevPath1 = NULL; + Status = gBS->OpenProtocol(Handle, &gEfiDevicePathProtocolGuid, (VOID**)&DevPath1, gImageHandle, NULL, EFI_OPEN_PROTOCOL_GET_PROTOCOL); + if (EFI_ERROR(Status) || DevPath1 == NULL) { + return (EFI_NOT_FOUND); + } + + return (FindHiiHandleViaDevPath(DevPath1, HiiHandle, HiiDb)); +} + +/** + Function to print out all HII configuration information to a file. + + @param[in] Handle The handle to get info on. NULL to do all handles. + @param[in] FileName The filename to rwite the info to. **/ SHELL_STATUS EFIAPI -ValidOptionsOnAll( - IN CONST BOOLEAN ChildrenToo +ConfigToFile( + IN CONST EFI_HANDLE Handle, + IN CONST CHAR16 *FileName ) { - EFI_HANDLE *HandleList; - EFI_HANDLE *CurrentHandle; - SHELL_STATUS ShellStatus; - EFI_STATUS Status; - BOOLEAN Found; - EFI_HII_DATABASE_PROTOCOL *HiiDb; + EFI_HII_DATABASE_PROTOCOL *HiiDatabase; + EFI_STATUS Status; + VOID *MainBuffer; + UINTN MainBufferSize; + EFI_HII_HANDLE HiiHandle; + SHELL_FILE_HANDLE FileHandle; - Found = FALSE; - HandleList = NULL; - ShellStatus = SHELL_SUCCESS; - Status = EFI_SUCCESS; + HiiDatabase = NULL; + MainBufferSize = 0; + MainBuffer = NULL; + FileHandle = NULL; - Status = gBS->LocateProtocol(&gEfiHiiDatabaseProtocolGuid, NULL, (VOID**)&HiiDb); + Status = ShellOpenFileByName(FileName, &FileHandle, EFI_FILE_MODE_READ|EFI_FILE_MODE_WRITE|EFI_FILE_MODE_CREATE, 0); if (EFI_ERROR(Status)) { - ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROTOCOL_NF), gShellDriver1HiiHandle, L"gEfiHiiDatabaseProtocolGuid", &gEfiHiiDatabaseProtocolGuid); + ShellPrintHiiEx( + -1, + -1, + NULL, + STRING_TOKEN(STR_GEN_FILE_OPEN), + gShellDriver1HiiHandle, + FileName, + Status); + return (SHELL_DEVICE_ERROR); + } + + // + // Locate HII Database protocol + // + Status = gBS->LocateProtocol ( + &gEfiHiiDatabaseProtocolGuid, + NULL, + (VOID **) &HiiDatabase + ); + + if (EFI_ERROR(Status) || HiiDatabase == NULL) { + ShellPrintHiiEx( + -1, + -1, + NULL, + STRING_TOKEN(STR_GEN_PROTOCOL_NF), + gShellDriver1HiiHandle, + L"EfiHiiDatabaseProtocol", + &gEfiHiiDatabaseProtocolGuid); + ShellCloseFile(&FileHandle); return (SHELL_NOT_FOUND); } - ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_DRVCFG_HEADER), gShellDriver1HiiHandle); - - // - // First do HII method - // - HandleList = GetHandleListByProtocol(&gEfiHiiConfigAccessProtocolGuid); - for (CurrentHandle = HandleList ; CurrentHandle != NULL && *CurrentHandle != NULL && ShellStatus == SHELL_SUCCESS; CurrentHandle++){ - Found = TRUE; - ///@todo VALIDATE - } - SHELL_FREE_NON_NULL(HandleList); - - // - // Now do EFI 1.10 & UEFI 2.0 drivers - // - HandleList = GetHandleListByProtocol(&gEfiDriverConfigurationProtocolGuid); - for (CurrentHandle = HandleList ; CurrentHandle != NULL && *CurrentHandle != NULL && ShellStatus == SHELL_SUCCESS; CurrentHandle++){ - Found = TRUE; - ///@todo VALIDATE - } - - if (!Found) { - ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_DRVCFG_NONE), gShellDriver1HiiHandle); - return (SHELL_SUCCESS); - } - - SHELL_FREE_NON_NULL(HandleList); - return (ShellStatus); -} - -/** - Function to print out configuration information on a configurable handle. - - @param[in] DriverHandle The driver handle to print info on. - @param[in] ControllerHandle The controllerHandle to print on. - @param[in] ChildrenToo TRUE to tewst for children. - @param[in] ProtocolMask BIT0 for HII, BIT1 for DirverConfiguration. - - @retval SHELL_SUCCESS The operation was successful. -**/ -SHELL_STATUS -EFIAPI -PrintConfigInfoOnSingleHandle( - IN CONST EFI_HANDLE DriverHandle, - IN CONST EFI_HANDLE ControllerHandle OPTIONAL, - IN CONST BOOLEAN ChildrenToo, - IN CONST UINT8 ProtocolMask // BIT0 - HII, BIT1 - DriverConfiguration - ) -{ - UINTN Index1; - UINTN Index2; - EFI_HANDLE *ChildHandleList; - UINTN Count; - UINTN LoopVar; - - Index1 = DriverHandle == NULL ? 0 : ConvertHandleToHandleIndex(DriverHandle ); - Index2 = ControllerHandle == NULL ? 0 : ConvertHandleToHandleIndex(ControllerHandle); - - if ((ProtocolMask & BIT0) == BIT0) { - ASSERT(Index1 == 0); + Status = ConvertHandleToHiiHandle(Handle, &HiiHandle, HiiDatabase); + if (EFI_ERROR(Status)) { ShellPrintHiiEx( -1, -1, NULL, - STRING_TOKEN (STR_DRVCFG_LINE_HII), + STRING_TOKEN(STR_GEN_HANDLE_NOT), gShellDriver1HiiHandle, - Index2 - ); + ConvertHandleToHandleIndex(Handle), + L"Device"); + ShellCloseFile(&FileHandle); + return (SHELL_DEVICE_ERROR); } - if ((ProtocolMask & BIT1) == BIT1) { - PARSE_HANDLE_DATABASE_MANAGED_CHILDREN(DriverHandle, ControllerHandle, &Count, &ChildHandleList); - for (LoopVar = 0 ; LoopVar <= Count ; LoopVar++) { + + Status = HiiDatabase->ExportPackageLists(HiiDatabase, HiiHandle, &MainBufferSize, MainBuffer); + if (Status == EFI_BUFFER_TOO_SMALL) { + MainBuffer = AllocateZeroPool(MainBufferSize); + Status = HiiDatabase->ExportPackageLists(HiiDatabase, HiiHandle, &MainBufferSize, MainBuffer); + } + + Status = ShellWriteFile(FileHandle, &MainBufferSize, MainBuffer); + + ShellCloseFile(&FileHandle); + SHELL_FREE_NON_NULL(MainBuffer); + + if (EFI_ERROR(Status)) { + ShellPrintHiiEx( + -1, + -1, + NULL, + STRING_TOKEN(STR_FILE_WRITE_FAIL), + gShellDriver1HiiHandle, + FileName, + Status); + return (SHELL_DEVICE_ERROR); + } + ShellPrintHiiEx( + -1, + -1, + NULL, + STRING_TOKEN(STR_DRVCFG_COMP), + gShellDriver1HiiHandle); + + return (SHELL_SUCCESS); +} + +/** + Function to read in HII configuration information from a file. + + @param[in] Handle The handle to get info for. + @param[in] FileName The filename to read the info from. +**/ +SHELL_STATUS +EFIAPI +ConfigFromFile( + IN EFI_HANDLE Handle, + IN CONST CHAR16 *FileName + ) +{ + EFI_HII_DATABASE_PROTOCOL *HiiDatabase; + EFI_STATUS Status; + VOID *MainBuffer; + UINT64 Temp; + UINTN MainBufferSize; + EFI_HII_HANDLE HiiHandle; + SHELL_FILE_HANDLE FileHandle; + CHAR16 *TempDevPathString; + EFI_HII_PACKAGE_LIST_HEADER *PackageListHeader; + EFI_HII_PACKAGE_HEADER *PackageHeader; + EFI_DEVICE_PATH_PROTOCOL *DevPath; + UINTN HandleIndex; + + HiiDatabase = NULL; + MainBufferSize = 0; + MainBuffer = NULL; + FileHandle = NULL; + + Status = ShellOpenFileByName(FileName, &FileHandle, EFI_FILE_MODE_READ, 0); + if (EFI_ERROR(Status)) { + ShellPrintHiiEx( + -1, + -1, + NULL, + STRING_TOKEN(STR_GEN_FILE_OPEN), + gShellDriver1HiiHandle, + FileName, + Status); + return (SHELL_DEVICE_ERROR); + } + + // + // Locate HII Database protocol + // + Status = gBS->LocateProtocol ( + &gEfiHiiDatabaseProtocolGuid, + NULL, + (VOID **) &HiiDatabase + ); + + if (EFI_ERROR(Status) || HiiDatabase == NULL) { + ShellPrintHiiEx( + -1, + -1, + NULL, + STRING_TOKEN(STR_GEN_PROTOCOL_NF), + gShellDriver1HiiHandle, + L"EfiHiiDatabaseProtocol", + &gEfiHiiDatabaseProtocolGuid); + ShellCloseFile(&FileHandle); + return (SHELL_NOT_FOUND); + } + + Status = ShellGetFileSize(FileHandle, &Temp); + MainBufferSize = (UINTN)Temp; + if (EFI_ERROR(Status)) { + ShellPrintHiiEx( + -1, + -1, + NULL, + STRING_TOKEN(STR_FILE_READ_FAIL), + gShellDriver1HiiHandle, + FileName, + Status); + ShellCloseFile(&FileHandle); + return (SHELL_DEVICE_ERROR); + } + MainBuffer = AllocateZeroPool((UINTN)MainBufferSize); + if (EFI_ERROR(Status)) { + ShellPrintHiiEx( + -1, + -1, + NULL, + STRING_TOKEN(STR_GEN_OUT_MEM), + gShellDriver1HiiHandle); + ShellCloseFile(&FileHandle); + return (SHELL_DEVICE_ERROR); + } + Status = ShellReadFile(FileHandle, &MainBufferSize, MainBuffer); + if (EFI_ERROR(Status)) { + ShellPrintHiiEx( + -1, + -1, + NULL, + STRING_TOKEN(STR_FILE_READ_FAIL), + gShellDriver1HiiHandle, + FileName, + Status); + ShellCloseFile(&FileHandle); + SHELL_FREE_NON_NULL(MainBuffer); + return (SHELL_DEVICE_ERROR); + } + + ShellCloseFile(&FileHandle); + + if (Handle != NULL) { + // + // User override in place. Just do it. + // + HiiHandle = NULL; + Status = ConvertHandleToHiiHandle(Handle, &HiiHandle, HiiDatabase); + if (EFI_ERROR(Status)) { ShellPrintHiiEx( -1, -1, NULL, - STRING_TOKEN (STR_DRVCFG_LINE_DRV), + STRING_TOKEN(STR_GEN_HANDLE_NOT), gShellDriver1HiiHandle, - Index1, - Index2, - Count != 0 ? ChildHandleList[LoopVar] : 0 - ); + ConvertHandleToHandleIndex(Handle), + L"Device"); + ShellCloseFile(&FileHandle); + return (SHELL_DEVICE_ERROR); + } + Status = HiiDatabase->UpdatePackageList(HiiDatabase, HiiHandle, MainBuffer); + if (EFI_ERROR(Status)) { + ShellPrintHiiEx( + -1, + -1, + NULL, + STRING_TOKEN(STR_GEN_UEFI_FUNC_ERROR), + gShellDriver1HiiHandle, + L"HiiDatabase->UpdatePackageList", + Status); + return (SHELL_DEVICE_ERROR); + } + } else { + // + // we need to parse the buffer and try to match the device paths for each item to try to find it's device path. + // + + for (PackageListHeader = (EFI_HII_PACKAGE_LIST_HEADER*)MainBuffer + ; PackageListHeader != NULL && ((CHAR8*)PackageListHeader) < (((CHAR8*)MainBuffer)+MainBufferSize) + ; PackageListHeader = (EFI_HII_PACKAGE_LIST_HEADER*)(((CHAR8*)(PackageListHeader)) + PackageListHeader->PackageLength )) { + for (PackageHeader = (EFI_HII_PACKAGE_HEADER*)(((CHAR8*)(PackageListHeader))+sizeof(EFI_HII_PACKAGE_LIST_HEADER)) + ; PackageHeader != NULL && ((CHAR8*)PackageHeader) < (((CHAR8*)MainBuffer)+MainBufferSize) && PackageHeader->Type != EFI_HII_PACKAGE_END + ; PackageHeader = (EFI_HII_PACKAGE_HEADER*)(((CHAR8*)(PackageHeader))+PackageHeader->Length)) { + if (PackageHeader->Type == EFI_HII_PACKAGE_DEVICE_PATH) { + HiiHandle = NULL; + Status = FindHiiHandleViaDevPath((EFI_DEVICE_PATH_PROTOCOL*)(((CHAR8*)PackageHeader) + sizeof(EFI_HII_PACKAGE_HEADER)), &HiiHandle, HiiDatabase); + if (EFI_ERROR(Status)) { + // + // print out an error. + // + TempDevPathString = gDevPathToText->ConvertDevicePathToText((EFI_DEVICE_PATH_PROTOCOL*)(((CHAR8*)PackageHeader) + sizeof(EFI_HII_PACKAGE_HEADER)), TRUE, TRUE); + ShellPrintHiiEx( + -1, + -1, + NULL, + STRING_TOKEN(STR_DRVCFG_IN_FILE_NF), + gShellDriver1HiiHandle, + TempDevPathString); + SHELL_FREE_NON_NULL(TempDevPathString); + } else { + Status = HiiDatabase->UpdatePackageList(HiiDatabase, HiiHandle, PackageListHeader); + if (EFI_ERROR(Status)) { + ShellPrintHiiEx( + -1, + -1, + NULL, + STRING_TOKEN(STR_GEN_UEFI_FUNC_ERROR), + gShellDriver1HiiHandle, + L"HiiDatabase->UpdatePackageList", + Status); + return (SHELL_DEVICE_ERROR); + } else { + DevPath = (EFI_DEVICE_PATH_PROTOCOL*)(((CHAR8*)PackageHeader) + sizeof(EFI_HII_PACKAGE_HEADER)); + gBS->LocateDevicePath(&gEfiHiiConfigAccessProtocolGuid, &DevPath, &Handle); + HandleIndex = ConvertHandleToHandleIndex(Handle); + ShellPrintHiiEx( + -1, + -1, + NULL, + STRING_TOKEN(STR_DRVCFG_DONE_HII), + gShellDriver1HiiHandle, + HandleIndex); + } + } + } + } } } + + SHELL_FREE_NON_NULL(MainBuffer); + + + ShellPrintHiiEx( + -1, + -1, + NULL, + STRING_TOKEN(STR_DRVCFG_COMP), + gShellDriver1HiiHandle); return (SHELL_SUCCESS); } +EFI_STATUS +EFIAPI +ShellCmdDriverConfigurationProcessActionRequired ( + EFI_HANDLE DriverImageHandle, + EFI_HANDLE ControllerHandle, + EFI_HANDLE ChildHandle, + EFI_DRIVER_CONFIGURATION_ACTION_REQUIRED ActionRequired + ) +{ + EFI_HANDLE ConnectControllerContextOverride[2]; + + switch (ActionRequired) { + case EfiDriverConfigurationActionNone: + ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_DRVCFG_NONE), gShellDriver1HiiHandle); + break; + + case EfiDriverConfigurationActionStopController: + ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_DRVCFG_STOP), gShellDriver1HiiHandle); + ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_DRVCFG_ENTER_S), gShellDriver1HiiHandle, L"stop controller"); + ShellPromptForResponse(ShellPromptResponseTypeEnterContinue, NULL, NULL); + + gBS->DisconnectController (ControllerHandle, DriverImageHandle, ChildHandle); + ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_DRVCFG_CTLR_S), gShellDriver1HiiHandle, L"stopped"); + break; + + case EfiDriverConfigurationActionRestartController: + ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_DRVCFG_RESTART_S), gShellDriver1HiiHandle, L"controller"); + ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_DRVCFG_ENTER_S), gShellDriver1HiiHandle, L"restart controller"); + ShellPromptForResponse(ShellPromptResponseTypeEnterContinue, NULL, NULL); + + gBS->DisconnectController (ControllerHandle, DriverImageHandle, ChildHandle); + ConnectControllerContextOverride[0] = DriverImageHandle; + ConnectControllerContextOverride[1] = NULL; + gBS->ConnectController (ControllerHandle, ConnectControllerContextOverride, NULL, TRUE); + ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_DRVCFG_CTLR_S), gShellDriver1HiiHandle, L"restarted"); + break; + + case EfiDriverConfigurationActionRestartPlatform: + ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_DRVCFG_RESTART_S), gShellDriver1HiiHandle, L"platform"); + ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_DRVCFG_ENTER_S), gShellDriver1HiiHandle, L"restart platform"); + ShellPromptForResponse(ShellPromptResponseTypeEnterContinue, NULL, NULL); + + gRT->ResetSystem (EfiResetCold, EFI_SUCCESS, 0, NULL); + break; + + default: + return (EFI_INVALID_PARAMETER); + break; + } + + return EFI_SUCCESS; +} + +SHELL_STATUS +EFIAPI +PreHiiDrvCfg ( + IN CONST CHAR8 *Language, + IN BOOLEAN ForceDefaults, + IN UINT32 DefaultType, + IN BOOLEAN AllChildren, + IN BOOLEAN ValidateOptions, + IN BOOLEAN SetOptions, + IN EFI_HANDLE DriverImageHandle, + IN EFI_HANDLE DeviceHandle, + IN EFI_HANDLE ChildHandle + ) +{ + EFI_STATUS Status; + SHELL_STATUS ShellStatus; + UINTN OuterLoopCounter; + CHAR8 *BestLanguage; + UINTN DriverImageHandleCount; + EFI_HANDLE *DriverImageHandleBuffer; + UINTN HandleCount; + EFI_HANDLE *HandleBuffer; + UINTN *HandleType; + UINTN LoopCounter; + UINTN ChildIndex; + UINTN ChildHandleCount; + EFI_HANDLE *ChildHandleBuffer; + UINTN *ChildHandleType; + EFI_DRIVER_CONFIGURATION_ACTION_REQUIRED ActionRequired; + EFI_DRIVER_CONFIGURATION_PROTOCOL *DriverConfiguration; + BOOLEAN Iso639Language; + UINTN HandleIndex1; + UINTN HandleIndex2; + UINTN HandleIndex3; + + ShellStatus = SHELL_SUCCESS; + + if (ChildHandle == NULL && AllChildren) { + SetOptions = FALSE; + } + + if (ForceDefaults) { + ShellPrintHiiEx( + -1, + -1, + NULL, + STRING_TOKEN (STR_DRVCFG_FORCE_D), + gShellDriver1HiiHandle, + DefaultType); + } else if (ValidateOptions) { + ShellPrintHiiEx( + -1, + -1, + NULL, + STRING_TOKEN (STR_DRVCFG_VALIDATE), + gShellDriver1HiiHandle); + } else if (SetOptions) { + ShellPrintHiiEx( + -1, + -1, + NULL, + STRING_TOKEN (STR_DRVCFG_SET), + gShellDriver1HiiHandle); + } + + if (DriverImageHandle == 0) { + DriverImageHandleBuffer = GetHandleListByProtocolList(CfgGuidList); + if (DriverImageHandleBuffer == NULL) { + ShellStatus = SHELL_NOT_FOUND; + goto Done; + } + for ( + HandleBuffer = DriverImageHandleBuffer, DriverImageHandleCount = 0 + ; HandleBuffer != NULL && *HandleBuffer != NULL + ; HandleBuffer++,DriverImageHandleCount++); + } else { + DriverImageHandleCount = 1; + // + // Allocate buffer to hold the image handle so as to + // keep consistent with the above clause + // + DriverImageHandleBuffer = AllocatePool (sizeof (EFI_HANDLE)); + ASSERT (DriverImageHandleBuffer); + DriverImageHandleBuffer[0] = DriverImageHandle; + } + + for (OuterLoopCounter = 0; OuterLoopCounter < DriverImageHandleCount; OuterLoopCounter++) { + Iso639Language = FALSE; + Status = gBS->OpenProtocol ( + DriverImageHandleBuffer[OuterLoopCounter], + &gEfiDriverConfiguration2ProtocolGuid, + (VOID **) &DriverConfiguration, + NULL, + NULL, + EFI_OPEN_PROTOCOL_GET_PROTOCOL + ); + if (EFI_ERROR (Status)) { + Iso639Language = TRUE; + Status = gBS->OpenProtocol ( + DriverImageHandleBuffer[OuterLoopCounter], + &gEfiDriverConfigurationProtocolGuid, + (VOID **) &DriverConfiguration, + NULL, + NULL, + EFI_OPEN_PROTOCOL_GET_PROTOCOL + ); + } + if (EFI_ERROR (Status)) { +// ShellPrintHiiEx( +// -1, +// -1, +// NULL, +// STRING_TOKEN (STR_DRVCFG_NOT_SUPPORT), +// gShellDriver1HiiHandle, +// ConvertHandleToHandleIndex (DriverImageHandleBuffer[OuterLoopCounter]) +// ); + ShellStatus = SHELL_UNSUPPORTED; + continue; + } + + BestLanguage = GetBestLanguage ( + DriverConfiguration->SupportedLanguages, + Iso639Language, + Language!=NULL?Language:"", + DriverConfiguration->SupportedLanguages, + NULL + ); + if (BestLanguage == NULL) { + ShellPrintHiiEx( + -1, + -1, + NULL, + STRING_TOKEN (STR_GEN_PROBLEM_VAL), + gShellDriver1HiiHandle, + L"-l" + ); + ShellStatus = SHELL_INVALID_PARAMETER; + continue; + } + + Status = ParseHandleDatabaseByRelationshipWithType ( + DriverImageHandleBuffer[OuterLoopCounter], + NULL, + &HandleCount, + &HandleBuffer, + &HandleType + ); + if (EFI_ERROR (Status)) { + continue; + } + + if (SetOptions && DeviceHandle == NULL) { + + gST->ConOut->ClearScreen (gST->ConOut); + Status = DriverConfiguration->SetOptions ( + DriverConfiguration, + NULL, + NULL, + BestLanguage, + &ActionRequired + ); + gST->ConOut->ClearScreen (gST->ConOut); + + ShellPrintHiiEx( + -1, + -1, + NULL, + STRING_TOKEN (STR_DRVCFG_ALL_LANG), + gShellDriver1HiiHandle, + ConvertHandleToHandleIndex (DriverImageHandleBuffer[OuterLoopCounter]), + DriverConfiguration->SupportedLanguages + ); + if (!EFI_ERROR (Status)) { + ShellPrintHiiEx( + -1, + -1, + NULL, + STRING_TOKEN (STR_DRVCFG_OPTIONS_SET), + gShellDriver1HiiHandle); + for (LoopCounter = 0; LoopCounter < HandleCount; LoopCounter++) { + if ((HandleType[LoopCounter] & HR_CONTROLLER_HANDLE) == HR_CONTROLLER_HANDLE) { + ShellCmdDriverConfigurationProcessActionRequired ( + DriverImageHandleBuffer[OuterLoopCounter], + HandleBuffer[LoopCounter], + NULL, + ActionRequired + ); + } + } + } else { + ShellPrintHiiEx( + -1, + -1, + NULL, + STRING_TOKEN (STR_DRVCFG_NOT_SET), + gShellDriver1HiiHandle, + Status); + } + continue; + } + + for (LoopCounter = 0; LoopCounter < HandleCount; LoopCounter++) { + if ((HandleType[LoopCounter] & HR_CONTROLLER_HANDLE) != HR_CONTROLLER_HANDLE) { + continue; + } + if (DeviceHandle != NULL && DeviceHandle != HandleBuffer[LoopCounter]) { + continue; + } + if (ChildHandle == NULL) { + HandleIndex1 = ConvertHandleToHandleIndex (DriverImageHandleBuffer[OuterLoopCounter]); + HandleIndex2 = ConvertHandleToHandleIndex (HandleBuffer[LoopCounter]); + ShellPrintHiiEx( + -1, + -1, + NULL, + STRING_TOKEN (STR_DRVCFG_CTRL_LANG), + gShellDriver1HiiHandle, + HandleIndex1, + HandleIndex2, + DriverConfiguration->SupportedLanguages + ); + + if (ForceDefaults) { + Status = DriverConfiguration->ForceDefaults ( + DriverConfiguration, + HandleBuffer[LoopCounter], + NULL, + DefaultType, + &ActionRequired + ); + + if (!EFI_ERROR (Status)) { + ShellPrintHiiEx( + -1, + -1, + NULL, + STRING_TOKEN (STR_DRVCFG_DEF_FORCED), + gShellDriver1HiiHandle); + ShellCmdDriverConfigurationProcessActionRequired ( + DriverImageHandleBuffer[OuterLoopCounter], + HandleBuffer[LoopCounter], + NULL, + ActionRequired + ); + } else { + ShellPrintHiiEx( + -1, + -1, + NULL, + STRING_TOKEN (STR_DRVCFG_FORCE_FAILED), + gShellDriver1HiiHandle, + Status); + ShellStatus = SHELL_DEVICE_ERROR; + } + } else if (ValidateOptions) { + Status = DriverConfiguration->OptionsValid ( + DriverConfiguration, + HandleBuffer[LoopCounter], + NULL + ); + + if (!EFI_ERROR (Status)) { + ShellPrintHiiEx( + -1, + -1, + NULL, + STRING_TOKEN (STR_DRVCFG_OPTIONS_VALID), + gShellDriver1HiiHandle); + } else { + ShellPrintHiiEx( + -1, + -1, + NULL, + STRING_TOKEN (STR_DRVCFG_OPTIONS_INV), + gShellDriver1HiiHandle, + Status); + ShellStatus = SHELL_DEVICE_ERROR; + } + } else if (SetOptions) { + gST->ConOut->ClearScreen (gST->ConOut); + Status = DriverConfiguration->SetOptions ( + DriverConfiguration, + HandleBuffer[LoopCounter], + NULL, + BestLanguage, + &ActionRequired + ); + gST->ConOut->ClearScreen (gST->ConOut); + HandleIndex1 = ConvertHandleToHandleIndex (DriverImageHandleBuffer[OuterLoopCounter]); + HandleIndex2 = ConvertHandleToHandleIndex (HandleBuffer[LoopCounter]); + ShellPrintHiiEx( + -1, + -1, + NULL, + STRING_TOKEN (STR_DRVCFG_CTRL_LANG), + gShellDriver1HiiHandle, + HandleIndex1, + HandleIndex2, + DriverConfiguration->SupportedLanguages + ); + if (!EFI_ERROR (Status)) { + ShellPrintHiiEx( + -1, + -1, + NULL, + STRING_TOKEN (STR_DRVCFG_OPTIONS_SET), + gShellDriver1HiiHandle); + + ShellCmdDriverConfigurationProcessActionRequired ( + DriverImageHandleBuffer[OuterLoopCounter], + HandleBuffer[LoopCounter], + NULL, + ActionRequired + ); + + } else { + ShellPrintHiiEx( + -1, + -1, + NULL, + STRING_TOKEN (STR_DRVCFG_NOT_SET), + gShellDriver1HiiHandle, + Status); + ShellStatus = SHELL_DEVICE_ERROR; + } + } else { + Print (L"\n"); + } + } + + if (ChildHandle == NULL && !AllChildren) { + continue; + } + + Status = ParseHandleDatabaseByRelationshipWithType ( + DriverImageHandleBuffer[OuterLoopCounter], + HandleBuffer[LoopCounter], + &ChildHandleCount, + &ChildHandleBuffer, + &ChildHandleType + ); + if (EFI_ERROR (Status)) { + continue; + } + + for (ChildIndex = 0; ChildIndex < ChildHandleCount; ChildIndex++) { + + if ((ChildHandleType[ChildIndex] & HR_CHILD_HANDLE) != HR_CHILD_HANDLE) { + continue; + } + + if (ChildHandle != NULL && ChildHandle != ChildHandleBuffer[ChildIndex]) { + continue; + } + + HandleIndex1 = ConvertHandleToHandleIndex (DriverImageHandleBuffer[OuterLoopCounter]); + HandleIndex2 = ConvertHandleToHandleIndex (HandleBuffer[LoopCounter]); + HandleIndex3 = ConvertHandleToHandleIndex (ChildHandleBuffer[ChildIndex]); + ShellPrintHiiEx( + -1, + -1, + NULL, + STRING_TOKEN (STR_DRVCFG_CHILD_LANG), + gShellDriver1HiiHandle, + HandleIndex1, + HandleIndex2, + HandleIndex3, + DriverConfiguration->SupportedLanguages); + + if (ForceDefaults) { + Status = DriverConfiguration->ForceDefaults ( + DriverConfiguration, + HandleBuffer[LoopCounter], + ChildHandleBuffer[ChildIndex], + DefaultType, + &ActionRequired + ); + + if (!EFI_ERROR (Status)) { + ShellPrintHiiEx( + -1, + -1, + NULL, + STRING_TOKEN (STR_DRVCFG_DEF_FORCED), + gShellDriver1HiiHandle); + + ShellCmdDriverConfigurationProcessActionRequired ( + DriverImageHandleBuffer[OuterLoopCounter], + HandleBuffer[LoopCounter], + ChildHandleBuffer[ChildIndex], + ActionRequired + ); + + } else { + ShellPrintHiiEx( + -1, + -1, + NULL, + STRING_TOKEN (STR_DRVCFG_FORCE_FAILED), + gShellDriver1HiiHandle, + Status); + ShellStatus = SHELL_DEVICE_ERROR; + } + } else if (ValidateOptions) { + Status = DriverConfiguration->OptionsValid ( + DriverConfiguration, + HandleBuffer[LoopCounter], + ChildHandleBuffer[ChildIndex] + ); + + if (!EFI_ERROR (Status)) { + ShellPrintHiiEx( + -1, + -1, + NULL, + STRING_TOKEN (STR_DRVCFG_OPTIONS_VALID), + gShellDriver1HiiHandle); + } else { + ShellPrintHiiEx( + -1, + -1, + NULL, + STRING_TOKEN (STR_DRVCFG_OPTIONS_INV), + gShellDriver1HiiHandle, + Status); + ShellStatus = SHELL_DEVICE_ERROR; + } + } else if (SetOptions) { + gST->ConOut->ClearScreen (gST->ConOut); + Status = DriverConfiguration->SetOptions ( + DriverConfiguration, + HandleBuffer[LoopCounter], + ChildHandleBuffer[ChildIndex], + BestLanguage, + &ActionRequired + ); + gST->ConOut->ClearScreen (gST->ConOut); + HandleIndex1 = ConvertHandleToHandleIndex (DriverImageHandleBuffer[OuterLoopCounter]); + HandleIndex2 = ConvertHandleToHandleIndex (HandleBuffer[LoopCounter]); + HandleIndex3 = ConvertHandleToHandleIndex (ChildHandleBuffer[ChildIndex]); + ShellPrintHiiEx( + -1, + -1, + NULL, + STRING_TOKEN (STR_DRVCFG_CHILD_LANG), + gShellDriver1HiiHandle, + HandleIndex1, + HandleIndex2, + HandleIndex3, + DriverConfiguration->SupportedLanguages + ); + if (!EFI_ERROR (Status)) { + ShellPrintHiiEx( + -1, + -1, + NULL, + STRING_TOKEN (STR_DRVCFG_OPTIONS_SET), + gShellDriver1HiiHandle); + + ShellCmdDriverConfigurationProcessActionRequired ( + DriverImageHandleBuffer[OuterLoopCounter], + HandleBuffer[LoopCounter], + ChildHandleBuffer[ChildIndex], + ActionRequired + ); + + } else { + ShellPrintHiiEx( + -1, + -1, + NULL, + STRING_TOKEN (STR_DRVCFG_NOT_SET), + gShellDriver1HiiHandle, + Status); + ShellStatus = SHELL_DEVICE_ERROR; + } + } else { + Print (L"\n"); + } + } + + FreePool (ChildHandleBuffer); + FreePool (ChildHandleType); + } + + FreePool (BestLanguage); + FreePool (HandleBuffer); + FreePool (HandleType); + } + + if (DriverImageHandle != NULL && DriverImageHandleCount != 0) { + FreePool (DriverImageHandleBuffer); + } + +Done: + return ShellStatus; +} + /** Function to print out configuration information on all configurable handles. @param[in] ChildrenToo TRUE to tewst for children. + @param[in] Language ASCII string for language code. + @param[in] UseHii TRUE to check for Hii and DPC, FALSE for DCP only. @retval SHELL_SUCCESS The operation was successful. **/ SHELL_STATUS EFIAPI PrintConfigInfoOnAll( - IN CONST BOOLEAN ChildrenToo + IN CONST BOOLEAN ChildrenToo, + IN CONST CHAR8 *Language, + IN CONST BOOLEAN UseHii ) { -// lcoate all the HII_CONFIG_ACCESS_PROTOCOL - those are all configurable -// then cross reference with EFI_DRIVER_CONFIGURATION_PROTOCOL - those are legacy configurable -// can be on chlid, but that is ok... just find the driver EFI_HANDLE *HandleList; EFI_HANDLE *CurrentHandle; - EFI_HANDLE *DriverHandleList; - EFI_HANDLE *ParentHandleList; - EFI_HANDLE *CurrentDriver; - UINTN Count; - SHELL_STATUS ShellStatus; - EFI_STATUS Status; - UINTN LoopVar; BOOLEAN Found; + UINTN Index2; + Found = FALSE; - Count = 0; HandleList = NULL; CurrentHandle = NULL; - DriverHandleList = NULL; - CurrentDriver = NULL; - ShellStatus = SHELL_SUCCESS; - ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_DRVCFG_HEADER), gShellDriver1HiiHandle); - // - // First do HII method - // - HandleList = GetHandleListByProtocol(&gEfiHiiConfigAccessProtocolGuid); - for (CurrentHandle = HandleList ; CurrentHandle != NULL && *CurrentHandle != NULL && ShellStatus == SHELL_SUCCESS; CurrentHandle++){ - // is this a driver handle itself? if yes print options for it. - if (!EFI_ERROR(gBS->OpenProtocol(*CurrentHandle, &gEfiDriverBindingProtocolGuid, NULL, NULL, gImageHandle, EFI_OPEN_PROTOCOL_TEST_PROTOCOL))) { - ShellStatus = PrintConfigInfoOnSingleHandle(*CurrentHandle, NULL, ChildrenToo, BIT0); - } else { - // get its driver and print options for it. - Count = 0; - Status = PARSE_HANDLE_DATABASE_UEFI_DRIVERS(*CurrentHandle, &Count, &DriverHandleList); - if (EFI_ERROR(Status)) { - Status = PARSE_HANDLE_DATABASE_PARENTS(*CurrentHandle, &Count, &ParentHandleList); - if (!EFI_ERROR(Status)) { - Status = PARSE_HANDLE_DATABASE_UEFI_DRIVERS(*ParentHandleList, &Count, &DriverHandleList); - } - } - if (Count == 0) { - Found = TRUE; - ShellStatus = PrintConfigInfoOnSingleHandle(NULL, *CurrentHandle, ChildrenToo, BIT0); - } else if (DriverHandleList != NULL) { - for (LoopVar = 0 ; LoopVar < Count ; LoopVar++) { - Found = TRUE; - ShellStatus = PrintConfigInfoOnSingleHandle(DriverHandleList[LoopVar], *CurrentHandle, ChildrenToo, BIT0); - } - } - SHELL_FREE_NON_NULL(DriverHandleList); + if (UseHii) { + // + // HII method + // + HandleList = GetHandleListByProtocol(&gEfiHiiConfigAccessProtocolGuid); + for (CurrentHandle = HandleList ; CurrentHandle != NULL && *CurrentHandle != NULL; CurrentHandle++){ + Found = TRUE; + Index2 = *CurrentHandle == NULL ? 0 : ConvertHandleToHandleIndex(*CurrentHandle); + ShellPrintHiiEx( + -1, + -1, + NULL, + STRING_TOKEN (STR_DRVCFG_LINE_HII), + gShellDriver1HiiHandle, + Index2 + ); } + SHELL_FREE_NON_NULL(HandleList); } - SHELL_FREE_NON_NULL(HandleList); - // - // Now do EFI 1.10 & UEFI 2.0 drivers - // - HandleList = GetHandleListByProtocol(&gEfiDriverConfigurationProtocolGuid); - for (CurrentHandle = HandleList ; CurrentHandle != NULL && *CurrentHandle != NULL && ShellStatus == SHELL_SUCCESS; CurrentHandle++){ - Found = TRUE; - ShellStatus = PrintConfigInfoOnSingleHandle(*CurrentHandle, NULL, ChildrenToo, BIT1); + if (PreHiiDrvCfg ( + Language, + FALSE, + 0, + ChildrenToo, + FALSE, + FALSE, + 0, + 0, + 0) == SHELL_SUCCESS) { + Found = TRUE; } - SHELL_FREE_NON_NULL(HandleList); + if (!Found) { ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_DRVCFG_NONE), gShellDriver1HiiHandle); return (SHELL_SUCCESS); } - return (ShellStatus); + + return (SHELL_SUCCESS); } -STATIC CONST SHELL_PARAM_ITEM ParamList[] = { +STATIC CONST SHELL_PARAM_ITEM ParamListHii[] = { + {L"-s", TypeFlag}, + {L"-l", TypeValue}, + {L"-f", TypeValue}, + {L"-o", TypeValue}, + {L"-i", TypeValue}, + {NULL, TypeMax} + }; +STATIC CONST SHELL_PARAM_ITEM ParamListPreHii[] = { {L"-c", TypeFlag}, {L"-s", TypeFlag}, {L"-v", TypeFlag}, {L"-l", TypeValue}, {L"-f", TypeValue}, - {L"-o", TypeValue}, - {L"-i", TypeValue}, {NULL, TypeMax} }; @@ -319,11 +1106,28 @@ ShellCommandRunDrvCfg ( SHELL_STATUS ShellStatus; CHAR8 *Language; CONST CHAR16 *Lang; - CONST CHAR16 *Temp2; + CONST CHAR16 *HandleIndex1; + CONST CHAR16 *HandleIndex2; + CONST CHAR16 *HandleIndex3; + CONST CHAR16 *ForceTypeString; + BOOLEAN Force; + BOOLEAN Set; + BOOLEAN Validate; + BOOLEAN InFromFile; + BOOLEAN OutToFile; + BOOLEAN AllChildren; + BOOLEAN UseHii; + UINT32 ForceType; + UINT64 Intermediate; + EFI_HANDLE Handle1; + EFI_HANDLE Handle2; + EFI_HANDLE Handle3; + CONST CHAR16 *FileName; ShellStatus = SHELL_SUCCESS; Status = EFI_SUCCESS; Language = NULL; + UseHii = TRUE; // // initialize the shell lib (we must be in non-auto-init...) @@ -337,75 +1141,222 @@ ShellCommandRunDrvCfg ( // // 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, ProblemParam); - FreePool(ProblemParam); - ShellStatus = SHELL_INVALID_PARAMETER; - } else { - ASSERT(FALSE); + Status = ShellCommandLineParse (ParamListHii, &Package, &ProblemParam, TRUE); + if (EFI_ERROR(Status) || ShellCommandLineGetCount(Package) > 2) { + UseHii = FALSE; + if (Package != NULL) { + ShellCommandLineFreeVarList (Package); } - } else { + SHELL_FREE_NON_NULL(ProblemParam); + Status = ShellCommandLineParse (ParamListPreHii, &Package, &ProblemParam, TRUE); + if (EFI_ERROR(Status)) { + if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) { + ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, ProblemParam); + FreePool(ProblemParam); + ShellStatus = SHELL_INVALID_PARAMETER; + goto Done; + } else { + ASSERT(FALSE); + } + } + } + if (ShellStatus == SHELL_SUCCESS) { Lang = ShellCommandLineGetValue(Package, L"-l"); if (Lang != NULL) { Language = AllocateZeroPool(StrSize(Lang)); AsciiSPrint(Language, StrSize(Lang), "%S", Lang); - } else if (!ShellCommandLineGetFlag(Package, L"-l")){ - Language = AllocateZeroPool(10); - AsciiSPrint(Language, 10, "en-us"); - } else { - ASSERT(Language == NULL); + } else if (ShellCommandLineGetFlag(Package, L"-l")){ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"-l"); - ShellCommandLineFreeVarList (Package); - return (SHELL_INVALID_PARAMETER); + ShellStatus = SHELL_INVALID_PARAMETER; + goto Done; + } + Set = ShellCommandLineGetFlag (Package, L"-s"); + Validate = ShellCommandLineGetFlag (Package, L"-v"); + InFromFile = ShellCommandLineGetFlag (Package, L"-i"); + OutToFile = ShellCommandLineGetFlag (Package, L"-o"); + AllChildren = ShellCommandLineGetFlag (Package, L"-c"); + Force = ShellCommandLineGetFlag (Package, L"-f"); + ForceTypeString = ShellCommandLineGetValue(Package, L"-f"); + + if (OutToFile) { + FileName = ShellCommandLineGetValue(Package, L"-o"); + } else if (InFromFile) { + FileName = ShellCommandLineGetValue(Package, L"-i"); + } else { + FileName = NULL; + } + + if (InFromFile && EFI_ERROR(ShellFileExists(FileName))) { + ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FIND_FAIL), gShellDriver1HiiHandle, FileName); + ShellStatus = SHELL_INVALID_PARAMETER; + goto Done; + } + if (OutToFile && !EFI_ERROR(ShellFileExists(FileName))) { + ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_EXIST), gShellDriver1HiiHandle, FileName); + ShellStatus = SHELL_INVALID_PARAMETER; + goto Done; + } + if (Force && ForceTypeString == NULL) { + ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"-f"); + ShellStatus = SHELL_INVALID_PARAMETER; + goto Done; + } + if (Force) { + Status = ShellConvertStringToUint64(ForceTypeString, &Intermediate, FALSE, FALSE); + if (EFI_ERROR(Status)) { + ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM_VAL), gShellDriver1HiiHandle, L"-f"); + ShellStatus = SHELL_INVALID_PARAMETER; + goto Done; + } + ForceType = (UINT32)Intermediate; + } else { + ForceType = 0; + } + HandleIndex1 = ShellCommandLineGetRawValue(Package, 1); + Handle1 = NULL; + if (HandleIndex1 != NULL && !EFI_ERROR(ShellConvertStringToUint64(HandleIndex1, &Intermediate, TRUE, FALSE))) { + Handle1 = ConvertHandleIndexToHandle((UINTN)Intermediate); + if (Handle1 == NULL || (UINT64)(UINTN)Intermediate != Intermediate) { + ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, HandleIndex1); + ShellStatus = SHELL_INVALID_PARAMETER; + goto Done; + } + } + HandleIndex2 = ShellCommandLineGetRawValue(Package, 2); + Handle2 = NULL; + if (HandleIndex2 != NULL && !EFI_ERROR(ShellConvertStringToUint64(HandleIndex2, &Intermediate, TRUE, FALSE))) { + Handle2 = ConvertHandleIndexToHandle((UINTN)Intermediate); + if (Handle2 == NULL || (UINT64)(UINTN)Intermediate != Intermediate) { + ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, HandleIndex2); + ShellStatus = SHELL_INVALID_PARAMETER; + goto Done; + } + } + HandleIndex3 = ShellCommandLineGetRawValue(Package, 3); + Handle3 = NULL; + if (HandleIndex3 != NULL && !EFI_ERROR(ShellConvertStringToUint64(HandleIndex3, &Intermediate, TRUE, FALSE))) { + Handle3 = ConvertHandleIndexToHandle((UINTN)Intermediate); + if (Handle3 == NULL || (UINT64)(UINTN)Intermediate != Intermediate) { + ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, HandleIndex3); + ShellStatus = SHELL_INVALID_PARAMETER; + goto Done; + } + } + + if ((InFromFile || OutToFile) && (FileName == NULL)) { + if (FileName == NULL) { + ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, InFromFile?L"-i":L"-o"); + } else { + ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_HANDLE_REQ), gShellDriver1HiiHandle); + } + ShellStatus = SHELL_INVALID_PARAMETER; + goto Done; + } + if (!UseHii && (InFromFile || OutToFile)) { + if (InFromFile) { + ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, L"-i"); + ShellStatus = SHELL_INVALID_PARAMETER; + goto Done; + } + if (OutToFile) { + ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, L"-o"); + ShellStatus = SHELL_INVALID_PARAMETER; + goto Done; + } + } + if (Validate && Force) { + ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CONF), gShellDriver1HiiHandle, L"-v", L"-f"); + ShellStatus = SHELL_INVALID_PARAMETER; + goto Done; + } + if (Validate && Set) { + ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CONF), gShellDriver1HiiHandle, L"-v", L"-s"); + ShellStatus = SHELL_INVALID_PARAMETER; + goto Done; + } + if (Set && Force) { + ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CONF), gShellDriver1HiiHandle, L"-s", L"-f"); + ShellStatus = SHELL_INVALID_PARAMETER; + goto Done; + } + if (OutToFile && InFromFile) { + ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CONF), gShellDriver1HiiHandle, L"-i", L"-o"); + ShellStatus = SHELL_INVALID_PARAMETER; + goto Done; } // - // Should be DriverHandle + // We do HII first. // - Temp2 = ShellCommandLineGetRawValue(Package, 1); - if (Temp2 == NULL) { - // - // no driver specified. cannot be export, inport, or set (and no specified language) - // - if (ShellCommandLineGetFlag(Package, L"-s") - ||ShellCommandLineGetFlag(Package, L"-l") - ||ShellCommandLineGetFlag(Package, L"-o") - ||ShellCommandLineGetFlag(Package, L"-i")) { - ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_HANDLE_REQ), gShellDriver1HiiHandle); - ShellStatus = SHELL_INVALID_PARAMETER; + if (UseHii) { + if (Handle1 != NULL && EFI_ERROR(gBS->OpenProtocol(Handle1, &gEfiHiiConfigAccessProtocolGuid, NULL, gImageHandle, NULL, EFI_OPEN_PROTOCOL_TEST_PROTOCOL))) { + // + // no HII on this handle. + // + ShellStatus = SHELL_UNSUPPORTED; + } else if (Validate) { + } else if (Force) { + } else if (Set) { + } else if (InFromFile) { + ShellStatus = ConfigFromFile(Handle1, FileName); + if (Handle1 != NULL && ShellStatus == SHELL_SUCCESS) { + goto Done; + } + } else if (OutToFile) { + ShellStatus = ConfigToFile(Handle1, FileName); + if (Handle1 != NULL && ShellStatus == SHELL_SUCCESS) { + goto Done; + } + } else if (HandleIndex1 == NULL) { + // + // display all that are configurable + // + ShellStatus = PrintConfigInfoOnAll(AllChildren, Language, UseHii); + goto Done; } else { - // - // do a loop for validation, forcing, or printing - // - if (ShellCommandLineGetFlag(Package, L"-v") && ShellCommandLineGetFlag(Package, L"-f")) { - ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CONF), gShellDriver1HiiHandle, L"-v", L"-f"); - ShellStatus = SHELL_INVALID_PARAMETER; - } else if (ShellCommandLineGetFlag(Package, L"-v")){ - // - // validate - // - ShellStatus = ValidOptionsOnAll(ShellCommandLineGetFlag(Package, L"-c")); - } else if (ShellCommandLineGetFlag(Package, L"-f")){ - // - // force - // -ASSERT(FALSE);// ShellStatus = ForceOptionsOnAll(ShellCommandLineGetFlag(Package, L"-c")); - } else { - // - // display all that are configurable - // - ShellStatus = PrintConfigInfoOnAll(ShellCommandLineGetFlag(Package, L"-c")); + if (!EFI_ERROR(gBS->OpenProtocol(Handle1, &gEfiHiiConfigAccessProtocolGuid, NULL, gImageHandle, NULL, EFI_OPEN_PROTOCOL_TEST_PROTOCOL))) { + ShellPrintHiiEx( + -1, + -1, + NULL, + STRING_TOKEN (STR_DRVCFG_LINE_HII), + gShellDriver1HiiHandle, + ConvertHandleToHandleIndex(Handle1) + ); + goto Done; } } - } else { - // - // we have a driver handle, make sure it's valid then process it... - // - ASSERT(FALSE); + } + + // + // We allways need to do this one since it does both by default. + // + if (!InFromFile && !OutToFile) { + ShellStatus = PreHiiDrvCfg ( + Language, + Force, + ForceType, + AllChildren, + Validate, + Set, + Handle1, + Handle2, + Handle3); + } + + if (ShellStatus == SHELL_UNSUPPORTED) { + ShellPrintHiiEx( + -1, + -1, + NULL, + STRING_TOKEN (STR_DRVCFG_NOT_SUPPORT), + gShellDriver1HiiHandle, + ConvertHandleToHandleIndex(Handle1) + ); } } + +Done: ShellCommandLineFreeVarList (Package); SHELL_FREE_NON_NULL(Language); return (ShellStatus); diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.uni b/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.uni index 0cb8ffc82b..c54ce34a2f 100644 Binary files a/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.uni and b/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.uni differ