Changeset 280 in xtideuniversalbios for trunk


Ignore:
Timestamp:
Feb 28, 2012, 5:48:29 PM (13 years ago)
Author:
gregli@…
google:author:
gregli@hotmail.com
Message:

Updated configurator with serial code move to assembly library. Updated version number to 2.0.0

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Assembly_Library/Src/AssemblyLibrary.asm

    r277 r280  
    7474    %include "SerialServer.asm"
    7575    %include "SerialServerScan.asm"
    76     %ifndef EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS
    77         %include "SerialServerImage.asm"
    78     %endif
    7976    %define INCLUDE_TIME_LIBRARY
    8077%endif     

  • trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Main.asm

    r153 r280  
    33
    44; Include .inc files
     5       
    56%define INCLUDE_MENU_DIALOGS
     7%define INCLUDE_SERIAL_LIBRARY
     8       
    69%include "AssemblyLibrary.inc"  ; Assembly Library. Must be included first!
    710%include "Romvars.inc"          ; XTIDE Universal BIOS variables

  • trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Menupages/IdeControllerMenu.asm

    r242 r280  
    216216    dw  NULL
    217217
    218 DEVICE_SERIAL_DEFAULT_CUSTOM_PORT   EQU     300h           ; can't be any of the pre-defined COM values
     218SERIAL_DEFAULT_CUSTOM_PORT   EQU        300h           ; can't be any of the pre-defined COM values
    219219
    220220PackedCOMPortAddresses:             ; COM1 - COMC (or COM12)
    221     db      DEVICE_SERIAL_COM1 >> 2
    222     db      DEVICE_SERIAL_COM2 >> 2
    223     db      DEVICE_SERIAL_COM3 >> 2
    224     db      DEVICE_SERIAL_COM4 >> 2
    225     db      DEVICE_SERIAL_COM5 >> 2
    226     db      DEVICE_SERIAL_COM6 >> 2
    227     db      DEVICE_SERIAL_COM7 >> 2
    228     db      DEVICE_SERIAL_COM8 >> 2
    229     db      DEVICE_SERIAL_COM9 >> 2
    230     db      DEVICE_SERIAL_COMA >> 2
    231     db      DEVICE_SERIAL_COMB >> 2
    232     db      DEVICE_SERIAL_COMC >> 2
    233     db      DEVICE_SERIAL_DEFAULT_CUSTOM_PORT >> 2          ; must be last entry (see reader/writer routines)
    234 DEVICE_SERIAL_DEFAULT_COM           EQU     '1'
     221    db      SERIAL_COM1_IOADDRESS >> 2
     222    db      SERIAL_COM2_IOADDRESS >> 2
     223    db      SERIAL_COM3_IOADDRESS >> 2
     224    db      SERIAL_COM4_IOADDRESS >> 2
     225    db      SERIAL_COM5_IOADDRESS >> 2
     226    db      SERIAL_COM6_IOADDRESS >> 2
     227    db      SERIAL_COM7_IOADDRESS >> 2
     228    db      SERIAL_COM8_IOADDRESS >> 2
     229    db      SERIAL_COM9_IOADDRESS >> 2
     230    db      SERIAL_COMA_IOADDRESS >> 2
     231    db      SERIAL_COMB_IOADDRESS >> 2
     232    db      SERIAL_COMC_IOADDRESS >> 2
     233    db      SERIAL_DEFAULT_CUSTOM_PORT >> 2         ; must be last entry (see reader/writer routines)
     234SERIAL_DEFAULT_COM          EQU     '1'
    235235
    236236g_rgbChoiceToValueLookupForBaud:
    … …  
    253253    dw      g_szValueCfgBaud2400
    254254    dw      NULL
    255 DEVICE_SERIAL_DEFAULT_BAUD          EQU     ((115200 / 9600)    & 0xff)
     255SERIAL_DEFAULT_BAUD         EQU     ((115200 / 9600)    & 0xff)
    256256
    257257; Section containing code
    … …  
    519519        jz      .done                               ; if we were already serial, nothing to do
    520520
    521         mov     byte [es:di+IDEVARS.bSerialBaud-IDEVARS.wPort],DEVICE_SERIAL_DEFAULT_BAUD
    522 
    523         mov     al,DEVICE_SERIAL_DEFAULT_COM
     521        mov     byte [es:di+IDEVARS.bSerialBaud-IDEVARS.wPort],SERIAL_DEFAULT_BAUD
     522
     523        mov     al,SERIAL_DEFAULT_COM
    524524        add     di,IDEVARS.bSerialCOMPortChar-IDEVARS.wPort
    525525        call    IdeControllerMenu_SerialWriteCOM
    … …  
    549549        mov     ah,[bx]
    550550
    551         cmp     ah,(DEVICE_SERIAL_DEFAULT_CUSTOM_PORT >> 2)
     551        cmp     ah,(SERIAL_DEFAULT_CUSTOM_PORT >> 2)
    552552        jz      .notFound
    553553

  • trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Strings.asm

    r258 r280  
    77; Menu title
    88g_szProgramTitle:
    9     db  "Configuration and Flashing program for XTIDE Universal BIOS v1.2.0.",LF,CR,NULL
     9    db  "Configuration and Flashing program for XTIDE Universal BIOS v2.0.0.",LF,CR,NULL
    1010g_szXtideUniversalBiosSignature:    db  "XTIDE120",NULL
    1111g_szBiosIsNotLoaded:                db  "BIOS is not loaded!",NULL
Note: See TracChangeset for help on using the changeset viewer.