Merge branch 'next' of gnuradio.org:gnuradio into next

author: Tom Rondeau <trondeau@vt.edu> 2013-02-27 18:35:38 -0500
committer: Tom Rondeau <trondeau@vt.edu> 2013-02-27 18:35:38 -0500
commit: 2f55d7dfc33e8d990e44c5bbb7c6d2fbdaddd563 (patch)
tree: 87cc11b4b13a0f4960ac9106ecb487aa0e82fd4d /gr-blocks/lib
parent: 5a5338f584297f30e451e43dcb05f331cad51cd4 (diff)
parent: 6e988b777c6788cc7d434b869173ebcdcc2ce5e3 (diff)
10 files changed, 630 insertions, 1 deletions
diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt
index 20e3ae4aa6..28158ab593 100644
--- a/gr-blocks/lib/CMakeLists.txt
+++ b/gr-blocks/lib/CMakeLists.txt
@@ -164,6 +164,7 @@ list(APPEND gr_blocks_sources
     multiply_const_cc_impl.cc
     multiply_const_ff_impl.cc
     nlog10_ff_impl.cc
+    pack_k_bits_bb_impl.cc
     patterned_interleaver_impl.cc
     peak_detector2_fb_impl.cc
     regenerate_bb_impl.cc
@@ -173,6 +174,7 @@ list(APPEND gr_blocks_sources
     short_to_char_impl.cc
     short_to_float_impl.cc
     stream_mux_impl.cc
+    stream_pdu_base.cc
     stream_to_streams_impl.cc
     stream_to_vector_impl.cc
     streams_to_stream_impl.cc
@@ -181,8 +183,10 @@ list(APPEND gr_blocks_sources
     threshold_ff_impl.cc
     throttle_impl.cc
     transcendental_impl.cc
+    tuntap_pdu_impl.cc
     uchar_array_to_float.cc
     uchar_to_float_impl.cc
+    unpack_k_bits_bb_impl.cc
     vector_to_stream_impl.cc
     vector_to_streams_impl.cc
 )
diff --git a/gr-blocks/lib/ConfigChecks.cmake b/gr-blocks/lib/ConfigChecks.cmake
index 72d6d1d8ab..7f60aed403 100644
--- a/gr-blocks/lib/ConfigChecks.cmake
+++ b/gr-blocks/lib/ConfigChecks.cmake
@@ -56,7 +56,7 @@ CHECK_INCLUDE_FILE_CXX(windows.h HAVE_WINDOWS_H)
 IF(HAVE_WINDOWS_H)
     ADD_DEFINITIONS(-DHAVE_WINDOWS_H -DUSING_WINSOCK)
     MESSAGE(STATUS "Adding windows libs to gr blocks libs...")
-    LIST(APPEND gnuradio_core_libs WS2_32.lib WSock32.lib)
+    LIST(APPEND blocks_libs WS2_32.lib WSock32.lib)
 ENDIF(HAVE_WINDOWS_H)
 
 ########################################################################
diff --git a/gr-blocks/lib/pack_k_bits_bb_impl.cc b/gr-blocks/lib/pack_k_bits_bb_impl.cc
new file mode 100644
index 0000000000..2a7fcc04cb
--- /dev/null
+++ b/gr-blocks/lib/pack_k_bits_bb_impl.cc
@@ -0,0 +1,76 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012-2013 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.
+ */
+
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "pack_k_bits_bb_impl.h"
+#include <gr_io_signature.h>
+#include <stdexcept>
+#include <iostream>
+
+namespace gr {
+  namespace blocks {
+
+    pack_k_bits_bb::sptr
+    pack_k_bits_bb::make(unsigned k)
+    {
+      return gnuradio::get_initial_sptr
+        (new pack_k_bits_bb_impl(k));
+    }
+
+    pack_k_bits_bb_impl::pack_k_bits_bb_impl(unsigned k)
+      : gr_sync_decimator("pack_k_bits_bb",
+                          gr_make_io_signature(1, 1, sizeof(unsigned char)),
+                          gr_make_io_signature(1, 1, sizeof(unsigned char)),
+                          k),
+        d_k(k)
+    {
+      if(d_k == 0)
+        throw std::out_of_range("interpolation must be > 0");
+    }
+    
+    pack_k_bits_bb_impl::~pack_k_bits_bb_impl()
+    {
+    }
+
+    int
+    pack_k_bits_bb_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];
+      unsigned char *out = (unsigned char *)output_items[0];
+
+      for(int i = 0; i < noutput_items; i++) {
+        out[i] = 0x00;
+        for(unsigned int j = 0; j < d_k; j++) {
+          out[i] |= (0x01 & in[i*d_k+j])<<(d_k-j-1);
+        }
+      }
+
+      return noutput_items;
+    }
+
+  } /* namespace blocks */
+} /* namespace gr */
diff --git a/gr-blocks/lib/pack_k_bits_bb_impl.h b/gr-blocks/lib/pack_k_bits_bb_impl.h
new file mode 100644
index 0000000000..668d438a46
--- /dev/null
+++ b/gr-blocks/lib/pack_k_bits_bb_impl.h
@@ -0,0 +1,48 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012-2013 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_PACK_K_BITS_BB_IMPL_H
+#define	INCLUDED_GR_PACK_K_BITS_BB_IMPL_H
+
+#include <blocks/pack_k_bits_bb.h>
+
+namespace gr {
+  namespace blocks {
+
+    class pack_k_bits_bb_impl : public pack_k_bits_bb
+    {
+    private:
+      unsigned d_k;    // number of relevent bits to pack from k input bytes
+  
+    public:
+      pack_k_bits_bb_impl(unsigned k);
+      ~pack_k_bits_bb_impl();
+
+      int work(int noutput_items,
+               gr_vector_const_void_star &input_items,
+               gr_vector_void_star &output_items);
+    };
+
+  } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_PACK_K_BITS_BB_IMPL_H */
diff --git a/gr-blocks/lib/stream_pdu_base.cc b/gr-blocks/lib/stream_pdu_base.cc
new file mode 100644
index 0000000000..14e76149a0
--- /dev/null
+++ b/gr-blocks/lib/stream_pdu_base.cc
@@ -0,0 +1,126 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2013 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
+
+#ifdef HAVE_IO_H
+#include <io.h>
+#endif
+
+#include <gr_pdu.h>
+#include <gr_basic_block.h>
+#include "stream_pdu_base.h"
+#include <boost/format.hpp>
+
+static const long timeout_us = 100*1000; //100ms
+
+namespace gr {
+  namespace blocks {
+
+    stream_pdu_base::stream_pdu_base(int MTU)
+      :	d_fd(-1),
+	d_started(false), 
+	d_finished(false)
+    {
+      // reserve space for rx buffer 
+      d_rxbuf.resize(MTU,0);
+    }
+    
+    stream_pdu_base::~stream_pdu_base()
+    {
+      stop_rxthread();
+    }
+
+    void
+    stream_pdu_base::start_rxthread(gr_basic_block *blk, pmt::pmt_t port)
+    {
+      d_blk = blk;
+      d_port = port;
+      d_thread = gruel::thread(boost::bind(&stream_pdu_base::run, this));
+      d_started = true;
+    }
+
+    void
+    stream_pdu_base::stop_rxthread()
+    {
+      d_finished = true;
+
+      if (d_started) {
+        d_thread.interrupt();
+        d_thread.join();
+      }
+    }
+
+    void
+    stream_pdu_base::run()
+    {
+      while(!d_finished) {
+        if (!wait_ready())
+	  continue;
+
+        const int result = read(d_fd, &d_rxbuf[0], d_rxbuf.size());
+        if (result <= 0)
+	  throw std::runtime_error("stream_pdu_base, bad socket read!");
+
+        pmt::pmt_t vector = pmt::init_u8vector(result, &d_rxbuf[0]);       
+        pmt::pmt_t pdu = pmt::cons(pmt::PMT_NIL, vector);
+
+        d_blk->message_port_pub(d_port, pdu);
+      } 
+    }
+
+    bool
+    stream_pdu_base::wait_ready()
+    {
+      //setup timeval for timeout
+      timeval tv;
+      tv.tv_sec = 0;
+      tv.tv_usec = timeout_us;
+    
+      //setup rset for timeout
+      fd_set rset;
+      FD_ZERO(&rset);
+      FD_SET(d_fd, &rset);
+      
+      //call select with timeout on receive socket
+      return ::select(d_fd+1, &rset, NULL, NULL, &tv) > 0;
+    }
+
+    void
+    stream_pdu_base::send(pmt::pmt_t msg)
+    {
+      pmt::pmt_t vector = pmt::cdr(msg);
+      size_t offset(0);
+      size_t itemsize(::gr_pdu_itemsize(type_from_pmt(vector)));
+      int len(pmt::length(vector)*itemsize);
+    
+      const int rv = write(d_fd, pmt::uniform_vector_elements(vector, offset), len);
+      if (rv != len) {
+        std::cerr << boost::format("WARNING: gr_stream_pdu_base::send(pdu) write failed! (d_fd=%d, len=%d, rv=%d)")
+	  % d_fd % len % rv << std::endl;
+      }
+    }
+
+  } /* namespace blocks */
+} /* namespace gr */
diff --git a/gr-blocks/lib/stream_pdu_base.h b/gr-blocks/lib/stream_pdu_base.h
new file mode 100644
index 0000000000..66eaaf0c04
--- /dev/null
+++ b/gr-blocks/lib/stream_pdu_base.h
@@ -0,0 +1,60 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2013 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_STREAM_PDU_BASE_H
+#define INCLUDED_STREAM_PDU_BASE_H
+
+#include <gruel/thread.h>
+#include <gruel/pmt.h>
+
+class gr_basic_block;
+
+namespace gr {
+  namespace blocks {
+
+    class stream_pdu_base
+    {
+    public:
+      stream_pdu_base(int MTU=10000);
+      ~stream_pdu_base();
+
+    protected:
+      int d_fd;
+      bool d_started;
+      bool d_finished;
+      std::vector<uint8_t> d_rxbuf;
+      gruel::thread d_thread;
+
+      pmt::pmt_t d_port;
+      gr_basic_block *d_blk;
+
+      void run();
+      void send(pmt::pmt_t msg);
+      bool wait_ready();
+      void start_rxthread(gr_basic_block *blk, pmt::pmt_t rxport);
+      void stop_rxthread();
+    };
+ 
+  } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_STREAM_PDU_BASE_H */
diff --git a/gr-blocks/lib/tuntap_pdu_impl.cc b/gr-blocks/lib/tuntap_pdu_impl.cc
new file mode 100644
index 0000000000..1970a92b69
--- /dev/null
+++ b/gr-blocks/lib/tuntap_pdu_impl.cc
@@ -0,0 +1,139 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2013 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 "tuntap_pdu_impl.h"
+#include <gr_io_signature.h>
+#include <gr_pdu.h>
+#include <boost/format.hpp>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+#if (defined(linux) || defined(__linux) || defined(__linux__))
+#include <sys/ioctl.h>
+#include <arpa/inet.h>
+#include <linux/if.h>
+#endif
+
+namespace gr {
+  namespace blocks {
+
+    tuntap_pdu::sptr
+    tuntap_pdu::make(std::string dev, int MTU)
+    {
+#if (defined(linux) || defined(__linux) || defined(__linux__))
+      return gnuradio::get_initial_sptr(new tuntap_pdu_impl(dev, MTU));
+#else
+      throw std::runtime_error("tuntap_pdu not implemented on this platform");
+#endif
+    }
+
+#if (defined(linux) || defined(__linux) || defined(__linux__))
+    tuntap_pdu_impl::tuntap_pdu_impl(std::string dev, int MTU)
+      :	gr_block("tuntap_pdu",
+		 gr_make_io_signature (0, 0, 0),
+		 gr_make_io_signature (0, 0, 0)),
+	stream_pdu_base(MTU),
+	d_dev(dev)
+    {
+      // make the tuntap
+      char dev_cstr[1024];
+      memset(dev_cstr, 0x00, 1024);
+      strncpy(dev_cstr, dev.c_str(), std::min(sizeof(dev_cstr), dev.size()));
+
+      d_fd = tun_alloc(dev_cstr);
+      if (d_fd <= 0)
+        throw std::runtime_error("gr::tuntap_pdu::make: tun_alloc failed (are you running as root?)");
+
+      std::cout << boost::format(
+	"Allocated virtual ethernet interface: %s\n"
+        "You must now use ifconfig to set its IP address. E.g.,\n"
+        "  $ sudo ifconfig %s 192.168.200.1\n"
+        "Be sure to use a different address in the same subnet for each machine.\n"
+        ) % dev % dev << std::endl;
+
+      // set up output message port
+      message_port_register_out(PDU_PORT_ID);
+      start_rxthread(this, PDU_PORT_ID);
+    
+      // set up input message port
+      message_port_register_in(PDU_PORT_ID);
+      set_msg_handler(PDU_PORT_ID, boost::bind(&tuntap_pdu_impl::send, this, _1));
+    }
+
+    int
+    tuntap_pdu_impl::tun_alloc(char *dev, int flags)
+    {
+      struct ifreq ifr;
+      int fd, err;
+      const char *clonedev = "/dev/net/tun";
+
+      /* Arguments taken by the function:
+       *
+       * char *dev: the name of an interface (or '\0'). MUST have enough
+       *   space to hold the interface name if '\0' is passed
+       * int flags: interface flags (eg, IFF_TUN etc.)
+       */
+
+      /* open the clone device */
+      if ((fd = open(clonedev, O_RDWR)) < 0)
+        return fd;
+
+      /* preparation of the struct ifr, of type "struct ifreq" */
+      memset(&ifr, 0, sizeof(ifr));
+
+      ifr.ifr_flags = flags;   /* IFF_TUN or IFF_TAP, plus maybe IFF_NO_PI */
+
+      /* if a device name was specified, put it in the structure; otherwise,
+       * the kernel will try to allocate the "next" device of the
+       * specified type
+       */
+      if (*dev)
+        strncpy(ifr.ifr_name, dev, IFNAMSIZ);
+
+      /* try to create the device */
+      if ((err = ioctl(fd, TUNSETIFF, (void *) &ifr)) < 0) {
+        close(fd);
+        return err;
+      }
+
+      /* if the operation was successful, write back the name of the
+       * interface to the variable "dev", so the caller can know
+       * it. Note that the caller MUST reserve space in *dev (see calling
+       * code below)
+       */
+      strcpy(dev, ifr.ifr_name);
+
+      /* this is the special file descriptor that the caller will use to talk
+       * with the virtual interface
+       */
+      return fd;
+    }
+#endif
+	
+  } /* namespace blocks */
+}/* namespace gr */
diff --git a/gr-blocks/lib/tuntap_pdu_impl.h b/gr-blocks/lib/tuntap_pdu_impl.h
new file mode 100644
index 0000000000..396d9d51c8
--- /dev/null
+++ b/gr-blocks/lib/tuntap_pdu_impl.h
@@ -0,0 +1,51 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2013 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_BLOCKS_TUNTAP_PDU_IMPL_H
+#define INCLUDED_BLOCKS_TUNTAP_PDU_IMPL_H
+
+#include <blocks/tuntap_pdu.h>
+#include "stream_pdu_base.h"
+
+#if (defined(linux) || defined(__linux) || defined(__linux__))
+#include <linux/if_tun.h>
+#endif
+
+namespace gr {
+  namespace blocks {
+
+    class tuntap_pdu_impl : public tuntap_pdu, public stream_pdu_base
+    {
+#if (defined(linux) || defined(__linux) || defined(__linux__))
+    private:
+      std::string d_dev;
+      int tun_alloc(char *dev, int flags = IFF_TAP | IFF_NO_PI);
+
+    public:
+      tuntap_pdu_impl(std::string dev, int MTU);
+#endif
+    };
+
+  } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_TUNTAP_PDU_IMPL_H */
diff --git a/gr-blocks/lib/unpack_k_bits_bb_impl.cc b/gr-blocks/lib/unpack_k_bits_bb_impl.cc
new file mode 100644
index 0000000000..367100be84
--- /dev/null
+++ b/gr-blocks/lib/unpack_k_bits_bb_impl.cc
@@ -0,0 +1,77 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,2010,2013 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.
+ */
+
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "unpack_k_bits_bb_impl.h"
+#include <gr_io_signature.h>
+#include <stdexcept>
+#include <iostream>
+
+namespace gr {
+  namespace blocks {
+
+    unpack_k_bits_bb::sptr
+    unpack_k_bits_bb::make(unsigned k)
+    {
+      return gnuradio::get_initial_sptr
+        (new unpack_k_bits_bb_impl(k));
+    }
+
+    unpack_k_bits_bb_impl::unpack_k_bits_bb_impl(unsigned k)
+      : gr_sync_interpolator("unpack_k_bits_bb",
+                             gr_make_io_signature(1, 1, sizeof(unsigned char)),
+                             gr_make_io_signature(1, 1, sizeof(unsigned char)),
+                             k),
+        d_k(k)
+    {
+      if(d_k == 0)
+        throw std::out_of_range("interpolation must be > 0");
+    }
+
+    unpack_k_bits_bb_impl::~unpack_k_bits_bb_impl()
+    {
+    }
+
+    int
+    unpack_k_bits_bb_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];
+      unsigned char *out = (unsigned char *)output_items[0];
+  
+      int n = 0;
+      for(unsigned int i = 0; i < noutput_items/d_k; i++) {
+        unsigned int t = in[i];
+        for(int j = d_k - 1; j >= 0; j--)
+          out[n++] = (t >> j) & 0x01;
+      }
+
+      assert(n == noutput_items);
+      return noutput_items;
+    }
+
+  } /* namespace blocks */
+} /* namespace gr */
diff --git a/gr-blocks/lib/unpack_k_bits_bb_impl.h b/gr-blocks/lib/unpack_k_bits_bb_impl.h
new file mode 100644
index 0000000000..c72d16ebf8
--- /dev/null
+++ b/gr-blocks/lib/unpack_k_bits_bb_impl.h
@@ -0,0 +1,48 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006,2013 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_UNPACK_K_BITS_BB_IMPL_H
+#define	INCLUDED_GR_UNPACK_K_BITS_BB_IMPL_H
+
+#include <blocks/unpack_k_bits_bb.h>
+
+namespace gr {
+  namespace blocks {
+
+    class unpack_k_bits_bb_impl : public unpack_k_bits_bb
+    {
+    private:
+      unsigned d_k;    // number of relevent bits to unpack into k output bytes
+
+    public:
+      unpack_k_bits_bb_impl(unsigned k);
+      ~unpack_k_bits_bb_impl();
+
+      int work(int noutput_items,
+               gr_vector_const_void_star &input_items,
+               gr_vector_void_star &output_items);
+    };
+
+  } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_UNPACK_K_BITS_BB_IMPL_H */
author	Tom Rondeau <trondeau@vt.edu>	2013-02-27 18:35:38 -0500
committer	Tom Rondeau <trondeau@vt.edu>	2013-02-27 18:35:38 -0500
commit	2f55d7dfc33e8d990e44c5bbb7c6d2fbdaddd563 (patch)
tree	87cc11b4b13a0f4960ac9106ecb487aa0e82fd4d /gr-blocks/lib
parent	5a5338f584297f30e451e43dcb05f331cad51cd4 (diff)
parent	6e988b777c6788cc7d434b869173ebcdcc2ce5e3 (diff)