7 files changed, 3 insertions, 338 deletions
diff --git a/gnuradio-core/src/lib/general/CMakeLists.txt b/gnuradio-core/src/lib/general/CMakeLists.txt
index ddc9225318..7ae3e49468 100644
--- a/gnuradio-core/src/lib/general/CMakeLists.txt
+++ b/gnuradio-core/src/lib/general/CMakeLists.txt
@@ -211,7 +211,6 @@ set(gr_core_general_triple_threats
     gr_float_to_uchar
     gr_fmdet_cf
     gr_frequency_modulator_fc
-    gr_framer_sink_1
     gr_head
     gr_int_to_float
     gr_interleave
diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i
index 6a9bfa4e1d..7433878c64 100644
--- a/gnuradio-core/src/lib/general/general.i
+++ b/gnuradio-core/src/lib/general/general.i
@@ -98,7 +98,6 @@
 #include <gr_test_types.h>
 #include <gr_test.h>
 #include <gr_unpack_k_bits_bb.h>
-#include <gr_framer_sink_1.h>
 #include <gr_multiply_cc.h>
 #include <gr_multiply_ff.h>
 #include <gr_multiply_const_cc.h>
@@ -202,7 +201,6 @@
 %include "gr_test_types.h"
 %include "gr_test.i"
 %include "gr_unpack_k_bits_bb.i"
-%include "gr_framer_sink_1.i"
 %include "gr_multiply_cc.i"
 %include "gr_multiply_ff.i"
 %include "gr_multiply_const_cc.i"
diff --git a/gnuradio-core/src/lib/general/gr_framer_sink_1.cc b/gnuradio-core/src/lib/general/gr_framer_sink_1.cc
deleted file mode 100644
index 64a0af6a07..0000000000
--- a/gnuradio-core/src/lib/general/gr_framer_sink_1.cc
+++ /dev/null
@@ -1,190 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2006,2010 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 <gr_framer_sink_1.h>
-#include <gr_io_signature.h>
-#include <cstdio>
-#include <stdexcept>
-#include <string.h>
-
-#define VERBOSE 0
-
-inline void
-gr_framer_sink_1::enter_search()
-{
-  if (VERBOSE)
-    fprintf(stderr, "@ enter_search\n");
-
-  d_state = STATE_SYNC_SEARCH;
-}
-
-inline void
-gr_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
-gr_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;
-}
-
-gr_framer_sink_1_sptr
-gr_make_framer_sink_1(gr_msg_queue_sptr target_queue)
-{
-  return gnuradio::get_initial_sptr(new gr_framer_sink_1(target_queue));
-}
-
-
-gr_framer_sink_1::gr_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();
-}
-
-gr_framer_sink_1::~gr_framer_sink_1 ()
-{
-}
-
-int
-gr_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/gnuradio-core/src/lib/general/gr_framer_sink_1.h b/gnuradio-core/src/lib/general/gr_framer_sink_1.h
deleted file mode 100644
index 93e41745f3..0000000000
--- a/gnuradio-core/src/lib/general/gr_framer_sink_1.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005,2006 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_H
-#define INCLUDED_GR_FRAMER_SINK_1_H
-
-#include <gr_core_api.h>
-#include <gr_sync_block.h>
-#include <gr_msg_queue.h>
-
-class gr_framer_sink_1;
-typedef boost::shared_ptr<gr_framer_sink_1> gr_framer_sink_1_sptr;
-
-GR_CORE_API gr_framer_sink_1_sptr
-gr_make_framer_sink_1 (gr_msg_queue_sptr target_queue);
-
-/*!
- * \brief Given a stream of bits and access_code flags, assemble packets.
- * \ingroup sink_blk
- *
- * input: stream of bytes from gr_correlate_access_code_bb
- * output: none.  Pushes assembled packet into target queue
- *
- * The framer expects a fixed length header of 2 16-bit shorts
- * containing the payload length, followed by the payload.  If the
- * 2 16-bit shorts are not identical, this packet is ignored.  Better
- * algs are welcome.
- *
- * The input data consists of bytes that have two bits used.
- * Bit 0, the LSB, contains the data bit.
- * Bit 1 if set, indicates that the corresponding bit is the
- * the first bit of the packet.  That is, this bit is the first
- * one after the access code.
- */
-class GR_CORE_API gr_framer_sink_1 : public gr_sync_block
-{
-  friend GR_CORE_API gr_framer_sink_1_sptr
-  gr_make_framer_sink_1 (gr_msg_queue_sptr target_queue);
-
- 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:
-  gr_framer_sink_1(gr_msg_queue_sptr target_queue);
-
-  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:
-  ~gr_framer_sink_1();
-
-  int work(int noutput_items,
-	   gr_vector_const_void_star &input_items,
-	   gr_vector_void_star &output_items);
-};
-
-#endif /* INCLUDED_GR_FRAMER_SINK_1_H */
diff --git a/gnuradio-core/src/lib/general/gr_framer_sink_1.i b/gnuradio-core/src/lib/general/gr_framer_sink_1.i
deleted file mode 100644
index 06281b138d..0000000000
--- a/gnuradio-core/src/lib/general/gr_framer_sink_1.i
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2006 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.
- */
-
-GR_SWIG_BLOCK_MAGIC(gr,framer_sink_1);
-
-gr_framer_sink_1_sptr
-gr_make_framer_sink_1(gr_msg_queue_sptr target_queue);
-
-class gr_framer_sink_1 : public gr_sync_block
-{
- protected:
-  gr_framer_sink_1(gr_msg_queue_sptr target_queue);
-
- public:
-  ~gr_framer_sink_1();
-};
diff --git a/gr-digital/python/pkt.py b/gr-digital/python/pkt.py
index 8650bdbb02..09254a7caa 100644
--- a/gr-digital/python/pkt.py
+++ b/gr-digital/python/pkt.py
@@ -143,7 +143,7 @@ class demod_pkts(gr.hier_block2):
         self._rcvd_pktq = gr.msg_queue()          # holds packets from the PHY
         self.correlator = digital_swig.correlate_access_code_bb(access_code, threshold)
 
-        self.framer_sink = gr.framer_sink_1(self._rcvd_pktq)
+        self.framer_sink = digital.framer_sink_1(self._rcvd_pktq)
         self.connect(self, self._demodulator, self.correlator, self.framer_sink)
         
         self._watcher = _queue_watcher_thread(self._rcvd_pktq, callback)
diff --git a/grc/grc_gnuradio/blks2/packet.py b/grc/grc_gnuradio/blks2/packet.py
index e39f55c841..494afa986a 100644
--- a/grc/grc_gnuradio/blks2/packet.py
+++ b/grc/grc_gnuradio/blks2/packet.py
@@ -1,4 +1,4 @@
-# Copyright 2008, 2009 Free Software Foundation, Inc.
+# Copyright 2008, 2009, 2012 Free Software Foundation, Inc.
 #
 # This file is part of GNU Radio
 #
@@ -158,7 +158,7 @@ class packet_decoder(gr.hier_block2):
 		#blocks
 		msgq = gr.msg_queue(DEFAULT_MSGQ_LIMIT) #holds packets from the PHY
 		correlator = digital.correlate_access_code_bb(self._access_code, self._threshold)
-		framer_sink = gr.framer_sink_1(msgq)
+		framer_sink = digital.framer_sink_1(msgq)
 		#initialize hier2
 		gr.hier_block2.__init__(
 			self,