From cc1753a75d7d99ff9ee2adca484dc4feada43f88 Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Mon, 27 Nov 2023 19:36:04 -0500 Subject: [PATCH] Move system time display to Rtc.initialize() --- src/hulk/hulk.d | 7 +------ src/hulk/rtc.d | 4 ++++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/hulk/hulk.d b/src/hulk/hulk.d index bc70315..4bb581b 100644 --- a/src/hulk/hulk.d +++ b/src/hulk/hulk.d @@ -82,10 +82,6 @@ void hulk_start() Acpi.initialize(hulk_header.bootinfo.acpi_xsdt_phys); Apic.initialize(); Rtc.initialize(); - /* Read the current system time. */ - Rtc.time t = Rtc.read_rtc_time(); - Klog.writefln("System time is 20%02u-%02u-%02u %02u:%02u:%02u", - t.year, t.month, t.day, t.hour, t.minute, t.second); Pit.initialize(); Pci.initialize(); Usb.initialize(); @@ -93,11 +89,10 @@ void hulk_start() resume_interrupts(); + /* Run kernel tests. */ Test.run(); Klog.writefln("\a5HULK Initialization Complete!"); - /* Run kernel tests. */ - /* Idle loop. */ Time.msleep(1); for (;;) diff --git a/src/hulk/rtc.d b/src/hulk/rtc.d index 9c14c30..910dd83 100644 --- a/src/hulk/rtc.d +++ b/src/hulk/rtc.d @@ -56,6 +56,10 @@ struct Rtc /* Send EOI to enable more RTC interrupts and re-enable NMIs. */ eoi(); + + time t = Rtc.read_rtc_time(); + Klog.writefln("System time is 20%02u-%02u-%02u %02u:%02u:%02u", + t.year, t.month, t.day, t.hour, t.minute, t.second); } private static ubyte read_register(ubyte register, bool disable_nmi = false)