Changeset 386 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Boot

Timestamp:

Apr 12, 2012, 2:07:46 PM (13 years ago)

Author:

aitotat@…

google:author:

aitotat@gmail.com

Message:

Changes to XTIDE Universal BIOS:

• Boot menu is now an optional module (MODULE_BOOT_MENU).

Location:

trunk/XTIDE_Universal_BIOS/Src/Boot

Files:

• BootMenuPrint.asm (modified) (5 diffs)
• BootPrint.asm (deleted)
• BootSector.asm (modified) (2 diffs)

trunk/XTIDE_Universal_BIOS/Src/Boot/BootMenuPrint.asm

@@ -61 +61 @@
     push    ax                                      ; the hard disks don't ever use it, but it does no harm)
 
-    jmp     short BootMenuPrint_RefreshInformation.FormatRelay
+    jmp     SHORT BootMenuPrint_RefreshInformation.FormatRelay
 
 ;--------------------------------------------------------------------
@@ -76 +76 @@
 BootMenuPrint_TitleStrings:
     mov     si, ROMVARS.szTitle
-    call    BootMenuPrint_NullTerminatedStringFromCSSIandSetCF
+    call    DetectPrint_NullTerminatedStringFromCSSIandSetCF
     CALL_DISPLAY_LIBRARY PrintNewlineCharacters
     mov     si, ROMVARS.szVersion
-    ; Fall to BootMenuPrint_NullTerminatedStringFromCSSIandSetCF
-
-;--------------------------------------------------------------------
-; BootMenuPrint_NullTerminatedStringFromCSSIandSetCF
-;   Parameters:
-;       CS:SI:  Ptr to NULL terminated string to print
-;   Returns:
-;       CF:     Set since menu event was handled successfully
-;   Corrupts registers:
-;       AX, DI
-;--------------------------------------------------------------------
-BootMenuPrint_NullTerminatedStringFromCSSIandSetCF:
-;
-; We send all CSSI strings through the Format routine for the case of
-; compressed strings, but this doesn't hurt in the non-compressed case either
-; (perhaps a little slower, but shouldn't be noticeable to the user)
-; and results in smaller code size.
-;
-    push    bp
-    mov     bp,sp
-    jmp     short BootMenuPrint_RefreshInformation.FormatRelay
+    jmp     DetectPrint_NullTerminatedStringFromCSSIandSetCF
 
 
@@ -186 +166 @@
 
 .FormatRelay:
-    jmp     short BootMenuPrint_FormatCSSIfromParamsInSSBP
+    jmp     DetectPrint_FormatCSSIfromParamsInSSBP
 
 
@@ -222 +202 @@
 
     test    di,di
-    jz      short BootMenuPrint_FormatCSSIfromParamsInSSBP
+    jz      SHORT BootMenuPrint_RefreshInformation.FormatRelay
 
 %include "BootMenuPrintCfg.asm"         ; inline of code to fill out remainder of information string
-
-;;; fall-through to BootMenuPrint_FormatCSSIfromParamsInSSBP
-
-
-;--------------------------------------------------------------------
-; BootMenuPrint_FormatCSSIfromParamsInSSBP
-;   Parameters:
-;       CS:SI:  Ptr to string to format
-;       BP:     SP before pushing parameters
-;   Returns:
-;       BP:     Popped from stack
-;       CF:     Set since menu event was handled successfully
-;   Corrupts registers:
-;       AX, DI
-;--------------------------------------------------------------------
-BootMenuPrint_FormatCSSIfromParamsInSSBP:
-    CALL_DISPLAY_LIBRARY FormatNullTerminatedStringFromCSSI
-    stc             ; Successful return from menu event
-    pop     bp
-    ret
+    jmp     DetectPrint_FormatCSSIfromParamsInSSBP
 
 
@@ -371 +332 @@
     push    cx          ; Key attribute for last space
     mov     si, g_szHotkey
-
-BootMenuPrint_FormatCSSIfromParamsInSSBP_Relay:
-    jmp     SHORT BootMenuPrint_FormatCSSIfromParamsInSSBP
-
-
-;--------------------------------------------------------------------
-; BootMenuPrint_InitializeDisplayContext
-;   Parameters:
-;       Nothing
-;   Returns:
-;       Nothing
-;   Corrupts registers:
-;       AX, DI
-;--------------------------------------------------------------------
-BootMenuPrint_InitializeDisplayContext:
-    CALL_DISPLAY_LIBRARY InitializeDisplayContext
-    ret
+    jmp     DetectPrint_FormatCSSIfromParamsInSSBP
 
 

trunk/XTIDE_Universal_BIOS/Src/Boot/BootSector.asm

@@ -34 +34 @@
 ;--------------------------------------------------------------------
 BootSector_TryToLoadFromDriveDL:
-    call    BootPrint_TryToBootFromDL
+    call    DetectPrint_TryToBootFromDL
     call    LoadFirstSectorFromDriveDL
     jc      SHORT .FailedToLoadFirstSector
@@ -46 +46 @@
     ret
 .FailedToLoadFirstSector:
-    call    BootPrint_FailedToLoadFirstSector
+    call    DetectPrint_FailedToLoadFirstSector
     clc
     ret
 .FirstHardDiskSectorNotBootable:
     mov     si, g_szBootSectorNotFound
-    call    BootMenuPrint_NullTerminatedStringFromCSSIandSetCF
+    call    DetectPrint_NullTerminatedStringFromCSSIandSetCF
     clc
     ret