From c2a95c96d5d4b9556a71fed221be98e7fcb16907 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Wed, 24 Aug 2016 20:31:59 -0600
Subject: [PATCH] Fixes for real hardware

---
 bootloader/x86/bootsector.asm     | 46 +++++++++++++++----------------
 bootloader/x86/startup-common.asm | 10 +++----
 bootloader/x86/vesa.asm           |  4 +--
 3 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/bootloader/x86/bootsector.asm b/bootloader/x86/bootsector.asm
index bc50c22..cbf466f 100644
--- a/bootloader/x86/bootsector.asm
+++ b/bootloader/x86/bootsector.asm
@@ -65,31 +65,31 @@ load:
     mov [DAPACK.count], cx
     mov [DAPACK.seg], dx
 
-    ; mov si, loading
-    ; call print
+    mov si, loading
+    call print
 
-    ; mov bx, [DAPACK.addr]
-    ; call print_num
+    mov bx, [DAPACK.addr]
+    call print_num
 
-    ; mov al, '#'
-    ; call print_char
-    ;
-    ; mov bx, [DAPACK.count]
-    ; call print_num
-    ;
-    ; mov al, ' '
-    ; call print_char
-    ;
-    ; mov bx, [DAPACK.seg]
-    ; call print_num
-    ;
-    ; mov al, ':'
-    ; call print_char
-    ;
-    ; mov bx, [DAPACK.buf]
-    ; call print_num
-    ;
-    ; call print_line
+    mov al, '#'
+    call print_char
+
+    mov bx, [DAPACK.count]
+    call print_num
+
+    mov al, ' '
+    call print_char
+
+    mov bx, [DAPACK.seg]
+    call print_num
+
+    mov al, ':'
+    call print_char
+
+    mov bx, [DAPACK.buf]
+    call print_num
+
+    call print_line
 
     mov dl, [disk]
     mov si, DAPACK
diff --git a/bootloader/x86/startup-common.asm b/bootloader/x86/startup-common.asm
index 5389a06..f582418 100644
--- a/bootloader/x86/startup-common.asm
+++ b/bootloader/x86/startup-common.asm
@@ -14,7 +14,7 @@ startup:
 ; buffersize in multiple of sectors (512 Bytes)
 ; min 1
 ; max (0x70000 - startup_end) / 512
-buffer_size_sectors equ 1
+buffer_size_sectors equ 512
 ; buffer size in Bytes
 buffer_size_bytes equ buffer_size_sectors * 512
 
@@ -32,7 +32,7 @@ kernel_base equ 0x100000
 
         ; populating buffer
         mov cx, buffer_size_sectors
-        mov bx, startup_end
+        mov bx, kernel_file
         mov dx, 0x0
 
         push ax
@@ -42,7 +42,7 @@ kernel_base equ 0x100000
         call unreal
         pop ax
 
-        mov esi, startup_end
+        mov esi, kernel_file
         mov ecx, buffer_size_bytes / 4
         a32 rep movsd
 
@@ -57,14 +57,14 @@ kernel_base equ 0x100000
     test cx, cx
     jz finished_loading ; if cx = 0 => skip
 
-    mov bx, startup_end
+    mov bx, kernel_file
     mov dx, 0x0
     call load
 
     ; moving remnants of kernel
     call unreal
 
-    mov esi, startup_end
+    mov esi, kernel_file
     mov ecx, (kernel_file.length_sectors % buffer_size_bytes) / 4
     a32 rep movsd
 finished_loading:
diff --git a/bootloader/x86/vesa.asm b/bootloader/x86/vesa.asm
index cb22221..8dadf2a 100644
--- a/bootloader/x86/vesa.asm
+++ b/bootloader/x86/vesa.asm
@@ -183,8 +183,8 @@ vesa:
 .minx dw 640
 .miny dw 480
 .required:
-.requiredx dw 1024    ;USE THESE WITH CAUTION
-.requiredy dw 768
+.requiredx dw 0 ;1024    ;USE THESE WITH CAUTION
+.requiredy dw 0 ;768
 .requiredmode dw 0
 
 .noedidmsg db "EDID not supported.",10,13,0