diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-04-10 18:39:45 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-04-10 18:39:45 -0700 |
| commit | ddae9468b9f69fcbc91c4f8cbffc0b7d69b79b4c (patch) | |
| tree | d2b9422fa68315ff1b001c9fa60baeb6752ae59b /host/lib/usrp/usrp2 | |
| parent | 1f41782b564da36e31f41e2561f2778e36986baf (diff) | |
| parent | f23e7bcc47f86ffb431aee43abe670e3e5e31647 (diff) | |
| download | uhd-ddae9468b9f69fcbc91c4f8cbffc0b7d69b79b4c.tar.gz uhd-ddae9468b9f69fcbc91c4f8cbffc0b7d69b79b4c.tar.bz2 uhd-ddae9468b9f69fcbc91c4f8cbffc0b7d69b79b4c.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/lib/usrp/usrp2')
| -rw-r--r-- | host/lib/usrp/usrp2/fw_common.h | 2 | ||||
| -rw-r--r-- | host/lib/usrp/usrp2/usrp2_fifo_ctrl.cpp | 2 |
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 |