Changeset 567 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Initialization/DetectDrives.asm

Timestamp:

May 26, 2014, 1:25:15 PM (11 years ago)

Author:

krille_n_@…

google:author:

krille_n_@hotmail.com

Message:

Changes:

• Renamed MODULE_FEATURE_SETS to MODULE_POWER_MANAGEMENT.
• Renamed MODULE_VERY_LATE_INITIALIZATION to MODULE_VERY_LATE_INIT and removed it from the official builds.
• Removed the code that skips detection of slave drives on XT-CF controllers since slave drives can be used with Lo-tech ISA CompactFlash boards.
• Added autodetection of the SVC ADP50L controller to XTIDECFG.
• The autodetection of XT-CF controllers now requires MODULE_8BIT_IDE_ADVANCED in the loaded BIOS.
• Fixed a bug in XTIDECFG from r502 where the "Base (cmd block) address" menu option would be displayed when a serial device was selected as the IDE controller.
• XTIDECFG would display the "Enable interrupt" menu option for the XTIDE r1 but not for the XTIDE r2. It's now displayed for both controller types.
• Disabled the "Internal Write Cache" menu option in the Master/Slave Drive menus for serial device type drives.
• Optimizations and other fixes.

File:

• trunk/XTIDE_Universal_BIOS/Src/Initialization/DetectDrives.asm (modified) (6 diffs)

trunk/XTIDE_Universal_BIOS/Src/Initialization/DetectDrives.asm

@@ -62 +62 @@
 ; if serial drive detected, do not scan (avoids duplicate drives and isn't needed - we already have a connection)
 ;
-    call    FindDPT_ToDSDIforSerialDevice   ; does not modify AX
+    call    FindDPT_ToDSDIforSerialDevice   ; Does not modify AX
     jnc     .AddHardDisks
 
@@ -68 +68 @@
 
 %ifdef MODULE_HOTKEYS
-    cmp     al, COM_DETECT_HOTKEY_SCANCODE  ; Set by last call to HotkeyBar_UpdateDuringDriveDetection above
+    cmp     al, COM_DETECT_HOTKEY_SCANCODE  ; Set by last call to HotkeyBar_UpdateDuringDriveDetection above
     je      .DriveDetectLoop
 %endif
@@ -134 +134 @@
     mov     [RAMVARS.xlateVars+XLATEVARS.bFlopCntAndFirst], al
 %endif
-
-%ifdef MODULE_8BIT_IDE_ADVANCED
-NoSlaveDriveAvailable:
-%endif
     ret
 
@@ -156 +152 @@
 ;       ES:     Zero (BDA segment)
 ;   Returns:
-;       Nothing
+;       Nothing
 ;   Corrupts registers:
 ;       AX, BL, CX, DX, SI, DI
 ;--------------------------------------------------------------------
 StartDetectionWithDriveSelectByteInBHandStringInCX:
-%ifdef MODULE_8BIT_IDE_ADVANCED
-    mov     al, [cs:bp+IDEVARS.bDevice]
-    cmp     al, DEVICE_8BIT_XTCF_PIO8
-    jb      SHORT .DoNotSkipSlaveDriveDetection
-    cmp     al, DEVICE_8BIT_XTCF_DMA
-    ja      SHORT .DoNotSkipSlaveDriveDetection
-
-    ; XT-CF do not support slave drives so skip detection
-    test    bh, FLG_DRVNHEAD_DRV
-    jnz     SHORT NoSlaveDriveAvailable
-.DoNotSkipSlaveDriveDetection:
-%endif ; MODULE_8BIT_IDE_ADVANCED
-
     call    DetectPrint_StartDetectWithMasterOrSlaveStringInCXandIdeVarsInCSBP
 
@@ -221 +204 @@
 ;       Nothing
 ;   Returns:
-;       CF:     Set (from DetectPrint_NullTerminatedStringFromCSSIandSetCF)
+;       CF:     Set (from DetectPrint_NullTerminatedStringFromCSSIandSetCF)
 ;   Corrupts registers:
 ;       AX, SI
@@ -248 +231 @@
     call    AtaID_VerifyFromESSI
     pop     bx
-    jc      SHORT DetectDrives_DriveNotFound
+    jnz     SHORT DetectDrives_DriveNotFound
     call    CreateDPT_FromAtaInformation
     jc      SHORT DetectDrives_DriveNotFound