commit-gnuradio
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commit-gnuradio] r11415 - in gnuradio/branches/developers/balister/arm-

From: balister
Subject: [Commit-gnuradio] r11415 - in gnuradio/branches/developers/balister/arm-configure: . debian gnuradio-core/src/python/gnuradio/gruimpl gnuradio-examples/python/digital gr-radar-mono/src/python gr-sounder/src/python gr-wxgui/src/python usrp/host/include/usrp usrp/host/lib usrp/limbo/apps-inband
Date: Fri, 10 Jul 2009 15:11:47 -0600 (MDT) 
Author: balister
Date: 2009-07-10 15:11:47 -0600 (Fri, 10 Jul 2009)
New Revision: 11415

Added:
   gnuradio/branches/developers/balister/arm-configure/debian/changelog.in
   
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/python/gnuradio/gruimpl/msgq_runner.py
   
gnuradio/branches/developers/balister/arm-configure/gnuradio-examples/python/digital/usrp_receive_path.py
   
gnuradio/branches/developers/balister/arm-configure/gnuradio-examples/python/digital/usrp_transmit_path.py
Removed:
   gnuradio/branches/developers/balister/arm-configure/debian/changelog
Modified:
   gnuradio/branches/developers/balister/arm-configure/
   gnuradio/branches/developers/balister/arm-configure/configure.ac
   
gnuradio/branches/developers/balister/arm-configure/debian/gen-install-files.sh
   gnuradio/branches/developers/balister/arm-configure/debian/prefs.py
   
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/python/gnuradio/gruimpl/Makefile.am
   
gnuradio/branches/developers/balister/arm-configure/gnuradio-examples/python/digital/
   
gnuradio/branches/developers/balister/arm-configure/gnuradio-examples/python/digital/Makefile.am
   
gnuradio/branches/developers/balister/arm-configure/gnuradio-examples/python/digital/benchmark_rx.py
   
gnuradio/branches/developers/balister/arm-configure/gnuradio-examples/python/digital/benchmark_tx.py
   
gnuradio/branches/developers/balister/arm-configure/gnuradio-examples/python/digital/generic_usrp.py
   
gnuradio/branches/developers/balister/arm-configure/gnuradio-examples/python/digital/receive_path.py
   
gnuradio/branches/developers/balister/arm-configure/gnuradio-examples/python/digital/rx_voice.py
   
gnuradio/branches/developers/balister/arm-configure/gnuradio-examples/python/digital/transmit_path.py
   
gnuradio/branches/developers/balister/arm-configure/gnuradio-examples/python/digital/tunnel.py
   
gnuradio/branches/developers/balister/arm-configure/gnuradio-examples/python/digital/tx_voice.py
   
gnuradio/branches/developers/balister/arm-configure/gr-radar-mono/src/python/Makefile.am
   
gnuradio/branches/developers/balister/arm-configure/gr-sounder/src/python/Makefile.am
   
gnuradio/branches/developers/balister/arm-configure/gr-wxgui/src/python/common.py
   
gnuradio/branches/developers/balister/arm-configure/gr-wxgui/src/python/fftsink_nongl.py
   
gnuradio/branches/developers/balister/arm-configure/gr-wxgui/src/python/scopesink_nongl.py
   
gnuradio/branches/developers/balister/arm-configure/gr-wxgui/src/python/waterfallsink_nongl.py
   
gnuradio/branches/developers/balister/arm-configure/usrp/host/include/usrp/usrp_basic.h
   
gnuradio/branches/developers/balister/arm-configure/usrp/host/include/usrp/usrp_bytesex.h
   
gnuradio/branches/developers/balister/arm-configure/usrp/host/include/usrp/usrp_local_sighandler.h
   
gnuradio/branches/developers/balister/arm-configure/usrp/host/include/usrp/usrp_prims.h
   
gnuradio/branches/developers/balister/arm-configure/usrp/host/include/usrp/usrp_slots.h
   
gnuradio/branches/developers/balister/arm-configure/usrp/host/include/usrp/usrp_standard.h
   gnuradio/branches/developers/balister/arm-configure/usrp/host/lib/
   gnuradio/branches/developers/balister/arm-configure/usrp/host/lib/gen-ratios
   gnuradio/branches/developers/balister/arm-configure/usrp/limbo/apps-inband/
Log:
Update branch to match trunk


Property changes on: gnuradio/branches/developers/balister/arm-configure
___________________________________________________________________
Modified: svn:mergeinfo
   - /gnuradio/branches/developers/eb/t348:10638-10648
/gnuradio/branches/developers/eb/t364:11016-11017
/gnuradio/branches/developers/eb/t367:11021-11025
/gnuradio/branches/developers/eb/t371:10958-10971
/gnuradio/branches/developers/eb/t378:10683-10688
/gnuradio/branches/developers/jblum/grc:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts:10464-10658
/gnuradio/branches/developers/jblum/vlen:10667-10677
/gnuradio/branches/developers/jblum/wxgui:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier:10818-10858
/gnuradio/branches/developers/jcorgan/deb:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2:10713-10765
/gnuradio/branches/developers/jcorgan/iad2:10771-10887
/gnuradio/branches/developers/jcorgan/np:11124-11148
/gnuradio/branches/developers/jcorgan/t161:10876-10880
/gnuradio/branches/developers/jcorgan/usrp-headers:11378-11390
/gnuradio/branches/developers/michaelld/am_swig_4:10555-10595
/gnuradio/branches/developers/michaelld/two_mods:10540-10546
/gnuradio/branches/developers/trondeau/qt:11235-11360
   + /gnuradio/branches/developers/eb/t348:10638-10648
/gnuradio/branches/developers/eb/t364:11016-11017
/gnuradio/branches/developers/eb/t367:11021-11025
/gnuradio/branches/developers/eb/t371:10958-10971
/gnuradio/branches/developers/eb/t378:10683-10688
/gnuradio/branches/developers/jblum/grc:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts:10464-10658
/gnuradio/branches/developers/jblum/vlen:10667-10677
/gnuradio/branches/developers/jblum/wxgui:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier:10818-10858
/gnuradio/branches/developers/jcorgan/deb:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2:10713-10765
/gnuradio/branches/developers/jcorgan/iad2:10771-10887
/gnuradio/branches/developers/jcorgan/np:11124-11148
/gnuradio/branches/developers/jcorgan/t161:10876-10880
/gnuradio/branches/developers/jcorgan/usrp-headers:11378-11390
/gnuradio/branches/developers/michaelld/am_swig_4:10555-10595
/gnuradio/branches/developers/michaelld/two_mods:10540-10546
/gnuradio/branches/developers/trondeau/qt:11235-11360
/gnuradio/trunk:11397-11414

Modified: gnuradio/branches/developers/balister/arm-configure/configure.ac
===================================================================
--- gnuradio/branches/developers/balister/arm-configure/configure.ac    
2009-07-10 20:29:37 UTC (rev 11414)
+++ gnuradio/branches/developers/balister/arm-configure/configure.ac    
2009-07-10 21:11:47 UTC (rev 11415)
@@ -286,6 +286,8 @@
 
 dnl If this is being done from a subversion tree, create variables
 GR_SUBVERSION
+BUILD_DATE=`date -R`
+AC_SUBST(BUILD_DATE)
 
 dnl Component specific configuration
 dnl The order of the GR_ macros determines the order of compilation
@@ -372,6 +374,7 @@
     Makefile \
     run_tests.sh \
     config/Makefile \
+    debian/changelog \
 ])
 
 dnl run_tests.sh is created from run_tests.sh.in .  Make it executable.

Copied: gnuradio/branches/developers/balister/arm-configure/debian/changelog.in 
(from rev 11414, gnuradio/trunk/debian/changelog.in)
===================================================================
--- gnuradio/branches/developers/balister/arm-configure/debian/changelog.in     
                        (rev 0)
+++ gnuradio/branches/developers/balister/arm-configure/debian/changelog.in     
2009-07-10 21:11:47 UTC (rev 11415)
@@ -0,0 +1,122 @@
+gnuradio (address@hidden@) unstable; urgency=low
+
+  * Development trunk updates as of revision @SVNVERSION@
+  * See http://gnuradio.org/trac
+
+ -- Johnathan Corgan <address@hidden>  @BUILD_DATE@
+
+gnuradio (3.2) unstable; urgency=low
+
+  * New upstream release 3.2
+  * See http://gnuradio.org/trac
+
+ -- Johnathan Corgan <address@hidden>  Sat,  23 May 2009 18:00:00 -0800
+
+gnuradio (3.1.3) stable; urgency=low
+
+  * "Upstream" release, see http://gnuradio.org/trac/wiki/Release3.1Branch
+
+ -- Johnathan Corgan <address@hidden>  Sat, 23 Aug 2008 19:00:00 -0800
+
+gnuradio (3.1.2) stable; urgency=low
+
+  * "Upstream" release, see http://gnuradio.org/trac/wiki/Release3.1Branch
+
+ -- Johnathan Corgan <address@hidden>  Wed, 24 Mar 2008 09:00:00 -0800
+
+gnuradio (3.1.1) stable; urgency=high
+
+  * Fixed regressions in digital packet radio (t196,t198)
+  * Fixed RX phase offset causing sidebands (t195)
+  * Fixed TX I/Q swapping bug (t179)
+  * Fixed loopback bug in gr-sounder
+  * Added complex and dual-channel options to oscope for
+    BasicRX and LFRX
+
+ -- Johnathan Corgan <address@hidden>  Sun,  4 Nov 2007 21:15:00 -0800
+
+gnuradio (3.1.0) stable; urgency=low
+
+  * Release 3.1 stable branch
+  * add/split packages to cover entire GNU Radio distribution
+
+ -- Johnathan Corgan <address@hidden>  Mon, 22 Oct 2007 10:37:00 -0800
+
+gnuradio (3.0.svn) unstable; urgency=low
+
+  * add/split packages to cover entire GNU Radio distribution
+  * fix build failure with gcc-4.3 by adding a #include, closes: #420896
+  * update copyright assertion on the debian/ contents, since I have
+    assigned my copyright to the FSF and now have upstream commit rights
+  * merge debian/ into upstream SVN repository
+  * add --disable-gr-qtgui (at least until we figure out qwt build deps!)
+  * add build dep on python-numpy
+  * conditionalize configure and clean targets to handle build from SVN
+
+ -- Bdale Garbee <address@hidden>  Thu, 26 Jul 2007 18:07:52 -0600
+
+gnuradio (3.0.3-1) unstable; urgency=low
+
+  * new upstream version
+  * tweak gnuradio-doc package to eliminate spurious subdirectory level
+  * add a usrp-doc binary package, recommended by the usrp package, and 
+    include xmlto in build dependencies so usrp_guide.html gets generated, 
+    closes: #407368
+
+ -- Bdale Garbee <address@hidden>  Sun, 11 Mar 2007 23:55:32 -0600
+
+gnuradio (3.0.2-2) unstable; urgency=high
+
+  * add run-time dependency on python-wxgtk2.6.  leaving urgency high since 
+    this would be a silly bug to release etch with if we can avoid it.
+
+ -- Bdale Garbee <address@hidden>  Mon,  4 Dec 2006 15:35:53 -0700
+
+gnuradio (3.0.2-1) unstable; urgency=high
+
+  * new upstream version, fixes FTBFS issues
+
+ -- Bdale Garbee <address@hidden>  Sun, 12 Nov 2006 14:52:33 -0800
+
+gnuradio (3.0-3) unstable; urgency=high
+
+  * put python-all-dev back in the build-depends list, closes: #398246
+  * move gr-wxgui conflicts/depends to python-gnuradio, closes: #396302
+  * fix up sections in control to match overrides
+
+ -- Bdale Garbee <address@hidden>  Sun, 12 Nov 2006 10:59:58 -0800
+
+gnuradio (3.0-2) unstable; urgency=high
+
+  * reworked package dependencies so that the 'gnuradio' binary package no
+    longer depends on the pieces in contrib.  instead, the 'usrp' binary
+    package in contrib now depends on all the USRP-related pieces.  A user
+    who doesn't have a USRP board can just install 'gnuradio' and get all
+    the relevant pieces, a USRP user needs to install both 'gnuradio' and
+    'usrp'.  Closes: #394533
+  * improve consistency of references to 'GNU Radio' as upstream project name
+  * make the gnuradio package dependencies on python-gnuradio and python-usrp
+    be version specific on suggestion from Ramakrishnan Muthukrishnan
+
+ -- Bdale Garbee <address@hidden>  Fri, 10 Nov 2006 00:39:38 -0800
+
+gnuradio (3.0-1) unstable; urgency=low
+
+  * new maintainer, new upstream version
+  * Restructuring source and binary packages to follow upstream changes, more
+    or less repackaging from scratch taking ideas from the previous packaging
+    by Ramakrishnan Muthukrishnan and Steinar H. Gunderson.  This single 
+    source package replaces all of: 
+        gnuradio-core
+        gnuradio-examples
+        gr-audio-alsa
+        gr-audio-jack
+        gr-audio-oss
+        gr-usrp
+        gr-wxgui
+        usrp
+    In addition, the 'gnuradio' binary package is a new meta-package that 
+    conveniently depends on everything gnuradio related to ease installation.
+
+ -- Bdale Garbee <address@hidden>  Sun,  8 Oct 2006 13:28:21 -0600
+

Modified: 
gnuradio/branches/developers/balister/arm-configure/debian/gen-install-files.sh
===================================================================
--- 
gnuradio/branches/developers/balister/arm-configure/debian/gen-install-files.sh 
    2009-07-10 20:29:37 UTC (rev 11414)
+++ 
gnuradio/branches/developers/balister/arm-configure/debian/gen-install-files.sh 
    2009-07-10 21:11:47 UTC (rev 11415)
@@ -463,7 +463,7 @@
 NAME=debian/gnuradio-radar-mono.install
 rm -f $NAME
 touch $NAME
-$EXTRACT gr-radar-mono/src/python/Makefile dist_ourpython_PYTHON >>$NAME
+$EXTRACT gr-radar-mono/src/python/Makefile radar_mono_python_PYTHON >>$NAME
 $EXTRACT gr-radar-mono/src/python/Makefile dist_bin_SCRIPTS >>$NAME
 echo usr/share/usrp/rev2/usrp_radar_mono.rbf >>$NAME
 echo usr/share/usrp/rev4/usrp_radar_mono.rbf >>$NAME


Property changes on: 
gnuradio/branches/developers/balister/arm-configure/debian/prefs.py
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/gnuradio/branches/developers/eb/t348/gnuradio-core/src/python/gnuradio/gr/prefs.py:10638-10648
/gnuradio/branches/developers/eb/t364/gnuradio-core/src/python/gnuradio/gr/prefs.py:11016-11017
/gnuradio/branches/developers/eb/t367/gnuradio-core/src/python/gnuradio/gr/prefs.py:11021-11025
/gnuradio/branches/developers/eb/t371/gnuradio-core/src/python/gnuradio/gr/prefs.py:10958-10971
/gnuradio/branches/developers/eb/t378/gnuradio-core/src/python/gnuradio/gr/prefs.py:10683-10688
/gnuradio/branches/developers/jblum/grc/gnuradio-core/src/python/gnuradio/gr/prefs.py:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/gnuradio-core/src/python/gnuradio/gr/prefs.py:10464-10658
/gnuradio/branches/developers/jblum/vlen/gnuradio-core/src/python/gnuradio/gr/prefs.py:10667-10677
/gnuradio/branches/developers/jblum/wxgui/gnuradio-core/src/python/gnuradio/gr/prefs.py:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/gnuradio-core/src/python/gnuradio/gr/prefs.py:10818-10858
/gnuradio/branches/developers/jcorgan/deb/gnuradio-core/src/python/gnuradio/gr/prefs.py:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/gnuradio-core/src/python/gnuradio/gr/prefs.py:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/gnuradio-core/src/python/gnuradio/gr/prefs.py:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/gnuradio-core/src/python/gnuradio/gr/prefs.py:10771-10887
/gnuradio/branches/developers/jcorgan/np/gnuradio-core/src/python/gnuradio/gr/prefs.py:11124-11148
/gnuradio/branches/developers/jcorgan/t161/gnuradio-core/src/python/gnuradio/gr/prefs.py:10876-10880
/gnuradio/branches/developers/jcorgan/usrp-headers/debian/prefs.py:11378-11390
/gnuradio/branches/developers/michaelld/am_swig_4/gnuradio-core/src/python/gnuradio/gr/prefs.py:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/gnuradio-core/src/python/gnuradio/gr/prefs.py:10540-10546
/gnuradio/branches/developers/trondeau/qt/gnuradio-core/src/python/gnuradio/gr/prefs.py:11235-11360
   + 
/gnuradio/branches/developers/eb/t348/gnuradio-core/src/python/gnuradio/gr/prefs.py:10638-10648
/gnuradio/branches/developers/eb/t364/gnuradio-core/src/python/gnuradio/gr/prefs.py:11016-11017
/gnuradio/branches/developers/eb/t367/gnuradio-core/src/python/gnuradio/gr/prefs.py:11021-11025
/gnuradio/branches/developers/eb/t371/gnuradio-core/src/python/gnuradio/gr/prefs.py:10958-10971
/gnuradio/branches/developers/eb/t378/gnuradio-core/src/python/gnuradio/gr/prefs.py:10683-10688
/gnuradio/branches/developers/jblum/grc/gnuradio-core/src/python/gnuradio/gr/prefs.py:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/gnuradio-core/src/python/gnuradio/gr/prefs.py:10464-10658
/gnuradio/branches/developers/jblum/vlen/gnuradio-core/src/python/gnuradio/gr/prefs.py:10667-10677
/gnuradio/branches/developers/jblum/wxgui/gnuradio-core/src/python/gnuradio/gr/prefs.py:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/gnuradio-core/src/python/gnuradio/gr/prefs.py:10818-10858
/gnuradio/branches/developers/jcorgan/deb/gnuradio-core/src/python/gnuradio/gr/prefs.py:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/gnuradio-core/src/python/gnuradio/gr/prefs.py:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/gnuradio-core/src/python/gnuradio/gr/prefs.py:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/gnuradio-core/src/python/gnuradio/gr/prefs.py:10771-10887
/gnuradio/branches/developers/jcorgan/np/gnuradio-core/src/python/gnuradio/gr/prefs.py:11124-11148
/gnuradio/branches/developers/jcorgan/t161/gnuradio-core/src/python/gnuradio/gr/prefs.py:10876-10880
/gnuradio/branches/developers/jcorgan/usrp-headers/debian/prefs.py:11378-11390
/gnuradio/branches/developers/michaelld/am_swig_4/gnuradio-core/src/python/gnuradio/gr/prefs.py:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/gnuradio-core/src/python/gnuradio/gr/prefs.py:10540-10546
/gnuradio/branches/developers/trondeau/qt/gnuradio-core/src/python/gnuradio/gr/prefs.py:11235-11360
/gnuradio/trunk/debian/prefs.py:11397-11414

Modified: 
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/python/gnuradio/gruimpl/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/python/gnuradio/gruimpl/Makefile.am
   2009-07-10 20:29:37 UTC (rev 11414)
+++ 
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/python/gnuradio/gruimpl/Makefile.am
   2009-07-10 21:11:47 UTC (rev 11415)
@@ -32,6 +32,7 @@
        listmisc.py                     \
        mathmisc.py                     \
        lmx2306.py                      \
+       msgq_runner.py                  \
        os_read_exactly.py              \
        sdr_1000.py                     \
        seq_with_cursor.py              \

Copied: 
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/python/gnuradio/gruimpl/msgq_runner.py
 (from rev 11414, 
gnuradio/trunk/gnuradio-core/src/python/gnuradio/gruimpl/msgq_runner.py)
===================================================================
--- 
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/python/gnuradio/gruimpl/msgq_runner.py
                                (rev 0)
+++ 
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/python/gnuradio/gruimpl/msgq_runner.py
        2009-07-10 21:11:47 UTC (rev 11415)
@@ -0,0 +1,82 @@
+#
+# Copyright 2009 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.
+#
+
+"""
+Convenience class for dequeuing messages from a gr.msg_queue and
+invoking a callback.
+
+Creates a Python thread that does a blocking read on the supplied
+gr.msg_queue, then invokes callback each time a msg is received.
+
+If the msg type is not 0, then it is treated as a signal to exit
+its loop.
+
+If the callback raises an exception, and the runner was created
+with 'exit_on_error' equal to True, then the runner will store the
+exception and exit its loop, otherwise the exception is ignored.
+
+To get the exception that the callback raised, if any, call
+exit_error() on the object.
+
+To manually stop the runner, call stop() on the object.
+
+To determine if the runner has exited, call exited() on the object.
+"""
+
+from gnuradio import gr
+import gnuradio.gr.gr_threading as _threading
+
+class msgq_runner(_threading.Thread):
+
+    def __init__(self, msgq, callback, exit_on_error=False):
+        _threading.Thread.__init__(self)
+
+        self._msgq = msgq
+        self._callback = callback
+        self._exit_on_error = exit_on_error
+        self._done = False
+        self._exited = False
+        self._exit_error = None
+        self.setDaemon(1)
+        self.start()
+
+    def run(self):
+        while not self._done:
+            msg = self._msgq.delete_head()
+            if msg.type() != 0:
+                self.stop()
+            else:
+                try:
+                    self._callback(msg)
+                except Exception, e:
+                    if self._exit_on_error:
+                        self._exit_error = e
+                        self.stop()
+        self._exited = True
+
+    def stop(self):
+        self._done = True
+
+    def exited(self):
+        return self._exited
+
+    def exit_error(self):
+        return self._exit_error


Property changes on: 
gnuradio/branches/developers/balister/arm-configure/gnuradio-examples/python/digital
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/gnuradio/branches/developers/eb/t348/gnuradio-examples/python/digital:10638-10648
/gnuradio/branches/developers/eb/t364/gnuradio-examples/python/digital:11016-11017
/gnuradio/branches/developers/eb/t367/gnuradio-examples/python/digital:11021-11025
/gnuradio/branches/developers/eb/t371/gnuradio-examples/python/digital:10958-10971
/gnuradio/branches/developers/eb/t378/gnuradio-examples/python/digital:10683-10688
/gnuradio/branches/developers/jblum/digital:10901-10941,10943-11199
/gnuradio/branches/developers/jblum/grc/gnuradio-examples/python/digital:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/gnuradio-examples/python/digital:10464-10658
/gnuradio/branches/developers/jblum/vlen/gnuradio-examples/python/digital:10667-10677
/gnuradio/branches/developers/jblum/wxgui/gnuradio-examples/python/digital:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/gnuradio-examples/python/digital:10818-10858
/gnuradio/branches/developers/jcorgan/deb/gnuradio-examples/python/digital:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/gnuradio-examples/python/digital:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/gnuradio-examples/python/digital:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/gnuradio-examples/python/digital:10771-10887
/gnuradio/branches/developers/jcorgan/np/gnuradio-examples/python/digital:11124-11148
/gnuradio/branches/developers/jcorgan/t161/gnuradio-examples/python/digital:10876-10880
/gnuradio/branches/developers/jcorgan/usrp-headers/gnuradio-examples/python/digital:11378-11390
/gnuradio/branches/developers/michaelld/am_swig_4/gnuradio-examples/python/digital:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/gnuradio-examples/python/digital:10540-10546
/gnuradio/branches/developers/trondeau/digital/gnuradio-examples/python/digital:11193-11205
/gnuradio/branches/developers/trondeau/qt/gnuradio-examples/python/digital:11235-11360
/gnuradio/branches/developers/trondeau/qtdigital/gnuradio-examples/python/digital:11210-11215
   + 
/gnuradio/branches/developers/eb/t348/gnuradio-examples/python/digital:10638-10648
/gnuradio/branches/developers/eb/t364/gnuradio-examples/python/digital:11016-11017
/gnuradio/branches/developers/eb/t367/gnuradio-examples/python/digital:11021-11025
/gnuradio/branches/developers/eb/t371/gnuradio-examples/python/digital:10958-10971
/gnuradio/branches/developers/eb/t378/gnuradio-examples/python/digital:10683-10688
/gnuradio/branches/developers/jblum/digital:10901-10941,10943-11199,11402-11405
/gnuradio/branches/developers/jblum/grc/gnuradio-examples/python/digital:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/gnuradio-examples/python/digital:10464-10658
/gnuradio/branches/developers/jblum/vlen/gnuradio-examples/python/digital:10667-10677
/gnuradio/branches/developers/jblum/wxgui/gnuradio-examples/python/digital:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/gnuradio-examples/python/digital:10818-10858
/gnuradio/branches/developers/jcorgan/deb/gnuradio-examples/python/digital:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/gnuradio-examples/python/digital:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/gnuradio-examples/python/digital:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/gnuradio-examples/python/digital:10771-10887
/gnuradio/branches/developers/jcorgan/np/gnuradio-examples/python/digital:11124-11148
/gnuradio/branches/developers/jcorgan/t161/gnuradio-examples/python/digital:10876-10880
/gnuradio/branches/developers/jcorgan/usrp-headers/gnuradio-examples/python/digital:11378-11390
/gnuradio/branches/developers/michaelld/am_swig_4/gnuradio-examples/python/digital:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/gnuradio-examples/python/digital:10540-10546
/gnuradio/branches/developers/trondeau/digital/gnuradio-examples/python/digital:11193-11205
/gnuradio/branches/developers/trondeau/qt/gnuradio-examples/python/digital:11235-11360
/gnuradio/branches/developers/trondeau/qtdigital/gnuradio-examples/python/digital:11210-11215
/gnuradio/trunk/gnuradio-examples/python/digital:11397-11414

Modified: 
gnuradio/branches/developers/balister/arm-configure/gnuradio-examples/python/digital/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/balister/arm-configure/gnuradio-examples/python/digital/Makefile.am
    2009-07-10 20:29:37 UTC (rev 11414)
+++ 
gnuradio/branches/developers/balister/arm-configure/gnuradio-examples/python/digital/Makefile.am
    2009-07-10 21:11:47 UTC (rev 11415)
@@ -33,7 +33,9 @@
        qt_rx_window.py         \
        receive_path.py         \
        transmit_path.py        \
-       usrp_options.py
+       usrp_options.py \
+       usrp_receive_path.py \
+       usrp_transmit_path.py
 
 dist_ourdata_SCRIPTS =         \
        benchmark_loopback.py   \

Modified: 
gnuradio/branches/developers/balister/arm-configure/gnuradio-examples/python/digital/benchmark_rx.py
===================================================================
--- 
gnuradio/branches/developers/balister/arm-configure/gnuradio-examples/python/digital/benchmark_rx.py
        2009-07-10 20:29:37 UTC (rev 11414)
+++ 
gnuradio/branches/developers/balister/arm-configure/gnuradio-examples/python/digital/benchmark_rx.py
        2009-07-10 21:11:47 UTC (rev 11415)
@@ -31,9 +31,7 @@
 import sys
 
 # from current dir
-from receive_path import receive_path
-from pick_bitrate import pick_rx_bitrate
-import usrp_options
+import usrp_receive_path
 
 #import os
 #print os.getpid()
@@ -43,112 +41,11 @@
     def __init__(self, demodulator, rx_callback, options):
         gr.top_block.__init__(self)
 
-        self._rx_freq            = options.rx_freq         # receiver's center 
frequency
-        self._rx_gain            = options.rx_gain         # receiver's gain
-        self._decim              = options.decim           # Decimating rate 
for the USRP (prelim)
-        self._bitrate            = options.bitrate
-        self._samples_per_symbol = options.samples_per_symbol
-        self._demod_class        = demodulator
-
-        if self._rx_freq is None:
-            sys.stderr.write("-f FREQ or --freq FREQ or --rx-freq FREQ must be 
specified\n")
-            raise SystemExit
-
-        # Set up USRP source
-        self._setup_usrp_source(options)
-
-        # copy the final answers back into options for use by demodulator
-        options.samples_per_symbol = self._samples_per_symbol
-        options.bitrate = self._bitrate
-        options.decim = self._decim
-
-        ok = self.set_freq(self._rx_freq)
-        if not ok:
-            print "Failed to set Rx frequency to %s" % 
(eng_notation.num_to_str(self._rx_freq))
-            raise ValueError, eng_notation.num_to_str(self._rx_freq)
-
-        self.set_gain(options.rx_gain)
-        self.set_auto_tr(True)                 # enable Auto Transmit/Receive 
switching
-
         # Set up receive path
-        self.rxpath = receive_path(demodulator, rx_callback, options) 
+        self.rxpath = usrp_receive_path.usrp_receive_path(demodulator, 
rx_callback, options) 
 
-        self.connect(self.u, self.rxpath)
-        
-    def _setup_usrp_source(self, options):
-        self.u = usrp_options.create_usrp_source(options)
-        adc_rate = self.u.adc_rate()
+        self.connect(self.rxpath)
 
-        self.u.set_decim(self._decim)
-
-        (self._bitrate, self._samples_per_symbol, self._decim) = \
-                        pick_rx_bitrate(self._bitrate, 
self._demod_class.bits_per_symbol(), \
-                                        self._samples_per_symbol, self._decim, 
adc_rate,  \
-                                        self.u.get_decim_rates())
-
-        self.u.set_decim(self._decim)
-
-
-    def set_freq(self, target_freq):
-        """
-        Set the center frequency we're interested in.
-
-        @param target_freq: frequency in Hz
-        @rypte: bool
-
-        Tuning is a two step process.  First we ask the front-end to
-        tune as close to the desired frequency as it can.  Then we use
-        the result of that operation and our target_frequency to
-        determine the value for the digital up converter.
-        """
-        return self.u.set_center_freq(target_freq)
-
-    def set_gain(self, gain):
-        """
-        Sets the analog gain in the USRP
-        """
-        if gain is None:
-            r = self.u.gain_range()
-            gain = (r[0] + r[1])/2               # set gain to midpoint
-        self.gain = gain
-        return self.u.set_gain(gain)
-
-    def set_auto_tr(self, enable):
-        return self.u.set_auto_tr(enable)
-
-    def decim(self):
-        return self._decim
-
-    def add_options(normal, expert):
-        """
-        Adds usrp-specific options to the Options Parser
-        """
-        add_freq_option(normal)
-        normal.add_option("-v", "--verbose", action="store_true", 
default=False)
-
-        expert.add_option("", "--rx-freq", type="eng_float", default=None,
-                          help="set Rx frequency to FREQ [default=%default]", 
metavar="FREQ")
-   
-
-    # Make a static method to call before instantiation
-    add_options = staticmethod(add_options)
-
-
-def add_freq_option(parser):
-    """
-    Hackery that has the -f / --freq option set both tx_freq and rx_freq
-    """
-    def freq_callback(option, opt_str, value, parser):
-        parser.values.rx_freq = value
-        parser.values.tx_freq = value
-
-    if not parser.has_option('--freq'):
-        parser.add_option('-f', '--freq', type="eng_float",
-                          action="callback", callback=freq_callback,
-                          help="set Tx and/or Rx frequency to FREQ 
[default=%default]",
-                          metavar="FREQ")
-
-
 # /////////////////////////////////////////////////////////////////////////////
 #                                   main
 # /////////////////////////////////////////////////////////////////////////////
@@ -183,9 +80,7 @@
                       help="Select modulation from: %s [default=%%default]"
                             % (', '.join(demods.keys()),))
 
-    my_top_block.add_options(parser, expert_grp)
-    receive_path.add_options(parser, expert_grp)
-    usrp_options.add_rx_options(parser)
+    usrp_receive_path.add_options(parser, expert_grp)
 
     for mod in demods.values():
         mod.add_options(expert_grp)

Modified: 
gnuradio/branches/developers/balister/arm-configure/gnuradio-examples/python/digital/benchmark_tx.py
===================================================================
--- 
gnuradio/branches/developers/balister/arm-configure/gnuradio-examples/python/digital/benchmark_tx.py
        2009-07-10 20:29:37 UTC (rev 11414)
+++ 
gnuradio/branches/developers/balister/arm-configure/gnuradio-examples/python/digital/benchmark_tx.py
        2009-07-10 21:11:47 UTC (rev 11415)
@@ -29,9 +29,7 @@
 import random, time, struct, sys
 
 # from current dir
-from transmit_path import transmit_path
-from pick_bitrate import pick_tx_bitrate
-import usrp_options
+import usrp_transmit_path
 
 #import os 
 #print os.getpid()
@@ -41,125 +39,10 @@
     def __init__(self, modulator, options):
         gr.top_block.__init__(self)
 
-        self._tx_freq            = options.tx_freq         # tranmitter's 
center frequency
-        self._interp             = options.interp          # interpolating 
rate for the USRP (prelim)
-        self._bitrate            = options.bitrate
-        self._samples_per_symbol = options.samples_per_symbol
-        self._modulator_class    = modulator
+        self.txpath = usrp_transmit_path.usrp_transmit_path(modulator, options)
 
-        if self._tx_freq is None:
-            sys.stderr.write("-f FREQ or --freq FREQ or --tx-freq FREQ must be 
specified\n")
-            raise SystemExit
+        self.connect(self.txpath)
 
-        # Set up USRP sink; also adjusts interp, and bitrate
-        self._setup_usrp_sink(options)
-
-        # copy the final answers back into options for use by modulator
-        options.samples_per_symbol = self._samples_per_symbol
-        options.bitrate = self._bitrate
-        options.interp = self._interp
-
-        # Set center frequency of USRP
-        ok = self.set_freq(self._tx_freq)
-        if not ok:
-            print "Failed to set Tx frequency to %s" % 
(eng_notation.num_to_str(self._tx_freq),)
-            raise ValueError
-
-        # Set the USRP for maximum transmit gain
-        # (Note that on the RFX cards this is a nop.)
-        self.set_gain(self.u.gain_range()[1])
-
-        self.txpath = transmit_path(modulator, options)
-
-        self.connect(self.txpath, self.u)
-
-    def _setup_usrp_sink(self, options):
-        """
-        Creates a USRP sink, determines the settings for best bitrate,
-        and attaches to the transmitter's subdevice.
-        """
-        self.u = usrp_options.create_usrp_sink(options)
-        dac_rate = self.u.dac_rate()
-
-        (self._bitrate, self._samples_per_symbol, self._interp) = \
-                        pick_tx_bitrate(self._bitrate, 
self._modulator_class.bits_per_symbol(), \
-                                        self._samples_per_symbol, 
self._interp, dac_rate, \
-                                        self.u.get_interp_rates())
-
-        self.u.set_interp(self._interp)
-        self.set_auto_tr(True)                 # enable Auto Transmit/Receive 
switching
-
-    def set_freq(self, target_freq):
-        """
-        Set the center frequency we're interested in.
-
-        @param target_freq: frequency in Hz
-        @rypte: bool
-
-        Tuning is a two step process.  First we ask the front-end to
-        tune as close to the desired frequency as it can.  Then we use
-        the result of that operation and our target_frequency to
-        determine the value for the digital up converter.
-        """
-        return self.u.set_center_freq(target_freq)
-
-    def set_gain(self, gain):
-        """
-        Sets the analog gain in the USRP
-        """
-        self.gain = gain
-        self.u.set_gain(gain)
-
-    def set_auto_tr(self, enable):
-        """
-        Turns on auto transmit/receive of USRP daughterboard (if exits; else 
ignored)
-        """
-        return self.u.set_auto_tr(enable)
-        
-    def interp(self):
-        return self._interp
-
-    def add_options(normal, expert):
-        """
-        Adds usrp-specific options to the Options Parser
-        """
-        add_freq_option(normal)
-        normal.add_option("-T", "--tx-subdev-spec", type="subdev", 
default=None,
-                          help="select USRP Tx side A or B")
-        normal.add_option("-v", "--verbose", action="store_true", 
default=False)
-
-        expert.add_option("", "--tx-freq", type="eng_float", default=None,
-                          help="set transmit frequency to FREQ 
[default=%default]", metavar="FREQ")
-        expert.add_option("-i", "--interp", type="intx", default=256,
-                          help="set fpga interpolation rate to INTERP 
[default=%default]")
-    # Make a static method to call before instantiation
-    add_options = staticmethod(add_options)
-
-    def _print_verbage(self):
-        """
-        Prints information about the transmit path
-        """
-        print "Using TX d'board %s"    % (self.subdev.side_and_name(),)
-        print "modulation:      %s"    % (self._modulator_class.__name__)
-        print "interp:          %3d"   % (self._interp)
-        print "Tx Frequency:    %s"    % 
(eng_notation.num_to_str(self._tx_freq))
-        
-
-def add_freq_option(parser):
-    """
-    Hackery that has the -f / --freq option set both tx_freq and rx_freq
-    """
-    def freq_callback(option, opt_str, value, parser):
-        parser.values.rx_freq = value
-        parser.values.tx_freq = value
-
-    if not parser.has_option('--freq'):
-        parser.add_option('-f', '--freq', type="eng_float",
-                          action="callback", callback=freq_callback,
-                          help="set Tx and/or Rx frequency to FREQ 
[default=%default]",
-                          metavar="FREQ")
-
-
 # /////////////////////////////////////////////////////////////////////////////
 #                                   main
 # /////////////////////////////////////////////////////////////////////////////
@@ -191,9 +74,7 @@
     parser.add_option("","--from-file", default=None,
                       help="use file for packet contents")
 
-    my_top_block.add_options(parser, expert_grp)
-    transmit_path.add_options(parser, expert_grp)
-    usrp_options.add_tx_options(parser)
+    usrp_transmit_path.add_options(parser, expert_grp)
 
     for mod in mods.values():
         mod.add_options(expert_grp)

Modified: 
gnuradio/branches/developers/balister/arm-configure/gnuradio-examples/python/digital/generic_usrp.py
===================================================================
--- 
gnuradio/branches/developers/balister/arm-configure/gnuradio-examples/python/digital/generic_usrp.py
        2009-07-10 20:29:37 UTC (rev 11414)
+++ 
gnuradio/branches/developers/balister/arm-configure/gnuradio-examples/python/digital/generic_usrp.py
        2009-07-10 21:11:47 UTC (rev 11415)
@@ -99,7 +99,7 @@
     def gain_range(self):
         if self._type == USRP1_TYPE: return self._subdev.gain_range()
         elif self._type == USRP2_TYPE: return self._u.gain_range()
-        elif self._type == DUMMY_TYPE: return (0, 0)
+        elif self._type == DUMMY_TYPE: return (0, 0, 0)
 
     def set_center_freq(self, target_freq):
         if self._type == USRP1_TYPE:

Modified: 
gnuradio/branches/developers/balister/arm-configure/gnuradio-examples/python/digital/receive_path.py
===================================================================
--- 
gnuradio/branches/developers/balister/arm-configure/gnuradio-examples/python/digital/receive_path.py
        2009-07-10 20:29:37 UTC (rev 11414)
+++ 
gnuradio/branches/developers/balister/arm-configure/gnuradio-examples/python/digital/receive_path.py
        2009-07-10 21:11:47 UTC (rev 11415)
@@ -118,8 +118,6 @@
         if not normal.has_option("--bitrate"):
             normal.add_option("-r", "--bitrate", type="eng_float", 
default=100e3,
                               help="specify bitrate [default=%default].")
-        normal.add_option("", "--show-rx-gain-range", action="store_true", 
default=False, 
-                          help="print min and max Rx gain available on 
selected daughterboard")
         normal.add_option("-v", "--verbose", action="store_true", 
default=False)
         expert.add_option("-S", "--samples-per-symbol", type="int", default=2,
                           help="set samples/symbol [default=%default]")


Property changes on: 
gnuradio/branches/developers/balister/arm-configure/gnuradio-examples/python/digital/receive_path.py
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/gnuradio/branches/developers/eb/t348/gnuradio-examples/python/digital/receive_path_lb.py:10638-10648
/gnuradio/branches/developers/eb/t364/gnuradio-examples/python/digital/receive_path_lb.py:11016-11017
/gnuradio/branches/developers/eb/t367/gnuradio-examples/python/digital/receive_path_lb.py:11021-11025
/gnuradio/branches/developers/eb/t371/gnuradio-examples/python/digital/receive_path_lb.py:10958-10971
/gnuradio/branches/developers/eb/t378/gnuradio-examples/python/digital/receive_path_lb.py:10683-10688
/gnuradio/branches/developers/jblum/digital/receive_path_lb.py:10901-10941
/gnuradio/branches/developers/jblum/grc/gnuradio-examples/python/digital/receive_path.py:11187-11273,11310-11357
/gnuradio/branches/developers/jblum/grc/gnuradio-examples/python/digital/receive_path_lb.py:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/gnuradio-examples/python/digital/receive_path_lb.py:10464-10658
/gnuradio/branches/developers/jblum/vlen/gnuradio-examples/python/digital/receive_path_lb.py:10667-10677
/gnuradio/branches/developers/jblum/wxgui/gnuradio-examples/python/digital/receive_path_lb.py:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/gnuradio-examples/python/digital/receive_path_lb.py:10818-10858
/gnuradio/branches/developers/jcorgan/deb/gnuradio-examples/python/digital/receive_path_lb.py:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/gnuradio-examples/python/digital/receive_path_lb.py:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/gnuradio-examples/python/digital/receive_path_lb.py:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/gnuradio-examples/python/digital/receive_path_lb.py:10771-10887
/gnuradio/branches/developers/jcorgan/np/gnuradio-examples/python/digital/receive_path_lb.py:11124-11148
/gnuradio/branches/developers/jcorgan/t161/gnuradio-examples/python/digital/receive_path_lb.py:10876-10880
/gnuradio/branches/developers/jcorgan/usrp-headers/gnuradio-examples/python/digital/receive_path.py:11378-11390
/gnuradio/branches/developers/michaelld/am_swig_4/gnuradio-examples/python/digital/receive_path_lb.py:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/gnuradio-examples/python/digital/receive_path_lb.py:10540-10546
/gnuradio/branches/developers/trondeau/qt/gnuradio-examples/python/digital/receive_path.py:11235-11360
/gnuradio/branches/developers/trondeau/qtdigital/gnuradio-examples/python/digital/receive_path.py:11210-11215
   + 
/gnuradio/branches/developers/eb/t348/gnuradio-examples/python/digital/receive_path_lb.py:10638-10648
/gnuradio/branches/developers/eb/t364/gnuradio-examples/python/digital/receive_path_lb.py:11016-11017
/gnuradio/branches/developers/eb/t367/gnuradio-examples/python/digital/receive_path_lb.py:11021-11025
/gnuradio/branches/developers/eb/t371/gnuradio-examples/python/digital/receive_path_lb.py:10958-10971
/gnuradio/branches/developers/eb/t378/gnuradio-examples/python/digital/receive_path_lb.py:10683-10688
/gnuradio/branches/developers/jblum/digital/receive_path.py:11402-11405
/gnuradio/branches/developers/jblum/digital/receive_path_lb.py:10901-10941
/gnuradio/branches/developers/jblum/grc/gnuradio-examples/python/digital/receive_path.py:11187-11273,11310-11357
/gnuradio/branches/developers/jblum/grc/gnuradio-examples/python/digital/receive_path_lb.py:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/gnuradio-examples/python/digital/receive_path_lb.py:10464-10658
/gnuradio/branches/developers/jblum/vlen/gnuradio-examples/python/digital/receive_path_lb.py:10667-10677
/gnuradio/branches/developers/jblum/wxgui/gnuradio-examples/python/digital/receive_path_lb.py:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/gnuradio-examples/python/digital/receive_path_lb.py:10818-10858
/gnuradio/branches/developers/jcorgan/deb/gnuradio-examples/python/digital/receive_path_lb.py:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/gnuradio-examples/python/digital/receive_path_lb.py:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/gnuradio-examples/python/digital/receive_path_lb.py:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/gnuradio-examples/python/digital/receive_path_lb.py:10771-10887
/gnuradio/branches/developers/jcorgan/np/gnuradio-examples/python/digital/receive_path_lb.py:11124-11148
/gnuradio/branches/developers/jcorgan/t161/gnuradio-examples/python/digital/receive_path_lb.py:10876-10880
/gnuradio/branches/developers/jcorgan/usrp-headers/gnuradio-examples/python/digital/receive_path.py:11378-11390
/gnuradio/branches/developers/michaelld/am_swig_4/gnuradio-examples/python/digital/receive_path_lb.py:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/gnuradio-examples/python/digital/receive_path_lb.py:10540-10546
/gnuradio/branches/developers/trondeau/qt/gnuradio-examples/python/digital/receive_path.py:11235-11360
/gnuradio/branches/developers/trondeau/qtdigital/gnuradio-examples/python/digital/receive_path.py:11210-11215

Modified: 
gnuradio/branches/developers/balister/arm-configure/gnuradio-examples/python/digital/rx_voice.py
===================================================================
--- 
gnuradio/branches/developers/balister/arm-configure/gnuradio-examples/python/digital/rx_voice.py
    2009-07-10 20:29:37 UTC (rev 11414)
+++ 
gnuradio/branches/developers/balister/arm-configure/gnuradio-examples/python/digital/rx_voice.py
    2009-07-10 21:11:47 UTC (rev 11415)
@@ -34,7 +34,7 @@
 import sys
 
 # from current dir
-from receive_path import receive_path
+import usrp_receive_path
 
 #import os
 #print os.getpid()
@@ -61,7 +61,7 @@
 class my_top_block(gr.top_block):
     def __init__(self, demod_class, rx_callback, options):
         gr.top_block.__init__(self)
-        self.rxpath = receive_path(demod_class, rx_callback, options)
+        self.rxpath = usrp_receive_path.usrp_receive_path(demod_class, 
rx_callback, options)
         self.audio_tx = audio_tx(options.audio_output)
        self.connect(self.rxpath)
        self.connect(self.audio_tx)        
@@ -101,9 +101,8 @@
                             % (', '.join(demods.keys()),))
     parser.add_option("-O", "--audio-output", type="string", default="",
                       help="pcm output device name.  E.g., hw:0,0 or /dev/dsp")
+    usrp_receive_path.add_options(parser, expert_grp)
 
-    receive_path.add_options(parser, expert_grp)
-
     for mod in demods.values():
         mod.add_options(expert_grp)
 


Property changes on: 
gnuradio/branches/developers/balister/arm-configure/gnuradio-examples/python/digital/transmit_path.py
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/gnuradio/branches/developers/eb/t348/gnuradio-examples/python/digital/transmit_path_lb.py:10638-10648
/gnuradio/branches/developers/eb/t364/gnuradio-examples/python/digital/transmit_path_lb.py:11016-11017
/gnuradio/branches/developers/eb/t367/gnuradio-examples/python/digital/transmit_path_lb.py:11021-11025
/gnuradio/branches/developers/eb/t371/gnuradio-examples/python/digital/transmit_path_lb.py:10958-10971
/gnuradio/branches/developers/eb/t378/gnuradio-examples/python/digital/transmit_path_lb.py:10683-10688
/gnuradio/branches/developers/jblum/digital/transmit_path_lb.py:10901-10941
/gnuradio/branches/developers/jblum/grc/gnuradio-examples/python/digital/transmit_path.py:11187-11273,11310-11357
/gnuradio/branches/developers/jblum/grc/gnuradio-examples/python/digital/transmit_path_lb.py:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/gnuradio-examples/python/digital/transmit_path_lb.py:10464-10658
/gnuradio/branches/developers/jblum/vlen/gnuradio-examples/python/digital/transmit_path_lb.py:10667-10677
/gnuradio/branches/developers/jblum/wxgui/gnuradio-examples/python/digital/transmit_path_lb.py:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/gnuradio-examples/python/digital/transmit_path_lb.py:10818-10858
/gnuradio/branches/developers/jcorgan/deb/gnuradio-examples/python/digital/transmit_path_lb.py:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/gnuradio-examples/python/digital/transmit_path_lb.py:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/gnuradio-examples/python/digital/transmit_path_lb.py:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/gnuradio-examples/python/digital/transmit_path_lb.py:10771-10887
/gnuradio/branches/developers/jcorgan/np/gnuradio-examples/python/digital/transmit_path_lb.py:11124-11148
/gnuradio/branches/developers/jcorgan/t161/gnuradio-examples/python/digital/transmit_path_lb.py:10876-10880
/gnuradio/branches/developers/jcorgan/usrp-headers/gnuradio-examples/python/digital/transmit_path.py:11378-11390
/gnuradio/branches/developers/michaelld/am_swig_4/gnuradio-examples/python/digital/transmit_path_lb.py:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/gnuradio-examples/python/digital/transmit_path_lb.py:10540-10546
/gnuradio/branches/developers/trondeau/qt/gnuradio-examples/python/digital/transmit_path.py:11235-11360
/gnuradio/branches/developers/trondeau/qtdigital/gnuradio-examples/python/digital/transmit_path.py:11210-11215
   + 
/gnuradio/branches/developers/eb/t348/gnuradio-examples/python/digital/transmit_path_lb.py:10638-10648
/gnuradio/branches/developers/eb/t364/gnuradio-examples/python/digital/transmit_path_lb.py:11016-11017
/gnuradio/branches/developers/eb/t367/gnuradio-examples/python/digital/transmit_path_lb.py:11021-11025
/gnuradio/branches/developers/eb/t371/gnuradio-examples/python/digital/transmit_path_lb.py:10958-10971
/gnuradio/branches/developers/eb/t378/gnuradio-examples/python/digital/transmit_path_lb.py:10683-10688
/gnuradio/branches/developers/jblum/digital/transmit_path.py:11402-11405
/gnuradio/branches/developers/jblum/digital/transmit_path_lb.py:10901-10941
/gnuradio/branches/developers/jblum/grc/gnuradio-examples/python/digital/transmit_path.py:11187-11273,11310-11357
/gnuradio/branches/developers/jblum/grc/gnuradio-examples/python/digital/transmit_path_lb.py:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/gnuradio-examples/python/digital/transmit_path_lb.py:10464-10658
/gnuradio/branches/developers/jblum/vlen/gnuradio-examples/python/digital/transmit_path_lb.py:10667-10677
/gnuradio/branches/developers/jblum/wxgui/gnuradio-examples/python/digital/transmit_path_lb.py:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/gnuradio-examples/python/digital/transmit_path_lb.py:10818-10858
/gnuradio/branches/developers/jcorgan/deb/gnuradio-examples/python/digital/transmit_path_lb.py:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/gnuradio-examples/python/digital/transmit_path_lb.py:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/gnuradio-examples/python/digital/transmit_path_lb.py:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/gnuradio-examples/python/digital/transmit_path_lb.py:10771-10887
/gnuradio/branches/developers/jcorgan/np/gnuradio-examples/python/digital/transmit_path_lb.py:11124-11148
/gnuradio/branches/developers/jcorgan/t161/gnuradio-examples/python/digital/transmit_path_lb.py:10876-10880
/gnuradio/branches/developers/jcorgan/usrp-headers/gnuradio-examples/python/digital/transmit_path.py:11378-11390
/gnuradio/branches/developers/michaelld/am_swig_4/gnuradio-examples/python/digital/transmit_path_lb.py:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/gnuradio-examples/python/digital/transmit_path_lb.py:10540-10546
/gnuradio/branches/developers/trondeau/qt/gnuradio-examples/python/digital/transmit_path.py:11235-11360
/gnuradio/branches/developers/trondeau/qtdigital/gnuradio-examples/python/digital/transmit_path.py:11210-11215

Modified: 
gnuradio/branches/developers/balister/arm-configure/gnuradio-examples/python/digital/tunnel.py
===================================================================
--- 
gnuradio/branches/developers/balister/arm-configure/gnuradio-examples/python/digital/tunnel.py
      2009-07-10 20:29:37 UTC (rev 11414)
+++ 
gnuradio/branches/developers/balister/arm-configure/gnuradio-examples/python/digital/tunnel.py
      2009-07-10 21:11:47 UTC (rev 11415)
@@ -46,8 +46,8 @@
 import os
 
 # from current dir
-from transmit_path import transmit_path
-from receive_path import receive_path
+import usrp_transmit_path
+import usrp_receive_path
 
 #print os.getpid()
 #raw_input('Attach and press enter')
@@ -91,11 +91,11 @@
                  rx_callback, options):
 
         gr.top_block.__init__(self)
-        self.txpath = transmit_path(mod_class, options)
-        self.rxpath = receive_path(demod_class, rx_callback, options)
-       self.connect(self.txpath);
-       self.connect(self.rxpath);
-       
+        self.txpath = usrp_transmit_path.usrp_transmit_path(mod_class, options)
+        self.rxpath = usrp_receive_path.usrp_receive_path(demod_class, 
rx_callback, options)
+        self.connect(self.txpath)
+        self.connect(self.rxpath)
+
     def send_pkt(self, payload='', eof=False):
         return self.txpath.send_pkt(payload, eof)
 
@@ -180,7 +180,10 @@
 
     parser = OptionParser (option_class=eng_option, conflict_handler="resolve")
     expert_grp = parser.add_option_group("Expert")
-
+    expert_grp.add_option("", "--rx-freq", type="eng_float", default=None,
+                          help="set Rx frequency to FREQ [default=%default]", 
metavar="FREQ")
+    expert_grp.add_option("", "--tx-freq", type="eng_float", default=None,
+                          help="set transmit frequency to FREQ 
[default=%default]", metavar="FREQ")
     parser.add_option("-m", "--modulation", type="choice", choices=mods.keys(),
                       default='gmsk',
                       help="Select modulation from: %s [default=%%default]"
@@ -192,8 +195,8 @@
     expert_grp.add_option("","--tun-device-filename", default="/dev/net/tun",
                           help="path to tun device file [default=%default]")
 
-    transmit_path.add_options(parser, expert_grp)
-    receive_path.add_options(parser, expert_grp)
+    usrp_transmit_path.add_options(parser, expert_grp)
+    usrp_receive_path.add_options(parser, expert_grp)
 
     for mod in mods.values():
         mod.add_options(expert_grp)
@@ -206,11 +209,6 @@
         parser.print_help(sys.stderr)
         sys.exit(1)
 
-    if options.rx_freq is None or options.tx_freq is None:
-        sys.stderr.write("You must specify -f FREQ or --freq FREQ\n")
-        parser.print_help(sys.stderr)
-        sys.exit(1)
-
     # open the TUN/TAP interface
     (tun_fd, tun_ifname) = open_tun_interface(options.tun_device_filename)
 

Modified: 
gnuradio/branches/developers/balister/arm-configure/gnuradio-examples/python/digital/tx_voice.py
===================================================================
--- 
gnuradio/branches/developers/balister/arm-configure/gnuradio-examples/python/digital/tx_voice.py
    2009-07-10 20:29:37 UTC (rev 11414)
+++ 
gnuradio/branches/developers/balister/arm-configure/gnuradio-examples/python/digital/tx_voice.py
    2009-07-10 21:11:47 UTC (rev 11415)
@@ -35,7 +35,7 @@
 import sys
 
 # from current dir
-from transmit_path import transmit_path
+import usrp_transmit_path
 
 #import os
 #print os.getpid()
@@ -64,7 +64,7 @@
 
     def __init__(self, modulator_class, options):
         gr.top_block.__init__(self)
-        self.txpath = transmit_path(modulator_class, options)
+        self.txpath = usrp_transmit_path.usrp_transmit_path(modulator_class, 
options)
         self.audio_rx = audio_rx(options.audio_input)
        self.connect(self.txpath)
        self.connect(self.audio_rx)
@@ -95,9 +95,8 @@
                       help="set megabytes to transmit [default=inf]")
     parser.add_option("-I", "--audio-input", type="string", default="",
                       help="pcm input device name.  E.g., hw:0,0 or /dev/dsp")
+    usrp_transmit_path.add_options(parser, expert_grp)
 
-    transmit_path.add_options(parser, expert_grp)
-
     for mod in mods.values():
         mod.add_options(expert_grp)
 

Copied: 
gnuradio/branches/developers/balister/arm-configure/gnuradio-examples/python/digital/usrp_receive_path.py
 (from rev 11414, 
gnuradio/trunk/gnuradio-examples/python/digital/usrp_receive_path.py)
===================================================================
--- 
gnuradio/branches/developers/balister/arm-configure/gnuradio-examples/python/digital/usrp_receive_path.py
                           (rev 0)
+++ 
gnuradio/branches/developers/balister/arm-configure/gnuradio-examples/python/digital/usrp_receive_path.py
   2009-07-10 21:11:47 UTC (rev 11415)
@@ -0,0 +1,86 @@
+#
+# Copyright 2009 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
+import usrp_options
+import receive_path
+from pick_bitrate import pick_rx_bitrate
+from gnuradio import eng_notation
+
+def add_freq_option(parser):
+    """
+    Hackery that has the -f / --freq option set both tx_freq and rx_freq
+    """
+    def freq_callback(option, opt_str, value, parser):
+        parser.values.rx_freq = value
+        parser.values.tx_freq = value
+
+    if not parser.has_option('--freq'):
+        parser.add_option('-f', '--freq', type="eng_float",
+                          action="callback", callback=freq_callback,
+                          help="set Tx and/or Rx frequency to FREQ 
[default=%default]",
+                          metavar="FREQ")
+
+def add_options(parser, expert):
+    add_freq_option(parser)
+    usrp_options.add_rx_options(parser)
+    receive_path.receive_path.add_options(parser, expert)
+    expert.add_option("", "--rx-freq", type="eng_float", default=None,
+                          help="set Rx frequency to FREQ [default=%default]", 
metavar="FREQ")
+    parser.add_option("-v", "--verbose", action="store_true", default=False)
+
+class usrp_receive_path(gr.hier_block2):
+
+    def __init__(self, demod_class, rx_callback, options):
+        '''
+        See below for what options should hold
+        '''
+        gr.hier_block2.__init__(self, "usrp_receive_path",
+                gr.io_signature(0, 0, 0),                    # Input signature
+                gr.io_signature(0, 0, 0)) # Output signature
+        if options.rx_freq is None:
+            sys.stderr.write("-f FREQ or --freq FREQ or --rx-freq FREQ must be 
specified\n")
+            raise SystemExit
+        rx_path = receive_path.receive_path(demod_class, rx_callback, options)
+        for attr in dir(rx_path): #forward the methods
+            if not attr.startswith('_') and not hasattr(self, attr):
+                setattr(self, attr, getattr(rx_path, attr))
+        #setup usrp
+        self._demod_class = demod_class
+        self._setup_usrp_source(options)
+        #connect
+        self.connect(self.u, rx_path)
+
+    def _setup_usrp_source(self, options):
+        self.u = usrp_options.create_usrp_source(options)
+        adc_rate = self.u.adc_rate()
+        if options.verbose:
+            print 'USRP Source:', self.u
+        (self._bitrate, self._samples_per_symbol, self._decim) = \
+                        pick_rx_bitrate(options.bitrate, 
self._demod_class.bits_per_symbol(), \
+                                        options.samples_per_symbol, 
options.decim, adc_rate,  \
+                                        self.u.get_decim_rates())
+
+        self.u.set_decim(self._decim)
+
+        if not self.u.set_center_freq(options.rx_freq):
+            print "Failed to set Rx frequency to %s" % 
(eng_notation.num_to_str(options.rx_freq))
+            raise ValueError, eng_notation.num_to_str(options.rx_freq)

Copied: 
gnuradio/branches/developers/balister/arm-configure/gnuradio-examples/python/digital/usrp_transmit_path.py
 (from rev 11414, 
gnuradio/trunk/gnuradio-examples/python/digital/usrp_transmit_path.py)
===================================================================
--- 
gnuradio/branches/developers/balister/arm-configure/gnuradio-examples/python/digital/usrp_transmit_path.py
                          (rev 0)
+++ 
gnuradio/branches/developers/balister/arm-configure/gnuradio-examples/python/digital/usrp_transmit_path.py
  2009-07-10 21:11:47 UTC (rev 11415)
@@ -0,0 +1,90 @@
+#
+# Copyright 2009 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
+import usrp_options
+import transmit_path
+from pick_bitrate import pick_tx_bitrate
+from gnuradio import eng_notation
+
+def add_freq_option(parser):
+    """
+    Hackery that has the -f / --freq option set both tx_freq and rx_freq
+    """
+    def freq_callback(option, opt_str, value, parser):
+        parser.values.rx_freq = value
+        parser.values.tx_freq = value
+
+    if not parser.has_option('--freq'):
+        parser.add_option('-f', '--freq', type="eng_float",
+                          action="callback", callback=freq_callback,
+                          help="set Tx and/or Rx frequency to FREQ 
[default=%default]",
+                          metavar="FREQ")
+
+def add_options(parser, expert):
+    add_freq_option(parser)
+    usrp_options.add_tx_options(parser)
+    transmit_path.transmit_path.add_options(parser, expert)
+    expert.add_option("", "--tx-freq", type="eng_float", default=None,
+                          help="set transmit frequency to FREQ 
[default=%default]", metavar="FREQ")
+    parser.add_option("-v", "--verbose", action="store_true", default=False)
+
+class usrp_transmit_path(gr.hier_block2):
+    def __init__(self, modulator_class, options):
+        '''
+        See below for what options should hold
+        '''
+        gr.hier_block2.__init__(self, "usrp_transmit_path",
+                gr.io_signature(0, 0, 0),                    # Input signature
+                gr.io_signature(0, 0, 0)) # Output signature
+        if options.tx_freq is None:
+            sys.stderr.write("-f FREQ or --freq FREQ or --tx-freq FREQ must be 
specified\n")
+            raise SystemExit
+        tx_path = transmit_path.transmit_path(modulator_class, options)
+        for attr in dir(tx_path): #forward the methods
+            if not attr.startswith('_') and not hasattr(self, attr):
+                setattr(self, attr, getattr(tx_path, attr))
+        #setup usrp
+        self._modulator_class = modulator_class
+        self._setup_usrp_sink(options)
+        #connect
+        self.connect(tx_path, self.u)
+
+    def _setup_usrp_sink(self, options):
+        """
+        Creates a USRP sink, determines the settings for best bitrate,
+        and attaches to the transmitter's subdevice.
+        """
+        self.u = usrp_options.create_usrp_sink(options)
+        dac_rate = self.u.dac_rate()
+        if options.verbose:
+            print 'USRP Sink:', self.u
+        (self._bitrate, self._samples_per_symbol, self._interp) = \
+                        pick_tx_bitrate(options.bitrate, 
self._modulator_class.bits_per_symbol(), \
+                                        options.samples_per_symbol, 
options.interp, dac_rate, \
+                                        self.u.get_interp_rates())
+
+        self.u.set_interp(self._interp)
+        self.u.set_auto_tr(True)
+
+        if not self.u.set_center_freq(options.tx_freq):
+            print "Failed to set Rx frequency to %s" % 
(eng_notation.num_to_str(options.tx_freq))
+            raise ValueError, eng_notation.num_to_str(options.tx_freq)

Modified: 
gnuradio/branches/developers/balister/arm-configure/gr-radar-mono/src/python/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/balister/arm-configure/gr-radar-mono/src/python/Makefile.am
    2009-07-10 20:29:37 UTC (rev 11414)
+++ 
gnuradio/branches/developers/balister/arm-configure/gr-radar-mono/src/python/Makefile.am
    2009-07-10 21:11:47 UTC (rev 11415)
@@ -21,11 +21,10 @@
 
 include $(top_srcdir)/Makefile.common
 
-ourpythondir = $(grpythondir)
-ourlibdir    = $(grpyexecdir)
+radar_mono_pythondir = $(grpythondir)
 
 dist_bin_SCRIPTS =     \
        usrp_radar_mono.py
 
-dist_ourpython_PYTHON =        \
+radar_mono_python_PYTHON =     \
        radar_mono.py

Modified: 
gnuradio/branches/developers/balister/arm-configure/gr-sounder/src/python/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/balister/arm-configure/gr-sounder/src/python/Makefile.am
       2009-07-10 20:29:37 UTC (rev 11414)
+++ 
gnuradio/branches/developers/balister/arm-configure/gr-sounder/src/python/Makefile.am
       2009-07-10 21:11:47 UTC (rev 11415)
@@ -25,8 +25,7 @@
 # This usually ends up at:
 #   ${prefix}/lib/python${python_version}/site-packages/gnuradio
 
-ourpythondir = $(grpythondir)
-ourlibdir    = $(grpyexecdir)
+sounder_pythondir = $(grpythondir)
 
 EXTRA_DIST =           \
        sounder_loopback.sh \
@@ -36,5 +35,5 @@
 dist_bin_SCRIPTS =             \
        usrp_sounder.py
 
-ourpython_PYTHON =     \
+sounder_python_PYTHON =        \
        sounder.py

Modified: 
gnuradio/branches/developers/balister/arm-configure/gr-wxgui/src/python/common.py
===================================================================
--- 
gnuradio/branches/developers/balister/arm-configure/gr-wxgui/src/python/common.py
   2009-07-10 20:29:37 UTC (rev 11414)
+++ 
gnuradio/branches/developers/balister/arm-configure/gr-wxgui/src/python/common.py
   2009-07-10 21:11:47 UTC (rev 11415)
@@ -44,32 +44,27 @@
 ##################################################
 # Input Watcher Thread
 ##################################################
-import threading
+from gnuradio import gru
 
-class input_watcher(threading.Thread):
+class input_watcher(gru.msgq_runner):
        """
        Input watcher thread runs forever.
        Read messages from the message queue.
        Forward messages to the message handler.
        """
        def __init__ (self, msgq, controller, msg_key, arg1_key='', 
arg2_key=''):
-               threading.Thread.__init__(self)
-               self.setDaemon(1)
-               self.msgq = msgq
                self._controller = controller
                self._msg_key = msg_key
                self._arg1_key = arg1_key
                self._arg2_key = arg2_key
-               self.keep_running = True
-               self.start()
+               gru.msgq_runner.__init__(self, msgq, self.handle_msg)
 
-       def run(self):
-               while self.keep_running:
-                       msg = self.msgq.delete_head()
-                       if self._arg1_key: self._controller[self._arg1_key] = 
msg.arg1()
-                       if self._arg2_key: self._controller[self._arg2_key] = 
msg.arg2()
-                       self._controller[self._msg_key] = msg.to_string()
+       def handle_msg(self, msg):
+               if self._arg1_key: self._controller[self._arg1_key] = msg.arg1()
+               if self._arg2_key: self._controller[self._arg2_key] = msg.arg2()
+               self._controller[self._msg_key] = msg.to_string()
 
+
 ##################################################
 # Shared Functions
 ##################################################

Modified: 
gnuradio/branches/developers/balister/arm-configure/gr-wxgui/src/python/fftsink_nongl.py
===================================================================
--- 
gnuradio/branches/developers/balister/arm-configure/gr-wxgui/src/python/fftsink_nongl.py
    2009-07-10 20:29:37 UTC (rev 11414)
+++ 
gnuradio/branches/developers/balister/arm-configure/gr-wxgui/src/python/fftsink_nongl.py
    2009-07-10 21:11:47 UTC (rev 11415)
@@ -25,7 +25,6 @@
 import wx
 import plot
 import numpy
-import threading
 import math    
 
 DIV_LEVELS = (1, 2, 5, 10, 20)
@@ -193,34 +192,28 @@
         self.__class__ (self.GetId())
 
 
-class input_watcher (threading.Thread):
+class input_watcher (gru.msgq_runner):
     def __init__ (self, msgq, fft_size, event_receiver, **kwds):
-        threading.Thread.__init__ (self, **kwds)
-        self.setDaemon (1)
-        self.msgq = msgq
         self.fft_size = fft_size
         self.event_receiver = event_receiver
-        self.keep_running = True
-        self.start ()
+        gru.msgq_runner.__init__(self, msgq, self.handle_msg)
 
-    def run (self):
-        while (self.keep_running):
-            msg = self.msgq.delete_head()  # blocking read of message queue
-            itemsize = int(msg.arg1())
-            nitems = int(msg.arg2())
+    def handle_msg(self, msg):
+        itemsize = int(msg.arg1())
+        nitems = int(msg.arg2())
 
-            s = msg.to_string()            # get the body of the msg as a 
string
+        s = msg.to_string() # get the body of the msg as a string
 
-            # There may be more than one FFT frame in the message.
-            # If so, we take only the last one
-            if nitems > 1:
-                start = itemsize * (nitems - 1)
-                s = s[start:start+itemsize]
+        # There may be more than one FFT frame in the message.
+        # If so, we take only the last one
+        if nitems > 1:
+            start = itemsize * (nitems - 1)
+            s = s[start:start+itemsize]
 
-            complex_data = numpy.fromstring (s, numpy.float32)
-            de = DataEvent (complex_data)
-            wx.PostEvent (self.event_receiver, de)
-            del de
+        complex_data = numpy.fromstring (s, numpy.float32)
+        de = DataEvent (complex_data)
+        wx.PostEvent (self.event_receiver, de)
+        del de
 
 class control_panel(wx.Panel):
     

Modified: 
gnuradio/branches/developers/balister/arm-configure/gr-wxgui/src/python/scopesink_nongl.py
===================================================================
--- 
gnuradio/branches/developers/balister/arm-configure/gr-wxgui/src/python/scopesink_nongl.py
  2009-07-10 20:29:37 UTC (rev 11414)
+++ 
gnuradio/branches/developers/balister/arm-configure/gr-wxgui/src/python/scopesink_nongl.py
  2009-07-10 21:11:47 UTC (rev 11415)
@@ -25,7 +25,6 @@
 import wx
 import gnuradio.wxgui.plot as plot
 import numpy
-import threading
 import struct
 
 default_scopesink_size = (640, 240)
@@ -193,48 +192,40 @@
         return self.marker
 
 
-class input_watcher (threading.Thread):
+class input_watcher (gru.msgq_runner):
     def __init__ (self, msgq, event_receiver, frame_decim, **kwds):
-        threading.Thread.__init__ (self, **kwds)
-        self.setDaemon (1)
-        self.msgq = msgq
         self.event_receiver = event_receiver
         self.frame_decim = frame_decim
         self.iscan = 0
-        self.keep_running = True
-        self.start ()
+        gru.msgq_runner.__init__(self, msgq, self.handle_msg)
 
-    def run (self):
-        # print "input_watcher: pid = ", os.getpid ()
-        while (self.keep_running):
-            msg = self.msgq.delete_head()   # blocking read of message queue
-            if self.iscan == 0:            # only display at frame_decim
-                self.iscan = self.frame_decim
-                                
-                nchan = int(msg.arg1())    # number of channels of data in msg
-                nsamples = int(msg.arg2()) # number of samples in each channel
-
-                s = msg.to_string()      # get the body of the msg as a string
-
-                bytes_per_chan = nsamples * gr.sizeof_float
-
-                records = []
-                for ch in range (nchan):
-
-                    start = ch * bytes_per_chan
-                    chan_data = s[start:start+bytes_per_chan]
-                    rec = numpy.fromstring (chan_data, numpy.float32)
-                    records.append (rec)
-
+    def handle_msg(self, msg):
+        if self.iscan == 0:            # only display at frame_decim
+            self.iscan = self.frame_decim
+            
+            nchan = int(msg.arg1())    # number of channels of data in msg
+            nsamples = int(msg.arg2()) # number of samples in each channel
+            
+            s = msg.to_string()      # get the body of the msg as a string
+            
+            bytes_per_chan = nsamples * gr.sizeof_float
+            
+            records = []
+            for ch in range (nchan):
+                
+                start = ch * bytes_per_chan
+                chan_data = s[start:start+bytes_per_chan]
+                rec = numpy.fromstring (chan_data, numpy.float32)
+                records.append (rec)
+                
                 # print "nrecords = %d, reclen = %d" % (len (records),nsamples)
-
+                
                 de = DataEvent (records)
                 wx.PostEvent (self.event_receiver, de)
                 records = []
                 del de
 
-            # end if iscan == 0
-            self.iscan -= 1
+        self.iscan -= 1
     
 
 class scope_window (wx.Panel):

Modified: 
gnuradio/branches/developers/balister/arm-configure/gr-wxgui/src/python/waterfallsink_nongl.py
===================================================================
--- 
gnuradio/branches/developers/balister/arm-configure/gr-wxgui/src/python/waterfallsink_nongl.py
      2009-07-10 20:29:37 UTC (rev 11414)
+++ 
gnuradio/branches/developers/balister/arm-configure/gr-wxgui/src/python/waterfallsink_nongl.py
      2009-07-10 21:11:47 UTC (rev 11415)
@@ -26,7 +26,6 @@
 import gnuradio.wxgui.plot as plot
 import numpy
 import os
-import threading
 import math    
 
 default_fftsink_size = (640,240)
@@ -148,37 +147,29 @@
 
     def Clone (self): 
         self.__class__ (self.GetId())
-
-
-class input_watcher (threading.Thread):
+    
+class input_watcher (gru.msgq_runner):
     def __init__ (self, msgq, fft_size, event_receiver, **kwds):
-        threading.Thread.__init__ (self, **kwds)
-        self.setDaemon (1)
-        self.msgq = msgq
         self.fft_size = fft_size
         self.event_receiver = event_receiver
-        self.keep_running = True
-        self.start ()
+        gru.msgq_runner.__init__(self, msgq, self.handle_msg)
 
-    def run (self):
-        while (self.keep_running):
-            msg = self.msgq.delete_head()  # blocking read of message queue
-            itemsize = int(msg.arg1())
-            nitems = int(msg.arg2())
+    def handle_msg(self, msg):
+        itemsize = int(msg.arg1())
+        nitems = int(msg.arg2())
 
-            s = msg.to_string()            # get the body of the msg as a 
string
+        s = msg.to_string() # get the body of the msg as a string
 
-            # There may be more than one FFT frame in the message.
-            # If so, we take only the last one
-            if nitems > 1:
-                start = itemsize * (nitems - 1)
-                s = s[start:start+itemsize]
+        # There may be more than one FFT frame in the message.
+        # If so, we take only the last one
+        if nitems > 1:
+            start = itemsize * (nitems - 1)
+            s = s[start:start+itemsize]
 
-            complex_data = numpy.fromstring (s, numpy.float32)
-            de = DataEvent (complex_data)
-            wx.PostEvent (self.event_receiver, de)
-            del de
-    
+        complex_data = numpy.fromstring (s, numpy.float32)
+        de = DataEvent (complex_data)
+        wx.PostEvent (self.event_receiver, de)
+        del de
 
 class waterfall_window (wx.Panel):
     def __init__ (self, fftsink, parent, id = -1,


Property changes on: 
gnuradio/branches/developers/balister/arm-configure/usrp/host/include/usrp/usrp_basic.h
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy/usrp_basic.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy/usrp_basic.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy/usrp_basic.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy/usrp_basic.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy/usrp_basic.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy/usrp_basic.h:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy/usrp_basic.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy/usrp_basic.h:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy/usrp_basic.h:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy/usrp_basic.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy/usrp_basic.h:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy/usrp_basic.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy/usrp_basic.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy/usrp_basic.h:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/usrp_basic.h:11124-11148
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy/usrp_basic.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy/usrp_basic.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy/usrp_basic.h:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy/usrp_basic.h:11235-11360
   + 
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy/usrp_basic.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy/usrp_basic.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy/usrp_basic.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy/usrp_basic.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy/usrp_basic.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy/usrp_basic.h:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy/usrp_basic.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy/usrp_basic.h:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy/usrp_basic.h:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy/usrp_basic.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy/usrp_basic.h:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy/usrp_basic.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy/usrp_basic.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy/usrp_basic.h:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/usrp_basic.h:11124-11148
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy/usrp_basic.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy/usrp_basic.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy/usrp_basic.h:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy/usrp_basic.h:11235-11360
/gnuradio/trunk/usrp/host/include/usrp/usrp_basic.h:11397-11414


Property changes on: 
gnuradio/branches/developers/balister/arm-configure/usrp/host/include/usrp/usrp_bytesex.h
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy/usrp_bytesex.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy/usrp_bytesex.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy/usrp_bytesex.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy/usrp_bytesex.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy/usrp_bytesex.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy/usrp_bytesex.h:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy/usrp_bytesex.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy/usrp_bytesex.h:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy/usrp_bytesex.h:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy/usrp_bytesex.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy/usrp_bytesex.h:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy/usrp_bytesex.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy/usrp_bytesex.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy/usrp_bytesex.h:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/usrp_bytesex.h:11124-11148
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy/usrp_bytesex.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy/usrp_bytesex.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy/usrp_bytesex.h:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy/usrp_bytesex.h:11235-11360
   + 
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy/usrp_bytesex.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy/usrp_bytesex.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy/usrp_bytesex.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy/usrp_bytesex.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy/usrp_bytesex.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy/usrp_bytesex.h:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy/usrp_bytesex.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy/usrp_bytesex.h:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy/usrp_bytesex.h:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy/usrp_bytesex.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy/usrp_bytesex.h:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy/usrp_bytesex.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy/usrp_bytesex.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy/usrp_bytesex.h:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/usrp_bytesex.h:11124-11148
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy/usrp_bytesex.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy/usrp_bytesex.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy/usrp_bytesex.h:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy/usrp_bytesex.h:11235-11360
/gnuradio/trunk/usrp/host/include/usrp/usrp_bytesex.h:11397-11414


Property changes on: 
gnuradio/branches/developers/balister/arm-configure/usrp/host/include/usrp/usrp_local_sighandler.h
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy/usrp_local_sighandler.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy/usrp_local_sighandler.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy/usrp_local_sighandler.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy/usrp_local_sighandler.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy/usrp_local_sighandler.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy/usrp_local_sighandler.h:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy/usrp_local_sighandler.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy/usrp_local_sighandler.h:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy/usrp_local_sighandler.h:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy/usrp_local_sighandler.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy/usrp_local_sighandler.h:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy/usrp_local_sighandler.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy/usrp_local_sighandler.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy/usrp_local_sighandler.h:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/usrp_local_sighandler.h:11124-11148
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy/usrp_local_sighandler.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy/usrp_local_sighandler.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy/usrp_local_sighandler.h:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy/usrp_local_sighandler.h:11235-11360
   + 
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy/usrp_local_sighandler.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy/usrp_local_sighandler.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy/usrp_local_sighandler.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy/usrp_local_sighandler.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy/usrp_local_sighandler.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy/usrp_local_sighandler.h:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy/usrp_local_sighandler.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy/usrp_local_sighandler.h:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy/usrp_local_sighandler.h:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy/usrp_local_sighandler.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy/usrp_local_sighandler.h:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy/usrp_local_sighandler.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy/usrp_local_sighandler.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy/usrp_local_sighandler.h:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/usrp_local_sighandler.h:11124-11148
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy/usrp_local_sighandler.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy/usrp_local_sighandler.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy/usrp_local_sighandler.h:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy/usrp_local_sighandler.h:11235-11360
/gnuradio/trunk/usrp/host/include/usrp/usrp_local_sighandler.h:11397-11414


Property changes on: 
gnuradio/branches/developers/balister/arm-configure/usrp/host/include/usrp/usrp_prims.h
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy/usrp_prims.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy/usrp_prims.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy/usrp_prims.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy/usrp_prims.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy/usrp_prims.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy/usrp_prims.h:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy/usrp_prims.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy/usrp_prims.h:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy/usrp_prims.h:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy/usrp_prims.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy/usrp_prims.h:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy/usrp_prims.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy/usrp_prims.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy/usrp_prims.h:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/usrp_prims.h:11124-11148
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy/usrp_prims.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy/usrp_prims.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy/usrp_prims.h:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy/usrp_prims.h:11235-11360
   + 
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy/usrp_prims.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy/usrp_prims.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy/usrp_prims.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy/usrp_prims.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy/usrp_prims.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy/usrp_prims.h:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy/usrp_prims.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy/usrp_prims.h:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy/usrp_prims.h:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy/usrp_prims.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy/usrp_prims.h:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy/usrp_prims.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy/usrp_prims.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy/usrp_prims.h:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/usrp_prims.h:11124-11148
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy/usrp_prims.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy/usrp_prims.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy/usrp_prims.h:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy/usrp_prims.h:11235-11360
/gnuradio/trunk/usrp/host/include/usrp/usrp_prims.h:11397-11414


Property changes on: 
gnuradio/branches/developers/balister/arm-configure/usrp/host/include/usrp/usrp_slots.h
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy/usrp_slots.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy/usrp_slots.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy/usrp_slots.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy/usrp_slots.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy/usrp_slots.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy/usrp_slots.h:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy/usrp_slots.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy/usrp_slots.h:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy/usrp_slots.h:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy/usrp_slots.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy/usrp_slots.h:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy/usrp_slots.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy/usrp_slots.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy/usrp_slots.h:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/usrp_slots.h:11124-11148
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy/usrp_slots.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy/usrp_slots.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy/usrp_slots.h:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy/usrp_slots.h:11235-11360
   + 
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy/usrp_slots.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy/usrp_slots.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy/usrp_slots.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy/usrp_slots.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy/usrp_slots.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy/usrp_slots.h:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy/usrp_slots.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy/usrp_slots.h:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy/usrp_slots.h:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy/usrp_slots.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy/usrp_slots.h:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy/usrp_slots.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy/usrp_slots.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy/usrp_slots.h:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/usrp_slots.h:11124-11148
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy/usrp_slots.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy/usrp_slots.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy/usrp_slots.h:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy/usrp_slots.h:11235-11360
/gnuradio/trunk/usrp/host/include/usrp/usrp_slots.h:11397-11414


Property changes on: 
gnuradio/branches/developers/balister/arm-configure/usrp/host/include/usrp/usrp_standard.h
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy/usrp_standard.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy/usrp_standard.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy/usrp_standard.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy/usrp_standard.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy/usrp_standard.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy/usrp_standard.h:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy/usrp_standard.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy/usrp_standard.h:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy/usrp_standard.h:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy/usrp_standard.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy/usrp_standard.h:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy/usrp_standard.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy/usrp_standard.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy/usrp_standard.h:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/usrp_standard.h:11124-11148
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy/usrp_standard.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy/usrp_standard.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy/usrp_standard.h:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy/usrp_standard.h:11235-11360
   + 
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy/usrp_standard.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy/usrp_standard.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy/usrp_standard.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy/usrp_standard.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy/usrp_standard.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy/usrp_standard.h:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy/usrp_standard.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy/usrp_standard.h:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy/usrp_standard.h:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy/usrp_standard.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy/usrp_standard.h:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy/usrp_standard.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy/usrp_standard.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy/usrp_standard.h:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/usrp_standard.h:11124-11148
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy/usrp_standard.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy/usrp_standard.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy/usrp_standard.h:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy/usrp_standard.h:11235-11360
/gnuradio/trunk/usrp/host/include/usrp/usrp_standard.h:11397-11414


Property changes on: 
gnuradio/branches/developers/balister/arm-configure/usrp/host/lib
___________________________________________________________________
Modified: svn:mergeinfo
   - /gnuradio/branches/developers/eb/t348/usrp/host/lib:10638-10648
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib:11016-11017
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib:11021-11025
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib:10958-10971
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib:10683-10688
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib:10464-10658
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib:10667-10677
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib:11125-11183
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib:10818-10858
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib:10428-10429
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib:10713-10765
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib:10771-10887
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib:11124-11148
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy:11124-11148
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib:10876-10880
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy:10876-10880
/gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/lib:11378-11390
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib:10555-10595
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib:10540-10546
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib:11235-11360
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy:11235-11360
   + /gnuradio/branches/developers/eb/t348/usrp/host/lib:10638-10648
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib:11016-11017
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib:11021-11025
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib:10958-10971
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib:10683-10688
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib:10464-10658
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib:10667-10677
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib:11125-11183
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib:10818-10858
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib:10428-10429
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib:10713-10765
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib:10771-10887
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy:10771-10887
/gnuradio/branches/developers/jcorgan/migration/usrp/host/lib:3109-3121
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib:11124-11148
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy:11124-11148
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib:10876-10880
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy:10876-10880
/gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/lib:11378-11390
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib:10555-10595
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib:10540-10546
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib:11235-11360
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy:11235-11360


Property changes on: 
gnuradio/branches/developers/balister/arm-configure/usrp/host/lib/gen-ratios
___________________________________________________________________
Modified: svn:mergeinfo
   - /gnuradio/branches/developers/eb/t348/usrp/host/lib/gen-ratios:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/gen-ratios:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/gen-ratios:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/gen-ratios:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/gen-ratios:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/gen-ratios:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/gen-ratios:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/gen-ratios:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/gen-ratios:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/gen-ratios:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/gen-ratios:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/gen-ratios:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/gen-ratios:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/gen-ratios:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/gen-ratios:11124-11148
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/gen-ratios:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/gen-ratios:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/gen-ratios:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/gen-ratios:11235-11360
   + /gnuradio/branches/developers/eb/t348/usrp/host/lib/gen-ratios:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/gen-ratios:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/gen-ratios:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/gen-ratios:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/gen-ratios:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/gen-ratios:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/gen-ratios:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/gen-ratios:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/gen-ratios:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/gen-ratios:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/gen-ratios:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/gen-ratios:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/gen-ratios:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/gen-ratios:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/gen-ratios:11124-11148
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/gen-ratios:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/gen-ratios:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/gen-ratios:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/gen-ratios:11235-11360
/gnuradio/trunk/usrp/host/lib/gen-ratios:11397-11414


Property changes on: 
gnuradio/branches/developers/balister/arm-configure/usrp/limbo/apps-inband
___________________________________________________________________
Modified: svn:mergeinfo
   - /gnuradio/branches/developers/eb/t348/usrp/host/apps-inband:10638-10648
/gnuradio/branches/developers/eb/t348/usrp/limbo/apps-inband:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/apps-inband:11016-11017
/gnuradio/branches/developers/eb/t364/usrp/limbo/apps-inband:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/apps-inband:11021-11025
/gnuradio/branches/developers/eb/t367/usrp/limbo/apps-inband:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/apps-inband:10958-10971
/gnuradio/branches/developers/eb/t371/usrp/limbo/apps-inband:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/apps-inband:10683-10688
/gnuradio/branches/developers/eb/t378/usrp/limbo/apps-inband:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/apps-inband:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/grc/usrp/limbo/apps-inband:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/apps-inband:10464-10658
/gnuradio/branches/developers/jblum/gui_guts/usrp/limbo/apps-inband:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/apps-inband:10667-10677
/gnuradio/branches/developers/jblum/vlen/usrp/limbo/apps-inband:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/apps-inband:11125-11183
/gnuradio/branches/developers/jblum/wxgui/usrp/limbo/apps-inband:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/apps-inband:10818-10858
/gnuradio/branches/developers/jcorgan/cpphier/usrp/limbo/apps-inband:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/apps-inband:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/deb/usrp/limbo/apps-inband:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/apps-inband:10428-10429
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/limbo/apps-inband:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/apps-inband:10713-10765
/gnuradio/branches/developers/jcorgan/gpio2/usrp/limbo/apps-inband:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/apps-inband:10771-10887
/gnuradio/branches/developers/jcorgan/iad2/usrp/limbo/apps-inband:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/apps-inband:11124-11148
/gnuradio/branches/developers/jcorgan/np/usrp/limbo/apps-inband:11124-11148
/gnuradio/branches/developers/jcorgan/t161/usrp/host/apps-inband:10876-10880
/gnuradio/branches/developers/jcorgan/t161/usrp/limbo/apps-inband:10876-10880
/gnuradio/branches/developers/jcorgan/usrp-headers/usrp/limbo/apps-inband:11378-11390
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/apps-inband:10555-10595
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/limbo/apps-inband:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/apps-inband:10540-10546
/gnuradio/branches/developers/michaelld/two_mods/usrp/limbo/apps-inband:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/apps-inband:11235-11360
/gnuradio/branches/developers/trondeau/qt/usrp/limbo/apps-inband:11235-11360
   + /gnuradio/branches/developers/eb/t348/usrp/host/apps-inband:10638-10648
/gnuradio/branches/developers/eb/t348/usrp/limbo/apps-inband:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/apps-inband:11016-11017
/gnuradio/branches/developers/eb/t364/usrp/limbo/apps-inband:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/apps-inband:11021-11025
/gnuradio/branches/developers/eb/t367/usrp/limbo/apps-inband:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/apps-inband:10958-10971
/gnuradio/branches/developers/eb/t371/usrp/limbo/apps-inband:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/apps-inband:10683-10688
/gnuradio/branches/developers/eb/t378/usrp/limbo/apps-inband:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/apps-inband:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/grc/usrp/limbo/apps-inband:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/apps-inband:10464-10658
/gnuradio/branches/developers/jblum/gui_guts/usrp/limbo/apps-inband:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/apps-inband:10667-10677
/gnuradio/branches/developers/jblum/vlen/usrp/limbo/apps-inband:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/apps-inband:11125-11183
/gnuradio/branches/developers/jblum/wxgui/usrp/limbo/apps-inband:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/apps-inband:10818-10858
/gnuradio/branches/developers/jcorgan/cpphier/usrp/limbo/apps-inband:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/apps-inband:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/deb/usrp/limbo/apps-inband:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/apps-inband:10428-10429
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/limbo/apps-inband:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/apps-inband:10713-10765
/gnuradio/branches/developers/jcorgan/gpio2/usrp/limbo/apps-inband:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/apps-inband:10771-10887
/gnuradio/branches/developers/jcorgan/iad2/usrp/limbo/apps-inband:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/apps-inband:11124-11148
/gnuradio/branches/developers/jcorgan/np/usrp/limbo/apps-inband:11124-11148
/gnuradio/branches/developers/jcorgan/t161/usrp/host/apps-inband:10876-10880
/gnuradio/branches/developers/jcorgan/t161/usrp/limbo/apps-inband:10876-10880
/gnuradio/branches/developers/jcorgan/usrp-headers/usrp/limbo/apps-inband:11378-11390
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/apps-inband:10555-10595
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/limbo/apps-inband:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/apps-inband:10540-10546
/gnuradio/branches/developers/michaelld/two_mods/usrp/limbo/apps-inband:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/apps-inband:11235-11360
/gnuradio/branches/developers/trondeau/qt/usrp/limbo/apps-inband:11235-11360
/gnuradio/trunk/usrp/limbo/apps-inband:11397-11414
reply via email to
[Prev in Thread] Current Thread [Next in Thread]