From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
To: barebox@lists.infradead.org
Subject: [PATCH 2/2] menu: fix non command management support
Date: Mon, 23 Apr 2012 08:22:40 +0200 [thread overview]
Message-ID: <1335162160-30661-2-git-send-email-plagnioj@jcrosoft.com> (raw)
In-Reply-To: <1335162160-30661-1-git-send-email-plagnioj@jcrosoft.com>
the auto select is always available
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
commands/menu.c | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/commands/menu.c b/commands/menu.c
index e5ce5a9..8833d74 100644
--- a/commands/menu.c
+++ b/commands/menu.c
@@ -41,14 +41,14 @@ typedef enum {
struct cmd_menu {
char *menu;
menu_action action;
+ char *description;
+ int auto_select;
#if defined(CONFIG_CMD_MENU_MANAGEMENT)
int entry;
int re_entrant;
- char *description;
char *command;
char *submenu;
int num;
- int auto_select;
menu_entry_type type;
int box_state;
#endif
@@ -58,7 +58,7 @@ struct cmd_menu {
#define OPTS "m:earlc:d:RsSn:u:A:b:B:"
#define is_entry(x) ((x)->entry)
#else
-#define OPTS "m:ls"
+#define OPTS "m:lsA:d:"
#define is_entry(x) (0)
#endif
@@ -334,6 +334,12 @@ static int do_menu(int argc, char *argv[])
case 's':
cm.action = action_show;
break;
+ case 'A':
+ cm.auto_select = simple_strtoul(optarg, NULL, 10);
+ break;
+ case 'd':
+ cm.description = optarg;
+ break;
#if defined(CONFIG_CMD_MENU_MANAGEMENT)
case 'e':
cm.entry = 1;
@@ -350,9 +356,6 @@ static int do_menu(int argc, char *argv[])
case 'u':
cm.submenu = optarg;
break;
- case 'd':
- cm.description = optarg;
- break;
case 'R':
cm.re_entrant = 1;
break;
@@ -362,8 +365,6 @@ static int do_menu(int argc, char *argv[])
case 'n':
cm.num = simple_strtoul(optarg, NULL, 10);
break;
- case 'A':
- cm.auto_select = simple_strtoul(optarg, NULL, 10);
case 'b':
cm.type = MENU_ENTRY_BOX;
cm.box_state = simple_strtoul(optarg, NULL, 10);
--
1.7.9.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
prev parent reply other threads:[~2012-04-23 6:42 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-23 6:22 [PATCH 1/2] usb: fix driver name Jean-Christophe PLAGNIOL-VILLARD
2012-04-23 6:22 ` Jean-Christophe PLAGNIOL-VILLARD [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1335162160-30661-2-git-send-email-plagnioj@jcrosoft.com \
--to=plagnioj@jcrosoft.com \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox