Changeset 480 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Inc

Timestamp:

Oct 27, 2012, 11:26:11 AM (12 years ago)

Author:

aitotat@…

google:author:

aitotat@gmail.com

Message:

Changes to XTIDE Universal BIOS:

• XT-CF DMA transfers should now work.

Location:

trunk/XTIDE_Universal_BIOS/Inc

Files:

• CustomDPT.inc (modified) (1 diff)
• RomVars.inc (modified) (1 diff)

trunk/XTIDE_Universal_BIOS/Inc/CustomDPT.inc

@@ -94 +94 @@
     FLG_INITERROR_FAILED_TO_INITIALIZE_STANDBY_TIMER    EQU (1<<6)
     FLG_INITERROR_FAILED_TO_SET_XTCF_MODE               EQU (1<<7)
+    FLG_INITERROR_FAILED_TO_SET_8BIT_MODE               EQU FLG_INITERROR_FAILED_TO_SET_XTCF_MODE
 
 

trunk/XTIDE_Universal_BIOS/Inc/RomVars.inc

@@ -139 +139 @@
 ; IDE Devices are grouped so device numbers cannot be changed without modifying code elsewhere!
 ;
-COUNT_OF_STANDARD_IDE_DEVICES           EQU 2
-COUNT_OF_8BIT_IDE_DEVICES               EQU 6
+COUNT_OF_STANDARD_IDE_DEVICES           EQU 2   ; 16- and 32-bit controllers
+COUNT_OF_8BIT_IDE_DEVICES               EQU 7
 COUNT_OF_ALL_IDE_DEVICES                EQU (COUNT_OF_8BIT_IDE_DEVICES + COUNT_OF_STANDARD_IDE_DEVICES)
 ; Standard port mapped I/O
 DEVICE_16BIT_ATA                        EQU (0<<1)
 DEVICE_32BIT_ATA                        EQU (1<<1)
-DEVICE_8BIT_XTIDE_REV1                  EQU (COUNT_OF_STANDARD_IDE_DEVICES<<1)
+DEVICE_8BIT_ATA                         EQU (COUNT_OF_STANDARD_IDE_DEVICES+0<<1)    ; 16- or 32-bit controller in 8-bit mode
+DEVICE_8BIT_XTIDE_REV1                  EQU (COUNT_OF_STANDARD_IDE_DEVICES+1<<1)
 ; Address lines A0 and A3 are swapped
-DEVICE_8BIT_XTIDE_REV2                  EQU ((COUNT_OF_STANDARD_IDE_DEVICES+1)<<1)  ; Or rev 1 with swapped A0 and A3
+DEVICE_8BIT_XTIDE_REV2                  EQU ((COUNT_OF_STANDARD_IDE_DEVICES+2)<<1)  ; Or rev 1 with swapped A0 and A3
 ; IDE Register offsets are SHL 1
-DEVICE_8BIT_XTCF_PIO8                   EQU ((COUNT_OF_STANDARD_IDE_DEVICES+2)<<1)  ; XT-CF using 8-bit PIO mode
-DEVICE_8BIT_XTCF_DMA                    EQU ((COUNT_OF_STANDARD_IDE_DEVICES+3)<<1)  ; XT-CF using DMA
-DEVICE_8BIT_XTCF_MEMMAP                 EQU ((COUNT_OF_STANDARD_IDE_DEVICES+4)<<1)  ; XT-CF using Memory Mapped transfers (not I/O)
+DEVICE_8BIT_XTCF_PIO8                   EQU ((COUNT_OF_STANDARD_IDE_DEVICES+3)<<1)  ; XT-CF using 8-bit PIO mode
+DEVICE_8BIT_XTCF_DMA                    EQU ((COUNT_OF_STANDARD_IDE_DEVICES+4)<<1)  ; XT-CF using DMA
+DEVICE_8BIT_XTCF_MEMMAP                 EQU ((COUNT_OF_STANDARD_IDE_DEVICES+5)<<1)  ; XT-CF using Memory Mapped transfers (not I/O)
 ; Memory Mapped I/O
-DEVICE_8BIT_JRIDE_ISA                   EQU ((COUNT_OF_STANDARD_IDE_DEVICES+5)<<1)  ; JR-IDE/ISA (Memory Mapped I/O)
+DEVICE_8BIT_JRIDE_ISA                   EQU ((COUNT_OF_STANDARD_IDE_DEVICES+6)<<1)  ; JR-IDE/ISA (Memory Mapped I/O)
 ; Virtual devices
 DEVICE_SERIAL_PORT                      EQU (COUNT_OF_ALL_IDE_DEVICES<<1)