Changeset 233 in xtideuniversalbios for trunk/Serial_Server/library/Image.cpp

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/Serial_Server/library/Image.cpp (modified) (2 diffs)

trunk/Serial_Server/library/Image.cpp

@@ -137 +137 @@
 #define ATA_dwLBACnt 60
 
-#define ATA_VendorSpecific_ReturnPortBaud 158
+#define ATA_wVendor 159
 
 #define ATA_wCaps_LBA 0x200
@@ -164 +164 @@
 };
 
-void Image::respondInquire( unsigned short *buff, struct baudRate *baudRate, unsigned char portAndBaud )
-{
-    unsigned short comPort = 0;
-    struct comPorts *cp;
-
-    if( portAndBaud )
-    {
-        for( cp = supportedComPorts; cp->port && cp->port != ((portAndBaud << 3) + 0x260); cp++ ) ;
-        if( cp->port )
-            comPort = cp->com;
-    }
-      
+void Image::respondInquire( unsigned short *buff, struct baudRate *baudRate, unsigned short port, unsigned char scan )
+{
     memset( &buff[0], 0, 514 );
 
-    if( comPort )
-        sprintf( (char *) &buff[ATA_strModel], "%.20s (COM%d/%s)", shortFileName, comPort, baudRate->display );
-    else
-        sprintf( (char *) &buff[ATA_strModel], "%.30s (%s baud)", shortFileName, baudRate->display );
-
-    // strncpy( (char *) &buff[ATA_strModel], img->shortFileName, 40 );
+    if( scan )
+    {
+        unsigned short comPort = 0;
+        struct comPorts *cp;
+
+        if( port )
+        {
+            for( cp = supportedComPorts; cp->port && cp->port != port; cp++ ) ;
+            if( cp->port )
+                comPort = cp->com;
+        }
+
+        if( comPort )
+            sprintf( (char *) &buff[ATA_strModel], "%.15s (COM%c/%s)", shortFileName, comPort, baudRate->display );
+        else
+            sprintf( (char *) &buff[ATA_strModel], "%.25s (%s baud)", shortFileName, baudRate->display );
+    }
+    else
+        sprintf( (char *) &buff[ATA_strModel], "%.30s", shortFileName );
 
     strncpy( (char *) &buff[ATA_strSerial], "serial", 20 );