Changeset 211 in xtideuniversalbios for trunk/Serial_Server/library

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

Location:

trunk/Serial_Server/library

Files:

• FlatImage.cpp (modified) (5 diffs)
• Image.cpp (modified) (1 diff)
• Process.cpp (modified) (15 diffs)

trunk/Serial_Server/library/FlatImage.cpp

@@ -25 +25 @@
         fp = fopen( name, "r" );
         if( fp )
-            log( 0, "Create Failure: '%s' already exists", name );
+            log( -1, "Create Failure: '%s' already exists", name );
         
         if( !(fp = fopen( name, "w" )) )
-            log( 0, "Could not create file '%s'", name );
+            log( -1, "Could not create file '%s'", name );
 
         memset( &buff[0], 0, 512 );
@@ -35 +35 @@
         {
             if( fwrite( &buff[0], 1, 512, fp ) != 512 )
-                log( 0, "Create write black sector error" );
+                log( -1, "Create write black sector error" );
         }
         fclose( fp );
         
         sizef = size2/2048.0;
-        log( 1, "Created file '%s' with geometry %u:%u:%u, size %.1lf megabytes\n", name, p_cyl, p_sect, p_head, sizef );
+        log( 0, "Created file '%s' with geometry %u:%u:%u, size %.1lf megabytes\n", name, p_cyl, p_sect, p_head, sizef );
     }
 
     fp = fopen( name, "r+" );
     if( !fp )
-        log( 0, "Could not Open %s", name );
-
-    log( 1, "Opening disk image '%s'", name );
+        log( -1, "Could not Open '%s'", name );
 
     fseek( fp, 0, SEEK_END );
@@ -53 +51 @@
 
     if( !totallba )
-        log( 0, "Could not get file size" );
+        log( -1, "Could not get file size for '%s'", name );
 
     if( totallba & 0x1ff )
-        log( 0, "File not made up of 512 byte sectors" );
+        log( -1, "'%s' not made up of 512 byte sectors", name );
 
     totallba >>= 9;
@@ -62 +60 @@
     {
         if( p_sect || p_head || p_cyl )
-            log( 0, "File size does not match geometry" );
+            log( -1, "'%s', file size does not match geometry", name );
         else if( (totallba % 16) != 0 || ((totallba/16) % 63) != 0 )
-            log( 0, "File size does not match standard geometry (x:16:63), please give explicitly with -g" );
+            log( -1, "'%s', file size does not match standard geometry (x:16:63), please geometry explicitly with -g", name );
         else
         {
@@ -80 +78 @@
 
     sizef = totallba/2048.0;
-    log( 1, "Using geometry %u:%u:%u, total size %.1lf megabytes", cyl, sect, head, sizef );
+    log( 0, "Opening disk image '%s', geometry %u:%u:%u, total size %.1lf MB", name, cyl, sect, head, sizef );
 }
 

trunk/Serial_Server/library/Image.cpp

@@ -33 +33 @@
 
     if( *(shortFileName) == 0 )
-        log( 0, "Can't parse %s\n\n", name );
+    {
+        log( 1, "Can't parse '%s' for short file name\n\n", name );
+        shortFileName = "SerDrive";
+    }
   
     readOnly = p_readOnly;

trunk/Serial_Server/library/Process.cpp

@@ -68 +68 @@
             sprintf( &logBuff[logCount*9], "... " );
 
-        log( 4, "%s%s", message, logBuff );
+        log( 3, "%s%s", message, logBuff );
     }
 }
@@ -118 +118 @@
             len = 1;
             workCount = 0;
-            log( 2, "Timeout waiting on command" );
+            log( 1, "Timeout waiting on command" );
             continue;
         }
@@ -149 +149 @@
                 {
                     if( buff.b[0] >= 0x20 && buff.b[0] <= 0x7e )
-                        log( 3, "Spurious: [%d:%c]", buff.b[0], buff.b[0] );
+                        log( 2, "Spurious: [%d:%c]", buff.b[0], buff.b[0] );
                     else
-                        log( 3, "Spurious: [%d]", buff.b[0] );
+                        log( 2, "Spurious: [%d]", buff.b[0] );
                 }
                 buffoffset = 0;
@@ -172 +172 @@
             if( (crc = checksum( &buff.w[0], 256 )) != buff.w[256] )
             {
-                log( 1, "Bad Write Sector Checksum" );
+                log( 0, "Bad Write Sector Checksum" );
                 continue;
             }
@@ -178 +178 @@
             if( img->readOnly )
             {
-                log( 2, "Attempt to write to read-only image" );
+                log( 1, "Attempt to write to read-only image" );
                 continue;
             }
@@ -189 +189 @@
             //
             if( serial->writeCharacters( &buff.w[256], 2 ) != 2 )
-                log( 1, "Serial Port Write Error" );
+                log( 0, "Serial Port Write Error" );
 
             workOffset++;
@@ -209 +209 @@
                 if( buff.b[0] != (workCount-0) )
                 {
-                    log( 1, "Continue Fault: Received=%d, Expected=%d", buff.b[0], workCount );
+                    log( 0, "Continue Fault: Received=%d, Expected=%d", buff.b[0], workCount );
                     workCount = 0;
                     continue;
@@ -221 +221 @@
                 if( (crc = checksum( &buff.w[0], 3 )) != buff.w[3] )
                 {
-                    log( 1, "Bad Command Checksum: %02x %02x %02x %02x %02x %02x %02x %02x, Checksum=%02x",
+                    log( 0, "Bad Command Checksum: %02x %02x %02x %02x %02x %02x %02x %02x, Checksum=%02x",
                          buff.b[0], buff.b[1], buff.b[2], buff.b[3], buff.b[4], buff.b[5], buff.b[6], buff.b[7], crc);
                     continue;
@@ -230 +230 @@
                     if( !image1 )
                     {
-                        log( 2, "Slave drive selected when not supplied" );
+                        log( 1, "Slave drive selected when not supplied" );
                         img = NULL;
                         continue;
@@ -261 +261 @@
                 if( (workCommand & SERIAL_COMMAND_WRITE) && img->readOnly )
                 {
-                    log( 2, "Write attempt to Read Only disk" );
+                    log( 1, "Write attempt to Read Only disk" );
                     continue;
                 }
@@ -293 +293 @@
 
                         if( br )
-                            log( 2, "    Ignoring Inquire with Baud Rate=%d", br->rate );
+                            log( 1, "    Ignoring Inquire with Baud Rate=%d", br->rate );
                         else
-                            log( 2, "    Ignoring Inquire with Unknown Baud Rate (portAndBaud=%d)", buff.inquire.portAndBaud );
+                            log( 1, "    Ignoring Inquire with Unknown Baud Rate (portAndBaud=%d)", buff.inquire.portAndBaud );
                         workCount = 0;
                         continue;
@@ -314 +314 @@
 
                 if( serial->writeCharacters( &buff.w[0], 514 ) != 514 )
-                    log( 1, "Serial Port Write Error" );
+                    log( 0, "Serial Port Write Error" );
 
                 workCount--;
@@ -327 +327 @@
 
             if( vtype == 1 )
-                log( 2, "%s %d: LBA=%u, Count=%u", comStr, img == image0 ? 0 : 1,
+                log( 1, "%s %d: LBA=%u, Count=%u", comStr, img == image0 ? 0 : 1,
                      mylba, workCount );
             else if( vtype == 2 )
-                log( 2, "%s %d: Cylinder=%u, Sector=%u, Head=%u, Count=%u, LBA=%u", comStr, img == image0 ? 0 : 1,
+                log( 1, "%s %d: Cylinder=%u, Sector=%u, Head=%u, Count=%u, LBA=%u", comStr, img == image0 ? 0 : 1,
                      cyl, sect, head, workCount+1, mylba );
 
@@ -336 +336 @@
 
             if( workOffset > 1 )
-                log( 3, "    Continuation: Offset=%u, Checksum=%04x", workOffset-1, buff.w[256] );
+                log( 2, "    Continuation: Offset=%u, Checksum=%04x", workOffset-1, buff.w[256] );
 
             if( !(workCommand & SERIAL_COMMAND_WRITE) && verboseLevel >= 4 )
@@ -342 +342 @@
 
             if( workCount == 0 && workOffset > 100 )
-                log( 2, "    Block Complete: %.2lf bytes per second", (512.0 * workOffset) / (GetTime() - perfTimer) * 1000.0 );
+                log( 1, "    Block Complete: %.2lf bytes per second", (512.0 * workOffset) / (GetTime() - perfTimer) * 1000.0 );
         }
     }