Skip to content

Commit

Permalink
radio: remove sidekiq radio support
Browse files Browse the repository at this point in the history
  • Loading branch information
joaquim-srs committed Feb 6, 2025
1 parent ec29b0c commit a252657
Show file tree
Hide file tree
Showing 13 changed files with 4 additions and 2,839 deletions.
16 changes: 3 additions & 13 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ option(ENABLE_RF_PLUGINS "Enable RF plugins" ON)
option(ENABLE_UHD "Enable UHD" ON)
option(ENABLE_BLADERF "Enable BladeRF" ON)
option(ENABLE_SOAPYSDR "Enable SoapySDR" ON)
option(ENABLE_SKIQ "Enable Sidekiq SDK" ON)
option(ENABLE_ZEROMQ "Enable ZeroMQ" ON)
option(ENABLE_HARDSIM "Enable support for SIM cards" ON)

Expand Down Expand Up @@ -216,15 +215,6 @@ if(ENABLE_UHD)
endif(UHD_FOUND)
endif(ENABLE_UHD)

# SKIQ
if (ENABLE_SKIQ)
find_package(SKIQ)
if(SKIQ_FOUND)
include_directories(${SKIQ_INCLUDE_DIRS})
link_directories(${SKIQ_LIBRARY_DIRS})
endif(SKIQ_FOUND)
endif (ENABLE_SKIQ)

# BladeRF
if(ENABLE_BLADERF)
find_package(bladeRF)
Expand Down Expand Up @@ -257,12 +247,12 @@ if(ENABLE_TIMEPROF)
add_definitions(-DENABLE_TIMEPROF)
endif(ENABLE_TIMEPROF)

if(BLADERF_FOUND OR UHD_FOUND OR SOAPYSDR_FOUND OR ZEROMQ_FOUND OR SKIQ_FOUND)
if(BLADERF_FOUND OR UHD_FOUND OR SOAPYSDR_FOUND OR ZEROMQ_FOUND)
set(RF_FOUND TRUE CACHE INTERNAL "RF frontend found")
else(BLADERF_FOUND OR UHD_FOUND OR SOAPYSDR_FOUND OR ZEROMQ_FOUND OR SKIQ_FOUND)
else(BLADERF_FOUND OR UHD_FOUND OR SOAPYSDR_FOUND OR ZEROMQ_FOUND)
set(RF_FOUND FALSE CACHE INTERNAL "RF frontend found")
add_definitions(-DDISABLE_RF)
endif(BLADERF_FOUND OR UHD_FOUND OR SOAPYSDR_FOUND OR ZEROMQ_FOUND OR SKIQ_FOUND)
endif(BLADERF_FOUND OR UHD_FOUND OR SOAPYSDR_FOUND OR ZEROMQ_FOUND)

# Boost
if(BUILD_STATIC)
Expand Down
89 changes: 0 additions & 89 deletions cmake/modules/FindSKIQ.cmake

This file was deleted.

17 changes: 0 additions & 17 deletions lib/src/phy/rf/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -92,23 +92,6 @@ if(RF_FOUND)
install(TARGETS srsran_rf_soapy DESTINATION ${LIBRARY_DIR} OPTIONAL)
endif (SOAPYSDR_FOUND AND ENABLE_SOAPYSDR)

if(SKIQ_FOUND AND ENABLE_SKIQ)
add_executable(skiq_pps_test skiq_pps_test.c)
target_link_libraries(skiq_pps_test ${SKIQ_LIBRARIES} rt pthread m)
add_definitions(-DENABLE_SIDEKIQ)
set(SOURCES_SKIQ rf_skiq_imp.c rf_skiq_imp_card.c rf_skiq_imp_port.c)
if (ENABLE_RF_PLUGINS)
add_library(srsran_rf_skiq SHARED ${SOURCES_SKIQ})
set_target_properties(srsran_rf_skiq PROPERTIES VERSION ${SRSRAN_VERSION_STRING} SOVERSION ${SRSRAN_SOVERSION})
list(APPEND DYNAMIC_PLUGINS srsran_rf_skiq)
else (ENABLE_RF_PLUGINS)
add_library(srsran_rf_skiq STATIC ${SOURCES_SKIQ})
list(APPEND STATIC_PLUGINS srsran_rf_skiq)
endif (ENABLE_RF_PLUGINS)
target_link_libraries(srsran_rf_skiq srsran_rf_utils srsran_phy ${SKIQ_LIBRARIES} rt)
install(TARGETS srsran_rf_skiq DESTINATION ${LIBRARY_DIR} OPTIONAL)
endif(SKIQ_FOUND AND ENABLE_SKIQ)

if (ZEROMQ_FOUND AND ENABLE_ZEROMQ)
add_definitions(-DENABLE_ZEROMQ)
set(SOURCES_ZMQ rf_zmq_imp.c rf_zmq_imp_tx.c rf_zmq_imp_rx.c)
Expand Down
13 changes: 0 additions & 13 deletions lib/src/phy/rf/rf_dev.h
Original file line number Diff line number Diff line change
Expand Up @@ -66,16 +66,6 @@ static srsran_rf_plugin_t plugin_zmq = {"", NULL, &srsran_rf_dev_zmq};
#include "rf_file_imp.h"
static srsran_rf_plugin_t plugin_file = {"", NULL, &srsran_rf_dev_file};

/* Define implementation for Sidekiq */
#ifdef ENABLE_SIDEKIQ
#ifdef ENABLE_RF_PLUGINS
static srsran_rf_plugin_t plugin_skiq = {"libsrsran_rf_skiq.so", NULL, NULL};
#else
#include "rf_skiq_imp.h"
static srsran_rf_plugin_t plugin_skiq = {"", NULL, &srsran_rf_dev_skiq};
#endif
#endif

//#define ENABLE_DUMMY_DEV

#ifdef ENABLE_DUMMY_DEV
Expand Down Expand Up @@ -111,9 +101,6 @@ static srsran_rf_plugin_t* rf_plugins[] = {
#ifdef ENABLE_ZEROMQ
&plugin_zmq,
#endif
#ifdef ENABLE_SIDEKIQ
&plugin_skiq,
#endif
#ifdef ENABLE_DUMMY_DEV
&plugin_dummy,
#endif
Expand Down
Loading

0 comments on commit a252657

Please sign in to comment.