5 files changed, 46 insertions, 43 deletions

diff --git a/gnuradio-core/src/lib/general/gr_keep_m_in_n.cc b/gnuradio-core/src/lib/general/gr_keep_m_in_n.cc
index a9f4c12ba..0da69a126 100644
--- a/gnuradio-core/src/lib/general/gr_keep_m_in_n.cc
+++ b/gnuradio-core/src/lib/general/gr_keep_m_in_n.cc
@@ -30,9 +30,9 @@
 #include <stdio.h>
 
 gr_keep_m_in_n_sptr
-gr_make_keep_m_in_n (size_t item_size, int m, int n, int offset)
+gr_make_keep_m_in_n(size_t item_size, int m, int n, int offset)
 {
-  return gnuradio::get_initial_sptr(new gr_keep_m_in_n (item_size, m, n, offset));
+  return gnuradio::get_initial_sptr(new gr_keep_m_in_n(item_size, m, n, offset));
 }
 
 
@@ -40,17 +40,17 @@ gr_make_keep_m_in_n (size_t item_size, int m, int n, int offset)
 *
 * offset = 0, starts with 0th item
 * offset = 1, starts with 1st item, etc...
-* 
+*
 * we take m items out of each n
 */
-gr_keep_m_in_n::gr_keep_m_in_n (size_t item_size, int m, int n, int offset)
-  : gr_block ("keep_m_in_n",
-	      gr_make_io_signature (1, 1, item_size),
-	      gr_make_io_signature (1, 1, item_size)),
+gr_keep_m_in_n::gr_keep_m_in_n(size_t item_size, int m, int n, int offset)
+  : gr_block("keep_m_in_n",
+	     gr_make_io_signature(1, 1, item_size),
+	     gr_make_io_signature(1, 1, item_size)),
     d_n(n),
     d_m(m),
-    d_offset( offset ),
-    d_itemsize( item_size )
+    d_offset(offset),
+    d_itemsize(item_size)
 {
     // sanity checking
     assert(d_m > 0);
@@ -62,33 +62,36 @@ gr_keep_m_in_n::gr_keep_m_in_n (size_t item_size, int m, int n, int offset)
 }
 
 
-void gr_keep_m_in_n::forecast (int noutput_items, gr_vector_int &ninput_items_required){
-    ninput_items_required[0] = d_n*(noutput_items/d_m);
+void
+gr_keep_m_in_n::forecast(int noutput_items, gr_vector_int &ninput_items_required)
+{
+  ninput_items_required[0] = d_n*(noutput_items/d_m);
 }
 
-void gr_keep_m_in_n::set_offset(int offset){
-    d_offset = offset;
+void
+gr_keep_m_in_n::set_offset(int offset)
+{
+  d_offset = offset;
 }
 
-
 int
-gr_keep_m_in_n::general_work (int noutput_items,
-                gr_vector_int &ninput_items,
-				gr_vector_const_void_star &input_items,
-				gr_vector_void_star &output_items)
+gr_keep_m_in_n::general_work(int noutput_items,
+			     gr_vector_int &ninput_items,
+			     gr_vector_const_void_star &input_items,
+			     gr_vector_void_star &output_items)
 {
-  uint8_t* out = (uint8_t*) output_items[0];
-  const uint8_t* in = (const uint8_t*) input_items[0];
+  uint8_t* out = (uint8_t*)output_items[0];
+  const uint8_t* in = (const uint8_t*)input_items[0];
   
   // iterate over data blocks of size {n, input : m, output}
-  int blks = std::min( noutput_items/d_m, ninput_items[0]/d_n );
-  for(int i=0; i<blks; i++){
+  int blks = std::min(noutput_items/d_m, ninput_items[0]/d_n);
+  for(int i=0; i<blks; i++) {
     // set up copy pointers
     const uint8_t* iptr = &in[(i*d_n + d_offset)*d_itemsize];
     uint8_t* optr = &out[i*d_m*d_itemsize];
     // perform copy
     memcpy( optr, iptr, d_m*d_itemsize );
-    } 
+  }
 
   consume_each(d_n);
   return d_m;
diff --git a/gnuradio-core/src/lib/general/gr_keep_m_in_n.h b/gnuradio-core/src/lib/general/gr_keep_m_in_n.h
index 22fbd2f4c..711c704f5 100644
--- a/gnuradio-core/src/lib/general/gr_keep_m_in_n.h
+++ b/gnuradio-core/src/lib/general/gr_keep_m_in_n.h
@@ -29,7 +29,7 @@
 class gr_keep_m_in_n;
 typedef boost::shared_ptr<gr_keep_m_in_n> gr_keep_m_in_n_sptr;
 
-GR_CORE_API gr_keep_m_in_n_sptr 
+GR_CORE_API gr_keep_m_in_n_sptr
 gr_make_keep_m_in_n (size_t item_size, int m, int n, int offset);
 
 
diff --git a/gnuradio-core/src/lib/general/gr_keep_m_in_n.i b/gnuradio-core/src/lib/general/gr_keep_m_in_n.i
index cb5c63683..de89cec2c 100644
--- a/gnuradio-core/src/lib/general/gr_keep_m_in_n.i
+++ b/gnuradio-core/src/lib/general/gr_keep_m_in_n.i
@@ -22,7 +22,7 @@
 
 GR_SWIG_BLOCK_MAGIC(gr,keep_m_in_n)
 
-gr_keep_m_in_n_sptr 
+gr_keep_m_in_n_sptr
 gr_make_keep_m_in_n (size_t itemsize, int m, int n, int offset);
 
 class gr_keep_m_in_n : public gr_sync_block
diff --git a/gnuradio-core/src/lib/general/gr_pack_k_bits_bb.cc b/gnuradio-core/src/lib/general/gr_pack_k_bits_bb.cc
index fc7e689fe..0a366a4cc 100644
--- a/gnuradio-core/src/lib/general/gr_pack_k_bits_bb.cc
+++ b/gnuradio-core/src/lib/general/gr_pack_k_bits_bb.cc
@@ -29,41 +29,41 @@
 #include <stdexcept>
 #include <iostream>
 
-gr_pack_k_bits_bb_sptr gr_make_pack_k_bits_bb (unsigned k)
+gr_pack_k_bits_bb_sptr gr_make_pack_k_bits_bb(unsigned k)
 {
-  return gnuradio::get_initial_sptr(new gr_pack_k_bits_bb (k));
+  return gnuradio::get_initial_sptr(new gr_pack_k_bits_bb(k));
 }
 
 
 gr_pack_k_bits_bb::gr_pack_k_bits_bb (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),
+  : 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");
+    throw std::out_of_range("interpolation must be > 0");
 }
 
-gr_pack_k_bits_bb::~gr_pack_k_bits_bb ()
+gr_pack_k_bits_bb::~gr_pack_k_bits_bb()
 {
 }
 
 int
-gr_pack_k_bits_bb::work (int noutput_items,
-			   gr_vector_const_void_star &input_items,
-			   gr_vector_void_star &output_items)
+gr_pack_k_bits_bb::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];
+  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++){
+  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);
+    for(unsigned int j = 0; j < d_k; j++) {
+        out[i] |= (0x01 & in[i*d_k+j])<<(d_k-j-1);
     }
   }
-  
+
   return noutput_items;
 }
diff --git a/gnuradio-core/src/lib/general/gr_pack_k_bits_bb.h b/gnuradio-core/src/lib/general/gr_pack_k_bits_bb.h
index 00b8f8f13..caf6d7992 100644
--- a/gnuradio-core/src/lib/general/gr_pack_k_bits_bb.h
+++ b/gnuradio-core/src/lib/general/gr_pack_k_bits_bb.h
@@ -33,7 +33,7 @@ GR_CORE_API gr_pack_k_bits_bb_sptr gr_make_pack_k_bits_bb (unsigned k);
 class gr_pack_k_bits_bb;
 
 /*!
- * \brief Converts a byte with k relevent bits to k output bytes with 1 bit in the LSB.
+ * \brief Converts a stream of bytes with 1 bit in the LSB to a byte with  k relevent bits.
  * \ingroup converter_blk
  */
 class GR_CORE_API gr_pack_k_bits_bb : public gr_sync_decimator