Changeset 489 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Initialization

Timestamp:

Dec 13, 2012, 7:32:09 AM (12 years ago)

Author:

gregli@…

google:author:

gregli@hotmail.com

Message:

Added version string to initial title banner, for cases where there is not a boot menu (just hotkeys, or no hotkeys). Also ifdef'd out some unused code.

Location:

trunk/XTIDE_Universal_BIOS/Src/Initialization

Files:

• DetectPrint.asm (modified) (3 diffs)
• Interrupts.asm (modified) (2 diffs)

trunk/XTIDE_Universal_BIOS/Src/Initialization/DetectPrint.asm

@@ -50 +50 @@
 
 ;--------------------------------------------------------------------
-; Prints BIOS name and segment address where it is found.
-;
-; DetectPrint_RomFoundAtSegment
-;   Parameters:
-;       Nothing
-;   Returns:
-;       Nothing
-;   Corrupts registers:
-;       AX, SI, DI
-;--------------------------------------------------------------------
-DetectPrint_RomFoundAtSegment:
-    push    bp
-    mov     bp, sp
-    mov     si, g_szRomAt
-    ePUSH_T ax, ROMVARS.szTitle         ; Bios title string
-    push    cs                          ; BIOS segment
-
-    jmp     DetectPrint_FormatCSSIfromParamsInSSBP
-
-
-;--------------------------------------------------------------------
 ; DetectPrint_StartDetectWithMasterOrSlaveStringInCXandIdeVarsInCSBP
 ;   Parameters:
@@ -82 +61 @@
 DetectPrint_StartDetectWithMasterOrSlaveStringInCXandIdeVarsInCSBP:
     mov     ax, [cs:bp+IDEVARS.wBasePort]   ; for IDE: AX=port address, DH=.bDevice
-    ; Fall to DetectPrint_StartDetectWithAutodetectedBasePortInAX
+    ; fall through to DetectPrint_StartDetectWithAutodetectedBasePortInAXandIdeVarsInCSBP
 
 ;--------------------------------------------------------------------
@@ -167 +146 @@
 ;       Nothing
 ;   Corrupts registers:
-;       AX, SI
+;       AX, SI, DI
 ;--------------------------------------------------------------------
 DetectPrint_DriveNameFromDrvDetectInfoInESBX:
-    push    di
-    push    bx
-
-    lea     si, [bx+DRVDETECTINFO.szDrvName]
-    mov     bx, es
-    CALL_DISPLAY_LIBRARY PrintNullTerminatedStringFromBXSI
-    CALL_DISPLAY_LIBRARY PrintNewlineCharacters
-
-    pop     bx
-    pop     di
-    ret
+    push    bp
+    mov     bp,sp   
+    lea     si,[bx+DRVDETECTINFO.szDrvName]
+    push    si
+    mov     si,g_szDriveName
+    jmp     SHORT DetectPrint_FormatCSSIfromParamsInSSBP
+
+                
+;--------------------------------------------------------------------
+; Prints BIOS name and segment address where it is found.
+;
+; DetectPrint_RomFoundAtSegment
+;   Parameters:
+;       Nothing
+;   Returns:
+;       Nothing
+;   Corrupts registers:
+;       AX, SI, DI
+;--------------------------------------------------------------------
+DetectPrint_RomFoundAtSegment:
+    mov     si, g_szRomAt
+    mov     di, cs                      ; BIOS segment address, for later inclusion in the output, parameterized
+                                        ; so that it can be a different value when using .BootMenuEntry
+
+.BootMenuEntry: 
+    push    bp
+    mov     bp, sp
+
+%ifndef USE_186
+    mov     ax, ROMVARS.szTitle
+    push    ax
+    push    di                          ; BIOS segment
+    add     al, ROMVARS.szVersion - ROMVARS.szTitle
+    push    ax
+%else
+    ; szTitle and szVersion have the high order byte of their addresses zero, 
+    ; so these push instructions are only 2 bytes
+    ;
+    push    ROMVARS.szTitle
+    push    di                          ; BIOS segment
+    push    ROMVARS.szVersion
+%endif
+
+    jmp     SHORT DetectPrint_FormatCSSIfromParamsInSSBP
+
 
 ;--------------------------------------------------------------------

trunk/XTIDE_Universal_BIOS/Src/Initialization/Interrupts.asm

@@ -43 +43 @@
 %ifndef MODULE_HOTKEYS
     cmp     BYTE [RAMVARS.bDrvCnt], 0
-    je      SHORT Interrupts_Return
+    je      SHORT Interrupts_InstallHandlerToVectorInALFromCSSI.Interrupts_Return
 %endif
     ; Fall to .InitializeInt13hAnd40h
@@ -172 +172 @@
     mov     [es:bx], si             ; Store offset
     mov     [es:bx+2], cs           ; Store segment
-Interrupts_Return:
+.Interrupts_Return:
     ret