diff options
author | Ashish Chaudhari <ashish@ettus.com> | 2015-04-21 10:40:37 -0700 |
---|---|---|
committer | Ashish Chaudhari <ashish@ettus.com> | 2015-04-21 10:40:37 -0700 |
commit | 893819c87f1cc9e845e29df0c26e1d2d0012b750 (patch) | |
tree | a300f39af94d6831df2bdee9ea0518dba949bb59 /host/lib/usrp/x300/x300_impl.hpp | |
parent | 625724d7f81c214e9955334860a364802be3fda9 (diff) | |
parent | 6e918dab8c3dbdc9774389812953cc495496a8e8 (diff) | |
download | uhd-893819c87f1cc9e845e29df0c26e1d2d0012b750.tar.gz uhd-893819c87f1cc9e845e29df0c26e1d2d0012b750.tar.bz2 uhd-893819c87f1cc9e845e29df0c26e1d2d0012b750.zip |
Merge branch 'master' into vivado
Conflicts:
host/lib/usrp/x300/x300_clock_ctrl.cpp
Diffstat (limited to 'host/lib/usrp/x300/x300_impl.hpp')
-rw-r--r-- | host/lib/usrp/x300/x300_impl.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/usrp/x300/x300_impl.hpp b/host/lib/usrp/x300/x300_impl.hpp index 9042ad2ca..c27133745 100644 --- a/host/lib/usrp/x300/x300_impl.hpp +++ b/host/lib/usrp/x300/x300_impl.hpp @@ -70,13 +70,13 @@ static const size_t X300_PCIE_RX_DATA_FRAME_SIZE = 8184; //bytes static const size_t X300_PCIE_TX_DATA_FRAME_SIZE = 8192; //bytes static const size_t X300_PCIE_DATA_NUM_FRAMES = 2048; static const size_t X300_PCIE_MSG_FRAME_SIZE = 256; //bytes -static const size_t X300_PCIE_MSG_NUM_FRAMES = 32; +static const size_t X300_PCIE_MSG_NUM_FRAMES = 64; static const size_t X300_10GE_DATA_FRAME_MAX_SIZE = 8000; //bytes static const size_t X300_1GE_DATA_FRAME_MAX_SIZE = 1472; //bytes static const size_t X300_ETH_MSG_FRAME_SIZE = uhd::transport::udp_simple::mtu; //bytes -static const size_t X300_ETH_MSG_NUM_FRAMES = 32; +static const size_t X300_ETH_MSG_NUM_FRAMES = 64; static const size_t X300_ETH_DATA_NUM_FRAMES = 32; static const double X300_DEFAULT_SYSREF_RATE = 10e6; |