Changeset 601 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Strings.asm


Ignore:
Timestamp:
Feb 14, 2019, 7:38:08 PM (6 years ago)
Author:
Krister Nordvall
Message:

Changes:

  • Building the BIOS now works again.
  • Added a new IDE device type/transfer mode for use only with XT-IDE rev 2+ (or Chuck(G)-modded rev 1) cards installed in any of the following machines: Olivetti M24, AT&T PC6300, Xerox 6060 and Logabax Persona 1600. This new transfer mode is slightly faster than the regular XT-IDE rev 1 device type and requires that the card is configured for High Speed mode (or, in case of the card being a rev 1 card, has the Chuck(G) mod done). The new device type is called "XTIDE rev 2 (Olivetti M24)" in XTIDECFG.
  • Made some minor improvements to the library code that handles 'Drive Not Ready' errors in XTIDECFG.
  • Optimizations.
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/XTIDE_Universal_BIOS/Src/Strings.asm

    r589 r601  
    135135
    136136g_szDeviceTypeValues:
    137 g_szDeviceTypeValues_16bit:         db  " 16",NULL
     137g_szDeviceTypeValues_16bit:             db  " 16",NULL
    138138%ifdef MODULE_ADVANCED_ATA OR MODULE_8BIT_IDE OR MODULE_8BIT_IDE_ADVANCED OR MODULE_SERIAL
    139 g_szDeviceTypeValues_32bit:         db  " 32",NULL
     139g_szDeviceTypeValues_32bit:             db  " 32",NULL
    140140%ifdef MODULE_8BIT_IDE OR MODULE_8BIT_IDE_ADVANCED OR MODULE_SERIAL
    141 g_szDeviceTypeValues_8bit:          db  "  8",NULL
    142 g_szDeviceTypeValues_XTIDEr1:       db  "D8 ",NULL  ; Dual 8-bit
    143 g_szDeviceTypeValues_XTIDEr2:       db  "X8 ",NULL  ; A0<->A3 swapped 8-bit
     141g_szDeviceTypeValues_8bit:              db  "  8",NULL
     142g_szDeviceTypeValues_XTIDEr1:           db  "D8 ",NULL  ; Dual 8-bit
     143g_szDeviceTypeValues_XTIDEr2:           db  "X8 ",NULL  ; A0<->A3 swapped 8-bit
     144g_szDeviceTypeValues_XTIDEr2_Olivetti:  db  "X8O",NULL  ; Same as above but in Olivetti M24 and derivatives
    144145%ifdef MODULE_8BIT_IDE_ADVANCED OR MODULE_SERIAL
    145 g_szDeviceTypeValues_XTCFpio8:      db  "T8 ",NULL  ; True 8-bit
    146 g_szDeviceTypeValues_XTCFpio8BIU:   db  "T8B",NULL
    147 g_szDeviceTypeValues_XTCFpio16BIU:  db  "16B",NULL
    148 g_szDeviceTypeValues_XTCFdma:       db  "8MA",NULL  ; DMA 8-bit
    149 g_szDeviceTypeValues_JrIde:         db  "M8 ",NULL  ; Memory Mapped 8-bit
    150 g_szDeviceTypeValues_ADP50L:        db  "M8 ",NULL  ; Memory Mapped 8-bit
     146g_szDeviceTypeValues_XTCFpio8:          db  "T8 ",NULL  ; True 8-bit
     147g_szDeviceTypeValues_XTCFpio8BIU:       db  "T8B",NULL
     148g_szDeviceTypeValues_XTCFpio16BIU:      db  "16B",NULL
     149g_szDeviceTypeValues_XTCFdma:           db  "8MA",NULL  ; DMA 8-bit
     150g_szDeviceTypeValues_JrIde:             db  "M8 ",NULL  ; Memory Mapped 8-bit
     151g_szDeviceTypeValues_ADP50L:            db  "M8 ",NULL  ; Memory Mapped 8-bit
    151152%ifdef MODULE_SERIAL
    152 g_szDeviceTypeValues_Serial:        db  "SER",NULL
     153g_szDeviceTypeValues_Serial:            db  "SER",NULL
    153154%endif ; MODULE_SERIAL
    154155%endif ; MODULE_8BIT_IDE_ADVANCED OR MODULE_SERIAL
    … …  
    183184        %error "g_szDeviceTypeValues Displacement Incorrect 5"
    184185    %endif
     186    %if g_szDeviceTypeValues_XTIDEr2_Olivetti <> g_szDeviceTypeValues_XTIDEr2 + g_szDeviceTypeValues_Displacement
     187        %error "g_szDeviceTypeValues Displacement Incorrect 6"
     188    %endif
    185189
    186190    %ifdef MODULE_8BIT_IDE_ADVANCED OR MODULE_SERIAL
    187191
    188     %if g_szDeviceTypeValues_XTCFpio8 <> g_szDeviceTypeValues_XTIDEr2 + g_szDeviceTypeValues_Displacement
    189         %error "g_szDeviceTypeValues Displacement Incorrect 6"
     192    %if g_szDeviceTypeValues_XTCFpio8 <> g_szDeviceTypeValues_XTIDEr2_Olivetti + g_szDeviceTypeValues_Displacement
     193        %error "g_szDeviceTypeValues Displacement Incorrect 7"
    190194    %endif
    191195    %if g_szDeviceTypeValues_XTCFpio8BIU <> g_szDeviceTypeValues_XTCFpio8 + g_szDeviceTypeValues_Displacement
    192         %error "g_szDeviceTypeValues Displacement Incorrect 7"
     196        %error "g_szDeviceTypeValues Displacement Incorrect 8"
    193197    %endif
    194198    %if g_szDeviceTypeValues_XTCFpio16BIU <> g_szDeviceTypeValues_XTCFpio8BIU + g_szDeviceTypeValues_Displacement
    195         %error "g_szDeviceTypeValues Displacement Incorrect 8"
     199        %error "g_szDeviceTypeValues Displacement Incorrect 9"
    196200    %endif
    197201    %if g_szDeviceTypeValues_XTCFdma <> g_szDeviceTypeValues_XTCFpio16BIU + g_szDeviceTypeValues_Displacement
    198         %error "g_szDeviceTypeValues Displacement Incorrect 9"
     202        %error "g_szDeviceTypeValues Displacement Incorrect 10"
    199203    %endif
    200204    %if g_szDeviceTypeValues_JrIde <> g_szDeviceTypeValues_XTCFdma + g_szDeviceTypeValues_Displacement
    201         %error "g_szDeviceTypeValues Displacement Incorrect 10"
     205        %error "g_szDeviceTypeValues Displacement Incorrect 11"
    202206    %endif
    203207    %if g_szDeviceTypeValues_ADP50L <> g_szDeviceTypeValues_JrIde + g_szDeviceTypeValues_Displacement
    204         %error "g_szDeviceTypeValues Displacement Incorrect 11"
     208        %error "g_szDeviceTypeValues Displacement Incorrect 12"
    205209    %endif
    206210
    … …  
    208212
    209213    %if g_szDeviceTypeValues_Serial <> g_szDeviceTypeValues_ADP50L + g_szDeviceTypeValues_Displacement
    210         %error "g_szDeviceTypeValues Displacement Incorrect 12"
     214        %error "g_szDeviceTypeValues Displacement Incorrect 13"
    211215    %endif
    212216
Note: See TracChangeset for help on using the changeset viewer.