Changeset 199 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Initialization

Timestamp:

Nov 21, 2011, 11:01:08 AM (13 years ago)

Author:

gregli@…

google:author:

gregli@hotmail.com

Message:

Adding proper serial port support to the Configurator, which required some minor changes elsewhere. Also added an option, off by default, to automatically scan for serial drives at the end of normal drive detection (no ALT key required, although that is still available if the option is off).

Location:

trunk/XTIDE_Universal_BIOS/Src/Initialization

Files:

• DetectDrives.asm (modified) (1 diff)
• DetectPrint.asm (modified) (1 diff)

trunk/XTIDE_Universal_BIOS/Src/Initialization/DetectDrives.asm

@@ -31 +31 @@
     add     bp, BYTE IDEVARS_size           ; Point to next IDEVARS
     loop    .DriveDetectLoop
-
 %ifdef MODULE_SERIAL
-    test    BYTE [es:BDA.bKBFlgs1], 8       ; alt key depressed
-    jz      .done
+    mov     al,[cs:ROMVARS.wFlags]
+    or      al,[es:BDA.bKBFlgs1]
+    and     al,8        ; 8 = alt key depressed, same as FLG_ROMVARS_SERIAL_ALWAYSDETECT
+    jz      .done
     mov     bp, ROMVARS.ideVarsSerialAuto
     mov     si, g_szDetectCOMAuto
-;;; fall-through        
+;;; fall-through                    
 %else
     ret
+%endif
+
+%if FLG_ROMVARS_SERIAL_SCANDETECT != 8
+%error "DetectDrives is currently coded to assume that FLG_ROMVARS_SERIAL_ALWAYSDETECT is the same bit as the ALT key code in the BDA.  Changes in the code will be needed if these values are no longer the same."
 %endif
 

trunk/XTIDE_Universal_BIOS/Src/Initialization/DetectPrint.asm

@@ -53 +53 @@
 %ifdef MODULE_SERIAL
 ;
-; Baud rate is packed into one word:
-;    High order 6 bits: number to add to '0' to get postfix character ('0' or 'K')
-;    Low order 10 bits: binary number to display (960, 240, 38, or 115)
-;          To get 9600: '0'<<10 + 960
-;          To get 2400: '0'<<10 + 240
-;          To get 38K:  ('K'-'0')<<10 + 38
-;          To get 115K: ('K'-'0')<<10 + 115
-;
+; Print baud rate from .wSerialPackedPrintBaud, in two parts - %u and then %c
+; 
     mov     ax,cx                       ; Unpack baud rate number
-    and     ax,03ffh
+    and     ax,DEVICE_SERIAL_PRINTBAUD_NUMBERMASK
     push    ax
 
     mov     al,ch                       ; Unpack baud rate postfix ('0' or 'K')
-    eSHR_IM al,2
-    add     al,'0'
+    eSHR_IM al,2                        ; also effectively masks off the postfix
+    add     al,DEVICE_SERIAL_PRINTBAUD_POSTCHARADD
     push    ax
 %endif