aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/x300/x300_fw_common.h
diff options
context:
space:
mode:
authorMichael West <michael.west@ettus.com>2014-02-18 16:18:04 -0800
committerMichael West <michael.west@ettus.com>2014-02-18 16:18:04 -0800
commit4d9c03d44b02d0ee91355280dbc58d1f19deddea (patch)
tree8e40fa4fb361933252cffae4af98a5e9df9218c1 /host/lib/usrp/x300/x300_fw_common.h
parent7fef199d194c9a63b3312845979fa353f90f4d23 (diff)
downloaduhd-4d9c03d44b02d0ee91355280dbc58d1f19deddea.tar.gz
uhd-4d9c03d44b02d0ee91355280dbc58d1f19deddea.tar.bz2
uhd-4d9c03d44b02d0ee91355280dbc58d1f19deddea.zip
- Fix for BUG #264: ./test_pps_input --source external passes even with no 1 PPS on external input on X3xx
- Fixed behavior of PPS and clock references to be consistent and intuitive. -- Added detection of clock reference and PPS. -- Changed order of precedence to external, gpsdo, internal for default of clock and PPS. -- Throws runtime error if the user requests a reference clock or PPS that is not present. - Bumped FPGA compatibility to 4.
Diffstat (limited to 'host/lib/usrp/x300/x300_fw_common.h')
-rw-r--r--host/lib/usrp/x300/x300_fw_common.h2
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 c470e9bff..632391644 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 3
+#define X300_FPGA_COMPAT_MAJOR 4
//shared memory sections - in between the stack and the program space
#define X300_FW_SHMEM_BASE 0x6000