Changeset 233 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/MenuitemPrint.asm

Timestamp:

Feb 4, 2012, 6:21:22 PM (12 years ago)

Author:

gregli@…

google:author:

gregli@hotmail.com

Message:

Serial Port: split single byte port and baud into two bytes, taking advantage of the two bytes in DPT_SERIAL, which supports more serial baud rates and in particular fixed a bug where a 4x client machine couldn't talk to a 115.2K server machine. This is a wide change, touching lots of files, but most are shallow changes. DetectPrint.asm took the most significant changes, now it calculates the baud rate to display instead of using characters provided by the Configurator. The Configurator now has a new menu flag, FLG_MENUITEM_CHOICESTRINGS, for specifying that values are not linear and they should be lookedup rather than indexed. Finally, another important bug fixed here is that in some error cases, the serial port code could get into an infinite loop waiting ont the hardware; now it has a timeout.

File:

• trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/MenuitemPrint.asm (modified) (2 diffs)

trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/MenuitemPrint.asm

@@ -156 +156 @@
 ALIGN JUMP_ALIGN
 MenuitemPrint_WriteLookupValueStringToBufferInESDIfromShiftedItemInDSSI:
+MenuitemPrint_WriteLookupValueStringToBufferInESDIfromRawItemInDSSI:
     call    Menuitem_GetValueToAXfromMenuitemInDSSI
     ; Fall to PrintLookupValueFromAXtoBufferInESDI
@@ -173 +174 @@
 PrintLookupValueFromAXtoBufferInESDI:
     push    si
+    test    byte [si+MENUITEM.bFlags], FLG_MENUITEM_CHOICESTRINGS
+    jnz     .lookupChoice   
+        
     add     ax, [si+MENUITEM.itemValue+ITEM_VALUE.rgszValueToStringLookup]
     xchg    bx, ax
+.found: 
     mov     si, [bx]
+.errorReturn:
     call    String_CopyDSSItoESDIandGetLengthToCX
     pop     si
     ret
 
+;
+; With FLG_MENUITEM_CHOICESTRINGS, the array at .rgszChoiceToStringLookup is based on the 
+; Choice number (offset within .rgwChoiceToValueLookup) instead of the value stored.
+; Here, we scan the .rgwChoiceToValueLookup array until we find the value there, and then
+; use the same offset in .rgszChoiceToStringLookup.  If we don't find the value, we 
+; return an "Error!" string instead.  
+;
+; Note that the pointer array at .rgszChoiceToStringLookup must be NULL terminated.  Since the
+; value could be zero, we don't use the .rgwChoiceToValueLookup array to find the end.
+;
+.lookupChoice:
+    mov     bx,[si+MENUITEM.itemValue+ITEM_VALUE.rgszChoiceToStringLookup]      
+    mov     si,[si+MENUITEM.itemValue+ITEM_VALUE.rgwChoiceToValueLookup]
+        
+.wordLoop:
+    cmp     ax,[si]
+    jz      .found
+    inc     si
+    inc     si
+    inc     bx
+    inc     bx
+    cmp     word [bx],0
+    jnz     .wordLoop
+
+    mov     si,g_szValueUnknownError
+    jmp     .errorReturn
 
 ;--------------------------------------------------------------------