diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-03-11 17:00:39 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-03-11 17:05:10 -0700 |
| commit | 2e594ae877f99411d54f1a8e3d9be274d8b9eb35 (patch) | |
| tree | 2fa0a5f0fc501ab2362f424831b367610077c2d6 /host/lib/usrp/multi_usrp.cpp | |
| parent | a7049e4ff79cdc205db76bf7270219f254073961 (diff) | |
| parent | cc7d37f114d5a14b4e45372f38324bf95115b6b9 (diff) | |
| download | uhd-2e594ae877f99411d54f1a8e3d9be274d8b9eb35.tar.gz uhd-2e594ae877f99411d54f1a8e3d9be274d8b9eb35.tar.bz2 uhd-2e594ae877f99411d54f1a8e3d9be274d8b9eb35.zip | |
Merge branch 'maint'
Conflicts:
host/include/uhd/transport/vrt_if_packet.hpp
Diffstat (limited to 'host/lib/usrp/multi_usrp.cpp')
| -rw-r--r-- | host/lib/usrp/multi_usrp.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/host/lib/usrp/multi_usrp.cpp b/host/lib/usrp/multi_usrp.cpp index 570c67875..1866255c9 100644 --- a/host/lib/usrp/multi_usrp.cpp +++ b/host/lib/usrp/multi_usrp.cpp @@ -848,7 +848,7 @@ public: * If device is in AGC mode it will ignore the setting. */ try { return rx_gain_group(chan)->set_value(gain, name); - } catch (uhd::key_error &e) { + } catch (uhd::key_error &) { THROW_GAIN_NAME_ERROR(name,chan,rx); } } @@ -882,7 +882,7 @@ public: double get_rx_gain(const std::string &name, size_t chan){ try { return rx_gain_group(chan)->get_value(name); - } catch (uhd::key_error &e) { + } catch (uhd::key_error &) { THROW_GAIN_NAME_ERROR(name,chan,rx); } } @@ -905,7 +905,7 @@ public: gain_range_t get_rx_gain_range(const std::string &name, size_t chan){ try { return rx_gain_group(chan)->get_range(name); - } catch (uhd::key_error &e) { + } catch (uhd::key_error &) { THROW_GAIN_NAME_ERROR(name,chan,rx); } } @@ -1188,7 +1188,7 @@ public: void set_tx_gain(double gain, const std::string &name, size_t chan){ try { return tx_gain_group(chan)->set_value(gain, name); - } catch (uhd::key_error &e) { + } catch (uhd::key_error &) { THROW_GAIN_NAME_ERROR(name,chan,tx); } } @@ -1207,7 +1207,7 @@ public: double get_tx_gain(const std::string &name, size_t chan){ try { return tx_gain_group(chan)->get_value(name); - } catch (uhd::key_error &e) { + } catch (uhd::key_error &) { THROW_GAIN_NAME_ERROR(name,chan,tx); } } @@ -1230,7 +1230,7 @@ public: gain_range_t get_tx_gain_range(const std::string &name, size_t chan){ try { return tx_gain_group(chan)->get_range(name); - } catch (uhd::key_error &e) { + } catch (uhd::key_error &) { THROW_GAIN_NAME_ERROR(name,chan,tx); } } @@ -1352,7 +1352,7 @@ public: { if (_tree->exists(mb_root(mboard) / "gpio" / bank)) { - return _tree->access<boost::uint64_t>(mb_root(mboard) / "gpio" / bank / attr).get(); + return boost::uint32_t(_tree->access<boost::uint64_t>(mb_root(mboard) / "gpio" / bank / attr).get()); } if (bank.size() > 2 and bank[1] == 'X') { |