diff --git a/cmake/modules/FindSKIQ.cmake b/cmake/modules/FindSKIQ.cmake index c5310e1ba..9426c447b 100644 --- a/cmake/modules/FindSKIQ.cmake +++ b/cmake/modules/FindSKIQ.cmake @@ -1,3 +1,10 @@ +# +# Copyright 2013-2021 Software Radio Systems Limited +# +# By using this file, you agree to the terms and conditions set +# forth in the LICENSE file which can be found at the top level of +# the distribution. +# INCLUDE(FindPkgConfig) #PKG_CHECK_MODULES(SKIQ SKIQ) IF(NOT SKIQ_FOUND) diff --git a/lib/src/phy/rf/rf_dev.h b/lib/src/phy/rf/rf_dev.h index 43cdd1176..4adbdd463 100644 --- a/lib/src/phy/rf/rf_dev.h +++ b/lib/src/phy/rf/rf_dev.h @@ -216,7 +216,7 @@ static rf_dev_t dev_zmq = {"zmq", .srsran_rf_send_timed_multi = rf_zmq_send_timed_multi}; #endif -/* Define implementation for bladeRF */ +/* Define implementation for Sidekiq */ #ifdef ENABLE_SIDEKIQ #include "rf_skiq_imp.h" diff --git a/lib/src/phy/rf/rf_skiq_imp.c b/lib/src/phy/rf/rf_skiq_imp.c index 6497e85ce..d1e9fe5a3 100644 --- a/lib/src/phy/rf/rf_skiq_imp.c +++ b/lib/src/phy/rf/rf_skiq_imp.c @@ -94,7 +94,7 @@ typedef struct { void rf_skiq_suppress_stdout(void* h) { SKIQ_RF_INFO("Suppressing stdout... lowering logging level to warning\n"); - // rf_skiq_logging_level = SKIQ_LOG_WARNING; + rf_skiq_logging_level = SKIQ_LOG_WARNING; } static bool rf_skiq_is_streaming(rf_skiq_handler_t* h) diff --git a/lib/src/phy/rf/rf_skiq_imp_card.c b/lib/src/phy/rf/rf_skiq_imp_card.c index 083b3d5c7..f2a7c2aac 100644 --- a/lib/src/phy/rf/rf_skiq_imp_card.c +++ b/lib/src/phy/rf/rf_skiq_imp_card.c @@ -413,6 +413,7 @@ int rf_skiq_card_start_rx_streaming(rf_skiq_card_t* q, uint64_t timestamp) // Start all Rx in a row if (skiq_start_rx_streaming_multi_on_trigger(q->card, rx_hdl, q->nof_ports, skiq_trigger_src_synced, timestamp)) { ERROR("Failed to start card %d Rx streaming\n", q->card); + pthread_mutex_unlock(&q->mutex); return SRSRAN_ERROR; } @@ -453,6 +454,7 @@ int rf_skiq_card_stop_rx_streaming(rf_skiq_card_t* q) // Stop all Rx in a row if (skiq_stop_rx_streaming_multi_immediate(q->card, rx_hdl, q->nof_ports)) { ERROR("Failed to stop card %d Rx streaming\n", q->card); + pthread_mutex_unlock(&q->mutex); return SRSRAN_ERROR; }