(Re)allow duplicate names for A/P stages

[flightgear.git] / src / Network / native.cxx

diff --git a/src/Network/native.cxx b/src/Network/native.cxx
index b66d33b7a83d6a8c0ea21a69a57c880ee20532d3..0057040537e30b8450a46e80afc373b3fc60efc5 100644 (file)
--- 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,19 +16,20 @@
 //
 // 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 <simgear/math/fg_geodesy.hxx>
+#include <simgear/io/iochannel.hxx>
 
-#include <Time/fg_time.hxx>
-
-#include "iochannel.hxx"
 #include "native.hxx"
 
+#include <FDM/flight.hxx>
 
 FGNative::FGNative() {
 }
@@ -40,15 +41,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;
     }
 
@@ -57,23 +58,36 @@ bool FGNative::open() {
     return true;
 }
 
+/**
+ * The design of FGNative requires direct, memcpy access to FGInterface,
+ * unfortunately. Since this is the only remaining place that does, the
+ * extern lives here, rather than a header file.
+ *
+ */
+extern FGInterface* evil_global_fdm_state;
 
 // process work for this port
 bool FGNative::process() {
-    FGIOChannel *io = get_io_channel();
-    int length = sizeof(*cur_fdm_state);
+    SGIOChannel *io = get_io_channel();
+    int length = sizeof(FGInterface);
 
-    if ( get_direction() == out ) {
-       // cout << "size of cur_fdm_state = " << length << endl;
-       buf = *cur_fdm_state;
+    if ( get_direction() == SG_IO_OUT ) {
+       buf = *evil_global_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." );
+               *evil_global_fdm_state = buf;
+           }
+       } else {
+           while ( io->read( (char *)(& buf), length ) == length ) {
+               SG_LOG( SG_IO, SG_DEBUG, "Success reading data." );
+               *evil_global_fdm_state = buf;
+           }
        }
     }
 
@@ -83,7 +97,7 @@ bool FGNative::process() {
 
 // close the channel
 bool FGNative::close() {
-    FGIOChannel *io = get_io_channel();
+    SGIOChannel *io = get_io_channel();
 
     set_enabled( false );