From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 93D95C05027 for ; Mon, 23 Jan 2023 13:04:31 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CAB6F856EA; Mon, 23 Jan 2023 14:04:28 +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="MtFK8uu0"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4AEF9854D2; Mon, 23 Jan 2023 14:04:27 +0100 (CET) Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) (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 55488856FD for ; Mon, 23 Jan 2023 14:04:24 +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=ilias.apalodimas@linaro.org Received: by mail-ed1-x529.google.com with SMTP id v13so14445756eda.11 for ; Mon, 23 Jan 2023 05:04:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=XjrWnw8elmZONDCEYGMSJLQW0D45bFt5FRordUqWk04=; b=MtFK8uu0FeuPaWfvdLfndEkvL4vqomKerrRoYtdnN9Gnp/M3qOb6bfLRocEtqXLHY7 FCRF3C1M2jyG2tYeTDOMrEZeFwj3SKDWVZX17uk/DUvlL6LdtKKXSEdlXsyQvOLfkAnV jcevFJvBV1whBwy9fU0ogQsyd2Ua0mj/e47G3M+6QrpHDDiiqN0ngHpBGiX2WOOC2YRj jBsP6w6LrZkyKqc9qmJEWdLUe7UesgWrviAYedqYtRBqJMK2IB26AHtqebJqJ54T/V5G fpxtYyaJ3z+4hnUnmIQVItWw59T/Mrr/T1JbMy0J4IX/uICiHpEo4yNmNQM518oMLumR u+qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=XjrWnw8elmZONDCEYGMSJLQW0D45bFt5FRordUqWk04=; b=RiaTeNDWgf3XnbpsEVSJjocScEvcYK9wkCii+D21XpIPMeLU4zSvHUoCBElAaona0Q ixVV0996umtlgHRfLLMDPP8y6qrB84IBgdzEQYrZrEO9i6e5bINCivpmak5dReqH9umC v1BYJgp74/g2MlWJReBw9nSWZ8VRscWfvU9onKIcBa8JzhXCu/e+TRtrLrytPu2U8ANR 28BoMJQdNw/Gy725aVQGo0KYP3lbLYh+yD/QvmoMDjNhYTqp1hGEXkx17B3dUS66XtGI 4IPLmyUVc5jrOcTa+nb7z390ir3xDd0MtIZay5N+hbP0Zxktx4ZQvzlFjYs8wOqCiTbs kh5A== X-Gm-Message-State: AFqh2krrCS4iKomzvDzsT1LqnHbfUr3p3oZc7qO/i+FPrDdkU/1Z6EsB 3dGW9LfTOgb/QiCSejvoxve5pQ== X-Google-Smtp-Source: AMrXdXu5SD5CXFp4rY2OsP1t4rPnZ2eSyFIrobCbbCQuOqCY1pfS8raAZhEbJFCRkJEWYKxH7CrIYg== X-Received: by 2002:a05:6402:2026:b0:49e:9751:2f0e with SMTP id ay6-20020a056402202600b0049e97512f0emr15578851edb.27.1674479063803; Mon, 23 Jan 2023 05:04:23 -0800 (PST) Received: from hera (ppp079167090036.access.hol.gr. [79.167.90.36]) by smtp.gmail.com with ESMTPSA id w9-20020a50c449000000b004972644b19fsm3224929edf.16.2023.01.23.05.04.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Jan 2023 05:04:23 -0800 (PST) Date: Mon, 23 Jan 2023 15:04:21 +0200 From: Ilias Apalodimas To: Masahisa Kojima Cc: u-boot@lists.denx.de, Heinrich Schuchardt Subject: Re: [PATCH v4 1/4] eficonfig: refactor eficonfig_process_common function Message-ID: References: <20230120084358.5919-1-masahisa.kojima@linaro.org> <20230120084358.5919-2-masahisa.kojima@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230120084358.5919-2-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 On Fri, Jan 20, 2023 at 05:43:55PM +0900, Masahisa Kojima wrote: > Current change boot order implementation does not call > eficonfig_process_common() and call own menu functions > for display_statusline, item_data_print and item_choice. > Change boot order functionality should call > eficonfig_process_common() to improve maintenanceability. > > This commit is a preparation to remove the change boot > order specific implementation. The menu functions > (display_statusline, item_data_print and item_choice) are > added as argument of eficonfig_process_common(). > The menu description string displayed at the bottom of > the menu is also added as argument. > > Signed-off-by: Masahisa Kojima > --- > No update since v3 > > Changes in v3: > - modify "reverse" local variable type to bool > > Changes in v2: > - add const qualifier to eficonfig_menu_desc, change it to pointer > > cmd/eficonfig.c | 71 +++++++++++++++++++++++++++++++++---------- > cmd/eficonfig_sbkey.c | 18 +++++++++-- > include/efi_config.h | 13 +++++++- > 3 files changed, 82 insertions(+), 20 deletions(-) > > diff --git a/cmd/eficonfig.c b/cmd/eficonfig.c > index d830e4af53..24d6bdb6bf 100644 > --- a/cmd/eficonfig.c > +++ b/cmd/eficonfig.c > @@ -22,6 +22,8 @@ > #include > > static struct efi_simple_text_input_protocol *cin; > +const char *eficonfig_menu_desc = > + " Press UP/DOWN to move, ENTER to select, ESC/CTRL+C to quit"; > > #define EFICONFIG_DESCRIPTION_MAX 32 > #define EFICONFIG_OPTIONAL_DATA_MAX 64 > @@ -134,10 +136,10 @@ void eficonfig_print_msg(char *msg) > * > * @data: pointer to the data associated with each menu entry > */ > -static void eficonfig_print_entry(void *data) > +void eficonfig_print_entry(void *data) > { > struct eficonfig_entry *entry = data; > - int reverse = (entry->efi_menu->active == entry->num); > + bool reverse = (entry->efi_menu->active == entry->num); > > /* TODO: support scroll or page for many entries */ > > @@ -161,7 +163,7 @@ static void eficonfig_print_entry(void *data) > * > * @m: pointer to the menu structure > */ > -static void eficonfig_display_statusline(struct menu *m) > +void eficonfig_display_statusline(struct menu *m) > { > struct eficonfig_entry *entry; > > @@ -171,10 +173,11 @@ static void eficonfig_display_statusline(struct menu *m) > printf(ANSI_CURSOR_POSITION > "\n%s\n" > ANSI_CURSOR_POSITION ANSI_CLEAR_LINE ANSI_CURSOR_POSITION > - " Press UP/DOWN to move, ENTER to select, ESC/CTRL+C to quit" > + "%s" > ANSI_CLEAR_LINE_TO_END ANSI_CURSOR_POSITION ANSI_CLEAR_LINE, > 1, 1, entry->efi_menu->menu_header, entry->efi_menu->count + 5, 1, > - entry->efi_menu->count + 6, 1, entry->efi_menu->count + 7, 1); > + entry->efi_menu->count + 6, 1, entry->efi_menu->menu_desc, > + entry->efi_menu->count + 7, 1); > } > > /** > @@ -183,7 +186,7 @@ static void eficonfig_display_statusline(struct menu *m) > * @data: pointer to the efimenu structure > * Return: key string to identify the selected entry > */ > -static char *eficonfig_choice_entry(void *data) > +char *eficonfig_choice_entry(void *data) > { > struct cli_ch_state s_cch, *cch = &s_cch; > struct list_head *pos, *n; > @@ -361,9 +364,17 @@ out: > * > * @efi_menu: pointer to the efimenu structure > * @menu_header: pointer to the menu header string > + * @menu_desc: pointer to the menu description > + * @display_statusline: function pointer to draw statusline > + * @item_data_print: function pointer to draw the menu item > + * @item_choice: function pointer to handle the key press > * Return: status code > */ > -efi_status_t eficonfig_process_common(struct efimenu *efi_menu, char *menu_header) > +efi_status_t eficonfig_process_common(struct efimenu *efi_menu, > + char *menu_header, const char *menu_desc, > + void (*display_statusline)(struct menu *), > + void (*item_data_print)(void *), > + char *(*item_choice)(void *)) > { > struct menu *menu; > void *choice = NULL; > @@ -382,10 +393,11 @@ efi_status_t eficonfig_process_common(struct efimenu *efi_menu, char *menu_heade > if (!efi_menu->menu_header) > return EFI_OUT_OF_RESOURCES; > } > + if (menu_desc) > + efi_menu->menu_desc = menu_desc; > > - menu = menu_create(NULL, 0, 1, eficonfig_display_statusline, > - eficonfig_print_entry, eficonfig_choice_entry, > - efi_menu); > + menu = menu_create(NULL, 0, 1, display_statusline, item_data_print, > + item_choice, efi_menu); > if (!menu) > return EFI_INVALID_PARAMETER; > > @@ -644,7 +656,12 @@ static efi_status_t eficonfig_select_volume(struct eficonfig_select_file_info *f > if (ret != EFI_SUCCESS) > goto out; > > - ret = eficonfig_process_common(efi_menu, " ** Select Volume **"); > + ret = eficonfig_process_common(efi_menu, " ** Select Volume **", > + eficonfig_menu_desc, > + eficonfig_display_statusline, > + eficonfig_print_entry, > + eficonfig_choice_entry); > + > out: > efi_free_pool(volume_handles); > list_for_each_safe(pos, n, &efi_menu->list) { > @@ -819,7 +836,11 @@ static efi_status_t eficonfig_show_file_selection(struct eficonfig_select_file_i > if (ret != EFI_SUCCESS) > goto err; > > - ret = eficonfig_process_common(efi_menu, " ** Select File **"); > + ret = eficonfig_process_common(efi_menu, " ** Select File **", > + eficonfig_menu_desc, > + eficonfig_display_statusline, > + eficonfig_print_entry, > + eficonfig_choice_entry); > err: > EFI_CALL(f->close(f)); > eficonfig_destroy(efi_menu); > @@ -980,7 +1001,11 @@ efi_status_t eficonfig_process_show_file_option(void *data) > if (!efi_menu) > return EFI_OUT_OF_RESOURCES; > > - ret = eficonfig_process_common(efi_menu, " ** Update File **"); > + ret = eficonfig_process_common(efi_menu, " ** Update File **", > + eficonfig_menu_desc, > + eficonfig_display_statusline, > + eficonfig_print_entry, > + eficonfig_choice_entry); > if (ret != EFI_SUCCESS) /* User selects "Clear" or "Quit" */ > ret = EFI_NOT_READY; > > @@ -1326,7 +1351,12 @@ static efi_status_t eficonfig_show_boot_option(struct eficonfig_boot_option *bo, > if (ret != EFI_SUCCESS) > goto out; > > - ret = eficonfig_process_common(efi_menu, header_str); > + ret = eficonfig_process_common(efi_menu, header_str, > + eficonfig_menu_desc, > + eficonfig_display_statusline, > + eficonfig_print_entry, > + eficonfig_choice_entry); > + > out: > eficonfig_destroy(efi_menu); > > @@ -1745,7 +1775,11 @@ static efi_status_t eficonfig_show_boot_selection(unsigned int *selected) > if (ret != EFI_SUCCESS) > goto out; > > - ret = eficonfig_process_common(efi_menu, " ** Select Boot Option **"); > + ret = eficonfig_process_common(efi_menu, " ** Select Boot Option **", > + eficonfig_menu_desc, > + eficonfig_display_statusline, > + eficonfig_print_entry, > + eficonfig_choice_entry); > out: > list_for_each_safe(pos, n, &efi_menu->list) { > entry = list_entry(pos, struct eficonfig_entry, list); > @@ -2567,7 +2601,12 @@ static int do_eficonfig(struct cmd_tbl *cmdtp, int flag, int argc, char *const a > if (!efi_menu) > return CMD_RET_FAILURE; > > - ret = eficonfig_process_common(efi_menu, " ** UEFI Maintenance Menu **"); > + ret = eficonfig_process_common(efi_menu, > + " ** UEFI Maintenance Menu **", > + eficonfig_menu_desc, > + eficonfig_display_statusline, > + eficonfig_print_entry, > + eficonfig_choice_entry); > eficonfig_destroy(efi_menu); > > if (ret == EFI_ABORTED) > diff --git a/cmd/eficonfig_sbkey.c b/cmd/eficonfig_sbkey.c > index ed39aab081..caca27495e 100644 > --- a/cmd/eficonfig_sbkey.c > +++ b/cmd/eficonfig_sbkey.c > @@ -410,7 +410,10 @@ static efi_status_t enumerate_and_show_signature_database(void *varname) > goto out; > > snprintf(buf, sizeof(buf), " ** Show Signature Database (%ls) **", (u16 *)varname); > - ret = eficonfig_process_common(efi_menu, buf); > + ret = eficonfig_process_common(efi_menu, buf, eficonfig_menu_desc, > + eficonfig_display_statusline, > + eficonfig_print_entry, > + eficonfig_choice_entry); > out: > list_for_each_safe(pos, n, &efi_menu->list) { > entry = list_entry(pos, struct eficonfig_entry, list); > @@ -472,7 +475,11 @@ static efi_status_t eficonfig_process_set_secure_boot_key(void *data) > efi_menu = eficonfig_create_fixed_menu(key_config_menu_items, > ARRAY_SIZE(key_config_menu_items)); > > - ret = eficonfig_process_common(efi_menu, header_str); > + ret = eficonfig_process_common(efi_menu, header_str, > + eficonfig_menu_desc, > + eficonfig_display_statusline, > + eficonfig_print_entry, > + eficonfig_choice_entry); > eficonfig_destroy(efi_menu); > > if (ret == EFI_ABORTED) > @@ -518,7 +525,12 @@ efi_status_t eficonfig_process_secure_boot_config(void *data) > break; > } > > - ret = eficonfig_process_common(efi_menu, header_str); > + ret = eficonfig_process_common(efi_menu, header_str, > + eficonfig_menu_desc, > + eficonfig_display_statusline, > + eficonfig_print_entry, > + eficonfig_choice_entry); > + > eficonfig_destroy(efi_menu); > > if (ret == EFI_ABORTED) > diff --git a/include/efi_config.h b/include/efi_config.h > index fd69926343..cec5715f84 100644 > --- a/include/efi_config.h > +++ b/include/efi_config.h > @@ -9,12 +9,14 @@ > #define _EFI_CONFIG_H > > #include > +#include > > #define EFICONFIG_ENTRY_NUM_MAX 99 > #define EFICONFIG_VOLUME_PATH_MAX 512 > #define EFICONFIG_FILE_PATH_MAX 512 > #define EFICONFIG_FILE_PATH_BUF_SIZE (EFICONFIG_FILE_PATH_MAX * sizeof(u16)) > > +extern const char *eficonfig_menu_desc; > typedef efi_status_t (*eficonfig_entry_func)(void *data); > > /** > @@ -45,6 +47,7 @@ struct eficonfig_entry { > * @active: active menu entry index > * @count: total count of menu entry > * @menu_header: menu header string > + * @menu_desc: menu description string > * @list: menu entry list structure > */ > struct efimenu { > @@ -52,6 +55,7 @@ struct efimenu { > int active; > int count; > char *menu_header; > + const char *menu_desc; > struct list_head list; > }; > > @@ -86,9 +90,16 @@ struct eficonfig_select_file_info { > }; > > void eficonfig_print_msg(char *msg); > +void eficonfig_print_entry(void *data); > +void eficonfig_display_statusline(struct menu *m); > +char *eficonfig_choice_entry(void *data); > 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_process_common(struct efimenu *efi_menu, > + char *menu_header, const char *menu_desc, > + void (*display_statusline)(struct menu *), > + void (*item_data_print)(void *), > + char *(*item_choice)(void *)); > 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); > -- > 2.17.1 > Reviewed-by: Ilias Apalodimas