Commit Graph
342 Commits
Author SHA1 Message Date
Wang Tsu-Han 1c025c2dfa Merge branch 'develop' into L1_renaming
Conflicts:
	common/utils/LOG/log.c
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-softmodem.c
2018-11-30 14:52:56 +01:00
Raphael Defosseux 0db0249057 Merge remote-tracking branch 'origin/373-parallelization-not-working-correctly-in-phy-simulators-and-bad-implementation-2' into develop_integration_w48
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-11-28 18:27:55 +01:00
Wang Tsu-Han 6aadf8312a Merge branch '373-parallelization-not-working-correctly-in-phy-simulators-and-bad-implementation-2' into L1_renaming 2018-11-28 11:59:31 +01:00
Louis Adrien Dufrene 04a3cda0b2 wrong manipulation had modified lte-enb.c 2018-11-16 11:42:13 +01:00
Louis Adrien Dufrene bfb65b57f7 astyle applied 2018-11-16 11:36:44 +01:00
Louis Adrien Dufrene 700437f184 astyle applied 2018-11-16 08:49:28 +01:00
Louis Adrien Dufrene 2f11541973 test commit 2018-11-15 13:21:48 +01:00
laurent af892cc058 start fixing parallel threads 2018-11-14 20:51:41 +01:00
Wang Tsu-Han bc1abcd86f Merge branch 'develop' into L1_renaming
Conflicts:
	targets/RT/USER/lte-enb.c
2018-11-08 12:16:13 +01:00
Wang Tsu-Han 045f2bfd31 unused veriable remove 2018-11-08 11:42:44 +01:00
Wang Tsu-Han 2c5e5c7a0c print removel and config file chenge back to one RU 2018-11-05 18:41:04 +01:00
Cedric Roux 355f47fb1e Merge remote-tracking branch 'origin/develop-adding-prefix-to-LTE-RRC' into develop_integration_2018_w44 2018-11-02 10:30:35 +01:00
Wang Tsu-Han 12b81a5b77 fixes after the raneming of eNB_proc_t and eNB_rxtx_proc_t 2018-10-30 17:29:20 +01:00
Wang Tsu-Han 1d24208370 bug fix for RU_mask_tx 2018-10-26 17:33:46 +02:00
Wang Tsu-Han 265f110691 using mask for ru_thread_tx 2018-10-26 16:49:50 +02:00
Wang Tsu-Han de32c38987 applying new mechanism for communication between threads 2018-10-25 17:48:07 +02:00
Wang Tsu-Han 2104817a50 name changing for L1 2018-10-24 16:07:21 +02: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
laurent 63d3bf148e a printf with a removed variable in last commit 2018-10-12 19:29:58 +02:00
Raphael Defosseux 7260c9a908 Merge remote-tracking branch 'origin/fix_ulsim' into develop_integration_2018_w40 2018-10-04 13:10:23 +02:00
laurent f7b69a7b93 manual merge because conflict 2018-10-03 19:56:29 +02:00
Florian Kaltenberger 9f5f0ade7e removing some dead code 2018-09-30 09:54:34 -07:00
laurent de2362761c after testing other targets 2018-09-27 18:10:03 +02:00
Wang Tsu-Han 5b1260a759 fixed for phy-simulation mode 2018-09-13 15:02:15 +02:00
Wang Tsu-Han c5cd47f976 fixes for not having parallel config inside the config file 2018-09-12 15:32:44 +02:00
Wang Tsu-Han 3005929bca modify threading option into config file 2018-09-11 18:50:11 +02:00
Wang Tsu-Han 8bb3b91665 Merge branch 'develop' into parallel-config
Conflicts:
	targets/RT/USER/lte-ru.c
2018-09-11 16:11:59 +02:00
Cedric Roux 2cb87ddd02 Merge remote-tracking branch 'origin/feature-slice+restart-w35' into develop_integration_2018_w36
Conflicts:
	openair2/ENB_APP/flexran_agent_common_internal.c
	openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
2018-09-07 16:13:40 +02:00
laurent 46231a5d5d merge with latest develop 2018-09-06 09:43:26 +02:00
laurent abbffef015 fix some exit situations, that was badly done by SIGUSR1 handler 2018-09-05 17:03:19 +02:00
Robert Schmidt 1f60f4ecea Log Level Debug for Freeing Transport Channel Msg 2018-09-05 14:21:39 +02:00
Robert Schmidt 175d28ee35 bugfixes kill_eNB_proc()
* put mutex lock around instance_prach
* destroy attributes
2018-09-03 18:10:28 +02:00
Robert Schmidt 2e1dfb5b3e place oai_exit test after wait_on_condition() in threads 2018-09-03 18:10:28 +02:00
Robert Schmidt c56b5af00e bugfix: kill td/te threads only if initialized
* init_td_thread()/init_te_thread() are only initialized depending on condition
  get_nprocs() > 2 && codingw
* apply the same the same for the functions kill_td_thread()/kill_te_thread()
2018-09-03 18:10:28 +02:00
Wang Tsu-Han ee04caab8a replacing judgment from get_nprocs() and worker flags by paralle_stage and worker_stage 2018-08-31 12:58:49 +02:00
laurent 4c475c429b first commit new itti 2018-08-06 16:52:27 +02:00
Cedric Roux 409b3d5c20 Merge remote-tracking branch 'origin/issue326_LOGreview' into develop_integration_2018_w31 2018-08-03 09:45:26 +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
Wang Tsu-Han aa00a4734a reset for remerging 2018-07-30 11:24:08 +02:00
oai bfecc0110b Remove compilation warnings, also fix telnet server compilation failure and NB-IoT shared lib compilation failure introduced when reviewing L1 sources organization 2018-07-05 17:37:38 +02:00
bruno mongazon 107e256170 fixed #320 issue 2018-06-25 18:42:31 +02:00
bruno mongazon b016bc229a fixed #320 issue 2018-06-25 18:23:36 +02:00
matzakos 74d1853ef6 Minor modifications to make nfapi-L2-emulator work again and redundant logs removal. 2018-06-21 17:56:29 +02:00
Cedric Roux 5c6ad3142d Merge remote-tracking branch 'origin/develop' into mu_with_tdd1
The monolithic eNodeB is not fully functional in FDD.

The TDD mode has not been tested.

Do not consider this commit as functional.

Conflicts:
	cmake_targets/CMakeLists.txt
	cmake_targets/build_oai
	common/utils/itti/intertask_interface.c
	openair1/PHY/INIT/lte_init.c
	openair1/PHY/LTE_ESTIMATION/lte_adjust_sync.c
	openair1/PHY/LTE_TRANSPORT/dci_tools.c
	openair1/PHY/LTE_TRANSPORT/dlsch_scrambling.c
	openair1/PHY/LTE_TRANSPORT/transport_eNB.h
	openair1/PHY/LTE_UE_TRANSPORT/transport_proto_ue.h
	openair1/PHY/defs_eNB.h
	openair1/PHY/impl_defs_lte.h
	openair1/SCHED/fapi_l1.c
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair1/SCHED/pusch_pc.c
	openair2/COMMON/platform_types.h
	openair2/COMMON/rrc_messages_types.h
	openair2/ENB_APP/enb_config.c
	openair2/ENB_APP/enb_paramdef.h
	openair2/LAYER2/MAC/config.c
	openair2/LAYER2/MAC/eNB_scheduler.c
	openair2/LAYER2/MAC/eNB_scheduler_RA.c
	openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
	openair2/LAYER2/MAC/eNB_scheduler_primitives.c
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	openair2/LAYER2/MAC/flexran_agent_scheduler_dlsch_ue.c
	openair2/LAYER2/MAC/mac.h
	openair2/LAYER2/MAC/mac_proto.h
	openair2/LAYER2/MAC/pre_processor.c
	openair2/LAYER2/RLC/rlc.c
	openair2/LAYER2/RLC/rlc_rrc.c
	openair2/RRC/LITE/rrc_common.c
	openair2/RRC/LTE/L2_interface.c
	openair2/RRC/LTE/MESSAGES/asn1_msg.c
	openair2/RRC/LTE/rrc_eNB.c
	openair2/UTIL/LOG/log.h
	targets/COMMON/openairinterface5g_limits.h
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-ru.c
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-softmodem.h
2018-06-12 16:23:36 +02:00
Wang Tsu-Han e4a7318877 Merge branch 'develop' into parallel-phy-test-EMUFH
Conflicts:
	openair1/PHY/defs_eNB.h
	targets/RT/USER/lte-enb.c
2018-06-12 16:18:45 +02:00
Wang Tsu-Han 003c4b6cb0 numerology fix 2018-05-17 11:01:58 +02:00
Wang Tsu-Han 4fdbfc31ee adding timing check for emulate-rf 2018-05-16 16:18:50 +02:00
Cedric Roux 343bbbac68 Merge remote-tracking branch 'origin/feature-better-sw-configuration-between-various-version' into develop_integration_2018_w19
Conflicts:
	cmake_targets/CMakeLists.txt
	openair1/PHY/LTE_TRANSPORT/prach.c
	openair1/PHY/LTE_TRANSPORT/print_stats.c
	openair1/PHY/LTE_TRANSPORT/transport_eNB.h
	openair1/PHY/LTE_UE_TRANSPORT/transport_proto_ue.h
	openair1/PHY/defs_eNB.h
	openair1/PHY/impl_defs_lte.h
	openair1/SCHED/sched_common.h
	openair1/SCHED_UE/phy_procedures_lte_ue.c
	openair2/LAYER2/MAC/mac.h
	openair2/LAYER2/PDCP_v10.1.0/pdcp.c
	openair2/LAYER2/PDCP_v10.1.0/pdcp.h
	openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
	openair2/LAYER2/RLC/rlc.c
	openair2/PHY_INTERFACE/defs.h
	openair2/RRC/LTE/MESSAGES/asn1_msg.c
	openair2/RRC/LTE/MESSAGES/asn1_msg.h
	openair2/RRC/LTE/rrc_UE.c
	openair2/RRC/LTE/rrc_eNB.c
	targets/SIMU/USER/oaisim_functions.c
2018-05-15 17:43:12 +02:00
Wang Tsu-Han 7e10daaf14 bug fix for phy-test DL 2018-05-15 15:21:32 +02:00
Masayuki HARADA de1996ec3e change compile option from UE_EXPANSION to UE_EXPANSION,PHY_TX_THREAD,PRE_SCD_THREAD. 2018-05-15 17:37:43 +09:00