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

* grub-core/kern/arm/efi/init.c: Rewrite timer fucntion.

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-10-07 19:23:14 +02:00
parent 1db3830418
commit 3b0f3aa2a7
2 changed files with 31 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2013-10-07 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/kern/arm/efi/init.c: Rewrite timer fucntion.
2013-10-04 Samuel Thibault <samuel.thibault@ens-lyon.org> 2013-10-04 Samuel Thibault <samuel.thibault@ens-lyon.org>
* util/grub.d/10_hurd.in: Use `version_find_latest` to sort gnumach * util/grub.d/10_hurd.in: Use `version_find_latest` to sort gnumach

52
grub-core/kern/arm/efi/init.c
View file

@ -24,45 +24,47 @@
#include <grub/time.h> #include <grub/time.h>
#include <grub/efi/efi.h> #include <grub/efi/efi.h>
/* static grub_uint64_t tmr;
* A bit ugly, but functional - and should be completely portable. static grub_efi_event_t tmr_evt;
*/
static grub_uint64_t static grub_uint64_t
grub_efi_get_time_ms(void) grub_efi_get_time_ms (void)
{ {
grub_efi_time_t now; return tmr;
grub_uint64_t retval; }
grub_efi_status_t status;
status = efi_call_2 (grub_efi_system_table->runtime_services->get_time, static void
&now, NULL); increment_timer (grub_efi_event_t event __attribute__ ((unused)),
if (status != GRUB_EFI_SUCCESS) void *context __attribute__ ((unused)))
{ {
grub_printf("No time!\n"); tmr++;
return 0;
}
retval = now.year * 365 * 24 * 60 * 60 * 1000;
retval += now.month * 30 * 24 * 60 * 60 * 1000;
retval += now.day * 24 * 60 * 60 * 1000;
retval += now.hour * 60 * 60 * 1000;
retval += now.minute * 60 * 1000;
retval += now.second * 1000;
retval += now.nanosecond / 1000;
grub_dprintf("timer", "timestamp: 0x%llx\n", retval);
return retval;
} }
void void
grub_machine_init (void) grub_machine_init (void)
{ {
grub_efi_boot_services_t *b;
grub_efi_init (); grub_efi_init ();
b = grub_efi_system_table->boot_services;
efi_call_5 (b->create_event, GRUB_EFI_EVT_TIMER | GRUB_EFI_EVT_NOTIFY_SIGNAL,
GRUB_EFI_TPL_CALLBACK, increment_timer, NULL, &tmr_evt);
efi_call_3 (b->set_timer, tmr_evt, GRUB_EFI_TIMER_PERIODIC, 10000);
grub_install_get_time_ms (grub_efi_get_time_ms); grub_install_get_time_ms (grub_efi_get_time_ms);
} }
void void
grub_machine_fini (void) grub_machine_fini (void)
{ {
grub_efi_boot_services_t *b;
b = grub_efi_system_table->boot_services;
efi_call_3 (b->set_timer, tmr_evt, GRUB_EFI_TIMER_PERIODIC, 0);
efi_call_1 (b->close_event, tmr_evt);
grub_efi_fini (); grub_efi_fini ();
} }