aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/usrp2
diff options
context:
space:
mode:
authorAshish Chaudhari <ashish@ettus.com>2015-04-21 10:40:37 -0700
committerAshish Chaudhari <ashish@ettus.com>2015-04-21 10:40:37 -0700
commit893819c87f1cc9e845e29df0c26e1d2d0012b750 (patch)
treea300f39af94d6831df2bdee9ea0518dba949bb59 /host/lib/usrp/usrp2
parent625724d7f81c214e9955334860a364802be3fda9 (diff)
parent6e918dab8c3dbdc9774389812953cc495496a8e8 (diff)
downloaduhd-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/usrp2')
-rw-r--r--host/lib/usrp/usrp2/fw_common.h2
-rw-r--r--host/lib/usrp/usrp2/usrp2_fifo_ctrl.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/usrp/usrp2/fw_common.h b/host/lib/usrp/usrp2/fw_common.h
index 337a1ad6f..cfaee0ddc 100644
--- a/host/lib/usrp/usrp2/fw_common.h
+++ b/host/lib/usrp/usrp2/fw_common.h
@@ -30,7 +30,7 @@ extern "C" {
#endif
//fpga and firmware compatibility numbers
-#define USRP2_FPGA_COMPAT_NUM 10
+#define USRP2_FPGA_COMPAT_NUM 11
#define USRP2_FW_COMPAT_NUM 12
#define USRP2_FW_VER_MINOR 4
diff --git a/host/lib/usrp/usrp2/usrp2_fifo_ctrl.cpp b/host/lib/usrp/usrp2/usrp2_fifo_ctrl.cpp
index 0276a7a66..e0544862d 100644
--- a/host/lib/usrp/usrp2/usrp2_fifo_ctrl.cpp
+++ b/host/lib/usrp/usrp2/usrp2_fifo_ctrl.cpp
@@ -33,7 +33,7 @@ static const size_t POKE32_CMD = (1 << 8);
static const size_t PEEK32_CMD = 0;
static const double ACK_TIMEOUT = 0.5;
static const double MASSIVE_TIMEOUT = 10.0; //for when we wait on a timed command
-static const boost::uint32_t MAX_SEQS_OUT = 15;
+static const boost::uint32_t MAX_SEQS_OUT = 63;
#define SPI_DIV SR_SPI_CORE + 0
#define SPI_CTRL SR_SPI_CORE + 1