key = bootmenu_autoboot_loop(menu, &esc);
} else {
/* Some key was pressed, so autoboot was stopped */
- bootmenu_loop(menu, &key, &esc);
+ key = bootmenu_loop(menu, &esc);
}
switch (key) {
struct efimenu *efi_menu = data;
while (1) {
- bootmenu_loop((struct bootmenu_data *)efi_menu, &key, &esc);
+ key = bootmenu_loop((struct bootmenu_data *)efi_menu, &esc);
switch (key) {
case BKEY_UP:
struct eficonfig_entry *entry, *tmp;
while (1) {
- bootmenu_loop(NULL, &key, &esc);
+ key = bootmenu_loop(NULL, &esc);
switch (key) {
case BKEY_PLUS:
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) {
/* 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;
/* Third char of ANSI (number '1') - optional */
if (*esc == 2 && c == '1') {
*esc = 3;
- *key = BKEY_NONE;
+ key = BKEY_NONE;
break;
}
/* 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;
}
* character is recognised
*
* @menu: Menu being processed
- * @key: Returns the code for the key the user pressed:
+ * @esc: On input, a non-zero value indicates that an escape sequence has
+ * resulted in that many characters so far. On exit this is updated to the
+ * new number of characters
+ * Returns: code for the key the user pressed:
* enter: BKEY_SELECT
* Ctrl-C: BKEY_QUIT
* Up arrow: BKEY_UP
* Plus: BKEY_PLUS
* Minus: BKEY_MINUS
* Space: BKEY_SPACE
- * @esc: On input, a non-zero value indicates that an escape sequence has
- * resulted in that many characters so far. On exit this is updated to the
- * new number of characters
*/
-void bootmenu_loop(struct bootmenu_data *menu,
- enum bootmenu_key *key, int *esc);
+enum bootmenu_key bootmenu_loop(struct bootmenu_data *menu, int *esc);
#endif /* __MENU_H__ */