4 files changed, 125 insertions, 136 deletions

diff --git a/src/kernel/boot.asm b/src/kernel/boot.asm
index 5ee93f0..98b122c 100644
--- a/src/kernel/boot.asm
+++ b/src/kernel/boot.asm
@@ -1,6 +1,8 @@
-[BITS 32]
 global start
 start:
+    [BITS 16]
+    call search_video_mode
+    [bits 32]
     mov esp, _sys_stack ; Points stack to stack area
     jmp stublet
 
@@ -29,6 +31,7 @@ mboot:
     dd start
 
 ; Endless loop
+[bits 32]
 stublet:
     extern kernel_main
     call kernel_main
@@ -42,7 +45,7 @@ stublet:
 
 %include "src/kernel/interrupts/irq.asm"
 
-; %include "src/kernel/graphics/vesa.asm"
+%include "src/kernel/graphics/vesa.asm"
 
 ; Store the stack
 SECTION .bss
diff --git a/src/kernel/graphics/graphics.h b/src/kernel/graphics/graphics.h
index 1f36d48..a9ed917 100644
--- a/src/kernel/graphics/graphics.h
+++ b/src/kernel/graphics/graphics.h
@@ -18,7 +18,4 @@ void terminal_put_char(char c);
 
 void terminal_write_line(const char *data);
 
-// VESA
-void vesa_init();
-
 #endif
\ No newline at end of file
diff --git a/src/kernel/graphics/vesa.asm b/src/kernel/graphics/vesa.asm
index 9d8e231..3fdd4cd 100644
--- a/src/kernel/graphics/vesa.asm
+++ b/src/kernel/graphics/vesa.asm
@@ -1,72 +1,3 @@
-global find_mode
-global best_video_mode
-
-vbe_info_block:
-	.signature					db "VBE2"	; indicate support for VBE 2.0+
-	.version					dw 0
-	.oem						dd 0
-	.capabilities 				dd 0
-	.video_modes				dd 0
-	.video_memory				dw 0
-	.software_rev				dw 0
-	.vendor						dd 0
-	.product_name				dd 0
-	.product_rev				dd 0
-	.reserved					times 222 db 0
-	.oem_data					times 256 db 0
-
-mode_info_block:
-	.attributes					dw 0
-	.window_a					db 0
-	.window_b					db 0
-	.granularity				dw 0
-	.window_size				dw 0
-	.segment_a					dw 0
-	.segment_b					dw 0
-	.win_func_ptr			 	dd 0
-	.pitch						dw 0
-	.width						dw 0
-	.height						dw 0
-	.w_char						db 0
-	.y_char						db 0
-	.planes						db 0
-	.bpp						db 0
-	.banks						db 0
-	.memory_model				db 0
-	.bank_size					db 0
-	.image_pages				db 0
-	.reserved0					db 0
-
-	.red_mask					db 0
-	.red_position				db 0
-	.green_mask					db 0
-	.green_position				db 0
-	.blue_mask					db 0
-	.blue_position				db 0
-	.reserved_mask				db 0
-	.reserved_position			db 0
-	.direct_color_attributes	db 0
-
-	.framebuffer				dd 0
-	.off_screen_mem_off			dd 0
-	.off_screen_mem_size		dw 0
-	.reserved1					times 206 db 0
-
-best_video_mode:
-	.bpp db 0
-	.height dw 0
-	.width dw 0
-	.mode dw 0
-	.framebuffer dd 0
-	.bytes_per_line dw 0
-	.bytes_per_pixel dd 0
-	.x_cur_max dw 0
-	.y_cur_max dw 0
-
-segments dw 0
-offset  dw 0
-mode 	dw 0
-
 width equ 1024
 height equ 768
 bpp equ 32
@@ -91,6 +22,7 @@ search_video_mode:
 
     mov cx, 1
     push cx
+    ret
 
 find_mode:
 	mov dx, [fs:si]
@@ -115,62 +47,59 @@ find_mode:
 	inc cx
 	push cx
 
-	check_mode:
-		mov cx, 0
-		mov bx, [best_video_mode.width]
-		cmp bx, [mode_info_block.width]
-		jl save_and_continue
-		je compare_height
-		jmp next_mode
-
-	compare_height:
-		mov bx, [best_video_mode.height]
-		cmp bx, [mode_info_block.height]
-		jl save_and_continue
-		je compare_bpp
-		jmp next_mode
-
-	compare_bpp:
-		mov dx, [best_video_mode.bpp]
-		mov ax, [mode_info_block.bpp]
-		and ax, 11111111b
-		cmp dx, ax
-		jl save_and_continue
-		jmp next_mode
-
-	save_and_continue:
-		mov bx, [mode_info_block.width]
-		mov [best_video_mode.width], bx
-
-		shr bx,3
-		dec bx
-		mov [best_video_mode.x_cur_max], bx
-
-		mov bx, [mode_info_block.height]
-		mov [best_video_mode.height], bx
-
-		shr bx, 4
-		dec bx
-		mov word [best_video_mode.y_cur_max], ax
-
-		mov ebx, 0
-		mov bl, [mode_info_block.bpp]
-		mov byte [best_video_mode.bpp], bl
-		shr ebx, 3
-		mov dword [best_video_mode.bytes_per_pixel], ebx
-
-
-		mov bx, [mode]
-		mov [best_video_mode.mode], bx
-		mov ebx, [mode_info_block.framebuffer]
-		mov dword[best_video_mode.framebuffer], ebx
-		mov bx, [mode_info_block.pitch]
-		mov word [best_video_mode.bytes_per_line],bx
-		jmp next_mode
-
-pop es
-
-jmp $
+check_mode:
+    mov cx, 0
+    mov bx, [best_video_mode.width]
+    cmp bx, [mode_info_block.width]
+    jl save_and_continue
+    je compare_height
+    jmp next_mode
+
+compare_height:
+    mov bx, [best_video_mode.height]
+    cmp bx, [mode_info_block.height]
+    jl save_and_continue
+    je compare_bpp
+    jmp next_mode
+
+compare_bpp:
+    mov dx, [best_video_mode.bpp]
+    mov ax, [mode_info_block.bpp]
+    and ax, 11111111b
+    cmp dx, ax
+    jl save_and_continue
+    jmp next_mode
+
+save_and_continue:
+    mov bx, [mode_info_block.width]
+    mov [best_video_mode.width], bx
+
+    shr bx,3
+    dec bx
+    mov [best_video_mode.x_cur_max], bx
+
+    mov bx, [mode_info_block.height]
+    mov [best_video_mode.height], bx
+
+    shr bx, 4
+    dec bx
+    mov word [best_video_mode.y_cur_max], ax
+
+    mov ebx, 0
+    mov bl, [mode_info_block.bpp]
+    mov byte [best_video_mode.bpp], bl
+    shr ebx, 3
+    mov dword [best_video_mode.bytes_per_pixel], ebx
+
+    mov bx, [mode]
+    mov [best_video_mode.mode], bx
+    mov ebx,[mode_info_block.framebuffer]
+    mov dword [best_video_mode.framebuffer], ebx
+    mov bx, [mode_info_block.pitch]
+    mov word [best_video_mode.bytes_per_line], bx
+    jmp next_mode
+    pop es
+    jmp $
 
 new_line_and_next_mode:
 	mov cx,1
@@ -199,3 +128,69 @@ next_mode:
 	mov fs, ax
 	mov si, [offset]
 	jmp find_mode
+
+vbe_info_block:
+	.signature					db "VBE2"; indicate support for VBE 2.0+
+	.version					dw 0
+	.oem						dd 0
+	.capabilities 				dd 0
+	.video_modes				dd 0
+	.video_memory				dw 0
+	.software_rev				dw 0
+	.vendor						dd 0
+	.product_name				dd 0
+	.product_rev				dd 0
+	.reserved					times 222 db 0
+	.oem_data					times 256 db 0
+
+mode_info_block:
+	.attributes					dw 0
+	.window_a					db 0
+	.window_b					db 0
+	.granularity				dw 0
+	.window_size				dw 0
+	.segment_a					dw 0
+	.segment_b					dw 0
+	.win_func_ptr			 	dd 0
+	.pitch						dw 0
+	.width						dw 0
+	.height						dw 0
+	.w_char						db 0
+	.y_char						db 0
+	.planes						db 0
+	.bpp						db 0
+	.banks						db 0
+	.memory_model				db 0
+	.bank_size					db 0
+	.image_pages				db 0
+	.reserved0					db 0
+
+	.red_mask					db 0
+	.red_position				db 0
+	.green_mask					db 0
+	.green_position				db 0
+	.blue_mask					db 0
+	.blue_position				db 0
+	.reserved_mask				db 0
+	.reserved_position			db 0
+	.direct_color_attributes	db 0
+
+	.framebuffer				dd 0
+	.off_screen_mem_off			dd 0
+	.off_screen_mem_size		dw 0
+	.reserved1					times 206 db 0
+
+best_video_mode:
+	.bpp db 0
+	.height dw 0
+	.width dw 0
+	.mode dw 0
+	.framebuffer dd 0
+	.bytes_per_line dw 0
+	.bytes_per_pixel dd 0
+	.x_cur_max dw 0
+	.y_cur_max dw 0
+
+segments dw 0
+offset dw 0
+mode dw 0
diff --git a/src/kernel/graphics/vesa.c b/src/kernel/graphics/vesa.c
deleted file mode 100644
index 0a121e5..0000000
--- a/src/kernel/graphics/vesa.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "graphics.h"
-
-
-void vesa_init() {
-    terminal_write_line("Init");
-}
\ No newline at end of file