9 files changed, 582 insertions, 427 deletions
diff --git a/gr-digital/lib/CMakeLists.txt b/gr-digital/lib/CMakeLists.txt
index 9acfff69a7..83d958b66c 100644
--- a/gr-digital/lib/CMakeLists.txt
+++ b/gr-digital/lib/CMakeLists.txt
@@ -104,6 +104,7 @@ expand_cc(chunks_to_symbols_XX_impl     bf bc sf sc if ic)
 list(APPEND digital_sources
     ${generated_sources}
     constellation.cc
+    crc32.cc
     glfsr.cc
     mpsk_snr_est.cc
     additive_scrambler_bb_impl.cc
@@ -117,13 +118,12 @@ list(APPEND digital_sources
     correlate_access_code_tag_bb_impl.cc
     costas_loop_cc_impl.cc
     #cpmmod_bc_impl.cc
-    #crc32_impl.cc
     descrambler_bb_impl.cc
     diff_decoder_bb_impl.cc
     diff_encoder_bb_impl.cc
     diff_phasor_cc_impl.cc
     fll_band_edge_cc_impl.cc
-    #framer_sink_1_impl.cc
+    framer_sink_1_impl.cc
     glfsr_source_b_impl.cc
     glfsr_source_f_impl.cc
     #gmskmod_bc_impl.cc
@@ -145,7 +145,7 @@ list(APPEND digital_sources
     probe_density_b_impl.cc
     probe_mpsk_snr_est_c_impl.cc
     scrambler_bb_impl.cc
-    #simple_framer_impl.cc
+    simple_framer_impl.cc
 )
 
 list(APPEND digital_libs
diff --git a/gr-digital/lib/crc32.cc b/gr-digital/lib/crc32.cc
new file mode 100644
index 0000000000..b203727114
--- /dev/null
+++ b/gr-digital/lib/crc32.cc
@@ -0,0 +1,136 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,2011,2012 Free Software Foundation, Inc.
+ * 
+ * This file is part of GNU Radio
+ * 
+ * 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 3, or (at your option)
+ * any later version.
+ * 
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+/*
+ * See also ISO 3309 [ISO-3309] or ITU-T V.42 [ITU-V42] for a formal specification.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <digital/crc32.h>
+
+namespace gr {
+  namespace digital {
+
+    // Automatically generated CRC function
+    // polynomial: 0x104C11DB7
+    unsigned int
+    update_crc32(unsigned int crc, const unsigned char *data, size_t len)
+    {
+      static const unsigned int table[256] = {
+	0x00000000U,0x04C11DB7U,0x09823B6EU,0x0D4326D9U,
+	0x130476DCU,0x17C56B6BU,0x1A864DB2U,0x1E475005U,
+	0x2608EDB8U,0x22C9F00FU,0x2F8AD6D6U,0x2B4BCB61U,
+	0x350C9B64U,0x31CD86D3U,0x3C8EA00AU,0x384FBDBDU,
+	0x4C11DB70U,0x48D0C6C7U,0x4593E01EU,0x4152FDA9U,
+	0x5F15ADACU,0x5BD4B01BU,0x569796C2U,0x52568B75U,
+	0x6A1936C8U,0x6ED82B7FU,0x639B0DA6U,0x675A1011U,
+	0x791D4014U,0x7DDC5DA3U,0x709F7B7AU,0x745E66CDU,
+	0x9823B6E0U,0x9CE2AB57U,0x91A18D8EU,0x95609039U,
+	0x8B27C03CU,0x8FE6DD8BU,0x82A5FB52U,0x8664E6E5U,
+	0xBE2B5B58U,0xBAEA46EFU,0xB7A96036U,0xB3687D81U,
+	0xAD2F2D84U,0xA9EE3033U,0xA4AD16EAU,0xA06C0B5DU,
+	0xD4326D90U,0xD0F37027U,0xDDB056FEU,0xD9714B49U,
+	0xC7361B4CU,0xC3F706FBU,0xCEB42022U,0xCA753D95U,
+	0xF23A8028U,0xF6FB9D9FU,0xFBB8BB46U,0xFF79A6F1U,
+	0xE13EF6F4U,0xE5FFEB43U,0xE8BCCD9AU,0xEC7DD02DU,
+	0x34867077U,0x30476DC0U,0x3D044B19U,0x39C556AEU,
+	0x278206ABU,0x23431B1CU,0x2E003DC5U,0x2AC12072U,
+	0x128E9DCFU,0x164F8078U,0x1B0CA6A1U,0x1FCDBB16U,
+	0x018AEB13U,0x054BF6A4U,0x0808D07DU,0x0CC9CDCAU,
+	0x7897AB07U,0x7C56B6B0U,0x71159069U,0x75D48DDEU,
+	0x6B93DDDBU,0x6F52C06CU,0x6211E6B5U,0x66D0FB02U,
+	0x5E9F46BFU,0x5A5E5B08U,0x571D7DD1U,0x53DC6066U,
+	0x4D9B3063U,0x495A2DD4U,0x44190B0DU,0x40D816BAU,
+	0xACA5C697U,0xA864DB20U,0xA527FDF9U,0xA1E6E04EU,
+	0xBFA1B04BU,0xBB60ADFCU,0xB6238B25U,0xB2E29692U,
+	0x8AAD2B2FU,0x8E6C3698U,0x832F1041U,0x87EE0DF6U,
+	0x99A95DF3U,0x9D684044U,0x902B669DU,0x94EA7B2AU,
+	0xE0B41DE7U,0xE4750050U,0xE9362689U,0xEDF73B3EU,
+	0xF3B06B3BU,0xF771768CU,0xFA325055U,0xFEF34DE2U,
+	0xC6BCF05FU,0xC27DEDE8U,0xCF3ECB31U,0xCBFFD686U,
+	0xD5B88683U,0xD1799B34U,0xDC3ABDEDU,0xD8FBA05AU,
+	0x690CE0EEU,0x6DCDFD59U,0x608EDB80U,0x644FC637U,
+	0x7A089632U,0x7EC98B85U,0x738AAD5CU,0x774BB0EBU,
+	0x4F040D56U,0x4BC510E1U,0x46863638U,0x42472B8FU,
+	0x5C007B8AU,0x58C1663DU,0x558240E4U,0x51435D53U,
+	0x251D3B9EU,0x21DC2629U,0x2C9F00F0U,0x285E1D47U,
+	0x36194D42U,0x32D850F5U,0x3F9B762CU,0x3B5A6B9BU,
+	0x0315D626U,0x07D4CB91U,0x0A97ED48U,0x0E56F0FFU,
+	0x1011A0FAU,0x14D0BD4DU,0x19939B94U,0x1D528623U,
+	0xF12F560EU,0xF5EE4BB9U,0xF8AD6D60U,0xFC6C70D7U,
+	0xE22B20D2U,0xE6EA3D65U,0xEBA91BBCU,0xEF68060BU,
+	0xD727BBB6U,0xD3E6A601U,0xDEA580D8U,0xDA649D6FU,
+	0xC423CD6AU,0xC0E2D0DDU,0xCDA1F604U,0xC960EBB3U,
+	0xBD3E8D7EU,0xB9FF90C9U,0xB4BCB610U,0xB07DABA7U,
+	0xAE3AFBA2U,0xAAFBE615U,0xA7B8C0CCU,0xA379DD7BU,
+	0x9B3660C6U,0x9FF77D71U,0x92B45BA8U,0x9675461FU,
+	0x8832161AU,0x8CF30BADU,0x81B02D74U,0x857130C3U,
+	0x5D8A9099U,0x594B8D2EU,0x5408ABF7U,0x50C9B640U,
+	0x4E8EE645U,0x4A4FFBF2U,0x470CDD2BU,0x43CDC09CU,
+	0x7B827D21U,0x7F436096U,0x7200464FU,0x76C15BF8U,
+	0x68860BFDU,0x6C47164AU,0x61043093U,0x65C52D24U,
+	0x119B4BE9U,0x155A565EU,0x18197087U,0x1CD86D30U,
+	0x029F3D35U,0x065E2082U,0x0B1D065BU,0x0FDC1BECU,
+	0x3793A651U,0x3352BBE6U,0x3E119D3FU,0x3AD08088U,
+	0x2497D08DU,0x2056CD3AU,0x2D15EBE3U,0x29D4F654U,
+	0xC5A92679U,0xC1683BCEU,0xCC2B1D17U,0xC8EA00A0U,
+	0xD6AD50A5U,0xD26C4D12U,0xDF2F6BCBU,0xDBEE767CU,
+	0xE3A1CBC1U,0xE760D676U,0xEA23F0AFU,0xEEE2ED18U,
+	0xF0A5BD1DU,0xF464A0AAU,0xF9278673U,0xFDE69BC4U,
+	0x89B8FD09U,0x8D79E0BEU,0x803AC667U,0x84FBDBD0U,
+	0x9ABC8BD5U,0x9E7D9662U,0x933EB0BBU,0x97FFAD0CU,
+	0xAFB010B1U,0xAB710D06U,0xA6322BDFU,0xA2F33668U,
+	0xBCB4666DU,0xB8757BDAU,0xB5365D03U,0xB1F740B4U,
+      };
+  
+      while(len > 0)
+	{
+	  crc = table[*data ^ ((crc >> 24) & 0xff)] ^ (crc << 8);
+	  data++;
+	  len--;
+	}
+      return crc;
+    }
+
+    unsigned int
+    update_crc32(unsigned int crc, const std::string s)
+    {
+      return update_crc32(crc, (const unsigned char *)s.data(), s.size());
+    }
+    
+    unsigned int
+    crc32(const unsigned char *buf, size_t len)
+    {
+      return update_crc32(0xffffffff, buf, len) ^ 0xffffffff;
+    }
+
+    unsigned int
+    crc32(const std::string s)
+    {
+      return crc32((const unsigned char *) s.data(), s.size());
+    }
+
+  } /* namespace digital */
+} /* namespace gr */
diff --git a/gr-digital/lib/digital_crc32.cc b/gr-digital/lib/digital_crc32.cc
deleted file mode 100644
index 8806d6e9c7..0000000000
--- a/gr-digital/lib/digital_crc32.cc
+++ /dev/null
@@ -1,130 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005,2011 Free Software Foundation, Inc.
- * 
- * This file is part of GNU Radio
- * 
- * 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 3, or (at your option)
- * any later version.
- * 
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-/*
- * See also ISO 3309 [ISO-3309] or ITU-T V.42 [ITU-V42] for a formal specification.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <digital_crc32.h>
-
-   
-// Automatically generated CRC function
-// polynomial: 0x104C11DB7
-unsigned int
-digital_update_crc32(unsigned int crc, const unsigned char *data, size_t len)
-{
-    static const unsigned int table[256] = {
-    0x00000000U,0x04C11DB7U,0x09823B6EU,0x0D4326D9U,
-    0x130476DCU,0x17C56B6BU,0x1A864DB2U,0x1E475005U,
-    0x2608EDB8U,0x22C9F00FU,0x2F8AD6D6U,0x2B4BCB61U,
-    0x350C9B64U,0x31CD86D3U,0x3C8EA00AU,0x384FBDBDU,
-    0x4C11DB70U,0x48D0C6C7U,0x4593E01EU,0x4152FDA9U,
-    0x5F15ADACU,0x5BD4B01BU,0x569796C2U,0x52568B75U,
-    0x6A1936C8U,0x6ED82B7FU,0x639B0DA6U,0x675A1011U,
-    0x791D4014U,0x7DDC5DA3U,0x709F7B7AU,0x745E66CDU,
-    0x9823B6E0U,0x9CE2AB57U,0x91A18D8EU,0x95609039U,
-    0x8B27C03CU,0x8FE6DD8BU,0x82A5FB52U,0x8664E6E5U,
-    0xBE2B5B58U,0xBAEA46EFU,0xB7A96036U,0xB3687D81U,
-    0xAD2F2D84U,0xA9EE3033U,0xA4AD16EAU,0xA06C0B5DU,
-    0xD4326D90U,0xD0F37027U,0xDDB056FEU,0xD9714B49U,
-    0xC7361B4CU,0xC3F706FBU,0xCEB42022U,0xCA753D95U,
-    0xF23A8028U,0xF6FB9D9FU,0xFBB8BB46U,0xFF79A6F1U,
-    0xE13EF6F4U,0xE5FFEB43U,0xE8BCCD9AU,0xEC7DD02DU,
-    0x34867077U,0x30476DC0U,0x3D044B19U,0x39C556AEU,
-    0x278206ABU,0x23431B1CU,0x2E003DC5U,0x2AC12072U,
-    0x128E9DCFU,0x164F8078U,0x1B0CA6A1U,0x1FCDBB16U,
-    0x018AEB13U,0x054BF6A4U,0x0808D07DU,0x0CC9CDCAU,
-    0x7897AB07U,0x7C56B6B0U,0x71159069U,0x75D48DDEU,
-    0x6B93DDDBU,0x6F52C06CU,0x6211E6B5U,0x66D0FB02U,
-    0x5E9F46BFU,0x5A5E5B08U,0x571D7DD1U,0x53DC6066U,
-    0x4D9B3063U,0x495A2DD4U,0x44190B0DU,0x40D816BAU,
-    0xACA5C697U,0xA864DB20U,0xA527FDF9U,0xA1E6E04EU,
-    0xBFA1B04BU,0xBB60ADFCU,0xB6238B25U,0xB2E29692U,
-    0x8AAD2B2FU,0x8E6C3698U,0x832F1041U,0x87EE0DF6U,
-    0x99A95DF3U,0x9D684044U,0x902B669DU,0x94EA7B2AU,
-    0xE0B41DE7U,0xE4750050U,0xE9362689U,0xEDF73B3EU,
-    0xF3B06B3BU,0xF771768CU,0xFA325055U,0xFEF34DE2U,
-    0xC6BCF05FU,0xC27DEDE8U,0xCF3ECB31U,0xCBFFD686U,
-    0xD5B88683U,0xD1799B34U,0xDC3ABDEDU,0xD8FBA05AU,
-    0x690CE0EEU,0x6DCDFD59U,0x608EDB80U,0x644FC637U,
-    0x7A089632U,0x7EC98B85U,0x738AAD5CU,0x774BB0EBU,
-    0x4F040D56U,0x4BC510E1U,0x46863638U,0x42472B8FU,
-    0x5C007B8AU,0x58C1663DU,0x558240E4U,0x51435D53U,
-    0x251D3B9EU,0x21DC2629U,0x2C9F00F0U,0x285E1D47U,
-    0x36194D42U,0x32D850F5U,0x3F9B762CU,0x3B5A6B9BU,
-    0x0315D626U,0x07D4CB91U,0x0A97ED48U,0x0E56F0FFU,
-    0x1011A0FAU,0x14D0BD4DU,0x19939B94U,0x1D528623U,
-    0xF12F560EU,0xF5EE4BB9U,0xF8AD6D60U,0xFC6C70D7U,
-    0xE22B20D2U,0xE6EA3D65U,0xEBA91BBCU,0xEF68060BU,
-    0xD727BBB6U,0xD3E6A601U,0xDEA580D8U,0xDA649D6FU,
-    0xC423CD6AU,0xC0E2D0DDU,0xCDA1F604U,0xC960EBB3U,
-    0xBD3E8D7EU,0xB9FF90C9U,0xB4BCB610U,0xB07DABA7U,
-    0xAE3AFBA2U,0xAAFBE615U,0xA7B8C0CCU,0xA379DD7BU,
-    0x9B3660C6U,0x9FF77D71U,0x92B45BA8U,0x9675461FU,
-    0x8832161AU,0x8CF30BADU,0x81B02D74U,0x857130C3U,
-    0x5D8A9099U,0x594B8D2EU,0x5408ABF7U,0x50C9B640U,
-    0x4E8EE645U,0x4A4FFBF2U,0x470CDD2BU,0x43CDC09CU,
-    0x7B827D21U,0x7F436096U,0x7200464FU,0x76C15BF8U,
-    0x68860BFDU,0x6C47164AU,0x61043093U,0x65C52D24U,
-    0x119B4BE9U,0x155A565EU,0x18197087U,0x1CD86D30U,
-    0x029F3D35U,0x065E2082U,0x0B1D065BU,0x0FDC1BECU,
-    0x3793A651U,0x3352BBE6U,0x3E119D3FU,0x3AD08088U,
-    0x2497D08DU,0x2056CD3AU,0x2D15EBE3U,0x29D4F654U,
-    0xC5A92679U,0xC1683BCEU,0xCC2B1D17U,0xC8EA00A0U,
-    0xD6AD50A5U,0xD26C4D12U,0xDF2F6BCBU,0xDBEE767CU,
-    0xE3A1CBC1U,0xE760D676U,0xEA23F0AFU,0xEEE2ED18U,
-    0xF0A5BD1DU,0xF464A0AAU,0xF9278673U,0xFDE69BC4U,
-    0x89B8FD09U,0x8D79E0BEU,0x803AC667U,0x84FBDBD0U,
-    0x9ABC8BD5U,0x9E7D9662U,0x933EB0BBU,0x97FFAD0CU,
-    0xAFB010B1U,0xAB710D06U,0xA6322BDFU,0xA2F33668U,
-    0xBCB4666DU,0xB8757BDAU,0xB5365D03U,0xB1F740B4U,
-    };
-  
-    while (len > 0)
-    {
-      crc = table[*data ^ ((crc >> 24) & 0xff)] ^ (crc << 8);
-      data++;
-      len--;
-    }
-    return crc;
-}
-
-unsigned int
-digital_update_crc32(unsigned int crc, const std::string s)
-{
-  return digital_update_crc32(crc, (const unsigned char *) s.data(), s.size());
-}
-    
-unsigned int
-digital_crc32(const unsigned char *buf, size_t len)
-{
-  return digital_update_crc32(0xffffffff, buf, len) ^ 0xffffffff;
-}
-
-unsigned int
-digital_crc32(const std::string s)
-{
-  return digital_crc32((const unsigned char *) s.data(), s.size());
-}
diff --git a/gr-digital/lib/digital_framer_sink_1.cc b/gr-digital/lib/digital_framer_sink_1.cc
deleted file mode 100644
index ba1c5bd50e..0000000000
--- a/gr-digital/lib/digital_framer_sink_1.cc
+++ /dev/null
@@ -1,192 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2006,2010,2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * 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 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <digital_framer_sink_1.h>
-#include <gr_io_signature.h>
-#include <cstdio>
-#include <stdexcept>
-#include <string.h>
-
-#define VERBOSE 0
-
-inline void
-digital_framer_sink_1::enter_search()
-{
-  if (VERBOSE)
-    fprintf(stderr, "@ enter_search\n");
-
-  d_state = STATE_SYNC_SEARCH;
-}
-
-inline void
-digital_framer_sink_1::enter_have_sync()
-{
-  if (VERBOSE)
-    fprintf(stderr, "@ enter_have_sync\n");
-
-  d_state = STATE_HAVE_SYNC;
-  d_header = 0;
-  d_headerbitlen_cnt = 0;
-}
-
-inline void
-digital_framer_sink_1::enter_have_header(int payload_len,
-					 int whitener_offset)
-{
-  if (VERBOSE)
-    fprintf(stderr, "@ enter_have_header (payload_len = %d) (offset = %d)\n",
-	    payload_len, whitener_offset);
-
-  d_state = STATE_HAVE_HEADER;
-  d_packetlen = payload_len;
-  d_packet_whitener_offset = whitener_offset;
-  d_packetlen_cnt = 0;
-  d_packet_byte = 0;
-  d_packet_byte_index = 0;
-}
-
-digital_framer_sink_1_sptr
-digital_make_framer_sink_1(gr_msg_queue_sptr target_queue)
-{
-  return gnuradio::get_initial_sptr(new digital_framer_sink_1(target_queue));
-}
-
-
-digital_framer_sink_1::digital_framer_sink_1(gr_msg_queue_sptr target_queue)
-  : gr_sync_block ("framer_sink_1",
-		   gr_make_io_signature (1, 1, sizeof(unsigned char)),
-		   gr_make_io_signature (0, 0, 0)),
-    d_target_queue(target_queue)
-{
-  enter_search();
-}
-
-digital_framer_sink_1::~digital_framer_sink_1 ()
-{
-}
-
-int
-digital_framer_sink_1::work (int noutput_items,
-			     gr_vector_const_void_star &input_items,
-			     gr_vector_void_star &output_items)
-{
-  const unsigned char *in = (const unsigned char *) input_items[0];
-  int count=0;
-
-  if (VERBOSE)
-    fprintf(stderr,">>> Entering state machine\n");
-
-  while (count < noutput_items){
-    switch(d_state) {
-
-    case STATE_SYNC_SEARCH:    // Look for flag indicating beginning of pkt
-      if (VERBOSE)
-	fprintf(stderr,"SYNC Search, noutput=%d\n", noutput_items);
-
-      while (count < noutput_items) {
-	if (in[count] & 0x2){  // Found it, set up for header decode
-	  enter_have_sync();
-	  break;
-	}
-	count++;
-      }
-      break;
-
-    case STATE_HAVE_SYNC:
-      if (VERBOSE)
-	fprintf(stderr,"Header Search bitcnt=%d, header=0x%08x\n",
-		d_headerbitlen_cnt, d_header);
-
-      while (count < noutput_items) {	// Shift bits one at a time into header
-	d_header = (d_header << 1) | (in[count++] & 0x1);
-	if (++d_headerbitlen_cnt == HEADERBITLEN) {
-
-	  if (VERBOSE)
-	    fprintf(stderr, "got header: 0x%08x\n", d_header);
-
-	  // we have a full header, check to see if it has been received properly
-	  if (header_ok()){
-	    int payload_len;
-	    int whitener_offset;
-	    header_payload(&payload_len, &whitener_offset);
-	    enter_have_header(payload_len, whitener_offset);
-
-	    if (d_packetlen == 0){	    // check for zero-length payload
-	      // build a zero-length message
-	      // NOTE: passing header field as arg1 is not scalable
-	      gr_message_sptr msg =
-		gr_make_message(0, d_packet_whitener_offset, 0, 0);
-
-	      d_target_queue->insert_tail(msg);		// send it
-	      msg.reset();  				// free it up
-
-	      enter_search();
-	    }
-	  }
-	  else
-	    enter_search();				// bad header
-	  break;					// we're in a new state
-	}
-      }
-      break;
-
-    case STATE_HAVE_HEADER:
-      if (VERBOSE)
-	fprintf(stderr,"Packet Build\n");
-
-      while (count < noutput_items) {   // shift bits into bytes of packet one at a time
-	d_packet_byte = (d_packet_byte << 1) | (in[count++] & 0x1);
-	if (d_packet_byte_index++ == 7) {	  	// byte is full so move to next byte
-	  d_packet[d_packetlen_cnt++] = d_packet_byte;
-	  d_packet_byte_index = 0;
-
-	  if (d_packetlen_cnt == d_packetlen){		// packet is filled
-
-	    // build a message
-	    // NOTE: passing header field as arg1 is not scalable
-	    gr_message_sptr msg =
-	      gr_make_message(0, d_packet_whitener_offset, 0, d_packetlen_cnt);
-	    memcpy(msg->msg(), d_packet, d_packetlen_cnt);
-
-	    d_target_queue->insert_tail(msg);		// send it
-	    msg.reset();  				// free it up
-
-	    enter_search();
-	    break;
-	  }
-	}
-      }
-      break;
-
-    default:
-      assert(0);
-
-    } // switch
-
-  }   // while
-
-  return noutput_items;
-}
diff --git a/gr-digital/lib/digital_simple_framer.cc b/gr-digital/lib/digital_simple_framer.cc
deleted file mode 100644
index 5c194543ca..0000000000
--- a/gr-digital/lib/digital_simple_framer.cc
+++ /dev/null
@@ -1,102 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2010,2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * 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 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <digital_simple_framer.h>
-#include <digital_simple_framer_sync.h>
-#include <gr_io_signature.h>
-#include <assert.h>
-#include <stdexcept>
-#include <string.h>
-
-
-digital_simple_framer_sptr
-digital_make_simple_framer (int payload_bytesize)
-{
-  return gnuradio::get_initial_sptr(new digital_simple_framer
-				    (payload_bytesize));
-}
-
-digital_simple_framer::digital_simple_framer (int payload_bytesize)
-  : gr_block ("simple_framer",
-	      gr_make_io_signature (1, 1, sizeof (unsigned char)),
-	      gr_make_io_signature (1, 1, sizeof (unsigned char))),
-    d_seqno (0), d_payload_bytesize (payload_bytesize),
-    d_input_block_size (payload_bytesize),
-    d_output_block_size (payload_bytesize + GRSF_OVERHEAD)
-{
-  set_output_multiple (d_output_block_size);
-}
-
-void
-digital_simple_framer::forecast (int noutput_items, gr_vector_int &ninput_items_required)
-{
-  assert (noutput_items % d_output_block_size == 0);
-
-  int nblocks = noutput_items / d_output_block_size;
-  int input_required = nblocks * d_input_block_size;
-
-  unsigned ninputs = ninput_items_required.size();
-  for (unsigned int i = 0; i < ninputs; i++)
-    ninput_items_required[i] = input_required;
-}
-
-int
-digital_simple_framer::general_work (int noutput_items,
-				     gr_vector_int &ninput_items,
-				     gr_vector_const_void_star &input_items,
-				     gr_vector_void_star &output_items)
-{
-  const unsigned char *in = (const unsigned char *) input_items[0];
-  unsigned char *out = (unsigned char *) output_items[0];
-
-  int n = 0;
-  int nblocks = 0;
-
-  memset (out, 0x55, noutput_items);
-
-  while (n < noutput_items) {
-    out[0] = (GRSF_SYNC >> 56) & 0xff;
-    out[1] = (GRSF_SYNC >> 48) & 0xff;
-    out[2] = (GRSF_SYNC >> 40) & 0xff;
-    out[3] = (GRSF_SYNC >> 32) & 0xff;
-    out[4] = (GRSF_SYNC >> 24) & 0xff;
-    out[5] = (GRSF_SYNC >> 16) & 0xff;
-    out[6] = (GRSF_SYNC >>  8) & 0xff;
-    out[7] = (GRSF_SYNC >>  0) & 0xff;
-    out[8] = d_seqno++;
-
-    memcpy (&out[9], in, d_input_block_size);
-    in += d_input_block_size;
-    out += d_output_block_size;
-    n += d_output_block_size;
-    nblocks++;
-  }
-
-  assert (n == noutput_items);
-
-  consume_each (nblocks * d_input_block_size);
-  return n;
-}
diff --git a/gr-digital/lib/framer_sink_1_impl.cc b/gr-digital/lib/framer_sink_1_impl.cc
new file mode 100644
index 0000000000..1dda5ca50c
--- /dev/null
+++ b/gr-digital/lib/framer_sink_1_impl.cc
@@ -0,0 +1,195 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2006,2010,2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * 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 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "framer_sink_1_impl.h"
+#include <gr_io_signature.h>
+#include <cstdio>
+#include <string>
+
+namespace gr {
+  namespace digital {
+
+#define VERBOSE 0
+
+    inline void
+    framer_sink_1_impl::enter_search()
+    {
+      if(VERBOSE)
+	fprintf(stderr, "@ enter_search\n");
+
+      d_state = STATE_SYNC_SEARCH;
+    }
+
+    inline void
+    framer_sink_1_impl::enter_have_sync()
+    {
+      if (VERBOSE)
+	fprintf(stderr, "@ enter_have_sync\n");
+      
+      d_state = STATE_HAVE_SYNC;
+      d_header = 0;
+      d_headerbitlen_cnt = 0;
+    }
+
+    inline void
+    framer_sink_1_impl::enter_have_header(int payload_len,
+					  int whitener_offset)
+    {
+      if(VERBOSE)
+	fprintf(stderr, "@ enter_have_header (payload_len = %d) (offset = %d)\n",
+		payload_len, whitener_offset);
+
+      d_state = STATE_HAVE_HEADER;
+      d_packetlen = payload_len;
+      d_packet_whitener_offset = whitener_offset;
+      d_packetlen_cnt = 0;
+      d_packet_byte = 0;
+      d_packet_byte_index = 0;
+    }
+
+    framer_sink_1::sptr
+    framer_sink_1::make(gr_msg_queue_sptr target_queue)
+    {
+      return gnuradio::get_initial_sptr
+	(new framer_sink_1_impl(target_queue));
+    }
+
+    framer_sink_1_impl::framer_sink_1_impl(gr_msg_queue_sptr target_queue)
+      : gr_sync_block("framer_sink_1",
+		      gr_make_io_signature(1, 1, sizeof(unsigned char)),
+		      gr_make_io_signature(0, 0, 0)),
+	d_target_queue(target_queue)
+    {
+      enter_search();
+    }
+
+    framer_sink_1_impl::~framer_sink_1_impl()
+    {
+    }
+
+    int
+    framer_sink_1_impl::work(int noutput_items,
+			     gr_vector_const_void_star &input_items,
+			     gr_vector_void_star &output_items)
+    {
+      const unsigned char *in = (const unsigned char *) input_items[0];
+      int count=0;
+
+      if(VERBOSE)
+	fprintf(stderr,">>> Entering state machine\n");
+
+      while(count < noutput_items){
+	switch(d_state) {
+
+	case STATE_SYNC_SEARCH:    // Look for flag indicating beginning of pkt
+	  if(VERBOSE)
+	    fprintf(stderr,"SYNC Search, noutput=%d\n", noutput_items);
+
+	  while(count < noutput_items) {
+	    if(in[count] & 0x2){  // Found it, set up for header decode
+	      enter_have_sync();
+	      break;
+	    }
+	    count++;
+	  }
+	  break;
+
+	case STATE_HAVE_SYNC:
+	  if(VERBOSE)
+	    fprintf(stderr,"Header Search bitcnt=%d, header=0x%08x\n",
+		    d_headerbitlen_cnt, d_header);
+
+	  while(count < noutput_items) {	// Shift bits one at a time into header
+	    d_header = (d_header << 1) | (in[count++] & 0x1);
+	    if(++d_headerbitlen_cnt == HEADERBITLEN) {
+
+	      if(VERBOSE)
+		fprintf(stderr, "got header: 0x%08x\n", d_header);
+
+	      // we have a full header, check to see if it has been received properly
+	      if(header_ok()) {
+		int payload_len;
+		int whitener_offset;
+		header_payload(&payload_len, &whitener_offset);
+		enter_have_header(payload_len, whitener_offset);
+
+		if(d_packetlen == 0) {	    // check for zero-length payload
+		  // build a zero-length message
+		  // NOTE: passing header field as arg1 is not scalable
+		  gr_message_sptr msg =
+		    gr_make_message(0, d_packet_whitener_offset, 0, 0);
+
+		  d_target_queue->insert_tail(msg);		// send it
+		  msg.reset();  				// free it up
+
+		  enter_search();
+		}
+	      }
+	      else
+		enter_search();				// bad header
+	      break;					// we're in a new state
+	    }
+	  }
+	  break;
+
+	case STATE_HAVE_HEADER:
+	  if(VERBOSE)
+	    fprintf(stderr,"Packet Build\n");
+
+	  while(count < noutput_items) {   // shift bits into bytes of packet one at a time
+	    d_packet_byte = (d_packet_byte << 1) | (in[count++] & 0x1);
+	    if(d_packet_byte_index++ == 7) {	  	// byte is full so move to next byte
+	      d_packet[d_packetlen_cnt++] = d_packet_byte;
+	      d_packet_byte_index = 0;
+
+	      if(d_packetlen_cnt == d_packetlen) {	// packet is filled
+		// build a message
+		// NOTE: passing header field as arg1 is not scalable
+		gr_message_sptr msg =
+		  gr_make_message(0, d_packet_whitener_offset, 0, d_packetlen_cnt);
+		memcpy(msg->msg(), d_packet, d_packetlen_cnt);
+
+		d_target_queue->insert_tail(msg);	// send it
+		msg.reset();  				// free it up
+
+		enter_search();
+		break;
+	      }
+	    }
+	  }
+	  break;
+
+	default:
+	  assert(0);
+	} // switch
+
+      }   // while
+
+      return noutput_items;
+    }
+
+  } /* namespace digital */
+} /* namespace gr */
diff --git a/gr-digital/lib/framer_sink_1_impl.h b/gr-digital/lib/framer_sink_1_impl.h
new file mode 100644
index 0000000000..ff2839acbf
--- /dev/null
+++ b/gr-digital/lib/framer_sink_1_impl.h
@@ -0,0 +1,83 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,2006,2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * 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 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_FRAMER_SINK_1_IMPL_H
+#define INCLUDED_GR_FRAMER_SINK_1_IMPL_H
+
+#include <digital/framer_sink_1.h>
+
+namespace gr {
+  namespace digital {
+
+    class framer_sink_1_impl : public framer_sink_1
+    {
+    private:
+      enum state_t {STATE_SYNC_SEARCH, STATE_HAVE_SYNC, STATE_HAVE_HEADER};
+
+      static const int MAX_PKT_LEN    = 4096;
+      static const int HEADERBITLEN   = 32;
+
+      gr_msg_queue_sptr  d_target_queue;	    // where to send the packet when received
+      state_t            d_state;
+      unsigned int       d_header;		    // header bits
+      int		     d_headerbitlen_cnt;    // how many so far
+
+      unsigned char      d_packet[MAX_PKT_LEN];	    // assembled payload
+      unsigned char	 d_packet_byte;		    // byte being assembled
+      int		 d_packet_byte_index;	    // which bit of d_packet_byte we're working on
+      int 		 d_packetlen;		    // length of packet
+      int                d_packet_whitener_offset;  // offset into whitener string to use
+      int		 d_packetlen_cnt;	    // how many so far
+
+    protected:
+      void enter_search();
+      void enter_have_sync();
+      void enter_have_header(int payload_len, int whitener_offset);
+
+      bool header_ok()
+      {
+	// confirm that two copies of header info are identical
+	return ((d_header >> 16) ^ (d_header & 0xffff)) == 0;
+      }
+
+      void header_payload(int *len, int *offset)
+      {
+	// header consists of two 16-bit shorts in network byte order
+	// payload length is lower 12 bits
+	// whitener offset is upper 4 bits
+	*len = (d_header >> 16) & 0x0fff;
+	*offset = (d_header >> 28) & 0x000f;
+      }
+
+    public:
+      framer_sink_1_impl(gr_msg_queue_sptr target_queue);
+      ~framer_sink_1_impl();
+
+      int work(int noutput_items,
+	       gr_vector_const_void_star &input_items,
+	       gr_vector_void_star &output_items);
+    };
+
+  } /* namespace digital */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_FRAMER_SINK_1_IMPL_H */
diff --git a/gr-digital/lib/simple_framer_impl.cc b/gr-digital/lib/simple_framer_impl.cc
new file mode 100644
index 0000000000..ff7e3ab614
--- /dev/null
+++ b/gr-digital/lib/simple_framer_impl.cc
@@ -0,0 +1,110 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2010,2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * 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 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "simple_framer_impl.h"
+#include <digital/simple_framer_sync.h>
+#include <gr_io_signature.h>
+#include <assert.h>
+#include <string>
+
+namespace gr {
+  namespace digital {
+
+    simple_framer::sptr
+    simple_framer::make(int payload_bytesize)
+    {
+      return gnuradio::get_initial_sptr
+	(new simple_framer_impl(payload_bytesize));
+    }
+
+    simple_framer_impl::simple_framer_impl(int payload_bytesize)
+      : gr_block("simple_framer",
+		 gr_make_io_signature(1, 1, sizeof(unsigned char)),
+		 gr_make_io_signature(1, 1, sizeof(unsigned char))),
+	d_seqno (0), d_payload_bytesize (payload_bytesize),
+	d_input_block_size (payload_bytesize),
+	d_output_block_size (payload_bytesize + GRSF_OVERHEAD)
+    {
+      set_output_multiple(d_output_block_size);
+    }
+
+    simple_framer_impl::~simple_framer_impl()
+    {
+    }
+
+    void
+    simple_framer_impl::forecast(int noutput_items, gr_vector_int &ninput_items_required)
+    {
+      assert(noutput_items % d_output_block_size == 0);
+
+      int nblocks = noutput_items / d_output_block_size;
+      int input_required = nblocks * d_input_block_size;
+
+      unsigned ninputs = ninput_items_required.size();
+      for(unsigned int i = 0; i < ninputs; i++)
+	ninput_items_required[i] = input_required;
+    }
+
+    int
+    simple_framer_impl::general_work(int noutput_items,
+				     gr_vector_int &ninput_items,
+				     gr_vector_const_void_star &input_items,
+				     gr_vector_void_star &output_items)
+    {
+      const unsigned char *in = (const unsigned char*)input_items[0];
+      unsigned char *out = (unsigned char*)output_items[0];
+
+      int n = 0;
+      int nblocks = 0;
+
+      memset(out, 0x55, noutput_items);
+
+      while(n < noutput_items) {
+	out[0] = (GRSF_SYNC >> 56) & 0xff;
+	out[1] = (GRSF_SYNC >> 48) & 0xff;
+	out[2] = (GRSF_SYNC >> 40) & 0xff;
+	out[3] = (GRSF_SYNC >> 32) & 0xff;
+	out[4] = (GRSF_SYNC >> 24) & 0xff;
+	out[5] = (GRSF_SYNC >> 16) & 0xff;
+	out[6] = (GRSF_SYNC >>  8) & 0xff;
+	out[7] = (GRSF_SYNC >>  0) & 0xff;
+	out[8] = d_seqno++;
+
+	memcpy(&out[9], in, d_input_block_size);
+	in += d_input_block_size;
+	out += d_output_block_size;
+	n += d_output_block_size;
+	nblocks++;
+      }
+
+      assert(n == noutput_items);
+
+      consume_each(nblocks * d_input_block_size);
+      return n;
+    }
+
+  } /* namespace digital */
+} /* namespace gr */
diff --git a/gr-digital/lib/simple_framer_impl.h b/gr-digital/lib/simple_framer_impl.h
new file mode 100644
index 0000000000..fe967eb26a
--- /dev/null
+++ b/gr-digital/lib/simple_framer_impl.h
@@ -0,0 +1,55 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * 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 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_SIMPLE_FRAMER_IMPL_H
+#define INCLUDED_GR_SIMPLE_FRAMER_IMPL_H
+
+#include <digital/simple_framer.h>
+
+namespace gr {
+  namespace digital {
+
+    class simple_framer_impl : public simple_framer
+    {
+    private:
+      int d_seqno;
+      int d_payload_bytesize;
+      int d_input_block_size;	// bytes
+      int d_output_block_size;	// bytes
+
+    public:
+      simple_framer_impl(int payload_bytesize);
+      ~simple_framer_impl();
+
+      void forecast(int noutput_items,
+		    gr_vector_int &ninput_items_required);
+
+      int general_work(int noutput_items,
+		       gr_vector_int &ninput_items,
+		       gr_vector_const_void_star &input_items,
+		       gr_vector_void_star &output_items);
+    };
+
+  } /* namespace digital */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_SIMPLE_FRAMER_IMPL_H */