Changeset 332 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Device

Timestamp:

Mar 12, 2012, 1:33:24 PM (13 years ago)

Author:

krille_n_@…

google:author:

krille_n_@hotmail.com

Message:

Changes:

• Fixed a bug in the new BIOS Drive Information Tool.
• Very small changes to improve speed (I hope).
• Changed AH48h_GetExtendedDriveParameters.asm to allow AT builds with USE_386 (won't affect any other builds).
• Verified that most define combinations can be built and changed Strings.asm accordingly. "Most" meaning with or without any combination of EBIOS and/or Serial code defines.

Location:

trunk/XTIDE_Universal_BIOS/Src/Device/IDE

Files:

• IdeError.asm (modified) (1 diff)
• IdeIO.asm (modified) (3 diffs)

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

@@ -23 +23 @@
 
 %ifndef ASSEMBLE_SHARED_IDE_DEVICE_FUNCTIONS    ; JR-IDE/ISA
-    jmp     ContinueFromMemIdeError     ; What's this supposed to do? *FIXME*
+    jmp     ContinueFromMemIdeError
 %else
 ContinueFromMemIdeError:

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

@@ -6 +6 @@
 
 ;--------------------------------------------------------------------
+; IdeIO_OutputALtoIdeControlBlockRegisterInDL
 ; IdeIO_OutputALtoIdeRegisterInDL
-; IdeIO_OutputALtoIdeControlBlockRegisterInDL
 ;   Parameters:
 ;       AL:     Byte to output
-;       DL:     IDE Register                (IdeIO_OutputALtoIdeRegisterInDL)
-;               IDE Control Block Register  (IdeIO_OutputALtoIdeControlBlockRegisterInDL)
+;       DL:     IDE Control Block Register  (IdeIO_OutputALtoIdeControlBlockRegisterInDL)
+;               IDE Register                (IdeIO_OutputALtoIdeRegisterInDL)
 ;       DS:DI:  Ptr to DPT (in RAMVARS segment)
 ;   Returns:
@@ -19 +19 @@
 ;--------------------------------------------------------------------
 ALIGN JUMP_ALIGN
+IdeIO_OutputALtoIdeControlBlockRegisterInDL:
+    mov     bl, IDEVARS.wPortCtrl
+    SKIP2B  f   ; cmp ax, <next instruction>
+    ; Fall to IdeIO_OutputALtoIdeRegisterInDL
+
 IdeIO_OutputALtoIdeRegisterInDL:
     mov     bl, IDEVARS.wPort
-    SKIP2B  f   ; cmp ax, <next instruction>
-    ; Fall to IdeIO_OutputALtoIdeControlBlockRegisterInDL
-
-IdeIO_OutputALtoIdeControlBlockRegisterInDL:
-    mov     bl, IDEVARS.wPortCtrl
     call    GetPortToDXandTranslateA0andA3ifNecessary
     out     dx, al
@@ -63 +63 @@
 GetPortToDXandTranslateA0andA3ifNecessary:
     xor     bh, bh
+    add     bl, [di+DPT.bIdevarsOffset]     ; CS:BX now points port address
     xor     dh, dh                          ; DX now has IDE register offset
-    add     bl, [di+DPT.bIdevarsOffset]     ; CS:BX now points port address
     add     dx, [cs:bx]
     test    BYTE [di+DPT.bFlagsHigh], FLGH_DPT_REVERSED_A0_AND_A3