From 738dc826b921932cfa5e7791c369600c123a1a9b Mon Sep 17 00:00:00 2001
From: notsomeidiot123 <kiminosei321@gmail.com>
Date: Mon, 14 Oct 2024 13:35:45 -0400
Subject: [PATCH] Set video mode

---
 src/bootloader/main.s | 12 ++++++++----
 src/kernel/entry.s    | 27 ++-------------------------
 src/kernel/kmain.c    |  2 ++
 3 files changed, 12 insertions(+), 29 deletions(-)

diff --git a/src/bootloader/main.s b/src/bootloader/main.s
index 1a99431..a1dc4ce 100644
--- a/src/bootloader/main.s
+++ b/src/bootloader/main.s
@@ -300,6 +300,7 @@ times 1024-($-$$) db 0
 part_2:
     call get_mmap
     call paging_en
+    call set_video_mode
     mov esi, 0
     call cache_file_table
     mov edi, kernel_file
@@ -311,7 +312,6 @@ part_2:
     ; debug
     mov esi, kload_paddr
     call load_elf
-    
     push eax
     cli
     mov eax, page_table
@@ -381,6 +381,10 @@ get_mmap:
         mov ax, 1
         ret
 set_video_mode:
+    mov ah, 0x0
+    mov al, 0x3
+    int 0x10
+    ret
 paging_en:
     mov eax, cr4
     or eax, 0x00000010 ;enable 4mb pages
@@ -747,9 +751,9 @@ k_info:
     .memory_map_count:  dw 0
     .padding:           db 0
     .bpp:               db 0;if depth == 0 then video is text mode
-    .xres:              dw 0
-    .yres:              dw 0
-    .framebuffer_ptr:   dd 0
+    .xres:              dw 80
+    .yres:              dw 25
+    .framebuffer_ptr:   dd 0xb8000
     .loaded_modules:    dd 0
 ;loaded_modules points to a struct array containing a ptr to the entry point of each pre-loaded module to be executed during startup
 ;module_struct:
diff --git a/src/kernel/entry.s b/src/kernel/entry.s
index 83ce3a7..e4891ed 100644
--- a/src/kernel/entry.s
+++ b/src/kernel/entry.s
@@ -1,33 +1,10 @@
 bits 32
 
 global _start
-
+extern kmain
 section .text
 _start:
-    mov ebx, 0xb8000
-    mov esi, string
-    mov ecx, 0
-    mov ah, 0x8f
-    ; mov ax, 0x55aaaa55
-    .lp:
-        lodsb
-        cmp al, 0
-        je .end
-        cmp al, 0xa
-        je .nl
-        cmp al, 0xd
-        je .cr
-        mov [ebx + ecx], ax
-        add ecx, 2
-        jmp .lp
-    .nl:
-        add ebx, 160
-        ; mov word [ebx + ecx], 0xf41
-        jmp .lp
-    .cr:
-        xor ecx, ecx
-        jmp .lp
-    .end:
+    call kmain
     jmp $
     
 section .data
diff --git a/src/kernel/kmain.c b/src/kernel/kmain.c
index a4c8922..1625f79 100644
--- a/src/kernel/kmain.c
+++ b/src/kernel/kmain.c
@@ -1,3 +1,5 @@
 void kmain(){
+    unsigned short *tm_ptr = (unsigned short*)(0xb8000);
+    tm_ptr[0] = 0xf41;
     return;
 }
\ No newline at end of file