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

fix(acpi): set alignment of SDT entries

Browse Source
This commit is contained in:
Loïc Grégoire
2026-04-15 20:11:37 -04:00
parent a09c78474d
commit 7d9231960f
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/platform/acpi/root.zig
+6 -6
View File
@@ -60,12 +60,12 @@ pub const SdtHeader = extern struct {
pub const Rsdt = extern struct { pub const Rsdt = extern struct {
header: SdtHeader, header: SdtHeader,
entries: [0]u32, entries: [0]u32 align(1),
}; };
pub const Xsdt = extern struct { pub const Xsdt = extern struct {
header: SdtHeader, header: SdtHeader,
entries: [0]u64, entries: [0]u64 align(1),
}; };
pub const MadtEntryHeader = extern struct { pub const MadtEntryHeader = extern struct {
@@ -263,7 +263,7 @@ pub var rsdt: ?*Rsdt = null;
pub fn find_table(signature: []const u8) ?*SdtHeader { pub fn find_table(signature: []const u8) ?*SdtHeader {
if (xsdt) |x| { if (xsdt) |x| {
const entry_count = (x.header.length - @sizeOf(SdtHeader)) / @sizeOf(u64); const entry_count = (x.header.length - @sizeOf(SdtHeader)) / @sizeOf(u64);
const entries_ptr: [*]u64 = @ptrCast(&x.entries); const entries_ptr: [*]align(1) u64 = @ptrCast(&x.entries);
for (0..entry_count) |i| { for (0..entry_count) |i| {
const hdr: *SdtHeader = @ptrFromInt(mm.p2v(entries_ptr[i])); const hdr: *SdtHeader = @ptrFromInt(mm.p2v(entries_ptr[i]));
@@ -273,7 +273,7 @@ pub fn find_table(signature: []const u8) ?*SdtHeader {
} }
} else if (rsdt) |r| { } else if (rsdt) |r| {
const entry_count = (r.header.length - @sizeOf(SdtHeader)) / @sizeOf(u32); const entry_count = (r.header.length - @sizeOf(SdtHeader)) / @sizeOf(u32);
const entries_ptr: [*]u32 = @ptrCast(&r.entries); const entries_ptr: [*]align(1) u32 = @ptrCast(&r.entries);
for (0..entry_count) |i| { for (0..entry_count) |i| {
const hdr: *SdtHeader = @ptrFromInt(mm.p2v(entries_ptr[i])); const hdr: *SdtHeader = @ptrFromInt(mm.p2v(entries_ptr[i]));
@@ -303,7 +303,7 @@ fn format_table(hdr: *SdtHeader, phys_addr: u64) void {
fn enumerate_tables() void { fn enumerate_tables() void {
if (xsdt) |x| { if (xsdt) |x| {
const entry_count = (x.header.length - @sizeOf(SdtHeader)) / @sizeOf(u64); const entry_count = (x.header.length - @sizeOf(SdtHeader)) / @sizeOf(u64);
const entries_ptr: [*]u64 = @ptrCast(&x.entries); const entries_ptr: [*]align(1) u64 = @ptrCast(&x.entries);
for (0..entry_count) |i| { for (0..entry_count) |i| {
const phys = entries_ptr[i]; const phys = entries_ptr[i];
@@ -312,7 +312,7 @@ fn enumerate_tables() void {
} }
} else if (rsdt) |r| { } else if (rsdt) |r| {
const entry_count = (r.header.length - @sizeOf(SdtHeader)) / @sizeOf(u32); const entry_count = (r.header.length - @sizeOf(SdtHeader)) / @sizeOf(u32);
const entries_ptr: [*]u32 = @ptrCast(&r.entries); const entries_ptr: [*]align(1) u32 = @ptrCast(&r.entries);
for (0..entry_count) |i| { for (0..entry_count) |i| {
const phys: u64 = entries_ptr[i]; const phys: u64 = entries_ptr[i];