diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-08-23 16:29:59 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-08-23 16:29:59 -0700 |
| commit | 3e3524294629f3ad3c1ca0c0011aeadceab90120 (patch) | |
| tree | 9f6bb9dfcc59e5907a1db72453d5f2dc21a93210 /host/lib/usrp/x300/x300_fw_common.h | |
| parent | 186e156277f61eb6fea276e84ce8e1c7b12b62ff (diff) | |
| parent | 70ec54a8d084bd1f96803e6b272f49478d414dd8 (diff) | |
| download | uhd-3e3524294629f3ad3c1ca0c0011aeadceab90120.tar.gz uhd-3e3524294629f3ad3c1ca0c0011aeadceab90120.tar.bz2 uhd-3e3524294629f3ad3c1ca0c0011aeadceab90120.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/lib/usrp/x300/x300_fw_common.h')
| -rw-r--r-- | host/lib/usrp/x300/x300_fw_common.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/usrp/x300/x300_fw_common.h b/host/lib/usrp/x300/x300_fw_common.h index e05cd9ec7..aae0f769c 100644 --- a/host/lib/usrp/x300/x300_fw_common.h +++ b/host/lib/usrp/x300/x300_fw_common.h @@ -31,9 +31,9 @@ extern "C" { #define X300_REVISION_COMPAT 7 #define X300_REVISION_MIN 2 -#define X300_FW_COMPAT_MAJOR 4 +#define X300_FW_COMPAT_MAJOR 5 #define X300_FW_COMPAT_MINOR 0 -#define X300_FPGA_COMPAT_MAJOR 0x20 +#define X300_FPGA_COMPAT_MAJOR 0x21 //shared memory sections - in between the stack and the program space #define X300_FW_SHMEM_BASE 0x6000 |