[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r9773 - in gnuradio/branches/developers/jcorgan/ss: .
|
From: |
jcorgan |
|
Subject: |
[Commit-gnuradio] r9773 - in gnuradio/branches/developers/jcorgan/ss: . config gr-dsss gr-dsss/data gr-dsss/doc gr-dsss/include gr-dsss/include/dsss gr-dsss/lib gr-dsss/python |
|
Date: |
Fri, 10 Oct 2008 20:55:11 -0600 (MDT) |
Author: jcorgan
Date: 2008-10-10 20:55:09 -0600 (Fri, 10 Oct 2008)
New Revision: 9773
Added:
gnuradio/branches/developers/jcorgan/ss/config/grc_gr_dsss.m4
gnuradio/branches/developers/jcorgan/ss/gr-dsss/
gnuradio/branches/developers/jcorgan/ss/gr-dsss/Makefile.am
gnuradio/branches/developers/jcorgan/ss/gr-dsss/data/
gnuradio/branches/developers/jcorgan/ss/gr-dsss/data/Makefile.am
gnuradio/branches/developers/jcorgan/ss/gr-dsss/doc/
gnuradio/branches/developers/jcorgan/ss/gr-dsss/doc/Makefile.am
gnuradio/branches/developers/jcorgan/ss/gr-dsss/include/
gnuradio/branches/developers/jcorgan/ss/gr-dsss/include/Makefile.am
gnuradio/branches/developers/jcorgan/ss/gr-dsss/include/dsss/
gnuradio/branches/developers/jcorgan/ss/gr-dsss/include/dsss/Makefile.am
gnuradio/branches/developers/jcorgan/ss/gr-dsss/include/dsss/code_gen_1b.h
gnuradio/branches/developers/jcorgan/ss/gr-dsss/include/dsss/msequence_b.h
gnuradio/branches/developers/jcorgan/ss/gr-dsss/lib/
gnuradio/branches/developers/jcorgan/ss/gr-dsss/lib/Makefile.am
gnuradio/branches/developers/jcorgan/ss/gr-dsss/lib/code_gen_1b.cc
gnuradio/branches/developers/jcorgan/ss/gr-dsss/lib/msequence_b.cc
gnuradio/branches/developers/jcorgan/ss/gr-dsss/lib/qa_code_gen_1b.cc
gnuradio/branches/developers/jcorgan/ss/gr-dsss/lib/qa_code_gen_1b.h
gnuradio/branches/developers/jcorgan/ss/gr-dsss/lib/qa_dsss.cc
gnuradio/branches/developers/jcorgan/ss/gr-dsss/lib/qa_dsss.h
gnuradio/branches/developers/jcorgan/ss/gr-dsss/lib/test_all.cc
gnuradio/branches/developers/jcorgan/ss/gr-dsss/python/
gnuradio/branches/developers/jcorgan/ss/gr-dsss/python/Makefile.am
gnuradio/branches/developers/jcorgan/ss/gr-dsss/python/__init__.py
gnuradio/branches/developers/jcorgan/ss/gr-dsss/python/code_gen_1b.i
gnuradio/branches/developers/jcorgan/ss/gr-dsss/python/dsss.i
gnuradio/branches/developers/jcorgan/ss/gr-dsss/python/qa_dsss.py
gnuradio/branches/developers/jcorgan/ss/gr-dsss/python/run_tests.in
Removed:
gnuradio/branches/developers/jcorgan/ss/gr-dsss/Makefile.am
gnuradio/branches/developers/jcorgan/ss/gr-dsss/data/
gnuradio/branches/developers/jcorgan/ss/gr-dsss/data/Makefile.am
gnuradio/branches/developers/jcorgan/ss/gr-dsss/doc/
gnuradio/branches/developers/jcorgan/ss/gr-dsss/doc/Makefile.am
gnuradio/branches/developers/jcorgan/ss/gr-dsss/include/
gnuradio/branches/developers/jcorgan/ss/gr-dsss/include/Makefile.am
gnuradio/branches/developers/jcorgan/ss/gr-dsss/include/dsss/
gnuradio/branches/developers/jcorgan/ss/gr-dsss/include/dsss/Makefile.am
gnuradio/branches/developers/jcorgan/ss/gr-dsss/include/dsss/code_gen_1b.h
gnuradio/branches/developers/jcorgan/ss/gr-dsss/include/dsss/msequence_b.h
gnuradio/branches/developers/jcorgan/ss/gr-dsss/lib/
gnuradio/branches/developers/jcorgan/ss/gr-dsss/lib/Makefile.am
gnuradio/branches/developers/jcorgan/ss/gr-dsss/lib/code_gen_1b.cc
gnuradio/branches/developers/jcorgan/ss/gr-dsss/lib/msequence_b.cc
gnuradio/branches/developers/jcorgan/ss/gr-dsss/lib/qa_code_gen_1b.cc
gnuradio/branches/developers/jcorgan/ss/gr-dsss/lib/qa_code_gen_1b.h
gnuradio/branches/developers/jcorgan/ss/gr-dsss/lib/qa_dsss.cc
gnuradio/branches/developers/jcorgan/ss/gr-dsss/lib/qa_dsss.h
gnuradio/branches/developers/jcorgan/ss/gr-dsss/lib/test_all.cc
gnuradio/branches/developers/jcorgan/ss/gr-dsss/python/
gnuradio/branches/developers/jcorgan/ss/gr-dsss/python/Makefile.am
gnuradio/branches/developers/jcorgan/ss/gr-dsss/python/__init__.py
gnuradio/branches/developers/jcorgan/ss/gr-dsss/python/code_gen_1b.i
gnuradio/branches/developers/jcorgan/ss/gr-dsss/python/dsss.i
gnuradio/branches/developers/jcorgan/ss/gr-dsss/python/qa_dsss.py
gnuradio/branches/developers/jcorgan/ss/gr-dsss/python/run_tests.in
Modified:
gnuradio/branches/developers/jcorgan/ss/Makefile.common
gnuradio/branches/developers/jcorgan/ss/config/Makefile.am
gnuradio/branches/developers/jcorgan/ss/configure.ac
gnuradio/branches/developers/jcorgan/ss/run_tests.sh.in
Log:
Merged r9666:9737 from jcorgan/dsss into jcorgan/ss
Modified: gnuradio/branches/developers/jcorgan/ss/Makefile.common
===================================================================
--- gnuradio/branches/developers/jcorgan/ss/Makefile.common 2008-10-11
02:12:45 UTC (rev 9772)
+++ gnuradio/branches/developers/jcorgan/ss/Makefile.common 2008-10-11
02:55:09 UTC (rev 9773)
@@ -35,6 +35,11 @@
grpythondir = $(pythondir)/gnuradio
grpyexecdir = $(pyexecdir)/gnuradio
+# Install data files in the appropriate subdirectory
+# This usually ends up at:
+# ${prefix}/share/gnuradio
+grdatadir = $(datadir)/gnuradio
+
# Install the non-gnuradio usrp stuff in the appropriate subdirectory
# This usually ends up at:
# ${prefix}/lib/python${python_version}/site-packages/usrpm
@@ -119,3 +124,4 @@
# Base directory for documentation (docdir undefined in autoconf < 1.60)
gr_docdir = $(if $(docdir),$(docdir),$(datadir)/doc/$(PACKAGE))-$(VERSION)
+
Modified: gnuradio/branches/developers/jcorgan/ss/config/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/ss/config/Makefile.am 2008-10-11
02:12:45 UTC (rev 9772)
+++ gnuradio/branches/developers/jcorgan/ss/config/Makefile.am 2008-10-11
02:55:09 UTC (rev 9773)
@@ -56,6 +56,7 @@
grc_gr_audio_portaudio.m4 \
grc_gr_audio_windows.m4 \
grc_gr_comedi.m4 \
+ grc_gr_dsss.m4 \
grc_gr_gcell.m4 \
grc_gr_gpio.m4 \
grc_gr_gsm_fr_vocoder.m4 \
Copied: gnuradio/branches/developers/jcorgan/ss/config/grc_gr_dsss.m4 (from rev
9737, gnuradio/branches/developers/jcorgan/dsss/config/grc_gr_dsss.m4)
===================================================================
--- gnuradio/branches/developers/jcorgan/ss/config/grc_gr_dsss.m4
(rev 0)
+++ gnuradio/branches/developers/jcorgan/ss/config/grc_gr_dsss.m4
2008-10-11 02:55:09 UTC (rev 9773)
@@ -0,0 +1,41 @@
+dnl Copyright 2008 Free Software Foundation, Inc.
+dnl
+dnl This file is part of GNU Radio
+dnl
+dnl GNU Radio is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 3, or (at your option)
+dnl any later version.
+dnl
+dnl GNU Radio is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with GNU Radio; see the file COPYING. If not, write to
+dnl the Free Software Foundation, Inc., 51 Franklin Street,
+dnl Boston, MA 02110-1301, USA.
+
+AC_DEFUN([GRC_GR_DSSS],[
+ GRC_ENABLE(gr-dsss)
+
+ dnl Don't do gr-dsss if gnuradio-core skipped
+ GRC_CHECK_DEPENDENCY(gr-dsss, gnuradio-core)
+
+ AC_CONFIG_FILES([\
+ gr-dsss/Makefile \
+ gr-dsss/data/Makefile \
+ gr-dsss/doc/Makefile \
+ gr-dsss/include/Makefile \
+ gr-dsss/include/dsss/Makefile \
+ gr-dsss/lib/Makefile \
+ gr-dsss/python/Makefile \
+ gr-dsss/python/run_tests \
+ ])
+
+ GRC_BUILD_CONDITIONAL(gr-dsss,[
+ dnl run_tests is created from run_tests.in. Make it executable.
+ AC_CONFIG_COMMANDS([run_tests_dsss], [chmod +x
gr-dsss/python/run_tests])
+ ])
+])
Modified: gnuradio/branches/developers/jcorgan/ss/configure.ac
===================================================================
--- gnuradio/branches/developers/jcorgan/ss/configure.ac 2008-10-11
02:12:45 UTC (rev 9772)
+++ gnuradio/branches/developers/jcorgan/ss/configure.ac 2008-10-11
02:55:09 UTC (rev 9773)
@@ -269,6 +269,7 @@
GRC_OMNITHREAD dnl must come before gnuradio-core and mblock
GRC_GCELL
GRC_GNURADIO_CORE
+GRC_GR_DSSS
GRC_PMT
GRC_MBLOCK dnl this must come after GRC_PMT
GRC_USRP
Copied: gnuradio/branches/developers/jcorgan/ss/gr-dsss (from rev 9737,
gnuradio/branches/developers/jcorgan/dsss/gr-dsss)
Property changes on: gnuradio/branches/developers/jcorgan/ss/gr-dsss
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
Deleted: gnuradio/branches/developers/jcorgan/ss/gr-dsss/Makefile.am
Copied: gnuradio/branches/developers/jcorgan/ss/gr-dsss/Makefile.am (from rev
9737, gnuradio/branches/developers/jcorgan/dsss/gr-dsss/Makefile.am)
===================================================================
--- gnuradio/branches/developers/jcorgan/ss/gr-dsss/Makefile.am
(rev 0)
+++ gnuradio/branches/developers/jcorgan/ss/gr-dsss/Makefile.am 2008-10-11
02:55:09 UTC (rev 9773)
@@ -0,0 +1,24 @@
+#
+# Copyright 2008 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 $(top_srcdir)/Makefile.common
+
+SUBDIRS = data doc include lib python
Copied: gnuradio/branches/developers/jcorgan/ss/gr-dsss/data (from rev 9737,
gnuradio/branches/developers/jcorgan/dsss/gr-dsss/data)
Property changes on: gnuradio/branches/developers/jcorgan/ss/gr-dsss/data
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
Deleted: gnuradio/branches/developers/jcorgan/ss/gr-dsss/data/Makefile.am
Copied: gnuradio/branches/developers/jcorgan/ss/gr-dsss/data/Makefile.am (from
rev 9737, gnuradio/branches/developers/jcorgan/dsss/gr-dsss/data/Makefile.am)
===================================================================
--- gnuradio/branches/developers/jcorgan/ss/gr-dsss/data/Makefile.am
(rev 0)
+++ gnuradio/branches/developers/jcorgan/ss/gr-dsss/data/Makefile.am
2008-10-11 02:55:09 UTC (rev 9773)
@@ -0,0 +1,25 @@
+#
+# Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+
+include $(top_srcdir)/Makefile.common
+
+ourdatadir = $(grdatadir)/dsss
+
+dist_ourdata_DATA =
Copied: gnuradio/branches/developers/jcorgan/ss/gr-dsss/doc (from rev 9737,
gnuradio/branches/developers/jcorgan/dsss/gr-dsss/doc)
Property changes on: gnuradio/branches/developers/jcorgan/ss/gr-dsss/doc
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
Deleted: gnuradio/branches/developers/jcorgan/ss/gr-dsss/doc/Makefile.am
Copied: gnuradio/branches/developers/jcorgan/ss/gr-dsss/doc/Makefile.am (from
rev 9737, gnuradio/branches/developers/jcorgan/dsss/gr-dsss/doc/Makefile.am)
===================================================================
--- gnuradio/branches/developers/jcorgan/ss/gr-dsss/doc/Makefile.am
(rev 0)
+++ gnuradio/branches/developers/jcorgan/ss/gr-dsss/doc/Makefile.am
2008-10-11 02:55:09 UTC (rev 9773)
@@ -0,0 +1,25 @@
+#
+# Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+
+include $(top_srcdir)/Makefile.common
+
+ourdocdir = $(gr_docdir)/dsss
+
+dist_ourdoc_DATA =
Copied: gnuradio/branches/developers/jcorgan/ss/gr-dsss/include (from rev 9737,
gnuradio/branches/developers/jcorgan/dsss/gr-dsss/include)
Property changes on: gnuradio/branches/developers/jcorgan/ss/gr-dsss/include
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
Deleted: gnuradio/branches/developers/jcorgan/ss/gr-dsss/include/Makefile.am
Copied: gnuradio/branches/developers/jcorgan/ss/gr-dsss/include/Makefile.am
(from rev 9737,
gnuradio/branches/developers/jcorgan/dsss/gr-dsss/include/Makefile.am)
===================================================================
--- gnuradio/branches/developers/jcorgan/ss/gr-dsss/include/Makefile.am
(rev 0)
+++ gnuradio/branches/developers/jcorgan/ss/gr-dsss/include/Makefile.am
2008-10-11 02:55:09 UTC (rev 9773)
@@ -0,0 +1,23 @@
+#
+# Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+
+include $(top_srcdir)/Makefile.common
+
+SUBDIRS = dsss
Copied: gnuradio/branches/developers/jcorgan/ss/gr-dsss/include/dsss (from rev
9737, gnuradio/branches/developers/jcorgan/dsss/gr-dsss/include/dsss)
Property changes on:
gnuradio/branches/developers/jcorgan/ss/gr-dsss/include/dsss
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
Deleted:
gnuradio/branches/developers/jcorgan/ss/gr-dsss/include/dsss/Makefile.am
Copied:
gnuradio/branches/developers/jcorgan/ss/gr-dsss/include/dsss/Makefile.am (from
rev 9737,
gnuradio/branches/developers/jcorgan/dsss/gr-dsss/include/dsss/Makefile.am)
===================================================================
--- gnuradio/branches/developers/jcorgan/ss/gr-dsss/include/dsss/Makefile.am
(rev 0)
+++ gnuradio/branches/developers/jcorgan/ss/gr-dsss/include/dsss/Makefile.am
2008-10-11 02:55:09 UTC (rev 9773)
@@ -0,0 +1,27 @@
+#
+# Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+
+include $(top_srcdir)/Makefile.common
+
+ourincludedir = $(grincludedir)/dsss
+
+ourinclude_HEADERS = \
+ code_gen_1b.h \
+ msequence_b.h
Deleted:
gnuradio/branches/developers/jcorgan/ss/gr-dsss/include/dsss/code_gen_1b.h
Copied:
gnuradio/branches/developers/jcorgan/ss/gr-dsss/include/dsss/code_gen_1b.h
(from rev 9737,
gnuradio/branches/developers/jcorgan/dsss/gr-dsss/include/dsss/code_gen_1b.h)
===================================================================
--- gnuradio/branches/developers/jcorgan/ss/gr-dsss/include/dsss/code_gen_1b.h
(rev 0)
+++ gnuradio/branches/developers/jcorgan/ss/gr-dsss/include/dsss/code_gen_1b.h
2008-10-11 02:55:09 UTC (rev 9773)
@@ -0,0 +1,40 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2008 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_DSSS_CODE_GEN_1B_H
+#define INCLUDED_DSSS_CODE_GEN_1B_H
+
+#include <gr_sync_block.h>
+
+namespace dsss {
+
+ class code_gen_1b : public gr_sync_block
+ {
+ protected:
+ code_gen_1b(const std::string &name);
+
+ public:
+ ~code_gen_1b();
+ };
+
+} /* namespace dsss */
+
+#endif /* INCLUDED_DSSS_CODE_GEN_1B_H */
Deleted:
gnuradio/branches/developers/jcorgan/ss/gr-dsss/include/dsss/msequence_b.h
Copied:
gnuradio/branches/developers/jcorgan/ss/gr-dsss/include/dsss/msequence_b.h
(from rev 9737,
gnuradio/branches/developers/jcorgan/dsss/gr-dsss/include/dsss/msequence_b.h)
===================================================================
--- gnuradio/branches/developers/jcorgan/ss/gr-dsss/include/dsss/msequence_b.h
(rev 0)
+++ gnuradio/branches/developers/jcorgan/ss/gr-dsss/include/dsss/msequence_b.h
2008-10-11 02:55:09 UTC (rev 9773)
@@ -0,0 +1,54 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2008 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_DSSS_MSEQUENCE_B_H
+#define INCLUDED_DSSS_MSEQUENCE_B_H
+
+#include <dsss/code_gen_1b.h>
+#include <gri_glfsr.h>
+
+namespace dsss {
+
+ class msequence_b;
+ typedef boost::shared_ptr<msequence_b> msequence_b_sptr;
+
+ msequence_b_sptr make_msequence_b(int degree, int mask=0, int seed=1);
+
+ class msequence_b : public code_gen_1b
+ {
+ private:
+ friend msequence_b_sptr make_msequence_b(int degree, int mask, int seed);
+ msequence_b(int degree, int mask, int seed);
+
+ gri_glfsr *d_glfsr;
+
+ public:
+ ~msequence_b();
+
+
+ virtual int work(int noutput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items);
+ };
+
+} /* namespace dsss */
+
+#endif /* INCLUDED_DSSS_MSEQUENCE_B_H */
Copied: gnuradio/branches/developers/jcorgan/ss/gr-dsss/lib (from rev 9737,
gnuradio/branches/developers/jcorgan/dsss/gr-dsss/lib)
Property changes on: gnuradio/branches/developers/jcorgan/ss/gr-dsss/lib
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
.deps
.libs
test_all
Deleted: gnuradio/branches/developers/jcorgan/ss/gr-dsss/lib/Makefile.am
Copied: gnuradio/branches/developers/jcorgan/ss/gr-dsss/lib/Makefile.am (from
rev 9737, gnuradio/branches/developers/jcorgan/dsss/gr-dsss/lib/Makefile.am)
===================================================================
--- gnuradio/branches/developers/jcorgan/ss/gr-dsss/lib/Makefile.am
(rev 0)
+++ gnuradio/branches/developers/jcorgan/ss/gr-dsss/lib/Makefile.am
2008-10-11 02:55:09 UTC (rev 9773)
@@ -0,0 +1,74 @@
+#
+# Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+
+include $(top_srcdir)/Makefile.common
+
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_CPPFLAGS) \
+ -I$(top_srcdir)/gr-dsss/include
+
+# list of programs run by "make check" and "make distcheck"
+TESTS = test_all
+
+lib_LTLIBRARIES = \
+ libgr-dsss.la
+
+noinst_LTLIBRARIES = \
+ libgr-dsss-qa.la
+
+# ----------------------------------------------------------------
+# The main library
+# ----------------------------------------------------------------
+libgr_dsss_la_SOURCES = \
+ code_gen_1b.cc \
+ msequence_b.cc
+
+libgr_dsss_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0
+
+libgr_dsss_la_LIBADD = \
+ $(GNURADIO_CORE_LA)
+
+# ----------------------------------------------------------------
+# The QA library. Note libdsss.la in LIBADD
+# ----------------------------------------------------------------
+libgr_dsss_qa_la_SOURCES = \
+ qa_dsss.cc \
+ qa_code_gen_1b.cc
+
+libgr_dsss_qa_la_LDFLAGS = $(NO_UNDEFINED)
+
+libgr_dsss_qa_la_LIBADD = \
+ libgr-dsss.la \
+ $(CPPUNIT_LIBS)
+
+# ----------------------------------------------------------------
+# headers that don't get installed
+# ----------------------------------------------------------------
+noinst_HEADERS = \
+ qa_dsss.h \
+ qa_code_gen_1b.h
+
+# ----------------------------------------------------------------
+# Our test program
+# ----------------------------------------------------------------
+noinst_PROGRAMS = \
+ test_all
+
+test_all_SOURCES = test_all.cc
+test_all_LDADD = libgr-dsss-qa.la
Deleted: gnuradio/branches/developers/jcorgan/ss/gr-dsss/lib/code_gen_1b.cc
Copied: gnuradio/branches/developers/jcorgan/ss/gr-dsss/lib/code_gen_1b.cc
(from rev 9737,
gnuradio/branches/developers/jcorgan/dsss/gr-dsss/lib/code_gen_1b.cc)
===================================================================
--- gnuradio/branches/developers/jcorgan/ss/gr-dsss/lib/code_gen_1b.cc
(rev 0)
+++ gnuradio/branches/developers/jcorgan/ss/gr-dsss/lib/code_gen_1b.cc
2008-10-11 02:55:09 UTC (rev 9773)
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2008 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 <dsss/code_gen_1b.h>
+#include <gr_io_signature.h>
+
+namespace dsss {
+
+ code_gen_1b::code_gen_1b(const std::string &name)
+ : gr_sync_block(name,
+ gr_make_io_signature(0, 0, 0),
+ gr_make_io_signature(1, 1, 1))
+ {
+ // NOP
+ }
+
+ code_gen_1b::~code_gen_1b()
+ {
+ // NOP
+ }
+
+} /* namespace dsss */
Deleted: gnuradio/branches/developers/jcorgan/ss/gr-dsss/lib/msequence_b.cc
Copied: gnuradio/branches/developers/jcorgan/ss/gr-dsss/lib/msequence_b.cc
(from rev 9737,
gnuradio/branches/developers/jcorgan/dsss/gr-dsss/lib/msequence_b.cc)
===================================================================
--- gnuradio/branches/developers/jcorgan/ss/gr-dsss/lib/msequence_b.cc
(rev 0)
+++ gnuradio/branches/developers/jcorgan/ss/gr-dsss/lib/msequence_b.cc
2008-10-11 02:55:09 UTC (rev 9773)
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2008 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 <dsss/msequence_b.h>
+
+namespace dsss {
+
+ msequence_b_sptr
+ make_msequence_b(int degree, int mask, int seed)
+ {
+ return msequence_b_sptr(new msequence_b(degree, mask, seed));
+ }
+
+ msequence_b::msequence_b(int degree, int mask, int seed)
+ : code_gen_1b("dsss.msequence_b")
+ {
+ if (mask == 0)
+ mask = gri_glfsr::glfsr_mask(degree);
+
+ d_glfsr = new gri_glfsr(mask, seed);
+ }
+
+ msequence_b::~msequence_b()
+ {
+ delete d_glfsr;
+ }
+
+ int
+ msequence_b::work(int noutput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items)
+ {
+ return noutput_items;
+ }
+
+} /* namespace dsss */
Deleted: gnuradio/branches/developers/jcorgan/ss/gr-dsss/lib/qa_code_gen_1b.cc
Copied: gnuradio/branches/developers/jcorgan/ss/gr-dsss/lib/qa_code_gen_1b.cc
(from rev 9737,
gnuradio/branches/developers/jcorgan/dsss/gr-dsss/lib/qa_code_gen_1b.cc)
===================================================================
--- gnuradio/branches/developers/jcorgan/ss/gr-dsss/lib/qa_code_gen_1b.cc
(rev 0)
+++ gnuradio/branches/developers/jcorgan/ss/gr-dsss/lib/qa_code_gen_1b.cc
2008-10-11 02:55:09 UTC (rev 9773)
@@ -0,0 +1,30 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <qa_code_gen_1b.h>
+#include <cppunit/TestAssert.h>
+#include <dsss/code_gen_1b.h>
+
+void
+qa_code_gen_1b::t1()
+{
+ CPPUNIT_ASSERT(true);
+}
Deleted: gnuradio/branches/developers/jcorgan/ss/gr-dsss/lib/qa_code_gen_1b.h
Copied: gnuradio/branches/developers/jcorgan/ss/gr-dsss/lib/qa_code_gen_1b.h
(from rev 9737,
gnuradio/branches/developers/jcorgan/dsss/gr-dsss/lib/qa_code_gen_1b.h)
===================================================================
--- gnuradio/branches/developers/jcorgan/ss/gr-dsss/lib/qa_code_gen_1b.h
(rev 0)
+++ gnuradio/branches/developers/jcorgan/ss/gr-dsss/lib/qa_code_gen_1b.h
2008-10-11 02:55:09 UTC (rev 9773)
@@ -0,0 +1,38 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+#ifndef INCLUDED_QA_CODE_GEN_1B_H
+#define INCLUDED_QA_CODE_GEN_1B_H
+
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestCase.h>
+
+class qa_code_gen_1b : public CppUnit::TestCase {
+
+ CPPUNIT_TEST_SUITE (qa_code_gen_1b);
+ CPPUNIT_TEST (t1);
+ CPPUNIT_TEST_SUITE_END ();
+
+ private:
+ void t1 ();
+};
+
+
+#endif /* INCLUDED_QA_CODE_GEN_1B_H */
Deleted: gnuradio/branches/developers/jcorgan/ss/gr-dsss/lib/qa_dsss.cc
Copied: gnuradio/branches/developers/jcorgan/ss/gr-dsss/lib/qa_dsss.cc (from
rev 9737, gnuradio/branches/developers/jcorgan/dsss/gr-dsss/lib/qa_dsss.cc)
===================================================================
--- gnuradio/branches/developers/jcorgan/ss/gr-dsss/lib/qa_dsss.cc
(rev 0)
+++ gnuradio/branches/developers/jcorgan/ss/gr-dsss/lib/qa_dsss.cc
2008-10-11 02:55:09 UTC (rev 9773)
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2008 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.
+ */
+
+/*
+ * This class gathers together all the test cases for the example
+ * directory into a single test suite. As you create new test cases,
+ * add them here.
+ */
+
+#include <qa_dsss.h>
+#include <qa_code_gen_1b.h>
+
+CppUnit::TestSuite *
+qa_dsss::suite()
+{
+ CppUnit::TestSuite *s = new CppUnit::TestSuite("dsss");
+
+ s->addTest(qa_code_gen_1b::suite());
+
+ return s;
+}
Deleted: gnuradio/branches/developers/jcorgan/ss/gr-dsss/lib/qa_dsss.h
Copied: gnuradio/branches/developers/jcorgan/ss/gr-dsss/lib/qa_dsss.h (from rev
9737, gnuradio/branches/developers/jcorgan/dsss/gr-dsss/lib/qa_dsss.h)
===================================================================
--- gnuradio/branches/developers/jcorgan/ss/gr-dsss/lib/qa_dsss.h
(rev 0)
+++ gnuradio/branches/developers/jcorgan/ss/gr-dsss/lib/qa_dsss.h
2008-10-11 02:55:09 UTC (rev 9773)
@@ -0,0 +1,36 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2008 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 Example 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 Example Public License for more details.
+ *
+ * You should have received a copy of the GNU Example 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_QA_DSSS_H
+#define INCLUDED_QA_DSSS_H
+
+#include <cppunit/TestSuite.h>
+
+//! collect all the tests for the example directory
+
+class qa_dsss {
+ public:
+ //! return suite of tests for all of example directory
+ static CppUnit::TestSuite *suite ();
+};
+
+#endif /* INCLUDED_QA_DSSS_H */
Deleted: gnuradio/branches/developers/jcorgan/ss/gr-dsss/lib/test_all.cc
Copied: gnuradio/branches/developers/jcorgan/ss/gr-dsss/lib/test_all.cc (from
rev 9737, gnuradio/branches/developers/jcorgan/dsss/gr-dsss/lib/test_all.cc)
===================================================================
--- gnuradio/branches/developers/jcorgan/ss/gr-dsss/lib/test_all.cc
(rev 0)
+++ gnuradio/branches/developers/jcorgan/ss/gr-dsss/lib/test_all.cc
2008-10-11 02:55:09 UTC (rev 9773)
@@ -0,0 +1,38 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2002,2008 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 <cppunit/TextTestRunner.h>
+
+#include <qa_dsss.h>
+
+int
+main (int argc, char **argv)
+{
+
+ CppUnit::TextTestRunner runner;
+
+ runner.addTest (qa_dsss::suite ());
+
+ bool was_successful = runner.run ("", false);
+
+ return was_successful ? 0 : 1;
+}
Copied: gnuradio/branches/developers/jcorgan/ss/gr-dsss/python (from rev 9737,
gnuradio/branches/developers/jcorgan/dsss/gr-dsss/python)
Property changes on: gnuradio/branches/developers/jcorgan/ss/gr-dsss/python
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
.libs
.deps
*.pyc
dsss_swig.cc
dsss_swig.py
run_tests
Deleted: gnuradio/branches/developers/jcorgan/ss/gr-dsss/python/Makefile.am
Copied: gnuradio/branches/developers/jcorgan/ss/gr-dsss/python/Makefile.am
(from rev 9737,
gnuradio/branches/developers/jcorgan/dsss/gr-dsss/python/Makefile.am)
===================================================================
--- gnuradio/branches/developers/jcorgan/ss/gr-dsss/python/Makefile.am
(rev 0)
+++ gnuradio/branches/developers/jcorgan/ss/gr-dsss/python/Makefile.am
2008-10-11 02:55:09 UTC (rev 9773)
@@ -0,0 +1,100 @@
+#
+# Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+
+include $(top_srcdir)/Makefile.common
+
+ourpythondir = $(grpythondir)/dsss
+ourpyexecdir = $(grpyexecdir)/dsss
+ourswigincludedir = $(grincludedir)/dsss/swig
+
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \
+ -I$(top_srcdir)/gr-dsss/include
+
+SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(SWIGGRFLAGS) $(STD_DEFINES_AND_INCLUDES)
\
+ $(WITH_INCLUDES) $(WITH_SWIG_INCLUDES)
+
+BUILT_SOURCES = $(swig_built_sources)
+
+MOSTLYCLEANFILES = $(BUILT_SOURCES) *.pyc
+
+# Don't distribute the output of swig
+dist-hook:
+ @for file in $(swig_built_sources); do echo $(RM) $(distdir)/$$file;
done
+ @for file in $(swig_built_sources); do $(RM) $(distdir)/$$file; done
+
+
+TESTS = run_tests
+
+
+ALL_IFILES = \
+ $(LOCAL_IFILES) \
+ $(NON_LOCAL_IFILES)
+
+NON_LOCAL_IFILES = \
+ $(GNURADIO_I)
+
+LOCAL_IFILES = \
+ dsss.i
+
+
+# These files are built by SWIG. The first is the C++ glue.
+# The second is the python wrapper that loads the _dsss shared library
+# and knows how to call our extensions.
+
+swig_built_sources = \
+ dsss_swig.cc \
+ dsss_swig.py
+
+# This gets dsss.py installed in the right place.
+# Any hand-written python should be listed here too.
+ourpython_PYTHON = \
+ __init__.py \
+ dsss_swig.py
+
+# Python QA code gets listed here. It's not installed.
+noinst_PYTHON = \
+ qa_dsss.py
+
+# This library contains the swig generated glue
+ourpyexec_LTLIBRARIES = _dsss_swig.la
+
+# These are the source files that go into the shared library
+_dsss_swig_la_SOURCES = \
+ dsss_swig.cc
+
+# Dummy C++ source to cause C++ linking
+nodist_EXTRA__dsss_swig_la_SOURCES = dummy.cc
+
+# magic flags
+_dsss_swig_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
+
+# Link the swig generated code against our library and some python magic.
+_dsss_swig_la_LIBADD = \
+ ../lib/libgr-dsss.la \
+ $(PYTHON_LDFLAGS)
+
+
+dsss_swig.cc dsss_swig.py: $(LOCAL_IFILES) $(ALL_IFILES)
+ $(SWIG) $(SWIGPYTHONARGS) -module dsss_swig -o dsss_swig.cc
$(srcdir)/dsss.i
+
+
+# These swig headers get installed in ${prefix}/include/<component>/swig
+ourswiginclude_HEADERS = \
+ $(LOCAL_IFILES)
Deleted: gnuradio/branches/developers/jcorgan/ss/gr-dsss/python/__init__.py
Copied: gnuradio/branches/developers/jcorgan/ss/gr-dsss/python/__init__.py
(from rev 9737,
gnuradio/branches/developers/jcorgan/dsss/gr-dsss/python/__init__.py)
===================================================================
--- gnuradio/branches/developers/jcorgan/ss/gr-dsss/python/__init__.py
(rev 0)
+++ gnuradio/branches/developers/jcorgan/ss/gr-dsss/python/__init__.py
2008-10-11 02:55:09 UTC (rev 9773)
@@ -0,0 +1,53 @@
+#
+# Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+
+# The presence of this file turns this directory into a Python package
+
+# ----------------------------------------------------------------
+# Temporary workaround for ticket:181 (swig+python problem)
+import sys
+_RTLD_GLOBAL = 0
+try:
+ from dl import RTLD_GLOBAL as _RTLD_GLOBAL
+except ImportError:
+ try:
+ from DLFCN import RTLD_GLOBAL as _RTLD_GLOBAL
+ except ImportError:
+ pass
+
+if _RTLD_GLOBAL != 0:
+ _dlopenflags = sys.getdlopenflags()
+ sys.setdlopenflags(_dlopenflags|_RTLD_GLOBAL)
+# ----------------------------------------------------------------
+
+
+# import swig generated symbols into the dsss namespace
+from dsss_swig import *
+
+# import any pure python here
+# from dsss_foo import bar
+# from dsss_baz import *
+
+
+# ----------------------------------------------------------------
+# Tail of workaround
+if _RTLD_GLOBAL != 0:
+ sys.setdlopenflags(_dlopenflags) # Restore original flags
+# ----------------------------------------------------------------
Deleted: gnuradio/branches/developers/jcorgan/ss/gr-dsss/python/code_gen_1b.i
Copied: gnuradio/branches/developers/jcorgan/ss/gr-dsss/python/code_gen_1b.i
(from rev 9737,
gnuradio/branches/developers/jcorgan/dsss/gr-dsss/python/code_gen_1b.i)
===================================================================
--- gnuradio/branches/developers/jcorgan/ss/gr-dsss/python/code_gen_1b.i
(rev 0)
+++ gnuradio/branches/developers/jcorgan/ss/gr-dsss/python/code_gen_1b.i
2008-10-11 02:55:09 UTC (rev 9773)
@@ -0,0 +1,37 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2008 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 <dsss/code_gen_1b.h>
+%}
+
+namespace dsss {
+
+ SWIG_SHARED_PTR(code_gen_1b_sptr, dsss::code_gen_1b);
+
+ class code_gen_1b
+ {
+ protected:
+ code_gen_1b();
+ };
+
+}
Deleted: gnuradio/branches/developers/jcorgan/ss/gr-dsss/python/dsss.i
Copied: gnuradio/branches/developers/jcorgan/ss/gr-dsss/python/dsss.i (from rev
9737, gnuradio/branches/developers/jcorgan/dsss/gr-dsss/python/dsss.i)
===================================================================
--- gnuradio/branches/developers/jcorgan/ss/gr-dsss/python/dsss.i
(rev 0)
+++ gnuradio/branches/developers/jcorgan/ss/gr-dsss/python/dsss.i
2008-10-11 02:55:09 UTC (rev 9773)
@@ -0,0 +1,32 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+%feature("autodoc", "1"); // generate python docstrings
+
+//%include <exception.i>
+%import <gnuradio.i> // the common stuff
+
+%{
+#include "gnuradio_swig_bug_workaround.h" // mandatory bug fix
+#include <stdexcept>
+%}
+
+%include "code_gen_1b.i"
Deleted: gnuradio/branches/developers/jcorgan/ss/gr-dsss/python/qa_dsss.py
Copied: gnuradio/branches/developers/jcorgan/ss/gr-dsss/python/qa_dsss.py (from
rev 9737, gnuradio/branches/developers/jcorgan/dsss/gr-dsss/python/qa_dsss.py)
===================================================================
--- gnuradio/branches/developers/jcorgan/ss/gr-dsss/python/qa_dsss.py
(rev 0)
+++ gnuradio/branches/developers/jcorgan/ss/gr-dsss/python/qa_dsss.py
2008-10-11 02:55:09 UTC (rev 9773)
@@ -0,0 +1,39 @@
+#!/usr/bin/env python
+#
+# Copyright 2008 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.
+#
+
+from gnuradio import gr, gr_unittest
+import dsss_swig as dsss
+
+class qa_dsss(gr_unittest.TestCase):
+
+ def setUp(self):
+ self.tb = gr.top_block()
+
+ def tearDown(self):
+ self.tb = None
+
+ def test_001_nop(self):
+ g = dsss.code_gen_1b()
+ self.assertTrue(g.next() == 0)
+
+if __name__ == '__main__':
+ gr_unittest.main()
Deleted: gnuradio/branches/developers/jcorgan/ss/gr-dsss/python/run_tests.in
Copied: gnuradio/branches/developers/jcorgan/ss/gr-dsss/python/run_tests.in
(from rev 9737,
gnuradio/branches/developers/jcorgan/dsss/gr-dsss/python/run_tests.in)
===================================================================
--- gnuradio/branches/developers/jcorgan/ss/gr-dsss/python/run_tests.in
(rev 0)
+++ gnuradio/branches/developers/jcorgan/ss/gr-dsss/python/run_tests.in
2008-10-11 02:55:09 UTC (rev 9773)
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# 1st parameter is absolute path to component source directory
+# 2nd parameter is absolute path to component build directory
+# 3rd parameter is path to Python QA directory
+
address@hidden@/run_tests.sh \
+ @abs_top_srcdir@/gr-dsss \
+ @abs_top_builddir@/gr-dsss \
+ @srcdir@
Modified: gnuradio/branches/developers/jcorgan/ss/run_tests.sh.in
===================================================================
--- gnuradio/branches/developers/jcorgan/ss/run_tests.sh.in 2008-10-11
02:12:45 UTC (rev 9772)
+++ gnuradio/branches/developers/jcorgan/ss/run_tests.sh.in 2008-10-11
02:55:09 UTC (rev 9773)
@@ -14,13 +14,13 @@
export srcdir=$3
# Where to find my swig generated shared library
-mylibdir=$2/src:$2/src/.libs:$2/src/lib:$2/src/lib/.libs
+mylibdir=$2/src:$2/src/.libs:$2/src/lib:$2/src/lib/.libs:$2/python/.libs
# Where to find my swig generated python module
-mysrcdir=$1/src:$1/src/lib
+mysrcdir=$1/src:$1/src/lib:$1/python
# Where to find my hand written python modules
-mypydir=$1/src:$1/src/python
+mypydir=$1/src:$1/src/python:$1/python
# Where to find core's swig generated shared libraries,
# and hand generated swig glue
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r9773 - in gnuradio/branches/developers/jcorgan/ss: . config gr-dsss gr-dsss/data gr-dsss/doc gr-dsss/include gr-dsss/include/dsss gr-dsss/lib gr-dsss/python,
jcorgan <=