Commit Graph
243 Commits
Author SHA1 Message Date
yilmazt 2b321fd1c7 Merging latest develop commits 2019-07-16 11:20:24 +02:00
yilmazt 7faabbc02f build_oai is thoroughly checked 2019-06-18 21:51:13 +02:00
yilmazt 420e6194d4 All 4 nr&lte-(ue)softmodems are compiling 2019-06-16 19:46:11 +02:00
Wang Tsu-Han 6b2e064216 Merge branch 'develop' into ru_rau_enhancement_L1_renaming
Conflicts:
	ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1.xml
	cmake_targets/CMakeLists.txt
	cmake_targets/build_oai
	openair1/PHY/LTE_UE_TRANSPORT/initial_sync.c
	targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.calisson.conf
	targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.memphis.conf
	targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.nord.conf
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-ue.c
2019-05-23 18:29:01 +02:00
Raphael Defosseux 7d1956b674 Merge remote-tracking branch 'origin/bugfix-ue-realtime' into develop_integration_2019_w21 2019-05-22 11:39:00 +02:00
Cedric Roux 1efbfa5304 bugfix: fix UE realtime bug
When pushing traffic with iperf the UE was crashing.

The argument passed to pthread_mutex_timedlock is absolute time based
on the CLOCK_REALTIME timer, not relative time. That seems to be the
root cause of the bug. (That there is a timeout is another story.)

This commit uses absolute value.

Also we separate cases between IS_SOFTMODEM_BASICSIM / IS_SOFTMODEM_RFSIM
and standard realtime UE. In the 'sim' modes we don't care about
timeout and just call pthread_mutex_lock. It seems to be the idea
of the original work. If not, then to be fixed.
2019-05-20 11:26:06 +02:00
yilmazt 7719314983 Merge branch 'develop' into develop-nr 2019-05-17 17:11:31 +02:00
frtabu 28a4f53356 Fix basic simu problem, due to remaining #if OAI_USRP... macros in UE 2019-05-06 19:17:40 +02:00
Raymond Knopp a64e7eef7d tested compilation and execution with --simL1 and --rfsim. 2019-04-22 21:20:43 +02:00
Raymond Knopp d1e27f4e8c changes in PARALLEL_RU_L!_TRX_SPLIT configuration. Correction of a few bugs related to passing of variables between threads 2019-04-19 03:18:06 +02:00
Raphael Defosseux 335e894ce3 Merge remote-tracking branch 'origin/T-ue-fixes-2019-w14' into develop_integration_2019_w15 2019-04-15 10:18:47 +02:00
frtabu 30b7c973e0 merge nfapi_cleanup 2019-04-05 18:43:40 +02:00
Cedric Roux 4905a5e8e8 bugfixes for the ue T tracer
Not much major changes. In openair1/PHY/LTE_UE_TRANSPORT/dci_tools_ue.c,
in the function generate_ue_dlsch_params_from_dci,
'harq_pid' was removed and dci_info_extarcted.harq_pid is now used for
all cases.

The ue T tracer only deals with PHY signals (no MAC, RLC, PDCP, RRC).
2019-04-03 12:44:17 +02:00
frtabu 753c2f446d apply astyle, fix compilation warnings in raw aeth transport and kernel modules 2019-03-10 00:04:12 +01:00
frtabu c9dcaa53af noS1 woking with tun interfaces and basic simu 2019-03-08 16:00:09 +01:00
frtabu 87a8cb28a5 basic and rf simulators as config option to allow noS1 datapath debug. 2019-03-04 22:07:32 +01:00
frtabu d0a3788ca8 re-apply fixes lost with last rebase 2019-02-12 10:12:07 +01:00
Raphael Defosseux f7938a4b24 Fixing L2-simulator for TDD environment
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-01-29 09:55:21 +01:00
Raphael Defosseux 2d7c9734fd Fixing a few warnings (flexran)
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-01-24 19:57:49 +01:00
Raphael Defosseux 8260607ed6 CI: fix in L2-simulator VM build start script
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-01-22 21:37:40 +01:00
Raphael Defosseux d73685933c Merge remote-tracking branch 'origin/develop' into issue_345_l2_fapi_simulator_new
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-01-16 11:21:27 +01:00
Florian Kaltenberger 73178c8153 Nr cpu affinity2 2019-01-09 20:49:15 +01:00
Haruki NAOI 7d9898a5bb Merge remote-tracking branch 'remotes/origin/develop' into issue_345_l2_fapi_simulator_new
# Conflicts:
#	openair2/LAYER2/PDCP_v10.1.0/pdcp.c
#	openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
#	openair2/LAYER2/RLC/rlc.c
2018-11-06 15:03:54 +09:00
frtabu 18ec5d8047 abort execution when an unknown option is passed via the command line: add config_check_cmdlineopt API to config module, create lte-softmodem-common.c source to remove duplicate code in lte-softmodem.c and lte-uesoftmodem.c, fix segfaults in exec_function of lte-uesoftmodem 2018-11-02 18:17:11 +01:00
yoshio.inoue 3ec3a1af34 Add comment 2018-11-02 16:55:13 +09:00
Y_Tomita bb7d63e97e Fix timing setting in L2 FAPI simulator. 2018-10-26 18:07:03 +09:00
Y_Tomita dcfe6b32e2 Fix for TDD L2 FAPI simulator. 2018-10-25 22:10:57 +09:00
Florian Kaltenberger 83e9908adb merging develop with develop-nr 2018-10-25 03:15:09 -07:00
Y_Tomita 6404eddfc1 Fix easy mistatke. 2018-10-23 13:19:33 +09:00
Y_Tomita 20a2e83c39 Add multiple UE's L2 FAPI simulator's function. 2018-10-22 17:21:30 +09:00
Y_Tomita ac0d6cc1f3 Add NAS initialization in L2 FAPI simulator. 2018-10-22 14:00:47 +09:00
Bi-Ruei, Chiu f58ad3c39f Add prefix LTE_ to LTE-RRC generated data types by ASN1C_PREFIX=LTE_
1. Modify all expressions using original LTE-RRC data types for new generated ones
2. Does not change any program logic
2018-10-17 15:46:12 +08:00
Cedric Roux 824f62d8bf basic simulator: support TDD mode
For whatever reason we need N_TA_offset to be 0 for the basic simulator
to function properly.

This is more a hack than a proper solution. More analysis is needed
to understand what happens and what should be really done.
2018-09-14 15:01:55 +02:00
Raymond Knopp 21be856f58 lte-softmodem-nos1 / lte-uesoftmodem-nos1 functional 2018-08-28 00:16:38 +02:00
Cedric Roux a48c36582f bugfix: fix threading in the UE
Various problems were found with the basic simulator.

Variables used by various threads for synchronization need to
be initialized properly. That is before the various threads
start using them.

This goes for:
- UE->is_synchronized
- UE->proc.instance_cnt_synch
- UE->proc.instance_cnt_rxtx

The function "UE->rfdevice.trx_start_func" was called in
"UE_thread_synch" but should be called in "UE_thread" because
"UE_thread" is the one that calls "UE->rfdevice.trx_read_func"
and there is no guaranty that the call to "UE->rfdevice.trx_start_func"
is done before as it has to (it's in another thread).

And finally "pthread_cond_signal(&proc->cond_rxtx)" was called twice,
which may not be a problem but was certainly not intended. Plus
removing one call simplifies the code by removing some "if" logic,
which is a good thing per se.

This commit was not tested with a real UE and may thus introduce some
issues. Hopefully not!
2018-08-27 17:46:03 +02:00
Cedric Roux 97ddf5ea28 basic simulator: bugfix: wait for synch ready at the right time
Before this commit we were checking for UE->is_synchronized == 0
then we were waiting for a potentially active synch routine to
finish and then we were starting the synch routine again but the
synch routine that was running may have set UE->is_synchronized
to 1. This was leading to various problems, most notably the following
message repeated over and over in the UE log and the UE unable to
connect properly:

    [RRC]  [UE 0] Frame 377: OUT OF SYNC FROM eNB 0 (T310 active 0 : T310 0, N310 345, N311 0)

So let's wait for a potentially active synch routine to finish
before anything else.
2018-08-27 17:32:00 +02:00
Raymond Knopp a9e4003372 lte-uesoftmodem compiles 2018-08-27 15:53:34 +02:00
Raymond Knopp b93b7073ca Merge remote-tracking branch 'origin/develop' into develop-nr
Conflicts:
	ci-scripts/Jenkinsfile-gitlab
	ci-scripts/buildOnVM.sh
	ci-scripts/checkCodingFormattingRules.sh
	ci-scripts/createVM.sh
	ci-scripts/destroyAllRunningVM.sh
	ci-scripts/reportBuildLocally.sh
	cmake_targets/CMakeLists.txt
	cmake_targets/build_oai
	cmake_targets/tools/build_helper
	common/utils/LOG/log.h
	openair1/PHY/LTE_ESTIMATION/lte_sync_timefreq.c
	openair1/PHY/TOOLS/file_output.c
	openair1/PHY/TOOLS/lte_dfts.c
	openair1/PHY/TOOLS/tools_defs.h
	openair1/PHY/defs_eNB.h
	openair1/PHY/impl_defs_lte.h
	openair1/SCHED_UE/phy_procedures_lte_ue.c
	openair2/COMMON/platform_constants.h
	openair2/COMMON/platform_types.h
	openair2/LAYER2/MAC/eNB_scheduler.c
	openair2/LAYER2/MAC/main.c
	openair2/RRC/LTE/L2_interface.c
	openair2/RRC/LTE/MESSAGES/asn1_msg.c
	openair2/RRC/LTE/MESSAGES/asn1_msg_NB_IoT.c
	openair2/RRC/LTE/rrc_UE.c
	openair2/RRC/LTE/rrc_eNB.c
	openair2/RRC/LTE/rrc_eNB_S1AP.c
	openair2/UTIL/LOG/log.c
	openair3/S1AP/s1ap_common.h
	openair3/S1AP/s1ap_eNB.c
	openair3/S1AP/s1ap_eNB_context_management_procedures.c
	openair3/S1AP/s1ap_eNB_decoder.c
	openair3/S1AP/s1ap_eNB_decoder.h
	openair3/S1AP/s1ap_eNB_handlers.c
	openair3/S1AP/s1ap_eNB_nas_procedures.c
	openair3/S1AP/s1ap_eNB_overload.c
	openair3/S1AP/s1ap_eNB_trace.c
	openair3/TEST/EPC_TEST/play_scenario_decode.c
	openair3/TEST/EPC_TEST/play_scenario_s1ap.c
	openair3/TEST/EPC_TEST/play_scenario_s1ap_compare_ie.c
	targets/COMMON/openairinterface5g_limits.h
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210.conf
	targets/RT/USER/lte-ran.c
	targets/RT/USER/lte-ru.c
	targets/RT/USER/lte-ue.c
	targets/SIMU/USER/oaisim_functions.c
2018-08-25 18:20:44 +02:00
frtabu 30509955c2 remove compilation warnings, especially when disabling T_TRACER. enhance LOG_M macro implementation, introduce LOG_DEBUG_XXX macro to replace #ifdef DEBUG_XXX 2018-07-30 20:07:22 +02:00
frtabu b85cbddeec log.c simplification, fix usefull functionality which never worked, move all log code from openair2 to common 2018-07-30 20:07:22 +02:00
Raymond Knopp 11c4cb9b33 1. fixed initialization issues for lte-uesoftmodem when running with non RF simulation target.
2. minor modifications in dlsch_demodulation.c for 2 eNB TX antennas, 1 RX antenna. Inconsistant indexing of some arrays in this case.
3. change in config_load_configmodule.c : removed exit(-1) when no configuration file is used. This makes unitary simulators exit. Effect on lte-XXsoftmodem TBC.
2018-07-25 00:33:04 +02:00
Raymond Knopp 5a808cb1ca Merge branch 'develop' into enhancement-rfsim
Conflicts:
	openair1/SCHED_UE/phy_procedures_lte_ue.c
	openair2/RRC/LTE/rrc_UE.c
	targets/RT/USER/lte-ru.c
	targets/RT/USER/lte-uesoftmodem.c
2018-06-28 14:54:15 -07:00
Raymond Knopp 27892e0935 Merge remote-tracking branch 'origin/develop' into enhancement-rfsim
Conflicts:
	cmake_targets/build_oai
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf
	targets/RT/USER/lte-ru.c
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-uesoftmodem.c
2018-06-28 14:44:47 -07:00
matzakos 74d1853ef6 Minor modifications to make nfapi-L2-emulator work again and redundant logs removal. 2018-06-21 17:56:29 +02:00
Raymond Knopp 8dd9cf3c86 creation of simulation data structure. some cleanup and testing with multiple UEs 2018-06-04 00:12:48 +02:00
Raymond Knopp c3c6284b83 Merge remote-tracking branch 'origin/develop' into enhancement-rfsim 2018-06-03 08:57:24 +02:00
Raymond Knopp fa8b42c0d5 debugging of --siml1 2018-05-31 13:57:48 +02:00
Raymond Knopp eb363157c6 moved simulation target into lte-uesoftmodem with --simL1 option 2018-05-30 17:49:55 -07:00
WEI-TAI CHEN 5b94aeac77 Merge nr_initialsync 2018-05-29 03:13:08 -07:00
Raymond Knopp b036b18afe moved sidlink L1 functions to LTE_UE_TRANSPORT, corrected issue related to "find_dlsch" which is needed to compile UE and creates problem for unitary simulations (moved to lte-ue.c application) 2018-05-28 11:09:38 -07:00