diff options
Diffstat (limited to 'mblock/src/include')
| -rw-r--r-- | mblock/src/include/mblock/class_registry.h | 4 | ||||
| -rw-r--r-- | mblock/src/include/mblock/common.h | 4 | ||||
| -rw-r--r-- | mblock/src/include/mblock/mblock.h | 18 | ||||
| -rw-r--r-- | mblock/src/include/mblock/message.h | 30 | ||||
| -rw-r--r-- | mblock/src/include/mblock/msg_accepter.h | 4 | ||||
| -rw-r--r-- | mblock/src/include/mblock/port.h | 20 | ||||
| -rw-r--r-- | mblock/src/include/mblock/protocol_class.h | 12 | ||||
| -rw-r--r-- | mblock/src/include/mblock/runtime.h | 6 |
8 files changed, 49 insertions, 49 deletions
diff --git a/mblock/src/include/mblock/class_registry.h b/mblock/src/include/mblock/class_registry.h index b94a7cbc1..8528b8875 100644 --- a/mblock/src/include/mblock/class_registry.h +++ b/mblock/src/include/mblock/class_registry.h @@ -26,7 +26,7 @@ //! conceptually, pointer to constructor typedef mb_mblock_sptr (*mb_mblock_maker_t)(mb_runtime *runtime, const std::string &instance_name, - pmt_t user_arg); + gruel::pmt_t user_arg); /* * \brief Maintain mapping between mblock class_name and factory (maker) @@ -40,7 +40,7 @@ public: template<class mblock> mb_mblock_sptr mb_mblock_maker(mb_runtime *runtime, const std::string &instance_name, - pmt_t user_arg) + gruel::pmt_t user_arg) { return mb_mblock_sptr(new mblock(runtime, instance_name, user_arg)); } diff --git a/mblock/src/include/mblock/common.h b/mblock/src/include/mblock/common.h index 2507d053e..054b9987e 100644 --- a/mblock/src/include/mblock/common.h +++ b/mblock/src/include/mblock/common.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006,2007,2008 Free Software Foundation, Inc. + * Copyright 2006,2007,2008,2009 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -21,7 +21,7 @@ #ifndef INCLUDED_MB_COMMON_H #define INCLUDED_MB_COMMON_H -#include <pmt.h> +#include <gruel/pmt.h> #include <vector> #include <stdexcept> #include <boost/utility.hpp> diff --git a/mblock/src/include/mblock/mblock.h b/mblock/src/include/mblock/mblock.h index bbc40f1ef..92b0b3284 100644 --- a/mblock/src/include/mblock/mblock.h +++ b/mblock/src/include/mblock/mblock.h @@ -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 * @@ -72,7 +72,7 @@ protected: * \param user_arg argument passed by user to constructor * (ignored by the mb_mblock base class) */ - mb_mblock(mb_runtime *runtime, const std::string &instance_name, pmt_t user_arg); + mb_mblock(mb_runtime *runtime, const std::string &instance_name, gruel::pmt_t user_arg); public: /*! @@ -128,7 +128,7 @@ protected: void define_component(const std::string &component_name, const std::string &class_name, - pmt_t user_arg = PMT_NIL); + gruel::pmt_t user_arg = gruel::PMT_NIL); /*! * \brief connect endpoint_1 to endpoint_2 @@ -217,7 +217,7 @@ protected: * * runtime->run(...) returns when all blocks have called exit. */ - void shutdown_all(pmt_t result); + void shutdown_all(gruel::pmt_t result); /*! * \brief main event dispatching loop @@ -259,8 +259,8 @@ public: * * To cancel a pending timeout, call cancel_timeout. */ - pmt_t - schedule_one_shot_timeout(const mb_time &abs_time, pmt_t user_data); + gruel::pmt_t + schedule_one_shot_timeout(const mb_time &abs_time, gruel::pmt_t user_data); /*! * \brief Schedule a periodic timeout. @@ -281,10 +281,10 @@ public: * * To cancel a pending timeout, call cancel_timeout. */ - pmt_t + gruel::pmt_t schedule_periodic_timeout(const mb_time &first_abs_time, const mb_time &delta_time, - pmt_t user_data); + gruel::pmt_t user_data); /*! * \brief Attempt to cancel a pending timeout. @@ -296,7 +296,7 @@ public: * * \param handle returned from schedule_one_shot_timeout or schedule_periodic_timeout. */ - void cancel_timeout(pmt_t handle); + void cancel_timeout(gruel::pmt_t handle); /*! * \brief Perform a pre-order depth-first traversal of the hierarchy. diff --git a/mblock/src/include/mblock/message.h b/mblock/src/include/mblock/message.h index 8fbee2ff0..443684fd6 100644 --- a/mblock/src/include/mblock/message.h +++ b/mblock/src/include/mblock/message.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006,2007,2008 Free Software Foundation, Inc. + * Copyright 2006,2007,2008,2009 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -38,37 +38,37 @@ typedef boost::shared_ptr<mb_message> mb_message_sptr; * \param priority urgency */ mb_message_sptr -mb_make_message(pmt_t signal, - pmt_t data = PMT_NIL, - pmt_t metadata = PMT_NIL, +mb_make_message(gruel::pmt_t signal, + gruel::pmt_t data = gruel::PMT_NIL, + gruel::pmt_t metadata = gruel::PMT_NIL, mb_pri_t priority = MB_PRI_DEFAULT); class mb_message { mb_message_sptr d_next; // link field for msg queue - pmt_t d_signal; - pmt_t d_data; - pmt_t d_metadata; + gruel::pmt_t d_signal; + gruel::pmt_t d_data; + gruel::pmt_t d_metadata; mb_pri_t d_priority; - pmt_t d_port_id; // name of port msg was rcvd on (symbol) + gruel::pmt_t d_port_id; // name of port msg was rcvd on (symbol) friend class mb_msg_queue; friend mb_message_sptr - mb_make_message(pmt_t signal, pmt_t data, pmt_t metadata, mb_pri_t priority); + mb_make_message(gruel::pmt_t signal, gruel::pmt_t data, gruel::pmt_t metadata, mb_pri_t priority); // private constructor - mb_message(pmt_t signal, pmt_t data, pmt_t metadata, mb_pri_t priority); + mb_message(gruel::pmt_t signal, gruel::pmt_t data, gruel::pmt_t metadata, mb_pri_t priority); public: ~mb_message(); - pmt_t signal() const { return d_signal; } - pmt_t data() const { return d_data; } - pmt_t metadata() const { return d_metadata; } + gruel::pmt_t signal() const { return d_signal; } + gruel::pmt_t data() const { return d_data; } + gruel::pmt_t metadata() const { return d_metadata; } mb_pri_t priority() const { return d_priority; } - pmt_t port_id() const { return d_port_id; } + gruel::pmt_t port_id() const { return d_port_id; } - void set_port_id(pmt_t port_id){ d_port_id = port_id; } + void set_port_id(gruel::pmt_t port_id){ d_port_id = port_id; } #if (MB_MESSAGE_LOCAL_ALLOCATOR) void *operator new(size_t); diff --git a/mblock/src/include/mblock/msg_accepter.h b/mblock/src/include/mblock/msg_accepter.h index 69be13111..7ce1705a6 100644 --- a/mblock/src/include/mblock/msg_accepter.h +++ b/mblock/src/include/mblock/msg_accepter.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007,2008 Free Software Foundation, Inc. + * Copyright 2007,2008,2009 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -42,7 +42,7 @@ public: mb_msg_accepter(){}; virtual ~mb_msg_accepter(); - virtual void operator()(pmt_t signal, pmt_t data, pmt_t metadata, mb_pri_t priority) = 0; + virtual void operator()(gruel::pmt_t signal, gruel::pmt_t data, gruel::pmt_t metadata, mb_pri_t priority) = 0; }; #endif /* INCLUDED_MB_MSG_ACCEPTER_H */ diff --git a/mblock/src/include/mblock/port.h b/mblock/src/include/mblock/port.h index 782bb1285..02d81d67b 100644 --- a/mblock/src/include/mblock/port.h +++ b/mblock/src/include/mblock/port.h @@ -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 * @@ -40,8 +40,8 @@ public: private: std::string d_port_name; - pmt_t d_port_symbol; // the port_name as a pmt symbol - pmt_t d_protocol_class; + gruel::pmt_t d_port_symbol; // the port_name as a gruel::pmt symbol + gruel::pmt_t d_protocol_class; bool d_conjugated; port_type_t d_port_type; @@ -59,13 +59,13 @@ protected: public: std::string port_name() const { return d_port_name; } - pmt_t port_symbol() const { return d_port_symbol; } - pmt_t protocol_class() const { return d_protocol_class; } + gruel::pmt_t port_symbol() const { return d_port_symbol; } + gruel::pmt_t protocol_class() const { return d_protocol_class; } bool conjugated() const { return d_conjugated; } port_type_t port_type() const { return d_port_type; } - pmt_t incoming_message_set() const; - pmt_t outgoing_message_set() const; + gruel::pmt_t incoming_message_set() const; + gruel::pmt_t outgoing_message_set() const; virtual ~mb_port(); @@ -78,9 +78,9 @@ public: * \param priority the urgency at which the message is sent */ virtual void - send(pmt_t signal, - pmt_t data = PMT_F, - pmt_t metadata = PMT_F, + send(gruel::pmt_t signal, + gruel::pmt_t data = gruel::PMT_F, + gruel::pmt_t metadata = gruel::PMT_F, mb_pri_t priority = MB_PRI_DEFAULT) = 0; /* diff --git a/mblock/src/include/mblock/protocol_class.h b/mblock/src/include/mblock/protocol_class.h index 33c5d7116..4267a912e 100644 --- a/mblock/src/include/mblock/protocol_class.h +++ b/mblock/src/include/mblock/protocol_class.h @@ -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 * @@ -30,14 +30,14 @@ * \param incoming incoming message set (list of symbols) * \param outgoing outgoing message set (list of symbols) */ -pmt_t mb_make_protocol_class(pmt_t name, pmt_t incoming, pmt_t outgoing); +gruel::pmt_t mb_make_protocol_class(gruel::pmt_t name, gruel::pmt_t incoming, gruel::pmt_t outgoing); // Accessors -pmt_t mb_protocol_class_name(pmt_t pc); //< return name of protocol class -pmt_t mb_protocol_class_incoming(pmt_t pc); //< return incoming message set -pmt_t mb_protocol_class_outgoing(pmt_t pc); //< return outgoing message set +gruel::pmt_t mb_protocol_class_name(gruel::pmt_t pc); //< return name of protocol class +gruel::pmt_t mb_protocol_class_incoming(gruel::pmt_t pc); //< return incoming message set +gruel::pmt_t mb_protocol_class_outgoing(gruel::pmt_t pc); //< return outgoing message set -pmt_t mb_protocol_class_lookup(pmt_t name); //< lookup an existing protocol class by name +gruel::pmt_t mb_protocol_class_lookup(gruel::pmt_t name); //< lookup an existing protocol class by name /*! diff --git a/mblock/src/include/mblock/runtime.h b/mblock/src/include/mblock/runtime.h index 866875715..69f49a40f 100644 --- a/mblock/src/include/mblock/runtime.h +++ b/mblock/src/include/mblock/runtime.h @@ -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 * @@ -59,8 +59,8 @@ public: */ virtual bool run(const std::string &instance_name, const std::string &class_name, - pmt_t user_arg, - pmt_t *result = 0) = 0; + gruel::pmt_t user_arg, + gruel::pmt_t *result = 0) = 0; // QA only... mb_mblock_sptr top() { return d_top; } |