diff options
| author | Martin Braun <martin.braun@ettus.com> | 2017-01-17 10:00:47 -0800 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2017-01-17 10:00:47 -0800 |
| commit | 52ca2e0b8045c254c2be1911e77e8bd3d94ceeab (patch) | |
| tree | c7e1a93eeadd65bb13db1aa68974da495114f046 /host/lib/usrp/x300/x300_impl.hpp | |
| parent | 46febf986ae5e89ebb0c350fd9aa42aaa6383997 (diff) | |
| parent | 95ff7e859d57829e428d41d7746e28c228b983ba (diff) | |
| download | uhd-52ca2e0b8045c254c2be1911e77e8bd3d94ceeab.tar.gz uhd-52ca2e0b8045c254c2be1911e77e8bd3d94ceeab.tar.bz2 uhd-52ca2e0b8045c254c2be1911e77e8bd3d94ceeab.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/lib/usrp/x300/x300_impl.hpp')
| -rw-r--r-- | host/lib/usrp/x300/x300_impl.hpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/host/lib/usrp/x300/x300_impl.hpp b/host/lib/usrp/x300/x300_impl.hpp index 53ef012d4..55b055d44 100644 --- a/host/lib/usrp/x300/x300_impl.hpp +++ b/host/lib/usrp/x300/x300_impl.hpp @@ -129,9 +129,12 @@ public: void setup_mb(const size_t which, const uhd::device_addr_t &); ~x300_impl(void); - // used by x300_find_with_addr to find X300 devices. - static boost::mutex claimer_mutex; //All claims and checks in this process are serialized - static bool is_claimed(uhd::wb_iface::sptr); + // device claim functions + enum claim_status_t {UNCLAIMED, CLAIMED_BY_US, CLAIMED_BY_OTHER}; + static claim_status_t claim_status(uhd::wb_iface::sptr iface); + static void claim(uhd::wb_iface::sptr iface); + static bool try_to_claim(uhd::wb_iface::sptr iface, long timeout = 2000); + static void release(uhd::wb_iface::sptr iface); enum x300_mboard_t { USRP_X300_MB, USRP_X310_MB, UNKNOWN |