From patchwork Thu Nov 10 08:30:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahisa Kojima X-Patchwork-Id: 623322 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp761193pvb; Thu, 10 Nov 2022 00:29:28 -0800 (PST) X-Google-Smtp-Source: AMsMyM7I03xV0ylEXR6aMoXM76BQXZFEt7EPpW7gYKi6QarZMQZ4tSMCmNK3Em+w4uMjmMqTMMjX X-Received: by 2002:a17:906:7055:b0:78b:9148:6b41 with SMTP id r21-20020a170906705500b0078b91486b41mr58368642ejj.629.1668068968453; Thu, 10 Nov 2022 00:29:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668068968; cv=none; d=google.com; s=arc-20160816; b=TKsGYWYXcXmZs4UYiASGyHypUBEHuUsva5ZSYWCfANQzm+fqaIw8+9oD8wLlYaE0ve asIy9lTdrYfGZjWEwMve4VNbOh6xU1z/8GpglokRKi/nYGUqrjRSk0qVk0lS0xCJGLns XCUWX3ja8kWbiEH3qsdN4EqUdBzlElmLi9L99TWUve9ip2PVOZ5L2+e3iaU8byrntwUa 8VY/9iCsCCQXMffyPATLVvzOOiQnBmVnl2EvHKn7SPBYl59hv1IejscEdXUqs3qXT2eR anTLSkuFCnxasrbdY/3wGOwOZHRlj8UZM8/USMeSCtybe1Aqk5P9eZZXk5bVusKWC+I2 xkMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=hR9bGrO+zYvfLdWABU8jdk1REtDhHq9ZaStcbcnoXgk=; b=WBTWbdLKzF9W8NoSezgIhs2pvIZAisF+ac0kJzO1IjnPOg2p/66RmM3tYSPCuYpVcz D50vSerMtU80ijLJkEqd0AQucI2vLB25n1DTkAxvQN42LVXeEYXGLycbAGSLZ0rH4PlL UCzQMBLMzso4OBdsvZxCYJz4e7x5Ixrp0dAf+YAB+sZ+8u6ADkxng5TAFrKoqiO/8j9y PVHuXEtbW6v6d4NP8ZW4goaLIv+HC4s3JLs+s54Wxz6PEtYgLvlgnpPbai+3bbP86fVy CXzCEXQ233Gt1C6DpehwZ8TsbKPPdpLEKYuFtZtSDzMp4tuqYkR/HhiAZM63geY6XZ+g i1ig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=aUxvUPOh; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [85.214.62.61]) by mx.google.com with ESMTPS id sa7-20020a1709076d0700b0078dec48d442si18399863ejc.680.2022.11.10.00.29.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Nov 2022 00:29:28 -0800 (PST) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) client-ip=85.214.62.61; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=aUxvUPOh; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 00FD285106; Thu, 10 Nov 2022 09:29:23 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="aUxvUPOh"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8894285106; Thu, 10 Nov 2022 09:29:20 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pg1-x531.google.com (mail-pg1-x531.google.com [IPv6:2607:f8b0:4864:20::531]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 746FA850FB for ; Thu, 10 Nov 2022 09:29:15 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=masahisa.kojima@linaro.org Received: by mail-pg1-x531.google.com with SMTP id 130so1115787pgc.5 for ; Thu, 10 Nov 2022 00:29:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=hR9bGrO+zYvfLdWABU8jdk1REtDhHq9ZaStcbcnoXgk=; b=aUxvUPOhuXhY0ZNjMp/dEDyOWEu4vn5BohQbC9iXC6alEZWrD8UeRbfQWUZIWQAdl5 w+fpY1iKuYZeNLCLh61aLIJzkMmRbdNY4wZgjWoPSgDZ+t3/xpntWLykNPvBfKAsSYAx b7ZZyr3LwOF+mKRyU1A0D0h/RjyTk3/6qbhmjWk3ZBzkhZSfY9DQZog5qT6krltXdJDT zCUAVw2Z6BmSvxLHNo3tEcI1YDb0xh7TvVYa/YXTlFDfTviyxkh3Zbj0/b3Q78ilSdS7 YnnoJMM+ONuBeDk2SlklWCUBi3rJa/yKZT5S3Vh4RO0XuPDYwQ5SKLKD2f+kB1SbLfOT KyoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=references:in-reply-to:message-id:date:subject:cc:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=hR9bGrO+zYvfLdWABU8jdk1REtDhHq9ZaStcbcnoXgk=; b=cIO+xLng/E516ZtxAX/6l/jDCHndrRaybrt8Uu9NO1IMvjnm/7RUpMHo4dmRvO3LVX 5SoZ5lAwWALulVu8fO04GUPRyGQuT91ItRyT2Eu3CObgM3ttuhHjGqNeekHBhEIRVpRF 7YjnbBy8GsSZ5ZHy8W7bXf4n5kZmv8OLUTkmJODGOgYsNXNGt8k4vOcYGAXv41lx9IqR n99VHlCswFI1hgeQHVTymFCECCnRZpYOkc7Re/Zmfz0WXSBPbqaIg9g0OKIUW4WTMkv1 i7eF1BhqriL+s/tbIg/gFHBRWFG8DdJ5am1ZBxVLfiwAfRAaGEJ6uL9xMxlF2xakPKB6 onMA== X-Gm-Message-State: ACrzQf09If0IdgCTsT4/s7jyDbl4USqEpzfTOj8EZSfv1iobAqU7G4qU 9DF7NlgwhjWDD/MOTtSwwyrwwWtva0PFmQ== X-Received: by 2002:a05:6a00:150b:b0:56b:e358:5c08 with SMTP id q11-20020a056a00150b00b0056be3585c08mr63194417pfu.37.1668068953236; Thu, 10 Nov 2022 00:29:13 -0800 (PST) Received: from localhost.localdomain ([240d:1a:cf7:5800:82fa:5bff:fe4b:26b1]) by smtp.gmail.com with ESMTPSA id b1-20020a170903228100b00176ba091cd3sm10638194plh.196.2022.11.10.00.29.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Nov 2022 00:29:12 -0800 (PST) From: Masahisa Kojima To: u-boot@lists.denx.de Cc: Heinrich Schuchardt , Ilias Apalodimas , Simon Glass , Takahiro Akashi , Etienne Carriere , Masahisa Kojima Subject: [PATCH v8 1/5] eficonfig: refactor file selection handling Date: Thu, 10 Nov 2022 17:30:50 +0900 Message-Id: <20221110083054.11950-2-masahisa.kojima@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221110083054.11950-1-masahisa.kojima@linaro.org> References: <20221110083054.11950-1-masahisa.kojima@linaro.org> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean eficonfig_select_file_handler() is commonly used to select the file. eficonfig_display_select_file_option() adds an additional menu to clear the selected file. eficonfig_display_select_file_option() is not always necessary for the file selection process, so it must be outside of eficonfig_select_file_handler(). This commit also renames the following functions to avoid confusion. eficonfig_select_file_handler() -> eficonfig_process_select_file() eficonfig_select_file() -> eficonfig_show_file_selection() eficonfig_display_select_file_option() -> eficonfig_process_show_file_option() Finally, test_eficonfig.py need to be updated to get aligned with the above modification. Signed-off-by: Masahisa Kojima Reviewed-by: Ilias Apalodimas --- No update since v7 Changes in v7: - rename functio name to avoid confusion - remove unused function - update commit message newly created in v2 cmd/eficonfig.c | 37 ++++++------------- include/efi_config.h | 2 +- .../py/tests/test_eficonfig/test_eficonfig.py | 1 + 3 files changed, 13 insertions(+), 27 deletions(-) diff --git a/cmd/eficonfig.c b/cmd/eficonfig.c index 2595dd9563..571e2b9ac0 100644 --- a/cmd/eficonfig.c +++ b/cmd/eficonfig.c @@ -756,14 +756,14 @@ out: } /** - * eficonfig_select_file() - construct the file selection menu + * eficonfig_show_file_selection() - construct the file selection menu * * @file_info: pointer to the file selection structure * @root: pointer to the file handle * Return: status code */ -static efi_status_t eficonfig_select_file(struct eficonfig_select_file_info *file_info, - struct efi_file_handle *root) +static efi_status_t eficonfig_show_file_selection(struct eficonfig_select_file_info *file_info, + struct efi_file_handle *root) { u32 count = 0, i; efi_uintn_t len; @@ -938,17 +938,6 @@ static efi_status_t eficonfig_boot_edit_save(void *data) return EFI_SUCCESS; } -/** - * eficonfig_process_select_file() - callback function for "Select File" entry - * - * @data: pointer to the data - * Return: status code - */ -efi_status_t eficonfig_process_select_file(void *data) -{ - return EFI_SUCCESS; -} - /** * eficonfig_process_clear_file_selection() - callback function for "Clear" entry * @@ -973,19 +962,19 @@ static struct eficonfig_item select_file_menu_items[] = { {"Quit", eficonfig_process_quit}, }; - /** - * eficonfig_display_select_file_option() - display select file option + * eficonfig_process_show_file_option() - display select file option * * @file_info: pointer to the file information structure * Return: status code */ -efi_status_t eficonfig_display_select_file_option(struct eficonfig_select_file_info *file_info) +efi_status_t eficonfig_process_show_file_option(void *data) { efi_status_t ret; struct efimenu *efi_menu; - select_file_menu_items[1].data = file_info; + select_file_menu_items[0].data = data; + select_file_menu_items[1].data = data; efi_menu = eficonfig_create_fixed_menu(select_file_menu_items, ARRAY_SIZE(select_file_menu_items)); if (!efi_menu) @@ -1001,12 +990,12 @@ efi_status_t eficonfig_display_select_file_option(struct eficonfig_select_file_i } /** - * eficonfig_select_file_handler() - handle user file selection + * eficonfig_process_select_file() - handle user file selection * * @data: pointer to the data * Return: status code */ -efi_status_t eficonfig_select_file_handler(void *data) +efi_status_t eficonfig_process_select_file(void *data) { size_t len; efi_status_t ret; @@ -1016,10 +1005,6 @@ efi_status_t eficonfig_select_file_handler(void *data) struct eficonfig_select_file_info *tmp = NULL; struct eficonfig_select_file_info *file_info = data; - ret = eficonfig_display_select_file_option(file_info); - if (ret != EFI_SUCCESS) - return ret; - tmp = calloc(1, sizeof(struct eficonfig_select_file_info)); if (!tmp) return EFI_OUT_OF_RESOURCES; @@ -1046,7 +1031,7 @@ efi_status_t eficonfig_select_file_handler(void *data) if (ret != EFI_SUCCESS) goto out; - ret = eficonfig_select_file(tmp, root); + ret = eficonfig_show_file_selection(tmp, root); if (ret == EFI_ABORTED) continue; if (ret != EFI_SUCCESS) @@ -1284,7 +1269,7 @@ static efi_status_t prepare_file_selection_entry(struct efimenu *efi_menu, char utf8_utf16_strcpy(&p, devname); u16_strlcat(file_name, file_info->current_path, len); ret = create_boot_option_entry(efi_menu, title, file_name, - eficonfig_select_file_handler, file_info); + eficonfig_process_show_file_option, file_info); out: free(devname); free(file_name); diff --git a/include/efi_config.h b/include/efi_config.h index 098cac2115..cc6aa51393 100644 --- a/include/efi_config.h +++ b/include/efi_config.h @@ -89,7 +89,7 @@ void eficonfig_print_msg(char *msg); void eficonfig_destroy(struct efimenu *efi_menu); efi_status_t eficonfig_process_quit(void *data); efi_status_t eficonfig_process_common(struct efimenu *efi_menu, char *menu_header); -efi_status_t eficonfig_select_file_handler(void *data); +efi_status_t eficonfig_process_select_file(void *data); efi_status_t eficonfig_get_unused_bootoption(u16 *buf, efi_uintn_t buf_size, u32 *index); efi_status_t eficonfig_append_bootorder(u16 index); diff --git a/test/py/tests/test_eficonfig/test_eficonfig.py b/test/py/tests/test_eficonfig/test_eficonfig.py index 99606d9c4b..102bfd7541 100644 --- a/test/py/tests/test_eficonfig/test_eficonfig.py +++ b/test/py/tests/test_eficonfig/test_eficonfig.py @@ -349,6 +349,7 @@ def test_efi_eficonfig(u_boot_console, efi_eficonfig_data): press_up_down_enter_and_wait(0, 1, True, 'Quit') press_up_down_enter_and_wait(0, 0, True, 'No block device found!') press_escape_key(False) + press_escape_key(False) check_current_is_maintenance_menu() # Return to U-Boot console press_escape_key(True)