Changeset 266 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Device/IDE/IdeCommand.asm

Timestamp:

Feb 24, 2012, 3:06:16 PM (13 years ago)

Author:

aitotat@…

google:author:

aitotat@gmail.com

Message:

Changes to XTIDE Universal BIOS:

• Some fixes for JR-IDE/ISA code (still not working).

File:

• trunk/XTIDE_Universal_BIOS/Src/Device/IDE/IdeCommand.asm (modified) (6 diffs)

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

@@ -56 +56 @@
     mov     [di+DPT.bIdevarsOffset], bp
     mov     BYTE [di+DPT_ATA.bSetBlock], 1  ; Block = 1 sector
+%ifdef ASSEMBLE_SHARED_IDE_DEVICE_FUNCTIONS
     call    IdeDPT_StoreReversedAddressLinesFlagIfNecessary
+%endif
 
     ; Wait until drive motors have reached max speed
@@ -108 +110 @@
     ; Output Device Control Byte to enable or disable interrupts
     mov     al, [bp+IDEPACK.bDeviceControl]
+%ifdef ASSEMBLE_SHARED_IDE_DEVICE_FUNCTIONS ; JR-IDE/ISA
     test    al, FLG_DEVCONTROL_nIEN ; Interrupts disabled?
     jnz     SHORT .DoNotSetInterruptInServiceFlag
@@ -118 +121 @@
     pop     ds
 .DoNotSetInterruptInServiceFlag:
+%endif
     OUTPUT_AL_TO_IDE_CONTROL_BLOCK_REGISTER DEVICE_CONTROL_REGISTER_out
 
@@ -127 +131 @@
     eMOVZX  ax, BYTE [bp+IDEPACK.bLbaLowExt]
     mov     cx, [bp+IDEPACK.wLbaMiddleAndHighExt]
-    call    OutputSectorCountAndAddress
+    call    IDEDEVICE%+OutputSectorCountAndAddress
 
     ; Output Sector Address Low
     mov     ax, [bp+IDEPACK.wSectorCountAndLbaLow]
     mov     cx, [bp+IDEPACK.wLbaMiddleAndHigh]
-    call    OutputSectorCountAndAddress
+    call    IDEDEVICE%+OutputSectorCountAndAddress
 
     ; Output command
@@ -198 +202 @@
 ;       AL, BX, DX
 ;--------------------------------------------------------------------
-%ifdef ASSEMBLE_SHARED_IDE_DEVICE_FUNCTIONS
-ALIGN JUMP_ALIGN
-OutputSectorCountAndAddress:
+ALIGN JUMP_ALIGN
+IDEDEVICE%+OutputSectorCountAndAddress:
     OUTPUT_AL_TO_IDE_REGISTER SECTOR_COUNT_REGISTER
 
@@ -211 +214 @@
     mov     al, ch
     JUMP_TO_OUTPUT_AL_TO_IDE_REGISTER LBA_HIGH_REGISTER
-%endif