Changeset 219 in xtideuniversalbios for trunk/Serial_Server/library/Process.cpp

Timestamp:

Jan 25, 2012, 7:04:43 AM (13 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/library/Process.cpp (modified) (5 diffs)

trunk/Serial_Server/library/Process.cpp

@@ -9 +9 @@
 #include <memory.h>
 #include <string.h>
+#include <stdio.h>
 
 union _buff {
@@ -54 +55 @@
 #define SERIAL_INQUIRE_PORTANDBAUD_PORTTRANSLATE( a ) ( ((a) & SERIAL_INQUIRE_PORTANDBAUD_PORT) << 1 | SERIAL_INQUIRE_PORTANDBAUD_STARTINGPORT )
 
+#define ATA_COMMAND_LBA 0x40
+#define ATA_COMMAND_HEADMASK 0xf
+
+#define ATA_DriveAndHead_Drive 0x10
+
 void logBuff( char *message, unsigned long buffoffset, unsigned long readto, int verboseLevel )
 {
@@ -75 +81 @@
 }
 
-void processRequests( Serial *serial, Image *image0, Image *image1, int timeoutEnabled, int verboseLevel )
+void processRequests( SerialAccess *serial, Image *image0, Image *image1, int timeoutEnabled, int verboseLevel )
 {
     unsigned char workCommand;
@@ -204 +210 @@
             // Echo back the CRC
             //
-            if( serial->writeCharacters( &buff.w[256], 2 ) != 2 )
-                log( 0, "Serial Port Write Error" );
+            if( !serial->writeCharacters( &buff.w[256], 2 ) )
+                break;
 
             workOffset++;
@@ -340 +346 @@
                 buff.w[256] = checksum( &buff.w[0], 256 );
 
-                if( serial->writeCharacters( &buff.w[0], 514 ) != 514 )
-                    log( 0, "Serial Port Write Error" );
+                if( !serial->writeCharacters( &buff.w[0], 514 ) )
+                    break;
 
                 if( verboseLevel >= 3 )