Changeset 496 in xtideuniversalbios for trunk

Timestamp:

Dec 30, 2012, 6:32:58 PM (12 years ago)

Author:

aitotat@…

google:author:

aitotat@gmail.com

Message:

Changes to XTIDE Universal BIOS:

• XT-CF related code in IdeIO_OutputALtoIdeControlBlockRegisterInDL is now properly included when MODULE_8BIT_IDE_ADVANCED is not available.
• Added Control Block Registers offsets to RomVars.inc.

Location:

trunk/XTIDE_Universal_BIOS

Files:

• Inc/Controllers/XTCF.inc (modified) (1 diff)
• Inc/RomVars.inc (modified) (1 diff)
• Src/Device/IDE/IdeIO.asm (modified) (2 diffs)

trunk/XTIDE_Universal_BIOS/Inc/Controllers/XTCF.inc

@@ -23 +23 @@
 %define XTCF_INC
 
-OFFSET_TO_CONTROL_BLOCK_REGISTERS   EQU     8
 DEFAULT_XTCF_SECTOR_WINDOW_SEGMENT  EQU     0D800h
 

trunk/XTIDE_Universal_BIOS/Inc/RomVars.inc

@@ -118 +118 @@
 %endif
 
+STANDARD_CONTROL_BLOCK_OFFSET           EQU     200h
+XTIDE_CONTROL_BLOCK_OFFSET              EQU     8h
+XTCF_CONTROL_BLOCK_OFFSET               EQU     XTIDE_CONTROL_BLOCK_OFFSET
+
 ; Default values for Port and PortCtrl, shared with the configurator
 ;
 DEVICE_XTIDE_DEFAULT_PORT               EQU     300h
-DEVICE_XTIDE_DEFAULT_PORTCTRL           EQU     (DEVICE_XTIDE_DEFAULT_PORT + 8h)
+DEVICE_XTIDE_DEFAULT_PORTCTRL           EQU     (DEVICE_XTIDE_DEFAULT_PORT + XTIDE_CONTROL_BLOCK_OFFSET)
 
-DEVICE_ATA_PRIMARY_PORT                 EQU     300h
-DEVICE_ATA_PRIMARY_PORTCTRL             EQU     (DEVICE_ATA_PRIMARY_PORT + 8h)
+DEVICE_ATA_PRIMARY_PORT                 EQU     1F0h
+DEVICE_ATA_PRIMARY_PORTCTRL             EQU     (DEVICE_ATA_PRIMARY_PORT + STANDARD_CONTROL_BLOCK_OFFSET)
 
 DEVICE_ATA_SECONDARY_PORT               EQU     170h
-DEVICE_ATA_SECONDARY_PORTCTRL           EQU     (DEVICE_ATA_SECONDARY_PORT + 200h)
+DEVICE_ATA_SECONDARY_PORTCTRL           EQU     (DEVICE_ATA_SECONDARY_PORT + STANDARD_CONTROL_BLOCK_OFFSET)
 
 DEVICE_ATA_TERTIARY_PORT                EQU     1E8h
-DEVICE_ATA_TERTIARY_PORTCTRL            EQU     (DEVICE_ATA_TERTIARY_PORT + 200h)
+DEVICE_ATA_TERTIARY_PORTCTRL            EQU     (DEVICE_ATA_TERTIARY_PORT + STANDARD_CONTROL_BLOCK_OFFSET)
 
 DEVICE_ATA_QUATERNARY_PORT              EQU     168h
-DEVICE_ATA_QUATERNARY_PORTCTRL          EQU     (DEVICE_ATA_QUATERNARY_PORT + 200h)
+DEVICE_ATA_QUATERNARY_PORTCTRL          EQU     (DEVICE_ATA_QUATERNARY_PORT + STANDARD_CONTROL_BLOCK_OFFSET)
 
 

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

@@ -106 +106 @@
     cmp     bl, DEVICE_8BIT_XTIDE_REV2
     jbe     SHORT .OutputALtoControlBlockRegisterInDX   ; Standard IDE controllers and XTIDE rev 1
-        
+
 %ifdef MODULE_8BIT_IDE_ADVANCED
     cmp     bl, DEVICE_8BIT_JRIDE_ISA
@@ -115 +115 @@
     mov     bx, JRIDE_CONTROL_BLOCK_REGISTER_WINDOW_OFFSET
     jmp     SHORT IdeIO_OutputALtoIdeRegisterInDL.OutputALtoMemoryMappedRegisterInDXwithWindowOffsetInBX
+%endif
 
 .ShlRegisterIndexInDX:
-    add     dl, OFFSET_TO_CONTROL_BLOCK_REGISTERS
+    add     dl, XTCF_CONTROL_BLOCK_OFFSET
     eSHL_IM dx, 1
     jmp     SHORT OutputALtoRegisterInDX
-%endif
 
 .OutputALtoControlBlockRegisterInDX: