Changeset 505 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Menus/HotkeyBar.asm

Timestamp:

Feb 25, 2013, 4:23:09 PM (12 years ago)

Author:

krille_n_@…

google:author:

krille_n_@hotmail.com

Message:

Changes:

• Reverted the changes to MenuEvents.inc done in r492 since they broke the F1 key function in XTIDECFG.
• Added a tail-call optimized variant of the CALL_DISPLAY_LIBRARY macro (JMP_DISPLAY_LIBRARY).
• Put a block size limit in AH1Eh_ChangeXTCFmodeBasedOnControlRegisterInAL. I think it's needed but if not, it's easy to remove.
• Other optimizations and fixes.

File:

• trunk/XTIDE_Universal_BIOS/Src/Menus/HotkeyBar.asm (modified) (14 diffs)

trunk/XTIDE_Universal_BIOS/Src/Menus/HotkeyBar.asm

@@ -34 +34 @@
     call    HotkeyBar_ScanHotkeysFromKeyBufferAndStoreToBootvars
     ; Fall to HotkeyBar_DrawToTopOfScreen
-        
-        
+
+
 ;--------------------------------------------------------------------
 ; HotkeyBar_DrawToTopOfScreen
@@ -127 +127 @@
     call    FormatFunctionHotkeyString
 %endif
-    ; Fall to .PrintRomBootHotkey       
+    ; Fall to .PrintRomBootHotkey
 
 ;--------------------------------------------------------------------
@@ -169 +169 @@
 ;--------------------------------------------------------------------
 HotkeyBar_ClearRestOfTopRow:
-    CALL_DISPLAY_LIBRARY    GetColumnsToALandRowsToAH
+    CALL_DISPLAY_LIBRARY GetColumnsToALandRowsToAH
     eMOVZX  cx, al
-    CALL_DISPLAY_LIBRARY    GetSoftwareCoordinatesToAX
+    CALL_DISPLAY_LIBRARY GetSoftwareCoordinatesToAX
     sub     cl, al
     mov     al, ' '
-    CALL_DISPLAY_LIBRARY    PrintRepeatedCharacterFromALwithCountInCX
-    ret
+    JMP_DISPLAY_LIBRARY PrintRepeatedCharacterFromALwithCountInCX
 
 
@@ -216 +215 @@
 
     mov     si, ATTRIBUTE_CHARS.cHurryTimeout       ; Selected hotkey
-    jz      SHORT GetDescriptionAttributeToDX       ; From compare with bScancode above
+    je      SHORT GetDescriptionAttributeToDX       ; From compare with bScancode above
 
 GetNonSelectedHotkeyDescriptionAttributeToDX:
@@ -226 +225 @@
     call    MenuAttribute_GetToAXfromTypeInSI
     xchg    dx, ax                  ; DX = Description attribute
-    ;;  fall through to PushHotkeyParamsAndFormat 
+    ;;  fall through to PushHotkeyParamsAndFormat
 
 
@@ -232 +231 @@
 
     mov     dx, (COLOR_ATTRIBUTE(COLOR_YELLOW, COLOR_CYAN) << 8) | MONO_REVERSE_BLINK
-    jz      SHORT SelectAttributeFromDHorDLbasedOnVideoMode         ; From compare with bScancode above
+    je      SHORT SelectAttributeFromDHorDLbasedOnVideoMode     ; From compare with bScancode above
 
 GetNonSelectedHotkeyDescriptionAttributeToDX:
@@ -245 +244 @@
     mov     dl, dh
 .AttributeLoadedToDL:
-    ;;  fall through to PushHotkeyParamsAndFormat       
+    ;;  fall through to PushHotkeyParamsAndFormat
 
 %endif ; MODULE_BOOT_MENU
@@ -277 +276 @@
     push    di              ; Description string
     push    cx              ; Description string parameter
-        
+
     push    si              ; Key attribute for last space
 
@@ -308 +307 @@
 ;--------------------------------------------------------------------
 HotkeyBar_RestoreCursorCoordinatesFromAX:
-    CALL_DISPLAY_LIBRARY    SetCursorCoordinatesFromAX
-    ret
+    JMP_DISPLAY_LIBRARY SetCursorCoordinatesFromAX
 
 
@@ -325 +323 @@
 HotkeyBar_StoreHotkeyToBootvarsForDriveLetterInDL:
     eMOVZX  ax, dl
-    xor     al, 32  ; Upper case drive letter to lower case keystroke
+    or      al, 32  ; Upper case drive letter to lower case keystroke
     jmp     SHORT HotkeyBar_StoreHotkeyToBootvarsIfValidKeystrokeInAX
 
@@ -364 +362 @@
     ; All scancodes are saved, even if it wasn't a drive letter,
     ; which also covers our function key case.  Invalid function keys
-    ; will not do anything (won't be printed, won't be accepted as input)       
+    ; will not do anything (won't be printed, won't be accepted as input)
     mov     [es:di], ah
-        
+
     ; Drive letter hotkeys remaining, allow 'a' to 'z'
     call    Char_IsLowerCaseLetterInAL
     jnc     SHORT .KeystrokeIsNotValidDriveLetter
-    xor     al, 32                  ; We want to print upper case letters
+    and     al, ~32                 ; We want to print upper case letters
 
     ; Clear HD First flag to assume Floppy Drive hotkey
@@ -377 +375 @@
 
     ; Determine if Floppy or Hard Drive hotkey
-    eMOVZX  cx, al                  ; Clear CH to clear scancode
+    xchg    cx, ax
     call    DriveXlate_GetLetterForFirstHardDriveToAX
     cmp     cl, al
@@ -386 +384 @@
 
 .StoreDriveLetter:
-    sbb     di, BYTE 1          ; Sub CF if Floppy Drive
+    sbb     di, BYTE 1              ; Sub CF if Floppy Drive
     xchg    ax, cx
-    mov     [es:di], al         ; AH = zero to clear function hotkey
-
-.KeystrokeIsNotValidDriveLetter:        
+    mov     [es:di], al
+
+.KeystrokeIsNotValidDriveLetter:
 NoHotkeyToProcess:
     mov     al, [es:BOOTVARS.hotkeyVars+HOTKEYVARS.bScancode]
@@ -407 +405 @@
 HotkeyBar_GetBootDriveNumbersToDX:
     mov     dx, [es:BOOTVARS.hotkeyVars+HOTKEYVARS.wFddAndHddLetters]
-    test    BYTE [es:BOOTVARS.hotkeyVars+HOTKEYVARS.bFlags], FLG_HOTKEY_HD_FIRST        
+    test    BYTE [es:BOOTVARS.hotkeyVars+HOTKEYVARS.bFlags], FLG_HOTKEY_HD_FIRST
     jnz     .noflip
     xchg    dl, dh
-.noflip:    
+.noflip:
     call    DriveXlate_ConvertDriveLetterInDLtoDriveNumber
     xchg    dl, dh
-    ; Fall to HotkeyBar_FallThroughTo_DriveXlate_ConvertDriveLetterInDLtoDriveNumber        
-        
-HotkeyBar_FallThroughTo_DriveXlate_ConvertDriveLetterInDLtoDriveNumber:     
-
+    ; Fall to HotkeyBar_FallThroughTo_DriveXlate_ConvertDriveLetterInDLtoDriveNumber
+
+HotkeyBar_FallThroughTo_DriveXlate_ConvertDriveLetterInDLtoDriveNumber:
+