diff options
Diffstat (limited to 'src/usr')
| -rw-r--r-- | src/usr/pingmgmt.c | 7 | ||||
| -rw-r--r-- | src/usr/prompt.c | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/usr/pingmgmt.c b/src/usr/pingmgmt.c index e45593828..0db10c219 100644 --- a/src/usr/pingmgmt.c +++ b/src/usr/pingmgmt.c @@ -56,16 +56,15 @@ static void ping_callback ( struct sockaddr *peer, unsigned int sequence, * Ping a host * * @v hostname Hostname - * @v timeout_ms Timeout between pings, in ms + * @v timeout Timeout between pings, in ticks * @v len Payload length * @ret rc Return status code */ -int ping ( const char *hostname, unsigned long timeout_ms, size_t len ) { +int ping ( const char *hostname, unsigned long timeout, size_t len ) { int rc; /* Create pinger */ - if ( ( rc = create_pinger ( &monojob, hostname, - ( ( timeout_ms * TICKS_PER_SEC ) / 1000 ), + if ( ( rc = create_pinger ( &monojob, hostname, timeout, len, ping_callback ) ) != 0 ) { printf ( "Could not start ping: %s\n", strerror ( rc ) ); return rc; diff --git a/src/usr/prompt.c b/src/usr/prompt.c index ede037457..957b4ab3d 100644 --- a/src/usr/prompt.c +++ b/src/usr/prompt.c @@ -28,28 +28,27 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <errno.h> #include <stdio.h> #include <ipxe/console.h> -#include <ipxe/timer.h> #include <usr/prompt.h> /** * Prompt for keypress * * @v text Prompt string - * @v wait_ms Time to wait, in milliseconds (0=indefinite) + * @v timeout Timeout period, in ticks (0=indefinite) * @v key Key to wait for (0=any key) * @ret rc Return status code * * Returns success if the specified key was pressed within the * specified timeout period. */ -int prompt ( const char *text, unsigned int wait_ms, int key ) { +int prompt ( const char *text, unsigned long timeout, int key ) { int key_pressed; /* Display prompt */ printf ( "%s", text ); /* Wait for key */ - key_pressed = getkey ( ( wait_ms * TICKS_PER_SEC ) / 1000 ); + key_pressed = getkey ( timeout ); /* Clear the prompt line */ while ( *(text++) ) |