Changeset 400 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Main.asm

Timestamp:

Apr 20, 2012, 2:30:16 PM (12 years ago)

Author:

aitotat@…

google:author:

aitotat@gmail.com

Message:

Changes to XTIDE Universal BIOS:

• Moved 8-bit device support to MODULE_8BIT_IDE.
• JR-IDE/ISA support requires a lot less bytes.
• AT builds now always use full operating mode.

File:

• trunk/XTIDE_Universal_BIOS/Src/Main.asm (modified) (4 diffs)

trunk/XTIDE_Universal_BIOS/Src/Main.asm

@@ -55 +55 @@
     %include "RamVars.inc"          ; For RAMVARS struct
     %include "BootVars.inc"         ; For BOOTVARS struct
-    %include "IDE_8bit.inc"         ; For IDE 8-bit data port macros
+    %include "IdeIO.inc"            ; Macros for IDE port I/O
     %include "DeviceIDE.inc"        ; For IDE device equates
 
@@ -136 +136 @@
     at  ROMVARS.ideVars0+IDEVARS.wPort,         dw  DEVICE_XTIDE_DEFAULT_PORT           ; Controller Command Block base port
     at  ROMVARS.ideVars0+IDEVARS.wPortCtrl,     dw  DEVICE_XTIDE_DEFAULT_PORTCTRL       ; Controller Control Block base port
-    at  ROMVARS.ideVars0+IDEVARS.bDevice,       db  DEVICE_XTIDE_REV1
+    at  ROMVARS.ideVars0+IDEVARS.bDevice,       db  DEVICE_8BIT_XTIDE_REV1
     at  ROMVARS.ideVars0+IDEVARS.drvParamsMaster+DRVPARAMS.wFlags,  db  DISABLE_WRITE_CACHE | FLG_DRVPARAMS_BLOCKMODE
     at  ROMVARS.ideVars0+IDEVARS.drvParamsSlave+DRVPARAMS.wFlags,   db  DISABLE_WRITE_CACHE | FLG_DRVPARAMS_BLOCKMODE
@@ -222 +222 @@
     %include "Vision.asm"           ; QDI Vision QD6500 and QD6580 support
 %endif
-%define IDEDEVICE Ide
-%define ASSEMBLE_SHARED_IDE_DEVICE_FUNCTIONS
-    %include "IOMappedIDE.inc"      ; Assembly IDE support for normal I/O mapped controllers
     %include "IdeCommand.asm"
-    %include "IdeTransfer.asm"      ; Must be included after IdeCommand.asm
+%ifdef MODULE_JRIDE
+    %include "JrIdeTransfer.asm"    ; Must be included after IdeCommand.asm
+%endif
+    %include "IdeTransfer.asm"
     %include "IdeWait.asm"
     %include "IdeError.asm"         ; Must be included after IdeWait.asm
@@ -234 +234 @@
     %include "IdeIrq.asm"
 %endif
-%undef IDEDEVICE
-%undef ASSEMBLE_SHARED_IDE_DEVICE_FUNCTIONS
-
-    ; JR-IDE support
-%ifdef MODULE_JRIDE
-%define IDEDEVICE MemIde
-    %include "MemMappedIDE.inc"     ; Assembly IDE support for memory mapped controllers
-    %include "IdeCommand.asm"
-    %include "MemIdeTransfer.asm"   ; Must be included after IdeCommand.asm
-    %include "IdeWait.asm"
-    %include "IdeError.asm"         ; Must be included after IdeWait.asm
-%undef IDEDEVICE
-%endif
-
-
+
+    ; Serial Device support
 %ifdef MODULE_SERIAL                ; Serial Port Device support
     %include "SerialCommand.asm"