Changeset 496 in xtideuniversalbios


Ignore:
Timestamp:
Dec 30, 2012, 6:32:58 PM (9 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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/XTIDE_Universal_BIOS/Inc/Controllers/XTCF.inc

    r491 r496  
    2323%define XTCF_INC
    2424
    25 OFFSET_TO_CONTROL_BLOCK_REGISTERS   EQU     8
    2625DEFAULT_XTCF_SECTOR_WINDOW_SEGMENT  EQU     0D800h
    2726
  • trunk/XTIDE_Universal_BIOS/Inc/RomVars.inc

    r493 r496  
    118118%endif
    119119
     120STANDARD_CONTROL_BLOCK_OFFSET           EQU     200h
     121XTIDE_CONTROL_BLOCK_OFFSET              EQU     8h
     122XTCF_CONTROL_BLOCK_OFFSET               EQU     XTIDE_CONTROL_BLOCK_OFFSET
     123
    120124; Default values for Port and PortCtrl, shared with the configurator
    121125;
    122126DEVICE_XTIDE_DEFAULT_PORT               EQU     300h
    123 DEVICE_XTIDE_DEFAULT_PORTCTRL           EQU     (DEVICE_XTIDE_DEFAULT_PORT + 8h)
     127DEVICE_XTIDE_DEFAULT_PORTCTRL           EQU     (DEVICE_XTIDE_DEFAULT_PORT + XTIDE_CONTROL_BLOCK_OFFSET)
    124128
    125 DEVICE_ATA_PRIMARY_PORT                 EQU     300h
    126 DEVICE_ATA_PRIMARY_PORTCTRL             EQU     (DEVICE_ATA_PRIMARY_PORT + 8h)
     129DEVICE_ATA_PRIMARY_PORT                 EQU     1F0h
     130DEVICE_ATA_PRIMARY_PORTCTRL             EQU     (DEVICE_ATA_PRIMARY_PORT + STANDARD_CONTROL_BLOCK_OFFSET)
    127131
    128132DEVICE_ATA_SECONDARY_PORT               EQU     170h
    129 DEVICE_ATA_SECONDARY_PORTCTRL           EQU     (DEVICE_ATA_SECONDARY_PORT + 200h)
     133DEVICE_ATA_SECONDARY_PORTCTRL           EQU     (DEVICE_ATA_SECONDARY_PORT + STANDARD_CONTROL_BLOCK_OFFSET)
    130134
    131135DEVICE_ATA_TERTIARY_PORT                EQU     1E8h
    132 DEVICE_ATA_TERTIARY_PORTCTRL            EQU     (DEVICE_ATA_TERTIARY_PORT + 200h)
     136DEVICE_ATA_TERTIARY_PORTCTRL            EQU     (DEVICE_ATA_TERTIARY_PORT + STANDARD_CONTROL_BLOCK_OFFSET)
    133137
    134138DEVICE_ATA_QUATERNARY_PORT              EQU     168h
    135 DEVICE_ATA_QUATERNARY_PORTCTRL          EQU     (DEVICE_ATA_QUATERNARY_PORT + 200h)
     139DEVICE_ATA_QUATERNARY_PORTCTRL          EQU     (DEVICE_ATA_QUATERNARY_PORT + STANDARD_CONTROL_BLOCK_OFFSET)
    136140
    137141
  • trunk/XTIDE_Universal_BIOS/Src/Device/IDE/IdeIO.asm

    r493 r496  
    106106    cmp     bl, DEVICE_8BIT_XTIDE_REV2
    107107    jbe     SHORT .OutputALtoControlBlockRegisterInDX   ; Standard IDE controllers and XTIDE rev 1
    108        
     108
    109109%ifdef MODULE_8BIT_IDE_ADVANCED
    110110    cmp     bl, DEVICE_8BIT_JRIDE_ISA
     
    115115    mov     bx, JRIDE_CONTROL_BLOCK_REGISTER_WINDOW_OFFSET
    116116    jmp     SHORT IdeIO_OutputALtoIdeRegisterInDL.OutputALtoMemoryMappedRegisterInDXwithWindowOffsetInBX
     117%endif
    117118
    118119.ShlRegisterIndexInDX:
    119     add     dl, OFFSET_TO_CONTROL_BLOCK_REGISTERS
     120    add     dl, XTCF_CONTROL_BLOCK_OFFSET
    120121    eSHL_IM dx, 1
    121122    jmp     SHORT OutputALtoRegisterInDX
    122 %endif
    123123
    124124.OutputALtoControlBlockRegisterInDX:
Note: See TracChangeset for help on using the changeset viewer.