Update jmk, PCI
diff --git a/src/kernel/Jmk b/src/kernel/Jmk
index 4133349..8300fd8 100644
--- a/src/kernel/Jmk
+++ b/src/kernel/Jmk
@@ -12,6 +12,9 @@
depends(initrd, $(ROOT)/boot/initrd, initrd.img)
depends(ata_pio, dri/ata_pio, ata_pio.a)
+depends(pci, dri/pci, pci.a)
+# AHCI not yet implemented
+# depends(ahci, dri/ahci, ahci.a)
CFLAGS += -I $(ROOT)/include/kernel
@@ -41,7 +44,8 @@
syscall.o \
task.o \
task_api.o \
- lib(ata_pio)
+ lib(ata_pio) \
+ lib(pci)
type(custom_link)
diff --git a/src/kernel/dri/pci/Jmk b/src/kernel/dri/pci/Jmk
index 07b50d2..4950d74 100644
--- a/src/kernel/dri/pci/Jmk
+++ b/src/kernel/dri/pci/Jmk
@@ -6,10 +6,10 @@
preset(32)
preset(warn)
-CFLAGS += -I $(ROOT)/include/kernel
-
archetype(c)
+CFLAGS += -I$(ROOT)/include/kernel
+
OBJECTS = pci.o
type(static_lib)
diff --git a/src/kernel/dri/pci/pci.c b/src/kernel/dri/pci/pci.c
index 09c9056..87e5d2e 100644
--- a/src/kernel/dri/pci/pci.c
+++ b/src/kernel/dri/pci/pci.c
@@ -1,10 +1,10 @@
-#include <dri/pci.h>
+#include <dri/pci/pci.h>
ushort pci_config_readw(uchar bus, uchar slot, uchar func, uchar offset)
{
struct pci_config_address address =
{
- .enabled = 1,
+ .enable = 1,
.bus = bus,
.device = slot,
.function = func,