diff options
| author | Ben Hilburn <ben.hilburn@ettus.com> | 2014-04-28 17:43:23 -0700 |
|---|---|---|
| committer | Ben Hilburn <ben.hilburn@ettus.com> | 2014-04-28 17:43:23 -0700 |
| commit | a5d18ee206bebf66952f697c5387c0d1555fd2f3 (patch) | |
| tree | b009792be56a3eee1ca63c217c3d4d56bf1aa468 /host/lib/usrp/x300/x300_impl.hpp | |
| parent | 8f46b048818ba107126910159c76453cfb2025e2 (diff) | |
| parent | f018fa068f863d7f01887137b4bc935984430f3f (diff) | |
| download | uhd-a5d18ee206bebf66952f697c5387c0d1555fd2f3.tar.gz uhd-a5d18ee206bebf66952f697c5387c0d1555fd2f3.tar.bz2 uhd-a5d18ee206bebf66952f697c5387c0d1555fd2f3.zip | |
Merge branch 'ashish/fpga-busy-bugfix' into maint
Diffstat (limited to 'host/lib/usrp/x300/x300_impl.hpp')
| -rw-r--r-- | host/lib/usrp/x300/x300_impl.hpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/host/lib/usrp/x300/x300_impl.hpp b/host/lib/usrp/x300/x300_impl.hpp index 4b3efc845..90aed2fdb 100644 --- a/host/lib/usrp/x300/x300_impl.hpp +++ b/host/lib/usrp/x300/x300_impl.hpp @@ -53,7 +53,7 @@ static const std::string X300_FW_FILE_NAME = "usrp_x300_fw.bin"; static const double X300_DEFAULT_TICK_RATE = 200e6; //Hz -static const double X300_BUS_CLOCK_RATE = 175e6; //Hz +static const double X300_BUS_CLOCK_RATE = 166.666667e6; //Hz static const size_t X300_TX_HW_BUFF_SIZE = 0x90000; //576KiB static const size_t X300_TX_FC_RESPONSE_FREQ = 8; //per flow-control window @@ -152,6 +152,7 @@ public: bool recv_async_msg(uhd::async_metadata_t &, double); // 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); enum x300_mboard_t { |