From d0a60fea5cf5ab2d1408059f998f355e273f11f1 Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Fri, 9 Dec 2016 13:43:58 -0800 Subject: rfnoc: DDC block has some safeguards in get_output_samp_rate in case its called with ANY_PORT --- host/lib/rfnoc/ddc_block_ctrl_impl.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'host') diff --git a/host/lib/rfnoc/ddc_block_ctrl_impl.cpp b/host/lib/rfnoc/ddc_block_ctrl_impl.cpp index 2aac22ca4..fb70b6f45 100644 --- a/host/lib/rfnoc/ddc_block_ctrl_impl.cpp +++ b/host/lib/rfnoc/ddc_block_ctrl_impl.cpp @@ -121,7 +121,15 @@ public: double get_output_samp_rate(size_t port=ANY_PORT) { - port = port == ANY_PORT ? 0 : port; + if (port == ANY_PORT) { + port = 0; + for (size_t i = 0; i < get_input_ports().size(); i++) { + if (_rx_streamer_active.count(i) and _rx_streamer_active.at(i)) { + port = i; + break; + } + } + } if (not (_rx_streamer_active.count(port) and _rx_streamer_active.at(port))) { return RATE_UNDEFINED; } -- cgit v1.2.3 From 2a72dd9094bea085995ba7c49d2e102403bdbc42 Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Tue, 13 Dec 2016 17:35:23 -0800 Subject: x300: Updated FPGA images to include 214 MHz change - Updated submodule pointer - Updated images package --- fpga-src | 2 +- host/CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'host') diff --git a/fpga-src b/fpga-src index a32119007..0821320bd 160000 --- a/fpga-src +++ b/fpga-src @@ -1 +1 @@ -Subproject commit a32119007d7fff31aace083eed94b6a4979e9c01 +Subproject commit 0821320bdf59756dc8f29243db18f0e8111aa701 diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt index 40819f176..aa0953678 100644 --- a/host/CMakeLists.txt +++ b/host/CMakeLists.txt @@ -338,8 +338,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 "21f58d903775485e2243a6ee77706679") -SET(UHD_IMAGES_DOWNLOAD_SRC "uhd-images_003.010.001.000-release.zip") +SET(UHD_IMAGES_MD5SUM "a3626ec5f123a4179552be08a50dccc2") +SET(UHD_IMAGES_DOWNLOAD_SRC "uhd-images_003.010.001.000-42-gd0a60fea.zip") #}}} ######################################################################## -- cgit v1.2.3