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


Ignore:
Timestamp:
Mar 12, 2012, 1:33:24 PM (12 years ago)
Author:
krille_n_@…
google:author:
krille_n_@hotmail.com
Message:

Changes:

  • Fixed a bug in the new BIOS Drive Information Tool.
  • Very small changes to improve speed (I hope).
  • Changed AH48h_GetExtendedDriveParameters.asm to allow AT builds with USE_386 (won't affect any other builds).
  • Verified that most define combinations can be built and changed Strings.asm accordingly. "Most" meaning with or without any combination of EBIOS and/or Serial code defines.
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/XTIDE_Universal_BIOS/Src/Strings.asm

    r322 r332  
    6161    %endif
    6262%endif
     63
     64g_szBusTypeValues:
     65g_szBusTypeValues_8Dual:        db      "D8 ",NULL
     66g_szBusTypeValues_8Reversed:    db      "X8 ",NULL
     67g_szBusTypeValues_8Single:      db      "S8 ",NULL
     68g_szBusTypeValues_16:           db      " 16",NULL
     69g_szBusTypeValues_32:           db      " 32",NULL
     70g_szBusTypeValues_Serial:       db      "SER",NULL
     71g_szBusTypeValues_8MemMapped:   db      "M8 ",NULL
     72g_szBusTypeValues_Displacement equ (g_szBusTypeValues_8Reversed - g_szBusTypeValues)
     73;
     74; Ensure that bus type strings are correctly spaced in memory
     75;
     76%ifndef CHECK_FOR_UNUSED_ENTRYPOINTS
     77    %if g_szBusTypeValues_8Dual <> g_szBusTypeValues
     78        %error "g_szBusTypeValues Displacement Incorrect 1"
     79    %endif
     80    %if g_szBusTypeValues_8Reversed <> g_szBusTypeValues + g_szBusTypeValues_Displacement
     81        %error "g_szBusTypeValues Displacement Incorrect 2"
     82    %endif
     83    %if g_szBusTypeValues_8Single <> g_szBusTypeValues_8Reversed + g_szBusTypeValues_Displacement
     84        %error "g_szBusTypeValues Displacement Incorrect 3"
     85    %endif
     86    %if g_szBusTypeValues_16 <> g_szBusTypeValues_8Single + g_szBusTypeValues_Displacement
     87        %error "g_szBusTypeValues Displacement Incorrect 4"
     88    %endif
     89    %if g_szBusTypeValues_32 <> g_szBusTypeValues_16 + g_szBusTypeValues_Displacement
     90        %error "g_szBusTypeValues Displacement Incorrect 5"
     91    %endif
     92    %if g_szBusTypeValues_Serial <> g_szBusTypeValues_32 + g_szBusTypeValues_Displacement
     93        %error "g_szBusTypeValues Displacement Incorrect 6"
     94    %endif
     95    %if g_szBusTypeValues_8MemMapped <> g_szBusTypeValues_Serial + g_szBusTypeValues_Displacement
     96        %error "g_szBusTypeValues Displacement Incorrect 7"
     97    %endif
     98%endif
     99
     100g_szSelectionTimeout:   db      DOUBLE_BOTTOM_LEFT_CORNER,DOUBLE_LEFT_HORIZONTAL_TO_SINGLE_VERTICAL,"%ASelection in %2-u s",NULL
     101
     102g_szDashForZero:        db      "- ",NULL
     103
     104; Boot Menu menuitem strings
     105;
     106; The following strings are used by BootMenuPrint_* routines.
     107; To support optimizations in that code, these strings must start on the same 256 byte page,
     108; which is checked at assembly time below.
     109;
     110g_szBootMenuPrintStart:
     111g_szDriveNum:           db  "%x %s",NULL
     112g_szDriveNumBOOTNFO:    db  "%x %z",NULL
     113g_szFloppyDrv:          db  "Floppy Drive %c",NULL
     114g_szBootMenuPrintEnd:
     115g_szForeignHD:          db  "Foreign Hard Disk",NULL
     116
     117%ifndef CHECK_FOR_UNUSED_ENTRYPOINTS
     118    %if ((g_szBootMenuPrintStart-$$) & 0xff00) <> ((g_szBootMenuPrintEnd-$$) & 0xff00)
     119        %error "g_szBootMenuPrint* strings must start on the same 256 byte page, required by the BootMenuPrint_* routines.  Please move this block up or down within strings.asm"
     120    %endif
     121%endif
     122
     123; Boot menu bottom of screen strings
     124g_szFDD:        db  "FDD     ",NULL
     125g_szHDD:        db  "HDD     ",NULL
     126g_szRomBoot:    db  "ROM Boot",NULL
     127g_szHotkey:     db  "%A%c%c%A%s%A ",NULL
     128
     129; Boot Menu information strings
     130g_szCapacity:           db  "Capacity : %s",NULL
     131g_szCapacityNum:        db  "%5-u.%u %ciB",NULL
     132g_szInformation:        db  "%s",LF,CR
     133    db  "Addr.",SINGLE_VERTICAL,"Block",SINGLE_VERTICAL,"Bus",SINGLE_VERTICAL,  "IRQ",SINGLE_VERTICAL,"Reset",LF,CR
     134    db     "%s",SINGLE_VERTICAL, "%5-u",SINGLE_VERTICAL, "%s",SINGLE_VERTICAL," %2-I",SINGLE_VERTICAL,"%5-x" ,NULL
    63135
    64136; The following strings are used by DetectPrint_StartDetectWithMasterOrSlaveStringInCXandIdeVarsInCSBP
    … …  
    85157    %endif
    86158%endif
    87 
    88 g_szBusTypeValues:
    89 g_szBusTypeValues_8Dual:        db      "D8 ",NULL
    90 g_szBusTypeValues_8Reversed:    db      "X8 ",NULL
    91 g_szBusTypeValues_8Single:      db      "S8 ",NULL
    92 g_szBusTypeValues_16:           db      " 16",NULL
    93 g_szBusTypeValues_32:           db      " 32",NULL
    94 g_szBusTypeValues_Serial:       db      "SER",NULL
    95 g_szBusTypeValues_8MemMapped:   db      "M8 ",NULL
    96 g_szBusTypeValues_Displacement equ (g_szBusTypeValues_8Reversed - g_szBusTypeValues)
    97 ;
    98 ; Ensure that bus type strings are correctly spaced in memory
    99 ;
    100 %ifndef CHECK_FOR_UNUSED_ENTRYPOINTS
    101     %if g_szBusTypeValues_8Dual <> g_szBusTypeValues
    102         %error "g_szBusTypeValues Displacement Incorrect 1"
    103     %endif
    104     %if g_szBusTypeValues_8Reversed <> g_szBusTypeValues + g_szBusTypeValues_Displacement
    105         %error "g_szBusTypeValues Displacement Incorrect 2"
    106     %endif
    107     %if g_szBusTypeValues_8Single <> g_szBusTypeValues_8Reversed + g_szBusTypeValues_Displacement
    108         %error "g_szBusTypeValues Displacement Incorrect 3"
    109     %endif
    110     %if g_szBusTypeValues_16 <> g_szBusTypeValues_8Single + g_szBusTypeValues_Displacement
    111         %error "g_szBusTypeValues Displacement Incorrect 4"
    112     %endif
    113     %if g_szBusTypeValues_32 <> g_szBusTypeValues_16 + g_szBusTypeValues_Displacement
    114         %error "g_szBusTypeValues Displacement Incorrect 5"
    115     %endif
    116     %if g_szBusTypeValues_Serial <> g_szBusTypeValues_32 + g_szBusTypeValues_Displacement
    117         %error "g_szBusTypeValues Displacement Incorrect 6"
    118     %endif
    119     %if g_szBusTypeValues_8MemMapped <> g_szBusTypeValues_Serial + g_szBusTypeValues_Displacement
    120         %error "g_szBusTypeValues Displacement Incorrect 7"
    121     %endif
    122 %endif
    123 
    124 ; Boot Menu menuitem strings
    125 ;
    126 ; The following strings are used by BootMenuPrint_* routines.
    127 ; To support optimizations in that code, these strings must start on the same 256 byte page,
    128 ; which is checked at assembly time below.
    129 ;
    130 g_szBootMenuPrintStart:
    131 g_szDriveNum:           db  "%x %s",NULL
    132 g_szDriveNumBOOTNFO:    db  "%x %z",NULL
    133 g_szFloppyDrv:          db  "Floppy Drive %c",NULL
    134 g_szBootMenuPrintEnd:
    135 g_szForeignHD:          db  "Foreign Hard Disk",NULL
    136 
    137 %ifndef CHECK_FOR_UNUSED_ENTRYPOINTS
    138     %if ((g_szBootMenuPrintStart-$$) & 0xff00) <> ((g_szBootMenuPrintEnd-$$) & 0xff00)
    139         %error "g_szBootMenuPrint* strings must start on the same 256 byte page, required by the BootMenuPrint_* routines.  Please move this block up or down within strings.asm"
    140     %endif
    141 %endif
    142 
    143 g_szSelectionTimeout:   db      DOUBLE_BOTTOM_LEFT_CORNER,DOUBLE_LEFT_HORIZONTAL_TO_SINGLE_VERTICAL,"%ASelection in %2-u s",NULL
    144 
    145 g_szDashForZero:        db      "- ",NULL
    146 
    147 ; Boot menu bottom of screen strings
    148 g_szFDD:        db  "FDD     ",NULL
    149 g_szHDD:        db  "HDD     ",NULL
    150 g_szRomBoot:    db  "ROM Boot",NULL
    151 g_szHotkey:     db  "%A%c%c%A%s%A ",NULL
    152 
    153 ; Boot Menu information strings
    154 g_szCapacity:           db  "Capacity : %s",NULL
    155 g_szCapacityNum:        db  "%5-u.%u %ciB",NULL
    156 g_szInformation:        db  "%s",LF,CR
    157     db  "Addr.",SINGLE_VERTICAL,"Block",SINGLE_VERTICAL,"Bus",SINGLE_VERTICAL,  "IRQ",SINGLE_VERTICAL,"Reset",LF,CR
    158     db     "%s",SINGLE_VERTICAL, "%5-u",SINGLE_VERTICAL, "%s",SINGLE_VERTICAL," %2-I",SINGLE_VERTICAL,"%5-x" ,NULL
    159159
    160160;------------------------------------------------------------------------------------------
Note: See TracChangeset for help on using the changeset viewer.