X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FNetwork%2Fnative.cxx;h=48edaf11566d4d81ccb1d697598ad8090190b4e9;hb=206053722eb59b31ed2fb182044f84bac0058f8a;hp=fffabba3fd8c7f05a21acbec5e340d6d60d69a48;hpb=8c70ec70260280552f7264441d6063736e2cf03b;p=flightgear.git

diff --git a/src/Network/native.cxx b/src/Network/native.cxx
index fffabba3f..48edaf115 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
@@ -16,18 +16,22 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+#include <simgear/debug/logstream.hxx>
 
-#include <Debug/logstream.hxx>
-#include <Math/fg_geodesy.hxx>
-#include <Time/fg_time.hxx>
 
-#include "iochannel.hxx"
 #include "native.hxx"
 
+#include <Main/globals.hxx>
+#include <FDM/fdm_shell.hxx>
+#include <FDM/flight.hxx>
 
 FGNative::FGNative() {
 }
@@ -39,15 +43,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;
     }
 
@@ -56,36 +60,27 @@ bool FGNative::open() {
     return true;
 }
 
-
 // process work for this port
-bool FGNative::process() {
-    FGIOChannel *io = get_io_channel();
-    int length = sizeof(*cur_fdm_state);
-
-    if ( get_direction() == 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." );
-	    return false;
-	}
-    } else if ( get_direction() == in ) {
-	if ( io->read( (char *)(& buf), length ) == length ) {
-	    FG_LOG( FG_IO, FG_ALERT, "Success reading data." );
-	    *cur_fdm_state = buf;
-	} else {
-	    FG_LOG( FG_IO, FG_ALERT, "Error reading data." );
-	    return false;
-	}
+bool FGNative::process()
+{
+    FDMShell* fdm = static_cast<FDMShell*>(globals->get_subsystem("flight"));
+    FGInterface* fdmState = fdm->getInterface();
+    if (!fdmState) {
+        return false;
+    }
+    
+    SGIOChannel *io = get_io_channel();
+    if ( get_direction() == SG_IO_OUT ) {
+        return fdmState->writeState(io);
+    } else {
+        return fdmState->readState(io);
     }
-
-    return true;
 }
 
 
 // close the channel
 bool FGNative::close() {
-    FGIOChannel *io = get_io_channel();
+    SGIOChannel *io = get_io_channel();
 
     set_enabled( false );