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

Timestamp:

Jun 30, 2018, 8:27:04 AM (6 years ago)

Author:

aitotat

Message:

Flashing now works again.
Hack to get Windows 95 to work properly (MODULE_WIN95_CMOS_HACK included for 386 builds by default).
Edited makefile to produce large 386 build.
Fixed recovery time for QDI Vision VLB-IDE controllers.
No more warnings with Nasm 2.13.xx and later.
File dialog now properly restores default drive when file selection is cancelled.

File:

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

trunk/XTIDE_Universal_BIOS/Src/Menus/HotkeyBar.asm

@@ -75 +75 @@
     mov     cl, [es:BOOTVARS.hotkeyVars+HOTKEYVARS.bFddLetter]
     mov     di, g_szFDD
+
+    ; Clear CH if floppy drive is selected for boot
+    mov     ch, [es:BOOTVARS.hotkeyVars+HOTKEYVARS.bFlags]
+    ;and        ch, FLG_HOTKEY_HD_FIRST     ; Needed if more flags are added
     call    FormatDriveHotkeyString
 
@@ -92 +96 @@
     call    BootVars_GetLetterForFirstHardDriveToAX
     mov     ah, ANGLE_QUOTE_RIGHT
-    mov     cl, [es:BOOTVARS.hotkeyVars+HOTKEYVARS.bHddLetter]
+    mov     cx, [es:BOOTVARS.hotkeyVars+HOTKEYVARS.bHddLetter]  ; Letter to CL, flags to CH
+    ;and        ch, FLG_HOTKEY_HD_FIRST     ; Needed if more flags are added
+    xor     ch, FLG_HOTKEY_HD_FIRST     ; Clear CH if HD is selected for boot, set otherwise
     mov     di, g_szHDD
     call    FormatDriveHotkeyString
@@ -182 +188 @@
 ; FormatDriveHotkeyString
 ;   Parameters:
+;       CH:         Zero if letter in CL is selected for boot
 ;       CL:         Drive letter hotkey from BOOTVARS
 ;       AL:         First character for drive key string
@@ -192 +199 @@
 ;       AX, CX, DX, SI, DI
 ;--------------------------------------------------------------------
-;; No work to do before going into FormatFunctionHotkeyString
-FormatDriveHotkeyString  equ  GetNonSelectedHotkeyDescriptionAttributeToDX
+FormatDriveHotkeyString:
+    ; Invalid scancodes are filtered on HotkeyBar_StoreHotkeyToBootvarsIfValidKeystrokeInAX
+    ; so here we have either drive letter or function key pressed. If latter, draw
+    ; drive letters as unselected
+    cmp     BYTE [es:BOOTVARS.hotkeyVars+HOTKEYVARS.bScancode], FIRST_FUNCTION_KEY_SCANCODE
+    jae     SHORT GetNonSelectedHotkeyDescriptionAttributeToDX
+
+    ; Drive selected to boot from?
+    test    ch, ch
+    jnz     SHORT GetNonSelectedHotkeyDescriptionAttributeToDX
+    jmp     SHORT GetSelectedHotkeyDescriptionAttributeToDX
+
 
 ;--------------------------------------------------------------------
@@ -216 +233 @@
 %ifdef MODULE_BOOT_MENU
 
+GetSelectedHotkeyDescriptionAttributeToDX:
     mov     si, ATTRIBUTE_CHARS.cHurryTimeout       ; Selected hotkey
-    je      SHORT GetDescriptionAttributeToDX       ; From compare with bScancode above
+    je      SHORT GetDescriptionAttributeToDX       ; From compare with bScancode above and from FormatDriveHotkeyString
 
 GetNonSelectedHotkeyDescriptionAttributeToDX:
@@ -232 +250 @@
 %else ; if no MODULE_BOOT_MENU - No boot menu so use simpler attributes
 
+GetSelectedHotkeyDescriptionAttributeToDX:
     mov     dx, (COLOR_ATTRIBUTE(COLOR_YELLOW, COLOR_CYAN) << 8) | MONO_REVERSE_BLINK
-    je      SHORT SelectAttributeFromDHorDLbasedOnVideoMode     ; From compare with bScancode above
+    je      SHORT SelectAttributeFromDHorDLbasedOnVideoMode     ; From compare with bScancode above and from FormatDriveHotkeyString
 
 GetNonSelectedHotkeyDescriptionAttributeToDX: