Tweaks in preparation for the 0.3.6-pre1 release.

[simgear.git] / simgear / io / sg_serial.cxx

diff --git a/simgear/io/sg_serial.cxx b/simgear/io/sg_serial.cxx
index 2d409fb8f92371d3d195138d223d3f1ee457387c..fcffdf68ae1f45232a1604830349c9865e3c39a0 100644 (file)
--- a/simgear/io/sg_serial.cxx
+++ b/simgear/io/sg_serial.cxx
@@ -30,13 +30,15 @@
 
 #include "sg_serial.hxx"
 
-FG_USING_STD(string);
+SG_USING_STD(string);
 
 
-SGSerial::SGSerial() :
+SGSerial::SGSerial( const string& device_name, const string& baud_rate ) :
     save_len(0)
 {
     set_type( sgSerialType );
+    device = device_name;
+    baud = baud_rate;
 }
 
 
@@ -45,16 +47,18 @@ SGSerial::~SGSerial() {
 
 
 // open the serial port based on specified direction
-bool SGSerial::open( SGProtocolDir dir ) {
+bool SGSerial::open( const SGProtocolDir d ) {
+    set_dir( d );
+
     if ( ! port.open_port( device ) ) {
-       FG_LOG( FG_IO, FG_ALERT, "Error opening device: " << device );
+       SG_LOG( SG_IO, SG_ALERT, "Error opening device: " << device );
        return false;
     }
 
     // cout << "fd = " << port.fd << endl;
 
     if ( ! port.set_baud( atoi( baud.c_str() ) ) ) {
-       FG_LOG( FG_IO, FG_ALERT, "Error setting baud: " << baud );
+       SG_LOG( SG_IO, SG_ALERT, "Error setting baud: " << baud );
        return false;
     }
 
@@ -112,7 +116,7 @@ int SGSerial::readline( char *buf, int length ) {
     // copy to external buffer
     strncpy( buf, save_buf, result );
     buf[result] = '\0';
-    FG_LOG( FG_IO, FG_INFO, "fg_serial line = " << buf );
+    SG_LOG( SG_IO, SG_INFO, "fg_serial line = " << buf );
 
     // shift save buffer
     for ( i = result; i < save_len; ++i ) {
@@ -125,11 +129,11 @@ int SGSerial::readline( char *buf, int length ) {
 
 
 // write data to port
-int SGSerial::write( char *buf, int length ) {
+int SGSerial::write( const char *buf, const int length ) {
     int result = port.write_port( buf, length );
 
     if ( result != length ) {
-       FG_LOG( FG_IO, FG_ALERT, "Error writing data: " << device );
+       SG_LOG( SG_IO, SG_WARN, "Error writing data: " << device );
     }
 
     return result;
@@ -137,7 +141,7 @@ int SGSerial::write( char *buf, int length ) {
 
 
 // write null terminated string to port
-int SGSerial::writestring( char *str ) {
+int SGSerial::writestring( const char *str ) {
     int length = strlen( str );
     return write( str, length );
 }