Changeset 459 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Menupages/BootMenuSettingsMenu.asm

Timestamp:

Sep 11, 2012, 5:53:27 PM (12 years ago)

Author:

aitotat@…

google:author:

aitotat@gmail.com

Message:

Changes to Configurator v2:

• All remaining module specific settings should now be hidden if module is not included in the build.

File:

• trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Menupages/BootMenuSettingsMenu.asm (modified) (4 diffs)

trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Menupages/BootMenuSettingsMenu.asm

@@ -94 +94 @@
     at  MENUITEM.szQuickInfo,       dw  g_szNfoBootDrive
     at  MENUITEM.szHelp,            dw  g_szHelpBootDrive
-    at  MENUITEM.bFlags,            db  FLG_MENUITEM_VISIBLE | FLG_MENUITEM_BYTEVALUE
+    at  MENUITEM.bFlags,            db  FLG_MENUITEM_BYTEVALUE
     at  MENUITEM.bType,             db  TYPE_MENUITEM_HEX
     at  MENUITEM.itemValue + ITEM_VALUE.wRomvarsValueOffset,        dw  ROMVARS.bBootDrv
@@ -163 +163 @@
     push    cs
     pop     ds
-    call    EnableOrDisableBootMenuSettings
-    call    EnableOrDisableSerialSettings
+    call    .EnableOrDisableScanForSerialDrives
+    call    .EnableOrDisableDefaultBootDrive
+    call    .EnableOrDisableBootMenuSelectionTimeout
     mov     si, g_MenupageForBootMenuSettingsMenu
     jmp     Menupage_ChangeToNewMenupageInDSSI
@@ -170 +171 @@
 
 ;--------------------------------------------------------------------
-; EnableOrDisableBootMenuSettings
+; .EnableOrDisableScanForSerialDrives
 ;   Parameters:
 ;       SS:BP:  Menu handle
@@ -179 +180 @@
 ;--------------------------------------------------------------------
 ALIGN JUMP_ALIGN
-EnableOrDisableBootMenuSettings:
-    mov     bx, ROMVARS.wFlags
-    call    Buffers_GetRomvarsValueToAXfromOffsetInBX
+.EnableOrDisableScanForSerialDrives:
+    call    Buffers_GetRomvarsFlagsToAX
+    mov     bx, g_MenuitemBootMenuSerialScanDetect
+    test    ax, FLG_ROMVARS_MODULE_SERIAL
+    jmp     SHORT .DisableMenuitemFromCSBXifZFset
+
+
+;--------------------------------------------------------------------
+; .EnableOrDisableDefaultBootDrive
+;   Parameters:
+;       SS:BP:  Menu handle
+;   Returns:
+;       Nothing
+;   Corrupts registers:
+;       AX, BX
+;--------------------------------------------------------------------
+ALIGN JUMP_ALIGN
+.EnableOrDisableDefaultBootDrive:
+    call    Buffers_GetRomvarsFlagsToAX
+    mov     bx, g_MenuitemBootMnuStngsDefaultBootDrive
+    test    ax, FLG_ROMVARS_MODULE_HOTKEYS
+    jmp     SHORT .DisableMenuitemFromCSBXifZFset
+
+
+;--------------------------------------------------------------------
+; .EnableOrDisableBootMenuSelectionTimeout
+;   Parameters:
+;       SS:BP:  Menu handle
+;   Returns:
+;       Nothing
+;   Corrupts registers:
+;       AX, BX
+;--------------------------------------------------------------------
+ALIGN JUMP_ALIGN
+.EnableOrDisableBootMenuSelectionTimeout:
+    call    Buffers_GetRomvarsFlagsToAX
+    mov     bx, g_MenuitemBootMnuStngsSelectionTimeout
     test    ax, FLG_ROMVARS_MODULE_BOOT_MENU
-    mov     al, FLG_MENUITEM_VISIBLE
-    jz      SHORT .DisableBootMenuSettings
-
-    ; Enable boot menu related
-    or      [g_MenuitemBootMnuStngsSelectionTimeout+MENUITEM.bFlags], al
+.DisableMenuitemFromCSBXifZFset:
+    jz      SHORT .DisableMenuitemFromCSBX
+    ; Fall to .EnableMenuitemFromCSBX
+
+
+;--------------------------------------------------------------------
+; .EnableMenuitemFromCSBX
+; .DisableMenuitemFromCSBX
+;   Parameters:
+;       CS:BX:  Ptr to MENUITEM
+;   Returns:
+;       Nothing
+;   Corrupts registers:
+;       Nothing
+;--------------------------------------------------------------------
+ALIGN JUMP_ALIGN
+.EnableMenuitemFromCSBX:
+    or      BYTE [cs:bx+MENUITEM.bFlags], FLG_MENUITEM_VISIBLE
     ret
 
-.DisableBootMenuSettings:
-    not     ax
-    and     [g_MenuitemBootMnuStngsSelectionTimeout+MENUITEM.bFlags], al
-    ret
-
-
-;--------------------------------------------------------------------
-; EnableOrDisableSerialSettings
-;   Parameters:
-;       SS:BP:  Menu handle
-;   Returns:
-;       Nothing
-;   Corrupts registers:
-;       AX, BX
-;--------------------------------------------------------------------
-EnableOrDisableSerialSettings:
-    mov     bx, ROMVARS.wFlags
-    call    Buffers_GetRomvarsValueToAXfromOffsetInBX
-    test    ax, FLG_ROMVARS_MODULE_SERIAL
-    mov     al, FLG_MENUITEM_VISIBLE
-    jz      SHORT .DisableSerialSettings
-
-    ; Enable serial related
-    or      [g_MenuitemBootMenuSerialScanDetect+MENUITEM.bFlags], al
-    ret
-
-.DisableSerialSettings:
-    not     ax
-    and     [g_MenuitemBootMenuSerialScanDetect+MENUITEM.bFlags], al
+ALIGN JUMP_ALIGN
+.DisableMenuitemFromCSBX:
+    and     BYTE [cs:bx+MENUITEM.bFlags], ~FLG_MENUITEM_VISIBLE
     ret