Changeset 371 in xtideuniversalbios for trunk


Ignore:
Timestamp:
Apr 5, 2012, 7:31:23 AM (13 years ago)
Author:
gregli@…
google:author:
gregli@hotmail.com
Message:

Small changes. 1) Changes biosdrvs.com to output CR+LF instead of LF+CR, consistent with DOS/Windows, but I did not update the Assembly Library as this would break the Configurator; 2) Put a C/C++ section in Version.inc for the serial server; 3) Configurator defaults the EEPROM address after scanning for a EEPROM in memory (as it does for loading the BIOS from ROM); 4) Added a command to the Configurator main menu to save chages to the file from which it was loaded (if it was loaded form a file), which is symmetric with the Load command and more discoverable than exiting DOS and then being prompted (which is still there too, if changes are unsaved).

Location:
trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/BIOS_Drive_Information_Tool/Src/Print.asm

    r359 r371  
    167167    add     sp, BYTE 8
    168168
    169     CALL_DISPLAY_LIBRARY    PrintNewlineCharacters
     169    push    si
     170    mov     si, g_szNewline
     171    call    Print_NullTerminatedStringFromSI
     172    pop     si
     173       
    170174    ret
    171175

  • trunk/BIOS_Drive_Information_Tool/Src/Strings.asm

    r359 r371  
    66SECTION .data
    77
    8 g_szProgramName:    db  "BIOS Drive Information Tool v1.0.1",LF,CR
    9                     db  "(C) 2012 by XTIDE Universal BIOS Team",LF,CR
    10                     db  "Released under GNU GPL v2",LF,CR
    11                     db  "http://code.google.com/p/xtideuniversalbios/",LF,CR,NULL
     8g_szProgramName:    db  "BIOS Drive Information Tool v1.0.1",CR,LF
     9                    db  "(C) 2012 by XTIDE Universal BIOS Team",CR,LF
     10                    db  "Released under GNU GPL v2",CR,LF
     11                    db  "http://code.google.com/p/xtideuniversalbios/",CR,LF,NULL
    1212                   
    13 g_szPressAnyKey:    db  LF,CR,"Press any key to display next drive.",LF,CR,NULL
     13g_szPressAnyKey:    db  CR,LF,"Press any key to display next drive.",CR,LF,NULL
    1414
    15 g_szHeaderDrive:    db  LF,CR,"-= Drive %2x =-",LF,CR,NULL
     15g_szHeaderDrive:    db  CR,LF,"-= Drive %2x =-",CR,LF,NULL
    1616
    17 g_szAtaInfoHeader:  db  "ATA-information from AH=25h...",LF,CR,NULL
    18 g_szFormatDrvName:  db  " Name: %s",LF,CR,NULL
    19 g_szFormatCHS:      db  " Cylinders    : %5-u, Heads: %3-u, Sectors: %2-u",LF,CR,NULL
     17g_szAtaInfoHeader:  db  "ATA-information from AH=25h...",CR,LF,NULL
     18g_szFormatDrvName:  db  " Name: %s",CR,LF,NULL
     19g_szFormatCHS:      db  " Cylinders    : %5-u, Heads: %3-u, Sectors: %2-u",CR,LF,NULL
    2020g_szChsSectors:     db  " CHS   sectors: ",NULL
    2121g_szLBA28:          db  " LBA28 sectors: ",NULL
    2222g_szLBA48:          db  " LBA48 sectors: ",NULL
    2323
    24 g_szXTUB:           db  "XTIDE Universal BIOS %s generates following L-CHS...",LF,CR,NULL
     24g_szXTUB:           db  "XTIDE Universal BIOS %s generates following L-CHS...",CR,LF,NULL
    2525g_szXTUBversion:    db  ROM_VERSION_STRING  ; This one is NULL terminated
    2626
    27 g_szOldInfoHeader:  db  "Old INT 13h information from AH=08h and AH=15h...",LF,CR,NULL
     27g_szOldInfoHeader:  db  "Old INT 13h information from AH=08h and AH=15h...",CR,LF,NULL
    2828                    ;   Cylinders
    2929g_szSectors:        db  " Total sectors: ",NULL
    3030
    3131
    32 g_szNewInfoHeader:  db  "EBIOS information from AH=48h...",LF,CR,NULL
    33 g_szNewExtensions:  db  " Version      : %2-x, Interface bitmap: %2-x",LF,CR,NULL
     32g_szNewInfoHeader:  db  "EBIOS information from AH=48h...",CR,LF,NULL
     33g_szNewExtensions:  db  " Version      : %2-x, Interface bitmap: %2-x",CR,LF,NULL
    3434                    ; Cylinders
    3535                    ; Total sectors
    36 g_szNewSectorSize:  db  " Sector size  : %u",LF,CR,NULL
     36g_szNewSectorSize:  db  " Sector size  : %u",CR,LF,NULL
    3737
    38 g_szBiosError:      db  " BIOS returned error code %x",LF,CR,NULL
     38g_szBiosError:      db  " BIOS returned error code %x",CR,LF,NULL
    3939g_szDashForZero:    db  "- ",NULL       ; Required by Assembly Library
     40
     41g_szNewline:        db  CR,LF,NULL

  • trunk/Serial_Server/win32/Win32.cpp

    r369 r371  
    1717#include "../library/flatimage.h"
    1818
     19#include "../../XTIDE_Universal_BIOS/inc/version.inc"
     20
    1921char *bannerStrings[] = {
    2022    "SerDrive - XTIDE Universal BIOS Serial Drive Server",
    2123    "Copyright (C) 2012 by XTIDE Universal BIOS Team",
    2224    "Released under GNU GPL v2, with ABSOLUTELY NO WARRANTY",
    23     "Version 2.0.0 Beta1, Built " __DATE__,
     25    ROM_VERSION_STRING,
    2426    "",
    2527    NULL };

  • trunk/XTIDE_Universal_BIOS/Inc/Version.inc

    r368 r371  
     1; /*
    12; Project name  :   XTIDE Universal BIOS
    23; Description   :   Version information.
     4
     5;--------------------------------------------------------------------------------
     6;
     7; Assembler Version
     8;
     9
    310%ifndef VERSION_INC
    411%define VERSION_INC
    … …  
    2431
    2532%endif ; VERSION_INC
     33
     34%comment
     35;*/
     36
     37//--------------------------------------------------------------------------------
     38//
     39// C/C++ Version
     40//
     41
     42#define BETA " Beta "
     43
     44#define ROM_VERSION_STRING      "v2.0.0" BETA "1 (" __DATE__ ")"
     45
     46/*
     47%endcomment
     48;*/

  • trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Buffers.asm

    r369 r371  
    100100ALIGN JUMP_ALIGN
    101101Buffers_SetUnsavedChanges:
    102     or      WORD [g_cfgVars+CFGVARS.wFlags], FLG_CFGVARS_UNSAVED
     102    or      WORD [cs:g_cfgVars+CFGVARS.wFlags], FLG_CFGVARS_UNSAVED
    103103    ret
    104104
    105105ALIGN JUMP_ALIGN
    106106Buffers_ClearUnsavedChanges:
    107     and     WORD [g_cfgVars+CFGVARS.wFlags], ~FLG_CFGVARS_UNSAVED
    108     ret
    109 
    110 ;--------------------------------------------------------------------       
    111 ; Buffers_TestLoaded
    112 ;   Parameters:
    113 ;       SS:BP:  Menu handle
    114 ;   Returns:
    115 ;       CF:     Set = BIOS Loaded
    116 ;   Corrupts registers:
    117 ;       AX
    118 ;--------------------------------------------------------------------               
    119 ALIGN JUMP_ALIGN
    120 Buffers_TestLoaded:
    121     test    word [cs:g_cfgVars+CFGVARS.wFlags], FLG_CFGVARS_FILELOADED    ; Clears CF
    122     jz      .done
    123     stc
    124 .done: 
    125     ret                     
     107    and     WORD [cs:g_cfgVars+CFGVARS.wFlags], ~FLG_CFGVARS_UNSAVED
     108    ret
    126109
    127110

  • trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Main.asm

    r280 r371  
    115115    at  CFGVARS.pMenupage,          dw  g_MenupageForMainMenu
    116116    at  CFGVARS.wFlags,             dw  DEFAULT_CFGVARS_FLAGS
    117     at  CFGVARS.wEepromSegment,     dw  DEFAULT_EEPROM_SEGMENT
     117    at  CFGVARS.wEepromSegment,     dw  0
    118118    at  CFGVARS.bEepromType,        db  DEFAULT_EEPROM_TYPE
    119119    at  CFGVARS.bEepromPage,        db  DEFAULT_PAGE_SIZE

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

    r293 r371  
    168168    push    cs
    169169    pop     ds
     170
     171    cmp     word [cs:g_cfgVars+CFGVARS.wEepromSegment], 0
     172    jnz     .alreadySet
     173
     174    push    es
     175    push    di
     176    call    EEPROM_FindXtideUniversalBiosROMtoESDI
     177    push    es
     178    pop     ax
     179    pop     di
     180    pop     es
     181    jc      .storeEepromSegment
     182    mov     ax, DEFAULT_EEPROM_SEGMENT
     183.storeEepromSegment:   
     184    mov     word [cs:g_cfgVars+CFGVARS.wEepromSegment], ax
     185       
     186.alreadySet:   
     187               
    170188    mov     si, g_MenupageForFlashMenu
    171189    jmp     Menupage_ChangeToNewMenupageInDSSI

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

    r336 r371  
    1010    at  MENUPAGE.fnEnter,           dw  MainMenu_EnterMenuOrModifyItemVisibility
    1111    at  MENUPAGE.fnBack,            dw  ExitToDosFromBackButton
    12     at  MENUPAGE.wMenuitems,        dw  8
     12    at  MENUPAGE.wMenuitems,        dw  9
    1313iend
    1414
    … …  
    7272    at  MENUITEM.bType,             db  TYPE_MENUITEM_PAGENEXT
    7373iend
     74
     75g_MenuitemMainMenuSaveFile:     
     76istruc MENUITEM
     77    at  MENUITEM.fnActivate,        dw  BiosFile_SaveUnsavedChanges
     78    at  MENUITEM.szName,            dw  g_szItemMainSave
     79    at  MENUITEM.szQuickInfo,       dw  g_szNfoMainSave
     80    at  MENUITEM.szHelp,            dw  g_szNfoMainSave
     81    at  MENUITEM.bFlags,            db  NULL
     82    at  MENUITEM.bType,             db  TYPE_MENUITEM_ACTION
     83iend       
    7484
    7585g_MenuitemMainMenuExitToDos:
    … …  
    113123    call    .EnableOrDisableConfigureXtideUniversalBios
    114124    call    .EnableOrDisableFlashEeprom
     125    call    .EnableOrDisableSave           
    115126    mov     si, g_MenupageForMainMenu
    116127    jmp     Menupage_ChangeToNewMenupageInDSSI
    … …  
    184195    ret
    185196
    186 
    187 
     197;--------------------------------------------------------------------
     198; .EnableOrDisableSave
     199;   Parameters:
     200;       DS:     CFGVARS segment
     201;   Returns:
     202;       Nothing
     203;   Corrupts registers:
     204;       Nothing
     205;--------------------------------------------------------------------
     206ALIGN JUMP_ALIGN       
     207.EnableOrDisableSave:   
     208    test    WORD [g_cfgVars+CFGVARS.wFlags], FLG_CFGVARS_FILELOADED
     209    jz      SHORT .DisableSave
     210    or      BYTE [g_MenuitemMainMenuSaveFile+MENUITEM.bFlags], FLG_MENUITEM_VISIBLE
     211    ret
     212
     213ALIGN JUMP_ALIGN               
     214.DisableSave:
     215    and     BYTE [g_MenuitemMainMenuSaveFile+MENUITEM.bFlags], ~FLG_MENUITEM_VISIBLE
     216    ret
     217               
    188218;--------------------------------------------------------------------
    189219; MENUITEM activation functions (.fnActivate)

  • trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Strings.asm

    r369 r371  
    5555g_szItemMainConfigure:  db  "Configure XTIDE Universal BIOS",NULL
    5656g_szItemMainFlash:      db  "Flash EEPROM",NULL
     57g_szItemMainSave:       db  "Save BIOS back to original file",NULL     
    5758g_szItemMainLicense:    db  "Copyright and License Information",NULL
    5859g_szItemMainHomePage:   db  "Web Links",NULL
    … …  
    7475g_szNfoMainConfigure:   db  "Configure XTIDE Universal BIOS settings.",NULL
    7576g_szNfoMainFlash:       db  "Flash loaded BIOS image to EEPROM.",NULL
     77g_szNfoMainSave:        db  "Save BIOS changes back to original file from which it was loaded.",NULL
    7678g_szNfoMainLicense:     db  "XTIDE Universal BIOS and XTIDECFG Copyright (C) 2009-2010 by Tomi Tilli, 2011-2012 by XTIDE Universal BIOS Team. Released under GNU GPL v2, with ABSOLUTELY NO WARRANTY. Press ENTER for more details...",NULL
    7779g_szNfoMainHomePage:    db  "Visit http://code.google.com/p/ xtideuniversalbios (home page) and http://vintage-computer.com/ vcforum (support)",NULL
Note: See TracChangeset for help on using the changeset viewer.