Changeset 262 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Inc

Timestamp:

Feb 24, 2012, 10:28:31 AM (13 years ago)

Author:

gregli@…

google:author:

gregli@hotmail.com

Message:

More optimizations. Merged RamVars_IsFunction/DriveHandledByThisBIOS in with FindDPT_ForDriveNumber, since they are often used together, making a returned NULL DI pointer indicate a foreign drive in many places. Revamped the iteration done in the handlers for int13/0dh and int13h/0h. Added serial specific print string during drive detection.

File:

• trunk/XTIDE_Universal_BIOS/Inc/RamVars.inc (modified) (4 diffs)

trunk/XTIDE_Universal_BIOS/Inc/RamVars.inc

@@ -10 +10 @@
 ; Variables for translating drive numbers.
 struc XLATEVARS
-    .wFDandHDswap:
-    .bFDSwap            resb    1   ; Floppy Drive to swap to 00h and vice versa
-    .bHDSwap            resb    1   ; Hard Drive to swap to 80h and vice versa
-    .bXlatedDrv         resb    1   ; Drive number after translation
 %ifdef MODULE_SERIAL_FLOPPY
     .bFlopCreateCnt:
@@ -23 +19 @@
                         resb    1   ; alignment
 %endif
+    .bXlatedDrv         resb    1   ; Drive number after translation
+    .wFDandHDswap:
+    .bFDSwap            resb    1   ; Floppy Drive to swap to 00h and vice versa
+    .bHDSwap            resb    1   ; Hard Drive to swap to 80h and vice versa
 endstruc
 
@@ -36 +36 @@
     .wDrvCntAndFirst:
     .bFirstDrv          resb    1   ; Number of first drive for this BIOS
+    .wDrvCntAndFlopCnt:             ; Both the hard disk and floppy counts in one word
+                                    ; (yes, misaligned, but it is only used this way during initialization)
     .bDrvCnt            resb    1   ; Number of drives handled by this BIOS
 
@@ -41 +43 @@
     .xlateVars      resb    XLATEVARS_size
 endstruc
+
+%ifdef MODULE_SERIAL_FLOPPY
+  %ifndef CHECK_FOR_UNUSED_ENTRYPOINTS
+    %if RAMVARS.xlateVars != RAMVARS.bDrvCnt+1 || XLATEVARS.bFlopCreateCnt != 0
+        %error "bFlopCreateCnt needs to be the first thing in XLATEVARS, and .xlateVars needs to come immediately after .bDrvCnt.  In at least one place, we read .wDrvCntAndFlopCnt to get both counts in one fetch"
+    %endif
+  %endif
+%endif
 
 RAMVARS_SIGNATURE       EQU "Xu"    ; RAMVARS signature for .wSignature