From patchwork Mon Oct 24 04:47:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahisa Kojima X-Patchwork-Id: 617832 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2483008pvb; Sun, 23 Oct 2022 21:47:53 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4XxPIphX+95FBprZeHArsBgw317XamugkZJDUGWujlm3rWVIBoMzdAeL3QlYw6txE9rdIW X-Received: by 2002:a17:907:b0b:b0:78d:8877:9f9e with SMTP id h11-20020a1709070b0b00b0078d88779f9emr25520186ejl.693.1666586873575; Sun, 23 Oct 2022 21:47:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666586873; cv=none; d=google.com; s=arc-20160816; b=zUCVWuy3hfTrXgBfRkAGF97axR2pMGf1kv02Fcm7TxqiZYhAdUMRXDW7SggoyqYjJY 1lgUbA25vik0IN+VsTx2M5tThVk9Afdy6BADGImyFyqtnd8Xh2DQvcSGBKiU3ZAc1oCu MQzE0cGtjn9bBGpVQIQoaKuVbceHoD8Sbirg1SkEkJ41HE5rxqcFANyvvtld+pYvF8NF oEY/Lr7UUmJgsK1VARfadkJu/Lpl6fmiMjjHdUygWOOTZMwTBSw5VdTuxl37lAy171m1 1rhs688h0trMZPt0zE7LgWXxys7n0iRPqPZLTSjPX5r3rhFvXXyQIE/MdfPeSNuTJcLE pr5Q== 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=mIfVlRRFu6D0eE+mUG1oh6Bjw/TDS44Ge7rbQ8JMeEkrfDmzBS/Sww1CXT2eyGc/09 6Kt5OputZuu3A7ut2kbLQtaLUZZPLkDYh/EESBFYZJG4S9VaM1m7mEo4nA6COx9TBkSB ARKDeavAPeSrjK22WXXoARBQIpJzyddWG0wHd9RZWU574Asy+fPzg4XINY5CYcBdCWrz mUXT7ImruAVqELhTnGKpB0D7yUH/gGbkkt5GKbRlIvc3qSZUufdb/e9g2X444mtosLNS X5KJD18njYQ68zpy5o9gjTTrkeYRq2tEPK7dFBZ/P8vttnx1Ozygzd7+4JqNPq+mi4JY NGKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=X4NbSbX6; 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 i6-20020a0564020f0600b00454474269dbsi25140315eda.154.2022.10.23.21.47.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Oct 2022 21:47:53 -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=X4NbSbX6; 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 8CF8684F1A; Mon, 24 Oct 2022 06:47:42 +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="X4NbSbX6"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C4F1484F0B; Mon, 24 Oct 2022 06:47:39 +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-pl1-x632.google.com (mail-pl1-x632.google.com [IPv6:2607:f8b0:4864:20::632]) (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 F003284EEA for ; Mon, 24 Oct 2022 06:47:36 +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-pl1-x632.google.com with SMTP id n7so7559467plp.1 for ; Sun, 23 Oct 2022 21:47:36 -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=X4NbSbX6jT6LRKYcirGh4ZFYQH27cp8jAx8yv+AjmKzbnlU3VJWvULmCKNyQ6WvIjr 0wbaC6rGwwHEk3l+ZvNB6cYWuZ3sb9OnEW++/3jVt9qpJeYqJJ+PWXRwS4Hroc5VhcnA DH2vmReH13HxNpnSsMZRK4k7W6roZEHho2bA45gprg9DI9rvioJRpTCM9ivIEgcZUqIu lr9sqb2OCAJI1tEQqHquizUz9TQfwh2xf4u4LUmIzHriF+i2oDZoZ5hLjyTeNFMOiUED 8lh8Pqx294Xt7iRC0jYQXHs5wLMlwr1JT0JIy5Qoa9UGcIYQ09QVSW/Skac24JYVwQLh a4DQ== 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=P+X0ikg1OVE5lk74WcpIW6syfSfw3egFGQWGr3pbD4AKw58nvID+dJicsSuFQ3MpKK 2Z6Q7otSN0wrOPU0FjNXXrOPRFS+h4o7mX2eokfUFnkl7snbLGUYThB6405g/f9dLzsN eVYQT0oo6nzFVdq0TpJQ0yX8tpVLmF/9tX8Hhpio4fBknWGvd1sbKttNFjy7OIXykVGN cEgya8R6gRN9Dhzcmuyw0+FRttXQGl5/xpUhkW/LECNP2GbodTMZzM4e6nZbsvzNAeME Fguop4U1qRkR48xpSvcIZYtmD1XrYMnZTlpuCs11L+PHF4gDr08++yZmaD9pax45nDUH Nz/g== X-Gm-Message-State: ACrzQf3/7GOt3nu6KWfyW6E7aS6axKE42HzTlVxL7EAzFxIr6cV8YIZX JaBf6/00OtA8cLkr4uKXgX/XXLgR9jom9w== X-Received: by 2002:a17:90a:e7c4:b0:20d:451f:a988 with SMTP id kb4-20020a17090ae7c400b0020d451fa988mr35622076pjb.57.1666586854970; Sun, 23 Oct 2022 21:47:34 -0700 (PDT) Received: from localhost.localdomain ([240d:1a:cf7:5800:82fa:5bff:fe4b:26b1]) by smtp.gmail.com with ESMTPSA id i72-20020a62874b000000b0056b932f3280sm3213979pfe.103.2022.10.23.21.47.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Oct 2022 21:47:34 -0700 (PDT) From: Masahisa Kojima To: u-boot@lists.denx.de Cc: Heinrich Schuchardt , Ilias Apalodimas , Simon Glass , Takahiro Akashi , Masahisa Kojima Subject: [PATCH v4 1/7] eficonfig: refactor eficonfig_select_file_handler() Date: Mon, 24 Oct 2022 13:47:58 +0900 Message-Id: <20221024044804.3351-2-masahisa.kojima@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221024044804.3351-1-masahisa.kojima@linaro.org> References: <20221024044804.3351-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)