Changeset 492 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Inc

Timestamp:

Dec 21, 2012, 1:01:55 AM (11 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/Inc

Files:

• BootVars.inc (modified) (3 diffs)
• HotkeyBar.inc (modified) (1 diff)
• ModuleDependency.inc (modified) (3 diffs)
• RamVars.inc (modified) (4 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

trunk/XTIDE_Universal_BIOS/Inc/HotkeyBar.inc

@@ -23 +23 @@
 MIN_TIME_TO_DISPLAY_HOTKEY_BAR          EQU (5000/55)   ; 5000 ms
 
-
-; Hotkeys
-BOOT_MENU_HOTKEY_SCANCODE               EQU 3Ch ; F2
 ROM_BOOT_HOTKEY_SCANCODE                EQU 42h ; F8
 
-; Default drives
-DEFAULT_FLOPPY_DRIVE_LETTER             EQU 'A'
-DEFAULT_HARD_DRIVE_LETTER               EQU 'C'
+%ifdef MODULE_BOOT_MENU
+BOOT_MENU_HOTKEY_SCANCODE               EQU 3Ch ; F2
+%endif
 
+%ifdef MODULE_SERIAL
+COM_DETECT_HOTKEY_SCANCODE              EQU 40h ; F6
+%endif
 
 %endif ; HOTKEYBAR_INC

trunk/XTIDE_Universal_BIOS/Inc/ModuleDependency.inc

@@ -18 +18 @@
 ;
 
-; Boot Menu requires Hotkey support
-%ifdef MODULE_BOOT_MENU
-    %ifndef MODULE_HOTKEYS
-        %define MODULE_HOTKEYS
-    %endif
-%endif
-
 %ifdef MODULE_SERIAL_FLOPPY
     %ifndef MODULE_SERIAL
@@ -30 +23 @@
     %endif
 %endif
-
 
 ; Include module specific .INC files
@@ -50 +42 @@
 %ifdef MODULE_HOTKEYS
     %include "HotkeyBar.inc"        ; For Hotkeys
-    %ifdef MODULE_BOOT_MENU
-        %include "BootMenu.inc"     ; For Boot Menu
-    %endif
+%endif
+
+%ifdef MODULE_BOOT_MENU
+    %include "BootMenu.inc"         ; For Boot Menu
+%endif
+
+%ifdef MODULE_BOOT_MENU OR MODULE_HOTKEYS
+    %define MODULE_DRIVEXLATE
 %endif
 

trunk/XTIDE_Universal_BIOS/Inc/RamVars.inc

@@ -26 +26 @@
 %endif
 
+%ifdef MODULE_SERIAL_FLOPPY
+    %define NEED_XLATEVARS
+%endif
+
+%ifdef MODULE_DRIVEXLATE
+    %define NEED_XLATEVARS
+%endif
+
+
 ; RAM Variables.
 ; Variables should be kept to minimum since they might be located
@@ -50 +59 @@
 
     ; Variables for drive number translation
-%ifdef MODULE_HOTKEYS
+%ifdef NEED_XLATEVARS
     .xlateVars          resb    XLATEVARS_size
 %endif
@@ -60 +69 @@
 
 
-
+%ifdef NEED_XLATEVARS
 ; Variables for translating drive numbers.
-%ifdef MODULE_HOTKEYS
     struc XLATEVARS
     %ifdef MODULE_SERIAL_FLOPPY
@@ -69 +77 @@
                                         ; and number of drives (low order bit, max 2 drives supported).
                                         ; During initialization, until the end of DetectDrives_FromAllIDEControllers,
-                                        ; this byte contains the raw number of floppy drives seen (using .bFlopCreateCnt)
+                                        ; this byte contains the raw number of floppy drives seen 
+                                        ; (using .bFlopCreateCnt)
     %else
                             resb    1   ; alignment
     %endif
+
+    %ifdef MODULE_DRIVEXLATE
         .bXlatedDrv         resb    1   ; Drive number after translation
         .wFDandHDswap:
         .bFDSwap            resb    1   ; Floppy Drive to swap to 00h and vice versa
         .bHDSwap            resb    1   ; Hard Drive to swap to 80h and vice versa
+    %else
+                            resb    1   ; alignment
+    %endif
     endstruc
 %endif
-
 
 %ifdef MODULE_SERIAL_FLOPPY