Changeset 211 in xtideuniversalbios for trunk/Serial_Server/win32

Timestamp:

Jan 16, 2012, 7:23:11 PM (12 years ago)

Author:

gregli@…

google:author:

gregli@hotmail.com

Message:

More minor changes, improved usage message

Location:

trunk/Serial_Server/win32

Files:

• Win32.cpp (modified) (4 diffs)
• Win32Serial.cpp (modified) (3 diffs)

trunk/Serial_Server/win32/Win32.cpp

@@ -21 +21 @@
 {
     char *usageStrings[] = {
-        "usage: SerServe [options] master-imagefile [[slave-options] slave-imagefile]",
+        "SerDrive - XTIDE Universal BIOS Serial Drive Server",
+        "Version 1.2.0_wip, Built " __DATE__,
+        "",
+        "usage: SerDrive [options] imagefile [[slave-options] slave-imagefile]",
+        "",
         "  -g cyl:sect:head  Geometry in cylinders, sectors per cylinder, and heads",
         "                    (default is 65:63:16 for a 32 MB disk)",
-        "  -n [megabytes]    New, Create new disk with given size or use -g geometry",
-        "  -p                Named pipe mode for emulators (pipe is " PIPENAME ")",
-        "  -c PortNumber     COM Port to use (default is first found)",
+        "",
+        "  -n [megabytes]    Create new disk with given size or use -g geometry",
+        "",
+        "  -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 ",
-        "                    9600, 38400, 115200, 230400, or 460800",   
-        "                    (default 9600, 115200 in pipe mode)",
+        "                    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 9600, 115200 in named pipe mode)",
+        "",
         "  -t                Disable timeout, useful for long delays when debugging",
-        "  -r                Read Only disk",
-        "  -v [level]        Reporting level 1-6, increasing information",
+        "",
+        "  -r                Read Only disk, do not allow writes",
+        "",
+        "  -v [level]        Reporting level 1-6, with increasing information",
         NULL };
 
@@ -41 +55 @@
 }
 
-int verbose = 1;
+int verbose = 0;
 
 int main(int argc, char* argv[])
@@ -158 +172 @@
 
         if( serial->resetConnection )
-            log( 1, "==== Resetting Connection ====" );
+            log( 0, "Connection closed, reset..." );
     }
     while( serial->resetConnection );
@@ -169 +183 @@
     va_start( args, message );
 
-    if( level == 0 )
-    {
-      vfprintf( stderr, message, args );
-      fprintf( stderr, "\n" );
-      exit( 1 );
+    if( level < 0 )
+    {
+        fprintf( stderr, "ERROR: " );
+        vfprintf( stderr, message, args );
+        fprintf( stderr, "\n" );
+        exit( 1 );
     }
     else if( verbose >= level )
     {
-      vprintf( message, args );
-      printf( "\n" );
+        vprintf( message, args );
+        printf( "\n" );
     }
 

trunk/Serial_Server/win32/Win32Serial.cpp

@@ -40 +40 @@
         }
         if( !name )
-            log( 0, "No Physical COM Ports Found" );
+            log( -1, "No physical COM ports found" );
     }
 
     if( !strcmp( name, "PIPE" ) )
     {
-        log( 1, "Opening named pipe %s (simulating %lu baud)", PIPENAME, baudRate->rate );
+        log( 0, "Opening named pipe %s (simulating %lu baud)", PIPENAME, baudRate->rate );
         
         pipe = CreateNamedPipeA( PIPENAME, PIPE_ACCESS_DUPLEX, PIPE_TYPE_BYTE|PIPE_REJECT_REMOTE_CLIENTS, 2, 1024, 1024, 0, NULL );
         if( !pipe )
-            log( 0, "Could not CreateNamedPipe " PIPENAME );
+            log( -1, "Could not CreateNamedPipe " PIPENAME );
         
         if( !ConnectNamedPipe( pipe, NULL ) )
-            log( 0, "Could not ConnectNamedPipe" );
+            log( -1, "Could not ConnectNamedPipe" );
 
         speedEmulation = 1;
@@ -61 +61 @@
         if( QueryDosDeviceA( name, buff2, sizeof(buff2) ) )
         {
-            log( 1, "Opening %s (%lu baud)", name, baudRate->rate );
+            log( 0, "Opening %s (%lu baud)", name, baudRate->rate );
             
             pipe = CreateFileA( name, GENERIC_READ|GENERIC_WRITE, 0, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0 );
             if( !pipe )
-                log( 0, "Could not Open \"%s\"", name );
+                log( -1, "Could not Open \"%s\"", name );
             
             FillMemory(&dcb, sizeof(dcb), 0);
@@ -74 +74 @@
             dcb.Parity = NOPARITY;
             if( !SetCommState( pipe, &dcb ) )
-                log( 0, "Could not SetCommState" );
+                log( -1, "Could not SetCommState" );
 
             if( !SetCommTimeouts( pipe, &timeouts ) )
-                log( 0, "Could not SetCommTimeouts" );
+                log( -1, "Could not SetCommTimeouts" );
         }
         else
         {
-            int first = 1;
             char logbuff[ 1024 ];
-            sprintf( logbuff, "Serial Port Not Found \"%s\", Available: ", name );
-            for( int t = 1; t <= 30 && !name; t++ )
+            int found = 0;
+
+            sprintf( logbuff, "serial port '%s' not found, detected COM ports:", name );
+
+            for( int t = 1; t <= 40; t++ )
             {
                 sprintf( buff1, "COM%d", t );
                 if( QueryDosDeviceA( buff1, buff2, sizeof(buff2) ) )
                 {
-                    if( !first )
-                        strcat( logbuff, ", " );
-                    else
-                        first = 0;
+                    strcat( logbuff, "\n    " );
                     strcat( logbuff, buff1 );
+                    found = 1;
                 }
             }
-            log( 0, logbuff );
+            if( !found )
+                strcat( logbuff, "\n    (none)" );
+
+            log( -1, logbuff );
         }
     }