diff options
| author | Josh Blum <josh@joshknows.com> | 2010-08-17 19:23:56 +0000 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-08-17 19:23:56 +0000 |
| commit | 1e28ae518de1268efa370eb8b4b206b7d5a49b03 (patch) | |
| tree | 3f989545009e168064987b3ef70c486c24a21c5b /host/lib/usrp/usrp_e/dboard_impl.cpp | |
| parent | 1aa1404ebb59594a8c81b31f9b56ad35bd832a26 (diff) | |
| download | uhd-1e28ae518de1268efa370eb8b4b206b7d5a49b03.tar.gz uhd-1e28ae518de1268efa370eb8b4b206b7d5a49b03.tar.bz2 uhd-1e28ae518de1268efa370eb8b4b206b7d5a49b03.zip | |
usrp-e: building off of next branch
Diffstat (limited to 'host/lib/usrp/usrp_e/dboard_impl.cpp')
| -rw-r--r-- | host/lib/usrp/usrp_e/dboard_impl.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/host/lib/usrp/usrp_e/dboard_impl.cpp b/host/lib/usrp/usrp_e/dboard_impl.cpp index 8aaf16c51..79ff54c9d 100644 --- a/host/lib/usrp/usrp_e/dboard_impl.cpp +++ b/host/lib/usrp/usrp_e/dboard_impl.cpp @@ -56,8 +56,7 @@ void usrp_e_impl::dboard_init(void){ * RX Dboard Get **********************************************************************/ void usrp_e_impl::rx_dboard_get(const wax::obj &key_, wax::obj &val){ - wax::obj key; std::string name; - boost::tie(key, name) = extract_named_prop(key_); + named_prop_t key = named_prop_t::extract(key_); //handle the get request conditioned on the key switch(key.as<dboard_prop_t>()){ @@ -66,7 +65,7 @@ void usrp_e_impl::rx_dboard_get(const wax::obj &key_, wax::obj &val){ return; case DBOARD_PROP_SUBDEV: - val = _dboard_manager->get_rx_subdev(name); + val = _dboard_manager->get_rx_subdev(key.name); return; case DBOARD_PROP_SUBDEV_NAMES: @@ -107,8 +106,7 @@ void usrp_e_impl::rx_dboard_set(const wax::obj &key, const wax::obj &val){ * TX Dboard Get **********************************************************************/ void usrp_e_impl::tx_dboard_get(const wax::obj &key_, wax::obj &val){ - wax::obj key; std::string name; - boost::tie(key, name) = extract_named_prop(key_); + named_prop_t key = named_prop_t::extract(key_); //handle the get request conditioned on the key switch(key.as<dboard_prop_t>()){ @@ -117,7 +115,7 @@ void usrp_e_impl::tx_dboard_get(const wax::obj &key_, wax::obj &val){ return; case DBOARD_PROP_SUBDEV: - val = _dboard_manager->get_tx_subdev(name); + val = _dboard_manager->get_tx_subdev(key.name); return; case DBOARD_PROP_SUBDEV_NAMES: |