From ed13b673b81d1cb7d5026eb6adf741f1f8c17ccd Mon Sep 17 00:00:00 2001 From: Ashish Chaudhari Date: Thu, 11 Dec 2014 14:31:06 -0800 Subject: e300,x300: Moved LED register space as not to overlap w/ GPIOs --- host/lib/usrp/e300/e300_regs.hpp | 2 +- host/lib/usrp/x300/x300_regs.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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_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; -- cgit v1.2.3 From e1755d60936cc7912522035c61bca71e944cf491 Mon Sep 17 00:00:00 2001 From: Ashish Chaudhari Date: Thu, 11 Dec 2014 14:34:17 -0800 Subject: e300,x300: Bumped FPGA compat number - X300: FPGA compat 9 - E300: FPGA compat 5 --- host/lib/usrp/e300/e300_fpga_defs.hpp | 2 +- host/lib/usrp/x300/x300_fw_common.h | 2 +- 2 files changed, 2 insertions(+), 2 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/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 -- cgit v1.2.3 From 2474ac3296142aa333c09c0215d6fb80c446f20e Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Tue, 16 Dec 2014 10:38:12 +0100 Subject: 3.8.1 Release - Updated fpga-src submodule - Updated version strings and images package --- .gitmodules | 2 +- CHANGELOG | 11 +++++++++++ fpga-src | 2 +- host/CMakeLists.txt | 4 ++-- host/cmake/Modules/UHDVersion.cmake | 2 +- 5 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 9d81e6973..793f1aae5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "fpga-src"] path = fpga-src url = git@github.com:EttusResearch/fpga.git - branch = master + branch = maint diff --git a/CHANGELOG b/CHANGELOG index fcda71faa..a5c67cbac 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,17 @@ Change Log for Releases ============================== +## 003.008.001 +* B2x0: Fixed PLL settings, Fixed external ref selection, serialized + streamer setup (thread-safety) +* X3x0: Fixed flow control issue, improved DAC ctrl + init logic, + Fixed I/Q alignment issue +* Generation-3 devices: Fixed LED registers +* UHD: Improved tuning logic for manual tunes +* Tools: Multiple kitchen sink fixes, coloured output +* Examples: Multiple bugfixes (multi-channel ops) +* Docs/Manual: Multiple fixes, E310 panel images + ## 003.008.000 * Added E310 support * B200/B210: Moved AD9361 controls from firmware to host diff --git a/fpga-src b/fpga-src index 8b902192b..b40be5ae5 160000 --- a/fpga-src +++ b/fpga-src @@ -1 +1 @@ -Subproject commit 8b902192b6dd6ead8ea5e0540b048960fe697072 +Subproject commit b40be5ae504ccf0a5ebb5add0ab777250ca77407 diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt index 42351d118..856f1ec70 100644 --- a/host/CMakeLists.txt +++ b/host/CMakeLists.txt @@ -234,8 +234,8 @@ UHD_INSTALL(FILES #{{{IMG_SECTION # This section is written automatically by /images/create_imgs_package.py # Any manual changes in here will be overwritten. -SET(UHD_IMAGES_MD5SUM "afd3164df1f251b921e22b4244272579") -SET(UHD_IMAGES_DOWNLOAD_SRC "uhd-images_003.008.000-release.zip") +SET(UHD_IMAGES_MD5SUM "b20992748b90e6bdd228fe693f4d2ba2") +SET(UHD_IMAGES_DOWNLOAD_SRC "uhd-images_003.008.001-release.zip") #}}} ######################################################################## diff --git a/host/cmake/Modules/UHDVersion.cmake b/host/cmake/Modules/UHDVersion.cmake index edf497a8d..69f668d3f 100644 --- a/host/cmake/Modules/UHDVersion.cmake +++ b/host/cmake/Modules/UHDVersion.cmake @@ -27,7 +27,7 @@ FIND_PACKAGE(Git QUIET) ######################################################################## SET(UHD_VERSION_MAJOR 003) SET(UHD_VERSION_MINOR 008) -SET(UHD_VERSION_PATCH 000) +SET(UHD_VERSION_PATCH 001) ######################################################################## # Set up trimmed version numbers for DLL resource files and packages -- cgit v1.2.3