diff options
author | Ashish Chaudhari <ashish@ettus.com> | 2014-08-20 09:06:32 -0700 |
---|---|---|
committer | Ashish Chaudhari <ashish@ettus.com> | 2014-08-20 09:06:32 -0700 |
commit | 72eae0503393966dfb2b961835ad1f9c5e5265e7 (patch) | |
tree | 60db7af4b572f280f3017b8ba3a5f39657c58816 /host/lib/usrp/x300/x300_fw_common.h | |
parent | 505c1d84fa7c53c0c640fab73b88c164671c7b91 (diff) | |
parent | d31ffb2ef869b05fc4aeafd6bf588e62dca7ee82 (diff) | |
download | uhd-72eae0503393966dfb2b961835ad1f9c5e5265e7.tar.gz uhd-72eae0503393966dfb2b961835ad1f9c5e5265e7.tar.bz2 uhd-72eae0503393966dfb2b961835ad1f9c5e5265e7.zip |
Merge branch 'master' into ashish/cat_refactor_phase2
Diffstat (limited to 'host/lib/usrp/x300/x300_fw_common.h')
-rw-r--r-- | host/lib/usrp/x300/x300_fw_common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/host/lib/usrp/x300/x300_fw_common.h b/host/lib/usrp/x300/x300_fw_common.h index 0bbaee319..f1ff5ce7d 100644 --- a/host/lib/usrp/x300/x300_fw_common.h +++ b/host/lib/usrp/x300/x300_fw_common.h @@ -31,7 +31,7 @@ extern "C" { #define X300_FW_COMPAT_MAJOR 3 #define X300_FW_COMPAT_MINOR 0 -#define X300_FPGA_COMPAT_MAJOR 6 +#define X300_FPGA_COMPAT_MAJOR 7 //shared memory sections - in between the stack and the program space #define X300_FW_SHMEM_BASE 0x6000 |