From ac35b51ea7e2f309625a25e41dd1bb9e1864a3f5 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Tue, 16 Feb 2010 17:34:47 -0800 Subject: Moved the usrp2 implementation files into a usrp2 dir within mboard. Filled in many of the properties for the mboard (including clock config). --- lib/usrp/mboard/usrp2.cpp | 11 +- lib/usrp/mboard/usrp2/dboard_impl.cpp | 76 ++++++++ lib/usrp/mboard/usrp2/dboard_impl.hpp | 50 ++++++ lib/usrp/mboard/usrp2/dboard_interface.hpp | 66 +++++++ lib/usrp/mboard/usrp2/fw_common.h | 104 +++++++++++ lib/usrp/mboard/usrp2/impl_base.cpp | 276 +++++++++++++++++++++++++++++ lib/usrp/mboard/usrp2/impl_base.hpp | 78 ++++++++ lib/usrp/mboard/usrp2_dboard_interface.hpp | 66 ------- lib/usrp/mboard/usrp2_fw_common.h | 76 -------- lib/usrp/mboard/usrp2_impl.cpp | 202 --------------------- lib/usrp/mboard/usrp2_impl.hpp | 79 --------- 11 files changed, 655 insertions(+), 429 deletions(-) create mode 100644 lib/usrp/mboard/usrp2/dboard_impl.cpp create mode 100644 lib/usrp/mboard/usrp2/dboard_impl.hpp create mode 100644 lib/usrp/mboard/usrp2/dboard_interface.hpp create mode 100644 lib/usrp/mboard/usrp2/fw_common.h create mode 100644 lib/usrp/mboard/usrp2/impl_base.cpp create mode 100644 lib/usrp/mboard/usrp2/impl_base.hpp delete mode 100644 lib/usrp/mboard/usrp2_dboard_interface.hpp delete mode 100644 lib/usrp/mboard/usrp2_fw_common.h delete mode 100644 lib/usrp/mboard/usrp2_impl.cpp delete mode 100644 lib/usrp/mboard/usrp2_impl.hpp (limited to 'lib/usrp/mboard') diff --git a/lib/usrp/mboard/usrp2.cpp b/lib/usrp/mboard/usrp2.cpp index 79b9429c8..92f4daa49 100644 --- a/lib/usrp/mboard/usrp2.cpp +++ b/lib/usrp/mboard/usrp2.cpp @@ -22,8 +22,7 @@ #include #include #include -#include "usrp2_impl.hpp" -//#include "usrp2_dboard_interface.hpp" +#include "usrp2/impl_base.hpp" using namespace uhd::usrp::mboard; @@ -93,8 +92,8 @@ usrp2::usrp2(const device_addr_t &device_addr){ ); //create the usrp2 implementation guts - _impl = usrp2_impl::sptr( - new usrp2_impl(ctrl_transport, data_transport) + _impl = impl_base::sptr( + new impl_base(ctrl_transport, data_transport) ); } @@ -106,12 +105,12 @@ usrp2::~usrp2(void){ * Get Properties **********************************************************************/ void usrp2::get(const wax::obj &key, wax::obj &val){ - return wax::cast(_impl)->get(key, val); + return wax::cast(_impl)->get(key, val); } /*********************************************************************** * Set Properties **********************************************************************/ void usrp2::set(const wax::obj &key, const wax::obj &val){ - return wax::cast(_impl)->set(key, val); + return wax::cast(_impl)->set(key, val); } diff --git a/lib/usrp/mboard/usrp2/dboard_impl.cpp b/lib/usrp/mboard/usrp2/dboard_impl.cpp new file mode 100644 index 000000000..309335cc7 --- /dev/null +++ b/lib/usrp/mboard/usrp2/dboard_impl.cpp @@ -0,0 +1,76 @@ +// +// Copyright 2010 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 +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program 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, see . +// + +#include +#include +#include +#include +#include "dboard_impl.hpp" +#include "dboard_interface.hpp" + +using namespace uhd; +using namespace uhd::usrp; + +dboard_impl::dboard_impl(uhd::usrp::dboard::manager::sptr mgr, type_t type){ + _mgr = mgr; + _type = type; +} + +dboard_impl::~dboard_impl(void){ + /* NOP */ +} + +void dboard_impl::get(const wax::obj &key_, wax::obj &val){ + wax::obj key; std::string name; + boost::tie(key, name) = extract_named_prop(key_); + + //handle the get request conditioned on the key + switch(wax::cast(key)){ + case DBOARD_PROP_NAME: + val = std::string("usrp2 dboard"); + return; + + case DBOARD_PROP_SUBDEV: + switch(_type){ + case TYPE_RX: + val = _mgr->get_rx_subdev(name); + return; + + case TYPE_TX: + val = _mgr->get_tx_subdev(name); + return; + } + + case DBOARD_PROP_SUBDEV_NAMES: + switch(_type){ + case TYPE_RX: + val = _mgr->get_rx_subdev_names(); + return; + + case TYPE_TX: + val = _mgr->get_tx_subdev_names(); + return; + } + + case DBOARD_PROP_CODEC: + throw std::runtime_error("unhandled prop in usrp2 dboard"); + } +} + +void dboard_impl::set(const wax::obj &, const wax::obj &){ + throw std::runtime_error("Cannot set on usrp2 dboard"); +} diff --git a/lib/usrp/mboard/usrp2/dboard_impl.hpp b/lib/usrp/mboard/usrp2/dboard_impl.hpp new file mode 100644 index 000000000..a05bcd07b --- /dev/null +++ b/lib/usrp/mboard/usrp2/dboard_impl.hpp @@ -0,0 +1,50 @@ +// +// Copyright 2010 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 +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program 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, see . +// + +#include +#include +#include +#include "fw_common.h" + +#ifndef INCLUDED_DBOARD_IMPL_HPP +#define INCLUDED_DBOARD_IMPL_HPP + +/*! + * The usrp2 dboard implementation: + * Provide the properties access for a dboard. + * Internally, hold a dboard manager and the direction. + * The usrp2 mboard base implementation will create + * two of these classes (one for rx and one for tx). + */ +class dboard_impl : boost::noncopyable, public wax::obj{ +public: + typedef boost::shared_ptr sptr; + enum type_t {TYPE_RX, TYPE_TX}; + + dboard_impl(uhd::usrp::dboard::manager::sptr manager, type_t type); + + ~dboard_impl(void); + + void get(const wax::obj &, wax::obj &); + void set(const wax::obj &, const wax::obj &); + +private: + uhd::usrp::dboard::manager::sptr _mgr; + type_t _type; +}; + +#endif /* INCLUDED_DBOARD_IMPL_HPP */ diff --git a/lib/usrp/mboard/usrp2/dboard_interface.hpp b/lib/usrp/mboard/usrp2/dboard_interface.hpp new file mode 100644 index 000000000..5afaeb701 --- /dev/null +++ b/lib/usrp/mboard/usrp2/dboard_interface.hpp @@ -0,0 +1,66 @@ +// +// Copyright 2010 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 +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program 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, see . +// + +#include +#include "impl_base.hpp" + +#ifndef INCLUDED_DBOARD_INTERFACE_HPP +#define INCLUDED_DBOARD_INTERFACE_HPP + +class dboard_interface : public uhd::usrp::dboard::interface{ +public: + dboard_interface(impl_base *impl){ + _impl = impl; + } + + ~dboard_interface(void){ + /* NOP */ + } + + void write_aux_dac(int, int){} + + int read_aux_adc(int){return 0;} + + void set_atr_reg(gpio_bank_t, uint16_t, uint16_t, uint16_t){} + + void set_gpio_ddr(gpio_bank_t, uint16_t, uint16_t){} + + void write_gpio(gpio_bank_t, uint16_t, uint16_t){} + + uint16_t read_gpio(gpio_bank_t){return 0;} + + void write_i2c (int, const std::string &){} + + std::string read_i2c (int, size_t){return "";} + + void write_spi (spi_dev_t, spi_push_t, const std::string &){} + + std::string read_spi (spi_dev_t, spi_latch_t, size_t){return "";} + + double get_rx_clock_rate(void){ + return _impl->get_master_clock_freq(); + } + + double get_tx_clock_rate(void){ + return _impl->get_master_clock_freq(); + } + +private: + impl_base *_impl; +}; + +#endif /* INCLUDED_DBOARD_INTERFACE_HPP */ diff --git a/lib/usrp/mboard/usrp2/fw_common.h b/lib/usrp/mboard/usrp2/fw_common.h new file mode 100644 index 000000000..bfac52907 --- /dev/null +++ b/lib/usrp/mboard/usrp2/fw_common.h @@ -0,0 +1,104 @@ +// +// Copyright 2010 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 +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program 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, see . +// + +#ifndef INCLUDED_USRP2_FW_COMMON_H +#define INCLUDED_USRP2_FW_COMMON_H + +/*! + * Structs and constants for usrp2 communication. + * This header is shared by the firmware and host code. + * Therefore, this header may only contain valid C code. + */ +#ifdef __cplusplus +extern "C" { +#endif + +// udp ports for the usrp2 communication +// Dynamic and/or private ports: 49152-65535 +#define USRP2_UDP_CTRL_PORT 49152 +#define USRP2_UDP_DATA_PORT 49153 + +typedef enum{ + USRP2_CTRL_ID_HUH_WHAT, + //USRP2_CTRL_ID_FOR_SURE, //TODO error condition enums + //USRP2_CTRL_ID_SUX_MAN, + + USRP2_CTRL_ID_GIVE_ME_YOUR_IP_ADDR_BRO, + USRP2_CTRL_ID_THIS_IS_MY_IP_ADDR_DUDE, + USRP2_CTRL_ID_HERE_IS_A_NEW_IP_ADDR_BRO, + + USRP2_CTRL_ID_GIVE_ME_YOUR_MAC_ADDR_BRO, + USRP2_CTRL_ID_THIS_IS_MY_MAC_ADDR_DUDE, + USRP2_CTRL_ID_HERE_IS_A_NEW_MAC_ADDR_BRO, + + USRP2_CTRL_ID_HERES_A_NEW_CLOCK_CONFIG_BRO, + USRP2_CTRL_ID_GOT_THE_NEW_CLOCK_CONFIG_DUDE, + + USRP2_CTRL_ID_GIVE_ME_YOUR_DBOARD_IDS_BRO, + USRP2_CTRL_ID_THESE_ARE_MY_DBOARD_IDS_DUDE +} usrp2_ctrl_id_t; + +typedef enum{ + USRP2_PPS_SOURCE_SMA, + USRP2_PPS_SOURCE_MIMO +} usrp2_pps_source_t; + +typedef enum{ + USRP2_PPS_POLARITY_POS, + USRP2_PPS_POLARITY_NEG +} usrp2_pps_polarity_t; + +typedef enum{ + USRP2_REF_SOURCE_INT, + USRP2_REF_SOURCE_SMA, + USRP2_REF_SOURCE_MIMO +} usrp2_ref_source_t; + +typedef struct{ + uint32_t id; + uint32_t seq; + union{ + uint32_t ip_addr; + uint8_t mac_addr[6]; + struct { + uint16_t rx_id; + uint16_t tx_id; + } dboard_ids; + struct { + uint8_t pps_source; + uint8_t pps_polarity; + uint8_t ref_source; + uint8_t _pad; + } clock_config; + /*struct { + uint8_t bank; + uint16_t ddr; + uint16_t mask; + } gpio_ddr_args; + struct { + uint8_t bank; + uint16_t val; + uint16_t mask; + } gpio_val_args;*/ + } data; +} usrp2_ctrl_data_t; + +#ifdef __cplusplus +} +#endif + +#endif /* INCLUDED_USRP2_FW_COMMON_H */ diff --git a/lib/usrp/mboard/usrp2/impl_base.cpp b/lib/usrp/mboard/usrp2/impl_base.cpp new file mode 100644 index 000000000..e81b7cdb0 --- /dev/null +++ b/lib/usrp/mboard/usrp2/impl_base.cpp @@ -0,0 +1,276 @@ +// +// Copyright 2010 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 +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program 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, see . +// + +#include +#include +#include +#include +#include "impl_base.hpp" +#include "dboard_interface.hpp" + +using namespace uhd; +using namespace uhd::usrp; + +/*********************************************************************** + * Structors + **********************************************************************/ +impl_base::impl_base( + uhd::transport::udp::sptr ctrl_transport, + uhd::transport::udp::sptr data_transport +){ + _ctrl_transport = ctrl_transport; + _data_transport = data_transport; + + //grab the dboard ids over the control line + usrp2_ctrl_data_t out_data; + out_data.id = htonl(USRP2_CTRL_ID_GIVE_ME_YOUR_DBOARD_IDS_BRO); + usrp2_ctrl_data_t in_data = ctrl_send_and_recv(out_data); + ASSERT_THROW(htonl(in_data.id) == USRP2_CTRL_ID_THESE_ARE_MY_DBOARD_IDS_DUDE); + std::cout << boost::format("rx id 0x%.2x, tx id 0x%.2x") + % ntohs(in_data.data.dboard_ids.rx_id) + % ntohs(in_data.data.dboard_ids.tx_id) << std::endl; + + //extract the dboard ids an convert them to enums + dboard::dboard_id_t rx_dboard_id = static_cast( + ntohs(in_data.data.dboard_ids.rx_id) + ); + dboard::dboard_id_t tx_dboard_id = static_cast( + ntohs(in_data.data.dboard_ids.tx_id) + ); + + //create a new dboard interface and manager + dboard::interface::sptr _dboard_interface( + new dboard_interface(this) + ); + dboard::manager::sptr dboard_manager( + new dboard::manager(rx_dboard_id, tx_dboard_id, _dboard_interface) + ); + + //load dboards + _rx_dboards[""] = dboard_impl::sptr(new dboard_impl(dboard_manager, dboard_impl::TYPE_RX)); + _tx_dboards[""] = dboard_impl::sptr(new dboard_impl(dboard_manager, dboard_impl::TYPE_TX)); + + //TOD load dsps + + //init the pps source clock config + _pps_source_dict["sma"] = USRP2_PPS_SOURCE_SMA; + _pps_source_dict["mimo"] = USRP2_PPS_SOURCE_MIMO; + _pps_source = "sma"; + + //init the pps polarity clock config + _pps_polarity_dict["pos"] = USRP2_PPS_POLARITY_POS; + _pps_polarity_dict["neg"] = USRP2_PPS_POLARITY_NEG; + _pps_polarity = "neg"; + + //init the ref source clock config + _ref_source_dict["int"] = USRP2_REF_SOURCE_INT; + _ref_source_dict["sma"] = USRP2_REF_SOURCE_SMA; + _ref_source_dict["mimo"] = USRP2_REF_SOURCE_MIMO; + _ref_source = "int"; + + //update the clock config (sends a control packet) + update_clock_config(); +} + +impl_base::~impl_base(void){ + /* NOP */ +} + +/*********************************************************************** + * Misc Access Methods + **********************************************************************/ +double impl_base::get_master_clock_freq(void){ + return 100e6; +} + +void impl_base::update_clock_config(void){ + //setup the out data + usrp2_ctrl_data_t out_data; + out_data.id = htonl(USRP2_CTRL_ID_HERES_A_NEW_CLOCK_CONFIG_BRO); + out_data.data.clock_config.pps_source = _pps_source_dict [_pps_source]; + out_data.data.clock_config.pps_polarity = _pps_polarity_dict[_pps_polarity]; + out_data.data.clock_config.ref_source = _ref_source_dict [_ref_source]; + + //send and recv + usrp2_ctrl_data_t in_data = ctrl_send_and_recv(out_data); + ASSERT_THROW(htonl(in_data.id) == USRP2_CTRL_ID_GOT_THE_NEW_CLOCK_CONFIG_DUDE); +} + +/*********************************************************************** + * Control Send/Recv + **********************************************************************/ +usrp2_ctrl_data_t impl_base::ctrl_send_and_recv(const usrp2_ctrl_data_t &out_data){ + boost::mutex::scoped_lock lock(_ctrl_mutex); + + //fill in the seq number and send + usrp2_ctrl_data_t out_copy = out_data; + out_copy.seq = htonl(++_ctrl_seq_num); + _ctrl_transport->send(boost::asio::buffer(&out_copy, sizeof(usrp2_ctrl_data_t))); + + //loop and recieve until the time is up + size_t num_timeouts = 0; + while(true){ + uhd::shared_iovec iov = _ctrl_transport->recv(); + if (iov.len < sizeof(usrp2_ctrl_data_t)){ + //sleep a little so we dont burn cpu + if (num_timeouts++ > 50) break; + boost::this_thread::sleep(boost::posix_time::milliseconds(1)); + }else{ + //handle the received data + usrp2_ctrl_data_t in_data = *reinterpret_cast(iov.base); + if (ntohl(in_data.seq) == _ctrl_seq_num){ + return in_data; + } + //didnt get seq, continue on... + } + } + throw std::runtime_error("usrp2 no control response"); +} + +/*********************************************************************** + * Get Properties + **********************************************************************/ +void impl_base::get(const wax::obj &key_, wax::obj &val){ + wax::obj key; std::string name; + boost::tie(key, name) = extract_named_prop(key_); + + //handle the get request conditioned on the key + switch(wax::cast(key)){ + case MBOARD_PROP_NAME: + val = std::string("usrp2 mboard"); + return; + + case MBOARD_PROP_OTHERS: + val = prop_names_t(); //empty other props + return; + + case MBOARD_PROP_RX_DBOARD: + val = _rx_dboards[name]->get_link(); + return; + + case MBOARD_PROP_RX_DBOARD_NAMES: + val = prop_names_t(_rx_dboards.get_keys()); + return; + + case MBOARD_PROP_TX_DBOARD: + val = _tx_dboards[name]->get_link(); + return; + + case MBOARD_PROP_TX_DBOARD_NAMES: + val = prop_names_t(_tx_dboards.get_keys()); + return; + + case MBOARD_PROP_MTU: + // FIXME we dont know the real MTU... + // give them something to fragment about + val = size_t(1500); + return; + + case MBOARD_PROP_CLOCK_RATE: + val = freq_t(get_master_clock_freq()); + return; + + case MBOARD_PROP_RX_DSP: + throw std::runtime_error("unhandled prop in usrp2 mboard"); + + case MBOARD_PROP_RX_DSP_NAMES: + throw std::runtime_error("unhandled prop in usrp2 mboard"); + + case MBOARD_PROP_TX_DSP: + throw std::runtime_error("unhandled prop in usrp2 mboard"); + + case MBOARD_PROP_TX_DSP_NAMES: + throw std::runtime_error("unhandled prop in usrp2 mboard"); + + case MBOARD_PROP_PPS_SOURCE: + val = _pps_source; + return; + + case MBOARD_PROP_PPS_SOURCE_NAMES: + val = prop_names_t(_pps_source_dict.get_keys()); + return; + + case MBOARD_PROP_PPS_POLARITY: + val = _pps_polarity; + return; + + case MBOARD_PROP_REF_SOURCE: + val = _ref_source; + return; + + case MBOARD_PROP_REF_SOURCE_NAMES: + val = prop_names_t(_ref_source_dict.get_keys()); + return; + + case MBOARD_PROP_TIME_NOW: + case MBOARD_PROP_TIME_NEXT_PPS: + throw std::runtime_error("Error: trying to get write-only property on usrp2 mboard"); + + } +} + +/*********************************************************************** + * Set Properties + **********************************************************************/ +void impl_base::set(const wax::obj &key, const wax::obj &val){ + //handle the get request conditioned on the key + switch(wax::cast(key)){ + + case MBOARD_PROP_PPS_SOURCE:{ + std::string name = wax::cast(val); + ASSERT_THROW(_pps_source_dict.has_key(name)); + _pps_source = name; //shadow + update_clock_config(); + } + return; + + case MBOARD_PROP_PPS_POLARITY:{ + std::string name = wax::cast(val); + ASSERT_THROW(_pps_polarity_dict.has_key(name)); + _pps_polarity = name; //shadow + update_clock_config(); + } + return; + + case MBOARD_PROP_REF_SOURCE:{ + std::string name = wax::cast(val); + ASSERT_THROW(_ref_source_dict.has_key(name)); + _ref_source = name; //shadow + update_clock_config(); + } + return; + + case MBOARD_PROP_NAME: + case MBOARD_PROP_OTHERS: + case MBOARD_PROP_MTU: + case MBOARD_PROP_CLOCK_RATE: + case MBOARD_PROP_RX_DSP: + case MBOARD_PROP_RX_DSP_NAMES: + case MBOARD_PROP_TX_DSP: + case MBOARD_PROP_TX_DSP_NAMES: + case MBOARD_PROP_RX_DBOARD: + case MBOARD_PROP_RX_DBOARD_NAMES: + case MBOARD_PROP_TX_DBOARD: + case MBOARD_PROP_TX_DBOARD_NAMES: + case MBOARD_PROP_PPS_SOURCE_NAMES: + case MBOARD_PROP_REF_SOURCE_NAMES: + case MBOARD_PROP_TIME_NOW: + case MBOARD_PROP_TIME_NEXT_PPS: + throw std::runtime_error("Error: trying to set read-only property on usrp2 mboard"); + + } +} diff --git a/lib/usrp/mboard/usrp2/impl_base.hpp b/lib/usrp/mboard/usrp2/impl_base.hpp new file mode 100644 index 000000000..b808cf2b1 --- /dev/null +++ b/lib/usrp/mboard/usrp2/impl_base.hpp @@ -0,0 +1,78 @@ +// +// Copyright 2010 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 +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program 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, see . +// + +#include +#include +#include +#include +#include +#include "dboard_impl.hpp" +#include "fw_common.h" + +#ifndef INCLUDED_IMPL_BASE_HPP +#define INCLUDED_IMPL_BASE_HPP + +class impl_base : boost::noncopyable, public wax::obj{ +public: + typedef boost::shared_ptr sptr; + + /*! + * Create a new usrp2 impl base. + * \param ctrl_transport the udp transport for control + * \param data_transport the udp transport for data + */ + impl_base( + uhd::transport::udp::sptr ctrl_transport, + uhd::transport::udp::sptr data_transport + ); + + ~impl_base(void); + + //performs a control transaction + usrp2_ctrl_data_t ctrl_send_and_recv(const usrp2_ctrl_data_t &); + + //properties access methods + void get(const wax::obj &, wax::obj &); + void set(const wax::obj &, const wax::obj &); + + //misc access methods + double get_master_clock_freq(void); + void update_clock_config(void); + +private: + //udp transports for control and data + uhd::transport::udp::sptr _ctrl_transport; + uhd::transport::udp::sptr _data_transport; + + //private vars for dealing with send/recv control + uint32_t _ctrl_seq_num; + boost::mutex _ctrl_mutex; + + //containers for the dboard objects + uhd::dict _rx_dboards; + uhd::dict _tx_dboards; + + //shadows for various settings + std::string _pps_source, _pps_polarity, _ref_source; + + //mappings from clock config strings to over the wire enums + uhd::dict _pps_source_dict; + uhd::dict _pps_polarity_dict; + uhd::dict _ref_source_dict; +}; + +#endif /* INCLUDED_IMPL_BASE_HPP */ diff --git a/lib/usrp/mboard/usrp2_dboard_interface.hpp b/lib/usrp/mboard/usrp2_dboard_interface.hpp deleted file mode 100644 index c2bb9edb0..000000000 --- a/lib/usrp/mboard/usrp2_dboard_interface.hpp +++ /dev/null @@ -1,66 +0,0 @@ -// -// Copyright 2010 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 -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program 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, see . -// - -#include -#include "usrp2_impl.hpp" - -#ifndef INCLUDED_USRP2_DBOARD_INTERFACE_HPP -#define INCLUDED_USRP2_DBOARD_INTERFACE_HPP - -class usrp2_dboard_interface : public uhd::usrp::dboard::interface{ -public: - usrp2_dboard_interface(usrp2_impl *impl){ - _impl = impl; - } - - ~usrp2_dboard_interface(void){ - /* NOP */ - } - - void write_aux_dac(int, int){} - - int read_aux_adc(int){return 0;} - - void set_atr_reg(gpio_bank_t, uint16_t, uint16_t, uint16_t){} - - void set_gpio_ddr(gpio_bank_t, uint16_t, uint16_t){} - - void write_gpio(gpio_bank_t, uint16_t, uint16_t){} - - uint16_t read_gpio(gpio_bank_t){return 0;} - - void write_i2c (int, const std::string &){} - - std::string read_i2c (int, size_t){return "";} - - void write_spi (spi_dev_t, spi_push_t, const std::string &){} - - std::string read_spi (spi_dev_t, spi_latch_t, size_t){return "";} - - double get_rx_clock_rate(void){ - return 100e6; - } - - double get_tx_clock_rate(void){ - return 100e6; - } - -private: - usrp2_impl *_impl; -}; - -#endif /* INCLUDED_USRP2_DBOARD_INTERFACE_HPP */ diff --git a/lib/usrp/mboard/usrp2_fw_common.h b/lib/usrp/mboard/usrp2_fw_common.h deleted file mode 100644 index c98220d84..000000000 --- a/lib/usrp/mboard/usrp2_fw_common.h +++ /dev/null @@ -1,76 +0,0 @@ -// -// Copyright 2010 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 -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program 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, see . -// - -#ifndef INCLUDED_USRP2_FW_COMMON_H -#define INCLUDED_USRP2_FW_COMMON_H - -/*! - * Structs and constants for usrp2 communication. - * This header is shared by the firmware and host code. - * Therefore, this header may only contain valid C code. - */ -#ifdef __cplusplus -extern "C" { -#endif - -// udp ports for the usrp2 communication -// Dynamic and/or private ports: 49152-65535 -#define USRP2_UDP_CTRL_PORT 49152 -#define USRP2_UDP_DATA_PORT 49153 - -typedef enum{ - USRP2_CTRL_ID_HUH_WHAT, - //USRP2_CTRL_ID_FOR_SURE, //TODO error condition enums - //USRP2_CTRL_ID_SUX_MAN, - USRP2_CTRL_ID_GIVE_ME_YOUR_IP_ADDR_BRO, - USRP2_CTRL_ID_THIS_IS_MY_IP_ADDR_DUDE, - USRP2_CTRL_ID_HERE_IS_A_NEW_IP_ADDR_BRO, - USRP2_CTRL_ID_GIVE_ME_YOUR_MAC_ADDR_BRO, - USRP2_CTRL_ID_THIS_IS_MY_MAC_ADDR_DUDE, - USRP2_CTRL_ID_HERE_IS_A_NEW_MAC_ADDR_BRO, - USRP2_CTRL_ID_GIVE_ME_YOUR_DBOARD_IDS_BRO, - USRP2_CTRL_ID_THESE_ARE_MY_DBOARD_IDS_DUDE -} usrp2_ctrl_id_t; - -typedef struct{ - uint32_t id; - uint32_t seq; - union{ - uint32_t ip_addr; - uint8_t mac_addr[6]; - struct { - uint16_t rx_id; - uint16_t tx_id; - } dboard_ids; - /*struct { - uint8_t bank; - uint16_t ddr; - uint16_t mask; - } gpio_ddr_args; - struct { - uint8_t bank; - uint16_t val; - uint16_t mask; - } gpio_val_args;*/ - } data; -} usrp2_ctrl_data_t; - -#ifdef __cplusplus -} -#endif - -#endif /* INCLUDED_USRP2_FW_COMMON_H */ diff --git a/lib/usrp/mboard/usrp2_impl.cpp b/lib/usrp/mboard/usrp2_impl.cpp deleted file mode 100644 index d607bb7e7..000000000 --- a/lib/usrp/mboard/usrp2_impl.cpp +++ /dev/null @@ -1,202 +0,0 @@ -// -// Copyright 2010 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 -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program 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, see . -// - -#include -#include -#include -#include -#include "usrp2_impl.hpp" -#include "usrp2_dboard_interface.hpp" - -using namespace uhd; -using namespace uhd::usrp; - -/*********************************************************************** - * USRP2 DBoard Wrapper - **********************************************************************/ -usrp2_dboard::usrp2_dboard(uhd::usrp::dboard::manager::sptr mgr, type_t type){ - _mgr = mgr; - _type = type; -} - -usrp2_dboard::~usrp2_dboard(void){ - /* NOP */ -} - -void usrp2_dboard::get(const wax::obj &key_, wax::obj &val){ - wax::obj key; std::string name; - boost::tie(key, name) = extract_named_prop(key_); - - //handle the get request conditioned on the key - switch(wax::cast(key)){ - case DBOARD_PROP_NAME: - val = std::string("usrp2 dboard"); - return; - - case DBOARD_PROP_SUBDEV: - switch(_type){ - case TYPE_RX: - val = _mgr->get_rx_subdev(name); - return; - - case TYPE_TX: - val = _mgr->get_tx_subdev(name); - return; - } - - case DBOARD_PROP_SUBDEV_NAMES: - switch(_type){ - case TYPE_RX: - val = _mgr->get_rx_subdev_names(); - return; - - case TYPE_TX: - val = _mgr->get_tx_subdev_names(); - return; - } - - case DBOARD_PROP_CODEC: - throw std::runtime_error("unhandled prop in usrp2 dboard"); - } -} - -void usrp2_dboard::set(const wax::obj &, const wax::obj &){ - throw std::runtime_error("Cannot set on usrp2 dboard"); -} - -/*********************************************************************** - * USRP2 Implementation - **********************************************************************/ -usrp2_impl::usrp2_impl( - uhd::transport::udp::sptr ctrl_transport, - uhd::transport::udp::sptr data_transport -){ - _ctrl_transport = ctrl_transport; - _data_transport = data_transport; - - //grab the dboard ids over the control line - usrp2_ctrl_data_t out_data; - out_data.id = htonl(USRP2_CTRL_ID_GIVE_ME_YOUR_DBOARD_IDS_BRO); - usrp2_ctrl_data_t in_data = ctrl_send_and_recv(out_data); - ASSERT_THROW(htonl(in_data.id) == USRP2_CTRL_ID_THESE_ARE_MY_DBOARD_IDS_DUDE); - std::cout << boost::format("rx id 0x%.2x, tx id 0x%.2x") - % ntohs(in_data.data.dboard_ids.rx_id) - % ntohs(in_data.data.dboard_ids.tx_id) << std::endl; - - //extract the dboard ids an convert them to enums - dboard::dboard_id_t rx_dboard_id = static_cast( - ntohs(in_data.data.dboard_ids.rx_id) - ); - dboard::dboard_id_t tx_dboard_id = static_cast( - ntohs(in_data.data.dboard_ids.tx_id) - ); - - //create a new dboard interface and manager - dboard::interface::sptr dboard_interface( - new usrp2_dboard_interface(this) - ); - dboard::manager::sptr dboard_manager( - new dboard::manager(rx_dboard_id, tx_dboard_id, dboard_interface) - ); - - //load dboards - _rx_dboards[""] = usrp2_dboard::sptr(new usrp2_dboard(dboard_manager, usrp2_dboard::TYPE_RX)); - _tx_dboards[""] = usrp2_dboard::sptr(new usrp2_dboard(dboard_manager, usrp2_dboard::TYPE_TX)); - - //TOD load dsps - -} - -usrp2_impl::~usrp2_impl(void){ - /* NOP */ -} - -/*********************************************************************** - * Control Send/Recv - **********************************************************************/ -usrp2_ctrl_data_t usrp2_impl::ctrl_send_and_recv(const usrp2_ctrl_data_t &out_data){ - boost::mutex::scoped_lock lock(_ctrl_mutex); - - //fill in the seq number and send - usrp2_ctrl_data_t out_copy = out_data; - out_copy.seq = htonl(++_ctrl_seq_num); - _ctrl_transport->send(boost::asio::buffer(&out_copy, sizeof(usrp2_ctrl_data_t))); - - //loop and recieve until the time is up - size_t num_timeouts = 0; - while(true){ - uhd::shared_iovec iov = _ctrl_transport->recv(); - if (iov.len < sizeof(usrp2_ctrl_data_t)){ - //sleep a little so we dont burn cpu - if (num_timeouts++ > 50) break; - boost::this_thread::sleep(boost::posix_time::milliseconds(1)); - }else{ - //handle the received data - usrp2_ctrl_data_t in_data = *reinterpret_cast(iov.base); - if (ntohl(in_data.seq) == _ctrl_seq_num){ - return in_data; - } - //didnt get seq, continue on... - } - } - throw std::runtime_error("usrp2 no control response"); -} - -/*********************************************************************** - * Get Properties - **********************************************************************/ -void usrp2_impl::get(const wax::obj &key_, wax::obj &val){ - wax::obj key; std::string name; - boost::tie(key, name) = extract_named_prop(key_); - - //handle the get request conditioned on the key - switch(wax::cast(key)){ - case MBOARD_PROP_NAME: - val = std::string("usrp2 mboard"); - return; - - case MBOARD_PROP_OTHERS: - val = prop_names_t(); //empty other props - return; - - case MBOARD_PROP_RX_DBOARD: - case MBOARD_PROP_RX_DBOARD_NAMES: - case MBOARD_PROP_TX_DBOARD: - case MBOARD_PROP_TX_DBOARD_NAMES: - case MBOARD_PROP_MTU: - case MBOARD_PROP_CLOCK_RATE: - case MBOARD_PROP_RX_DSP: - case MBOARD_PROP_RX_DSP_NAMES: - case MBOARD_PROP_TX_DSP: - case MBOARD_PROP_TX_DSP_NAMES: - case MBOARD_PROP_PPS_SOURCE: - case MBOARD_PROP_PPS_SOURCE_NAMES: - case MBOARD_PROP_PPS_POLARITY: - case MBOARD_PROP_REF_SOURCE: - case MBOARD_PROP_REF_SOURCE_NAMES: - case MBOARD_PROP_TIME_NOW: - case MBOARD_PROP_TIME_NEXT_PPS: - throw std::runtime_error("unhandled prop in usrp2 mboard"); - } -} - -/*********************************************************************** - * Set Properties - **********************************************************************/ -void usrp2_impl::set(const wax::obj &, const wax::obj &){ - throw std::runtime_error("Cannot set on usrp2 mboard"); -} diff --git a/lib/usrp/mboard/usrp2_impl.hpp b/lib/usrp/mboard/usrp2_impl.hpp deleted file mode 100644 index 23f81d711..000000000 --- a/lib/usrp/mboard/usrp2_impl.hpp +++ /dev/null @@ -1,79 +0,0 @@ -// -// Copyright 2010 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 -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program 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, see . -// - -#include -#include -#include -#include -#include -#include -#include "usrp2_fw_common.h" - -#ifndef INCLUDED_USRP2_IMPL_HPP -#define INCLUDED_USRP2_IMPL_HPP - -/*********************************************************************** - * USRP2 DBoard Wrapper - **********************************************************************/ -class usrp2_dboard : boost::noncopyable, public wax::obj{ -public: - typedef boost::shared_ptr sptr; - enum type_t {TYPE_RX, TYPE_TX}; - - usrp2_dboard(uhd::usrp::dboard::manager::sptr manager, type_t type); - - ~usrp2_dboard(void); - - void get(const wax::obj &, wax::obj &); - void set(const wax::obj &, const wax::obj &); - -private: - uhd::usrp::dboard::manager::sptr _mgr; - type_t _type; -}; - -/*********************************************************************** - * USRP2 Implementation - **********************************************************************/ -class usrp2_impl : boost::noncopyable{ -public: - typedef boost::shared_ptr sptr; - - usrp2_impl( - uhd::transport::udp::sptr ctrl_transport, - uhd::transport::udp::sptr data_transport - ); - - ~usrp2_impl(void); - - usrp2_ctrl_data_t ctrl_send_and_recv(const usrp2_ctrl_data_t &); - - void get(const wax::obj &, wax::obj &); - void set(const wax::obj &, const wax::obj &); - -private: - uhd::transport::udp::sptr _ctrl_transport; - uhd::transport::udp::sptr _data_transport; - - uint32_t _ctrl_seq_num; - boost::mutex _ctrl_mutex; - - uhd::dict _rx_dboards; - uhd::dict _tx_dboards; -}; - -#endif /* INCLUDED_USRP2_IMPL_HPP */ -- cgit v1.2.3