Changeset 110 for trunk/bootcode/regular/driveio.asm

Timestamp:

Apr 8, 2017, 12:27:07 AM (8 years ago)

Author:

Ben Rietbroek

Message:

Use the LBA read/write functions in load/save sector [v1.1.1-testing]

CAUTION:
This is a testbuild !
AirBoot uses the BIOS to access disks and a small coding error can trash
partition tables or other vital disk structures. You are advised to make
backups of TRACK0 and EBRs before using this testbuild. More info at:
​https://rousseaux.github.io/netlabs.air-boot/pdf/AirBoot-v1.1.0-manual.pdf

File:

• trunk/bootcode/regular/driveio.asm (modified) (4 diffs)

trunk/bootcode/regular/driveio.asm

@@ -475 +475 @@
 ; #########################################################################
 DriveIO_LoadSector      Proc Near  Uses ax bx cx dx ds si es di
+
         ; Is the drive not a harddrive?
         cmp     dl, 80h
@@ -504 +505 @@
         dec     di
         jnz     DIOLS_ErrorLoop
+
         ; Sector load failed...
         jmp     DriveIO_GotLoadError
 
     DIOLS_UseExtension:
-        push    cx
-        mov     cs:[INT13X_DAP_NumBlocks], 1         ; Copy ONE sector
-        mov     wptr cs:[INT13X_DAP_Transfer+0], si
-        mov     cx, ds
-        mov     wptr cs:[INT13X_DAP_Transfer+2], cx  ; Fill out Transfer Adress
-        mov     wptr cs:[INT13X_DAP_Absolute+0], ax
-        mov     wptr cs:[INT13X_DAP_Absolute+2], bx  ; Fill out Absolute Sector
-        push    cs
-        pop     ds
-        mov     si, offset [INT13X_DAP]
-        mov     ah, 42h                              ; Extended Read
-        int     13h
-        pop     cx
-        jnc     DIOLS_Success
+
+        mov     di, ds                  ; segment for transfer address
+        mov     cx, ax                  ; low word of lba
+        call    DriveIO_ReadSectorLBA   ; extended read
+        jc      DriveIO_GotLoadError    ; halt on error
+
+        ;~ push    cx
+        ;~ mov     cs:[INT13X_DAP_NumBlocks], 1         ; Copy ONE sector
+        ;~ mov     wptr cs:[INT13X_DAP_Transfer+0], si
+        ;~ mov     cx, ds
+        ;~ mov     wptr cs:[INT13X_DAP_Transfer+2], cx  ; Fill out Transfer Adress
+        ;~ mov     wptr cs:[INT13X_DAP_Absolute+0], ax
+        ;~ mov     wptr cs:[INT13X_DAP_Absolute+2], bx  ; Fill out Absolute Sector
+        ;~ push    cs
+        ;~ pop     ds
+        ;~ mov     si, offset [INT13X_DAP]
+        ;~ mov     ah, 42h                              ; Extended Read
+        ;~ int     13h
+        ;~ pop     cx
+        ;~ jnc     DIOLS_Success
+
         ; Sector load failed...
-        jmp     DriveIO_GotLoadError
+        ;~ jmp     DriveIO_GotLoadError
 
     DIOLS_Success:
@@ -893 +902 @@
         cmp     bptr cs:[LBASwitchTable+di], bl
         jbe     DIOSS_UseExtension
+
     DIOSS_UseNormal:
         mov     di, 3
@@ -907 +917 @@
 
     DIOSS_UseExtension:
-        push    cx
-        mov     cs:[INT13X_DAP_NumBlocks], 1         ; Copy ONE sector
-        mov     wptr cs:[INT13X_DAP_Transfer+0], si
-        mov     cx, ds
-        mov     wptr cs:[INT13X_DAP_Transfer+2], cx  ; Fill out Transfer Adress
-        mov     wptr cs:[INT13X_DAP_Absolute+0], ax
-        mov     wptr cs:[INT13X_DAP_Absolute+2], bx  ; Fill out Absolute Sector
-        push    cs
-        pop     ds
-        mov     si, offset [INT13X_DAP]
-        mov     ax, 4300h                            ; Extended Write (No Verify)
-        int     13h
-        pop     cx
-        jnc     DIOSS_Success
-        call    MBR_SaveError
+
+        mov     di, ds                  ; segment for transfer address
+        mov     cx, ax                  ; low word of lba
+        xor     ax, ax                  ; no verify
+        call    DriveIO_WriteSectorLBA  ; extended write
+        jc      MBR_SaveError           ; halt on error
+
+        ;~ push    cx
+        ;~ mov     cs:[INT13X_DAP_NumBlocks], 1         ; Copy ONE sector
+        ;~ mov     wptr cs:[INT13X_DAP_Transfer+0], si
+        ;~ mov     cx, ds
+        ;~ mov     wptr cs:[INT13X_DAP_Transfer+2], cx  ; Fill out Transfer Adress
+        ;~ mov     wptr cs:[INT13X_DAP_Absolute+0], ax
+        ;~ mov     wptr cs:[INT13X_DAP_Absolute+2], bx  ; Fill out Absolute Sector
+        ;~ push    cs
+        ;~ pop     ds
+        ;~ mov     si, offset [INT13X_DAP]
+        ;~ mov     ax, 4300h                            ; Extended Write (No Verify)
+        ;~ int     13h
+        ;~ pop     cx
+        ;~ jnc     DIOSS_Success
+        ;~ call    MBR_SaveError
 
     DIOSS_Success: