Changeset 243 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Inc

Timestamp:

Feb 10, 2012, 2:00:50 PM (13 years ago)

Author:

aitotat@…

google:author:

aitotat@gmail.com

Message:

Changes to XTIDE Universal BIOS:

• Brought back optional "A then C" boot loader.
• Now there is only one INT 19h handler that remains unchanged.

Location:

trunk/XTIDE_Universal_BIOS/Inc

Files:

• BootVars.inc (modified) (3 diffs)
• RomVars.inc (modified) (2 diffs)

trunk/XTIDE_Universal_BIOS/Inc/BootVars.inc

@@ -56 +56 @@
 ; STORE_POST_STACK_POINTER
 ;   Parameters:
-;       DS:     BDA and Interrupt Vector segment (zero)
+;       ES:     BDA and Interrupt Vector segment (zero)
 ;   Returns:
 ;       Nothing
@@ -63 +63 @@
 ;--------------------------------------------------------------------
 %macro STORE_POST_STACK_POINTER 0
-    mov     [BOOTVARS.dwPostStack], sp
-    mov     [BOOTVARS.dwPostStack+2], ss
+    mov     [es:BOOTVARS.dwPostStack], sp
+    mov     [es:BOOTVARS.dwPostStack+2], ss
 %endmacro
 
@@ -102 +102 @@
 ; Restores SS and SP to initial boot loader values.
 ;
-; Before doing any changes, see the note regarding
-; LOAD_BDA_SEGMENT_TO in BootVars_SwitchToBootMenuStack
+; Note! Must return with AX=0 and CF preserved.
+; See Int19hMenu_JumpToBootSector_or_RomBoot.
 ;
 ; SWITCH_BACK_TO_POST_STACK
 ;   Parameters:
-;       Nothing
+;       AX:     BDA and Interrupt Vector segment (zero)
 ;   Returns:
 ;       SS:SP:  Ptr to POST stack
 ;   Corrupts registers:
-;       Nothing
+;       Nothing (not even FLAGS)
 ;--------------------------------------------------------------------
 %macro SWITCH_BACK_TO_POST_STACK 0
 %ifndef USE_386
-    cli                                 ; Disable interrupts
-    LOAD_BDA_SEGMENT_TO ss, sp
+    cli
+    mov     ss, ax
     mov     sp, [ss:BOOTVARS.dwPostStack]
     mov     ss, [ss:BOOTVARS.dwPostStack+2]
-    sti                                 ; Enable interrupts
+    sti
 %else
-    LOAD_BDA_SEGMENT_TO ss, sp
+    mov     ss, ax
     lss     sp, [ss:BOOTVARS.dwPostStack]
-%endif
+%endif  
 %endmacro
 

trunk/XTIDE_Universal_BIOS/Inc/RomVars.inc

@@ -17 +17 @@
     .wFlags             resb    2   ; Word for ROM flags
     .wDisplayMode       resb    2   ; Display mode for boot menu
+    .wfDisplayBootMenu:             ; Zero = no Boot Menu, non-zero = Boot Menu timeout
     .wBootTimeout       resb    2   ; Boot Menu selection timeout in system timer ticks
     .bIdeCnt            resb    1   ; Number of available IDE controllers
@@ -39 +40 @@
                                                 ; by holding down the ALT key at the end of drive detection.
                                                 ; (Conveniently, this is 8, a fact we exploit when testing the bit)
+FLG_ROMVARS_MODULE_JRIDE            EQU (1<<5)  ; Here in case the configuration needs to know functionality is present
 FLG_ROMVARS_MODULE_SERIAL           EQU (1<<6)  ; Here in case the configuration needs to know functionality is present
 FLG_ROMVARS_MODULE_EBIOS            EQU (1<<7)  ; Here in case the configuration needs to know functionality is present