diff options
| author | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2008-12-20 20:54:52 +0000 |
|---|---|---|
| committer | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2008-12-20 20:54:52 +0000 |
| commit | 66dca69648e7fa8fbdd2973f77224ad34198d9a5 (patch) | |
| tree | d5c67453d04d7f727da5dcac7f427a85ea086983 | |
| parent | 8d3704c5af29ef15e3a4490049d2fd6d917bc6d8 (diff) | |
Move mblock library include files into separate library. Updates to usrp in-band code to accommodate. Tested with out-of-tree mblock application builds. Trunk passes distcheck.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10144 221aa14e-8319-0410-a670-987f0aec2ac5
76 files changed, 323 insertions, 273 deletions
diff --git a/config/grc_mblock.m4 b/config/grc_mblock.m4 index e262f25b86..e3ae1817f1 100644 --- a/config/grc_mblock.m4 +++ b/config/grc_mblock.m4 @@ -36,7 +36,7 @@ AC_DEFUN([GRC_MBLOCK],[ fi if test $passed != with; then dnl how and where to find INCLUDES and LA - mblock_INCLUDES="-I\${abs_top_srcdir}/mblock/src/lib" + mblock_INCLUDES="-I\${abs_top_srcdir}/mblock/src/include" mblock_LA="\${abs_top_builddir}/mblock/src/lib/libmblock.la" fi @@ -45,6 +45,8 @@ AC_DEFUN([GRC_MBLOCK],[ mblock/mblock.pc \ mblock/doc/Makefile \ mblock/src/Makefile \ + mblock/src/include/Makefile \ + mblock/src/include/mblock/Makefile \ mblock/src/lib/Makefile \ mblock/src/scheme/Makefile \ mblock/src/scheme/gnuradio/Makefile \ diff --git a/mblock/src/Makefile.am b/mblock/src/Makefile.am index 52f60f4764..60995c9720 100644 --- a/mblock/src/Makefile.am +++ b/mblock/src/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2008 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -19,4 +19,4 @@ # Boston, MA 02110-1301, USA. # -SUBDIRS = lib scheme +SUBDIRS = include lib scheme diff --git a/mblock/src/include/Makefile.am b/mblock/src/include/Makefile.am new file mode 100644 index 0000000000..d5672989c6 --- /dev/null +++ b/mblock/src/include/Makefile.am @@ -0,0 +1,24 @@ +# +# Copyright 2008 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 + +SUBDIRS = mblock diff --git a/mblock/src/include/mblock/Makefile.am b/mblock/src/include/mblock/Makefile.am new file mode 100644 index 0000000000..e36215aa40 --- /dev/null +++ b/mblock/src/include/mblock/Makefile.am @@ -0,0 +1,37 @@ +# +# Copyright 2008 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 + +mbincludedir = $(includedir)/mblock + +mbinclude_HEADERS = \ + common.h \ + class_registry.h \ + exception.h \ + mblock.h \ + message.h \ + msg_accepter.h \ + msg_queue.h \ + port.h \ + protocol_class.h \ + runtime.h \ + time.h diff --git a/mblock/src/lib/mb_class_registry.h b/mblock/src/include/mblock/class_registry.h index 713cc1e262..b94a7cbc19 100644 --- a/mblock/src/lib/mb_class_registry.h +++ b/mblock/src/include/mblock/class_registry.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -21,7 +21,7 @@ #ifndef INCLUDED_MB_CLASS_REGISTRY_H #define INCLUDED_MB_CLASS_REGISTRY_H -#include <mb_common.h> +#include <mblock/common.h> //! conceptually, pointer to constructor typedef mb_mblock_sptr (*mb_mblock_maker_t)(mb_runtime *runtime, diff --git a/mblock/src/lib/mb_common.h b/mblock/src/include/mblock/common.h index 1f78d5a40c..2507d053ea 100644 --- a/mblock/src/lib/mb_common.h +++ b/mblock/src/include/mblock/common.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006,2007 Free Software Foundation, Inc. + * Copyright 2006,2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * diff --git a/mblock/src/lib/mb_exception.h b/mblock/src/include/mblock/exception.h index 837e49f425..6cc4566569 100644 --- a/mblock/src/lib/mb_exception.h +++ b/mblock/src/include/mblock/exception.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006 Free Software Foundation, Inc. + * Copyright 2006,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * diff --git a/mblock/src/lib/mb_mblock.h b/mblock/src/include/mblock/mblock.h index 146e280089..14517ffcc5 100644 --- a/mblock/src/lib/mb_mblock.h +++ b/mblock/src/include/mblock/mblock.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006 Free Software Foundation, Inc. + * Copyright 2006,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -21,10 +21,10 @@ #ifndef INCLUDED_MB_MBLOCK_H #define INCLUDED_MB_MBLOCK_H -#include <mb_common.h> -#include <mb_message.h> -#include <mb_port.h> -#include <mb_time.h> +#include <mblock/common.h> +#include <mblock/message.h> +#include <mblock/port.h> +#include <mblock/time.h> /*! diff --git a/mblock/src/lib/mb_message.h b/mblock/src/include/mblock/message.h index f5e465530c..8fbee2ff08 100644 --- a/mblock/src/lib/mb_message.h +++ b/mblock/src/include/mblock/message.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006,2007 Free Software Foundation, Inc. + * Copyright 2006,2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -21,7 +21,7 @@ #ifndef INCLUDED_MB_MESSAGE_H #define INCLUDED_MB_MESSAGE_H -#include <mb_common.h> +#include <mblock/common.h> #include <iosfwd> #define MB_MESSAGE_LOCAL_ALLOCATOR 0 // define to 0 or 1 diff --git a/mblock/src/lib/mb_msg_accepter.h b/mblock/src/include/mblock/msg_accepter.h index 254b3b0447..69be13111b 100644 --- a/mblock/src/lib/mb_msg_accepter.h +++ b/mblock/src/include/mblock/msg_accepter.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -21,7 +21,7 @@ #ifndef INCLUDED_MB_MSG_ACCEPTER_H #define INCLUDED_MB_MSG_ACCEPTER_H -#include <mb_common.h> +#include <mblock/common.h> /*! * \brief Abstract class that accepts messages diff --git a/mblock/src/lib/mb_msg_queue.h b/mblock/src/include/mblock/msg_queue.h index a1cd43f14b..31ff65a51f 100644 --- a/mblock/src/lib/mb_msg_queue.h +++ b/mblock/src/include/mblock/msg_queue.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -21,9 +21,9 @@ #ifndef INCLUDED_MB_MSG_QUEUE_H #define INCLUDED_MB_MSG_QUEUE_H -#include <mb_common.h> +#include <mblock/common.h> #include <omnithread.h> -#include <mb_time.h> +#include <mblock/time.h> /*! * \brief priority queue for mblock messages diff --git a/mblock/src/lib/mb_port.h b/mblock/src/include/mblock/port.h index 0e9898bc49..892a1dd976 100644 --- a/mblock/src/lib/mb_port.h +++ b/mblock/src/include/mblock/port.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006 Free Software Foundation, Inc. + * Copyright 2006,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -21,7 +21,7 @@ #ifndef INCLUDED_MB_PORT_H #define INCLUDED_MB_PORT_H -#include <mb_common.h> +#include <mblock/common.h> /*! * \brief Abstract port characteristics diff --git a/mblock/src/lib/mb_protocol_class.h b/mblock/src/include/mblock/protocol_class.h index 7a1d9afb69..33c5d7116d 100644 --- a/mblock/src/lib/mb_protocol_class.h +++ b/mblock/src/include/mblock/protocol_class.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006 Free Software Foundation, Inc. + * Copyright 2006,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -21,7 +21,7 @@ #ifndef INCLUDED_MB_PROTOCOL_CLASS_H #define INCLUDED_MB_PROTOCOL_CLASS_H -#include <mb_common.h> +#include <mblock/common.h> /*! * \brief construct a protocol_class diff --git a/mblock/src/lib/mb_runtime.h b/mblock/src/include/mblock/runtime.h index 1c9ebcab03..4236e346fd 100644 --- a/mblock/src/lib/mb_runtime.h +++ b/mblock/src/include/mblock/runtime.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006 Free Software Foundation, Inc. + * Copyright 2006,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -21,7 +21,7 @@ #ifndef INCLUDED_MB_RUNTIME_H #define INCLUDED_MB_RUNTIME_H -#include <mb_common.h> +#include <mblock/common.h> #include <omnithread.h> /*! diff --git a/mblock/src/lib/mb_time.h b/mblock/src/include/mblock/time.h index cba6be7851..cba6be7851 100644 --- a/mblock/src/lib/mb_time.h +++ b/mblock/src/include/mblock/time.h diff --git a/mblock/src/lib/Makefile.am b/mblock/src/lib/Makefile.am index e8e5f59af2..269c8ae228 100644 --- a/mblock/src/lib/Makefile.am +++ b/mblock/src/lib/Makefile.am @@ -22,7 +22,8 @@ include $(top_srcdir)/Makefile.common AM_CPPFLAGS = $(DEFINES) $(OMNITHREAD_INCLUDES) $(PMT_INCLUDES) \ - $(BOOST_CPPFLAGS) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES) + $(BOOST_CPPFLAGS) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES) \ + $(MBLOCK_INCLUDES) # disable test until we fix ticket:180 # TESTS = test_mblock @@ -75,25 +76,11 @@ libmblock_la_LIBADD = \ $(PMT_LA) \ -lstdc++ -include_HEADERS = \ - mb_class_registry.h \ - mb_common.h \ - mb_exception.h \ +noinst_HEADERS = \ mb_gettid.h \ - mb_mblock.h \ - mb_message.h \ - mb_msg_accepter.h \ mb_msg_accepter_msgq.h \ - mb_msg_queue.h \ - mb_port.h \ mb_port_simple.h \ - mb_protocol_class.h \ - mb_runtime.h \ - mb_time.h \ - mb_util.h - - -noinst_HEADERS = \ + mb_util.h \ mb_connection.h \ mb_endpoint.h \ mb_mblock_impl.h \ diff --git a/mblock/src/lib/benchmark_send.cc b/mblock/src/lib/benchmark_send.cc index 7b8f7cb766..fe873a69a1 100644 --- a/mblock/src/lib/benchmark_send.cc +++ b/mblock/src/lib/benchmark_send.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -19,7 +19,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include <mb_runtime.h> +#include <mblock/runtime.h> #include <iostream> int diff --git a/mblock/src/lib/mb_class_registry.cc b/mblock/src/lib/mb_class_registry.cc index 77cec8de6b..7ccee2969f 100644 --- a/mblock/src/lib/mb_class_registry.cc +++ b/mblock/src/lib/mb_class_registry.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -22,7 +22,7 @@ #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <mb_class_registry.h> +#include <mblock/class_registry.h> #include <map> static std::map<std::string, mb_mblock_maker_t> s_registry; diff --git a/mblock/src/lib/mb_endpoint.h b/mblock/src/lib/mb_endpoint.h index db55b3f449..aae376a5d5 100644 --- a/mblock/src/lib/mb_endpoint.h +++ b/mblock/src/lib/mb_endpoint.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006 Free Software Foundation, Inc. + * Copyright 2006,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -23,7 +23,7 @@ #define INCLUDED_MB_ENDPOINT_H #include <string> -#include <mb_port.h> +#include <mblock/port.h> /*! * \brief Endpoint specification for connection diff --git a/mblock/src/lib/mb_exception.cc b/mblock/src/lib/mb_exception.cc index 3c08a01d04..810131840d 100644 --- a/mblock/src/lib/mb_exception.cc +++ b/mblock/src/lib/mb_exception.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006 Free Software Foundation, Inc. + * Copyright 2006,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -23,8 +23,8 @@ #include <config.h> #endif -#include <mb_exception.h> -#include <mb_mblock.h> +#include <mblock/exception.h> +#include <mblock/mblock.h> #include <mb_util.h> diff --git a/mblock/src/lib/mb_mblock.cc b/mblock/src/lib/mb_mblock.cc index 38d216ad47..b2f763623c 100644 --- a/mblock/src/lib/mb_mblock.cc +++ b/mblock/src/lib/mb_mblock.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006 Free Software Foundation, Inc. + * Copyright 2006,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -23,10 +23,10 @@ #include <config.h> #endif -#include <mb_mblock.h> +#include <mblock/mblock.h> #include <mb_mblock_impl.h> -#include <mb_runtime.h> -#include <mb_exception.h> +#include <mblock/runtime.h> +#include <mblock/exception.h> #include <iostream> diff --git a/mblock/src/lib/mb_mblock_impl.cc b/mblock/src/lib/mb_mblock_impl.cc index 90868cf4c5..e11b008983 100644 --- a/mblock/src/lib/mb_mblock_impl.cc +++ b/mblock/src/lib/mb_mblock_impl.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006 Free Software Foundation, Inc. + * Copyright 2006,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -23,11 +23,11 @@ #include <config.h> #endif #include <mb_mblock_impl.h> -#include <mb_mblock.h> -#include <mb_protocol_class.h> -#include <mb_port.h> +#include <mblock/mblock.h> +#include <mblock/protocol_class.h> +#include <mblock/port.h> #include <mb_port_simple.h> -#include <mb_exception.h> +#include <mblock/exception.h> #include <mb_util.h> #include <mb_msg_accepter_smp.h> #include <mbi_runtime_lock.h> diff --git a/mblock/src/lib/mb_mblock_impl.h b/mblock/src/lib/mb_mblock_impl.h index 374ee8fe0e..ed8059b008 100644 --- a/mblock/src/lib/mb_mblock_impl.h +++ b/mblock/src/lib/mb_mblock_impl.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006,2007 Free Software Foundation, Inc. + * Copyright 2006,2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -21,10 +21,10 @@ #ifndef INCLUDED_MB_MBLOCK_IMPL_H #define INCLUDED_MB_MBLOCK_IMPL_H -#include <mb_mblock.h> +#include <mblock/mblock.h> #include <mb_runtime_base.h> #include <mb_connection.h> -#include <mb_msg_queue.h> +#include <mblock/msg_queue.h> #include <list> #include <map> diff --git a/mblock/src/lib/mb_message.cc b/mblock/src/lib/mb_message.cc index ce98a931e3..664e369fa5 100644 --- a/mblock/src/lib/mb_message.cc +++ b/mblock/src/lib/mb_message.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006 Free Software Foundation, Inc. + * Copyright 2006,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -22,7 +22,7 @@ #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <mb_message.h> +#include <mblock/message.h> #include <stdio.h> #include <pmt_pool.h> diff --git a/mblock/src/lib/mb_msg_accepter.cc b/mblock/src/lib/mb_msg_accepter.cc index 001b1f11ea..88b92394c4 100644 --- a/mblock/src/lib/mb_msg_accepter.cc +++ b/mblock/src/lib/mb_msg_accepter.cc @@ -23,7 +23,7 @@ #include <config.h> #endif -#include <mb_msg_accepter.h> +#include <mblock/msg_accepter.h> mb_msg_accepter::~mb_msg_accepter() { diff --git a/mblock/src/lib/mb_msg_accepter_msgq.cc b/mblock/src/lib/mb_msg_accepter_msgq.cc index 8220dbfee4..fb97914e5b 100644 --- a/mblock/src/lib/mb_msg_accepter_msgq.cc +++ b/mblock/src/lib/mb_msg_accepter_msgq.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -23,7 +23,7 @@ #include <config.h> #endif #include <mb_msg_accepter_msgq.h> -#include <mb_message.h> +#include <mblock/message.h> pmt_t s_sys_port = pmt_intern("%sys-port"); diff --git a/mblock/src/lib/mb_msg_accepter_msgq.h b/mblock/src/lib/mb_msg_accepter_msgq.h index 1436e8c04a..6c743bb4ba 100644 --- a/mblock/src/lib/mb_msg_accepter_msgq.h +++ b/mblock/src/lib/mb_msg_accepter_msgq.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -21,8 +21,8 @@ #ifndef INCLUDED_MB_MSG_ACCEPTER_MSGQ_H #define INCLUDED_MB_MSG_ACCEPTER_MSGQ_H -#include <mb_msg_accepter.h> -#include <mb_msg_queue.h> +#include <mblock/msg_accepter.h> +#include <mblock/msg_queue.h> /*! * \brief Concrete class that accepts messages and inserts them into a message queue. diff --git a/mblock/src/lib/mb_msg_accepter_smp.cc b/mblock/src/lib/mb_msg_accepter_smp.cc index ac3b4cfdb8..3b392a8c1b 100644 --- a/mblock/src/lib/mb_msg_accepter_smp.cc +++ b/mblock/src/lib/mb_msg_accepter_smp.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -23,10 +23,10 @@ #include <config.h> #endif #include <mb_msg_accepter_smp.h> -#include <mb_common.h> -#include <mb_mblock.h> +#include <mblock/common.h> +#include <mblock/mblock.h> #include <mb_mblock_impl.h> -#include <mb_message.h> +#include <mblock/message.h> mb_msg_accepter_smp::mb_msg_accepter_smp(mb_mblock_sptr mblock, pmt_t port_name) : d_mb(mblock), d_port_name(port_name) diff --git a/mblock/src/lib/mb_msg_accepter_smp.h b/mblock/src/lib/mb_msg_accepter_smp.h index 39eedf8f03..0e0cd7c643 100644 --- a/mblock/src/lib/mb_msg_accepter_smp.h +++ b/mblock/src/lib/mb_msg_accepter_smp.h @@ -21,7 +21,7 @@ #ifndef INCLUDED_MB_MSG_ACCEPTER_SMP_H #define INCLUDED_MB_MSG_ACCEPTER_SMP_H -#include <mb_msg_accepter.h> +#include <mblock/msg_accepter.h> /*! * \brief Concrete message acceptor that does an mb_msg_queue insertion diff --git a/mblock/src/lib/mb_msg_queue.cc b/mblock/src/lib/mb_msg_queue.cc index c5dd72fb56..c68c5fd64b 100644 --- a/mblock/src/lib/mb_msg_queue.cc +++ b/mblock/src/lib/mb_msg_queue.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -22,8 +22,8 @@ #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <mb_msg_queue.h> -#include <mb_message.h> +#include <mblock/msg_queue.h> +#include <mblock/message.h> mb_msg_queue::mb_msg_queue() diff --git a/mblock/src/lib/mb_port.cc b/mblock/src/lib/mb_port.cc index 959e89c72b..a13f49f2c6 100644 --- a/mblock/src/lib/mb_port.cc +++ b/mblock/src/lib/mb_port.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006 Free Software Foundation, Inc. + * Copyright 2006,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -23,8 +23,8 @@ #include <config.h> #endif -#include <mb_port.h> -#include <mb_protocol_class.h> +#include <mblock/port.h> +#include <mblock/protocol_class.h> mb_port::mb_port(mb_mblock *mblock, const std::string &port_name, diff --git a/mblock/src/lib/mb_port_simple.cc b/mblock/src/lib/mb_port_simple.cc index 24a01b5628..1b4b35cbf1 100644 --- a/mblock/src/lib/mb_port_simple.cc +++ b/mblock/src/lib/mb_port_simple.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -24,9 +24,9 @@ #endif #include <mb_port_simple.h> -#include <mb_msg_accepter.h> -#include <mb_exception.h> -#include <mb_mblock.h> +#include <mblock/msg_accepter.h> +#include <mblock/exception.h> +#include <mblock/mblock.h> #include <mb_mblock_impl.h> #include <assert.h> #include <mbi_runtime_lock.h> diff --git a/mblock/src/lib/mb_port_simple.h b/mblock/src/lib/mb_port_simple.h index db9e226e68..3041239adf 100644 --- a/mblock/src/lib/mb_port_simple.h +++ b/mblock/src/lib/mb_port_simple.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -21,7 +21,7 @@ #ifndef INCLUDED_MB_PORT_SIMPLE_H #define INCLUDED_MB_PORT_SIMPLE_H -#include <mb_port.h> +#include <mblock/port.h> /*! * \brief Concrete port realization diff --git a/mblock/src/lib/mb_protocol_class.cc b/mblock/src/lib/mb_protocol_class.cc index fb1f6531c0..f076909e1c 100644 --- a/mblock/src/lib/mb_protocol_class.cc +++ b/mblock/src/lib/mb_protocol_class.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006 Free Software Foundation, Inc. + * Copyright 2006,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -23,7 +23,7 @@ #include <config.h> #endif -#include <mb_protocol_class.h> +#include <mblock/protocol_class.h> #include <iostream> static pmt_t s_ALL_PROTOCOL_CLASSES = PMT_NIL; diff --git a/mblock/src/lib/mb_runtime.cc b/mblock/src/lib/mb_runtime.cc index 56ae2869c8..57a05c416f 100644 --- a/mblock/src/lib/mb_runtime.cc +++ b/mblock/src/lib/mb_runtime.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006 Free Software Foundation, Inc. + * Copyright 2006,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -23,7 +23,7 @@ #include <config.h> #endif -#include <mb_runtime.h> +#include <mblock/runtime.h> #include <mb_runtime_thread_per_block.h> mb_runtime_sptr diff --git a/mblock/src/lib/mb_runtime_base.cc b/mblock/src/lib/mb_runtime_base.cc index c10c3168a7..1dea4d46ec 100644 --- a/mblock/src/lib/mb_runtime_base.cc +++ b/mblock/src/lib/mb_runtime_base.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * diff --git a/mblock/src/lib/mb_runtime_base.h b/mblock/src/lib/mb_runtime_base.h index 4872bd81ea..019662bc22 100644 --- a/mblock/src/lib/mb_runtime_base.h +++ b/mblock/src/lib/mb_runtime_base.h @@ -22,9 +22,9 @@ #ifndef INCLUDED_MB_RUNTIME_BASE_H #define INCLUDED_MB_RUNTIME_BASE_H -#include <mb_runtime.h> +#include <mblock/runtime.h> #include <omnithread.h> -#include <mb_time.h> +#include <mblock/time.h> /* * \brief This is the runtime class used by the implementation. diff --git a/mblock/src/lib/mb_runtime_nop.cc b/mblock/src/lib/mb_runtime_nop.cc index 78bc0a1aa0..603d5addb1 100644 --- a/mblock/src/lib/mb_runtime_nop.cc +++ b/mblock/src/lib/mb_runtime_nop.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -23,9 +23,9 @@ #include <config.h> #endif #include <mb_runtime_nop.h> -#include <mb_mblock.h> -#include <mb_class_registry.h> -#include <mb_exception.h> +#include <mblock/mblock.h> +#include <mblock/class_registry.h> +#include <mblock/exception.h> mb_runtime_sptr mb_make_runtime_nop() diff --git a/mblock/src/lib/mb_runtime_thread_per_block.cc b/mblock/src/lib/mb_runtime_thread_per_block.cc index f1e4d10af0..d12014a16e 100644 --- a/mblock/src/lib/mb_runtime_thread_per_block.cc +++ b/mblock/src/lib/mb_runtime_thread_per_block.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -23,10 +23,10 @@ #include <config.h> #endif #include <mb_runtime_thread_per_block.h> -#include <mb_mblock.h> +#include <mblock/mblock.h> #include <mb_mblock_impl.h> -#include <mb_class_registry.h> -#include <mb_exception.h> +#include <mblock/class_registry.h> +#include <mblock/exception.h> #include <mb_worker.h> #include <omnithread.h> #include <iostream> diff --git a/mblock/src/lib/mb_runtime_thread_per_block.h b/mblock/src/lib/mb_runtime_thread_per_block.h index ed2dc046cb..ef962911e1 100644 --- a/mblock/src/lib/mb_runtime_thread_per_block.h +++ b/mblock/src/lib/mb_runtime_thread_per_block.h @@ -23,7 +23,7 @@ #include <mb_runtime_base.h> #include <mb_worker.h> -#include <mb_msg_queue.h> +#include <mblock/msg_queue.h> #include <mb_timer_queue.h> /*! diff --git a/mblock/src/lib/mb_timer_queue.h b/mblock/src/lib/mb_timer_queue.h index 208e37d51b..e8b8e1b641 100644 --- a/mblock/src/lib/mb_timer_queue.h +++ b/mblock/src/lib/mb_timer_queue.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -22,11 +22,11 @@ #ifndef INCLUDED_MB_TIMER_QUEUE_H #define INCLUDED_MB_TIMER_QUEUE_H -#include <mb_time.h> +#include <mblock/time.h> #include <vector> #include <queue> #include <pmt.h> -#include <mb_msg_accepter.h> +#include <mblock/msg_accepter.h> class mb_timeout { public: diff --git a/mblock/src/lib/mb_worker.cc b/mblock/src/lib/mb_worker.cc index 4ac161e9dd..e7ac6a9b44 100644 --- a/mblock/src/lib/mb_worker.cc +++ b/mblock/src/lib/mb_worker.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -24,10 +24,10 @@ #endif #include <mb_worker.h> #include <mb_runtime_thread_per_block.h> -#include <mb_exception.h> -#include <mb_mblock.h> +#include <mblock/exception.h> +#include <mblock/mblock.h> #include <mb_gettid.h> -#include <mb_msg_accepter.h> +#include <mblock/msg_accepter.h> #include <iostream> #ifdef HAVE_SCHED_H #include <sched.h> diff --git a/mblock/src/lib/mb_worker.h b/mblock/src/lib/mb_worker.h index d5937144c4..b840ae557e 100644 --- a/mblock/src/lib/mb_worker.h +++ b/mblock/src/lib/mb_worker.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -23,8 +23,8 @@ #define INCLUDED_MB_WORKER_H #include <omnithread.h> -#include <mb_common.h> -#include <mb_class_registry.h> +#include <mblock/common.h> +#include <mblock/class_registry.h> class mb_worker; diff --git a/mblock/src/lib/mbi_runtime_lock.h b/mblock/src/lib/mbi_runtime_lock.h index a4dec76f5c..020cd733ce 100644 --- a/mblock/src/lib/mbi_runtime_lock.h +++ b/mblock/src/lib/mbi_runtime_lock.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -22,7 +22,7 @@ #ifndef INCLUDED_MBI_RUNTIME_LOCK_H #define INCLUDED_MBI_RUNTIME_LOCK_H -#include <mb_runtime.h> +#include <mblock/runtime.h> #include <mb_mblock_impl.h> #include <boost/utility.hpp> diff --git a/mblock/src/lib/qa_bitset.cc b/mblock/src/lib/qa_bitset.cc index 85f388fc25..bc42ac8b04 100644 --- a/mblock/src/lib/qa_bitset.cc +++ b/mblock/src/lib/qa_bitset.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -22,10 +22,10 @@ #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <mb_mblock.h> -#include <mb_protocol_class.h> -#include <mb_message.h> -#include <mb_class_registry.h> +#include <mblock/mblock.h> +#include <mblock/protocol_class.h> +#include <mblock/message.h> +#include <mblock/class_registry.h> #include <iostream> #include <sstream> #include <bitset> diff --git a/mblock/src/lib/qa_disconnect.cc b/mblock/src/lib/qa_disconnect.cc index ff263da84c..e098e8b29e 100644 --- a/mblock/src/lib/qa_disconnect.cc +++ b/mblock/src/lib/qa_disconnect.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -22,10 +22,10 @@ #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <mb_mblock.h> -#include <mb_protocol_class.h> -#include <mb_message.h> -#include <mb_class_registry.h> +#include <mblock/mblock.h> +#include <mblock/protocol_class.h> +#include <mblock/message.h> +#include <mblock/class_registry.h> #include <iostream> #include <sstream> #include <bitset> diff --git a/mblock/src/lib/qa_mblock_prims.cc b/mblock/src/lib/qa_mblock_prims.cc index 6802986fad..2eed3afde3 100644 --- a/mblock/src/lib/qa_mblock_prims.cc +++ b/mblock/src/lib/qa_mblock_prims.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006,2007 Free Software Foundation, Inc. + * Copyright 2006,2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -26,15 +26,15 @@ #include <qa_mblock_prims.h> #include <cppunit/TestAssert.h> -#include <mb_mblock.h> -#include <mb_runtime.h> -#include <mb_protocol_class.h> -#include <mb_exception.h> -#include <mb_msg_queue.h> -#include <mb_message.h> +#include <mblock/mblock.h> +#include <mblock/runtime.h> +#include <mblock/protocol_class.h> +#include <mblock/exception.h> +#include <mblock/msg_queue.h> +#include <mblock/message.h> #include <mb_mblock_impl.h> -#include <mb_msg_accepter.h> -#include <mb_class_registry.h> +#include <mblock/msg_accepter.h> +#include <mblock/class_registry.h> #include <stdio.h> static pmt_t s_cs = pmt_intern("cs"); diff --git a/mblock/src/lib/qa_mblock_send.cc b/mblock/src/lib/qa_mblock_send.cc index b9db971c70..114dbdc4eb 100644 --- a/mblock/src/lib/qa_mblock_send.cc +++ b/mblock/src/lib/qa_mblock_send.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006,2007 Free Software Foundation, Inc. + * Copyright 2006,2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -26,16 +26,16 @@ #include <qa_mblock_send.h> #include <cppunit/TestAssert.h> -#include <mb_mblock.h> -#include <mb_runtime.h> +#include <mblock/mblock.h> +#include <mblock/runtime.h> #include <mb_runtime_nop.h> // QA only -#include <mb_protocol_class.h> -#include <mb_exception.h> -#include <mb_msg_queue.h> -#include <mb_message.h> +#include <mblock/protocol_class.h> +#include <mblock/exception.h> +#include <mblock/msg_queue.h> +#include <mblock/message.h> #include <mb_mblock_impl.h> -#include <mb_msg_accepter.h> -#include <mb_class_registry.h> +#include <mblock/msg_accepter.h> +#include <mblock/class_registry.h> #include <stdio.h> static pmt_t s_data = pmt_intern("data"); diff --git a/mblock/src/lib/qa_mblock_sys.cc b/mblock/src/lib/qa_mblock_sys.cc index 5991b7ffcc..58e48f715f 100644 --- a/mblock/src/lib/qa_mblock_sys.cc +++ b/mblock/src/lib/qa_mblock_sys.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006,2007 Free Software Foundation, Inc. + * Copyright 2006,2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -26,16 +26,16 @@ #include <qa_mblock_sys.h> #include <cppunit/TestAssert.h> -#include <mb_mblock.h> -#include <mb_runtime.h> +#include <mblock/mblock.h> +#include <mblock/runtime.h> #include <mb_runtime_nop.h> // QA only -#include <mb_protocol_class.h> -#include <mb_exception.h> -#include <mb_msg_queue.h> -#include <mb_message.h> +#include <mblock/protocol_class.h> +#include <mblock/exception.h> +#include <mblock/msg_queue.h> +#include <mblock/message.h> #include <mb_mblock_impl.h> -#include <mb_msg_accepter.h> -#include <mb_class_registry.h> +#include <mblock/msg_accepter.h> +#include <mblock/class_registry.h> #include <stdio.h> #include <string.h> #include <iostream> diff --git a/mblock/src/lib/qa_timeouts.cc b/mblock/src/lib/qa_timeouts.cc index 4f1eb46eef..2505635c1d 100644 --- a/mblock/src/lib/qa_timeouts.cc +++ b/mblock/src/lib/qa_timeouts.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -24,12 +24,12 @@ #endif #include <qa_timeouts.h> #include <cppunit/TestAssert.h> -#include <mb_mblock.h> -#include <mb_runtime.h> -#include <mb_protocol_class.h> -#include <mb_message.h> -#include <mb_msg_accepter.h> -#include <mb_class_registry.h> +#include <mblock/mblock.h> +#include <mblock/runtime.h> +#include <mblock/protocol_class.h> +#include <mblock/message.h> +#include <mblock/msg_accepter.h> +#include <mblock/class_registry.h> #include <mb_timer_queue.h> #include <string.h> #include <iostream> diff --git a/mblock/src/scheme/gnuradio/compile-mbh.scm b/mblock/src/scheme/gnuradio/compile-mbh.scm index a16e14c585..30085340f9 100755 --- a/mblock/src/scheme/gnuradio/compile-mbh.scm +++ b/mblock/src/scheme/gnuradio/compile-mbh.scm @@ -3,7 +3,7 @@ !# ;; -*-scheme-*- ;; -;; Copyright 2007 Free Software Foundation, Inc. +;; Copyright 2007,2008 Free Software Foundation, Inc. ;; ;; This file is part of GNU Radio ;; @@ -180,7 +180,7 @@ (format o-port "// protocol-classes: ~{~a ~}~%" (map car protocol-classes)) (format o-port "//~%") - (format o-port "#include <mb_protocol_class.h>~%") + (format o-port "#include <mblock/protocol_class.h>~%") (format o-port "#include <unistd.h>~%") (format o-port "static const char~%protocol_class_init_data[~d] = {~% " diff --git a/usrp/host/apps-inband/Makefile.am b/usrp/host/apps-inband/Makefile.am index 663a861ed4..0a44d81124 100644 --- a/usrp/host/apps-inband/Makefile.am +++ b/usrp/host/apps-inband/Makefile.am @@ -24,7 +24,7 @@ include $(top_srcdir)/Makefile.common AM_CPPFLAGS = \ $(DEFINES) $(OMNITHREAD_INCLUDES) $(PMT_INCLUDES) $(MBLOCK_INCLUDES) \ $(USRP_INCLUDES) $(USRP_INBAND_INCLUDES) $(BOOST_CPPFLAGS) \ - $(CPPUNIT_INCLUDES) $(WITH_INCLUDES) + $(CPPUNIT_INCLUDES) $(WITH_INCLUDES) -I$(top_srcdir)/mblock/src/lib bin_PROGRAMS = diff --git a/usrp/host/apps-inband/read_packets.cc b/usrp/host/apps-inband/read_packets.cc index 3d112d98fd..24a1e88b5c 100644 --- a/usrp/host/apps-inband/read_packets.cc +++ b/usrp/host/apps-inband/read_packets.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -25,7 +25,7 @@ #include <iostream> #include <usrp_inband_usb_packet.h> -#include <mb_class_registry.h> +#include <mblock/class_registry.h> #include <vector> #include <usrp_usb_interface.h> #include <fstream> diff --git a/usrp/host/apps-inband/test_usrp_inband_2rx.cc b/usrp/host/apps-inband/test_usrp_inband_2rx.cc index da8d7271c3..c210f196a9 100644 --- a/usrp/host/apps-inband/test_usrp_inband_2rx.cc +++ b/usrp/host/apps-inband/test_usrp_inband_2rx.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -23,16 +23,16 @@ #include <config.h> #endif -#include <mb_mblock.h> -#include <mb_runtime.h> +#include <mblock/mblock.h> +#include <mblock/runtime.h> #include <mb_runtime_nop.h> // QA only -#include <mb_protocol_class.h> -#include <mb_exception.h> -#include <mb_msg_queue.h> -#include <mb_message.h> +#include <mblock/protocol_class.h> +#include <mblock/exception.h> +#include <mblock/msg_queue.h> +#include <mblock/message.h> #include <mb_mblock_impl.h> -#include <mb_msg_accepter.h> -#include <mb_class_registry.h> +#include <mblock/msg_accepter.h> +#include <mblock/class_registry.h> #include <pmt.h> #include <stdio.h> #include <string.h> diff --git a/usrp/host/apps-inband/test_usrp_inband_2tx.cc b/usrp/host/apps-inband/test_usrp_inband_2tx.cc index 942f6df078..caa7803390 100644 --- a/usrp/host/apps-inband/test_usrp_inband_2tx.cc +++ b/usrp/host/apps-inband/test_usrp_inband_2tx.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -23,16 +23,16 @@ #include <config.h> #endif -#include <mb_mblock.h> -#include <mb_runtime.h> +#include <mblock/mblock.h> +#include <mblock/runtime.h> #include <mb_runtime_nop.h> // QA only -#include <mb_protocol_class.h> -#include <mb_exception.h> -#include <mb_msg_queue.h> -#include <mb_message.h> +#include <mblock/protocol_class.h> +#include <mblock/exception.h> +#include <mblock/msg_queue.h> +#include <mblock/message.h> #include <mb_mblock_impl.h> -#include <mb_msg_accepter.h> -#include <mb_class_registry.h> +#include <mblock/msg_accepter.h> +#include <mblock/class_registry.h> #include <pmt.h> #include <stdio.h> #include <string.h> diff --git a/usrp/host/apps-inband/test_usrp_inband_overrun.cc b/usrp/host/apps-inband/test_usrp_inband_overrun.cc index 107668b894..cd0fa525a3 100644 --- a/usrp/host/apps-inband/test_usrp_inband_overrun.cc +++ b/usrp/host/apps-inband/test_usrp_inband_overrun.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -23,14 +23,14 @@ #include <config.h> #endif -#include <mb_mblock.h> -#include <mb_runtime.h> -#include <mb_protocol_class.h> -#include <mb_exception.h> -#include <mb_msg_queue.h> -#include <mb_message.h> -#include <mb_msg_accepter.h> -#include <mb_class_registry.h> +#include <mblock/mblock.h> +#include <mblock/runtime.h> +#include <mblock/protocol_class.h> +#include <mblock/exception.h> +#include <mblock/msg_queue.h> +#include <mblock/message.h> +#include <mblock/msg_accepter.h> +#include <mblock/class_registry.h> #include <pmt.h> #include <stdio.h> #include <string.h> diff --git a/usrp/host/apps-inband/test_usrp_inband_ping.cc b/usrp/host/apps-inband/test_usrp_inband_ping.cc index 6b1347ccca..d779c9a644 100644 --- a/usrp/host/apps-inband/test_usrp_inband_ping.cc +++ b/usrp/host/apps-inband/test_usrp_inband_ping.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -23,14 +23,14 @@ #include <config.h> #endif -#include <mb_mblock.h> -#include <mb_runtime.h> -#include <mb_protocol_class.h> -#include <mb_exception.h> -#include <mb_msg_queue.h> -#include <mb_message.h> -#include <mb_msg_accepter.h> -#include <mb_class_registry.h> +#include <mblock/mblock.h> +#include <mblock/runtime.h> +#include <mblock/protocol_class.h> +#include <mblock/exception.h> +#include <mblock/msg_queue.h> +#include <mblock/message.h> +#include <mblock/msg_accepter.h> +#include <mblock/class_registry.h> #include <pmt.h> #include <stdio.h> #include <string.h> diff --git a/usrp/host/apps-inband/test_usrp_inband_registers.cc b/usrp/host/apps-inband/test_usrp_inband_registers.cc index a1d9cc1417..d9bd2db171 100644 --- a/usrp/host/apps-inband/test_usrp_inband_registers.cc +++ b/usrp/host/apps-inband/test_usrp_inband_registers.cc @@ -23,15 +23,15 @@ #include <config.h> #endif -#include <mb_mblock.h> -#include <mb_runtime.h> -#include <mb_protocol_class.h> -#include <mb_exception.h> -#include <mb_msg_queue.h> -#include <mb_message.h> +#include <mblock/mblock.h> +#include <mblock/runtime.h> +#include <mblock/protocol_class.h> +#include <mblock/exception.h> +#include <mblock/msg_queue.h> +#include <mblock/message.h> //#include <mb_mblock_impl.h> -#include <mb_msg_accepter.h> -#include <mb_class_registry.h> +#include <mblock/msg_accepter.h> +#include <mblock/class_registry.h> #include <pmt.h> #include <stdio.h> #include <string.h> diff --git a/usrp/host/apps-inband/test_usrp_inband_rx.cc b/usrp/host/apps-inband/test_usrp_inband_rx.cc index cff2aa723c..dcb87a7c9e 100644 --- a/usrp/host/apps-inband/test_usrp_inband_rx.cc +++ b/usrp/host/apps-inband/test_usrp_inband_rx.cc @@ -23,14 +23,14 @@ #include <config.h> #endif -#include <mb_mblock.h> -#include <mb_runtime.h> -#include <mb_protocol_class.h> -#include <mb_exception.h> -#include <mb_msg_queue.h> -#include <mb_message.h> -#include <mb_msg_accepter.h> -#include <mb_class_registry.h> +#include <mblock/mblock.h> +#include <mblock/runtime.h> +#include <mblock/protocol_class.h> +#include <mblock/exception.h> +#include <mblock/msg_queue.h> +#include <mblock/message.h> +#include <mblock/msg_accepter.h> +#include <mblock/class_registry.h> #include <pmt.h> #include <stdio.h> #include <string.h> diff --git a/usrp/host/apps-inband/test_usrp_inband_timestamps.cc b/usrp/host/apps-inband/test_usrp_inband_timestamps.cc index 43d0c46a0f..3b874d1a5b 100644 --- a/usrp/host/apps-inband/test_usrp_inband_timestamps.cc +++ b/usrp/host/apps-inband/test_usrp_inband_timestamps.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -23,14 +23,14 @@ #include <config.h> #endif -#include <mb_mblock.h> -#include <mb_runtime.h> -#include <mb_protocol_class.h> -#include <mb_exception.h> -#include <mb_msg_queue.h> -#include <mb_message.h> -#include <mb_msg_accepter.h> -#include <mb_class_registry.h> +#include <mblock/mblock.h> +#include <mblock/runtime.h> +#include <mblock/protocol_class.h> +#include <mblock/exception.h> +#include <mblock/msg_queue.h> +#include <mblock/message.h> +#include <mblock/msg_accepter.h> +#include <mblock/class_registry.h> #include <pmt.h> #include <stdio.h> #include <string.h> diff --git a/usrp/host/apps-inband/test_usrp_inband_tx.cc b/usrp/host/apps-inband/test_usrp_inband_tx.cc index 9cdb92c287..7ce38c2e40 100644 --- a/usrp/host/apps-inband/test_usrp_inband_tx.cc +++ b/usrp/host/apps-inband/test_usrp_inband_tx.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -23,14 +23,14 @@ #include <config.h> #endif -#include <mb_mblock.h> -#include <mb_runtime.h> -#include <mb_protocol_class.h> -#include <mb_exception.h> -#include <mb_msg_queue.h> -#include <mb_message.h> -#include <mb_msg_accepter.h> -#include <mb_class_registry.h> +#include <mblock/mblock.h> +#include <mblock/runtime.h> +#include <mblock/protocol_class.h> +#include <mblock/exception.h> +#include <mblock/msg_queue.h> +#include <mblock/message.h> +#include <mblock/msg_accepter.h> +#include <mblock/class_registry.h> #include <pmt.h> #include <stdio.h> #include <string.h> diff --git a/usrp/host/apps-inband/test_usrp_inband_underrun.cc b/usrp/host/apps-inband/test_usrp_inband_underrun.cc index e9f85d3133..11babb0481 100644 --- a/usrp/host/apps-inband/test_usrp_inband_underrun.cc +++ b/usrp/host/apps-inband/test_usrp_inband_underrun.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -23,14 +23,14 @@ #include <config.h> #endif -#include <mb_mblock.h> -#include <mb_runtime.h> -#include <mb_protocol_class.h> -#include <mb_exception.h> -#include <mb_msg_queue.h> -#include <mb_message.h> -#include <mb_msg_accepter.h> -#include <mb_class_registry.h> +#include <mblock/mblock.h> +#include <mblock/runtime.h> +#include <mblock/protocol_class.h> +#include <mblock/exception.h> +#include <mblock/msg_queue.h> +#include <mblock/message.h> +#include <mblock/msg_accepter.h> +#include <mblock/class_registry.h> #include <pmt.h> #include <stdio.h> #include <string.h> diff --git a/usrp/host/lib/inband/qa_inband_usrp_server.cc b/usrp/host/lib/inband/qa_inband_usrp_server.cc index e457e8d64c..c66418392a 100644 --- a/usrp/host/lib/inband/qa_inband_usrp_server.cc +++ b/usrp/host/lib/inband/qa_inband_usrp_server.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -28,10 +28,10 @@ #include <cppunit/TestAssert.h> #include <stdio.h> #include <usrp_server.h> -#include <mb_mblock.h> -#include <mb_runtime.h> -#include <mb_protocol_class.h> -#include <mb_class_registry.h> +#include <mblock/mblock.h> +#include <mblock/runtime.h> +#include <mblock/protocol_class.h> +#include <mblock/class_registry.h> #include <vector> #include <iostream> #include <pmt.h> diff --git a/usrp/host/lib/inband/usrp_inband_usb_packet.h b/usrp/host/lib/inband/usrp_inband_usb_packet.h index 8f59d1b656..6f1a3feb3e 100644 --- a/usrp/host/lib/inband/usrp_inband_usb_packet.h +++ b/usrp/host/lib/inband/usrp_inband_usb_packet.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -23,7 +23,7 @@ #define INCLUDED_USRP_INBAND_USB_PACKET_H_ #include <usrp_bytesex.h> -#include <mb_mblock.h> +#include <mblock/mblock.h> #include <pmt.h> #include <iostream> diff --git a/usrp/host/lib/inband/usrp_rx.cc b/usrp/host/lib/inband/usrp_rx.cc index b1f9f7b9b5..45d41bed76 100644 --- a/usrp/host/lib/inband/usrp_rx.cc +++ b/usrp/host/lib/inband/usrp_rx.cc @@ -29,7 +29,7 @@ #include <iostream> #include <vector> #include <usb.h> -#include <mb_class_registry.h> +#include <mblock/class_registry.h> #include <usrp_inband_usb_packet.h> #include <fpga_regs_common.h> #include <stdio.h> diff --git a/usrp/host/lib/inband/usrp_rx.h b/usrp/host/lib/inband/usrp_rx.h index 10104bd665..9496b27d9b 100644 --- a/usrp/host/lib/inband/usrp_rx.h +++ b/usrp/host/lib/inband/usrp_rx.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -21,7 +21,7 @@ #ifndef INCLUDED_USRP_RX_H #define INCLUDED_USRP_RX_H -#include <mb_mblock.h> +#include <mblock/mblock.h> #include <fstream> class usrp_standard_rx; diff --git a/usrp/host/lib/inband/usrp_rx_stub.cc b/usrp/host/lib/inband/usrp_rx_stub.cc index 8be7095334..e5c454d24b 100644 --- a/usrp/host/lib/inband/usrp_rx_stub.cc +++ b/usrp/host/lib/inband/usrp_rx_stub.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -28,7 +28,7 @@ #include <iostream> #include <vector> #include <usb.h> -#include <mb_class_registry.h> +#include <mblock/class_registry.h> #include <usrp_inband_usb_packet.h> #include <fpga_regs_common.h> #include "usrp_standard.h" diff --git a/usrp/host/lib/inband/usrp_rx_stub.h b/usrp/host/lib/inband/usrp_rx_stub.h index 9cf308a992..238b4568f6 100644 --- a/usrp/host/lib/inband/usrp_rx_stub.h +++ b/usrp/host/lib/inband/usrp_rx_stub.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -21,7 +21,7 @@ #ifndef INCLUDED_USRP_RX_STUB_H #define INCLUDED_USRP_RX_STUB_H -#include <mb_mblock.h> +#include <mblock/mblock.h> #include <vector> #include "usrp_standard.h" #include <ui_nco.h> diff --git a/usrp/host/lib/inband/usrp_server.cc b/usrp/host/lib/inband/usrp_server.cc index 9f92e2afe9..ac26363088 100644 --- a/usrp/host/lib/inband/usrp_server.cc +++ b/usrp/host/lib/inband/usrp_server.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -25,7 +25,7 @@ #include <usrp_server.h> #include <iostream> #include <usrp_inband_usb_packet.h> -#include <mb_class_registry.h> +#include <mblock/class_registry.h> #include <vector> #include <usrp_usb_interface.h> #include <string.h> diff --git a/usrp/host/lib/inband/usrp_server.h b/usrp/host/lib/inband/usrp_server.h index 09c82faac4..dd1825d571 100644 --- a/usrp/host/lib/inband/usrp_server.h +++ b/usrp/host/lib/inband/usrp_server.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -21,7 +21,7 @@ #ifndef INCLUDED_USRP_SERVER_H #define INCLUDED_USRP_SERVER_H -#include <mb_mblock.h> +#include <mblock/mblock.h> #include <vector> #include <queue> #include <fstream> diff --git a/usrp/host/lib/inband/usrp_tx.cc b/usrp/host/lib/inband/usrp_tx.cc index 5c0a8c307a..cf7976bcac 100644 --- a/usrp/host/lib/inband/usrp_tx.cc +++ b/usrp/host/lib/inband/usrp_tx.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -26,7 +26,7 @@ #include <usrp_tx.h> #include <iostream> #include <usb.h> -#include <mb_class_registry.h> +#include <mblock/class_registry.h> #include <usrp_inband_usb_packet.h> #include <fpga_regs_common.h> #include <usrp_standard.h> diff --git a/usrp/host/lib/inband/usrp_tx.h b/usrp/host/lib/inband/usrp_tx.h index 546a26afc3..823d5ceaa8 100644 --- a/usrp/host/lib/inband/usrp_tx.h +++ b/usrp/host/lib/inband/usrp_tx.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -21,7 +21,7 @@ #ifndef INCLUDED_USRP_TX_H #define INCLUDED_USRP_TX_H -#include <mb_mblock.h> +#include <mblock/mblock.h> #include <fstream> class usrp_standard_tx; diff --git a/usrp/host/lib/inband/usrp_tx_stub.cc b/usrp/host/lib/inband/usrp_tx_stub.cc index 8d47f8152d..c78b1a7b89 100644 --- a/usrp/host/lib/inband/usrp_tx_stub.cc +++ b/usrp/host/lib/inband/usrp_tx_stub.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -26,7 +26,7 @@ #include <iostream> #include <vector> #include <usb.h> -#include <mb_class_registry.h> +#include <mblock/class_registry.h> #include <usrp_tx_stub.h> #include <usrp_inband_usb_packet.h> #include <fpga_regs_common.h> diff --git a/usrp/host/lib/inband/usrp_tx_stub.h b/usrp/host/lib/inband/usrp_tx_stub.h index 52294beec4..b81037ad71 100644 --- a/usrp/host/lib/inband/usrp_tx_stub.h +++ b/usrp/host/lib/inband/usrp_tx_stub.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -21,7 +21,7 @@ #ifndef INCLUDED_USRP_TX_STUB_H #define INCLUDED_USRP_TX_STUB_H -#include <mb_mblock.h> +#include <mblock/mblock.h> #include <vector> #include "usrp_standard.h" #include <fstream> diff --git a/usrp/host/lib/inband/usrp_usb_interface.cc b/usrp/host/lib/inband/usrp_usb_interface.cc index 51b6d4646c..c69eb0b005 100644 --- a/usrp/host/lib/inband/usrp_usb_interface.cc +++ b/usrp/host/lib/inband/usrp_usb_interface.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -28,7 +28,7 @@ #include <iostream> #include <vector> #include <usb.h> -#include <mb_class_registry.h> +#include <mblock/class_registry.h> #include <usrp_inband_usb_packet.h> #include <fpga_regs_common.h> #include "usrp_rx.h" diff --git a/usrp/host/lib/inband/usrp_usb_interface.h b/usrp/host/lib/inband/usrp_usb_interface.h index 6c2c157680..5151f155c1 100644 --- a/usrp/host/lib/inband/usrp_usb_interface.h +++ b/usrp/host/lib/inband/usrp_usb_interface.h @@ -21,7 +21,7 @@ #ifndef INCLUDED_USRP_USB_INTERFACE_H #define INCLUDED_USRP_USB_INTERFACE_H -#include <mb_mblock.h> +#include <mblock/mblock.h> #include <vector> #include "usrp_standard.h" |