Changeset 589 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Inc


Ignore:
Timestamp:
May 22, 2016, 12:26:57 PM (9 years ago)
Author:
Krister Nordvall
Message:

Changes:

  • BIOS: Fixed a purely cosmetic bug from r542 where, in builds containing MODULE_EBIOS, the boot menu would display an incorrect drive size (0.4 kB with MODULE_STRINGS_COMPRESSED or 0.5 kB without) for old drives with no support for LBA.
  • Fixed a bug from r392 where Vision_DetectAndReturnIDinAXandPortInDXifControllerPresent would return the ID in AL instead of AH (if DANGEROUS_DETECTION had been defined).
  • Fixed a bug from r587 in AdvAtaInit.asm that would prevent detection of QDI Vision controllers.
  • Also changed how the QDI Vision IDs are defined (removed the need for shifting) to avoid confusion. This fixed a potential bug from r587 in AdvAtaInit.asm where some IDs were not being shifted.
  • Fixed a bug in PDC20x30.asm from r587 where GetPdcIDtoAX would not return with the IDE base port in DX so DisablePdcProgrammingMode would fail.
  • Made some changes to ModuleDependency.inc and other files so that MODULE_ADVANCED_ATA now requires USE_386. Consequently it is no longer included in the regular AT-builds, only in the 386_8k-build.
  • Moved the UNROLL_SECTORS_IN_CX_TO_xWORDS macros from IDE_8bit.inc to IdeIO.inc which means it's now possible to build a BIOS without MODULE_8BIT_IDE.
  • XTIDECFG: Added a minimum DOS version check (since it needs DOS version 2+) to allow the program to quit gracefully in the unlikely scenario where someone tries to run it under DOS version 1.
  • Made some changes to Drive.asm to improve drive enumeration. The old method using GET_DOS_DRIVE_PARAMETER_BLOCK_FOR_SPECIFIC_DRIVE worked well in Windows XP but not in Windows 98 SE (in Windows or in DOS mode). The two problems were; 1) The function call would access the drives which on single floppy drive systems would cause Windows to swap between A: and B: (throwing a blue screen asking the user to insert a disk etc). 2) Only floppy drives and FAT16 drives would be available in the list of drives, no FAT32/optical/network drives.
  • Improved code in IdeControllerMenu.asm so that the default port addresses for all IDE interfaces are now restored when (re-)selecting the (same) type of IDE device.
  • Also made it impossible to select a device type unless the required module is included in the loaded BIOS.
  • The version check done when loading a BIOS now uses the FLASH_SIGNATURE definition from Version.inc. Any changes affecting RomVars now only requires updating that definition. This means that changes to RomVars must be implemented in both the BIOS and XTIDECFG before being committed to the repository.
  • Added a compatibility fix for 3Com 3C503 cards to the ROM checksumming code in Buffers.asm (Buffers_GenerateChecksum).
  • SerDrive: Made some minor changes to file names and paths to improve compatibility with case sensitive environments.
  • BIOSDRVS: Made a minor size optimization which as a side effect also makes it compatible with all DOS versions including DOS version 1.
  • Library: Renamed the WAIT_RETRACE_IF_NECESSARY_THEN macro to CALL_WAIT_FOR_RETRACE_IF_NECESSARY_THEN and made a tail-call-optimized version of it (JMP_WAIT_FOR_RETRACE_IF_NECESSARY_THEN).
  • A speed optimization to the eRCL_IM macro for 386 and higher. This change breaks emulation in the sense that the macro will fail when given a memory operand as the first parameter.
  • Other minor optimizations and fixes.
Location:
trunk/XTIDE_Universal_BIOS/Inc
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/XTIDE_Universal_BIOS/Inc/BootVars.inc

    r545 r589  
    4141    .dwPostStack        resb    4       ; POST stack pointer when entering INT 19h
    4242%ifdef MODULE_HOTKEYS
    43     .hotkeyVars             resb    HOTKEYVARS_size
     43    .hotkeyVars         resb    HOTKEYVARS_size
    4444%endif
    4545    .rgDrvDetectInfo:                   ; Array containing DRVDETECTINFO structs

  • trunk/XTIDE_Universal_BIOS/Inc/Controllers/AdvancedID.inc

    r588 r589  
    3232; Vision
    3333; QDI Vision Controller Identification nibbles used by hardware so do not modify these
    34 ID_QD6580_ALTERNATE         EQU     5
    35 ID_QD6580                   EQU     10
    36 ID_QD6500                   EQU     12
     34ID_QD6580_ALTERNATE         EQU     80
     35ID_QD6580                   EQU     160
     36ID_QD6500                   EQU     192
    3737
    3838

  • trunk/XTIDE_Universal_BIOS/Inc/Controllers/PDC20x30.inc

    r587 r589  
    22; Description   :   Promise PDC 20230-C and 20630 VLB IDE controller
    33;                   specifications.
    4 ;
    5 ;                   Specifications can be found at
    64
    75;

  • trunk/XTIDE_Universal_BIOS/Inc/Controllers/XTCF.inc

    r588 r589  
    5656; the mode via a call to Int 13h function 1Eh accordingly (see AH1Eh_XTCF.asm).
    5757;
    58 XTCF_8BIT_PIO_MODE                  EQU     0   ; XT-CF using 8-bit PIO mode
    59 XTCF_8BIT_PIO_MODE_WITH_BIU_OFFLOAD EQU     1   ; XT-CF using 8-bit PIO mode, but with 16-bit instructions
    60 XTCF_16BIT_PIO_WITH_BIU_OFFLOAD     EQU     2   ; Lo-tech 8-bit IDE Adapter
    61 XTCF_DMA_MODE                       EQU     3   ; XT-CFv3 using DMA
     58XTCF_8BIT_PIO_MODE                      EQU     0   ; XT-CF using 8-bit PIO mode
     59XTCF_8BIT_PIO_MODE_WITH_BIU_OFFLOAD     EQU     1   ; XT-CF using 8-bit PIO mode, but with 16-bit instructions
     60XTCF_16BIT_PIO_MODE_WITH_BIU_OFFLOAD    EQU     2   ; Lo-tech 8-bit IDE Adapter
     61XTCF_DMA_MODE                           EQU     3   ; XT-CFv3 using DMA
    6262
    6363

  • trunk/XTIDE_Universal_BIOS/Inc/CustomDPT.inc

    r584 r589  
    8484
    8585
    86     ; Flags for DPT_ADVANCED_ATA.bInitError
     86    ; Flags for DPT.bInitError
    8787    FLG_INITERROR_FAILED_TO_SELECT_DRIVE                EQU (1<<0)
    8888    FLG_INITERROR_FAILED_TO_INITIALIZE_CHS_PARAMETERS   EQU (1<<1)

  • trunk/XTIDE_Universal_BIOS/Inc/IDE_8bit.inc

    r526 r589  
    2121%ifndef IDE_8BIT_INC
    2222%define IDE_8BIT_INC
    23 
    24 ;--------------------------------------------------------------------
    25 ; UNROLL_SECTORS_IN_CX_TO_DWORDS
    26 ; UNROLL_SECTORS_IN_CX_TO_QWORDS
    27 ; UNROLL_SECTORS_IN_CX_TO_OWORDS
    28 ;   Parameters:
    29 ;       CX:     Number of sectors in block
    30 ;   Returns:
    31 ;       CX:     Number of DWORDs, QWORDs or OWORDs in block
    32 ;   Corrupts registers:
    33 ;       Nothing
    34 ;--------------------------------------------------------------------
    35 %macro UNROLL_SECTORS_IN_CX_TO_DWORDS 0
    36 %ifdef USE_186
    37     shl     cx, 7
    38 %else
    39     xchg    cl, ch      ; Sectors to WORDs (SHL CX, 8)
    40     shr     cx, 1
    41 %endif
    42 %endmacro
    43 
    44 %macro UNROLL_SECTORS_IN_CX_TO_QWORDS 0
    45 %ifdef USE_186
    46     shl     cx, 6
    47 %else
    48     UNROLL_SECTORS_IN_CX_TO_DWORDS
    49     shr     cx, 1
    50 %endif
    51 %endmacro
    52 
    53 %macro UNROLL_SECTORS_IN_CX_TO_OWORDS 0
    54 %ifdef USE_186
    55     shl     cx, 5
    56 %else
    57 ;   UNROLL_SECTORS_IN_CX_TO_QWORDS
    58 ;   shr     cx, 1
    59     mov     ch, cl      ; 2 bytes shorter but possibly slower
    60     mov     cl, 3
    61     shr     cx, cl
    62 %endif
    63 %endmacro
    64 
    6523
    6624;--------------------------------------------------------------------

  • trunk/XTIDE_Universal_BIOS/Inc/IdeIO.inc

    r526 r589  
    105105
    106106
     107;--------------------------------------------------------------------
     108; UNROLL_SECTORS_IN_CX_TO_DWORDS
     109; UNROLL_SECTORS_IN_CX_TO_QWORDS
     110; UNROLL_SECTORS_IN_CX_TO_OWORDS
     111;   Parameters:
     112;       CX:     Number of sectors in block
     113;   Returns:
     114;       CX:     Number of DWORDs, QWORDs or OWORDs in block
     115;   Corrupts registers:
     116;       Nothing
     117;--------------------------------------------------------------------
     118%macro UNROLL_SECTORS_IN_CX_TO_DWORDS 0
     119%ifdef USE_186
     120    shl     cx, 7
     121%else
     122    xchg    cl, ch      ; Sectors to WORDs (SHL CX, 8)
     123    shr     cx, 1
     124%endif
     125%endmacro
     126
     127%macro UNROLL_SECTORS_IN_CX_TO_QWORDS 0
     128%ifdef USE_186
     129    shl     cx, 6
     130%else
     131    UNROLL_SECTORS_IN_CX_TO_DWORDS
     132    shr     cx, 1
     133%endif
     134%endmacro
     135
     136%macro UNROLL_SECTORS_IN_CX_TO_OWORDS 0
     137%ifdef USE_186
     138    shl     cx, 5
     139%else
     140;   UNROLL_SECTORS_IN_CX_TO_QWORDS
     141;   shr     cx, 1
     142    mov     ch, cl      ; 2 bytes shorter but possibly slower
     143    mov     cl, 3
     144    shr     cx, cl
     145%endif
     146%endmacro
     147
     148
    107149%endif ; IDE_IO_INC

  • trunk/XTIDE_Universal_BIOS/Inc/ModuleDependency.inc

    r587 r589  
    2626%endif
    2727
    28 
    2928%ifdef MODULE_SERIAL_FLOPPY
    3029    %ifndef MODULE_SERIAL
    … …  
    4140%endif
    4241
    43 ; Include module specific .INC files
    4442%ifdef MODULE_8BIT_IDE
    4543    %include "IDE_8bit.inc"         ; For IDE 8-bit data port macros
    … …  
    4745
    4846%ifdef MODULE_ADVANCED_ATA
     47    %ifndef USE_386
     48        %error "MODULE_ADVANCED_ATA requires USE_386!"
     49    %endif
    4950    %include "AdvancedID.inc"
    5051    %include "PDC20x30.inc"         ; For Promise PDC 20230-C and 20630 controllers
    … …  
    7980; Included modules for ROMVARS.wFlags
    8081%ifdef MODULE_8BIT_IDE
    81     MAIN_FLG_MODULE_8BIT_IDE    EQU FLG_ROMVARS_MODULE_8BIT_IDE
     82    MAIN_FLG_MODULE_8BIT_IDE            EQU FLG_ROMVARS_MODULE_8BIT_IDE
    8283%else
    83     MAIN_FLG_MODULE_8BIT_IDE    EQU 0
     84    MAIN_FLG_MODULE_8BIT_IDE            EQU 0
    8485%endif
    8586
    8687%ifdef MODULE_ADVANCED_ATA
    87     MAIN_FLG_MODULE_ADVANCED_ATA    EQU FLG_ROMVARS_MODULE_ADVANCED_ATA
     88    MAIN_FLG_MODULE_ADVANCED_ATA        EQU FLG_ROMVARS_MODULE_ADVANCED_ATA
    8889%else
    89     MAIN_FLG_MODULE_ADVANCED_ATA    EQU 0
     90    MAIN_FLG_MODULE_ADVANCED_ATA        EQU 0
    9091%endif
    9192
    9293%ifdef MODULE_BOOT_MENU
    93     MAIN_FLG_MODULE_BOOT_MENU   EQU FLG_ROMVARS_MODULE_BOOT_MENU
     94    MAIN_FLG_MODULE_BOOT_MENU           EQU FLG_ROMVARS_MODULE_BOOT_MENU
    9495%else
    95     MAIN_FLG_MODULE_BOOT_MENU   EQU 0
     96    MAIN_FLG_MODULE_BOOT_MENU           EQU 0
    9697%endif
    9798
    9899%ifdef MODULE_EBIOS
    99     MAIN_FLG_MODULE_EBIOS   EQU FLG_ROMVARS_MODULE_EBIOS
     100    MAIN_FLG_MODULE_EBIOS               EQU FLG_ROMVARS_MODULE_EBIOS
    100101%else
    101     MAIN_FLG_MODULE_EBIOS   EQU 0
     102    MAIN_FLG_MODULE_EBIOS               EQU 0
    102103%endif
    103104
    104105%ifdef MODULE_HOTKEYS
    105     MAIN_FLG_MODULE_HOTKEYS EQU FLG_ROMVARS_MODULE_HOTKEYS
     106    MAIN_FLG_MODULE_HOTKEYS             EQU FLG_ROMVARS_MODULE_HOTKEYS
    106107%else
    107     MAIN_FLG_MODULE_HOTKEYS EQU 0
     108    MAIN_FLG_MODULE_HOTKEYS             EQU 0
    108109%endif
    109110
    110111%ifdef MODULE_IRQ
    111     MAIN_FLG_MODULE_IRQ     EQU FLG_ROMVARS_MODULE_IRQ
     112    MAIN_FLG_MODULE_IRQ                 EQU FLG_ROMVARS_MODULE_IRQ
    112113%else
    113     MAIN_FLG_MODULE_IRQ     EQU 0
     114    MAIN_FLG_MODULE_IRQ                 EQU 0
    114115%endif
    115116
    116117%ifdef MODULE_SERIAL
    117     MAIN_FLG_MODULE_SERIAL  EQU FLG_ROMVARS_MODULE_SERIAL
     118    MAIN_FLG_MODULE_SERIAL              EQU FLG_ROMVARS_MODULE_SERIAL
    118119%else
    119     MAIN_FLG_MODULE_SERIAL  EQU 0
     120    MAIN_FLG_MODULE_SERIAL              EQU 0
    120121%endif
    121122
    122123%ifdef MODULE_SERIAL_FLOPPY
    123     MAIN_FLG_MODULE_SERIAL_FLOPPY   EQU FLG_ROMVARS_MODULE_SERIAL_FLOPPY
     124    MAIN_FLG_MODULE_SERIAL_FLOPPY       EQU FLG_ROMVARS_MODULE_SERIAL_FLOPPY
    124125%else
    125     MAIN_FLG_MODULE_SERIAL_FLOPPY   EQU 0
     126    MAIN_FLG_MODULE_SERIAL_FLOPPY       EQU 0
    126127%endif
    127128
    … …  
    145146
    146147MASK_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_POWER_MANAGEMENT | MAIN_FLG_MODULE_8BIT_IDE_ADVANCED
    147 

  • trunk/XTIDE_Universal_BIOS/Inc/RamVars.inc

    r555 r589  
    132132%endif
    133133
     134                            alignb  2   ; Keep the INTPACK structure and stack pointer WORD aligned
     135
    134136    .intpack                resb    INTPACK_size
    135137endstruc

  • trunk/XTIDE_Universal_BIOS/Inc/RomVars.inc

    r588 r589  
    7171                                                ; (Conveniently, this is 8, a fact we exploit when testing the bit)
    7272
    73 ; Here in case the configuration needs to know functionality is present
     73; Here in case the configuration needs to know functionality is present. Note! Changing the order/location of these flags
     74; also requires changes elsewhere as they are usually tested using byte-accesses for efficiency.
    7475FLG_ROMVARS_MODULE_POWER_MANAGEMENT     EQU (1<<5)
    7576FLG_ROMVARS_MODULE_8BIT_IDE             EQU (1<<6)
    … …  
    146147; Device types for IDEVARS.bDevice
    147148; IDE Devices are grouped so device numbers cannot be changed without modifying code elsewhere!
    148 ; (IdeTransfer.asm)
    149149COUNT_OF_STANDARD_IDE_DEVICES           EQU 2   ; 16- and 32-bit controllers
    150150COUNT_OF_8BIT_IDE_DEVICES               EQU 9
Note: See TracChangeset for help on using the changeset viewer.