mirrors/Zag
1
0
Fork 0
mirror of https://github.com/rdmsr/zag.git synced 2026-11-01 15:48:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: time -> clock

Browse Source
This commit is contained in:
Loïc Grégoire
2026-04-18 14:07:42 -04:00
parent a1db75746a
commit 44cf08e57c
13 changed files with 95 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/platform/acpi/hpet.zig
+5 -4
View File
@@ -4,7 +4,7 @@ const acpi = b.pl.acpi;
const mm = b.mm;
const ke = b.ke;
var hpet_timer: ke.TimeCounter = .{
var hpet_cs: ke.ClockSource = .{
.name = "HPET",
.quality = 50,
.frequency = 0, // Filled at runtime
@@ -19,9 +19,10 @@ var hpet_regs: *volatile acpi.HpetRegs = undefined;
const femtos_per_s = 1_000_000_000_000_000;
pub fn init(hpet: *acpi.HpetTable) linksection(b.init) void {
hpet_regs = @ptrFromInt(mm.p2v(hpet.base_address.address));
if (ke.clock.is_better_than(&hpet_cs)) return;
hpet_timer.frequency = femtos_per_s / (b.mmio_read(u64, @intFromPtr(&hpet_regs.general_capabilities)) >> 32);
hpet_regs = @ptrFromInt(mm.p2v(hpet.base_address.address));
hpet_cs.frequency = femtos_per_s / (b.mmio_read(u64, @intFromPtr(&hpet_regs.general_capabilities)) >> 32);
// Disable timer.
b.mmio_write(u64, @intFromPtr(&hpet_regs.general_configuration), 0);
@@ -32,7 +33,7 @@ pub fn init(hpet: *acpi.HpetTable) linksection(b.init) void {
// Enable timer.
b.mmio_write(u64, @intFromPtr(&hpet_regs.general_configuration), 1);
ke.time.register_source(&hpet_timer);
ke.clock.register_source(&hpet_cs);
}
fn read_hpet() u64 {
src/platform/acpi/timer.zig
+4 -2
View File
@@ -4,7 +4,7 @@ const acpi = b.pl.acpi;
const ke = b.ke;
const arch = @import("arch");
var pm_timer: ke.TimeCounter = .{
var pm_timer: ke.ClockSource = .{
.name = "ACPI",
.quality = 25,
.frequency = 3579545, // 3.579545 MHz
@@ -27,6 +27,8 @@ pub fn init(fadt: *acpi.Fadt) linksection(b.init) void {
return;
}
if (ke.clock.is_better_than(&pm_timer)) return;
timer_gas.address_space_id = .SystemIo;
timer_gas.address = fadt.pm_tmr_blk;
timer_gas.access_size = 3;
@@ -46,7 +48,7 @@ pub fn init(fadt: *acpi.Fadt) linksection(b.init) void {
pm_timer.mask = std.math.maxInt(u32);
}
ke.time.register_source(&pm_timer);
ke.clock.register_source(&pm_timer);
}
fn read_timer() u64 {