diff options
Diffstat (limited to 'src/include/ipxe')
-rw-r--r-- | src/include/ipxe/console.h | 2 | ||||
-rw-r--r-- | src/include/ipxe/errfile.h | 4 | ||||
-rw-r--r-- | src/include/ipxe/login_ui.h | 2 | ||||
-rw-r--r-- | src/include/ipxe/menu.h | 4 | ||||
-rw-r--r-- | src/include/ipxe/settings.h | 1 |
5 files changed, 11 insertions, 2 deletions
diff --git a/src/include/ipxe/console.h b/src/include/ipxe/console.h index 1b764aac..ca8093a7 100644 --- a/src/include/ipxe/console.h +++ b/src/include/ipxe/console.h @@ -38,6 +38,8 @@ struct console_configuration { unsigned int bottom; /** Background picture, if any */ struct pixel_buffer *pixbuf; + /** Update mode: Don't re-init vesa mode, just update margins and bg image */ + int lazy_update; }; /** diff --git a/src/include/ipxe/errfile.h b/src/include/ipxe/errfile.h index 0ab37230..afc260ba 100644 --- a/src/include/ipxe/errfile.h +++ b/src/include/ipxe/errfile.h @@ -224,6 +224,10 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); #define ERRFILE_ecam ( ERRFILE_DRIVER | 0x00d30000 ) #define ERRFILE_pcibridge ( ERRFILE_DRIVER | 0x00d40000 ) #define ERRFILE_mnpnet ( ERRFILE_DRIVER | 0x00d50000 ) +#define ERRFILE_aqc1xx ( ERRFILE_DRIVER | 0x00df0000 ) +#define ERRFILE_atl_hw ( ERRFILE_DRIVER | 0x00d60000 ) +#define ERRFILE_atl2_hw ( ERRFILE_DRIVER | 0x00d70000 ) + #define ERRFILE_aoe ( ERRFILE_NET | 0x00000000 ) #define ERRFILE_arp ( ERRFILE_NET | 0x00010000 ) diff --git a/src/include/ipxe/login_ui.h b/src/include/ipxe/login_ui.h index 313e0734..07b1dd49 100644 --- a/src/include/ipxe/login_ui.h +++ b/src/include/ipxe/login_ui.h @@ -9,6 +9,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); -extern int login_ui ( void ); +extern int login_ui ( int nouser ); #endif /* _IPXE_LOGIN_UI_H */ diff --git a/src/include/ipxe/menu.h b/src/include/ipxe/menu.h index 3cc99be4..33965cfd 100644 --- a/src/include/ipxe/menu.h +++ b/src/include/ipxe/menu.h @@ -21,6 +21,8 @@ struct menu { const char *title; /** Menu items */ struct list_head items; + /** Hidden menu items, accessible via hotkey only */ + struct list_head hidden_items; }; /** A menu item */ @@ -40,7 +42,7 @@ struct menu_item { extern struct menu * create_menu ( const char *name, const char *title ); extern struct menu_item * add_menu_item ( struct menu *menu, const char *label, const char *text, int shortcut, - int is_default ); + int is_default, int is_hidden ); extern void destroy_menu ( struct menu *menu ); extern struct menu * find_menu ( const char *name ); extern int show_menu ( struct menu *menu, unsigned long timeout, diff --git a/src/include/ipxe/settings.h b/src/include/ipxe/settings.h index 0301da12..ccb5e99f 100644 --- a/src/include/ipxe/settings.h +++ b/src/include/ipxe/settings.h @@ -424,6 +424,7 @@ extern const struct setting_type setting_type_uint32 __setting_type; extern const struct setting_type setting_type_hex __setting_type; extern const struct setting_type setting_type_hexhyp __setting_type; extern const struct setting_type setting_type_hexraw __setting_type; +extern const struct setting_type setting_type_md5 __setting_type; extern const struct setting_type setting_type_base64 __setting_type; extern const struct setting_type setting_type_uuid __setting_type; extern const struct setting_type setting_type_guid __setting_type; |