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

Timestamp:

Nov 19, 2011, 11:18:39 AM (12 years ago)

Author:

gregli@…

google:author:

gregli@hotmail.com

Message:

Added printing of COM port and baud rate, when set explicitly by idecfg. Although it eats some bytes, I think it is worth it, since the BIOS will be looking for a server on a particular com port and baud rate, and it could be hard to troubleshoot a mismatch without this information. However, if we become space crunched, this change can be backed out.

File:

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

trunk/XTIDE_Universal_BIOS/Src/Initialization/DetectDrives.asm

@@ -21 +21 @@
     mov     bp, ROMVARS.ideVars0            ; CS:BP now points to first IDEVARS
 .DriveDetectLoop:
-    mov     si,g_szDetect
+    mov     si, g_szDetect
+%ifdef MODULE_SERIAL
+    cmp     byte [cs:bp+IDEVARS.bDevice], DEVICE_SERIAL_PORT
+    jnz     .DriveNotSerial
+    mov     si, g_szDetectCOM
+.DriveNotSerial:
+%endif
     call    .DetectDrives_WithIDEVARS       ; Detect Master and Slave
     add     bp, BYTE IDEVARS_size           ; Point to next IDEVARS
@@ -30 +36 @@
     jz      .done
     mov     bp, ROMVARS.ideVarsSerialAuto
-    mov     si,g_szSerial
+    mov     si, g_szDetectCOMAuto
 ;;; fall-through        
 %else
@@ -52 +58 @@
 .DetectDrives_WithIDEVARS:
     push    cx
-        
-    push    si
+
+    push    si      
     mov     ax, g_szMaster
     mov     bh, MASK_DRVNHEAD_SET                               ; Select Master drive
     call    StartDetectionWithDriveSelectByteInBHandStringInAX  ; Detect and create DPT + BOOTNFO
     pop     si
-        
+
     mov     ax, g_szSlave
     mov     bh, MASK_DRVNHEAD_SET | FLG_DRVNHEAD_DRV
@@ -112 +118 @@
     ;call   ReadAtapiInfoFromDrive      ; Assume CD-ROM
     ;jnc    SHORT _CreateBiosTablesForCDROM
-    jmp     DetectPrint_DriveNotFound
+    jmp     short DetectDrives_DriveNotFound
 
 
@@ -130 +136 @@
 CreateBiosTablesForHardDisk:
     call    CreateDPT_FromAtaInformation
-    jc      SHORT .InvalidAtaInfo
+    jc      SHORT DetectDrives_DriveNotFound
     call    BootInfo_CreateForHardDisk
-    jmp     DetectPrint_DriveNameFromBootnfoInESBX
-.InvalidAtaInfo:
-    jmp     DetectPrint_DriveNotFound
+    jmp     short DetectPrint_DriveNameFromBootnfoInESBX
+
+;--------------------------------------------------------------------
+; DetectDrives_DriveNotFound
+;   Parameters:
+;       Nothing
+;   Returns:
+;       Nothing
+;   Corrupts registers:
+;       AX, SI
+;--------------------------------------------------------------------
+DetectDrives_DriveNotFound:     
+    mov     si, g_szNotFound
+    jmp     BootMenuPrint_NullTerminatedStringFromCSSIandSetCF      
+