[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r11524 - in gnuradio/trunk: . config gnuradio-core/src
|
From: |
jcorgan |
|
Subject: |
[Commit-gnuradio] r11524 - in gnuradio/trunk: . config gnuradio-core/src/lib/runtime gnuradio-core/src/python/gnuradio/gr gnuradio-examples/python/digital gr-audio-alsa gruel/src/include/gruel gruel/src/lib gruel/src/lib/msg usrp/host/include/usrp usrp/host/lib usrp/host/lib/limbo usrp2/host/include/usrp2 |
|
Date: |
Sat, 1 Aug 2009 08:56:28 -0600 (MDT) |
Author: jcorgan
Date: 2009-08-01 08:56:28 -0600 (Sat, 01 Aug 2009)
New Revision: 11524
Added:
gnuradio/trunk/gruel/src/include/gruel/msg_accepter.h
gnuradio/trunk/gruel/src/include/gruel/msg_accepter_msgq.h
gnuradio/trunk/gruel/src/include/gruel/msg_queue.h
gnuradio/trunk/gruel/src/lib/msg/
gnuradio/trunk/gruel/src/lib/msg/Makefile.am
gnuradio/trunk/gruel/src/lib/msg/msg_accepter.cc
gnuradio/trunk/gruel/src/lib/msg/msg_accepter_msgq.cc
gnuradio/trunk/gruel/src/lib/msg/msg_queue.cc
Removed:
gnuradio/trunk/gruel/src/lib/msg/Makefile.am
gnuradio/trunk/gruel/src/lib/msg/msg_accepter.cc
gnuradio/trunk/gruel/src/lib/msg/msg_accepter_msgq.cc
gnuradio/trunk/gruel/src/lib/msg/msg_queue.cc
Modified:
gnuradio/trunk/
gnuradio/trunk/config/grc_gruel.m4
gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_basic_block.cc
gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_basic_block.h
gnuradio/trunk/gnuradio-core/src/python/gnuradio/gr/pubsub.py
gnuradio/trunk/gnuradio-examples/python/digital/receive_path.py
gnuradio/trunk/gnuradio-examples/python/digital/transmit_path.py
gnuradio/trunk/gr-audio-alsa/gnuradio-audio-alsa.pc.in
gnuradio/trunk/gruel/src/include/gruel/Makefile.am
gnuradio/trunk/gruel/src/lib/Makefile.am
gnuradio/trunk/usrp/host/include/usrp/db_base.h
gnuradio/trunk/usrp/host/include/usrp/db_base.i
gnuradio/trunk/usrp/host/include/usrp/db_basic.h
gnuradio/trunk/usrp/host/include/usrp/db_dbs_rx.h
gnuradio/trunk/usrp/host/include/usrp/db_dtt754.h
gnuradio/trunk/usrp/host/include/usrp/db_dtt768.h
gnuradio/trunk/usrp/host/include/usrp/db_flexrf.h
gnuradio/trunk/usrp/host/include/usrp/db_flexrf_mimo.h
gnuradio/trunk/usrp/host/include/usrp/db_tv_rx.h
gnuradio/trunk/usrp/host/include/usrp/db_xcvr2450.h
gnuradio/trunk/usrp/host/include/usrp/usrp_basic.h
gnuradio/trunk/usrp/host/include/usrp/usrp_bytesex.h
gnuradio/trunk/usrp/host/include/usrp/usrp_local_sighandler.h
gnuradio/trunk/usrp/host/include/usrp/usrp_prims.h
gnuradio/trunk/usrp/host/include/usrp/usrp_slots.h
gnuradio/trunk/usrp/host/include/usrp/usrp_standard.h
gnuradio/trunk/usrp/host/include/usrp/usrp_subdev_spec.h
gnuradio/trunk/usrp/host/include/usrp/usrp_tune_result.h
gnuradio/trunk/usrp/host/lib/gen-ratios
gnuradio/trunk/usrp/host/lib/limbo/db_wbx.cc
gnuradio/trunk/usrp/host/lib/limbo/db_wbx.h
gnuradio/trunk/usrp2/host/include/usrp2/mimo_config.h
Log:
Merged r11500:11506 from features/msg-passing into trunk. Work-in-progress,
passes distcheck.
Property changes on: gnuradio/trunk
___________________________________________________________________
Added: svn:mergeinfo
+ /gnuradio/branches/features/msg-passing:11501-11506
Modified: gnuradio/trunk/config/grc_gruel.m4
===================================================================
--- gnuradio/trunk/config/grc_gruel.m4 2009-07-31 01:47:20 UTC (rev 11523)
+++ gnuradio/trunk/config/grc_gruel.m4 2009-08-01 14:56:28 UTC (rev 11524)
@@ -43,6 +43,7 @@
gruel/src/include/gruel/inet.h \
gruel/src/lib/Makefile \
gruel/src/lib/pmt/Makefile \
+ gruel/src/lib/msg/Makefile \
gruel/src/scheme/Makefile \
gruel/src/scheme/gnuradio/Makefile \
])
Modified: gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_basic_block.cc
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_basic_block.cc
2009-07-31 01:47:20 UTC (rev 11523)
+++ gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_basic_block.cc
2009-08-01 14:56:28 UTC (rev 11524)
@@ -27,6 +27,8 @@
#include <gr_basic_block.h>
#include <stdexcept>
+using namespace pmt;
+
static long s_next_id = 0;
static long s_ncurrently_allocated = 0;
@@ -39,7 +41,8 @@
gr_basic_block::gr_basic_block(const std::string &name,
gr_io_signature_sptr input_signature,
gr_io_signature_sptr output_signature)
- : d_name(name),
+ : gruel::msg_accepter_msgq(gruel::make_msg_queue(0)),
+ d_name(name),
d_input_signature(input_signature),
d_output_signature(output_signature),
d_unique_id(s_next_id++),
Modified: gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_basic_block.h
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_basic_block.h
2009-07-31 01:47:20 UTC (rev 11523)
+++ gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_basic_block.h
2009-08-01 14:56:28 UTC (rev 11524)
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2006,2008 Free Software Foundation, Inc.
+ * Copyright 2006,2008,2009 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -26,20 +26,21 @@
#include <gr_runtime_types.h>
#include <gr_sptr_magic.h>
#include <boost/enable_shared_from_this.hpp>
+#include <gruel/msg_accepter_msgq.h>
#include <string>
/*!
* \brief The abstract base class for all signal processing blocks.
* \ingroup internal
*
- * Basic blocks are the bare abstraction of an entity that has a name
- * and a set of inputs and outputs. These are never instantiated
+ * Basic blocks are the bare abstraction of an entity that has a name,
+ * a set of inputs and outputs, and a message queue. These are never
instantiated
* directly; rather, this is the abstract parent class of both gr_hier_block,
* which is a recursive container, and gr_block, which implements actual
* signal processing functions.
*/
-class gr_basic_block : public boost::enable_shared_from_this<gr_basic_block>
+class gr_basic_block : gruel::msg_accepter_msgq, public
boost::enable_shared_from_this<gr_basic_block>
{
protected:
friend class gr_flowgraph;
@@ -96,6 +97,17 @@
* and output gr_io_signatures.
*/
virtual bool check_topology(int ninputs, int noutputs) { return true; }
+
+ /*!
+ * \brief Block message handler.
+ *
+ * \param msg Arbitrary message encapsulated as pmt::pmt_t
+ *
+ * This function is called by the runtime system whenever there are
+ * messages in its queue. Blocks should override this to receive
+ * messages; the default behavior is to drop them on the floor.
+ */
+ virtual void handle_msg(pmt::pmt_t msg) { };
};
inline bool operator<(gr_basic_block_sptr lhs, gr_basic_block_sptr rhs)
Property changes on:
gnuradio/trunk/gnuradio-core/src/python/gnuradio/gr/pubsub.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/python/gnuradio/gr/pubsub.py:11398-11413
/gnuradio/branches/developers/eb/t348/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10638-10648
/gnuradio/branches/developers/eb/t364/gnuradio-core/src/python/gnuradio/gr/pubsub.py:11016-11017
/gnuradio/branches/developers/eb/t367/gnuradio-core/src/python/gnuradio/gr/pubsub.py:11021-11025
/gnuradio/branches/developers/eb/t371/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10958-10971
/gnuradio/branches/developers/eb/t378/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10683-10688
/gnuradio/branches/developers/jblum/grc/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/vlen/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10667-10677
/gnuradio/branches/developers/jblum/wxgui/gnuradio-core/src/python/gnuradio/gr/pubsub.py:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10818-10858
/gnuradio/branches/developers/jcorgan/deb/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/gpio2/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10771-10887
/gnuradio/branches/developers/jcorgan/np/gnuradio-core/src/python/gnuradio/gr/pubsub.py:11124-11148
/gnuradio/branches/developers/jcorgan/omni/gnuradio-core/src/python/gnuradio/gr/pubsub.py:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/gnuradio-core/src/python/gnuradio/gr/pubsub.py:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/gnuradio-core/src/python/gnuradio/gr/pubsub.py:11453-11459
/gnuradio/branches/developers/jcorgan/t161/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10876-10880
/gnuradio/branches/developers/jcorgan/usrp-headers/gnuradio-core/src/python/gnuradio/gr/pubsub.py:11378-11390
/gnuradio/branches/developers/michaelld/two_mods/gr-wxgui/src/python/pubsub.py:10540-10546
/gnuradio/branches/developers/trondeau/qt/gnuradio-core/src/python/gnuradio/gr/pubsub.py:11235-11360
+
/gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/python/gnuradio/gr/pubsub.py:11398-11413
/gnuradio/branches/developers/eb/t348/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10638-10648
/gnuradio/branches/developers/eb/t364/gnuradio-core/src/python/gnuradio/gr/pubsub.py:11016-11017
/gnuradio/branches/developers/eb/t367/gnuradio-core/src/python/gnuradio/gr/pubsub.py:11021-11025
/gnuradio/branches/developers/eb/t371/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10958-10971
/gnuradio/branches/developers/eb/t378/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10683-10688
/gnuradio/branches/developers/jblum/grc/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/vlen/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10667-10677
/gnuradio/branches/developers/jblum/wxgui/gnuradio-core/src/python/gnuradio/gr/pubsub.py:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10818-10858
/gnuradio/branches/developers/jcorgan/deb/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/gpio2/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10771-10887
/gnuradio/branches/developers/jcorgan/np/gnuradio-core/src/python/gnuradio/gr/pubsub.py:11124-11148
/gnuradio/branches/developers/jcorgan/omni/gnuradio-core/src/python/gnuradio/gr/pubsub.py:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/gnuradio-core/src/python/gnuradio/gr/pubsub.py:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/gnuradio-core/src/python/gnuradio/gr/pubsub.py:11453-11459
/gnuradio/branches/developers/jcorgan/t161/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10876-10880
/gnuradio/branches/developers/jcorgan/usrp-headers/gnuradio-core/src/python/gnuradio/gr/pubsub.py:11378-11390
/gnuradio/branches/developers/michaelld/two_mods/gr-wxgui/src/python/pubsub.py:10540-10546
/gnuradio/branches/developers/trondeau/qt/gnuradio-core/src/python/gnuradio/gr/pubsub.py:11235-11360
/gnuradio/branches/features/msg-passing/gnuradio-core/src/python/gnuradio/gr/pubsub.py:11501-11506
Property changes on:
gnuradio/trunk/gnuradio-examples/python/digital/receive_path.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/balister/arm-configure/gnuradio-examples/python/digital/receive_path.py:11398-11413
/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/omni/gnuradio-examples/python/digital/receive_path.py:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/gnuradio-examples/python/digital/receive_path.py:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/gnuradio-examples/python/digital/receive_path.py:11453-11459
/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/balister/arm-configure/gnuradio-examples/python/digital/receive_path.py:11398-11413
/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/omni/gnuradio-examples/python/digital/receive_path.py:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/gnuradio-examples/python/digital/receive_path.py:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/gnuradio-examples/python/digital/receive_path.py:11453-11459
/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/features/msg-passing/gnuradio-examples/python/digital/receive_path.py:11501-11506
Property changes on:
gnuradio/trunk/gnuradio-examples/python/digital/transmit_path.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/balister/arm-configure/gnuradio-examples/python/digital/transmit_path.py:11398-11413
/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/omni/gnuradio-examples/python/digital/transmit_path.py:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/gnuradio-examples/python/digital/transmit_path.py:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/gnuradio-examples/python/digital/transmit_path.py:11453-11459
/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/balister/arm-configure/gnuradio-examples/python/digital/transmit_path.py:11398-11413
/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/omni/gnuradio-examples/python/digital/transmit_path.py:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/gnuradio-examples/python/digital/transmit_path.py:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/gnuradio-examples/python/digital/transmit_path.py:11453-11459
/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/features/msg-passing/gnuradio-examples/python/digital/transmit_path.py:11501-11506
Property changes on: gnuradio/trunk/gr-audio-alsa/gnuradio-audio-alsa.pc.in
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/balister/arm-configure/gr-audio-alsa/gnuradio-audio-alsa.pc.in:11398-11413
/gnuradio/branches/developers/eb/t348/gr-audio-alsa/gr-audio-alsa.pc.in:10638-10648
/gnuradio/branches/developers/eb/t364/gr-audio-alsa/gr-audio-alsa.pc.in:11016-11017
/gnuradio/branches/developers/eb/t367/gr-audio-alsa/gr-audio-alsa.pc.in:11021-11025
/gnuradio/branches/developers/eb/t371/gr-audio-alsa/gr-audio-alsa.pc.in:10958-10971
/gnuradio/branches/developers/eb/t378/gr-audio-alsa/gr-audio-alsa.pc.in:10683-10688
/gnuradio/branches/developers/jblum/grc/gr-audio-alsa/gnuradio-audio-alsa.pc.in:11187-11273,11310-11357
/gnuradio/branches/developers/jblum/grc/gr-audio-alsa/gr-audio-alsa.pc.in:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/gr-audio-alsa/gr-audio-alsa.pc.in:10464-10658
/gnuradio/branches/developers/jblum/vlen/gr-audio-alsa/gr-audio-alsa.pc.in:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/gr-audio-alsa/gr-audio-alsa.pc.in:10818-10858
/gnuradio/branches/developers/jcorgan/deb/gr-audio-alsa/gr-audio-alsa.pc.in:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/gr-audio-alsa/gr-audio-alsa.pc.in:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/gr-audio-alsa/gr-audio-alsa.pc.in:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/gr-audio-alsa/gr-audio-alsa.pc.in:10771-10887
/gnuradio/branches/developers/jcorgan/omni/gr-audio-alsa/gnuradio-audio-alsa.pc.in:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/gr-audio-alsa/gnuradio-audio-alsa.pc.in:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/gr-audio-alsa/gnuradio-audio-alsa.pc.in:11453-11459
/gnuradio/branches/developers/jcorgan/t161/gr-audio-alsa/gr-audio-alsa.pc.in:10876-10880
/gnuradio/branches/developers/jcorgan/usrp-headers/gr-audio-alsa/gnuradio-audio-alsa.pc.in:11378-11390
/gnuradio/branches/developers/michaelld/am_swig_4/gr-audio-alsa/gr-audio-alsa.pc.in:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/gr-audio-alsa/gr-audio-alsa.pc.in:10540-10546
/gnuradio/branches/developers/trondeau/qt/gr-audio-alsa/gnuradio-audio-alsa.pc.in:11235-11360
+
/gnuradio/branches/developers/balister/arm-configure/gr-audio-alsa/gnuradio-audio-alsa.pc.in:11398-11413
/gnuradio/branches/developers/eb/t348/gr-audio-alsa/gr-audio-alsa.pc.in:10638-10648
/gnuradio/branches/developers/eb/t364/gr-audio-alsa/gr-audio-alsa.pc.in:11016-11017
/gnuradio/branches/developers/eb/t367/gr-audio-alsa/gr-audio-alsa.pc.in:11021-11025
/gnuradio/branches/developers/eb/t371/gr-audio-alsa/gr-audio-alsa.pc.in:10958-10971
/gnuradio/branches/developers/eb/t378/gr-audio-alsa/gr-audio-alsa.pc.in:10683-10688
/gnuradio/branches/developers/jblum/grc/gr-audio-alsa/gnuradio-audio-alsa.pc.in:11187-11273,11310-11357
/gnuradio/branches/developers/jblum/grc/gr-audio-alsa/gr-audio-alsa.pc.in:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/gr-audio-alsa/gr-audio-alsa.pc.in:10464-10658
/gnuradio/branches/developers/jblum/vlen/gr-audio-alsa/gr-audio-alsa.pc.in:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/gr-audio-alsa/gr-audio-alsa.pc.in:10818-10858
/gnuradio/branches/developers/jcorgan/deb/gr-audio-alsa/gr-audio-alsa.pc.in:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/gr-audio-alsa/gr-audio-alsa.pc.in:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/gr-audio-alsa/gr-audio-alsa.pc.in:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/gr-audio-alsa/gr-audio-alsa.pc.in:10771-10887
/gnuradio/branches/developers/jcorgan/omni/gr-audio-alsa/gnuradio-audio-alsa.pc.in:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/gr-audio-alsa/gnuradio-audio-alsa.pc.in:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/gr-audio-alsa/gnuradio-audio-alsa.pc.in:11453-11459
/gnuradio/branches/developers/jcorgan/t161/gr-audio-alsa/gr-audio-alsa.pc.in:10876-10880
/gnuradio/branches/developers/jcorgan/usrp-headers/gr-audio-alsa/gnuradio-audio-alsa.pc.in:11378-11390
/gnuradio/branches/developers/michaelld/am_swig_4/gr-audio-alsa/gr-audio-alsa.pc.in:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/gr-audio-alsa/gr-audio-alsa.pc.in:10540-10546
/gnuradio/branches/developers/trondeau/qt/gr-audio-alsa/gnuradio-audio-alsa.pc.in:11235-11360
/gnuradio/branches/features/msg-passing/gr-audio-alsa/gnuradio-audio-alsa.pc.in:11501-11506
Modified: gnuradio/trunk/gruel/src/include/gruel/Makefile.am
===================================================================
--- gnuradio/trunk/gruel/src/include/gruel/Makefile.am 2009-07-31 01:47:20 UTC
(rev 11523)
+++ gnuradio/trunk/gruel/src/include/gruel/Makefile.am 2009-08-01 14:56:28 UTC
(rev 11524)
@@ -28,6 +28,9 @@
gruelinclude_HEADERS = \
$(BUILT_SOURCES) \
+ msg_accepter.h \
+ msg_accepter_msgq.h \
+ msg_queue.h \
pmt.h \
pmt_pool.h \
pmt_serial_tags.h \
Copied: gnuradio/trunk/gruel/src/include/gruel/msg_accepter.h (from rev 11506,
gnuradio/branches/features/msg-passing/gruel/src/include/gruel/msg_accepter.h)
===================================================================
--- gnuradio/trunk/gruel/src/include/gruel/msg_accepter.h
(rev 0)
+++ gnuradio/trunk/gruel/src/include/gruel/msg_accepter.h 2009-08-01
14:56:28 UTC (rev 11524)
@@ -0,0 +1,42 @@
+/* -*- c++ -*- */
+/*
+ * 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 this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+#ifndef INCLUDED_MSG_ACCEPTER_H
+#define INCLUDED_MSG_ACCEPTER_H
+
+#include <gruel/pmt.h>
+
+namespace gruel {
+
+ /*!
+ * \brief Virtual base class that accepts messages
+ */
+ class msg_accepter
+ {
+ public:
+ msg_accepter() {};
+ virtual ~msg_accepter();
+
+ virtual void post(pmt::pmt_t msg) = 0;
+ };
+
+} /* namespace gruel */
+
+#endif /* INCLUDED_MSG_ACCEPTER_H */
Copied: gnuradio/trunk/gruel/src/include/gruel/msg_accepter_msgq.h (from rev
11506,
gnuradio/branches/features/msg-passing/gruel/src/include/gruel/msg_accepter_msgq.h)
===================================================================
--- gnuradio/trunk/gruel/src/include/gruel/msg_accepter_msgq.h
(rev 0)
+++ gnuradio/trunk/gruel/src/include/gruel/msg_accepter_msgq.h 2009-08-01
14:56:28 UTC (rev 11524)
@@ -0,0 +1,48 @@
+/* -*- c++ -*- */
+/*
+ * 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 this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef INCLUDED_MSG_ACCEPTER_MSGQ_H
+#define INCLUDED_MSG_ACCEPTER_MSGQ_H
+
+#include <gruel/msg_accepter.h>
+#include <gruel/msg_queue.h>
+
+namespace gruel {
+
+ /*!
+ * \brief Concrete class that accepts messages and inserts them into a
message queue.
+ */
+ class msg_accepter_msgq : public msg_accepter
+ {
+ msg_queue_sptr d_msg_queue;
+
+ public:
+ msg_accepter_msgq(msg_queue_sptr msgq);
+ ~msg_accepter_msgq();
+
+ void post(pmt::pmt_t msg);
+
+ msg_queue_sptr msg_queue() const { return d_msg_queue; }
+ };
+
+} /* namespace gruel */
+
+#endif /* INCLUDED_MSG_ACCEPTER_MSGQ_H */
Copied: gnuradio/trunk/gruel/src/include/gruel/msg_queue.h (from rev 11506,
gnuradio/branches/features/msg-passing/gruel/src/include/gruel/msg_queue.h)
===================================================================
--- gnuradio/trunk/gruel/src/include/gruel/msg_queue.h
(rev 0)
+++ gnuradio/trunk/gruel/src/include/gruel/msg_queue.h 2009-08-01 14:56:28 UTC
(rev 11524)
@@ -0,0 +1,90 @@
+/* -*- c++ -*- */
+/*
+ * 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.
+ */
+#ifndef INCLUDED_MSG_QUEUE_H
+#define INCLUDED_MSG_QUEUE_H
+
+#include <gruel/thread.h>
+#include <gruel/pmt.h>
+#include <deque>
+
+namespace gruel {
+
+ class msg_queue;
+ typedef boost::shared_ptr<msg_queue> msg_queue_sptr;
+
+ msg_queue_sptr make_msg_queue(unsigned int limit=0);
+
+ /*!
+ * \brief thread-safe message queue
+ */
+ class msg_queue {
+
+ gruel::mutex d_mutex;
+ gruel::condition_variable d_not_empty;
+ gruel::condition_variable d_not_full;
+ unsigned int d_limit; // max # of messages in queue. 0 ->
unbounded
+
+ std::deque<pmt::pmt_t> d_msgs;
+
+ public:
+ msg_queue(unsigned int limit);
+ ~msg_queue();
+
+ /*!
+ * \brief Insert message at tail of queue.
+ * \param msg message
+ *
+ * Block if queue if full.
+ */
+ void insert_tail(pmt::pmt_t msg);
+
+ /*!
+ * \brief Delete message from head of queue and return it.
+ * Block if no message is available.
+ */
+ pmt::pmt_t delete_head();
+
+ /*!
+ * \brief If there's a message in the q, delete it and return it.
+ * If no message is available, return pmt_t().
+ */
+ pmt::pmt_t delete_head_nowait();
+
+ //! Delete all messages from the queue
+ void flush();
+
+ //! is the queue empty?
+ bool empty_p() const { return d_msgs.empty(); }
+
+ //! is the queue full?
+ bool full_p() const { return d_limit != 0 && count() >= d_limit; }
+
+ //! return number of messages in queue
+ unsigned int count() const { return d_msgs.size(); }
+
+ //! return limit on number of message in queue. 0 -> unbounded
+ unsigned int limit() const { return d_limit; }
+ };
+
+} /* namespace gruel */
+
+#endif /* INCLUDED_MSG_QUEUE_H */
Modified: gnuradio/trunk/gruel/src/lib/Makefile.am
===================================================================
--- gnuradio/trunk/gruel/src/lib/Makefile.am 2009-07-31 01:47:20 UTC (rev
11523)
+++ gnuradio/trunk/gruel/src/lib/Makefile.am 2009-08-01 14:56:28 UTC (rev
11524)
@@ -21,7 +21,7 @@
include $(top_srcdir)/Makefile.common
-SUBDIRS = pmt
+SUBDIRS = pmt msg
AM_CPPFLAGS = $(DEFINES) $(BOOST_CPPFLAGS) $(CPPUNIT_INCLUDES)
$(GRUEL_INCLUDES) $(WITH_INCLUDES)
@@ -33,6 +33,7 @@
# ----------------------------------------------------------------
PMT_LIB = pmt/libpmt.la
+MSG_LIB = msg/libmsg.la
# These are the source files that go into the gruel shared library
libgruel_la_SOURCES = \
@@ -44,6 +45,5 @@
libgruel_la_LIBADD = \
$(BOOST_THREAD_LIB) \
$(PMT_LIB) \
+ $(MSG_LIB) \
-lstdc++
-
-
Property changes on: gnuradio/trunk/gruel/src/lib/msg
___________________________________________________________________
Added: svn:ignore
+ Makefile
Makefile.in
.deps
.libs
Copied: gnuradio/trunk/gruel/src/lib/msg/Makefile.am (from rev 11506,
gnuradio/branches/features/msg-passing/gruel/src/lib/msg/Makefile.am)
===================================================================
--- gnuradio/trunk/gruel/src/lib/msg/Makefile.am
(rev 0)
+++ gnuradio/trunk/gruel/src/lib/msg/Makefile.am 2009-08-01 14:56:28 UTC
(rev 11524)
@@ -0,0 +1,32 @@
+#
+# 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.
+#
+
+include $(top_srcdir)/Makefile.common
+
+AM_CPPFLAGS = $(DEFINES) $(BOOST_CPPFLAGS) $(GRUEL_INCLUDES) $(WITH_INCLUDES)
+
+noinst_LTLIBRARIES = libmsg.la
+
+libmsg_la_SOURCES = \
+ msg_accepter.cc \
+ msg_accepter_msgq.cc \
+ msg_queue.cc
+
Copied: gnuradio/trunk/gruel/src/lib/msg/msg_accepter.cc (from rev 11506,
gnuradio/branches/features/msg-passing/gruel/src/lib/msg/msg_accepter.cc)
===================================================================
--- gnuradio/trunk/gruel/src/lib/msg/msg_accepter.cc
(rev 0)
+++ gnuradio/trunk/gruel/src/lib/msg/msg_accepter.cc 2009-08-01 14:56:28 UTC
(rev 11524)
@@ -0,0 +1,36 @@
+/* -*- c++ -*- */
+/*
+ * 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gruel/msg_accepter.h>
+
+namespace gruel {
+
+ msg_accepter::~msg_accepter()
+ {
+ // NOP, required as virtual destructor
+ }
+
+} /* namespace gruel */
Copied: gnuradio/trunk/gruel/src/lib/msg/msg_accepter_msgq.cc (from rev 11506,
gnuradio/branches/features/msg-passing/gruel/src/lib/msg/msg_accepter_msgq.cc)
===================================================================
--- gnuradio/trunk/gruel/src/lib/msg/msg_accepter_msgq.cc
(rev 0)
+++ gnuradio/trunk/gruel/src/lib/msg/msg_accepter_msgq.cc 2009-08-01
14:56:28 UTC (rev 11524)
@@ -0,0 +1,48 @@
+/* -*- c++ -*- */
+/*
+ * 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 this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <gruel/msg_accepter_msgq.h>
+
+using namespace pmt;
+
+namespace gruel {
+
+ msg_accepter_msgq::msg_accepter_msgq(msg_queue_sptr msgq)
+ : d_msg_queue(msgq)
+ {
+ }
+
+ msg_accepter_msgq::~msg_accepter_msgq()
+ {
+ // NOP, required as virtual destructor
+ }
+
+ void
+ msg_accepter_msgq::post(pmt_t msg)
+ {
+ d_msg_queue->insert_tail(msg);
+ }
+
+} /* namespace gruel */
Copied: gnuradio/trunk/gruel/src/lib/msg/msg_queue.cc (from rev 11506,
gnuradio/branches/features/msg-passing/gruel/src/lib/msg/msg_queue.cc)
===================================================================
--- gnuradio/trunk/gruel/src/lib/msg/msg_queue.cc
(rev 0)
+++ gnuradio/trunk/gruel/src/lib/msg/msg_queue.cc 2009-08-01 14:56:28 UTC
(rev 11524)
@@ -0,0 +1,103 @@
+/* -*- c++ -*- */
+/*
+ * 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gruel/msg_queue.h>
+#include <stdexcept>
+
+using namespace pmt;
+
+namespace gruel {
+
+ msg_queue_sptr
+ make_msg_queue(unsigned int limit)
+ {
+ return msg_queue_sptr(new msg_queue(limit));
+ }
+
+ msg_queue::msg_queue(unsigned int limit)
+ : d_limit(limit)
+ {
+ }
+
+ msg_queue::~msg_queue()
+ {
+ flush();
+ }
+
+ void
+ msg_queue::insert_tail(pmt_t msg)
+ {
+ gruel::scoped_lock guard(d_mutex);
+
+ while (full_p())
+ d_not_full.wait(guard);
+
+ d_msgs.push_back(msg);
+ d_not_empty.notify_one();
+ }
+
+ pmt_t
+ msg_queue::delete_head()
+ {
+ gruel::scoped_lock guard(d_mutex);
+
+ while (empty_p())
+ d_not_empty.wait(guard);
+
+ pmt_t m(d_msgs.front());
+ d_msgs.pop_front();
+
+ if (d_limit > 0) // Unlimited length queues never block on write
+ d_not_full.notify_one();
+
+ return m;
+ }
+
+ pmt_t
+ msg_queue::delete_head_nowait()
+ {
+ gruel::scoped_lock guard(d_mutex);
+
+ if (empty_p())
+ return pmt_t();
+
+ pmt_t m(d_msgs.front());
+ d_msgs.pop_front();
+
+ if (d_limit > 0) // Unlimited length queues never block on write
+ d_not_full.notify_one();
+
+ return m;
+ }
+
+ void
+ msg_queue::flush()
+ {
+ while (delete_head_nowait() != pmt_t())
+ ;
+ }
+
+} /* namespace gruel */
Property changes on: gnuradio/trunk/usrp/host/include/usrp/db_base.h
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/balister/arm-configure/usrp/host/include/usrp/db_base.h:11398-11413
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy/db_base.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy/db_base.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy/db_base.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy/db_base.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy/db_base.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy/db_base.h:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy/db_base.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy/db_base.h:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy/db_base.h:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy/db_base.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy/db_base.h:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy/db_base.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy/db_base.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy/db_base.h:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/db_base.h:11124-11148
/gnuradio/branches/developers/jcorgan/omni/usrp/host/include/usrp/db_base.h:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/include/usrp/db_base.h:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/include/usrp/db_base.h:11453-11459
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy/db_base.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy/db_base.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy/db_base.h:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy/db_base.h:11235-11360
+
/gnuradio/branches/developers/balister/arm-configure/usrp/host/include/usrp/db_base.h:11398-11413
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy/db_base.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy/db_base.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy/db_base.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy/db_base.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy/db_base.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy/db_base.h:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy/db_base.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy/db_base.h:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy/db_base.h:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy/db_base.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy/db_base.h:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy/db_base.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy/db_base.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy/db_base.h:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/db_base.h:11124-11148
/gnuradio/branches/developers/jcorgan/omni/usrp/host/include/usrp/db_base.h:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/include/usrp/db_base.h:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/include/usrp/db_base.h:11453-11459
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy/db_base.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy/db_base.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy/db_base.h:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy/db_base.h:11235-11360
/gnuradio/branches/features/msg-passing/usrp/host/include/usrp/db_base.h:11501-11506
Property changes on: gnuradio/trunk/usrp/host/include/usrp/db_base.i
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/balister/arm-configure/usrp/host/include/usrp/db_base.i:11398-11413
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy/db_base.i:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy/db_base.i:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy/db_base.i:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy/db_base.i:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy/db_base.i:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy/db_base.i:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy/db_base.i:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy/db_base.i:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy/db_base.i:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy/db_base.i:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy/db_base.i:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy/db_base.i:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy/db_base.i:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy/db_base.i:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/db_base.i:11124-11148
/gnuradio/branches/developers/jcorgan/omni/usrp/host/include/usrp/db_base.i:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/include/usrp/db_base.i:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/include/usrp/db_base.i:11453-11459
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy/db_base.i:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy/db_base.i:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy/db_base.i:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy/db_base.i:11235-11360
+
/gnuradio/branches/developers/balister/arm-configure/usrp/host/include/usrp/db_base.i:11398-11413
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy/db_base.i:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy/db_base.i:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy/db_base.i:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy/db_base.i:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy/db_base.i:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy/db_base.i:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy/db_base.i:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy/db_base.i:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy/db_base.i:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy/db_base.i:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy/db_base.i:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy/db_base.i:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy/db_base.i:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy/db_base.i:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/db_base.i:11124-11148
/gnuradio/branches/developers/jcorgan/omni/usrp/host/include/usrp/db_base.i:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/include/usrp/db_base.i:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/include/usrp/db_base.i:11453-11459
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy/db_base.i:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy/db_base.i:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy/db_base.i:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy/db_base.i:11235-11360
/gnuradio/branches/features/msg-passing/usrp/host/include/usrp/db_base.i:11501-11506
Property changes on: gnuradio/trunk/usrp/host/include/usrp/db_basic.h
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/balister/arm-configure/usrp/host/include/usrp/db_basic.h:11398-11413
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy/db_basic.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy/db_basic.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy/db_basic.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy/db_basic.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy/db_basic.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy/db_basic.h:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy/db_basic.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy/db_basic.h:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy/db_basic.h:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy/db_basic.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy/db_basic.h:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy/db_basic.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy/db_basic.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy/db_basic.h:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/db_basic.h:11124-11148
/gnuradio/branches/developers/jcorgan/omni/usrp/host/include/usrp/db_basic.h:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/include/usrp/db_basic.h:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/include/usrp/db_basic.h:11453-11459
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy/db_basic.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy/db_basic.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy/db_basic.h:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy/db_basic.h:11235-11360
+
/gnuradio/branches/developers/balister/arm-configure/usrp/host/include/usrp/db_basic.h:11398-11413
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy/db_basic.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy/db_basic.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy/db_basic.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy/db_basic.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy/db_basic.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy/db_basic.h:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy/db_basic.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy/db_basic.h:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy/db_basic.h:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy/db_basic.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy/db_basic.h:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy/db_basic.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy/db_basic.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy/db_basic.h:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/db_basic.h:11124-11148
/gnuradio/branches/developers/jcorgan/omni/usrp/host/include/usrp/db_basic.h:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/include/usrp/db_basic.h:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/include/usrp/db_basic.h:11453-11459
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy/db_basic.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy/db_basic.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy/db_basic.h:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy/db_basic.h:11235-11360
/gnuradio/branches/features/msg-passing/usrp/host/include/usrp/db_basic.h:11501-11506
Property changes on: gnuradio/trunk/usrp/host/include/usrp/db_dbs_rx.h
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/balister/arm-configure/usrp/host/include/usrp/db_dbs_rx.h:11398-11413
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy/db_dbs_rx.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy/db_dbs_rx.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy/db_dbs_rx.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy/db_dbs_rx.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy/db_dbs_rx.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy/db_dbs_rx.h:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy/db_dbs_rx.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy/db_dbs_rx.h:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy/db_dbs_rx.h:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy/db_dbs_rx.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy/db_dbs_rx.h:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy/db_dbs_rx.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy/db_dbs_rx.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy/db_dbs_rx.h:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/db_dbs_rx.h:11124-11148
/gnuradio/branches/developers/jcorgan/omni/usrp/host/include/usrp/db_dbs_rx.h:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/include/usrp/db_dbs_rx.h:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/include/usrp/db_dbs_rx.h:11453-11459
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy/db_dbs_rx.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy/db_dbs_rx.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy/db_dbs_rx.h:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy/db_dbs_rx.h:11235-11360
+
/gnuradio/branches/developers/balister/arm-configure/usrp/host/include/usrp/db_dbs_rx.h:11398-11413
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy/db_dbs_rx.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy/db_dbs_rx.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy/db_dbs_rx.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy/db_dbs_rx.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy/db_dbs_rx.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy/db_dbs_rx.h:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy/db_dbs_rx.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy/db_dbs_rx.h:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy/db_dbs_rx.h:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy/db_dbs_rx.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy/db_dbs_rx.h:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy/db_dbs_rx.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy/db_dbs_rx.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy/db_dbs_rx.h:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/db_dbs_rx.h:11124-11148
/gnuradio/branches/developers/jcorgan/omni/usrp/host/include/usrp/db_dbs_rx.h:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/include/usrp/db_dbs_rx.h:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/include/usrp/db_dbs_rx.h:11453-11459
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy/db_dbs_rx.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy/db_dbs_rx.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy/db_dbs_rx.h:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy/db_dbs_rx.h:11235-11360
/gnuradio/branches/features/msg-passing/usrp/host/include/usrp/db_dbs_rx.h:11501-11506
Property changes on: gnuradio/trunk/usrp/host/include/usrp/db_dtt754.h
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/balister/arm-configure/usrp/host/include/usrp/db_dtt754.h:11398-11413
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy/db_dtt754.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy/db_dtt754.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy/db_dtt754.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy/db_dtt754.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy/db_dtt754.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy/db_dtt754.h:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy/db_dtt754.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy/db_dtt754.h:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy/db_dtt754.h:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy/db_dtt754.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy/db_dtt754.h:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy/db_dtt754.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy/db_dtt754.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy/db_dtt754.h:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/db_dtt754.h:11124-11148
/gnuradio/branches/developers/jcorgan/omni/usrp/host/include/usrp/db_dtt754.h:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/include/usrp/db_dtt754.h:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/include/usrp/db_dtt754.h:11453-11459
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy/db_dtt754.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy/db_dtt754.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy/db_dtt754.h:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy/db_dtt754.h:11235-11360
+
/gnuradio/branches/developers/balister/arm-configure/usrp/host/include/usrp/db_dtt754.h:11398-11413
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy/db_dtt754.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy/db_dtt754.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy/db_dtt754.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy/db_dtt754.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy/db_dtt754.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy/db_dtt754.h:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy/db_dtt754.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy/db_dtt754.h:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy/db_dtt754.h:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy/db_dtt754.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy/db_dtt754.h:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy/db_dtt754.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy/db_dtt754.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy/db_dtt754.h:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/db_dtt754.h:11124-11148
/gnuradio/branches/developers/jcorgan/omni/usrp/host/include/usrp/db_dtt754.h:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/include/usrp/db_dtt754.h:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/include/usrp/db_dtt754.h:11453-11459
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy/db_dtt754.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy/db_dtt754.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy/db_dtt754.h:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy/db_dtt754.h:11235-11360
/gnuradio/branches/features/msg-passing/usrp/host/include/usrp/db_dtt754.h:11501-11506
Property changes on: gnuradio/trunk/usrp/host/include/usrp/db_dtt768.h
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/balister/arm-configure/usrp/host/include/usrp/db_dtt768.h:11398-11413
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy/db_dtt768.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy/db_dtt768.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy/db_dtt768.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy/db_dtt768.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy/db_dtt768.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy/db_dtt768.h:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy/db_dtt768.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy/db_dtt768.h:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy/db_dtt768.h:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy/db_dtt768.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy/db_dtt768.h:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy/db_dtt768.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy/db_dtt768.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy/db_dtt768.h:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/db_dtt768.h:11124-11148
/gnuradio/branches/developers/jcorgan/omni/usrp/host/include/usrp/db_dtt768.h:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/include/usrp/db_dtt768.h:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/include/usrp/db_dtt768.h:11453-11459
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy/db_dtt768.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy/db_dtt768.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy/db_dtt768.h:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy/db_dtt768.h:11235-11360
+
/gnuradio/branches/developers/balister/arm-configure/usrp/host/include/usrp/db_dtt768.h:11398-11413
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy/db_dtt768.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy/db_dtt768.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy/db_dtt768.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy/db_dtt768.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy/db_dtt768.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy/db_dtt768.h:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy/db_dtt768.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy/db_dtt768.h:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy/db_dtt768.h:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy/db_dtt768.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy/db_dtt768.h:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy/db_dtt768.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy/db_dtt768.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy/db_dtt768.h:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/db_dtt768.h:11124-11148
/gnuradio/branches/developers/jcorgan/omni/usrp/host/include/usrp/db_dtt768.h:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/include/usrp/db_dtt768.h:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/include/usrp/db_dtt768.h:11453-11459
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy/db_dtt768.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy/db_dtt768.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy/db_dtt768.h:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy/db_dtt768.h:11235-11360
/gnuradio/branches/features/msg-passing/usrp/host/include/usrp/db_dtt768.h:11501-11506
Property changes on: gnuradio/trunk/usrp/host/include/usrp/db_flexrf.h
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/balister/arm-configure/usrp/host/include/usrp/db_flexrf.h:11398-11413
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy/db_flexrf.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy/db_flexrf.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy/db_flexrf.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy/db_flexrf.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy/db_flexrf.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy/db_flexrf.h:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy/db_flexrf.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy/db_flexrf.h:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy/db_flexrf.h:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy/db_flexrf.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy/db_flexrf.h:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy/db_flexrf.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy/db_flexrf.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy/db_flexrf.h:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/db_flexrf.h:11124-11148
/gnuradio/branches/developers/jcorgan/omni/usrp/host/include/usrp/db_flexrf.h:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/include/usrp/db_flexrf.h:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/include/usrp/db_flexrf.h:11453-11459
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy/db_flexrf.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy/db_flexrf.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy/db_flexrf.h:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy/db_flexrf.h:11235-11360
+
/gnuradio/branches/developers/balister/arm-configure/usrp/host/include/usrp/db_flexrf.h:11398-11413
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy/db_flexrf.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy/db_flexrf.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy/db_flexrf.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy/db_flexrf.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy/db_flexrf.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy/db_flexrf.h:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy/db_flexrf.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy/db_flexrf.h:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy/db_flexrf.h:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy/db_flexrf.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy/db_flexrf.h:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy/db_flexrf.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy/db_flexrf.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy/db_flexrf.h:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/db_flexrf.h:11124-11148
/gnuradio/branches/developers/jcorgan/omni/usrp/host/include/usrp/db_flexrf.h:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/include/usrp/db_flexrf.h:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/include/usrp/db_flexrf.h:11453-11459
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy/db_flexrf.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy/db_flexrf.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy/db_flexrf.h:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy/db_flexrf.h:11235-11360
/gnuradio/branches/features/msg-passing/usrp/host/include/usrp/db_flexrf.h:11501-11506
Property changes on: gnuradio/trunk/usrp/host/include/usrp/db_flexrf_mimo.h
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/balister/arm-configure/usrp/host/include/usrp/db_flexrf_mimo.h:11398-11413
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy/db_flexrf_mimo.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy/db_flexrf_mimo.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy/db_flexrf_mimo.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy/db_flexrf_mimo.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy/db_flexrf_mimo.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy/db_flexrf_mimo.h:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy/db_flexrf_mimo.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy/db_flexrf_mimo.h:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy/db_flexrf_mimo.h:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy/db_flexrf_mimo.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy/db_flexrf_mimo.h:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy/db_flexrf_mimo.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy/db_flexrf_mimo.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy/db_flexrf_mimo.h:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/db_flexrf_mimo.h:11124-11148
/gnuradio/branches/developers/jcorgan/omni/usrp/host/include/usrp/db_flexrf_mimo.h:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/include/usrp/db_flexrf_mimo.h:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/include/usrp/db_flexrf_mimo.h:11453-11459
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy/db_flexrf_mimo.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy/db_flexrf_mimo.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy/db_flexrf_mimo.h:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy/db_flexrf_mimo.h:11235-11360
+
/gnuradio/branches/developers/balister/arm-configure/usrp/host/include/usrp/db_flexrf_mimo.h:11398-11413
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy/db_flexrf_mimo.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy/db_flexrf_mimo.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy/db_flexrf_mimo.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy/db_flexrf_mimo.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy/db_flexrf_mimo.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy/db_flexrf_mimo.h:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy/db_flexrf_mimo.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy/db_flexrf_mimo.h:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy/db_flexrf_mimo.h:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy/db_flexrf_mimo.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy/db_flexrf_mimo.h:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy/db_flexrf_mimo.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy/db_flexrf_mimo.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy/db_flexrf_mimo.h:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/db_flexrf_mimo.h:11124-11148
/gnuradio/branches/developers/jcorgan/omni/usrp/host/include/usrp/db_flexrf_mimo.h:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/include/usrp/db_flexrf_mimo.h:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/include/usrp/db_flexrf_mimo.h:11453-11459
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy/db_flexrf_mimo.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy/db_flexrf_mimo.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy/db_flexrf_mimo.h:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy/db_flexrf_mimo.h:11235-11360
/gnuradio/branches/features/msg-passing/usrp/host/include/usrp/db_flexrf_mimo.h:11501-11506
Property changes on: gnuradio/trunk/usrp/host/include/usrp/db_tv_rx.h
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/balister/arm-configure/usrp/host/include/usrp/db_tv_rx.h:11398-11413
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy/db_tv_rx.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy/db_tv_rx.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy/db_tv_rx.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy/db_tv_rx.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy/db_tv_rx.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy/db_tv_rx.h:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy/db_tv_rx.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy/db_tv_rx.h:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy/db_tv_rx.h:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy/db_tv_rx.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy/db_tv_rx.h:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy/db_tv_rx.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy/db_tv_rx.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy/db_tv_rx.h:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/db_tv_rx.h:11124-11148
/gnuradio/branches/developers/jcorgan/omni/usrp/host/include/usrp/db_tv_rx.h:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/include/usrp/db_tv_rx.h:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/include/usrp/db_tv_rx.h:11453-11459
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy/db_tv_rx.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy/db_tv_rx.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy/db_tv_rx.h:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy/db_tv_rx.h:11235-11360
+
/gnuradio/branches/developers/balister/arm-configure/usrp/host/include/usrp/db_tv_rx.h:11398-11413
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy/db_tv_rx.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy/db_tv_rx.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy/db_tv_rx.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy/db_tv_rx.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy/db_tv_rx.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy/db_tv_rx.h:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy/db_tv_rx.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy/db_tv_rx.h:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy/db_tv_rx.h:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy/db_tv_rx.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy/db_tv_rx.h:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy/db_tv_rx.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy/db_tv_rx.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy/db_tv_rx.h:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/db_tv_rx.h:11124-11148
/gnuradio/branches/developers/jcorgan/omni/usrp/host/include/usrp/db_tv_rx.h:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/include/usrp/db_tv_rx.h:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/include/usrp/db_tv_rx.h:11453-11459
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy/db_tv_rx.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy/db_tv_rx.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy/db_tv_rx.h:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy/db_tv_rx.h:11235-11360
/gnuradio/branches/features/msg-passing/usrp/host/include/usrp/db_tv_rx.h:11501-11506
Property changes on: gnuradio/trunk/usrp/host/include/usrp/db_xcvr2450.h
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/balister/arm-configure/usrp/host/include/usrp/db_xcvr2450.h:11398-11413
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy/db_xcvr2450.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy/db_xcvr2450.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy/db_xcvr2450.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy/db_xcvr2450.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy/db_xcvr2450.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy/db_xcvr2450.h:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy/db_xcvr2450.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy/db_xcvr2450.h:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy/db_xcvr2450.h:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy/db_xcvr2450.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy/db_xcvr2450.h:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy/db_xcvr2450.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy/db_xcvr2450.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy/db_xcvr2450.h:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/db_xcvr2450.h:11124-11148
/gnuradio/branches/developers/jcorgan/omni/usrp/host/include/usrp/db_xcvr2450.h:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/include/usrp/db_xcvr2450.h:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/include/usrp/db_xcvr2450.h:11453-11459
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy/db_xcvr2450.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy/db_xcvr2450.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy/db_xcvr2450.h:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy/db_xcvr2450.h:11235-11360
+
/gnuradio/branches/developers/balister/arm-configure/usrp/host/include/usrp/db_xcvr2450.h:11398-11413
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy/db_xcvr2450.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy/db_xcvr2450.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy/db_xcvr2450.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy/db_xcvr2450.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy/db_xcvr2450.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy/db_xcvr2450.h:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy/db_xcvr2450.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy/db_xcvr2450.h:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy/db_xcvr2450.h:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy/db_xcvr2450.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy/db_xcvr2450.h:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy/db_xcvr2450.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy/db_xcvr2450.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy/db_xcvr2450.h:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/db_xcvr2450.h:11124-11148
/gnuradio/branches/developers/jcorgan/omni/usrp/host/include/usrp/db_xcvr2450.h:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/include/usrp/db_xcvr2450.h:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/include/usrp/db_xcvr2450.h:11453-11459
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy/db_xcvr2450.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy/db_xcvr2450.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy/db_xcvr2450.h:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy/db_xcvr2450.h:11235-11360
/gnuradio/branches/features/msg-passing/usrp/host/include/usrp/db_xcvr2450.h:11501-11506
Property changes on: gnuradio/trunk/usrp/host/include/usrp/usrp_basic.h
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/balister/arm-configure/usrp/host/include/usrp/usrp_basic.h:11398-11413
/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/omni/usrp/host/include/usrp/usrp_basic.h:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/include/usrp/usrp_basic.h:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/include/usrp/usrp_basic.h:11453-11459
/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/balister/arm-configure/usrp/host/include/usrp/usrp_basic.h:11398-11413
/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/omni/usrp/host/include/usrp/usrp_basic.h:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/include/usrp/usrp_basic.h:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/include/usrp/usrp_basic.h:11453-11459
/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/features/msg-passing/usrp/host/include/usrp/usrp_basic.h:11501-11506
Property changes on: gnuradio/trunk/usrp/host/include/usrp/usrp_bytesex.h
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/balister/arm-configure/usrp/host/include/usrp/usrp_bytesex.h:11398-11413
/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/omni/usrp/host/include/usrp/usrp_bytesex.h:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/include/usrp/usrp_bytesex.h:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/include/usrp/usrp_bytesex.h:11453-11459
/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/balister/arm-configure/usrp/host/include/usrp/usrp_bytesex.h:11398-11413
/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/omni/usrp/host/include/usrp/usrp_bytesex.h:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/include/usrp/usrp_bytesex.h:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/include/usrp/usrp_bytesex.h:11453-11459
/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/features/msg-passing/usrp/host/include/usrp/usrp_bytesex.h:11501-11506
Property changes on:
gnuradio/trunk/usrp/host/include/usrp/usrp_local_sighandler.h
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/balister/arm-configure/usrp/host/include/usrp/usrp_local_sighandler.h:11398-11413
/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/omni/usrp/host/include/usrp/usrp_local_sighandler.h:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/include/usrp/usrp_local_sighandler.h:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/include/usrp/usrp_local_sighandler.h:11453-11459
/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/balister/arm-configure/usrp/host/include/usrp/usrp_local_sighandler.h:11398-11413
/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/omni/usrp/host/include/usrp/usrp_local_sighandler.h:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/include/usrp/usrp_local_sighandler.h:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/include/usrp/usrp_local_sighandler.h:11453-11459
/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/features/msg-passing/usrp/host/include/usrp/usrp_local_sighandler.h:11501-11506
Property changes on: gnuradio/trunk/usrp/host/include/usrp/usrp_prims.h
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/balister/arm-configure/usrp/host/include/usrp/usrp_prims.h:11398-11413
/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/omni/usrp/host/include/usrp/usrp_prims.h:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/include/usrp/usrp_prims.h:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/include/usrp/usrp_prims.h:11453-11459
/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/balister/arm-configure/usrp/host/include/usrp/usrp_prims.h:11398-11413
/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/omni/usrp/host/include/usrp/usrp_prims.h:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/include/usrp/usrp_prims.h:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/include/usrp/usrp_prims.h:11453-11459
/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/features/msg-passing/usrp/host/include/usrp/usrp_prims.h:11501-11506
Property changes on: gnuradio/trunk/usrp/host/include/usrp/usrp_slots.h
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/balister/arm-configure/usrp/host/include/usrp/usrp_slots.h:11398-11413
/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/omni/usrp/host/include/usrp/usrp_slots.h:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/include/usrp/usrp_slots.h:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/include/usrp/usrp_slots.h:11453-11459
/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/balister/arm-configure/usrp/host/include/usrp/usrp_slots.h:11398-11413
/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/omni/usrp/host/include/usrp/usrp_slots.h:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/include/usrp/usrp_slots.h:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/include/usrp/usrp_slots.h:11453-11459
/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/features/msg-passing/usrp/host/include/usrp/usrp_slots.h:11501-11506
Property changes on: gnuradio/trunk/usrp/host/include/usrp/usrp_standard.h
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/balister/arm-configure/usrp/host/include/usrp/usrp_standard.h:11398-11413
/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/omni/usrp/host/include/usrp/usrp_standard.h:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/include/usrp/usrp_standard.h:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/include/usrp/usrp_standard.h:11453-11459
/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/balister/arm-configure/usrp/host/include/usrp/usrp_standard.h:11398-11413
/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/omni/usrp/host/include/usrp/usrp_standard.h:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/include/usrp/usrp_standard.h:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/include/usrp/usrp_standard.h:11453-11459
/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/features/msg-passing/usrp/host/include/usrp/usrp_standard.h:11501-11506
Property changes on: gnuradio/trunk/usrp/host/include/usrp/usrp_subdev_spec.h
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/balister/arm-configure/usrp/host/include/usrp/usrp_subdev_spec.h:11398-11413
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy/usrp_subdev_spec.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy/usrp_subdev_spec.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy/usrp_subdev_spec.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy/usrp_subdev_spec.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy/usrp_subdev_spec.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy/usrp_subdev_spec.h:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy/usrp_subdev_spec.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy/usrp_subdev_spec.h:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy/usrp_subdev_spec.h:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy/usrp_subdev_spec.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy/usrp_subdev_spec.h:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy/usrp_subdev_spec.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy/usrp_subdev_spec.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy/usrp_subdev_spec.h:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/usrp_subdev_spec.h:11124-11148
/gnuradio/branches/developers/jcorgan/omni/usrp/host/include/usrp/usrp_subdev_spec.h:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/include/usrp/usrp_subdev_spec.h:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/include/usrp/usrp_subdev_spec.h:11453-11459
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy/usrp_subdev_spec.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy/usrp_subdev_spec.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy/usrp_subdev_spec.h:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy/usrp_subdev_spec.h:11235-11360
+
/gnuradio/branches/developers/balister/arm-configure/usrp/host/include/usrp/usrp_subdev_spec.h:11398-11413
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy/usrp_subdev_spec.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy/usrp_subdev_spec.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy/usrp_subdev_spec.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy/usrp_subdev_spec.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy/usrp_subdev_spec.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy/usrp_subdev_spec.h:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy/usrp_subdev_spec.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy/usrp_subdev_spec.h:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy/usrp_subdev_spec.h:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy/usrp_subdev_spec.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy/usrp_subdev_spec.h:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy/usrp_subdev_spec.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy/usrp_subdev_spec.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy/usrp_subdev_spec.h:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/usrp_subdev_spec.h:11124-11148
/gnuradio/branches/developers/jcorgan/omni/usrp/host/include/usrp/usrp_subdev_spec.h:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/include/usrp/usrp_subdev_spec.h:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/include/usrp/usrp_subdev_spec.h:11453-11459
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy/usrp_subdev_spec.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy/usrp_subdev_spec.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy/usrp_subdev_spec.h:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy/usrp_subdev_spec.h:11235-11360
/gnuradio/branches/features/msg-passing/usrp/host/include/usrp/usrp_subdev_spec.h:11501-11506
Property changes on: gnuradio/trunk/usrp/host/include/usrp/usrp_tune_result.h
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/balister/arm-configure/usrp/host/include/usrp/usrp_tune_result.h:11398-11413
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy/usrp_tune_result.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy/usrp_tune_result.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy/usrp_tune_result.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy/usrp_tune_result.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy/usrp_tune_result.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy/usrp_tune_result.h:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy/usrp_tune_result.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy/usrp_tune_result.h:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy/usrp_tune_result.h:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy/usrp_tune_result.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy/usrp_tune_result.h:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy/usrp_tune_result.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy/usrp_tune_result.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy/usrp_tune_result.h:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/usrp_tune_result.h:11124-11148
/gnuradio/branches/developers/jcorgan/omni/usrp/host/include/usrp/usrp_tune_result.h:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/include/usrp/usrp_tune_result.h:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/include/usrp/usrp_tune_result.h:11453-11459
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy/usrp_tune_result.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy/usrp_tune_result.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy/usrp_tune_result.h:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy/usrp_tune_result.h:11235-11360
+
/gnuradio/branches/developers/balister/arm-configure/usrp/host/include/usrp/usrp_tune_result.h:11398-11413
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy/usrp_tune_result.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy/usrp_tune_result.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy/usrp_tune_result.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy/usrp_tune_result.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy/usrp_tune_result.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy/usrp_tune_result.h:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy/usrp_tune_result.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy/usrp_tune_result.h:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy/usrp_tune_result.h:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy/usrp_tune_result.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy/usrp_tune_result.h:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy/usrp_tune_result.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy/usrp_tune_result.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy/usrp_tune_result.h:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/usrp_tune_result.h:11124-11148
/gnuradio/branches/developers/jcorgan/omni/usrp/host/include/usrp/usrp_tune_result.h:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/include/usrp/usrp_tune_result.h:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/include/usrp/usrp_tune_result.h:11453-11459
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy/usrp_tune_result.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy/usrp_tune_result.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy/usrp_tune_result.h:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy/usrp_tune_result.h:11235-11360
/gnuradio/branches/features/msg-passing/usrp/host/include/usrp/usrp_tune_result.h:11501-11506
Property changes on: gnuradio/trunk/usrp/host/lib/gen-ratios
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/balister/arm-configure/usrp/host/lib/gen-ratios:11398-11413
/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/omni/usrp/host/lib/gen-ratios:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/lib/gen-ratios:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/lib/gen-ratios:11453-11459
/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/balister/arm-configure/usrp/host/lib/gen-ratios:11398-11413
/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/omni/usrp/host/lib/gen-ratios:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/lib/gen-ratios:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/lib/gen-ratios:11453-11459
/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/features/msg-passing/usrp/host/lib/gen-ratios:11501-11506
Property changes on: gnuradio/trunk/usrp/host/lib/limbo/db_wbx.cc
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/balister/arm-configure/usrp/host/lib/limbo/db_wbx.cc:11398-11413
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy/db_wbx.cc:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy/db_wbx.cc:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy/db_wbx.cc:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy/db_wbx.cc:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy/db_wbx.cc:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy/db_wbx.cc:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy/db_wbx.cc:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy/db_wbx.cc:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy/db_wbx.cc:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy/db_wbx.cc:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy/db_wbx.cc:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy/db_wbx.cc:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy/db_wbx.cc:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy/db_wbx.cc:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/db_wbx.cc:11124-11148
/gnuradio/branches/developers/jcorgan/omni/usrp/host/lib/limbo/db_wbx.cc:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/lib/limbo/db_wbx.cc:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/lib/limbo/db_wbx.cc:11453-11459
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy/db_wbx.cc:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy/db_wbx.cc:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy/db_wbx.cc:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy/db_wbx.cc:11235-11360
+
/gnuradio/branches/developers/balister/arm-configure/usrp/host/lib/limbo/db_wbx.cc:11398-11413
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy/db_wbx.cc:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy/db_wbx.cc:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy/db_wbx.cc:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy/db_wbx.cc:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy/db_wbx.cc:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy/db_wbx.cc:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy/db_wbx.cc:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy/db_wbx.cc:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy/db_wbx.cc:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy/db_wbx.cc:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy/db_wbx.cc:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy/db_wbx.cc:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy/db_wbx.cc:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy/db_wbx.cc:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/db_wbx.cc:11124-11148
/gnuradio/branches/developers/jcorgan/omni/usrp/host/lib/limbo/db_wbx.cc:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/lib/limbo/db_wbx.cc:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/lib/limbo/db_wbx.cc:11453-11459
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy/db_wbx.cc:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy/db_wbx.cc:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy/db_wbx.cc:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy/db_wbx.cc:11235-11360
/gnuradio/branches/features/msg-passing/usrp/host/lib/limbo/db_wbx.cc:11501-11506
Property changes on: gnuradio/trunk/usrp/host/lib/limbo/db_wbx.h
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/balister/arm-configure/usrp/host/lib/limbo/db_wbx.h:11398-11413
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy/db_wbx.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy/db_wbx.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy/db_wbx.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy/db_wbx.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy/db_wbx.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy/db_wbx.h:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy/db_wbx.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy/db_wbx.h:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy/db_wbx.h:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy/db_wbx.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy/db_wbx.h:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy/db_wbx.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy/db_wbx.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy/db_wbx.h:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/db_wbx.h:11124-11148
/gnuradio/branches/developers/jcorgan/omni/usrp/host/lib/limbo/db_wbx.h:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/lib/limbo/db_wbx.h:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/lib/limbo/db_wbx.h:11453-11459
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy/db_wbx.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy/db_wbx.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy/db_wbx.h:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy/db_wbx.h:11235-11360
+
/gnuradio/branches/developers/balister/arm-configure/usrp/host/lib/limbo/db_wbx.h:11398-11413
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy/db_wbx.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy/db_wbx.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy/db_wbx.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy/db_wbx.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy/db_wbx.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy/db_wbx.h:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy/db_wbx.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy/db_wbx.h:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy/db_wbx.h:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy/db_wbx.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy/db_wbx.h:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy/db_wbx.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy/db_wbx.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy/db_wbx.h:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/db_wbx.h:11124-11148
/gnuradio/branches/developers/jcorgan/omni/usrp/host/lib/limbo/db_wbx.h:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp/host/lib/limbo/db_wbx.h:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp/host/lib/limbo/db_wbx.h:11453-11459
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy/db_wbx.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy/db_wbx.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy/db_wbx.h:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy/db_wbx.h:11235-11360
/gnuradio/branches/features/msg-passing/usrp/host/lib/limbo/db_wbx.h:11501-11506
Property changes on: gnuradio/trunk/usrp2/host/include/usrp2/mimo_config.h
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/balister/arm-configure/usrp2/host/include/usrp2/mimo_config.h:11398-11413
/gnuradio/branches/developers/eb/t348/usrp2/firmware/include/usrp2_mimo_config.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp2/firmware/include/usrp2_mimo_config.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp2/firmware/include/usrp2_mimo_config.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp2/firmware/include/usrp2_mimo_config.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp2/firmware/include/usrp2_mimo_config.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp2/firmware/include/usrp2_mimo_config.h:10680-10938
/gnuradio/branches/developers/jblum/grc/usrp2/host/include/usrp2/mimo_config.h:11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp2/firmware/include/usrp2_mimo_config.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp2/firmware/include/usrp2_mimo_config.h:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp2/host/include/usrp2/mimo_config.h:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp2/firmware/include/usrp2_mimo_config.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp2/firmware/include/usrp2_mimo_config.h:10949-10959,11013-11022
/gnuradio/branches/developers/jcorgan/deb/usrp2/host/include/usrp2/mimo_config.h:11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp2/firmware/include/usrp2_mimo_config.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp2/firmware/include/usrp2_mimo_config.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp2/firmware/include/usrp2_mimo_config.h:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp2/host/include/usrp2/mimo_config.h:11124-11148
/gnuradio/branches/developers/jcorgan/omni/usrp2/host/include/usrp2/mimo_config.h:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp2/host/include/usrp2/mimo_config.h:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp2/host/include/usrp2/mimo_config.h:11453-11459
/gnuradio/branches/developers/jcorgan/t161/usrp2/firmware/include/usrp2_mimo_config.h:10876-10880
/gnuradio/branches/developers/jcorgan/usrp-headers/usrp2/host/include/usrp2/mimo_config.h:11378-11390
/gnuradio/branches/developers/michaelld/am_swig_4/usrp2/firmware/include/usrp2_mimo_config.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp2/firmware/include/usrp2_mimo_config.h:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp2/host/include/usrp2/mimo_config.h:11235-11360
+
/gnuradio/branches/developers/balister/arm-configure/usrp2/host/include/usrp2/mimo_config.h:11398-11413
/gnuradio/branches/developers/eb/t348/usrp2/firmware/include/usrp2_mimo_config.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp2/firmware/include/usrp2_mimo_config.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp2/firmware/include/usrp2_mimo_config.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp2/firmware/include/usrp2_mimo_config.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp2/firmware/include/usrp2_mimo_config.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp2/firmware/include/usrp2_mimo_config.h:10680-10938
/gnuradio/branches/developers/jblum/grc/usrp2/host/include/usrp2/mimo_config.h:11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp2/firmware/include/usrp2_mimo_config.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp2/firmware/include/usrp2_mimo_config.h:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp2/host/include/usrp2/mimo_config.h:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp2/firmware/include/usrp2_mimo_config.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp2/firmware/include/usrp2_mimo_config.h:10949-10959,11013-11022
/gnuradio/branches/developers/jcorgan/deb/usrp2/host/include/usrp2/mimo_config.h:11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp2/firmware/include/usrp2_mimo_config.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp2/firmware/include/usrp2_mimo_config.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp2/firmware/include/usrp2_mimo_config.h:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp2/host/include/usrp2/mimo_config.h:11124-11148
/gnuradio/branches/developers/jcorgan/omni/usrp2/host/include/usrp2/mimo_config.h:11463-11485
/gnuradio/branches/developers/jcorgan/pmt/usrp2/host/include/usrp2/mimo_config.h:11492-11494
/gnuradio/branches/developers/jcorgan/pmt-gruel/usrp2/host/include/usrp2/mimo_config.h:11453-11459
/gnuradio/branches/developers/jcorgan/t161/usrp2/firmware/include/usrp2_mimo_config.h:10876-10880
/gnuradio/branches/developers/jcorgan/usrp-headers/usrp2/host/include/usrp2/mimo_config.h:11378-11390
/gnuradio/branches/developers/michaelld/am_swig_4/usrp2/firmware/include/usrp2_mimo_config.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp2/firmware/include/usrp2_mimo_config.h:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp2/host/include/usrp2/mimo_config.h:11235-11360
/gnuradio/branches/features/msg-passing/usrp2/host/include/usrp2/mimo_config.h:11501-11506
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r11524 - in gnuradio/trunk: . config gnuradio-core/src/lib/runtime gnuradio-core/src/python/gnuradio/gr gnuradio-examples/python/digital gr-audio-alsa gruel/src/include/gruel gruel/src/lib gruel/src/lib/msg usrp/host/include/usrp usrp/host/lib usrp/host/lib/limbo usrp2/host/include/usrp2,
jcorgan <=