Use develop USRP device for lte

cmake_targets/CMakeLists.txt

@@ -527,11 +527,16 @@ set (SHLIB_LOADER_SOURCES
 ######################################################################
 
 include_directories("${OPENAIR_TARGETS}/ARCH/USRP/USERSPACE/LIB/")
-set(HWLIB_USRP_SOURCE
-  ${OPENAIR_TARGETS}/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
-  )
-add_library(oai_usrpdevif MODULE ${HWLIB_USRP_SOURCE} )
-target_link_libraries(oai_usrpdevif uhd)
+file(GLOB USRPSRCVARIANT "${OPENAIR_TARGETS}/ARCH/USRP/USERSPACE/LIB/usrp_lib*.cpp")
+foreach(USRPSOURCE ${USRPSRCVARIANT})
+#  set(HWLIB_USRP_SOURCE
+#     ${OPENAIR_TARGETS}/ARCH/USRP/USERSPACE/LIB/usrp_lib${USRPVERSION}.cpp
+#     )
+  get_filename_component(USRPVERSION ${USRPSOURCE} NAME_WE)
+  string(REPLACE "usrp_lib" "" USRPVERSION ${USRPVERSION} )
+  add_library(oai_usrpdevif${USRPVERSION} MODULE ${USRPSOURCE} )
+  target_link_libraries(oai_usrpdevif${USRPVERSION} uhd)
+endforeach(USRPSOURCE)
 
 include_directories("${OPENAIR_TARGETS}/ARCH/BLADERF/USERSPACE/LIB/")
 set(HWLIB_BLADERF_SOURCE

cmake_targets/build_oai

@@ -781,7 +781,9 @@ function main() {
   # Build RF device and transport protocol libraries #
   ####################################################
   if [ "$eNB" = "1" -o "$UE" = "1" -o "$gNB" = "1" -o "$nrUE" = "1" -o "$HWLAT" = "1" ] ; then
-
+        if [ "$eNB" = "1" -o "$UE" = "1" ] ; then
+        	USRPVERSION="lte"
+        fi
       # build RF device libraries
       if [ "$HW" != "None" ] ; then
           rm -f liboai_device.so
@@ -798,11 +800,11 @@ function main() {
 	          echo_info "liboai_device.so is linked to EXMIMO device library"
 	      elif [ "$HW" == "OAI_USRP" ] ; then
               compilations \
-                  $build_dir oai_usrpdevif \
-                  liboai_usrpdevif.so $dbin/liboai_usrpdevif.so.$REL
+                  $build_dir oai_usrpdevif$USRPVERSION \
+                  liboai_usrpdevif$USRPVERSION.so $dbin/liboai_usrpdevif$USRPVERSION.so.$REL
                   
-              ln -sf liboai_usrpdevif.so liboai_device.so
-              ln -sf $dbin/liboai_usrpdevif.so.$REL $dbin/liboai_device.so
+              ln -sf liboai_usrpdevif$USRPVERSION.so liboai_device.so
+              ln -sf $dbin/liboai_usrpdevif$USRPVERSION.so.$REL $dbin/liboai_device.so
               echo_info "liboai_device.so is linked to USRP device library"        
           elif [ "$HW" == "OAI_BLADERF" ] ; then
               if [ -f "/usr/include/libbladeRF.h" ] ; then