[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r10436 - in gnuradio/branches/developers/michaelld/am_
|
From: |
michaelld |
|
Subject: |
[Commit-gnuradio] r10436 - in gnuradio/branches/developers/michaelld/am_swig: gnuradio-core/src/lib/filter gnuradio-core/src/lib/gengen gr-gpio/src/lib gr-gsm-fr-vocoder/src/lib gr-pager/src gr-trellis/src/lib |
|
Date: |
Wed, 11 Feb 2009 06:16:01 -0700 (MST) |
Author: michaelld
Date: 2009-02-11 06:16:00 -0700 (Wed, 11 Feb 2009)
New Revision: 10436
Added:
gnuradio/branches/developers/michaelld/am_swig/gr-gpio/src/lib/gpio_swig.i
Removed:
gnuradio/branches/developers/michaelld/am_swig/gr-gpio/src/lib/gpio.i
Modified:
gnuradio/branches/developers/michaelld/am_swig/gnuradio-core/src/lib/filter/Makefile.am
gnuradio/branches/developers/michaelld/am_swig/gnuradio-core/src/lib/gengen/Makefile.am
gnuradio/branches/developers/michaelld/am_swig/gr-gpio/src/lib/Makefile.am
gnuradio/branches/developers/michaelld/am_swig/gr-gsm-fr-vocoder/src/lib/Makefile.am
gnuradio/branches/developers/michaelld/am_swig/gr-pager/src/Makefile.am
gnuradio/branches/developers/michaelld/am_swig/gr-trellis/src/lib/Makefile.am
Log:
WIP. Getting closer. Fixes some missed files and names. Everything
now compiles and passes 'check'. Still some cleanup and more testing.
Modified:
gnuradio/branches/developers/michaelld/am_swig/gnuradio-core/src/lib/filter/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/am_swig/gnuradio-core/src/lib/filter/Makefile.am
2009-02-11 03:27:14 UTC (rev 10435)
+++
gnuradio/branches/developers/michaelld/am_swig/gnuradio-core/src/lib/filter/Makefile.am
2009-02-11 13:16:00 UTC (rev 10436)
@@ -109,7 +109,7 @@
#
generic_CODE = \
- sysconfig_generic.cc
+ sysconfig_generic.cc
generic_qa_CODE = \
qa_dotprod_generic.cc
@@ -164,7 +164,7 @@
qa_dotprod_x86.cc \
qa_float_dotprod_x86.cc \
qa_complex_dotprod_x86.cc \
- qa_ccomplex_dotprod_x86.cc
+ qa_ccomplex_dotprod_x86.cc
powerpc_CODE = \
sysconfig_powerpc.cc \
@@ -221,7 +221,7 @@
complex_dotprod_generic.cc \
ccomplex_dotprod_generic.cc \
float_dotprod_generic.c \
- short_dotprod_generic.c
+ short_dotprod_generic.c
libfilter_qa_la_common_SOURCES = \
qa_filter.cc \
@@ -232,7 +232,7 @@
qa_gr_fir_scc.cc \
qa_gr_rotator.cc \
qa_gri_mmse_fir_interpolator.cc \
- qa_gri_mmse_fir_interpolator_cc.cc
+ qa_gri_mmse_fir_interpolator_cc.cc
if MD_CPU_generic
libfilter_la_SOURCES = $(libfilter_la_common_SOURCES) $(generic_CODE)
@@ -321,10 +321,8 @@
qa_gr_fir_scc.h \
qa_gr_rotator.h \
qa_gri_mmse_fir_interpolator.h \
- qa_gri_mmse_fir_interpolator_cc.h
+ qa_gri_mmse_fir_interpolator_cc.h
-
-
# These swig headers get installed in ${prefix}/include/gnuradio/swig
swiginclude_HEADERS = \
$(srcdir)/filter.i \
@@ -340,7 +338,7 @@
$(srcdir)/gr_iir_filter_ffd.i \
$(srcdir)/gr_single_pole_iir_filter_ff.i \
$(srcdir)/gr_single_pole_iir_filter_cc.i \
+ filter_generated.i \
$(GENERATED_I)
-
CLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc
Modified:
gnuradio/branches/developers/michaelld/am_swig/gnuradio-core/src/lib/gengen/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/am_swig/gnuradio-core/src/lib/gengen/Makefile.am
2009-02-11 03:27:14 UTC (rev 10435)
+++
gnuradio/branches/developers/michaelld/am_swig/gnuradio-core/src/lib/gengen/Makefile.am
2009-02-11 13:16:00 UTC (rev 10436)
@@ -161,21 +161,17 @@
libgengen_la_SOURCES = \
$(GENERATED_CC)
-#libgengen_qa_la_SOURCES =
-
grinclude_HEADERS = \
$(GENERATED_H) \
gr_endianness.h \
gr_noise_type.h \
gr_sig_source_waveform.h
-noinst_HEADERS =
-
# These swig headers get installed in ${prefix}/include/gnuradio/swig
swiginclude_HEADERS = \
- $(GENERATED_I) \
$(srcdir)/gr_endianness.i \
$(srcdir)/gengen.i \
- $(srcdir)/gengen_generated.i
+ gengen_generated.i \
+ $(GENERATED_I)
CLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc
Modified:
gnuradio/branches/developers/michaelld/am_swig/gr-gpio/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/michaelld/am_swig/gr-gpio/src/lib/Makefile.am
2009-02-11 03:27:14 UTC (rev 10435)
+++ gnuradio/branches/developers/michaelld/am_swig/gr-gpio/src/lib/Makefile.am
2009-02-11 13:16:00 UTC (rev 10436)
@@ -29,7 +29,7 @@
# These swig headers get installed in ${prefix}/include/gnuradio/swig
swiginclude_HEADERS = \
- $(srcdir)/gpio.i
+ $(srcdir)/gpio_swig.i
# These files are built by SWIG. The first is the C++ glue.
# The second is the python wrapper that loads the _gpio shared library
Deleted: gnuradio/branches/developers/michaelld/am_swig/gr-gpio/src/lib/gpio.i
Added:
gnuradio/branches/developers/michaelld/am_swig/gr-gpio/src/lib/gpio_swig.i
===================================================================
--- gnuradio/branches/developers/michaelld/am_swig/gr-gpio/src/lib/gpio_swig.i
(rev 0)
+++ gnuradio/branches/developers/michaelld/am_swig/gr-gpio/src/lib/gpio_swig.i
2009-02-11 13:16:00 UTC (rev 10436)
@@ -0,0 +1,43 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2009 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.
+ */
+
+%include "gnuradio.i" // the common stuff
+
+%{
+#include "gpio_and_const_ss.h"
+%}
+
+// ----------------------------------------------------------------
+
+GR_SWIG_BLOCK_MAGIC(gpio,and_const_ss)
+
+gpio_and_const_ss_sptr gpio_make_and_const_ss (unsigned short k);
+
+class gpio_and_const_ss : public gr_sync_block
+{
+ private:
+ gpio_and_const_ss (unsigned short k);
+
+ public:
+ unsigned short k () const { return d_k; }
+ void set_k (unsigned short k) { d_k = k; }
+};
Modified:
gnuradio/branches/developers/michaelld/am_swig/gr-gsm-fr-vocoder/src/lib/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/am_swig/gr-gsm-fr-vocoder/src/lib/Makefile.am
2009-02-11 03:27:14 UTC (rev 10435)
+++
gnuradio/branches/developers/michaelld/am_swig/gr-gsm-fr-vocoder/src/lib/Makefile.am
2009-02-11 13:16:00 UTC (rev 10436)
@@ -43,7 +43,7 @@
BUILT_SOURCES = \
gsm_full_rate.cc \
- gsm_full_rate.py
+ gsm_full_rate.py
# This gets gsm_full_rate.py installed in the right place
ourpython_PYTHON = \
Modified:
gnuradio/branches/developers/michaelld/am_swig/gr-pager/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/michaelld/am_swig/gr-pager/src/Makefile.am
2009-02-11 03:27:14 UTC (rev 10435)
+++ gnuradio/branches/developers/michaelld/am_swig/gr-pager/src/Makefile.am
2009-02-11 13:16:00 UTC (rev 10436)
@@ -57,7 +57,7 @@
BUILT_SOURCES = \
pager_swig.cc \
- pager_swig.py
+ pager_swig.py
# This gets imported Python objects installed in the right place
ourpython_PYTHON = \
@@ -79,13 +79,12 @@
pageri_bch3221.cc \
pageri_flex_modes.cc \
pageri_util.cc
- # Additional source modules here
# magic flags
_pager_swig_la_LDFLAGS = $(STD_SWIG_LA_LD_FLAGS)
# link the library against the c++ standard library
-_pager_swig_la_LIBADD = $(STD_SWIG_LA_LIB_ADD)
+_pager_swig_la_LIBADD = $(STD_SWIG_LA_LIB_ADD)
# KLUDGE: Force runtime include of SWIG dependency files.
# This is not guaranteed to be portable, but will probably work.
Modified:
gnuradio/branches/developers/michaelld/am_swig/gr-trellis/src/lib/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/am_swig/gr-trellis/src/lib/Makefile.am
2009-02-11 03:27:14 UTC (rev 10435)
+++
gnuradio/branches/developers/michaelld/am_swig/gr-trellis/src/lib/Makefile.am
2009-02-11 13:16:00 UTC (rev 10436)
@@ -89,24 +89,24 @@
swig_built_sources = \
trellis.cc \
- trellis.py
+ trellis.py
BUILT_SOURCES = \
$(GENERATED_H) \
$(GENERATED_I) \
$(GENERATED_CC) \
- $(swig_built_sources)
+ $(swig_built_sources)
# These swig headers get installed in ${prefix}/include/gnuradio/swig
swiginclude_HEADERS = \
$(srcdir)/trellis.i \
- $(GENERATED_I) \
$(srcdir)/fsm.i \
$(srcdir)/interleaver.i \
$(srcdir)/trellis_permutation.i \
$(srcdir)/trellis_siso_f.i \
$(srcdir)/trellis_siso_combined_f.i \
- $(srcdir)/trellis_generated.i
+ trellis_generated.i \
+ $(GENERATED_I)
EXTRA_DIST = \
$(CODE_GENERATOR) \
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r10436 - in gnuradio/branches/developers/michaelld/am_swig: gnuradio-core/src/lib/filter gnuradio-core/src/lib/gengen gr-gpio/src/lib gr-gsm-fr-vocoder/src/lib gr-pager/src gr-trellis/src/lib,
michaelld <=