[Commit-gnuradio] r3607 - gnuradio/branches/developers/jcorgan/pager/gr-pager/src

[jcorgan]

Author: jcorgan
Date: 2006-09-21 22:05:02 -0600 (Thu, 21 Sep 2006)
New Revision: 3607

Added:
   
gnuradio/branches/developers/jcorgan/pager/gr-pager/src/pager_flex_deinterleave.cc
   
gnuradio/branches/developers/jcorgan/pager/gr-pager/src/pager_flex_deinterleave.h
Removed:
   
gnuradio/branches/developers/jcorgan/pager/gr-pager/src/pager_flex_deframer.cc
   gnuradio/branches/developers/jcorgan/pager/gr-pager/src/pager_flex_deframer.h
Modified:
   gnuradio/branches/developers/jcorgan/pager/gr-pager/src/Makefile.am
   gnuradio/branches/developers/jcorgan/pager/gr-pager/src/pager.i
Log:
Work in progress. Goodbye, deframer, we hardly knew ye

Modified: gnuradio/branches/developers/jcorgan/pager/gr-pager/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/pager/gr-pager/src/Makefile.am 
2006-09-22 02:15:56 UTC (rev 3606)
+++ gnuradio/branches/developers/jcorgan/pager/gr-pager/src/Makefile.am 
2006-09-22 04:05:02 UTC (rev 3607)
@@ -76,7 +76,7 @@
     pager_swig.cc \
     pager_slicer_fb.cc \
     pager_flex_sync.cc \
-    pager_flex_deframer.cc \
+    pager_flex_deinterleave.cc \
     pageri_flex_modes.cc \
     pageri_bch3221.cc
     # Additional source modules here
@@ -97,7 +97,7 @@
 grinclude_HEADERS = \
     pager_slicer_fb.h \
     pager_flex_sync.h \
-    pager_flex_deframer.h \
+    pager_flex_deinterleave.h \
     pageri_flex_modes.h \
     pageri_bch3221.h
     # Additional header files here

Modified: gnuradio/branches/developers/jcorgan/pager/gr-pager/src/pager.i
===================================================================
--- gnuradio/branches/developers/jcorgan/pager/gr-pager/src/pager.i     
2006-09-22 02:15:56 UTC (rev 3606)
+++ gnuradio/branches/developers/jcorgan/pager/gr-pager/src/pager.i     
2006-09-22 04:05:02 UTC (rev 3607)
@@ -27,7 +27,7 @@
 #include "gnuradio_swig_bug_workaround.h"      // mandatory bug fix
 #include "pager_slicer_fb.h"
 #include "pager_flex_sync.h"
-#include "pager_flex_deframer.h"
+#include "pager_flex_deinterleave.h"
 #include <stdexcept>
 %}
 
@@ -61,14 +61,14 @@
 
 // ----------------------------------------------------------------
 
-GR_SWIG_BLOCK_MAGIC(pager,flex_deframer);
+GR_SWIG_BLOCK_MAGIC(pager,flex_deinterleave);
 
-pager_flex_deframer_sptr pager_make_flex_deframer(int rate);
+pager_flex_deinterleave_sptr pager_make_flex_deinterleave();
 
-class pager_flex_deframer : public gr_block
+class pager_flex_deinterleave : public gr_sync_block
 {
 private:
-    pager_flex_deframer(int rate);
+    pager_flex_deinterleave();
 
 public:
 };

Deleted: 
gnuradio/branches/developers/jcorgan/pager/gr-pager/src/pager_flex_deframer.cc

Deleted: 
gnuradio/branches/developers/jcorgan/pager/gr-pager/src/pager_flex_deframer.h

Added: 
gnuradio/branches/developers/jcorgan/pager/gr-pager/src/pager_flex_deinterleave.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/pager/gr-pager/src/pager_flex_deinterleave.cc
                          (rev 0)
+++ 
gnuradio/branches/developers/jcorgan/pager/gr-pager/src/pager_flex_deinterleave.cc
  2006-09-22 04:05:02 UTC (rev 3607)
@@ -0,0 +1,58 @@
+/*
+ * 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 2, 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 "pager_flex_deinterleave.h"
+#include <gr_io_signature.h>
+
+pager_flex_deinterleave_sptr pager_make_flex_deinterleave()
+{
+    return pager_flex_deinterleave_sptr(new pager_flex_deinterleave());
+}
+
+pager_flex_deinterleave::pager_flex_deinterleave() :
+    gr_sync_block("flex_deinterleave",
+    gr_make_io_signature(1, 1, sizeof(unsigned char)),
+    gr_make_io_signature(1, 1, sizeof(unsigned char)))
+{
+    set_output_multiple(256); // One FLEX block at a time
+}
+
+int pager_flex_deinterleave::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 i = 0;
+
+    while (i < noutput_items) {
+        unsigned char bit = *in++; i++;
+       *out++ = bit;
+    }
+
+    consume_each(i);
+    return noutput_items;
+}


Property changes on: 
gnuradio/branches/developers/jcorgan/pager/gr-pager/src/pager_flex_deinterleave.cc
___________________________________________________________________
Name: svn:eol-style
   + native

Added: 
gnuradio/branches/developers/jcorgan/pager/gr-pager/src/pager_flex_deinterleave.h
===================================================================
--- 
gnuradio/branches/developers/jcorgan/pager/gr-pager/src/pager_flex_deinterleave.h
                           (rev 0)
+++ 
gnuradio/branches/developers/jcorgan/pager/gr-pager/src/pager_flex_deinterleave.h
   2006-09-22 04:05:02 UTC (rev 3607)
@@ -0,0 +1,51 @@
+/*
+ * Copyright 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 2, 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_PAGER_FLEX_DEINTERLEAVE_H
+#define INCLUDED_PAGER_FLEX_DEINTERLEAVE_H
+
+#include <gr_sync_block.h>
+
+class pager_flex_deinterleave;
+typedef boost::shared_ptr<pager_flex_deinterleave> 
pager_flex_deinterleave_sptr;
+
+pager_flex_deinterleave_sptr pager_make_flex_deinterleave();
+
+/*!
+ * \brief flex deinterleave description
+ * \ingroup block
+ */
+
+class pager_flex_deinterleave : public gr_sync_block
+{
+private:
+    // Constructors
+    friend pager_flex_deinterleave_sptr pager_make_flex_deinterleave();
+    pager_flex_deinterleave();
+   
+public:
+
+    int work(int noutput_items,
+             gr_vector_const_void_star &input_items, 
+             gr_vector_void_star &output_items);
+};
+
+#endif /* INCLUDED_PAGER_FLEX_DEINTERLEAVE_H */


Property changes on: 
gnuradio/branches/developers/jcorgan/pager/gr-pager/src/pager_flex_deinterleave.h
___________________________________________________________________
Name: svn:eol-style
   + native