Changeset 219 in xtideuniversalbios for trunk/Serial_Server/win32/Win32.cpp

Timestamp:

Jan 25, 2012, 7:04:43 AM (12 years ago)

Author:

gregli@…

google:author:

gregli@hotmail.com

Message:

Serial Server, more minor improvements, added support for larger than 2 GB disks under Win32

File:

• trunk/Serial_Server/win32/Win32.cpp (modified) (4 diffs)

trunk/Serial_Server/win32/Win32.cpp

@@ -16 +16 @@
 #include "../library/library.h"
 #include "../library/flatimage.h"
-#include "Win32Serial.h"
 
 void usage(void)
@@ -30 +29 @@
         "",
         "  -n [megabytes]      Create new disk with given size or use -g geometry",
-        "                      Maximum size is 137.4 GB (LBA28 limit)",
+        "                      Maximum size is " USAGE_MAXSECTORS, 
         "                      (default is a 32 MB disk, with CHS geometry 65:63:16)",
         "",
@@ -74 +73 @@
     unsigned short wbuff[256];
 
-    Serial *serial;
+    SerialAccess serial;
     Image *img;
     struct baudRate *baudRate = NULL;
@@ -178 +177 @@
     do
     {
-        serial = new Win32Serial( ComPort, baudRate );
-
-        processRequests( serial, images[0], images[1], timeoutEnabled, verbose );
-
-        delete serial;
-
-        if( serial->resetConnection )
-            log( 0, "Connection closed, reset..." );
-    }
-    while( serial->resetConnection );
+        serial.Connect( ComPort, baudRate );
+
+        processRequests( &serial, images[0], images[1], timeoutEnabled, verbose );
+
+        serial.Disconnect();
+
+        if( serial.resetConnection )
+            log( 0, "Serial Connection closed, reset..." );
+    }
+    while( serial.resetConnection );
 }