Changeset 258 in xtideuniversalbios for trunk/Serial_Server/win32/Win32Serial.h

Timestamp:

Feb 22, 2012, 7:01:53 PM (13 years ago)

Author:

gregli@…

google:author:

gregli@hotmail.com

Message:

Added floppy drive emulation over the serial connection (MODULE_SERIAL_FLOPPY). Along the way, various optimizations were made to stay within the 8K ROM size target. Also, serial code now returns the number of sectors transferred.

File:

• trunk/Serial_Server/win32/Win32Serial.h (modified) (4 diffs)

trunk/Serial_Server/win32/Win32Serial.h

@@ -35 +35 @@
         }
 
-        if( !strcmp( name, "PIPE" ) )
+        if( name[0] == '\\' && name[1] == '\\' )
         {
-            log( 0, "Opening named pipe %s (simulating %s baud)", PIPENAME, baudRate->display );
+            log( 0, "Opening named pipe %s (simulating %s baud)", name, baudRate->display );
         
-            pipe = CreateNamedPipeA( PIPENAME, PIPE_ACCESS_DUPLEX, PIPE_TYPE_BYTE|PIPE_REJECT_REMOTE_CLIENTS, 2, 1024, 1024, 0, NULL );
+            pipe = CreateNamedPipeA( name, PIPE_ACCESS_DUPLEX, PIPE_TYPE_BYTE|PIPE_REJECT_REMOTE_CLIENTS, 2, 1024, 1024, 0, NULL );
             if( pipe == INVALID_HANDLE_VALUE )
                 log( -1, "Could not CreateNamedPipe " PIPENAME );
@@ -59 +59 @@
                 DCB dcb;
 
-                log( 0, "Opening %s (%lu baud)", name, baudRate->rate );
+                log( 0, "Opening %s (%s baud)", name, baudRate->display );
             
                 pipe = CreateFileA( name, GENERIC_READ|GENERIC_WRITE, 0, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0 );
@@ -74 +74 @@
                 dcb.Parity = NOPARITY;
                 if( !SetCommState( pipe, &dcb ) )
-                    log( -1, "Could not SetCommState" );
+                {
+                    char *msg = "";
+                    COMMPROP comProp;
+
+                    if( GetCommProperties( pipe, &comProp ) )
+                    {
+                        if( comProp.dwMaxBaud != BAUD_USER )
+                            msg = "\n    On this COM port, baud rate is limited to 115.2K";
+                    }
+                    log( -1, "Could not SetCommState: baud rate selected may not be availabele%s", msg );
+                }
 
                 if( !SetCommTimeouts( pipe, &timeouts ) )
@@ -82 +92 @@
             {
                 char logbuff[ 1024 ];
-                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) ) )
-                    {
-                        strcat( logbuff, "\n    " );
-                        strcat( logbuff, buff1 );
-                        found = 1;
-                    }
-                }
-                if( !found )
-                    strcat( logbuff, "\n    (none)" );
+                EnumerateCOMPorts( logbuff, 1024 );
                 
-                log( -1, logbuff );
+                log( -1, "Serial port '%s' not found, detected COM ports: %s", name, logbuff );
             }
         }
+    }
+
+    static void EnumerateCOMPorts( char *logbuff, int logbuffLen )
+    {
+        int found = 0;
+        char buff1[20], buff2[1024];
+
+        logbuff[0] = 0;
+
+        for( int t = 1; t <= 40 && strlen(logbuff) < (logbuffLen - 40); t++ )
+        {
+            sprintf( buff1, "COM%d", t );
+            if( QueryDosDeviceA( buff1, buff2, sizeof(buff2) ) )
+            {
+                if( found )
+                    strcat( logbuff, ", " );
+                strcat( logbuff, buff1 );
+                found = 1;
+            }
+        }
+
+        if( !found )
+            strcat( logbuff, "(none)" );
     }