working tdd/fdd at 5 and 10 Mhz

mult_cpx_conj_vector can now also do multiply add
beam_precoding now uses mult_cpx_conj_vector

.gitlab-ci.yml

@@ -2,6 +2,8 @@ job1:
   script:
     - date
     - pwd
+    - echo $OAI_USER
+    - echo $OAI_PASS
     - echo $OAI_TEST_CASE_GROUP
     - echo $MACHINELIST
     - echo $MACHINELISTGENERIC

LICENSE

@@ -1,200 +1,94 @@
-				The OpenAirInterface Software Alliance (OSA)
-					OAI Public License (Version 1.1)
+                      OAI PUBLIC LICENSE V1.0
 
-LICENSE TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION OF OPENAIR 5G SOFTWARE.
+ Copyright (C) 2016 OpenAirInterface Software Alliance, Inc. <http://www.openairinterface.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
 
-1.	Definitions.
-
-“License” shall mean the terms and conditions for use, reproduction, and distribution set forth 
-in this document.
+Definitions.
+“License” shall mean the terms and conditions for use, reproduction, and distribution set forth in this  document.
 
 “Licensor” shall mean the OpenAirInterface Software Alliance.
 
-“Legal Entity” shall mean the union, at the time an acting entity joins the Alliance, of the 
-acting entity and all other entities that control, are controlled by, or are under common control 
-with that entity. For the purposes of this definition, “control” means (i) the power, direct or 
-indirect, to cause the direction or management of such entity, whether by contract or 
-otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) 
-beneficial ownership of such entity.
+“Legal Entity” shall mean the union, at the time an acting entity joins the Alliance, of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, “control” means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
 
-“You” (or “Your”) shall mean an individual or Legal Entity exercising permissions granted by 
-this License.
+“You” (or “Your”) shall mean an individual or Legal Entity exercising permissions granted by this License.
 
-“Source” form shall mean the preferred form for making modifications, including but not 
-limited to software source code, documentation source, and configuration files.
+“Source” form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
 
-“Object” form shall mean any form resulting from mechanical transformation or translation of 
-a Source form, including but not limited to compiled object code, generated documentation, 
-and conversions to other media types.
+“Object” form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
 
-“OpenAirInterface Software Alliance” shall mean the endowment fund established at the 
-initiative of Eurecom, an educational and research establishment located at Campus Sophia 
-Tech, 450 Route des Chappes, 06410 Biot, France, which statutes were signed on 18 
-November 2014.
+“OpenAirInterface Software Alliance” shall mean the endowment fund established at the initiative of Eurecom, an educational and research establishment located at Campus Sophia Tech, 450 Route des Chappes, 06410 Biot, France, which statutes were signed on 18 November 2014.
 
-“Work” shall mean the work of authorship, whether in Source or Object form, made available 
-under the License, as indicated by a copyright notice that is included in or attached to the 
-work (an example is provided in the Appendix below).
+“ “Work” shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
 
-“Derivative Works” shall mean any work, whether in Source or Object form, that is based on 
-(or derived from) the Work and for which the editorial revisions, annotations, elaborations, or 
-other modifications represent, as a whole, an original work of authorship. For the purposes of 
-this License, Derivative Works shall not include works that remain separable from, or merely 
-link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
+“Derivative Works” shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
 
-“Contribution” shall mean any work of authorship that is intentionally submitted to Licensor 
-for inclusion in the Work by the copyright owner or by an individual or Legal Entity 
-authorized to submit on behalf of the copyright owner. For the purposes of this definition, 
-“submitted” means any form of electronic, , or written communication sent to the Licensor or 
-its representatives, including but not limited to communication on electronic mailing lists, 
-source code control systems, and issue tracking systems that are managed by, or on behalf of, 
-the Licensor for the purpose of discussing and improving the Work
+“Contribution” shall mean any work of authorship that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, “submitted” means any form of electronic, , or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work “Contributor License Agreement” shall mean the agreement signed by any Contributor setting forth the terms and conditions applicable to its Contribution. “Contributor” shall mean any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
 
-“Contributor License Agreement” shall mean the agreement signed by any Contributor setting 
-forth the terms and conditions applicable to its Contribution. 
+Grant of Copyright License.
+Subject to the terms and conditions of this License, Licensor and each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form
 
-“Contributor” shall mean any individual or Legal Entity on behalf of whom a Contribution 
-has been received by Licensor and subsequently incorporated within the Work.
+3. Grant of Patent License.
 
-2.	Grant of Copyright License.
-Subject to the terms and conditions of this License, Licensor and each Contributor hereby 
-grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable 
-copyright license to reproduce, prepare Derivative Works of, publicly display, publicly 
-perform, and distribute the Work and such Derivative Works in Source or Object form
+3.1 Grant of Patent License for non-commercial purposes:
 
-3. 	Grant of Patent License.
+Subject to the terms and conditions of this License, Licensor and each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, import, and otherwise transfer the Work, for non-commercial purposes, where such license applies only to those patent claims licensable by such Contributor or Licensor that are necessarily infringed by the Work and/or their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted.
 
-3.1 Grant of Patent License for study, testing and research purposes:
-Subject to the terms and conditions of this License, Licensor and each Contributor hereby 
-grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable 
-(except as stated in this section) patent license to make, have made, use, and otherwise 
-transfer (excluding selling) the Work, solely for study, testing and research purposes, where 
-such license applies only to those patent claims licensable by Licensor or such Contributor 
-that are necessarily infringed respectively by the Work and/or the said Contributor 
-Contribution(s) alone or by combination of their Contribution(s) with the Work  to which 
-such Contribution(s) was submitted (“Essential Patents”).
+3.2 Grant of Patent License for commercial purposes:
 
-3.2 Grant of Patent License for purposes other than study and research:
-For purposes other than study, testing and research, and subject to the terms and conditions of 
-this License, You commit to be prepared to negotiate a non-exclusive, non-transferable, non-
-assignable license of Essential Patents with each Contributor and/or the Licensor on Fair, 
-Reasonable and Non-Discriminatory (“FRAND”) terms and conditions for the use of the 
-Work or Contribution(s) incorporated within the Work.
-Licensor and/or each Contributor, by submitting a Contribution, will identify any of its known 
-Essential Patent it owns related to the Work and/or its Contribution.
+For commercial purposes, and subject to the terms and conditions of this License, You commits to be prepared to negotiate a patent license with each Contributor and/or the Licensor on Fair, Reasonable and Non-Discriminatory (“FRAND”) terms and conditions for the Work or Contribution(s) incorporated within the Work.
+
+Licensor and/or each Contributor, by submitting a Contribution, will identify any patent it owns related to the Work and/or its Contribution.
 
 3.3 Patent Litigation
-If You institute patent litigation against any entity making use of the Work solely for study, 
-testing and research purposes (including a cross-claim or counterclaim in a lawsuit) alleging 
-that the Work or a Contribution incorporated within the Work constitutes direct or 
-contributory patent infringement, then the patent licenses granted to You under section 3.1 of 
-this License for that Work shall terminate as of the date such litigation is filed.
 
-4. Sublicensing
-You may grant sublicenses under the licenses granted under sections 2 and 3.1 provided that 
-the sublicense is subject to and inclusive of all the terms of and rights under this License to 
-which the Work is or was distributed by the OpenAirInterface Software Alliance.
+If You institute patent litigation against any entity making non-commercial use of the Work (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
 
-5. Redistribution
-Subject to terms and conditions set forth in sections 2 and 3, You may reproduce and 
-distribute copies of the Work or Derivative Works thereof in any medium, with or without 
-modifications, and in Source or Object form, provided that You meet the following 
-conditions:  
+4. Redistibution
 
-1. You must give any other recipients of the Work or Derivative Works a copy of this 
-License; and
+Subject to terms and conditions set forth in articles 2 and 3, You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
 
-2. You must cause any modified files by You to carry prominent notices stating that You 
-changed the files; and
 
-3. You must retain, in the Source form of any Derivative Works that You distribute, all 
-copyright, patent, trademark, and attribution notices from the Source form of the Work, 
-excluding those notices that do not pertain to any part of the Derivative Works; and
 
-4. If the Work includes a “NOTICE” text file as part of its distribution, then any Derivative 
-Works that You distribute must include a readable copy of the attribution notices contained 
-within such NOTICE file, excluding those notices that do not pertain to any part of the 
-Derivative Works, in at least one of the following places: within a NOTICE text file 
-distributed as part of the Derivative Works; within the Source form or documentation, if 
-provided along with the Derivative Works; or, within a display generated by the Derivative 
-Works, if and wherever such third-party notices normally appear. The contents of the 
-NOTICE file are for informational purposes only and do not modify the License. You may 
-add Your own attribution notices within Derivative Works that You distribute, alongside or as 
-an addendum to the NOTICE text from the Work, provided that such additional attribution 
-notices cannot be construed as modifying the License. 
-You may add Your own copyright statement to Your modifications and may provide 
-additional or different license terms and conditions for use, reproduction, or distribution of 
-Your modifications, or for any such Derivative Works as a whole, provided Your use, 
-reproduction, and distribution of the Work otherwise complies with the conditions stated in 
-this License.
 
-6. Submission of Contributions. 
-Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be 
-under the terms and conditions of this License, without any additional terms or conditions. 
-Notwithstanding the above, nothing herein shall supersede or modify the terms of any 
-separate license agreement such as the Contributor License Agreement You may have 
-executed with Licensor regarding such Contributions.
+1. You must give any other recipients of the Work or Derivative Works a copy of this License; and
 
-7. Trademarks. 
-This License does not grant permission to use the trade names, trademarks, service marks, or 
-product names of the Licensor, except as required for reasonable and customary use in 
-describing the origin of the Work and reproducing the content of the NOTICE file.
+2. You must cause any modified files by You to carry prominent notices stating that You changed the files; and
 
-8. Disclaimer of Warranty. 
-Unless required by applicable law or agreed to in writing, Licensor provides the Work (and 
-each Contributor provides its Contributions) on an “AS IS” BASIS, WITHOUT 
-WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, 
-without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, 
-MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely 
-responsible for determining the appropriateness of using or redistributing the Work and 
-assume any risks associated with your exercise of permissions under this License.
+3. You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
 
-9. Limitation of Liability. 
-In no event and under no legal theory, whether in tort (including negligence), contract, or 
-otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or 
-agreed to in writing, shall Licensor and any Contributor, as such, be liable to You for 
-damages, including any direct, indirect, special, incidental, or consequential damages of any 
-character arising as a result of this License or out of Your use or inability to use the Work 
-(including but not limited to damages for loss of goodwill, work stoppage, computer failure or 
-malfunction, or any and all other commercial damages or losses), even if such Contributor has 
-been advised of the possibility of such damages.
+4. If the Work includes a “NOTICE” text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
 
-10. Accepting Warranty or Additional Liability. 
-While redistributing the Work or Derivative Works thereof, You may choose to offer, and 
-charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations 
-and/or rights consistent with this License. However, in accepting such obligations, You may 
-act only on Your own behalf and on Your sole responsibility, not on behalf of any other 
-Contributor and/or the Licensor, and only if You agree to indemnify, defend, and hold each 
-Contributor and/or the Licensor harmless for any liability incurred by, or claims asserted 
-against, such Contributor and/or Licensor by reason of Your accepting any such warranty or 
-additional liability.
 
-11. Applicable law. 
-The present license shall be governed by the laws of France.
+You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
+
+5. Submission of Contributions. Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement such as the Contributor License Agreement You may have executed with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an “AS IS” BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall Licensor and any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor and/or the Licensor,and only if You agree to indemnify, defend, and hold each Contributor and/or the Licensor harmless for any liability incurred by, or claims asserted against, such Contributor and/or Licensor by reason of Your accepting any such warranty or additional liability.
+
+10. Applicable law. The present license shall be governed by the laws of France.
 
 END OF TERMS AND CONDITIONS
 
-1.	APPENDIX: How to apply the PRESENT OPENAIR 5G License to your work
-To apply the present License to your work, attach the following boilerplate notice, with the 
-fields enclosed by brackets “[]” replaced with your own identifying information. (Don’t 
-include the brackets!) The text should be enclosed in the appropriate comment syntax for the 
-file format. We also recommend that a file or class name and description of purpose be 
-included on the same “printed page” as the copyright notice for easier identification within 
-third-party archives.
+APPENDIX: How to apply the PRESENT OPENAIR 5G License to your work
+To apply the present License to your work, attach the following boilerplate notice, with the fields enclosed by brackets “[]” replaced with your own identifying information. (Don’t include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same “printed page” as the copyright notice for easier identification within third-party archives.
 
 Copyright [yyyy] [name of copyright owner]
+Licensed under the License terms and conditions for use, reproduction, and distribution of OPENAIR 5G software (the “License”);
 
-Licensed under the License terms and conditions for use, reproduction, and distribution of 
-OPENAIR 5G software (the “License”);
+you may not use this file except in compliance with the License.You may obtain a copy of the License at
+Unless required by applicable law or agreed to in writing, software
 
-you may not use this file except in compliance with the License. You may obtain a copy of 
-the License at
-
-Unless required by applicable law or agreed to in writing, software distributed under the 
-License is distributed on an “AS IS” BASIS,
+distributed under the License is distributed on an “AS IS” BASIS,
 
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 
-See the License for the specific language governing permissions and limitations under the 
-License.
+See the License for the specific language governing permissions and
 
+limitations under the License.

README.txt

@@ -39,8 +39,3 @@ v0.3 -> Last stable commit on develop branch before the merge of feature-131-new
 v0.4 -> Merge of feature-131-new-license. It closes issue#131 and changes the license to OAI Public License V1.0
 v0.5 -> Merge of enhancement-10-harmony-lts. It includes fixes for Ubuntu 16.04 support
 v0.5.1 -> Merge of bugfix-137-uplink-fixes. It includes stablity fixes for eNB
-v0.5.2 -> Last version with old code for oaisim (abstraction mode works)
-v0.6 -> RRH functionality, UE greatly improved, better TDD support,
-        a lot of bugs fixed. WARNING: oaisim in PHY abstraction mode does not
-        work, you need to use v0.5.2 for that.
-v0.6.1 -> Mostly bugfixes. This is the last version without NFAPI.

cmake_targets/CMakeLists.txt

@@ -3,7 +3,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *
@@ -27,8 +27,6 @@ cmake_minimum_required (VERSION 2.8)
 # Base directories, compatible with legacy OAI building
 ################################################
 set (OPENAIR_DIR     $ENV{OPENAIR_DIR})
-#set (NFAPI_DIR       $ENV{NFAPI_DIR})
-set (NFAPI_DIR       ${OPENAIR_DIR}/nfapi)
 set (OPENAIR1_DIR    ${OPENAIR_DIR}/openair1)
 set (OPENAIR2_DIR    ${OPENAIR_DIR}/openair2)
 set (OPENAIR3_DIR    ${OPENAIR_DIR}/openair3)
@@ -39,6 +37,11 @@ set (OPENAIR_BIN_DIR ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY})
 
 project (OpenAirInterface)
 
+#add_definitions("-DEMIT_ASN_DEBUG=1")
+add_subdirectory(${OPENAIR_TARGETS}/ARCH/LMSSDR/USERSPACE/LIB/lms7002m lms7002m)
+add_subdirectory(${OPENAIR_TARGETS}/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR lmsSDR)
+add_subdirectory(${OPENAIR_TARGETS}/ARCH/LMSSDR/USERSPACE/LIB/Si5351C Si5351C)
+
 ###########################################
 # macros to define options as there is numerous options in oai
 ################################################
@@ -116,7 +119,6 @@ endmacro(add_list_string_option)
 ####################################################
 # compilation flags
 #############################################
-
 #set(CMAKE_BUILD_TYPE "Debug")
 if (CMAKE_BUILD_TYPE STREQUAL "")
    set(CMAKE_BUILD_TYPE "RelWithDebInfo")
@@ -132,9 +134,6 @@ else (CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7l")
     file(STRINGS "/proc/cpuinfo" CPUINFO REGEX flags LIMIT_COUNT 1)
     if (CPUINFO MATCHES "avx2")
       set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -mavx2")
-      set(COMPILATION_AVX2 "True")
-    else()
-      set(COMPILATION_AVX2 "False")
     endif()
     if (CPUINFO MATCHES "sse4_1")
       set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -msse4.1")
@@ -176,7 +175,7 @@ set(CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath -Wl,${CMAKE_CU
 # these changes are related to hardcoded path to include .h files
 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")
+set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS} -g -DMALLOC_CHECK_=3 -O2") 
 
 
 set(GIT_BRANCH        "UNKNOWN")
@@ -201,7 +200,7 @@ if(GIT_FOUND)
     OUTPUT_VARIABLE GIT_COMMIT_HASH
     OUTPUT_STRIP_TRAILING_WHITESPACE
   )
-
+  
   # Get the latest commit date of the working branch
   execute_process(
     COMMAND git log -1 --format=%cd
@@ -229,20 +228,15 @@ 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 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(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")
 add_boolean_option(PRINT_STATS         False "This adds the possibility to see the status")
 add_boolean_option(T_TRACER            False "Activate the T tracer, a debugging/monitoring framework" )
 add_boolean_option(UE_AUTOTEST_TRACE   False "Activate UE autotest specific logs")
-add_boolean_option(UE_DEBUG_TRACE      False "Activate UE debug trace")
-add_boolean_option(UE_TIMING_TRACE     False "Activate UE timing trace")
-add_boolean_option(DISABLE_LOG_X       False "Deactivate all LOG_* macros")
-add_boolean_option(USRP_REC_PLAY       False "Enable USRP record playback mode")
-add_boolean_option(UE_EXPANSION_SIM2   False "UE EXPANSION SIM2")
 
 add_boolean_option(DEBUG_CONSOLE False "makes debugging easier, disables stdout/stderr buffering")
 
@@ -263,14 +257,6 @@ if (${ENABLE_ITTI})
   set(GTPU_need_ITTI ${OPENAIR3_DIR}/GTPV1-U/gtpv1u_eNB.c)
 endif (${ENABLE_ITTI})
 
-set (UDP_DIR ${OPENAIR_DIR}/common/utils/udp)
-  add_library(UDP_L1L2
-    # add .h files if depend on (this one is generated)
-    ${UDP_DIR}/udp_com.h
-    ${UDP_DIR}/udp_com.c
-    )
-  set(UDP_LIB UDP_L1L2)
-
 add_boolean_option(RTAI False "Use RTAI")
 
 
@@ -298,10 +284,8 @@ if (${RRC_ASN1_VERSION} STREQUAL "Rel8")
   set (RRC_GRAMMAR ${OPENAIR2_DIR}/RRC/LITE/MESSAGES/asn1c/ASN1_files/EUTRA-RRC-Definitions-86.asn)
 elseif (${RRC_ASN1_VERSION} STREQUAL "CBA")
   set (RRC_GRAMMAR ${OPENAIR2_DIR}/RRC/LITE/MESSAGES/asn1c/ASN1_files/EUTRA-RRC-Definitions-a20-lola.asn)
-elseif (${RRC_ASN1_VERSION} STREQUAL "Rel10")
-  set (RRC_GRAMMAR ${OPENAIR2_DIR}/RRC/LITE/MESSAGES/asn1c/ASN1_files/EUTRA-RRC-Definitions-a20.asn)
 else()
-  set (RRC_GRAMMAR ${OPENAIR2_DIR}/RRC/LITE/MESSAGES/asn1c/ASN1_files/RRC-e30.asn)
+  set (RRC_GRAMMAR ${OPENAIR2_DIR}/RRC/LITE/MESSAGES/asn1c/ASN1_files/EUTRA-RRC-Definitions-a20.asn)
 endif  (${RRC_ASN1_VERSION} STREQUAL "Rel8")
 
 set (RRC_FULL_DIR ${asn1_generated_dir}/${RRC_ASN1_VERSION})
@@ -322,11 +306,11 @@ if (NOT ${ret} STREQUAL 0)
   message(FATAL_ERROR "${fix_asn1c_call}: error")
 endif (NOT ${ret} STREQUAL 0)
 file(GLOB rrc_source ${RRC_FULL_DIR}/*.c)
+set(rrc_source  ${rrc_source} ${OPENAIR2_DIR}/RRC/LITE/MESSAGES/asn1_msg.c)
 file(GLOB rrc_h ${RRC_FULL_DIR}/*.h)
 set(rrc_h ${rrc_h} ${RRC_FULL_DIR}/asn1_constants.h)
 set_source_files_properties(${rrc_source} PROPERTIES COMPILE_FLAGS -w) # suppress warnings from generated code
-add_library(RRC_LIB ${rrc_h} ${rrc_source}
-    ${OPENAIR2_DIR}/RRC/LITE/MESSAGES/asn1_msg.c)
+add_library(RRC_LIB ${rrc_h} ${rrc_source})
 include_directories ("${RRC_FULL_DIR}")
 
 # add the command to generate the source code
@@ -492,97 +476,137 @@ include_directories ("${X2AP_DIR}")
 
 # Hardware dependant options
 ###################################
-add_list1_option(NB_ANTENNAS_RX "2" "Number of antennas in reception" "1" "2" "4")
+add_list1_option(NB_ANTENNAS_RX "4" "Number of antennas in reception" "1" "2" "4")
 add_list1_option(NB_ANTENNAS_TX "4" "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" "None" "EXMIMO" "OAI_USRP" "OAI_BLADERF" "CPRIGW" "OAI_LMSSDR")
+add_list2_option(RF_BOARD "EXMIMO" "RF head type" "None" "EXMIMO" "OAI_USRP" "OAI_BLADERF" "CPRIGW" "OAI_LMSSDR" "OAI_IRIS")
 
 add_list2_option(TRANSP_PRO "None" "Transport protocol type" "None" "ETHERNET")
-#NOKIA config enhancement
-set (CONFIG_ROOTDIR
-    ${OPENAIR_DIR}/common/config
-   )
-set (CONFIG_SOURCES
-    ${CONFIG_ROOTDIR}/config_load_configmodule.c
-    ${CONFIG_ROOTDIR}/config_userapi.c
-    ${CONFIG_ROOTDIR}/config_cmdline.c
-   ) 
-set (CONFIG_LIBCONFIG_SOURCES
-    ${CONFIG_ROOTDIR}/libconfig/config_libconfig.c
-   )   
-add_library(params_libconfig MODULE ${CONFIG_LIBCONFIG_SOURCES} )
-target_link_libraries(params_libconfig config)  
-# shared library loader
-set (SHLIB_LOADER_SOURCES
-    ${OPENAIR_DIR}/common/utils/load_module_shlib.c
-)
+
+
 # include RF devices / transport protocols library modules
 ######################################################################
 
 include_directories("${OPENAIR_TARGETS}/ARCH/EXMIMO/USERSPACE/LIB/")
 include_directories ("${OPENAIR_TARGETS}/ARCH/EXMIMO/DEFS/")
 #set (option_HWEXMIMOLIB_lib "-l ")
-set(HWLIB_EXMIMO_SOURCE
+set(HWLIB_EXMIMO_SOURCE 
   ${OPENAIR_TARGETS}/ARCH/EXMIMO/USERSPACE/LIB/openair0_lib.c
 #  ${OPENAIR_TARGETS}/ARCH/EXMIMO/USERSPACE/LIB/gain_control.c
   )
 add_library(oai_exmimodevif MODULE ${HWLIB_EXMIMO_SOURCE} )
 
 include_directories("${OPENAIR_TARGETS}/ARCH/USRP/USERSPACE/LIB/")
-set(HWLIB_USRP_SOURCE
+set (option_HWUSRPLIB_lib "-l uhd")
+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)
 
 include_directories("${OPENAIR_TARGETS}/ARCH/BLADERF/USERSPACE/LIB/")
-set(HWLIB_BLADERF_SOURCE
+set (option_HWBLADERFLIB_lib "-l bladerf")
+set(HWLIB_BLADERF_SOURCE 
   ${OPENAIR_TARGETS}/ARCH/BLADERF/USERSPACE/LIB/bladerf_lib.c
   )
 add_library(oai_bladerfdevif MODULE ${HWLIB_BLADERF_SOURCE} )
-target_link_libraries(oai_bladerfdevif bladeRF)
 
 include_directories("${OPENAIR_TARGETS}/ARCH/LMSSDR/USERSPACE/LIB/")
-
-set(HWLIB_LMSSDR_SOURCE
+set (option_HWLMSSDRLIB_lib "-l LMS_SDR -l LMS7002M -l Si5351C")
+set(HWLIB_LMSSDR_SOURCE 
   ${OPENAIR_TARGETS}/ARCH/LMSSDR/USERSPACE/LIB/lms_lib.cpp
   )
 add_library(oai_lmssdrdevif MODULE ${HWLIB_LMSSDR_SOURCE} )
-target_include_directories(oai_lmssdrdevif PRIVATE /usr/local/include/lime)
-target_link_libraries(oai_lmssdrdevif LimeSuite )
 
 include_directories("${OPENAIR_TARGETS}/ARCH/ETHERNET/USERSPACE/LIB/")
-set(TPLIB_ETHERNET_SOURCE
+set(TPLIB_ETHERNET_SOURCE 
   ${OPENAIR_TARGETS}/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
   ${OPENAIR_TARGETS}/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c
   ${OPENAIR_TARGETS}/ARCH/ETHERNET/USERSPACE/LIB/eth_raw.c
   )
 add_library(oai_eth_transpro MODULE ${TPLIB_ETHERNET_SOURCE} )
 
-include_directories("${OPENAIR_TARGETS}/ARCH/mobipass/")
-set(TPLIB_MOBIPASS_SOURCE
-  ${OPENAIR_TARGETS}/ARCH/mobipass/interface.c
-  ${OPENAIR_TARGETS}/ARCH/mobipass/mobipass.c
-  ${OPENAIR_TARGETS}/ARCH/mobipass/queues.c
+include_directories("${OPENAIR_TARGETS}/ARCH/IRIS/USERSPACE/LIB/")
+set (option_HWIRISLIB_lib "-l SoapySDR")
+set(HWLIB_IRIS_SOURCE 
+  ${OPENAIR_TARGETS}/ARCH/IRIS/USERSPACE/LIB/iris_lib.cpp
   )
-add_library(oai_mobipass MODULE ${TPLIB_MOBIPASS_SOURCE} )
+add_library(oai_irisdevif MODULE ${HWLIB_IRIS_SOURCE} )
 
-# Hide all functions/variables in the mobipass library.
-# Use __attribute__((__visibility__("default")))
-# in the source code to unhide a function/variable.
-get_target_property(mobipas_cflags oai_mobipass COMPILE_FLAGS)
-set_target_properties(oai_mobipass PROPERTIES COMPILE_FLAGS "${mobipass_cflags} -fvisibility=hidden")
+# RF devices / transport protocols settings
+######################################################################
+if (${RF_BOARD} STREQUAL "EXMIMO")
+  set(DRIVER2013)
+  include_directories ("${OPENAIR_TARGETS}/ARCH/EXMIMO/USERSPACE/LIB/")
+  include_directories ("${OPENAIR_TARGETS}/ARCH/EXMIMO/DEFS/")
+  set(HW_SOURCE ${HW_SOURCE}
+    ${OPENAIR_TARGETS}/ARCH/EXMIMO/USERSPACE/LIB/openair0_lib.c)
+#    ${OPENAIR_TARGETS}/ARCH/EXMIMO/USERSPACE/LIB/gain_control.c)
+  set(option_HW_lib "-rdynamic -ldl")
 
-set(HWLIB_TCP_BRIDGE_SOURCE
-  ${OPENAIR_TARGETS}/ARCH/tcp_bridge/tcp_bridge.c
-  )
-add_library(oai_tcp_bridge MODULE ${HWLIB_TCP_BRIDGE_SOURCE} )
+elseif (${RF_BOARD} STREQUAL "OAI_USRP")
+  include_directories("${OPENAIR_TARGETS}/ARCH/USRP/USERSPACE/LIB/")
+  include_directories("/opt/include/uhd")
+  set(HW_SOURCE ${HW_SOURCE}
+    ${OPENAIR_TARGETS}/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp)
+  LINK_DIRECTORIES("/opt/lib")
+  set(option_HW_lib "-luhd -rdynamic -ldl -lboost_system")
 
-#get_target_property(tcp_bridge_cflags oai_tcp_bridge COMPILE_FLAGS)
-#set_target_properties(oai_tcp_bridge PROPERTIES COMPILE_FLAGS "${tcp_bridge_cflags} -fvisibility=hidden")
-set_target_properties(oai_tcp_bridge PROPERTIES COMPILE_FLAGS "-fvisibility=hidden")
+elseif (${RF_BOARD} STREQUAL "OAI_BLADERF")
+  include_directories("${OPENAIR_TARGETS}/ARCH/BLADERF/USERSPACE/LIB/")
+  include_directories("${OPENAIR2_DIR}/UTIL/LOG")
+  include_directories("/usr/include")
+  set(HW_SOURCE ${HW_SOURCE}
+    ${OPENAIR_TARGETS}/ARCH/BLADERF/USERSPACE/LIB/bladerf_lib.c
+    )
+  LINK_DIRECTORIES("/usr/lib/x86_64-linux-gnu")
 
+  set(option_HW_lib "bladeRF -rdynamic -ldl")
+
+elseif (${RF_BOARD} STREQUAL "OAI_LMSSDR")
+  include_directories("${OPENAIR_TARGETS}/ARCH/LMSSDR/USERSPACE/LIB")
+  include_directories("${OPENAIR_TARGETS}/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR")
+  include_directories("${OPENAIR_TARGETS}/ARCH/LMSSDR/USERSPACE/LIB/lms7002m")
+  include_directories("${OPENAIR_TARGETS}/ARCH/LMSSDR/USERSPACE/LIB/Si5351C")
+  include_directories("${OPENAIR_TARGETS}/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/LMS_StreamBoard")
+  LINK_DIRECTORIES("/usr/lib/x86_64-linux-gnu")
+  LINK_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}/lmsSDR")
+  LINK_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}/lms7002m")
+  LINK_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}/Si5351C")
+  set(HW_SOURCE ${HW_SOURCE} ${OPENAIR_TARGETS}/ARCH/LMSSDR/USERSPACE/LIB/lms_lib.cpp)
+  set(option_HW_lib "-lLMS_SDR -lLMS7002M -lSi5351C -rdynamic -ldl")
+
+elseif (${RF_BOARD} STREQUAL "OAI_IRIS")
+  include_directories("${OPENAIR_TARGETS}/ARCH/IRIS/USERSPACE/LIB/")
+  include_directories("/usr/local/include/")
+  set(HW_SOURCE ${HW_SOURCE}
+    ${OPENAIR_TARGETS}/ARCH/IRIS/USERSPACE/LIB/iris_lib.cpp)
+  LINK_DIRECTORIES("/usr/local/lib")
+  set(option_HW_lib "-lSoapySDR -rdynamic -ldl")
+
+
+elseif (${RF_BOARD} STREQUAL "CPRIGW")
+  set(HW_SOURCE ${HW_SOURCE}
+    ${OPENAIR_TARGETS}/ARCH/CPRIGW/USERSPACE/LIB/cprigw_lib.c
+    )
+  include_directories("${OPENAIR_TARGETS}/ARCH/CPRIGW/USERSPACE/LIB/")
+  set(option_HW_lib "-rdynamic dl")
+  
+endif (${RF_BOARD} STREQUAL "EXMIMO")
+
+
+if (${TRANSP_PRO} STREQUAL "ETHERNET")
+  
+  include_directories ("${OPENAIR_TARGETS}/ARCH/ETHERNET/USERSPACE/LIB")
+  set(TRANSPORT_SOURCE ${TRANSPORT_SOURCE}
+    ${OPENAIR_TARGETS}/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
+    ${OPENAIR_TARGETS}/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c
+    ${OPENAIR_TARGETS}/ARCH/ETHERNET/USERSPACE/LIB/eth_raw.c
+    )
+  set(option_TP_lib "-rdynamic -ldl")
+
+  
+endif (${TRANSP_PRO} STREQUAL "ETHERNET")
 ##########################################################
 
 include_directories ("${OPENAIR_TARGETS}/ARCH/COMMON")
@@ -778,7 +802,6 @@ else()
   include_directories("${OPENAIR2_DIR}/UTIL")
   include_directories("${OPENAIR2_DIR}/UTIL/LOG")
 endif()
-include_directories("${NFAPI_DIR}")
 include_directories("${OPENAIR1_DIR}")
 include_directories("${OPENAIR2_DIR}/NAS")
 include_directories("${OPENAIR2_DIR}")
@@ -836,13 +859,13 @@ include_directories("${OPENAIR_DIR}")
 if (FLEXRAN_AGENT_SB_IF)
   # set the version of protobuf messages, V3 not supported yet
   add_list1_option(FLPT_VERSION V2 "FLPT MSG  protobuf  grammar version" V2 V3)
-
+  
   if (${FLPT_VERSION} STREQUAL "V2")
     set (FLPTDIR V2)
   elseif (${FLPT_VERSION} STREQUAL "V3")
     set (FLPTDIR V3)
   endif(${FLPT_VERSION} STREQUAL "V2")
-
+  
   set(FLPT_MSG_DIR ${OPENAIR2_DIR}/ENB_APP/MESSAGES/${FLPTDIR} )
   set(FLPT_MSG_FILES
     ${FLPT_MSG_DIR}/header.proto
@@ -873,10 +896,10 @@ if (FLEXRAN_AGENT_SB_IF)
     ${FLPT_C_DIR}/config_common.pb-c.c
     ${FLPT_C_DIR}/control_delegation.pb-c.c
     )
-
+  
   file(GLOB flpt_h ${FLPT_C_DIR}/*.h)
   set(flpt_h ${flpt_h} )
-
+  
   add_library(FLPT_MSG
     ${FLPT_OAI_generated}
     ${FLPT_source}
@@ -907,12 +930,12 @@ if (FLEXRAN_AGENT_SB_IF)
     )
   set(FLEXRAN_AGENT_LIB FLEXRAN_AGENT)
   #include_directories(${OPENAIR2_DIR}/ENB_APP)
-
+  
   set(PROTOBUF_LIB "protobuf-c")
-
+  
   FIND_PATH(LIBYAML_INCLUDE_DIR NAMES yaml.h)
   FIND_LIBRARY(LIBYAML_LIBRARIES NAMES yaml libyaml)
-
+  
   INCLUDE(FindPackageHandleStandardArgs)
   FIND_PACKAGE_HANDLE_STANDARD_ARGS(Yaml DEFAULT_MSG LIBYAML_LIBRARIES LIBYAML_INCLUDE_DIR)
   MARK_AS_ADVANCED(LIBYAML_INCLUDE_DIR LIBYAML_LIBRARIES)
@@ -928,9 +951,9 @@ add_library(HASHTABLE
 include_directories(${OPENAIR_DIR}/common/utils/hashtable)
 
 if (MESSAGE_CHART_GENERATOR)
-  add_library(MSC
+  add_library(MSC  
     ${OPENAIR_DIR}/common/utils/msc/msc.c
-  )
+  )  
   set(MSC_LIB MSC)
 endif()
 include_directories(${OPENAIR_DIR}/common/utils/msc)
@@ -1007,13 +1030,11 @@ add_library(SECU_CN ${SECU_CN_SRC})
 
 # Scheduler
 ################################"
-set(SCHED_SRC
-  ${OPENAIR1_DIR}/SCHED/fapi_l1.c
+set(SCHED_SRC 
   ${OPENAIR1_DIR}/SCHED/phy_procedures_lte_eNb.c
   ${OPENAIR1_DIR}/SCHED/phy_procedures_lte_ue.c
   ${OPENAIR1_DIR}/SCHED/phy_procedures_lte_common.c
-  ${OPENAIR1_DIR}/SCHED/ru_procedures.c
-#  ${OPENAIR1_DIR}/SCHED/phy_mac_stub.c
+  ${OPENAIR1_DIR}/SCHED/phy_mac_stub.c
   ${OPENAIR1_DIR}/SCHED/pucch_pc.c
   ${OPENAIR1_DIR}/SCHED/pusch_pc.c
   ${OPENAIR1_DIR}/SCHED/srs_pc.c
@@ -1042,7 +1063,6 @@ set(PHY_SRC
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/lte_mcs.c
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pbch.c
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dci.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/edci.c
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/phich.c
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pcfich.c
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pucch.c
@@ -1066,6 +1086,7 @@ set(PHY_SRC
   ${OPENAIR1_DIR}/PHY/MODULATION/slot_fep_mbsfn.c
   ${OPENAIR1_DIR}/PHY/MODULATION/slot_fep_ul.c
   ${OPENAIR1_DIR}/PHY/MODULATION/ul_7_5_kHz.c
+  ${OPENAIR1_DIR}/PHY/MODULATION/ul_1_4_fs.c
   ${OPENAIR1_DIR}/PHY/MODULATION/beamforming.c
   ${OPENAIR1_DIR}/PHY/MODULATION/compute_bf_weights.c
   ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/freq_equalization.c
@@ -1095,13 +1116,13 @@ set(PHY_SRC
   ${OPENAIR1_DIR}/PHY/CODING/3gpplte_turbo_decoder_sse_16bit.c
   ${OPENAIR1_DIR}/PHY/CODING/3gpplte_turbo_decoder_avx2_16bit.c
   ${OPENAIR1_DIR}/PHY/CODING/lte_rate_matching.c
+  ${OPENAIR1_DIR}/PHY/CODING/rate_matching.c
   ${OPENAIR1_DIR}/PHY/CODING/viterbi.c
   ${OPENAIR1_DIR}/PHY/CODING/viterbi_lte.c
   ${OPENAIR1_DIR}/PHY/INIT/lte_init.c
   ${OPENAIR1_DIR}/PHY/INIT/lte_parms.c
   ${OPENAIR1_DIR}/PHY/INIT/lte_param_init.c
   ${OPENAIR1_DIR}/PHY/TOOLS/file_output.c
-  ${OPENAIR1_DIR}/PHY/TOOLS/cadd_vv.c
   ${OPENAIR1_DIR}/PHY/TOOLS/lte_dfts.c
   ${OPENAIR1_DIR}/PHY/TOOLS/log2_approx.c
   ${OPENAIR1_DIR}/PHY/TOOLS/cmult_sv.c
@@ -1112,21 +1133,16 @@ set(PHY_SRC
   ${OPENAIR1_DIR}/PHY/TOOLS/sqrt.c
   ${OPENAIR1_DIR}/PHY/TOOLS/time_meas.c
   ${OPENAIR1_DIR}/PHY/TOOLS/lut.c
+  ${OPENAIR1_DIR}/PHY/TOOLS/thread_pool.c
   )
 if (${SMBV})
   set(PHY_SRC "${PHY_SRC} ${OPENAIR1_DIR}/PHY/TOOLS/smbv.c")
 endif  (${SMBV})
-
-if (${COMPILATION_AVX2} STREQUAL "True")
-  set(PHY_SRC ${PHY_SRC} ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dlsch_llr_computation_avx2.c)
-endif ()
-
 add_library(PHY ${PHY_SRC})
 
 #Layer 2 library
 #####################
 set(MAC_DIR ${OPENAIR2_DIR}/LAYER2/MAC)
-set(PHY_INTERFACE_DIR ${OPENAIR2_DIR}/PHY_INTERFACE)
 set(RLC_DIR ${OPENAIR2_DIR}/LAYER2/RLC)
 set(RLC_UM_DIR ${OPENAIR2_DIR}/LAYER2/RLC/UM_v9.3.0)
 set(RLC_AM_DIR ${OPENAIR2_DIR}/LAYER2/RLC/AM_v9.3.0)
@@ -1177,7 +1193,7 @@ set(L2_SRC
   ${RRC_DIR}/L2_interface.c
   )
 set (MAC_SRC
-  ${PHY_INTERFACE_DIR}/IF_Module.c
+  ${MAC_DIR}/lte_transport_init.c
   ${MAC_DIR}/main.c
   ${MAC_DIR}/ue_procedures.c
   ${MAC_DIR}/ra_procedures.c
@@ -1309,7 +1325,7 @@ set(libnas_api_OBJS
   ${NAS_SRC}COMMON/API/NETWORK/nas_message.c
   ${NAS_SRC}COMMON/API/NETWORK/network_api.c
   )
-
+  
 set(libnas_emm_msg_OBJS
   ${NAS_SRC}COMMON/EMM/MSG/AttachAccept.c
   ${NAS_SRC}COMMON/EMM/MSG/AttachComplete.c
@@ -1342,7 +1358,7 @@ set(libnas_emm_msg_OBJS
   ${NAS_SRC}COMMON/EMM/MSG/TrackingAreaUpdateRequest.c
   ${NAS_SRC}COMMON/EMM/MSG/UplinkNasTransport.c
 )
-
+  
 set(libnas_esm_msg_OBJS
   ${NAS_SRC}COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextAccept.c
   ${NAS_SRC}COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextReject.c
@@ -1462,7 +1478,7 @@ set (libnas_utils_OBJS
   ${NAS_SRC}COMMON/UTIL/OctetString.c
 )
 
-if(NAS_UE)
+if(NAS_UE) 
   set(libnas_ue_api_OBJS
     ${NAS_SRC}UE/API/USER/at_command.c
     ${NAS_SRC}UE/API/USER/at_error.c
@@ -1612,7 +1628,6 @@ ${OPENAIR1_DIR}/SIMULATION/TOOLS/multipath_tv_channel.c
 ${OPENAIR1_DIR}/SIMULATION/RF/rf.c
 ${OPENAIR1_DIR}/SIMULATION/RF/dac.c
 ${OPENAIR1_DIR}/SIMULATION/RF/adc.c
-${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/netlink_init.c
 )
 
 add_library(SIMU_ETH
@@ -1620,7 +1635,7 @@ ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/netlink_init.c
 ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/multicast_link.c
 ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/socket.c
 ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/bypass_session_layer.c
-#${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/emu_transport.c
+${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/emu_transport.c
 ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/pgm_link.c
 )
 
@@ -1691,25 +1706,9 @@ else()
 endif()
 
 # Atlas is required by some packages, but not found in pkg-config
-# So, here are some hacks here. Hope this gets fixed in future!
-if(EXISTS "/usr/include/atlas/cblas.h" OR EXISTS "/usr/include/cblas.h")
+if(EXISTS "/usr/include/atlas/cblas.h")
   include_directories("/usr/include/atlas")
-  LINK_DIRECTORIES("/usr/lib64")
-  LINK_DIRECTORIES("/usr/lib64/atlas") #Added because atlas libraries in CentOS 7 are here!
-  
-  if(EXISTS "/usr/lib64/libblas.so" OR EXISTS "/usr/lib/libblas.so") #Case for CentOS7
-     list(APPEND ATLAS_LIBRARIES blas)
-  else() # Case for Ubuntu
-     list(APPEND ATLAS_LIBRARIES cblas)
-  endif()
-
-  if(EXISTS "/usr/lib/atlas/libtatlas.so" OR EXISTS "/usr/lib64/atlas/libtatlas.so") #Case for CentOS7
-     list(APPEND ATLAS_LIBRARIES tatlas)
-  else()
-     list(APPEND ATLAS_LIBRARIES atlas) #Case for Ubuntu
-  endif()
-
-  list(APPEND ATLAS_LIBRARIES lapack)
+  list(APPEND ATLAS_LIBRARIES cblas atlas lapack)
 else()
   message("No Blas/Atlas libs found, some targets will fail")
 endif()
@@ -1775,7 +1774,6 @@ add_executable(lte-softmodem
   ${OPENAIR_TARGETS}/RT/USER/rt_wrapper.c
   ${OPENAIR_TARGETS}/RT/USER/lte-ue.c
   ${OPENAIR_TARGETS}/RT/USER/lte-enb.c
-  ${OPENAIR_TARGETS}/RT/USER/lte-ru.c
   ${OPENAIR_TARGETS}/RT/USER/lte-softmodem.c
   ${OPENAIR1_DIR}/SIMULATION/TOOLS/taus.c
   ${OPENAIR_TARGETS}/SIMU/USER/init_lte.c
@@ -1783,24 +1781,22 @@ add_executable(lte-softmodem
   ${OPENAIR_TARGETS}/ARCH/COMMON/common_lib.c
   ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/netlink_init.c
   ${OPENAIR3_DIR}/NAS/UE/nas_ue_task.c
-  ${OPENAIR_DIR}/common/utils/utils.c
-  ${OPENAIR_DIR}/common/utils/system.c
   ${GTPU_need_ITTI}
+  ${HW_SOURCE}
+  ${TRANSPORT_SOURCE}  
   ${RTAI_SOURCE}
   ${XFORMS_SOURCE}
   ${XFORMS_SOURCE_SOFTMODEM}
   ${T_SOURCE}
-  ${CONFIG_SOURCES}
-  ${SHLIB_LOADER_SOURCES}
   )
 
-target_link_libraries (lte-softmodem -ldl 
+target_link_libraries (lte-softmodem -ldl
   -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} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} ${UDP_LIB} LFDS7
+  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} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} LFDS7
   -Wl,--end-group )
 
 target_link_libraries (lte-softmodem ${LIBXML2_LIBRARIES})
-target_link_libraries (lte-softmodem pthread m ${CONFIG_LIBRARIES} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES} sctp  ${XFORMS_LIBRARIES} ${PROTOBUF_LIB}  ${CMAKE_DL_LIBS} ${LIBYAML_LIBRARIES})
+target_link_libraries (lte-softmodem pthread m ${CONFIG_LIBRARIES} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES} sctp ${option_HW_lib} ${option_TP_lib} ${XFORMS_LIBRARIES} ${PROTOBUF_LIB}  ${CMAKE_DL_LIBS} ${LIBYAML_LIBRARIES})
 target_link_libraries (lte-softmodem ${LIB_LMS_LIBRARIES})
 target_link_libraries (lte-softmodem ${T_LIB})
 
@@ -1813,7 +1809,6 @@ add_executable(lte-softmodem-nos1
   ${OPENAIR_TARGETS}/RT/USER/rt_wrapper.c
   ${OPENAIR_TARGETS}/RT/USER/lte-ue.c
   ${OPENAIR_TARGETS}/RT/USER/lte-enb.c
-  ${OPENAIR_TARGETS}/RT/USER/lte-ru.c
   ${OPENAIR_TARGETS}/RT/USER/lte-softmodem.c
   ${OPENAIR1_DIR}/SIMULATION/TOOLS/taus.c
   ${OPENAIR_TARGETS}/SIMU/USER/init_lte.c
@@ -1822,21 +1817,20 @@ add_executable(lte-softmodem-nos1
   ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
   ${OPENAIR2_DIR}/RRC/NAS/rb_config.c
   ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/netlink_init.c
-  ${OPENAIR_DIR}/common/utils/system.c
+  ${HW_SOURCE}
+  ${TRANSPORT_SOURCE}  
   ${RTAI_SOURCE}
   ${XFORMS_SOURCE}
   ${XFORMS_SOURCE_SOFTMODEM}
   ${T_SOURCE}
-  ${CONFIG_SOURCES}
-  ${SHLIB_LOADER_SOURCES}
   )
 target_link_libraries (lte-softmodem-nos1
   -Wl,--start-group
-  RRC_LIB SECU_CN SECU_OSA UTIL HASHTABLE SCHED_LIB PHY LFDS L2 ${MSC_LIB} ${RAL_LIB} ${ITTI_LIB} ${MIH_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} ${UDP_LIB} LFDS7
+  RRC_LIB SECU_CN SECU_OSA UTIL HASHTABLE SCHED_LIB PHY LFDS L2 ${MSC_LIB} ${RAL_LIB} ${ITTI_LIB} ${MIH_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} LFDS7
   -Wl,--end-group )
 
 target_link_libraries (lte-softmodem-nos1 ${LIBXML2_LIBRARIES})
-target_link_libraries (lte-softmodem-nos1 pthread m ${CONFIG_LIBRARIES} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES}   ${XFORMS_LIBRARIES} ${PROTOBUF_LIB} ${CMAKE_DL_LIBS} ${LIBYAML_LIBRARIES})
+target_link_libraries (lte-softmodem-nos1 pthread m ${CONFIG_LIBRARIES} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES}  ${option_HW_lib} ${option_TP_lib} ${XFORMS_LIBRARIES} ${PROTOBUF_LIB} ${CMAKE_DL_LIBS} ${LIBYAML_LIBRARIES})
 target_link_libraries (lte-softmodem-nos1  ${LIB_LMS_LIBRARIES})
 target_link_libraries (lte-softmodem-nos1 ${T_LIB})
 
@@ -1848,18 +1842,33 @@ add_executable(rrh_gw
   ${OPENAIR_TARGETS}/RT/USER/eNB_transport_IQ.c
   ${OPENAIR_TARGETS}/RT/USER/UE_transport_IQ.c
   ${OPENAIR_TARGETS}/RT/USER/rt_wrapper.c
-  ${OPENAIR_TARGETS}/ARCH/COMMON/common_lib.c
+  ${OPENAIR_TARGETS}/ARCH/COMMON/common_lib.c		
+  ${HW_SOURCE}
+  ${TRANSPORT_SOURCE}  
   ${T_SOURCE}
   )
 target_include_directories(rrh_gw PRIVATE  ${OPENAIR_DIR}/common/utils/itti)
 target_link_libraries(rrh_gw
   -Wl,--start-group
-  UTIL LFDS -ldl
+  UTIL LFDS  
   -Wl,--end-group )
 target_link_libraries (rrh_gw rt pthread m )
+target_link_libraries (rrh_gw  ${option_HW_lib} ${option_TP_lib})
 target_link_libraries (rrh_gw ${LIB_LMS_LIBRARIES})
 target_link_libraries (rrh_gw ${T_LIB})
 
+Message("-- option_HW_lib=${option_HW_lib}")
+Message("-- HW_SOURCE=${HW_SOURCE}")
+Message("-- option_TP_lib=${option_TP_lib}")
+Message("-- TRANSPORT_SOURCE=${TRANSPORT_SOURCE}")
+
+if (${RF_BOARD} STREQUAL "OAI_LMSSDR")
+  add_dependencies(lte-softmodem LMS7002M LMS_SDR Si5351C)
+  add_dependencies(lte-softmodem-nos1 LMS7002M LMS_SDR Si5351C)
+  add_dependencies(rrh_gw LMS7002M LMS_SDR Si5351C)
+endif (${RF_BOARD} STREQUAL "OAI_LMSSDR")
+
+
 
 # USIM process
 #################
@@ -1896,7 +1905,7 @@ add_executable(oaisim
   ${x2ap_h}
   ${OPENAIR_BIN_DIR}/messages_xml.h
   ${OPENAIR_TARGETS}/RT/USER/lte-ue.c
-  ${OPENAIR_TARGETS}/RT/USER/lte-ru.c
+  ${OPENAIR_TARGETS}/RT/USER/lte-enb.c
   ${OPENAIR_TARGETS}/RT/USER/rt_wrapper.c
   ${OPENAIR_TARGETS}/SIMU/USER/channel_sim.c
   ${OPENAIR_TARGETS}/SIMU/USER/init_lte.c
@@ -1906,29 +1915,26 @@ add_executable(oaisim
   ${OPENAIR_TARGETS}/SIMU/USER/oaisim_functions.c
   ${OPENAIR_TARGETS}/SIMU/USER/event_handler.c
   ${OPENAIR_TARGETS}/SIMU/USER/oaisim.c
-  ${OPENAIR_TARGETS}/ARCH/COMMON/common_lib.c
   ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
   ${OPENAIR2_DIR}/RRC/NAS/rb_config.c
   ${OPENAIR3_DIR}/NAS/UE/nas_ue_task.c
-  ${OPENAIR_DIR}/common/utils/utils.c
-  ${OPENAIR_DIR}/common/utils/system.c
   ${GTPU_need_ITTI}
   ${OPENAIR_TARGETS}/COMMON/create_tasks.c
+  ${HW_SOURCE}
+  ${TRANSPORT_SOURCE}  
   ${XFORMS_SOURCE}
   ${T_SOURCE}
-  ${CONFIG_SOURCES}
-  ${SHLIB_LOADER_SOURCES}
 )
 
 
 target_include_directories(oaisim PUBLIC  ${OPENAIR_TARGETS}/SIMU/USER)
 target_link_libraries (oaisim
-  -Wl,-ldl,--start-group
-  RRC_LIB S1AP_LIB S1AP_ENB X2AP_LIB GTPV1U SECU_CN UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB PHY LFDS ${MSC_LIB} L2 ${RAL_LIB} LIB_NAS_UE SIMU SECU_OSA ${ITTI_LIB}  ${MIH_LIB} ${UDP_LIB}
+  -Wl,--start-group
+  RRC_LIB S1AP_LIB S1AP_ENB X2AP_LIB GTPV1U SECU_CN UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB PHY LFDS ${MSC_LIB} L2 ${RAL_LIB} LIB_NAS_UE SIMU SIMU_ETH SECU_OSA ${ITTI_LIB}  ${MIH_LIB}
   -Wl,--end-group )
 
 target_link_libraries (oaisim ${LIBXML2_LIBRARIES} ${LAPACK_LIBRARIES})
-target_link_libraries (oaisim pthread m ${CONFIG_LIBRARIES} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES}  ${NETTLE_LIBRARIES} sctp 
+target_link_libraries (oaisim pthread m ${CONFIG_LIBRARIES} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES}  ${NETTLE_LIBRARIES} sctp ${option_HW_lib} ${option_TP_lib}
   ${ATLAS_LIBRARIES} ${XFORMS_LIBRARIES} ${OPENPGM_LIBRARIES})
 #Force link with forms, regardless XFORMS option
 target_link_libraries (oaisim forms)
@@ -1944,7 +1950,6 @@ add_executable(oaisim_nos1
   ${x2ap_h}
   ${OPENAIR_BIN_DIR}/messages_xml.h
   ${OPENAIR_TARGETS}/RT/USER/lte-ue.c
-  ${OPENAIR_TARGETS}/RT/USER/lte-ru.c
   ${OPENAIR_TARGETS}/RT/USER/lte-enb.c
   ${OPENAIR_TARGETS}/RT/USER/rt_wrapper.c
   ${OPENAIR_TARGETS}/SIMU/USER/channel_sim.c
@@ -1955,24 +1960,22 @@ add_executable(oaisim_nos1
   ${OPENAIR_TARGETS}/SIMU/USER/oaisim_functions.c
   ${OPENAIR_TARGETS}/SIMU/USER/event_handler.c
   ${OPENAIR_TARGETS}/SIMU/USER/oaisim.c
-  ${OPENAIR_TARGETS}/ARCH/COMMON/common_lib.c
   ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
   ${OPENAIR2_DIR}/RRC/NAS/rb_config.c
   ${OPENAIR_TARGETS}/COMMON/create_tasks.c
-  ${OPENAIR_DIR}/common/utils/system.c
+  ${HW_SOURCE}
+  ${TRANSPORT_SOURCE}  
   ${XFORMS_SOURCE}
   ${T_SOURCE}
-  ${CONFIG_SOURCES}
-  ${SHLIB_LOADER_SOURCES}
 )
 target_include_directories(oaisim_nos1 PUBLIC  ${OPENAIR_TARGETS}/SIMU/USER)
 target_link_libraries (oaisim_nos1
   -Wl,--start-group
-  RRC_LIB X2AP_LIB SECU_CN UTIL HASHTABLE SCHED_LIB PHY LFDS ${MSC_LIB} L2 ${RAL_LIB} SIMU SECU_OSA ${ITTI_LIB}  ${MIH_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} ${UDP_LIB} LFDS7
+  RRC_LIB X2AP_LIB SECU_CN UTIL HASHTABLE SCHED_LIB PHY LFDS ${MSC_LIB} L2 ${RAL_LIB} SIMU SIMU_ETH SECU_OSA ${ITTI_LIB}  ${MIH_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} LFDS7
   -Wl,--end-group )
 
 target_link_libraries (oaisim_nos1 ${LIBXML2_LIBRARIES} ${LAPACK_LIBRARIES})
-target_link_libraries (oaisim_nos1 pthread m ${CONFIG_LIBRARIES} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES}  ${NETTLE_LIBRARIES}  
+target_link_libraries (oaisim_nos1 pthread m ${CONFIG_LIBRARIES} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES}  ${NETTLE_LIBRARIES}  ${option_HW_lib} ${option_TP_lib}
   ${ATLAS_LIBRARIES} ${XFORMS_LIBRARIES} ${OPENPGM_LIBRARIES} ${PROTOBUF_LIB} ${CMAKE_DL_LIBS} ${LIBYAML_LIBRARIES})
 #Force link with forms, regardless XFORMS option
 target_link_libraries (oaisim_nos1 forms)
@@ -1985,20 +1988,7 @@ target_link_libraries (oaisim_nos1 ${T_LIB})
 # Unitary tests for each piece of L1: example, mbmssim is MBMS L1 simulator
 #####################################
 
-#special case for dlim TM4, which uses its own version of phy_scope code
-add_executable(dlsim_tm4
-  ${OPENAIR_BIN_DIR}/messages_xml.h
-  ${OPENAIR1_DIR}/SIMULATION/LTE_PHY/dlsim_tm4.c
-  ${OPENAIR1_DIR}/PHY/TOOLS/lte_phy_scope_tm4.c
-  ${T_SOURCE}
-  )
-target_link_libraries (dlsim_tm4
-  -Wl,--start-group SIMU UTIL SCHED_LIB PHY LFDS ${ITTI_LIB} -Wl,--end-group
-  pthread m rt ${CONFIG_LIBRARIES} ${ATLAS_LIBRARIES} ${XFORMS_LIBRARIES} ${T_LIB}
-  )
-
 foreach(myExe dlsim dlsim_tm7 ulsim pbchsim scansim mbmssim pdcchsim pucchsim prachsim syncsim)
-
   add_executable(${myExe}
     ${OPENAIR_BIN_DIR}/messages_xml.h
     ${OPENAIR1_DIR}/SIMULATION/LTE_PHY/${myExe}.c
@@ -2023,7 +2013,7 @@ add_executable(test_epc_generate_scenario
   ${OPENAIR_BIN_DIR}/messages_xml.h
   )
 target_link_libraries (test_epc_generate_scenario
-  -Wl,--start-group RRC_LIB S1AP_LIB S1AP_ENB X2AP_LIB GTPV1U LIB_NAS_UE SECU_CN UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB PHY LFDS ${ITTI_LIB} ${MSC_LIB} L2 -Wl,--end-group pthread m rt crypt sctp ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES} ${CONFIG_LIBRARIES}
+  -Wl,--start-group RRC_LIB S1AP_LIB S1AP_ENB X2AP_LIB GTPV1U LIB_NAS_UE SECU_CN UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB PHY LFDS ${ITTI_LIB} ${MSC_LIB} L2 -Wl,--end-group pthread m rt crypt sctp ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES} ${CONFIG_LIBRARIES}  
   )
 
 add_executable(test_epc_play_scenario
@@ -2044,7 +2034,7 @@ add_executable(test_epc_play_scenario
   )
 target_include_directories(test_epc_play_scenario PUBLIC /usr/local/share/asn1c)
 target_link_libraries (test_epc_play_scenario
-  -Wl,--start-group RRC_LIB S1AP_LIB X2AP_LIB GTPV1U LIB_NAS_UE SECU_CN UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB PHY LFDS ${ITTI_LIB} ${MSC_LIB} -Wl,--end-group pthread m rt crypt sctp ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES} ${CONFIG_LIBRARIES}
+  -Wl,--start-group RRC_LIB S1AP_LIB X2AP_LIB GTPV1U LIB_NAS_UE SECU_CN UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB PHY LFDS ${ITTI_LIB} ${MSC_LIB} -Wl,--end-group pthread m rt crypt sctp ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES} ${CONFIG_LIBRARIES}  
   )
 
 
@@ -2064,7 +2054,7 @@ foreach(myExe s1ap
     ${OPENAIR3_DIR}/TEST/test_${myExe}.c
     )
   target_link_libraries (test_${myExe}
-    -Wl,--start-group SECU_CN UTIL LFDS -Wl,--end-group m rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES} ${CONFIG_LIBRARIES}
+    -Wl,--start-group SECU_CN UTIL LFDS -Wl,--end-group m rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES} ${CONFIG_LIBRARIES} 
     )
 endforeach(myExe)
 
@@ -2074,22 +2064,21 @@ endforeach(myExe)
 
 #ensure that the T header files are generated before targets depending on them
 if (${T_TRACER})
-  foreach(i
-        #all "add_executable" definitions (except tests, rb_tool, updatefw)
-        lte-softmodem lte-softmodem-nos1 rrh_gw oaisim oaisim_nos1
-        dlsim_tm4 dlsim dlsim_tm7 ulsim pbchsim scansim mbmssim
-        pdcchsim pucchsim prachsim syncsim
-        #all "add_library" definitions
-        ITTI RRC_LIB S1AP_LIB S1AP_ENB X2AP_LIB
-        oai_exmimodevif oai_usrpdevif oai_bladerfdevif oai_lmssdrdevif
-        oai_eth_transpro
-        FLPT_MSG ASYNC_IF FLEXRAN_AGENT HASHTABLE MSC UTIL OMG_SUMO SECU_OSA
-        SECU_CN SCHED_LIB PHY L2 default_sched remote_sched RAL MIH CN_UTILS
-        GTPV1U SCTP_CLIENT UDP LIB_NAS_UE LFDS LFDS7 SIMU OPENAIR0_LIB)
-    if (TARGET ${i})
-      add_dependencies(${i} generate_T)
-    endif()
-  endforeach(i)
+  add_dependencies(lte-softmodem generate_T)
+  add_dependencies(lte-softmodem-nos1 generate_T)
+  add_dependencies(rrh_gw generate_T)
+  add_dependencies(oaisim generate_T)
+  add_dependencies(oaisim_nos1 generate_T)
+  add_dependencies(dlsim generate_T)
+  add_dependencies(dlsim_tm7 generate_T)
+  add_dependencies(ulsim generate_T)
+  add_dependencies(pbchsim generate_T)
+  add_dependencies(scansim generate_T)
+  add_dependencies(mbmssim generate_T)
+  add_dependencies(pdcchsim generate_T)
+  add_dependencies(pucchsim generate_T)
+  add_dependencies(prachsim generate_T)
+  add_dependencies(syncsim generate_T)
 endif (${T_TRACER})
 
 ##################################################
@@ -2114,17 +2103,11 @@ endforeach()
 # force castxml and clang compilation with gnu89 standard
 # we can't use cXX standard as pthread_rwlock_t is gnu standard
 list(APPEND itti_compiler_options "-std=gnu89")
-set (ITTI_H ${ITTI_DIR}/intertask_interface_types.h)
-set (UDP_H ${UDP_DIR}/udp_com.h)
-if(EXISTS /usr/bin/gccxml)
-   set(xml_command gccxml ${itti_compiler_options} -fxml=${OPENAIR_BIN_DIR}/messages.xml ${ITTI_H})
-else()
-   set(xml_command castxml --castxml-gccxml ${itti_compiler_options} ${ITTI_H} -o ${OPENAIR_BIN_DIR}/messages.xml)
-endif()
 
+set (ITTI_H ${ITTI_DIR}/intertask_interface_types.h)
 add_custom_command (
   OUTPUT ${OPENAIR_BIN_DIR}/messages.xml
-  COMMAND ${xml_command}
+  COMMAND gccxml ${itti_compiler_options} -fxml=${OPENAIR_BIN_DIR}/messages.xml ${ITTI_H}
   DEPENDS ${S1AP_OAI_generated} ${RRC_FULL_DIR}/asn1_constants.h
   )
 
@@ -2234,16 +2217,16 @@ make_driver(ue_ip ${OPENAIR2_DIR}/NETWORK_DRIVER/UE_IP ${ue_ip_src})
 # OCTAVE tools
 ###############
 set(OCT_INCL -I${OPENAIR_TARGETS}/ARCH/EXMIMO/DEFS -I${OPENAIR_TARGETS}/ARCH/EXMIMO/USERSPACE/LIB -I${OPENAIR_TARGETS}/ARCH/COMMON)
-set(OCT_LIBS -L${CMAKE_CURRENT_BINARY_DIR} -lm -lOPENAIR0_LIB)
+set(OCT_LIBS -L${CMAKE_CURRENT_BINARY_DIR} -lm -lOPENAIR0_LIB) 
 set(OCT_FLAGS -DEXMIMO)
 set(OCT_DIR ${OPENAIR_TARGETS}/ARCH/EXMIMO/USERSPACE/OCTAVE)
 set(OCT_FILES
   oarf_config_exmimo.oct
-  oarf_config_exmimo.oct
-  oarf_get_frame.oct
-  oarf_stop.oct
-  oarf_send_frame.oct
-  oarf_get_num_detected_cards.oct
+  oarf_config_exmimo.oct 
+  oarf_get_frame.oct 
+  oarf_stop.oct 
+  oarf_send_frame.oct 
+  oarf_get_num_detected_cards.oct 
   oarf_stop_without_reset.oct
 )
 
@@ -2253,7 +2236,7 @@ foreach(file IN ITEMS ${OCT_FILES})
     OUTPUT ${file}
     DEPENDS ${OCT_DIR}/${src} OPENAIR0_LIB
     COMMAND mkoctfile
-    ARGS ${OCT_FLAGS} ${OCT_INCL} ${OCT_LIBS}
+    ARGS ${OCT_FLAGS} ${OCT_INCL} ${OCT_LIBS} 
     ARGS -o ${file} ${OCT_DIR}/${src}
     COMMENT "Generating ${file}"
     VERBATIM

cmake_targets/at_commands/CMakeLists.txt

@@ -3,7 +3,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *
@@ -88,47 +88,31 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse4.2 -std=gnu99 -Wall -Wstrict-prototype
 set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -ggdb -DMALLOC_CHECK_=3")
 set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -ggdb -DMALLOC_CHECK_=3 -O2")
 
-##This is to detect nettle version changes between Ubuntu 14.04/16.04
-#set ( nettle_cmd "nettle-hash" )
-#set ( nettle_arg "-V" )
-#execute_process(COMMAND  ${nettle_cmd} ${nettle_arg}   RESULT_VARIABLE rv OUTPUT_VARIABLE ov ERROR_VARIABLE ev)
-#
-#string(REGEX MATCH "[+-]?[0-9]+([.][0-9]+)?" nv ${ov})
-#
-#message("NETTLE_VERSION = ${nv}")
-#
-## we need to remove decimal as floating point arithematic does not work properly with C preprocessor
-#STRING(REGEX REPLACE "[.]" "" nv ${nv})
-#
-#if ("${nv}" STREQUAL "")
-#  message( FATAL_ERROR "The nettle version not detected properly. Try to run build_oai -I again" )
-#endif()
-#
-#set (NETTLE_VERSION "${nv}")
-#add_definitions("-DNETTLE_VERSION=${NETTLE_VERSION}")
+#This is to detect nettle version changes between Ubuntu 14.04/16.04
+set ( nettle_cmd "nettle-hash" )
+set ( nettle_arg "-V" )
+execute_process(COMMAND  ${nettle_cmd} ${nettle_arg}   RESULT_VARIABLE rv OUTPUT_VARIABLE ov ERROR_VARIABLE ev)
 
-include(FindPkgConfig)
+string(REGEX MATCH "[+-]?[0-9]+([.][0-9]+)?" nv ${ov})
 
-pkg_search_module(NETTLE nettle)
-if(NOT ${NETTLE_FOUND})
-  message( FATAL_ERROR "PACKAGE nettle not found: some targets will fail. Run build_oai -I again!")
-else()
-  include_directories(${NETTLE_INCLUDE_DIRS})
-endif()
+message("NETTLE_VERSION = ${nv}")
 
-message ("NETTLE VERSION_INSTALLED  = ${NETTLE_VERSION}")
+# we need to remove decimal as floating point arithematic does not work properly with C preprocessor
+STRING(REGEX REPLACE "[.]" "" nv ${nv})
 
-string(REGEX REPLACE "([0-9]+).*" "\\1" NETTLE_VERSION_MAJOR ${NETTLE_VERSION})
-string(REGEX REPLACE "[0-9]+\\.([0-9]+).*" "\\1" NETTLE_VERSION_MINOR ${NETTLE_VERSION})
-message ("NETTLE_VERSION_MAJOR = ${NETTLE_VERSION_MAJOR}")
-message ("NETTLE_VERSION_MINOR = ${NETTLE_VERSION_MINOR}")
-
-if ("${NETTLE_VERSION_MAJOR}" STREQUAL "" OR "${NETTLE_VERSION_MINOR}" STREQUAL "")
+if ("${nv}" STREQUAL "")
   message( FATAL_ERROR "The nettle version not detected properly. Try to run build_oai -I again" )
 endif()
 
-add_definitions("-DNETTLE_VERSION_MAJOR=${NETTLE_VERSION_MAJOR}")
-add_definitions("-DNETTLE_VERSION_MINOR=${NETTLE_VERSION_MINOR}")
+set (NETTLE_VERSION "${nv}")
+add_definitions("-DNETTLE_VERSION=${NETTLE_VERSION}")
+
+include(FindPkgConfig)
+
+INCLUDE(FindNettle)
+IF( NOT NETTLE_FOUND )
+  MESSAGE( SEND_ERROR "Nettle is required" )
+ENDIF( NOT NETTLE_FOUND )
 
 
 pkg_search_module(OPENSSL openssl REQUIRED)
@@ -231,8 +215,8 @@ set(api_user_HDR
 
 add_library(api_user ${api_user_SRC} ${api_user_HDR})
 target_include_directories(api_user PRIVATE ${OPENAIR_NAS_DIR}/UE/API/USER
-                                            ${OPENAIR_NAS_DIR}/COMMON
                                             ${OPENAIR_NAS_DIR}/UE
+                                            ${OPENAIR_NAS_DIR}/COMMON
                                             )
 
 ################################################################################
@@ -413,7 +397,6 @@ target_include_directories(emm PRIVATE
                      ${OPENAIR_DIR}/common/utils/msc 
                      ${OPENAIR_DIR}/common/utils
                      ${OPENAIR_DIR}/openair2/COMMON
-                     ${OPENAIR_NAS_DIR}/UE
                      ${OPENAIR_NAS_DIR}/UE/API/USIM 
                      ${OPENAIR_NAS_DIR}/UE/EMM
                      ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG
@@ -426,6 +409,7 @@ target_include_directories(emm PRIVATE
 # esm LIB
 ################################################################################
 set(esm_SRC
+    ${OPENAIR_NAS_DIR}/UE/ESM/esm_main.c
     ${OPENAIR_NAS_DIR}/UE/ESM/DedicatedEpsBearerContextActivation.c
     ${OPENAIR_NAS_DIR}/UE/ESM/DefaultEpsBearerContextActivation.c
     ${OPENAIR_NAS_DIR}/UE/ESM/EpsBearerContextDeactivation.c
@@ -468,7 +452,6 @@ set(esm_SRC
 )
 
 set(esm_HDR
-    ${OPENAIR_TARGETS}/COMMON/openairinterface5g_limits.h
     ${OPENAIR_NAS_DIR}/UE/ESM/esm_main.h
     ${OPENAIR_NAS_DIR}/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextAccept.h
     ${OPENAIR_NAS_DIR}/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextReject.h
@@ -498,17 +481,13 @@ set(esm_HDR
     ${OPENAIR_NAS_DIR}/UE/ESM/SAP/esm_recv.h
     ${OPENAIR_NAS_DIR}/UE/ESM/SAP/esm_sap.h
     ${OPENAIR_NAS_DIR}/UE/ESM/SAP/esm_send.h
-    ${OPENAIR_DIR}/common/utils/utils.h
 )
 
 add_library(esm ${esm_SRC} ${esm_HDR})
 
 target_include_directories(esm PRIVATE 
-                     ${OPENAIR_DIR}/common/utils
-                     ${OPENAIR_NAS_DIR}/UE
                      ${OPENAIR_NAS_DIR}/UE/API/USER 
                      ${OPENAIR_NAS_DIR}/UE/ESM
-                     ${OPENAIR_TARGETS}/COMMON
                      ${OPENAIR_NAS_DIR}/COMMON/ESM/MSG
                      ${OPENAIR_NAS_DIR}/UE/ESM/SAP
                      ${OPENAIR_NAS_DIR}/COMMON/IES
@@ -691,9 +670,6 @@ target_include_directories(ies PRIVATE
 # EXECUTABLE at_nas_ue
 ################################################################################
 include_directories( 
-                     ${OPENAIR_TARGETS}/COMMON
-                     ${OPENAIR_NAS_DIR}/UE
-                     ${OPENAIR_DIR}/common/utils
                      ${OPENAIR_DIR}/common/utils/msc 
                      ${OPENAIR3_DIR}/COMMON 
                      ${OPENAIR3_DIR}/SECU 
@@ -715,8 +691,6 @@ ADD_EXECUTABLE(at_nas_ue  ${OPENAIR_NAS_DIR}/UE/UEprocess.c
                           ${OPENAIR_NAS_DIR}/UE/nas_parser.c
                           ${OPENAIR_NAS_DIR}/UE/nas_proc.c  
                           ${OPENAIR_NAS_DIR}/UE/nas_user.c  
-                          ${OPENAIR_DIR}/common/utils/utils.c
-                          ${OPENAIR_DIR}/common/utils/system.c
                           )
                           
 target_link_libraries (at_nas_ue 

cmake_targets/autotests/README.txt

@@ -101,19 +101,6 @@ Obj.#   Case#   Test#	Description
 01      51      04      pdcchsim (TBD)
 01      51      05      pbchsim (TBD)
 01      51      06      mbmssim (TBD)
-01      51      10      dlsim_tm4 test cases (Test 1: 10 MHz, R2.FDD (MCS 5), EVA5, -1dB), 
-                        (Test 5: 1.4 MHz, R4.FDD (MCS 4), EVA5, 0dB (70%)),
-                        (Test 6: 10 MHz, R3.FDD (MCS 15), EVA5, 6.7dB (70%)),
-                        (Test 6b: 5 MHz, R3-1.FDD (MCS 15), EVA5, 6.7dB (70%)),
-                        (Test 7: 5 MHz, R3-1.FDD (MCS 15), EVA5, 6.7dB (30%)),
-                        (Test 7b: 5 MHz, R3-1.FDD (MCS 15), ETU70, 1.4 dB (30%)),
-                        (Test 10: 5 MHz, R6.FDD (MCS 25), EVA5, 17.4 dB (70%)),
-                        (Test 10b: 5 MHz, R6-1.FDD (MCS 24,18 PRB), EVA5, 17.5dB (70%)),
-                        (Test 11: 10 MHz, R7.FDD (MCS 25), EVA5, 17.7dB (70%))
-		        (TM2 Test 1 10 MHz, R.11 FDD (MCS 14), EVA5, 6.8 dB (70%)),
-		        (TM2 Test 1b 20 MHz, R.11-2 FDD (MCS 13), EVA5, 5.9 dB (70%)),
-
-
 
 
 01      55              lte-softmodem tests with USRP B210 RF as eNB and ALU EPC w/ Bandrich COTS UE for 1TX/1RX (TM1), 2TX/2RX (TM2)
@@ -213,7 +200,7 @@ Obj.#   Case#   Test#	Description
 01      63      04      Band 7 FDD 10MHz DL Throughput for 300 sec for 1TX/1RX
 01      63      05      Band 7 FDD 20MHz DL Throughput for 300 sec for 1TX/1RX
 
-01      65              lte-softmodem tests with BladeRF RF as eNB and ALU EPC w/ Bandrich COTS UE for 1TX/1RX
+01      65      00      lte-softmodem tests with BladeRF RF as eNB and ALU EPC w/ Bandrich COTS UE for 1TX/1RX
 01      65      00      Band 7 FDD 5MHz UL Throughput for 300 sec for 1TX/1RX
 01      65      01      Band 7 FDD 10MHz UL Throughput for 300 sec for 1TX/1RX
 01      65      02      Band 7 FDD 20MHz UL Throughput for 300 sec for 1TX/1RX
@@ -222,7 +209,7 @@ Obj.#   Case#   Test#	Description
 01      65      05      Band 7 FDD 20MHz DL Throughput for 300 sec for 1TX/1RX
 
 
-01      70              lte-softmodem tests with SoDeRa RF as eNB and ALU EPC w/ Bandrich COTS UE for TX/1RX
+01      70      00      lte-softmodem tests with SoDeRa RF as eNB and ALU EPC w/ Bandrich COTS UE for TX/1RX
 01      70      00      Band 7 FDD 5MHz UL Throughput for 300 sec for 1TX/1RX
 01      70      01      Band 7 FDD 10MHz UL Throughput for 300 sec for 1TX/1RX
 01      70      02      Band 7 FDD 20MHz UL Throughput for 300 sec for 1TX/1RX
@@ -231,7 +218,7 @@ Obj.#   Case#   Test#	Description
 01      70      05      Band 7 FDD 20MHz DL Throughput for 300 sec for 1TX/1RX
 
 
-01      75              lte-softmodem + RRU (NGFI IF4P5, RAW) tests with B210 RF as eNB and ALU EPC w/ Bandrich COTS UE for TX/1RX
+01      75      00      lte-softmodem + RRU (NGFI IF4P5, RAW) tests with B210 RF as eNB and ALU EPC w/ Bandrich COTS UE for TX/1RX
 01      75      00      Band 7 FDD 5MHz UL Throughput for 300 sec for 1TX/1RX
 01      75      01      Band 7 FDD 10MHz UL Throughput for 300 sec for 1TX/1RX
 01      75      02      Band 7 FDD 20MHz UL Throughput for 300 sec for 1TX/1RX
@@ -239,21 +226,7 @@ Obj.#   Case#   Test#	Description
 01      75      04      Band 7 FDD 10MHz DL Throughput for 300 sec for 1TX/1RX
 01      75      05      Band 7 FDD 20MHz DL Throughput for 300 sec for 1TX/1RX
 
-01      76              lte-softmodem + RRU (NGFI IF4P5, UDP) tests with B210 RF as eNB and ALU EPC w/ Bandrich COTS UE for TX/1RX
-01      76      00      Band 7 FDD 5MHz UL Throughput (UDP) for 300 sec for 1TX/1RX
-01      76      01      Band 7 FDD 10MHz UL Throughput (UDP) for 300 sec for 1TX/1RX
-01      76      02      Band 7 FDD 20MHz UL Throughput (UDP) for 300 sec for 1TX/1RX
-01      76      03      Band 7 FDD 5MHz DL Throughput (UDP) for 300 sec for 1TX/1RX
-01      76      04      Band 7 FDD 10MHz DL Throughput (UDP) for 300 sec for 1TX/1RX
-01      76      05      Band 7 FDD 20MHz DL Throughput (UDP) for 300 sec for 1TX/1RX
-01      76      06      Band 7 FDD 5MHz UL Throughput (TCP) for 300 sec for 1TX/1RX
-01      76      07      Band 7 FDD 10MHz UL Throughput (TCP) for 300 sec for 1TX/1RX
-01      76      08      Band 7 FDD 20MHz UL Throughput (TCP) for 300 sec for 1TX/1RX
-01      76      09      Band 7 FDD 5MHz DL Throughput (TCP) for 300 sec for 1TX/1RX
-01      76      10      Band 7 FDD 10MHz DL Throughput (TCP) for 300 sec for 1TX/1RX
-01      76      11      Band 7 FDD 20MHz DL Throughput (TCP) for 300 sec for 1TX/1RX
-
-01      80              lte-softmodem + RRU (NGFI) tests with BladeRF RF as eNB and ALU EPC w/ Bandrich COTS UE for TX/1RX
+01      80      00      lte-softmodem + RRU (NGFI) tests with BladeRF RF as eNB and ALU EPC w/ Bandrich COTS UE for TX/1RX
 01      80      00      Band 7 FDD 5MHz UL Throughput for 300 sec for 1TX/1RX
 01      80      01      Band 7 FDD 10MHz UL Throughput for 300 sec for 1TX/1RX
 01      80      02      Band 7 FDD 20MHz UL Throughput for 300 sec for 1TX/1RX
@@ -261,7 +234,7 @@ Obj.#   Case#   Test#	Description
 01      80      04      Band 7 FDD 10MHz DL Throughput for 300 sec for 1TX/1RX
 01      80      05      Band 7 FDD 20MHz DL Throughput for 300 sec for 1TX/1RX
 
-01      85              lte-softmodem + RRU (NGFI) tests with USRP X310 RF as eNB and ALU EPC w/ Bandrich COTS UE for TX/1RX
+01      85      00      lte-softmodem + RRU (NGFI) tests with USRP X310 RF as eNB and ALU EPC w/ Bandrich COTS UE for TX/1RX
 01      85      00      Band 7 FDD 5MHz UL Throughput for 300 sec for 1TX/1RX
 01      85      01      Band 7 FDD 10MHz UL Throughput for 300 sec for 1TX/1RX
 01      85      02      Band 7 FDD 20MHz UL Throughput for 300 sec for 1TX/1RX
@@ -269,32 +242,6 @@ Obj.#   Case#   Test#	Description
 01      85      04      Band 7 FDD 10MHz DL Throughput for 300 sec for 1TX/1RX
 01      85      05      Band 7 FDD 20MHz DL Throughput for 300 sec for 1TX/1RX
 
-01      86              lte-softmodem tests with USRP B210 RF as eNB and ALU EPC w/ Huawei e3276 COTS UE for 1TX/1RX (TM1), 2TX/2RX (TM2)
-01      86      00      Band 38 TDD 5MHz UL Throughput (UDP) for 300 sec for 1TX/1RX
-01      86      01      Band 38 TDD 10MHz UL Throughput (UDP) for 300 sec for 1TX/1RX
-01      86      02      Band 38 TDD 20MHz UL Throughput (UDP) for 300 sec for 1TX/1RX
-01      86      03      Band 38 TDD 5MHz DL Throughput (UDP) for 300 sec for 1TX/1RX
-01      86      04      Band 38 TDD 10MHz DL Throughput (UDP) for 300 sec for 1TX/1RX
-01      86      05      Band 38 TDD 20MHz DL Throughput (UDP) for 300 sec for 1TX/1RX
-01      86      06      Band 38 TDD 5MHz UL Throughput (UDP) for 300 sec for 2TX/2RX (TM2)
-01      86      07      Band 38 TDD 10MHz UL Throughput (UDP) for 300 sec for 2TX/2RX (TM2)
-01      86      08      Band 38 TDD 20MHz UL Throughput (UDP) for 300 sec for 2TX/2RX (TM2)
-01      86      09      Band 38 TDD 5MHz DL Throughput (UDP) for 300 sec for 2TX/2RX (TM2)
-01      86      10      Band 38 TDD 10MHz DL Throughput (UDP) for 300 sec for 2TX/2RX (TM2)
-01      86      11      Band 38 TDD 20MHz DL Throughput (UDP) for 300 sec for 2TX/2RX (TM2)
-01      86      12      Band 38 TDD 5MHz UL Throughput (TCP) for 300 sec for 1TX/1RX
-01      86      13      Band 38 TDD 10MHz UL Throughput (TCP) for 300 sec for 1TX/1RX
-01      86      14      Band 38 TDD 20MHz UL Throughput (TCP) for 300 sec for 1TX/1RX
-01      86      15      Band 38 TDD 5MHz DL Throughput (TCP) for 300 sec for 1TX/1RX
-01      86      16      Band 38 TDD 10MHz DL Throughput (TCP) for 300 sec for 1TX/1RX
-01      86      17      Band 38 TDD 20MHz DL Throughput (TCP) for 300 sec for 1TX/1RX
-01      86      18      Band 38 TDD 5MHz UL Throughput (TCP) for 300 sec for 2TX/2RX  (TM2)
-01      86      19      Band 38 TDD 10MHz UL Throughput (TCP) for 300 sec for 2TX/2RX (TM2)
-01      86      20      Band 38 TDD 20MHz UL Throughput (TCP) for 300 sec for 2TX/2RX (TM2)
-01      86      21      Band 38 TDD 5MHz DL Throughput (TCP) for 300 sec for 2TX/2RX (TM2)
-01      86      22      Band 38 TDD 10MHz DL Throughput (TCP) for 300 sec for 2TX/2RX (TM2)
-01      86      23      Band 38 TDD 20MHz DL Throughput (TCP) for 300 sec for 2TX/2RX (TM2)
-
 02      55              lte-softmodem tests with USRP B210 RF as eNB and ALU EPC w/ Sony Experia M4 COTS UE for 1TX/1RX and 2TX/2RX (TM2)
 02      55      00      Band 7 FDD 5MHz UL Throughput (UDP) for 300 sec for 1TX/1RX
 02      55      01      Band 7 FDD 10MHz UL Throughput (UDP) for 300 sec for 1TX/1RX

cmake_targets/autotests/core.py

@@ -3,7 +3,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/autotests/log.py

@@ -3,7 +3,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/autotests/openair.py

@@ -3,7 +3,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/autotests/run_compilation_autotests.bash

@@ -4,7 +4,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/autotests/run_exec_autotests.bash

@@ -4,7 +4,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/autotests/run_exec_lte-softmodem_tests.py

@@ -4,7 +4,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/autotests/test_case_list.xml

@@ -62,7 +62,8 @@
      <compile_prog_args>--oaisim -r Rel10 --noS1  -c </compile_prog_args>
      <compile_prog_out>$OPENAIR_DIR/cmake_targets/oaisim_noS1_build_oai/build/oaisim_nos1
                        $OPENAIR_DIR/cmake_targets/oaisim_noS1_build_oai/build/rb_tool
-                       $OPENAIR_DIR/cmake_targets/oaisim_noS1_build_oai/build/CMakeFiles/nasmesh/nasmesh.ko</compile_prog_out>
+                       $OPENAIR_DIR/cmake_targets/oaisim_noS1_build_oai/build/CMakeFiles/nasmesh/nasmesh.ko
+                       $OPENAIR_DIR/cmake_targets/oaisim_noS1_build_oai/build/CMakeFiles/oai_nw_drv/oai_nw_drv.ko</compile_prog_out>
      <pre_exec>$OPENAIR_DIR/cmake_targets/autotests/tools/free_mem.bash</pre_exec>
      <pre_exec_args></pre_exec_args>
      <main_exec></main_exec>
@@ -941,14 +942,9 @@
       (Test 7b, 5 MHz, R3-1.FDD (MCS 15), ETU70, 1.4 dB (30%)),
       (Test 10, 5 MHz, R6.FDD (MCS 25), EVA5, 17.4 dB (70%)),
       (Test 10b, 5 MHz, R6-1.FDD (MCS 24,18 PRB), EVA5, 17.5dB (70%)),
-      (Test 11, 10 MHz, R7.FDD (MCS 25), EVA5, 17.7dB (70%)),
-      (Test 11b, 10 MHz, R7-1.FDD (MCS 25), EVA5, 16.7dB (70%)),
-      (Test 15, 20 MHz, R.9 FDD	(MCS 26), EVA5, 17.6dB (70%)),
-      (Test 15b, 20 MHz, R.9-2 FDD (MCS 26, 17PRB), EVA5, 17.3dB (70%)),
-      (Test 15c, 20 MHz, R.9-1 FDD (MCS 26, 83 PRB), EVA5, 16.6dB (70%)),
-
+      (Test 11, 10 MHz, R7.FDD (MCS 25), EVA5, 17.7dB (70%))
       (TM2 Test 1 10 MHz, R.11 FDD (MCS 14), EVA5, 6.8 dB (70%)),
-      (TM2 Test 1b 5 MHz, R.11-2 FDD (MCS 13), EVA5, 5.9 dB (70%)),
+      (TM2 Test 1b 20 MHz, R.11-2 FDD (MCS 13), EVA5, 5.9 dB (70%)),
        </desc>
       <pre_compile_prog></pre_compile_prog>
       <compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</compile_prog>
@@ -965,9 +961,6 @@
                        -m25 -gF -s17.4 -w1.0 -f.2 -n500 -B25 -c3 -z2 -O70
                        -m25 -gF -s17.5 -w1.0 -f.2 -n500 -B25 -c3 -z2 -r1022 -O70
                        -m26 -gF -s17.7 -w1.0 -f.2 -n500 -B50 -c2 -z2 -O70
-                       -m26 -gF -s17.6 -w1.0 -f.2 -n500 -B100 -c2 -z2 -O70
-                       -m26 -gF -s17.3 -w1.0 -f.2 -n500 -B100 -c2 -z2 -r1600 -O70
-                       -m26 -gF -s16.6 -w1.0 -f.2 -n500 -B100 -c2 -z2 -r1899 -O70
 		       -m14 -gF -s6.8  -w1.0 -f.2 -n500 -B50 -c2 -x2 -y2 -z2 -O70
                        -m13 -gF -s5.9  -w1.0 -f.2 -n500 -B25 -c3 -x2 -y2 -z2 -O70</main_exec_args>
       <tags>dlsim.test1 dlsim.test5 dlsim.test6 dlsim.test6b dlsim.test7 dlsim.test7b dlsim.test10 dlsim.test10b dlsim.test11 dlsim.TM2_test1 dlsim.TM2_test1b</tags>
@@ -1002,43 +995,6 @@
       <nruns>3</nruns>
     </testCase>
 
-    <testCase id="015110">
-      <class>execution</class>
-      <desc>dlsim_tm4 test cases (Test 1: 10 MHz, R2.FDD (MCS 5), EVA5, -1dB), 
-      (Test 5: 1.4 MHz, R4.FDD (MCS 4), EVA5, 0dB (70%)),
-      (Test 6, 10 MHz, R3.FDD (MCS 15), EVA5, 6.7dB (70%)),
-      (Test 6b, 5 MHz, R3-1.FDD (MCS 15), EVA5, 6.7dB (70%)),
-      (Test 7, 5 MHz, R3-1.FDD (MCS 15), EVA5, 6.7dB (30%)),
-      (Test 7b, 5 MHz, R3-1.FDD (MCS 15), ETU70, 1.4 dB (30%)),
-      (Test 10, 5 MHz, R6.FDD (MCS 25), EVA5, 17.4 dB (70%)),
-      (Test 10b, 5 MHz, R6-1.FDD (MCS 24,18 PRB), EVA5, 17.5dB (70%)),
-      (Test 11, 10 MHz, R7.FDD (MCS 25), EVA5, 17.7dB (70%))
-      (TM2 Test 1 10 MHz, R.11 FDD (MCS 14), EVA5, 6.8 dB (70%)),
-      (TM2 Test 1b 20 MHz, R.11-2 FDD (MCS 13), EVA5, 5.9 dB (70%)),
-       </desc>
-      <pre_compile_prog></pre_compile_prog>
-      <compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</compile_prog>
-      <compile_prog_args> --phy_simulators  -c </compile_prog_args>
-      <pre_exec>$OPENAIR_DIR/cmake_targets/autotests/tools/free_mem.bash</pre_exec>
-      <pre_exec_args></pre_exec_args>
-      <main_exec> $OPENAIR_DIR/cmake_targets/lte-simulators/build/dlsim_tm4</main_exec>
-      <main_exec_args> -m5 -gF -s-1 -w1.0 -f.2 -n500 -B50 -c2 -z2 -O70
-                       -m4 -gF -s0 -w1.0 -f.2 -n500 -B6 -c4 -z2 -O70
-                       -m15 -gF -s6.7 -w1.0 -f.2 -n500 -B50 -c2 -z2 -O70
-                       -m14 -gF -s6.7 -w1.0 -f.2 -n500 -B25 -c3 -z2 -O70
-                       -m15 -gG -s6.7 -w1.0 -f.2 -n500 -B50 -c2 -z2 -O30
-                       -m14 -gG -s1.4 -w1.0 -f.2 -n500 -B25 -c3 -z2 -O30
-                       -m25 -gF -s17.4 -w1.0 -f.2 -n500 -B25 -c3 -z2 -O70
-                       -m25 -gF -s17.5 -w1.0 -f.2 -n500 -B25 -c3 -z2 -r1022 -O70
-                       -m26 -gF -s17.7 -w1.0 -f.2 -n500 -B50 -c2 -z2 -O70
-		       -m14 -gF -s6.8  -w1.0 -f.2 -n500 -B50 -c2 -x2 -y2 -z2 -O70
-                       -m13 -gF -s5.9  -w1.0 -f.2 -n500 -B25 -c3 -x2 -y2 -z2 -O70</main_exec_args>
-      <tags>dlsim_tm4.test1 dlsim_tm4.test5 dlsim_tm4.test6 dlsim_tm4.test6b dlsim_tm4.test7 dlsim_tm4.test7b dlsim_tm4.test10 dlsim_tm4.test10b dlsim_tm4.test11 dlsim_tm4.TM2_test1 dlsim_tm4.TM2_test1b</tags>
-      <search_expr_true>"passed"</search_expr_true>
-      <search_expr_false>segmentation fault|assertion|exiting|fatal</search_expr_false>
-      <nruns>3</nruns>
-    </testCase>
-
   <testCase id="015500" >
     <class>lte-softmodem</class>
     <desc></desc>
@@ -8672,43 +8628,6 @@ c
     <nruns>10</nruns>
     </testCase> 
 
-  <testCase id="017600"></testCase>
-  <testCase id="017601"></testCase>
-  <testCase id="017602"></testCase>
-  <testCase id="017603"></testCase>
-  <testCase id="017604"></testCase>
-  <testCase id="017605"></testCase>
-  <testCase id="017606"></testCase>
-  <testCase id="017607"></testCase>
-  <testCase id="017608"></testCase>
-  <testCase id="017609"></testCase>
-  <testCase id="017610"></testCase>
-  <testCase id="017611"></testCase>
-
-  <testCase id="018600"></testCase>
-  <testCase id="018601"></testCase>
-  <testCase id="018602"></testCase>
-  <testCase id="018603"></testCase>
-  <testCase id="018604"></testCase>
-  <testCase id="018605"></testCase>
-  <testCase id="018606"></testCase>
-  <testCase id="018607"></testCase>
-  <testCase id="018608"></testCase>
-  <testCase id="018609"></testCase>
-  <testCase id="018610"></testCase>
-  <testCase id="018611"></testCase>
-  <testCase id="018612"></testCase>
-  <testCase id="018613"></testCase>
-  <testCase id="018614"></testCase>
-  <testCase id="018615"></testCase>
-  <testCase id="018616"></testCase>
-  <testCase id="018617"></testCase>
-  <testCase id="018618"></testCase>
-  <testCase id="018619"></testCase>
-  <testCase id="018620"></testCase>
-  <testCase id="018621"></testCase>
-  <testCase id="018622"></testCase>
-  <testCase id="018623"></testCase>
 
   <testCase id="025500" >
     <class>lte-softmodem</class>
@@ -10567,7 +10486,7 @@ c
     <UE_compile_prog>$OPENAIR_DIR/cmake_targets/build_oai --eNB --UE -w USRP -c -x  </UE_compile_prog>
     <UE_branch>develop1B</UE_branch>
     <UE_compile_prog_args></UE_compile_prog_args>
-    <UE_pre_exec>$OPENAIR_DIR/cmake_targets/autotests/tools/free_mem.bash ; sudo rmmod nasmesh ; sudo rmmod ue_ip</UE_pre_exec>
+    <UE_pre_exec>$OPENAIR_DIR/cmake_targets/autotests/tools/free_mem.bash ; sudo rmmod nasmesh ; sudo rmmod ue_ip; sudo rmmod oai_nw_drv</UE_pre_exec>
     <UE_pre_exec_args></UE_pre_exec_args>
     <UE_main_exec>sleep 50; cd $OPENAIR_DIR/cmake_targets/lte_build_oai/build ; sudo -E $OPENAIR_DIR/cmake_targets/lte_build_oai/build/lte-softmodem  -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 90 --ue-rxgain 125 </UE_main_exec>
     <UE_main_exec_args></UE_main_exec_args>
@@ -10667,7 +10586,7 @@ c
     <UE_compile_prog>$OPENAIR_DIR/cmake_targets/build_oai --eNB --UE -w USRP -c -x  </UE_compile_prog>
     <UE_branch>develop1B</UE_branch>
     <UE_compile_prog_args></UE_compile_prog_args>
-    <UE_pre_exec>$OPENAIR_DIR/cmake_targets/autotests/tools/free_mem.bash ; sudo rmmod nasmesh ; sudo rmmod ue_ip</UE_pre_exec>
+    <UE_pre_exec>$OPENAIR_DIR/cmake_targets/autotests/tools/free_mem.bash ; sudo rmmod nasmesh ; sudo rmmod ue_ip; sudo rmmod oai_nw_drv</UE_pre_exec>
     <UE_pre_exec_args></UE_pre_exec_args>
     <UE_main_exec>sleep 50; cd $OPENAIR_DIR/cmake_targets/lte_build_oai/build ; sudo -E $OPENAIR_DIR/cmake_targets/lte_build_oai/build/lte-softmodem  -U -C2660000000 -r50 --ue-scan-carrier --ue-txgain 90 --ue-rxgain 125 </UE_main_exec>
     <UE_main_exec_args></UE_main_exec_args>
@@ -10767,7 +10686,7 @@ c
     <UE_compile_prog>$OPENAIR_DIR/cmake_targets/build_oai --eNB --UE -w USRP -c -x  </UE_compile_prog>
     <UE_branch>develop1B</UE_branch>
     <UE_compile_prog_args></UE_compile_prog_args>
-    <UE_pre_exec>$OPENAIR_DIR/cmake_targets/autotests/tools/free_mem.bash ; sudo rmmod nasmesh ; sudo rmmod ue_ip</UE_pre_exec>
+    <UE_pre_exec>$OPENAIR_DIR/cmake_targets/autotests/tools/free_mem.bash ; sudo rmmod nasmesh ; sudo rmmod ue_ip; sudo rmmod oai_nw_drv</UE_pre_exec>
     <UE_pre_exec_args></UE_pre_exec_args>
     <UE_main_exec>sleep 50; cd $OPENAIR_DIR/cmake_targets/lte_build_oai/build ; sudo -E $OPENAIR_DIR/cmake_targets/lte_build_oai/build/lte-softmodem  -U -C2660000000 -r100 --ue-scan-carrier --ue-txgain 90 --ue-rxgain 125 </UE_main_exec>
     <UE_main_exec_args></UE_main_exec_args>
@@ -10868,7 +10787,7 @@ c
     <UE_compile_prog>$OPENAIR_DIR/cmake_targets/build_oai --eNB --UE -w USRP -c -x  </UE_compile_prog>
     <UE_branch>develop1B</UE_branch>
     <UE_compile_prog_args></UE_compile_prog_args>
-    <UE_pre_exec>$OPENAIR_DIR/cmake_targets/autotests/tools/free_mem.bash ; sudo rmmod nasmesh ; sudo rmmod ue_ip</UE_pre_exec>
+    <UE_pre_exec>$OPENAIR_DIR/cmake_targets/autotests/tools/free_mem.bash ; sudo rmmod nasmesh ; sudo rmmod ue_ip; sudo rmmod oai_nw_drv</UE_pre_exec>
     <UE_pre_exec_args></UE_pre_exec_args>
     <UE_main_exec>sleep 50; cd $OPENAIR_DIR/cmake_targets/lte_build_oai/build ; sudo -E $OPENAIR_DIR/cmake_targets/lte_build_oai/build/lte-softmodem  -U -C2660000000 -r25 --ue-scan-carrier --ue-txgain 90 --ue-rxgain 125 </UE_main_exec>
     <UE_main_exec_args></UE_main_exec_args>
@@ -10968,7 +10887,7 @@ c
     <UE_compile_prog>$OPENAIR_DIR/cmake_targets/build_oai --eNB --UE -w USRP -c -x  </UE_compile_prog>
     <UE_branch>develop1B</UE_branch>
     <UE_compile_prog_args></UE_compile_prog_args>
-    <UE_pre_exec>$OPENAIR_DIR/cmake_targets/autotests/tools/free_mem.bash ; sudo rmmod nasmesh ; sudo rmmod ue_ip</UE_pre_exec>
+    <UE_pre_exec>$OPENAIR_DIR/cmake_targets/autotests/tools/free_mem.bash ; sudo rmmod nasmesh ; sudo rmmod ue_ip; sudo rmmod oai_nw_drv</UE_pre_exec>
     <UE_pre_exec_args></UE_pre_exec_args>
     <UE_main_exec>sleep 50; cd $OPENAIR_DIR/cmake_targets/lte_build_oai/build ; sudo -E $OPENAIR_DIR/cmake_targets/lte_build_oai/build/lte-softmodem  -U -C2660000000 -r50 --ue-scan-carrier --ue-txgain 90 --ue-rxgain 125 </UE_main_exec>
     <UE_main_exec_args></UE_main_exec_args>
@@ -11070,7 +10989,7 @@ c
     <UE_compile_prog>$OPENAIR_DIR/cmake_targets/build_oai --eNB --UE -w USRP -c -x  </UE_compile_prog>
     <UE_branch>develop1B</UE_branch>
     <UE_compile_prog_args></UE_compile_prog_args>
-    <UE_pre_exec>$OPENAIR_DIR/cmake_targets/autotests/tools/free_mem.bash ; sudo rmmod nasmesh ; sudo rmmod ue_ip</UE_pre_exec>
+    <UE_pre_exec>$OPENAIR_DIR/cmake_targets/autotests/tools/free_mem.bash ; sudo rmmod nasmesh ; sudo rmmod ue_ip; sudo rmmod oai_nw_drv</UE_pre_exec>
     <UE_pre_exec_args></UE_pre_exec_args>
     <UE_main_exec>sleep 50; cd $OPENAIR_DIR/cmake_targets/lte_build_oai/build ; sudo -E $OPENAIR_DIR/cmake_targets/lte_build_oai/build/lte-softmodem  -U -C2660000000 -r100 --ue-scan-carrier --ue-txgain 90 --ue-rxgain 125 </UE_main_exec>
     <UE_main_exec_args></UE_main_exec_args>

cmake_targets/autotests/testsuite_ue_noS1.xml

@@ -3208,316 +3208,6 @@
 
 
 
- <!--20 MHz test -->
-
-<testCase id="039400" >
-        <class>lte-softmodem-noS1</class>
-        <desc></desc>
-        <eNB>imb182-desktop</eNB>
-        <UE>yanbo-M4HM87P-00</UE>
-        <TimeOut_cmd>300</TimeOut_cmd>
-        <eNB_working_dir>/tmp</eNB_working_dir>
-        <eNB_config_file>targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.100PRB.usrpb210.conf  downlink_frequency 2680000000L</eNB_config_file>
-        <eNB_compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</eNB_compile_prog>
-        <eNB_compile_prog_args>-c -w USRP --eNB --noS1</eNB_compile_prog_args>
-        <eNB_pre_exec>source $OPENAIR_DIR/cmake_targets/tools/init_nas_nos1 eNB</eNB_pre_exec>
-        <eNB_pre_exec_args></eNB_pre_exec_args>
-        <eNB_main_exec>$OPENAIR_DIR/cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1</eNB_main_exec>
-        <eNB_main_exec_args> -O $OPENAIR_DIR/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.100PRB.usrpb210.conf -m 28 --single-thread-disable --phy-test</eNB_main_exec_args>
-        <eNB_traffic_exec></eNB_traffic_exec>
-        <eNB_traffic_exec_args></eNB_traffic_exec_args>
-        <eNB_search_expr_true></eNB_search_expr_true>
-        <eNB_search_expr_false></eNB_search_expr_false>
-        <eNB_terminate_missing_procs>False</eNB_terminate_missing_procs>
-
-        <UE_working_dir>/tmp</UE_working_dir>
-        <UE_config_file></UE_config_file>
-        <UE_compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</UE_compile_prog>
-        <UE_compile_prog_args>-c --UE -w USRP --noS1 --eNB --ue-autotest-trace </UE_compile_prog_args>
-        <UE_pre_exec>source ./targets/bin/init_nas_nos1 UE</UE_pre_exec>
-        <UE_pre_exec_args></UE_pre_exec_args>
-        <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2680000000 -r100 --ue-scan-carrier --ue-txgain 85 --ue-rxgain 100 -S --phy-test</UE_main_exec>
-        <UE_main_exec_args></UE_main_exec_args>
-        <UE_traffic_exec></UE_traffic_exec>
-        <UE_traffic_exec_args></UE_traffic_exec_args>
-        <UE_search_expr_true></UE_search_expr_true>
-        <UE_search_expr_false></UE_search_expr_false>
-        <UE_terminate_missing_procs>False</UE_terminate_missing_procs>
-        <UE_metric  id="UE_DLSCH_BITRATE" 
-            description="UE downlink physical throughput"  
-            regex='(UE_DLSCH_BITRATE) =\s+(\d+\.\d+) kbps.+frame = (\d+)\)' 
-            unit_of_meas = "kbps"
-            pass_fail_stat = "mean_value"
-            min_limit = "55008"/>
-        <UE_metric  id="UE_FREQ_OFFSET" 
-                description="UE downlink frequency channel offset"  
-                regex='(UE_FREQ_OFFSET) =\s+(-?\d+) Hz.+frame = (\d+)\)' 
-                unit_of_meas = "Hz"/> 
-        <UE_metric  id="UE_RX_OFFSET" 
-                description="UE downlink rx sample offset"  
-                regex='(UE_RX_OFFSET) =\s+(-?\d+).+frame = (\d+)\)' 
-                unit_of_meas = ""/> 
-        <tags>UE_USRP.NOS1.PHYTEST_PERF.BAND7.20MHZ.MCS28</tags>
-	<nruns>3</nruns><max_ntries>6</max_ntries>
-    </testCase> 
-
-
- <testCase id="036600" >
-        <class>lte-softmodem-noS1</class>
-        <desc></desc>
-        <eNB>imb182-desktop</eNB>
-        <UE>yanbo-M4HM87P-00</UE>
-        <TimeOut_cmd>300</TimeOut_cmd>
-        <eNB_working_dir>/tmp</eNB_working_dir>
-        <eNB_config_file>targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.100PRB.usrpb210.conf  downlink_frequency 2680000000L</eNB_config_file>
-        <eNB_compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</eNB_compile_prog>
-        <eNB_compile_prog_args>-c -w USRP --eNB --noS1</eNB_compile_prog_args>
-        <eNB_pre_exec>source $OPENAIR_DIR/cmake_targets/tools/init_nas_nos1 eNB</eNB_pre_exec>
-        <eNB_pre_exec_args></eNB_pre_exec_args>
-        <eNB_main_exec>$OPENAIR_DIR/cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1</eNB_main_exec>
-        <eNB_main_exec_args> -O $OPENAIR_DIR/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.100PRB.usrpb210.conf -m 0 --single-thread-disable --phy-test</eNB_main_exec_args>
-        <eNB_traffic_exec></eNB_traffic_exec>
-        <eNB_traffic_exec_args></eNB_traffic_exec_args>
-        <eNB_search_expr_true></eNB_search_expr_true>
-        <eNB_search_expr_false></eNB_search_expr_false>
-        <eNB_terminate_missing_procs>False</eNB_terminate_missing_procs>
-
-        <UE_working_dir>/tmp</UE_working_dir>
-        <UE_config_file></UE_config_file>
-        <UE_compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</UE_compile_prog>
-        <UE_compile_prog_args>-c --UE -w USRP --noS1 --eNB --ue-autotest-trace </UE_compile_prog_args>
-        <UE_pre_exec>source ./targets/bin/init_nas_nos1 UE</UE_pre_exec>
-        <UE_pre_exec_args></UE_pre_exec_args>
-        <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2680000000 -r100 --ue-scan-carrier --ue-txgain 85 --ue-rxgain 100 -S --phy-test</UE_main_exec>
-        <UE_main_exec_args></UE_main_exec_args>
-        <UE_traffic_exec></UE_traffic_exec>
-        <UE_traffic_exec_args></UE_traffic_exec_args>
-        <UE_search_expr_true></UE_search_expr_true>
-        <UE_search_expr_false></UE_search_expr_false>
-        <UE_terminate_missing_procs>False</UE_terminate_missing_procs>
-        <UE_metric  id="UE_DLSCH_BITRATE" 
-            description="UE downlink physical throughput"  
-            regex='(UE_DLSCH_BITRATE) =\s+(\d+\.\d+) kbps.+frame = (\d+)\)' 
-            unit_of_meas = "kbps"
-            pass_fail_stat = "mean_value"
-            min_limit = "2040"/>
-        <UE_metric  id="UE_FREQ_OFFSET" 
-                description="UE downlink frequency channel offset"  
-                regex='(UE_FREQ_OFFSET) =\s+(-?\d+) Hz.+frame = (\d+)\)' 
-                unit_of_meas = "Hz"/> 
-        <UE_metric  id="UE_RX_OFFSET" 
-                description="UE downlink rx sample offset"  
-                regex='(UE_RX_OFFSET) =\s+(-?\d+).+frame = (\d+)\)' 
-                unit_of_meas = ""/> 
-        <tags>UE_USRP.NOS1.PHYTEST_PERF.BAND7.20MHZ.MCS0</tags>
-	<nruns>3</nruns><max_ntries>6</max_ntries>
-    </testCase> 
-
-
- <testCase id="038400" >
-        <class>lte-softmodem-noS1</class>
-        <desc></desc>
-        <eNB>imb182-desktop</eNB>
-        <UE>yanbo-M4HM87P-00</UE>
-        <TimeOut_cmd>300</TimeOut_cmd>
-        <eNB_working_dir>/tmp</eNB_working_dir>
-        <eNB_config_file>targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.100PRB.usrpb210.conf  downlink_frequency 2680000000L</eNB_config_file>
-        <eNB_compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</eNB_compile_prog>
-        <eNB_compile_prog_args>-c -w USRP --eNB --noS1</eNB_compile_prog_args>
-        <eNB_pre_exec>source $OPENAIR_DIR/cmake_targets/tools/init_nas_nos1 eNB</eNB_pre_exec>
-        <eNB_pre_exec_args></eNB_pre_exec_args>
-        <eNB_main_exec>$OPENAIR_DIR/cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1</eNB_main_exec>
-        <eNB_main_exec_args> -O $OPENAIR_DIR/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.100PRB.usrpb210.conf -m 18 --single-thread-disable --phy-test</eNB_main_exec_args>
-        <eNB_traffic_exec></eNB_traffic_exec>
-        <eNB_traffic_exec_args></eNB_traffic_exec_args>
-        <eNB_search_expr_true></eNB_search_expr_true>
-        <eNB_search_expr_false></eNB_search_expr_false>
-        <eNB_terminate_missing_procs>False</eNB_terminate_missing_procs>
-
-        <UE_working_dir>/tmp</UE_working_dir>
-        <UE_config_file></UE_config_file>
-        <UE_compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</UE_compile_prog>
-        <UE_compile_prog_args>-c --UE -w USRP --noS1 --eNB --ue-autotest-trace </UE_compile_prog_args>
-        <UE_pre_exec>source ./targets/bin/init_nas_nos1 UE</UE_pre_exec>
-        <UE_pre_exec_args></UE_pre_exec_args>
-        <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2680000000 -r100 --ue-scan-carrier --ue-txgain 85 --ue-rxgain 100 -S --phy-test</UE_main_exec>
-        <UE_main_exec_args></UE_main_exec_args>
-        <UE_traffic_exec></UE_traffic_exec>
-        <UE_traffic_exec_args></UE_traffic_exec_args>
-        <UE_search_expr_true></UE_search_expr_true>
-        <UE_search_expr_false></UE_search_expr_false>
-        <UE_terminate_missing_procs>False</UE_terminate_missing_procs>
-        <UE_metric  id="UE_DLSCH_BITRATE" 
-            description="UE downlink physical throughput"  
-            regex='(UE_DLSCH_BITRATE) =\s+(\d+\.\d+) kbps.+frame = (\d+)\)' 
-            unit_of_meas = "kbps"
-            pass_fail_stat = "mean_value"
-            min_limit = "23976"/>
-        <UE_metric  id="UE_FREQ_OFFSET" 
-                description="UE downlink frequency channel offset"  
-                regex='(UE_FREQ_OFFSET) =\s+(-?\d+) Hz.+frame = (\d+)\)' 
-                unit_of_meas = "Hz"/> 
-        <UE_metric  id="UE_RX_OFFSET" 
-                description="UE downlink rx sample offset"  
-                regex='(UE_RX_OFFSET) =\s+(-?\d+).+frame = (\d+)\)' 
-                unit_of_meas = ""/> 
-        <tags>UE_USRP.NOS1.PHYTEST_PERF.BAND7.20MHZ.MCS18</tags>
-	<nruns>3</nruns><max_ntries>6</max_ntries>
-    </testCase> 
-
-
-
- <testCase id="036630" >
-        <class>lte-softmodem-noS1</class>
-        <desc></desc>
-        <eNB>imb182-desktop</eNB>
-        <UE>yanbo-M4HM87P-00</UE>
-        <TimeOut_cmd>700</TimeOut_cmd>
-        <eNB_working_dir>/tmp</eNB_working_dir>
-        <eNB_config_file>targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.100PRB.usrpb210.conf  downlink_frequency 2680000000L</eNB_config_file>
-        <eNB_compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</eNB_compile_prog>
-        <eNB_compile_prog_args>-c -w USRP --eNB --noS1</eNB_compile_prog_args>
-        <eNB_pre_exec>source $OPENAIR_DIR/cmake_targets/tools/init_nas_nos1 eNB</eNB_pre_exec>
-        <eNB_pre_exec_args></eNB_pre_exec_args>
-        <eNB_main_exec>$OPENAIR_DIR/cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1</eNB_main_exec>
-        <eNB_main_exec_args> -O $OPENAIR_DIR/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.100PRB.usrpb210.conf -m 0</eNB_main_exec_args>
-        <eNB_traffic_exec>sleep 80;iperf -c 10.0.1.9 -i 1 -u -b 2M</eNB_traffic_exec> 
-        <eNB_traffic_exec_args></eNB_traffic_exec_args>
-        <eNB_search_expr_true></eNB_search_expr_true>
-        <eNB_search_expr_false></eNB_search_expr_false>
-        <eNB_terminate_missing_procs>False</eNB_terminate_missing_procs>
-
-        <UE_working_dir>/tmp</UE_working_dir>
-        <UE_config_file></UE_config_file>
-        <UE_compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</UE_compile_prog>
-        <UE_compile_prog_args>-c --UE -w USRP --noS1 --eNB --ue-autotest-trace </UE_compile_prog_args>
-        <UE_pre_exec>source ./targets/bin/init_nas_nos1 UE</UE_pre_exec>
-        <UE_pre_exec_args></UE_pre_exec_args>
-        <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2680000000 -r100 --ue-scan-carrier --ue-txgain 85 --ue-rxgain 100 </UE_main_exec>
-        <UE_main_exec_args></UE_main_exec_args>
-        <UE_traffic_exec>iperf -s -i 1 -u</UE_traffic_exec>
-        <UE_traffic_exec_args></UE_traffic_exec_args>
-        <UE_search_expr_true>600</UE_search_expr_true>
-        <UE_search_expr_false></UE_search_expr_false>
-        <UE_terminate_missing_procs>False</UE_terminate_missing_procs>
-        <UE_metric  id="UE_DLSCH_BITRATE" 
-                description="UE downlink physical throughput"  
-                regex='(UE_DLSCH_BITRATE) =\s+(\d+\.\d+) kbps.+frame = (\d+)\)' 
-                unit_of_meas = "kbps"/> 
-        <UE_metric  id="UE_FREQ_OFFSET" 
-                description="UE downlink frequency channel offset"  
-                regex='(UE_FREQ_OFFSET) =\s+(-?\d+) Hz.+frame = (\d+)\)' 
-                unit_of_meas = "Hz"/> 
-        <UE_metric  id="UE_RX_OFFSET" 
-                description="UE downlink rx sample offset"  
-                regex='(UE_RX_OFFSET) =\s+(-?\d+).+frame = (\d+)\)' 
-                unit_of_meas = ""/> 
-        <tags>UE_USRP.NOS1.DATA_IPERF_DL.BAND7.20MHZ.MCS0</tags>
-	<nruns>3</nruns><max_ntries>6</max_ntries>
-    </testCase> 
-
- 
- <testCase id="038430" >
-        <class>lte-softmodem-noS1</class>
-        <desc></desc>
-        <eNB>imb182-desktop</eNB>
-        <UE>yanbo-M4HM87P-00</UE>
-        <TimeOut_cmd>700</TimeOut_cmd>
-        <eNB_working_dir>/tmp</eNB_working_dir>
-        <eNB_config_file>targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.100PRB.usrpb210.conf  downlink_frequency 2680000000L</eNB_config_file>
-        <eNB_compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</eNB_compile_prog>
-        <eNB_compile_prog_args>-c -w USRP --eNB --noS1</eNB_compile_prog_args>
-        <eNB_pre_exec>source $OPENAIR_DIR/cmake_targets/tools/init_nas_nos1 eNB</eNB_pre_exec>
-        <eNB_pre_exec_args></eNB_pre_exec_args>
-        <eNB_main_exec>$OPENAIR_DIR/cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1</eNB_main_exec>
-        <eNB_main_exec_args> -O $OPENAIR_DIR/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.100PRB.usrpb210.conf -m 18</eNB_main_exec_args>
-        <eNB_traffic_exec>sleep 80;iperf -c 10.0.1.9 -i 1 -u -b 24M</eNB_traffic_exec> 
-        <eNB_traffic_exec_args></eNB_traffic_exec_args>
-        <eNB_search_expr_true></eNB_search_expr_true>
-        <eNB_search_expr_false></eNB_search_expr_false>
-        <eNB_terminate_missing_procs>False</eNB_terminate_missing_procs>
-
-        <UE_working_dir>/tmp</UE_working_dir>
-        <UE_config_file></UE_config_file>
-        <UE_compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</UE_compile_prog>
-        <UE_compile_prog_args>-c --UE -w USRP --noS1 --eNB --ue-autotest-trace </UE_compile_prog_args>
-        <UE_pre_exec>source ./targets/bin/init_nas_nos1 UE</UE_pre_exec>
-        <UE_pre_exec_args></UE_pre_exec_args>
-        <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2680000000 -r100 --ue-scan-carrier --ue-txgain 85 --ue-rxgain 100 </UE_main_exec>
-        <UE_main_exec_args></UE_main_exec_args>
-        <UE_traffic_exec>iperf -s -i 1 -u</UE_traffic_exec>
-        <UE_traffic_exec_args></UE_traffic_exec_args>
-        <UE_search_expr_true>600</UE_search_expr_true>
-        <UE_search_expr_false></UE_search_expr_false>
-        <UE_terminate_missing_procs>False</UE_terminate_missing_procs>
-        <UE_metric  id="UE_DLSCH_BITRATE" 
-                description="UE downlink physical throughput"  
-                regex='(UE_DLSCH_BITRATE) =\s+(\d+\.\d+) kbps.+frame = (\d+)\)' 
-                unit_of_meas = "kbps"/> 
-        <UE_metric  id="UE_FREQ_OFFSET" 
-                description="UE downlink frequency channel offset"  
-                regex='(UE_FREQ_OFFSET) =\s+(-?\d+) Hz.+frame = (\d+)\)' 
-                unit_of_meas = "Hz"/> 
-        <UE_metric  id="UE_RX_OFFSET" 
-                description="UE downlink rx sample offset"  
-                regex='(UE_RX_OFFSET) =\s+(-?\d+).+frame = (\d+)\)' 
-                unit_of_meas = ""/> 
-        <tags>UE_USRP.NOS1.DATA_IPERF_DL.BAND7.20MHZ.MCS18</tags>
-	<nruns>3</nruns><max_ntries>6</max_ntries>
-    </testCase> 
-
-
-
- <testCase id="039430" >
-        <class>lte-softmodem-noS1</class>
-        <desc></desc>
-        <eNB>imb182-desktop</eNB>
-        <UE>yanbo-M4HM87P-00</UE>
-        <TimeOut_cmd>700</TimeOut_cmd>
-        <eNB_working_dir>/tmp</eNB_working_dir>
-        <eNB_config_file>targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.100PRB.usrpb210.conf  downlink_frequency 2680000000L</eNB_config_file>
-        <eNB_compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</eNB_compile_prog>
-        <eNB_compile_prog_args>-c -w USRP --eNB --noS1</eNB_compile_prog_args>
-        <eNB_pre_exec>source $OPENAIR_DIR/cmake_targets/tools/init_nas_nos1 eNB</eNB_pre_exec>
-        <eNB_pre_exec_args></eNB_pre_exec_args>
-        <eNB_main_exec>$OPENAIR_DIR/cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1</eNB_main_exec>
-        <eNB_main_exec_args> -O $OPENAIR_DIR/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.100PRB.usrpb210.conf -m 28</eNB_main_exec_args>
-        <eNB_traffic_exec>sleep 80;iperf -c 10.0.1.9 -i 1 -u -b 55M</eNB_traffic_exec> <!-- PHY max TP 73.334Mbps -> 75% = 55Mbps -->
-        <eNB_traffic_exec_args></eNB_traffic_exec_args>
-        <eNB_search_expr_true></eNB_search_expr_true>
-        <eNB_search_expr_false></eNB_search_expr_false>
-        <eNB_terminate_missing_procs>False</eNB_terminate_missing_procs>
-
-        <UE_working_dir>/tmp</UE_working_dir>
-        <UE_config_file></UE_config_file>
-        <UE_compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</UE_compile_prog>
-        <UE_compile_prog_args>-c --UE -w USRP --noS1 --eNB --ue-autotest-trace </UE_compile_prog_args>
-        <UE_pre_exec>source ./targets/bin/init_nas_nos1 UE</UE_pre_exec>
-        <UE_pre_exec_args></UE_pre_exec_args>
-        <UE_main_exec>sleep 20; ./cmake_targets/autotests/tools/run_gdb ./cmake_targets/lte_noS1_build_oai/build/lte-softmodem-nos1 -U -C2680000000 -r100 --ue-scan-carrier --ue-txgain 85 --ue-rxgain 100 </UE_main_exec>
-        <UE_main_exec_args></UE_main_exec_args>
-        <UE_traffic_exec>iperf -s -i 1 -u</UE_traffic_exec>
-        <UE_traffic_exec_args></UE_traffic_exec_args>
-        <UE_search_expr_true>600</UE_search_expr_true>
-        <UE_search_expr_false></UE_search_expr_false>
-        <UE_terminate_missing_procs>False</UE_terminate_missing_procs>
-        <UE_metric  id="UE_DLSCH_BITRATE" 
-                description="UE downlink physical throughput"  
-                regex='(UE_DLSCH_BITRATE) =\s+(\d+\.\d+) kbps.+frame = (\d+)\)' 
-                unit_of_meas = "kbps"/> 
-        <UE_metric  id="UE_FREQ_OFFSET" 
-                description="UE downlink frequency channel offset"  
-                regex='(UE_FREQ_OFFSET) =\s+(-?\d+) Hz.+frame = (\d+)\)' 
-                unit_of_meas = "Hz"/> 
-        <UE_metric  id="UE_RX_OFFSET" 
-                description="UE downlink rx sample offset"  
-                regex='(UE_RX_OFFSET) =\s+(-?\d+).+frame = (\d+)\)' 
-                unit_of_meas = ""/> 
-        <tags>UE_USRP.NOS1.DATA_IPERF_DL.BAND7.20MHZ.MCS28</tags>
-	<nruns>3</nruns><max_ntries>6</max_ntries>
-    </testCase> 
-
-
 
 
   </testCaseList>

cmake_targets/autotests/tools/configure_cots_bandrich_ue.py

@@ -4,7 +4,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/autotests/tools/configure_cots_huaweiE398_ue.py

@@ -4,7 +4,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/autotests/tools/configure_cots_sony_experia_m4_ue.py

@@ -4,7 +4,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/autotests/tools/configure_usrpb210.py

@@ -4,7 +4,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/autotests/tools/find_usb_path.bash

@@ -4,7 +4,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/autotests/tools/free_mem.bash

@@ -4,7 +4,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/autotests/tools/git-retry.sh

@@ -4,7 +4,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/autotests/tools/iperf3_script

@@ -4,7 +4,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/autotests/tools/iperf3_script_phone

@@ -4,7 +4,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/autotests/tools/iperf_script

@@ -4,7 +4,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/autotests/tools/iperf_script_phone

@@ -4,7 +4,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/autotests/tools/lib_autotest.py

@@ -4,7 +4,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/autotests/tools/run_gdb

@@ -4,7 +4,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/autotests/tools/search_repl.py

@@ -4,7 +4,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/autotests/v2/actions/3276.txt

@@ -1,13 +0,0 @@
-When running lsusb, if you have:
-
-    Bus 001 Device 002: ID 12d1:14fe Huawei Technologies Co., Ltd. Modem (Mass Storage Mode)
-
-You need to run:
-
-    usb_modeswitch -v 12d1 -p 14fe -M '55534243123456780000000000000011062000000100000000000000000000'
-
-After what, running lsusb should give:
-
-    Bus 001 Device 004: ID 12d1:1506 Huawei Technologies Co., Ltd. Modem/Networkcard
-
-Values of 'Bus' and 'Device' may differ of course.

cmake_targets/autotests/v2/actions/alu_hss.bash

@@ -1,5 +1,2 @@
-sudo rmmod nasmesh || true
-sudo rmmod ue_ip || true
 sudo /opt/ltebox/tools/stop_ltebox || true
-sudo killall -9 hss_sim || true
 sudo /opt/hss_sim0609/starthss_real

cmake_targets/autotests/v2/actions/bandrich.txt

@@ -13,16 +13,6 @@ containing lines:
     SUBSYSTEM=="tty", ENV{ID_VENDOR_ID}=="1a8d", ENV{ID_MODEL_ID}=="100d", ENV{ID_SERIAL_SHORT}=="357473040068155", ENV{ID_USB_INTERFACE_NUM}=="00", SYMLINK+="bandrich.data", MODE="0666"
     SUBSYSTEM=="tty", ENV{ID_VENDOR_ID}=="1a8d", ENV{ID_MODEL_ID}=="100d", ENV{ID_SERIAL_SHORT}=="357473040068155", ENV{ID_USB_INTERFACE_NUM}=="02", SYMLINK+="bandrich.control", MODE="0666"
 
-To avoid NetworkManager to play with the bandrich, add also the line:
-
-    ENV{ID_VENDOR_ID}=="1a8d", ENV{ID_MM_DEVICE_IGNORE}="1"
-
-Maybe also add; , ENV{ID_MM_DEVICE_IGNORE}="1"
-to the two other lines.
-
-Then run: udevadm control --reload-rules
-And:      service network-manager restart
-
 Change vendor_id/model_id/serial/interface num to match yours.
 Use lsusb -v to find values.
 

cmake_targets/autotests/v2/actions/execution.bash

@@ -1,4 +1,2 @@
-cd /tmp/oai_test_setup/oai
-source oaienv
 echo $EXEC $EXEC_ARGS
 $EXEC $EXEC_ARGS

cmake_targets/autotests/v2/actions/execution_compile.bash

@@ -1,13 +1,8 @@
 cd /tmp/oai_test_setup/oai
 source oaienv
-sudo rmmod nasmesh || true
-sudo rmmod ue_ip || true
 cd cmake_targets
 rm -rf log
 mkdir -p log
-echo $PRE_BUILD
 bash -c "$PRE_BUILD"
-echo $BUILD_PROG $BUILD_ARGUMENTS
 $BUILD_PROG $BUILD_ARGUMENTS
-echo $PRE_EXEC
 bash -c "$PRE_EXEC"

cmake_targets/autotests/v2/actions/run_enb.bash

@@ -3,8 +3,6 @@ stty isig intr ^C
 
 cd /tmp/oai_test_setup/oai
 source oaienv
-sudo rmmod nasmesh || true
-sudo rmmod ue_ip || true
 cd cmake_targets/lte_build_oai/build
 ulimit -c unlimited
 sudo rm -f core

cmake_targets/autotests/v2/actions/start_3276.bash

@@ -1,13 +0,0 @@
-#enable control+C reception (to be refined if it does not work)
-stty isig intr ^C
-
-cd /tmp/oai_test_setup/oai
-source oaienv
-sudo rmmod nasmesh || true
-sudo rmmod ue_ip || true
-cd cmake_targets/autotests/v2/actions
-sudo python start_3276.py
-
-sudo wvdial -C wvdial.3276.conf || true
-
-sudo python stop_3276.py

cmake_targets/autotests/v2/actions/start_3276.py

@@ -1,59 +0,0 @@
-import time
-
-from modem import quit, Modem
-
-try:
-    modem = Modem("/dev/ttyUSB0")
-
-    #test that modem is there
-    print "INFO: check modem's presence"
-    modem.send('AT')
-    if modem.wait().ret != True:
-        print "ERROR: no modem?"
-        quit(1)
-
-    #first deactivate
-    print "INFO: deactivate the modem"
-    modem.send('AT+CFUN=0')
-    if modem.wait().ret != True:
-        print "ERROR: failed deactivating the modem"
-        quit(1)
-
-    #activate the modem
-    print "INFO: activate the modem"
-    modem.send('AT+CFUN=1')
-    if modem.wait().ret != True:
-        print "ERROR: failed asking modem for activation"
-        quit(1)
-
-    #wait for modem to be connected
-    #timeout after one minute
-    print "INFO: wait for modem to be connected (timeout: one minute)"
-    start_time = time.time()
-    while True:
-        modem.send('AT+CGATT?')
-        r = modem.wait()
-        if r.ret != True:
-            print "ERROR: failed checking attachment status of modem"
-            quit(1)
-        if "+CGATT: 1" in r.data:
-            break
-        if not "CGATT: 0" in r.data:
-            print "ERROR: bad data when checking attachment status of modem"
-            quit(1)
-        time.sleep(0.1)
-        if time.time() > start_time + 60:
-            print "ERROR: modem not connected after one minute, close modem"
-            modem.send('AT+CFUN=0')
-            r = modem.wait()
-            if r.ret != True:
-                print "ERROR: closing modem failed"
-            quit(1)
-
-    print "INFO: modem is connected"
-
-except BaseException, e:
-    print "ERROR: " + str(e)
-    quit(1)
-
-quit(0)

cmake_targets/autotests/v2/actions/start_bandrich.bash

@@ -16,8 +16,6 @@ stty isig intr ^C
 
 cd /tmp/oai_test_setup/oai
 source oaienv
-sudo rmmod nasmesh || true
-sudo rmmod ue_ip || true
 cd cmake_targets/autotests/v2/actions
 python start_bandrich.py
 

cmake_targets/autotests/v2/actions/stop_3276.py

@@ -1,29 +0,0 @@
-import time
-
-from modem import quit, Modem
-
-try:
-    modem = Modem("/dev/ttyUSB0")
-
-    #test that modem is there
-    print "INFO: check modem's presence"
-    modem.send('AT')
-    r = modem.wait()
-    if r.ret != True and "NO CARRIER" not in r.data:
-        print "ERROR: no modem?"
-        quit(1)
-    if "NO CARRIER" in r.data:
-        print "WARNING: 'NO CARRIER' detected, not sure if handled correctly"
-
-    #deactivate the modem
-    print "INFO: deactivate the modem"
-    modem.send('AT+CFUN=0')
-    if modem.wait().ret != True:
-        print "ERROR: failed asking modem for deactivation"
-        quit(1)
-
-except BaseException, e:
-    print "ERROR: " + str(e)
-    quit(1)
-
-quit(0)

cmake_targets/autotests/v2/actions/wvdial.3276.conf

@@ -1,27 +0,0 @@
-[Dialer Defaults]
-Modem = /dev/ttyUSB0
-ISDN = off
-Modem Type = Analog Modem
-Baud = 9600
-Init1 = ATZ
-Init2 = AT&F &D2 &C1
-Init3 = AT+CGDCONT=1,"IP","oai.ipv4"
-Phone = *99#
-Phone1 = 
-Phone2 = 
-Phone3 = 
-Phone4 = 
-Ask Password = off
-Password = ''
-Username = ImaginLab
-Auto Reconnect = off
-Abort on Busy = off
-Carrier Check = on
-Check Def Route = on
-Abort on No Dialtone = on
-Stupid Mode = on
-Idle Seconds = 0
-Auto DNS = on
-;Minimize = off
-;Dock = off
-;Do NOT edit this file by hand!

cmake_targets/autotests/v2/alu_test.py

@@ -9,24 +9,18 @@ class alu_test:
                  openair,
                  user, password,
                  log_subdir,
-                 env,
-                 enb_rru = "",
-                 enb_rcc = ""):
-        self.epc_machine      = epc
-        self.enb_machine      = enb
-        self.ue_machine       = ue
-        self.openair_dir      = openair
-        self.oai_user         = user
-        self.oai_password     = password
-        self.env              = env
-        self.enb_rru_machine  = enb_rru
-        self.enb_rcc_machine  = enb_rcc
+                 env):
+        self.epc_machine  = epc
+        self.enb_machine  = enb
+        self.ue_machine   = ue
+        self.openair_dir  = openair
+        self.oai_user     = user
+        self.oai_password = password
+        self.env          = env
 
-        self.task_hss     = None
-        self.task_enb     = None
-        self.task_ue      = None
-        self.task_rru_enb = None
-        self.task_rcc_enb = None
+        self.task_hss = None
+        self.task_enb = None
+        self.task_ue  = None
 
         self.logdir = openair + '/cmake_targets/autotests/log/' + log_subdir
         quickshell('mkdir -p ' + self.logdir)
@@ -46,10 +40,6 @@ class alu_test:
             self.task_enb.kill()
         if self.task_ue != None and self.task_ue.alive():
             self.task_ue.kill()
-        if self.task_rru_enb != None and self.task_rru_enb.alive():
-            self.task_rru_enb.kill()
-        if self.task_rcc_enb != None and self.task_rcc_enb.alive():
-            self.task_rcc_enb.kill()
 
     ##########################################################################
     # start_epc
@@ -111,8 +101,8 @@ class alu_test:
     ##########################################################################
     # compile_enb
     ##########################################################################
-    def compile_enb(self, build_arguments, log_suffix=""):
-        log("INFO: ALU test: compile softmodem on " + self.enb_machine)
+    def compile_enb(self, build_arguments):
+        log("INFO: ALU test: compile softmodem")
         envcomp = list(self.env)
         envcomp.append('BUILD_ARGUMENTS="' + build_arguments + '"')
         #we don't care about BUILD_OUTPUT but required (TODO: change that)
@@ -130,8 +120,7 @@ class alu_test:
                 self.oai_user,
                 self.oai_password,
                 envcomp,
-                self.logdir + "/compile_softmodem." + log_suffix + \
-                    self.enb_machine,
+                self.logdir + "/compile_softmodem." + self.enb_machine,
                 post_action=post_action)
         ret = task.wait()
         if ret != 0:
@@ -174,107 +163,49 @@ class alu_test:
             #os._exit(1)
 
     ##########################################################################
-    # start_enb_rru_rcc
+    # start_bandrich_ue
     ##########################################################################
-    def start_enb_rru_rcc(self, rru_config_file, rcc_config_file):
-        #copy wanted configuration files
-        quickshell("sshpass -p " + self.oai_password +
-                   " scp config/" + rru_config_file + " " +
-                   self.oai_user + "@" + self.enb_rru_machine+":/tmp/enb.conf")
-        quickshell("sshpass -p " + self.oai_password +
-                   " scp config/" + rcc_config_file + " " +
-                   self.oai_user + "@" + self.enb_rcc_machine+":/tmp/enb.conf")
-
-        #run RRU/RCC softmodem
-        log("INFO: ALU test: run RRU softmodem with configuration file " +
-            rru_config_file)
-        self.task_rru_enb = Task("actions/run_enb.bash",
-                "run_RRU_softmodem",
-                self.enb_rru_machine,
-                self.oai_user,
-                self.oai_password,
-                self.env,
-                self.logdir + "/run_softmodem." + self.enb_rru_machine,
-                event=self.event)
-        self.task_rru_enb.waitlog('[RRH] binding to')
-        log("INFO: ALU test: run RCC softmodem with configuration file " +
-            rcc_config_file)
-        self.task_rcc_enb = Task("actions/run_enb.bash",
-                "run_RCC_softmodem",
-                self.enb_rcc_machine,
-                self.oai_user,
-                self.oai_password,
-                self.env,
-                self.logdir + "/run_softmodem." + self.enb_rcc_machine,
-                event=self.event)
-        self.task_rcc_enb.waitlog('[BBU] local ip addr')
-        #wait for RRU and RCC to be connected
-        self.task_rru_enb.waitlog('devices ok (eNB_thread_asynch_rx)')
-
-    ##########################################################################
-    # stop_enb_rru_rcc
-    ##########################################################################
-    def stop_enb_rru_rcc(self):
-        log("INFO: ALU test: stop RRU/RCC softmodem")
-        self.task_rru_enb.sendnow("%c" % 3)
-        ret = self.task_rru_enb.wait()
-        if ret != 0:
-            log("ERROR: ALU test: RRU softmodem failed")
-            #not sure if we have to quit here or not
-            #os._exit(1)
-        self.task_rcc_enb.sendnow("%c" % 3)
-        ret = self.task_rcc_enb.wait()
-        if ret != 0:
-            log("ERROR: ALU test: RCC softmodem failed")
-            #not sure if we have to quit here or not
-            #os._exit(1)
-
-    ##########################################################################
-    # start_ue
-    ##########################################################################
-    def start_ue(self, ue):
-        log("INFO: ALU test: start " + ue + " UE")
-        self.task_ue = Task("actions/start_" + ue + ".bash",
-                "start_" + ue,
+    def start_bandrich_ue(self):
+        log("INFO: ALU test: start bandrich UE")
+        self.task_ue = Task("actions/start_bandrich.bash",
+                "start_bandrich",
                 self.ue_machine,
                 self.oai_user,
                 self.oai_password,
                 self.env,
-                self.logdir + "/start_" + ue + "." + self.ue_machine,
+                self.logdir + "/start_bandrich." + self.ue_machine,
                 event=self.event)
         self.task_ue.waitlog("local  IP address", event=self.event)
         self.event.wait()
 
         #at this point one task has died or we have the line in the log
         if self.task_ue.waitlog_state != WAITLOG_SUCCESS:
-            log("ERROR: ALU test: " + ue + " UE did not connect")
+            log("ERROR: ALU test: bandrich UE did not connect")
             raise TestFailed()
 
         self.event.clear()
 
-        if (    (self.task_enb != None and not self.task_enb.alive()) or
-                (self.task_rru_enb!=None and not self.task_rru_enb.alive()) or
-                (self.task_rcc_enb!=None and not self.task_rcc_enb.alive()) or
+        if (    not self.task_enb.alive() or
                 not self.task_hss.alive() or
                 not self.task_ue.alive()):
             log("ERROR: ALU test: eNB, HSS or UE task died")
             raise TestFailed()
 
-        #get UE IP
+        #get bandrich UE IP
         l = open(self.task_ue.logfile, "r").read()
-        self.ue_ip = re.search("local  IP address (.*)\n", l) \
-                       .groups()[0]
-        log("INFO: ALU test: " + ue + " UE IP address: " + self.ue_ip)
+        self.bandrich_ue_ip = re.search("local  IP address (.*)\n", l) \
+                                .groups()[0]
+        log("INFO: ALU test: bandrich UE IP address: " + self.bandrich_ue_ip)
 
     ##########################################################################
-    # stop_ue
+    # stop_bandrich_ue
     ##########################################################################
-    def stop_ue(self, ue):
-        log("INFO: ALU test: stop " + ue + " UE")
+    def stop_bandrich_ue(self):
+        log("INFO: ALU test: stop bandrich UE")
         self.task_ue.sendnow("%c" % 3)
         ret = self.task_ue.wait()
         if ret != 0:
-            log("ERROR: ALU test: task " + ue + " UE failed")
+            log("ERROR: ALU test: task bandrich UE failed")
             #not sure if we have to quit here or not
             #os._exit(1)
 
@@ -319,20 +250,14 @@ class alu_test:
         self.event.wait()
         log("DEBUG: event.wait() done")
 
-        if (    (self.task_enb != None and not self.task_enb.alive()) or
-                (self.task_rru_enb!=None and not self.task_rru_enb.alive()) or
-                (self.task_rcc_enb!=None and not self.task_rcc_enb.alive()) or
+        if (    not self.task_enb.alive() or
                 not self.task_hss.alive() or
                 not self.task_ue.alive()):
             log("ERROR: unexpected task exited, test failed, kill all")
             if task_traffic_client.alive():
                 task_traffic_client.kill()
-            if (self.task_enb != None and self.task_enb.alive()):
+            if self.task_enb.alive():
                 self.task_enb.kill()
-            if (self.task_rru_enb != None and self.task_rru_enb.alive()):
-                self.task_rru_enb.kill()
-            if (self.task_rcc_enb != None and self.task_rcc_enb.alive()):
-                self.task_rcc_enb.kill()
             if self.task_ue.alive():
                 self.task_ue.kill()
 
@@ -352,9 +277,7 @@ class alu_test:
 
         self.event.clear()
 
-        if (    (self.task_enb != None and not self.task_enb.alive()) or
-                (self.task_rru_enb!=None and not self.task_rru_enb.alive()) or
-                (self.task_rcc_enb!=None and not self.task_rcc_enb.alive()) or
+        if (    not self.task_enb.alive() or
                 not self.task_hss.alive() or
                 not self.task_ue.alive()):
             log("ERROR: ALU test: eNB, HSS or UE task died")
@@ -363,47 +286,47 @@ class alu_test:
     ##########################################################################
     # dl_tcp
     ##########################################################################
-    def dl_tcp(self, ue):
-        self._do_traffic(ue + " downlink TCP",
-                         "server_tcp", self.ue_machine, self.ue_ip,
+    def dl_tcp(self):
+        self._do_traffic("bandrich downlink TCP",
+                         "server_tcp", self.ue_machine, self.bandrich_ue_ip,
                          "client_tcp", self.epc_machine,
                          "Server listening on TCP port 5001",
-                         ue + "_downlink_tcp_server",
-                         ue + "_downlink_tcp_client")
+                         "bandrich_downlink_tcp_server",
+                         "bandrich_downlink_tcp_client")
 
     ##########################################################################
     # ul_tcp
     ##########################################################################
-    def ul_tcp(self, ue):
-        self._do_traffic(ue + " uplink TCP",
+    def ul_tcp(self):
+        self._do_traffic("bandrich uplink TCP",
                          "server_tcp", self.epc_machine, "192.172.0.1",
                          "client_tcp", self.ue_machine,
                          "Server listening on TCP port 5001",
-                         ue + "_uplink_tcp_server",
-                         ue + "_uplink_tcp_client")
+                         "bandrich_uplink_tcp_server",
+                         "bandrich_uplink_tcp_client")
 
     ##########################################################################
     # dl_udp
     ##########################################################################
-    def dl_udp(self, ue, bandwidth):
-        self._do_traffic(ue + " downlink UDP",
-                         "server_udp", self.ue_machine, self.ue_ip,
+    def dl_udp(self, bandwidth):
+        self._do_traffic("bandrich downlink UDP",
+                         "server_udp", self.ue_machine, self.bandrich_ue_ip,
                          "client_udp", self.epc_machine,
                          "Server listening on UDP port 5001",
-                         ue + "_downlink_udp_server",
-                         ue + "_downlink_udp_client",
+                         "bandrich_downlink_udp_server",
+                         "bandrich_downlink_udp_client",
                          udp_bandwidth=bandwidth)
 
     ##########################################################################
     # ul_udp
     ##########################################################################
-    def ul_udp(self, ue, bandwidth):
-        self._do_traffic(ue + " uplink UDP",
+    def ul_udp(self, bandwidth):
+        self._do_traffic("bandrich uplink UDP",
                          "server_udp", self.epc_machine, "192.172.0.1",
                          "client_udp", self.ue_machine,
                          "Server listening on UDP port 5001",
-                         ue + "_uplink_udp_server",
-                         ue + "_uplink_udp_client",
+                         "bandrich_uplink_udp_server",
+                         "bandrich_uplink_udp_client",
                          udp_bandwidth=bandwidth)
 
 ##############################################################################
@@ -411,72 +334,22 @@ class alu_test:
 ##############################################################################
 
 def run_b210_alu(tests, openair_dir, oai_user, oai_password, env):
+    if not do_tests(tests['b210']['alu']):
+        return
 
-    #compile eNB (two cases: one for FDD and one for TDD)
+    #compile eNB
 
-    if do_tests(tests['b210']['alu']['fdd']):
-        alu = alu_test(epc='amerique', enb='hutch', ue='stevens',
-                       openair=openair_dir,
-                       user=oai_user, password=oai_password,
-                       log_subdir='enb_tests/b210_alu/compile_enb_fdd',
-                       env=env)
-
-        try:
-            alu.compile_enb("--eNB -w USRP -x -c --disable-cpu-affinity")
-        except BaseException, e:
-            log("ERROR: ALU test failed: eNB compilation failed: " + str(e))
-            return
-
-    if do_tests(tests['b210']['alu']['tdd']):
-        alu = alu_test(epc='amerique', enb='calisson', ue='mozart',
-                       openair=openair_dir,
-                       user=oai_user, password=oai_password,
-                       log_subdir='enb_tests/b210_alu/compile_enb_tdd',
-                       env=env)
-
-        try:
-            alu.compile_enb("--eNB -w USRP -x -c --disable-cpu-affinity")
-        except BaseException, e:
-            log("ERROR: ALU test failed: eNB compilation failed: " + str(e))
-            return
-
-    #compile RRU/RCC eNB
-
-    if do_tests(tests['remote b210']['alu']['fdd']):
-        #RRU
-        alu = alu_test(epc='amerique', ue='stevens',
-                       openair=openair_dir,
-                       user=oai_user, password=oai_password,
-                       log_subdir='enb_tests/remote_b210_alu/compile_enb_rru',
-                       env=env,
-                       #hack: set 'enb' to reuse 'compile_enb'
-                       enb = 'superserver',
-                       enb_rru = 'superserver', enb_rcc = 'starsky')
-
-        try:
-            alu.compile_enb("--eNB -x -c -w USRP -t ETHERNET",
-                            log_suffix='rru.')
-        except BaseException, e:
-            log("ERROR: ALU test failed: RRU eNB compilation failed: "+str(e))
-            return
-
-        #RCC
-        alu = alu_test(epc='amerique', ue='stevens',
-                       openair=openair_dir,
-                       user=oai_user, password=oai_password,
-                       log_subdir='enb_tests/remote_b210_alu/compile_enb_rcc',
-                       env=env,
-                       #hack: set 'enb' to reuse 'compile_enb'
-                       enb = 'starsky',
-                       enb_rru = 'superserver', enb_rcc = 'starsky')
-
-        try:
-            alu.compile_enb("--eNB -w None -t ETHERNET",
-                            log_suffix='rcc.')
-        except BaseException, e:
-            log("ERROR: ALU test failed: RCC eNB compilation failed: "+str(e))
-            return
+    alu = alu_test(epc='amerique', enb='hutch', ue='stevens',
+                   openair=openair_dir,
+                   user=oai_user, password=oai_password,
+                   log_subdir='enb_tests/b210_alu/compile_enb',
+                   env=env)
 
+    try:
+        alu.compile_enb("--eNB -w USRP -x -c --disable-cpu-affinity")
+    except BaseException, e:
+        log("ERROR: ALU test failed: eNB compilation failed: " + str(e))
+        return
 
     #run tests
 
@@ -488,64 +361,29 @@ def run_b210_alu(tests, openair_dir, oai_user, oai_password, env):
                          "10" : "15M",
                          "20" : "15M" }
 
-    ue_machine = { "fdd" : "stevens",
-                   "tdd" : "mozart" }
-
-    enb_machine = { "fdd" : "hutch",
-                    "tdd" : "calisson" }
-
-    band = { "fdd" : "7",
-             "tdd" : "38" }
-
-    for mode in ('fdd', 'tdd'):
-        for bw in ('5', '10', '20'):
-            if do_tests(tests['b210']['alu'][mode][bw]):
-                log("INFO: ALU test: run tests for bandwidth " + bw + " MHz")
-                ctest = tests['b210']['alu'][mode][bw]
-                alu = alu_test(epc='amerique', enb=enb_machine[mode], ue=ue_machine[mode],
-                               openair=openair_dir,
-                               user=oai_user, password=oai_password,
-                               log_subdir='enb_tests/b210_alu/' + mode + "/" + bw,
-                               env=env)
-                try:
-                    alu.start_epc()
-                    alu.start_enb("enb.band" + band[mode] + ".tm1.usrpb210." + mode + "." + bw + "MHz.conf")
-                    for ue in ('bandrich', '3276'):
-                        if ue in ctest and do_tests(ctest[ue]):
-                            alu.start_ue(ue)
-                            if do_tests(ctest[ue]['tcp']['dl']): alu.dl_tcp(ue)
-                            if do_tests(ctest[ue]['tcp']['ul']): alu.ul_tcp(ue)
-                            if do_tests(ctest[ue]['udp']['dl']): alu.dl_udp(ue, udp_dl_bandwidth[bw])
-                            if do_tests(ctest[ue]['udp']['ul']): alu.ul_udp(ue, udp_ul_bandwidth[bw])
-                            alu.stop_ue(ue)
-                    alu.stop_enb()
-                    alu.stop_epc()
-                except BaseException, e:
-                    log("ERROR: ALU test failed: " + str(e))
-                    alu.finish()
-            if do_tests(tests['remote b210']['alu'][mode][bw]):
-                log("INFO: ALU test: run RRU/RCC tests for bandwidth " + bw + " MHz")
-                ctest = tests['remote b210']['alu'][mode][bw]
-                alu = alu_test(epc='amerique', enb='', ue=ue_machine[mode],
-                               openair=openair_dir,
-                               user=oai_user, password=oai_password,
-                               log_subdir='enb_tests/remote_b210_alu/' + bw,
-                               env=env,
-                               enb_rru='superserver', enb_rcc='starsky')
-                try:
-                    alu.start_epc()
-                    alu.start_enb_rru_rcc("rru.band7.tm1.if4p5." + bw + "MHz.udp.usrpb210.conf",
-                                          "rcc.band7.tm1.if4p5." + bw + "MHz.conf")
-                    for ue in ('bandrich', '3276'):
-                        if ue in ctest and do_tests(ctest[ue]):
-                            alu.start_ue(ue)
-                            if do_tests(ctest[ue]['tcp']['dl']): alu.dl_tcp(ue)
-                            if do_tests(ctest[ue]['tcp']['ul']): alu.ul_tcp(ue)
-                            if do_tests(ctest[ue]['udp']['dl']): alu.dl_udp(ue, udp_dl_bandwidth[bw])
-                            if do_tests(ctest[ue]['udp']['ul']): alu.ul_udp(ue, udp_ul_bandwidth[bw])
-                            alu.stop_ue(ue)
-                    alu.stop_enb_rru_rcc()
-                    alu.stop_epc()
-                except BaseException, e:
-                    log("ERROR: ALU test failed: " + str(e))
-                    alu.finish()
+    for bw in ('5', '10', '20'):
+        if do_tests(tests['b210']['alu'][bw]):
+            log("INFO: ALU test: run tests for bandwidth " + bw + " MHz")
+            ctest = tests['b210']['alu'][bw]
+            alu = alu_test(epc='amerique', enb='hutch', ue='stevens',
+                           openair=openair_dir,
+                           user=oai_user, password=oai_password,
+                           log_subdir='enb_tests/b210_alu/' + bw,
+                           env=env)
+            try:
+                alu.start_epc()
+                alu.start_enb("enb.band7.tm1.usrpb210." + bw + "MHz.conf")
+                if do_tests(ctest['bandrich']):
+                    alu.start_bandrich_ue()
+                    if do_tests(ctest['bandrich']['tcp']['dl']): alu.dl_tcp()
+                    if do_tests(ctest['bandrich']['tcp']['ul']): alu.ul_tcp()
+                    if do_tests(ctest['bandrich']['udp']['dl']):
+                        alu.dl_udp(udp_dl_bandwidth[bw])
+                    if do_tests(ctest['bandrich']['udp']['ul']):
+                        alu.ul_udp(udp_ul_bandwidth[bw])
+                    alu.stop_bandrich_ue()
+                alu.stop_enb()
+                alu.stop_epc()
+            except BaseException, e:
+                log("ERROR: ALU test failed: " + str(e))
+                alu.finish()

cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.10MHz.conf

@@ -47,7 +47,7 @@ eNBs =
         prach_zero_correlation  			      = 1;
         prach_freq_offset       			      = 2;
         pucch_delta_shift       			      = 1;
-        pucch_nRB_CQI           			      = 0;
+        pucch_nRB_CQI           			      = 1;
         pucch_nCS_AN            			      = 0;
         pucch_n1_AN             			      = 32;
         pdsch_referenceSignalPower 			      = -24;

cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.20MHz.conf

@@ -47,7 +47,7 @@ eNBs =
         prach_zero_correlation  			      = 1;
         prach_freq_offset       			      = 2;
         pucch_delta_shift       			      = 1;
-        pucch_nRB_CQI           			      = 0;
+        pucch_nRB_CQI           			      = 1;
         pucch_nCS_AN            			      = 0;
         pucch_n1_AN             			      = 32;
         pdsch_referenceSignalPower 			      = -24;

cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.5MHz.conf

@@ -47,7 +47,7 @@ eNBs =
         prach_zero_correlation  			      = 1;
         prach_freq_offset       			      = 2;
         pucch_delta_shift       			      = 1;
-        pucch_nRB_CQI           			      = 0;
+        pucch_nRB_CQI           			      = 1;
         pucch_nCS_AN            			      = 0;
         pucch_n1_AN             			      = 32;
         pdsch_referenceSignalPower 			      = -24;

cmake_targets/autotests/v2/main.py

@@ -233,7 +233,7 @@ class ExecutionThread(threading.Thread):
         for arg in args.splitlines():
             i = i+1
             runenv2 = list(runenv)
-            runenv2.append('OPENAIR_TARGETS=/tmp/oai_test_setup/oai/targets')
+            runenv2.append('OPENAIR_TARGET=/tmp/oai_test_setup/oai/targets')
             runenv2.append('EXEC="'
                              + test.findtext('main_exec')
                              + '"')
@@ -280,45 +280,65 @@ machine_list.wait_all_free()
 # run eNB softmodem tests                                                    #
 ##############################################################################
 
-tests = {}
-for a in { 'b210', 'remote b210', 'x310', 'exmimo2' }:
-  tests[a] = {}
-  for b in { 'alu', 'openair-cn' }:
-    tests[a][b] = {}
-    for c in { 'fdd', 'tdd' }:
-      tests[a][b][c] = {}
-      for d in { '5', '10', '20' }:
-        tests[a][b][c][d] = {}
-        for e in { 'bandrich', 'sony', '3276' }:
-          tests[a][b][c][d][e] = {}
-          for f in { 'tcp', 'udp' }:
-            tests[a][b][c][d][e][f] = {}
-            for g in { 'dl', 'ul' }:
-              tests[a][b][c][d][e][f][g] = False
+tests = {
+  'b210' : {
+    'alu' : {
+      '5' : {
+        'bandrich' : {
+          'tcp' : { 'ul': False, 'dl' : False },
+          'udp' : { 'ul': False, 'dl' : False }},
+        'sony' : {
+          'tcp' : { 'ul': False, 'dl' : False },
+          'udp' : { 'ul': False, 'dl' : False }}},
+      '10' : {
+        'bandrich' : {
+          'tcp' : { 'ul': False, 'dl' : False },
+          'udp' : { 'ul': False, 'dl' : False }},
+        'sony' : {
+          'tcp' : { 'ul': False, 'dl' : False },
+          'udp' : { 'ul': False, 'dl' : False }}},
+      '20' : {
+        'bandrich' : {
+          'tcp' : { 'ul': False, 'dl' : False },
+          'udp' : { 'ul': False, 'dl' : False }},
+        'sony' : {
+          'tcp' : { 'ul': False, 'dl' : False },
+          'udp' : { 'ul': False, 'dl' : False }}}},
+    'openair-cn' : {}
+  },
+  'x310' : {
+    'alu' : {},
+    'openair-cn' : {}
+  },
+  'exmimo2' : {
+    'alu' : {},
+    'openair-cn' : {}
+  }
+}
 
 todo_tests_ids = []
 for test in todo_tests:
     todo_tests_ids.append(test.get('id'))
 
 for test in todo_tests_ids:
-  if test=='015500':tests['b210']['alu']['fdd'][ '5']['bandrich']['udp']['ul']=True
-  if test=='015501':tests['b210']['alu']['fdd']['10']['bandrich']['udp']['ul']=True
-  if test=='015502':tests['b210']['alu']['fdd']['20']['bandrich']['udp']['ul']=True
-  if test=='015503':tests['b210']['alu']['fdd'][ '5']['bandrich']['udp']['dl']=True
-  if test=='015504':tests['b210']['alu']['fdd']['10']['bandrich']['udp']['dl']=True
-  if test=='015505':tests['b210']['alu']['fdd']['20']['bandrich']['udp']['dl']=True
+  if test=='015500':tests['b210']['alu'][ '5']['bandrich']['udp']['ul']=True
+  if test=='015501':tests['b210']['alu']['10']['bandrich']['udp']['ul']=True
+  if test=='015502':tests['b210']['alu']['20']['bandrich']['udp']['ul']=True
+  if test=='015503':tests['b210']['alu'][ '5']['bandrich']['udp']['dl']=True
+  if test=='015504':tests['b210']['alu']['10']['bandrich']['udp']['dl']=True
+  if test=='015505':tests['b210']['alu']['20']['bandrich']['udp']['dl']=True
   if test=='015506':log('WARNING: skip test ' + test) #TODO
   if test=='015507':log('WARNING: skip test ' + test) #TODO
   if test=='015508':log('WARNING: skip test ' + test) #TODO
   if test=='015509':log('WARNING: skip test ' + test) #TODO
   if test=='015510':log('WARNING: skip test ' + test) #TODO
   if test=='015511':log('WARNING: skip test ' + test) #TODO
-  if test=='015512':tests['b210']['alu']['fdd'][ '5']['bandrich']['tcp']['ul']=True
-  if test=='015513':tests['b210']['alu']['fdd']['10']['bandrich']['tcp']['ul']=True
-  if test=='015514':tests['b210']['alu']['fdd']['20']['bandrich']['tcp']['ul']=True
-  if test=='015515':tests['b210']['alu']['fdd'][ '5']['bandrich']['tcp']['dl']=True
-  if test=='015516':tests['b210']['alu']['fdd']['10']['bandrich']['tcp']['dl']=True
-  if test=='015517':tests['b210']['alu']['fdd']['20']['bandrich']['tcp']['dl']=True
+  if test=='015512':tests['b210']['alu'][ '5']['bandrich']['tcp']['ul']=True
+  if test=='015513':tests['b210']['alu']['10']['bandrich']['tcp']['ul']=True
+  if test=='015514':tests['b210']['alu']['20']['bandrich']['tcp']['ul']=True
+  if test=='015515':tests['b210']['alu'][ '5']['bandrich']['tcp']['dl']=True
+  if test=='015516':tests['b210']['alu']['10']['bandrich']['tcp']['dl']=True
+  if test=='015517':tests['b210']['alu']['20']['bandrich']['tcp']['dl']=True
   if test=='015518':log('WARNING: skip test ' + test) #TODO
   if test=='015519':log('WARNING: skip test ' + test) #TODO
   if test=='015520':log('WARNING: skip test ' + test) #TODO
@@ -407,19 +427,6 @@ for test in todo_tests_ids:
   if test=='017504':log('WARNING: skip test ' + test) #TODO
   if test=='017505':log('WARNING: skip test ' + test) #TODO
 
-  if test=='017600':tests['remote b210']['alu']['fdd'][ '5']['bandrich']['udp']['ul']=True
-  if test=='017601':tests['remote b210']['alu']['fdd']['10']['bandrich']['udp']['ul']=True
-  if test=='017602':tests['remote b210']['alu']['fdd']['20']['bandrich']['udp']['ul']=True
-  if test=='017603':tests['remote b210']['alu']['fdd'][ '5']['bandrich']['udp']['dl']=True
-  if test=='017604':tests['remote b210']['alu']['fdd']['10']['bandrich']['udp']['dl']=True
-  if test=='017605':tests['remote b210']['alu']['fdd']['20']['bandrich']['udp']['dl']=True
-  if test=='017606':tests['remote b210']['alu']['fdd'][ '5']['bandrich']['tcp']['ul']=True
-  if test=='017607':tests['remote b210']['alu']['fdd']['10']['bandrich']['tcp']['ul']=True
-  if test=='017608':tests['remote b210']['alu']['fdd']['20']['bandrich']['tcp']['ul']=True
-  if test=='017609':tests['remote b210']['alu']['fdd'][ '5']['bandrich']['tcp']['dl']=True
-  if test=='017610':tests['remote b210']['alu']['fdd']['10']['bandrich']['tcp']['dl']=True
-  if test=='017611':tests['remote b210']['alu']['fdd']['20']['bandrich']['tcp']['dl']=True
-
   if test=='018000':log('WARNING: skip test ' + test) #TODO
   if test=='018001':log('WARNING: skip test ' + test) #TODO
   if test=='018002':log('WARNING: skip test ' + test) #TODO
@@ -434,31 +441,6 @@ for test in todo_tests_ids:
   if test=='018504':log('WARNING: skip test ' + test) #TODO
   if test=='018505':log('WARNING: skip test ' + test) #TODO
 
-  if test=='018600':tests['b210']['alu']['tdd'][ '5']['3276']['udp']['ul']=True
-  if test=='018601':tests['b210']['alu']['tdd']['10']['3276']['udp']['ul']=True
-  if test=='018602':tests['b210']['alu']['tdd']['20']['3276']['udp']['ul']=True
-  if test=='018603':tests['b210']['alu']['tdd'][ '5']['3276']['udp']['dl']=True
-  if test=='018604':tests['b210']['alu']['tdd']['10']['3276']['udp']['dl']=True
-  if test=='018605':tests['b210']['alu']['tdd']['20']['3276']['udp']['dl']=True
-  if test=='018606':log('WARNING: skip test ' + test) #TODO
-  if test=='018607':log('WARNING: skip test ' + test) #TODO
-  if test=='018608':log('WARNING: skip test ' + test) #TODO
-  if test=='018609':log('WARNING: skip test ' + test) #TODO
-  if test=='018610':log('WARNING: skip test ' + test) #TODO
-  if test=='018611':log('WARNING: skip test ' + test) #TODO
-  if test=='018612':tests['b210']['alu']['tdd'][ '5']['3276']['tcp']['ul']=True
-  if test=='018613':tests['b210']['alu']['tdd']['10']['3276']['tcp']['ul']=True
-  if test=='018614':tests['b210']['alu']['tdd']['20']['3276']['tcp']['ul']=True
-  if test=='018615':tests['b210']['alu']['tdd'][ '5']['3276']['tcp']['dl']=True
-  if test=='018616':tests['b210']['alu']['tdd']['10']['3276']['tcp']['dl']=True
-  if test=='018617':tests['b210']['alu']['tdd']['20']['3276']['tcp']['dl']=True
-  if test=='018618':log('WARNING: skip test ' + test) #TODO
-  if test=='018619':log('WARNING: skip test ' + test) #TODO
-  if test=='018620':log('WARNING: skip test ' + test) #TODO
-  if test=='018621':log('WARNING: skip test ' + test) #TODO
-  if test=='018622':log('WARNING: skip test ' + test) #TODO
-  if test=='018623':log('WARNING: skip test ' + test) #TODO
-
   if test=='025500':log('WARNING: skip test ' + test) #TODO
   if test=='025501':log('WARNING: skip test ' + test) #TODO
   if test=='025502':log('WARNING: skip test ' + test) #TODO

cmake_targets/build_oai

@@ -4,7 +4,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *
@@ -33,13 +33,6 @@ ORIGIN_PATH=$PWD
 THIS_SCRIPT_PATH=$(dirname $(readlink -f $0))
 source $THIS_SCRIPT_PATH/tools/build_helper
 
-# set environment variables (OPENAIR_HOME, ...)
-set_openair_env
-
-#variables for UE data generation
-gen_nvram_path=$OPENAIR_DIR/targets/bin
-conf_nvram_path=$OPENAIR_DIR/openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf
-
 MSC_GEN="False"
 XFORMS="True"
 FLEXRAN_AGENT_SB_IF="True"
@@ -48,7 +41,7 @@ VCD_TIMING="False"
 DEADLINE_SCHEDULER_FLAG_USER="False"
 FORCE_DEADLINE_SCHEDULER_FLAG_USER=""
 CPU_AFFINITY_FLAG_USER="False" #Only valid when lowlatecy flag is set to False
-REL="Rel14"
+REL="Rel10"
 HW="None"
 TP="None"
 NOS1=0
@@ -61,27 +54,20 @@ BUILD_DOXYGEN=0
 T_TRACER="False"
 DISABLE_HARDWARE_DEPENDENCY="False"
 CMAKE_BUILD_TYPE=""
-CMAKE_CMD="$CMAKE"
 UE_AUTOTEST_TRACE="False"
-UE_DEBUG_TRACE="False"
-UE_TIMING_TRACE="False"
-DISABLE_LOG_X="False"
-USRP_REC_PLAY="False"
-BUILD_ECLIPSE=0
-UE_EXPANSION_SIM2="False"
 trap handle_ctrl_c INT
 
 function print_help() {
-  echo_info "
+  echo_info '
 This program installs OpenAirInterface Software
 You should have ubuntu 14.xx, updated, and the Linux kernel >= 3.14
 Options
 -h
    This help
 -c | --clean
-   Erase all files to make a rebuild from start
+   Erase all files to make a rebuild from start"
 -C | --clean-all
-   Erase all files made by previous compilations, installations
+   Erase all files made by previous compilations, installations"
 --clean-kernel
    Erase previously installed features in kernel: iptables, drivers, ...
 -I | --install-external-packages
@@ -96,27 +82,22 @@ Options
 --eNB
    Makes the LTE softmodem
 --UE
-   Makes the UE specific parts (ue_ip, usim, nvram) from the given configuration file
---UE-conf-nvram [configuration file]
-   Specify conf_nvram_path (default \"$conf_nvram_path\")
---UE-gen-nvram [output path]
-   Specify gen_nvram_path (default \"$gen_nvram_path\")
+   Makes the UE specific parts (ue_ip, usim, nvram) 
 --RRH
    Makes the RRH
 -a | --agent
    Enables agent for software-defined control of the eNB
 -r | --3gpp-release
-   default is Rel14,
+   default is Rel10,
    Rel8 limits the implementation to 3GPP Release 8 version
-   Rel10 limits the implementation to 3GPP Release 10 version
 -w | --hardware
-   EXMIMO, USRP, BLADERF, ETHERNET, LMSSDR, None (Default)
+   EXMIMO, USRP, BLADERF, ETHERNET, LMSSDR, IRIS, None (Default)
    Adds this RF board support (in external packages installation and in compilation)
 -t | --transport protocol
    ETHERNET , None
    Adds this trasport protocol support in compilation
 --oaisim
-   Makes the oaisim simulator. Hardware will be defaulted to \"None\".
+   Makes the oaisim simulator. Hardware will be defaulted to "None".
 --phy_simulators
    Makes the unitary tests Layer 1 simulators
 --core_simulators
@@ -152,18 +133,6 @@ Options
    Disable HW dependency during installation
 --ue-autotest-trace
     Enable specific traces for UE autotest framework
---ue-trace
-    Enable traces for UE debugging
---ue-timing
-    Enable traces for timing
---disable-log
-   Disable all LOG_* macros
---build-eclipse
-   Build eclipse project files. Paths are auto corrected by fixprj.sh
---usrp-recplay
-   Build for I/Q record-playback modes
---ues-sim
-   Enable UE Expansion SIM2
 Usage (first build):
  oaisim (eNB + UE): ./build_oai -I  --oaisim -x --install-system-files
  Eurecom EXMIMO + COTS UE : ./build_oai -I  --eNB -x --install-system-files
@@ -171,12 +140,11 @@ Usage (first build):
 Usage (Regular):
  oaisim : ./build_oai --oaisim -x 
  Eurecom EXMIMO + OAI ENB : ./build_oai --eNB -x 
- NI/ETTUS B201  + OAI ENB : ./build_oai --eNB -x -w USRP"
+ NI/ETTUS B201  + OAI ENB : ./build_oai --eNB -x -w USRP'
 }
 
 
 function main() {
-
   until [ -z "$1" ]
   do
     case "$1" in
@@ -202,7 +170,6 @@ function main() {
             GDB=1
             CMAKE_BUILD_TYPE="Debug"
             echo_info "Will Compile with gdb symbols and disable compiler optimization"
-            CMAKE_CMD="$CMAKE_CMD -DCMAKE_BUILD_TYPE=Debug"
             shift;;
        --eNB)
             eNB=1
@@ -216,12 +183,6 @@ function main() {
             UE=1
             echo_info "Will compile UE"
             shift;;
-       --UE-conf-nvram)
-            conf_nvram_path=$(readlink -f "$1")
-            shift 2;;
-        --UE-gen-nvram)
-            gen_nvram_path=$(readlink -f $2)
-            shift 2;;
        --RRH)
             RRH=1
             echo_info "Will compile RRH"
@@ -233,7 +194,7 @@ function main() {
        -w | --hardware)
             HW="$2" #"${i#*=}"
             # Use OAI_USRP  as the key word USRP is used inside UHD driver           
-	    if [ "$HW" != "BLADERF" -a  "$HW" != "USRP" -a "$HW" != "LMSSDR" -a  "$HW" != "None" -a  "$HW" != "EXMIMO"  ] ; then 
+	    if [ "$HW" != "BLADERF" -a  "$HW" != "USRP" -a "$HW" != "LMSSDR" -a  "$HW" != "None" -a  "$HW" != "EXMIMO" -a "$HW" != "IRIS" ] ; then 
 		echo_fatal "Unknown HW type $HW will exit..."		
 	    else
 		if [ "$HW" == "USRP" ] ; then 
@@ -245,6 +206,9 @@ function main() {
 		if [ "$HW" == "LMSSDR" ] ; then 
 		    HW="OAI_LMSSDR"
 		fi 
+		if [ "$HW" == "IRIS" ] ; then 
+		    HW="OAI_IRIS"
+		fi 
 		echo_info "Setting hardware to: $HW"
 	    fi
             shift 2;;
@@ -331,39 +295,6 @@ function main() {
             UE_AUTOTEST_TRACE="True"
             echo_info "Enabling autotest specific trace for UE"
             shift 1;;
-        --ue-trace)
-            UE_DEBUG_TRACE="True"
-            echo_info "Enabling UE trace for debug"
-            shift 1;;
-        --ue-timing)
-            UE_TIMING_TRACE="True"
-            echo_info "Enabling UE timing trace"
-            shift 1;;
-        --ues-sim)
-            UE_EXPANSION_SIM2="True"
-            echo_info "Enabling UE Expansion SIM2"
-            shift 1;;
-        --disable-log)
-            DISABLE_LOG_X="True"
-            echo_info "Disabling all LOG_* traces"
-            shift 1;;
-        --uhd-images-dir)
-            UHD_IMAGES_DIR=$2
-            echo_info "Downloading UHD images in the indicated location"
-            shift 2;;
-       --build-eclipse)
-            BUILD_ECLIPSE=1
-            CMAKE_CMD="$CMAKE_CMD"' -DCMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT=TRUE -G"Eclipse CDT4 - Unix Makefiles"'
-            echo_info "Enabling build eclipse project support"
-            shift 1;;
-       --build-telnetsrv)
-            BUILD_TELNETSRV=1
-            echo_info "Build embedded telnet server"
-            shift ;;			
-        --usrp-recplay)
-            USRP_REC_PLAY="True"
-            echo_info "Enabling USRP record playback mode"
-            shift 1;;
         -h | --help)
             print_help
             exit 1;;
@@ -374,9 +305,6 @@ function main() {
    esac
   done
   
-  CMAKE_CMD="$CMAKE_CMD .."
-  echo_info "CMAKE_CMD=$CMAKE_CMD"
-  
   #########################################################
   # check validity of HW and TP parameters for RRH and eNB
   #########################################################
@@ -419,6 +347,8 @@ function main() {
         DEADLINE_SCHEDULER_FLAG_USER="False"
      elif [ "$HW" = "OAI_LMSSDR" ] ; then 
         DEADLINE_SCHEDULER_FLAG_USER="False"
+     elif [ "$HW" = "OAI_IRIS" ] ; then 
+        DEADLINE_SCHEDULER_FLAG_USER="False"
      elif [ "$HW" = "None" ] ; then 
         DEADLINE_SCHEDULER_FLAG_USER="False"
      else 
@@ -437,16 +367,13 @@ function main() {
   echo_info "Flags for Deadline scheduler: $DEADLINE_SCHEDULER_FLAG_USER"
   echo_info "Flags for CPU Affinity: $CPU_AFFINITY_FLAG_USER"
 
-  if [ -n "$UHD_IMAGES_DIR" ] && [ -z "$INSTALL_EXTERNAL" ]; then
-    echo_error "UHD images download settings will not be applied without -I present"
-    exit
-  fi
   ############################################
   # setting and printing OAI envs, we should check here
   ############################################
 
   echo_info "2. Setting the OAI PATHS ..."
 
+  set_openair_env
   cecho "OPENAIR_DIR    = $OPENAIR_DIR" $green
 
   # for conf files copy in this bash script
@@ -477,7 +404,7 @@ function main() {
       echo_info "installing packages for USRP support"
       check_install_usrp_uhd_driver
       if [ ! "$DISABLE_HARDWARE_DEPENDENCY" == "True" ]; then
-        install_usrp_uhd_driver $UHD_IMAGES_DIR
+        install_usrp_uhd_driver
       fi
     fi 
     if [ "$HW" == "OAI_BLADERF" ] ; then
@@ -487,10 +414,12 @@ function main() {
         flash_firmware_bladerf
       fi
     fi
-    if [ "$FLEXRAN_AGENT" == "1" ] ; then
-      echo_info "installing protobuf/protobuf-c for flexran agent support"
-      install_protobuf_from_source
-      install_protobuf_c_from_source
+    if [ "$HW" == "OAI_IRIS" ] ; then
+      echo_info "installing packages for IRIS support"
+      check_install_soapy
+      #if [ ! "$DISABLE_HARDWARE_DEPENDENCY" == "True" ]; then
+      #  flash_firmware_iris
+      #fi
     fi
   fi
 
@@ -501,9 +430,9 @@ function main() {
 
   if [ "$oaisim" = "1" ] ; then
       #to be discussed
-      # there is no RF device  transport protocol 
+      # there is no RF device and no transport protocol 
       HW="None" 
-      TP="ETHERNET"
+      TP="None"
       
       if [ "$XFORMS" == "True" ] ; then 
 	  PRINT_STATS="True"
@@ -522,9 +451,6 @@ function main() {
       lte_exec=lte-softmodem
   fi
 
-# configuration module libraries, one currently available, using libconfig 
-  config_libconfig_shlib=params_libconfig
-  
   # first generate the CMakefile in the right directory
   if [ "$eNB" = "1" -o "$UE" = "1" -o "$HW" = "EXMIMO" ] ; then
 
@@ -551,19 +477,9 @@ function main() {
     echo "set (CPU_AFFINITY \"${CPU_AFFINITY_FLAG_USER}\" )"      >>$cmake_file
     echo "set ( T_TRACER $T_TRACER )"              >>  $cmake_file
     echo "set (UE_AUTOTEST_TRACE $UE_AUTOTEST_TRACE)"        >>  $cmake_file
-    echo "set (UE_DEBUG_TRACE $UE_DEBUG_TRACE)"        >>  $cmake_file
-    echo "set (UE_TIMING_TRACE $UE_TIMING_TRACE)"        >>  $cmake_file
-    echo "set (DISABLE_LOG_X $DISABLE_LOG_X)"        >>  $cmake_file
-    echo "set (USRP_REC_PLAY $USRP_REC_PLAY)"        >>  $cmake_file
-    echo "set (UE_EXPANSION_SIM2 $UE_EXPANSION_SIM2)"    >> $cmake_file
-    if [ "$UE" = 1 -a "$NOS1" = "0" ] ; then
-     echo_info "Compiling UE S1 build : enabling Linux and NETLINK"
-     echo "set (LINUX True )"              >>  $cmake_file
-     echo "set (PDCP_USE_NETLINK True )"   >>  $cmake_file
-    fi
     echo 'include(${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists.txt)' >> $cmake_file
     cd  $DIR/$lte_build_dir/build
-    eval $CMAKE_CMD
+    cmake ..
   fi
 
   if [ "$eNB" = "1" -o "$UE" = "1" ] ; then
@@ -572,11 +488,6 @@ function main() {
 	  $lte_build_dir $lte_exec \
 	  $lte_exec $dbin/$lte_exec.$REL
 
-# mandatory shared lib
-    compilations \
-	  $lte_build_dir $config_libconfig_shlib \
-	  lib$config_libconfig_shlib.so $dbin/lib$config_libconfig_shlib.so
-	  
     if [ "$NOS1" = "1" ] ; then
 	compilations \
 	    $lte_build_dir nasmesh \
@@ -597,7 +508,7 @@ function main() {
 
 #    mkdir -p $DIR/at_commands/build
 #    cd $DIR/at_commands/build
-#    eval $CMAKE_CMD
+#    cmake ..
 #    compilations \
 #      at_commands at_nas_ue \
 #      at_nas_ue $dbin/at_nas_ue
@@ -606,24 +517,22 @@ function main() {
     mkdir -p $DIR/nas_sim_tools/build
     cd $DIR/nas_sim_tools/build
     
-    eval $CMAKE_CMD
+    cmake ..
     compilations \
       nas_sim_tools usim \
       usim $dbin/usim
     compilations \
       nas_sim_tools nvram \
       nvram $dbin/nvram
-    compilations \
-        nas_sim_tools conf2uedata \
-        conf2uedata $dbin/conf2uedata
 
     # generate USIM data
-    if [ -f $dbin/conf2uedata ]; then
-      install_nas_tools $conf_nvram_path $gen_nvram_path
+    if [ -f $dbin/nvram ]; then
+      install_nas_tools $dbin $dconf
       echo_info "Copying UE specific part to $DIR/$lte_build_dir/build"
-      cp -Rvf $dbin/.ue_emm.nvram0 $DIR/$lte_build_dir/build
-      cp -Rvf $dbin/.ue.nvram0 $DIR/$lte_build_dir/build
-      cp -Rvf $dbin/.usim.nvram0 $DIR/$lte_build_dir/build
+      cp -Rvf $dbin/.ue_emm.nvram $DIR/$lte_build_dir/build
+      cp -Rvf $dbin/.ue.nvram $DIR/$lte_build_dir/build
+      cp -Rvf $dbin/.usim.nvram $DIR/$lte_build_dir/build
+
     else
       echo_warning "not generated UE NAS files: binaries not found"
     fi
@@ -635,13 +544,13 @@ function main() {
     mkdir -p build
     cd build
     rm -f *sim
-    eval $CMAKE_CMD
+    cmake ..
   fi
 
   if [ "$SIMUS_PHY" = "1" ] ; then
     # lte unitary simulators compilation
     echo_info "Compiling unitary tests simulators"
-    simlist="dlsim_tm4 dlsim ulsim pucchsim prachsim pdcchsim pbchsim mbmssim"
+    simlist="dlsim ulsim pucchsim prachsim pdcchsim pbchsim mbmssim"
     for f in $simlist ; do
       compilations \
       lte-simulators $f \
@@ -709,12 +618,11 @@ function main() {
     echo "set ( RRC_ASN1_VERSION \"${REL}\")" >>  $cmake_file
     echo "set ( ENABLE_VCD_FIFO $VCD_TIMING )" >>  $cmake_file
     echo "set ( T_TRACER $T_TRACER )"          >>  $cmake_file
-    echo "set (UE_EXPANSION_SIM2 $UE_EXPANSION_SIM2)"    >> $cmake_file
     echo 'include(${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists.txt)' >> $cmake_file
     [ "$CLEAN" = "1" ] && rm -rf $DIR/$oaisim_build_dir/build
     mkdir -p $DIR/$oaisim_build_dir/build
     cd $DIR/$oaisim_build_dir/build
-    eval $CMAKE_CMD
+    cmake ..
     compilations \
 	  $oaisim_build_dir $oaisim_exec \
 	  $oaisim_exec $dbin/$oaisim_exec.$REL
@@ -725,7 +633,7 @@ function main() {
     	echo_info "Compiling at_nas_ue"
 	mkdir -p $DIR/at_commands/build
 	cd $DIR/at_commands/build
-	eval $CMAKE_CMD
+	cmake ..
 	compilations \
 	    at_commands at_nas_ue \
 	    at_nas_ue $dbin/at_nas_ue
@@ -739,20 +647,17 @@ function main() {
 	[ "$CLEAN" = "1" ] && rm -rf $DIR/nas_sim_tools/build
 	mkdir -p $DIR/nas_sim_tools/build
 	cd $DIR/nas_sim_tools/build
-	eval $CMAKE_CMD
+	cmake ..
 	compilations \
 	    nas_sim_tools usim \
 	    usim $dbin/usim
 	compilations \
 	    nas_sim_tools nvram \
 	    nvram $dbin/nvram
-	compilations \
-        nas_sim_tools conf2uedata \
-        conf2uedata $dbin/conf2uedata
 
 	# generate USIM data
-	if [ -f $dbin/conf2uedata ]; then
-	    install_nas_tools $conf_nvram_path $gen_nvram_path
+	if [ -f $dbin/nvram ]; then
+	    install_nas_tools $dbin $dconf
 	else
 	    echo_warning "not generated UE NAS files: binaries not found"
 	fi
@@ -768,20 +673,11 @@ function main() {
 	    CMakeFiles/nasmesh/nasmesh.ko $dbin/nasmesh.ko
 
 	#oai_nw_drv
-	#compilations \
-	#    $oaisim_build_dir oai_nw_drv \
-	#    CMakeFiles/oai_nw_drv/oai_nw_drv.ko $dbin/oai_nw_drv.ko
+	compilations \
+	    $oaisim_build_dir oai_nw_drv \
+	    CMakeFiles/oai_nw_drv/oai_nw_drv.ko $dbin/oai_nw_drv.ko
     fi
 
-    if [ "$TP" == "ETHERNET" ] ; then
-	compilations \
-	    $oaisim_build_dir oai_eth_transpro \
-	    liboai_eth_transpro.so $dbin/liboai_eth_transpro.so.$REL
-	ln -sf liboai_eth_transpro.so liboai_transpro.so
-	ln -sf $dbin/liboai_eth_transpro.so.$REL $dbin/liboai_transpro.so
-	echo_info "liboai_transpro.so is linked with ETHERNET library"	 
-    fi
-      
     cmake_file=$DIR/oaisim_mme_build_oai/CMakeLists.txt
     cp $DIR/oaisim_mme_build_oai/CMakeLists.template $cmake_file
     echo "set ( CMAKE_BUILD_TYPE $CMAKE_BUILD_TYPE )" >> $cmake_file
@@ -796,7 +692,7 @@ function main() {
     #[ "$CLEAN" = "1" ] && rm -rf $DIR/oaisim_mme_build_oai/build
     #mkdir -p $DIR/oaisim_mme_build_oai/build
     #cd $DIR/oaisim_mme_build_oai/build
-    #eval $CMAKE_CMD
+    #cmake ..
     #compilations \
 	#  oaisim_mme_build_oai oaisim_mme \
 	#  oaisim_mme $dbin/oaisim_mme.$REL
@@ -826,59 +722,47 @@ function main() {
      echo "set ( T_TRACER $T_TRACER )"            >>  $cmake_file
      echo 'include(${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists.txt)' >> $cmake_file    
      cd $DIR/$rrh_build_dir/build
-     eval $CMAKE_CMD
+     cmake ..
      compilations \
 	 rrh_gw rrh_gw \
 	 rrh_gw $dbin/rrh_gw
 
   fi
-  # Telnet server compilation
-  #####################
-  if [ "$BUILD_TELNETSRV" = "1" ] ; then
-
-     telnetsrv_build_dir=telnetsrv
-     mkdir -p $DIR/$telnetsrv_build_dir/build
-     cd $DIR/$telnetsrv_build_dir/build   
-     echo_info "Compiling telnet server library ..."
-    
-     [ "$CLEAN" = "1" ] && rm -rf $DIR/$telnetsrv_build_dir 
-     cmake_file=$OPENAIR_DIR/common/utils/$telnetsrv_build_dir/CMakeLists.txt   
-     cd $DIR/$telnetsrv_build_dir/build
-     eval  "$CMAKE_CMD $OPENAIR_DIR/common/utils/$telnetsrv_build_dir/"
-     make
-
-  fi  
+  
   # build RF device and transport protocol libraries
   #####################################
-  if [ "$eNB" = "1" -o "$UE" = "1" -o  "$RRH" = "1" ] ; then
+  if [ "$eNB" = "1" -o  "$RRH" = "1" ] ; then
 
-      if [ "$eNB" = "1" -o "$UE" = "1" ] ; then
+      if [ "$eNB" = "1" ] ; then
 	  build_dir=$lte_build_dir	  
       else
 	  build_dir=$rrh_build_dir	 
       fi
 
-      # build RF device libraries
+      # build RF device libraries (currently EXMIMO is not complied with the rest of HW targets)
       if [ "$HW" != "None" ] ; then
 	  rm -f liboai_device.so
 	  rm -f $dbin/liboai_device.so
 
+
 	  # link liboai_device.so with the selected RF device library
 	  if [ "$HW" == "EXMIMO" ] ; then
+	      
+	      #add exmimo compilation
+	      #TODO EXMIMO library support
 	      compilations \
 		  $build_dir oai_exmimodevif \
 		  liboai_exmimodevif.so $dbin/liboai_exmimodevif.so.$REL
-
-	      ln -sf liboai_exmimodevif.so liboai_device.so
-	      ln -sf $dbin/liboai_exmimodevif.so.$REL $dbin/liboai_device.so
 	      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
+	      if [ -d "/usr/include/uhd" ] ; then
+		  compilations \
+		      $build_dir oai_usrpdevif \
+		      liboai_usrpdevif.so $dbin/liboai_usrpdevif.so.$REL
+	      fi
 
-	      ln -sf liboai_usrpdevif.so liboai_device.so
-	      ln -sf $dbin/liboai_usrpdevif.so.$REL $dbin/liboai_device.so
+	      ln -s liboai_usrpdevif.so liboai_device.so
+	      ln -s $dbin/liboai_usrpdevif.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
@@ -887,8 +771,8 @@ function main() {
 		      liboai_bladerfdevif.so $dbin/liboai_bladerfdevif.so.$REL
 	      fi
 
-	      ln -sf liboai_bladerfdevif.so liboai_device.so
-	      ln -sf $dbin/liboai_bladerfdevif.so.$REL $dbin/liboai_device.so
+	      ln -s liboai_bladerfdevif.so liboai_device.so
+	      ln -s $dbin/liboai_bladerfdevif.so.$REL $dbin/liboai_device.so
 	      echo_info "liboai_device.so is linked to BLADERF device library"	 
 	  elif [ "$HW" == "OAI_LMSSDR" ] ; then
 #	      if [ -f "/usr/include/libbladeRF.h" ] ; then
@@ -897,9 +781,17 @@ function main() {
 		      liboai_lmssdrdevif.so $dbin/liboai_lmssdrdevif.so.$REL
 #	      fi
 
-	      ln -sf liboai_lmssdrdevif.so liboai_device.so
-	      ln -sf $dbin/liboai_lmssdrdevif.so.$REL $dbin/liboai_device.so
+	      ln -s liboai_lmssdrdevif.so liboai_device.so
+	      ln -s $dbin/liboai_lmssdrdevif.so.$REL $dbin/liboai_device.so
 	      echo_info "liboai_device.so is linked to LMSSDR device library"	 
+	  elif [ "$HW" == "OAI_IRIS" ] ; then
+		  compilations \
+		      $build_dir oai_irisdevif \
+		      liboai_irisdevif.so $dbin/liboai_irisdevif.so.$REL
+
+	      ln -s liboai_irisdevif.so liboai_device.so
+	      ln -s $dbin/liboai_irisdevif.so.$REL $dbin/liboai_device.so
+	      echo_info "liboai_device.so is linked to IRIS device library"        
 	  else 
 	      echo_info "liboai_device.so is not linked to any device library"	    
 	  fi
@@ -914,8 +806,8 @@ function main() {
 	      compilations \
 		  $build_dir oai_eth_transpro \
 		  liboai_eth_transpro.so $dbin/liboai_eth_transpro.so.$REL
-	      ln -sf liboai_eth_transpro.so liboai_transpro.so
-	      ln -sf $dbin/liboai_eth_transpro.so.$REL $dbin/liboai_transpro.so
+	      ln -s liboai_eth_transpro.so liboai_transpro.so
+	      ln -s $dbin/liboai_eth_transpro.so.$REL $dbin/liboai_transpro.so
 	      echo_info "liboai_transpro.so is linked with ETHERNET library"	 
 	  fi      
       fi
@@ -933,7 +825,7 @@ fi
     [ "$CLEAN" = "1" ] && rm -rf $OPENAIR_DIR/cmake_targets/doxygen/build
     mkdir -p $OPENAIR_DIR/cmake_targets/doxygen/build
     cd $OPENAIR_DIR/cmake_targets/doxygen/build
-    eval $CMAKE_CMD
+    cmake ..
     make doc
     ) >& $doxygen_log
   fi

cmake_targets/build_ue

@@ -1,6 +0,0 @@
-#!/bin/bash
-#sudo ./build_oai -c -C -I --install-optional-packages --install-system-files --UE -w USRP -V 
-#sudo ./build_oai -c -C -I --install-optional-packages --UE -w USRP -V 
-#sudo ./build_oai -c -C --UE -w USRP -V
-sudo ./build_oai -c -C --UE -w USRP
-#sudo ./build_oai -c -C --UE -w USRP --build-eclipse

cmake_targets/iris-command.txt

@@ -0,0 +1,17 @@
+
+BS TDD:
+
+sudo -E ./lte-softmodem-nos1 -d -O /usr/git/openairinterface5g/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.iris030.tdd.conf --tx-sample-advance -40 2>&1
+
+UE TDD:
+
+sudo -E ./lte-softmodem-nos1  -U -T -C2580000000 -r25 --ue-txgain 52 --ue-rxgain 113 --rrh-remote-address 0118 -d -g 9 -G 0x75 --tx-sample-advance -40 >&1
+
+BS FDD:
+
+sudo -E ./lte-softmodem-nos1 -d -O /usr/git/openairinterface5g/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.iris030.conf --tx-sample-advance -40 2>&1
+
+UE FDD:
+
+sudo -E ./lte-softmodem-nos1  -U -C2660000000 -r25 --ue-txgain 52 --ue-rxgain 113 --rrh-remote-address 0118 -d -g 9 -G 0x75 --tx-sample-advance -40 >&1 
+

cmake_targets/lte-simulators/CMakeLists.txt

@@ -3,12 +3,12 @@ set(PACKAGE_NAME "unitary_tests_simulators")
 set(PHYSIM True)
 set(RF_BOARD None)
 set(XFORMS True)
-set(ENABLE_ITTI False)
+
 set(DEBUG_PHY False)
 set(MU_RECIEVER False)
 set(RANDOM_BF False)
 set(PBS_SIM False)
-set(PERFECT_CE True)
+set(PERFECT_CE False)
 set(NAS_UE False)
 set(MESSAGE_CHART_GENERATOR False)
 

cmake_targets/nas_sim_tools/CMakeLists.txt

@@ -2,89 +2,70 @@ cmake_minimum_required(VERSION 2.8)
 
 project(NAS_SIM_TOOLS)
 
-include(FindPkgConfig)
-pkg_search_module(CONFIG libconfig REQUIRED)
-include_directories(${CONFIG_INCLUDE_DIRS})
-add_definitions(-std=gnu99)
 
 ENABLE_LANGUAGE(C)
-
-set(CMAKE_C_FLAGS
-  "${CMAKE_C_FLAGS} ${C_FLAGS_PROCESSOR} -Werror -Wall -Wstrict-prototypes -Wno-packed-bitfield-compat -g")
+#Sends the -std=c99 flag to the gcc compiler
+add_definitions(-std=c99)
+add_definitions(-DNAS_UE)
 
 set(OPENAIR_DIR     $ENV{OPENAIR_DIR})
+set(OPENAIR1_DIR    $ENV{OPENAIR_DIR}/openair1)
+set(OPENAIR2_DIR    $ENV{OPENAIR_DIR}/openair2)
 set(OPENAIR3_DIR    $ENV{OPENAIR_DIR}/openair3)
+set(OPENAIR3_DIR   $ENV{OPENAIR_DIR}/openair3)
+set(OPENAIR_TARGETS $ENV{OPENAIR_DIR}/targets)
 
-set(CONF2UEDATA_LIB_SRC
-    ${OPENAIR_DIR}/openair3/NAS/TOOLS/conf_emm.c
-    ${OPENAIR_DIR}/openair3/NAS/TOOLS/conf_user_data.c
-    ${OPENAIR_DIR}/openair3/NAS/TOOLS/conf_usim.c
-    ${OPENAIR_DIR}/openair3/NAS/TOOLS/conf_network.c
-    ${OPENAIR_DIR}/openair3/NAS/TOOLS/conf_user_plmn.c
-    ${OPENAIR_DIR}/openair3/NAS/TOOLS/conf_parser.c
-    ${OPENAIR_DIR}/openair3/NAS/TOOLS/fs.c
-    ${OPENAIR_DIR}/openair3/NAS/TOOLS/display.c
+#set(EXECUTABLE_OUTPUT_PATH ${OPENAIR_DIR}/targets/bin)
+
+
+# Add .h files for dependancies
+set(usim_SRC
+    ${OPENAIR_DIR}/openair3/NAS/TOOLS/usim_data.c
     ${OPENAIR_DIR}/openair3/NAS/UE/API/USIM/usim_api.c
     ${OPENAIR_DIR}/openair3/NAS/UE/API/USIM/aka_functions.c
     ${OPENAIR_DIR}/openair3/NAS/COMMON/UTIL/memory.c
     ${OPENAIR_DIR}/openair3/NAS/COMMON/UTIL/nas_log.c
     ${OPENAIR_DIR}/openair3/NAS/COMMON/UTIL/OctetString.c
     ${OPENAIR_DIR}/openair3/NAS/COMMON/UTIL/TLVEncoder.c
-    ${OPENAIR_DIR}/common/utils/utils.c
 )
-
-set(conf2uedata_HDR
-    ${OPENAIR_DIR}/openair3/NAS/TOOLS/conf2uedata.h
-    ${OPENAIR_DIR}/openair3/NAS/TOOLS/conf_emm.h
+set(usim_HDR
+    ${OPENAIR_DIR}/openair3/NAS/TOOLS/network.h
     ${OPENAIR_DIR}/openair3/NAS/UE/API/USIM/usim_api.h
     ${OPENAIR_DIR}/openair3/NAS/UE/API/USIM/aka_functions.h
     ${OPENAIR_DIR}/openair3/NAS/COMMON/UTIL/memory.h
     ${OPENAIR_DIR}/openair3/NAS/COMMON/UTIL/nas_log.h
     ${OPENAIR_DIR}/openair3/NAS/COMMON/UTIL/OctetString.h
     ${OPENAIR_DIR}/openair3/NAS/COMMON/UTIL/TLVEncoder.h
-    ${OPENAIR_DIR}/common/utils/utils.h
 )
-
 include_directories(
-    ${OPENAIR_DIR}/common/utils
-    ${OPENAIR_DIR}/openair3/NAS/UE
     ${OPENAIR_DIR}/openair3/NAS/COMMON
-    ${OPENAIR_DIR}/openair3/NAS/UE/API/USER
     ${OPENAIR_DIR}/openair3/NAS/UE/API/USIM
     ${OPENAIR_DIR}/openair3/NAS/UE/EMM/
     ${OPENAIR_DIR}/openair3/NAS/UE/ESM/
     ${OPENAIR_DIR}/openair3/NAS/COMMON/IES/
     ${OPENAIR_DIR}/openair3/NAS/COMMON/UTIL
 )
-
-# conf2uedata binary
-
-set(conf2uedata_SRC
-    ${OPENAIR_DIR}/openair3/NAS/TOOLS/conf2uedata.c
-	${CONF2UEDATA_LIB_SRC}
-)
-
-add_executable(conf2uedata  ${conf2uedata_SRC} ${conf2uedata_HDR} )
-target_link_libraries(conf2uedata ${CONFIG_LIBRARIES})
-
-# usim binary
-
-set(usim_SRC
-    ${OPENAIR_DIR}/openair3/NAS/TOOLS/usim.c
-	${CONF2UEDATA_LIB_SRC}
-)
+ADD_EXECUTABLE(usim  ${usim_SRC} ${usim_HDR})
 
 
-add_executable(usim  ${usim_SRC} ${conf2uedata_HDR} )
-target_link_libraries(usim ${CONFIG_LIBRARIES})
 
-# nvram binary
 
 set(nvram_SRC
-    ${OPENAIR_DIR}/openair3/NAS/TOOLS/nvram.c
-	${CONF2UEDATA_LIB_SRC}
+    ${OPENAIR_DIR}/openair3/NAS/TOOLS/ue_data.c
+    ${OPENAIR_DIR}/openair3/NAS/COMMON/UTIL/memory.c
+    ${OPENAIR_DIR}/openair3/NAS/COMMON/UTIL/nas_log.c
 )
 
+set(nvram_HDR
+    ${OPENAIR_DIR}/openair3/NAS/UE/EMM/emmData.h
+    ${OPENAIR_DIR}/openair3/NAS/COMMON/UTIL/memory.h
+    ${OPENAIR_DIR}/openair3/NAS/COMMON/userDef.h
+)
 
-add_executable(nvram  ${nvram_SRC} ${conf2uedata_HDR} )
-target_link_libraries(nvram ${CONFIG_LIBRARIES})
+ADD_EXECUTABLE(nvram  ${nvram_SRC} ${nvram_HDR})
+
+#install (TARGETS usim  DESTINATION ${EXECUTABLE_OUTPUT_PATH})
+#install (TARGETS nvram DESTINATION ${EXECUTABLE_OUTPUT_PATH})
+
+#install(CODE "EXECUTE_PROCESS (COMMAND ${OPENAIR_TARGETS}/bin/nvram --gen WORKING_DIRECTORY ${OPENAIR_TARGETS}/bin)")
+#install(CODE "EXECUTE_PROCESS (COMMAND ${OPENAIR_TARGETS}/bin/usim  --gen WORKING_DIRECTORY ${OPENAIR_TARGETS}/bin)")

cmake_targets/snap_environment.sh

@@ -1,3 +0,0 @@
-#!/bin/sh
-export UHD_IMAGES_DIR=$SNAP/uhd_images
-exec $@

cmake_targets/tools/asn1tostruct.py

@@ -38,7 +38,7 @@ def outputHeaderToFile(f, filename):
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ * the OAI Public License, Version 1.0  (the "License"); you may not use this file
  * except in compliance with the License.
  * You may obtain a copy of the License at
  *

cmake_targets/tools/build_helper

@@ -3,7 +3,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *
@@ -24,22 +24,6 @@
 # authors Laurent Thomas, Lionel GAUTHIER
 #
 #######################################
-if [ ! -f /etc/os-release ]; then
-  echo "No /etc/os-release file found. You're likely on an unsupported distro."
-  exit -1
-fi
-OS_DISTRO=$(grep "^ID=" /etc/os-release | sed "s/ID=//" | sed "s/\"//g")
-OS_RELEASE=$(grep "^VERSION_ID=" /etc/os-release | sed "s/VERSION_ID=//" | sed "s/\"//g")
-case "$OS_DISTRO" in
-  fedora) OS_BASEDISTRO="fedora"; INSTALLER="dnf"; CMAKE="cmake" ;;
-  rhel)   OS_BASEDISTRO="fedora"; INSTALLER="yum"; CMAKE="cmake3" ;;
-  centos) OS_BASEDISTRO="fedora"; INSTALLER="yum"; CMAKE="cmake3" ;;
-  debian) OS_BASEDISTRO="debian"; INSTALLER="apt-get"; CMAKE="cmake" ;;
-  ubuntu) OS_BASEDISTRO="debian"; INSTALLER="apt-get"; CMAKE="cmake" ;;
-esac
-KERNEL_VERSION=$(uname -r | cut -d '.' -f1)
-KERNEL_MAJOR=$(uname -r | cut -d '.' -f2)
-
 SUDO='sudo -E'
 
 ###############################
@@ -82,11 +66,12 @@ echo_info()    { cecho "$*" $blue         ;}
 # If we can't check the distribution, it returns "Unknown"
 # This function return always true as exit code by design
 # Examples:
-#   ubuntu16.04
-#   debian8.5
+#   Ubuntu16.04
+#   Debian8.5
 get_distribution_release() {
-    if [[ ! -z "$OS_DISTRO$OS_RELEASE" ]]; then
-        echo "$OS_DISTRO$OS_RELEASE"
+    local distributor
+    if distributor=$(lsb_release -si 2>/dev/null) ; then
+        echo $distributor$(lsb_release -sr)
     else
         echo Unknown
     fi
@@ -95,11 +80,8 @@ get_distribution_release() {
 check_supported_distribution() {
     local distribution=$(get_distribution_release)
     case "$distribution" in
-        "ubuntu16.04") return 0 ;;
-        "ubuntu14.04") return 0 ;;
-        "fedora24")    return 0 ;;
-        "rhel7")       return 0 ;;
-        "centos7")     return 0 ;;
+        "Ubuntu16.04") return 0 ;;
+        "Ubuntu14.04") return 0 ;;
     esac
     return 1
 }
@@ -154,20 +136,6 @@ clean_all_files() {
 # Compilers
 ###################################
 
-#check_warnings:
-#    print error message if the compilation had warnings
-#argument:
-#    $1: log file
-check_warnings() {
-  #we look for 'warning:' in the compilation log file
-  #this is how gcc starts a warning
-  #this is not perfect, we may get false positive
-  warning_count=`grep "warning:" "$1"|wc -l`
-  if [ $warning_count -gt 0 ]; then
-    echo_error "WARNING: $warning_count warnings. See $1"
-  fi
-}
-
 compilations() {
   cd $OPENAIR_DIR/cmake_targets/$1/build
   set +e
@@ -185,7 +153,6 @@ compilations() {
   if [ -s $3 ] ; then
      cp $3 $4
      echo_success "$2 compiled"
-     check_warnings "$dlog/$2.$REL.txt"
   else
      echo_error "$2 compilation failed"
      exit 1
@@ -204,7 +171,7 @@ install_protobuf_from_source(){
     echo "Downloading protobuf"
     #rm -rf /tmp/protobuf-2.6.1.tar.gz* /tmp/protobuf-2.6.1
     #wget https://github.com/google/protobuf/releases/download/v2.6.1/protobuf-2.6.1.tar.gz
-    #tar -xzvf protobuf-2.6.1.tar.gz --owner $USER --group $USER --no-same-owner
+    #tar -xzvf protobuf-2.6.1.tar.gz
     #cd protobuf-2.6.1/
     rm -rf /tmp/protobuf-cpp-3.3.0.tar.gz* /tmp/protobuf-3.3.0
     wget https://github.com/google/protobuf/releases/download/v3.3.0/protobuf-cpp-3.3.0.tar.gz
@@ -222,9 +189,6 @@ install_protobuf_c_from_source(){
     protobuf_c_install_log=$OPENAIR_DIR/cmake_targets/log/protobuf_c_install_log.txt
     echo_info "\nInstalling Google Protobuf_C from sources. The log file for Protobuf_C installation is here: $protobuf_c_install_log "
     (
-    if [[ "$OS_DISTRO" == "rhel" ]] || [[ "$OS_DISTRO" == "centos" ]]; then
-        export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
-    fi
     cd /tmp
     echo "Downloading protobuf-c"
     rm -rf /tmp/protobuf-c
@@ -239,29 +203,7 @@ install_protobuf_c_from_source(){
     ) >& $protobuf_c_install_log
 }
 
-install_usrp_uhd_driver_from_source(){
-    uhd_install_log=$OPENAIR_DIR/cmake_targets/log/uhd_install_log.txt
-    echo_info "\nInstalling UHD driver from sources. The log file for UHD driver installation is here: $uhd_install_log "
-    (
-    cd /tmp
-    echo "Downloading UHD driver"
-    rm -rf /tmp/uhd
-    git clone git://github.com/EttusResearch/uhd.git
-    cd uhd
-    git checkout tags/release_003_010_001_001
-    mkdir -p host/build
-    cd host/build
-    $CMAKE ../
-    echo "Compiling UHD"
-    make
-    make test
-    $SUDO make install
-    $SUDO ldconfig
-    ) >& $uhd_install_log
-}
-
 check_install_usrp_uhd_driver(){
-    if [[ "$OS_DISTRO" == "ubuntu" ]]; then
         #first we remove old installation
         $SUDO apt-get remove -y uhd || true
         $SUDO apt-get remove libuhd-dev libuhd003 uhd-host -y
@@ -270,99 +212,111 @@ check_install_usrp_uhd_driver(){
         #The new USRP repository
         $SUDO add-apt-repository ppa:ettusresearch/uhd -y
         $SUDO apt-get update
-        $SUDO apt-get -y --allow-unauthenticated install  python python-tk libboost-all-dev libusb-1.0-0-dev
-        $SUDO apt-get -y --allow-unauthenticated install libuhd-dev libuhd003 uhd-host
-    elif [[ "$OS_BASEDISTRO" == "fedora" ]]; then
-        $SUDO $INSTALLER -y install python boost libusb-devel libusbx-devel boost-devel python-mako python-docutils cmake
-        if [[ "$OS_DISTRO" == "rhel" ]] || [[ "$OS_DISTRO" == "centos" ]]; then
-            # until EPEL repo hasn't bumped UHD driver to >=3.10 in EPEL, build driver from source
-            $SUDO $INSTALLER -y remove uhd uhd-devel uhd-firmware
-            install_ursp_uhd_driver_from_source
-        else
-            $SUDO $INSTALLER -y install uhd uhd-devel uhd-firmware
-        fi
-    fi
+        $SUDO apt-get -y install  python python-tk libboost-all-dev libusb-1.0-0-dev
+        $SUDO apt-get -y install libuhd-dev libuhd003 uhd-host
 }
 
 install_usrp_uhd_driver() {
-    if [[ "$OS_DISTRO" == "ubuntu" ]]; then
         # We move uhd-host apart because it depends on linux kernel version
         # On newer kernels, it fails to install
         $SUDO apt-get -y install uhd-host
-    fi
-    if [ -z $1 ]; then
-      $SUDO uhd_images_downloader
-    else
-      $SUDO uhd_images_downloader -i $1
-    fi
-}
-
-install_bladerf_driver_from_source(){
-    bladerf_install_log=$OPENAIR_DIR/cmake_targets/log/bladerf_install_log.txt
-    echo_info "\nInstalling BladeRF driver from sources. The log file for BladeRF driver installation is here: $bladerf_install_log "
-    (
-    cd /tmp
-    echo "Downloading BladeRF driver"
-    rm -rf /tmp/bladeRF
-    git clone https://github.com/Nuand/bladeRF.git
-    cd bladeRF
-    git checkout tags/2016.06
-    mkdir -p build
-    cd build
-    $CMAKE ../
-    echo "Compiling BladeRF driver"
-    make
-    $SUDO make install
-    $SUDO ldconfig
-    echo "Downloading FPGA and firmware images"
-    cd /tmp/bladeRF
-    wget https://www.nuand.com/fx3/bladeRF_fw_latest.img
-    wget https://www.nuand.com/fpga/hostedx40-latest.rbf
-    sudo mkdir -p /usr/share/Nuand/bladeRF
-    sudo mv bladeRF_fw_latest.img /usr/share/Nuand/bladeRF/bladeRF_fw.img
-    sudo mv hostedx40-latest.rbf /usr/share/Nuand/bladeRF/hostedx40.rbf
-    ) >& $bladerf_install_log
+        $SUDO uhd_images_downloader 
 }
 
 check_install_bladerf_driver(){
-    if [[ "$OS_DISTRO" == "ubuntu" ]]; then
-        if [ "$(get_distribution_release)" == "ubuntu14.04" ] ; then
-            $SUDO add-apt-repository -y ppa:bladerf/bladerf
-            $SUDO apt-get update
-        fi
-        $SUDO apt-get install -y --allow-unauthenticated  bladerf libbladerf-dev
-        $SUDO apt-get install -y --allow-unauthenticated bladerf-firmware-fx3
-        $SUDO apt-get install -y --allow-unauthenticated bladerf-fpga-hostedx40	
-   elif [[ "$OS_BASEDISTRO" == "fedora" ]]; then
-        install_bladerf_driver_from_source
-   else
-        echo_error "BladeRF Installer for OAI does not support automatic build. Install BladeRF compiling sources manually from BladeRF website"
-   fi
+	if [ "$(get_distribution_release)" == "Ubuntu14.04" ] ; then
+		$SUDO add-apt-repository -y ppa:bladerf/bladerf
+		$SUDO apt-get update
+	fi
+	$SUDO apt-get install -y bladerf libbladerf-dev
+	$SUDO apt-get install -y bladerf-firmware-fx3
+	$SUDO apt-get install -y bladerf-fpga-hostedx40	
 }
 
 flash_firmware_bladerf() {
 	$SUDO bladeRF-cli --flash-firmware /usr/share/Nuand/bladeRF/bladeRF_fw.img
 }
 
-check_install_lmssdr_driver(){
-	if ( [ -d "/usr/local/include/lime" ] &&
-             [ -f "/usr/local/include/lime/LimeSuite.h" ] )
-	then
-  		echo_success "Found lmssdr drivers and tools installed from source"
-        else
-                echo_error "lmssdr support implies installing lmssdr drivers and tools" \
-                           " from sources. check:"
-                echo_info "https://open-cells.com/index.php/2017/05/10/limesdr-installation/"
-                echo_fatal "Cannot compile lmssdr device" 
-	fi
+install_soapy_from_source(){
+    soapy_install_log=$OPENAIR_DIR/cmake_targets/log/soapy_install_log.txt
+    echo_info "\nInstalling Soapy EcoSystem from source. The log file for Soapy installation is here: $soapy_install_log "
+    (
+    cd /tmp
+    echo "Downloading SoapySDR"
+    rm -rf /tmp/soapysdr
+    git clone https://github.com/pothosware/SoapySDR.git
+    cd soapysdr
+    #git checkout tags/release_003_010_001_001
+    mkdir -p build
+    cd build
+    $CMAKE ../
+    echo "Compiling SoapySDR"
+    make -j`nproc`
+    $SUDO make install
+    $SUDO ldconfig
+    cd /tmp
+    echo "Downloading SoapyRemote"
+    rm -rf /tmp/soapyremote
+    git clone https://github.com/pothosware/SoapyRemote.git
+    cd soapyremote
+    #git checkout tags/release_003_010_001_001
+    mkdir -p build
+    cd build
+    cmake ../
+    echo "Compiling SoapyRemote"
+    make -j`nproc`
+    $SUDO make install
+    $SUDO ldconfig
+    ) >& $soapy_install_log
+}
 
+install_soapy_iris_from_source(){
+    iris_install_log=$OPENAIR_DIR/cmake_targets/log/iris_install_log.txt
+    echo_info "\nInstalling Iris driver from source. The log file for Iris driver installation is here: $iris_install_log "
+    (
+    cd /tmp
+    echo "Downloading SoapyIris"
+    rm -rf /tmp/sklk-soapyiris
+    git clone https://github.com/skylarkwireless/sklk-soapyiris.git
+    cd sklk-soapyiris
+    mkdir -p build
+    cd build
+    cmake ../
+    echo "Compiling SoapyIris"
+    make -j`nproc`
+    $SUDO make install
+    $SUDO ldconfig
+    ) >& $iris_install_log
+}
+
+check_install_soapy () {
+    #if [[ "$OS_DISTRO" == "ubuntu" ]]; then
+        #first we remove old installation
+        $SUDO apt-get remove -y soapysdr soapysdr-server libsoapysdr-dev python-soapysdr python3-soapysdr soapysdr-module-remote || true
+        $SUDO add-apt-repository -y ppa:myriadrf/drivers
+        $SUDO apt-get update
+        $SUDO apt-get install -y soapysdr soapysdr-server libsoapysdr-dev python-soapysdr python3-soapysdr soapysdr-module-remote
+
+    #elif [[ "$OS_BASEDISTRO" == "fedora" ]]; then
+    #    $SUDO $INSTALLER -y install software-properties-common python3-software-properties python-software-properties subversion git python3 python-numpy python3-numpy cmake swig python-dev
+    #    install_soapy_from_source
+    #fi
+    install_soapy_iris_from_source
 
 }
 
+# we don't have this tool yet.
+#flash_firmware_iris() {
+    #if [ -z $1 ]; then
+    #  $SUDO iris_images_downloader
+    #else
+    #  $SUDO iris_images_downloader -i $1
+    #fi
+#}
+
 check_install_additional_tools (){
-  $SUDO $INSTALLER update -y
-  if [[ "$OS_DISTRO" == "ubuntu" ]]; then
-    PACKAGE_LIST="\
+    $SUDO apt-get update
+    $SUDO apt-get install -y \
 	check \
 	dialog \
 	dkms \
@@ -391,73 +345,13 @@ check_install_additional_tools (){
         bc \
         ntp \
         python-scipy \
-        python-matplotlib"
-  elif [[ "$OS_DISTRO" == "rhel" ]] || [[ "$OS_DISTRO" == "centos" ]]; then
-    PACKAGE_LIST="\
-      check \
-      dialog \
-      dkms \
-      gawk \
-      boost-devel \
-      openvpn \
-      pkgconfig \
-      pexpect \
-      sshfs \
-      swig  \
-      wireshark \
-      unzip  \
-      valgrind  \
-      vconfig	  \
-      ctags \
-      ntpdate \
-      iperf3 \
-      wvdial \
-      numpy \
-      sshpass \
-      nscd \
-      python2-paramiko \
-      python-pyroute2 \
-      python-netifaces \
-      scipy \
-      python-matplotlib"
-  elif [[ "$OS_DISTRO" == "fedora" ]]; then
-    PACKAGE_LIST=" \
-      check \
-      dialog \
-      dkms \
-      gawk \
-      boost-devel \
-      openvpn \
-      pkgconfig \
-      python-pexpect \
-      sshfs \
-      swig  \
-      wireshark \
-      unzip  \
-      valgrind  \
-      vconfig	  \
-      ctags \
-      ntpdate \
-      iperf3 \
-      wvdial \
-      python-numpy \
-      sshpass \
-      nscd \
-      python2-paramiko \
-      python-pyroute2 \
-      python-netifaces \
-      python2-scipy \
-      python2-matplotlib"
-  fi
-    $SUDO $INSTALLER install -y $PACKAGE_LIST
-    
-    $SUDO rm -fr /opt/ssh
-    $SUDO GIT_SSL_NO_VERIFY=true git clone https://gitlab.eurecom.fr/oai/ssh.git /opt/ssh
+        python-matplotlib
 
-  #The packages below are already installed for Redhat distros (RHEL, CentOS, Fedora)
-  if [[ "$OS_DISTRO" == "ubuntu" ]]; then
     $SUDO pip install paramiko
     $SUDO pip install pyroute2 colorama
+    $SUDO rm -fr /opt/ssh
+    $SUDO GIT_SSL_NO_VERIFY=true git clone https://gitlab.eurecom.fr/oai/ssh.git /opt/ssh
+    
     log_netiface=$OPENAIR_DIR/cmake_targets/log/netiface_install_log.txt
     echo_info "Installing Netinterfaces package. The logfile for installation is in $log_netiface"
     (
@@ -468,7 +362,6 @@ check_install_additional_tools (){
     $SUDO python setup.py install
     cd -
     ) >& $log_netiface
-  fi
 }
 
 check_install_oai_software() {
@@ -477,17 +370,16 @@ check_install_oai_software() {
         echo_error "Your distribution $(get_distribution_release) is not supported by oai !"
         exit 1
     fi
-    $SUDO $INSTALLER update -y
-  if [[ "$OS_DISTRO" == "ubuntu" ]]; then
+    $SUDO apt-get update
     $SUDO apt install -y software-properties-common
     case "$(get_distribution_release)" in
-        "ubuntu14.04")
+        "Ubuntu14.04")
             specific_packages="libtasn1-3-dev"
             # For iperf3
             $SUDO add-apt-repository "deb http://archive.ubuntu.com/ubuntu trusty-backports universe"
             $SUDO apt-get update
             ;;
-        "ubuntu16.04")
+        "Ubuntu16.04")
             specific_packages="libtasn1-6-dev"
             ;;
     esac
@@ -550,97 +442,74 @@ check_install_oai_software() {
 	python-pip \
 	pydb \
 	libyaml-dev \
-	wget \
-	libxpm-dev
+	wget
 
     $SUDO update-alternatives --set liblapack.so /usr/lib/atlas-base/atlas/liblapack.so
     
+    #Remove old gnutls/nettle installation that was done from sources
+    remove_nettle_from_source
+    
     $SUDO apt-get install -y nettle-dev nettle-bin
+    remove_gnutls_from_source
 
     $SUDO apt-get install -y libgnutls-dev
-  elif [[ "$OS_BASEDISTRO" == "fedora" ]]; then
-    if [[ "$OS_DISTRO" == "rhel" ]] || [[ "$OS_DISTRO" == "centos" ]]; then
-      if rpm -q epel-release > /dev/null; then
-        echo "EPEL repos already present. Good."
-      else
-        echo "EPEL repos not present. Installing them."
-        $SUDO $INSTALLER install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
-      fi
-      $SUDO $INSTALLER install -y python-epdb
-      $SUDO $INSTALLER install -y gccxml
-    else
-      $SUDO $INSTALLER install -y mscgen pydb
-      # Fedora repos already contain gccxml's successor castxml.
-      $SUDO $INSTALLER install -y castxml
-    fi
     
-    $SUDO $INSTALLER install -y \
-      autoconf \
-      automake \
-      bc \
-      bison \
-      $CMAKE \
-      doxygen \
-      ethtool \
-      flex \
-      gdb \
-      git \
-      graphviz \
-      gtkwave \
-      guile-devel \
-      iperf \
-      iproute \
-      iptables \
-      iptables-devel \
-      atlas-devel \
-      blas-devel \
-      libconfig-devel \
-      libffi-devel \
-      xforms \
-      xforms-devel \
-      libgcrypt-devel \
-      gmp-devel \
-      gtk3-devel \
-      libidn2-devel  \
-      libidn-devel \
-      mariadb-devel \
-      octave-devel \
-      openpgm-devel \
-      lksctp-tools \
-      lksctp-tools-devel \
-      openssl-devel \
-      libtasn1 \
-      libtool \
-      libusb-devel \
-      libxml2 \
-      libxml2-devel \
-      libxslt-devel \
-      octave \
-      octave-signal \
-      openssh-clients \
-      openssh-server \
-      openssl \
-      patch \
-      psmisc \
-      python \
-      subversion \
-      xmlstarlet \
-      python-pip \
-      wget \
-      kernel-headers \
-      kernel-devel \
-      nettle-devel \
-      gnutls-devel \
-      libXpm-devel \
-      lapack \
-      lapack-devel \
-      blas \
-      blas-devel
-  fi
-
     install_asn1c_from_source
     $SUDO rm -fr /opt/ssh
     $SUDO git clone https://gist.github.com/2190472.git /opt/ssh
+    sudo apt -y autoremove
+    install_protobuf_from_source
+    install_protobuf_c_from_source
+}
+
+### Remove Nettle installation which was done from sources
+remove_nettle_from_source() {
+    nettle_uninstall_log=$OPENAIR_DIR/cmake_targets/log/nettle_uninstall_log.txt
+    echo_info "\nUn-Installing Nettle from sources. The log file for nettle un-installation is here: $nettle_uninstall_log "
+    (
+    $SUDO apt-get remove -y nettle-dev nettle-bin 
+    cd /tmp
+    echo "Downloading nettle archive"
+    $SUDO rm -rf /tmp/nettle-2.5.tar.gz* /tmp/nettle-2.5
+    wget https://ftp.gnu.org/gnu/nettle/nettle-2.5.tar.gz
+    if [ $? -ne 0 ]; then
+      wget ftp://ftp.lysator.liu.se/pub/security/lsh/nettle-2.5.tar.gz
+    fi
+    if [ ! -f nettle-2.5.tar.gz ]; then
+      echo_error "Could not download nettle source files"
+      cd -
+      return
+    fi
+    tar -xzf nettle-2.5.tar.gz
+    cd nettle-2.5/
+    ./configure --disable-openssl --enable-shared --prefix=/usr 
+    $SUDO make uninstall || true 
+    $SUDO ldconfig
+    ) >& $nettle_uninstall_log
+}
+
+### Remove Gnutls from source
+remove_gnutls_from_source(){
+    gnutls_uninstall_log=$OPENAIR_DIR/cmake_targets/log/gnutls_uninstall_log.txt
+    echo_info "\nUn-Installing Gnutls. The log file for Gnutls un-installation is here: $gnutls_uninstall_log "
+    (
+    $SUDO apt-get remove -y libgnutls-dev
+    cd /tmp 
+    echo "Downloading gnutls archive"
+    $SUDO rm -rf /tmp/gnutls-3.1.23.tar.xz* /tmp/gnutls-3.1.23
+    wget http://mirrors.dotsrc.org/gcrypt/gnutls/v3.1/gnutls-3.1.23.tar.xz || \
+      wget ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/gnutls-3.1.23.tar.xz
+    if [ ! -f gnutls-3.1.23.tar.xz ]; then
+      echo_error "Could not download gnutls source files"
+      cd -
+      return
+    fi
+    tar -xJf gnutls-3.1.23.tar.xz
+    cd gnutls-3.1.23/
+    ./configure --prefix=/usr
+    $SUDO make uninstall || true
+    $SUDO ldconfig
+    )>& $gnutls_uninstall_log
 }
 
 install_asn1c_from_source(){
@@ -663,18 +532,19 @@ install_asn1c_from_source(){
 ################################################
 
 install_nas_tools() {
-  if [ ! -f .ue.nvram0 ]; then
+  cd $1
+  if [ ! -f .ue.nvram ]; then
     echo_success "generate .ue_emm.nvram .ue.nvram"
-    ./nvram --gen -c $1 -o $2
+    ./nvram --gen
   else
-    [ ./nvram -nt .ue.nvram0 -o ./nvram -nt .ue_emm.nvram0 ] && ./nvram --gen -c $1 -o $2
+    [ ./nvram -nt .ue.nvram  -o ./nvram -nt .ue_emm.nvram ] && ./nvram --gen
   fi
 
-  if [ ! -f .usim.nvram0 ]; then
+  if [ ! -f .usim.nvram ]; then
     echo_success "generate .usim.nvram"
-    ./usim --gen -c $1 -o $2
+    ./usim --gen
   else
-    [ ./usim -nt .usim.nvram0 ] && ./usim --gen -c $1 -o $2
+    [ ./usim -nt .usim.nvram ] && ./usim --gen
   fi
 
 }

cmake_targets/tools/build_test_epc_tools

@@ -4,7 +4,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/tools/example_enb_exmimo_mme_hss.txt

@@ -3,7 +3,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/tools/example_oaisim_enb_ue_mme_virtual.txt

@@ -3,7 +3,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/tools/fix_asn1

@@ -3,16 +3,19 @@
 # in those arrays, each line is:
 #   <file> <sha1sum of file (without line 4 which changes depending on the location of the files)> <patch to apply to file>
 
-RRC_Rel14=(
-  "SystemInformation-r8-IEs.h" 4df485c5ddf2540eca271876cdc512caa19b0890 "fix_asn1.data/RRC.rel14/SystemInformation-r8-IEs.h.diff"
-)
-
 RRC_Rel10=(
   "SystemInformation-r8-IEs.h" 603cd6615cff36ec7020692d72c0d6de7c4859cb "fix_asn1.data/RRC.rel10/SystemInformation-r8-IEs.h.diff"
 )
 
 X2AP_Rel11_2=(
   "X2ap-CriticalityDiagnostics-IE-List.h" ae96308b37fcbcbf39da5012e42968135fc5f27b "fix_asn1.data/X2AP.rel11.2/X2ap-CriticalityDiagnostics-IE-List.h.diff"
+  "NativeInteger.c"                       1a55f5402fd363318cf5444ffe1f67530dcf66ff "fix_asn1.data/X2AP.rel11.2/NativeInteger.c.diff"
+  "constr_SET_OF.c"                       808cbbdf19b118c0bdb04e3acf2cbe6e4133be2b "fix_asn1.data/X2AP.rel11.2/constr_SET_OF.c.diff"
+)
+
+S1AP_Rel10_5=(
+  "NativeInteger.c" 1a55f5402fd363318cf5444ffe1f67530dcf66ff "fix_asn1.data/S1AP.rel10.5/NativeInteger.c.diff"
+  "constr_SET_OF.c" 808cbbdf19b118c0bdb04e3acf2cbe6e4133be2b "fix_asn1.data/S1AP.rel10.5/constr_SET_OF.c.diff"
 )
 
 red_color="$(tput setaf 1)"
@@ -22,7 +25,6 @@ reset_color="$(tput sgr0)"
 function error()
 {
   echo -e "$red_color"ERROR: "$@""$reset_color"
-  exit 1
 }
 
 function check_sha1()
@@ -91,10 +93,6 @@ function patch_rrc()
   local version="$2"
 
   case "$version" in
-    Rel14 )
-      echo "patching RRC files release 14"
-      apply_patches "$directory" RRC_Rel14 ${#RRC_Rel14[*]}
-      ;;
     Rel10 )
       echo "patching RRC files release 10"
       apply_patches "$directory" RRC_Rel10 ${#RRC_Rel10[*]}
@@ -131,7 +129,8 @@ function patch_s1ap()
 
   case "$version" in
     R10 )
-      #nothing to do anymore (fixes went to asn1c)
+      echo "patching S1AP files release 10.5"
+      apply_patches "$directory" S1AP_Rel10_5 ${#S1AP_Rel10_5[*]}
       ;;
     * )
       error unknwon/unhandled S1AP version \'"$version"\'

cmake_targets/tools/fix_asn1.data/RRC.rel14/SystemInformation-r8-IEs.h.diff

@@ -1,23 +0,0 @@
-73,77d72
-< /* SystemInformation-r8-IEs */
-< typedef struct SystemInformation_r8_IEs {
-< 	struct SystemInformation_r8_IEs__sib_TypeAndInfo {
-< 		A_SEQUENCE_OF(struct SystemInformation_r8_IEs__sib_TypeAndInfo__Member {
-< 			SystemInformation_r8_IEs__sib_TypeAndInfo__Member_PR present;
-103c98,102
-< 			} choice;
----
-> 			};
-> 
-> 		struct SystemInformation_r8_IEs__sib_TypeAndInfo__Member {
-> 			SystemInformation_r8_IEs__sib_TypeAndInfo__Member_PR present;
-> 			union SystemInformation_r8_IEs__sib_TypeAndInfo__Member_u choice;
-107c106,111
-< 		} ) list;
----
-> 		};
-> 
-> /* SystemInformation-r8-IEs */
-> typedef struct SystemInformation_r8_IEs {
-> 	struct SystemInformation_r8_IEs__sib_TypeAndInfo {
-> 		A_SEQUENCE_OF(struct SystemInformation_r8_IEs__sib_TypeAndInfo__Member) list;

cmake_targets/tools/fix_asn1.data/S1AP.rel10.5/NativeInteger.c.diff

@@ -0,0 +1,8 @@
+283c283
+< 	int dynamic = 0;
+---
+> 	//int dynamic = 0;
+290c290
+< 		dynamic = 1;
+---
+> 		//dynamic = 1;

cmake_targets/tools/fix_asn1.data/S1AP.rel10.5/constr_SET_OF.c.diff

@@ -0,0 +1,4 @@
+1007c1007
+< 				(int)nelems, (int)ct ? ct->effective_bits : -1);
+---
+> 				(int)nelems, ct ? ct->effective_bits : -1);

cmake_targets/tools/fix_asn1.data/X2AP.rel11.2/NativeInteger.c.diff

@@ -0,0 +1,8 @@
+283c283
+< 	int dynamic = 0;
+---
+> 	//int dynamic = 0;
+290c290
+< 		dynamic = 1;
+---
+> 		//dynamic = 1;

cmake_targets/tools/fix_asn1.data/X2AP.rel11.2/constr_SET_OF.c.diff

@@ -0,0 +1,4 @@
+1007c1007
+< 				(int)nelems, (int)ct ? ct->effective_bits : -1);
+---
+> 				(int)nelems, ct ? ct->effective_bits : -1);

cmake_targets/tools/indent_source_code

@@ -4,7 +4,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/tools/init_exmimo2

@@ -5,7 +5,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/tools/init_nas_nos1

@@ -5,7 +5,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/tools/init_nas_s1

@@ -1,71 +0,0 @@
-#!/bin/bash
-
-#WARNING: this file may not work properly, be sure to know what you
-#do when using it
-
-#/*
-# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
-# * contributor license agreements.  See the NOTICE file distributed with
-# * this work for additional information regarding copyright ownership.
-# * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
-# * except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# *      http://www.openairinterface.org/?page_id=698
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-# *-------------------------------------------------------------------------------
-# * For more information about the OpenAirInterface (OAI) Software Alliance:
-# *      contact@openairinterface.org
-# */
-
-################################################################################
-# file init_nas_s1
-# brief loads the ue_ip module and sets up IP for the UE
-# you may want to edit it to fit your settings (replace oip0 by oipX for
-# instance)
-# author Florian Kaltenberger
-#
-#######################################
-
-LTEIF=oip1
-#OPENAIR_DIR=/home/oai/svn-oai/openair4G
-
-load_module() {
-  mod_name=${1##*/}
-  mod_name=${mod_name%.*}
-  if awk "/$mod_name/ {found=1 ;exit} END {if (found!=1) exit 1}" /proc/modules
-    then
-      echo "module $mod_name already loaded: I remove it first"
-      sudo rmmod $mod_name
-  fi
-  echo loading $mod_name
-  sudo insmod $1
-}
-
-load_module ../../targets/bin/ue_ip.ko
-
-if [ "$1" = "UE" ]; then
-  echo "bring up $LTEIF interface for UE"
- sudo ifconfig $LTEIF up
-fi
-
-sudo ip route flush cache
-sleep 1
-sudo sysctl -w net.ipv4.conf.all.log_martians=1
-echo "Disabling reverse path filtering"
-sudo sysctl -w net.ipv4.conf.all.rp_filter=0
-sudo ip route flush cache
-
-# Check table 200 lte in /etc/iproute2/rt_tables
-fgrep lte /etc/iproute2/rt_tables  > /dev/null 
-if [ $? -ne 0 ]; then
-    echo "200 lte " >> /etc/iproute2/rt_tables
-fi
-sudo ip rule add fwmark 1 table lte
-sudo ip route add default dev $LTEIF table lte

cmake_targets/tools/perf_oai.bash

@@ -3,7 +3,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/tools/run_enb_s1_exmimo

@@ -4,7 +4,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/tools/run_enb_s1_usrp

@@ -4,7 +4,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

cmake_targets/tools/run_enb_ue_virt_noS1

@@ -4,7 +4,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *
@@ -150,7 +150,7 @@ function main()
 #      -u | --num-ue )
 	    
       -V | --vcd)
-        echo "setting gtk-wave output"
+        "setting gtk-wave output"
         exe_arguments="$exe_arguments -V /tmp/oai_gtk_wave.vcd"
         shift ;
         ;;
@@ -164,11 +164,6 @@ function main()
 	exe_arguments="$exe_arguments -n $2"
         shift 2;
 	;; 
-      -x | --xforms)
-        echo "running with xforms"
-        exe_arguments="$exe_arguments --xforms"
-        shift 1;
-        ;;
       *)   
         echo "Unknown option $1"
         help
@@ -217,11 +212,11 @@ function main()
   fi
   
   if [ $run_gdb -eq 0 ]; then 
-    exec $SUDO $OPENAIR_DIR/targets/bin/oaisim_nos1.Rel14 $exe_arguments | tee /tmp/enb_ue_nos1.log.txt
+    exec $SUDO $OPENAIR_DIR/targets/bin/oaisim_nos1.Rel10 $exe_arguments | tee /tmp/enb_ue_nos1.log.txt
   else
     touch      ~/.gdb_enb_ue_nos1
     chmod 777  ~/.gdb_enb_ue_nos1
-    echo "file $OPENAIR_DIR/targets/bin/oaisim_nos1.Rel14" > ~/.gdb_enb_ue_nos1
+    echo "file $OPENAIR_DIR/targets/bin/oaisim_nos1.Rel10" > ~/.gdb_enb_ue_nos1
     echo "set args $exe_arguments" >> ~/.gdb_enb_ue_nos1
     echo "run"                        >> ~/.gdb_enb_ue_nos1
     cat ~/.gdb_enb_ue_nos1

cmake_targets/tools/run_enb_ue_virt_s1

@@ -4,7 +4,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *
@@ -174,7 +174,7 @@ function main()
         ;;      
 
       -V | --vcd)
-        echo "setting gtk-wave output"
+        "setting gtk-wave output"
         exe_arguments="$exe_arguments -V /tmp/oai_gtk_wave.vcd"
         shift ;
         ;;
@@ -183,11 +183,6 @@ function main()
         exe_arguments="$exe_arguments -P wireshark"
         shift 2;
         ;;
-      -x | --xforms)
-        echo "running with xforms"
-        exe_arguments="$exe_arguments --xforms"
-        shift 1;
-        ;;
       *)   
         echo "Unknown option $1"
         help
@@ -252,6 +247,12 @@ function main()
   if [ $? -ne 0 ]; then
     echo "200 lte " >> /etc/iproute2/rt_tables
   fi
+  ip rule add fwmark 1 table lte 
+  ifconfig oip1 up
+  ip route add default dev oip1 table lte
+  # the actual IP address depends on the EPC/MME config file for address pool
+  ip route add from 192.188.0.0/24 table lte
+  ip route add to 192.188.0.0/24 table lte
 
   exe_arguments="$exe_arguments -s15 -AAWGN -y1 -b1 -u1 -Q0"
     
@@ -263,11 +264,11 @@ function main()
   fi
    
   if [ $run_gdb -eq 0 ]; then 
-    exec $OPENAIR_DIR/targets/bin/oaisim.Rel14 $exe_arguments | tee /tmp/enb_ue_s1.log.txt
+    exec $OPENAIR_DIR/targets/bin/oaisim.Rel10 $exe_arguments | tee /tmp/enb_ue_s1.log.txt
   else
     touch      ~/.gdb_enb_ue_s1
     chmod 777  ~/.gdb_enb_ue_s1
-    echo "file $OPENAIR_DIR/targets/bin/oaisim.Rel14" > ~/.gdb_enb_ue_s1
+    echo "file $OPENAIR_DIR/targets/bin/oaisim.Rel10" > ~/.gdb_enb_ue_s1
     echo "set args $exe_arguments" >> ~/.gdb_enb_ue_s1
     echo "run"                        >> ~/.gdb_enb_ue_s1
     cat ~/.gdb_enb_ue_s1

cmake_targets/tools/run_ue_s1

@@ -1,33 +0,0 @@
-#!/bin/bash
-
-# Carrier frequency in Hz
-#FREQ=2660000000 #FDD
-FREQ=2350000000 #TDD
-NRB=50
-TA=0
-
-#9:trace, 8/7:debug, 6:info, 4:warn, 3:error
-LOGLEVEL=6
-
-#enable or disable soft scope
-#SCOPE=''
-SCOPE='-d'
-
-#enable or disable VCD logging
-VCD=''
-#VCD='-V'
-
-ISTDD='-T'
-#ISTDD=''
-
-#use external clock
-ECLK="--external-clock"
-#ECLK=""
-
-#UE scan carrier
-#ISSCAN="--ue-scan-carrier"
-ISSCAN=""
-
-sudo sh -c './init_nas_s1 UE'
-cd ../../targets/bin/ 
-sudo -E ./lte-softmodem.Rel10 -U -C$FREQ -r$NRB $ISSCAN --ue-txgain 70 --ue-rxgain 80 -A $TA $ECLK -W $ISTDD -g $LOGLEVEL $SCOPE 2>&1 | sudo tee /tmp/UE.log 

cmake_targets/tools/stop_exmimo2

@@ -4,7 +4,7 @@
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
 # * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
 # * except in compliance with the License.
 # * You may obtain a copy of the License at
 # *

common/config/config_cmdline.c

@@ -1,166 +0,0 @@
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.0  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-/*! \file common/config/cmdline/config_libconfig.c
- * \brief configuration module, command line parsing implementation 
- * \author Francois TABURET
- * \date 2017
- * \version 0.1
- * \company NOKIA BellLabs France
- * \email: francois.taburet@nokia-bell-labs.com
- * \note
- * \warning
- */
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-#include "config_userapi.h"
-
-int processoption(paramdef_t *cfgoptions, char *value)
-{
-char *tmpval = value;
-int optisset=0;
-char defbool[2]="1";
-
-     if ( value == NULL) {
-        if( (cfgoptions->paramflags &PARAMFLAG_BOOL) == 0 ) { /* not a boolean, argument required */
-	    fprintf(stderr,"[CONFIG] command line, option %s requires an argument\n",cfgoptions->optname);
-	    return 0;
-        } else {        /* boolean value option without argument, set value to true*/
-            tmpval = defbool;
-        }
-     }
-     switch(cfgoptions->type)
-       {
-       	case TYPE_STRING:
-           if (cfgoptions->numelt == 0 ) {
-              config_check_valptr(cfgoptions, cfgoptions->strptr, strlen(tmpval)+1);
-              sprintf(*(cfgoptions->strptr), "%s",tmpval);
-            } else {
-              sprintf( (char *)(cfgoptions->strptr), "%s",tmpval);              
-           }
-           printf_cmdl("[CONFIG] %s set to  %s from command line\n", cfgoptions->optname, tmpval);
-	   optisset=1;
-        break;
-	
-        case TYPE_STRINGLIST:
-        break;
-        case TYPE_UINT32:
-       	case TYPE_INT32:
-        case TYPE_UINT16:
-       	case TYPE_INT16:
-	case TYPE_UINT8:
-       	case TYPE_INT8:	
-           config_check_valptr(cfgoptions, (char **)&(cfgoptions->iptr),sizeof(int32_t));
-	   config_assign_int(cfgoptions,cfgoptions->optname,(int32_t)strtol(tmpval,NULL,0));  
-	   optisset=1;
-        break;  	
-       	case TYPE_UINT64:
-       	case TYPE_INT64:
-           config_check_valptr(cfgoptions, (char **)&(cfgoptions->i64ptr),sizeof(uint64_t));
-	   *(cfgoptions->i64ptr)=strtoll(tmpval,NULL,0);  
-           printf_cmdl("[CONFIG] %s set to  %lli from command line\n", cfgoptions->optname, (long long)*(cfgoptions->i64ptr));
-	   optisset=1;
-        break;        
-       	case TYPE_UINTARRAY:
-       	case TYPE_INTARRAY:
-
-        break;
-        case TYPE_DOUBLE:
-           config_check_valptr(cfgoptions, (char **)&(cfgoptions->dblptr),sizeof(double)); 
-           *(cfgoptions->dblptr) = strtof(tmpval,NULL);  
-           printf_cmdl("[CONFIG] %s set to  %lf from command line\n", cfgoptions->optname, *(cfgoptions->dblptr));
-	   optisset=1; 
-        break; 
-
-       	case TYPE_IPV4ADDR:
-
-        break;
-
-       default:
-            fprintf(stderr,"[CONFIG] command line, %s type %i  not supported\n",cfgoptions->optname, cfgoptions->type);
-       break;
-       } /* switch on param type */
-       if (optisset == 1) {
-          cfgoptions->paramflags = cfgoptions->paramflags |  PARAMFLAG_PARAMSET;
-       }
-       
-    return optisset;
-}
-
-int config_process_cmdline(paramdef_t *cfgoptions,int numoptions, char *prefix)
-{
-char **p = config_get_if()->argv;
-int c = config_get_if()->argc;
-int j;
-char *pp;
-char *cfgpath; 
- 
-  j = (prefix ==NULL) ? 0 : strlen(prefix); 
-  cfgpath = malloc( j + MAX_OPTNAME_SIZE +1);
-  if (cfgpath == NULL) {
-     fprintf(stderr,"[CONFIG] %s %i malloc error,  %s\n", __FILE__, __LINE__,strerror(errno));
-     return -1;
-  }
-
-  j=0;
-  p++;
-  c--;
-    while (c > 0 && *p != NULL) {
-        if (strcmp(*p, "-h") == 0 || strcmp(*p, "--help") == 0 ) {
-            config_printhelp(cfgoptions,numoptions);
-        }
-
-        if (*p[0] == '-') {        
-    	    for(int i=0;i<numoptions;i++) {
-    		if ( ( cfgoptions[i].paramflags & PARAMFLAG_DISABLECMDLINE) != 0) {
-    		  continue;
-    		 }
-    		if (prefix != NULL) {
-    		   sprintf(cfgpath,"%s.%s",prefix,cfgoptions[i].optname);
-    		} else {
-    		   sprintf(cfgpath,"%s",cfgoptions[i].optname);
-    		}
-
-    		if ( ((strlen(*p) == 2) && (strcmp(*p + 1,cfgpath) == 0))  || 
-    		     ((strlen(*p) > 2) && (strcmp(*p + 2,cfgpath ) == 0 )) ) {
-    		   pp = *(p+1);
-    		   if ( ( pp != NULL ) && (c>1) &&  (pp[0]!= '-') ) {
-    		
-    		      j += processoption(&(cfgoptions[i]), pp);
-    		   } else {
-    		      j += processoption(&(cfgoptions[i]), NULL);
-    		   }
-                   break;
-    		}
-    	     } /* for */
-         } /* if (*p[0] == '-') */  	     
-   	 p++;
-         c--;  
-    }   /* fin du while */
-  printf_cmdl("[CONFIG] %s %i options set from command line\n",((prefix == NULL) ? "":prefix),j);
-  free(cfgpath);
-  return j;            
-}  /* parse_cmdline*/
-
-
-

common/config/config_load_configmodule.c

@@ -1,227 +0,0 @@
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.0  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-/*! \file common/config/config_load_configmodule.c
- * \brief configuration module, load the shared library implementing the configuration module 
- * \author Francois TABURET
- * \date 2017
- * \version 0.1
- * \company NOKIA BellLabs France
- * \email: francois.taburet@nokia-bell-labs.com
- * \note
- * \warning
- */
-#define _GNU_SOURCE
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <errno.h>
-#include <dlfcn.h>
-
-#define CONFIG_LOADCONFIG_MAIN
-#include "config_load_configmodule.h"
-#include "config_userapi.h"
-#define CONFIG_SHAREDLIBFORMAT "libparams_%s.so"
-
-int load_config_sharedlib(configmodule_interface_t *cfgptr)
-{
-void *lib_handle;
-char fname[128];
-char libname[FILENAME_MAX]; 
-int st;
-
-   st=0;  
-   sprintf(libname,CONFIG_SHAREDLIBFORMAT,cfgptr->cfgmode);
-
-   lib_handle = dlopen(libname,RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE);
-   if (!lib_handle) {
-      fprintf(stderr,"[CONFIG] %s %d Error calling dlopen(%s): %s\n",__FILE__, __LINE__, libname,dlerror());
-      st = -1;
-   } else { 
-      sprintf (fname,"config_%s_init",cfgptr->cfgmode);
-      cfgptr->init = dlsym(lib_handle,fname);
-
-      if (cfgptr->init == NULL ) {
-         printf("[CONFIG] %s %d no function %s for config mode %s\n",
-               __FILE__, __LINE__,fname, cfgptr->cfgmode);
-      } else {
-         st=cfgptr->init(cfgptr->cfgP,cfgptr->num_cfgP); 
-         printf("[CONFIG] function %s returned %i\n",
-               fname, st);	 
-      }
-
-      sprintf (fname,"config_%s_get",cfgptr->cfgmode);
-      cfgptr->get = dlsym(lib_handle,fname);
-      if (cfgptr->get == NULL ) { 
-         printf("[CONFIG] %s %d no function %s for config mode %s\n",
-               __FILE__, __LINE__,fname, cfgptr->cfgmode);
-	 st = -1;
-      }
-      
-      sprintf (fname,"config_%s_getlist",cfgptr->cfgmode);
-      cfgptr->getlist = dlsym(lib_handle,fname);
-      if (cfgptr->getlist == NULL ) { 
-         printf("[CONFIG] %s %d no function %s for config mode %s\n",
-               __FILE__, __LINE__,fname, cfgptr->cfgmode);
-	 st = -1;
-      }
-
-      sprintf (fname,"config_%s_end",cfgptr->cfgmode);
-      cfgptr->end = dlsym(lib_handle,fname);
-      if (cfgptr->getlist == NULL ) { 
-         printf("[CONFIG] %s %d no function %s for config mode %s\n",
-               __FILE__, __LINE__,fname, cfgptr->cfgmode);
-      }      
-   } 
-   
-   return st;	       
-}
-/*-----------------------------------------------------------------------------------*/
-/* from here: interface implementtion of the configuration module */
-
-
-configmodule_interface_t *load_configmodule(int argc, char **argv)
-{
-char *cfgparam=NULL;
-char *modeparams=NULL;
-char *cfgmode=NULL;
-char *strtokctx=NULL;
-char *atoken;
-uint32_t tmpflags=0;
-int i;
- 
-/* first parse the command line to look for the -O option */
-  opterr=0;
-  for (i = 0;i<argc;i++) {
-       if (strlen(argv[i]) < 2) continue;
-       if ( argv[i][1] == 'O' && i < (argc -1)) {
-          cfgparam = argv[i+1]; 
-       } 
-        if ( argv[i][1] == 'h' ) {
-          tmpflags = CONFIG_HELP; 
-       }            
-   }
-   optind=1;
-
-/* look for the OAI_CONFIGMODULE environement variable */
-  if ( cfgparam == NULL ) {
-     cfgparam = getenv("OAI_CONFIGMODULE");
-     }
-
-/* default */
-  if (cfgparam == NULL) {
-     tmpflags = tmpflags | CONFIG_NOOOPT;
-     cfgparam = DEFAULT_CFGMODE ":" DEFAULT_CFGFILENAME;
-     }
-/* parse the config parameters to set the config source */
-   i = sscanf(cfgparam,"%m[^':']:%ms",&cfgmode,&modeparams);
-   if (i< 0) {
-       fprintf(stderr,"[CONFIG] %s, %d, sscanf error parsing config source  %s: %s\n", __FILE__, __LINE__,cfgparam, strerror(errno));
-       cfgmode=strdup(DEFAULT_CFGMODE);
-       modeparams = strdup(DEFAULT_CFGFILENAME);
-   }
-   else if ( i == 1 ) {
-  /* -O argument doesn't contain ":" separator, assume -O <conf file> option, default cfgmode to libconfig
-     with one parameter, the path to the configuration file */
-       modeparams=cfgmode;
-       cfgmode=strdup(DEFAULT_CFGMODE);
-   }
-
-   cfgptr = malloc(sizeof(configmodule_interface_t));
-   memset(cfgptr,0,sizeof(configmodule_interface_t));
-
-   cfgptr->rtflags = cfgptr->rtflags | tmpflags;
-   cfgptr->argc   = argc;
-   cfgptr->argv   = argv; 
-   cfgptr->cfgmode=strdup(cfgmode);
-
-   cfgptr->num_cfgP=0;
-   atoken=strtok_r(modeparams,":",&strtokctx);     
-   while ( cfgptr->num_cfgP< CONFIG_MAX_OOPT_PARAMS && atoken != NULL) {
-       /* look for debug level in the config parameters, it is commom to all config mode 
-          and will be removed frome the parameter array passed to the shared module */
-       char *aptr;
-       aptr=strcasestr(atoken,"dbgl");
-       if (aptr != NULL) {
-           cfgptr->rtflags = cfgptr->rtflags | strtol(aptr+4,NULL,0);
-
-       } else {
-           cfgptr->cfgP[cfgptr->num_cfgP] = strdup(atoken);
-           cfgptr->num_cfgP++;
-       }
-       atoken = strtok_r(NULL,":",&strtokctx);
-   }
-
-   
-   printf("[CONFIG] get parameters from %s ",cfgmode);
-   for (i=0;i<cfgptr->num_cfgP; i++) {
-        printf("%s ",cfgptr->cfgP[i]); 
-   }
-   printf("\n");
-
- 
-   i=load_config_sharedlib(cfgptr);
-   if (i< 0) {
-      fprintf(stderr,"[CONFIG] %s %d config module %s couldn't be loaded\n", __FILE__, __LINE__,cfgmode);
-      cfgptr->rtflags = cfgptr->rtflags | CONFIG_HELP | CONFIG_ABORT;
-   } else {
-      printf("[CONFIG] config module %s loaded\n",cfgmode);
-      Config_Params[CONFIGPARAM_DEBUGFLAGS_IDX].uptr=&(cfgptr->rtflags);
-      config_get(Config_Params,CONFIG_PARAMLENGTH(Config_Params), CONFIG_SECTIONNAME ); 
-   }
-
-  
-
-   if (modeparams != NULL) free(modeparams);
-   if (cfgmode != NULL) free(cfgmode);
-   if (CONFIG_ISFLAGSET(CONFIG_ABORT)) config_printhelp(Config_Params,CONFIG_PARAMLENGTH(Config_Params));
-   return cfgptr;
-}
-
-void end_configmodule()
-{ 
-  if (cfgptr != NULL) {
-      if (cfgptr->end != NULL) {
-         printf ("[CONFIG] calling config module end function...\n"); 
-         cfgptr->end();
-      }
-      if( cfgptr->cfgmode != NULL) free(cfgptr->cfgmode);
-      printf ("[CONFIG] free %u config parameter pointers\n",cfgptr->num_cfgP);  
-      for (int i=0; i<cfgptr->num_cfgP; i++) {
-          if ( cfgptr->cfgP[i] != NULL) free(cfgptr->cfgP[i]);
-          }
-      printf ("[CONFIG] free %u config value pointers\n",cfgptr->numptrs);  
-      for(int i=0; i<cfgptr->numptrs ; i++) {
-          if (cfgptr->ptrs[i] != NULL) {
-             free(cfgptr->ptrs[i]);
-          }
-          cfgptr->ptrs[i]=NULL;
-      }
-
-  free(cfgptr);
-  cfgptr=NULL;
-  }
-}
-
-
-
-

common/config/config_load_configmodule.h

@@ -1,104 +0,0 @@
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.0  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-/*! \file common/config/config_load_configmodule.h
- * \brief: configuration module, include file to be used by the source code calling the 
- *  configuration module initialization 
- * \author Francois TABURET
- * \date 2017
- * \version 0.1
- * \company NOKIA BellLabs France
- * \email: francois.taburet@nokia-bell-labs.com
- * \note
- * \warning
- */
-#ifndef INCLUDE_CONFIG_LOADCONFIGMODULE_H
-#define INCLUDE_CONFIG_LOADCONFIGMODULE_H 
-
-
-#include <string.h>
-#include <stdlib.h>
-#include "common/config/config_paramdesc.h"
-#define CONFIG_MAX_OOPT_PARAMS    10     // maximum number of parameters in the -O option (-O <cfgmode>:P1:P2...
-#define CONFIG_MAX_ALLOCATEDPTRS  1024   // maximum number of parameters that can be dynamicaly allocated in the config module
-
-/* rtflags bit position definitions */
-#define CONFIG_PRINTPARAMS    1        // print parameters values while processing
-#define CONFIG_DEBUGPTR       2        // print memory allocation/free debug messages
-#define CONFIG_DEBUGCMDLINE   4        // print command line processing messages
-#define CONFIG_HELP           8        // print help message
-#define CONFIG_ABORT          16       // config failed,abort execution 
-#define CONFIG_NOOOPT         32       // no -O option found when parsing command line 
-
-
-typedef int(*configmodule_initfunc_t)(char *cfgP[],int numP);
-typedef int(*configmodule_getfunc_t)(paramdef_t *,int numparams, char *prefix);
-typedef int(*configmodule_getlistfunc_t)(paramlist_def_t *, paramdef_t *,int numparams, char *prefix);
-typedef void(*configmodule_endfunc_t)(void);
-typedef struct configmodule_interface
-{
-  int      argc;
-  char     **argv;
-  char     *cfgmode;
-  int      num_cfgP;
-  char     *cfgP[CONFIG_MAX_OOPT_PARAMS];
-  configmodule_initfunc_t         init;
-  configmodule_getfunc_t          get;
-  configmodule_getlistfunc_t      getlist;
-  configmodule_endfunc_t          end;
-  uint32_t numptrs;
-  uint32_t rtflags;
-  char     *ptrs[CONFIG_MAX_ALLOCATEDPTRS];  
-} configmodule_interface_t;
-
-#ifdef CONFIG_LOADCONFIG_MAIN
-configmodule_interface_t *cfgptr=NULL;
-
-static char config_helpstr [] = "\n lte-softmodem -O [config mode]<:dbg[debugflags]> \n \
-          debugflags can also be defined in the config_libconfig section of the config file\n \
-          debugflags: mask,    1->print parameters, 2->print memory allocations debug messages\n \
-                               4->print command line processing debug messages\n ";
-			       
-#define CONFIG_SECTIONNAME "config"
-#define CONFIGPARAM_DEBUGFLAGS_IDX        0
-
-
-static paramdef_t Config_Params[] = {
-/*-----------------------------------------------------------------------------------------------------------------------*/
-/*                                            config parameters for config module                                        */
-/*   optname              helpstr           paramflags     XXXptr       defXXXval            type       numelt           */
-/*-----------------------------------------------------------------------------------------------------------------------*/
-{"debugflags",            config_helpstr,   0,             uptr:NULL,   defintval:0,        TYPE_MASK,  0}, 
-};
-
-#else
-extern configmodule_interface_t *cfgptr;
-#endif
-
-
-#define printf_params(...) if ( (cfgptr->rtflags & CONFIG_PRINTPARAMS) != 0 )  { printf ( __VA_ARGS__ ); }
-#define printf_ptrs(...)   if ( (cfgptr->rtflags & CONFIG_DEBUGPTR) != 0 )     { printf ( __VA_ARGS__ ); }     
-#define printf_cmdl(...)   if ( (cfgptr->rtflags & CONFIG_DEBUGCMDLINE) != 0 ) { printf ( __VA_ARGS__ ); }
- 
-extern configmodule_interface_t *load_configmodule(int argc, char **argv);
-extern void end_configmodule(void);
-
-#endif  /* INCLUDE_CONFIG_LOADCONFIGMODULE_H */

common/config/config_paramdesc.h

@@ -1,120 +0,0 @@
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.0  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-/*! \file common/config/config_paramdesc.h
- * \brief configuration module, include file describing parameters, common to all implementations
- * \author Francois TABURET
- * \date 2017
- * \version 0.1
- * \company NOKIA BellLabs France
- * \email: francois.taburet@nokia-bell-labs.com
- * \note
- * \warning
- */
-#include <stdint.h>
-#ifndef INCLUDE_CONFIG_PARAMDESC_H
-#define INCLUDE_CONFIG_PARAMDESC_H
-
-
-
-
-
-#define MAX_OPTNAME_SIZE 64
-
-
-
-/* parameter flags definitions */
-/*   Flags to be used by calling modules in their parameters definitions to modify  config module behavior*/
-#define PARAMFLAG_MANDATORY               (1 << 0)         // parameter must be explicitely set, default value ignored
-#define PARAMFLAG_DISABLECMDLINE          (1 << 1)         // parameter cannot bet set from comand line
-#define PARAMFLAG_DONOTREAD               (1 << 2)         // parameter must be ignored in get function
-#define PARAMFLAG_NOFREE                  (1 << 3)         // don't free parameter in end function
-#define PARAMFLAG_BOOL                    (1 << 4)         // integer param can be 0 or 1
-
-
-/*   Flags used by config modules to return info to calling modules and/or to  for internal usage*/
-#define PARAMFLAG_MALLOCINCONFIG          (1 << 15)        // parameter allocated in config module
-#define PARAMFLAG_PARAMSET                (1 << 16)        // parameter has been explicitely set in get functions
-#define PARAMFLAG_PARAMSETDEF             (1 << 17)        // parameter has been set to default value in get functions
-
-typedef struct paramdef
-{
-   char optname[MAX_OPTNAME_SIZE];        /* parameter name, can be used as long command line option */
-   char *helpstr;                         /* help string */
-   unsigned int paramflags;               /* value is a "ored" combination of above PARAMFLAG_XXXX values */
-   union {                                /* pointer to the parameter value, completed by the config module */
-     char **strptr;
-     char **strlistptr;
-     uint8_t   *u8ptr;
-     char      *i8ptr;     
-     uint16_t  *u16ptr;
-     int16_t   *i16ptr;
-     uint32_t  *uptr;
-     int32_t   *iptr;
-     uint64_t  *u64ptr;
-     int64_t   *i64ptr;
-     double    *dblptr;
-     } ;
-   union {                                /* default parameter value, to be used when PARAMFLAG_MANDATORY is not specified */
-     char *defstrval;
-     char **defstrlistval;
-     uint32_t defuintval;
-     int defintval;
-     uint64_t defint64val;
-     int *defintarrayval;
-     double defdblval;
-     } ;   
-   char type;                              /* parameter value type, as listed below as TYPE_XXXX macro */
-   int numelt;                             /* number of elements in a list or array parameters or max size of string value */ 
-} paramdef_t;
-
-#define TYPE_INT        TYPE_INT32
-#define TYPE_UINT       TYPE_UINT32
-#define TYPE_STRING     1
-#define TYPE_INT8       2
-#define TYPE_UINT8      3
-#define TYPE_INT16      4
-#define TYPE_UINT16     5
-#define TYPE_INT32      6
-#define TYPE_UINT32     7
-#define TYPE_INT64      8
-#define TYPE_UINT64     9
-#define TYPE_MASK       10
-#define TYPE_DOUBLE     16
-#define TYPE_IPV4ADDR   20
-
-
-#define TYPE_STRINGLIST 50
-#define TYPE_INTARRAY   51
-#define TYPE_UINTARRAY  52
-#define TYPE_LIST       55
-
-#define ANY_IPV4ADDR_STRING "0.0.0.0"
-
-typedef struct paramlist_def {
-    char listname[MAX_OPTNAME_SIZE];
-    paramdef_t **paramarray;
-    int numelt ;
-} paramlist_def_t;
-
-/* macro helpers for module users */
-#define CONFIG_PARAMLENGTH(A)    (sizeof(A)/sizeof(paramdef_t))
-#endif  /* INCLUDE_CONFIG_PARAMDESC_H */

common/config/config_userapi.c

@@ -1,157 +0,0 @@
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.0  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-/*! \file common/config/config_userapi.c
- * \brief configuration module, api implementation to access configuration parameters
- * \author Francois TABURET
- * \date 2017
- * \version 0.1
- * \company NOKIA BellLabs France
- * \email: francois.taburet@nokia-bell-labs.com
- * \note
- * \warning
- */
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <errno.h>
-#include <dlfcn.h>
-#include "config_userapi.h"
-
-
-configmodule_interface_t *config_get_if(void)
-{
-    if (cfgptr == NULL) {
-        fprintf(stderr,"[CONFIG] %s %d config module not initialized\n",__FILE__, __LINE__);
-	exit(-1);
-    }
-    return cfgptr;
-}
-
-char * config_check_valptr(paramdef_t *cfgoptions, char **ptr, int length) 
-{
-
-     printf_ptrs("[CONFIG] %s ptr: 0x%08lx requested size: %i\n",cfgoptions->optname,(uintptr_t)(ptr),length);
-     if(cfgoptions->numelt > 0) { /* already allocated */
-          return *ptr;
-     }
-
-     if (*ptr == NULL) {
-        *ptr = malloc(length);
-        if ( *ptr != NULL) {
-             memset(*ptr,0,length);
-             if ( (cfgoptions->paramflags & PARAMFLAG_NOFREE) != 0) {
-                 config_get_if()->ptrs[config_get_if()->numptrs] = *ptr;
-                 config_get_if()->numptrs++;
-             }
-        } else {
-             fprintf (stderr,"[CONFIG] %s %d malloc error\n",__FILE__, __LINE__);
-             exit(-1);
-        }       
-     }
-     return *ptr;
-}
-
-void config_assign_int(paramdef_t *cfgoptions, char *fullname, int val)
-{
-int tmpval=val;
-  if ( ((cfgoptions->paramflags &PARAMFLAG_BOOL) != 0) && tmpval >1) {
-      tmpval =1;
-  }
-  switch (cfgoptions->type) {
-       	case TYPE_UINT8:
-	     *(cfgoptions->u8ptr) = (uint8_t)tmpval;
-	     printf_params("[CONFIG] %s: %u\n", fullname, (uint8_t)tmpval);
-	break;
-       	case TYPE_INT8:
-	     *(cfgoptions->i8ptr) = (int8_t)tmpval;
-	     printf_params("[CONFIG] %s: %i\n", fullname, (int8_t)tmpval);
-	break;		
-       	case TYPE_UINT16:
-	     *(cfgoptions->u16ptr) = (uint16_t)tmpval;
-	     printf_params("[CONFIG] %s: %hu\n", fullname, (uint16_t)tmpval);     
-	break;
-       	case TYPE_INT16:
-	     *(cfgoptions->i16ptr) = (int16_t)tmpval;
-	     printf_params("[CONFIG] %s: %hi\n", fullname, (int16_t)tmpval);
-	break;	
-       	case TYPE_UINT32:
-	     *(cfgoptions->uptr) = (uint32_t)tmpval;
-	     printf_params("[CONFIG] %s: %u\n", fullname, (uint32_t)tmpval);
-	break;
-       	case TYPE_MASK:
-	     *(cfgoptions->uptr) = *(cfgoptions->uptr) | (uint32_t)tmpval;
-	     printf_params("[CONFIG] %s: 0x%08x\n", fullname, (uint32_t)tmpval);
-	break;
-       	case TYPE_INT32:
-	     *(cfgoptions->iptr) = (int32_t)tmpval;
-	     printf_params("[CONFIG] %s: %i\n", fullname, (int32_t)tmpval);
-	break;	
-	default:
-	     fprintf (stderr,"[CONFIG] %s %i type %i non integer parameter %s not assigned\n",__FILE__, __LINE__,cfgoptions->type,fullname);
-	break;
-  }
-}
-
-void config_printhelp(paramdef_t *params,int numparams)
-{
-   for (int i=0 ; i<numparams ; i++) {
-       if ( params[i].helpstr != NULL) {
-           printf("%s%s: %s",
-	           (strlen(params[i].optname) <= 1) ? "-" : "--", 
-	           params[i].optname,
-	           params[i].helpstr);
-       }
-   }
-}
-
-int config_get(paramdef_t *params,int numparams, char *prefix)
-{
-int ret= -1;
-
-if (CONFIG_ISFLAGSET(CONFIG_ABORT)) {
-    fprintf(stderr,"[CONFIG] config_get skipped, config module not properly initialized\n");
-    return ret;
-}
-configmodule_interface_t *cfgif = config_get_if();
-  if (cfgif != NULL) {
-      ret = config_get_if()->get(params, numparams,prefix);
-      if (ret >= 0) {
-         config_process_cmdline(params,numparams,prefix);
-     }
-  return ret;
-  }
-return ret;
-}
-
-int config_isparamset(paramdef_t *params,int paramidx)
-{
-  if ((params[paramidx].paramflags & PARAMFLAG_PARAMSET) != 0) {
-      return 1;
-  } else {
-      return 0;
-  }
-}
-
-int config_getparamval_fromparamdefidx(paramdef_t *cfgoptions,int paramidx) {
-    return -1;
-}

common/config/config_userapi.h

@@ -1,65 +0,0 @@
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.0  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-/*! \file common/config/config_userapi.h
- * \brief: configuration module, include file to be used by the source code calling the 
- *  configuration module to access configuration parameters
- * \author Francois TABURET
- * \date 2017
- * \version 0.1
- * \company NOKIA BellLabs France
- * \email: francois.taburet@nokia-bell-labs.com
- * \note
- * \warning
- */
-#ifndef INCLUDE_CONFIG_USERAPI_H
-#define INCLUDE_CONFIG_USERAPI_H 
-#include "config_load_configmodule.h"
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-#define DEFAULT_CFGFILENAME "oaisoftmodem.conf"
-#define DEFAULT_CFGMODE     "libconfig"
-
-#define CONFIG_GETSOURCE    ( (config_get_if()==NULL) ? NULL : config_get_if()->cfgmode       )
-#define CONFIG_GETNUMP      ( (config_get_if()==NULL) ? 0    : config_get_if()->num_cfgP      )
-#define CONFIG_GETP(P)      ( (config_get_if()==NULL) ? NULL : config_get_if()->cfgP[P]       )
-#define CONFIG_ISFLAGSET(P) ( (config_get_if()==NULL) ? 0    : !!(config_get_if()->rtflags & P))
-
-extern configmodule_interface_t *config_get_if(void);
-extern char * config_check_valptr(paramdef_t *cfgoptions, char **ptr, int length) ;
-extern void config_printhelp(paramdef_t *,int numparams);
-extern int config_process_cmdline(paramdef_t *params,int numparams, char *prefix);
-extern int config_get(paramdef_t *params,int numparams, char *prefix);
-extern int config_isparamset(paramdef_t *params,int paramidx);
-extern void config_assign_int(paramdef_t *cfgoptions, char *fullname, int val);
-extern int config_process_cmdline(paramdef_t *cfgoptions,int numoptions, char *prefix);
-extern int config_getparamval_fromparamdefidx(paramdef_t *cfgoptions,int paramidx);
-#define config_getlist config_get_if()->getlist
-#define CONFIG_GETCONFFILE (config_get_if()->cfgP[0])
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

common/config/libconfig/config_libconfig.c

@@ -1,379 +0,0 @@
-#define _GNU_SOURCE
-#include <libconfig.h>
-
-#include <string.h>
-#include <stdlib.h>
-
-#include <arpa/inet.h>
-
-#include "config_libconfig.h"
-#include "config_libconfig_private.h"
-#include "../config_userapi.h"
-#include "errno.h"
-
-#if ( LIBCONFIG_VER_MAJOR == 1 && LIBCONFIG_VER_MINOR < 5)
-#define config_setting_lookup config_lookup_from
-#endif
-
-void config_libconfig_end(void );
-
-int read_strlist(paramdef_t *cfgoptions,config_setting_t *setting, char *cfgpath)
-{
-const char *str;
-int st;
-
-   cfgoptions->numelt=config_setting_length(setting);
-   cfgoptions->strlistptr=malloc(sizeof(char *) * (cfgoptions->numelt));
-   st=0;
-   for (int i=0; i< cfgoptions->numelt && cfgoptions->strlistptr != NULL; i++) {
-       str=config_setting_get_string_elem(setting,i);
-       if (str==NULL) {
-          printf("[LIBCONFIG] %s%i  not found in config file\n", cfgoptions->optname,i);
-       } else {
-            cfgoptions->strlistptr[i]=malloc(strlen(str)+1);
-            sprintf(cfgoptions->strlistptr[i],"%s",str);
-	    st++;
-            printf_params("[LIBCONFIG] %s%i: %s\n", cfgpath,i,cfgoptions->strlistptr[i]);
-       }
-   }
-   return st;
-}
-
-int read_intarray(paramdef_t *cfgoptions,config_setting_t *setting, char *cfgpath)
-{
-
-   cfgoptions->numelt=config_setting_length(setting);
-   
-   if (cfgoptions->numelt > 0) {
-       cfgoptions->iptr=malloc(sizeof(int) * (cfgoptions->numelt));
-       for (int i=0; i< cfgoptions->numelt && cfgoptions->iptr != NULL; i++) {
-            cfgoptions->iptr[i]=config_setting_get_int_elem(setting,i);
-            printf_params("[LIBCONFIG] %s[%i]: %i\n", cfgpath,i,cfgoptions->iptr[i]);
-       } /* for loop on array element... */
-   }
-   return cfgoptions->numelt;
-}
-
-
-
-
-int config_libconfig_get(paramdef_t *cfgoptions,int numoptions, char *prefix )
-{
-
-
-  config_setting_t *setting;
-  char *str;
-  int i,u;
-  long long int llu;
-  double dbl; 
-  int rst;
-  int status=0;
-  int notfound;
-  int defval;
-  int fatalerror=0;
-  char *cfgpath; /* listname.[listindex].paramname */
-  int numdefvals=0;
-  
-  i = (prefix ==NULL) ? 0 : strlen(prefix); 
-  cfgpath = malloc( i+ MAX_OPTNAME_SIZE +1);
-  if (cfgpath == NULL) {
-     fprintf(stderr,"[LIBCONFIG] %s %i malloc error,  %s\n", __FILE__, __LINE__,strerror(errno));
-     return -1;
-  }
-  for(i=0;i<numoptions;i++) {
-
-     if (prefix != NULL) {
-         sprintf(cfgpath,"%s.%s",prefix,cfgoptions[i].optname);
-     } else {
-         sprintf(cfgpath,"%s",cfgoptions[i].optname);
-     }
-
-     if( (cfgoptions->paramflags & PARAMFLAG_DONOTREAD) != 0) {
-         printf_params("[LIBCONFIG] %s.%s ignored\n", cfgpath,cfgoptions[i].optname );
-         continue;
-     }
-     notfound=0;
-     defval=0;
-     switch(cfgoptions[i].type)
-       {
-       	case TYPE_STRING:
-           
-           if ( config_lookup_string(&(libconfig_privdata.cfg),cfgpath, (const char **)&str)) {
-              if ( cfgoptions[i].numelt > 0  && str != NULL && strlen(str) >= cfgoptions[i].numelt ) {
-                  fprintf(stderr,"[LIBCONFIG] %s:  %s exceeds maximum length of %i bytes, value truncated\n",
-                           cfgpath,str,cfgoptions[i].numelt); 
-                  str[strlen(str)-1] = 0;
-              }
-              if (cfgoptions[i].numelt == 0 ) {
-                  config_check_valptr(&(cfgoptions[i]), (char **)(&(cfgoptions[i].strptr)), sizeof(char *));
-                  config_check_valptr(&(cfgoptions[i]), cfgoptions[i].strptr, strlen(str)+1);
-                  sprintf( *(cfgoptions[i].strptr) , "%s", str);
-                  printf_params("[LIBCONFIG] %s: %s\n", cfgpath,*(cfgoptions[i].strptr) );
-              } else {
-                 sprintf( (char *)(cfgoptions[i].strptr) , "%s", str);
-                 printf_params("[LIBCONFIG] %s: %s\n", cfgpath,(char *)cfgoptions[i].strptr );
-              }
-           } else {
-	      if( cfgoptions[i].defstrval != NULL) {
-                 defval=1;
- 
-                 if (cfgoptions[i].numelt == 0 ) {
-                     config_check_valptr(&(cfgoptions[i]), (char **)(&(cfgoptions[i].strptr)), sizeof(char *));
-                     config_check_valptr(&(cfgoptions[i]), cfgoptions[i].strptr, strlen(cfgoptions[i].defstrval)+1);
-                     sprintf(*(cfgoptions[i].strptr), "%s",cfgoptions[i].defstrval);
-                     printf_params("[LIBCONFIG] %s set to default value %s\n", cfgpath, *(cfgoptions[i].strptr));
-                 } else {
-                    sprintf((char *)(cfgoptions[i].strptr), "%s",cfgoptions[i].defstrval);
-                    printf_params("[LIBCONFIG] %s set to default value %s\n", cfgpath, (char *)cfgoptions[i].strptr);
-                 }
-              } else {
-	         notfound=1;
-              } 
-	   }
-       break;
-       	case TYPE_STRINGLIST:
-	   setting = config_setting_lookup (config_root_setting(&(libconfig_privdata.cfg)),cfgpath );
-           if ( setting != NULL) {
-              read_strlist(&cfgoptions[i],setting,cfgpath);
-           } else {
-              if( cfgoptions[i].defstrlistval != NULL) {
-                  cfgoptions[i].strlistptr=cfgoptions[i].defstrlistval;
-                  defval=1;
-		for(int j=0; j<cfgoptions[i].numelt; j++)
-                     printf_params("[LIBCONFIG] %s%i set to default value %s\n", cfgpath,j, cfgoptions[i].strlistptr[j]);
-              } else {
-                notfound=1;
-              }
-	   }
-       break;
-       	case TYPE_UINT8:
-       	case TYPE_INT8:	
-       	case TYPE_UINT16:
-       	case TYPE_INT16:
-       	case TYPE_UINT32:
-       	case TYPE_INT32:
-       	case TYPE_MASK:	
-           config_check_valptr(&(cfgoptions[i]), (char **)(&(cfgoptions[i].iptr)),sizeof(int32_t));
-           if ( config_lookup_int(&(libconfig_privdata.cfg),cfgpath, &u)) {
-	      config_assign_int(&(cfgoptions[i]),cfgpath,u);
-           } else {
-	      if( ((cfgoptions[i].paramflags & PARAMFLAG_MANDATORY) == 0)) {
-                 config_assign_int(&(cfgoptions[i]),cfgpath,cfgoptions[i].defintval);
-                 defval=1;
-                 printf_params("[LIBCONFIG] %s set to default value\n", cfgpath);
-              } else {
-	         notfound=1;
-              }
-	   }	      
-        break;
-       	case TYPE_UINT64:
-       	case TYPE_INT64:
-           config_check_valptr(&(cfgoptions[i]), (char **)&(cfgoptions[i].i64ptr),sizeof(long long));
-           if ( config_lookup_int64(&(libconfig_privdata.cfg),cfgpath, &llu)) {
-              if(cfgoptions[i].type==TYPE_UINT64) {
-                 *(cfgoptions[i].u64ptr) = (uint64_t)llu;
-                 printf_params("[LIBCONFIG] %s: %llu\n", cfgpath,(long long unsigned)(*(cfgoptions[i].u64ptr)) );
-              } else {
-                 *(cfgoptions[i].iptr) = llu;
-                 printf_params("[LIBCONFIG] %s: %lli\n", cfgpath,(long long unsigned)(*(cfgoptions[i].i64ptr)) ); 
-              }
-           } else {
-	      if( ((cfgoptions[i].paramflags & PARAMFLAG_MANDATORY) == 0)) {
-                 *(cfgoptions[i].u64ptr)=cfgoptions[i].defuintval;
-                 defval=1;
-                 printf_params("[LIBCONFIG] %s set to default value %llu\n", cfgpath, (long long unsigned)(*(cfgoptions[i].u64ptr)));
-              } else {
-	         notfound=1;
-              }
-	   }	      
-        break;        
-       	case TYPE_UINTARRAY:
-       	case TYPE_INTARRAY:
-	   setting = config_setting_lookup (config_root_setting(&(libconfig_privdata.cfg)),cfgpath );
-           if ( setting != NULL) {
-              read_intarray(&cfgoptions[i],setting,cfgpath);
-           } else {
-              if( cfgoptions[i].defintarrayval != NULL) {
-                config_check_valptr(&(cfgoptions[i]),(char **)&(cfgoptions[i].iptr), sizeof(int32_t*));
-                cfgoptions[i].iptr=cfgoptions[i].defintarrayval;
-                defval=1;
-                for (int j=0; j<cfgoptions[i].numelt ; j++) {
-                    printf_params("[LIBCONFIG] %s[%i] set to default value %i\n", cfgpath,j,(int)cfgoptions[i].iptr[j]);
-                }
-              } else {
-                notfound=1;
-              }
-	   }    
-        break;
-       	case TYPE_DOUBLE:
-           config_check_valptr(&(cfgoptions[i]), (char **)&(cfgoptions[i].dblptr),sizeof(double));
-           if ( config_lookup_float(&(libconfig_privdata.cfg),cfgpath, &dbl)) {
-                 *(cfgoptions[i].dblptr) = dbl;
-                 printf_params("[LIBCONFIG] %s: %lf\n", cfgpath,*(cfgoptions[i].dblptr) );
-           } else {
-	      if( ((cfgoptions[i].paramflags & PARAMFLAG_MANDATORY) == 0)) {
-                 *(cfgoptions[i].u64ptr)=cfgoptions[i].defdblval;
-                 defval=1;
-                 printf_params("[LIBCONFIG] %s set to default value %lf\n", cfgpath, *(cfgoptions[i].dblptr));
-              } else {
-	         notfound=1;
-              }
-	   }	      
-        break;  
-       	case TYPE_IPV4ADDR:
-           config_check_valptr(&(cfgoptions[i]),(char **)&(cfgoptions[i].uptr), sizeof(int));
-           if ( !config_lookup_string(&(libconfig_privdata.cfg),cfgpath, (const char **)&str)) {
-	      str=cfgoptions[i].defstrval;
-              defval=1;
-	      printf_params("[LIBCONFIG] %s set to default value %s\n", cfgpath, str);
-	   }
-	   if (str != NULL) {
-              rst=inet_pton(AF_INET, str,cfgoptions[i].uptr );
-	      if (rst == 1 && *(cfgoptions[i].uptr) > 0) {
-                 printf_params("[LIBCONFIG] %s: %s\n", cfgpath,str );
-              } else {
-		 if ( strncmp(str,ANY_IPV4ADDR_STRING,sizeof(ANY_IPV4ADDR_STRING)) == 0) {
-		    printf_params("[LIBCONFIG] %s:%s (INADDR_ANY) \n",cfgpath,str);
-		    *cfgoptions[i].uptr=INADDR_ANY;
-		 } else {
-		    fprintf(stderr,"[LIBCONFIG] %s not valid for %s \n", str, cfgpath);
-                    fatalerror=1;
-                 }
-              }
-           } else {
-	      notfound=1;
-	   }
-              
-        break;
-       	case TYPE_LIST:
-	   setting = config_setting_lookup (config_root_setting(&(libconfig_privdata.cfg)),cfgpath );
-           if ( setting) {
-              cfgoptions[i].numelt=config_setting_length(setting);
-           } else {
-              notfound=1;
-	   }
-       break;
-       default:
-            fprintf(stderr,"[LIBCONFIG] %s type %i  not supported\n", cfgpath,cfgoptions[i].type);
-            fatalerror=1;
-       break;
-       } /* switch on param type */
-    if( notfound == 1) {
-        printf("[LIBCONFIG] %s not found in %s ", cfgpath,libconfig_privdata.configfile );
-        if ( (cfgoptions[i].paramflags & PARAMFLAG_MANDATORY) != 0) {
-            fatalerror=1;
-            printf("  mandatory parameter missing\n");
-        } else {
-           printf("\n");
-        }
-    } else {
-      if (defval == 1) {
-          numdefvals++;
-	  cfgoptions[i].paramflags = cfgoptions[i].paramflags |  PARAMFLAG_PARAMSETDEF;
-      } else {
-          cfgoptions[i].paramflags = cfgoptions[i].paramflags |  PARAMFLAG_PARAMSET;
-      }
-      status++;
-    }
-  } /* for loop on options */
-  printf("[LIBCONFIG] %s: %i/%i parameters successfully set, (%i to default value)\n",
-         ((prefix == NULL)?"(root)":prefix), 
-         status,numoptions,numdefvals );
-  if (fatalerror == 1) {
-      fprintf(stderr,"[LIBCONFIG] fatal errors found when processing  %s \n", libconfig_privdata.configfile );
-      config_libconfig_end();
-      end_configmodule();
-  }
-  free(cfgpath);
-  return status;
-}
-
-int config_libconfig_getlist(paramlist_def_t *ParamList, 
-                                   paramdef_t *params, int numparams, char *prefix)
-{
-config_setting_t *setting;
-int i,j,status;
-char *listpath=NULL;
-char cfgpath[MAX_OPTNAME_SIZE*2 + 6]; /* prefix.listname.[listindex] */
-
-    if (prefix != NULL)
-        {
-        i=asprintf(&listpath ,"%s.%s",prefix,ParamList->listname);
-        }
-    else
-        {
-        i=asprintf(&listpath ,"%s",ParamList->listname);
-        }
-    setting = config_lookup(&(libconfig_privdata.cfg), listpath);
-    if ( setting) {
-        status = ParamList->numelt = config_setting_length(setting);
-        printf_params("[LIBCONFIG] %i %s in config file %s \n", 
-               ParamList->numelt,listpath,libconfig_privdata.configfile );
-    } else {
-        printf("[LIBCONFIG] list %s not found in config file %s \n", 
-               listpath,libconfig_privdata.configfile );
-        ParamList->numelt= 0;
-        status = -1;
-    }
-    if (ParamList->numelt > 0 && params != NULL) {
-        ParamList->paramarray = malloc(ParamList->numelt * sizeof(paramdef_t *));
-        if ( ParamList->paramarray != NULL) {
-             config_get_if()->ptrs[config_get_if()->numptrs] = (char *)(ParamList->paramarray); 
-             config_get_if()->numptrs++;
-        } else {
-             fprintf (stderr,"[LIBCONFIG] %s %d malloc error\n",__FILE__, __LINE__);
-             exit(-1);
-        }
-        for (i=0 ; i < ParamList->numelt ; i++) {
-            ParamList->paramarray[i] = malloc(numparams * sizeof(paramdef_t));
-            if ( ParamList->paramarray[i] != NULL) {
-                 config_get_if()->ptrs[config_get_if()->numptrs] = (char *)(ParamList->paramarray[i]); 
-                 config_get_if()->numptrs++;
-            } else {
-                 fprintf (stderr,"[LIBCONFIG] %s %d malloc error\n",__FILE__, __LINE__);
-                 exit(-1);
-            }
-            
-            memcpy(ParamList->paramarray[i], params, sizeof(paramdef_t)*numparams);
-            for (j=0;j<numparams;j++) {
-                ParamList->paramarray[i][j].strptr = NULL ;
-                } 
-            sprintf(cfgpath,"%s.[%i]",listpath,i);
-            config_libconfig_get(ParamList->paramarray[i], numparams, cfgpath );
-        } /* for i... */
-    } /* ParamList->numelt > 0 && params != NULL */
-    if (listpath != NULL)
-        free(listpath);
-    return status;
-}
-
-int config_libconfig_init(char *cfgP[], int numP)
-{
-  config_init(&(libconfig_privdata.cfg));
-  libconfig_privdata.configfile = strdup((char *)cfgP[0]);
-  config_get_if()->numptrs=0;
-  memset(config_get_if()->ptrs,0,sizeof(void *) * CONFIG_MAX_ALLOCATEDPTRS);
-
-  /* Read the file. If there is an error, report it and exit. */
-  if(! config_read_file(&(libconfig_privdata.cfg), libconfig_privdata.configfile)) {
-    fprintf(stderr,"[LIBCONFIG] %s %d file %s - %d - %s\n",__FILE__, __LINE__,
-                   libconfig_privdata.configfile, config_error_line(&(libconfig_privdata.cfg)),
-                   config_error_text(&(libconfig_privdata.cfg)));
-    config_destroy(&(libconfig_privdata.cfg));
-    printf( "\n");
-    return -1;
-  }
-  
-
-  return 0;
-}
-
-
-void config_libconfig_end(void )
-{
-  config_destroy(&(libconfig_privdata.cfg));
-  if ( libconfig_privdata.configfile != NULL ) {
-     free(libconfig_privdata.configfile);
-  } 
-  
-}

common/config/libconfig/config_libconfig.h

@@ -1,54 +0,0 @@
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.0  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-/*! \file common/config/libconfig/config_libconfig.c
- * \brief configuration module, include file for libconfig implementation 
- * \author Francois TABURET
- * \date 2017
- * \version 0.1
- * \company NOKIA BellLabs France
- * \email: francois.taburet@nokia-bell-labs.com
- * \note
- * \warning
- */
-#ifndef INCLUDE_CONFIG_LIBCONFIG_H
-#define INCLUDE_CONFIG_LIBCONFIG_H
-
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-#include "common/config/config_paramdesc.h"
-
-
-
- 
-typedef struct libconfig_privatedata {
-      char *configfile;
-      config_t cfg;
-} libconfig_privatedata_t;
- 
-#ifdef __cplusplus
-}
-#endif
-#endif  /* INCLUDE_CONFIG_LIBCONFIG_H */

common/config/libconfig/config_libconfig_private.h

@@ -1,39 +0,0 @@
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.0  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-/*! \file common/config/libconfig/config_libconfig_private.h
- * \brief configuration module, include file for libconfig implementation 
- * \author Francois TABURET
- * \date 2017
- * \version 0.1
- * \company NOKIA BellLabs France
- * \email: francois.taburet@nokia-bell-labs.com
- * \note
- * \warning
- */
-
-
-static libconfig_privatedata_t libconfig_privdata;
-
-
-
-      
-

common/ran_context.h

@@ -1,86 +0,0 @@
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.0  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-/*! \file PHY/impl_defs_lte.h
-* \brief LTE Physical channel configuration and variable structure definitions
-* \author R. Knopp, F. Kaltenberger
-* \date 2011
-* \version 0.1
-* \company Eurecom
-* \email: knopp@eurecom.fr,florian.kaltenberger@eurecom.fr
-* \note
-* \warning
-*/
-
-#ifndef __RAN_CONTEXT_H__
-#define __RAN_CONTEXT_H__
-
-#include <pthread.h>
-#include "COMMON/platform_constants.h"
-#include "PHY/defs.h"
-#include "PHY/types.h"
-#include "PHY/impl_defs_top.h"
-#include "PHY/impl_defs_lte.h"
-#include "RRC/LITE/defs.h"
-
-#include "gtpv1u.h"
-#include "NwGtpv1u.h"
-#include "NwGtpv1uMsg.h"
-#include "NwGtpv1uPrivate.h"
-#include "gtpv1u_eNB_defs.h"
-
-typedef struct {
-  /// RAN context config file name
-  char *config_file_name;
-  /// Number of RRC instances in this node
-  int nb_inst;
-  /// Number of Component Carriers per instance in this node
-  int *nb_CC;
-  /// Number of MACRLC instances in this node
-  int nb_macrlc_inst;
-  /// Number of component carriers per instance in this node
-  int *nb_mac_CC;
-  /// Number of L1 instances in this node
-  int nb_L1_inst;
-  /// Number of Component Carriers per instance in this node
-  int *nb_L1_CC;
-  /// Number of RU instances in this node
-  int nb_RU;
-  /// eNB context variables
-  struct PHY_VARS_eNB_s ***eNB;
-  /// RRC context variables
-  struct eNB_RRC_INST_s **rrc;
-  /// RRC context variables
-  struct eNB_MAC_INST_s **mac;
-  /// GTPu descriptor 
-  gtpv1u_data_t *gtpv1u_data_g;
-  /// RU descriptors. These describe what each radio unit is supposed to do and contain the necessary functions for fronthaul interfaces
-  struct RU_t_s **ru;
-  /// Mask to indicate fronthaul setup status of RU (hard-limit to 64 RUs)
-  uint64_t ru_mask;
-  /// Mutex for protecting ru_mask
-  pthread_mutex_t ru_mutex;
-  /// condition variable for signaling setup completion of an RU
-  pthread_cond_t ru_cond;
-} RAN_CONTEXT_t;
-
-
-#endif

common/utils/Makefile.inc

@@ -0,0 +1,59 @@
+export KERNEL_DIR=/lib/modules/$(shell uname -r)/
+CC=gcc
+CCC=gcc
+linux := $(shell if [ `uname` = "Linux" ] ; then echo "1" ; else echo "0" ; fi)
+
+
+CFLAGS += -std=gnu99 
+CFLAGS += -Wall -g -ggdb -Wstrict-prototypes -fno-strict-aliasing 
+
+# Need to force this option because default kernel module builder is wrong
+CFLAGS += $(call cc-option,-mpreferred-stack-boundary=4)
+
+#For performance, if some option doesn't exist in all gcc versions, use $(call cc-option,MY_OPTION)
+#CFLAGS += -O2
+#CFLAGS +=  -funroll-loops 
+CFLAGS += -Wno-packed-bitfield-compat 
+
+# This is the minimum CPU faetures for OAI
+CFLAGS += -mmmx -msse -msse2 -mssse3 -msse4.1
+# Add CPU features from local CPU
+#CFLAGS += -march=native
+
+ifeq ($(OSTYPE),Cygwin)
+cygwin=1
+CFLAGS += -DCYGWIN
+else
+cygwin=0
+endif
+
+ifeq ($(linux),1)
+CFLAGS += 
+LDFLAGS += 
+endif
+
+ITTI_DIR = $(COMMON_UTILS_DIR)/itti
+
+ITTI_OBJS =  $(ITTI_DIR)/intertask_interface.o
+ITTI_OBJS += $(ITTI_DIR)/intertask_interface_dump.o
+ITTI_OBJS += $(ITTI_DIR)/backtrace.o
+ITTI_OBJS += $(ITTI_DIR)/memory_pools.o
+ITTI_OBJS += $(ITTI_DIR)/signals.o
+ITTI_OBJS += $(ITTI_DIR)/timer.o
+
+
+HASHTABLE_DIR = $(COMMON_UTILS_DIR)/collection/hashtable
+MSC_DIR = $(COMMON_UTILS_DIR)/msc
+
+HASHTABLE_OBJS =  $(HASHTABLE_DIR)/hashtable.o
+HASHTABLE_OBJS += $(HASHTABLE_DIR)/obj_hashtable.o
+
+UTILS_OBJS = $(ITTI_OBJS) $(HASHTABLE_OBJS)  
+
+UTILS_incl = 				\
+    -I$(COMMON_UTILS_DIR)   \
+    -I$(HASHTABLE_DIR)      \
+    -I$(ITTI_DIR) \
+    -I$(MSC_DIR)
+
+print-%  : ; @echo $* = $($*)

common/utils/T/.gitignore

@@ -10,9 +10,4 @@ tracer/replay
 tracer/textlog
 tracer/vcd
 tracer/macpdu2wireshark
-tracer/ue
-tracer/to_vcd
-tracer/extract_input_subframe
-tracer/extract_output_subframe
-tracer/extract
 tracee/tracee

common/utils/T/T.c

@@ -36,7 +36,7 @@ static void get_message(int s)
   int is_on;
 
   if (read(s, &t, 1) != 1) QUIT("get_message fails");
-printf("T tracer: got mess %d\n", t);
+printf("got mess %d\n", t);
   switch (t) {
   case 0:
     /* toggle all those IDs */

common/utils/T/T.h

@@ -184,30 +184,8 @@ extern T_cache_t *T_cache;
   } while (0)
 #endif
 
-/* we have 4 versions of T_HEADER:
- * - bad quality C++ version with time
- * - good quality C version with time
- * - bad quality C++ version without time
- * - good quality C version without time
- */
-
 #ifdef T_SEND_TIME
 
-#ifdef __cplusplus
-
-/* C++ version of T_HEADER with time */
-#define T_HEADER(x) \
-  do { \
-    struct timespec T_HEADER_time; \
-    if (clock_gettime(CLOCK_REALTIME, &T_HEADER_time)) abort(); \
-    memcpy(T_LOCAL_buf, &T_HEADER_time, sizeof(struct timespec)); \
-    T_LOCAL_size += sizeof(struct timespec); \
-    T_PUT_int(1, (int)(uintptr_t)(x)); \
-  } while (0)
-
-#else /* #ifdef __cplusplus */
-
-/* C version of T_HEADER with time */
 #define T_HEADER(x) \
   do { \
     if (!__builtin_types_compatible_p(typeof(x), struct T_header *)) { \
@@ -223,21 +201,8 @@ extern T_cache_t *T_cache;
     T_PUT_int(1, (int)(uintptr_t)(x)); \
   } while (0)
 
-#endif /* #ifdef __cplusplus */
-
 #else /* #ifdef T_SEND_TIME */
 
-#ifdef __cplusplus
-
-/* C++ version of T_HEADER without time */
-#define T_HEADER(x) \
-  do { \
-    T_PUT_int(1, (int)(uintptr_t)(x)); \
-  } while (0)
-
-#else /* #ifdef __cplusplus */
-
-/* C version of T_HEADER without time */
 #define T_HEADER(x) \
   do { \
     if (!__builtin_types_compatible_p(typeof(x), struct T_header *)) { \
@@ -249,8 +214,6 @@ extern T_cache_t *T_cache;
     T_PUT_int(1, (int)(uintptr_t)(x)); \
   } while (0)
 
-#endif /* #ifdef __cplusplus */
-
 #endif /* #ifdef T_SEND_TIME */
 
 #define T1(t) \

common/utils/T/T_defs.h

@@ -29,10 +29,10 @@ typedef struct {
 #define T_SHM_FILENAME "/T_shm_segment"
 
 /* number of VCD functions (to be kept up to date! see in T_messages.txt) */
-#define VCD_NUM_FUNCTIONS 178
+#define VCD_NUM_FUNCTIONS 142
 
 /* number of VCD variables (to be kept up to date! see in T_messages.txt) */
-#define VCD_NUM_VARIABLES 128
+#define VCD_NUM_VARIABLES 107
 
 /* first VCD function (to be kept up to date! see in T_messages.txt) */
 #define VCD_FIRST_FUNCTION    ((uintptr_t)T_VCD_FUNCTION_RT_SLEEP)

common/utils/T/T_messages.txt

@@ -16,67 +16,63 @@ ID = ENB_PHY_DL_TICK
 ID = ENB_PHY_DLSCH_UE_DCI
     DESC = eNodeB downlink UE specific DCI as sent by the PHY layer
     GROUP = ALL:PHY:GRAPHIC:ENB
-    FORMAT = int,eNB_ID : int,frame : int,subframe : int,rnti : int,dci_format : int,harq_pid : int,mcs : int,TBS
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,dci_format : int,harq_pid : int,mcs : int,TBS
 ID = ENB_PHY_DLSCH_UE_ACK
     DESC = eNodeB downlink UE ACK as seen by the PHY layer in process_HARQ_feedback
     GROUP = ALL:PHY:GRAPHIC:ENB
-    FORMAT = int,eNB_ID : int,frame : int,subframe : int,rnti : int,harq_pid
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,harq_pid
 ID = ENB_PHY_DLSCH_UE_NACK
     DESC = eNodeB downlink UE NACK as seen by the PHY layer in process_HARQ_feedback
     GROUP = ALL:PHY:GRAPHIC:ENB
-    FORMAT = int,eNB_ID : int,frame : int,subframe : int,rnti : int,harq_pid
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,harq_pid
 ID = ENB_PHY_ULSCH_UE_DCI
     DESC = eNodeB uplink UE specific DCI as sent by the PHY layer
     GROUP = ALL:PHY:GRAPHIC:ENB
-    FORMAT = int,eNB_ID : int,frame : int,subframe : int,rnti : int,harq_pid : int,mcs : int,round : int,first_rb : int,nb_rb : int,TBS : int,L : int,firstCCE
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,harq_pid : int,mcs : int,round : int,first_rb : int,nb_rb : int,TBS
 ID = ENB_PHY_ULSCH_UE_NO_DCI_RETRANSMISSION
     DESC = eNodeB uplink UE retransmission due to PHICH NACK (see generate_phich_top)
     GROUP = ALL:PHY:GRAPHIC:ENB
-    FORMAT = int,eNB_ID : int,frame : int,subframe : int,rnti : int,harq_pid
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,harq_pid
 ID = ENB_PHY_ULSCH_UE_ACK
     DESC = eNodeB uplink UE ACK as seen by the PHY layer
     GROUP = ALL:PHY:GRAPHIC:ENB
-    FORMAT = int,eNB_ID : int,frame : int,subframe : int,rnti : int,harq_pid
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,harq_pid
 ID = ENB_PHY_ULSCH_UE_NACK
     DESC = eNodeB uplink UE NACK as seen by the PHY layer
     GROUP = ALL:PHY:GRAPHIC:ENB
-    FORMAT = int,eNB_ID : int,frame : int,subframe : int,rnti : int,harq_pid
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,harq_pid
 ID = ENB_PHY_INPUT_SIGNAL
     DESC = eNodeB received signal in the time domain for a duration of 1ms
     GROUP = ALL:PHY:GRAPHIC:HEAVY:ENB
     FORMAT = int,eNB_ID : int,frame : int,subframe : int,antenna : buffer,rxdata
-ID = ENB_PHY_OUTPUT_SIGNAL
-    DESC = eNodeB sent signal in the time domain for a duration of 1ms
-    GROUP = ALL:PHY:HEAVY:ENB
-    FORMAT = int,eNB_ID : int,CC_id : int,frame : int,subframe : int,antenna : buffer,txdata
 ID = ENB_PHY_UL_CHANNEL_ESTIMATE
     DESC = eNodeB channel estimation in the time domain
     GROUP = ALL:PHY:GRAPHIC:HEAVY:ENB
-    FORMAT = int,eNB_ID : int,rnti : int,frame : int,subframe : int,antenna : buffer,chest_t
+    FORMAT = int,eNB_ID : int,UE_ID : int,frame : int,subframe : int,antenna : buffer,chest_t
 ID = ENB_PHY_PUSCH_IQ
     DESC = eNodeB PUSCH received IQ data
     GROUP = ALL:PHY:GRAPHIC:HEAVY:ENB
-    FORMAT = int,eNB_ID : int,rnti : int,frame : int,subframe : int,nb_rb : int,N_RB_UL : int,symbols_per_tti : buffer,pusch_comp
+    FORMAT = int,eNB_ID : int,UE_ID : int,frame : int,subframe : int,nb_rb : int,N_RB_UL : int,symbols_per_tti : buffer,pusch_comp
 ID = ENB_PHY_PUCCH_1AB_IQ
     DESC = eNodeB PUCCH received IQ data
     GROUP = ALL:PHY:GRAPHIC:HEAVY:ENB
-    FORMAT = int,eNB_ID : int,rnti : int,frame : int,subframe : int,I : int,Q
+    FORMAT = int,eNB_ID : int,UE_ID : int,frame : int,subframe : int,I : int,Q
 ID = ENB_PHY_PUCCH_1_ENERGY
     DESC = eNodeB PUCCH 1 energy and threshold
     GROUP = ALL:PHY:GRAPHIC:HEAVY:ENB
-    FORMAT = int,eNB_ID : int,rnti : int,frame : int,subframe : int,energy : int,threshold
+    FORMAT = int,eNB_ID : int,UE_ID : int,frame : int,subframe : int,energy : int,threshold
 ID = ENB_PHY_PHICH
     DESC = eNodeB PHICH
     GROUP = ALL:PHY:ENB
-    FORMAT = int,eNB_ID : int,frame : int,subframe : int,rnti : int,harq_pid : int,NGROUP : int,NSF : int,ngroup : int,nseq : int,ACK : int,first_rb : int,n_DMRS
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,harq_pid : int,NGROUP : int,NSF : int,ngroup : int,nseq : int,ACK : int,first_rb : int,n_DMRS
 ID = ENB_PHY_MSG3_ALLOCATION
     DESC = eNodeB Msg3 allocation/reallocation
     GROUP = ALL:PHY:ENB
-    FORMAT = int,eNB_ID : int,frame : int,subframe : int,rnti : int,first_transmission : int,Msg3_frame : int,Msg3_subframe
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,first_transmission : int,Msg3_frame : int,Msg3_subframe
 ID = ENB_PHY_INITIATE_RA_PROCEDURE
     DESC = eNodeB initiates a random access procedure after detecting enough energy for one of the preambles
     GROUP = ALL:PHY:ENB
-    FORMAT = int,eNB_ID : int,frame : int,subframe : int,preamble : int,energy : int,delay
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,preamble : int,energy : int,delay
 
 #MAC logs
 ID = ENB_MAC_UE_DL_SDU
@@ -97,7 +93,7 @@ ID = ENB_MAC_UE_UL_PDU
     FORMAT = int,eNB_ID : int,CC_id : int,rnti : int,frame : int,subframe : int,harq_pid : int,sdu_length : int,num_ce : int,num_sdu
 ID = ENB_MAC_UE_UL_PDU_WITH_DATA
     DESC = MAC uplink UE received PDU
-    GROUP = ALL:MAC:ENB
+    GROUP = ALL:MAC:ENB:HEAVY
     FORMAT = int,eNB_ID : int,CC_id : int,rnti : int,frame : int,subframe : int,harq_pid : int,sdu_length : int,num_ce : int,num_sdu : buffer,data
 ID = ENB_MAC_UE_UL_SDU
     DESC = MAC uplink UE received SDU
@@ -115,10 +111,6 @@ ID = ENB_MAC_UE_DL_PDU_WITH_DATA
     DESC = MAC downlink PDU for an UE
     GROUP = ALL:MAC:ENB
     FORMAT = int,eNB_ID : int,CC_id : int,rnti : int,frame : int,subframe : int,harq_pid : buffer,data
-ID = ENB_MAC_SCHEDULING_REQUEST
-    DESC = MAC scheduling request detected for an UE
-    GROUP = ALL:MAC:ENB
-    FORMAT = int,eNB_ID : int,CC_id : int,frame : int,subframe : int,rnti
 
 #RLC logs
 ID = ENB_RLC_DL
@@ -813,85 +805,6 @@ ID = LEGACY_CLI_TRACE
     GROUP = ALL:LEGACY_CLI:LEGACY_GROUP_TRACE:LEGACY
     FORMAT = string,log
 
-#################
-#### UE LOGS ####
-#################
-#general logs
-ID = UE_MASTER_TICK
-    DESC = UE master tick - one tick per ms, to be used as "reference clock", mostly for ticktime view
-    GROUP = ALL:GENERAL:UE
-    FORMAT = int,eNB_ID : int,frame : int,subframe
-
-#PHY logs
-ID = UE_PHY_UL_TICK
-    DESC = UE uplink tick - one tick per ms at start of uplink processing
-    GROUP = ALL:PHY:GRAPHIC:UE
-    FORMAT = int,eNB_ID : int,frame : int,subframe
-ID = UE_PHY_DL_TICK
-    DESC = UE downlink tick - one tick per ms at start of downlink processing
-    GROUP = ALL:PHY:GRAPHIC:UE
-    FORMAT = int,eNB_ID : int,frame : int,subframe
-ID = UE_PHY_DLSCH_UE_DCI
-    DESC = UE downlink UE specific DCI as sent by the PHY layer
-    GROUP = ALL:PHY:GRAPHIC:UE
-    FORMAT = int,eNB_ID : int,frame : int,subframe : int,rnti : int,dci_format : int,harq_pid : int,mcs : int,TBS
-ID = UE_PHY_DLSCH_UE_ACK
-    DESC = UE downlink UE ACK as seen by the PHY layer in process_HARQ_feedback
-    GROUP = ALL:PHY:GRAPHIC:UE
-    FORMAT = int,eNB_ID : int,frame : int,subframe : int,rnti : int,harq_pid
-ID = UE_PHY_DLSCH_UE_NACK
-    DESC = UE downlink UE NACK as seen by the PHY layer in process_HARQ_feedback
-    GROUP = ALL:PHY:GRAPHIC:UE
-    FORMAT = int,eNB_ID : int,frame : int,subframe : int,rnti : int,harq_pid
-ID = UE_PHY_ULSCH_UE_DCI
-    DESC = UE uplink UE specific DCI as sent by the PHY layer
-    GROUP = ALL:PHY:GRAPHIC:UE
-    FORMAT = int,eNB_ID : int,frame : int,subframe : int,rnti : int,harq_pid : int,mcs : int,round : int,first_rb : int,nb_rb : int,TBS
-ID = UE_PHY_ULSCH_UE_ACK
-    DESC = UE uplink UE ACK as seen by the PHY layer
-    GROUP = ALL:PHY:GRAPHIC:UE
-    FORMAT = int,eNB_ID : int,frame : int,subframe : int,rnti : int,harq_pid
-ID = UE_PHY_ULSCH_UE_NACK
-    DESC = UE uplink UE NACK as seen by the PHY layer
-    GROUP = ALL:PHY:GRAPHIC:UE
-    FORMAT = int,eNB_ID : int,frame : int,subframe : int,rnti : int,harq_pid
-ID = UE_PHY_INPUT_SIGNAL
-    DESC = UE received signal in the time domain for a duration of 1ms
-    GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
-    FORMAT = int,eNB_ID : int,frame : int,subframe : int,antenna : buffer,rxdata
-ID = UE_PHY_DL_CHANNEL_ESTIMATE
-    DESC = UE channel estimation in the time domain
-    GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
-    FORMAT = int,eNB_ID : int,frame : int,subframe : int,antenna : buffer,chest_t
-ID = UE_PHY_PDCCH_IQ
-    DESC = UE PDCCH received IQ data
-    GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
-    FORMAT = int,nb_rb : int,NB_RB_DL : int,symbols_per_tti : buffer,rxdataF_comp
-ID = UE_PHY_PDCCH_ENERGY
-    DESC = UE PDSCH 1 energy and threshold
-    GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
-    FORMAT = int,eNB_ID : int,frame : int,subframe : int,pdcch_ch_level00 : int,pdcch_ch_level01 : int,pdcch_ch_level10: int,pdcch_ch_level11
-ID = UE_PHY_PDSCH_IQ
-    DESC = UE PDSCH received IQ data
-    GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
-    FORMAT = int,eNB_ID : int,frame : int,subframe : int,nb_rb : int,N_RB_UL : int,symbols_per_tti : buffer,pusch_comp
-ID = UE_PHY_PDSCH_ENERGY
-    DESC = UE PDSCH 1 energy and threshold
-    GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
-    FORMAT = int,eNB_ID : int,frame : int,subframe : int,pdsch_ch_level00 : int,pdsch_ch_level01 : int,pdsch_ch_level10: int,pdsch_ch_level11
-ID = UE_PHY_PUSCH_TX_POWER
-    DESC = UE PUSCH  tx power
-    GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
-    FORMAT = int,eNB_ID : int,frame : int,subframe : int,p0_pusch : int,ampl: int,g_pusch: int,pl: int,nb_rb
-ID = UE_PHY_PUCCH_TX_POWER
-    DESC = UE PDSCH 1 energy and threshold
-    GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
-    FORMAT = int,eNB_ID : int,frame : int,subframe : int,p0_pucch : int,ampl: int,g_pucch: int,pl
-ID = UE_PHY_MEAS
-    DESC = UE PHY measurements
-    GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
-    FORMAT = int,eNB_ID : int,frame : int,subframe : int,rsrp : int,rssi : int,snr: int,rx_power: int,noise_power: int,w_cqi: int,freq_offset
-
 #for debug/test - not used
 ID = first
 ID = buf_test
@@ -958,38 +871,6 @@ ID = VCD_VARIABLE_SUBFRAME_NUMBER_RX1_ENB
     DESC = VCD variable SUBFRAME_NUMBER_RX1_ENB
     GROUP = ALL:VCD:ENB:VCD_VARIABLE
     FORMAT = ulong,value
-ID = VCD_VARIABLE_FRAME_NUMBER_TX0_RU
-    DESC = VCD variable FRAME_NUMBER_TX0_RU
-    GROUP = ALL:VCD:ENB:VCD_VARIABLE
-    FORMAT = ulong,value
-ID = VCD_VARIABLE_FRAME_NUMBER_TX1_RU
-    DESC = VCD variable FRAME_NUMBER_TX1_RU
-    GROUP = ALL:VCD:ENB:VCD_VARIABLE
-    FORMAT = ulong,value
-ID = VCD_VARIABLE_FRAME_NUMBER_RX0_RU
-    DESC = VCD variable FRAME_NUMBER_RX0_RU
-    GROUP = ALL:VCD:ENB:VCD_VARIABLE
-    FORMAT = ulong,value
-ID = VCD_VARIABLE_FRAME_NUMBER_RX1_RU
-    DESC = VCD variable FRAME_NUMBER_RX1_RU
-    GROUP = ALL:VCD:ENB:VCD_VARIABLE
-    FORMAT = ulong,value
-ID = VCD_VARIABLE_SUBFRAME_NUMBER_TX0_RU
-    DESC = VCD variable SUBFRAME_NUMBER_TX0_RU
-    GROUP = ALL:VCD:ENB:VCD_VARIABLE
-    FORMAT = ulong,value
-ID = VCD_VARIABLE_SUBFRAME_NUMBER_TX1_RU
-    DESC = VCD variable SUBFRAME_NUMBER_TX1_RU
-    GROUP = ALL:VCD:ENB:VCD_VARIABLE
-    FORMAT = ulong,value
-ID = VCD_VARIABLE_SUBFRAME_NUMBER_RX0_RU
-    DESC = VCD variable SUBFRAME_NUMBER_RX0_RU
-    GROUP = ALL:VCD:ENB:VCD_VARIABLE
-    FORMAT = ulong,value
-ID = VCD_VARIABLE_SUBFRAME_NUMBER_RX1_RU
-    DESC = VCD variable SUBFRAME_NUMBER_RX1_RU
-    GROUP = ALL:VCD:ENB:VCD_VARIABLE
-    FORMAT = ulong,value
 ID = VCD_VARIABLE_RUNTIME_TX_ENB
     DESC = VCD variable RUNTIME_TX_ENB
     GROUP = ALL:VCD:ENB:VCD_VARIABLE
@@ -1082,18 +963,6 @@ ID = VCD_VARIABLE_TRX_TST
     DESC = VCD variable TRX_TST
     GROUP = ALL:VCD:ENB:VCD_VARIABLE
     FORMAT = ulong,value
-ID = VCD_VARIABLE_TRX_TS_UE
-    DESC = VCD variable TRX_TS_UE
-    GROUP = ALL:VCD:UE:VCD_VARIABLE
-    FORMAT = ulong,value
-ID = VCD_VARIABLE_TRX_TST_UE
-    DESC = VCD variable TRX_TST_UE
-    GROUP = ALL:VCD:UE:VCD_VARIABLE
-    FORMAT = ulong,value
-ID = VCD_VARIABLE_TRX_WRITE_FLAGS
-    DESC = VCD variable TRX_WRITE_FLAGS
-    GROUP = ALL:VCD:ENB:VCD_VARIABLE
-    FORMAT = ulong,value
 ID = VCD_VARIABLE_TX_TS
     DESC = VCD variable TX_TS
     GROUP = ALL:VCD:ENB:VCD_VARIABLE
@@ -1398,45 +1267,13 @@ ID = VCD_VARIABLE_UE0_SFN7
     DESC = VCD variable UE0_SFN7
     GROUP = ALL:VCD:ENB:VCD_VARIABLE
     FORMAT = ulong,value
-ID = VCD_VARIABLE_SEND_IF4_SYMBOL
-    DESC = VCD variable SEND_IF4_SYMBOL
-    GROUP = ALL:VCD:ENB:VCD_VARIABLE
-    FORMAT = ulong,value
-ID = VCD_VARIABLE_RECV_IF4_SYMBOL
-    DESC = VCD variable RECV_IF4_SYMBOL
-    GROUP = ALL:VCD:ENB:VCD_VARIABLE
-    FORMAT = ulong,value
-ID = VCD_VARIABLE_SEND_IF5_PKT_ID
-    DESC = VCD variable SEND_IF5_PKT_ID
-    GROUP = ALL:VCD:ENB:VCD_VARIABLE
-    FORMAT = ulong,value
-ID = VCD_VARIABLE_RECV_IF5_PKT_ID
-    DESC = VCD variable RECV_IF5_PKT_ID
-    GROUP = ALL:VCD:ENB:VCD_VARIABLE
-    FORMAT = ulong,value
-ID = VCD_VARIABLE_UE_PDCP_FLUSH_SIZE
-    DESC = VCD variable UE_PDCP_FLUSH_SIZE
-    GROUP = ALL:VCD:ENB:UE:VCD_VARIABLE
-    FORMAT = ulong,value
-ID = VCD_VARIABLE_UE_PDCP_FLUSH_ERR
-    DESC = VCD variable UE_PDCP_FLUSH_ERR
-    GROUP = ALL:VCD:ENB:UE:VCD_VARIABLE
-    FORMAT = ulong,value
 ID = VCD_VARIABLE_UE0_TRX_READ_NS
     DESC = VCD variable UE0_TRX_READ_NS
-    GROUP = ALL:VCD:UE:VCD_VARIABLE
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
     FORMAT = ulong,value
 ID = VCD_VARIABLE_UE0_TRX_WRITE_NS
     DESC = VCD variable UE0_TRX_WRITE_NS
-    GROUP = ALL:VCD:UE:VCD_VARIABLE
-    FORMAT = ulong,value
-ID = VCD_VARIABLE_UE0_TRX_READ_NS_MISSING
-    DESC = VCD variable UE0_TRX_READ_NS_MISSING
-    GROUP = ALL:VCD:UE:VCD_VARIABLE
-    FORMAT = ulong,value
-ID = VCD_VARIABLE_UE0_TRX_WRITE_NS_MISSING
-    DESC = VCD variable UE0_TRX_WRITE_NS_MISSING
-    GROUP = ALL:VCD:UE:VCD_VARIABLE
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
     FORMAT = ulong,value
 
 #functions
@@ -1453,14 +1290,6 @@ ID = VCD_FUNCTION_TRX_WRITE
     DESC = VCD function TRX_WRITE
     GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
-ID = VCD_FUNCTION_TRX_READ_UE
-    DESC = VCD function TRX_READ_UE
-    GROUP = ALL:VCD:UE:VCD_FUNCTION
-    FORMAT = int,value
-ID = VCD_FUNCTION_TRX_WRITE_UE
-    DESC = VCD function TRX_WRITE_UE
-    GROUP = ALL:VCD:UE:VCD_FUNCTION
-    FORMAT = int,value
 ID = VCD_FUNCTION_TRX_READ_IF
     DESC = VCD function TRX_READ_IF
     GROUP = ALL:VCD:ENB:VCD_FUNCTION
@@ -1497,12 +1326,8 @@ ID = VCD_FUNCTION_TRX_WRITE_SF9
     DESC = VCD function TRX_WRITE_SF9
     GROUP = ALL:VCD:UE:VCD_FUNCTION
     FORMAT = int,value
-ID = VCD_FUNCTION_UE_SIGNAL_COND_RXTX0
-    DESC = VCD function UE_SIGNAL_COND_RXTX0
-    GROUP = ALL:VCD:UE:VCD_FUNCTION
-    FORMAT = int,value
-ID = VCD_FUNCTION_UE_SIGNAL_COND_RXTX1
-    DESC = VCD function UE_SIGNAL_COND_RXTX1
+ID = VCD_FUNCTION_UE_SIGNAL_COND_RXTX
+    DESC = VCD function UE_SIGNAL_COND_RXTX
     GROUP = ALL:VCD:UE:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_UE_WAIT_COND_RXTX0
@@ -1613,28 +1438,12 @@ ID = VCD_FUNCTION_PHY_PROCEDURES_ENB_TX1
     DESC = VCD function PHY_PROCEDURES_ENB_TX1
     GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
-ID = VCD_FUNCTION_PHY_PROCEDURES_RU_FEPRX
-    DESC = VCD function PHY_PROCEDURES_RU_FEPRX
+ID = VCD_FUNCTION_PHY_PROCEDURES_ENB_RX_COMMON
+    DESC = VCD function PHY_PROCEDURES_ENB_RX_COMMON
     GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
-ID = VCD_FUNCTION_PHY_PROCEDURES_RU_FEPRX1
-    DESC = VCD function PHY_PROCEDURES_RU_FEPRX1
-    GROUP = ALL:VCD:ENB:VCD_FUNCTION
-    FORMAT = int,value
-ID = VCD_FUNCTION_PHY_PROCEDURES_RU_FEPTX_OFDM
-    DESC = VCD function PHY_PROCEDURES_RU_FEPTX_OFDM
-    GROUP = ALL:VCD:ENB:VCD_FUNCTION
-    FORMAT = int,value
-ID = VCD_FUNCTION_PHY_PROCEDURES_RU_FEPTX_OFDM1
-    DESC = VCD function PHY_PROCEDURES_RU_FEPTX_OFDM1
-    GROUP = ALL:VCD:ENB:VCD_FUNCTION
-    FORMAT = int,value
-ID = VCD_FUNCTION_PHY_PROCEDURES_RU_FEPTX_PREC
-    DESC = VCD function PHY_PROCEDURES_RU_FEPTX_PREC
-    GROUP = ALL:VCD:ENB:VCD_FUNCTION
-    FORMAT = int,value
-ID = VCD_FUNCTION_PHY_PROCEDURES_RU_FEPTX_PREC1
-    DESC = VCD function PHY_PROCEDURES_RU_FEPTX_PREC1
+ID = VCD_FUNCTION_PHY_PROCEDURES_ENB_RX_COMMON1
+    DESC = VCD function PHY_PROCEDURES_ENB_RX_COMMON1
     GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_PHY_PROCEDURES_ENB_RX_UESPEC
@@ -1645,6 +1454,10 @@ ID = VCD_FUNCTION_PHY_PROCEDURES_ENB_RX_UESPEC1
     DESC = VCD function PHY_PROCEDURES_ENB_RX_UESPEC1
     GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
+ID = VCD_FUNCTION_ENB_SLOT_FEP
+    DESC = VCD function ENB_SLOT_FEP
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
+    FORMAT = int,value
 ID = VCD_FUNCTION_PHY_PROCEDURES_UE_TX
     DESC = VCD function PHY_PROCEDURES_UE_TX
     GROUP = ALL:VCD:UE:VCD_FUNCTION
@@ -1841,10 +1654,6 @@ ID = VCD_FUNCTION_PHY_ENB_PRACH_RX
     DESC = VCD function PHY_ENB_PRACH_RX
     GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
-ID = VCD_FUNCTION_PHY_RU_PRACH_RX
-    DESC = VCD function PHY_RU_PRACH_RX
-    GROUP = ALL:VCD:ENB:VCD_FUNCTION
-    FORMAT = int,value
 ID = VCD_FUNCTION_PHY_ENB_PDCCH_TX
     DESC = VCD function PHY_ENB_PDCCH_TX
     GROUP = ALL:VCD:ENB:VCD_FUNCTION
@@ -1865,10 +1674,6 @@ ID = VCD_FUNCTION_UE_ULSCH_ENCODING
     DESC = VCD function UE_ULSCH_ENCODING
     GROUP = ALL:VCD:UE:VCD_FUNCTION
     FORMAT = int,value
-ID = VCD_FUNCTION_UE_ULSCH_ENCODING_FILL_CQI
-    DESC = VCD function UE_ULSCH_ENCODING_FILL_CQI
-    GROUP = ALL:VCD:UE:VCD_FUNCTION
-    FORMAT = int,value
 ID = VCD_FUNCTION_UE_ULSCH_SCRAMBLING
     DESC = VCD function UE_ULSCH_SCRAMBLING
     GROUP = ALL:VCD:UE:VCD_FUNCTION
@@ -2009,10 +1814,10 @@ ID = VCD_FUNCTION_RLC_DATA_REQ
     DESC = VCD function RLC_DATA_REQ
     GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
-#ID = VCD_FUNCTION_RLC_DATA_IND
-#    DESC = VCD function RLC_DATA_IND
-#    GROUP = ALL:VCD:ENB:VCD_FUNCTION
-#    FORMAT = int,value
+ID = VCD_FUNCTION_RLC_DATA_IND
+    DESC = VCD function RLC_DATA_IND
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
+    FORMAT = int,value
 ID = VCD_FUNCTION_MAC_RLC_STATUS_IND
     DESC = VCD function MAC_RLC_STATUS_IND
     GROUP = ALL:VCD:ENB:VCD_FUNCTION
@@ -2057,22 +1862,6 @@ ID = VCD_FUNCTION_PDCP_VALIDATE_SECURITY
     DESC = VCD function PDCP_VALIDATE_SECURITY
     GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
-ID = VCD_FUNCTION_PDCP_FIFO_READ
-    DESC = VCD function PDCP_FIFO_READ
-    GROUP = ALL:VCD:ENB:VCD_FUNCTION
-    FORMAT = int,value
-ID = VCD_FUNCTION_PDCP_FIFO_READ_BUFFER
-    DESC = VCD function PDCP_FIFO_READ_BUFFER
-    GROUP = ALL:VCD:ENB:VCD_FUNCTION
-    FORMAT = int,value
-ID = VCD_FUNCTION_PDCP_FIFO_FLUSH
-    DESC = VCD function PDCP_FIFO_FLUSH
-    GROUP = ALL:VCD:ENB:VCD_FUNCTION
-    FORMAT = int,value
-ID = VCD_FUNCTION_PDCP_FIFO_FLUSH_BUFFER
-    DESC = VCD function PDCP_FIFO_FLUSH_BUFFER
-    GROUP = ALL:VCD:ENB:VCD_FUNCTION
-    FORMAT = int,value
 ID = VCD_FUNCTION_RRC_RX_TX
     DESC = VCD function RRC_RX_TX
     GROUP = ALL:VCD:ENB:VCD_FUNCTION
@@ -2149,11 +1938,82 @@ ID = VCD_FUNCTION_RECV_IF5
     DESC = VCD function RECV_IF5
     GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
-ID = VCD_FUNCTION_TRX_COMPR_IF
-    DESC = VCD function TRX_COMPR_IF
-    GROUP = ALL:VCD:ENB:VCD_FUNCTION
-    FORMAT = int,value
-ID = VCD_FUNCTION_TRX_DECOMPR_IF
-    DESC = VCD function TRX_DECOMPR_IF
-    GROUP = ALL:VCD:ENB:VCD_FUNCTION
-    FORMAT = int,value
+
+#################
+#### UE LOGS ####
+#################
+#general logs
+ID = UE_MASTER_TICK
+    DESC = UE master tick - one tick per ms, to be used as "reference clock", mostly for ticktime view
+    GROUP = ALL:GENERAL:UE
+    FORMAT = int,eNB_ID : int,frame : int,subframe
+
+#PHY logs
+ID = UE_PHY_UL_TICK
+    DESC = UE uplink tick - one tick per ms at start of uplink processing
+    GROUP = ALL:PHY:GRAPHIC:UE
+    FORMAT = int,eNB_ID : int,frame : int,subframe
+ID = UE_PHY_DL_TICK
+    DESC = UE downlink tick - one tick per ms at start of downlink processing
+    GROUP = ALL:PHY:GRAPHIC:UE
+    FORMAT = int,eNB_ID : int,frame : int,subframe
+ID = UE_PHY_DLSCH_UE_DCI
+    DESC = UE downlink UE specific DCI as sent by the PHY layer
+    GROUP = ALL:PHY:GRAPHIC:UE
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,dci_format : int,harq_pid : int,mcs : int,TBS
+ID = UE_PHY_DLSCH_UE_ACK
+    DESC = UE downlink UE ACK as seen by the PHY layer in process_HARQ_feedback
+    GROUP = ALL:PHY:GRAPHIC:UE
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,harq_pid
+ID = UE_PHY_DLSCH_UE_NACK
+    DESC = UE downlink UE NACK as seen by the PHY layer in process_HARQ_feedback
+    GROUP = ALL:PHY:GRAPHIC:UE
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,harq_pid
+ID = UE_PHY_ULSCH_UE_DCI
+    DESC = UE uplink UE specific DCI as sent by the PHY layer
+    GROUP = ALL:PHY:GRAPHIC:UE
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,harq_pid : int,mcs : int,round : int,first_rb : int,nb_rb : int,TBS
+ID = UE_PHY_ULSCH_UE_ACK
+    DESC = UE uplink UE ACK as seen by the PHY layer
+    GROUP = ALL:PHY:GRAPHIC:UE
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,harq_pid
+ID = UE_PHY_ULSCH_UE_NACK
+    DESC = UE uplink UE NACK as seen by the PHY layer
+    GROUP = ALL:PHY:GRAPHIC:UE
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,harq_pid
+ID = UE_PHY_INPUT_SIGNAL
+    DESC = UE received signal in the time domain for a duration of 1ms
+    GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,antenna : buffer,rxdata
+ID = UE_PHY_DL_CHANNEL_ESTIMATE
+    DESC = UE channel estimation in the time domain
+    GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
+    FORMAT = int,eNB_ID : int,UE_ID : int,frame : int,subframe : int,antenna : buffer,chest_t
+ID = UE_PHY_PDCCH_IQ
+    DESC = UE PDCCH received IQ data
+    GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
+    FORMAT = int,nb_rb : int,NB_RB_DL : int,symbols_per_tti : buffer,rxdataF_comp
+ID = UE_PHY_PDCCH_ENERGY
+    DESC = UE PDSCH 1 energy and threshold
+    GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
+    FORMAT = int,eNB_ID : int,UE_ID : int,frame : int,subframe : int,pdcch_ch_level00 : int,pdcch_ch_level01 : int,pdcch_ch_level10: int,pdcch_ch_level11
+ID = UE_PHY_PDSCH_IQ
+    DESC = UE PDSCH received IQ data
+    GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
+    FORMAT = int,eNB_ID : int,UE_ID : int,frame : int,subframe : int,nb_rb : int,N_RB_UL : int,symbols_per_tti : buffer,pusch_comp
+ID = UE_PHY_PDSCH_ENERGY
+    DESC = UE PDSCH 1 energy and threshold
+    GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
+    FORMAT = int,eNB_ID : int,UE_ID : int,frame : int,subframe : int,pdsch_ch_level00 : int,pdsch_ch_level01 : int,pdsch_ch_level10: int,pdsch_ch_level11
+ID = UE_PHY_PUSCH_TX_POWER
+    DESC = UE PUSCH  tx power
+    GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
+    FORMAT = int,eNB_ID : int,UE_id : int,frame : int,subframe : int,p0_pusch : int,ampl: int,g_pusch: int,pl: int,nb_rb
+ID = UE_PHY_PUCCH_TX_POWER
+    DESC = UE PDSCH 1 energy and threshold
+    GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
+    FORMAT = int,eNB_ID : int,UE_id : int,frame : int,subframe : int,p0_pucch : int,ampl: int,g_pucch: int,pl
+ID = UE_PHY_MEAS
+    DESC = UE PHY measurements
+    GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
+    FORMAT = int,eNB_ID : int,UE_ID : int,frame : int,subframe : int,rsrp : int,rssi : int,snr: int,rx_power: int,noise_power: int,w_cqi: int,freq_offset

common/utils/T/local_tracer.c

@@ -63,7 +63,7 @@ static int get_connection(char *addr, int port)
   socklen_t alen;
   int s, t;
 
-  printf("T tracer: waiting for connection on %s:%d\n", addr, port);
+  printf("waiting for connection on %s:%d\n", addr, port);
 
   s = socket(AF_INET, SOCK_STREAM, 0);
   if (s == -1) { perror("socket"); exit(1); }
@@ -82,7 +82,7 @@ static int get_connection(char *addr, int port)
   if (t == -1) { perror("accept"); exit(1); }
   close(s);
 
-  printf("T tracer: connected\n");
+  printf("connected\n");
 
   return t;
 }
@@ -150,7 +150,7 @@ process:
   while (size) {
     int l = write(f->socket_remote, b, size);
     if (l <= 0) {
-      printf("T tracer: forward error\n");
+      printf("forward error\n");
       close(f->socket_remote);
       f->socket_remote = -1;
       break;
@@ -268,7 +268,7 @@ static void *forwarder(int port, int s)
   f->memusage = 0;
   f->last_warning_memusage = 0;
 
-  printf("T tracer: waiting for remote tracer on port %d\n", port);
+  printf("waiting for remote tracer on port %d\n", port);
 
   f->remote_port = port;
   f->socket_remote = get_connection("0.0.0.0", port);
@@ -305,7 +305,7 @@ static void forward(void *_forwarder, char *buf, int size)
   if (f->memusage > f->last_warning_memusage &&
       f->memusage - f->last_warning_memusage > 100000000) {
     f->last_warning_memusage += 100000000;
-    printf("T tracer: WARNING: memory usage is over %"PRIu64"MB\n",
+    printf("WARNING: memory usage is over %"PRIu64"MB\n",
            f->last_warning_memusage / 1000000);
   } else
   if (f->memusage < f->last_warning_memusage &&

common/utils/T/tracer/Makefile

@@ -3,11 +3,9 @@ CFLAGS=-Wall -g -pthread -DT_TRACER -I.
 
 #CFLAGS += -O3 -ffast-math -fomit-frame-pointer
 
-LIBS=-lm
-XLIBS=-lX11 -lpng -lXft
+LIBS=-lX11 -lm -lpng -lXft
 
-all: record replay extract_config textlog enb ue vcd macpdu2wireshark \
-     extract_input_subframe extract_output_subframe to_vcd extract
+all: record replay extract_config textlog enb ue vcd macpdu2wireshark
 
 record: utils.o record.o database.o config.o
 	$(CC) $(CFLAGS) -o record $^ $(LIBS)
@@ -18,40 +16,25 @@ replay: utils.o replay.o
 extract_config: extract_config.o
 	$(CC) $(CFLAGS) -o extract_config $^ $(LIBS)
 
-extract_input_subframe: extract_input_subframe.o database.o event.o utils.o \
-    config.o
-	$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
-
-extract_output_subframe: extract_output_subframe.o database.o event.o utils.o \
-    config.o
-	$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
-
-extract: extract.o database.o event.o utils.o config.o
-	$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
-
 textlog: utils.o textlog.o database.o event.o handler.o config.o \
          event_selector.o view/view.a gui/gui.a logger/logger.a \
          filter/filter.a
-	$(CC) $(CFLAGS) -o textlog $^ $(LIBS) $(XLIBS)
+	$(CC) $(CFLAGS) -o textlog $^ $(LIBS)
 
 enb: utils.o enb.o database.o event.o handler.o config.o \
          event_selector.o view/view.a gui/gui.a logger/logger.a \
          filter/filter.a
-	$(CC) $(CFLAGS) -o enb $^ $(LIBS) $(XLIBS)
+	$(CC) $(CFLAGS) -o enb $^ $(LIBS)
 
 ue: utils.o ue.o database.o event.o handler.o config.o \
          event_selector.o view/view.a gui/gui.a logger/logger.a \
          filter/filter.a
-	$(CC) $(CFLAGS) -o ue $^ $(LIBS) $(XLIBS)
+	$(CC) $(CFLAGS) -o ue $^ $(LIBS)
 
 vcd: utils.o vcd.o database.o event.o handler.o config.o \
          event_selector.o view/view.a gui/gui.a logger/logger.a \
          filter/filter.a
-	$(CC) $(CFLAGS) -o vcd $^ $(LIBS) $(XLIBS)
-
-to_vcd: to_vcd.o database.o event.o handler.o utils.o config.o \
-         logger/logger.a filter/filter.a
-	$(CC) $(CFLAGS) -o to_vcd $^ $(LIBS)
+	$(CC) $(CFLAGS) -o vcd $^ $(LIBS)
 
 macpdu2wireshark: macpdu2wireshark.o database.o utils.o handler.o event.o \
                   config.o
@@ -75,9 +58,8 @@ filter/filter.a:
 	$(CC) $(CFLAGS) -c -o $@ $<
 
 clean:
-	rm -f *.o core tracer_remote textlog enb ue vcd record replay
-	rm -f extract_config macpdu2wireshark extract_input_subframe
-	rm -f extract_output_subframe to_vcd extract
+	rm -f *.o core tracer_remote textlog enb vcd record replay
+	rm -f extract_config macpdu2wireshark
 	cd gui && make clean
 	cd view && make clean
 	cd logger && make clean

common/utils/T/tracer/enb.c

@@ -17,44 +17,6 @@
 #include "openair_logo.h"
 #include "config.h"
 
-/****************************************************************************/
-/* conversion from rnti to "ue_id" (which does not really exists)           */
-/* the idea is to assign an ue_id to an rnti as soon as we get an event     */
-/* for the rnti                                                             */
-/****************************************************************************/
-
-int ue_id[65536];
-int next_ue_id;
-
-void reset_ue_ids(void)
-{
-  int i;
-  printf("resetting known UEs\n");
-  for (i = 0; i < 65536; i++) ue_id[i] = -1;
-  ue_id[65535] = 0;
-  ue_id[65534] = 1;     /* HACK: to be removed */
-  ue_id[2]     = 2;     /* this supposes RA RNTI = 2, very openair specific */
-  next_ue_id = 3;
-}
-
-int ue_id_from_rnti(void *_priv, int rnti)
-{
-  if (rnti < 0) rnti = 65534; /* HACK, to be removed */
-
-  if (rnti < 0 || rnti > 65535) { printf("bad rnti %d\n", rnti); exit(1); }
-  /* rnti not seen yet? give it a new ue_id */
-  if (ue_id[rnti] == -1) {
-    ue_id[rnti] = next_ue_id;
-    next_ue_id++;
-  }
-  return ue_id[rnti];
-}
-
-/****************************************************************************/
-/* end of rnti->ue_id conversion                                            */
-/****************************************************************************/
-
-
 typedef struct {
   view *phyview;
   view *macview;
@@ -63,7 +25,6 @@ typedef struct {
   view *rrcview;
   view *legacy;
   widget *current_ue_label;
-  widget *current_ue_button;
   widget *prev_ue_button;
   widget *next_ue_button;
   widget *pusch_iq_ue_xy_plot;
@@ -97,7 +58,6 @@ typedef struct {
   enb_gui *e;
   int ue;                /* what UE is displayed in the UE specific views */
   void *database;
-  int nb_rb;
 } enb_data;
 
 void is_on_changed(void *_d)
@@ -125,6 +85,27 @@ connection_dies:
   if (pthread_mutex_unlock(&d->lock)) abort();
 }
 
+void usage(void)
+{
+  printf(
+"options:\n"
+"    -d <database file>        this option is mandatory\n"
+"    -on <GROUP or ID>         turn log ON for given GROUP or ID\n"
+"    -off <GROUP or ID>        turn log OFF for given GROUP or ID\n"
+"    -ON                       turn all logs ON\n"
+"    -OFF                      turn all logs OFF\n"
+"                              note: you may pass several -on/-off/-ON/-OFF,\n"
+"                                    they will be processed in order\n"
+"                                    by default, all is off\n"
+"    -ip <host>                connect to given IP address (default %s)\n"
+"    -p <port>                 connect to given port (default %d)\n"
+"    -debug-gui                activate GUI debug logs\n",
+  DEFAULT_REMOTE_IP,
+  DEFAULT_REMOTE_PORT
+  );
+  exit(1);
+}
+
 static void *gui_thread(void *_g)
 {
   gui *g = _g;
@@ -135,15 +116,11 @@ static void *gui_thread(void *_g)
 static filter *ticktime_filter(void *database, char *event, int i, int ue)
 {
   /* filter is "harq_pid == i && UE_id == 0 && eNB_id == 0" */
-  /* we get the UE_id from the rnti */
   return
     filter_and(
       filter_eq(filter_evarg(database, event, "harq_pid"), filter_int(i)),
       filter_and(
-        filter_eq(
-          filter_evfun(database, ue_id_from_rnti, NULL,
-            filter_evarg(database, event, "rnti")),
-          filter_int(ue)),
+        filter_eq(filter_evarg(database, event, "UE_id"), filter_int(ue)),
         filter_eq(filter_evarg(database, event, "eNB_ID"), filter_int(0))));
 }
 
@@ -171,28 +148,23 @@ static void set_current_ue(gui *g, enb_data *e, int ue)
 
   logger_set_filter(e->e->pusch_iq_ue_logger,
       filter_eq(
-        filter_evfun(e->database, ue_id_from_rnti, NULL,
-          filter_evarg(e->database, "ENB_PHY_PUSCH_IQ", "rnti")),
+        filter_evarg(e->database, "ENB_PHY_PUSCH_IQ", "UE_ID"),
         filter_int(ue)));
   logger_set_filter(e->e->ul_estimate_ue_logger,
       filter_eq(
-        filter_evfun(e->database, ue_id_from_rnti, NULL,
-          filter_evarg(e->database, "ENB_PHY_UL_CHANNEL_ESTIMATE", "rnti")),
+        filter_evarg(e->database, "ENB_PHY_UL_CHANNEL_ESTIMATE", "UE_ID"),
         filter_int(ue)));
   logger_set_filter(e->e->pucch1_energy_ue_threshold_logger,
       filter_eq(
-        filter_evfun(e->database, ue_id_from_rnti, NULL,
-          filter_evarg(e->database, "ENB_PHY_PUCCH_1_ENERGY", "rnti")),
+        filter_evarg(e->database, "ENB_PHY_PUCCH_1_ENERGY", "UE_ID"),
         filter_int(ue)));
   logger_set_filter(e->e->pucch1_energy_ue_energy_logger,
       filter_eq(
-        filter_evfun(e->database, ue_id_from_rnti, NULL,
-          filter_evarg(e->database, "ENB_PHY_PUCCH_1_ENERGY", "rnti")),
+        filter_evarg(e->database, "ENB_PHY_PUCCH_1_ENERGY", "UE_ID"),
         filter_int(ue)));
   logger_set_filter(e->e->pucch_iq_ue_logger,
       filter_eq(
-        filter_evfun(e->database, ue_id_from_rnti, NULL,
-          filter_evarg(e->database, "ENB_PHY_PUCCH_1AB_IQ", "rnti")),
+        filter_evarg(e->database, "ENB_PHY_PUCCH_1AB_IQ", "UE_ID"),
         filter_int(ue)));
   for (i = 0; i < 8; i++) {
     logger_set_filter(e->e->dl_dci_logger[i],
@@ -213,13 +185,11 @@ static void set_current_ue(gui *g, enb_data *e, int ue)
   }
   logger_set_filter(e->e->dl_mcs_logger,
       filter_eq(
-        filter_evfun(e->database, ue_id_from_rnti, NULL,
-          filter_evarg(e->database, "ENB_PHY_DLSCH_UE_DCI", "rnti")),
+        filter_evarg(e->database, "ENB_PHY_DLSCH_UE_DCI", "UE_id"),
         filter_int(ue)));
   logger_set_filter(e->e->ul_mcs_logger,
       filter_eq(
-        filter_evfun(e->database, ue_id_from_rnti, NULL,
-          filter_evarg(e->database, "ENB_PHY_ULSCH_UE_DCI", "rnti")),
+        filter_evarg(e->database, "ENB_PHY_ULSCH_UE_DCI", "UE_id"),
         filter_int(ue)));
 }
 
@@ -231,15 +201,12 @@ static void click(void *private, gui *g,
   enb_data *ed = private;
   enb_gui *e = ed->e;
   int ue = ed->ue;
-  int do_reset = 0;
 
   if (button != 1) return;
   if (w == e->prev_ue_button) { ue--; if (ue < 0) ue = 0; }
   if (w == e->next_ue_button) ue++;
-  if (w == e->current_ue_button) do_reset = 1;
 
   if (pthread_mutex_lock(&ed->lock)) abort();
-  if (do_reset) reset_ue_ids();
   if (ue != ed->ue) {
     set_current_ue(g, ed, ue);
     ed->ue = ue;
@@ -281,12 +248,10 @@ static void enb_main_gui(enb_gui *e, gui *g, event_handler *h, void *database,
   widget_add_child(g, col, logo, -1);
   w = new_container(g, HORIZONTAL);
   widget_add_child(g, col, w, -1);
-  /* TODO: use button widget, not label widget */
   w2 = new_label(g, "");
   widget_add_child(g, w, w2, -1);
-  label_set_clickable(g, w2, 1);
-  e->current_ue_button = w2;
   e->current_ue_label = w2;
+  /* TODO: use button widget, not label widget */
   w2 = new_label(g, "  [prev UE]  ");
   widget_add_child(g, w, w2, -1);
   label_set_clickable(g, w2, 1);
@@ -299,14 +264,14 @@ static void enb_main_gui(enb_gui *e, gui *g, event_handler *h, void *database,
 
   input_signal_plot = new_xy_plot(g, 256, 55, "input signal", 20);
   widget_add_child(g, line, input_signal_plot, -1);
-  xy_plot_set_range(g, input_signal_plot, 0, 7680*10 * ed->nb_rb/25, 20, 70);
+  xy_plot_set_range(g, input_signal_plot, 0, 7680*10, 20, 70);
   input_signal_log = new_framelog(h, database,
       "ENB_PHY_INPUT_SIGNAL", "subframe", "rxdata");
   /* a skip value of 10 means to process 1 frame over 10, that is
    * more or less 10 frames per second
    */
   framelog_set_skip(input_signal_log, 10);
-  input_signal_view = new_view_xy(7680*10 * ed->nb_rb/25, 10,
+  input_signal_view = new_view_xy(7680*10, 10,
       g, input_signal_plot, new_color(g, "#0c0c72"), XY_LOOP_MODE);
   logger_add_view(input_signal_log, input_signal_view);
 
@@ -624,8 +589,7 @@ static void enb_main_gui(enb_gui *e, gui *g, event_handler *h, void *database,
   container_set_child_growable(g, top_container, text, 1);
   e->legacy = new_view_textlist(10000, 10, g, text);
 
-  set_current_ue(g, ed, ed->ue);
-  register_notifier(g, "click", e->current_ue_button, click, ed);
+  set_current_ue(g, ed, 0);
   register_notifier(g, "click", e->prev_ue_button, click, ed);
   register_notifier(g, "click", e->next_ue_button, click, ed);
 }
@@ -646,28 +610,6 @@ void view_add_log(view *v, char *log, event_handler *h, void *database,
   on_off(database, log, is_on, 1);
 }
 
-void usage(void)
-{
-  printf(
-"options:\n"
-"    -d   <database file>      this option is mandatory\n"
-"    -rb  <RBs>                setup for this number of RBs (default 25)\n"
-"    -on  <GROUP or ID>        turn log ON for given GROUP or ID\n"
-"    -off <GROUP or ID>        turn log OFF for given GROUP or ID\n"
-"    -ON                       turn all logs ON\n"
-"    -OFF                      turn all logs OFF\n"
-"                              note: you may pass several -on/-off/-ON/-OFF,\n"
-"                                    they will be processed in order\n"
-"                                    by default, all is off\n"
-"    -ip <host>                connect to given IP address (default %s)\n"
-"    -p  <port>                connect to given port (default %d)\n"
-"    -debug-gui                activate GUI debug logs\n",
-  DEFAULT_REMOTE_IP,
-  DEFAULT_REMOTE_PORT
-  );
-  exit(1);
-}
-
 int main(int n, char **v)
 {
   extern int volatile gui_logd;
@@ -686,10 +628,6 @@ int main(int n, char **v)
   enb_gui eg;
   enb_data enb_data;
 
-  reset_ue_ids();
-
-  enb_data.nb_rb = 25;
-
   /* write on a socket fails if the other end is closed and we get SIGPIPE */
   if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) abort();
 
@@ -700,8 +638,6 @@ int main(int n, char **v)
     if (!strcmp(v[i], "-h") || !strcmp(v[i], "--help")) usage();
     if (!strcmp(v[i], "-d"))
       { if (i > n-2) usage(); database_filename = v[++i]; continue; }
-    if (!strcmp(v[i], "-rb"))
-      { if (i > n-2) usage(); enb_data.nb_rb = atoi(v[++i]); continue; }
     if (!strcmp(v[i], "-ip")) { if (i > n-2) usage(); ip = v[++i]; continue; }
     if (!strcmp(v[i], "-p"))
       { if (i > n-2) usage(); port = atoi(v[++i]); continue; }
@@ -717,11 +653,6 @@ int main(int n, char **v)
     usage();
   }
 
-  switch (enb_data.nb_rb) {
-  case 25: case 50: case 100: break;
-  default: printf("ERROR, bad value for -rb (%d)\n", enb_data.nb_rb); exit(1);
-  }
-
   if (database_filename == NULL) {
     printf("ERROR: provide a database file (-d)\n");
     exit(1);
@@ -740,7 +671,7 @@ int main(int n, char **v)
   g = gui_init();
   new_thread(gui_thread, g);
 
-  enb_data.ue = 3;
+  enb_data.ue = 0;
   enb_data.e = &eg;
   enb_data.database = database;
 

common/utils/T/tracer/extract.c

@@ -1,124 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <fcntl.h>
-#include "database.h"
-#include "event.h"
-#include "config.h"
-
-void usage(void)
-{
-  printf(
-"usage: [options] <file> <event> <buffer name>\n"
-"options:\n"
-"    -d <database file>        this option is mandatory\n"
-"    -o <output file>          this option is mandatory\n"
-"    -f <name> <value>         field 'name' of 'event' has to match 'value'\n"
-"                              type of 'name' must be int\n"
-"                              (you can use several -f options)\n"
-  );
-  exit(1);
-}
-
-int get_filter_arg(database_event_format *f, char *field, char *type)
-{
-  int i;
-  for (i = 0; i < f->count; i++)
-    if (!strcmp(f->name[i], field)) {
-      if (strcmp(f->type[i], type)) break;
-      return i;
-    }
-  printf("bad field %s, check that it exists and has type '%s'\n",field,type);
-  exit(1);
-}
-
-int main(int n, char **v)
-{
-  char *database_filename = NULL;
-  void *database;
-  int i;
-  int input_event_id;
-  database_event_format f;
-  char *file = NULL;
-  char *output_file = NULL;
-  FILE *out;
-  int fd;
-  char *event_name = NULL;
-  char *buffer_name = NULL;
-  char *filter[n];
-  int filter_arg[n];
-  int filter_value[n];
-  int filter_count = 0;
-  int buffer_arg;
-  int found;
-
-  for (i = 1; i < n; i++) {
-    if (!strcmp(v[i], "-h") || !strcmp(v[i], "--help")) usage();
-    if (!strcmp(v[i], "-d"))
-      { if (i > n-2) usage(); database_filename = v[++i]; continue; }
-    if (!strcmp(v[i], "-o"))
-      { if (i > n-2) usage(); output_file = v[++i]; continue; }
-    if (!strcmp(v[i], "-f")) { if (i>n-3) usage();
-      filter[filter_count]         = v[++i];
-      filter_value[filter_count++] = atoi(v[++i]);
-      continue;
-    }
-    if (file == NULL) { file = v[i]; continue; }
-    if (event_name == NULL) { event_name = v[i]; continue; }
-    if (buffer_name == NULL) { buffer_name = v[i]; continue; }
-    usage();
-  }
-  if (file == NULL || event_name == NULL || buffer_name == NULL) usage();
-
-  if (database_filename == NULL) {
-    printf("ERROR: provide a database file (-d)\n");
-    exit(1);
-  }
-
-  if (output_file == NULL) {
-    printf("gimme -o <output file>, thanks\n");
-    exit(1);
-  }
-
-  out = fopen(output_file, "w"); if(out==NULL){perror(output_file);exit(1);}
-
-  database = parse_database(database_filename);
-
-  load_config_file(database_filename);
-
-  input_event_id = event_id_from_name(database, event_name);
-  f = get_format(database, input_event_id);
-
-  buffer_arg = get_filter_arg(&f, buffer_name, "buffer");
-
-  for (i = 0; i < filter_count; i++)
-    filter_arg[i] = get_filter_arg(&f, filter[i], "int");
-
-  fd = open(file, O_RDONLY);
-  if (fd == -1) { perror(file); exit(1); }
-
-  found = 0;
-
-  while (1) {
-    char v[T_BUFFER_MAX];
-    event e;
-    e = get_event(fd, v, database);
-    if (e.type == -1) break;
-    if (e.type != input_event_id) continue;
-    for (i = 0; i < filter_count; i++)
-      if (filter_value[i] != e.e[filter_arg[i]].i)
-        break;
-    if (i != filter_count)
-      continue;
-    if (fwrite(e.e[buffer_arg].b, e.e[buffer_arg].bsize, 1, out) != 1)
-      { perror(output_file); exit(1); }
-    found = 1;
-    break;
-  }
-
-  if (found == 0) printf("ERROR: event not found\n");
-
-  fclose(out);
-
-  return 0;
-}

common/utils/T/tracer/extract_input_subframe.c

@@ -1,143 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <fcntl.h>
-#include "database.h"
-#include "event.h"
-#include "config.h"
-
-void usage(void)
-{
-  printf(
-"usage: [options] <file> <frame> <subframe>\n"
-"options:\n"
-"    -d <database file>        this option is mandatory\n"
-"    -o <output file>          this option is mandatory\n"
-"    -v                        verbose\n"
-"    -c <number of subframes>  default to 1\n"
-  );
-  exit(1);
-}
-
-int main(int n, char **v)
-{
-  char *database_filename = NULL;
-  void *database;
-  int i;
-  int input_event_id;
-  database_event_format f;
-  char *file = NULL;
-  char *output_file = NULL;
-  FILE *out;
-  int fd;
-  int frame = -1, subframe = -1;
-  int frame_arg, subframe_arg, buffer_arg;
-  int verbose = 0;
-  int number_of_subframes = 1;
-  int processed_subframes = 0;
-
-  for (i = 1; i < n; i++) {
-    if (!strcmp(v[i], "-h") || !strcmp(v[i], "--help")) usage();
-    if (!strcmp(v[i], "-d"))
-      { if (i > n-2) usage(); database_filename = v[++i]; continue; }
-    if (!strcmp(v[i], "-o"))
-      { if (i > n-2) usage(); output_file = v[++i]; continue; }
-    if (!strcmp(v[i], "-c"))
-      { if (i > n-2) usage(); number_of_subframes = atoi(v[++i]); continue; }
-    if (!strcmp(v[i], "-v")) { verbose = 1; continue; }
-    if (file == NULL) { file = v[i]; continue; }
-    if (frame == -1) { frame = atoi(v[i]); continue; }
-    if (subframe == -1) { subframe = atoi(v[i]); continue; }
-    usage();
-  }
-  if (file == NULL || frame == -1 || subframe == -1) usage();
-
-  if (database_filename == NULL) {
-    printf("ERROR: provide a database file (-d)\n");
-    exit(1);
-  }
-
-  if (number_of_subframes < 1) {
-    printf("bad value for option -c, must be at least 1 and is %d\n",
-           number_of_subframes);
-    exit(1);
-  }
-
-  if (output_file == NULL) {
-    printf("gimme -o <output file>, thanks\n");
-    exit(1);
-  }
-
-  out = fopen(output_file, "w"); if(out==NULL){perror(output_file);exit(1);}
-
-  database = parse_database(database_filename);
-
-  load_config_file(database_filename);
-
-  input_event_id = event_id_from_name(database, "ENB_PHY_INPUT_SIGNAL");
-  f = get_format(database, input_event_id);
-
-  frame_arg = subframe_arg = buffer_arg = -1;
-  for (i = 0; i < f.count; i++) {
-    if (!strcmp(f.name[i], "frame")) {
-      if (frame_arg != -1) goto err;
-      if (strcmp(f.type[i], "int")) goto err;
-      frame_arg = i;
-    }
-    if (!strcmp(f.name[i], "subframe")) {
-      if (subframe_arg != -1) goto err;
-      if (strcmp(f.type[i], "int")) goto err;
-      subframe_arg = i;
-    }
-    if (!strcmp(f.name[i], "rxdata")) {
-      if (buffer_arg != -1) goto err;
-      if (strcmp(f.type[i], "buffer")) goto err;
-      buffer_arg = i;
-    }
-    continue;
-err:
-    printf("cannot deal with ENB_PHY_INPUT_SIGNAL from database file\n");
-    exit(1);
-  }
-  if (frame_arg == -1 || subframe_arg == -1 || buffer_arg == -1) goto err;
-
-  fd = open(file, O_RDONLY);
-  if (fd == -1) { perror(file); exit(1); }
-
-  /* get wanted frame/subframe */
-  while (1) {
-    char v[T_BUFFER_MAX];
-    event e;
-    e = get_event(fd, v, database);
-    if (e.type == -1) break;
-    if (e.type != input_event_id) continue;
-    if (verbose)
-      printf("input frame %d subframe %d size %d\n",
-             e.e[frame_arg].i, e.e[subframe_arg].i, e.e[buffer_arg].bsize);
-    if (!(frame == e.e[frame_arg].i && subframe == e.e[subframe_arg].i))
-      continue;
-#if 0
-for (i = 0; i < e.e[buffer_arg].bsize/2; i++) {
-short *x = e.e[buffer_arg].b;
-x[i] *= 14;
-}
-#endif
-    if (fwrite(e.e[buffer_arg].b, e.e[buffer_arg].bsize, 1, out) != 1)
-      { perror(output_file); exit(1); }
-    processed_subframes++;
-    number_of_subframes--;
-    if (!number_of_subframes) {
-      if (fclose(out)) perror(output_file);
-      printf("%d subframes dumped\n", processed_subframes);
-      return 0;
-    }
-    subframe++;
-    if (subframe == 10) { subframe = 0; frame=(frame+1)%1024; }
-  }
-
-  printf("frame %d subframe %d not found\n", frame, subframe);
-  printf("%d subframes dumped\n", processed_subframes);
-  fclose(out);
-
-  return 0;
-}

common/utils/T/tracer/extract_output_subframe.c

@@ -1,158 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <fcntl.h>
-#include "database.h"
-#include "event.h"
-#include "config.h"
-
-void usage(void)
-{
-  printf(
-"usage: [options] <file> <frame> <subframe> <number of subframes>\n"
-"    the program dumps 'number of subframes' subframes starting\n"
-"    at 'frame:suubframe'\n"
-"options:\n"
-"    -d <database file>        this option is mandatory\n"
-"    -o <output file>          output to file (default: stdout)\n"
-"    -v                        verbose\n"
-  );
-  exit(1);
-}
-
-int main(int n, char **v)
-{
-  char *database_filename = NULL;
-  void *database;
-  int i;
-  int output_event_id;
-  database_event_format f;
-  char *file = NULL;
-  int fd;
-  int frame = -1, subframe = -1;
-  int number_of_subframes = -1;
-  int frame_arg, subframe_arg, buffer_arg;
-  int verbose = 0;
-  char *out_filename = NULL;
-  FILE *out;
-
-  for (i = 1; i < n; i++) {
-    if (!strcmp(v[i], "-h") || !strcmp(v[i], "--help")) usage();
-    if (!strcmp(v[i], "-d"))
-      { if (i > n-2) usage(); database_filename = v[++i]; continue; }
-    if (!strcmp(v[i], "-o"))
-      { if (i > n-2) usage(); out_filename = v[++i]; continue; }
-    if (!strcmp(v[i], "-v")) { verbose = 1; continue; }
-    if (file == NULL)              { file = v[i]; continue; }
-    if (frame == -1)               { frame = atoi(v[i]); continue; }
-    if (subframe == -1)            { subframe = atoi(v[i]); continue; }
-    if (number_of_subframes == -1) {number_of_subframes=atoi(v[i]);continue;}
-    usage();
-  }
-  if (file == NULL || frame == -1 || subframe == -1 ||
-      number_of_subframes == -1) usage();
-
-  if (database_filename == NULL) {
-    printf("ERROR: provide a database file (-d)\n");
-    exit(1);
-  }
-
-  if (out_filename == NULL) out = stdout;
-  else {
-    out = fopen(out_filename, "w");
-    if (out == NULL) { perror(out_filename); exit(1); }
-  }
-
-  database = parse_database(database_filename);
-
-  load_config_file(database_filename);
-
-  output_event_id = event_id_from_name(database, "ENB_PHY_OUTPUT_SIGNAL");
-  f = get_format(database, output_event_id);
-
-  frame_arg = subframe_arg = buffer_arg = -1;
-  for (i = 0; i < f.count; i++) {
-    if (!strcmp(f.name[i], "frame")) {
-      if (frame_arg != -1) goto err;
-      if (strcmp(f.type[i], "int")) goto err;
-      frame_arg = i;
-    }
-    if (!strcmp(f.name[i], "subframe")) {
-      if (subframe_arg != -1) goto err;
-      if (strcmp(f.type[i], "int")) goto err;
-      subframe_arg = i;
-    }
-    if (!strcmp(f.name[i], "txdata")) {
-      if (buffer_arg != -1) goto err;
-      if (strcmp(f.type[i], "buffer")) goto err;
-      buffer_arg = i;
-    }
-    continue;
-err:
-    printf("cannot deal with ENB_PHY_OUTPUT_SIGNAL from database file\n");
-    exit(1);
-  }
-  if (frame_arg == -1 || subframe_arg == -1 || buffer_arg == -1) goto err;
-
-  fd = open(file, O_RDONLY);
-  if (fd == -1) { perror(file); exit(1); }
-
-  int last_frame = -1;
-  int last_subframe = -1;
-  int subframe_written = 0;
-  while (1) {
-    char v[T_BUFFER_MAX];
-    event e;
-    e = get_event(fd, v, database);
-    if (e.type == -1) break;
-    if (e.type != output_event_id) continue;
-    if (verbose)
-      printf("found output frame %d subframe %d size %d\n",
-             e.e[frame_arg].i, e.e[subframe_arg].i, e.e[buffer_arg].bsize);
-    if (!(last_frame != -1 ||
-          (frame == e.e[frame_arg].i && subframe == e.e[subframe_arg].i)))
-      continue;
-    frame = e.e[frame_arg].i;
-    subframe = e.e[subframe_arg].i;
-    if (last_frame != -1) {
-      if (frame*10+subframe != (last_frame*10+last_subframe + 1) % 10240) {
-        printf("error: discontinuity, not what you want...\n");
-        exit(1);
-      }
-    }
-    last_frame = frame;
-    last_subframe = subframe;
-#if 0
-for (i = 0; i < e.e[buffer_arg].bsize/2; i++) {
-short *x = e.e[buffer_arg].b;
-x[i] *= 14;
-}
-#endif
-    if (verbose)
-      printf("save output frame %d subframe %d size %d\n",
-             e.e[frame_arg].i, e.e[subframe_arg].i, e.e[buffer_arg].bsize);
-    if (fwrite(e.e[buffer_arg].b, e.e[buffer_arg].bsize, 1, out) != 1) {
-      perror(out_filename);
-      exit(1);
-    }
-    subframe_written++;
-    if (subframe_written != number_of_subframes)
-      continue;
-
-    /* done */
-    fflush(out);
-    if (out_filename != NULL) {
-      if (fclose(out)) perror(out_filename);
-    }
-    if (verbose)
-      printf("%d subframes written\n", subframe_written);
-    return 0;
-  }
-
-  printf("error with input file, %d subframe written\n", subframe_written);
-  fflush(out);
-  if (out_filename != NULL) {
-    if (fclose(out)) perror(out_filename);
-  }
-  return 1;
-}

common/utils/T/tracer/filter/filter.c

@@ -10,8 +10,6 @@ struct filter {
     struct { struct filter *a, *b; } op2;
     int v;
     struct { int event_type; int arg_index; } evarg;
-    struct { int (*fun)(void *priv, int v); void *priv;
-             struct filter *x; } evfun;
   } v;
 
   int (*eval)(struct filter *this, event e);
@@ -54,11 +52,6 @@ int eval_evarg(struct filter *f, event e)
   return e.e[f->v.evarg.arg_index].i;
 }
 
-int eval_evfun(struct filter *f, event e)
-{
-  return f->v.evfun.fun(f->v.evfun.priv, f->v.evfun.x->eval(f->v.evfun.x, e));
-}
-
 /****************************************************************************/
 /*                     free memory functions                                */
 /****************************************************************************/
@@ -70,12 +63,6 @@ void free_op2(struct filter *f)
   free(f);
 }
 
-void free_evfun(struct filter *f)
-{
-  free_filter(f->v.evfun.x);
-  free(f);
-}
-
 void free_noop(struct filter *f)
 {
   free(f);
@@ -148,19 +135,6 @@ filter *filter_evarg(void *database, char *event_name, char *varname)
   return ret;
 }
 
-filter *filter_evfun(void *database, int (*fun)(void *priv, int v),
-    void *priv, filter *x)
-{
-  struct filter *ret = calloc(1, sizeof(struct filter));
-  if (ret == NULL) abort();
-  ret->eval = eval_evfun;
-  ret->free = free_evfun;
-  ret->v.evfun.fun  = fun;
-  ret->v.evfun.priv = priv;
-  ret->v.evfun.x    = x;
-  return ret;
-}
-
 void free_filter(filter *_f)
 {
   struct filter *f;

common/utils/T/tracer/filter/filter.h

@@ -9,8 +9,6 @@ filter *filter_and(filter *a, filter *b);
 filter *filter_eq(filter *a, filter *b);
 filter *filter_int(int v);
 filter *filter_evarg(void *database, char *event_name, char *varname);
-filter *filter_evfun(void *database, int (*fun)(void *priv, int v),
-    void *priv, filter *x);
 
 int filter_eval(filter *f, event e);
 

common/utils/T/tracer/to_vcd.c

@@ -1,302 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdint.h>
-#include <inttypes.h>
-#include <signal.h>
-#include <unistd.h>
-#include "database.h"
-#include "utils.h"
-#include "handler.h"
-#include "config.h"
-#include "logger/logger.h"
-#include "view/view.h"
-
-typedef struct {
-  char *event;
-  char *arg;
-  char *vcd_name;
-  int boolean;
-} vcd_vars;
-
-/****************************************************************************/
-/* VCD file handling begin                                                  */
-/****************************************************************************/
-
-FILE *out;
-
-uint64_t start_time;
-int start_time_inited;
-
-void vcd_init(char *file)
-{
-  out = fopen(file, "w"); if (out == NULL) { perror(file); exit(1); }
-}
-
-void vcd_write_header(vcd_vars *v, int n)
-{
-  int i;
-
-  if (fprintf(out,
-"$date\n"
-"  January, 1, 1970.\n"
-"$end\n"
-"$version\n"
-"  to_vcd\n"
-"$end\n"
-"$timescale 1ns $end\n"
-"$scope module logic $end\n") <= 0) abort();
-
-  for (i = 0; i < n; i++)
-    if (fprintf(out, "$var wire %d %s %s $end\n",
-           v[i].boolean ? 1 : 64,
-           v[i].vcd_name, v[i].vcd_name) <= 0) abort();
-
-  if (fprintf(out,
-"$upscope $end\n"
-"$enddefinitions $end\n"
-"$dumpvars\n") <= 0) abort();
-
-  for (i = 0; i < n; i++)
-    if (v[i].boolean) {
-      if (fprintf(out, "0%s\n", v[i].vcd_name) <= 0) abort();
-    } else {
-      if (fprintf(out, "b0 %s\n", v[i].vcd_name) <= 0) abort();
-    }
-
-  if (fprintf(out,
-"$end\n") <= 0) abort();
-
-}
-
-void vcd_end(void)
-{
-  if (fclose(out)) { perror("error closing VCD file"); exit(1); }
-}
-
-char *b64(uint64_t val)
-{
-  static char v[65];
-  char *s = &v[64];
-  *s = 0;
-  if (val == 0) { s--; *s = '0'; return s; }
-  while (val) {
-    s--;
-    *s = val&1 ? '1' : '0';
-    val >>= 1;
-  }
-  return s;
-}
-
-void vcd_dump(char *v)
-{
-  uint64_t h, m, s, ns;
-  char t;
-  uint64_t val;
-  uint64_t time;
-  char var[256];
-  if (sscanf(v, "%"SCNu64":%"SCNu64":%"SCNu64".%"SCNu64": %c %"SCNu64" %s",
-      &h, &m, &s, &ns, &t, &val, var) != 7)
-    goto err;
-  time = h*60*60*1000000000 +
-            m*60*1000000000 +
-               s*1000000000 +
-                         ns;
-  if (!start_time_inited) {
-    start_time = time;
-    start_time_inited = 1;
-  }
-  if (fprintf(out, "#%"PRIu64"\n", time - start_time) <= 0) abort();
-  switch (t) {
-  case 'b': if (fprintf(out, "%d%s\n", val!=0, var) <= 0) abort(); break;
-  case 'l': if (fprintf(out, "b%s %s\n", b64(val), var) <= 0) abort(); break;
-  default: goto err;
-  }
-
-  return;
-
-err:
-  printf("bad vcd_dump line '%s'\n", v);
-  exit(1);
-}
-
-/****************************************************************************/
-/* VCD file handling end                                                    */
-/****************************************************************************/
-
-
-/****************************************************************************/
-/* vcd view start                                                           */
-/****************************************************************************/
-
-struct vcd_view {
-  view common;
-};
-
-static void vcd_view_clear(view *this)
-{
-  /* nothing */
-}
-
-static void vcd_view_append(view *_this, char *s)
-{
-  vcd_dump(s);
-}
-
-static view *new_view_vcd(void)
-{
-  struct vcd_view *ret = calloc(1, sizeof(struct vcd_view));
-  if (ret == NULL) abort();
-  ret->common.clear = vcd_view_clear;
-  ret->common.append = (void (*)(view *, ...))vcd_view_append;
-  return (view *)ret;
-}
-
-/****************************************************************************/
-/* vcd view end                                                             */
-/****************************************************************************/
-
-void activate_traces(int socket, int number_of_events, int *is_on)
-{
-  char t = 1;
-  if (socket_send(socket, &t, 1) == -1 ||
-      socket_send(socket, &number_of_events, sizeof(int)) == -1 ||
-      socket_send(socket, is_on, number_of_events * sizeof(int)) == -1)
-    abort();
-}
-
-void usage(void)
-{
-  printf(
-"options:\n"
-"    -d <database file>           this option is mandatory\n"
-"    -o <output file>             this option is mandatory\n"
-"    -ip <host>                   connect to given IP address (default %s)\n"
-"    -p <port>                    connect to given port (default %d)\n"
-"    -b <event> <arg> <vcd name>  trace as binary (0 off, anything else on)\n"
-"    -l <event> <arg> <vcd name>  trace as uint64_t\n",
-  DEFAULT_REMOTE_IP,
-  DEFAULT_REMOTE_PORT
-  );
-  exit(1);
-}
-
-int run = 1;
-static int socket = -1;
-
-void force_stop(int x)
-{
-  printf("\ngently quit...\n");
-  close(socket);
-  socket = -1;
-  run = 0;
-}
-
-int main(int n, char **v)
-{
-  char *output_filename = NULL;
-  char *database_filename = NULL;
-  void *database;
-  char *ip = DEFAULT_REMOTE_IP;
-  int port = DEFAULT_REMOTE_PORT;
-  int *is_on;
-  int number_of_events;
-  int i;
-  vcd_vars vars[n];
-  int nvars = 0;
-  view *vcd_view;
-  event_handler *h;
-  logger *textlog;
-
-  /* write on a socket fails if the other end is closed and we get SIGPIPE */
-  if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) abort();
-
-  for (i = 1; i < n; i++) {
-    if (!strcmp(v[i], "-h") || !strcmp(v[i], "--help")) usage();
-    if (!strcmp(v[i], "-d"))
-      { if (i > n-2) usage(); database_filename = v[++i]; continue; }
-    if (!strcmp(v[i], "-o"))
-      { if (i > n-2) usage(); output_filename = v[++i]; continue; }
-    if (!strcmp(v[i], "-ip")) { if (i > n-2) usage(); ip = v[++i]; continue; }
-    if (!strcmp(v[i], "-p"))
-      { if (i > n-2) usage(); port = atoi(v[++i]); continue; }
-    if (!strcmp(v[i], "-b")) { if(i>n-4)usage();
-      vars[nvars].event     = v[++i];
-      vars[nvars].arg       = v[++i];
-      vars[nvars].vcd_name  = v[++i];
-      vars[nvars++].boolean = 1;
-      continue;
-    }
-    if (!strcmp(v[i], "-l")) { if(i>n-4)usage();
-      vars[nvars].event     = v[++i];
-      vars[nvars].arg       = v[++i];
-      vars[nvars].vcd_name  = v[++i];
-      vars[nvars++].boolean = 0;
-      continue;
-    }
-    usage();
-  }
-
-  if (output_filename == NULL) {
-    printf("ERROR; provide an output file (-o)\n");
-    exit(1);
-  }
-
-  if (database_filename == NULL) {
-    printf("ERROR: provide a database file (-d)\n");
-    exit(1);
-  }
-
-  database = parse_database(database_filename);
-
-  load_config_file(database_filename);
-
-  number_of_events = number_of_ids(database);
-  is_on = calloc(number_of_events, sizeof(int));
-  if (is_on == NULL) abort();
-
-  h = new_handler(database);
-
-  /* create the view */
-  vcd_view = new_view_vcd();
-
-  /* setup traces */
-  for (i = 0; i < nvars; i++) {
-    char format[256];
-    if (strlen(vars[i].arg) > 256-3) abort();
-    if (strlen(vars[i].vcd_name) > 256-1) abort();
-    sprintf(format, "%c [%s] %s",
-        vars[i].boolean ? 'b' : 'l',
-        vars[i].arg,
-        vars[i].vcd_name);
-    textlog = new_textlog(h, database, vars[i].event, format);
-    logger_add_view(textlog, vcd_view);
-    on_off(database, vars[i].event, is_on, 1);
-  }
-
-  socket = connect_to(ip, port);
-
-  /* activate selected traces */
-  activate_traces(socket, number_of_events, is_on);
-
-  vcd_init(output_filename);
-  vcd_write_header(vars, nvars);
-
-  /* exit on ctrl+c and ctrl+z */
-  if (signal(SIGQUIT, force_stop) == SIG_ERR) abort();
-  if (signal(SIGINT, force_stop) == SIG_ERR) abort();
-  if (signal(SIGTSTP, force_stop) == SIG_ERR) abort();
-
-  /* read messages */
-  while (run) {
-    char v[T_BUFFER_MAX];
-    event e;
-    e = get_event(socket, v, database);
-    if (e.type == -1) { printf("disconnected? let's quit gently\n"); break; }
-    handle_event(h, e);
-  }
-
-  vcd_end();
-
-  return 0;
-}

common/utils/asn1_conversions.h

@@ -3,7 +3,7 @@
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ * the OAI Public License, Version 1.0  (the "License"); you may not use this file
  * except in compliance with the License.
  * You may obtain a copy of the License at
  *

common/utils/assertions.h

@@ -3,7 +3,7 @@
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ * the OAI Public License, Version 1.0  (the "License"); you may not use this file
  * except in compliance with the License.
  * You may obtain a copy of the License at
  *