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


Ignore:
Timestamp:
Jun 3, 2015, 12:30:54 PM (9 years ago)
Author:
krille_n_@…
google:author:
krille_n_@hotmail.com
Message:

Changes:

  • Fixed a bug in AH24h_HSetBlocks.asm from r550. Trying to set a too large block size with an XT-CF card in DMA transfer mode would corrupt the stack.
  • Fixed a bug from r545 where the list of devices under g_szDeviceTypeValues in Strings.asm was no longer up to date causing the boot menu to display the wrong string for devices numbered higher than DEVICE_8BIT_XTCF_PIO8.
  • Made some fairly significant changes to the XT-CF code to reduce size. Two changes in functionality; 1) Added a simple check to validate the request for a change of the XT-CF transfer mode. 2) Changing transfer mode to use DMA no longer calls AH24h_SetBlockSize if the block size already is within the limits of DMA transfers. UNTESTED
  • XTIDECFG now clears IDEVARS.bIRQ when changing IDE controller to a serial device to keep the boot menu from displaying it since the serial device doesn't use IRQs at all.
  • Other minor optimizations.
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/XTIDE_Universal_BIOS/Src/Strings.asm

    r536 r588  
    135135
    136136g_szDeviceTypeValues:
    137 g_szDeviceTypeValues_16bit:     db  " 16",NULL
    138 g_szDeviceTypeValues_32bit:     db  " 32",NULL
    139 g_szDeviceTypeValues_8bit:      db  "  8",NULL
    140 g_szDeviceTypeValues_XTIDEr1:   db  "D8 ",NULL  ; Dual 8-bit
    141 g_szDeviceTypeValues_XTIDEr2:   db  "X8 ",NULL  ; A0<->A3 swapped 8-bit
    142 g_szDeviceTypeValues_XTCFpio8:  db  "T8 ",NULL  ; True 8-bit
    143 g_szDeviceTypeValues_XTCFdma:   db  "8MA",NULL  ; DMA 8-bit
    144 g_szDeviceTypeValues_XTCFmem:   db  "M8 ",NULL  ; Memory Mapped 8-bit
    145 g_szDeviceTypeValues_JrIde:     db  "M8 ",NULL
    146 g_szDeviceTypeValues_ADP50L:    db  "M8 ",NULL
    147 g_szDeviceTypeValues_Serial:    db  "SER",NULL
     137g_szDeviceTypeValues_16bit:         db  " 16",NULL
     138g_szDeviceTypeValues_32bit:         db  " 32",NULL
     139g_szDeviceTypeValues_8bit:          db  "  8",NULL
     140g_szDeviceTypeValues_XTIDEr1:       db  "D8 ",NULL  ; Dual 8-bit
     141g_szDeviceTypeValues_XTIDEr2:       db  "X8 ",NULL  ; A0<->A3 swapped 8-bit
     142g_szDeviceTypeValues_XTCFpio8:      db  "T8 ",NULL  ; True 8-bit
     143g_szDeviceTypeValues_XTCFpio8BIU:   db  "T8B",NULL
     144g_szDeviceTypeValues_XTCFpio16BIU:  db  "16B",NULL
     145g_szDeviceTypeValues_XTCFdma:       db  "8MA",NULL  ; DMA 8-bit
     146g_szDeviceTypeValues_JrIde:         db  "M8 ",NULL  ; Memory Mapped 8-bit
     147g_szDeviceTypeValues_ADP50L:        db  "M8 ",NULL  ; Memory Mapped 8-bit
     148g_szDeviceTypeValues_Serial:        db  "SER",NULL
    148149
    149150g_szDeviceTypeValues_Displacement equ (g_szDeviceTypeValues_32bit - g_szDeviceTypeValues)
    … …  
    159160    %endif
    160161    %if g_szDeviceTypeValues_8bit <> g_szDeviceTypeValues_32bit + g_szDeviceTypeValues_Displacement
    161         %error "g_szDeviceTypeValues Displacement Incorrect 2"
     162        %error "g_szDeviceTypeValues Displacement Incorrect 3"
    162163    %endif
    163164    %if g_szDeviceTypeValues_XTIDEr1 <> g_szDeviceTypeValues_8bit + g_szDeviceTypeValues_Displacement
    164         %error "g_szDeviceTypeValues Displacement Incorrect 3"
     165        %error "g_szDeviceTypeValues Displacement Incorrect 4"
    165166    %endif
    166167    %if g_szDeviceTypeValues_XTIDEr2 <> g_szDeviceTypeValues_XTIDEr1 + g_szDeviceTypeValues_Displacement
    167         %error "g_szDeviceTypeValues Displacement Incorrect 4"
     168        %error "g_szDeviceTypeValues Displacement Incorrect 5"
    168169    %endif
    169170    %if g_szDeviceTypeValues_XTCFpio8 <> g_szDeviceTypeValues_XTIDEr2 + g_szDeviceTypeValues_Displacement
    170         %error "g_szDeviceTypeValues Displacement Incorrect 5"
    171     %endif
    172     %if g_szDeviceTypeValues_XTCFdma <> g_szDeviceTypeValues_XTCFpio8 + g_szDeviceTypeValues_Displacement
    173171        %error "g_szDeviceTypeValues Displacement Incorrect 6"
    174172    %endif
    175     %if g_szDeviceTypeValues_XTCFmem <> g_szDeviceTypeValues_XTCFdma + g_szDeviceTypeValues_Displacement
     173    %if g_szDeviceTypeValues_XTCFpio8BIU <> g_szDeviceTypeValues_XTCFpio8 + g_szDeviceTypeValues_Displacement
    176174        %error "g_szDeviceTypeValues Displacement Incorrect 7"
    177175    %endif
    178     %if g_szDeviceTypeValues_JrIde <> g_szDeviceTypeValues_XTCFmem + g_szDeviceTypeValues_Displacement
     176    %if g_szDeviceTypeValues_XTCFpio16BIU <> g_szDeviceTypeValues_XTCFpio8BIU + g_szDeviceTypeValues_Displacement
    179177        %error "g_szDeviceTypeValues Displacement Incorrect 8"
    180178    %endif
     179    %if g_szDeviceTypeValues_XTCFdma <> g_szDeviceTypeValues_XTCFpio16BIU + g_szDeviceTypeValues_Displacement
     180        %error "g_szDeviceTypeValues Displacement Incorrect 9"
     181    %endif
     182    %if g_szDeviceTypeValues_JrIde <> g_szDeviceTypeValues_XTCFdma + g_szDeviceTypeValues_Displacement
     183        %error "g_szDeviceTypeValues Displacement Incorrect 10"
     184    %endif
    181185    %if g_szDeviceTypeValues_ADP50L <> g_szDeviceTypeValues_JrIde + g_szDeviceTypeValues_Displacement
    182         %error "g_szDeviceTypeValues Displacement Incorrect 9"
     186        %error "g_szDeviceTypeValues Displacement Incorrect 11"
    183187    %endif
    184188    %if g_szDeviceTypeValues_Serial <> g_szDeviceTypeValues_ADP50L + g_szDeviceTypeValues_Displacement
    185         %error "g_szDeviceTypeValues Displacement Incorrect 10"
     189        %error "g_szDeviceTypeValues Displacement Incorrect 12"
    186190    %endif
    187191%endif
Note: See TracChangeset for help on using the changeset viewer.