diff options
| author | Josh Blum <josh@joshknows.com> | 2010-04-12 13:55:57 +0000 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-04-12 13:55:57 +0000 |
| commit | 615f7081d8361643031437ac31bb4a44e41839e8 (patch) | |
| tree | f092991d1f3ff97fa53d9373c90e358105c4ff79 /host/lib/usrp/usrp2/usrp2_impl.hpp | |
| parent | 50780640a1b9ed6abb2abebbc727ce19711fbcb4 (diff) | |
| parent | 34854116a4fd287fe681222f2b7a881692e418d3 (diff) | |
| download | uhd-615f7081d8361643031437ac31bb4a44e41839e8.tar.gz uhd-615f7081d8361643031437ac31bb4a44e41839e8.tar.bz2 uhd-615f7081d8361643031437ac31bb4a44e41839e8.zip | |
Merge branch 'master' into usrp_e
Diffstat (limited to 'host/lib/usrp/usrp2/usrp2_impl.hpp')
| -rw-r--r-- | host/lib/usrp/usrp2/usrp2_impl.hpp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/host/lib/usrp/usrp2/usrp2_impl.hpp b/host/lib/usrp/usrp2/usrp2_impl.hpp index 55be420cd..baa6530b8 100644 --- a/host/lib/usrp/usrp2/usrp2_impl.hpp +++ b/host/lib/usrp/usrp2/usrp2_impl.hpp @@ -103,8 +103,11 @@ public: usrp2_ctrl_data_t ctrl_send_and_recv(const usrp2_ctrl_data_t &); //peek and poke registers - void poke(boost::uint32_t addr, boost::uint32_t data); - boost::uint32_t peek(boost::uint32_t addr); + void poke32(boost::uint32_t addr, boost::uint32_t data); + boost::uint32_t peek32(boost::uint32_t addr); + + void poke16(boost::uint32_t addr, boost::uint16_t data); + boost::uint16_t peek16(boost::uint32_t addr); //misc access methods double get_master_clock_freq(void); @@ -135,6 +138,7 @@ private: ; uhd::transport::smart_buffer::sptr _rx_smart_buff; boost::asio::const_buffer _rx_copy_buff; + size_t _fragment_offset_in_samps; void io_init(void); //udp transports for control and data @@ -159,18 +163,18 @@ private: void mboard_init(void); void mboard_get(const wax::obj &, wax::obj &); void mboard_set(const wax::obj &, const wax::obj &); - uhd::dict<std::string, wax_obj_proxy::sptr> _mboards; + wax_obj_proxy::sptr _mboard_proxy; //properties interface for rx dboard void rx_dboard_get(const wax::obj &, wax::obj &); void rx_dboard_set(const wax::obj &, const wax::obj &); - uhd::dict<std::string, wax_obj_proxy::sptr> _rx_dboards; + wax_obj_proxy::sptr _rx_dboard_proxy; uhd::prop_names_t _rx_subdevs_in_use; //properties interface for tx dboard void tx_dboard_get(const wax::obj &, wax::obj &); void tx_dboard_set(const wax::obj &, const wax::obj &); - uhd::dict<std::string, wax_obj_proxy::sptr> _tx_dboards; + wax_obj_proxy::sptr _tx_dboard_proxy; uhd::prop_names_t _tx_subdevs_in_use; void update_rx_mux_config(void); void update_tx_mux_config(void); @@ -192,12 +196,12 @@ private: //properties interface for ddc void ddc_get(const wax::obj &, wax::obj &); void ddc_set(const wax::obj &, const wax::obj &); - uhd::dict<std::string, wax_obj_proxy::sptr> _rx_dsps; + wax_obj_proxy::sptr _rx_dsp_proxy; //properties interface for duc void duc_get(const wax::obj &, wax::obj &); void duc_set(const wax::obj &, const wax::obj &); - uhd::dict<std::string, wax_obj_proxy::sptr> _tx_dsps; + wax_obj_proxy::sptr _tx_dsp_proxy; }; |