Current timer code for ARM EFI is horror. Can anyone test this?
=== modified file 'grub-core/kern/arm/efi/init.c'
--- grub-core/kern/arm/efi/init.c 2013-04-07 00:41:07 +0000
+++ grub-core/kern/arm/efi/init.c 2013-10-03 22:19:23 +0000
@@ -24,45 +24,47 @@
#include <grub/time.h>
#include <grub/efi/efi.h>
-/*
- * A bit ugly, but functional - and should be completely portable.
- */
+static grub_uint64_t tmr;
+static grub_efi_event_t tmr_evt;
+
static grub_uint64_t
-grub_efi_get_time_ms(void)
-{
- grub_efi_time_t now;
- grub_uint64_t retval;
- grub_efi_status_t status;
-
- status = efi_call_2 (grub_efi_system_table->runtime_services->get_time,
- &now, NULL);
- if (status != GRUB_EFI_SUCCESS)
- {
- grub_printf("No time!\n");
- 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;
+grub_efi_get_time_ms (void)
+{
+ return tmr;
+}
+
+static void
+increment_timer (grub_efi_event_t event __attribute__ ((unused)),
+ void *context __attribute__ ((unused)))
+{
+ tmr++;
}
void
grub_machine_init (void)
{
+ grub_efi_boot_services_t *b;
+
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);
}
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 ();
}=== modified file 'grub-core/kern/arm/efi/startup.S' --- grub-core/kern/arm/efi/startup.S 2013-04-07 00:41:07 +0000 +++ grub-core/kern/arm/efi/startup.S 2013-10-03 22:20:58 +0000 @@ -33,6 +33,4 @@ str r1, [ip] ldr ip, =EXT_C(grub_main) bx ip - .thumb @ For relocation debugging - blx _start .end
signature.asc
Description: OpenPGP digital signature
_______________________________________________ Grub-devel mailing list Grub-devel@gnu.org https://lists.gnu.org/mailman/listinfo/grub-devel
