diff options
| author | michael-west <michael.west@ettus.com> | 2015-11-02 16:05:01 -0800 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-12-10 14:21:49 -0800 |
| commit | 9f9a55e1f59dfd1ff7c6580f4e8c7752ac87775b (patch) | |
| tree | d99c2d8c4c431573ca23a895f4644b2bf842a3a8 | |
| parent | b9b83502771e5caa60fb336441fb0d5ed3fe9f1a (diff) | |
| download | uhd-9f9a55e1f59dfd1ff7c6580f4e8c7752ac87775b.tar.gz uhd-9f9a55e1f59dfd1ff7c6580f4e8c7752ac87775b.tar.bz2 uhd-9f9a55e1f59dfd1ff7c6580f4e8c7752ac87775b.zip | |
Bumped FPGA compat numbers for B200, X300, and E300.
| -rw-r--r-- | host/lib/usrp/b200/b200_impl.hpp | 2 | ||||
| -rw-r--r-- | host/lib/usrp/e300/e300_fpga_defs.hpp | 2 | ||||
| -rw-r--r-- | host/lib/usrp/x300/x300_fw_common.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/host/lib/usrp/b200/b200_impl.hpp b/host/lib/usrp/b200/b200_impl.hpp index 4ddb29f0b..538ee8cd7 100644 --- a/host/lib/usrp/b200/b200_impl.hpp +++ b/host/lib/usrp/b200/b200_impl.hpp @@ -49,7 +49,7 @@ #include "recv_packet_demuxer_3000.hpp" static const boost::uint8_t B200_FW_COMPAT_NUM_MAJOR = 8; static const boost::uint8_t B200_FW_COMPAT_NUM_MINOR = 0; -static const boost::uint16_t B200_FPGA_COMPAT_NUM = 11; +static const boost::uint16_t B200_FPGA_COMPAT_NUM = 12; static const boost::uint16_t B205_FPGA_COMPAT_NUM = 2; static const double B200_BUS_CLOCK_RATE = 100e6; static const boost::uint32_t B200_GPSDO_ST_NONE = 0x83; diff --git a/host/lib/usrp/e300/e300_fpga_defs.hpp b/host/lib/usrp/e300/e300_fpga_defs.hpp index a8fa60d9d..3b21468ba 100644 --- a/host/lib/usrp/e300/e300_fpga_defs.hpp +++ b/host/lib/usrp/e300/e300_fpga_defs.hpp @@ -21,7 +21,7 @@ namespace uhd { namespace usrp { namespace e300 { namespace fpga { static const size_t NUM_RADIOS = 2; -static const boost::uint32_t COMPAT_MAJOR = 11; +static const boost::uint32_t COMPAT_MAJOR = 12; static const boost::uint32_t COMPAT_MINOR = 0; }}}} // namespace diff --git a/host/lib/usrp/x300/x300_fw_common.h b/host/lib/usrp/x300/x300_fw_common.h index 1b88db69a..dc9e6eba1 100644 --- a/host/lib/usrp/x300/x300_fw_common.h +++ b/host/lib/usrp/x300/x300_fw_common.h @@ -33,7 +33,7 @@ extern "C" { #define X300_REVISION_MIN 2 #define X300_FW_COMPAT_MAJOR 4 #define X300_FW_COMPAT_MINOR 0 -#define X300_FPGA_COMPAT_MAJOR 15 +#define X300_FPGA_COMPAT_MAJOR 16 //shared memory sections - in between the stack and the program space #define X300_FW_SHMEM_BASE 0x6000 |