tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NetworkPkg/TlsAuthConfigDxe: Use HiiPopUp() instead of CreatePopUp() 

REF:https://bugzilla.tianocore.org/show_bug.cgi?id=2635

According to EDK2 Driver Writer's Guide For UEFI 2.3.1, 4.2.18 Offer
alternatives to function keys. Configuration of drivers should be
accomplished via HII and via OS-present interfaces.

Cc: Jiaxin Wu <jiaxin.wu@intel.com>
Cc: Siyuan Fu <siyuan.fu@intel.com>
Signed-off-by: Maciej Rabeda <maciej.rabeda@linux.intel.com>
Reviewed-by: Siyuan Fu <siyuan.fu@intel.com>
Reviewed-by: Maciej Rabeda <maciej.rabeda@linux.intel.com>
This commit is contained in:
Keysound Chang 2020-04-09 14:56:41 +08:00 committed by mergify[bot]
parent 1c76101134
commit ddfb0ab1bb
4 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf
View File

@ -52,6 +52,7 @@
[Protocols] [Protocols]
gEfiDevicePathProtocolGuid ## PRODUCES gEfiDevicePathProtocolGuid ## PRODUCES
gEfiHiiConfigAccessProtocolGuid ## PRODUCES gEfiHiiConfigAccessProtocolGuid ## PRODUCES
gEfiHiiPopupProtocolGuid ## CONSUMES
[Guids] [Guids]
gTlsAuthConfigGuid ## PRODUCES ## GUID gTlsAuthConfigGuid ## PRODUCES ## GUID

2
NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxeStrings.uni
View File

@ -28,6 +28,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
#string STR_TLS_AUTH_CONFIG_SAVE_AND_EXIT #language en-US "Commit Changes and Exit" #string STR_TLS_AUTH_CONFIG_SAVE_AND_EXIT #language en-US "Commit Changes and Exit"
#string STR_TLS_AUTH_CONFIG_NO_SAVE_AND_EXIT #language en-US "Discard Changes and Exit" #string STR_TLS_AUTH_CONFIG_NO_SAVE_AND_EXIT #language en-US "Discard Changes and Exit"
#string STR_TLS_AUTH_ENROLL_CERT_FAILURE #language en-US "Enroll Cert Failure!"
#string STR_CERT_TYPE_PCKS_GUID #language en-US "GUID for CERT" #string STR_CERT_TYPE_PCKS_GUID #language en-US "GUID for CERT"
#string STR_NULL #language en-US "" #string STR_NULL #language en-US ""

20
NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.c
View File

@ -1383,7 +1383,6 @@ TlsAuthConfigAccessCallback (
OUT EFI_BROWSER_ACTION_REQUEST *ActionRequest OUT EFI_BROWSER_ACTION_REQUEST *ActionRequest
) )
{ {
EFI_INPUT_KEY Key;
EFI_STATUS Status; EFI_STATUS Status;
RETURN_STATUS RStatus; RETURN_STATUS RStatus;
TLS_AUTH_CONFIG_PRIVATE_DATA *Private; TLS_AUTH_CONFIG_PRIVATE_DATA *Private;
@ -1391,6 +1390,8 @@ TlsAuthConfigAccessCallback (
TLS_AUTH_CONFIG_IFR_NVDATA *IfrNvData; TLS_AUTH_CONFIG_IFR_NVDATA *IfrNvData;
UINT16 LabelId; UINT16 LabelId;
EFI_DEVICE_PATH_PROTOCOL *File; EFI_DEVICE_PATH_PROTOCOL *File;
EFI_HII_POPUP_PROTOCOL *HiiPopUp;
EFI_HII_POPUP_SELECTION PopUpSelect;
Status = EFI_SUCCESS; Status = EFI_SUCCESS;
File = NULL; File = NULL;
@ -1402,6 +1403,11 @@ TlsAuthConfigAccessCallback (
Private = TLS_AUTH_CONFIG_PRIVATE_FROM_THIS (This); Private = TLS_AUTH_CONFIG_PRIVATE_FROM_THIS (This);
mTlsAuthPrivateData = Private; mTlsAuthPrivateData = Private;
Status = gBS->LocateProtocol (&gEfiHiiPopupProtocolGuid, NULL, (VOID**) &HiiPopUp);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "Can't find Form PopUp protocol. Exit (%r)\n", Status));
return Status;
}
// //
// Retrieve uncommitted data from Browser // Retrieve uncommitted data from Browser
@ -1460,11 +1466,13 @@ TlsAuthConfigAccessCallback (
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
CleanFileContext (Private); CleanFileContext (Private);
CreatePopUp ( HiiPopUp->CreatePopup (
EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, HiiPopUp,
&Key, EfiHiiPopupStyleError,
L"ERROR: Enroll Cert Failure!", EfiHiiPopupTypeOk,
NULL Private->RegisteredHandle,
STRING_TOKEN (STR_TLS_AUTH_ENROLL_CERT_FAILURE),
&PopUpSelect
); );
} }
break; break;

1
NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.h
View File

@ -14,6 +14,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
#include <Protocol/HiiConfigAccess.h> #include <Protocol/HiiConfigAccess.h>
#include <Protocol/SimpleFileSystem.h> #include <Protocol/SimpleFileSystem.h>
#include <Protocol/HiiPopup.h>
// //
// Libraries // Libraries