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

Timestamp:

Feb 4, 2012, 6:21:22 PM (12 years ago)

Author:

gregli@…

google:author:

gregli@hotmail.com

Message:

Serial Port: split single byte port and baud into two bytes, taking advantage of the two bytes in DPT_SERIAL, which supports more serial baud rates and in particular fixed a bug where a 4x client machine couldn't talk to a 115.2K server machine. This is a wide change, touching lots of files, but most are shallow changes. DetectPrint.asm took the most significant changes, now it calculates the baud rate to display instead of using characters provided by the Configurator. The Configurator now has a new menu flag, FLG_MENUITEM_CHOICESTRINGS, for specifying that values are not linear and they should be lookedup rather than indexed. Finally, another important bug fixed here is that in some error cases, the serial port code could get into an infinite loop waiting ont the hardware; now it has a timeout.

File:

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

trunk/XTIDE_Universal_BIOS/Src/Initialization/DetectDrives.asm

@@ -22 +22 @@
 
 .DriveDetectLoop:                           ; Loop through IDEVARS
-    mov     si, g_szDetect                  ; Setup standard print string
+    push    cx
+
+    mov     cx, g_szDetectMaster
+    mov     bh, MASK_DRVNHEAD_SET                               ; Select Master drive
+    call    StartDetectionWithDriveSelectByteInBHandStringInAX  ; Detect and create DPT + BOOTNFO
+
+    mov     cx, g_szDetectSlave
+    mov     bh, MASK_DRVNHEAD_SET | FLG_DRVNHEAD_DRV  
+    call    StartDetectionWithDriveSelectByteInBHandStringInAX
+        
+    pop     cx
+
+    add     bp, BYTE IDEVARS_size           ; Point to next IDEVARS
+
 %ifdef MODULE_SERIAL        
-    cmp     byte [cs:bp+IDEVARS.bDevice], DEVICE_SERIAL_PORT
-    jnz     .DriveNotSerial                 ; Special print string for serial drives
-    mov     si, g_szDetectCOM
-.DriveNotSerial:
+    jcxz    .done                           ; Set to zero on .ideVarsSerialAuto iteration (if any)
 %endif
-
-    call    .DetectDrives_WithIDEVARS       ; Detect Master and Slave
-    add     bp, BYTE IDEVARS_size           ; Point to next IDEVARS
+        
     loop    .DriveDetectLoop
 
 %ifdef MODULE_SERIAL        
 ;
-; if serial drive detected, do not scan (avoids duplicate drives and isn't needed - we have a connection)
-; Note that XLATEVARS.bLastSerial is zero'd in RamVars_Initialize, called in Initialize_AutoDetectDrives;
-; bLastSerial it set in the detection code of SerialCommand.asm
+; if serial drive detected, do not scan (avoids duplicate drives and isn't needed - we already have a connection)
 ;
-    cmp     byte [RAMVARS.xlateVars+XLATEVARS.bLastSerial],cl   ; cx = zero after the loop above
-                                                                ; less instruction bytes than using immediate
-    jnz     .done                                                 
-        
+    call    FindDPT_ToDSDIforSerialDevice
+    jc      .done
+
+    mov     bp, ROMVARS.ideVarsSerialAuto   ; Point to our special IDEVARS sructure, just for serial scans      
+                
     mov     al,[cs:ROMVARS.wFlags]          ; Configurator set to always scan?
     or      al,[es:BDA.bKBFlgs1]            ; Or, did the user hold down the ALT key?
     and     al,8                            ; 8 = alt key depressed, same as FLG_ROMVARS_SERIAL_ALWAYSDETECT
-    jz      .done                           
+    jnz     .DriveDetectLoop                            
+%endif
 
-    mov     bp, ROMVARS.ideVarsSerialAuto   ; Point to our special IDEVARS sructure, just for serial scans
-    mov     si, g_szDetectCOMAuto           ; Special, special print string for serial drives during a scan
-;;; fall-through                    
-%else
+.done:
     ret
-%endif
 
 %if FLG_ROMVARS_SERIAL_SCANDETECT != 8
@@ -60 +64 @@
 %endif
 
-;--------------------------------------------------------------------
-; Detects IDE hard disks by using information from IDEVARS.
-;
-; DetectDrives_WithIDEVARS
-;   Parameters:
-;       CS:BP:      Ptr to IDEVARS
-;       DS:         RAMVARS segment
-;       ES:         Zero (BDA segment)
-;       SI:         Ptr to template string
-;   Returns:
-;       Nothing
-;   Corrupts registers:
-;       AX, BX, DX, SI, DI
-;--------------------------------------------------------------------
-.DetectDrives_WithIDEVARS:
-    push    cx
-
-    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
-    call    StartDetectionWithDriveSelectByteInBHandStringInAX
-    pop     cx
-        
-.done:  
-    ret
-
         
 ;--------------------------------------------------------------------
 ; StartDetectionWithDriveSelectByteInBHandStringInAX
 ;   Parameters:
-;       AX:     Offset to "Master" or "Slave" string
 ;       BH:     Drive Select byte for Drive and Head Register
+;       CX:     Offset to "Master" or "Slave" string
 ;       CS:BP:  Ptr to IDEVARS for the drive
 ;       DS:     RAMVARS segment