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

Timestamp:

Apr 29, 2011, 7:04:13 PM (14 years ago)

Author:

Tomi Tilli

google:author:

aitotat

Message:

Changes to XTIDE Universal BIOS:

• Redesigned Disk Parameter Tables.
• Code generalizations for supporting non-IDE devices in the future.

File:

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

trunk/XTIDE_Universal_BIOS/Src/Main.asm

@@ -25 +25 @@
 %include "BootMenu.inc"         ; For Boot Menu
 %include "IDE_8bit.inc"         ; For IDE 8-bit data port macros
+%include "DeviceIDE.inc"        ; For IDE device equates
 
 
@@ -55 +56 @@
     at  ROMVARS.wDisplayMode,   dw  DEFAULT_TEXT_MODE
     at  ROMVARS.wBootTimeout,   dw  30 * TICKS_PER_SECOND   ; Boot Menu selection timeout
-    at  ROMVARS.bIdeCnt,        db  3                       ; Number of supported controllers
+    at  ROMVARS.bIdeCnt,        db  4                       ; Number of supported controllers
     at  ROMVARS.bBootDrv,       db  80h                     ; Boot Menu default drive
     at  ROMVARS.bMinFddCnt,     db  0                       ; Do not force minimum number of floppy drives
@@ -62 +63 @@
     at  ROMVARS.ideVars0+IDEVARS.wPort,         dw  1F0h            ; Controller Command Block base port
     at  ROMVARS.ideVars0+IDEVARS.wPortCtrl,     dw  3F0h            ; Controller Control Block base port
-    at  ROMVARS.ideVars0+IDEVARS.bBusType,      db  BUS_TYPE_16     ; Bus type
-    at  ROMVARS.ideVars0+IDEVARS.bIRQ,          db  14              ; IRQ
+    at  ROMVARS.ideVars0+IDEVARS.bDevice,       db  DEVICE_16BIT_ATA
+    at  ROMVARS.ideVars0+IDEVARS.bIRQ,          db  14
     at  ROMVARS.ideVars0+IDEVARS.drvParamsMaster+DRVPARAMS.wFlags,  db  FLG_DRVPARAMS_BLOCKMODE
     at  ROMVARS.ideVars0+IDEVARS.drvParamsSlave+DRVPARAMS.wFlags,   db  FLG_DRVPARAMS_BLOCKMODE
@@ -69 +70 @@
     at  ROMVARS.ideVars1+IDEVARS.wPort,         dw  170h            ; Controller Command Block base port
     at  ROMVARS.ideVars1+IDEVARS.wPortCtrl,     dw  370h            ; Controller Control Block base port
-    at  ROMVARS.ideVars1+IDEVARS.bBusType,      db  BUS_TYPE_16     ; Bus type
-    at  ROMVARS.ideVars1+IDEVARS.bIRQ,          db  15              ; IRQ
+    at  ROMVARS.ideVars1+IDEVARS.bDevice,       db  DEVICE_16BIT_ATA
+    at  ROMVARS.ideVars1+IDEVARS.bIRQ,          db  15
     at  ROMVARS.ideVars1+IDEVARS.drvParamsMaster+DRVPARAMS.wFlags,  db  FLG_DRVPARAMS_BLOCKMODE
     at  ROMVARS.ideVars1+IDEVARS.drvParamsSlave+DRVPARAMS.wFlags,   db  FLG_DRVPARAMS_BLOCKMODE
@@ -76 +77 @@
     at  ROMVARS.ideVars2+IDEVARS.wPort,         dw  300h            ; Controller Command Block base port
     at  ROMVARS.ideVars2+IDEVARS.wPortCtrl,     dw  308h            ; Controller Control Block base port
-    at  ROMVARS.ideVars2+IDEVARS.bBusType,      db  BUS_TYPE_8_DUAL ; Bus type
-    at  ROMVARS.ideVars2+IDEVARS.bIRQ,          db  0               ; IRQ
+    at  ROMVARS.ideVars2+IDEVARS.bDevice,       db  DEVICE_8BIT_DUAL_PORT_XTIDE
+    at  ROMVARS.ideVars2+IDEVARS.bIRQ,          db  0
     at  ROMVARS.ideVars2+IDEVARS.drvParamsMaster+DRVPARAMS.wFlags,  db  FLG_DRVPARAMS_BLOCKMODE
     at  ROMVARS.ideVars2+IDEVARS.drvParamsSlave+DRVPARAMS.wFlags,   db  FLG_DRVPARAMS_BLOCKMODE
@@ -83 +84 @@
     at  ROMVARS.ideVars3+IDEVARS.wPort,         dw  168h            ; Controller Command Block base port
     at  ROMVARS.ideVars3+IDEVARS.wPortCtrl,     dw  368h            ; Controller Control Block base port
-    at  ROMVARS.ideVars3+IDEVARS.bBusType,      db  BUS_TYPE_16     ; Bus type
-    at  ROMVARS.ideVars3+IDEVARS.bIRQ,          db  0               ; IRQ
+    at  ROMVARS.ideVars3+IDEVARS.bDevice,       db  DEVICE_16BIT_ATA
+    at  ROMVARS.ideVars3+IDEVARS.bIRQ,          db  0
     at  ROMVARS.ideVars3+IDEVARS.drvParamsMaster+DRVPARAMS.wFlags,  db  FLG_DRVPARAMS_BLOCKMODE
     at  ROMVARS.ideVars3+IDEVARS.drvParamsSlave+DRVPARAMS.wFlags,   db  FLG_DRVPARAMS_BLOCKMODE
@@ -101 +102 @@
     at  ROMVARS.ideVars0+IDEVARS.wPort,         dw  300h            ; Controller Command Block base port
     at  ROMVARS.ideVars0+IDEVARS.wPortCtrl,     dw  308h            ; Controller Control Block base port
-    at  ROMVARS.ideVars0+IDEVARS.bBusType,      db  BUS_TYPE_8_DUAL ; Bus type
+    at  ROMVARS.ideVars0+IDEVARS.bDevice,       db  DEVICE_8BIT_DUAL_PORT_XTIDE
     at  ROMVARS.ideVars0+IDEVARS.bIRQ,          db  0               ; IRQ
     at  ROMVARS.ideVars0+IDEVARS.drvParamsMaster+DRVPARAMS.wFlags,  db  FLG_DRVPARAMS_BLOCKMODE
@@ -146 +147 @@
 %include "DriveXlate.asm"       ; For swapping drive numbers
 %include "HAddress.asm"         ; For sector address translations
-%include "HCapacity.asm"        ; For calculating drive capacity
-%include "HError.asm"           ; For error checking
-%include "HPIO.asm"             ; For PIO transfers
-%include "HIRQ.asm"             ; For IRQ handling
-%include "HStatus.asm"          ; For reading hard disk status
-%include "HDrvSel.asm"          ; For selecting drive to access
-%include "HCommand.asm"         ; For outputting command and parameters
 %include "HTimer.asm"           ; For timeout and delay
 
@@ -178 +172 @@
 %include "AH24h_HSetBlocks.asm" ; Required by Int13h_Jump.asm
 %include "AH25h_HDrvID.asm"     ; Required by Int13h_Jump.asm
+%include "Device.asm"
+%include "Idepack.asm"
 
+; IDE Device support
+%include "IdeCommand.asm"
+%include "IdeDPT.asm"
+%include "IdeIO.asm"
+%include "IdeIrq.asm"
+%include "IdeTransfer.asm"
+%include "IdeWait.asm"
+%include "IdeError.asm"         ; Must be included after IdeWait.asm
+
+; Serial Port Device support
+%include "SerialCommand.asm"
+%include "SerialDPT.asm"