Changeset 592 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Menupages/MainMenu.asm

Timestamp:

Jun 25, 2018, 10:29:27 PM (6 years ago)

Author:

krille_n_

Message:

Changes:

• The problem with NASM in the previous revision (r591) has been fixed.
• The colors used by the boot menu and hotkey bar can now be customized by selecting one of a number of pre-defined color themes. Suggestions for additional themes are more than welcome!
• Large builds are now 10 KB. Small builds are still 8 KB with the exception of the Tiny build which is now 4 KB. In other words, builds are now as small as possible to make it easier to combine them with other BIOSes.
• Added code to the library to improve drive error handling. XTIDECFG can now handle "Drive Not Ready" errors.
• Fixed a couple of potential bugs in AtaID.asm (AtaID_GetMaxPioModeToAXandMinCycleTimeToCX); 1) ATA1.bPioMode was treated as a WORD variable. 2) ATA2.bPIOSupp was assumed to be non-zero which would result in PIO mode 3 being returned if the assumption was wrong.
• Made the same changes in the equivalent function used by BIOSDRVS (DisplayPioModeInformationUsingAtaInfoFromDSBX in AtaInfo.asm).
• Fixed a bug from r587 in PDC20x30.asm in PDC20x30_GetMaxPioModeToALandMinPioCycleTimeToBX.
• Fixed a bug from r523 in XTIDECFG where Auto Configure would only set the IRQ on one IDE interface on AT-builds.
• XTIDECFG will now restore the default settings for the "Serial port virtual device" when reselecting it in the list of device types. This makes it behave consistently for all device types.
• The eAAM macro is now used regardless if USE_UNDOC_INTEL is defined or not because it is apparently supported on all processors including the NEC V20/V30 CPUs.
• Renamed the EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS define to EXCLUDE_FROM_XUB.
• Added a define to exclude unused library code from BIOSDRVS (EXCLUDE_FROM_BIOSDRVS). This makes it a lot smaller than in previous revisions.
• All unnecessary CLD-instructions are now under a new define 'CLD_NEEDED' which is only enabled for the BIOS. It is disabled for XTIDECFG and BIOSDRVS but can be enabled if needed by adding this define to the respective makefile. This change was made because these unnecessary instructions are wasteful and should never be needed. In fact, they only serve to hide bugs (in other peoples code) which I strongly believe should be avoided. I recommend people making their own BIOSes from source to not use this define as it's extremely unlikely to be needed.
• Updated the copyright info in SerDrive and changed an URL to point to the new site.
• Updated the copyright info and version number in BIOSDRVS.
• Updated the copyright info in XTIDECFG.
• Optimizations in general.

File:

• trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Menupages/MainMenu.asm (modified) (6 diffs)

trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Menupages/MainMenu.asm

@@ -155 +155 @@
 .EnableOrDisableXtideRomItems:
     call    EEPROM_FindXtideUniversalBiosROMtoESDI
-    jnc     SHORT .DisableAllRomItems
+    jc      SHORT .DisableAllRomItems
     or      BYTE [g_MenuitemMainMenuLoadXtideUniversalBiosFromRom+MENUITEM.bFlags], FLG_MENUITEM_VISIBLE
     call    Buffers_IsXtideUniversalBiosLoaded
@@ -201 +201 @@
 ALIGN JUMP_ALIGN
 .EnableOrDisableFlashEeprom:
-    test    WORD [g_cfgVars+CFGVARS.wFlags], FLG_CFGVARS_FILELOADED | FLG_CFGVARS_ROMLOADED
+    test    BYTE [g_cfgVars+CFGVARS.wFlags], FLG_CFGVARS_FILELOADED | FLG_CFGVARS_ROMLOADED
     jz      SHORT .DisableFlashEeprom
     or      BYTE [g_MenuitemMainMenuFlashEeprom+MENUITEM.bFlags], FLG_MENUITEM_VISIBLE
@@ -222 +222 @@
 ALIGN JUMP_ALIGN
 .EnableOrDisableSave:
-    test    WORD [g_cfgVars+CFGVARS.wFlags], FLG_CFGVARS_FILELOADED
+    test    BYTE [g_cfgVars+CFGVARS.wFlags], FLG_CFGVARS_FILELOADED
     jz      SHORT .DisableSave
     or      BYTE [g_MenuitemMainMenuSaveFile+MENUITEM.bFlags], FLG_MENUITEM_VISIBLE
@@ -257 +257 @@
     add     si, BYTE FILE_DIALOG_IO.szFile
     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:
@@ -272 +274 @@
     mov     dx, g_szDlgMainLoadROM
     call    Dialogs_DisplayNotificationFromCSDX
+    call    LoadColorTheme
     jmp     MainMenu_EnterMenuOrModifyItemVisibility
 
@@ -281 +284 @@
     call    Buffers_SetUnsavedChanges
     mov     dx, g_szDlgMainLoadStngs
-    jmp     Dialogs_DisplayNotificationFromCSDX
-
+    call    Dialogs_DisplayNotificationFromCSDX
+    call    EEPROM_FindXtideUniversalBiosROMtoESDI
+    call    LoadColorTheme.FromROM
+    jmp     MainMenu_EnterMenuOrModifyItemVisibility
+
+
+;--------------------------------------------------------------------
+; LoadColorTheme
+;   Parameters:
+;       ES:     ROMVARS segment (only when loading theme from ROM)
+;   Returns:
+;       Nothing
+;   Corrupts registers:
+;       AX, BX, DI, ES
+;--------------------------------------------------------------------
+ALIGN JUMP_ALIGN
+LoadColorTheme:
+    call    Buffers_GetFileBufferToESDI
+.FromROM:
+    mov     ax, [es:ROMVARS.pColorTheme]
+    jmp     ReadColorTheme
+