Changeset 492 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Menus/DriveXlate.asm

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/Src/Menus/DriveXlate.asm (modified) (1 diff)

trunk/XTIDE_Universal_BIOS/Src/Menus/DriveXlate.asm

@@ -20 +20 @@
 ; Section containing code
 SECTION .text
+
+;--------------------------------------------------------------------
+; DriveXlate_ConvertDriveLetterInDLtoDriveNumber
+;   Parameters:
+;       DS:     RAMVARS segment
+;       DL:     Drive letter ('A'...)
+;   Returns:
+;       DL:     Drive number (0xh for Floppy Drives, 8xh for Hard Drives)
+;   Corrupts registers:
+;       AX
+;--------------------------------------------------------------------
+DriveXlate_ConvertDriveLetterInDLtoDriveNumber:
+    call    DriveXlate_GetLetterForFirstHardDriveToAX
+    cmp     dl, al
+    jb      SHORT .ConvertLetterInDLtoFloppyDriveNumber
+
+    ; Convert letter in DL to Hard Drive number
+    sub     dl, al
+    or      dl, 80h
+    ret
+
+.ConvertLetterInDLtoFloppyDriveNumber:
+    sub     dl, DEFAULT_FLOPPY_DRIVE_LETTER
+    ret
+
+%ifdef MODULE_HOTKEY
+%if HotkeyBar_FallThroughTo_DriveXlate_ConvertDriveLetterInDLtoDriveNumber <> DriveXlate_ConvertDriveLetterInDLtoDriveNumber
+    %error "DriveXlate_ConvertDriveLetterInDLtoDriveNumber must be at the top of DriveXlate.asm, and that file must immediately follow HotKeys.asm"
+%endif      
+%endif
+        
+;--------------------------------------------------------------------
+; DriveXlate_ConvertDriveNumberFromDLtoDriveLetter
+;   Parameters:
+;       DL:     Drive number (0xh for Floppy Drives, 8xh for Hard Drives)
+;       DS:     RAMVARS Segment
+;   Returns:
+;       DL:     Drive letter ('A'...)
+;       CF:     Set if Hard Drive
+;               Clear if Floppy Drive
+;   Corrupts registers:
+;       AX
+;--------------------------------------------------------------------
+DriveXlate_ConvertDriveNumberFromDLtoDriveLetter:
+    test    dl, dl
+    jns     SHORT .GetDefaultFloppyDrive
+
+    ; Store default hard drive to boot from
+    call    DriveXlate_GetLetterForFirstHardDriveToAX
+    sub     dl, 80h
+    add     dl, al
+    stc
+    ret
+
+.GetDefaultFloppyDrive:
+    add     dl, DEFAULT_FLOPPY_DRIVE_LETTER     ; Clears CF
+    ret
+
+
+;--------------------------------------------------------------------
+; Returns letter for first hard disk. Usually it will be 'C' but it
+; can be higher if more than two floppy drives are found.
+;
+; DriveXlate_GetLetterForFirstHardDriveToAX
+;   Parameters:
+;       DS:     RAMVARS segment
+;   Returns:
+;       AX:     Upper case letter for first hard disk
+;   Corrupts registers:
+;       Nothing
+;--------------------------------------------------------------------
+DriveXlate_GetLetterForFirstHardDriveToAX:
+    call    FloppyDrive_GetCountToAX
+    add     al, DEFAULT_FLOPPY_DRIVE_LETTER
+    MAX_U   al, DEFAULT_HARD_DRIVE_LETTER
+    ret
+                
 
 ;--------------------------------------------------------------------