Changeset 481 in xtideuniversalbios


Ignore:
Timestamp:
Oct 27, 2012, 12:52:21 PM (12 years ago)
Author:
aitotat@…
google:author:
aitotat@gmail.com
Message:

Changes to Configurator v2:

  • Now up to date with recent changes in XTIDE Universal BIOS device numberings.
Location:
trunk/XTIDE_Universal_BIOS_Configurator_v2
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Main.asm

    r457 r481  
    2525%include "AssemblyLibrary.inc"  ; Assembly Library. Must be included first!
    2626%include "Romvars.inc"          ; XTIDE Universal BIOS variables
     27%include "XTCF.inc"             ; For XT-CF modes
    2728
    2829%include "Version.inc"

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

    r459 r481  
    188188
    189189g_rgwChoiceToValueLookupForDevice:
    190     dw  DEVICE_8BIT_JRIDE_ISA
    191     dw  DEVICE_8BIT_XTCF
    192     dw  DEVICE_8BIT_XTIDE_REV2
    193     dw  DEVICE_8BIT_XTIDE_REV1
    194190    dw  DEVICE_16BIT_ATA
    195191    dw  DEVICE_32BIT_ATA
     192    dw  DEVICE_8BIT_ATA
     193    dw  DEVICE_8BIT_XTIDE_REV1
     194    dw  DEVICE_8BIT_XTIDE_REV2
     195    dw  DEVICE_8BIT_XTCF_PIO8
     196    dw  DEVICE_8BIT_XTCF_DMA
     197    dw  DEVICE_8BIT_XTCF_MEMMAP
     198    dw  DEVICE_8BIT_JRIDE_ISA
    196199    dw  DEVICE_SERIAL_PORT
    197200g_rgszValueToStringLookupForDevice:
    198     dw  g_szValueCfgDeviceJrIdeIsa
    199     dw  g_szValueCfgDeviceFast
    200     dw  g_szValueCfgDeviceRev2
    201     dw  g_szValueCfgDeviceRev1
    202201    dw  g_szValueCfgDevice16b
    203202    dw  g_szValueCfgDevice32b
     203    dw  g_szValueCfgDevice8b
     204    dw  g_szValueCfgDeviceRev1
     205    dw  g_szValueCfgDeviceRev2
     206    dw  g_szValueCfgDevicePioXTCF
     207    dw  g_szValueCfgDeviceDmaXTCF
     208    dw  g_szValueCfgDeviceMemXTCF
     209    dw  g_szValueCfgDeviceJrIdeIsa
    204210    dw  g_szValueCfgDeviceSerial
    205211
    … …  
    297303    mov     [cs:g_MenuitemIdeControllerDevice+MENUITEM.itemValue+ITEM_VALUE.wRomvarsValueOffset], ax
    298304
    299     lea     ax, [bx+IDEVARS.wPort]
     305    lea     ax, [bx+IDEVARS.wBasePort]
    300306    mov     [cs:g_MenuitemIdeControllerCommandBlockAddress+MENUITEM.itemValue+ITEM_VALUE.wRomvarsValueOffset], ax
    301307
    … …  
    306312    mov     [cs:g_MenuitemIdeControllerSerialBaud+MENUITEM.itemValue+ITEM_VALUE.wRomvarsValueOffset], ax
    307313
    308     lea     ax, [bx+IDEVARS.wPortCtrl]
     314    lea     ax, [bx+IDEVARS.wControlBlockPort]
    309315    mov     [cs:g_MenuitemIdeControllerControlBlockAddress+MENUITEM.itemValue+ITEM_VALUE.wRomvarsValueOffset], ax
    310316
    … …  
    358364    call    Buffers_GetRomvarsValueToAXfromOffsetInBX
    359365    mov     bx, g_MenuitemIdeControllerEnableInterrupt
    360     cmp     al, DEVICE_SERIAL_PORT
     366    cmp     al, DEVICE_8BIT_XTIDE_REV2
    361367    jae     SHORT .DisableMenuitemFromCSBX
    362     cmp     al, DEVICE_8BIT_XTCF
    363     jbe     SHORT .DisableMenuitemFromCSBX
    364368
    365369    call    .EnableMenuitemFromCSBX
    … …  
    536540        mov     bl,[es:di]                          ; what is the current Device?
    537541
    538         add     di,IDEVARS.wPort - IDEVARS.bDevice  ; Get ready to set the Port addresses
     542        add     di,IDEVARS.wBasePort - IDEVARS.bDevice  ; Get ready to set the Port addresses
    539543
    540544        cmp     al,DEVICE_SERIAL_PORT
    … …  
    556560
    557561.writeNonSerial:
    558         stosw                                       ; Store defaults in IDEVARS.wPort and IDEVARS.wPortCtrl
     562        stosw                                       ; Store defaults in IDEVARS.wBasePort and IDEVARS.wBasePortCtrl
    559563        xchg    bx, ax
    560564        stosw
    … …  
    566570        jz      .done                               ; if we were already serial, nothing to do
    567571
    568         mov     byte [es:di+IDEVARS.bSerialBaud-IDEVARS.wPort],SERIAL_DEFAULT_BAUD
     572        mov     byte [es:di+IDEVARS.bSerialBaud-IDEVARS.wBasePort],SERIAL_DEFAULT_BAUD
    569573
    570574        mov     al,SERIAL_DEFAULT_COM
    571         add     di,IDEVARS.bSerialCOMPortChar-IDEVARS.wPort
     575        add     di,IDEVARS.bSerialCOMPortChar-IDEVARS.wBasePort
    572576        call    IdeControllerMenu_SerialWriteCOM
    573577        stosb

  • trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Strings.asm

    r459 r481  
    2424g_szProgramTitle:
    2525    db  "Configuration and Flashing program for XTIDE Universal BIOS v2.0.0.",LF,CR,NULL
    26 g_szXtideUniversalBiosSignature:    db  "XTIDE201",NULL
     26g_szXtideUniversalBiosSignature:    db  "XTIDE203",NULL
    2727g_szBiosIsNotLoaded:                db  "BIOS is not loaded!",NULL
    2828g_szEEPROM:                         db  "EEPROM",NULL
    … …  
    238238
    239239g_szMultichoiceCfgDevice:
    240                         db  "JR-IDE/ISA",LF
    241                         db  "Lo-tech XT-CF",LF
    242                         db  "XTIDE rev 2 or modded rev 1",LF
    243                         db  "XTIDE rev 1",LF
    244240                        db  "16-bit ISA/VLB/PCI IDE",LF
    245241                        db  "32-bit VLB/PCI IDE",LF
     242                        db  "16-bit ISA IDE in 8-bit mode",LF
     243                        db  "XTIDE rev 1",LF
     244                        db  "XTIDE rev 2 or modded rev 1",LF
     245                        db  "Lo-tech XT-CF in PIO mode",LF
     246                        db  "Lo-tech XT-CF in DMA mode",LF
     247                        db  "Lo-tech XT-CF in memory mode",LF
     248                        db  "JR-IDE/ISA",LF
    246249                        db  "Serial port virtual device",NULL
    247250
     251g_szValueCfgDevice16b:      db  "16-bit",NULL
     252g_szValueCfgDevice32b:      db  "32-bit",NULL
     253g_szValueCfgDevice8b:       db  "8-bit",NULL
     254g_szValueCfgDeviceRev1:     db  "XTIDE r1",NULL
     255g_szValueCfgDeviceRev2:     db  "XTIDE r2",NULL
     256g_szValueCfgDevicePioXTCF:  db  "XTCF PIO",NULL
     257g_szValueCfgDeviceDmaXTCF:  db  "XTCF DMA",NULL
     258g_szValueCfgDeviceMemXTCF:  db  "XTCF MEM",NULL
     259g_szValueCfgDeviceJrIdeIsa: db  "JR-ISA",NULL
     260g_szValueCfgDeviceSerial:   db  "Serial",NULL
    248261
    249262g_szSerialCOMChoice:
    … …  
    296309
    297310
    298 g_szValueCfgDeviceJrIdeIsa: db  "JR-ISA",NULL
    299 g_szValueCfgDeviceFast:     db  "XT-CF",NULL
    300 g_szValueCfgDeviceRev2:     db  "XTIDE r2",NULL
    301 g_szValueCfgDeviceRev1:     db  "XTIDE r1",NULL
    302 g_szValueCfgDevice16b:      db  "16-bit",NULL
    303 g_szValueCfgDevice32b:      db  "32-bit",NULL
    304 g_szValueCfgDeviceSerial:   db  "Serial",NULL
    305 
    306 
    307311
    308312; Strings for DRVPARAMS menu

  • trunk/XTIDE_Universal_BIOS_Configurator_v2/makefile

    r425 r481  
    4747LIBS += ../Assembly_Library/Src/Util/
    4848LIBS += ../XTIDE_Universal_BIOS/Inc/
     49LIBS += ../XTIDE_Universal_BIOS/Inc/Controllers/
    4950HEADERS += $(LIBS)
    5051
Note: See TracChangeset for help on using the changeset viewer.