diff options
| author | Michael Brown | 2013-11-01 03:22:12 +0100 |
|---|---|---|
| committer | Michael Brown | 2013-11-01 03:26:19 +0100 |
| commit | 5e1fa5cd4090f229a40903f13abf328e86271717 (patch) | |
| tree | 77a6302aeeb86f6c86fe95fb757a952a4ef7490e /src/include | |
| parent | [ipv6] Add ndp_tx_router_solicitation() to send router solicitations (diff) | |
| download | ipxe-5e1fa5cd4090f229a40903f13abf328e86271717.tar.gz ipxe-5e1fa5cd4090f229a40903f13abf328e86271717.tar.xz ipxe-5e1fa5cd4090f229a40903f13abf328e86271717.zip | |
[parseopt] Add parse_timeout()
Parsing a timeout value (specified in milliseconds) into an internal
timeout value measured in timer ticks is a common operation. Provide
a parse_timeout() value to carry out this conversion automatically.
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/ipxe/menu.h | 2 | ||||
| -rw-r--r-- | src/include/ipxe/parseopt.h | 1 | ||||
| -rw-r--r-- | src/include/usr/pingmgmt.h | 2 | ||||
| -rw-r--r-- | src/include/usr/prompt.h | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/src/include/ipxe/menu.h b/src/include/ipxe/menu.h index 993b027ea..f2b3caccc 100644 --- a/src/include/ipxe/menu.h +++ b/src/include/ipxe/menu.h @@ -43,7 +43,7 @@ extern struct menu_item * add_menu_item ( struct menu *menu, const char *label, int is_default ); extern void destroy_menu ( struct menu *menu ); extern struct menu * find_menu ( const char *name ); -extern int show_menu ( struct menu *menu, unsigned int timeout_ms, +extern int show_menu ( struct menu *menu, unsigned long timeout, const char *select, struct menu_item **selected ); #endif /* _IPXE_MENU_H */ diff --git a/src/include/ipxe/parseopt.h b/src/include/ipxe/parseopt.h index 108ce04ce..e3b54c8e5 100644 --- a/src/include/ipxe/parseopt.h +++ b/src/include/ipxe/parseopt.h @@ -126,6 +126,7 @@ struct named_setting { extern int parse_string ( char *text, char **value ); extern int parse_integer ( char *text, unsigned int *value ); +extern int parse_timeout ( char *text, unsigned long *value ); extern int parse_netdev ( char *text, struct net_device **netdev ); extern int parse_menu ( char *text, struct menu **menu ); extern int parse_flag ( char *text __unused, int *flag ); diff --git a/src/include/usr/pingmgmt.h b/src/include/usr/pingmgmt.h index 4a2efc3bd..45ad5d394 100644 --- a/src/include/usr/pingmgmt.h +++ b/src/include/usr/pingmgmt.h @@ -11,6 +11,6 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <stdint.h> -extern int ping ( const char *hostname, unsigned long timeout_ms, size_t len ); +extern int ping ( const char *hostname, unsigned long timeout, size_t len ); #endif /* _USR_PINGMGMT_H */ diff --git a/src/include/usr/prompt.h b/src/include/usr/prompt.h index fc1946c7a..57e43d2dc 100644 --- a/src/include/usr/prompt.h +++ b/src/include/usr/prompt.h @@ -9,6 +9,6 @@ FILE_LICENCE ( GPL2_OR_LATER ); -extern int prompt ( const char *text, unsigned int wait_ms, int key ); +extern int prompt ( const char *text, unsigned long timeout, int key ); #endif /* _USR_PROMPT_H */ |