diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-12-18 12:22:05 -0800 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-12-18 12:22:05 -0800 |
| commit | afa4232e4f1082748259b06595d20badc3afbff8 (patch) | |
| tree | 668834ec0f3396e9d378327dd84f8e784327581e /host/lib/usrp/e300/e300_impl.hpp | |
| parent | fc213724d3a3734d9d9373675b7e2c1ef29b4020 (diff) | |
| parent | 789784fc7e8aeb12b8d8092d6874dee49712a156 (diff) | |
| download | uhd-afa4232e4f1082748259b06595d20badc3afbff8.tar.gz uhd-afa4232e4f1082748259b06595d20badc3afbff8.tar.bz2 uhd-afa4232e4f1082748259b06595d20badc3afbff8.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/lib/usrp/e300/e300_impl.hpp')
| -rw-r--r-- | host/lib/usrp/e300/e300_impl.hpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/host/lib/usrp/e300/e300_impl.hpp b/host/lib/usrp/e300/e300_impl.hpp index 1bf5cb950..e9a0b4b9a 100644 --- a/host/lib/usrp/e300/e300_impl.hpp +++ b/host/lib/usrp/e300/e300_impl.hpp @@ -56,10 +56,11 @@ namespace uhd { namespace usrp { namespace e300 { static const std::string E300_FPGA_FILE_NAME = "usrp_e300_fpga.bit"; -static const std::string E310_FPGA_FILE_NAME = "usrp_e310_fpga.bit"; +static const std::string E310_SG1_FPGA_FILE_NAME = "usrp_e310_fpga.bit"; +static const std::string E310_SG3_FPGA_FILE_NAME = "usrp_e310_fpga_sg3.bit"; -static const std::string E300_FPGA_IDLE_FILE_NAME = "usrp_e300_fpga_idle.bit"; -static const std::string E310_FPGA_IDLE_FILE_NAME = "usrp_e310_fpga_idle.bit"; +static const std::string E3XX_SG1_FPGA_IDLE_FILE_NAME = "usrp_e3xx_fpga_idle.bit"; +static const std::string E3XX_SG3_FPGA_IDLE_FILE_NAME = "usrp_e3xx_fpga_idle_sg3.bit"; static const std::string E300_TEMP_SYSFS = "iio:device0"; static const std::string E300_SPIDEV_DEVICE = "/dev/spidev0.1"; |