diff options
| author | Ben Hilburn <ben.hilburn@ettus.com> | 2014-04-28 17:43:23 -0700 |
|---|---|---|
| committer | Ben Hilburn <ben.hilburn@ettus.com> | 2014-04-28 17:43:23 -0700 |
| commit | a5d18ee206bebf66952f697c5387c0d1555fd2f3 (patch) | |
| tree | b009792be56a3eee1ca63c217c3d4d56bf1aa468 /host/lib/usrp/x300/x300_fw_common.h | |
| parent | 8f46b048818ba107126910159c76453cfb2025e2 (diff) | |
| parent | f018fa068f863d7f01887137b4bc935984430f3f (diff) | |
| download | uhd-a5d18ee206bebf66952f697c5387c0d1555fd2f3.tar.gz uhd-a5d18ee206bebf66952f697c5387c0d1555fd2f3.tar.bz2 uhd-a5d18ee206bebf66952f697c5387c0d1555fd2f3.zip | |
Merge branch 'ashish/fpga-busy-bugfix' into maint
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 632391644..0bbaee319 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 4 +#define X300_FPGA_COMPAT_MAJOR 6 //shared memory sections - in between the stack and the program space #define X300_FW_SHMEM_BASE 0x6000 |