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
4950 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
yaojie a5343618cf Added the judgment of the NGAP field in the configuration file 2020-10-27 07:40:09 +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
Wu.Jing a9b76b5341 Merge branch 'develop_SA_RRC' into develop_SA_SIM 
Conflicts:
	openair2/RRC/NR/MESSAGES/asn1_msg.c
	openair2/RRC/NR/rrc_gNB.c
 2020-10-26 07:30:18 +00:00
Wu.Jing 92ba7dc249 Merge branch 'develop_SA_NGAP' into develop_SA_RRC 2020-10-26 06:20:02 +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
Francesco Mani 914b8da916 fix after integration 2020-10-19 12:46:55 +02: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
hardy 8eb9d0b4a6 Merge remote-tracking branch 'origin/fixes-mac-sched-nfapi' into integration_2020_wk42 2020-10-19 10:52:37 +02:00
hardy 4d14cc63b9 Merge remote-tracking branch 'origin/cce_indexing_fix' into integration_2020_wk42 2020-10-19 10:51:46 +02:00
hardy d94fc12887 Merge remote-tracking branch 'origin/NR_RA_updates' into integration_2020_wk42 2020-10-19 10:50:56 +02:00
hardy 639d957e30 Merge remote-tracking branch 'origin/flexran-apps' into integration_2020_wk42 2020-10-19 10:49:44 +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
Xue Song a76ef07a69 Merge branch 'develop_SA_RRC' into develop_SA_SIM 2020-10-16 01:48:23 +00:00
Xue Song 43ef53cbcf Add pucchresset->maxPayloadMinus1 to be compatible with Rel15 2020-10-16 01:46:15 +00:00
Qiu DeZhi 46bbb6a943 Modify RRCSetupComplete 2020-10-15 10:34:19 +00:00
Florian Kaltenberger 0d555854e9 Merge branch 'NR_MAC_SSB_RO_GlobalEdge' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_MAC_SSB_RO_GlobalEdge 2020-10-15 11:27:10 +02:00
Wu.Jing b2722225ab Merge branch 'master' into develop_SA_L3 2020-10-15 08:26:42 +00:00
Francesco Mani 62dbda5c83 Merge remote-tracking branch 'origin/develop' into NR_RA_updates 2020-10-15 10:18:16 +02:00
kn.raju 2cad2b936e modified mapping of SSB index to UE_id 2020-10-15 13:00:04 +05:30
Francesco Mani 5f1fe21c7c Revert "Fix to avoid RRC->X2AP ticking every msec when x2ap task is not enabled" 
This reverts commit 1a5874d40f.
 2020-10-15 08:54:31 +02: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