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

Timestamp:

Apr 20, 2012, 4:38:26 PM (12 years ago)

Author:

aitotat@…

google:author:

aitotat@gmail.com

Message:

Changes to Configurator:

• Updated device types.
• ROMVARS.wFlags is checked to detect what Boot Settings should be set visible.

File:

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

trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Menupages/BootMenuSettingsMenu.asm

@@ -26 +26 @@
     at  MENUPAGE.fnEnter,           dw  BootMenuSettingsMenu_EnterMenuOrModifyItemVisibility
     at  MENUPAGE.fnBack,            dw  ConfigurationMenu_EnterMenuOrModifyItemVisibility
-    at  MENUPAGE.wMenuitems,        dw  8
+    at  MENUPAGE.wMenuitems,        dw  6
 iend
 
@@ -78 +78 @@
     at  MENUITEM.szQuickInfo,       dw  g_szNfoSerialDetect
     at  MENUITEM.szHelp,            dw  g_szHelpSerialDetect
-    at  MENUITEM.bFlags,            db  FLG_MENUITEM_VISIBLE | FLG_MENUITEM_FLAGVALUE
+    at  MENUITEM.bFlags,            db  FLG_MENUITEM_FLAGVALUE
     at  MENUITEM.bType,             db  TYPE_MENUITEM_MULTICHOICE
     at  MENUITEM.itemValue + ITEM_VALUE.wRomvarsValueOffset,        dw  ROMVARS.wFlags
@@ -87 +87 @@
 iend
 
-g_MenuitemBootMnuStngsEnableBootMenu:
-istruc MENUITEM
-    at  MENUITEM.fnActivate,        dw  Menuitem_ActivateMultichoiceSelectionForMenuitemInDSSI
-    at  MENUITEM.fnFormatValue,     dw  MenuitemPrint_WriteLookupValueStringToBufferInESDIfromShiftedItemInDSSI
-    at  MENUITEM.szName,            dw  g_szItemBootEnableMenu
-    at  MENUITEM.szQuickInfo,       dw  g_szNfoBootEnableMenu
-    at  MENUITEM.szHelp,            dw  g_szNfoBootEnableMenu
-    at  MENUITEM.bFlags,            db  FLG_MENUITEM_VISIBLE | FLG_MENUITEM_MODIFY_MENU
-    at  MENUITEM.bType,             db  TYPE_MENUITEM_MULTICHOICE
-    at  MENUITEM.itemValue + ITEM_VALUE.wRomvarsValueOffset,        dw  ROMVARS.wfDisplayBootMenu
-    at  MENUITEM.itemValue + ITEM_VALUE.szDialogTitle,              dw  g_szDlgBootEnableMenu
-    at  MENUITEM.itemValue + ITEM_VALUE.szMultichoice,              dw  g_szMultichoiceBooleanFlag
-    at  MENUITEM.itemValue + ITEM_VALUE.rgwChoiceToValueLookup,     dw  g_rgwChoiceToValueLookupForEnableBootMenu
-    at  MENUITEM.itemValue + ITEM_VALUE.rgszValueToStringLookup,    dw  g_rgszValueToStringLookupForFlagBooleans
-    at  MENUITEM.itemValue + ITEM_VALUE.fnValueReader,              dw  ValueReaderForEnableBootMenu
-iend
-
 g_MenuitemBootMnuStngsDefaultBootDrive:
 istruc MENUITEM
@@ -111 +94 @@
     at  MENUITEM.szQuickInfo,       dw  g_szNfoBootDrive
     at  MENUITEM.szHelp,            dw  g_szHelpBootDrive
-    at  MENUITEM.bFlags,            db  FLG_MENUITEM_BYTEVALUE
+    at  MENUITEM.bFlags,            db  FLG_MENUITEM_VISIBLE | FLG_MENUITEM_BYTEVALUE
     at  MENUITEM.bType,             db  TYPE_MENUITEM_HEX
     at  MENUITEM.itemValue + ITEM_VALUE.wRomvarsValueOffset,        dw  ROMVARS.bBootDrv
@@ -133 +116 @@
     at  MENUITEM.itemValue + ITEM_VALUE.wMaxValue,                  dw  1092
 iend
-
-%if 0   ; *FIXME*
-g_MenuitemBootMnuStngsSwapBootDriveNumbers:
-istruc MENUITEM
-    at  MENUITEM.fnActivate,        dw  Menuitem_ActivateMultichoiceSelectionForMenuitemInDSSI
-    at  MENUITEM.fnFormatValue,     dw  MenuitemPrint_WriteLookupValueStringToBufferInESDIfromShiftedItemInDSSI
-    at  MENUITEM.szName,            dw  g_szItemBootSwap
-    at  MENUITEM.szQuickInfo,       dw  g_szNfoBootSwap
-    at  MENUITEM.szHelp,            dw  g_szHelpBootSwap
-    at  MENUITEM.bFlags,            db  FLG_MENUITEM_FLAGVALUE
-    at  MENUITEM.bType,             db  TYPE_MENUITEM_MULTICHOICE
-    at  MENUITEM.itemValue + ITEM_VALUE.wRomvarsValueOffset,        dw  ROMVARS.wFlags
-    at  MENUITEM.itemValue + ITEM_VALUE.szDialogTitle,              dw  g_szDlgBootSwap
-    at  MENUITEM.itemValue + ITEM_VALUE.szMultichoice,              dw  g_szMultichoiceBooleanFlag
-    at  MENUITEM.itemValue + ITEM_VALUE.rgszValueToStringLookup,    dw  g_rgszValueToStringLookupForFlagBooleans
-    at  MENUITEM.itemValue + ITEM_VALUE.wValueBitmask,              dw  FLG_ROMVARS_DRVXLAT
-iend
-%endif
 
 
@@ -199 +164 @@
     pop     ds
     call    EnableOrDisableBootMenuSettings
+    call    EnableOrDisableSerialSettings
     mov     si, g_MenupageForBootMenuSettingsMenu
     jmp     Menupage_ChangeToNewMenupageInDSSI
@@ -214 +180 @@
 ALIGN JUMP_ALIGN
 EnableOrDisableBootMenuSettings:
-    mov     bx, [cs:g_MenuitemBootMnuStngsEnableBootMenu+MENUITEM.itemValue+ITEM_VALUE.wRomvarsValueOffset]
+    mov     bx, ROMVARS.wFlags
     call    Buffers_GetRomvarsValueToAXfromOffsetInBX
-    test    ax, ax
+    test    ax, FLG_ROMVARS_MODULE_BOOT_MENU
     mov     al, FLG_MENUITEM_VISIBLE
     jz      SHORT .DisableBootMenuSettings
 
     ; Enable boot menu related
-    or      [g_MenuitemBootMnuStngsDefaultBootDrive+MENUITEM.bFlags], al
     or      [g_MenuitemBootMnuStngsSelectionTimeout+MENUITEM.bFlags], al
-;   or      [g_MenuitemBootMnuStngsSwapBootDriveNumbers+MENUITEM.bFlags], al
     ret
 
 .DisableBootMenuSettings:
     not     ax
-    and     [g_MenuitemBootMnuStngsDefaultBootDrive+MENUITEM.bFlags], al
     and     [g_MenuitemBootMnuStngsSelectionTimeout+MENUITEM.bFlags], al
-;   and     [g_MenuitemBootMnuStngsSwapBootDriveNumbers+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
     ret