Changeset 120 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Initialization/DetectDrives.asm

Timestamp:

Feb 28, 2011, 4:41:41 PM (13 years ago)

Author:

aitotat

google:author:

aitotat

Message:

Changes to XTIDE Universal BIOS:

• Display library now gets initialized.
• Small optimizations.
• Something is still broken.

File:

• trunk/XTIDE_Universal_BIOS/Src/Initialization/DetectDrives.asm (modified) (4 diffs)

trunk/XTIDE_Universal_BIOS/Src/Initialization/DetectDrives.asm

@@ -68 +68 @@
 StartDetectionWithDriveSelectByteInBHandStringInAX:
     call    DetectPrint_StartDetectWithMasterOrSlaveStringInAXandIdeVarsInCSBP
-    call    ReadAtaInfoFromDrive    ; Assume hard disk
-    jnc     SHORT CreateBiosTablesForHardDisk
-    ;call   ReadAtapiInfoFromDrive  ; Assume CD-ROM (not yet implemented)
-    ;jnc    SHORT _CreateBiosTablesForCDROM
-    jmp     DetectPrint_DriveNotFound
-
+    ; Fall to .ReadAtaInfoFromHardDisk
 
 ;--------------------------------------------------------------------
-; ReadAtaInfoFromDrive
+; .ReadAtaInfoFromHardDisk
 ;   Parameters:
 ;       BH:     Drive Select byte for Drive and Head Register
@@ -89 +84 @@
 ;       AX, BL, CX, DX, DI
 ;--------------------------------------------------------------------
-ReadAtaInfoFromDrive:
+.ReadAtaInfoFromHardDisk:
     mov     bl, [cs:bp+IDEVARS.bBusType]; Load BUS type
     mov     dx, [cs:bp+IDEVARS.wPort]   ; Load IDE Base Port address
     mov     di, BOOTVARS.rgbAtaInfo     ; ES:DI now points to ATA info location
     call    AH25h_GetDriveInfo
-    mov     si, di                      ; ES:SI now points to ATA information
-    ret
+    jnc     SHORT CreateBiosTablesForHardDisk
+    ; Fall to .ReadAtapiInfoFromDrive
+
+.ReadAtapiInfoFromDrive:                ; Not yet implemented
+    ;call   ReadAtapiInfoFromDrive      ; Assume CD-ROM
+    ;jnc    SHORT _CreateBiosTablesForCDROM
+    jmp     DetectPrint_DriveNotFound
 
 
@@ -103 +103 @@
 ;       BH:     Drive Select byte for Drive and Head Register
 ;       CS:BP:  Ptr to IDEVARS for the drive
-;       ES:SI   Ptr to ATA information for the drive
+;       ES:DI   Ptr to ATA information for the drive
 ;       DS:     RAMVARS segment
 ;       ES:     BDA/Bootnfo segment
@@ -112 +112 @@
 ;--------------------------------------------------------------------
 CreateBiosTablesForHardDisk:
+    mov     si, di                  ; ES:SI now points to ATA information
     call    CreateDPT_FromAtaInformation
     jc      SHORT .InvalidAtaInfo