Changeset 219 in xtideuniversalbios for trunk/Serial_Server/library/Library.h

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/library/Library.h (modified) (3 diffs)

trunk/Serial_Server/library/Library.h

@@ -9 +9 @@
 #define LIBRARY_H_INCLUDED
 
-#include "stdio.h"
+void log( int level, char *message, ... );
 
-void log( int level, char *message, ... );
 unsigned long GetTime(void);
 unsigned long GetTime_Timeout(void);
@@ -20 +19 @@
 {
 public:
-    virtual int seekSector( unsigned long cyl, unsigned long sect, unsigned long head ) = 0;
-    virtual int seekSector( unsigned long lba ) = 0;
+    virtual void seekSector( unsigned long lba ) = 0;
 
-    virtual int writeSector( void *buff ) = 0;
+    virtual void writeSector( void *buff ) = 0;
     
-    virtual int readSector( void *buff ) = 0;
+    virtual void readSector( void *buff ) = 0;
 
     Image( char *name, int p_readOnly, int p_drive );
@@ -57 +55 @@
 struct baudRate *baudRateMatchDivisor( unsigned char divisor );
 
-class Serial
-{
-public:
-    virtual unsigned long readCharacters( void *buff, unsigned long len ) = 0;
+#ifdef WIN32
+#include "../win32/win32serial.h"
+#else
+// there is no standard way to read/write and configure the serial port, OS specifc only
+#endif
 
-    virtual unsigned long writeCharacters( void *buff, unsigned long len ) = 0;
+#ifdef WIN32
+#include "../win32/win32file.h"
+#else
+#include "file.h"
+#endif
 
-    Serial( char *name, struct baudRate *p_baudRate ) 
-    {
-        speedEmulation = 0;
-        resetConnection = 0;
-        baudRate = p_baudRate;
-    };
-
-    virtual ~Serial() {};
-
-    int speedEmulation;
-    int resetConnection;
-
-    struct baudRate *baudRate;
-};
-
-void processRequests( Serial *serial, Image *image0, Image *image1, int timeoutEnabled, int verboseLevel );
-
-#define ATA_COMMAND_LBA 0x40
-#define ATA_COMMAND_HEADMASK 0xf
-
-#define ATA_DriveAndHead_Drive 0x10
+void processRequests( SerialAccess *serial, Image *image0, Image *image1, int timeoutEnabled, int verboseLevel );
 
 #endif