[Commit-gnuradio] r9658 - in gnuradio/branches/features/cppdb: config gnuradio-examples/c++/usrp_test gr-usrp/src usrp/host/lib/legacy

[jcorgan]

Author: jcorgan
Date: 2008-09-24 13:43:56 -0600 (Wed, 24 Sep 2008)
New Revision: 9658

Modified:
   gnuradio/branches/features/cppdb/config/grc_gnuradio_examples.m4
   gnuradio/branches/features/cppdb/gnuradio-examples/c++/usrp_test/
   gnuradio/branches/features/cppdb/gnuradio-examples/c++/usrp_test/main.cc
   gnuradio/branches/features/cppdb/gr-usrp/src/
   gnuradio/branches/features/cppdb/gr-usrp/src/Makefile.am
   gnuradio/branches/features/cppdb/usrp/host/lib/legacy/db_dtt754.cc
   gnuradio/branches/features/cppdb/usrp/host/lib/legacy/db_dtt768.cc
Log:
Fixes to pass make check, mostly removing compiler warnings.  Don't forget to 
back out the C++ examples in config before merge.

Modified: gnuradio/branches/features/cppdb/config/grc_gnuradio_examples.m4
===================================================================
--- gnuradio/branches/features/cppdb/config/grc_gnuradio_examples.m4    
2008-09-24 19:43:13 UTC (rev 9657)
+++ gnuradio/branches/features/cppdb/config/grc_gnuradio_examples.m4    
2008-09-24 19:43:56 UTC (rev 9658)
@@ -26,6 +26,8 @@
     AC_CONFIG_FILES([ \
         gnuradio-examples/Makefile \
        gnuradio-examples/c++/Makefile \
+        gnuradio-examples/c++/dial_tone/Makefile \
+       gnuradio-examples/c++/usrp_test/Makefile \
        gnuradio-examples/python/Makefile \
        gnuradio-examples/python/apps/hf_explorer/Makefile \
        gnuradio-examples/python/apps/hf_radio/Makefile \


Property changes on: 
gnuradio/branches/features/cppdb/gnuradio-examples/c++/usrp_test
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in
.libs
.deps
usrp_test


Modified: 
gnuradio/branches/features/cppdb/gnuradio-examples/c++/usrp_test/main.cc
===================================================================
--- gnuradio/branches/features/cppdb/gnuradio-examples/c++/usrp_test/main.cc    
2008-09-24 19:43:13 UTC (rev 9657)
+++ gnuradio/branches/features/cppdb/gnuradio-examples/c++/usrp_test/main.cc    
2008-09-24 19:43:56 UTC (rev 9658)
@@ -28,8 +28,8 @@
   
   std::vector<gr_complex> data = top_block->sink->data();
   
-  printf("data size: %d\n", data.size());
-  for(int i=0; i < data.size(); i++) {
+  printf("data size: %zu\n", data.size());
+  for(unsigned int i=0; i < data.size(); i++) {
     printf("%f + j%f, ", data[i].real(), data[i].imag());
   }
   printf("\n");


Property changes on: gnuradio/branches/features/cppdb/gr-usrp/src
___________________________________________________________________
Name: svn:ignore
   - Makefile
Makefile.in
.la
.lo
.deps
.libs
*.la
*.lo
usrp0.cc
usrp0.h
usrp1.h
usrp1.cc
usrp1.py
usrp0.py
run_tests
usrp_dbids.py
*.pyc
   + Makefile
Makefile.in
.la
.lo
.deps
.libs
*.la
*.lo
usrp0.cc
usrp0.h
usrp1.h
usrp1.cc
usrp1.py
usrp0.py
usrp.py
run_tests
usrp_dbids.py
*.pyc


Modified: gnuradio/branches/features/cppdb/gr-usrp/src/Makefile.am
===================================================================
--- gnuradio/branches/features/cppdb/gr-usrp/src/Makefile.am    2008-09-24 
19:43:13 UTC (rev 9657)
+++ gnuradio/branches/features/cppdb/gr-usrp/src/Makefile.am    2008-09-24 
19:43:56 UTC (rev 9658)
@@ -28,11 +28,6 @@
 ourpythondir = $(grpythondir)
 ourlibdir    = $(grpyexecdir)
 
-#AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
-#SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \
-#      $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)
-
-
 EXTRA_DIST = run_tests.in
 TESTS = run_tests
 
@@ -99,10 +94,9 @@
        $(USRP_LA)                      \
        -lstdc++
 
-
 _usrp_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
 
-_usrp1_la_CXXFLAGS = @swig_CXXFLAGS@
+_usrp_la_CXXFLAGS = @swig_CXXFLAGS@
 
 usrp1.cc usrp.py: $(NON_LOCAL_IFILES) usrp1.i
        $(SWIG) $(SWIGPYTHONARGS) -module usrp -o usrp1.cc usrp1.i

Modified: gnuradio/branches/features/cppdb/usrp/host/lib/legacy/db_dtt754.cc
===================================================================
--- gnuradio/branches/features/cppdb/usrp/host/lib/legacy/db_dtt754.cc  
2008-09-24 19:43:13 UTC (rev 9657)
+++ gnuradio/branches/features/cppdb/usrp/host/lib/legacy/db_dtt754.cc  
2008-09-24 19:43:56 UTC (rev 9658)
@@ -185,6 +185,8 @@
   _set_rfagc(rfgain);
   _set_ifagc(ifgain);
   _set_pga(pgagain);
+
+  return true; // can't fail with the assert in place
 }
 
 float

Modified: gnuradio/branches/features/cppdb/usrp/host/lib/legacy/db_dtt768.cc
===================================================================
--- gnuradio/branches/features/cppdb/usrp/host/lib/legacy/db_dtt768.cc  
2008-09-24 19:43:13 UTC (rev 9657)
+++ gnuradio/branches/features/cppdb/usrp/host/lib/legacy/db_dtt768.cc  
2008-09-24 19:43:56 UTC (rev 9658)
@@ -28,7 +28,7 @@
   int C = 0;   // Charge Pump Current, no info on how to choose
   int R = 4;   // 125 kHz fref
   
-  int ATP = 7; // Disable internal AGC
+  // int ATP = 7; // Disable internal AGC
   return (0x80 | C<<5 | R);
 }