Changeset 592 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Initialization/AtaID.asm

Timestamp:

Jun 25, 2018, 10:29:27 PM (7 years ago)

Author:

Krister Nordvall

Message:

Changes:

• The problem with NASM in the previous revision (r591) has been fixed.
• The colors used by the boot menu and hotkey bar can now be customized by selecting one of a number of pre-defined color themes. Suggestions for additional themes are more than welcome!
• Large builds are now 10 KB. Small builds are still 8 KB with the exception of the Tiny build which is now 4 KB. In other words, builds are now as small as possible to make it easier to combine them with other BIOSes.
• Added code to the library to improve drive error handling. XTIDECFG can now handle "Drive Not Ready" errors.
• Fixed a couple of potential bugs in AtaID.asm (AtaID_GetMaxPioModeToAXandMinCycleTimeToCX); 1) ATA1.bPioMode was treated as a WORD variable. 2) ATA2.bPIOSupp was assumed to be non-zero which would result in PIO mode 3 being returned if the assumption was wrong.
• Made the same changes in the equivalent function used by BIOSDRVS (DisplayPioModeInformationUsingAtaInfoFromDSBX in AtaInfo.asm).
• Fixed a bug from r587 in PDC20x30.asm in PDC20x30_GetMaxPioModeToALandMinPioCycleTimeToBX.
• Fixed a bug from r523 in XTIDECFG where Auto Configure would only set the IRQ on one IDE interface on AT-builds.
• XTIDECFG will now restore the default settings for the "Serial port virtual device" when reselecting it in the list of device types. This makes it behave consistently for all device types.
• The eAAM macro is now used regardless if USE_UNDOC_INTEL is defined or not because it is apparently supported on all processors including the NEC V20/V30 CPUs.
• Renamed the EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS define to EXCLUDE_FROM_XUB.
• Added a define to exclude unused library code from BIOSDRVS (EXCLUDE_FROM_BIOSDRVS). This makes it a lot smaller than in previous revisions.
• All unnecessary CLD-instructions are now under a new define 'CLD_NEEDED' which is only enabled for the BIOS. It is disabled for XTIDECFG and BIOSDRVS but can be enabled if needed by adding this define to the respective makefile. This change was made because these unnecessary instructions are wasteful and should never be needed. In fact, they only serve to hide bugs (in other peoples code) which I strongly believe should be avoided. I recommend people making their own BIOSes from source to not use this define as it's extremely unlikely to be needed.
• Updated the copyright info in SerDrive and changed an URL to point to the new site.
• Updated the copyright info and version number in BIOSDRVS.
• Updated the copyright info in XTIDECFG.
• Optimizations in general.

File:

• trunk/XTIDE_Universal_BIOS/Src/Initialization/AtaID.asm (modified) (7 diffs)

trunk/XTIDE_Universal_BIOS/Src/Initialization/AtaID.asm

@@ -104 +104 @@
 ;       DX:     User defined P-CHS to L-CHS translate mode
 ;   Corrupts registers:
-;       AX, BX, CX
+;       AX, BX
 ;--------------------------------------------------------------------
 AtaID_ModifyESSIforUserDefinedLimitsAndReturnTranslateModeInDX:
@@ -113 +113 @@
     pop     ds
 
-    ; Load User Defined CHS or LBA to CX:AX
-    mov     dx, [bx+DRVPARAMS.wFlags]
+    ; Load User Defined CHS or LBA to BX:AX
+    mov     dl, [bx+DRVPARAMS.wFlags]           ; Only load the flags we actually need
     mov     ax, [bx+DRVPARAMS.wCylinders]       ; Or .dwMaximumLBA
-    mov     cx, [bx+DRVPARAMS.wHeadsAndSectors] ; Or .dwMaximumLBA+2
+    mov     bx, [bx+DRVPARAMS.wHeadsAndSectors] ; Or .dwMaximumLBA+2
 
     push    es
@@ -127 +127 @@
     ; Apply new CHS and disable LBA (we also want to set CHS addressing)
     mov     [si+ATA1.wCylCnt], ax
-    eMOVZX  ax, cl
+    eMOVZX  ax, bl
     mov     [si+ATA1.wHeadCnt], ax
-    mov     al, ch
+    mov     al, bh
     mov     [si+ATA1.wSPT], ax
     and     BYTE [si+ATA1.wCaps+1], ~(A1_wCaps_LBA>>8)
@@ -140 +140 @@
 
     ; Apply new LBA and disable LBA48
-    cmp     cx, [si+ATA1.dwLBACnt+2]
+    cmp     bx, [si+ATA1.dwLBACnt+2]
     ja      SHORT .NoUserDefinedLBA     ; Do not set larger than drive
     jb      SHORT .StoreNewLBA
@@ -147 +147 @@
 .StoreNewLBA:
     mov     [si+ATA1.dwLBACnt], ax
-    mov     [si+ATA1.dwLBACnt+2], cx
+    mov     [si+ATA1.dwLBACnt+2], bx
     and     BYTE [si+ATA6.wSetSup83+1], ~(A6_wSetSup83_LBA48>>8)
 .NoUserDefinedLBA:
@@ -173 +173 @@
 AtaID_GetMaxPioModeToAXandMinCycleTimeToCX:
     ; 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
-    eSHL_IM bx, 1                   ; Shift for WORD lookup
+%ifdef USE_386
+    movzx   ax, [es:si+ATA1.bPioMode]   ; AH = 0, AL = PIO mode 0, 1 or 2
+%else
+    mov     al, [es:si+ATA1.bPioMode]
+    cbw
+%endif
+    mov     bx, ax
+    eSHL_IM bx, 1                       ; Shift for WORD lookup
     mov     cx, [cs:bx+.rgwPio0to2CycleTimeInNanosecs]
 
     ; Check if IORDY is supported
     test    BYTE [es:si+ATA2.wCaps+1], A2_wCaps_IORDY >> 8
-    jz      SHORT .ReturnPioTimings ; No PIO 3 or higher if no IORDY
-    mov     ah, FLGH_DPT_IORDY
+    jz      SHORT .ReturnPioTimings     ; No PIO 3 or higher if no IORDY
+    mov     ah, FLGH_DPT_IORDY          ; *FIXME* Actually, CF specification v4.1 says that use of IORDY is invalid for PIO modes 5 and 6.
 
     ; Check if Advanced PIO modes are supported (3 and above)
@@ -187 +192 @@
     jz      SHORT .ReturnPioTimings
 
-    ; Get Advanced PIO mode
-    ; (Hard Disks supports up to 4 but CF cards can support 5 and 6)
-    mov     bl, [es:si+ATA2.bPIOSupp]
+    ; Get Advanced PIO mode (Hard Disks supports up to 4 but CF cards can support 5 and 6)
+    or      bh, [es:si+ATA2.bPIOSupp]
+    jz      SHORT .ReturnPioTimings
 .CheckNextFlag:
     inc     ax
-    shr     bl, 1
+    shr     bh, 1
     jnz     SHORT .CheckNextFlag
     MIN_U   al, 6                       ; Make sure not above lookup tables