fixes for booting in vmware

Author: braindigitalis

.gitignore

@@ -1,3 +1,4 @@
+cmake-build-debug/*
 build
 .iso
 os/modules

src/ahci.c

@@ -77,17 +77,17 @@ void port_rebase(ahci_hba_port_t* port, int portno)
 	// Command list maxim size = 32*32 = 1K per port
 	port->clb = (kmalloc_low(0x100000) & 0xFFFFFFFFFFFFF000) + 0x1000;
 	port->clbu = 0;
-	kprintf("Alloc: %08x\n", port->clb);
+	dprintf("Alloc: %08x\n", port->clb);
 	memset((void*)((uint64_t)port->clb), 0, 1024);
-	kprintf("After memset\n");
+	dprintf("After memset\n");
 
 	// FIS offset: 32K+256*portno
 	// FIS entry size = 256 bytes per port
 	port->fb = port->clb + (32 * 1024) + (portno << 8);
 	port->fbu = 0;
 	memset((void*)((uint64_t)port->fb), 0, 256);
 
-	kprintf("After 2nd memset\n");
+	dprintf("After 2nd memset\n");
 
 	// Command table offset: 40K + 8K*portno
 	// Command table size = 256*32 = 8K per port
@@ -100,11 +100,11 @@ void port_rebase(ahci_hba_port_t* port, int portno)
 		cmdheader[i].ctbau = 0;
 		memset((void*)(uint64_t)cmdheader[i].ctba, 0, 256);
 	}
-	kprintf("After table init\n");
+	dprintf("After table init\n");
 
 	start_cmd(port);	// Start command engine
 
-	kprintf("After start_cmd\n");
+	dprintf("After start_cmd\n");
 }
 
 int storage_device_ahci_block_read(void* dev, uint64_t start, uint32_t bytes, unsigned char* buffer)

src/idt.c

@@ -18,77 +18,78 @@ __attribute__((aligned(16)))
 idt_entry_t idt_entries[256];
 
 volatile idt_ptr_t idt64 = {
-    .limit = sizeof(idt_entries) - 1,
-    .base = idt_entries
+	.limit = sizeof(idt_entries) - 1,
+	.base = idt_entries
 };
 
 void io_wait() {
-    outb(0x80, 0);
+	outb(0x80, 0);
 }
 
 void pic_remap(int offset1, int offset2) {
-    uint8_t a1 = inb(PIC1_DATA);
-    uint8_t a2 = inb(PIC2_DATA);
-
-    outb(PIC1_COMMAND, ICW1_INIT | ICW1_ICW4);
-    io_wait();
-    outb(PIC2_COMMAND, ICW1_INIT | ICW1_ICW4);
-    io_wait();
-    outb(PIC1_DATA, offset1);
-    io_wait();
-    outb(PIC2_DATA, offset2);
-    io_wait();
-    outb(PIC1_DATA, 4);
-    io_wait();
-    outb(PIC2_DATA, 2);
-    io_wait();
-    outb(PIC1_DATA, ICW4_8086);
-    io_wait();
-    outb(PIC2_DATA, ICW4_8086);
-    io_wait();
-
-    outb(PIC1_DATA, a1);
-    outb(PIC2_DATA, a2);
+	uint8_t a1 = inb(PIC1_DATA);
+	uint8_t a2 = inb(PIC2_DATA);
+
+	outb(PIC1_COMMAND, ICW1_INIT | ICW1_ICW4);
+	io_wait();
+	outb(PIC2_COMMAND, ICW1_INIT | ICW1_ICW4);
+	io_wait();
+	outb(PIC1_DATA, offset1);
+	io_wait();
+	outb(PIC2_DATA, offset2);
+	io_wait();
+	outb(PIC1_DATA, 4);
+	io_wait();
+	outb(PIC2_DATA, 2);
+	io_wait();
+	outb(PIC1_DATA, ICW4_8086);
+	io_wait();
+	outb(PIC2_DATA, ICW4_8086);
+	io_wait();
+
+	outb(PIC1_DATA, a1);
+	outb(PIC2_DATA, a2);
 }
 
 void pic_disable() {
-    outb(PIC1_DATA, 0xFF);
-    outb(PIC2_DATA, 0xFF);
+	outb(PIC1_DATA, 0xFF);
+	outb(PIC2_DATA, 0xFF);
 }
 
 void pic_enable() {
-    outb(PIC1_DATA, 0x00);
-    outb(PIC2_DATA, 0x00);
+	outb(PIC1_DATA, 0x00);
+	outb(PIC2_DATA, 0x00);
 }
 
 void pic_eoi(int irq) {
-    if (irq >= 8) {
-        outb(PIC2_COMMAND, PIC_EOI);
-    }
-    outb(PIC1_COMMAND, PIC_EOI);
+	if (irq >= 8) {
+	outb(PIC2_COMMAND, PIC_EOI);
+	}
+	outb(PIC1_COMMAND, PIC_EOI);
 }
 
 void init_idt() {
-    memset(idt_entries, 0, sizeof(idt_entries));
+	memset(idt_entries, 0, sizeof(idt_entries));
 
-    init_error_handler();
-    register_interrupt_handler(IRQ0, timer_callback, dev_zero, NULL);
-    init_debug();
+	init_error_handler();
+	register_interrupt_handler(IRQ0, timer_callback, dev_zero, NULL);
+	init_debug();
 
-    // Fill the IDT with handler pointers (in loader.S)
-    idt_init(idt_entries);
+	// Fill the IDT with handler pointers (in loader.S)
+	idt_init(idt_entries);
 
-    __asm__ volatile("lidtq (%0)" :: "r"(&idt64));
+	__asm__ volatile("lidtq (%0)" :: "r"(&idt64));
 
-    uint32_t frequency = 50;
-    uint32_t divisor = 1193180 / frequency;
-    outb(0x43, 0x36);
-    outb(0x40, divisor & 0xFF);
-    outb(0x40, divisor >> 8);
+	uint32_t frequency = 50;
+	uint32_t divisor = 1193180 / frequency;
+	outb(0x43, 0x36);
+	outb(0x40, divisor & 0xFF);
+	outb(0x40, divisor >> 8);
 
-    pic_remap(0x20, 0x28);
-    pic_enable();
+	pic_remap(0x20, 0x28);
+	pic_enable();
 
-    interrupts_on();
-    dprintf("Interrupts enabled!\n");
+	interrupts_on();
+
+	dprintf("Interrupts enabled!\n");
 }

src/init.c

@@ -10,10 +10,22 @@ init_func_t init_funcs[] = {
 	NULL,
 };
 
+char* init_funcs_names[] = {
+	"console",	"heap",			"cores",	"idt",
+	"pci",		"clock",
+	"devicenames",	"keyboard",		"ide",		"ahci",
+	"filesystem",	"iso9660",		"devfs",	"fat32",
+	NULL,
+};
+
+
 void init()
 {
+	uint32_t n = 0;
 	for (init_func_t* func = init_funcs; *func; ++func) {
+		dprintf("Bringing up %s...\n", init_funcs_names[n]);
 		(*func)();
+		dprintf("Initialisation of %s done!\n", init_funcs_names[n++]);
 	}
 
 }