Merge branch 'next' of github.com:softwareradiosystems/srsLTE into next_private

CMakeLists.txt

@@ -74,17 +74,15 @@ find_package(Threads REQUIRED)
 
 find_package(Polarssl)
 if (POLARSSL_FOUND)
-  set(POLAR_INCLUDE_DIRS "${POLARSSL_INCLUDE_DIRS}")
+  set(SEC_INCLUDE_DIRS "${POLARSSL_INCLUDE_DIRS}")
-  set(POLAR_LIBRARIES    "${POLARSSL_LIBRARIES}")
+  set(SEC_LIBRARIES    "${POLARSSL_LIBRARIES}")
   add_definitions(-DHAVE_POLARSSL)
 else(POLARSSL_FOUND)
-  find_package(MbedTLS)
+  find_package(MbedTLS REQUIRED)
   if (MBEDTLS_FOUND)
-    set(POLAR_INCLUDE_DIRS "${MBEDTLS_INCLUDE_DIRS}")
+    set(SEC_INCLUDE_DIRS "${MBEDTLS_INCLUDE_DIRS}")
-    set(POLAR_LIBRARIES    "${MBEDTLS_LIBRARIES}")
+    set(SEC_LIBRARIES    "${MBEDTLS_LIBRARIES}")
     add_definitions(-DHAVE_MBEDTLS)
-  else(MBEDTLS_FOUND)
-    message(FATAL_ERROR "Either polarssl or mbedtls is required to compile srsLTE")
   endif (MBEDTLS_FOUND)
 endif(POLARSSL_FOUND)
 
@@ -192,15 +190,6 @@ set(INCLUDE_DIR include)
 set(DOC_DIR "share/doc/${CPACK_PACKAGE_NAME}")
 set(DATA_DIR share/${CPACK_PACKAGE_NAME})
 
-
-########################################################################
-# Install headers
-########################################################################
-INSTALL(DIRECTORY include/
-        DESTINATION "${INCLUDE_DIR}"
-        FILES_MATCHING PATTERN "*.h"
-)
-
 ########################################################################
 # Compiler specific setup
 ########################################################################

cmake/modules/FindSSE.cmake

@@ -49,7 +49,8 @@ if (ENABLE_SSE)
               b = _mm256_loadu_ps( src );
               c = _mm256_add_ps( a, b );
               _mm256_storeu_ps( dst, c );
-              for( int i = 0; i < 8; i++ ){
+              int i = 0;
+              for( i = 0; i < 8; i++ ){
                 if( ( src[i] + src[i] ) != dst[i] ){
                   return -1;
                 }
@@ -82,7 +83,8 @@ if (ENABLE_SSE)
             b =  _mm256_loadu_si256( (__m256i*)src );
             c = _mm256_add_epi32( a, b );
             _mm256_storeu_si256( (__m256i*)dst, c );
-            for( int i = 0; i < 8; i++ ){
+            int i = 0;
+            for( i = 0; i < 8; i++ ){
               if( ( src[i] + src[i] ) != dst[i] ){
                 return -1;
               }

lib/CMakeLists.txt

@@ -25,3 +25,10 @@ add_subdirectory(src)
 add_subdirectory(include)
 add_subdirectory(examples)
 add_subdirectory(test)
+
+########################################################################
+# Install library headers
+########################################################################
+INSTALL(  DIRECTORY include/
+          DESTINATION "${INCLUDE_DIR}"
+          FILES_MATCHING PATTERN "*.h" )

lib/include/srslte/upper/rlc_common.h

@@ -179,6 +179,6 @@ public:
   virtual void     write_pdu(uint8_t *payload, uint32_t nof_bytes) = 0;
 };
 
-} // namespace srsue
+} // namespace srslte
 
 #endif // RLC_COMMON_H

lib/src/common/CMakeLists.txt

@@ -21,6 +21,6 @@
 file(GLOB CXX_SOURCES "*.cc")
 file(GLOB C_SOURCES "*.c")
 add_library(srslte_common SHARED ${C_SOURCES} ${CXX_SOURCES})
-target_link_libraries(srslte_common ${POLAR_LIBRARIES})
+target_link_libraries(srslte_common ${SEC_LIBRARIES})
 install(TARGETS srslte_common DESTINATION ${LIBRARY_DIR})
 SRSLTE_SET_PIC(srslte_common)

lib/test/common/CMakeLists.txt

@@ -22,7 +22,7 @@
 # LOGGER TEST
 #######################################################################
 add_executable(logger_test logger_test.cc)
-target_link_libraries(logger_test srslte_phy srslte_common srslte_phy ${POLAR_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES})
+target_link_libraries(logger_test srslte_phy srslte_common srslte_phy ${SEC_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES})
 add_test(logger_test logger_test)
 
 add_executable(msg_queue_test msg_queue_test.cc)
@@ -30,7 +30,7 @@ target_link_libraries(msg_queue_test srslte_phy srslte_common ${CMAKE_THREAD_LIB
 add_test(msg_queue_test msg_queue_test)
 
 add_executable(log_filter_test log_filter_test.cc)
-target_link_libraries(log_filter_test srslte_phy srslte_common srslte_phy ${POLAR_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES})
+target_link_libraries(log_filter_test srslte_phy srslte_common srslte_phy ${SEC_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES})
 
 add_executable(timeout_test timeout_test.cc)
 target_link_libraries(timeout_test srslte_phy ${CMAKE_THREAD_LIBS_INIT})

lib/test/upper/rlc_am_data_test.cc

@@ -40,7 +40,7 @@ uint32_t PDU2_LEN = 5;
 uint8_t pdu3[] = {0x8C, 0x00, 0xDD, 0xCD, 0xDC, 0x5D, 0xC0};
 uint32_t PDU3_LEN = 7;
 
-using namespace srsue;
+using namespace srslte;
 
 int main(int argc, char **argv) {
   srslte::rlc_amd_pdu_header_t h;

srsenb/CMakeLists.txt

@@ -34,13 +34,13 @@ endif()
 ########################################################################
 include_directories(
     ${Boost_INCLUDE_DIRS}
-    ${POLAR_INCLUDE_DIRS}
+    ${SEC_INCLUDE_DIRS}
     ${PROJECT_SOURCE_DIR}/srsenb/hdr
 )
 
 link_directories(
     ${Boost_LIBRARY_DIRS}
-    ${POLAR_LIBRARY_DIRS}
+    ${SEC_LIBRARY_DIRS}
 )
 
 ########################################################################

srsenb/src/CMakeLists.txt

@@ -25,7 +25,7 @@ target_link_libraries(srsenb  srsenb_upper
                               srslte_radio
                               ${CMAKE_THREAD_LIBS_INIT} 
                               ${Boost_LIBRARIES} 
-                              ${POLAR_LIBRARIES} 
+                              ${SEC_LIBRARIES}
                               ${LIBCONFIGPP_LIBRARIES}
                               ${SCTP_LIBRARIES})
 

srsenb/test/upper/CMakeLists.txt

@@ -9,7 +9,7 @@ target_link_libraries(ip_test_enb srsenb_upper
                                   srslte_radio
                                   ${CMAKE_THREAD_LIBS_INIT} 
                                   ${Boost_LIBRARIES} 
-                                  ${POLAR_LIBRARIES})
+                                  ${SEC_LIBRARIES})
 
 # Simple PLMN -> MCC/MNC test
 add_executable(plmn_test plmn_test.cc)

srsue/CMakeLists.txt

@@ -30,13 +30,13 @@ endif()
 ########################################################################
 include_directories(
     ${Boost_INCLUDE_DIRS}
-    ${POLAR_INCLUDE_DIRS}
+    ${SEC_INCLUDE_DIRS}
     ${PROJECT_SOURCE_DIR}/srsue/hdr
 )
 
 link_directories(
     ${Boost_LIBRARY_DIRS}
-    ${POLAR_LIBRARY_DIRS}
+    ${SEC_LIBRARY_DIRS}
 )
 
 ########################################################################