From 33197f1dac1ce27cd747c99c50a7ceda76beb9eb Mon Sep 17 00:00:00 2001
From: Rhodez-x <jorn@guld-berg.dk>
Date: Fri, 14 Dec 2018 13:40:06 +0100
Subject: [PATCH] More logic added to check for more active partitions

---
 slrboot.bin  | Bin 8192 -> 8192 bytes
 slrboot.nasm |  33 +++++++++++++++------------------
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/slrboot.bin b/slrboot.bin
index 1110ee78dc7668ab33543f4ed80a2d045a0263b1..0e3a9040b33676df5d029199af6eab03a34d92b4 100644
GIT binary patch
delta 240
zcmZp0XmF_imG+9Wh5-n6FbMQr*u$`42LnUjjlKgNVk))2_c7G$XJFgO!1#ITZo`_!
z*9>LBhxh%jd9jDV@V4Q}h5Kr48yHGib~7?KE<6WeJMLy;Sa=V{W@cFU4#s9-X#UAq
zBCw@xryRqshL*FUh6lDVp7j+2YS^)_w)r<>30w040q@sen-6ew9yUDC&AwQ-_JtWk
z^I;|+Q?K@gHp8zk$Jx|t85xeVY1c9UNzGb@ntiIZK!cpRfX+QDJTcIZ$5=PDqJWnR
W<RyWL8)r=3$0)$qu=zZrp&S5;&0co^

delta 113
zcmV-%0FM8FK!89|`ey10d;kCd0EiZ+e7FD*j?laSu($vKj@XXC`@R5tzW@fg00Q%*
zyD@x$>i~9B!@h)k=s^Iq0<ZzQ0DQ85iZ;-FiVo3ziZ0K6%@gPf0Flg22QV#VcyJ90
TvjGAa0h7J~5CH(Q&jB$Wm?SL&

diff --git a/slrboot.nasm b/slrboot.nasm
index 87e7ffe..53a2d0d 100644
--- a/slrboot.nasm
+++ b/slrboot.nasm
@@ -36,9 +36,6 @@ call print      ; Call our string-printing routine
 xor bx, bx
 xor cx, cx
 mov ax, [partition_1.active_partition]
-call dumpax
-cli
-hlt
 cmp ax, 0x80
 jne check_p_2
 mov bx, 0x01 ; Partion 1 active
@@ -67,7 +64,7 @@ mov bx, 0x04 ; Partion 4 active
 
 eval_active_partion_number: 
 cmp cx, 1
-je boot_partition:
+je boot_partition
 ; here goes wait call, for the user to enter debug mode. 
 ; Wating for 2 seconds: 
 mov ah, 0x86   ; code for waiting interupt call
@@ -79,34 +76,34 @@ xor ax, ax
 mov ah, 0x01 ; BIOS call to wait for key
 int 0x16
 
-mov bx, 1
 
 boot_partition:
 ; IMPORTANT bx, has to hold the value 1-4 for the partiotion that wanted to be booted.  
 
+mov bx, 2
 
 mov ax, partition_1
 .loop:
     cmp bx, 1 
     je break
     add ax, 0x10
+    ;call dumpax
     dec bx
     jmp .loop
 break:
 
-add ax, 7 ; This is the offset to fetch the LBA start adress of the partition record
-
-mov bx, [ax] ; first part of LBA
-mov WORD [DAPACK.lba_addr_dw_low], bx
-inc ax ; next part
-mov bx, [ax]
-mov WORD [DAPACK.lba_addr_dw_low + 1], bx
-inc ax ; next part
-mov bx, [ax]
-mov WORD [DAPACK.lba_addr_dw_low + 2], bx
-inc ax ; next part
-mov bx, [ax]
-mov WORD [DAPACK.lba_addr_dw_low + 3], bx
+add ax, 8 ; This is the offset to fetch the LBA start adress of the partition record
+mov bx, ax
+xor ax, ax
+mov ax, [bx] ; first part of LBA
+mov WORD [DAPACK.lba_addr_dw_low], ax
+call dumpax
+add bx, 2 ; next part
+mov ax, [bx]
+mov WORD [DAPACK.lba_addr_dw_low + 1], ax
+call dumpax
+cli 
+hlt
 mov WORD [DAPACK.blkcnt],          0x01  
 mov WORD [DAPACK.db_addr_segment], 0x0000
 mov WORD [DAPACK.db_addr_offset],  0x7c00