[Commit-gnuradio] r9449 - in gnuradio/branches/features/gr-usrp2: config gr-usrp2 gr-usrp2/src

[jcorgan]

Author: jcorgan
Date: 2008-08-29 14:02:46 -0600 (Fri, 29 Aug 2008)
New Revision: 9449

Added:
   gnuradio/branches/features/gr-usrp2/config/grc_gr_usrp2.m4
   gnuradio/branches/features/gr-usrp2/gr-usrp2/Makefile.am
Modified:
   gnuradio/branches/features/gr-usrp2/gr-usrp2/src/Makefile.am
   gnuradio/branches/features/gr-usrp2/gr-usrp2/src/usrp2.i
Log:
wip

Added: gnuradio/branches/features/gr-usrp2/config/grc_gr_usrp2.m4
===================================================================
--- gnuradio/branches/features/gr-usrp2/config/grc_gr_usrp2.m4                  
        (rev 0)
+++ gnuradio/branches/features/gr-usrp2/config/grc_gr_usrp2.m4  2008-08-29 
20:02:46 UTC (rev 9449)
@@ -0,0 +1,39 @@
+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_USRP2],[
+    GRC_ENABLE(gr-usrp2)
+
+    dnl Don't do gr-usrp if gnuradio-core skipped
+    GRC_CHECK_DEPENDENCY(gr-usrp, gnuradio-core)
+
+    dnl Fetch libusrp2 variables
+    PKG_CHECK_MODULES(USRP2, usrp2)
+
+    AC_CONFIG_FILES([ \
+        gr-usrp2/Makefile \
+        gr-usrp2/src/Makefile \
+        gr-usrp2/src/run_tests \
+    ])
+
+    GRC_BUILD_CONDITIONAL(gr-usrp2,[
+       dnl run_tests is created from run_tests.in.  Make it executable.
+       AC_CONFIG_COMMANDS([run_tests_usrp2], [chmod +x gr-usrp2/src/run_tests])
+    ])
+])

Added: gnuradio/branches/features/gr-usrp2/gr-usrp2/Makefile.am
===================================================================
--- gnuradio/branches/features/gr-usrp2/gr-usrp2/Makefile.am                    
        (rev 0)
+++ gnuradio/branches/features/gr-usrp2/gr-usrp2/Makefile.am    2008-08-29 
20:02:46 UTC (rev 9449)
@@ -0,0 +1,24 @@
+#
+# Copyright 2001,2006,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 = src

Modified: gnuradio/branches/features/gr-usrp2/gr-usrp2/src/Makefile.am
===================================================================
--- gnuradio/branches/features/gr-usrp2/gr-usrp2/src/Makefile.am        
2008-08-29 19:45:44 UTC (rev 9448)
+++ gnuradio/branches/features/gr-usrp2/gr-usrp2/src/Makefile.am        
2008-08-29 20:02:46 UTC (rev 9449)
@@ -65,7 +65,7 @@
 test_gr_usrp2_LDADD = libgr-usrp2.la
 
 # Uncomment to include swig part of build
-#include Makefile.swig
+include Makefile.swig
 
 # ----------------------------------------------------------------------
 # Local Python files, not installed

Modified: gnuradio/branches/features/gr-usrp2/gr-usrp2/src/usrp2.i
===================================================================
--- gnuradio/branches/features/gr-usrp2/gr-usrp2/src/usrp2.i    2008-08-29 
19:45:44 UTC (rev 9448)
+++ gnuradio/branches/features/gr-usrp2/gr-usrp2/src/usrp2.i    2008-08-29 
20:02:46 UTC (rev 9449)
@@ -26,6 +26,7 @@
 %import "gnuradio.i"                           // the common stuff
 
 %{
+#include <gnuradio_swig_bug_workaround.h>
 //#include "usrp2_sink_32fc.h"
 #include "usrp2_source_32fc.h"
 %}
@@ -97,6 +98,6 @@
   ~usrp2_source_32fc();
 
   bool set_gain(double gain);
-  bool set_center_freq(double frequency, tune_result r);
+  //bool set_center_freq(double frequency, tune_result r);
   bool set_decim(int decimation_factor);
 };