Changeset 500 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src

Timestamp:

Jan 23, 2013, 7:44:48 PM (12 years ago)

Author:

aitotat@…

google:author:

aitotat@gmail.com

Message:

Changes to XTIDE Universal BIOS:

• Selected drive is again properly displayed on hotkeybar when MODULE_BOOT_MENU is not available.

Location:

trunk/XTIDE_Universal_BIOS/Src

Files:

• Menus/HotkeyBar.asm (modified) (7 diffs)
• VariablesAndDPTs/BootVars.asm (modified) (1 diff)

trunk/XTIDE_Universal_BIOS/Src/Menus/HotkeyBar.asm

@@ -66 +66 @@
 ;--------------------------------------------------------------------
 .PrintFloppyDriveHotkeys:
-    mov     cx, [es:BOOTVARS.hotkeyVars+HOTKEYVARS.wHddAndFddLetters]
-        
     call    FloppyDrive_GetCountToAX
     test    ax, ax      ; Any Floppy Drives?
@@ -73 +71 @@
 
     mov     ax, (ANGLE_QUOTE_RIGHT << 8) | DEFAULT_FLOPPY_DRIVE_LETTER
+    mov     cl, [es:BOOTVARS.hotkeyVars+HOTKEYVARS.bFddLetter]
     mov     di, g_szFDD
     call    FormatDriveHotkeyString
@@ -91 +90 @@
     call    DriveXlate_GetLetterForFirstHardDriveToAX
     mov     ah, ANGLE_QUOTE_RIGHT
-    mov     cl, ch
+    mov     cl, [es:BOOTVARS.hotkeyVars+HOTKEYVARS.bHddLetter]
     mov     di, g_szHDD
     call    FormatDriveHotkeyString
@@ -229 +228 @@
     ;;  fall through to PushHotkeyParamsAndFormat 
 
-%else ; MODULE_BOOT_MENU - No boot menu so use simpler attributes
+
+%else ; if no MODULE_BOOT_MENU - No boot menu so use simpler attributes
 
     mov     dx, (COLOR_ATTRIBUTE(COLOR_YELLOW, COLOR_CYAN) << 8) | MONO_REVERSE_BLINK
@@ -238 +238 @@
 
 SelectAttributeFromDHorDLbasedOnVideoMode:
-    mov     al, [es:BDA.bVidMode]
-    shr     al, 1
+    mov     ch, [es:BDA.bVidMode]       ; We only need to preserve CL
+    shr     ch, 1
     jnc     SHORT .AttributeLoadedToDL  ; Black & White modes
-    shr     al, 1
+    shr     ch, 1
     jnz     SHORT .AttributeLoadedToDL  ; MDA
     mov     dl, dh
@@ -253 +253 @@
 ; PushHotkeyParamsAndFormat
 ;   Parameters:
-;       BL:         First character
-;       BH:         Second character
+;       AL:         First character
+;       AH:         Second character
 ;       DX:         Description Attribute
 ;       CX:         Description string parameter
@@ -406 +406 @@
 ;--------------------------------------------------------------------
 HotkeyBar_GetBootDriveNumbersToDX:
-    mov     dx, [es:BOOTVARS.hotkeyVars+HOTKEYVARS.wHddAndFddLetters]
+    mov     dx, [es:BOOTVARS.hotkeyVars+HOTKEYVARS.wFddAndHddLetters]
     test    BYTE [es:BOOTVARS.hotkeyVars+HOTKEYVARS.bFlags], FLG_HOTKEY_HD_FIRST        
     jnz     .noflip

trunk/XTIDE_Universal_BIOS/Src/VariablesAndDPTs/BootVars.asm

@@ -64 +64 @@
 ;--------------------------------------------------------------------
 BootVars_StoreHotkeyForDriveNumberInDL:
-    mov     WORD [es:BOOTVARS.hotkeyVars+HOTKEYVARS.wHddAndFddLetters], DEFAULT_FLOPPY_DRIVE_LETTER | (DEFAULT_HARD_DRIVE_LETTER<<8)
+    mov     WORD [es:BOOTVARS.hotkeyVars+HOTKEYVARS.wFddAndHddLetters], DEFAULT_FLOPPY_DRIVE_LETTER | (DEFAULT_HARD_DRIVE_LETTER<<8)
     call    DriveXlate_ConvertDriveNumberFromDLtoDriveLetter
     jmp     HotkeyBar_StoreHotkeyToBootvarsForDriveLetterInDL