[Commit-gnuradio] r3812 - in gnuradio/branches/developers/jcorgan/cppwrap: gnuradio-examples/c++/usrp_wfm_rcv gr-usrp/src

[jcorgan]

Author: jcorgan
Date: 2006-10-17 15:35:48 -0600 (Tue, 17 Oct 2006)
New Revision: 3812

Modified:
   
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-examples/c++/usrp_wfm_rcv/Makefile.am
   
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-examples/c++/usrp_wfm_rcv/usrp_wfm_rcv.cc
   gnuradio/branches/developers/jcorgan/cppwrap/gr-usrp/src/Makefile.am
Log:
Changes to create and link against new libgr_usrp

Modified: 
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-examples/c++/usrp_wfm_rcv/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-examples/c++/usrp_wfm_rcv/Makefile.am
 2006-10-17 20:35:52 UTC (rev 3811)
+++ 
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-examples/c++/usrp_wfm_rcv/Makefile.am
 2006-10-17 21:35:48 UTC (rev 3812)
@@ -22,12 +22,17 @@
 include $(top_srcdir)/Makefile.common
 
 # For compiling within the GNU Radio build tree
-INCLUDES=$(STD_DEFINES_AND_INCLUDES)
+INCLUDES=$(STD_DEFINES_AND_INCLUDES) \
+         -I$(top_srcdir)/gr-usrp/src \
+         -I$(top_srcdir)/gr-audio-alsa/src
+
+GR_USRP_LIBS=$(top_builddir)/gr-usrp/src/libgr_usrp.la
 GR_AUDIO_ALSA_LIBS=$(top_builddir)/gr-audio-alsa/src/libgr_audio_alsa.la
 
 # For compiling outside the tree, these are the usual
 # INCLUDES = -I/usr/local/include -I/usr/local/include/gnuradio
 # GNURADIO_CORE_LIBS = -lgnuradio-core
+# GR_USRP_LIBS       = -lgr_usrp
 # GR_AUDIO_ALSA_LIBS = -lgr_audio_alsa
 
 noinst_PROGRAMS = usrp_wfm_rcv
@@ -36,6 +41,7 @@
     
 usrp_wfm_rcv_LDADD = \
     $(GNURADIO_CORE_LIBS) \
+    $(GR_USRP_LIBS) \
     $(GR_AUDIO_ALSA_LIBS)
 
 MOSTLYCLEANFILES = *~

Modified: 
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-examples/c++/usrp_wfm_rcv/usrp_wfm_rcv.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-examples/c++/usrp_wfm_rcv/usrp_wfm_rcv.cc
     2006-10-17 20:35:52 UTC (rev 3811)
+++ 
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-examples/c++/usrp_wfm_rcv/usrp_wfm_rcv.cc
     2006-10-17 21:35:48 UTC (rev 3812)
@@ -19,14 +19,31 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <gnuradio/audio_alsa_sink.h>
+#include <usrp1_source_c.h>
+#include <audio_alsa_sink.h>
 #include <gr_flow_graph.h>
 
+#define RX_BOARD   0
+#define USRP_DECIM 250
+#define USRP_NCHAN 1
+#define USRP_MUX   0x32103210
+
 int main()
 {
+    usrp1_source_c_sptr src;
     audio_alsa_sink_sptr sink;
     gr_flow_graph_sptr fg;
     
+    src = usrp1_make_source_c(RX_BOARD,
+                             USRP_DECIM,
+                             USRP_NCHAN,
+                             USRP_MUX,
+                             0,                // mode
+                             0,                // fusb_block_size
+                             0,                // fusb_nblocks
+                             "",               // fpga_filename
+                             "");              // firmware_filename
+                             
     sink = audio_alsa_make_sink(48000);
     
     fg = gr_make_flow_graph();

Modified: gnuradio/branches/developers/jcorgan/cppwrap/gr-usrp/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/cppwrap/gr-usrp/src/Makefile.am        
2006-10-17 20:35:52 UTC (rev 3811)
+++ gnuradio/branches/developers/jcorgan/cppwrap/gr-usrp/src/Makefile.am        
2006-10-17 21:35:48 UTC (rev 3812)
@@ -81,9 +81,12 @@
 
 ourlib_LTLIBRARIES = _usrp1.la
 
+lib_LTLIBRARIES = libgr_usrp.la
 
 _usrp1_la_SOURCES =                    \
-       usrp1.cc                        \
+       usrp1.cc
+
+libgr_usrp_la_SOURCES =                        \
        usrp1_sink_base.cc              \
        usrp1_sink_c.cc                 \
        usrp1_sink_s.cc                 \
@@ -91,28 +94,28 @@
        usrp1_source_c.cc               \
        usrp1_source_s.cc               
 
-
 _usrp1_la_LIBADD =                     \
        $(PYTHON_LDFLAGS)               \
-       $(GNURADIO_CORE_LIBS)           \
-       $(USRP_LIBS)                    \
+       libgr_usrp.la                   \
        -lstdc++
 
+libgr_usrp_la_LIBADD =                 \
+       $(GNURADIO_CORE_LIBS)           \
+       $(USRP_LIBS)
 
 _usrp1_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
 
+libgr_usrp_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version
 
 usrp1.cc usrp1.py: usrp1.i $(NON_LOCAL_IFILES) $(LOCAL_IFILES)
        $(SWIG) $(SWIGPYTHONARGS) -module usrp1 -o usrp1.cc $(LOCAL_IFILES)
 
-
 noinst_PYTHON =                                \
        qa_usrp.py                      
 
 MOSTLYCLEANFILES = \
        $(BUILT_SOURCES) *~ *.pyc
 
-
 # Don't distribute output of swig
 dist-hook:
        @for file in $(BUILT_SOURCES); do echo $(RM) $(distdir)/$$file; done