Changeset 370 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Initialization

Timestamp:

Mar 29, 2012, 4:40:50 PM (13 years ago)

Author:

krille_n_@…

google:author:

krille_n_@hotmail.com

Message:

Changes:

• Added some missing PIO mode timings to ATA_ID.inc (based on info from ​http://www.singlix.net/specs/cfspc4_0.pdf)
• Updated Configuration_FullMode.txt but it may need additional changes as the Tandy info doesn't match the wiki.
• Optimizations.
• Excluded some unused code from XTIDECFG.

Location:

trunk/XTIDE_Universal_BIOS/Src/Initialization

Files:

• AdvAtaInit.asm (modified) (1 diff)
• AtaID.asm (modified) (2 diffs)
• Vision.asm (modified) (2 diffs)

trunk/XTIDE_Universal_BIOS/Src/Initialization/AdvAtaInit.asm

@@ -114 +114 @@
 ;--------------------------------------------------------------------
 AdvAtaInit_SelectSlowestCommonPioTimingsToBXandCXfromDSSIandDSDI:
-    eMOVZX  bx, BYTE [di+DPT_ADVANCED_ATA.bPioMode]
+    eMOVZX  bx, [di+DPT_ADVANCED_ATA.bPioMode]
     mov     cx, [di+DPT_ADVANCED_ATA.wMinPioCycleTime]
     test    si, si

trunk/XTIDE_Universal_BIOS/Src/Initialization/AtaID.asm

@@ -89 +89 @@
     ; Get PIO mode and cycle time for PIO 0...2
     mov     bx, [es:si+ATA1.bPioMode]
+    mov     ax, bx                  ; AH = 0, AL = PIO mode 0, 1 or 2
     shl     bx, 1                   ; Shift for WORD lookup
     mov     cx, [cs:bx+.rgwPio0to2CycleTimeInNanosecs]
-    shr     bx, 1
-    xchg    ax, bx                  ; AH = 0, AL = PIO mode 0, 1 or 2
 
     ; Check if IORDY is supported
@@ -105 +104 @@
     ; Get Advanced PIO mode
     ; (Hard Disks supports up to 4 but CF cards can support 5 and 6)
-    mov     bx, [es:si+ATA2.bPIOSupp]
+    mov     bl, [es:si+ATA2.bPIOSupp]
 .CheckNextFlag:
     inc     ax
-    shr     bx, 1
+    shr     bl, 1
     jnz     SHORT .CheckNextFlag
     MIN_U   al, 6                       ; Make sure not above lookup tables

trunk/XTIDE_Universal_BIOS/Src/Initialization/Vision.asm

@@ -45 +45 @@
 IsConfigRegisterWithIDinAL:
     mov     ah, al
-    and     ah, MASK_QDCONFIG_CONTROLLER_ID
-    cmp     ah, ID_QD6500 << 4
+    and     al, MASK_QDCONFIG_CONTROLLER_ID
+    cmp     al, ID_QD6500 << 4
     je      SHORT VisionControllerDetected
-    cmp     ah, ID_QD6580 << 4
+    cmp     al, ID_QD6580 << 4
     je      SHORT VisionControllerDetected
-    cmp     ah, ID_QD6580_ALTERNATE << 4
+    cmp     al, ID_QD6580_ALTERNATE << 4
 VisionControllerDetected:
+    xchg    ah, al
     ret
 
@@ -175 +176 @@
     mov     bp, QD6500_MAX_ACTIVE_TIME_CLOCKS | (QD6500_MIN_ACTIVE_TIME_CLOCKS << 8)
 
-    ; We need the PIO Cycle Time in CX to calculate Active and Recovery Times. 
+    ; We need the PIO Cycle Time in CX to calculate Active and Recovery Times.
 .CalculateTimingsForQD65xx:
     call    AdvAtaInit_SelectSlowestCommonPioTimingsToBXandCXfromDSSIandDSDI