vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2008-08-08 Robert Millan <rmh@aybabtu.com>

Browse source 
* kern/disk.c: Replace `<grub/machine/time.h>' with `<grub/time.h>'.
        (grub_last_time): Change type to grub_uint64_t.
        (grub_disk_open): Migrate code from to using grub_get_time_ms().
        (grub_disk_close): Likewise.

        * normal/menu.c: Replace `<grub/machine/time.h>' with `<grub/time.h>'.
        (run_menu): Migrate code from to using grub_get_time_ms().

        * util/misc.c (grub_get_time_ms): New function.
This commit is contained in:
robertmh 2008-08-07 23:48:13 +00:00
parent 7f280db554
commit 042bd419da
4 changed files with 35 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
normal/menu.c
View file

@ -21,7 +21,7 @@
#include <grub/misc.h>
#include <grub/loader.h>
#include <grub/mm.h>
#include <grub/machine/time.h>
#include <grub/time.h>
#include <grub/env.h>
#include <grub/script.h>
@ -326,7 +326,7 @@ static int
run_menu (grub_menu_t menu, int nested)
{
int first, offset;
unsigned long saved_time;
grub_uint64_t saved_time;
int default_entry;
int timeout;
@ -351,7 +351,7 @@ run_menu (grub_menu_t menu, int nested)
}
/* Initialize the time. */
saved_time = grub_get_rtc ();
saved_time = grub_get_time_ms ();
refresh:
grub_setcursor (0);
@ -371,10 +371,10 @@ run_menu (grub_menu_t menu, int nested)
if (timeout > 0)
{
unsigned long current_time;
grub_uint64_t current_time;
current_time = grub_get_rtc ();
if (current_time - saved_time >= GRUB_TICKS_PER_SECOND)
current_time = grub_get_time_ms ();
if (current_time - saved_time >= 1000)
{
timeout--;
set_timeout (timeout);