From 5898af3d0bb03ee465b3f525703dcda6df0fb539 Mon Sep 17 00:00:00 2001 From: Andre Puschmann Date: Tue, 30 May 2017 15:06:24 +0200 Subject: [PATCH] add srslte_asn1 lib - remove extra subfolder containing liblte - add asn1 lib containing rrc msg packing and unpacking - add security related bits to common --- {liblte/hdr => lib/include/srslte/asn1}/liblte_common.h | 0 {liblte/hdr => lib/include/srslte/asn1}/liblte_mme.h | 0 {liblte/hdr => lib/include/srslte/asn1}/liblte_rrc.h | 0 .../hdr => lib/include/srslte/common}/liblte_security.h | 2 +- {liblte/hdr => lib/include/srslte/common}/liblte_ssl.h | 0 lib/src/asn1/CMakeLists.txt | 7 +++++++ {liblte/src => lib/src/asn1}/liblte_common.cc | 2 +- {liblte/src => lib/src/asn1}/liblte_mme.cc | 4 ++-- {liblte/src => lib/src/asn1}/liblte_rrc.cc | 2 +- {liblte/src => lib/src/common}/liblte_security.cc | 4 ++-- liblte/CMakeLists.txt | 9 --------- 11 files changed, 14 insertions(+), 16 deletions(-) rename {liblte/hdr => lib/include/srslte/asn1}/liblte_common.h (100%) rename {liblte/hdr => lib/include/srslte/asn1}/liblte_mme.h (100%) rename {liblte/hdr => lib/include/srslte/asn1}/liblte_rrc.h (100%) rename {liblte/hdr => lib/include/srslte/common}/liblte_security.h (99%) rename {liblte/hdr => lib/include/srslte/common}/liblte_ssl.h (100%) create mode 100644 lib/src/asn1/CMakeLists.txt rename {liblte/src => lib/src/asn1}/liblte_common.cc (99%) rename {liblte/src => lib/src/asn1}/liblte_mme.cc (99%) rename {liblte/src => lib/src/asn1}/liblte_rrc.cc (99%) rename {liblte/src => lib/src/common}/liblte_security.cc (99%) delete mode 100644 liblte/CMakeLists.txt diff --git a/liblte/hdr/liblte_common.h b/lib/include/srslte/asn1/liblte_common.h similarity index 100% rename from liblte/hdr/liblte_common.h rename to lib/include/srslte/asn1/liblte_common.h diff --git a/liblte/hdr/liblte_mme.h b/lib/include/srslte/asn1/liblte_mme.h similarity index 100% rename from liblte/hdr/liblte_mme.h rename to lib/include/srslte/asn1/liblte_mme.h diff --git a/liblte/hdr/liblte_rrc.h b/lib/include/srslte/asn1/liblte_rrc.h similarity index 100% rename from liblte/hdr/liblte_rrc.h rename to lib/include/srslte/asn1/liblte_rrc.h diff --git a/liblte/hdr/liblte_security.h b/lib/include/srslte/common/liblte_security.h similarity index 99% rename from liblte/hdr/liblte_security.h rename to lib/include/srslte/common/liblte_security.h index f65937658..b49f7211b 100644 --- a/liblte/hdr/liblte_security.h +++ b/lib/include/srslte/common/liblte_security.h @@ -36,7 +36,7 @@ INCLUDES *******************************************************************************/ -#include "liblte_common.h" +#include "srslte/asn1/liblte_common.h" /******************************************************************************* DEFINES diff --git a/liblte/hdr/liblte_ssl.h b/lib/include/srslte/common/liblte_ssl.h similarity index 100% rename from liblte/hdr/liblte_ssl.h rename to lib/include/srslte/common/liblte_ssl.h diff --git a/lib/src/asn1/CMakeLists.txt b/lib/src/asn1/CMakeLists.txt new file mode 100644 index 000000000..83fe5e315 --- /dev/null +++ b/lib/src/asn1/CMakeLists.txt @@ -0,0 +1,7 @@ +include_directories(hdr) +add_library(srslte_asn1 SHARED + liblte_common.cc + liblte_rrc.cc + liblte_mme.cc +) +INSTALL(TARGETS srslte_asn1 DESTINATION ${LIBRARY_DIR}) diff --git a/liblte/src/liblte_common.cc b/lib/src/asn1/liblte_common.cc similarity index 99% rename from liblte/src/liblte_common.cc rename to lib/src/asn1/liblte_common.cc index e0d5cf6a7..0e618bf35 100644 --- a/liblte/src/liblte_common.cc +++ b/lib/src/asn1/liblte_common.cc @@ -33,7 +33,7 @@ INCLUDES *******************************************************************************/ -#include "liblte_common.h" +#include "srslte/asn1/liblte_common.h" /******************************************************************************* DEFINES diff --git a/liblte/src/liblte_mme.cc b/lib/src/asn1/liblte_mme.cc similarity index 99% rename from liblte/src/liblte_mme.cc rename to lib/src/asn1/liblte_mme.cc index b0b7cf32f..4447b001f 100644 --- a/liblte/src/liblte_mme.cc +++ b/lib/src/asn1/liblte_mme.cc @@ -40,8 +40,8 @@ INCLUDES *******************************************************************************/ -#include "liblte_mme.h" -#include "liblte_security.h" +#include "srslte/asn1/liblte_mme.h" +#include "srslte/common/liblte_security.h" /******************************************************************************* DEFINES diff --git a/liblte/src/liblte_rrc.cc b/lib/src/asn1/liblte_rrc.cc similarity index 99% rename from liblte/src/liblte_rrc.cc rename to lib/src/asn1/liblte_rrc.cc index 62ad12c50..3bfa4a540 100644 --- a/liblte/src/liblte_rrc.cc +++ b/lib/src/asn1/liblte_rrc.cc @@ -59,7 +59,7 @@ INCLUDES *******************************************************************************/ -#include "liblte_rrc.h" +#include "srslte/asn1/liblte_rrc.h" #include #include diff --git a/liblte/src/liblte_security.cc b/lib/src/common/liblte_security.cc similarity index 99% rename from liblte/src/liblte_security.cc rename to lib/src/common/liblte_security.cc index 4722cac4b..95f9617cd 100644 --- a/liblte/src/liblte_security.cc +++ b/lib/src/common/liblte_security.cc @@ -34,8 +34,8 @@ INCLUDES *******************************************************************************/ -#include "liblte_security.h" -#include "liblte_ssl.h" +#include "srslte/common/liblte_security.h" +#include "srslte/common/liblte_ssl.h" #include "math.h" /******************************************************************************* diff --git a/liblte/CMakeLists.txt b/liblte/CMakeLists.txt deleted file mode 100644 index 28c5d60f0..000000000 --- a/liblte/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -include_directories(hdr) -add_library(lte SHARED - src/liblte_common.cc - src/liblte_rrc.cc - src/liblte_mme.cc - src/liblte_security.cc -) -target_link_libraries(lte ${POLAR_LIBRARIES}) -INSTALL(TARGETS lte DESTINATION ${LIBRARY_DIR})