Changeset 493 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Inc


Ignore:
Timestamp:
Dec 21, 2012, 8:44:25 AM (12 years ago)
Author:
gregli@…
google:author:
gregli@hotmail.com
Message:

Separated MODULE_8BIT_IDE into the basic part used by XTIDE rev 1 and rev 2 which is PIO based, and MODULE_8BIT_IDE_ADVANCED for JRIDE and XTCF support which requires memory mapping and/or DMA. This allows for creating an 8KB image with boot menu support (but no hotkeys) for the XTIDE rev 1. Cleaned up how we reset the drive translation information, ensuring it is properly set between boot attempt on a primary and secondary drive - as a result we clean it when needed, rather than trying to always keep it clean. Also fixed translation bugs in int13h.asm where I had previously missed converting some MODULE_HOTKEYS into MODULE_DRIVEXLATE.

Location:
trunk/XTIDE_Universal_BIOS/Inc
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/XTIDE_Universal_BIOS/Inc/BootVars.inc

    r492 r493  
    4141    .dwPostStack        resb    4       ; POST stack pointer when entering INT 19h
    4242
    43 %ifdef MODULE_8BIT_IDE
     43%ifdef MODULE_8BIT_IDE_ADVANCED
    4444    .wNextXTCFportToScan    resb    2   ; Needed for XT-CF port autodetection
    4545%endif
  • trunk/XTIDE_Universal_BIOS/Inc/ModuleDependency.inc

    r492 r493  
    2424%endif
    2525
     26%ifdef MODULE_8BIT_IDE_ADVANCED
     27    %define MODULE_8BIT_IDE
     28    %include "DmaController.inc"
     29    %include "XTCF.inc"             ; For Lo-tech XT-CF
     30    %include "JRIDE_ISA.inc"        ; For JR-IDE/ISA
     31%endif
     32
    2633; Include module specific .INC files
    2734%ifdef MODULE_8BIT_IDE
    28     %include "DmaController.inc"
    2935    %include "IDE_8bit.inc"         ; For IDE 8-bit data port macros
    30     %include "XTCF.inc"             ; For Lo-tech XT-CF
    31     %include "JRIDE_ISA.inc"        ; For JR-IDE/ISA
    3236%endif
    3337
     
    118122%endif
    119123
    120 MASK_ROMVARS_INCLUDED_MODULES   EQU MAIN_FLG_MODULE_8BIT_IDE | MAIN_FLG_MODULE_ADVANCED_ATA | MAIN_FLG_MODULE_BOOT_MENU | MAIN_FLG_MODULE_EBIOS | MAIN_FLG_MODULE_HOTKEYS | MAIN_FLG_MODULE_IRQ | MAIN_FLG_MODULE_SERIAL | MAIN_FLG_MODULE_SERIAL_FLOPPY | MAIN_FLG_MODULE_STRINGS_COMPRESSED | MAIN_FLG_MODULE_FEATURE_SETS
     124%ifdef MODULE_8BIT_IDE_ADVANCED
     125    MAIN_FLG_MODULE_8BIT_IDE_ADVANCED   EQU FLG_ROMVARS_MODULE_8BIT_IDE_ADVANCED
     126%else
     127    MAIN_FLG_MODULE_8BIT_IDE_ADVANCED   EQU 0
     128%endif
     129
     130MASK_ROMVARS_INCLUDED_MODULES   EQU MAIN_FLG_MODULE_8BIT_IDE | MAIN_FLG_MODULE_ADVANCED_ATA | MAIN_FLG_MODULE_BOOT_MENU | MAIN_FLG_MODULE_EBIOS | MAIN_FLG_MODULE_HOTKEYS | MAIN_FLG_MODULE_IRQ | MAIN_FLG_MODULE_SERIAL | MAIN_FLG_MODULE_SERIAL_FLOPPY | MAIN_FLG_MODULE_STRINGS_COMPRESSED | MAIN_FLG_MODULE_FEATURE_SETS | MAIN_FLG_MODULE_8BIT_IDE_ADVANCED
     131
  • trunk/XTIDE_Universal_BIOS/Inc/RomVars.inc

    r482 r493  
    7272FLG_ROMVARS_MODULE_FEATURE_SETS         EQU (1<<5)
    7373FLG_ROMVARS_MODULE_8BIT_IDE             EQU (1<<6)
    74 
     74FLG_ROMVARS_MODULE_8BIT_IDE_ADVANCED    EQU (1<<7)
    7575FLG_ROMVARS_MODULE_ADVANCED_ATA         EQU (1<<8)
    7676FLG_ROMVARS_MODULE_BOOT_MENU            EQU (1<<9)
     
    123123DEVICE_XTIDE_DEFAULT_PORTCTRL           EQU     (DEVICE_XTIDE_DEFAULT_PORT + 8h)
    124124
    125 DEVICE_ATA_PRIMARY_PORT                 EQU     1F0h
    126 DEVICE_ATA_PRIMARY_PORTCTRL             EQU     (DEVICE_ATA_PRIMARY_PORT + 200h)
     125DEVICE_ATA_PRIMARY_PORT                 EQU     300h
     126DEVICE_ATA_PRIMARY_PORTCTRL             EQU     (DEVICE_ATA_PRIMARY_PORT + 8h)
    127127
    128128DEVICE_ATA_SECONDARY_PORT               EQU     170h
Note: See TracChangeset for help on using the changeset viewer.