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

Timestamp:

Apr 19, 2012, 3:08:06 PM (12 years ago)

Author:

aitotat@…

google:author:

aitotat@gmail.com

Message:

Changes to XTIDE Universal BIOS:

• IRQ related stuff is now optional MODULE_IRQ.
• XT builds no longer include support for IDE IRQ.

File:

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

trunk/XTIDE_Universal_BIOS/Src/Main.asm

@@ -46 +46 @@
     ; Included .inc files
     %include "AssemblyLibrary.inc"  ; Assembly Library. Must be included first!
+    %include "ModuleDependency.inc" ; Dependency checks for optional modules
     %include "Version.inc"
-    %include "ModuleDependency.inc" ; Dependency checks for optional modules
-    %include "IntController.inc"    ; For Interrupt Controller equates
     %include "ATA_ID.inc"           ; For ATA Drive Information structs
     %include "IdeRegisters.inc"     ; For ATA Registers, flags and commands
@@ -89 +88 @@
     at  ROMVARS.bIdleTimeout,   db  0                       ; Standby timer disabled by default
 
-    at  ROMVARS.ideVars0+IDEVARS.wPort,         dw  DEVICE_ATA_DEFAULT_PORT         ; Controller Command Block base port
-    at  ROMVARS.ideVars0+IDEVARS.wPortCtrl,     dw  DEVICE_ATA_DEFAULT_PORTCTRL     ; Controller Control Block base port
+    at  ROMVARS.ideVars0+IDEVARS.wPort,         dw  DEVICE_ATA_PRIMARY_PORT         ; Controller Command Block base port
+    at  ROMVARS.ideVars0+IDEVARS.wPortCtrl,     dw  DEVICE_ATA_PRIMARY_PORTCTRL     ; Controller Control Block base port
     at  ROMVARS.ideVars0+IDEVARS.bDevice,       db  DEVICE_16BIT_ATA
     at  ROMVARS.ideVars0+IDEVARS.bIRQ,          db  0
@@ -96 +95 @@
     at  ROMVARS.ideVars0+IDEVARS.drvParamsSlave+DRVPARAMS.wFlags,   db  DISABLE_WRITE_CACHE | FLG_DRVPARAMS_BLOCKMODE
 
-    at  ROMVARS.ideVars1+IDEVARS.wPort,         dw  DEVICE_ATA_DEFAULT_SECONDARY_PORT
-    at  ROMVARS.ideVars1+IDEVARS.wPortCtrl,     dw  DEVICE_ATA_DEFAULT_SECONDARY_PORTCTRL
+    at  ROMVARS.ideVars1+IDEVARS.wPort,         dw  DEVICE_ATA_SECONDARY_PORT
+    at  ROMVARS.ideVars1+IDEVARS.wPortCtrl,     dw  DEVICE_ATA_SECONDARY_PORTCTRL
     at  ROMVARS.ideVars1+IDEVARS.bDevice,       db  DEVICE_16BIT_ATA
     at  ROMVARS.ideVars1+IDEVARS.bIRQ,          db  0
@@ -103 +102 @@
     at  ROMVARS.ideVars1+IDEVARS.drvParamsSlave+DRVPARAMS.wFlags,   db  DISABLE_WRITE_CACHE | FLG_DRVPARAMS_BLOCKMODE
 
-    at  ROMVARS.ideVars2+IDEVARS.wPort,         dw  1E8h
-    at  ROMVARS.ideVars2+IDEVARS.wPortCtrl,     dw  3E8h
+    at  ROMVARS.ideVars2+IDEVARS.wPort,         dw  DEVICE_ATA_TERTIARY_PORT
+    at  ROMVARS.ideVars2+IDEVARS.wPortCtrl,     dw  DEVICE_ATA_TERTIARY_PORTCTRL
     at  ROMVARS.ideVars2+IDEVARS.bDevice,       db  DEVICE_16BIT_ATA
     at  ROMVARS.ideVars2+IDEVARS.bIRQ,          db  0
@@ -110 +109 @@
     at  ROMVARS.ideVars2+IDEVARS.drvParamsSlave+DRVPARAMS.wFlags,   db  DISABLE_WRITE_CACHE | FLG_DRVPARAMS_BLOCKMODE
 
-    at  ROMVARS.ideVars3+IDEVARS.wPort,         dw  168h
-    at  ROMVARS.ideVars3+IDEVARS.wPortCtrl,     dw  368h
+    at  ROMVARS.ideVars3+IDEVARS.wPort,         dw  DEVICE_ATA_QUATERNARY_PORT
+    at  ROMVARS.ideVars3+IDEVARS.wPortCtrl,     dw  DEVICE_ATA_QUATERNARY_PORTCTRL
     at  ROMVARS.ideVars3+IDEVARS.bDevice,       db  DEVICE_16BIT_ATA
     at  ROMVARS.ideVars3+IDEVARS.bIRQ,          db  0
@@ -232 +231 @@
     %include "IdeDPT.asm"
     %include "IdeIO.asm"
+%ifdef MODULE_IRQ
     %include "IdeIrq.asm"
+%endif
 %undef IDEDEVICE
 %undef ASSEMBLE_SHARED_IDE_DEVICE_FUNCTIONS