Begin tasking v3 rewrite
diff --git a/src/kernel/Jmk b/src/kernel/Jmk
index bf51a3f..25898cc 100644
--- a/src/kernel/Jmk
+++ b/src/kernel/Jmk
@@ -27,7 +27,7 @@
FS ?= ext2
-CFLAGS += -I$(ROOT)/include/kernel $(test_defines) -O0
+CFLAGS += -I$(ROOT)/include/kernel $(test_defines) -O0 -Wno-ignored-qualifiers -Wno-sign-compare
LDFLAGS += -Tlink.ld -melf_i386
ASMFLAGS += -felf -Fdwarf
diff --git a/src/kernel/dri/ide/ide.c b/src/kernel/dri/ide/ide.c
index de4144c..2f45670 100644
--- a/src/kernel/dri/ide/ide.c
+++ b/src/kernel/dri/ide/ide.c
@@ -17,7 +17,7 @@
void ide_print_device(struct ide_device *dev)
{
- kprintf(INFO "<ide-device dma=%b>\n", dev->supports_dma);
+ kprintf(INFO "IDE device dma=%b\n", dev->supports_dma);
}
void ide_thread(struct ide_thread_data *data)
diff --git a/src/kernel/dri/pci/pci.c b/src/kernel/dri/pci/pci.c
index 4d2d01e..bb0b36c 100644
--- a/src/kernel/dri/pci/pci.c
+++ b/src/kernel/dri/pci/pci.c
@@ -19,6 +19,7 @@
struct pci_device pci_check_device(uchar bus, uchar slot, uchar func)
{
+
uint vendor_device = pci_config_readd(bus, slot, func, 0);
ushort vendor = vendor_device & 0xffff;
diff --git a/src/kernel/main.c b/src/kernel/main.c
index befb64b..b61efda 100644
--- a/src/kernel/main.c
+++ b/src/kernel/main.c
@@ -47,11 +47,12 @@
test_allocator();
#endif
- // Load initrd
- struct multiboot_info mb = make_multiboot_physical(mboot);
init_vfs();
#ifdef INITRD
+ // Load initrd
+ struct multiboot_info mb = make_multiboot_physical(mboot);
+
kassert(mb.mods_count, "No multiboot modules loaded!");
kprintf(DEBUG "mboot->mods_addr = %d (0x%x)\n", mb.mods_addr, mb.mods_addr);
uchar *initrd_loc = (uchar *)((uint *)mb.mods_addr)[0];
@@ -64,7 +65,7 @@
asm("sti");
- init_tasks();
+ // init_tasks();
init_sync();
pci_init();
diff --git a/src/kernel/task.c b/src/kernel/task.c
index d538e01..85cce5b 100644
--- a/src/kernel/task.c
+++ b/src/kernel/task.c
@@ -85,8 +85,8 @@
// Virtual address of page directory (in kernel memory)
uint *dir_v = PHYS_TO_VIRT(proc->page_directory_p);
- // Virtual location of new stack, with space reserved for argument and
- // return address to kill_this_thread().
+ // Virtual location of new stack, with space reserved for argument
+ // and return address to kill_this_thread().
uint new_stack_base_v = proc->last_stack_pos;
proc->last_stack_pos -= 0x1000;