Update Mac configure script for new ALUT scheme; support --with-alut-framework.

[flightgear.git] / src / Network / generic.hxx

diff --git a/src/Network/generic.hxx b/src/Network/generic.hxx
index 13b6202941e4d48a2e91cc8fcd1b4e35144ce658..6df4681935808896c219f7c22e0d01bd685800d6 100644 (file)
--- a/src/Network/generic.hxx
+++ b/src/Network/generic.hxx
@@ -27,18 +27,18 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 
 #include "protocol.hxx"
 
-SG_USING_STD(string);
+using std::string;
 
 
 class FGGeneric : public FGProtocol {
 
 public:
 
-    FGGeneric(string&);
+    FGGeneric(vector<string>);
     ~FGGeneric();
 
     bool gen_message();
@@ -47,15 +47,19 @@ public:
     // open hailing frequencies
     bool open();
 
+    void reinit();
+
     // process work for this port
     bool process();
 
     // close the channel
     bool close();
 
+    void setExitOnError(bool val) { exitOnError = val; }
+    bool getExitOnError() { return exitOnError; }
 protected:
 
-    enum e_type { FG_BOOL=0, FG_INT, FG_DOUBLE, FG_STRING };
+    enum e_type { FG_BOOL=0, FG_INT, FG_FLOAT, FG_DOUBLE, FG_STRING, FG_FIXED };
 
     typedef struct {
      // string name;
@@ -63,14 +67,19 @@ protected:
         e_type type;
         double offset;
         double factor;
-        SGPropertyNode *prop;
+        SGPropertyNode_ptr prop;
     } _serial_prot;
 
 private:
 
+    string file_name;
+    string direction;
+
     int length;
     char buf[ FG_MAX_MSG_SIZE ];
 
+    string preamble;
+    string postamble;
     string var_separator;
     string line_separator;
     string var_sep_string;
@@ -78,8 +87,18 @@ private:
     vector<_serial_prot> _out_message;
     vector<_serial_prot> _in_message;
 
-    void read_config(SGPropertyNode *root, vector<_serial_prot> &msg);
+    bool binary_mode;
+    enum {FOOTER_NONE, FOOTER_LENGTH, FOOTER_MAGIC} binary_footer_type;
+    int binary_footer_value;
+    int binary_record_length;
+    enum {BYTE_ORDER_NEEDS_CONVERSION, BYTE_ORDER_MATCHES_NETWORK_ORDER} binary_byte_order;
 
+    bool gen_message_ascii();
+    bool gen_message_binary();
+    bool parse_message_ascii();
+    bool parse_message_binary();
+    void read_config(SGPropertyNode *root, vector<_serial_prot> &msg);
+    bool exitOnError;
 };