commit-gnuradio
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commit-gnuradio] r9817 - in gnuradio/branches/features/coded-ofdm: gnur


From: jamieson
Subject: [Commit-gnuradio] r9817 - in gnuradio/branches/features/coded-ofdm: gnuradio-core/src/lib/general gnuradio-core/src/lib/gengen gnuradio-core/src/lib/io gr-trellis/src/lib
Date: Wed, 22 Oct 2008 02:55:52 -0600 (MDT)

Author: jamieson
Date: 2008-10-22 02:55:52 -0600 (Wed, 22 Oct 2008)
New Revision: 9817

Added:
   
gnuradio/branches/features/coded-ofdm/gnuradio-core/src/lib/general/gr_complex_to_interleaved_float.cc
   
gnuradio/branches/features/coded-ofdm/gnuradio-core/src/lib/general/gr_complex_to_interleaved_float.h
   
gnuradio/branches/features/coded-ofdm/gnuradio-core/src/lib/general/gr_complex_to_interleaved_float.i
   
gnuradio/branches/features/coded-ofdm/gnuradio-core/src/lib/general/gr_short_to_char.cc
   
gnuradio/branches/features/coded-ofdm/gnuradio-core/src/lib/general/gr_short_to_char.h
   
gnuradio/branches/features/coded-ofdm/gnuradio-core/src/lib/general/gr_short_to_char.i
Modified:
   
gnuradio/branches/features/coded-ofdm/gnuradio-core/src/lib/general/Makefile.am
   gnuradio/branches/features/coded-ofdm/gnuradio-core/src/lib/general/general.i
   gnuradio/branches/features/coded-ofdm/gnuradio-core/src/lib/gengen/
   
gnuradio/branches/features/coded-ofdm/gnuradio-core/src/lib/gengen/Makefile.am
   
gnuradio/branches/features/coded-ofdm/gnuradio-core/src/lib/gengen/Makefile.gen
   
gnuradio/branches/features/coded-ofdm/gnuradio-core/src/lib/gengen/gengen_generated.i
   gnuradio/branches/features/coded-ofdm/gnuradio-core/src/lib/io/Makefile.am
   gnuradio/branches/features/coded-ofdm/gr-trellis/src/lib/
Log:
Housekeeping to further reconcile with trunk r7324; code now compiles without 
error.  Modified svn:ignore props for newly-added generated files.

Modified: 
gnuradio/branches/features/coded-ofdm/gnuradio-core/src/lib/general/Makefile.am
===================================================================
--- 
gnuradio/branches/features/coded-ofdm/gnuradio-core/src/lib/general/Makefile.am 
    2008-10-22 00:56:40 UTC (rev 9816)
+++ 
gnuradio/branches/features/coded-ofdm/gnuradio-core/src/lib/general/Makefile.am 
    2008-10-22 08:55:52 UTC (rev 9817)
@@ -98,7 +98,6 @@
        gr_null_sink.cc                 \
        gr_null_source.cc               \
        gr_ofdm_frame_acquisition.cc            \
-       gr_ofdm_detector.cc \
        gr_coded_ofdm_demod.cc \
        gr_coded_ofdm_demod2softin.cc \
        gr_ofdm_interleaver.cc \
@@ -178,8 +177,7 @@
        qa_gr_firdes.cc                 \
        qa_gr_fxpt.cc                   \
        qa_gr_fxpt_nco.cc               \
-       qa_gr_fxpt_vco.cc               \
-       qa_gr_math.cc
+       qa_gr_fxpt_vco.cc
 
 
 
@@ -255,7 +253,6 @@
        gr_ofdm_frame_acquisition.h             \
        gr_ofdm_constants.h \
        gr_ofdm_struct_dot11a.h \
-       gr_ofdm_detector.h              \
        gr_coded_ofdm_demod.h           \
        gr_coded_ofdm_demod2softin.h           \
        gr_ofdm_interleaver.h \
@@ -347,8 +344,7 @@
        qa_gr_fxpt.h                    \
        qa_gr_fxpt_nco.h                \
        qa_gr_fxpt_vco.h                \
-       sine_table.h                      \
-       qa_gr_math.h
+       sine_table.h
 
 swiginclude_HEADERS =                  \
        general.i                       \
@@ -411,7 +407,6 @@
        gr_null_source.i                \
        gr_ofdm_frame_acquisition.i             \
        gr_ofdm_constants.i \
-       gr_ofdm_detector.i              \
        gr_coded_ofdm_demod.i           \
        gr_coded_ofdm_demod2softin.i \
        gr_ofdm_interleaver.i \

Modified: 
gnuradio/branches/features/coded-ofdm/gnuradio-core/src/lib/general/general.i
===================================================================
--- 
gnuradio/branches/features/coded-ofdm/gnuradio-core/src/lib/general/general.i   
    2008-10-22 00:56:40 UTC (rev 9816)
+++ 
gnuradio/branches/features/coded-ofdm/gnuradio-core/src/lib/general/general.i   
    2008-10-22 08:55:52 UTC (rev 9817)
@@ -106,7 +106,6 @@
 #include <gr_coded_ofdm_frame_sink.h>
 #include <gr_ofdm_insert_preamble.h>
 #include <gr_ofdm_sampler.h>
-#include <gr_ofdm_detector.h>
 #include <gr_coded_ofdm_demod.h>
 #include <gr_coded_ofdm_demod2softin.h>
 #include <gr_ofdm_interleaver.h>
@@ -226,7 +225,6 @@
 %include "gr_coded_ofdm_frame_sink.i"
 %include "gr_ofdm_insert_preamble.i"
 %include "gr_ofdm_sampler.i"
-%include "gr_ofdm_detector.i"
 %include "gr_coded_ofdm_demod.i"
 %include "gr_coded_ofdm_demod2softin.i"
 %include "gr_ofdm_interleaver.i"

Added: 
gnuradio/branches/features/coded-ofdm/gnuradio-core/src/lib/general/gr_complex_to_interleaved_float.cc
===================================================================
--- 
gnuradio/branches/features/coded-ofdm/gnuradio-core/src/lib/general/gr_complex_to_interleaved_float.cc
                              (rev 0)
+++ 
gnuradio/branches/features/coded-ofdm/gnuradio-core/src/lib/general/gr_complex_to_interleaved_float.cc
      2008-10-22 08:55:52 UTC (rev 9817)
@@ -0,0 +1,67 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004 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_complex_to_interleaved_float.h>
+#include <gr_io_signature.h>
+
+#define VERBOSE 0 
+
+gr_complex_to_interleaved_float_sptr
+gr_make_complex_to_interleaved_float (unsigned char tag)
+{
+  return gr_complex_to_interleaved_float_sptr (new 
gr_complex_to_interleaved_float (tag));
+}
+
+gr_complex_to_interleaved_float::gr_complex_to_interleaved_float (unsigned 
char tag)
+  : gr_sync_interpolator ("gr_complex_to_interleaved_float",
+                  gr_make_io_signature (1, 1, sizeof (gr_complex)),
+                  gr_make_io_signature (1, 1, sizeof (float)), 2),
+    d_tag(tag)
+{
+}
+
+int
+gr_complex_to_interleaved_float::work (int noutput_items,
+                          gr_vector_const_void_star &input_items,
+                          gr_vector_void_star &output_items) {
+  gr_complex *in = (gr_complex *) input_items[0];
+  float *out = (float *) output_items[0];
+#if VERBOSE
+  printf("gr_complex_to_interleaved_float(0x%02x): noutput_items: %d\n", 
+         d_tag, noutput_items);
+#endif
+  for (int oi = 0; oi < noutput_items - 1; oi += 2) {
+    out[oi] = in[oi/2].real();
+    out[oi + 1] = in[oi/2].imag();
+
+#if VERBOSE > 1
+    printf("gr_complex_to_interleaved_float(0x%02x): in[%03d] = %+.3f%+.3fj -> 
out[%03d] = %+.3f out[%03d] = %+.3f\n",
+           d_tag, oi/2, in[oi/2].real(), in[oi/2].imag(), oi, in[oi/2].real(),
+           oi+1, in[oi/2].imag());
+#endif
+  }
+  return noutput_items;
+}

Added: 
gnuradio/branches/features/coded-ofdm/gnuradio-core/src/lib/general/gr_complex_to_interleaved_float.h
===================================================================
--- 
gnuradio/branches/features/coded-ofdm/gnuradio-core/src/lib/general/gr_complex_to_interleaved_float.h
                               (rev 0)
+++ 
gnuradio/branches/features/coded-ofdm/gnuradio-core/src/lib/general/gr_complex_to_interleaved_float.h
       2008-10-22 08:55:52 UTC (rev 9817)
@@ -0,0 +1,55 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004 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_complex_to_interleaved_float_H
+#define INCLUDED_GR_complex_to_interleaved_float_H
+
+#include <gr_sync_interpolator.h>
+#include <gr_complex.h>
+
+class gr_complex_to_interleaved_float;
+typedef boost::shared_ptr<gr_complex_to_interleaved_float> 
gr_complex_to_interleaved_float_sptr;
+
+gr_complex_to_interleaved_float_sptr
+gr_make_complex_to_interleaved_float (unsigned char tag);
+
+/*!
+ * \brief Convert 1 stream of complex to a stream of interleaved floats.
+ * \ingroup converter
+ */
+
+class gr_complex_to_interleaved_float : public gr_sync_interpolator
+{
+  friend gr_complex_to_interleaved_float_sptr 
gr_make_complex_to_interleaved_float (unsigned char tag);
+  gr_complex_to_interleaved_float (unsigned char tag);
+
+ protected:
+  unsigned char d_tag;
+
+ public:
+  virtual int work (int noutput_items,
+                   gr_vector_const_void_star &input_items,
+                   gr_vector_void_star &output_items);
+};
+
+
+#endif /* INCLUDED_GR_complex_to_interleaved_float_H */

Added: 
gnuradio/branches/features/coded-ofdm/gnuradio-core/src/lib/general/gr_complex_to_interleaved_float.i
===================================================================
--- 
gnuradio/branches/features/coded-ofdm/gnuradio-core/src/lib/general/gr_complex_to_interleaved_float.i
                               (rev 0)
+++ 
gnuradio/branches/features/coded-ofdm/gnuradio-core/src/lib/general/gr_complex_to_interleaved_float.i
       2008-10-22 08:55:52 UTC (rev 9817)
@@ -0,0 +1,30 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004 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,complex_to_interleaved_float)
+
+gr_complex_to_interleaved_float_sptr gr_make_complex_to_interleaved_float 
(unsigned char tag);
+
+class gr_complex_to_interleaved_float : public gr_sync_interpolator
+{
+  gr_complex_to_interleaved_float (unsigned char tag);
+};

Added: 
gnuradio/branches/features/coded-ofdm/gnuradio-core/src/lib/general/gr_short_to_char.cc
===================================================================
--- 
gnuradio/branches/features/coded-ofdm/gnuradio-core/src/lib/general/gr_short_to_char.cc
                             (rev 0)
+++ 
gnuradio/branches/features/coded-ofdm/gnuradio-core/src/lib/general/gr_short_to_char.cc
     2008-10-22 08:55:52 UTC (rev 9817)
@@ -0,0 +1,61 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004 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_short_to_char.h>
+#include <gr_io_signature.h>
+
+gr_short_to_char_sptr
+gr_make_short_to_char (gr_endianness_t endian)
+{
+  return gr_short_to_char_sptr (new gr_short_to_char (endian));
+}
+
+gr_short_to_char::gr_short_to_char (gr_endianness_t endian)
+  : gr_sync_interpolator ("gr_short_to_char",
+                  gr_make_io_signature (1, 1, sizeof (short)),
+                  gr_make_io_signature (1, 1, sizeof (char)),
+       2),
+    d_endian(endian)
+{ }
+
+int
+gr_short_to_char::work (int noutput_items,
+                        gr_vector_const_void_star &input_items,
+                        gr_vector_void_star &output_items)
+{
+  const short *in = (const short *) input_items[0];
+  char *out = (char *) output_items[0];
+  printf("gr_short_to_char: noutput_items=%d\n", noutput_items);
+
+  for (int oi = 0; oi < noutput_items; oi++)
+    out[oi] = (d_endian == GR_LSB_FIRST) ? 
+              ((oi & 1) ? (in[oi/2] & 0xff) : (in[oi/2] >> 8)) :
+              (!(oi & 1) ? (in[oi/2] & 0xff) : (in[oi/2] >> 8));
+  return noutput_items;
+}
+
+
+

Added: 
gnuradio/branches/features/coded-ofdm/gnuradio-core/src/lib/general/gr_short_to_char.h
===================================================================
--- 
gnuradio/branches/features/coded-ofdm/gnuradio-core/src/lib/general/gr_short_to_char.h
                              (rev 0)
+++ 
gnuradio/branches/features/coded-ofdm/gnuradio-core/src/lib/general/gr_short_to_char.h
      2008-10-22 08:55:52 UTC (rev 9817)
@@ -0,0 +1,55 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004 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_short_to_char_H
+#define INCLUDED_GR_short_to_char_H
+
+#include <gr_sync_interpolator.h>
+#include <gr_endianness.h>
+
+class gr_short_to_char;
+typedef boost::shared_ptr<gr_short_to_char> gr_short_to_char_sptr;
+
+gr_short_to_char_sptr
+gr_make_short_to_char (gr_endianness_t endian);
+
+/*!
+ * \brief Convert stream of short to a stream of float
+ * \ingroup converter
+ */
+
+class gr_short_to_char : public gr_sync_interpolator
+{
+  friend gr_short_to_char_sptr gr_make_short_to_char (gr_endianness_t endian);
+  gr_short_to_char (gr_endianness_t endian);
+
+ protected:
+  gr_endianness_t d_endian;
+
+ public:
+  virtual int work (int noutput_items,
+                   gr_vector_const_void_star &input_items,
+                   gr_vector_void_star &output_items);
+};
+
+
+#endif /* INCLUDED_GR_short_to_char_H */

Added: 
gnuradio/branches/features/coded-ofdm/gnuradio-core/src/lib/general/gr_short_to_char.i
===================================================================
--- 
gnuradio/branches/features/coded-ofdm/gnuradio-core/src/lib/general/gr_short_to_char.i
                              (rev 0)
+++ 
gnuradio/branches/features/coded-ofdm/gnuradio-core/src/lib/general/gr_short_to_char.i
      2008-10-22 08:55:52 UTC (rev 9817)
@@ -0,0 +1,31 @@
+
+/* -*- c++ -*- */
+/*
+ * Copyright 2004 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,short_to_char)
+
+gr_short_to_char_sptr gr_make_short_to_char (gr_endianness_t endian);
+
+class gr_short_to_char : public gr_sync_interpolator
+{
+  gr_short_to_char (gr_endianness_t endian);
+};


Property changes on: 
gnuradio/branches/features/coded-ofdm/gnuradio-core/src/lib/gengen
___________________________________________________________________
Name: svn:ignore
   - Makefile
Makefile.in
.la
.lo
.deps
.libs
*.la
*.lo
*.pyc
GrFIRfilterCCC.cc
GrFIRfilterCCC.h
GrFIRfilterCCF.cc
GrFIRfilterCCF.h
GrFIRfilterFCC.cc
GrFIRfilterFCC.h
GrFIRfilterFFF.cc
GrFIRfilterFFF.h
GrFIRfilterFSF.cc
GrFIRfilterFSF.h
GrFIRfilterSCC.cc
GrFIRfilterSCC.h
GrFIRfilterSIS.cc
GrFIRfilterSIS.h
GrFreqXlatingFIRfilterCCC.cc
GrFreqXlatingFIRfilterCCC.h
GrFreqXlatingFIRfilterCCF.cc
GrFreqXlatingFIRfilterCCF.h
GrFreqXlatingFIRfilterFCC.cc
GrFreqXlatingFIRfilterFCC.h
GrFreqXlatingFIRfilterFCF.cc
GrFreqXlatingFIRfilterFCF.h
GrFreqXlatingFIRfilterSCC.cc
GrFreqXlatingFIRfilterSCC.h
GrFreqXlatingFIRfilterSCF.cc
GrFreqXlatingFIRfilterSCF.h
gr_fir_CCC.cc
gr_fir_CCC.h
gr_fir_CCC_generic.cc
gr_fir_CCC_generic.h
gr_fir_CCF.cc
gr_fir_CCF.h
gr_fir_CCF_generic.cc
gr_fir_CCF_generic.h
gr_fir_FCC.cc
gr_fir_FCC.h
gr_fir_FCC_generic.cc
gr_fir_FCC_generic.h
gr_fir_FFF.cc
gr_fir_FFF.h
gr_fir_FFF_generic.cc
gr_fir_FFF_generic.h
gr_fir_FSF.cc
gr_fir_FSF.h
gr_fir_FSF_generic.cc
gr_fir_FSF_generic.h
gr_fir_SCC.cc
gr_fir_SCC.h
gr_fir_SCC_generic.cc
gr_fir_SCC_generic.h
gr_fir_SIS.cc
gr_fir_SIS.h
gr_fir_SIS_generic.cc
gr_fir_SIS_generic.h
gr_fir_sysconfig.cc
gr_fir_sysconfig.h
gr_fir_sysconfig_generic.cc
gr_fir_sysconfig_generic.h
gr_fir_util.cc
gr_fir_util.h
GrFIRfilterCCC.i
GrFIRfilterCCF.i
GrFIRfilterFCC.i
GrFIRfilterFFF.i
GrFIRfilterFSF.i
GrFIRfilterSCC.i
GrFIRfilterSIS.i
GrFreqXlatingFIRfilterCCC.i
GrFreqXlatingFIRfilterCCF.i
GrFreqXlatingFIRfilterFCC.i
GrFreqXlatingFIRfilterFCF.i
GrFreqXlatingFIRfilterSCC.i
GrFreqXlatingFIRfilterSCF.i
# --- generated files ---
gr_add_cc.cc
gr_add_cc.h
gr_add_cc.i
gr_add_const_c.cc
gr_add_const_c.h
gr_add_const_c.i
gr_add_const_cc.cc
gr_add_const_cc.h
gr_add_const_cc.i
gr_add_const_f.cc
gr_add_const_f.h
gr_add_const_f.i
gr_add_const_ff.cc
gr_add_const_ff.h
gr_add_const_ff.i
gr_add_const_i.cc
gr_add_const_i.h
gr_add_const_i.i
gr_add_const_ii.cc
gr_add_const_ii.h
gr_add_const_ii.i
gr_add_const_s.cc
gr_add_const_s.h
gr_add_const_s.i
gr_add_const_sf.cc
gr_add_const_sf.h
gr_add_const_sf.i
gr_add_const_ss.cc
gr_add_const_ss.h
gr_add_const_ss.i
gr_add_const_vcc.cc
gr_add_const_vcc.h
gr_add_const_vcc.i
gr_add_const_vff.cc
gr_add_const_vff.h
gr_add_const_vff.i
gr_add_const_vii.cc
gr_add_const_vii.h
gr_add_const_vii.i
gr_add_const_vss.cc
gr_add_const_vss.h
gr_add_const_vss.i
gr_add_ff.cc
gr_add_ff.h
gr_add_ff.i
gr_add_ii.cc
gr_add_ii.h
gr_add_ii.i
gr_add_ss.cc
gr_add_ss.h
gr_add_ss.i
gr_add_vcc.cc
gr_add_vcc.h
gr_add_vcc.i
gr_add_vff.cc
gr_add_vff.h
gr_add_vff.i
gr_add_vii.cc
gr_add_vii.h
gr_add_vii.i
gr_add_vss.cc
gr_add_vss.h
gr_add_vss.i
gr_divide_cc.cc
gr_divide_cc.h
gr_divide_cc.i
gr_divide_ff.cc
gr_divide_ff.h
gr_divide_ff.i
gr_divide_ii.cc
gr_divide_ii.h
gr_divide_ii.i
gr_divide_ss.cc
gr_divide_ss.h
gr_divide_ss.i
gr_multiply_cc.cc
gr_multiply_cc.h
gr_multiply_cc.i
gr_multiply_const_cc.cc
gr_multiply_const_cc.h
gr_multiply_const_cc.i
gr_multiply_const_ff.cc
gr_multiply_const_ff.h
gr_multiply_const_ff.i
gr_multiply_const_ii.cc
gr_multiply_const_ii.h
gr_multiply_const_ii.i
gr_multiply_const_ss.cc
gr_multiply_const_ss.h
gr_multiply_const_ss.i
gr_multiply_ff.cc
gr_multiply_ff.h
gr_multiply_ff.i
gr_multiply_ii.cc
gr_multiply_ii.h
gr_multiply_ii.i
gr_multiply_ss.cc
gr_multiply_ss.h
gr_multiply_ss.i
gr_multiply_vcc.cc
gr_multiply_vcc.h
gr_multiply_vcc.i
gr_multiply_vff.cc
gr_multiply_vff.h
gr_multiply_vff.i
gr_multiply_vii.cc
gr_multiply_vii.h
gr_multiply_vii.i
gr_multiply_vss.cc
gr_multiply_vss.h
gr_multiply_vss.i
gr_multiply_const_vcc.cc
gr_multiply_const_vcc.h
gr_multiply_const_vcc.i
gr_multiply_const_vff.cc
gr_multiply_const_vff.h
gr_multiply_const_vff.i
gr_multiply_const_vii.cc
gr_multiply_const_vii.h
gr_multiply_const_vii.i
gr_multiply_const_vss.cc
gr_multiply_const_vss.h
gr_multiply_const_vss.i
gr_noise_source_c.cc
gr_noise_source_c.h
gr_noise_source_c.i
gr_noise_source_f.cc
gr_noise_source_f.h
gr_noise_source_f.i
gr_noise_source_i.cc
gr_noise_source_i.h
gr_noise_source_i.i
gr_noise_source_s.cc
gr_noise_source_s.h
gr_noise_source_s.i
gr_peak_detector_fb.cc
gr_peak_detector_fb.h
gr_peak_detector_fb.i
gr_peak_detector_ib.cc
gr_peak_detector_ib.h
gr_peak_detector_ib.i
gr_peak_detector_sb.cc
gr_peak_detector_sb.h
gr_peak_detector_sb.i
gr_peak_detector_ii.cc
gr_peak_detector_ss.cc
gr_peak_detector_ii.h
gr_peak_detector_ii.i
gr_peak_detector_ff.h
gr_peak_detector_ff.i
gr_peak_detector_ff.cc
gr_peak_detector_ss.h
gr_peak_detector_ss.i
gr_sample_and_hold_bb.cc
gr_sample_and_hold_bb.h
gr_sample_and_hold_bb.i
gr_sample_and_hold_ff.cc
gr_sample_and_hold_ff.h
gr_sample_and_hold_ff.i
gr_sample_and_hold_ss.cc
gr_sample_and_hold_ss.h
gr_sample_and_hold_ss.i
gr_sample_and_hold_ii.cc
gr_sample_and_hold_ii.h
gr_sample_and_hold_ii.i
gr_sig_source_c.cc
gr_sig_source_c.h
gr_sig_source_c.i
gr_sig_source_f.cc
gr_sig_source_f.h
gr_sig_source_f.i
gr_sig_source_i.cc
gr_sig_source_i.h
gr_sig_source_i.i
gr_sig_source_s.cc
gr_sig_source_s.h
gr_sig_source_s.i
gr_sub_cc.cc
gr_sub_cc.h
gr_sub_cc.i
gr_sub_ff.cc
gr_sub_ff.h
gr_sub_ff.i
gr_sub_ii.cc
gr_sub_ii.h
gr_sub_ii.i
gr_sub_ss.cc
gr_sub_ss.h
gr_sub_ss.i
gr_vector_sink_b.cc
gr_vector_sink_b.h
gr_vector_sink_b.i
gr_vector_sink_c.cc
gr_vector_sink_c.h
gr_vector_sink_c.i
gr_vector_sink_f.cc
gr_vector_sink_f.h
gr_vector_sink_f.i
gr_vector_sink_i.cc
gr_vector_sink_i.h
gr_vector_sink_i.i
gr_vector_sink_s.cc
gr_vector_sink_s.h
gr_vector_sink_s.i
gr_vector_source_b.cc
gr_vector_source_b.h
gr_vector_source_b.i
gr_vector_source_c.cc
gr_vector_source_c.h
gr_vector_source_c.i
gr_vector_source_f.cc
gr_vector_source_f.h
gr_vector_source_f.i
gr_vector_source_i.cc
gr_vector_source_i.h
gr_vector_source_i.i
gr_vector_source_s.cc
gr_vector_source_s.h
gr_vector_source_s.i
gr_mute_cc.cc
gr_mute_cc.h
gr_mute_cc.i
gr_mute_ff.cc
gr_mute_ff.h
gr_mute_ff.i
gr_mute_ii.cc
gr_mute_ii.h
gr_mute_ii.i
gr_mute_ss.cc
gr_mute_ss.h
gr_mute_ss.i
gr_prefix.cc
gr_chunks_to_symbols_bc.cc
gr_chunks_to_symbols_bc.h
gr_chunks_to_symbols_bc.i
gr_chunks_to_symbols_bf.cc
gr_chunks_to_symbols_bf.h
gr_chunks_to_symbols_bf.i
gr_chunks_to_symbols_ic.cc
gr_chunks_to_symbols_ic.h
gr_chunks_to_symbols_ic.i
gr_chunks_to_symbols_if.cc
gr_chunks_to_symbols_if.h
gr_chunks_to_symbols_if.i
gr_chunks_to_symbols_sc.cc
gr_chunks_to_symbols_sc.h
gr_chunks_to_symbols_sc.i
gr_chunks_to_symbols_sf.cc
gr_chunks_to_symbols_sf.h
gr_chunks_to_symbols_sf.i
gr_packed_to_unpacked_bb.cc
gr_packed_to_unpacked_bb.h
gr_packed_to_unpacked_bb.i
gr_packed_to_unpacked_ii.cc
gr_packed_to_unpacked_ii.h
gr_packed_to_unpacked_ii.i
gr_packed_to_unpacked_ss.cc
gr_packed_to_unpacked_ss.h
gr_packed_to_unpacked_ss.i
gr_unpacked_to_packed_bb.cc
gr_unpacked_to_packed_bb.h
gr_unpacked_to_packed_bb.i
gr_unpacked_to_packed_ii.cc
gr_unpacked_to_packed_ii.h
gr_unpacked_to_packed_ii.i
gr_unpacked_to_packed_ss.cc
gr_unpacked_to_packed_ss.h
gr_unpacked_to_packed_ss.i
gr_max_ii.h
gr_max_ii.i
gr_max_ff.h
gr_max_ff.i
gr_argmax_fs.h
gr_argmax_fs.i
gr_argmax_is.cc
gr_max_ss.h
gr_max_ss.i
gr_max_ii.cc
gr_argmax_fs.cc
gr_argmax_ss.h
gr_argmax_ss.i
gr_argmax_ss.cc
gr_max_ss.cc
gr_argmax_is.h
gr_argmax_is.i
gr_max_ff.cc
# --- end generated files ---


   + Makefile
Makefile.in
.la
.lo
.deps
.libs
*.la
*.lo
*.pyc
GrFIRfilterCCC.cc
GrFIRfilterCCC.h
GrFIRfilterCCF.cc
GrFIRfilterCCF.h
GrFIRfilterFCC.cc
GrFIRfilterFCC.h
GrFIRfilterFFF.cc
GrFIRfilterFFF.h
GrFIRfilterFSF.cc
GrFIRfilterFSF.h
GrFIRfilterSCC.cc
GrFIRfilterSCC.h
GrFIRfilterSIS.cc
GrFIRfilterSIS.h
GrFreqXlatingFIRfilterCCC.cc
GrFreqXlatingFIRfilterCCC.h
GrFreqXlatingFIRfilterCCF.cc
GrFreqXlatingFIRfilterCCF.h
GrFreqXlatingFIRfilterFCC.cc
GrFreqXlatingFIRfilterFCC.h
GrFreqXlatingFIRfilterFCF.cc
GrFreqXlatingFIRfilterFCF.h
GrFreqXlatingFIRfilterSCC.cc
GrFreqXlatingFIRfilterSCC.h
GrFreqXlatingFIRfilterSCF.cc
GrFreqXlatingFIRfilterSCF.h
gr_fir_CCC.cc
gr_fir_CCC.h
gr_fir_CCC_generic.cc
gr_fir_CCC_generic.h
gr_fir_CCF.cc
gr_fir_CCF.h
gr_fir_CCF_generic.cc
gr_fir_CCF_generic.h
gr_fir_FCC.cc
gr_fir_FCC.h
gr_fir_FCC_generic.cc
gr_fir_FCC_generic.h
gr_fir_FFF.cc
gr_fir_FFF.h
gr_fir_FFF_generic.cc
gr_fir_FFF_generic.h
gr_fir_FSF.cc
gr_fir_FSF.h
gr_fir_FSF_generic.cc
gr_fir_FSF_generic.h
gr_fir_SCC.cc
gr_fir_SCC.h
gr_fir_SCC_generic.cc
gr_fir_SCC_generic.h
gr_fir_SIS.cc
gr_fir_SIS.h
gr_fir_SIS_generic.cc
gr_fir_SIS_generic.h
gr_fir_sysconfig.cc
gr_fir_sysconfig.h
gr_fir_sysconfig_generic.cc
gr_fir_sysconfig_generic.h
gr_fir_util.cc
gr_fir_util.h
GrFIRfilterCCC.i
GrFIRfilterCCF.i
GrFIRfilterFCC.i
GrFIRfilterFFF.i
GrFIRfilterFSF.i
GrFIRfilterSCC.i
GrFIRfilterSIS.i
GrFreqXlatingFIRfilterCCC.i
GrFreqXlatingFIRfilterCCF.i
GrFreqXlatingFIRfilterFCC.i
GrFreqXlatingFIRfilterFCF.i
GrFreqXlatingFIRfilterSCC.i
GrFreqXlatingFIRfilterSCF.i
# --- generated files ---
gr_add_cc.cc
gr_add_cc.h
gr_add_cc.i
gr_add_const_c.cc
gr_add_const_c.h
gr_add_const_c.i
gr_add_const_cc.cc
gr_add_const_cc.h
gr_add_const_cc.i
gr_add_const_f.cc
gr_add_const_f.h
gr_add_const_f.i
gr_add_const_ff.cc
gr_add_const_ff.h
gr_add_const_ff.i
gr_add_const_i.cc
gr_add_const_i.h
gr_add_const_i.i
gr_add_const_ii.cc
gr_add_const_ii.h
gr_add_const_ii.i
gr_add_const_s.cc
gr_add_const_s.h
gr_add_const_s.i
gr_add_const_sf.cc
gr_add_const_sf.h
gr_add_const_sf.i
gr_add_const_ss.cc
gr_add_const_ss.h
gr_add_const_ss.i
gr_add_const_vcc.cc
gr_add_const_vcc.h
gr_add_const_vcc.i
gr_add_const_vff.cc
gr_add_const_vff.h
gr_add_const_vff.i
gr_add_const_vii.cc
gr_add_const_vii.h
gr_add_const_vii.i
gr_add_const_vss.cc
gr_add_const_vss.h
gr_add_const_vss.i
gr_add_ff.cc
gr_add_ff.h
gr_add_ff.i
gr_add_ii.cc
gr_add_ii.h
gr_add_ii.i
gr_add_ss.cc
gr_add_ss.h
gr_add_ss.i
gr_add_vcc.cc
gr_add_vcc.h
gr_add_vcc.i
gr_add_vff.cc
gr_add_vff.h
gr_add_vff.i
gr_add_vii.cc
gr_add_vii.h
gr_add_vii.i
gr_add_vss.cc
gr_add_vss.h
gr_add_vss.i
gr_divide_cc.cc
gr_divide_cc.h
gr_divide_cc.i
gr_divide_ff.cc
gr_divide_ff.h
gr_divide_ff.i
gr_divide_ii.cc
gr_divide_ii.h
gr_divide_ii.i
gr_divide_ss.cc
gr_divide_ss.h
gr_divide_ss.i
gr_multiply_cc.cc
gr_multiply_cc.h
gr_multiply_cc.i
gr_multiply_const_cc.cc
gr_multiply_const_cc.h
gr_multiply_const_cc.i
gr_multiply_const_ff.cc
gr_multiply_const_ff.h
gr_multiply_const_ff.i
gr_multiply_const_ii.cc
gr_multiply_const_ii.h
gr_multiply_const_ii.i
gr_multiply_const_ss.cc
gr_multiply_const_ss.h
gr_multiply_const_ss.i
gr_multiply_ff.cc
gr_multiply_ff.h
gr_multiply_ff.i
gr_multiply_ii.cc
gr_multiply_ii.h
gr_multiply_ii.i
gr_multiply_ss.cc
gr_multiply_ss.h
gr_multiply_ss.i
gr_multiply_vcc.cc
gr_multiply_vcc.h
gr_multiply_vcc.i
gr_multiply_vff.cc
gr_multiply_vff.h
gr_multiply_vff.i
gr_multiply_vii.cc
gr_multiply_vii.h
gr_multiply_vii.i
gr_multiply_vss.cc
gr_multiply_vss.h
gr_multiply_vss.i
gr_multiply_const_vcc.cc
gr_multiply_const_vcc.h
gr_multiply_const_vcc.i
gr_multiply_const_vff.cc
gr_multiply_const_vff.h
gr_multiply_const_vff.i
gr_multiply_const_vii.cc
gr_multiply_const_vii.h
gr_multiply_const_vii.i
gr_multiply_const_vss.cc
gr_multiply_const_vss.h
gr_multiply_const_vss.i
gr_noise_source_c.cc
gr_noise_source_c.h
gr_noise_source_c.i
gr_noise_source_f.cc
gr_noise_source_f.h
gr_noise_source_f.i
gr_noise_source_i.cc
gr_noise_source_i.h
gr_noise_source_i.i
gr_noise_source_s.cc
gr_noise_source_s.h
gr_noise_source_s.i
gr_peak_detector_fb.cc
gr_peak_detector_fb.h
gr_peak_detector_fb.i
gr_peak_detector_ib.cc
gr_peak_detector_ib.h
gr_peak_detector_ib.i
gr_peak_detector_sb.cc
gr_peak_detector_sb.h
gr_peak_detector_sb.i
gr_peak_detector_ii.cc
gr_peak_detector_ss.cc
gr_peak_detector_ii.h
gr_peak_detector_ii.i
gr_peak_detector_ff.h
gr_peak_detector_ff.i
gr_peak_detector_ff.cc
gr_peak_detector_ss.h
gr_peak_detector_ss.i
gr_sample_and_hold_bb.cc
gr_sample_and_hold_bb.h
gr_sample_and_hold_bb.i
gr_sample_and_hold_ff.cc
gr_sample_and_hold_ff.h
gr_sample_and_hold_ff.i
gr_sample_and_hold_ss.cc
gr_sample_and_hold_ss.h
gr_sample_and_hold_ss.i
gr_sample_and_hold_ii.cc
gr_sample_and_hold_ii.h
gr_sample_and_hold_ii.i
gr_sig_source_c.cc
gr_sig_source_c.h
gr_sig_source_c.i
gr_sig_source_f.cc
gr_sig_source_f.h
gr_sig_source_f.i
gr_sig_source_i.cc
gr_sig_source_i.h
gr_sig_source_i.i
gr_sig_source_s.cc
gr_sig_source_s.h
gr_sig_source_s.i
gr_sub_cc.cc
gr_sub_cc.h
gr_sub_cc.i
gr_sub_ff.cc
gr_sub_ff.h
gr_sub_ff.i
gr_sub_ii.cc
gr_sub_ii.h
gr_sub_ii.i
gr_sub_ss.cc
gr_sub_ss.h
gr_sub_ss.i
gr_vector_sink_b.cc
gr_vector_sink_b.h
gr_vector_sink_b.i
gr_vector_sink_c.cc
gr_vector_sink_c.h
gr_vector_sink_c.i
gr_vector_sink_f.cc
gr_vector_sink_f.h
gr_vector_sink_f.i
gr_vector_sink_i.cc
gr_vector_sink_i.h
gr_vector_sink_i.i
gr_vector_sink_s.cc
gr_vector_sink_s.h
gr_vector_sink_s.i
gr_vector_source_b.cc
gr_vector_source_b.h
gr_vector_source_b.i
gr_vector_source_c.cc
gr_vector_source_c.h
gr_vector_source_c.i
gr_vector_source_f.cc
gr_vector_source_f.h
gr_vector_source_f.i
gr_vector_source_i.cc
gr_vector_source_i.h
gr_vector_source_i.i
gr_vector_source_s.cc
gr_vector_source_s.h
gr_vector_source_s.i
gr_mute_cc.cc
gr_mute_cc.h
gr_mute_cc.i
gr_mute_ff.cc
gr_mute_ff.h
gr_mute_ff.i
gr_mute_ii.cc
gr_mute_ii.h
gr_mute_ii.i
gr_mute_ss.cc
gr_mute_ss.h
gr_mute_ss.i
gr_prefix.cc
gr_chunks_to_symbols_bc.cc
gr_chunks_to_symbols_bc.h
gr_chunks_to_symbols_bc.i
gr_chunks_to_symbols_bf.cc
gr_chunks_to_symbols_bf.h
gr_chunks_to_symbols_bf.i
gr_chunks_to_symbols_ic.cc
gr_chunks_to_symbols_ic.h
gr_chunks_to_symbols_ic.i
gr_chunks_to_symbols_if.cc
gr_chunks_to_symbols_if.h
gr_chunks_to_symbols_if.i
gr_chunks_to_symbols_sc.cc
gr_chunks_to_symbols_sc.h
gr_chunks_to_symbols_sc.i
gr_chunks_to_symbols_sf.cc
gr_chunks_to_symbols_sf.h
gr_chunks_to_symbols_sf.i
gr_packed_to_unpacked_bb.cc
gr_packed_to_unpacked_bb.h
gr_packed_to_unpacked_bb.i
gr_packed_to_unpacked_ii.cc
gr_packed_to_unpacked_ii.h
gr_packed_to_unpacked_ii.i
gr_packed_to_unpacked_ss.cc
gr_packed_to_unpacked_ss.h
gr_packed_to_unpacked_ss.i
gr_unpacked_to_packed_bb.cc
gr_unpacked_to_packed_bb.h
gr_unpacked_to_packed_bb.i
gr_unpacked_to_packed_ii.cc
gr_unpacked_to_packed_ii.h
gr_unpacked_to_packed_ii.i
gr_unpacked_to_packed_ss.cc
gr_unpacked_to_packed_ss.h
gr_unpacked_to_packed_ss.i
gr_max_ii.h
gr_max_ii.i
gr_max_ff.h
gr_max_ff.i
gr_argmax_fs.h
gr_argmax_fs.i
gr_argmax_is.cc
gr_max_ss.h
gr_max_ss.i
gr_max_ii.cc
gr_argmax_fs.cc
gr_argmax_ss.h
gr_argmax_ss.i
gr_argmax_ss.cc
gr_max_ss.cc
gr_argmax_is.h
gr_argmax_is.i
gr_max_ff.cc
gr_unpacked_to_packed_bs.h
gr_unpacked_to_packed_bs.i
gr_stream_enable_inv_ii.h
gr_stream_enable_inv_ii.i
gr_stream_enable_inv_cc.cc
gr_stream_enable_ii.cc
gr_unpacked_to_packed_sb.h
gr_unpacked_to_packed_sb.i
gr_stream_enable_inv_ff.h
gr_stream_enable_inv_ff.i
gr_stream_enable_inv_ss.cc
gr_stream_enable_inv_cc.h
gr_stream_enable_ii.h
gr_stream_enable_ii.i
gr_stream_enable_inv_cc.i
gr_stream_enable_ff.h
gr_stream_enable_ff.i
gr_stream_enable_inv_ss.h
gr_stream_enable_inv_ss.i
gr_stream_enable_cc.h
gr_stream_enable_cc.i
gr_unpacked_to_packed_bs.cc
gr_packed_to_unpacked_bs.h
gr_packed_to_unpacked_bs.i
gr_stream_enable_ss.h
gr_stream_enable_ss.i
gr_unpacked_to_packed_sb.cc
gr_packed_to_unpacked_sb.h
gr_packed_to_unpacked_sb.i
gr_stream_enable_inv_ff.cc
gr_stream_enable_cc.cc
gr_stream_enable_ss.cc
gr_packed_to_unpacked_bs.cc
generate-stamp
gr_packed_to_unpacked_sb.cc
gr_stream_enable_inv_ii.cc
gr_stream_enable_ff.cc
# --- end generated files ---



Modified: 
gnuradio/branches/features/coded-ofdm/gnuradio-core/src/lib/gengen/Makefile.am
===================================================================
--- 
gnuradio/branches/features/coded-ofdm/gnuradio-core/src/lib/gengen/Makefile.am  
    2008-10-22 00:56:40 UTC (rev 9816)
+++ 
gnuradio/branches/features/coded-ofdm/gnuradio-core/src/lib/gengen/Makefile.am  
    2008-10-22 08:55:52 UTC (rev 9817)
@@ -103,19 +103,7 @@
        gr_vector_source_X.i.t          \
        gr_vector_sink_X.cc.t           \
        gr_vector_sink_X.h.t            \
-       gr_vector_sink_X.i.t            \
-       gr_xor_XX.cc.t                  \
-       gr_xor_XX.h.t                   \
-       gr_xor_XX.i.t                   \
-       gr_and_XX.cc.t                  \
-       gr_and_XX.h.t                   \
-       gr_and_XX.i.t                   \
-       gr_or_XX.cc.t                   \
-       gr_or_XX.h.t                    \
-       gr_or_XX.i.t                    \
-       gr_not_XX.cc.t                  \
-       gr_not_XX.h.t                   \
-       gr_not_XX.i.t
+       gr_vector_sink_X.i.t
 
 include Makefile.gen
 

Modified: 
gnuradio/branches/features/coded-ofdm/gnuradio-core/src/lib/gengen/Makefile.gen
===================================================================
--- 
gnuradio/branches/features/coded-ofdm/gnuradio-core/src/lib/gengen/Makefile.gen 
    2008-10-22 00:56:40 UTC (rev 9816)
+++ 
gnuradio/branches/features/coded-ofdm/gnuradio-core/src/lib/gengen/Makefile.gen 
    2008-10-22 08:55:52 UTC (rev 9817)
@@ -3,6 +3,15 @@
 #
 GENERATED_H = \
        gr_add_cc.h \
+       gr_add_const_cc.h \
+       gr_add_const_ff.h \
+       gr_add_const_ii.h \
+       gr_add_const_sf.h \
+       gr_add_const_ss.h \
+       gr_add_const_vcc.h \
+       gr_add_const_vff.h \
+       gr_add_const_vii.h \
+       gr_add_const_vss.h \
        gr_add_ff.h \
        gr_add_ii.h \
        gr_add_ss.h \
@@ -27,6 +36,14 @@
        gr_max_ii.h \
        gr_max_ss.h \
        gr_multiply_cc.h \
+       gr_multiply_const_cc.h \
+       gr_multiply_const_ff.h \
+       gr_multiply_const_ii.h \
+       gr_multiply_const_ss.h \
+       gr_multiply_const_vcc.h \
+       gr_multiply_const_vff.h \
+       gr_multiply_const_vii.h \
+       gr_multiply_const_vss.h \
        gr_multiply_ff.h \
        gr_multiply_ii.h \
        gr_multiply_ss.h \
@@ -88,6 +105,15 @@
 
 GENERATED_I = \
        gr_add_cc.i \
+       gr_add_const_cc.i \
+       gr_add_const_ff.i \
+       gr_add_const_ii.i \
+       gr_add_const_sf.i \
+       gr_add_const_ss.i \
+       gr_add_const_vcc.i \
+       gr_add_const_vff.i \
+       gr_add_const_vii.i \
+       gr_add_const_vss.i \
        gr_add_ff.i \
        gr_add_ii.i \
        gr_add_ss.i \
@@ -112,6 +138,14 @@
        gr_max_ii.i \
        gr_max_ss.i \
        gr_multiply_cc.i \
+       gr_multiply_const_cc.i \
+       gr_multiply_const_ff.i \
+       gr_multiply_const_ii.i \
+       gr_multiply_const_ss.i \
+       gr_multiply_const_vcc.i \
+       gr_multiply_const_vff.i \
+       gr_multiply_const_vii.i \
+       gr_multiply_const_vss.i \
        gr_multiply_ff.i \
        gr_multiply_ii.i \
        gr_multiply_ss.i \
@@ -173,6 +207,15 @@
 
 GENERATED_CC = \
        gr_add_cc.cc \
+       gr_add_const_cc.cc \
+       gr_add_const_ff.cc \
+       gr_add_const_ii.cc \
+       gr_add_const_sf.cc \
+       gr_add_const_ss.cc \
+       gr_add_const_vcc.cc \
+       gr_add_const_vff.cc \
+       gr_add_const_vii.cc \
+       gr_add_const_vss.cc \
        gr_add_ff.cc \
        gr_add_ii.cc \
        gr_add_ss.cc \
@@ -197,6 +240,14 @@
        gr_max_ii.cc \
        gr_max_ss.cc \
        gr_multiply_cc.cc \
+       gr_multiply_const_cc.cc \
+       gr_multiply_const_ff.cc \
+       gr_multiply_const_ii.cc \
+       gr_multiply_const_ss.cc \
+       gr_multiply_const_vcc.cc \
+       gr_multiply_const_vff.cc \
+       gr_multiply_const_vii.cc \
+       gr_multiply_const_vss.cc \
        gr_multiply_ff.cc \
        gr_multiply_ii.cc \
        gr_multiply_ss.cc \
@@ -255,3 +306,4 @@
        gr_vector_source_f.cc \
        gr_vector_source_i.cc \
        gr_vector_source_s.cc
+

Modified: 
gnuradio/branches/features/coded-ofdm/gnuradio-core/src/lib/gengen/gengen_generated.i
===================================================================
--- 
gnuradio/branches/features/coded-ofdm/gnuradio-core/src/lib/gengen/gengen_generated.i
       2008-10-22 00:56:40 UTC (rev 9816)
+++ 
gnuradio/branches/features/coded-ofdm/gnuradio-core/src/lib/gengen/gengen_generated.i
       2008-10-22 08:55:52 UTC (rev 9817)
@@ -60,7 +60,9 @@
 #include <gr_noise_source_i.h>
 #include <gr_noise_source_s.h>
 #include <gr_packed_to_unpacked_bb.h>
+#include <gr_packed_to_unpacked_bs.h>
 #include <gr_packed_to_unpacked_ii.h>
+#include <gr_packed_to_unpacked_sb.h>
 #include <gr_packed_to_unpacked_ss.h>
 #include <gr_peak_detector_fb.h>
 #include <gr_peak_detector_ib.h>
@@ -73,12 +75,22 @@
 #include <gr_sig_source_f.h>
 #include <gr_sig_source_i.h>
 #include <gr_sig_source_s.h>
+#include <gr_stream_enable_cc.h>
+#include <gr_stream_enable_ff.h>
+#include <gr_stream_enable_ii.h>
+#include <gr_stream_enable_inv_cc.h>
+#include <gr_stream_enable_inv_ff.h>
+#include <gr_stream_enable_inv_ii.h>
+#include <gr_stream_enable_inv_ss.h>
+#include <gr_stream_enable_ss.h>
 #include <gr_sub_cc.h>
 #include <gr_sub_ff.h>
 #include <gr_sub_ii.h>
 #include <gr_sub_ss.h>
 #include <gr_unpacked_to_packed_bb.h>
+#include <gr_unpacked_to_packed_bs.h>
 #include <gr_unpacked_to_packed_ii.h>
+#include <gr_unpacked_to_packed_sb.h>
 #include <gr_unpacked_to_packed_ss.h>
 #include <gr_vector_sink_b.h>
 #include <gr_vector_sink_c.h>
@@ -150,7 +162,9 @@
 %include <gr_noise_source_i.i>
 %include <gr_noise_source_s.i>
 %include <gr_packed_to_unpacked_bb.i>
+%include <gr_packed_to_unpacked_bs.i>
 %include <gr_packed_to_unpacked_ii.i>
+%include <gr_packed_to_unpacked_sb.i>
 %include <gr_packed_to_unpacked_ss.i>
 %include <gr_peak_detector_fb.i>
 %include <gr_peak_detector_ib.i>
@@ -163,12 +177,22 @@
 %include <gr_sig_source_f.i>
 %include <gr_sig_source_i.i>
 %include <gr_sig_source_s.i>
+%include <gr_stream_enable_cc.i>
+%include <gr_stream_enable_ff.i>
+%include <gr_stream_enable_ii.i>
+%include <gr_stream_enable_inv_cc.i>
+%include <gr_stream_enable_inv_ff.i>
+%include <gr_stream_enable_inv_ii.i>
+%include <gr_stream_enable_inv_ss.i>
+%include <gr_stream_enable_ss.i>
 %include <gr_sub_cc.i>
 %include <gr_sub_ff.i>
 %include <gr_sub_ii.i>
 %include <gr_sub_ss.i>
 %include <gr_unpacked_to_packed_bb.i>
+%include <gr_unpacked_to_packed_bs.i>
 %include <gr_unpacked_to_packed_ii.i>
+%include <gr_unpacked_to_packed_sb.i>
 %include <gr_unpacked_to_packed_ss.i>
 %include <gr_vector_sink_b.i>
 %include <gr_vector_sink_c.i>

Modified: 
gnuradio/branches/features/coded-ofdm/gnuradio-core/src/lib/io/Makefile.am
===================================================================
--- gnuradio/branches/features/coded-ofdm/gnuradio-core/src/lib/io/Makefile.am  
2008-10-22 00:56:40 UTC (rev 9816)
+++ gnuradio/branches/features/coded-ofdm/gnuradio-core/src/lib/io/Makefile.am  
2008-10-22 08:55:52 UTC (rev 9817)
@@ -55,10 +55,7 @@
        ppio_ppdev.cc                   \
        sdr_1000.cc                     \
        gr_udp_sink.cc                  \
-       gr_udp_source.cc                \
-       gr_wavfile_sink.cc              \
-       gr_wavfile_source.cc            \
-       gri_wavfile.cc
+       gr_udp_source.cc
 
 grinclude_HEADERS =                    \
        gr_file_sink.h                  \
@@ -90,10 +87,7 @@
        ppio_ppdev.h                    \
        sdr_1000.h                      \
        gr_udp_sink.h                   \
-       gr_udp_source.h                 \
-       gr_wavfile_source.h             \
-       gr_wavfile_sink.h               \
-       gri_wavfile.h
+       gr_udp_source.h
 
 
 
@@ -116,7 +110,5 @@
        ppio.i                          \
        sdr_1000.i                      \
        gr_udp_sink.i                   \
-       gr_udp_source.i                 \
-       gr_wavfile_source.i             \
-       gr_wavfile_sink.i
+       gr_udp_source.i
 


Property changes on: gnuradio/branches/features/coded-ofdm/gr-trellis/src/lib
___________________________________________________________________
Name: svn:ignore
   - Makefile
Makefile.in
.la
.lo
.deps
.libs
*.la
*.lo
*.pyc
trellis.cc
trellis.py
wip
trellis_encoder_bs.cc
trellis_metrics_c.h
trellis_metrics_c.i
trellis_metrics_f.cc
trellis_viterbi_i.h
trellis_viterbi_combined_i.h
trellis_viterbi_i.i
trellis_viterbi_combined_i.i
trellis_metrics_i.h
trellis_metrics_i.i
trellis_encoder_bb.cc
trellis_encoder_ss.cc
trellis_viterbi_combined_s.h
trellis_viterbi_s.h
trellis_viterbi_combined_s.i
trellis_viterbi_s.i
trellis_metrics_s.h
trellis_metrics_s.i
trellis_encoder_si.h
trellis_encoder_si.i
trellis_metrics_i.cc
trellis_viterbi_s.cc
trellis_viterbi_combined_s.cc
trellis_encoder_ss.h
trellis_encoder_ss.i
trellis_encoder_bi.cc
trellis_encoder_bi.h
trellis_encoder_bi.i
trellis_encoder_ii.cc
trellis_viterbi_combined_b.cc
trellis_viterbi_b.cc
trellis_encoder_bs.h
trellis_encoder_bs.i
trellis_viterbi_combined_b.h
trellis_viterbi_b.h
trellis_viterbi_combined_b.i
trellis_viterbi_b.i
trellis_encoder_si.cc
trellis_metrics_f.h
trellis_metrics_f.i
trellis_encoder_ii.h
trellis_encoder_ii.i
trellis_metrics_c.cc
trellis_viterbi_combined_i.cc
trellis_viterbi_i.cc
trellis_encoder_bb.h
trellis_encoder_bb.i
trellis_metrics_s.cc
trellis_viterbi_combined_fs.h
trellis_viterbi_combined_fs.i
trellis_viterbi_combined_fi.cc
trellis_viterbi_combined_is.h
trellis_viterbi_combined_is.i
trellis_viterbi_combined_ci.h
trellis_viterbi_combined_ci.i
trellis_viterbi_combined_cs.cc
trellis_viterbi_combined_is.cc
trellis_viterbi_combined_si.h
trellis_viterbi_combined_si.i
trellis_viterbi_combined_ss.cc
trellis_viterbi_combined_fb.cc
trellis_viterbi_combined_fi.h
trellis_viterbi_combined_fi.i
trellis_viterbi_combined_cb.h
trellis_viterbi_combined_cb.i
trellis_viterbi_combined_ci.cc
trellis_viterbi_combined_ii.cc
trellis_viterbi_combined_ii.h
trellis_viterbi_combined_ii.i
trellis_viterbi_combined_sb.h
trellis_viterbi_combined_sb.i
trellis_viterbi_combined_si.cc
trellis_viterbi_combined_fb.h
trellis_viterbi_combined_fb.i
trellis_viterbi_combined_ib.h
trellis_viterbi_combined_ib.i
trellis_viterbi_combined_cs.h
trellis_viterbi_combined_cs.i
trellis_viterbi_combined_fs.cc
trellis_viterbi_combined_cb.cc
trellis_viterbi_combined_ss.h
trellis_viterbi_combined_ss.i
trellis_viterbi_combined_ib.cc
trellis_viterbi_combined_sb.cc
trellis_generated.i

   + Makefile
Makefile.in
.la
.lo
.deps
.libs
*.la
*.lo
*.pyc
trellis.cc
trellis.py
wip
trellis_encoder_bs.cc
trellis_metrics_c.h
trellis_metrics_c.i
trellis_metrics_f.cc
trellis_viterbi_i.h
trellis_viterbi_combined_i.h
trellis_viterbi_i.i
trellis_viterbi_combined_i.i
trellis_metrics_i.h
trellis_metrics_i.i
trellis_encoder_bb.cc
trellis_encoder_ss.cc
trellis_viterbi_combined_s.h
trellis_viterbi_s.h
trellis_viterbi_combined_s.i
trellis_viterbi_s.i
trellis_metrics_s.h
trellis_metrics_s.i
trellis_encoder_si.h
trellis_encoder_si.i
trellis_metrics_i.cc
trellis_viterbi_s.cc
trellis_viterbi_combined_s.cc
trellis_encoder_ss.h
trellis_encoder_ss.i
trellis_encoder_bi.cc
trellis_encoder_bi.h
trellis_encoder_bi.i
trellis_encoder_ii.cc
trellis_viterbi_combined_b.cc
trellis_viterbi_b.cc
trellis_encoder_bs.h
trellis_encoder_bs.i
trellis_viterbi_combined_b.h
trellis_viterbi_b.h
trellis_viterbi_combined_b.i
trellis_viterbi_b.i
trellis_encoder_si.cc
trellis_metrics_f.h
trellis_metrics_f.i
trellis_encoder_ii.h
trellis_encoder_ii.i
trellis_metrics_c.cc
trellis_viterbi_combined_i.cc
trellis_viterbi_i.cc
trellis_encoder_bb.h
trellis_encoder_bb.i
trellis_metrics_s.cc
trellis_viterbi_combined_fs.h
trellis_viterbi_combined_fs.i
trellis_viterbi_combined_fi.cc
trellis_viterbi_combined_is.h
trellis_viterbi_combined_is.i
trellis_viterbi_combined_ci.h
trellis_viterbi_combined_ci.i
trellis_viterbi_combined_cs.cc
trellis_viterbi_combined_is.cc
trellis_viterbi_combined_si.h
trellis_viterbi_combined_si.i
trellis_viterbi_combined_ss.cc
trellis_viterbi_combined_fb.cc
trellis_viterbi_combined_fi.h
trellis_viterbi_combined_fi.i
trellis_viterbi_combined_cb.h
trellis_viterbi_combined_cb.i
trellis_viterbi_combined_ci.cc
trellis_viterbi_combined_ii.cc
trellis_viterbi_combined_ii.h
trellis_viterbi_combined_ii.i
trellis_viterbi_combined_sb.h
trellis_viterbi_combined_sb.i
trellis_viterbi_combined_si.cc
trellis_viterbi_combined_fb.h
trellis_viterbi_combined_fb.i
trellis_viterbi_combined_ib.h
trellis_viterbi_combined_ib.i
trellis_viterbi_combined_cs.h
trellis_viterbi_combined_cs.i
trellis_viterbi_combined_fs.cc
trellis_viterbi_combined_cb.cc
trellis_viterbi_combined_ss.h
trellis_viterbi_combined_ss.i
trellis_viterbi_combined_ib.cc
trellis_viterbi_combined_sb.cc
trellis_generated.i
trellis_framed_encoder_si.h
trellis_framed_encoder_si.i
trellis_framed_encoder_bs.h
trellis_framed_encoder_bs.i
trellis_framed_encoder_bb.cc
trellis_framed_encoder_ss.cc
trellis_framed_encoder_ii.h
trellis_framed_encoder_ii.i
trellis_framed_encoder_ii.cc
trellis_framed_encoder_si.cc
trellis_framed_encoder_ss.h
trellis_framed_encoder_ss.i
trellis_framed_encoder_bi.h
trellis_framed_encoder_bi.i
trellis_framed_encoder_bs.cc
trellis_framed_encoder_bb.h
trellis_framed_encoder_bb.i
trellis_framed_encoder_bi.cc






reply via email to

[Prev in Thread] Current Thread [Next in Thread]