Changeset 316 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS

Timestamp:

Mar 11, 2012, 3:56:34 AM (13 years ago)

Author:

gregli@…

google:author:

gregli@hotmail.com

Message:

Fixed a bug with ah0h/reset of a serial drive that was found during COM detect.

Location:

trunk/XTIDE_Universal_BIOS

Files:

• Inc/RomVars.inc (modified) (2 diffs)
• Src/Handlers/Int13h/AH0h_HReset.asm (modified) (1 diff)

trunk/XTIDE_Universal_BIOS/Inc/RomVars.inc

@@ -24 +24 @@
     .bStealSize         resb    1   ; Number of 1kB blocks stolen from 640kB base RAM
 
+    .ideVarsBegin:
     .ideVars0           resb    IDEVARS_size
     .ideVars1           resb    IDEVARS_size
@@ -32 +33 @@
     .ideVarsSerialAuto  resb    IDEVARS_size
 %endif
+
+    .ideVarsEnd:
 endstruc
+
+%ifndef CHECK_FOR_UNUSED_ENTRYPOINTS
+    %if ROMVARS.ideVarsEnd & 0xff00 <> 0
+        %error ".ideVars structures must fit within the first 256 bytes of the ROM image"
+    %endif
+    %if (ROMVARS.ideVarsEnd - ROMVARS.ideVarsBegin) = 0
+        %error "there must be at lesat one .ideVars structure, it would be bizarre if this were not true, but it is assumed in the ah0h reset code."
+    %endif
+%endif
 
 ; Bit defines for ROMVARS.wFlags

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

@@ -158 +158 @@
     mov     dl, ROMVARS.ideVars0                        ; starting Idevars offset
 
-    call    RamVars_GetIdeControllerCountToCX           ; get count of ide controllers
-    jcxz    .done                                       ; just in case bIdeCnt is zero (shouldn't be)
+    ; Get count of ALL Idevars structures, not just the ones that are configured.  This may seem odd, 
+    ; but it catches the .ideVarsSerialAuto structure, which would not be scanned if the count from
+    ; RamVars_GetIdeControllerCountToCX was used.  Unused controllers won't make a difference, since no DPT
+    ; will point to them.  Performance isn't an issue, as this is a reset operation.
+    ;
+    mov     cx, (ROMVARS.ideVarsEnd - ROMVARS.ideVarsBegin) / IDEVARS_size
+
 .loop:
     call    FindDPT_ForIdevarsOffsetInDL                ; look for the first drive on this controller, if any