Changeset 359 in xtideuniversalbios for trunk/BIOS_Drive_Information_Tool/Src/Main.asm

Timestamp:

Mar 19, 2012, 2:22:17 PM (12 years ago)

Author:

aitotat@…

google:author:

aitotat@gmail.com

Message:

Changes to BIOS Drive Information Tool:

• L-CHS variables generated by XTIDE Universal BIOS are now displayed.

File:

• trunk/BIOS_Drive_Information_Tool/Src/Main.asm (modified) (5 diffs)

trunk/BIOS_Drive_Information_Tool/Src/Main.asm

@@ -7 +7 @@
 %define INCLUDE_KEYBOARD_LIBRARY
 %include "AssemblyLibrary.inc"  ; Assembly Library. Must be included first!
-%include "ATA_ID.inc"
-%include "Int13h.inc"
-%include "EBIOS.inc"
+%include "Version.inc"          ; From XTIDE Universal BIOS
+%include "ATA_ID.inc"           ; From XTIDE Universal BIOS
+%include "Int13h.inc"           ; From XTIDE Universal BIOS
+%include "EBIOS.inc"            ; From XTIDE Universal BIOS
+FLG_DRVNHEAD_DRV    EQU (1<<4)  ; Required by CustomDPT.inc
+%include "CustomDPT.inc"        ; From XTIDE Universal BIOS
 
 
@@ -22 +25 @@
 ; Include library and other sources
 %include "AssemblyLibrary.asm"
+%include "LbaAssist.asm"        ; From XTIDE Universal BIOS
 %include "Strings.asm"
 %include "Bios.asm"
@@ -33 +37 @@
 StartBiosDriveInformationTool:
     CALL_DISPLAY_LIBRARY    InitializeDisplayContext
-    mov     bl, ATTRIBUTES_NOT_USED
-    mov     ax, Print_DosCharOut
-    CALL_DISPLAY_LIBRARY    SetCharOutputFunctionFromAXwithAttribFlagInBL
+    call    Print_SetCharacterOutputToSTDOUT
 
     mov     si, g_szProgramName
@@ -60 +62 @@
     call    Print_NullTerminatedStringFromSI
     call    Keyboard_GetKeystrokeToAXandWaitIfNecessary
+
 .DisplayFirstDrive:
     mov     si, g_szHeaderDrive
@@ -126 +129 @@
     mov     si, g_szLBA48
     call    Print_NullTerminatedStringFromSI
+    mov     si, bx
     mov     ax, [bx+ATA6.qwLBACnt]
     mov     dx, [bx+ATA6.qwLBACnt+2]
     mov     bx, [bx+ATA6.qwLBACnt+4]
     call    Print_TotalSectorsFromBXDXAX
+    mov     bx, si
 .SkipLBA48:
+
+    ; Print L-CHS generated by XTIDE Universal BIOS
+    mov     ax, g_szXTUBversion
+    mov     si, g_szXTUB
+    call    Print_VersionStringFromAXusingFormatStringInSI
+    call    DisplayXTUBcompatibilityInfoUsingAtaInfoFromDSBX
+
 .SkipAtaInfoSinceError:
     pop     dx
     pop     cx
+    ret
+
+
+ALIGN JUMP_ALIGN
+DisplayXTUBcompatibilityInfoUsingAtaInfoFromDSBX:
+    test    WORD [bx+ATA1.wCaps], A1_wCaps_LBA
+    jz      SHORT .LbaNotSupported
+    test    WORD [bx+ATA6.wSetSup83], A6_wSetSup83_LBA48
+    jz      SHORT .LoadLba28SectorCount
+
+    ; Load LBA48 Sector Count
+    mov     ax, [bx+ATA6.qwLBACnt]
+    mov     dx, [bx+ATA6.qwLBACnt+2]
+    mov     bx, [bx+ATA6.qwLBACnt+4]
+    jmp     SHORT .ConvertLbaToLCHS
+.LoadLba28SectorCount:
+    mov     ax, [bx+ATA1.dwLBACnt]
+    mov     dx, [bx+ATA1.dwLBACnt+2]
+    xor     bx, bx
+
+.ConvertLbaToLCHS:
+    call    LbaAssist_ConvertSectorCountFromBXDXAXtoLbaAssistedCHSinDXAXBLBH
+    LIMIT_LBA_CYLINDERS_IN_DXAX_TO_LCHS_CYLINDERS
+    xchg    cx, ax
+    eMOVZX  dx, bl
+    eMOVZX  ax, bh
+    call    Print_CHSfromCXDXAX
+.LbaNotSupported:
     ret