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

Set EFI ticks to 1000Hz simplifying much of the code and avoiding cotsly division

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-05-08 17:05:47 +02:00
parent a988e7aa63
commit 7216a1bff3
3 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
grub-core/Makefile.core.def
View file

@ -83,7 +83,6 @@ kernel = {
noemu_nodist = symlist.c; noemu_nodist = symlist.c;
i386_pc = kern/generic/rtc_get_time_ms.c; i386_pc = kern/generic/rtc_get_time_ms.c;
efi = kern/generic/rtc_get_time_ms.c;
i386_qemu = kern/generic/rtc_get_time_ms.c; i386_qemu = kern/generic/rtc_get_time_ms.c;
i386_coreboot = kern/generic/rtc_get_time_ms.c; i386_coreboot = kern/generic/rtc_get_time_ms.c;
i386_multiboot = kern/generic/rtc_get_time_ms.c; i386_multiboot = kern/generic/rtc_get_time_ms.c;

16
grub-core/kern/efi/efi.c
View file

@ -24,6 +24,7 @@
#include <grub/efi/console_control.h> #include <grub/efi/console_control.h>
#include <grub/efi/pe32.h> #include <grub/efi/pe32.h>
#include <grub/machine/time.h> #include <grub/machine/time.h>
#include <grub/time.h>
#include <grub/term.h> #include <grub/term.h>
#include <grub/kernel.h> #include <grub/kernel.h>
#include <grub/mm.h> #include <grub/mm.h>
@ -193,8 +194,8 @@ grub_efi_set_virtual_address_map (grub_efi_uintn_t memory_map_size,
return grub_error (GRUB_ERR_IO, "set_virtual_address_map failed"); return grub_error (GRUB_ERR_IO, "set_virtual_address_map failed");
} }
grub_uint32_t grub_uint64_t
grub_get_rtc (void) grub_rtc_get_time_ms (void)
{ {
grub_efi_time_t time; grub_efi_time_t time;
grub_efi_runtime_services_t *r; grub_efi_runtime_services_t *r;
@ -204,9 +205,14 @@ grub_get_rtc (void)
/* What is possible in this case? */ /* What is possible in this case? */
return 0; return 0;
return (((time.minute * 60 + time.second) * 1000 return ((time.minute * 60 + time.second) * 1000
+ time.nanosecond / 1000000) + time.nanosecond / 1000000);
* GRUB_TICKS_PER_SECOND / 1000); }
grub_uint32_t
grub_get_rtc (void)
{
return grub_rtc_get_time_ms ();
} }
/* Search the mods section from the PE32/PE32+ image. This code uses /* Search the mods section from the PE32/PE32+ image. This code uses

3
include/grub/efi/time.h
View file

@ -21,8 +21,7 @@
#include <grub/symbol.h> #include <grub/symbol.h>
/* This is destined to overflow when one hour passes by. */ #define GRUB_TICKS_PER_SECOND 1000
#define GRUB_TICKS_PER_SECOND ((1UL << 31) / 60 / 60 * 2)
/* Return the real time in ticks. */ /* Return the real time in ticks. */
grub_uint32_t EXPORT_FUNC (grub_get_rtc) (void); grub_uint32_t EXPORT_FUNC (grub_get_rtc) (void);