Changeset 492 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Initialization

Timestamp:

Dec 21, 2012, 1:01:55 AM (12 years ago)

Author:

gregli@…

google:author:

gregli@hotmail.com

Message:

Removed the dependency between MODULE_BOOT_MENU and MODULE_HOTKEYS. With these changes, 0, 1, or 2 of them can be included in a build. This change also means that the hotkeys don't work while the menu is up. But the most important hotkey there was for Rom Boot, and that has been added to the menu as a choice proper. Lots of changes across the board in the hotkeys code - even if we eventually back this change out (becaue, for example we want hotkeys to work in the menu) we should probably start from this base and add that functionality back in, as these changes results in approximately 120 bytes of savings and includes new functionality, such as the Rom Boot menu item and the Com Detect hotkey.

Location:

trunk/XTIDE_Universal_BIOS/Src/Initialization

Files:

• DetectDrives.asm (modified) (3 diffs)
• DetectPrint.asm (modified) (5 diffs)
• Interrupts.asm (modified) (1 diff)

trunk/XTIDE_Universal_BIOS/Src/Initialization/DetectDrives.asm

@@ -48 +48 @@
     call    StartDetectionWithDriveSelectByteInBHandStringInCX
 
+%ifdef MODULE_HOTKEYS
+    call    HotkeyBar_ScanHotkeysFromKeyBufferAndStoreToBootvars        ; Done here while CX is still protected
+%endif              
+
     pop     cx
 
@@ -62 +66 @@
 ; if serial drive detected, do not scan (avoids duplicate drives and isn't needed - we already have a connection)
 ;
-    call    FindDPT_ToDSDIforSerialDevice
+    call    FindDPT_ToDSDIforSerialDevice   ; does not modify AX
     jnc     .AddHardDisks
 
     mov     bp, ROMVARS.ideVarsSerialAuto   ; Point to our special IDEVARS structure, just for serial scans
+
+%ifdef MODULE_HOTKEYS
+    cmp     al, COM_DETECT_HOTKEY_SCANCODE  ; Set by last call to HotkeyBar_UpdateDuringDriveDetection above
+    jz      .DriveDetectLoop
+%endif      
 
     mov     al,[cs:ROMVARS.wFlags]          ; Configurator set to always scan?
@@ -192 +201 @@
 %ifdef MODULE_HOTKEYS
     call    HotkeyBar_UpdateDuringDriveDetection
-%endif
+%endif              
+        
 %ifdef MODULE_8BIT_IDE
     pop     dx

trunk/XTIDE_Universal_BIOS/Src/Initialization/DetectPrint.asm

@@ -34 +34 @@
     ret
 
-
+        
+%ifdef MODULE_HOTKEYS
 ;--------------------------------------------------------------------
 ; DetectPrint_GetSoftwareCoordinatesToAX
@@ -47 +48 @@
     CALL_DISPLAY_LIBRARY    GetSoftwareCoordinatesToAX
     ret
-
-
+%endif
+
+        
 ;--------------------------------------------------------------------
 ; DetectPrint_StartDetectWithMasterOrSlaveStringInCXandIdeVarsInCSBP
@@ -227 +229 @@
     mov     bp, sp
 
-%ifdef MODULE_HOTKEYS
+%ifdef MODULE_DRIVEXLATE
 
     call    DriveXlate_ToOrBack ; DL = Untranslated Drive number
@@ -233 +235 @@
     call    DriveXlate_ToOrBack ; DL = Translated Drive number
 
-    call    HotkeyBar_ConvertDriveNumberFromDLtoDriveLetter ; DL = Translated letter
+    call    DriveXlate_ConvertDriveNumberFromDLtoDriveLetter    ; DL = Translated letter
     xchg    dl, dh
-    call    HotkeyBar_ConvertDriveNumberFromDLtoDriveLetter ; DL = Untranslated letter
+    call    DriveXlate_ConvertDriveNumberFromDLtoDriveLetter    ; DL = Untranslated letter
     push    dx
     xchg    dl, dh
     push    dx
 
-    call    HotkeyBar_ConvertDriveLetterInDLtoDriveNumber   ; Restore DL
+    call    DriveXlate_ConvertDriveLetterInDLtoDriveNumber  ; Restore DL
 
 %else
@@ -254 +256 @@
     push    ax
 
-%endif ; MODULE_HOTKEYS
+%endif ; MODULE_DRIVEXLATE
 
     mov     si, g_szTryToBoot

trunk/XTIDE_Universal_BIOS/Src/Initialization/Interrupts.asm

@@ -41 +41 @@
     ; If no drives detected, leave system INT 13h and 40h handlers
     ; in place. We need our INT 13h handler to swap drive letters.
-%ifndef MODULE_HOTKEYS
+%ifndef MODULE_DRIVEXLATE
     cmp     BYTE [RAMVARS.bDrvCnt], 0
     je      SHORT Interrupts_InstallHandlerToVectorInALFromCSSI.Interrupts_Return