Changeset 596 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS_Configurator_v2

Timestamp:

Jul 10, 2018, 1:20:11 AM (6 years ago)

Author:

krille_n_

Message:

Changes:

• Made changes to HotkeyBar.asm to give the Boot Menu and Hotkey Bar a more consistent look. It will probably seem a bit strange at first to people used to the classic theme.
• Added the missing parts of USE_NEC_V that should have been committed with the rest in r593.
• Removed DEFINES_ALL_FEATURES from the BIOS makefile. It didn't work anymore and never really made sense anyway. Added all the official builds to 'make unused' instead which actually uncovered some unused code in the Tiny build.
• XTIDECFG will no longer load color themes from unrecognized versions of the BIOS.
• Other fixes in comments and some minor optimizations.

Location:

trunk/XTIDE_Universal_BIOS_Configurator_v2

Files:

• Inc/MenuStructs.inc (modified) (1 diff)
• Src/BiosFile.asm (modified) (1 diff)
• Src/Buffers.asm (modified) (2 diffs)
• Src/Flash.asm (modified) (1 diff)
• Src/Menupages/MainMenu.asm (modified) (3 diffs)

trunk/XTIDE_Universal_BIOS_Configurator_v2/Inc/MenuStructs.inc

@@ -38 +38 @@
 
 struc MENUPAGE
-    .fnEnter            resb    2   ; Function to initialize MENUPAGE
-    .fnBack             resb    2   ; Function to initialize previous MENUPAGE
-    .wMenuitems         resb    2   ; Number of MENUITEM structs
-    .rgMenuitem:                    ; All MENUITEM structs in this MENUPAGE
+    .fnEnter                resb    2   ; Function to initialize MENUPAGE
+    .fnBack                 resb    2   ; Function to initialize previous MENUPAGE
+    .wMenuitems             resb    2   ; Number of MENUITEM structs
+    .rgMenuitem:                        ; All MENUITEM structs in this MENUPAGE
 endstruc
 
 struc MENUITEM
-    .fnActivate         resb    2   ; Offset to item activation function
-    .fnFormatValue      resb    2   ; Offset to item value formatting function
+    .fnActivate             resb    2   ; Offset to item activation function
+    .fnFormatValue          resb    2   ; Offset to item value formatting function
 
-    .szName             resb    2   ; Offset to item name string
-    .szQuickInfo        resb    2   ; Offset to item quick information string
-    .szHelp             resb    2   ; Offset to item help string
+    .szName                 resb    2   ; Offset to item name string
+    .szQuickInfo            resb    2   ; Offset to item quick information string
+    .szHelp                 resb    2   ; Offset to item help string
 
-    .bFlags             resb    1   ; Item flags
-    .bType              resb    1   ; Item type
-    .itemValue          resb    ITEM_VALUE_size     ; ITEM_VALUE for automated item handling
+    .bFlags                 resb    1   ; Item flags
+    .bType                  resb    1   ; Item type
+    .itemValue              resb    ITEM_VALUE_size     ; ITEM_VALUE for automated item handling
 endstruc
 

trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/BiosFile.asm

@@ -40 +40 @@
     jc      SHORT .DisplayErrorMessage
 
-    mov     ax, FLG_CFGVARS_FILELOADED
-    call    Buffers_NewBiosWithSizeInDXCXandSourceInAXhasBeenLoadedForConfiguration
+    mov     al, FLG_CFGVARS_FILELOADED
+    call    Buffers_NewBiosWithSizeInDXCXandSourceInALhasBeenLoadedForConfiguration
     call    FileIO_CloseUsingHandleFromBX
     call    DisplayFileLoadedSuccessfully

trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Buffers.asm

@@ -109 +109 @@
 
 ;--------------------------------------------------------------------
-; Buffers_NewBiosWithSizeInDXCXandSourceInAXhasBeenLoadedForConfiguration
+; Buffers_NewBiosWithSizeInDXCXandSourceInALhasBeenLoadedForConfiguration
 ;   Parameters:
 ;       AL:     EEPROM source (FLG_CFGVARS_FILELOADED or FLG_CFGVARS_ROMLOADED)
@@ -119 +119 @@
 ;--------------------------------------------------------------------
 ALIGN JUMP_ALIGN
-Buffers_NewBiosWithSizeInDXCXandSourceInAXhasBeenLoadedForConfiguration:
+Buffers_NewBiosWithSizeInDXCXandSourceInALhasBeenLoadedForConfiguration:
     and     BYTE [cs:g_cfgVars+CFGVARS.wFlags], ~(FLG_CFGVARS_FILELOADED | FLG_CFGVARS_ROMLOADED | FLG_CFGVARS_UNSAVED)
     or      [cs:g_cfgVars+CFGVARS.wFlags], al

trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Flash.asm

@@ -296 +296 @@
 
 ;--------------------------------------------------------------------
-; WaitUntilEepromPageWriteHasCompleted
+; .WaitUntilEepromPageWriteHasCompleted
 ;   Parameters:
 ;       SS:BP:  Ptr to FLASHVARS

trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Menupages/MainMenu.asm

@@ -258 +258 @@
     call    BiosFile_LoadFileFromDSSItoRamBuffer
     call    LoadColorTheme
-    ; *FIXME* Will load themes even from unrecognized versions of the BIOS which isn't really a problem but still 'unexpected behaviour' and therefore a bug.
     call    MainMenu_EnterMenuOrModifyItemVisibility
 .CancelFileLoading:
@@ -270 +269 @@
     call    Buffers_SaveChangesIfFileLoaded
     call    EEPROM_LoadXtideUniversalBiosFromRomToRamBufferAndReturnSizeInDXCX
-    mov     ax, FLG_CFGVARS_ROMLOADED
-    call    Buffers_NewBiosWithSizeInDXCXandSourceInAXhasBeenLoadedForConfiguration
+    mov     al, FLG_CFGVARS_ROMLOADED
+    call    Buffers_NewBiosWithSizeInDXCXandSourceInALhasBeenLoadedForConfiguration
     mov     dx, g_szDlgMainLoadROM
     call    Dialogs_DisplayNotificationFromCSDX
@@ -297 +296 @@
 ;       Nothing
 ;   Corrupts registers:
-;       AX, BX, DI, ES
+;       AX, BX, CX, SI, DI, ES
 ;--------------------------------------------------------------------
 ALIGN JUMP_ALIGN
 LoadColorTheme:
     call    Buffers_GetFileBufferToESDI
+    call    Buffers_IsXtideUniversalBiosSignatureInESDI
+    jnz     SHORT .Return
 .FromROM:
     mov     ax, [es:ROMVARS.pColorTheme]
     jmp     ReadColorTheme
-
+.Return:
+    ret
+