diff options
| author | Martin Braun <martin.braun@ettus.com> | 2014-12-16 12:47:19 +0100 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2014-12-16 12:47:19 +0100 |
| commit | c2c2ecfad41a37655277d42cbed103c7f952852a (patch) | |
| tree | b42e6238a5bdb4106646bcd0c98cca3c5bc05238 /host/lib/usrp | |
| parent | bb10b51c21ed7e116e4be5b11a256eefb60d7903 (diff) | |
| parent | 2474ac3296142aa333c09c0215d6fb80c446f20e (diff) | |
| download | uhd-c2c2ecfad41a37655277d42cbed103c7f952852a.tar.gz uhd-c2c2ecfad41a37655277d42cbed103c7f952852a.tar.bz2 uhd-c2c2ecfad41a37655277d42cbed103c7f952852a.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/lib/usrp')
| -rw-r--r-- | host/lib/usrp/e300/e300_fpga_defs.hpp | 2 | ||||
| -rw-r--r-- | host/lib/usrp/e300/e300_regs.hpp | 2 | ||||
| -rw-r--r-- | host/lib/usrp/x300/x300_fw_common.h | 2 | ||||
| -rw-r--r-- | host/lib/usrp/x300/x300_regs.hpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/host/lib/usrp/e300/e300_fpga_defs.hpp b/host/lib/usrp/e300/e300_fpga_defs.hpp index d58fd63a9..5fba65b90 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 = 4; +static const boost::uint32_t COMPAT_MAJOR = 5; static const boost::uint32_t COMPAT_MINOR = 0; }}}} // namespace diff --git a/host/lib/usrp/e300/e300_regs.hpp b/host/lib/usrp/e300/e300_regs.hpp index f99a19b8e..5736ebfd4 100644 --- a/host/lib/usrp/e300/e300_regs.hpp +++ b/host/lib/usrp/e300/e300_regs.hpp @@ -34,7 +34,7 @@ localparam SR_RX_CTRL = 96; localparam SR_TIME = 128; localparam SR_RX_DSP = 144; localparam SR_TX_DSP = 184; -localparam SR_LEDS = 196; +localparam SR_LEDS = 195; localparam SR_FP_GPIO = 200; localparam SR_RX_FRONT = 208; localparam SR_TX_FRONT = 216; diff --git a/host/lib/usrp/x300/x300_fw_common.h b/host/lib/usrp/x300/x300_fw_common.h index 6cf4834b3..42583f7f0 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 8 +#define X300_FPGA_COMPAT_MAJOR 9 //shared memory sections - in between the stack and the program space #define X300_FW_SHMEM_BASE 0x6000 diff --git a/host/lib/usrp/x300/x300_regs.hpp b/host/lib/usrp/x300/x300_regs.hpp index d4610499a..f920b5ae2 100644 --- a/host/lib/usrp/x300/x300_regs.hpp +++ b/host/lib/usrp/x300/x300_regs.hpp @@ -37,7 +37,7 @@ localparam SR_RX_CTRL = 96; localparam SR_TIME = 128; localparam SR_RX_DSP = 144; localparam SR_TX_DSP = 184; -localparam SR_LEDS = 196; +localparam SR_LEDS = 195; localparam SR_FP_GPIO = 200; localparam SR_RX_FRONT = 208; localparam SR_TX_FRONT = 216; |