From ccf1d5c5e5f5c20ff77f45da3295b9dd5bdb6272 Mon Sep 17 00:00:00 2001 From: michael-west Date: Thu, 2 Apr 2015 10:51:27 -0700 Subject: uhd: Add ability to get and set command time through dboard_iface. This creates a wb_iface child class called timed_wb_iface, which adds support for timed commands. --- host/lib/usrp/cores/radio_ctrl_core_3000.cpp | 8 +++++++- host/lib/usrp/cores/radio_ctrl_core_3000.hpp | 7 +++++-- 2 files changed, 12 insertions(+), 3 deletions(-) (limited to 'host/lib/usrp/cores') diff --git a/host/lib/usrp/cores/radio_ctrl_core_3000.cpp b/host/lib/usrp/cores/radio_ctrl_core_3000.cpp index 1c9b5c4fa..47cfaf3ca 100644 --- a/host/lib/usrp/cores/radio_ctrl_core_3000.cpp +++ b/host/lib/usrp/cores/radio_ctrl_core_3000.cpp @@ -1,5 +1,5 @@ // -// Copyright 2012-2014 Ettus Research LLC +// Copyright 2012-2015 Ettus Research LLC // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -111,6 +111,12 @@ public: if (_use_time) _timeout = MASSIVE_TIMEOUT; //permanently sets larger timeout } + uhd::time_spec_t get_time(void) + { + boost::mutex::scoped_lock lock(_mutex); + return _time; + } + void set_tick_rate(const double rate) { boost::mutex::scoped_lock lock(_mutex); diff --git a/host/lib/usrp/cores/radio_ctrl_core_3000.hpp b/host/lib/usrp/cores/radio_ctrl_core_3000.hpp index 1c25ceb2c..c1cc1d372 100644 --- a/host/lib/usrp/cores/radio_ctrl_core_3000.hpp +++ b/host/lib/usrp/cores/radio_ctrl_core_3000.hpp @@ -1,5 +1,5 @@ // -// Copyright 2012-2014 Ettus Research LLC +// Copyright 2012-2015 Ettus Research LLC // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -29,7 +29,7 @@ /*! * Provide access to peek, poke for the radio ctrl module */ -class radio_ctrl_core_3000 : public uhd::wb_iface +class radio_ctrl_core_3000 : public uhd::timed_wb_iface { public: typedef boost::shared_ptr sptr; @@ -54,6 +54,9 @@ public: //! Set the command time that will activate virtual void set_time(const uhd::time_spec_t &time) = 0; + //! Get the command time that will activate + virtual uhd::time_spec_t get_time(void) = 0; + //! Set the tick rate (converting time into ticks) virtual void set_tick_rate(const double rate) = 0; }; -- cgit v1.2.3