diff --git a/cmake_targets/CMakeLists.txt b/cmake_targets/CMakeLists.txt index 1fca4bf41dd3cf060a04841e51300f29feafdf7b..0887dfcd667944b1dff8f29f40da85afe6e8f28d 100644 --- a/cmake_targets/CMakeLists.txt +++ b/cmake_targets/CMakeLists.txt @@ -186,7 +186,10 @@ add_boolean_option(MSG_PRINT False "print debug messages") add_boolean_option(DISABLE_XER_PRINT False "print XER Format") add_boolean_option(XER_PRINT False "print XER Format") add_boolean_option(RRC_MSG_PRINT False "print RRC messages") -add_boolean_option(PDCP_MSG_PRINT False "print PDCP messages") +add_boolean_option(PDCP_MSG_PRINT False "print PDCP messages to /tmp/pdcp.log") +add_boolean_option(DEBUG_PDCP_PAYLOAD False "print PDCP PDU to stdout") # if true, make sure that global and PDCP log levels are trace +add_boolean_option(DEBUG_MAC_INTERFACE False "print MAC-RLC PDU exchange to stdout") # if true, make sure that global and PDCP log levels are trace +add_boolean_option(TRACE_RLC_PAYLOAD False "print RLC PDU to stdout") # if true, make sure that global and PDCP log levels are trace add_boolean_option(TEST_OMG False "???") add_boolean_option(DEBUG_OMG False "???") add_boolean_option(XFORMS False "This adds the possibility to see the signal oscilloscope") @@ -2085,3 +2088,37 @@ ADD_CUSTOM_TARGET(oarf DEPENDS ${OCT_FILES} ) +#CMAKE INSTALL and CPACK + +#INSTALL(PROGRAMS lte-softmodem ${OPENAIR_DIR}/targets DESTINATION bin) +#INSTALL(PROGRAMS oaisim ${OPENAIR_DIR}/targets DESTINATION bin) + + +#SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "OpenAirInterface") +#SET(CPACK_PACKAGE_VENDOR "Eurecom") +#SET(CPACK_PACKAGE_DESCRIPTION_FILE "${OPENAIR_DIR}/README.txt") +#SET(CPACK_RESOURCE_FILE_LICENSE "${OPENAIR_DIR}/COPYING") +#SET(CPACK_PACKAGE_VERSION_MAJOR "1") +#SET(CPACK_PACKAGE_VERSION_MINOR "1") +#SET(CPACK_PACKAGE_VERSION_PATCH "1") + +#SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CMake ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}") +#SET(CPACK_STRIP_FILES "${OPENAIR_TARGETS}/bin") +#SET(CPACK_SOURCE_STRIP_FILES "") + +##debian specific +#SET(CPACK_DEBIAN_PACKAGE_NAME "OAI") +#SET(CPACK_DEBIAN_PACKAGE_VERSION "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}") +##dpkg --print-architecture (do not use i686 +#SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64") + +#SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.3.1-6), libgcc1 (>= 1:3.4.2-12)") +#SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libpthread.so.0 libm.so.6 libconfig.so.9 librt.so.1 libcrypt.so.1 libcrypto.so.1.0.0 libnettle.so.4 libsctp.so.1 libc.so.6") +#SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "EURECOM-OSA") + +#SET(CPACK_PACKAGE_EXECUTABLES "lte-softmodem" "mme_gw.Rel10" "openair-hss") + +#SET(CPACK_DEBIAN_PACKAGE_DESCRIPTION "OpenAirInterface") +#SET(CPACK_DEBIAN_PACKAGE_Section "Beta-Release") + +#INCLUDE(CPack) diff --git a/openair2/LAYER2/RLC/rlc.c b/openair2/LAYER2/RLC/rlc.c index 04610169d3e18b2a01ea8c74c1d9f65203b9129b..67c8803c93ceb4308cdd8f0040ed8078bb649d03 100644 --- a/openair2/LAYER2/RLC/rlc.c +++ b/openair2/LAYER2/RLC/rlc.c @@ -55,7 +55,6 @@ extern boolean_t pdcp_data_ind( //#define TRACE_RLC_PAYLOAD 1 #define DEBUG_RLC_DATA_REQ 1 -#if defined(TRACE_RLC_PAYLOAD) //----------------------------------------------------------------------------- void rlc_util_print_hex_octets(comp_name_t componentP, unsigned char* dataP, const signed long sizeP) //----------------------------------------------------------------------------- @@ -102,7 +101,7 @@ void rlc_util_print_hex_octets(comp_name_t componentP, unsigned char* dataP, con LOG_T(componentP, " |\n"); } -#endif + //----------------------------------------------------------------------------- rlc_op_status_t rlc_stat_req ( const protocol_ctxt_t* const ctxt_pP, diff --git a/openair2/LAYER2/RLC/rlc_mac.c b/openair2/LAYER2/RLC/rlc_mac.c index e18f548e8cbd2e6729237ef202e5522cbc021bea..83ef0716ea8e3dcb377647e3f97c2b9241a7434f 100644 --- a/openair2/LAYER2/RLC/rlc_mac.c +++ b/openair2/LAYER2/RLC/rlc_mac.c @@ -44,7 +44,7 @@ #include "assertions.h" #include "UTIL/LOG/vcd_signal_dumper.h" -#define DEBUG_MAC_INTERFACE 1 +//#define DEBUG_MAC_INTERFACE 1 //----------------------------------------------------------------------------- struct mac_data_ind mac_rlc_deserialize_tb ( @@ -80,10 +80,8 @@ struct mac_data_ind mac_rlc_deserialize_tb ( memcpy(((struct mac_tb_ind *) (tb_p->data))->data_ptr, &buffer_pP[tbs_size], tb_sizeP); #ifdef DEBUG_MAC_INTERFACE -#if defined(TRACE_RLC_PAYLOAD) LOG_T(RLC, "[MAC-RLC] DUMP RX PDU(%d bytes):\n", tb_sizeP); rlc_util_print_hex_octets(RLC, ((struct mac_tb_ind *) (tb_p->data))->data_ptr, tb_sizeP); -#endif #endif nb_tb_read = nb_tb_read + 1; tbs_size = tbs_size + tb_sizeP; @@ -114,10 +112,8 @@ tbs_size_t mac_rlc_serialize_tb (char* buffer_pP, list_t transport_blocksP) if (tb_p != NULL) { tb_size = ((struct mac_tb_req *) (tb_p->data))->tb_size; #ifdef DEBUG_MAC_INTERFACE -#if defined(TRACE_RLC_PAYLOAD) LOG_T(RLC, "[MAC-RLC] DUMP TX PDU(%d bytes):\n", tb_size); rlc_util_print_hex_octets(RLC, ((struct mac_tb_req *) (tb_p->data))->data_ptr, tb_size); -#endif #endif memcpy(&buffer_pP[tbs_size], &((struct mac_tb_req *) (tb_p->data))->data_ptr[0], tb_size); tbs_size = tbs_size + tb_size;