From d6e8a2a923320394da9669c5d0e9994a986bfdf3 Mon Sep 17 00:00:00 2001
From: Elaina Claus <elaina.claus@chtm.me>
Date: Fri, 20 Dec 2024 02:07:46 +0000
Subject: [PATCH] minor cleanup and add dev enviroment files to gitignore

---
 .gitignore                  |  3 ++-
 include/fat32/FAT32_SYS.inc |  4 ++--
 src/stage2/stage2.nasm      | 22 ----------------------
 3 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/.gitignore b/.gitignore
index 92682b7..ab2cf9a 100755
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,5 @@ build/*
 bx_enh_dbg.ini
 stevia-log
 .vscode/
-*.map
\ No newline at end of file
+*.map
+compose-dev.yaml
diff --git a/include/fat32/FAT32_SYS.inc b/include/fat32/FAT32_SYS.inc
index d9bd5ba..ce85716 100644
--- a/include/fat32/FAT32_SYS.inc
+++ b/include/fat32/FAT32_SYS.inc
@@ -47,7 +47,7 @@ InitFATDriver:
     mov bx, dx                                                           ; set bx, should point at our partition
 
     mov eax, dword [bx + PartEntry_t.lba_start]
-    mov dword [fat32_state + FAT32_State_t.active_drive_lba_32], eax
+    mov dword [fat32_state + FAT32_State_t.curr_drive_lba_32], eax
 
     mov ax, fat32_bpb
     mov si, ax
@@ -193,7 +193,7 @@ SearchFATDIR:
 
             mov cx, 0xA                     ; max of 11 filename length of 11 characters
             ; si points to the start of the current directory entry
-            mov di, BootTarget_str          ; current memory location (8.3 name is at offset 0)
+            mov di, BootTarget          ; current memory location (8.3 name is at offset 0)
             repe cmpsb                      ; compare the strings
 
             pop di
diff --git a/src/stage2/stage2.nasm b/src/stage2/stage2.nasm
index d5d6cc6..9d0b0c9 100755
--- a/src/stage2/stage2.nasm
+++ b/src/stage2/stage2.nasm
@@ -169,8 +169,6 @@ main:
     call EnterUnrealMode
     print_string UnrealMode_OK_info
 
-    
-
     ; FAT Driver setup
     call InitFATDriver
     print_string InitFATSYS_OK_info
@@ -401,26 +399,6 @@ BootTarget:
 ; pre-bss init globals (generally const...but there are exceptions)
 ;
 
-align 8, db 0x00
-boot_drive:
-    db 0x00
-
-align 8, db 0x00
-partition_offset:
-    dw 0x0000
-
-align 8, db 0x00
-vbr_fat32_bpb_ptr:
-    dw 0x0000
-
-align 8, db 0x00
-vbr_part_table_ptr:
-    dw 0x0000
-
-;
-; pre-bss init globals (generally const...but there are exceptions)
-;
-
 align 8, db 0x00
 boot_drive:
     db 0x00