colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmd: simplify eficonfig_init()

Browse Source 
As the system table already has pointers to the Simple Text Input and
Output Protocols we can directly use these instead of calling
OpenProtocol.

Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
This commit is contained in:
Heinrich Schuchardt
2025-03-10 07:13:43 +01:00
parent 71f497a6d3
commit 6cabeaf2d8
1 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
cmd/eficonfig.c
View File

@@ -2283,26 +2283,11 @@ static efi_status_t eficonfig_init(void)
{ {
efi_status_t ret = EFI_SUCCESS; efi_status_t ret = EFI_SUCCESS;
static bool init; static bool init;
struct efi_handler *handler;
unsigned long columns, rows; unsigned long columns, rows;
if (!init) { if (!init) {
ret = efi_search_protocol(efi_root, &efi_guid_text_input_protocol, &handler); cout = systab.con_out;
if (ret != EFI_SUCCESS) cin = systab.con_in;
return ret;
ret = efi_protocol_open(handler, (void **)&cin, efi_root, NULL,
EFI_OPEN_PROTOCOL_GET_PROTOCOL);
if (ret != EFI_SUCCESS)
return ret;
ret = efi_search_protocol(efi_root, &efi_guid_text_output_protocol, &handler);
if (ret != EFI_SUCCESS)
return ret;
ret = efi_protocol_open(handler, (void **)&cout, efi_root, NULL,
EFI_OPEN_PROTOCOL_GET_PROTOCOL);
if (ret != EFI_SUCCESS)
return ret;
cout->query_mode(cout, cout->mode->mode, &columns, &rows); cout->query_mode(cout, cout->mode->mode, &columns, &rows);
avail_row = rows - (EFICONFIG_MENU_HEADER_ROW_NUM + avail_row = rows - (EFICONFIG_MENU_HEADER_ROW_NUM +