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

Timestamp:

Mar 27, 2012, 5:01:57 PM (12 years ago)

Author:

aitotat@…

google:author:

aitotat@gmail.com

Message:

Changes to XTIDE Universal BIOS:

• Errors from AH=9h are stored to DPTs again.
• XT build fits in 8k again.

Location:

trunk/XTIDE_Universal_BIOS/Src/Boot

Files:

• BootMenuInfo.asm (modified) (3 diffs)
• BootMenuPrintCfg.asm (modified) (2 diffs)

trunk/XTIDE_Universal_BIOS/Src/Boot/BootMenuInfo.asm

@@ -65 +65 @@
 
 ;--------------------------------------------------------------------
-; BootMenuInfo_IsAvailable
-;   Parameters:
-;       Nothing
-;   Returns:
-;       ES:     Segment to BOOTVARS with BOOTMENUINFOs
-;       ZF:     Set if BOOTVARS with BOOTMENUINFOs is available
-;               Cleared if not available (no longer initializing)
-;   Corrupts registers:
-;       BX
-;--------------------------------------------------------------------
-BootMenuInfo_IsAvailable:
-    LOAD_BDA_SEGMENT_TO es, bx
-    cmp     WORD [es:BOOTVARS.wMagicWord], BOOTVARS_MAGIC_WORD
-    ret
-
-
-;--------------------------------------------------------------------
 ; Returns offset to BOOTMENUINFO based on DPT pointer.
 ;
@@ -90 +73 @@
 ;       BX:     Offset to BOOTMENUINFO struct
 ;   Corrupts registers:
-;       Nothing
+;       AX
 ;--------------------------------------------------------------------
 BootMenuInfo_ConvertDPTtoBX:
-    push    ax
     mov     ax, di
     sub     ax, BYTE RAMVARS_size                   ; subtract off base of DPTs
@@ -100 +82 @@
     add     ax, BOOTVARS.rgBootNfo                  ; add base of BOOTMENUINFO
     xchg    ax, bx
-    pop     ax
     ret 

trunk/XTIDE_Universal_BIOS/Src/Boot/BootMenuPrintCfg.asm

@@ -65 +65 @@
     test    BYTE [di+DPT.bFlagsHigh], FLGH_DPT_BLOCK_MODE_SUPPORTED
     jz      SHORT .PushBlockSizeFromAX
-    mov     al, [di+DPT_ATA.bSetBlock]
+    mov     al, [di+DPT_ATA.bBlockSize]
 .PushBlockSizeFromAX:
     push    ax
@@ -114 +114 @@
 ;--------------------------------------------------------------------
 .PushResetStatus:
-    call    BootMenuInfo_IsAvailable    ; Load segment to ES
-    call    BootMenuInfo_ConvertDPTtoBX
-    push    WORD [es:bx+BOOTMENUINFO.wInitErrorFlags]
+    xor     ax, ax
+%ifdef MODULE_SERIAL
+    test    BYTE [di+DPT.bFlagsHigh], FLGH_DPT_SERIAL_DEVICE
+    jnz     SHORT .AlwaysSuccess
+    mov     al, [di+DPT_ATA.bInitError]
+.AlwaysSuccess:
+%endif
+    push    ax
 
 ;;; fall-out to BootMenuPrint_HardDiskRefreshInformation.