zig

commit 97fd100471ea74acd3a18c5bbc95efc8f8978b93 (tree)
parent 23adf095798b8345997b2cbe182c7f109fe1da49
Author: Tristan Ross <tristan.ross@midstall.com>
Date:   Wed, 20 Dec 2023 09:33:59 -0800

os.uefi: add ns to epoch

Diffstat:
M
lib/std/os/uefi.zig
 | 
3
++-
M
lib/std/time.zig
 | 
2
+-

2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/std/os/uefi.zig b/lib/std/os/uefi.zig
@@ -153,7 +153,8 @@ pub const Time = extern struct {
         days += daysInYear(self.year, @as(u4, @intCast(self.month)) - 1) + self.day;
         const hours = self.hour + (days * 24);
         const minutes = self.minute + (hours * 60);
-        return self.second + (minutes * 60);
+        const seconds = self.second + (minutes * std.time.s_per_min);
+        return self.nanosecond + (seconds * std.time.ns_per_s);
     }
 };
 
diff --git a/lib/std/time.zig b/lib/std/time.zig
@@ -118,7 +118,7 @@ pub fn nanoTimestamp() i128 {
         var value: std.os.uefi.Time = undefined;
         const status = std.os.uefi.system_table.runtime_services.getTime(&value, null);
         assert(status == .Success);
-        return @as(i128, @intCast(value.toEpoch())) * ms_per_s;
+        return value.toEpoch();
     }
 
     var ts: os.timespec = undefined;