From 97496ace66842f9d7529793b2b202be9abe156c3 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Mon, 5 Apr 2010 16:36:51 -0700 Subject: simplified the usage of dboard, dsp, and mboard proxies. removed the dict structure for each, we are just going to have one. --- host/lib/usrp/usrp2/mboard_impl.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'host/lib/usrp/usrp2/mboard_impl.cpp') diff --git a/host/lib/usrp/usrp2/mboard_impl.cpp b/host/lib/usrp/usrp2/mboard_impl.cpp index 0891f9dc8..94ab88a6b 100644 --- a/host/lib/usrp/usrp2/mboard_impl.cpp +++ b/host/lib/usrp/usrp2/mboard_impl.cpp @@ -29,7 +29,7 @@ using namespace uhd::usrp; * Helper Methods **********************************************************************/ void usrp2_impl::mboard_init(void){ - _mboards[""] = wax_obj_proxy::make( + _mboard_proxy = wax_obj_proxy::make( boost::bind(&usrp2_impl::mboard_get, this, _1, _2), boost::bind(&usrp2_impl::mboard_set, this, _1, _2) ); @@ -173,21 +173,21 @@ void usrp2_impl::mboard_get(const wax::obj &key_, wax::obj &val){ return; case MBOARD_PROP_RX_DBOARD: - ASSERT_THROW(_rx_dboards.has_key(name)); - val = _rx_dboards[name]->get_link(); + ASSERT_THROW(name == ""); + val = _rx_dboard_proxy->get_link(); return; case MBOARD_PROP_RX_DBOARD_NAMES: - val = prop_names_t(_rx_dboards.get_keys()); + val = prop_names_t(1, ""); return; case MBOARD_PROP_TX_DBOARD: - ASSERT_THROW(_tx_dboards.has_key(name)); - val = _tx_dboards[name]->get_link(); + ASSERT_THROW(name == ""); + val = _tx_dboard_proxy->get_link(); return; case MBOARD_PROP_TX_DBOARD_NAMES: - val = prop_names_t(_tx_dboards.get_keys()); + val = prop_names_t(1, ""); return; case MBOARD_PROP_CLOCK_RATE: @@ -195,21 +195,21 @@ void usrp2_impl::mboard_get(const wax::obj &key_, wax::obj &val){ return; case MBOARD_PROP_RX_DSP: - ASSERT_THROW(_rx_dsps.has_key(name)); - val = _rx_dsps[name]->get_link(); + ASSERT_THROW(name == ""); + val = _rx_dsp_proxy->get_link(); return; case MBOARD_PROP_RX_DSP_NAMES: - val = prop_names_t(_rx_dsps.get_keys()); + val = prop_names_t(1, ""); return; case MBOARD_PROP_TX_DSP: - ASSERT_THROW(_tx_dsps.has_key(name)); - val = _tx_dsps[name]->get_link(); + ASSERT_THROW(name == ""); + val = _tx_dsp_proxy->get_link(); return; case MBOARD_PROP_TX_DSP_NAMES: - val = prop_names_t(_tx_dsps.get_keys()); + val = prop_names_t(1, ""); return; case MBOARD_PROP_CLOCK_CONFIG: -- cgit v1.2.3