[Commit-gnuradio] r10105 - in gnuradio/branches/features/cppdb-test: config gnuradio-examples/c++ gr-usrp/src

[jcorgan]

Author: jcorgan
Date: 2008-12-05 11:01:33 -0700 (Fri, 05 Dec 2008)
New Revision: 10105

Removed:
   gnuradio/branches/features/cppdb-test/gnuradio-examples/c++/usrp_test/
Modified:
   gnuradio/branches/features/cppdb-test/config/grc_gnuradio_examples.m4
   gnuradio/branches/features/cppdb-test/gr-usrp/src/usrp.i
Log:
Cleanup and fixes, passes make distcheck.

Modified: gnuradio/branches/features/cppdb-test/config/grc_gnuradio_examples.m4
===================================================================
--- gnuradio/branches/features/cppdb-test/config/grc_gnuradio_examples.m4       
2008-12-05 16:17:35 UTC (rev 10104)
+++ gnuradio/branches/features/cppdb-test/config/grc_gnuradio_examples.m4       
2008-12-05 18:01:33 UTC (rev 10105)
@@ -26,7 +26,6 @@
     AC_CONFIG_FILES([ \
         gnuradio-examples/Makefile \
        gnuradio-examples/c++/Makefile \
-        gnuradio-examples/c++/dial_tone/Makefile \
        gnuradio-examples/python/Makefile \
        gnuradio-examples/python/apps/hf_explorer/Makefile \
        gnuradio-examples/python/apps/hf_radio/Makefile \

Modified: gnuradio/branches/features/cppdb-test/gr-usrp/src/usrp.i
===================================================================
--- gnuradio/branches/features/cppdb-test/gr-usrp/src/usrp.i    2008-12-05 
16:17:35 UTC (rev 10104)
+++ gnuradio/branches/features/cppdb-test/gr-usrp/src/usrp.i    2008-12-05 
18:01:33 UTC (rev 10105)
@@ -33,6 +33,8 @@
 
 %include <usrp_subdev_spec.h>
 %include <db_base.i>
+%include <fpga_regs_common.h>
+%include <fpga_regs_standard.h>
 %include "usrp_standard.i"
 %include "usrp_base.i"
 %include "usrp_source_base.i"
@@ -45,9 +47,6 @@
 //---Allow a more Pythonic interface
 %pythoncode %{
 
-# Grab USRP register definitions
-from usrpm.usrp_fpga_regs import *
-
 # Allow subdev_spec to be tuple
 def __selected_subdev(self, subdev_spec):
   ss = usrp_subdev_spec(subdev_spec[0], subdev_spec[1])