Changeset 264 in xtideuniversalbios

Timestamp:

Feb 24, 2012, 11:12:00 AM (13 years ago)

Author:

gregli@…

google:author:

gregli@hotmail.com

Message:

Corrected a bug where the initial pointer to idevars0 was not properly set.

File:

• trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h/AH0h_HReset.asm (modified) (2 diffs)

trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h/AH0h_HReset.asm

@@ -47 +47 @@
         
     call    ResetForeignHardDisks
-    call    AH0h_ResetHardDisksHandledByOurBIOS
+
+    ; Resetting our hard disks will modify dl and bl such that this call must be the last in the list
+    ;
+    call    AH0h_ResetHardDisksHandledByOurBIOS         
+
 .SkipHardDiskReset:
     mov     ah, bh
@@ -141 +145 @@
 ALIGN JUMP_ALIGN
 AH0h_ResetHardDisksHandledByOurBIOS:
-    mov     bl, [di+DPT.bIdevarsOffset]                 ; replace drive number with Idevars pointer for comparisons
+    mov     bl, [di+DPT.bIdevarsOffset]                 ; replace drive number with Idevars pointer for cmp with dl
+    mov     dl, ROMVARS.ideVars0                        ; starting Idevars offset
+
     mov     cl, [cs:ROMVARS.bIdeCnt]                    ; get count of ide controllers
-    mov     ch, 0                                       
-    mov     dl, 0                                       ; starting Idevars offset
-    mov     si, IterateFindFirstDPTforIdevars           ; iteration routine
+    mov     ch, 0
+    jcxz    .done                                       ; just in case bIdeCnt is zero (shouldn't be)
+
+    mov     si, IterateFindFirstDPTforIdevars           ; iteration routine (see below)
+
 .loop:
     call    IterateAllDPTs                              ; look for the first drive on this controller, if any
     jc      .notFound
+
     call    AHDh_ResetDrive                             ; reset master and slave on that controller
-    call    BackupErrorCodeFromTheRequestedDriveToBH    ; save error code if same controller as initial request
+    call    BackupErrorCodeFromTheRequestedDriveToBH    ; save error code if same controller as drive from entry
+
 .notFound:
-    add     dl, IDEVARS_size                            ; move pointer forward
-    loop    .loop                                       ; and repeat
+    add     dl, IDEVARS_size                            ; move Idevars pointer forward
+    loop    .loop
+
+.done:
     ret