usrp1: compiling off next branch

made usb checking changes

implemented named_prop_t::extract change

copied the remainder of the codec pga gain control

1 files changed, 6 insertions, 8 deletions

diff --git a/host/lib/usrp/usrp1/dboard_impl.cpp b/host/lib/usrp/usrp1/dboard_impl.cpp
index 4f2836ea9..9df87432d 100644
--- a/host/lib/usrp/usrp1/dboard_impl.cpp
+++ b/host/lib/usrp/usrp1/dboard_impl.cpp
@@ -82,8 +82,7 @@ void usrp1_impl::dboard_init(void)
  **********************************************************************/
 void usrp1_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>()){
@@ -92,7 +91,7 @@ void usrp1_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:
@@ -112,7 +111,7 @@ void usrp1_impl::rx_dboard_get(const wax::obj &key_, wax::obj &val)
         return;
 
     case DBOARD_PROP_GAIN_GROUP:
-        val = make_gain_group(_dboard_manager->get_rx_subdev(name),
+        val = make_gain_group(_dboard_manager->get_rx_subdev(key.name),
                               _rx_codec_proxy->get_link());
         return;
 
@@ -142,8 +141,7 @@ void usrp1_impl::rx_dboard_set(const wax::obj &key, const wax::obj &val)
  **********************************************************************/
 void usrp1_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>()){
@@ -152,7 +150,7 @@ void usrp1_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:
@@ -172,7 +170,7 @@ void usrp1_impl::tx_dboard_get(const wax::obj &key_, wax::obj &val)
         return;
 
     case DBOARD_PROP_GAIN_GROUP:
-        val = make_gain_group(_dboard_manager->get_tx_subdev(name),
+        val = make_gain_group(_dboard_manager->get_tx_subdev(key.name),
                               _tx_codec_proxy->get_link());
         return;