Changeset 243 in xtideuniversalbios for trunk

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

Files:

• Inc/BootVars.inc (modified) (3 diffs)
• Inc/RomVars.inc (modified) (2 diffs)
• Src/Boot/BootMenu.asm (modified) (3 diffs)
• Src/Boot/BootMenuPrint.asm (modified) (1 diff)
• Src/Handlers/Int19h.asm (added)
• Src/Handlers/Int19hMenu.asm (deleted)
• Src/Initialization/Initialize.asm (modified) (3 diffs)
• Src/Initialization/Interrupts.asm (modified) (1 diff)
• Src/Main.asm (modified) (3 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

trunk/XTIDE_Universal_BIOS/Src/Boot/BootMenu.asm

@@ -8 +8 @@
 ; Displays Boot Menu and returns Drive or Function number.
 ;
-; BootMenu_DisplayAndReturnSelection
+; BootMenu_DisplayAndReturnSelectionInDX
 ;   Parameters:
 ;       DS:     RAMVARS segment
@@ -17 +17 @@
 ;--------------------------------------------------------------------
 ALIGN JUMP_ALIGN
-BootMenu_DisplayAndReturnSelection:
+BootMenu_DisplayAndReturnSelectionInDX:
     call    DriveXlate_Reset
     call    BootMenuPrint_TheBottomOfScreen
@@ -23 +23 @@
     call    BootMenuPrint_ClearScreen
     call    BootMenu_GetDriveToDXforMenuitemInCX
-    jnc     BootMenu_DisplayAndReturnSelection
+    jnc     BootMenu_DisplayAndReturnSelectionInDX
     ret
 

trunk/XTIDE_Universal_BIOS/Src/Boot/BootMenuPrint.asm

@@ -426 +426 @@
     db      2880  / FloppyTypes.rgbCapacityMultiplier    ;  type 5
     db      2880  / FloppyTypes.rgbCapacityMultiplier    ;  type 6
-
-
-
-
-        
-
-
-        

trunk/XTIDE_Universal_BIOS/Src/Initialization/Initialize.asm

@@ -30 +30 @@
     ; Install INT 19h handler (boot loader) where drives are detected
     mov     bx, BIOS_BOOT_LOADER_INTERRUPT_19h
-    mov     si, HandlerForLateInitialization
+    mov     si, Int19h_BootLoaderHandler
     call    Interrupts_InstallHandlerToVectorInBXFromCSSI
 
@@ -39 +39 @@
     popf
     retf
-
-
-;--------------------------------------------------------------------
-; HandlerForLateInitialization
-;   Parameters:
-;       Nothing
-;   Returns:
-;       Never returns
-;--------------------------------------------------------------------
-HandlerForLateInitialization:
-    LOAD_BDA_SEGMENT_TO es, ax
-    call    Initialize_AndDetectDrives      ; Installs new boot menu loader
-    int     BIOS_BOOT_LOADER_INTERRUPT_19h  ; Display boot menu
 
 
@@ -103 +90 @@
 ;   Parameters:
 ;       DS:     RAMVARS segment
+;       ES:     BDA and interrupt vector segment (zero)
 ;   Returns:
 ;       Nothing
 ;   Corrupts registers:
-;       All
+;       All, except DS and ES
 ;--------------------------------------------------------------------
 .ResetDetectedDrives:

trunk/XTIDE_Universal_BIOS/Src/Initialization/Interrupts.asm

@@ -43 +43 @@
     ; 40h from 13h. That system locks to infinite loop if we copy 13h to 40h.
     call    FloppyDrive_IsInt40hInstalled
-    jc      SHORT .InitializeInt19h
+    jc      SHORT .Int40hAlreadyInstalled
     mov     [es:BIOS_DISKETTE_INTERRUPT_40h*4], ax      ; Store old INT 13h offset
     mov     [es:BIOS_DISKETTE_INTERRUPT_40h*4+2], dx    ; Store old INT 13h segment
-    ; Fall to .InitializeInt19h
-
-;--------------------------------------------------------------------
-; .InitializeInt19h
-;   Parameters:
-;       DS:     RAMVARS segment
-;       ES:     BDA and Interrupt Vector segment (zero)
-;   Returns:
-;       Nothing
-;   Corrupts registers:
-;       BX, SI
-;--------------------------------------------------------------------
-.InitializeInt19h:
-    mov     bx, BIOS_BOOT_LOADER_INTERRUPT_19h
-    mov     si, Int19hMenu_BootLoader
-    call    Interrupts_InstallHandlerToVectorInBXFromCSSI
+.Int40hAlreadyInstalled:
     ; Fall to .InitializeHardwareIrqHandlers
 

trunk/XTIDE_Universal_BIOS/Src/Main.asm

@@ -70 +70 @@
 %endif
 
+%ifdef MODULE_JRIDE
+    MAIN_FLG_MODULE_JRIDE   equ FLG_ROMVARS_MODULE_JRIDE
+%else
+    MAIN_FLG_MODULE_JRIDE   equ 0
+%endif
+
+
 ;---------------------------;
 ; AT Build default settings ;
 ;---------------------------;
 %ifdef USE_AT
-    at  ROMVARS.wFlags,         dw  FLG_ROMVARS_FULLMODE | FLG_ROMVARS_DRVXLAT | MAIN_FLG_MODULE_SERIAL | MAIN_FLG_MODULE_EBIOS
+    at  ROMVARS.wFlags,         dw  FLG_ROMVARS_FULLMODE | FLG_ROMVARS_DRVXLAT | MAIN_FLG_MODULE_SERIAL | MAIN_FLG_MODULE_EBIOS | MAIN_FLG_MODULE_JRIDE
     at  ROMVARS.wDisplayMode,   dw  DEFAULT_TEXT_MODE
     at  ROMVARS.wBootTimeout,   dw  30 * TICKS_PER_SECOND   ; Boot Menu selection timeout
@@ -117 +124 @@
 ; XT and XT+ Build default settings ;
 ;-----------------------------------;
-    at  ROMVARS.wFlags,         dw  FLG_ROMVARS_DRVXLAT | MAIN_FLG_MODULE_SERIAL | MAIN_FLG_MODULE_EBIOS
+    at  ROMVARS.wFlags,         dw  FLG_ROMVARS_DRVXLAT | MAIN_FLG_MODULE_SERIAL | MAIN_FLG_MODULE_EBIOS | MAIN_FLG_MODULE_JRIDE
     at  ROMVARS.wDisplayMode,   dw  DEFAULT_TEXT_MODE
     at  ROMVARS.wBootTimeout,   dw  30 * TICKS_PER_SECOND   ; Boot Menu selection timeout
@@ -178 +185 @@
 
     ; Boot loader
-    %include "Int19hMenu.asm"       ; For Int 19h, Boot Loader for Boot Menu
+    %include "Int19h.asm"           ; For Int 19h, Boot Loader
 
     ; For all device types