pci: Fix aliasing warning on Clang

menix-os · Jan 10, 2025 · 7fea593 · 7fea593
1 parent fdc0109
commit 7fea593
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/include/menix/system/pci/pci.h b/include/menix/system/pci/pci.h
@@ -44,7 +44,7 @@ struct ATTR(packed) PciConfigSpace
 	u8 cache_line_size, latency_timer, header_type, bist;
 
 	// Fields depending on the header type.
-	union
+	union ATTR(packed)
 	{
 		struct ATTR(packed)
 		{

diff --git a/kernel/system/bus/pci/device.c b/kernel/system/bus/pci/device.c
@@ -78,16 +78,15 @@ void pci_scan_devices()
 
 PhysAddr pci_get_bar(PciDevice* device, usize idx)
 {
-	volatile u32* bars = device->config_space->generic.bar;
-	PhysAddr bar = bars[idx];
+	PhysAddr bar = device->config_space->generic.bar[idx];
 
 	// Memory Space BAR
 	if ((bar & 1) == 0)
 	{
 		const usize type = (bar & 0b110) >> 1;
 		// If a 64-bit BAR, add the upper bits to the address.
 		if (type == 0x2)
-			bar |= (PhysAddr)bars[idx + 1] << 32;
+			bar |= (PhysAddr)device->config_space->generic.bar[idx + 1] << 32;
 		bar = ALIGN_DOWN(bar, 16);
 	}
 	// IO Space BAR