basic skeleton for SoDeRa OAI library

cmake_targets/CMakeLists.txt

@@ -159,7 +159,7 @@ set(CMAKE_C_FLAGS
   "${CMAKE_C_FLAGS} -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_FCNTL_H=1 -DHAVE_ARPA_INET_H=1 -DHAVE_SYS_TIME_H=1 -DHAVE_SYS_SOCKET_H=1 -DHAVE_STRERROR=1 -DHAVE_SOCKET=1 -DHAVE_MEMSET=1 -DHAVE_GETTIMEOFDAY=1 -DHAVE_STDLIB_H=1 -DHAVE_MALLOC=1 -DHAVE_LIBSCTP"
 )
 set(CMAKE_CXX_FLAGS
-  "${CMAKE_CXX_FLAGS} ${C_FLAGS_PROCESSOR}"
+  "${CMAKE_CXX_FLAGS} ${C_FLAGS_PROCESSOR} -std=c++11 "
 )
 # set a flag for changes in the source code
 # these changes are related to hardcoded path to include .h files
@@ -167,6 +167,7 @@ add_definitions(-DCMAKER)
 set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS} -g -DMALLOC_CHECK_=3")
 set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS} -g -DMALLOC_CHECK_=3 -O2") 
 
+Message("RF_BOARD is ${RF_BOARD}")
 # Below has been put in comment because does not work with
 # SVN authentication.
 #
@@ -404,7 +405,9 @@ add_list1_option(NB_ANTENNAS_RX "2" "Number of antennas in reception" "1" "2" "4
 add_list1_option(NB_ANTENNAS_TX "2" "Number of antennas in transmission" "1" "2" "4")
 add_list1_option(NB_ANTENNAS_TXRX "2" "Number of antennas in ????" "1" "2" "4")
 
-add_list2_option(RF_BOARD "EXMIMO" "RF head type" "False" "EXMIMO" "OAI_USRP" "ETHERNET" "OAI_BLADERF" "CPRIGW")
+add_list2_option(RF_BOARD "EXMIMO" "RF head type" "False" "EXMIMO" "OAI_USRP" "ETHERNET" "OAI_BLADERF" "OAI_SODERA" "CPRIGW")
+
+Message("RF_BOARD  is ${RF_BOARD}")
 
 if (${RF_BOARD} STREQUAL "EXMIMO")
   set(DRIVER2013)
@@ -434,6 +437,19 @@ elseif (${RF_BOARD} STREQUAL "OAI_BLADERF")
   set(option_HW_lib "bladeRF")
  #set(LOWLATENCY False)
 
+elseif (${RF_BOARD} STREQUAL "OAI_SODERA")
+  include_directories("${OPENAIR_TARGETS}/ARCH/SODERA/USERSPACE/LIB/")
+  include_directories("${OPENAIR_TARGETS}/ARCH/SODERA/USERSPACE/LIB/SoDeRaV1_distro_01v/lms7suite_source_code/src/lms7002m")
+  include_directories("${OPENAIR_TARGETS}/ARCH/SODERA/USERSPACE/LIB/SoDeRaV1_distro_01v/lms7suite_source_code/src/Si5351C")
+  set(HW_SOURCE ${HW_SOURCE}
+    ${OPENAIR_TARGETS}/ARCH/SODERA/USERSPACE/LIB/sodera_lib.cpp
+    )
+  LINK_DIRECTORIES("${OPENAIR_TARGETS}/ARCH/SODERA/USERSPACE/LIB/SoDeRaV1_distro_01v/lms7suite_source_code/build/lms7002m")
+  LINK_DIRECTORIES("/usr/lib/x86_64-linux-gnu")
+  set(option_HW_lib "usb-1.0")
+  set(LMS7002_LIB "libLMS7002M.a")
+ #set(LOWLATENCY False)
+
 elseif (${RF_BOARD} STREQUAL "ETHERNET")
   include_directories ("${OPENAIR_TARGETS}/ARCH/ETHERNET/USERSPACE/LIB")
   set(HW_SOURCE ${HW_SOURCE}
@@ -1431,7 +1447,7 @@ add_executable(lte-softmodem
 
 target_link_libraries (lte-softmodem
   -Wl,--start-group
-  RRC_LIB S1AP_LIB S1AP_ENB GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB PHY LFDS L2 ${MSC_LIB} ${RAL_LIB} ${NAS_UE_LIB} ${ITTI_LIB} ${MIH_LIB}
+  RRC_LIB S1AP_LIB S1AP_ENB GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB PHY LFDS L2 ${MSC_LIB} ${RAL_LIB} ${NAS_UE_LIB} ${ITTI_LIB} ${MIH_LIB} ${LMS7002_LIB}
   -Wl,--end-group )
 
 

cmake_targets/build_oai

@@ -90,7 +90,7 @@ Options
    default is Rel10,
    Rel8 limits the implementation to 3GPP Release 8 version
 -w | --hardware
-   EXMIMO (Default), USRP, BLADERF, ETHERNET, None
+   EXMIMO (Default), USRP, BLADERF, SODERA, ETHERNET, None
    Adds this RF board support (in external packages installation and in compilation)
 --oaisim
    Makes the oaisim simulator. Hardware will be defaulted to "NONE".
@@ -181,6 +181,9 @@ function main() {
             if [ "$HW" == "BLADERF" ] ; then 
 		HW="OAI_BLADERF"
 	    fi 
+            if [ "$HW" == "SODERA" ] ; then 
+		HW="OAI_SODERA"
+	    fi 
             echo_info "setting hardware to: $HW"
             shift 2;;
        --oaisim)
@@ -249,6 +252,7 @@ function main() {
    esac
   done
 
+  echo_info "RF HW set to $HW" 
   #Now we set flags to enable deadline scheduler settings
   #By default: USRP: disable, 
   #By default: BLADERF: enable,
@@ -262,6 +266,8 @@ function main() {
         LOWLATENCY_FLAG_USER="False"
      elif [ "$HW" = "OAI_BLADERF" ] ; then 
         LOWLATENCY_FLAG_USER="False"
+     elif [ "$HW" = "OAI_SODERA" ] ; then 
+        LOWLATENCY_FLAG_USER="False"
      elif [ "$HW" = "None" ] ; then 
         LOWLATENCY_FLAG_USER="False"
      else 

targets/ARCH/COMMON/common_lib.c

@@ -57,12 +57,14 @@ int openair0_device_init(openair0_device *device, openair0_config_t *openair0_cf
   openair0_dev_init_usrp(device, openair0_cfg);
   printf("openair0_dev_init_usrp ...\n");
   return(openair0_dev_init_usrp(device, openair0_cfg));
-
 #elif OAI_BLADERF  
   device->type=BLADERF_IF;
   printf(" openair0_dev_init_bladerf ...\n");   
   return(openair0_dev_init_bladerf(device, openair0_cfg));	
-
-#endif 
+#elif OAI_SODERA
+  device->type=OAI_SODERA;
+  printf(" openair0_dev_init_sodera ...\n");   
+  return(openair0_dev_init_sodera(device, openair0_cfg));	
+#endif
    
 }

targets/ARCH/COMMON/common_lib.h

@@ -164,6 +164,8 @@ typedef enum {
   USRP_X300_IF,
   /*!\brief device is BLADE RF*/
   BLADERF_IF,
+  /*!\brief device is SODERA RF*/
+  SODERARF_IF,
   /*!\brief device is NONE*/
   NONE_IF,
   MAX_DEV_TYPE
@@ -295,6 +297,7 @@ extern "C"
 /*! \brief Initialize Openair ETHERNET target. It returns 0 if OK */
   int openair0_dev_init_eth(openair0_device *device, openair0_config_t *openair0_cfg);
   int openair0_dev_init_bladerf(openair0_device *device, openair0_config_t *openair0_cfg);
+  int openair0_dev_init_sodera(openair0_device *device, openair0_config_t *openair0_cfg);
   int openair0_dev_init_usrp(openair0_device* device, openair0_config_t *openair0_cfg);
   int openair0_dev_init_exmimo(openair0_device *device, openair0_config_t *openair0_cfg);
 /*@}*/