diff options
Diffstat (limited to 'host/lib/usrp/x300')
| -rw-r--r-- | host/lib/usrp/x300/x300_dboard_iface.cpp | 15 | ||||
| -rw-r--r-- | host/lib/usrp/x300/x300_impl.cpp | 1 | ||||
| -rw-r--r-- | host/lib/usrp/x300/x300_impl.hpp | 1 |
3 files changed, 16 insertions, 1 deletions
diff --git a/host/lib/usrp/x300/x300_dboard_iface.cpp b/host/lib/usrp/x300/x300_dboard_iface.cpp index eff5183e0..c286e805a 100644 --- a/host/lib/usrp/x300/x300_dboard_iface.cpp +++ b/host/lib/usrp/x300/x300_dboard_iface.cpp @@ -1,5 +1,5 @@ // -// Copyright 2013 Ettus Research LLC +// Copyright 2013,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 @@ -50,6 +50,9 @@ public: void _set_gpio_ddr(unit_t, boost::uint16_t); void _set_gpio_out(unit_t, boost::uint16_t); + void set_command_time(const uhd::time_spec_t& t); + uhd::time_spec_t get_command_time(void); + void set_gpio_debug(unit_t, int); boost::uint16_t read_gpio(unit_t); @@ -331,3 +334,13 @@ double x300_dboard_iface::read_aux_adc(unit_t unit, aux_adc_t which) //convert to voltage and return return 3.3*ad7922_regs.result/4095; } + +uhd::time_spec_t x300_dboard_iface::get_command_time() +{ + return _config.cmd_time_ctrl->get_time(); +} + +void x300_dboard_iface::set_command_time(const uhd::time_spec_t& t) +{ + _config.cmd_time_ctrl->set_time(t); +} diff --git a/host/lib/usrp/x300/x300_impl.cpp b/host/lib/usrp/x300/x300_impl.cpp index 641adc048..cab2ec491 100644 --- a/host/lib/usrp/x300/x300_impl.cpp +++ b/host/lib/usrp/x300/x300_impl.cpp @@ -1013,6 +1013,7 @@ void x300_impl::setup_radio(const size_t mb_i, const std::string &slot_name) db_config.which_rx_clk = (slot_name == "A")? X300_CLOCK_WHICH_DB0_RX : X300_CLOCK_WHICH_DB1_RX; db_config.which_tx_clk = (slot_name == "A")? X300_CLOCK_WHICH_DB0_TX : X300_CLOCK_WHICH_DB1_TX; db_config.dboard_slot = (slot_name == "A")? 0 : 1; + db_config.cmd_time_ctrl = perif.ctrl; _dboard_ifaces[db_path] = x300_make_dboard_iface(db_config); //create a new dboard manager diff --git a/host/lib/usrp/x300/x300_impl.hpp b/host/lib/usrp/x300/x300_impl.hpp index 9ad060c85..9042ad2ca 100644 --- a/host/lib/usrp/x300/x300_impl.hpp +++ b/host/lib/usrp/x300/x300_impl.hpp @@ -131,6 +131,7 @@ struct x300_dboard_iface_config_t x300_clock_which_t which_rx_clk; x300_clock_which_t which_tx_clk; boost::uint8_t dboard_slot; + uhd::timed_wb_iface::sptr cmd_time_ctrl; }; uhd::usrp::dboard_iface::sptr x300_make_dboard_iface(const x300_dboard_iface_config_t &); |