Changeset 505 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Device/IDE

Timestamp:

Feb 25, 2013, 4:23:09 PM (12 years ago)

Author:

krille_n_@…

google:author:

krille_n_@hotmail.com

Message:

Changes:

• Reverted the changes to MenuEvents.inc done in r492 since they broke the F1 key function in XTIDECFG.
• Added a tail-call optimized variant of the CALL_DISPLAY_LIBRARY macro (JMP_DISPLAY_LIBRARY).
• Put a block size limit in AH1Eh_ChangeXTCFmodeBasedOnControlRegisterInAL. I think it's needed but if not, it's easy to remove.
• Other optimizations and fixes.

File:

• trunk/XTIDE_Universal_BIOS/Src/Device/IDE/IdeIO.asm (modified) (7 diffs)

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

@@ -56 +56 @@
     mov     al, [di+DPT_ATA.bDevice]
     cmp     al, DEVICE_8BIT_XTIDE_REV2
+    jb      SHORT .InputToALfromRegisterInDX    ; Standard IDE controllers and XTIDE rev 1
+
+%ifdef MODULE_8BIT_IDE_ADVANCED
     je      SHORT .ReverseA0andA3fromRegisterIndexInDX
-    jb      SHORT .InputToALfromRegisterInDX    ; Standard IDE controllers and XTIDE rev 1
-        
-%ifdef MODULE_8BIT_IDE_ADVANCED
+
     cmp     al, DEVICE_8BIT_JRIDE_ISA
     jne     SHORT .ShlRegisterIndexInDX         ; All XT-CF modes
@@ -71 +72 @@
     ret
 %endif
-        
+
 .ReverseA0andA3fromRegisterIndexInDX:
     mov     dl, [cs:bx+g_rgbSwapA0andA3fromIdeRegisterIndex]
@@ -77 +78 @@
 
 .ShlRegisterIndexInDX:
-    shl     dx, 1
+    eSHL_IM dx, 1
     ; Fall to .InputToALfromRegisterInDX
 
@@ -102 +103 @@
     mov     bl, [di+DPT_ATA.bDevice]
     cmp     bl, DEVICE_8BIT_XTIDE_REV2
+    jb      SHORT .OutputALtoControlBlockRegisterInDX   ; Standard IDE controllers and XTIDE rev 1
+
+%ifdef MODULE_8BIT_IDE_ADVANCED
     je      SHORT .ReverseA0andA3fromRegisterIndexInDX
-    jb      SHORT .OutputALtoControlBlockRegisterInDX   ; Standard IDE controllers and XTIDE rev 1
-
-%ifdef MODULE_8BIT_IDE_ADVANCED
+
     cmp     bl, DEVICE_8BIT_JRIDE_ISA
     jne     SHORT .ShlRegisterIndexInDX     ; All XT-CF modes
@@ -125 +127 @@
 
 .ShlRegisterIndexInDX:
-    shl     dx, 1
+    eSHL_IM dx, 1
     add     dx, BYTE XTCF_CONTROL_BLOCK_OFFSET
     jmp     SHORT OutputALtoRegisterInDX
@@ -152 +154 @@
     mov     bl, [di+DPT_ATA.bDevice]
     cmp     bl, DEVICE_8BIT_XTIDE_REV2
+    jb      SHORT OutputALtoRegisterInDX    ; Standard IDE controllers and XTIDE rev 1
+
+%ifdef MODULE_8BIT_IDE_ADVANCED
     je      SHORT .ReverseA0andA3fromRegisterIndexInDX
-    jb      SHORT OutputALtoRegisterInDX    ; Standard IDE controllers and XTIDE rev 1
-
-%ifdef MODULE_8BIT_IDE_ADVANCED
+
     cmp     bl, DEVICE_8BIT_JRIDE_ISA
     jne     SHORT .ShlRegisterIndexInDX     ; All XT-CF modes
@@ -177 +180 @@
 
 .ShlRegisterIndexInDX:
-    shl     dx, 1
+    eSHL_IM dx, 1
     ; Fall to OutputALtoRegisterInDX