diff options
| author | Ben Hilburn <ben.hilburn@ettus.com> | 2014-05-22 12:29:55 -0700 |
|---|---|---|
| committer | Ben Hilburn <ben.hilburn@ettus.com> | 2014-05-22 12:29:55 -0700 |
| commit | c4b1f8103343b9932ca1e74128de3afbbcb81928 (patch) | |
| tree | ad51521ded352b481f8731bfc8477ebea9881f89 /host/lib/usrp/x300/x300_fw_ctrl.cpp | |
| parent | 79c9b12b2aa3107634153db03a1fd9058f6aa6b9 (diff) | |
| parent | 482a4eaffd146de789dfc59052a4c3cb5b51938a (diff) | |
| download | uhd-c4b1f8103343b9932ca1e74128de3afbbcb81928.tar.gz uhd-c4b1f8103343b9932ca1e74128de3afbbcb81928.tar.bz2 uhd-c4b1f8103343b9932ca1e74128de3afbbcb81928.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/lib/usrp/x300/x300_fw_ctrl.cpp')
| -rw-r--r-- | host/lib/usrp/x300/x300_fw_ctrl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/usrp/x300/x300_fw_ctrl.cpp b/host/lib/usrp/x300/x300_fw_ctrl.cpp index 67c314d3f..804d23f51 100644 --- a/host/lib/usrp/x300/x300_fw_ctrl.cpp +++ b/host/lib/usrp/x300/x300_fw_ctrl.cpp @@ -285,8 +285,8 @@ protected: private: niriok_proxy& _drv_proxy; - static const uint32_t READ_TIMEOUT_IN_MS = 10; - static const uint32_t INIT_TIMEOUT_IN_MS = 5000; + static const boost::uint32_t READ_TIMEOUT_IN_MS = 10; + static const boost::uint32_t INIT_TIMEOUT_IN_MS = 5000; }; wb_iface::sptr x300_make_ctrl_iface_enet(uhd::transport::udp_simple::sptr udp) |