maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,293 Commits 5 Branches 0 Tags
dc288b7bc8da630bb090d01c908e733a527d9e22
Commit Graph
1522 Commits
Author SHA1 Message Date
masayuki.harada dc288b7bc8 Merge branch 'develop_SA_L3' into NR_SA_NGAP_RRC_wk42 
# Conflicts:
#	openair2/GNB_APP/gnb_paramdef.h
#	openair2/RRC/NR/rrc_gNB.c
 2020-10-28 03:57:14 +09:00
masayuki.harada 8cff73dc39 Fix merge error. 2020-10-28 03:19:41 +09:00
masayuki.harada 5c49c67f98 Merge remote-tracking branch 'remotes/origin/develop_SA_RRC' into develop_SA_L3 
# Conflicts:
#	openair2/RRC/NR_UE/rrc_UE.c
#	openair2/RRC/NR_UE/rrc_defs.h
 2020-10-27 20:47:03 +09: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
masayuki.harada 4649f0f615 Merge remote-tracking branch 'remotes/origin/develop_SA_SIM' into develop_SA_L3 2020-10-27 19:47:49 +09:00
He Shanyun 5880c1f8c7 add nas message for registration request 2020-10-27 09:28:47 +00:00
Xue Song 356a4d83e9 fix nrUE build error 2020-10-27 07:41:53 +00:00
He Shanyun b67badef1b fix build error of phy simulator 2020-10-27 02:59:52 +00:00
Wu.Jing 66bc0bac1e Merge branch 'master' into develop_SA_L3 2020-10-26 09:04:03 +00:00
Wu.Jing 08e775559b Merge branch 'develop_SA_SIM' into develop_SA_L3 2020-10-26 09:02:18 +00:00
masayuki.harada 1ce1e8f82b Merge branch 'oai_develop' 
# Conflicts:
#	ci-scripts/Jenkinsfile-gitlab
 2020-10-26 15:03:58 +09:00
Xue Song d5f95c6c79 fix some error 2020-10-23 08:00:21 +00:00
Xue Song ce85677762 modify some issues 2020-10-23 03:42:06 +00:00
hardy 0a8bc5cdb5 Merge remote-tracking branch 'origin/fix_rrc_x2_ticking' into integration_2020_wk42_2 2020-10-22 16:23:05 +02:00
masayuki.harada a21ba6c7dc Merge remote-tracking branch 'remotes/origin/develop_SA_L3' into NR_SA_NGAP_RRC_wk42 2020-10-22 19:59:13 +09:00
zhanghuiqin f3c922b1c1 fix RRCReject 2020-10-22 09:19:27 +00:00
He Shanyun 028be9e486 fix build error of phy simulator 2020-10-22 05:55:51 +00:00
masayuki.harada a6a39d9951 Merge branch 'develop_SA_L3' into NR_SA_NGAP_RRC_wk42 
# Conflicts:
#	openair2/RRC/NR/rrc_gNB.c
 2020-10-21 16:41:09 +09:00
yaojie bfd2c35c35 fix warning/error 2020-10-21 07:30:20 +00:00
Xue Song 592642cb28 modify RRC messages 2020-10-21 02:46:40 +00:00
zhanghuiqin fad30fff8a fix UECapabilityEnquiry & UECapabilityInformation 2020-10-20 08:41:41 +00:00
matzakos 8e3ec3e5a8 Merge remote-tracking branch 'origin/develop' into fix_rrc_x2_ticking 2020-10-19 11:49:43 +02:00
hardy 03e5b461a3 Merge remote-tracking branch 'origin/NR_MAC_SSB_RO_GlobalEdge' into integration_2020_wk42 
Solved Conflicts in:
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
	openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
 2020-10-19 11:18:30 +02:00
zhanghuiqin 49487217bf add UECapabitlityEnquiry(ue) 2020-10-19 08:22:15 +00:00
Xue Song 4766f3a629 fix RRCReconfiguration/RRCReconfigurationComplete 2020-10-19 07:58:10 +00:00
Qiu DeZhi 4421bc5665 modify rrcRelease 2020-10-19 06:55:53 +00:00
Qiu DeZhi 1605266440 Add RRCrelease 2020-10-19 04:59:29 +00:00
matzakos dc63cab2b0 Merge remote-tracking branch 'origin/develop' into fix_rrc_x2_ticking 2020-10-16 11:35:54 +02:00
yaojie 6030a75a65 fix securityModeCommand/securityModeComplete 2020-10-16 09:15:53 +00:00
Xue Song dfa50d975b Modify RRCSetupComplete 2020-10-16 08:42:28 +00:00
Xue Song 5697057f0b Unblock ITTI SIM process 2020-10-16 05:06:19 +00:00
Qiu DeZhi 46bbb6a943 Modify RRCSetupComplete 2020-10-15 10:34:19 +00:00
Wu.Jing b2722225ab Merge branch 'master' into develop_SA_L3 2020-10-15 08:26:42 +00:00
masayuki.harada af35e37c74 Merge branch 'oai_develop' 
# Conflicts:
#	openair2/RRC/NR/rrc_gNB.c
 2020-10-15 15:25:04 +09:00
yaojie 1fd1853ce7 add nr_decode_SI/SIB2/SIB3 2020-10-15 05:46:32 +00:00
Qiu DeZhi b4fad9c589 Merge branch 'develop_SA_SIM' of http://10.37.143.24:8000/gitlab/vran/OAI-5GNR into develop_SA_SIM 2020-10-14 08:02:27 +00:00
yaojie e981df3cd8 add nr_decode_SIB1 2020-10-14 05:27:38 +00:00
He Shanyun e6ddb5379c add process for itti simulator 2020-10-14 03:22:55 +00:00
Florian Kaltenberger 18ae5acc98 Merge remote-tracking branch 'origin/develop' into NR_MAC_SSB_RO_GlobalEdge 2020-10-13 21:47:21 +02:00
Xue Song 878b483746 Merge branch 'develop_SA_RRC' into develop_SA_SIM 2020-10-13 11:37:45 +00:00
Xue Song 9812545c61 modify rrc_gNB_generate_RRCSetup 2020-10-13 11:36:52 +00:00
Xue Song 38516da2dc Merge branch 'develop_SA_RRC' into develop_SA_SIM 2020-10-13 10:48:46 +00:00
Xue Song 0f378cf3da modify RRCSetup 2020-10-13 10:48:01 +00:00
Xue Song db410e41a6 Merge branch 'develop_SA_RRC' into develop_SA_SIM 2020-10-13 09:31:16 +00:00
Xue Song 8c421698c4 modify do_RRCSetup 2020-10-13 09:07:19 +00:00
Qiu DeZhi f9d8c922e4 add rrcRelease 2020-10-13 07:26:54 +00:00
yaojie 602424f616 handle bcch message in rrc_nrue_task 2020-10-13 07:13:42 +00:00
yincong e344a7bd4a add Sidelink redioresource 2020-10-13 06:14:16 +00:00
Xue Song f6d5e5f95d handle dcch message in rrc_nrue_task 2020-10-13 02:11:39 +00:00
hardy fd571e9014 Merge remote-tracking branch 'origin/small-bugfixes-w40' into integration_2020_wk41 2020-10-12 18:08:16 +02:00