X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FNetwork%2Fnative.cxx;h=fcf3f572957f175f3529a55f0e9ecbb6464c445f;hb=0da1cc6de035bb2f79a2419f034cfbef0e114bcb;hp=957cbe2b2309ee8e34bf33fd2c3f0bd38dea6102;hpb=d70120752c8b1b010e536fb506ca198b86e79286;p=flightgear.git

diff --git a/src/Network/native.cxx b/src/Network/native.cxx
index 957cbe2b2..fcf3f5729 100644
--- a/src/Network/native.cxx
+++ b/src/Network/native.cxx
@@ -2,7 +2,7 @@
 //
 // Written by Curtis Olson, started November 1999.
 //
-// Copyright (C) 1999  Curtis L. Olson - curt@flightgear.org
+// Copyright (C) 1999  Curtis L. Olson - http://www.flightgear.org/~curt
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -21,11 +21,9 @@
 // $Id$
 
 
-#include <Debug/logstream.hxx>
-#include <Math/fg_geodesy.hxx>
-#include <Time/fg_time.hxx>
+#include <simgear/debug/logstream.hxx>
+#include <simgear/io/iochannel.hxx>
 
-#include "iochannel.hxx"
 #include "native.hxx"
 
 
@@ -39,15 +37,15 @@ FGNative::~FGNative() {
 // open hailing frequencies
 bool FGNative::open() {
     if ( is_enabled() ) {
-	FG_LOG( FG_IO, FG_ALERT, "This shouldn't happen, but the channel " 
+	SG_LOG( SG_IO, SG_ALERT, "This shouldn't happen, but the channel " 
 		<< "is already in use, ignoring" );
 	return false;
     }
 
-    FGIOChannel *io = get_io_channel();
+    SGIOChannel *io = get_io_channel();
 
     if ( ! io->open( get_direction() ) ) {
-	FG_LOG( FG_IO, FG_ALERT, "Error opening channel communication layer." );
+	SG_LOG( SG_IO, SG_ALERT, "Error opening channel communication layer." );
 	return false;
     }
 
@@ -59,20 +57,27 @@ bool FGNative::open() {
 
 // process work for this port
 bool FGNative::process() {
-    FGIOChannel *io = get_io_channel();
+    SGIOChannel *io = get_io_channel();
     int length = sizeof(*cur_fdm_state);
 
-    if ( get_direction() == out ) {
+    if ( get_direction() == SG_IO_OUT ) {
 	// cout << "size of cur_fdm_state = " << length << endl;
 	buf = *cur_fdm_state;
 	if ( ! io->write( (char *)(& buf), length ) ) {
-	    FG_LOG( FG_IO, FG_ALERT, "Error writing data." );
+	    SG_LOG( SG_IO, SG_ALERT, "Error writing data." );
 	    return false;
 	}
-    } else if ( get_direction() == in ) {
-	while ( io->read( (char *)(& buf), length ) == length ) {
-	    FG_LOG( FG_IO, FG_ALERT, "Success reading data." );
-	    *cur_fdm_state = buf;
+    } else if ( get_direction() == SG_IO_IN ) {
+	if ( io->get_type() == sgFileType ) {
+	    if ( io->read( (char *)(& buf), length ) == length ) {
+		SG_LOG( SG_IO, SG_DEBUG, "Success reading data." );
+		*cur_fdm_state = buf;
+	    }
+	} else {
+	    while ( io->read( (char *)(& buf), length ) == length ) {
+		SG_LOG( SG_IO, SG_DEBUG, "Success reading data." );
+		*cur_fdm_state = buf;
+	    }
 	}
     }
 
@@ -82,7 +87,7 @@ bool FGNative::process() {
 
 // close the channel
 bool FGNative::close() {
-    FGIOChannel *io = get_io_channel();
+    SGIOChannel *io = get_io_channel();
 
     set_enabled( false );