17 files changed, 92 insertions, 524 deletions

diff --git a/src/arch/amd64/acpi.c b/src/arch/amd64/acpi.c
deleted file mode 100644
index a7f38b6..0000000
--- a/src/arch/amd64/acpi.c
+++ /dev/null
@@ -1,337 +0,0 @@
-#include <acpi.h>
-#include <lib.h>
-#include <memory.h>
-#include <stdint.h>
-#include <stddef.h>
-#include <string.h>
-#include <panic.h>
-
-#include "bindings.h"
-
-struct acpi_header {
-	uint32_t signature;
-	uint32_t length;
-	uint8_t revision;
-	uint8_t checksum;
-	uint8_t oem_id[6];
-	uint8_t oem_table_id[8];
-	uint32_t oem_revision;
-	uint32_t creator_id;
-	uint32_t creator_revision;
-} __attribute__((packed));
-
-// root system descriptor pointer
-// ACPI 1.0
-struct rsdp {
-	uint8_t signature[8];
-	uint8_t checksum;
-	uint8_t oemid[6];
-	uint8_t revision;
-	uint32_t rsdt_addr;
-} __attribute__((packed));
-
-// eXtended system descriptor pointer
-// ACPI 2.0
-struct xsdp {
-	char signature[8];
-	uint8_t checksum;
-	char oemid[6];
-	uint8_t revision;
-	uint32_t rsdt_addr;
-	uint32_t length;
-	uint64_t xsdt_addr;
-	uint8_t extendeid_checksum;
-	uint8_t reserved[3];
-} __attribute__((packed));
-
-// root system descriptor table
-// ACPI 1.0
-struct rsdt {
-	struct acpi_header h;
-	uint32_t sdt_pointers[];
-} __attribute__((packed));
-
-// eXtended system descriptor table
-// ACPI 2.0
-struct xsdt {
-	struct acpi_header h;
-	uint64_t sdt_pointers[];
-} __attribute__((packed));
-
-
-// generic address structure
-struct gas {
-	uint8_t address_space;
-	uint8_t bit_width;
-	uint8_t bit_offset;
-	uint8_t access_size;
-	uint64_t address;
-};
-
-// differentiated system description table
-struct dsdt {
-	struct acpi_header h;
-	char s5_addr[];
-} __attribute__((packed));
-
-struct apic {
-	struct acpi_header h;
-	// todo
-} __attribute__((packed));
-
-struct hept {
-	struct acpi_header h;
-	// todo
-} __attribute__((packed));
-
-struct waet {
-	struct acpi_header h;
-	// todo
-} __attribute__((packed));
-
-// fixed acpi description table
-struct fadt {
-	struct acpi_header h;
-	uint32_t firmware_ctrl;
-	uint32_t dsdt;
-
-	// field used in ACPI 1.0; no longer in use, for compatibility only
-	uint8_t  reserved;
-
-	uint8_t  preferred_power_management_profile;
-	uint16_t sci_interrupt;
-	uint32_t smi_command_port;
-	uint8_t  acpi_enable;
-	uint8_t  acpi_disable;
-	uint8_t  s4bios_req;
-	uint8_t  pstate_control;
-	uint32_t pm1_a_event_block;
-	uint32_t pm1_b_event_block;
-	uint32_t pm1_a_control_block;
-	uint32_t pm1_b_control_block;
-	uint32_t pm2_control_block;
-	uint32_t pm_timer_block;
-	uint32_t gpe0_block;
-	uint32_t gpe1_block;
-	uint8_t  pm1_event_length;
-	uint8_t  pm1_control_length;
-	uint8_t  pm2_control_length;
-	uint8_t  pm_timer_length;
-	uint8_t  gpe0_length;
-	uint8_t  gpe1_length;
-	uint8_t  gpe1_base;
-	uint8_t  cstate_control;
-	uint16_t worst_c2_latency;
-	uint16_t worst_c3_latency;
-	uint16_t flush_size;
-	uint16_t flush_stride;
-	uint8_t  duty_offset;
-	uint8_t  duty_width;
-	uint8_t  day_alarm;
-	uint8_t  month_alarm;
-	uint8_t  century;
-
-	// reserved in ACPI 1.0; used since ACPI 2.0+
-	uint16_t boot_architecture_flags;
-
-	uint8_t  reserved_2;
-	uint32_t flags;
-
-	// 12 byte structure; see below for details
-	struct gas reset_reg;
-
-	uint8_t  reset_value;
-	uint8_t  reserved_3[3];
-
-	// 64bit pointers - Available on ACPI 2.0+
-	uint64_t x_firmware_control;
-	uint64_t x_dsdt;
-
-	struct gas x_pm1_a_event_block;
-	struct gas x_pm1_b_event_block;
-	struct gas x_pm1_a_control_block;
-	struct gas x_pm1_b_control_block;
-	struct gas x_pm2_control_block;
-	struct gas x_pm_timer_block;
-	struct gas x_gpe0_block;
-	struct gas x_gpe1_block;
-} __attribute__((packed));
-
-struct acpi_state {
-	union {
-		struct xsdt *xsdt;
-		struct rsdt *rsdt;
-	} sdt;
-	struct fadt *fadt;
-	struct dsdt *dsdt;
-	struct apic *apic;
-	struct hept *hept;
-	struct waet *waet;
-	uint8_t version;
-
-	uint16_t SLP_TYPa;
-	uint16_t SLP_TYPb;
-	uint16_t SLP_EN;
-	uint16_t SCI_EN;
-};
-
-/* global state, idk a better way rn */
-static struct acpi_state state;
-
-static bool checksum(uint8_t *data, size_t len) {
-	unsigned char sum = 0;
-	for (size_t i = 0; i < len; i++)
-		sum += data[i];
-	return sum == 0;
-}
-
-static int read_s5_addr(struct dsdt *dsdt) {
-	char *s5_addr = dsdt->s5_addr;
-	int dsdt_len = dsdt->h.length - sizeof(struct acpi_header);
-
-	while (0 < dsdt_len--) {
-		if (memcmp(s5_addr, "_S5_", 4) == 0)
-			break;
-		s5_addr++;
-	}
-
-	if (dsdt_len > 0) {
-		// check for valid AML structure
-		if ( ( *(s5_addr-1) == 0x08 || ( *(s5_addr-2) == 0x08 && *(s5_addr-1) == '\\') ) && *(s5_addr+4) == 0x12 ) {
-			s5_addr += 5;
-			s5_addr += ((*s5_addr &0xC0)>>6) +2;   // calculate PkgLength size
-
-			if (*s5_addr == 0x0A)
-				s5_addr++;   // skip byteprefix
-			state.SLP_TYPa = *(s5_addr)<<10;
-			s5_addr++;
-
-			if (*s5_addr == 0x0A)
-				s5_addr++;   // skip byteprefix
-			state.SLP_TYPb = *(s5_addr)<<10;
-
-			state.SLP_EN = 1<<13;
-			state.SCI_EN = 1;
-
-		} else {
-			return -1;
-		}
-	} else {
-		return -1;
-	}
-
-	return -1;
-}
-
-static void acpi_load_table(uint64_t addr);
-
-static void acpi_load_rsdt_tables(struct rsdt *rsdt) {
-	int entries = (rsdt->h.length - sizeof(rsdt->h)) / 4;
-	for (int i = 0; i < entries; i++) {
-		uint32_t addr = rsdt->sdt_pointers[i];
-		acpi_load_table(addr);
-	}
-}
-
-static void acpi_load_xsdt_tables(struct xsdt *xsdt) {
-	int entries = (xsdt->h.length - sizeof(xsdt->h)) / 8;
-	for (int i = 0; i < entries; i++) {
-		uint64_t addr = xsdt->sdt_pointers[i];
-		acpi_load_table(addr);
-	}
-}
-
-#define SIG_RSDT    0x54445352
-#define SIG_XSDT    0x54445358
-#define SIG_FACP    0x50434146
-#define SIG_DSDT    0x54445344
-#define SIG_APIC    0x43495041
-#define SIG_HEPT    0x54455048
-#define SIG_WAET    0x54454157
-
-static void acpi_handle_table(struct acpi_header *header) {
-	switch (header->signature) {
-		case SIG_RSDT:
-			state.sdt.rsdt = (struct rsdt *) header;
-			acpi_load_rsdt_tables(state.sdt.rsdt);
-			break;
-		case SIG_XSDT:
-			state.sdt.xsdt = (struct xsdt *) header;
-			acpi_load_xsdt_tables(state.sdt.xsdt);
-			break;
-		case SIG_FACP:
-			state.fadt = (struct fadt *) header;
-			acpi_load_table(state.fadt->dsdt);
-			break;
-		case SIG_DSDT:
-			state.dsdt = (struct dsdt *) header;
-			read_s5_addr(state.dsdt);
-			break;
-		case SIG_APIC:
-			state.apic = (struct apic *) header;
-			break;
-		case SIG_HEPT:
-			state.hept = (struct hept *) header;
-			break;
-		case SIG_WAET:
-			state.waet = (struct waet *) header;
-			break;
-		default:
-			break;
-	}
-}
-
-static void acpi_load_table(uint64_t addr) {
-	struct acpi_header *temp, *mapped;
-	uint32_t length;
-
-	temp = (struct acpi_header * ) (uintptr_t) addr;
-	mapped = mmap(temp, sizeof(struct acpi_header));
-	length = mapped->length;
-	unmap(mapped);
-	mapped = mmap(temp, length);
-	if (!checksum((uint8_t *) mapped, mapped->length)) {
-		unmap(mapped);
-		return;
-	}
-	kprintf("%.*s: %#016lx\n", 4, (char*)&mapped->signature, (size_t)temp);
-	acpi_handle_table(mapped);
-}
-
-int acpi_init(void *rootsdp) {
-
-	memset(&state, 0, sizeof(struct acpi_state));
-
-	struct rsdp *rsdp = (struct rsdp *) rootsdp;
-
-	if (!checksum((uint8_t *)rsdp, sizeof(struct rsdp)))
-		return -1;
-
-	if (memcmp(rsdp->signature, "RSD PTR ", 8) != 0) {
-		panic("invalid acpi rsdp signature: %.*s\n", 8, rsdp->signature);
-	}
-
-	if (rsdp->revision == 0) {
-		state.version = 0;
-		kprintf("ACPI 1.0\n");
-		acpi_load_table(rsdp->rsdt_addr);
-	} else if (rsdp->revision == 2) {
-		state.version = 2;
-		struct xsdp *xsdp = (struct xsdp *) rsdp;
-		kprintf("ACPI 2.0\n");
-		acpi_load_table(xsdp->xsdt_addr);
-	} else {
-		panic("invalid acpi rev: %d\n", rsdp->revision);
-	}
-
-	kprintf("\n");
-
-	outb(state.fadt->smi_command_port,state.fadt->acpi_enable);
-
-	return 0;
-}
-
-int acpi_shutdown(void) {
-	outw((unsigned int) state.fadt->pm1_a_control_block, state.SLP_TYPb | state.SLP_EN);
-	return -1;
-}
diff --git a/src/arch/amd64/cpu/idt.c b/src/arch/amd64/cpu/idt.c
index 5c2ef5c..a2da88f 100644
--- a/src/arch/amd64/cpu/idt.c
+++ b/src/arch/amd64/cpu/idt.c
@@ -1,14 +1,14 @@
 #include <stdint.h>
 #include <stddef.h>
 #include <lib.h>
+#include <bindings.h>
+#include <pic.h>
 
 #include "idt.h"
 #include "backtrace.h"
 #include "debugger.h"
 #include "registers.h"
 #include "../paging.h"
-#include "../bindings.h"
-#include "../drivers/pic.h"
 
 #define IDT_SIZE 256
 
@@ -182,7 +182,7 @@ void idt_exception_handler(uint64_t exception, uint64_t code, struct isr_regs *s
 	}
 
 	kputs("\n");
-	
+
 	isr_print_regs(state);
 
 	kputs("\n");
diff --git a/src/arch/amd64/drivers/pci.c b/src/arch/amd64/drivers/pci.c
deleted file mode 100644
index 7aa11c8..0000000
--- a/src/arch/amd64/drivers/pci.c
+++ /dev/null
@@ -1,166 +0,0 @@
-#include <stdint.h>
-#include <pci.h>
-#include <panic.h>
-#include <lib.h>
-
-#include "../bindings.h"
-
-#define CONF_ADDR 0xCF8
-#define CONF_DATA 0xCFC
-
-#define TABLE_LEN 16
-
-struct pci_table_entry {
-	struct pci_device device;
-	uint16_t device_id;
-	uint16_t vendor_id;
-	uint8_t class;
-	uint8_t subclass;
-	uint8_t prog_if;
-	uint8_t revision;
-};
-
-static struct pci_table_entry pci_table[TABLE_LEN];
-static size_t pci_table_next = 0;
-
-uint32_t pci_rcfg_d(struct pci_device dev, uint8_t offset) {
-	uint32_t addr = 0x80000000;
-	addr |= ((uint32_t)dev.bus) << 16;
-	addr |= ((uint32_t)dev.device) << 11;
-	addr |= ((uint32_t)dev.function) << 8;
-	addr |= offset & 0xFC;
-
-	outl(CONF_ADDR, addr);
-	uint32_t in = inl(CONF_DATA);
-	return in;
-}
-
-uint16_t pci_rcfg_w(struct pci_device dev, uint8_t offset) {
-	uint32_t dword = pci_rcfg_d(dev, offset);
-	return (uint16_t)((dword >> ((offset & 2) * 8)) & 0xFFFF);
-}
-
-uint8_t pci_rcfg_b(struct pci_device dev, uint8_t offset) {
-	uint32_t dword = pci_rcfg_d(dev, offset);
-	return (uint8_t)((dword >> ((offset & 3) * 8)) & 0xFF);
-}
-
-void pci_wcfg_d(struct pci_device dev, uint8_t offset, uint32_t dword) {
-	uint32_t addr = 0x80000000;
-	addr |= ((uint32_t)dev.bus) << 16;
-	addr |= ((uint32_t)dev.device) << 11;
-	addr |= ((uint32_t)dev.function) << 8;
-	addr |= offset & 0xFC;
-
-	outl(CONF_ADDR, addr);
-	outl(CONF_DATA, dword);
-}
-
-void pci_wcfg_w(struct pci_device dev, uint8_t offset, uint16_t word) {
-	size_t shift = (offset & 2) * 8;
-	uint32_t dword = pci_rcfg_d(dev, offset);
-	dword &= ~(0xFFFF << shift);
-	dword |= word << shift;
-	pci_wcfg_d(dev, offset, dword);
-}
-
-void pci_wcfg_b(struct pci_device dev, uint8_t offset, uint8_t byte) {
-	size_t shift = (offset & 3) * 8;
-	uint32_t dword = pci_rcfg_d(dev, offset);
-	dword &= ~(0xFF << shift);
-	dword |= byte << shift;
-	pci_wcfg_d(dev, offset, dword);
-}
-
-static void print_device(struct pci_table_entry *entry) {
-	kprintf(
-		"BUS: %#-4x  DEV: %#-4x  FUNC: %#-4x  ID: %04x:%04x  CLASS: %02x:%02x:%02x  REV: %#02x\n",
-		entry->device.bus,
-		entry->device.device,
-		entry->device.function,
-		entry->vendor_id,
-		entry->device_id,
-		entry->class,
-		entry->subclass,
-		entry->prog_if,
-		entry->revision
-	);
-}
-
-static struct pci_table_entry *load_device(struct pci_device dev) {
-	if (pci_table_next >= TABLE_LEN) panic("Too many PCI devices: limit is %d", TABLE_LEN);
-	struct pci_table_entry *entry = &pci_table[pci_table_next++];
-	entry->device = dev;
-	uint32_t dword0 = pci_rcfg_d(dev, 0);
-	uint32_t dword2 = pci_rcfg_d(dev, 8);
-
-	entry->device_id = (dword0 >> 16) & 0xFFFF;
-	entry->vendor_id = dword0 & 0xFFFF;
-
-	entry->class = (dword2 >> 24) & 0xFF;
-	entry->subclass = (dword2 >> 16) & 0xFF;
-	entry->prog_if = (dword2 >> 8) & 0xFF;
-	entry->revision = dword2 & 0xFF;
-
-	return entry;
-}
-
-void pci_init(void) {
-	pci_table_next = 0;
-	struct pci_device pcidev;
-	for (int bus = 0; bus < 256; bus++) {
-		pcidev.bus = bus;
-		for (int dev = 0; dev < 32; dev++) {
-			pcidev.device = dev;
-			pcidev.function = 0;
-
-			uint16_t vendor = pci_rcfg_w(pcidev, 0);
-			if (vendor == 0xFFFF) continue;
-
-			load_device(pcidev);
-
-			uint8_t header_type = pci_rcfg_b(pcidev, 14);
-
-			if (!(header_type & 0x80)) continue;
-			for (int func = 1; func < 8; func++) {
-				pcidev.function = func;
-
-				uint16_t vendor = pci_rcfg_w(pcidev, 0);
-				if (vendor == 0xFFFF) continue;
-
-				load_device(pcidev);
-			}
-		}
-	}
-	kprintf("PCI DEVICES\n");
-	for (size_t i = 0; i < pci_table_next; i++) {
-		print_device(&pci_table[i]);
-	}
-	kprintf("\n");
-}
-
-bool pci_findby_class(struct pci_device *dest, uint8_t class, uint8_t subclass, size_t *offset) {
-	size_t o = 0;
-	if (offset == NULL) offset = &o;
-	for (; *offset < pci_table_next; (*offset)++) {
-		struct pci_table_entry *entry = &pci_table[*offset];
-		if (entry->class == class && entry->subclass == subclass) {
-			*dest = entry->device;
-			return true;
-		}
-	}
-	return false;
-}
-
-bool pci_findby_id(struct pci_device *dest, uint16_t device, uint16_t vendor, size_t *offset) {
-	size_t o = 0;
-	if (offset == NULL) offset = &o;
-	for (; *offset < pci_table_next; (*offset)++) {
-		struct pci_table_entry *entry = &pci_table[*offset];
-		if (entry->device_id == device && entry->vendor_id == vendor) {
-			*dest = entry->device;
-			return true;
-		}
-	}
-	return false;
-}
diff --git a/src/arch/amd64/fpu.c b/src/arch/amd64/fpu.c
index 5a8aa92..292264c 100644
--- a/src/arch/amd64/fpu.c
+++ b/src/arch/amd64/fpu.c
@@ -1,9 +1,10 @@
-#include <fpu.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <lib.h>
 
-void enable_fpu(void) {
+#include "fpu.h"
+
+void fpu_enable(void) {
 	size_t cr4;
 	uint16_t cw = 0x37F;
 	__asm__ volatile ("mov %%cr4, %0" : "=r"(cr4));
diff --git a/src/arch/amd64/fpu.h b/src/arch/amd64/fpu.h
new file mode 100644
index 0000000..bd7ca67
--- /dev/null
+++ b/src/arch/amd64/fpu.h
@@ -0,0 +1,3 @@
+#pragma once
+
+void fpu_enable(void);
diff --git a/src/arch/amd64/paging.c b/src/arch/amd64/paging.c
index c857d0b..7a718e1 100644
--- a/src/arch/amd64/paging.c
+++ b/src/arch/amd64/paging.c
@@ -3,13 +3,13 @@
 #include <stdint.h>
 #include <lib.h>
 #include <memory.h>
+#include <bindings.h>
 
 #define MEMORY_INTERNAL
-#include <memory/physalloc.h>
-#include <memory/virtalloc.h>
+#include <sys/physalloc.h>
+#include <sys/virtalloc.h>
 
 #include "paging.h"
-#include "bindings.h"
 
 // PAGE MAP LEVEL 4 ENTRY
 struct pml4e {
diff --git a/src/arch/amd64/panic.c b/src/arch/amd64/panic.c
index 48e65f5..6acc88c 100644
--- a/src/arch/amd64/panic.c
+++ b/src/arch/amd64/panic.c
@@ -1,11 +1,9 @@
 #include <panic.h>
 #include <backtrace.h>
 #include <stdarg.h>
-
+#include <bindings.h>
 #include <lib.h>
 
-#include "bindings.h"
-
 _Noreturn void _panic_impl(char *line, char *file, char *format, ...) {
 	cli();
 	va_list list;
diff --git a/src/arch/amd64/shim.c b/src/arch/amd64/shim.c
index c1c3368..05d995c 100644
--- a/src/arch/amd64/shim.c
+++ b/src/arch/amd64/shim.c
@@ -3,11 +3,12 @@
 #include <lib.h>
 #include <shim.h>
 #include <memory.h>
+#include <mboot.h>
+#include <pic.h>
 
 #include "paging.h"
-#include "mboot.h"
+#include "fpu.h"
 #include "cpu/idt.h"
-#include "drivers/pic.h"
 
 static struct boot_info boot_info;
 
@@ -16,6 +17,7 @@ void *amd64_shim(long mboot_magic, volatile void *mboot_data_ptr) {
 	paging_init();
 	pic_remap();
 	idt_init();
+	fpu_enable();
 
 	mboot_load_info(mboot_magic, mboot_data_ptr, &boot_info);
 
diff --git a/src/arch/x86_common/acpi.c b/src/arch/x86_common/acpi.c
new file mode 100644
index 0000000..2392185
--- /dev/null
+++ b/src/arch/x86_common/acpi.c
@@ -0,0 +1,13 @@
+#include <bindings.h>
+
+#define ACPI_INTERNAL
+#include <sys/acpi.h>
+
+void acpi_sys_enable(struct acpi_state *state) {
+	outb(state->fadt->smi_command_port, state->fadt->acpi_enable);
+}
+
+int acpi_sys_shutdown(struct acpi_state *state) {
+	outw((unsigned int) state->fadt->pm1_a_control_block, state->SLP_TYPb | state->SLP_EN);
+	return -1;
+}
diff --git a/src/arch/amd64/drivers/bochs.c b/src/arch/x86_common/drivers/bochs.c
index b3908f9..8e9ca2b 100644
--- a/src/arch/amd64/drivers/bochs.c
+++ b/src/arch/x86_common/drivers/bochs.c
@@ -4,8 +4,7 @@
 #include <panic.h>
 #include <pci.h>
 #include <bochs.h>
-
-#include "../bindings.h"
+#include <bindings.h>
 
 #define INDEX           0x1CE
 #define DATA            0x1CF
diff --git a/src/arch/x86_common/drivers/pci.c b/src/arch/x86_common/drivers/pci.c
new file mode 100644
index 0000000..579562a
--- /dev/null
+++ b/src/arch/x86_common/drivers/pci.c
@@ -0,0 +1,57 @@
+#include <pci.h>
+#include <bindings.h>
+
+#define PCI_INTERNAL
+#include <sys/pci.h>
+
+#define CONF_ADDR 0xCF8
+#define CONF_DATA 0xCFC
+
+uint32_t pci_sys_rcfg_d(struct pci_device dev, uint8_t offset) {
+	uint32_t addr = 0x80000000;
+	addr |= ((uint32_t)dev.bus) << 16;
+	addr |= ((uint32_t)dev.device) << 11;
+	addr |= ((uint32_t)dev.function) << 8;
+	addr |= offset & 0xFC;
+
+	outl(CONF_ADDR, addr);
+	uint32_t in = inl(CONF_DATA);
+	return in;
+}
+
+uint16_t pci_sys_rcfg_w(struct pci_device dev, uint8_t offset) {
+	uint32_t dword = pci_sys_rcfg_d(dev, offset);
+	return (uint16_t)((dword >> ((offset & 2) * 8)) & 0xFFFF);
+}
+
+uint8_t pci_sys_rcfg_b(struct pci_device dev, uint8_t offset) {
+	uint32_t dword = pci_sys_rcfg_d(dev, offset);
+	return (uint8_t)((dword >> ((offset & 3) * 8)) & 0xFF);
+}
+
+void pci_sys_wcfg_d(struct pci_device dev, uint8_t offset, uint32_t dword) {
+	uint32_t addr = 0x80000000;
+	addr |= ((uint32_t)dev.bus) << 16;
+	addr |= ((uint32_t)dev.device) << 11;
+	addr |= ((uint32_t)dev.function) << 8;
+	addr |= offset & 0xFC;
+
+	outl(CONF_ADDR, addr);
+	outl(CONF_DATA, dword);
+}
+
+void pci_sys_wcfg_w(struct pci_device dev, uint8_t offset, uint16_t word) {
+	size_t shift = (offset & 2) * 8;
+	uint32_t dword = pci_sys_rcfg_d(dev, offset);
+	dword &= ~(0xFFFF << shift);
+	dword |= word << shift;
+	pci_sys_wcfg_d(dev, offset, dword);
+}
+
+void pci_sys_wcfg_b(struct pci_device dev, uint8_t offset, uint8_t byte) {
+	size_t shift = (offset & 3) * 8;
+	uint32_t dword = pci_sys_rcfg_d(dev, offset);
+	dword &= ~(0xFF << shift);
+	dword |= byte << shift;
+	pci_sys_wcfg_d(dev, offset, dword);
+}
diff --git a/src/arch/amd64/drivers/pic.c b/src/arch/x86_common/drivers/pic.c
index be7716f..d911648 100644
--- a/src/arch/amd64/drivers/pic.c
+++ b/src/arch/x86_common/drivers/pic.c
@@ -1,5 +1,5 @@
-#include "../bindings.h"
-#include "pic.h"
+#include <bindings.h>
+#include <pic.h>
 
 #define PIC1            0x20        /* IO base address for master PIC */
 #define PIC2            0xA0        /* IO base address for slave PIC */
diff --git a/src/arch/amd64/drivers/serial.c b/src/arch/x86_common/drivers/serial.c
index b9e351e..255f8fc 100644
--- a/src/arch/amd64/drivers/serial.c
+++ b/src/arch/x86_common/drivers/serial.c
@@ -1,6 +1,5 @@
 #include <serial.h>
-
-#include "../bindings.h"
+#include <bindings.h>
 
 #define PORT 0x3F8
 
diff --git a/src/arch/amd64/bindings.h b/src/arch/x86_common/include/bindings.h
index 9406774..9406774 100644
--- a/src/arch/amd64/bindings.h
+++ b/src/arch/x86_common/include/bindings.h
diff --git a/src/arch/amd64/mboot.h b/src/arch/x86_common/include/mboot.h
index d1ca1a0..d1ca1a0 100644
--- a/src/arch/amd64/mboot.h
+++ b/src/arch/x86_common/include/mboot.h
diff --git a/src/arch/amd64/drivers/pic.h b/src/arch/x86_common/include/pic.h
index 2a4670e..2a4670e 100644
--- a/src/arch/amd64/drivers/pic.h
+++ b/src/arch/x86_common/include/pic.h
diff --git a/src/arch/amd64/mboot.c b/src/arch/x86_common/mboot.c
index 9fd7fc2..db82b9d 100644
--- a/src/arch/amd64/mboot.c
+++ b/src/arch/x86_common/mboot.c
@@ -2,8 +2,7 @@
 #include <lib.h>
 #include <stdint.h>
 #include <panic.h>
-
-#include "mboot.h"
+#include <mboot.h>
 
 #define MBOOT_HEADER_MAGIC  0x36D76289