Changeset 492 in xtideuniversalbios for trunk/Assembly_Library/Src/Keyboard

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/Assembly_Library/Src/Keyboard/Keyboard.asm (modified) (3 diffs)

trunk/Assembly_Library/Src/Keyboard/Keyboard.asm

@@ -289 +289 @@
 ;       Nothing
 ;--------------------------------------------------------------------
+
+%ifdef EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS
+    %define EXCLUDE
+    %ifdef MODULE_HOTKEYS
+        %undef EXCLUDE
+    %endif
+    %ifdef MODULE_BOOT_MENU
+        %undef EXCLUDE
+    %endif
+%endif
+        
+%ifndef EXCLUDE
+
 ALIGN KEYBOARD_JUMP_ALIGN
 Keyboard_GetKeystrokeToAXandLeaveItToBuffer:
@@ -294 +307 @@
     int     BIOS_KEYBOARD_INTERRUPT_16h
     ret
+        
 ALIGN KEYBOARD_JUMP_ALIGN
 Keyboard_GetKeystrokeToAX:
@@ -306 +320 @@
 Keyboard_GetKeystrokeToAXReturn:
     ret
+        
+%endif
+%undef EXCLUDE