Changeset 412 in xtideuniversalbios for trunk

Timestamp:

Apr 28, 2012, 4:08:03 PM (13 years ago)

Author:

krille_n_@…

google:author:

krille_n_@hotmail.com

Message:

Changes:

• Minor optimizations to the JR-IDE/ISA code.
• Some cleanups (the MemoryMappedIDE folder and Bootmenu_SwapDrives.txt were deleted).

Location:

trunk

Files:

• XTIDE_Universal_BIOS/Src/Device/IDE/IdeIO.asm (modified) (7 diffs)
• XTIDE_Universal_BIOS/Src/Device/IDE/JrIdeTransfer.asm (modified) (8 diffs)
• XTIDE_Universal_BIOS/Src/Device/MemoryMappedIDE (deleted)
• XTIDE_Universal_BIOS_Configurator_v2/Inc/Help/Bootmenu_SwapDrives.txt (deleted)

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

@@ -3 +3 @@
 
 ;
-; XTIDE Universal BIOS and Associated Tools 
+; XTIDE Universal BIOS and Associated Tools
 ; Copyright (C) 2009-2010 by Tomi Tilli, 2011-2012 by XTIDE Universal BIOS Team.
 ;
@@ -10 +10 @@
 ; the Free Software Foundation; either version 2 of the License, or
 ; (at your option) any later version.
-; 
+;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-; GNU General Public License for more details.      
+; GNU General Public License for more details.
 ; Visit http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
-;       
+;
 
 ; Section containing code
@@ -42 +42 @@
     jmp     SHORT OutputToJrIdeRegister
 .OutputToIoMappedIde:
-%endif
-%endif
+%endif  ; MODULE_JRIDE
+%endif  ; MODULE_8BIT_IDE
 
     mov     bl, IDEVARS.wPortCtrl
@@ -68 +68 @@
     jnz     SHORT OutputALtoIOmappedIdeRegisterInDL
 
+%if JRIDE_COMMAND_BLOCK_REGISTER_WINDOW_OFFSET & 0FFh = 0
+    mov     dh, JRIDE_COMMAND_BLOCK_REGISTER_WINDOW_OFFSET >> 8
+%else
     add     dx, JRIDE_COMMAND_BLOCK_REGISTER_WINDOW_OFFSET
+%endif
 OutputToJrIdeRegister:
     mov     bx, dx
@@ -75 +79 @@
 ALIGN JUMP_ALIGN
 OutputALtoIOmappedIdeRegisterInDL:
-%endif
-%endif
+%endif  ; MODULE_JRIDE
+%endif  ; MODULE_8BIT_IDE
 
     mov     bl, IDEVARS.wPort
@@ -116 +120 @@
     jnz     SHORT .InputToALfromIOmappedIdeRegisterInDL
 
+%if JRIDE_COMMAND_BLOCK_REGISTER_WINDOW_OFFSET & 0FFh = 0
+    mov     dh, JRIDE_COMMAND_BLOCK_REGISTER_WINDOW_OFFSET >> 8
+%else
     add     dx, JRIDE_COMMAND_BLOCK_REGISTER_WINDOW_OFFSET
+%endif
     mov     bx, dx
     mov     al, [cs:bx]
     ret
 .InputToALfromIOmappedIdeRegisterInDL:
-%endif
-%endif
+%endif  ; MODULE_JRIDE
+%endif  ; MODULE_8BIT_IDE
     mov     bl, IDEVARS.wPort
     call    GetIdePortToDX
@@ -172 +180 @@
 %else   ; Only standard IDE devices
     xor     bh, bh
+    add     bl, [di+DPT.bIdevarsOffset]         ; CS:BX now points port address
     xor     dh, dh
-    add     bl, [di+DPT.bIdevarsOffset]     ; CS:BX now points port address
-    add     dx, [cs:bx]                     ; DX now has port address
+    add     dx, [cs:bx]                         ; DX now has port address
     ret
 %endif

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

@@ -3 +3 @@
 
 ;
-; XTIDE Universal BIOS and Associated Tools 
+; XTIDE Universal BIOS and Associated Tools
 ; Copyright (C) 2009-2010 by Tomi Tilli, 2011-2012 by XTIDE Universal BIOS Team.
 ;
@@ -10 +10 @@
 ; the Free Software Foundation; either version 2 of the License, or
 ; (at your option) any later version.
-; 
+;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-; GNU General Public License for more details.      
+; GNU General Public License for more details.
 ; Visit http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
-;               
+;
 
 ; Structure containing variables for PIO transfer functions.
@@ -93 +93 @@
 
     mov     cx, [bp+MEMPIOVARS.wSectorsInBlock]
-
-ALIGN JUMP_ALIGN
-.ReadNextBlockFromDrive:
     cmp     [bp+MEMPIOVARS.bSectorsLeft], cl
     jbe     SHORT .ReadLastBlockFromDrive
+
+ALIGN JUMP_ALIGN
+.ReadNextBlockFromDrive:
     call    ReadSingleBlockFromSectorAccessWindowInDSSItoESDI
     call    WaitUntilReadyToTransferNextBlock
@@ -104 +104 @@
     ; Increment number of successfully read sectors
     mov     cx, [bp+MEMPIOVARS.wSectorsInBlock]
+    add     [bp+MEMPIOVARS.bSectorsDone], cl
     sub     [bp+MEMPIOVARS.bSectorsLeft], cl
-    add     [bp+MEMPIOVARS.bSectorsDone], cl
-    jmp     SHORT .ReadNextBlockFromDrive
+    ja      SHORT .ReadNextBlockFromDrive
 
 ALIGN JUMP_ALIGN
@@ -123 +123 @@
     lds     di, [bp+MEMPIOVARS.fpDPT]           ; DPT now in DS:DI
 %ifdef USE_386
-    movzx   cx, BYTE [bp+MEMPIOVARS.bSectorsDone]
+    movzx   cx, [bp+MEMPIOVARS.bSectorsDone]
 %else
     mov     ch, 0
@@ -158 +158 @@
 
     mov     cx, [bp+MEMPIOVARS.wSectorsInBlock]
-
-ALIGN JUMP_ALIGN
-.WriteNextBlockToDrive:
     cmp     [bp+MEMPIOVARS.bSectorsLeft], cl
     jbe     SHORT .WriteLastBlockToDrive
+
+ALIGN JUMP_ALIGN
+.WriteNextBlockToDrive:
     call    WriteSingleBlockFromDSSIToSectorAccessWindowInESDI
     call    WaitUntilReadyToTransferNextBlock
@@ -169 +169 @@
     ; Increment number of successfully written WORDs
     mov     cx, [bp+MEMPIOVARS.wSectorsInBlock]
+    add     [bp+MEMPIOVARS.bSectorsDone], cl
     sub     [bp+MEMPIOVARS.bSectorsLeft], cl
-    add     [bp+MEMPIOVARS.bSectorsDone], cl
-    jmp     SHORT .WriteNextBlockToDrive
+    ja      SHORT .WriteNextBlockToDrive
 
 ALIGN JUMP_ALIGN
@@ -255 +255 @@
 
 %if JRIDE_SECTOR_ACCESS_WINDOW_SIZE <> 512
-    %error "JRIDE_SECTOR_ACCESS_WINDOW_SIZE is no longer equal to 512. MemIdeTransfer.asm needs changes."
+    %error "JRIDE_SECTOR_ACCESS_WINDOW_SIZE is no longer equal to 512. JrIdeTransfer.asm needs changes."
 %endif