Changeset 233 in xtideuniversalbios for trunk/Serial_Server/win32

Timestamp:

Feb 4, 2012, 6:21:22 PM (13 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.

Location:

trunk/Serial_Server/win32

Files:

• Win32.cpp (modified) (4 diffs)
• Win32Serial.h (modified) (1 diff)

trunk/Serial_Server/win32/Win32.cpp

@@ -32 +32 @@
         "                      (default is a 32 MB disk, with CHS geometry 65:63:16)",
         "",
-        "  -p                  Named Pipe mode for emulators (pipe is '" PIPENAME "')",
+        "  -p                  Named Pipe mode for emulators (pipe is \"" PIPENAME "\")",
         "",
         "  -c COMPortNumber    COM Port to use (default is first found)",
         "",
-        "  -b BaudRate         Baud rate to use on the COM port ",
-        "                      Without a rate multiplier: 2400, 9600, 38400, 115200",
-        "                      With a 2x rate multiplier: 4800, 19200, 76800, 230400",
-        "                      With a 4x rate multiplier: 9600, 38400, 153600, 460800",
-        "                      Abbreviations also accepted (ie, '460K', '38.4K', etc)",
-        "                      (default is 38400, 115200 in named pipe mode)",
+        "  -b BaudRate         Baud rate to use on the COM port, with client machine",
+        "                      rate multiplier in effect:",
+        "                          None:  2400,  4800,  9600,  28.8K,  57.6K, 115.2K",
+        "                          2x:    4800,  9600, 19200,  57.6K, 115.2K, 230.4K",
+        "                          4x:    9600, 19200, 38400, 115.2K, 230.4K, 460.8K",
+        "                          and for completeness:               76.8K, 153.6K",
+        "                      (default is 9600, 115.2K when in named pipe mode)",
         "",
         "  -t                  Disable timeout, useful for long delays when debugging",
@@ -148 +149 @@
                 break;
             case 'b': case 'B':
-                if( !(baudRate = baudRateMatchString( argv[++t] )) )
-                {
-                    fprintf( stderr, "Unknown Baud Rate %s\n\n", argv[t] );
-                    usage();
-                }
+                if( !(baudRate = baudRateMatchString( argv[++t] )) || !baudRate->rate )
+                    log( -2, "Unknown Baud Rate \"%s\"", argv[t] );
                 break;
             default:
-                fprintf( stderr, "Unknown Option: %s\n\n", argv[t] );
-                usage();
+                log( -2, "Unknown Option: \"%s\"", argv[t] );
             }
         }
@@ -179 +176 @@
 
     if( !baudRate )
-        baudRate = baudRateMatchString( "38400" );
+        baudRate = baudRateMatchString( "9600" );
 
     do
@@ -206 +203 @@
         vfprintf( stderr, message, args );
         fprintf( stderr, "\n" );
+        if( level < -1 )
+        {
+            fprintf( stderr, "\n" );
+            usage();
+        }
         exit( 1 );
     }

trunk/Serial_Server/win32/Win32Serial.h

@@ -37 +37 @@
         if( !strcmp( name, "PIPE" ) )
         {
-            log( 0, "Opening named pipe %s (simulating %lu baud)", PIPENAME, baudRate->rate );
+            log( 0, "Opening named pipe %s (simulating %s baud)", PIPENAME, baudRate->display );
         
             pipe = CreateNamedPipeA( PIPENAME, PIPE_ACCESS_DUPLEX, PIPE_TYPE_BYTE|PIPE_REJECT_REMOTE_CLIENTS, 2, 1024, 1024, 0, NULL );