diff options
| author | Josh Blum <josh@joshknows.com> | 2010-08-15 12:40:37 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-08-15 12:40:37 -0700 |
| commit | 2e978d8835b8f954b7c34c42138b64d3a5767f81 (patch) | |
| tree | 22a6c6c94afa59697249fbc641cf398fe6c0b110 /host/lib/usrp/usrp1/usrp1_impl.cpp | |
| parent | a8a4d6c0c81cdb7d7577b9e696a18580717d0324 (diff) | |
| download | uhd-2e978d8835b8f954b7c34c42138b64d3a5767f81.tar.gz uhd-2e978d8835b8f954b7c34c42138b64d3a5767f81.tar.bz2 uhd-2e978d8835b8f954b7c34c42138b64d3a5767f81.zip | |
usrp1: compiling off next branch
made usb checking changes
implemented named_prop_t::extract change
copied the remainder of the codec pga gain control
Diffstat (limited to 'host/lib/usrp/usrp1/usrp1_impl.cpp')
| -rw-r--r-- | host/lib/usrp/usrp1/usrp1_impl.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/host/lib/usrp/usrp1/usrp1_impl.cpp b/host/lib/usrp/usrp1/usrp1_impl.cpp index 4cb286354..1435b981c 100644 --- a/host/lib/usrp/usrp1/usrp1_impl.cpp +++ b/host/lib/usrp/usrp1/usrp1_impl.cpp @@ -165,8 +165,7 @@ usrp1_impl::~usrp1_impl(void){ **********************************************************************/ void usrp1_impl::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<device_prop_t>()){ @@ -175,7 +174,7 @@ void usrp1_impl::get(const wax::obj &key_, wax::obj &val) return; case DEVICE_PROP_MBOARD: - UHD_ASSERT_THROW(name == ""); + UHD_ASSERT_THROW(key.name == ""); val = _mboard_proxy->get_link(); return; |