Changeset 457 in xtideuniversalbios for trunk

Timestamp:

Sep 9, 2012, 7:19:00 PM (12 years ago)

Author:

aitotat@…

google:author:

aitotat@gmail.com

Message:

Changes to Configurator v2:

• Operating mode selection is no longer displayed for AT builds.
• Power Management is now displayed only when MODULE_FEATURE_SETS is available.

Location:

trunk/XTIDE_Universal_BIOS_Configurator_v2/Src

Files:

• Buffers.asm (modified) (1 diff)
• Main.asm (modified) (1 diff)
• Menupages/ConfigurationMenu.asm (modified) (5 diffs)

trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Buffers.asm

@@ -84 +84 @@
 
 ;--------------------------------------------------------------------
+; Buffers_IsXTbuildLoaded
+;   Parameters:
+;       Nothing
+;   Returns:
+;       ZF:     Set if XT or XT+ build is loaded
+;               Cleared if some other (AT, 386) build is loaded
+;   Corrupts registers:
+;       DI, ES
+;--------------------------------------------------------------------
+ALIGN JUMP_ALIGN
+Buffers_IsXTbuildLoaded:
+%strlen BUILD_TYPE_OFFSET   TITLE_STRING_START
+    call    Buffers_GetFileBufferToESDI
+    cmp     WORD [es:di+ROMVARS.szTitle+BUILD_TYPE_OFFSET+1], 'XT'  ; +1 is for '('
+    ret
+%undef BUILD_TYPE_OFFSET
+
+
+;--------------------------------------------------------------------
 ; Buffers_NewBiosWithSizeInDXCXandSourceInAXhasBeenLoadedForConfiguration
 ;   Parameters:

trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Main.asm

@@ -26 +26 @@
 %include "Romvars.inc"          ; XTIDE Universal BIOS variables
 
+%include "Version.inc"
 %include "MenuCfg.inc"
 %include "MenuStructs.inc"

trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Menupages/ConfigurationMenu.asm

@@ -96 +96 @@
     at  MENUITEM.szQuickInfo,       dw  g_szNfoCfgFullMode
     at  MENUITEM.szHelp,            dw  g_szHelpCfgFullMode
-    at  MENUITEM.bFlags,            db  FLG_MENUITEM_VISIBLE | FLG_MENUITEM_MODIFY_MENU | FLG_MENUITEM_FLAGVALUE
+    at  MENUITEM.bFlags,            db  FLG_MENUITEM_MODIFY_MENU | FLG_MENUITEM_FLAGVALUE
     at  MENUITEM.bType,             db  TYPE_MENUITEM_MULTICHOICE
     at  MENUITEM.itemValue + ITEM_VALUE.wRomvarsValueOffset,        dw  ROMVARS.wFlags
@@ -142 +142 @@
     at  MENUITEM.szQuickInfo,       dw  g_szNfoCfgIdleTimeout
     at  MENUITEM.szHelp,            dw  g_szHelpCfgIdleTimeout
-    at  MENUITEM.bFlags,            db  FLG_MENUITEM_VISIBLE | FLG_MENUITEM_BYTEVALUE | FLG_MENUITEM_CHOICESTRINGS
+    at  MENUITEM.bFlags,            db  FLG_MENUITEM_BYTEVALUE | FLG_MENUITEM_CHOICESTRINGS
     at  MENUITEM.bType,             db  TYPE_MENUITEM_MULTICHOICE
     at  MENUITEM.itemValue + ITEM_VALUE.wRomvarsValueOffset,        dw  ROMVARS.bIdleTimeout
@@ -187 +187 @@
     call    .DisableAllIdeControllerMenuitems
     call    .EnableIdeControllerMenuitemsBasedOnConfiguration
+    call    .EnableOrDisableOperatingModeSelection
     call    .EnableOrDisableKiBtoStealFromRAM
+    call    .EnableOrDisableIdleTimeout
     call    LimitIdeControllersForLiteMode
     mov     si, g_MenupageForConfigurationMenu
@@ -229 +231 @@
 
 ;--------------------------------------------------------------------
+; .EnableOrDisableOperatingModeSelection
+;   Parameters:
+;       SS:BP:  Menu handle
+;   Returns:
+;       Nothing
+;   Corrupts registers:
+;       BX, DI, ES
+;--------------------------------------------------------------------
+ALIGN JUMP_ALIGN
+.EnableOrDisableOperatingModeSelection:
+    mov     bx, g_MenuitemConfigurationFullOperatingMode
+    call    Buffers_IsXTbuildLoaded
+    je      SHORT .EnableMenuitemFromCSBX
+    jmp     SHORT .DisableMenuitemFromCSBX
+
+
+;--------------------------------------------------------------------
 ; .EnableOrDisableKiBtoStealFromRAM
 ;   Parameters:
@@ -242 +261 @@
     mov     bx, g_MenuitemConfigurationKiBtoStealFromRAM
     test    ax, FLG_ROMVARS_FULLMODE
+    jz      SHORT .DisableMenuitemFromCSBX
+    jmp     SHORT .EnableMenuitemFromCSBX
+
+
+;--------------------------------------------------------------------
+; .EnableOrDisableIdleTimeout
+;   Parameters:
+;       SS:BP:  Menu handle
+;   Returns:
+;       Nothing
+;   Corrupts registers:
+;       AX, BX
+;--------------------------------------------------------------------
+ALIGN JUMP_ALIGN
+.EnableOrDisableIdleTimeout:
+    call    Buffers_GetRomvarsFlagsToAX
+    mov     bx, g_MenuitemConfigurationIdleTimeout
+    test    ax, FLG_ROMVARS_MODULE_FEATURE_SETS
     jz      SHORT .DisableMenuitemFromCSBX
     ; Fall to .EnableMenuitemFromCSBX