Commit Graph
40 Commits
Author SHA1 Message Date
rmagueta 4301582f88 Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
#	openair2/SIMULATION/NR_RRC/itti_sim.c
2021-04-15 15:29:03 +01:00
Xue Song 5918c03cd4 add nrue nas task 2021-02-16 14:14:46 +09:00
Laurent Thomas fa63d9a4e6 merge develop 2021-02-08 11:56:42 +01:00
Xue Song 52edf0c123 Merge branch 'master' into develop_SA_rfsim_for_F1
Conflicts:
	openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
	openair2/F1AP/f1ap_cu_interface_management.c
	openair2/F1AP/f1ap_cu_rrc_message_transfer.c
	openair2/F1AP/f1ap_cu_task.c
	openair2/F1AP/f1ap_du_interface_management.c
	openair2/F1AP/f1ap_du_task.c
	openair2/GNB_APP/gnb_app.c
	openair2/GNB_APP/gnb_config.c
	openair2/LAYER2/NR_MAC_UE/main_ue_nr.c
	openair2/RRC/NR/L2_nr_interface.c
	openair2/RRC/NR/MESSAGES/asn1_msg.c
	openair2/RRC/NR/rrc_gNB.c
	openair2/RRC/NR/rrc_gNB_NGAP.c
	openair2/RRC/NR_UE/L2_interface_ue.c
	openair2/RRC/NR_UE/rrc_UE.c
	openair3/NGAP/ngap_gNB.c
2021-02-04 18:16:37 +09:00
Xue Song 6a3b7b40a5 Merge branch 'master' into develop_SA_L3
Conflicts:
	openair2/GNB_APP/gnb_config.c
	openair2/RRC/NR/rrc_gNB.c
	openair2/RRC/NR/rrc_gNB_NGAP.c
	openair2/RRC/NR_UE/rrc_UE.c
2021-02-03 14:58:07 +09:00
Laurent Thomas 6b37681854 merge develop, minor code addition 2021-02-01 09:02:57 +01:00
laurent 4b345f1589 tested with one UE, better intergration with legacy gtpu 2021-01-27 15:09:00 +01:00
Laurent Thomas 75ad3da9d9 start new gtpu 2021-01-21 15:51:30 +01:00
Laurent Thomas eddebae1e4 fix after code review 2021-01-21 13:47:18 +01:00
Laurent a432feda3e add external visibility for itti_create_queue 2020-12-23 14:29:40 +01:00
Laurent 42a110338c itti dynamic queue creation, and 64 bits instance id 2020-12-23 13:56:01 +01:00
masayuki.harada 1956fd3b72 Merge commit 'b67badef1b2fd390d801e20644b08df0d5880583' into develop_SA_L3
# Conflicts:
#	common/utils/ocp_itti/intertask_interface.h
#	openair2/RRC/NR/rrc_gNB.c
#	openair3/NGAP/ngap_gNB_nas_procedures.c
2020-10-27 20:25:16 +09:00
Xue Song 62292f892e modify ngap_gNB_handle_nas_first_req 2020-10-27 01:56:41 +00:00
He Shanyun e6ddb5379c add process for itti simulator 2020-10-14 03:22:55 +00:00
He Shanyun 90dc22aea6 add rrc_nrue_task 2020-10-10 05:15:46 +00:00
Xue Song aa8e695d59 Fix compiling error 2020-10-10 03:24:06 +00:00
He Shanyun 8f3adc8bc8 fix gNB build error 2020-09-10 07:05:01 +00:00
zhenghuangkun 85fe26bd80 Modify NGAP Messages 2020-09-09 18:55:14 +09:00
laurent 4b58b9d38a gcc warnings 2020-07-02 16:32:07 +02:00
Thomas Schlichter 79471f2f6d Merge branch 'develop' into NR_RRC_PRACH_procedures
Conflicts:
	executables/nr-ue.c
	openair1/PHY/NR_TRANSPORT/nr_dci_tools.c
	openair1/PHY/NR_UE_TRANSPORT/nr_prach.c
	openair1/PHY/defs_RU.h
	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
	openair2/RRC/NR/rrc_gNB_nsa.c
	openair2/X2AP/x2ap_eNB_handler.c
2020-04-30 18:54:37 +02:00
laurent 9ac5f6015d update license text 2020-04-29 11:31:00 +02:00
laurent 744fe92859 set back rrc as a separate thread, lead to create back race conditions 2020-04-28 15:39:50 +02:00
laurent 861caa735d merge develop 2020-04-13 18:04:18 +02:00
Raymond Knopp b6ce8ed962 ENDC S1-U gNB support: Separate some GTP functions between eNB and gNB. Downlink traffic from SGW arrives properly at gNB now after path switch 2020-04-10 12:15:52 +02:00
laurent 8d9d80ee37 very big merge with merged develop, basic test done 2020-01-30 17:10:36 +01:00
Raphael Defosseux e7aa071e1b Merge remote-tracking branch 'origin/develop' into merging-2019-w51-to-develop-nr 2020-01-10 15:35:54 +01:00
Raphael Defosseux c409da3bb8 Patch provided by Gabriel Arrobo.
Mainly comestics and integer type management

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-01-09 14:10:04 +01:00
laurent c8d28f5254 fix LimeSDR board API, merge develop 2019-12-23 15:38:36 +01:00
laurent 63c023029a du in 2 threads, and fix UL in FS6 split 2019-10-26 11:28:46 +02:00
yilmazt 9aa3483235 executables compiling again 2019-10-03 16:00:46 +02:00
javier.morgade@ieee.org ac1347843f COMMON types updated: VCD,FAPI
ACKNOWLEDGEMENT:
 	1. This commit was developed at Vicomtech (https://www.vicomtech.org) under UE project CDN-X-ALL: "CDN edge-cloud computing for efficient cache and reliable streaming aCROSS Aggregated unicast-multicast LinkS"
 	2. Project funded by Fed4FIRE+ OC5 (https://www.fed4fire.eu)

	Signed-off-by: javier.morgade@ieee.org <javier.morgade@ieee.org>
2019-09-14 12:55:32 +02:00
yilmazt 4967e1b1ac develop&-nr up-to-date as of 30.7.19 2019-07-30 22:01:48 +02:00
luaihui e468376d93 add forwarding and end marker 2019-07-11 10:59:07 +09:00
yilmazt 2b05aba106 --phy_simulators compile up to nr_dlsim 2019-05-22 21:49:19 +02:00
yilmazt 7719314983 Merge branch 'develop' into develop-nr 2019-05-17 17:11:31 +02:00
Robert Schmidt 397d2f4815 Merge commit 'develop' into feature-127-protocol-split
* remove a lot of white spaces
* many conflicts in enb_config.c
2018-11-07 16:07:59 +01:00
Florian Kaltenberger 83e9908adb merging develop with develop-nr 2018-10-25 03:15:09 -07:00
laurent d8472426c4 fix_issue_350_gtpu_init 2018-09-20 12:37:26 +02:00
laurent 46231a5d5d merge with latest develop 2018-09-06 09:43:26 +02:00
laurent 0a9a636ceb commit new itti code 2018-08-06 16:52:51 +02:00