Changeset 211 in xtideuniversalbios for trunk/Serial_Server/win32/Win32Serial.cpp


Ignore:
Timestamp:
Jan 16, 2012, 7:23:11 PM (13 years ago)
Author:
gregli@…
google:author:
gregli@hotmail.com
Message:

More minor changes, improved usage message

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/Serial_Server/win32/Win32Serial.cpp

    r209 r211  
    4040        }
    4141        if( !name )
    42             log( 0, "No Physical COM Ports Found" );
     42            log( -1, "No physical COM ports found" );
    4343    }
    4444
    4545    if( !strcmp( name, "PIPE" ) )
    4646    {
    47         log( 1, "Opening named pipe %s (simulating %lu baud)", PIPENAME, baudRate->rate );
     47        log( 0, "Opening named pipe %s (simulating %lu baud)", PIPENAME, baudRate->rate );
    4848       
    4949        pipe = CreateNamedPipeA( PIPENAME, PIPE_ACCESS_DUPLEX, PIPE_TYPE_BYTE|PIPE_REJECT_REMOTE_CLIENTS, 2, 1024, 1024, 0, NULL );
    5050        if( !pipe )
    51             log( 0, "Could not CreateNamedPipe " PIPENAME );
     51            log( -1, "Could not CreateNamedPipe " PIPENAME );
    5252       
    5353        if( !ConnectNamedPipe( pipe, NULL ) )
    54             log( 0, "Could not ConnectNamedPipe" );
     54            log( -1, "Could not ConnectNamedPipe" );
    5555
    5656        speedEmulation = 1;
    … …  
    6161        if( QueryDosDeviceA( name, buff2, sizeof(buff2) ) )
    6262        {
    63             log( 1, "Opening %s (%lu baud)", name, baudRate->rate );
     63            log( 0, "Opening %s (%lu baud)", name, baudRate->rate );
    6464           
    6565            pipe = CreateFileA( name, GENERIC_READ|GENERIC_WRITE, 0, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0 );
    6666            if( !pipe )
    67                 log( 0, "Could not Open \"%s\"", name );
     67                log( -1, "Could not Open \"%s\"", name );
    6868           
    6969            FillMemory(&dcb, sizeof(dcb), 0);
    … …  
    7474            dcb.Parity = NOPARITY;
    7575            if( !SetCommState( pipe, &dcb ) )
    76                 log( 0, "Could not SetCommState" );
     76                log( -1, "Could not SetCommState" );
    7777
    7878            if( !SetCommTimeouts( pipe, &timeouts ) )
    79                 log( 0, "Could not SetCommTimeouts" );
     79                log( -1, "Could not SetCommTimeouts" );
    8080        }
    8181        else
    8282        {
    83             int first = 1;
    8483            char logbuff[ 1024 ];
    85             sprintf( logbuff, "Serial Port Not Found \"%s\", Available: ", name );
    86             for( int t = 1; t <= 30 && !name; t++ )
     84            int found = 0;
     85
     86            sprintf( logbuff, "serial port '%s' not found, detected COM ports:", name );
     87
     88            for( int t = 1; t <= 40; t++ )
    8789            {
    8890                sprintf( buff1, "COM%d", t );
    8991                if( QueryDosDeviceA( buff1, buff2, sizeof(buff2) ) )
    9092                {
    91                     if( !first )
    92                         strcat( logbuff, ", " );
    93                     else
    94                         first = 0;
     93                    strcat( logbuff, "\n    " );
    9594                    strcat( logbuff, buff1 );
     95                    found = 1;
    9696                }
    9797            }
    98             log( 0, logbuff );
     98            if( !found )
     99                strcat( logbuff, "\n    (none)" );
     100
     101            log( -1, logbuff );
    99102        }
    100103    }
Note: See TracChangeset for help on using the changeset viewer.