From e305764cde47f6a05ca5b39790141264d3155bd4 Mon Sep 17 00:00:00 2001
From: Tom-on64 <kubecekt@gmail.com>
Date: Thu, 2 May 2024 11:09:05 +0200
Subject: [PATCH] Added setup screen on bootup. Also added src/config.asm,
 where you can configure some stuff

---
 other/setup.png | Bin 0 -> 9074 bytes
 src/config.asm  |   7 ++++
 src/stage2.asm  | 100 ++++++++++++++++++++++++++++++++++++++++++++++--
 3 files changed, 103 insertions(+), 4 deletions(-)
 create mode 100644 other/setup.png
 create mode 100644 src/config.asm

diff --git a/other/setup.png b/other/setup.png
new file mode 100644
index 0000000000000000000000000000000000000000..148b2806a1a32db9a02fd8e75866738d3695f634
GIT binary patch
literal 9074
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
J{b=9u{|3c9-{JrO

literal 0
HcmV?d00001

diff --git a/src/config.asm b/src/config.asm
new file mode 100644
index 0000000..18dae5b
--- /dev/null
+++ b/src/config.asm
@@ -0,0 +1,7 @@
+;;;
+;;; Kern build configuration
+;;;
+
+;; Force 1920x1080 32bpp resolution (will skip prompt on boot)
+; %define FORCE_RESOLUTION
+
diff --git a/src/stage2.asm b/src/stage2.asm
index 5e8db67..3496d38 100644
--- a/src/stage2.asm
+++ b/src/stage2.asm
@@ -1,6 +1,8 @@
 [bits 16]
 [org 0x7e00]
 
+%include "src/config.asm"
+
 %define KERNEL_LOC 0x1000
 %define VIDMEM 0xb800
 
@@ -29,10 +31,8 @@ getMemoryMap:
     jnz .start
 
 .error:
-    mov si, acpiFuncErr
-    call print
-    cli
-    hlt
+    stc
+    jmp inputGfx
 
 .nextEntry:
     mov edx, "PAMS" ; In case BIOS messes with edx
@@ -59,8 +59,30 @@ getMemoryMap:
     mov [memMapEntries], bp
     clc
 
+;; Get graphics values from user (resolution etc.)
+inputGfx:
+    xor ecx, ecx
+    cmp word [width], 0 ; Values already set
+    jne vbeSetup
+    mov si, gfxChooseMsg
+    call print
+    call getNumber ; Stores input value in bx
+    mov [width], bx
+
+    mov si, gfxHeightMsg
+    call print
+    call getNumber
+    mov [height], bx
+
+    mov si, gfxBppMsg
+    call print
+    call getNumber
+    mov [bpp], bx
+
 vbeSetup:
     ; Setup VBE info
+    xor ax, ax
+    mov es, ax
     mov ax, 0x4f00
     mov di, vbeInfoBlock
     int 0x10
@@ -233,6 +255,64 @@ print:
     pop ax
     ret
 
+;;
+;; Reads a base 10 number as input from user
+;; Returns:
+;;  bx - number read
+;;
+getNumber: ; TODO: if user enters a number that overflows (n > 0xffff) shit breaks
+    push cx
+    push ax
+    push dx
+    xor bx, bx
+    mov cx, 10
+.nextDigit:
+    xor ah, ah
+    int 0x16
+    mov ah, 0x0e
+
+    cmp al, 0x08 ; Backspace
+    je .backspace
+    cmp al, 0x0d ; Enter
+    je .enter
+
+    cmp al, '0' ; Make sure user entered a number
+    jl .nextDigit
+    cmp al, '9' 
+    jg .nextDigit
+
+    int 0x10 ; Print the digit
+
+    sub al, '0' ; Convert to integer
+    mov ah, 0
+    imul bx, bx, 10 ; bx *= 10
+    add bx, ax ; bx += ax
+    jmp .nextDigit
+
+.backspace:
+    cmp bx, 0 ; Check if we can backspace
+    je .nextDigit 
+    int 0x10 ; go back one space
+
+    mov ax, bx
+    xor dx, dx
+    div cx      ; dx:ax / cx -> ax = result, dx = remainder
+    mov bx, ax
+
+    mov ah, 0x0e
+    mov al, ' ' 
+    int 0x10
+    mov al, 0x08
+    int 0x10
+
+    jmp .nextDigit
+
+.enter:
+    pop dx
+    pop ax
+    pop cx
+    ret
+
 ;; 32 Bit entry code
 [bits 32]
 protected_start:
@@ -267,6 +347,11 @@ vbeErr: db "VBE Error!", 0
 modeNotFoundErr: db "VBE Mode not found!", 0
 acpiFuncErr: db "ACPI Function not supported!", 0
 
+gfxChooseMsg: db "Please enter desired values" ; No NULL terminator, we want to print gfxWidthMsg right after anyway
+gfxWidthMsg: db 0x0a, 0x0d, "Width: ", 0
+gfxHeightMsg: db 0x0a, 0x0d, "Height: ", 0
+gfxBppMsg: db 0x0a, 0x0d, "Bits Per Pixel: ", 0
+
 ;; GDT
 GDT:
 .start:
@@ -297,9 +382,16 @@ CODE_SEG equ GDT.codeDescriptor - GDT.start
 DATA_SEG equ GDT.dataDescriptor - GDT.start
 
 ;; VBE Stuff
+%ifdef FORCE_RESOLUTION
 width: dw 1920
 height: dw 1080
 bpp: db 32
+%else
+width: dw 0
+height: dw 0
+bpp: db 0
+%endif
+
 offset: dw 0
 _segment: dw 0 ; segment is a keyword
 mode: dw 0