Changeset 567 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Device/IDE/IdeTransfer.asm

Timestamp:

May 26, 2014, 1:25:15 PM (10 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/Device/IDE/IdeTransfer.asm (modified) (5 diffs)

trunk/XTIDE_Universal_BIOS/Src/Device/IDE/IdeTransfer.asm

@@ -228 +228 @@
 
     ; Get transfer function based on bus type
-    xchg    ax, bx                              ; Lookup table offset to AX
-    mov     bl, [di+DPT_ATA.bDevice]
+    mov     al, [di+DPT_ATA.bDevice]
+    add     bx, ax
 %ifdef MODULE_8BIT_IDE_ADVANCED
-    mov     dl, bl
-%endif
-    add     bx, ax
+    cmp     al, DEVICE_8BIT_XTCF_DMA
+%endif
     mov     ax, [cs:bx]                         ; Load offset to transfer function
     mov     [bp+PIOVARS.fnXfer], ax
@@ -239 +238 @@
     ; Normalize pointer for PIO-transfers and convert to physical address for DMA transfers
 %ifdef MODULE_8BIT_IDE_ADVANCED
-    cmp     dl, DEVICE_8BIT_XTCF_DMA
     jb      SHORT IdeTransfer_NormalizePointerInESSI
 
     ; Convert ES:SI to physical address
-%ifdef USE_186          ; Bytes EU Cycles(286)
+%ifdef USE_186
+                        ; Bytes EU Cycles(286)
     mov     ax, es      ; 2     2
     rol     ax, 4       ; 3     9
@@ -255 +254 @@
                         ; 18    24
 %else ; 808x
-
-%if 0
                         ; Bytes EU Cycles(808x)
     mov     al, 4       ; 2     4
@@ -279 +276 @@
 ; In other words, we could use a real world test here.
 ;
-%endif ; 0
+%if 0
                         ; Bytes EU Cycles(808x/286)
     xor     dx, dx      ; 2     3/2
@@ -291 +288 @@
     mov     es, dx      ; 2     2/2
     ;------------------------------------
-%endif                  ; 26    29/26
-    clc
-    ret
+                        ; 26    29/26
+%endif ; 0
+%endif
+
+    ret     ; With CF cleared (taken care of by the physical address conversion)
 %endif ; MODULE_8BIT_IDE_ADVANCED
     ; Fall to IdeTransfer_NormalizePointerInESSI if no MODULE_8BIT_IDE_ADVANCED