make maintainer-clean removes these, and we want a clean orig.tar.gz

[debian/gnuradio] / gr-pager / src / pager_flex_parse.h

diff --git a/gr-pager/src/pager_flex_parse.h b/gr-pager/src/pager_flex_parse.h
index ade88c056b5d1ca595a20113ad82bbfbe1717b04..0f7cfb3702bcdf8fc68952152a837733a1ac1c76 100644 (file)
--- a/gr-pager/src/pager_flex_parse.h
+++ b/gr-pager/src/pager_flex_parse.h
@@ -5,7 +5,7 @@
  * 
  * GNU Radio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
+ * the Free Software Foundation; either version 3, or (at your option)
  * any later version.
  * 
  * GNU Radio is distributed in the hope that it will be useful,
@@ -23,36 +23,43 @@
 #define INCLUDED_PAGER_FLEX_PARSE_H
 
 #include <gr_sync_block.h>
+#include <gr_msg_queue.h>
 #include <pageri_flex_modes.h>
+#include <sstream>
 
 class pager_flex_parse;
 typedef boost::shared_ptr<pager_flex_parse> pager_flex_parse_sptr;
 
-pager_flex_parse_sptr pager_make_flex_parse();
+pager_flex_parse_sptr pager_make_flex_parse(gr_msg_queue_sptr queue, float freq);
+
+#define FIELD_DELIM ((unsigned char)128)
 
 /*!
  * \brief flex parse description
- * \ingroup block
+ * \ingroup pager_blk
  */
-
 class pager_flex_parse : public gr_sync_block
 {
 private:
     // Constructors
-    friend pager_flex_parse_sptr pager_make_flex_parse();
-    pager_flex_parse();
+    friend pager_flex_parse_sptr pager_make_flex_parse(gr_msg_queue_sptr queue, float freq);
+    pager_flex_parse(gr_msg_queue_sptr queue, float freq);
+
+    std::ostringstream d_payload;
+    gr_msg_queue_sptr d_queue;           // Destination for decoded pages
 
     int d_count;                         // Count of received codewords
     gr_int32 d_datawords[88];             // 11 blocks of 8 32-bit words
 
-    page_type_t d_type;                  // Current page type
+    page_type_t d_type;                          // Current page type
     int d_capcode;                       // Current page destination address
     bool d_laddr;                        // Current page has long address
-
+    float d_freq;                        // Channel frequency
+    
     void parse_data();                   // Handle a frame's worth of data
     void parse_capcode(gr_int32 aw1, gr_int32 aw2);     
-    void parse_alphanumeric(int mw1, int mw2);
-    void parse_numeric(int mw1, int mw2);
+    void parse_alphanumeric(int mw1, int mw2, int j);
+    void parse_numeric(int mw1, int mw2, int j);
     void parse_tone_only();
     void parse_unknown(int mw1, int mw2);