Changeset 215 in xtideuniversalbios for trunk/Serial_Server/win32

Timestamp:

Jan 19, 2012, 9:17:04 AM (13 years ago)

Author:

gregli@…

google:author:

gregli@hotmail.com

Message:

More minor improvements to the serial server, in particular improved timeout recovery.

Location:

trunk/Serial_Server/win32

Files:

• Win32.cpp (modified) (7 diffs)
• Win32Serial.cpp (modified) (1 diff)

trunk/Serial_Server/win32/Win32.cpp

@@ -40 +40 @@
         "                    With a 4x rate multiplier: 9600, 38400, 153600, 460800",
         "                    Abbreviations also accepted (ie, '460K', '38.4K', etc)",
-        "                    (default is 9600, 115200 in named pipe mode)",
+        "                    (default is 38400, 115200 in named pipe mode)",
         "",
         "  -t                Disable timeout, useful for long delays when debugging",
@@ -47 +47 @@
         "",
         "  -v [level]        Reporting level 1-6, with increasing information",
+        "",
+        "On the client computer, a serial port can be configured for use as a hard disk",
+        "with xtidecfg.com.  Or one can hold down the ALT key at the end of the normal",
+        "IDE hard disk scan and the XTIDE Universal BIOS will scan COM1-7, at each of",
+        "the four speeds given above for BaudRate.  Note that hardware rate multipliers",
+        "must be taken into account on the server end, but are invisible on the client.",
         NULL };
 
@@ -68 +74 @@
     Serial *serial;
     Image *img;
-    struct baudRate *baudRate;
+    struct baudRate *baudRate = NULL;
 
     int timeoutEnabled = 1;
@@ -81 +87 @@
     int imagecount = 0;
     Image *images[2] = { NULL, NULL };
-
-    baudRate = baudRateMatchString( "9600" );
 
     for( int t = 1; t < argc; t++ )
@@ -114 +118 @@
             case 'p': case 'P':
                 ComPort = "PIPE";
-                baudRate = baudRateMatchString( "115200" );
+                if( !baudRate )
+                    baudRate = baudRateMatchString( "115200" );
                 break;            
             case 'g': case 'G':
@@ -141 +146 @@
                 if( !(baudRate = baudRateMatchString( argv[++t] )) )
                 {
-                        fprintf( stderr, "Unknown Baud Rate %s\n\n", argv[t] );
-                        usage();
+                    fprintf( stderr, "Unknown Baud Rate %s\n\n", argv[t] );
+                    usage();
                 }
                 break;
@@ -163 +168 @@
         usage();
 
+    if( !baudRate )
+        baudRate = baudRateMatchString( "38400" );
+
     do
     {

trunk/Serial_Server/win32/Win32Serial.cpp

@@ -53 +53 @@
         if( !ConnectNamedPipe( pipe, NULL ) )
             log( -1, "Could not ConnectNamedPipe" );
+
+        if( baudRate->divisor > 3 )
+            log( -1, "Cannot simulate baud rates with hardware multipliers" );
 
         speedEmulation = 1;