Fixed vbe parameter in ext2 loader

4 files changed, 10 insertions, 14 deletions

diff --git a/apps/Makefile b/apps/Makefile
index b753dd5..84098c5 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -5,7 +5,7 @@ CC = ../cross/opt/bin/i686-elf-gcc
 LD = ../cross/opt/bin/i686-elf-ld
 OC = ../cross/opt/bin/i686-elf-objcopy
 
-CFLAGS = -Wall -Wextra -nostdlib -nostdinc -fno-builtin -std=c99 -m32 -pedantic-errors -I../libc/inc/ -I../libgui/inc/ -fPIE -Duserspace -Ofast
+CFLAGS = -Wall -Wextra -nostdlib -nostdinc -fno-builtin -std=c99 -m32 -pedantic-errors -I../libc/inc/ -I../libgui/inc/ -fPIE -Duserspace -Os
 
 all: $(COBJS)
 
diff --git a/boot/load.c b/boot/load.c
index 19ddce9..20d25a1 100644
--- a/boot/load.c
+++ b/boot/load.c
@@ -132,7 +132,8 @@ struct inode *get_inode(int i);
 int find_inode(const char *name, int dir_inode);
 void serial_install();
 void serial_print(const char *data);
-int main()
+
+int main(void *data)
 {
 	serial_install();
 	heap = 0xf000;
@@ -140,9 +141,12 @@ int main()
 	*(void **)(&entry) = read_inode(get_inode(find_inode("kernel.bin", 2)));
 	if (entry) {
 		serial_print("Loaded kernel!\n");
-		entry();
+		entry(data);
+		return 0;
+	} else {
+		serial_print("Couldn't find kernel!\n");
+		return 1;
 	}
-	return 0;
 }
 
 u8 inb(u16 port)
@@ -330,8 +334,6 @@ void *read_inode(struct inode *in)
 	if (!num_blocks)
 		return 0;
 
-	/* u32 sz = BLOCK_SIZE * num_blocks; */
-	/* void *buf = malloc(sz); */
 	void *buf = (void *)0x50000;
 	//assert(buf != 0);
 
diff --git a/kernel/Makefile b/kernel/Makefile
index 353a339..f91839a 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -20,10 +20,7 @@ LD = ../cross/opt/bin/i686-elf-ld
 OC = ../cross/opt/bin/i686-elf-objcopy
 AS = nasm
 
-# Flags to make the binary smaller TODO: Remove after indirect pointer support!
-CSFLAGS = -mpreferred-stack-boundary=2 -fno-asynchronous-unwind-tables -Os
-
-CFLAGS = $(CSFLAGS) -Wall -Wextra -nostdlib -nostdinc -ffreestanding -fno-builtin -mno-red-zone -mgeneral-regs-only -std=c99 -m32 -pedantic-errors -Wl,-ekernel_main -I../libc/inc/ -Iinc/ -Dkernel
+CFLAGS = -Wall -Wextra -nostdlib -nostdinc -ffreestanding -fno-builtin -fno-asynchronous-unwind-tables -mno-red-zone -mgeneral-regs-only -mpreferred-stack-boundary=2 -std=c99 -m32 -pedantic-errors -Wl,-ekernel_main -I../libc/inc/ -Iinc/ -Dkernel -Os
 
 ASFLAGS = -f elf32
 
diff --git a/libc/Makefile b/libc/Makefile
index 3458256..cbc2fc9 100644
--- a/libc/Makefile
+++ b/libc/Makefile
@@ -16,10 +16,7 @@ LD = ../cross/opt/bin/i686-elf-ld
 AR = ../cross/opt/bin/i686-elf-ar
 AS = nasm
 
-# Flags to make the binary smaller TODO: Remove after indirect pointer support!
-CSFLAGS = -mpreferred-stack-boundary=2 -fno-asynchronous-unwind-tables -Os
-
-CFLAGS = $(CSFLAGS) -Wall -Wextra -nostdlib -nostdinc -fno-builtin -mno-red-zone -mgeneral-regs-only -std=c99 -m32 -pedantic-errors -Iinc/
+CFLAGS = -Wall -Wextra -nostdlib -nostdinc -fno-builtin -fno-asynchronous-unwind-tables -mno-red-zone -mgeneral-regs-only -mpreferred-stack-boundary=2 -std=c99 -m32 -pedantic-errors -Iinc/ -Os
 
 ASFLAGS = -f elf32