Changeset 96 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Boot/BootMenuPrintCfg.asm

Timestamp:

Jan 28, 2011, 4:29:42 PM (13 years ago)

Author:

aitotat

google:author:

aitotat

Message:

Changes to XTIDE Universal BIOS:

• Cleaned boot loader code some more.

File:

• trunk/XTIDE_Universal_BIOS/Src/Boot/BootMenuPrintCfg.asm (modified) (5 diffs)

trunk/XTIDE_Universal_BIOS/Src/Boot/BootMenuPrintCfg.asm

@@ -20 +20 @@
 ALIGN JUMP_ALIGN
 BootMenuPrintCfg_ForOurDrive:
-    call    BootMenuPrintCfg_HeaderAndChangeLine
+    mov     si, g_szCfgHeader
+    call    BootMenuPrint_NullTerminatedStringFromCSSIandSetCF
     call    BootMenuPrintCfg_GetPointers
-    call    BootMenuPrintCfg_PushAndFormatCfgString
-    jmp     BootMenuPrint_Newline
+    ; Fall to PushAndFormatCfgString
 
 
 ;--------------------------------------------------------------------
-; Prints configuration header and changes for printing values.
-;
-; BootMenuPrintCfg_HeaderAndChangeLine
-;   Parameters:
-;       Nothing
-;   Returns:
-;       Nothing
-;   Corrupts registers:
-;       AX, SI, DI
-;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
-BootMenuPrintCfg_HeaderAndChangeLine:
-    mov     si, g_szCfgHeader
-    call    PrintNullTerminatedStringFromCSSIandSetCF
-    jmp     BootMenuPrint_Newline
-
-
-;--------------------------------------------------------------------
-; Return all necessary pointers to drive information structs.
-;
-; BootMenuPrintCfg_GetPointers
-;   Parameters:
-;       DS:DI:  Ptr to DPT
-;   Returns:
-;       DS:DI:  Ptr to DPT
-;       ES:BX:  Ptr to BOOTNFO
-;       CS:SI:  Ptr to IDEVARS
-;   Corrupts registers:
-;       AX, DL
-;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
-BootMenuPrintCfg_GetPointers:
-    mov     dl, [di+DPT.bDrvNum]        ; Load Drive number to DL
-    call    BootInfo_GetOffsetToBX      ; ES:BX now points...
-    LOAD_BDA_SEGMENT_TO es, ax          ; ...to BOOTNFO
-    mov     al, [di+DPT.bIdeOff]
-    xchg    si, ax                      ; CS:SI now points to IDEVARS
-    ret
-
-
-;--------------------------------------------------------------------
-; Pushes all string formatting parameters and prints
-; formatted configuration string.
-;
-; BootMenuPrintCfg_PushAndFormatCfgString
+; PushAndFormatCfgString
 ;   Parameters:
 ;       DS:DI:  Ptr to DPT
@@ -82 +38 @@
 ;--------------------------------------------------------------------
 ALIGN JUMP_ALIGN
-BootMenuPrintCfg_PushAndFormatCfgString:
+PushAndFormatCfgString:
     push    bp
-
     mov     bp, sp
     ; Fall to first push below
@@ -97 +52 @@
 ;       Nothing (jumps to next push below)
 ;   Corrupts registers:
-;       AX, DX
+;       AX
 ;--------------------------------------------------------------------
 PushAddressingMode:
-    mov     dx, bx              ; Backup BX to DX
+    xchg    ax, bx
     mov     bx, MASK_DPT_ADDR   ; Load addressing mode mask
     and     bl, [di+DPT.bFlags] ; Addressing mode now in BX
     push    WORD [cs:bx+.rgszAddressingModeString]
-    mov     bx, dx
+    xchg    bx, ax
     jmp     SHORT .NextPush
 ALIGN WORD_ALIGN
@@ -208 +163 @@
 
 ;--------------------------------------------------------------------
-; Prints formatted configuration string from parameters pushed to stack.
-;
-; BootMenuPrintCfg_ValuesFromStack
+; PrintValuesFromStack
 ;   Parameters:
 ;       Stack:  All formatting parameters
@@ -218 +171 @@
 ;       AX, SI, DI
 ;--------------------------------------------------------------------
-BootMenuPrintCfg_ValuesFromStack:
+PrintValuesFromStack:
     mov     si, g_szCfgFormat
-    jmp     PrintNullTerminatedStringFromCSSIandSetCF
+    jmp     BootMenuPrint_NullTerminatedStringFromCSSIandSetCF
+
+
+;--------------------------------------------------------------------
+; BootMenuPrintCfg_GetPointers
+;   Parameters:
+;       DS:DI:  Ptr to DPT
+;   Returns:
+;       DS:DI:  Ptr to DPT
+;       ES:BX:  Ptr to BOOTNFO
+;       CS:SI:  Ptr to IDEVARS
+;   Corrupts registers:
+;       AX, DL
+;--------------------------------------------------------------------
+ALIGN JUMP_ALIGN
+BootMenuPrintCfg_GetPointers:
+    mov     dl, [di+DPT.bDrvNum]        ; Load Drive number to DL
+    call    BootInfo_GetOffsetToBX      ; ES:BX now points...
+    LOAD_BDA_SEGMENT_TO es, ax          ; ...to BOOTNFO
+    mov     al, [di+DPT.bIdeOff]
+    xchg    si, ax                      ; CS:SI now points to IDEVARS
+    ret