Changeset 558 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/VariablesAndDPTs/CreateDPT.asm

Timestamp:

Jun 23, 2013, 3:52:31 PM (11 years ago)

Author:

krille_n_@…

google:author:

krille_n_@hotmail.com

Message:

Changes:

• Building the BIOS Drive Information Tool now works again.
• Moved all XT-CF related code to MODULE_8BIT_IDE_ADVANCED. I don't see how an XT-CF card could work without *_ADVANCED anyway but if I'm wrong, feel free to undo this. Note! The autodetection code in XTIDECFG has NOT been changed to reflect this (still relies on MODULE_8BIT_IDE).
• Optimizations and fixes in general.

File:

• trunk/XTIDE_Universal_BIOS/Src/VariablesAndDPTs/CreateDPT.asm (modified) (5 diffs)

trunk/XTIDE_Universal_BIOS/Src/VariablesAndDPTs/CreateDPT.asm

@@ -34 +34 @@
 ;       ES:     BDA Segment
 ;   Returns:
-;       DS:DI:  Ptr to Disk Parameter Table (if successful)
-;       CF:     Cleared if DPT created successfully
-;               Set if any error
+;       DS:DI:  Ptr to Disk Parameter Table
+;       CF:     Cleared
 ;   Corrupts registers:
 ;       AX, BX, CX, DX
@@ -167 +166 @@
     xor     bx, bx
     jmp     SHORT .StoreTotalSectorsFromBXDXAX
-    ; Fall to .StoreNumberOfLbaSectors
+
 
 ;--------------------------------------------------------------------
@@ -209 +208 @@
 ; Update drive counts (hard and floppy)
 ;----------------------------------------------------------------------
-
+%ifdef MODULE_SERIAL
+; Device_FinalizeDPT returns with CF set only when a floppy was found which can't happen without MODULE_SERIAL
 %ifdef MODULE_SERIAL_FLOPPY
 ;
@@ -224 +224 @@
     adc     byte [RAMVARS.xlateVars+XLATEVARS.bFlopCreateCnt], 0
     jnz     .AllDone
-%else
+%else ; ~MODULE_SERIAL_FLOPPY
 ;
 ; Even without floppy support enabled, we shouldn't try to mount a floppy image as a hard disk, which
@@ -231 +231 @@
 ;
     jc      .AllDone
-%endif
+%endif ; MODULE_SERIAL_FLOPPY
+%endif ; MODULE_SERIAL
 
     inc     BYTE [RAMVARS.bDrvCnt]      ; Increment drive count to RAMVARS
 
+%ifdef MODULE_SERIAL
 .AllDone:
     clc
+%endif
+
     ret