dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-10-22 10:31:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

menu: Update bootmenu_loop() to return the code

Browse Source 
Use the return value to save having to pass around a pointer. This also
resolves any ambiguity about what *key contains when the function is
called.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2023-01-06 08:52:24 -06:00
committed by Tom Rini
parent 5712976b26
commit d0ca98dbd9
4 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
common/menu.c
View File

@@ -476,9 +476,9 @@ enum bootmenu_key bootmenu_autoboot_loop(struct bootmenu_data *menu, int *esc)
return key;
}
void bootmenu_loop(struct bootmenu_data *menu,
enum bootmenu_key *key, int *esc)
enum bootmenu_key bootmenu_loop(struct bootmenu_data *menu, int *esc)
{
enum bootmenu_key key = BKEY_NONE;
int c;
if (*esc == 1) {
@@ -505,17 +505,17 @@ void bootmenu_loop(struct bootmenu_data *menu,
/* First char of ANSI escape sequence '\e' */
if (c == '\e') {
*esc = 1;
*key = BKEY_NONE;
key = BKEY_NONE;
}
break;
case 1:
/* Second char of ANSI '[' */
if (c == '[') {
*esc = 2;
*key = BKEY_NONE;
key = BKEY_NONE;
} else {
/* Alone ESC key was pressed */
*key = BKEY_QUIT;
key = BKEY_QUIT;
*esc = (c == '\e') ? 1 : 0;
}
break;
@@ -524,7 +524,7 @@ void bootmenu_loop(struct bootmenu_data *menu,
/* Third char of ANSI (number '1') - optional */
if (*esc == 2 && c == '1') {
*esc = 3;
*key = BKEY_NONE;
key = BKEY_NONE;
break;
}
@@ -532,31 +532,33 @@ void bootmenu_loop(struct bootmenu_data *menu,
/* ANSI 'A' - key up was pressed */
if (c == 'A')
*key = BKEY_UP;
key = BKEY_UP;
/* ANSI 'B' - key down was pressed */
else if (c == 'B')
*key = BKEY_DOWN;
key = BKEY_DOWN;
/* other key was pressed */
else
*key = BKEY_NONE;
key = BKEY_NONE;
break;
}
/* enter key was pressed */
if (c == '\r')
*key = BKEY_SELECT;
key = BKEY_SELECT;
/* ^C was pressed */
if (c == 0x3)
*key = BKEY_QUIT;
key = BKEY_QUIT;
if (c == '+')
*key = BKEY_PLUS;
key = BKEY_PLUS;
if (c == '-')
*key = BKEY_MINUS;
key = BKEY_MINUS;
if (c == ' ')
*key = BKEY_SPACE;
key = BKEY_SPACE;
return key;
}