Changeset 492 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Inc/BootVars.inc

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.

File:

• trunk/XTIDE_Universal_BIOS/Inc/BootVars.inc (modified) (3 diffs)

trunk/XTIDE_Universal_BIOS/Inc/BootVars.inc

@@ -22 +22 @@
 %define BOOTVARS_INC
 
+; Default drives
+DEFAULT_FLOPPY_DRIVE_LETTER             EQU 'A'
+DEFAULT_HARD_DRIVE_LETTER               EQU 'C'
+
 ; Number of times to retry booting before accepting error
 BOOT_READ_RETRY_TIMES       EQU     3
@@ -43 +47 @@
     .clearToZeroFromThisPoint:
 %ifdef MODULE_HOTKEYS
-    .hotkeyVars         resb    HOTKEYVARS_size
+    .hotkeyVars             resb    HOTKEYVARS_size
 %endif
 
@@ -50 +54 @@
 
 %ifdef MODULE_HOTKEYS
+
 struc HOTKEYVARS
     .wTimeToClose       resb    2       ; Earliest system time when Hotkey Bar can be closed
-    .bScancode          resb    1       ; Function hotkey scancode
-    .bFlags             resb    1       ; Must be just before .bHddLetter! 
     .wHddAndFddLetters:
+    .bFddLetter         resb    1       ; Floppy Drive letter hotkey (upper case)
     .bHddLetter         resb    1       ; Hard Drive letter hotkey (upper case)
-    .bFddLetter         resb    1       ; Floppy Drive letter hotkey (upper case)
+    .bFlags             resb    1       ; Must be just after .bHddLetter!  (dependency in Hotkeybar.asm)
+    .bScancode          resb    1       ; Function hotkey scancode, must be just after .bFlags!
 endstruc
 
-; Bit defines for HOTKEYVARS.bFlags
+%ifndef CHECK_FOR_UNUSED_ENTRYPOINTS
+%if HOTKEYVARS.bFddLetter+1 != HOTKEYVARS.bHddLetter || HOTKEYVARS.bHddLetter+1 != HOTKEYVARS.bFlags || HOTKEYVARS.bFlags+1 != HOTKEYVARS.bScancode 
+%error "HOTKEYVARS: bytes need to come in the order .bFddLetter, then .bHddLetter, then .bFlags, then .bScancode"
+%endif
+%endif
+
+; Bit defines for KEYBOARDVARS.bFlags
 FLG_HOTKEY_HD_FIRST     EQU     (1<<0)  ; First try to boot from HDD, then FDD
 
-%endif ; MODULE_HOTKEY
-
-
+%endif ; MODULE_HOTKEYS
 
 struc DRVDETECTINFO