X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2Ffg_io.cxx;h=d98cc0769eb1884742a85ced196c9aa71be88336;hb=a2acc953ae337d45954382904e0d1ea6c63b48a0;hp=8e9f40e99dc40a2c05cba6fee3d225ebf0bd7b61;hpb=65e9aba6dc57510bae1aa7e7322868592028bf82;p=flightgear.git

diff --git a/src/Main/fg_io.cxx b/src/Main/fg_io.cxx
index 8e9f40e99..d98cc0769 100644
--- a/src/Main/fg_io.cxx
+++ b/src/Main/fg_io.cxx
@@ -21,28 +21,44 @@
 // $Id$
 
 
-#include <Include/compiler.h>
+#include <simgear/compiler.h>
 
-#include STL_STRING
+#include <stdlib.h>             // atoi()
 
-#include <Debug/logstream.hxx>
-#include <Include/fg_types.hxx>
-#include <Main/options.hxx>
+#include STL_STRING
 
-#include <Network/iochannel.hxx>
-#include <Network/fg_file.hxx>
-#include <Network/fg_serial.hxx>
-#include <Network/fg_socket.hxx>
+#include <simgear/debug/logstream.hxx>
+#include <simgear/io/iochannel.hxx>
+#include <simgear/io/sg_file.hxx>
+#include <simgear/io/sg_serial.hxx>
+#include <simgear/io/sg_socket.hxx>
+#include <simgear/io/sg_socket_udp.hxx>
+#include <simgear/math/sg_types.hxx>
+#include <simgear/timing/timestamp.hxx>
 
 #include <Network/protocol.hxx>
+#include <Network/atc610x.hxx>
+#include <Network/atlas.hxx>
 #include <Network/garmin.hxx>
+#include <Network/httpd.hxx>
+#ifdef FG_JPEG_SERVER
+#  include <Network/jpg-httpd.hxx>
+#endif
+#include <Network/joyclient.hxx>
+#include <Network/native.hxx>
+#include <Network/native_ctrls.hxx>
+#include <Network/native_fdm.hxx>
+#include <Network/opengc.hxx>
 #include <Network/nmea.hxx>
+#include <Network/props.hxx>
 #include <Network/pve.hxx>
+#include <Network/ray.hxx>
 #include <Network/rul.hxx>
 
-#include <Time/timestamp.hxx>
+#include "globals.hxx"
 
-FG_USING_STD(string);
+SG_USING_NAMESPACE(std);
+SG_USING_STD(string);
 
 
 // define the global I/O channel list
@@ -52,11 +68,13 @@ io_container global_io_list;
 // configure a port based on the config string
 static FGProtocol *parse_port_config( const string& config )
 {
+    bool short_circuit = false;
+
     string::size_type begin, end;
 
     begin = 0;
 
-    FG_LOG( FG_IO, FG_INFO, "Parse I/O channel request: " << config );
+    SG_LOG( SG_IO, SG_INFO, "Parse I/O channel request: " << config );
 
     // determine protocol
     end = config.find(",", begin);
@@ -66,18 +84,63 @@ static FGProtocol *parse_port_config( const string& config )
     
     string protocol = config.substr(begin, end - begin);
     begin = end + 1;
-    FG_LOG( FG_IO, FG_INFO, "  protocol = " << protocol );
+    SG_LOG( SG_IO, SG_INFO, "  protocol = " << protocol );
 
     FGProtocol *io;
-    if ( protocol == "garmin" ) {
+    if ( protocol == "atc610x" ) {
+	FGATC610x *atc610x = new FGATC610x;
+	io = atc610x;
+        short_circuit = true;
+	cout << "here ..." << endl;
+    } else if ( protocol == "atlas" ) {
+	FGAtlas *atlas = new FGAtlas;
+	io = atlas;
+    } else if ( protocol == "opengc" ) {
+	// char wait;
+	// printf("Parsed opengc\n"); cin >> wait;
+	FGOpenGC *opengc = new FGOpenGC;
+	io = opengc;
+    } else if ( protocol == "garmin" ) {
 	FGGarmin *garmin = new FGGarmin;
 	io = garmin;
+    } else if ( protocol == "httpd" ) {
+        // determine port
+        string port = config.substr(begin);
+	FGHttpd *httpd = new FGHttpd( atoi(port.c_str()) );
+	io = httpd;
+        short_circuit = true;
+#ifdef FG_JPEG_SERVER
+    } else if ( protocol == "jpg-httpd" ) {
+        // determine port
+        string port = config.substr(begin);
+	FGJpegHttpd *jpeg_httpd = new FGJpegHttpd( atoi(port.c_str()) );
+	io = jpeg_httpd;
+        short_circuit = true;
+#endif
+    } else if ( protocol == "joyclient" ) {
+	FGJoyClient *joyclient = new FGJoyClient;
+	io = joyclient;
+    } else if ( protocol == "native" ) {
+	FGNative *native = new FGNative;
+	io = native;
+    } else if ( protocol == "native_ctrls" ) {
+	FGNativeCtrls *native_ctrls = new FGNativeCtrls;
+	io = native_ctrls;
+    } else if ( protocol == "native_fdm" ) {
+	FGNativeFDM *native_fdm = new FGNativeFDM;
+	io = native_fdm;
     } else if ( protocol == "nmea" ) {
 	FGNMEA *nmea = new FGNMEA;
 	io = nmea;
+    } else if ( protocol == "props" ) {
+	FGProps *props = new FGProps;
+	io = props;
     } else if ( protocol == "pve" ) {
 	FGPVE *pve = new FGPVE;
 	io = pve;
+    } else if ( protocol == "ray" ) {
+	FGRAY *ray = new FGRAY;
+	io = ray;
     } else if ( protocol == "rul" ) {
 	FGRUL *rul = new FGRUL;
 	io = rul;
@@ -85,83 +148,92 @@ static FGProtocol *parse_port_config( const string& config )
 	return NULL;
     }
 
-    // determine medium
-    end = config.find(",", begin);
-    if ( end == string::npos ) {
-	return NULL;		// dummy
-    }
+    if ( ! short_circuit ) {
+        // determine medium
+        end = config.find(",", begin);
+        if ( end == string::npos ) {
+            return NULL;		// dummy
+        }
     
-    string medium = config.substr(begin, end - begin);
-    begin = end + 1;
-    FG_LOG( FG_IO, FG_INFO, "  medium = " << medium );
-
-    // determine direction
-    end = config.find(",", begin);
-    if ( end == string::npos ) {
-	return NULL;		// dummy
-    }
+        string medium = config.substr(begin, end - begin);
+        begin = end + 1;
+        SG_LOG( SG_IO, SG_INFO, "  medium = " << medium );
+
+        // determine direction
+        end = config.find(",", begin);
+        if ( end == string::npos ) {
+            return NULL;		// dummy
+        }
     
-    string direction = config.substr(begin, end - begin);
-    begin = end + 1;
-    io->set_direction( direction );
-    FG_LOG( FG_IO, FG_INFO, "  direction = " << direction );
-
-    // determine hertz
-    end = config.find(",", begin);
-    if ( end == string::npos ) {
-	return NULL;		// dummy
-    }
+        string direction = config.substr(begin, end - begin);
+        begin = end + 1;
+        io->set_direction( direction );
+        SG_LOG( SG_IO, SG_INFO, "  direction = " << direction );
+
+        // determine hertz
+        end = config.find(",", begin);
+        if ( end == string::npos ) {
+            return NULL;		// dummy
+        }
     
-    string hertz_str = config.substr(begin, end - begin);
-    begin = end + 1;
-    double hertz = atof( hertz_str.c_str() );
-    io->set_hz( hertz );
-    FG_LOG( FG_IO, FG_INFO, "  hertz = " << hertz );
-
-    if ( medium == "serial" ) {
-	FGSerial *ch = new FGSerial;
-	io->set_io_channel( ch );
-
-	// device name
-	end = config.find(",", begin);
-	if ( end == string::npos ) {
-	    return NULL;
-	}
+        string hertz_str = config.substr(begin, end - begin);
+        begin = end + 1;
+        double hertz = atof( hertz_str.c_str() );
+        io->set_hz( hertz );
+        SG_LOG( SG_IO, SG_INFO, "  hertz = " << hertz );
+
+        if ( medium == "serial" ) {
+            // device name
+            end = config.find(",", begin);
+            if ( end == string::npos ) {
+                return NULL;
+            }
     
-	ch->set_device( config.substr(begin, end - begin) );
-	begin = end + 1;
-	FG_LOG( FG_IO, FG_INFO, "  device = " << ch->get_device() );
-
-	// baud
-	ch->set_baud( config.substr(begin) );
-	FG_LOG( FG_IO, FG_INFO, "  baud = " << ch->get_baud() );
-
-	io->set_io_channel( ch );
-    } else if ( medium == "file" ) {
-	FGFile *ch = new FGFile;
-	io->set_io_channel( ch );
-
-	// file name
-	ch->set_file_name( config.substr(begin) );
-	FG_LOG( FG_IO, FG_INFO, "  file name = " << ch->get_file_name() );
-    } else if ( medium == "socket" ) {
-	FGSocket *ch = new FGSocket;
-	io->set_io_channel( ch );
-
-	// hostname
-	end = config.find(",", begin);
-	if ( end == string::npos ) {
-	    return NULL;
-	}
+            string device = config.substr(begin, end - begin);
+            begin = end + 1;
+            SG_LOG( SG_IO, SG_INFO, "  device = " << device );
+
+            // baud
+            string baud = config.substr(begin);
+            SG_LOG( SG_IO, SG_INFO, "  baud = " << baud );
+
+            SGSerial *ch = new SGSerial( device, baud );
+            io->set_io_channel( ch );
+        } else if ( medium == "file" ) {
+            // file name
+            string file = config.substr(begin);
+            SG_LOG( SG_IO, SG_INFO, "  file name = " << file );
+
+            SGFile *ch = new SGFile( file );
+            io->set_io_channel( ch );
+        } else if ( medium == "socket" ) {
+            // hostname
+            end = config.find(",", begin);
+            if ( end == string::npos ) {
+                return NULL;
+            }
     
-	ch->set_hostname( config.substr(begin, end - begin) );
-	begin = end + 1;
-	FG_LOG( FG_IO, FG_INFO, "  hostname = " << ch->get_hostname() );
-
-	// port
-	ch->set_port_str( config.substr(begin) );
-	FG_LOG( FG_IO, FG_INFO, "  port string = " << ch->get_port_str() );
-
+            string hostname = config.substr(begin, end - begin);
+            begin = end + 1;
+            SG_LOG( SG_IO, SG_INFO, "  hostname = " << hostname );
+
+            // port string
+            end = config.find(",", begin);
+            if ( end == string::npos ) {
+                return NULL;
+            }
+    
+            string port = config.substr(begin, end - begin);
+            begin = end + 1;
+            SG_LOG( SG_IO, SG_INFO, "  port string = " << port );
+
+            // socket style
+            string style_str = config.substr(begin);
+            SG_LOG( SG_IO, SG_INFO, "  style string = " << style_str );
+            
+            SGSocket *ch = new SGSocket( hostname, port, style_str );
+            io->set_io_channel( ch );
+        }
     }
 
     return io;
@@ -171,9 +243,11 @@ static FGProtocol *parse_port_config( const string& config )
 // step through the port config streams (from fgOPTIONS) and setup
 // serial port channels for each
 void fgIOInit() {
+    // SG_LOG( SG_IO, SG_INFO, "I/O Channel initialization, " << 
+    //         globals->get_channel_options_list()->size() << " requests." );
+
     FGProtocol *p;
-    string_list channel_options_list = 
-	current_options.get_channel_options_list();
+    string_list *channel_options_list = globals->get_channel_options_list();
 
     // we could almost do this in a single step except pushing a valid
     // port onto the port list copies the structure and destroys the
@@ -181,16 +255,17 @@ void fgIOInit() {
 
     // parse the configuration strings and store the results in the
     // appropriate FGIOChannel structures
-    for ( int i = 0; i < (int)channel_options_list.size(); ++i ) {
-	p = parse_port_config( channel_options_list[i] );
+    for ( int i = 0; i < (int)channel_options_list->size(); ++i ) {
+	p = parse_port_config( (*channel_options_list)[i] );
 	if ( p != NULL ) {
 	    p->open();
 	    global_io_list.push_back( p );
 	    if ( !p->is_enabled() ) {
-		FG_LOG( FG_IO, FG_INFO, "I/O Channel config failed." );
+		SG_LOG( SG_IO, SG_ALERT, "I/O Channel config failed." );
+		exit(-1);
 	    }
 	} else {
-	    FG_LOG( FG_IO, FG_INFO, "I/O Channel parse failed." );
+	    SG_LOG( SG_IO, SG_INFO, "I/O Channel parse failed." );
 	}
     }
 }
@@ -204,8 +279,8 @@ void fgIOProcess() {
 
     static int inited = 0;
     int interval;
-    static FGTimeStamp last;
-    FGTimeStamp current;
+    static SGTimeStamp last;
+    SGTimeStamp current;
 
     if ( ! inited ) {
 	inited = 1;
@@ -223,10 +298,27 @@ void fgIOProcess() {
 
 	if ( p->is_enabled() ) {
 	    p->dec_count_down( interval );
-	    if ( p->get_count_down() < 0 ) {
+	    while ( p->get_count_down() < 0 ) {
 		p->process();
-		p->set_count_down( 1000000.0 / p->get_hz() );
+		p->dec_count_down(int( -1000000.0 / p->get_hz()));
 	    }
 	}
     }
 }
+
+
+// shutdown all I/O connections
+void fgIOShutdownAll() {
+    FGProtocol *p;
+
+    // cout << "processing I/O channels" << endl;
+
+    for ( int i = 0; i < (int)global_io_list.size(); ++i ) {
+	// cout << "  channel = " << i << endl;
+	p = global_io_list[i];
+
+	if ( p->is_enabled() ) {
+	    p->close();
+	}
+    }
+}