Changeset 185 in xtideuniversalbios


Ignore:
Timestamp:
Nov 15, 2011, 5:52:06 AM (12 years ago)
Author:
gregli@…
google:author:
gregli@hotmail.com
Message:

Some basic cleanup and fixing build problems with the Configurator (missing strings)

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/XTIDE_Universal_BIOS/Src/Boot/BootMenuPrintCfg.asm

    r184 r185  
    5959    add     ax,g_szAddressingModes
    6060    push    ax
    61 ;
    62 ; Ensure that addressing modes are correctly spaced in memory
    63 ;
    64 %if g_szLCHS <> g_szAddressingModes
    65 %error "g_szAddressingModes Displacement Incorrect 1"
    66 %endif
    67 %if g_szPCHS <> g_szLCHS + g_szAddressingModes_Displacement
    68 %error "g_szAddressingModes Displacement Incorrect 2"
    69 %endif
    70 %if g_szLBA28 <> g_szPCHS + g_szAddressingModes_Displacement       
    71 %error "g_szAddressingModes Displacement Incorrect 3"
    72 %endif
    73 %if g_szLBA48 <> g_szLBA28 + g_szAddressingModes_Displacement       
    74 %error "g_szAddressingModes Displacement Incorrect 4"
    75 %endif             
    7661       
    7762;--------------------------------------------------------------------
    … …  
    10994    add     ax,g_szBusTypeValues
    11095    push    ax 
    111 
    112 ;
    113 ; Ensure that bus type strings are correctly spaced in memory
    114 ;
    115 %if g_szBusTypeValues_8Dual <> g_szBusTypeValues
    116 %error "g_szBusTypeValues Displacement Incorrect 1"
    117 %endif
    118 %if g_szBusTypeValues_8Reversed <> g_szBusTypeValues + g_szBusTypeValues_Displacement
    119 %error "g_szBusTypeValues Displacement Incorrect 2"     
    120 %endif
    121 %if g_szBusTypeValues_8Single <> g_szBusTypeValues_8Reversed + g_szBusTypeValues_Displacement
    122 %error "g_szBusTypeValues Displacement Incorrect 3"             
    123 %endif
    124 %if g_szBusTypeValues_16 <> g_szBusTypeValues_8Single + g_szBusTypeValues_Displacement     
    125 %error "g_szBusTypeValues Displacement Incorrect 4"             
    126 %endif
    127 %if g_szBusTypeValues_32 <> g_szBusTypeValues_16 + g_szBusTypeValues_Displacement
    128 %error "g_szBusTypeValues Displacement Incorrect 5"             
    129 %endif
    130 %if g_szBusTypeValues_Serial <> g_szBusTypeValues_32 + g_szBusTypeValues_Displacement
    131 %error "g_szBusTypeValues Displacement Incorrect 6"             
    132 %endif             
    13396               
    13497;--------------------------------------------------------------------

  • trunk/XTIDE_Universal_BIOS/Src/Strings.asm

    r184 r185  
    4343g_szLBA28:      db  "LBA28",NULL
    4444g_szLBA48:      db  "LBA48",NULL
    45 g_szAddressingModes_Displacement equ 6
     45g_szAddressingModes_Displacement equ (g_szPCHS - g_szAddressingModes)
     46;
     47; Ensure that addressing modes are correctly spaced in memory
     48;
     49%if g_szLCHS <> g_szAddressingModes
     50%error "g_szAddressingModes Displacement Incorrect 1"
     51%endif
     52%if g_szPCHS <> g_szLCHS + g_szAddressingModes_Displacement
     53%error "g_szAddressingModes Displacement Incorrect 2"
     54%endif
     55%if g_szLBA28 <> g_szPCHS + g_szAddressingModes_Displacement       
     56%error "g_szAddressingModes Displacement Incorrect 3"
     57%endif
     58%if g_szLBA48 <> g_szLBA28 + g_szAddressingModes_Displacement       
     59%error "g_szAddressingModes Displacement Incorrect 4"
     60%endif             
    4661       
    4762g_szFddUnknown: db  "%sUnknown",NULL
    … …  
    5166g_szFddThreeHalf:       db  "3",ONE_HALF,NULL
    5267g_szFddFiveQuarter:     db  "5",ONE_QUARTER,NULL       
    53 g_szFddThreeFive_Displacement equ 3
     68g_szFddThreeFive_Displacement equ (g_szFddFiveQuarter - g_szFddThreeHalf)
    5469
    5570g_szBusTypeValues:     
    … …  
    6075g_szBusTypeValues_32:           db      " 32",NULL
    6176g_szBusTypeValues_Serial:       db      "SER",NULL
    62 g_szBusTypeValues_Displacement equ 4
     77g_szBusTypeValues_Displacement equ (g_szBusTypeValues_8Reversed - g_szBusTypeValues)
     78;
     79; Ensure that bus type strings are correctly spaced in memory
     80;
     81%if g_szBusTypeValues_8Dual <> g_szBusTypeValues
     82%error "g_szBusTypeValues Displacement Incorrect 1"
     83%endif
     84%if g_szBusTypeValues_8Reversed <> g_szBusTypeValues + g_szBusTypeValues_Displacement
     85%error "g_szBusTypeValues Displacement Incorrect 2"     
     86%endif
     87%if g_szBusTypeValues_8Single <> g_szBusTypeValues_8Reversed + g_szBusTypeValues_Displacement
     88%error "g_szBusTypeValues Displacement Incorrect 3"             
     89%endif
     90%if g_szBusTypeValues_16 <> g_szBusTypeValues_8Single + g_szBusTypeValues_Displacement     
     91%error "g_szBusTypeValues Displacement Incorrect 4"             
     92%endif
     93%if g_szBusTypeValues_32 <> g_szBusTypeValues_16 + g_szBusTypeValues_Displacement
     94%error "g_szBusTypeValues Displacement Incorrect 5"             
     95%endif
     96%if g_szBusTypeValues_Serial <> g_szBusTypeValues_32 + g_szBusTypeValues_Displacement
     97%error "g_szBusTypeValues Displacement Incorrect 6"             
     98%endif             
    6399       
    64100g_szSelectionTimeout:   db      DOUBLE_BOTTOM_LEFT_CORNER,DOUBLE_LEFT_HORIZONTAL_TO_SINGLE_VERTICAL,"%ASelection in %2u s",NULL

  • trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Strings.asm

    r159 r185  
    298298g_szValueFlash32bytes:  db  "32 bytes",NULL
    299299g_szValueFlash64bytes:  db  "64 bytes",NULL
     300
     301g_szSelectionTimeout:   db      DOUBLE_BOTTOM_LEFT_CORNER,DOUBLE_LEFT_HORIZONTAL_TO_SINGLE_VERTICAL,"%ASelection in %2u s",NULL
     302
     303g_szDashForZero:        db      "- ",NULL

  • trunk/XTIDE_Universal_BIOS_Configurator_v2/makefile

    r181 r185  
    8989
    9090# Assembler
    91 AS = nasm.exe
     91AS = ..\..\nasm.exe
    9292
    9393# use this command to erase files.
Note: See TracChangeset for help on using the changeset viewer.