Changeset 286 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Menuitem.asm

Timestamp:

Mar 1, 2012, 8:52:08 PM (13 years ago)

Author:

aitotat@…

google:author:

aitotat@gmail.com

Message:

Changes to Configurator v2:

• JR-IDE/ISA can now be selected.
• Maximum LBA for EBIOS can now be specified.
• Drive internal write cache can now be enabled or disabled.

File:

• trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Menuitem.asm (modified) (9 diffs)

trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Menuitem.asm

@@ -76 +76 @@
 ;       DS:SI:  Ptr to MENUITEM
 ;   Returns:
-;       Nothing
+;       CF:     Cleared if value inputted
+;               Set if user cancellation
 ;   Corrupts registers:
 ;       AX, BX, CX, SI, DI, ES
@@ -97 +98 @@
     pop     di
 
-    cmp     BYTE [si+WORD_DIALOG_IO.bUserCancellation], TRUE
+    mov     cl, [si+WORD_DIALOG_IO.bUserCancellation]
+    cmp     cl, TRUE
     je      SHORT .NothingToChange
     mov     ax, [si+WORD_DIALOG_IO.wReturnWord]
@@ -104 +106 @@
 .NothingToChange:
     add     sp, BYTE WORD_DIALOG_IO_size
+    shr     cl, 1
     ret
 
@@ -150 +153 @@
     add     di, [si+MENUITEM.itemValue+ITEM_VALUE.wRomvarsValueOffset]
     jmp     [cs:bx+.rgfnJumpToStoreValueBasedOnItemType]
+.InvalidItemType:
+    ret
 
 ALIGN WORD_ALIGN
@@ -174 +179 @@
 ALIGN JUMP_ALIGN
 .StoreMultichoiceValueFromAXtoESDIwithItemInDSSI:
+    test    BYTE [si+MENUITEM.bFlags], FLG_MENUITEM_MASKVALUE
+    jnz     SHORT .ClearBitsUsingMask
     test    BYTE [si+MENUITEM.bFlags], FLG_MENUITEM_FLAGVALUE
     jz      SHORT .TranslateChoiceToValueUsingLookupTable
@@ -187 +194 @@
     or      [es:di], ax
     jmp     SHORT .SetUnsavedChanges
+
+ALIGN JUMP_ALIGN
+.ClearBitsUsingMask:
+    mov     bx, [si+MENUITEM.itemValue+ITEM_VALUE.wValueBitmask]
+    not     bx
+    and     [es:di], bx
+    ; Fall to .TranslateChoiceToValueUsingLookupTable
+
 
 ALIGN JUMP_ALIGN
@@ -225 +240 @@
 .NoWriter:
     pop     bx
+    test    BYTE [si+MENUITEM.bFlags], FLG_MENUITEM_MASKVALUE
+    jz      SHORT .StoreByteOrWord
+    or      [es:di], ax
+    jmp     SHORT .SetUnsavedChanges
+
+.StoreByteOrWord:
     test    BYTE [si+MENUITEM.bFlags], FLG_MENUITEM_BYTEVALUE
     jnz     SHORT .StoreByteFromAL
-        
+
     mov     [es:di+1], ah
 ALIGN JUMP_ALIGN
@@ -255 +276 @@
     CALL_MENU_LIBRARY GetHighlightedItemToAX
     CALL_MENU_LIBRARY RefreshItemFromAX
-.InvalidItemType:
     ret
 
@@ -306 +326 @@
     pop     es
 
+    test    BYTE [si+MENUITEM.bFlags], FLG_MENUITEM_MASKVALUE
+    jz      SHORT .TestIfFlagValue
+    and     ax, [si+MENUITEM.itemValue+ITEM_VALUE.wValueBitmask]
+    ret
+
+.TestIfFlagValue:
     test    BYTE [si+MENUITEM.bFlags], FLG_MENUITEM_FLAGVALUE
     jz      SHORT .Return