Frederic BOUVIER:

[simgear.git] / simgear / serial / serial.cxx

diff --git a/simgear/serial/serial.cxx b/simgear/serial/serial.cxx
index 3fa85bdc1b7f9fd4508fdae46872dd5038838c75..3c24f87789559a4791fe198325da5119161b1a2b 100644 (file)
--- a/simgear/serial/serial.cxx
+++ b/simgear/serial/serial.cxx
@@ -24,15 +24,15 @@
 
 #include <simgear/compiler.h>
 
+#include STL_IOSTREAM
+
 #ifdef SG_HAVE_STD_INCLUDE
 #  include <cerrno>
 #else
 #  include <errno.h>
 #endif
 
-#if defined( WIN32 ) && !defined( __CYGWIN__) && !defined( __CYGWIN32__ )
-  // maybe include something???
-#else
+#if !defined( WIN32 ) || defined( __CYGWIN__) || defined( __CYGWIN32__ )
 #  include <termios.h>
 #  include <sys/types.h>
 #  include <sys/stat.h>
@@ -44,14 +44,13 @@
 
 #include "serial.hxx"
 
-
-FGSerialPort::FGSerialPort()
+SGSerialPort::SGSerialPort()
     : dev_open(false)
 {
     // empty
 }
 
-FGSerialPort::FGSerialPort(const string& device, int baud) {
+SGSerialPort::SGSerialPort(const string& device, int baud) {
     open_port(device);
     
     if ( dev_open ) {
@@ -59,13 +58,13 @@ FGSerialPort::FGSerialPort(const string& device, int baud) {
     }
 }
 
-FGSerialPort::~FGSerialPort() {
+SGSerialPort::~SGSerialPort() {
     // closing the port here screws us up because if we would even so
-    // much as make a copy of an FGSerialPort object and then delete it,
+    // much as make a copy of an SGSerialPort object and then delete it,
     // the file descriptor gets closed.  Doh!!!
 }
 
-bool FGSerialPort::open_port(const string& device) {
+bool SGSerialPort::open_port(const string& device) {
 
 #if defined( WIN32 ) && !defined( __CYGWIN__) && !defined( __CYGWIN32__ )
 
@@ -74,7 +73,7 @@ bool FGSerialPort::open_port(const string& device) {
         0, // dwShareMode
         NULL, // lpSecurityAttributes
         OPEN_EXISTING,
-        FILE_FLAG_OVERLAPPED,
+        0,
         NULL );
     if ( fd == INVALID_HANDLE_VALUE )
     {
@@ -104,7 +103,7 @@ bool FGSerialPort::open_port(const string& device) {
     struct termios config;
 
     fd = open(device.c_str(), O_RDWR | O_NONBLOCK);
-    cout << "Serial fd created = " << fd << endl;
+    SG_LOG( SG_EVENT, SG_DEBUG, "Serial fd created = " << fd);
 
     if ( fd  == -1 ) {
        SG_LOG( SG_IO, SG_ALERT, "Cannot open " << device
@@ -147,7 +146,7 @@ bool FGSerialPort::open_port(const string& device) {
 }
 
 
-bool FGSerialPort::close_port() {
+bool SGSerialPort::close_port() {
 #if defined( WIN32 ) && !defined( __CYGWIN__) && !defined( __CYGWIN32__ )
     CloseHandle( fd );
 #else
@@ -160,10 +159,55 @@ bool FGSerialPort::close_port() {
 }
 
 
-bool FGSerialPort::set_baud(int baud) {
+bool SGSerialPort::set_baud(int baud) {
 
 #if defined( WIN32 ) && !defined( __CYGWIN__) && !defined( __CYGWIN32__ )
 
+    DCB dcb;
+    if ( GetCommState( fd, &dcb ) ) {
+        dcb.BaudRate = baud;
+        dcb.fOutxCtsFlow = FALSE;
+        dcb.fOutxDsrFlow = FALSE;
+        dcb.fOutX = TRUE;
+        dcb.fInX = TRUE;
+
+        if ( !SetCommState( fd, &dcb ) ) {
+            LPVOID lpMsgBuf;
+            FormatMessage(
+                FORMAT_MESSAGE_ALLOCATE_BUFFER | 
+                FORMAT_MESSAGE_FROM_SYSTEM | 
+                FORMAT_MESSAGE_IGNORE_INSERTS,
+                NULL,
+                GetLastError(),
+                MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
+                (LPTSTR) &lpMsgBuf,
+                0,
+                NULL );
+
+            SG_LOG( SG_IO, SG_ALERT, "Unable to update port settings: " 
+                << (const char*) lpMsgBuf );
+            LocalFree( lpMsgBuf );
+           return false;
+        }
+    } else {
+        LPVOID lpMsgBuf;
+        FormatMessage(
+            FORMAT_MESSAGE_ALLOCATE_BUFFER | 
+            FORMAT_MESSAGE_FROM_SYSTEM | 
+            FORMAT_MESSAGE_IGNORE_INSERTS,
+            NULL,
+            GetLastError(),
+            MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
+            (LPTSTR) &lpMsgBuf,
+            0,
+            NULL );
+
+        SG_LOG( SG_IO, SG_ALERT, "Unable to poll port settings: " 
+             << (const char*) lpMsgBuf );
+        LocalFree( lpMsgBuf );
+       return false;
+    }
+
     return true;
 
 #else
@@ -224,21 +268,41 @@ bool FGSerialPort::set_baud(int baud) {
 
 }
 
-string FGSerialPort::read_port() {
+string SGSerialPort::read_port() {
+
+    const int max_count = 1024;
+    char buffer[max_count+1];
+    string result;
 
 #if defined( WIN32 ) && !defined( __CYGWIN__) && !defined( __CYGWIN32__ )
 
-    string result = "";
+    DWORD count;
+    if ( ReadFile( fd, buffer, max_count, &count, 0 ) ) {
+       buffer[count] = '\0';
+        result = buffer;
+    } else {
+        LPVOID lpMsgBuf;
+        FormatMessage(
+            FORMAT_MESSAGE_ALLOCATE_BUFFER | 
+            FORMAT_MESSAGE_FROM_SYSTEM | 
+            FORMAT_MESSAGE_IGNORE_INSERTS,
+            NULL,
+            GetLastError(),
+            MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
+            (LPTSTR) &lpMsgBuf,
+            0,
+            NULL );
+
+        SG_LOG( SG_IO, SG_ALERT, "Serial I/O read error: " 
+             << (const char*) lpMsgBuf );
+        LocalFree( lpMsgBuf );
+    }
+
     return result;
 
 #else
 
-    const int max_count = 1024;
-    char buffer[max_count+1];
-    int count;
-    string result;
-
-    count = read(fd, buffer, max_count);
+    int count = read(fd, buffer, max_count);
     // cout << "read " << count << " bytes" << endl;
 
     if ( count < 0 ) {
@@ -260,12 +324,35 @@ string FGSerialPort::read_port() {
 
 }
 
-int FGSerialPort::read_port(char *buf, int len) {
+int SGSerialPort::read_port(char *buf, int len) {
 
 #if defined( WIN32 ) && !defined( __CYGWIN__) && !defined( __CYGWIN32__ )
 
-    buf[0] = '\0';
-    return 0;
+    DWORD count;
+    if ( ReadFile( fd, buf, len, &count, 0 ) ) {
+       buf[count] = '\0';
+
+        return count;
+    } else {
+        LPVOID lpMsgBuf;
+        FormatMessage(
+            FORMAT_MESSAGE_ALLOCATE_BUFFER | 
+            FORMAT_MESSAGE_FROM_SYSTEM | 
+            FORMAT_MESSAGE_IGNORE_INSERTS,
+            NULL,
+            GetLastError(),
+            MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
+            (LPTSTR) &lpMsgBuf,
+            0,
+            NULL );
+
+        SG_LOG( SG_IO, SG_ALERT, "Serial I/O read error: " 
+             << (const char*) lpMsgBuf );
+        LocalFree( lpMsgBuf );
+
+       buf[0] = '\0';
+       return 0;
+    }
 
 #else
 
@@ -294,20 +381,19 @@ int FGSerialPort::read_port(char *buf, int len) {
 }
 
 
-int FGSerialPort::write_port(const string& value) {
+int SGSerialPort::write_port(const string& value) {
 
 #if defined( WIN32 ) && !defined( __CYGWIN__) && !defined( __CYGWIN32__ )
 
-    LPCVOID lpBuffer = value.c_str();
+    LPCVOID lpBuffer = value.data();
     DWORD nNumberOfBytesToWrite = value.length();
     DWORD lpNumberOfBytesWritten;
-    OVERLAPPED lpOverlapped;
 
     if ( WriteFile( fd,
         lpBuffer,
         nNumberOfBytesToWrite,
         &lpNumberOfBytesWritten,
-        &lpOverlapped ) == 0 )
+        0 ) == 0 )
     {
         LPVOID lpMsgBuf;
         FormatMessage(
@@ -370,19 +456,18 @@ int FGSerialPort::write_port(const string& value) {
 }
 
 
-int FGSerialPort::write_port(const char* buf, int len) {
+int SGSerialPort::write_port(const char* buf, int len) {
 #if defined( WIN32 ) && !defined( __CYGWIN__) && !defined( __CYGWIN32__ )
 
     LPCVOID lpBuffer = buf;
     DWORD nNumberOfBytesToWrite = len;
     DWORD lpNumberOfBytesWritten;
-    OVERLAPPED lpOverlapped;
 
     if ( WriteFile( fd,
         lpBuffer,
         nNumberOfBytesToWrite,
         &lpNumberOfBytesWritten,
-        &lpOverlapped ) == 0 )
+        0 ) == 0 )
     {
         LPVOID lpMsgBuf;
         FormatMessage(