Changeset 127 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src

Timestamp:

Mar 3, 2011, 6:43:50 PM (14 years ago)

Author:

Tomi Tilli

google:author:

aitotat

Message:

Changes to XTIDE Universal BIOS:

• More boot menu fixes.

Location:

trunk/XTIDE_Universal_BIOS/Src

Files:

• Boot/BootMenu.asm (modified) (2 diffs)
• Boot/BootMenuEvent.asm (modified) (1 diff)
• Boot/BootMenuPrint.asm (modified) (3 diffs)
• Boot/BootMenuPrintCfg.asm (modified) (4 diffs)
• Strings.asm (modified) (2 diffs)

trunk/XTIDE_Universal_BIOS/Src/Boot/BootMenu.asm

@@ -36 +36 @@
 ;       CX:     Index of selected item or NO_ITEM_SELECTED
 ;   Corrupts registers:
-;       BX, DI
+;       AX, BX, DI
 ;--------------------------------------------------------------------
 ALIGN JUMP_ALIGN
@@ -166 +166 @@
     jz      SHORT .ReturnItemIndexInDX  ; Return if floppy drive (HD bit not set)
     call    FloppyDrive_GetCountToCX
+    and     dl, ~80h                    ; Clear HD bit
     add     dx, cx
 .ReturnItemIndexInDX:

trunk/XTIDE_Universal_BIOS/Src/Boot/BootMenuEvent.asm

@@ -24 +24 @@
 ALIGN JUMP_ALIGN
 BootMenuEvent_Handler:
-    cmp     bx, MENUEVENT.RefreshItemFromCX ; Above last supported item?
+    cmp     bx, BYTE MENUEVENT.RefreshItemFromCX    ; Above last supported item?
     ja      SHORT .EventNotHandled
-    jmp     [bx+.rgfnEventSpecificHandlers]
+    jmp     [cs:bx+.rgfnEventSpecificHandlers]
 .EventNotHandled:
     clc

trunk/XTIDE_Universal_BIOS/Src/Boot/BootMenuPrint.asm

@@ -88 +88 @@
 ;       AX, BX, SI, DI
 ;--------------------------------------------------------------------
-;ALIGN JUMP_ALIGN
 .HardDiskMenuitemForOurDrive:
     call    BootInfo_GetOffsetToBX
@@ -224 +223 @@
     call    FindDPT_ForDriveNumber      ; DS:DI to point DPT
     jnc     SHORT .HardDiskMenuitemInfoForForeignDrive
-    call    .HardDiskMenuitemInfoSizeForOurDrive
-    jmp     BootMenuPrintCfg_ForOurDrive
+    ; Fall to .HardDiskMenuitemInfoForOurDrive
+
+;--------------------------------------------------------------------
+; .HardDiskMenuitemInfoForOurDrive
+;   Parameters:
+;       DL:     Untranslated Hard Disk number
+;       DS:DI:  Ptr to DPT
+;   Returns:
+;       Nothing
+;   Corrupts registers:
+;       AX, BX, CX, DX, SI, DI, ES
+;--------------------------------------------------------------------
+ALIGN JUMP_ALIGN
+.HardDiskMenuitemInfoForOurDrive:
+    push    di
+    ePUSH_T ax, BootMenuPrintCfg_ForOurDrive    ; Return from BootMenuPrint_FormatCSSIfromParamsInSSBP
+    push    bp
+    mov     bp, sp
+    ePUSH_T ax, g_szCapacity
+
+    ; Get and push L-CHS size
+    call    HCapacity_GetSectorCountFromOurAH08h
+    call    ConvertSectorCountInBXDXAXtoSizeAndPushForFormat
+
+    ; Get and push total LBA size
+    mov     dl, [di+DPT.bDrvNum]
+    call    BootInfo_GetTotalSectorCount
+    call    ConvertSectorCountInBXDXAXtoSizeAndPushForFormat
+
+    mov     si, g_szSizeDual
+    jmp     SHORT BootMenuPrint_FormatCSSIfromParamsInSSBP
+
 
 ;--------------------------------------------------------------------
@@ -248 +277 @@
 
     mov     si, g_szSizeSingle
-    jmp     SHORT BootMenuPrint_FormatCSSIfromParamsInSSBP
-
-;--------------------------------------------------------------------
-; .HardDiskMenuitemInfoSizeForOurDrive
-;   Parameters:
-;       DL:     Untranslated Hard Disk number
-;       DS:DI:  Ptr to DPT
-;   Returns:
-;       Nothing
-;   Corrupts registers:
-;       AX, BX, CX, DX, SI, ES
-;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
-.HardDiskMenuitemInfoSizeForOurDrive:
-    push    bp
-    mov     bp, sp
-    ePUSH_T ax, g_szCapacity
-
-    ; Get and push L-CHS size
-    call    HCapacity_GetSectorCountFromOurAH08h
-    call    ConvertSectorCountInBXDXAXtoSizeAndPushForFormat
-
-    ; Get and push total LBA size
-    call    BootInfo_GetTotalSectorCount
-    call    ConvertSectorCountInBXDXAXtoSizeAndPushForFormat
-
-    mov     si, g_szSizeDual
     ; Fall to BootMenuPrint_FormatCSSIfromParamsInSSBP
 

trunk/XTIDE_Universal_BIOS/Src/Boot/BootMenuPrintCfg.asm

@@ -12 +12 @@
 ; BootMenuPrintCfg_ForOurDrive
 ;   Parameters:
-;       DS:DI:  Ptr to DPT
+;       DS:     Segment to DPT
+;       Stack:  Offset to DPT
 ;   Returns:
 ;       Nothing
@@ -20 +21 @@
 ALIGN JUMP_ALIGN
 BootMenuPrintCfg_ForOurDrive:
+    pop     di
     mov     si, g_szCfgHeader
     call    BootMenuPrint_NullTerminatedStringFromCSSIandSetCF
@@ -37 +39 @@
 ;       AX, DX, SI, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 PushAndFormatCfgString:
     push    bp
@@ -173 +174 @@
 PrintValuesFromStack:
     mov     si, g_szCfgFormat
-    jmp     BootMenuPrint_NullTerminatedStringFromCSSIandSetCF
+    jmp     BootMenuPrint_FormatCSSIfromParamsInSSBP
 
 

trunk/XTIDE_Universal_BIOS/Src/Strings.asm

@@ -6 +6 @@
 
 ; POST drive detection strings
-g_szRomAt:      db  "%s @ %x",CR,LF,NULL
+g_szRomAt:      db  "%s @ %x",LF,CR,NULL
 g_szMaster:     db  "Master",NULL
 g_szSlave:      db  "Slave ",NULL
 g_szDetect:     db  "IDE %s at %x: ",NULL           ; IDE Master at 1F0h:
-g_szNotFound:   db  "not found",CR,LF,NULL
+g_szNotFound:   db  "not found",LF,CR,NULL
 
 ; Boot loader strings
-g_szTryToBoot:  db  "Booting from %s %x",ANGLE_QUOTE_RIGHT,"%x",CR,LF,NULL
+g_szTryToBoot:  db  "Booting from %s %x",ANGLE_QUOTE_RIGHT,"%x",LF,CR,NULL
 g_szBootSector: db  "Boot sector",NULL
 g_szFound:      db  "found",NULL
-g_szSectRead:   db  "%s %s!",CR,LF,NULL
-g_szReadError:  db  "Error %x!",CR,LF,NULL
+g_szSectRead:   db  "%s %s!",LF,CR,NULL
+g_szReadError:  db  "Error %x!",LF,CR,NULL
 
 ; Boot menu bottom of screen strings
@@ -34 +34 @@
 g_szCapacity:   db  "Capacity : ",NULL
 g_szSizeSingle: db  "%s%u.%u %ciB",NULL
-g_szSizeDual:   db  "%s%u.%u %ciB / %u.%u %ciB",NULL
-g_szCfgHeader:  db  "Addr.",SINGLE_VERTICAL,"Block",SINGLE_VERTICAL,"Bus",  SINGLE_VERTICAL,"IRQ",  SINGLE_VERTICAL,"Reset",CR,LF,NULL
+g_szSizeDual:   db  "%s%u.%u %ciB / %u.%u %ciB",LF,CR,NULL
+g_szCfgHeader:  db  "Addr.",SINGLE_VERTICAL,"Block",SINGLE_VERTICAL,"Bus",  SINGLE_VERTICAL,"IRQ",  SINGLE_VERTICAL,"Reset",LF,CR,NULL
 g_szCfgFormat:  db  "%s"   ,SINGLE_VERTICAL,"%5u",  SINGLE_VERTICAL,"%c%2u",SINGLE_VERTICAL," %c%c",SINGLE_VERTICAL,"%5x",  NULL
 g_szLCHS:       db  "L-CHS",NULL