From patchwork Wed Oct 26 10:43:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahisa Kojima X-Patchwork-Id: 618802 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp309787pvb; Wed, 26 Oct 2022 03:43:30 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7O9xD/rdWnrtGPCiXH+M2hUZ4qIzT5LLPw+nCb3YNxWG8Xhbzv4AYkVqNaEBKbER8ro37S X-Received: by 2002:a17:906:730f:b0:791:9b75:2ca1 with SMTP id di15-20020a170906730f00b007919b752ca1mr35319329ejc.140.1666781009971; Wed, 26 Oct 2022 03:43:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666781009; cv=none; d=google.com; s=arc-20160816; b=H2s0KP0EgVFeUQc+wCMUmUV/GwZBk4i6hFNKtEEUGEAKwk2wsDjtaIrPHukw6CjGnR 6ecEDISvw/FZpvEA3h873a4G1lI5RYKlES8ty349RyXX0GKxxfTlyvCKrxBpItXCxPpU G0N+stvLNiDrj/tJw01r7PpqV3cBaSTIbWEw5FfSD/6krH2tyBZ/anGKHD21A4yex7nv X9Zqh3aTReXwLea3e2JXJ/9Sw5c3sNt5PFy1S50IB2Kds6JXxUbdLi//RAV/0/AUKetR SYZUvQ4VV0A59u9JY230QdJFODK1GtmW8PRpooWFZsXVxKL9dyo7FjIEhRTN+tLnnEQ+ kmEA== 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=OMsh9Oc0CCknYUovkbuTqB+UsRMDQpThqpMPaS13aiY=; b=KpjuZgmZEGvii4HNjZ37+EZebbVIuB5JIENhxxXbYnP++QmC2PBqkpM8eyI96QbKK+ MbQhi+rXu8RhG49QWB88ttPQIToqq6huKcMjkzziNHwik3GoHmjusWd7boNFdGu9fOex O4IEoX3YuZsZudGYga2CeSbm4qOtc9hA8K/P1YW33veExsLEsFfhQEDpASw8kwbGaIsg T3PKEybXhU+q+qS4r1jC6+DzL7evWM6770dymZMaOSRjqG3e2FpQfaX+gPQcqluxBWdR 76csIQ4Ssal52HEEHbxi3jHJDQ6dUR5ZB3JcQHZd/V/J7aVLzMgVEP+Q5e2DU8Ga50Rl 01Sg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BheukdxF; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 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. [2a01:238:438b:c500:173d:9f52:ddab:ee01]) by mx.google.com with ESMTPS id cw12-20020a170906478c00b007a2d966eeccsi2518306ejc.686.2022.10.26.03.43.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Oct 2022 03:43:29 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BheukdxF; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 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 984A885035; Wed, 26 Oct 2022 12:43:28 +0200 (CEST) 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="BheukdxF"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4CFCC85017; Wed, 26 Oct 2022 12:43:14 +0200 (CEST) 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-pj1-x1031.google.com (mail-pj1-x1031.google.com [IPv6:2607:f8b0:4864:20::1031]) (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 219E085017 for ; Wed, 26 Oct 2022 12:43:10 +0200 (CEST) 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-pj1-x1031.google.com with SMTP id m6-20020a17090a5a4600b00212f8dffec9so1772454pji.0 for ; Wed, 26 Oct 2022 03:43:10 -0700 (PDT) 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=OMsh9Oc0CCknYUovkbuTqB+UsRMDQpThqpMPaS13aiY=; b=BheukdxFB1dfQKHXujhApRiBlh9h2wP3j5L3pBACPM/FBoUydaIhgFhPAyU5Y7S+Y+ zrBG5hQaJ1TlrAo2ph3QwvM0wGwQtC/PZVEMOClWmbWCfLAz2wo+q2ChJy4DsIQsXR/P 7qE/SNtJ1djBMW4w2Is19M1mDzwO6ZyyV3BwT6IvI8w+sD/fhmE9daJUIE33TyovJZgd bMCdsIniTypLGAdbnH2tQUH5+kiPYgFTOZw5AHCtqEsZiRFdDP1PshTz31BUUGd4tPhD hnZUiemoiG31nAsOXHQKPOE4ezncfZYabqEBKzh+7SOcnYfbxUpbteqktGaxtEXSLvlf MVVQ== 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=OMsh9Oc0CCknYUovkbuTqB+UsRMDQpThqpMPaS13aiY=; b=3KtCwcYOphbHzKWdKEmGsji+JIQ9zWr17b8cyFeBgGKlCYk4jA/9wyB3faV7PyR/1O 8k+//nIw+Nir8V7yWMu2NOzCm6hd6Q98+RMIxBTjPYe4kTel5D8mBM1JA+1vZbsQ4RSu moW8utr1TujJ7aGr6nDpE/dnGGhdr0vK94dvVuQRrtzOLkHhP4iByxeqgwnUtaTrL07C ku+zZj0lu9u2LdmmdWvmYq06OW8nW2ob7rpJpIXhhoFja0y4YspyLXJd4NH8O7N1jypv 7OyIRCHDSbVaeE9mh4CIKGcIW/Wi0bju9OEN9x/4UuQ6vjFHPiMx1X95ieEdglc6YYms ZIOw== X-Gm-Message-State: ACrzQf01rq+QF995sKwfxsXsh86oq25lhdGmdBNyZiFuCQzvnVFakrkF uq3Sfr/aOzi+5ZdLh6VvFjKSalox+op2DA== X-Received: by 2002:a17:902:6ac2:b0:184:7a4c:fdd6 with SMTP id i2-20020a1709026ac200b001847a4cfdd6mr43324208plt.54.1666780988201; Wed, 26 Oct 2022 03:43:08 -0700 (PDT) Received: from localhost.localdomain ([240d:1a:cf7:5800:82fa:5bff:fe4b:26b1]) by smtp.gmail.com with ESMTPSA id b3-20020a1709027e0300b00186881e1feasm2637078plm.112.2022.10.26.03.43.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Oct 2022 03:43:07 -0700 (PDT) From: Masahisa Kojima To: u-boot@lists.denx.de Cc: Heinrich Schuchardt , Ilias Apalodimas , Simon Glass , Takahiro Akashi , Etienne Carriere , Masahisa Kojima Subject: [PATCH v6 1/5] eficonfig: refactor eficonfig_select_file_handler() Date: Wed, 26 Oct 2022 19:43:41 +0900 Message-Id: <20221026104345.28714-2-masahisa.kojima@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221026104345.28714-1-masahisa.kojima@linaro.org> References: <20221026104345.28714-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() intends to add the additional menu mainly to clear the selected file information. eficonfig_display_select_file_option() is not necessary for the file selection process, so it should be outside of eficonfig_select_file_handler(). Signed-off-by: Masahisa Kojima --- No change since v2 newly created in v2 cmd/eficonfig.c | 13 +++++-------- test/py/tests/test_eficonfig/test_eficonfig.py | 1 + 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/cmd/eficonfig.c b/cmd/eficonfig.c index 2595dd9563..f6a99bd01a 100644 --- a/cmd/eficonfig.c +++ b/cmd/eficonfig.c @@ -968,7 +968,7 @@ efi_status_t eficonfig_process_clear_file_selection(void *data) } static struct eficonfig_item select_file_menu_items[] = { - {"Select File", eficonfig_process_select_file}, + {"Select File", eficonfig_select_file_handler}, {"Clear", eficonfig_process_clear_file_selection}, {"Quit", eficonfig_process_quit}, }; @@ -980,12 +980,13 @@ static struct eficonfig_item select_file_menu_items[] = { * @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_display_select_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) @@ -1016,10 +1017,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; @@ -1284,7 +1281,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_display_select_file_option, file_info); out: free(devname); free(file_name); 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)