Xue Song
9bba3c795a
Fix GTPU's IP setting error
2020-11-09 18:04:56 +09:00
masayuki.harada
483f4b2d1b
Fix merge miss.
2020-10-28 04:21:41 +09:00
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
4649f0f615
Merge remote-tracking branch 'remotes/origin/develop_SA_SIM' into develop_SA_L3
2020-10-27 19:47:49 +09:00
yaojie
a5343618cf
Added the judgment of the NGAP field in the configuration file
2020-10-27 07:40:09 +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
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
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
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
zhenghuangkun
84579c5dc0
Modify MME_MODE_ENABLED to AMF_MODE_ENABLED
...
Modify kenb to kgnb
Modify some warnings
2020-10-10 06:16:49 +00:00
Wu.Jing
079157eb55
cherry-pick 3efc7538ac
2020-10-10 11:26:40 +09:00
zhenghuangkun
6ca5753555
Add author and email
2020-10-10 10:56:14 +09:00
zhenghuangkun
5217b76448
Add DownlinkNASTransport Message
...
Add UEContextReleaseCommand Message
Modify NGSetup Message Encode failed
2020-10-10 10:50:19 +09:00
matzakos
c6aae3140e
Merge develop branch into NR_SA_NGAP_RRC
2020-10-07 10:38:58 +02:00
Florian Kaltenberger
c2889d3b49
Merge remote-tracking branch 'origin/develop' into NR_MAC_SSB_RO_GlobalEdge
2020-10-04 20:54:40 +02:00
zhenghuangkun
3efc7538ac
Modify MME_MODE_ENABLED to AMF_MODE_ENABLED
...
Modify kenb to kgnb
Modify some warnings
2020-09-29 02:56:21 +00:00
masayuki.harada
c948fefec2
Revert some changes to avoid setup failure.
2020-09-28 19:55:31 +09:00
zhenghuangkun
ad44cbdc94
Add author and email
2020-09-28 06:03:39 +00:00
Florian Kaltenberger
79bf2b3fb0
Merge remote-tracking branch 'origin/develop' into NR_MAC_SSB_RO_GlobalEdge
2020-09-22 15:26:57 +02:00
Cedric Roux
4236ff2b3e
nr: improve x2/rrc for ENDC
...
This commit introduces several enhancements in X2AP and RRC to deal
with ENDC. The main goal is to deal with UE's on/off and with various
errors.
The following work is included:
- DC prep and DC overall X2 timers
- X2 messages for UE release and DC timers' timeout
Open problems:
- what to do when the UE sends an scg Failure? This commit removes
the UE. And this removal may not be correctly done
- UE removal in the gNB's PHY layer (a next commit is coming,
but it is hackish and will need a rework)
2020-09-22 11:57:31 +02:00
zhenghuangkun
0f3d53e1b9
Merge remote-tracking branch 'remotes/origin/master' into develop_SA_L3
2020-09-21 02:20:35 +00:00
zhenghuangkun
b2f4b9828b
Add DownlinkNASTransport Message
...
Add UEContextReleaseCommand Message
Modify NGSetup Message Encode failed
2020-09-14 06:51:14 +00:00
zhenghuangkun
05033b0bf4
Add InitialContextSetupResponse Message
2020-09-11 09:23:39 +00:00
He Shanyun
3b3452dcce
fix issue about load config error of gnb
2020-09-11 06:09:24 +00:00
zhenghuangkun
5dc6712cec
Add InitialUEMessage And InitialContextSetupRequest Message
2020-09-11 03:01:55 +00:00
He Shanyun
c8b67cb1a1
compile NGAP_GNB lib
2020-09-10 11:34:02 +00:00
zhenghuangkun
46f1dc9614
Modify NGAP Message
2020-09-10 09:19:49 +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
Francesco Mani
35c298d708
remove unnecessary declarations
2020-08-20 11:26:10 +02:00
Francesco Mani
4d0d54a98d
power target from config file functional
2020-08-19 14:25:03 +02:00
Francesco Mani
edf903f776
pucch power control and handling of missed reception using confidence level
2020-08-18 15:47:48 +02:00
Francesco Mani
ff7ac327cd
first version of pusch power control
2020-08-05 12:30:25 +02:00
kn.raju
6acb8d909a
rrc configuration changes reverted
2020-07-30 17:40:17 +05:30
kn.raju
df5ce819c6
fixed run time error
2020-07-30 17:40:17 +05:30
Francesco Mani
f4ccaf0dc0
Merge remote-tracking branch 'origin/develop' into NR_RRC_harq_hacks
2020-06-29 19:27:33 +02:00
Raphael Defosseux
1ff1f3dda9
fix a bunch of compilation warnings
2020-06-19 11:41:36 +02:00
Florian Kaltenberger
377cfc6f0c
fixing an issue with libconfig
2020-06-16 09:11:19 +02:00
Francesco Mani
2b976aa711
Merge branch 'NR_RRC_PRACH_procedures' into NR_RRC_harq_hacks
2020-06-12 19:14:25 +02:00
Florian Kaltenberger
f46e3d4c76
fixing an issue with libconfig
2020-06-12 11:13:18 +02:00
Francesco Mani
bedb295dfd
Merge branch 'develop' into NR_RRC_harq_hacks
2020-06-09 20:32:35 +02:00
Thomas Schlichter
614083f03f
Merge branch 'develop' into NR_RRC_PRACH_procedures
...
Conflicts:
cmake_targets/CMakeLists.txt
openair2/GNB_APP/gnb_app.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
openair2/RRC/NR/rrc_gNB_nsa.c
2020-06-09 13:03:28 +02:00
laurent
d1e8c23529
cleanup
2020-06-04 10:48:29 +02:00
Thomas Schlichter
225a500b3e
Merge branch 'develop' into NR_RRC_PRACH_procedures
...
Conflicts:
executables/nr-ue.c
openair1/PHY/NR_REFSIG/dmrs_nr.c
openair1/PHY/NR_TRANSPORT/nr_prach.c
openair1/PHY/NR_TRANSPORT/nr_transport_common_proto.h
openair1/PHY/NR_TRANSPORT/nr_transport_proto_common.h
openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
openair1/PHY/NR_UE_TRANSPORT/nr_transport_ue.h
openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c
openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
openair1/SIMULATION/NR_PHY/prachsim.c
openair1/SIMULATION/NR_PHY/ulsim.c
openair2/LAYER2/NR_MAC_COMMON/nr_mac_extern.h
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
2020-06-03 19:50:54 +02:00
Thomas Schlichter
ce105df4e7
Merge branch 'develop' into NR_RRC_PRACH_procedures
...
Conflicts:
openair1/PHY/NR_TRANSPORT/nr_transport.h
openair1/PHY/NR_TRANSPORT/nr_transport_common_proto.h
openair1/PHY/NR_TRANSPORT/nr_transport_proto_common.h
openair1/SCHED_NR/phy_procedures_nr_gNB.c
openair1/SIMULATION/NR_PHY/prachsim.c
openair2/GNB_APP/RRC_nr_paramsvalues.h
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
2020-05-20 19:26:16 +02:00
Francesco Mani
d268c320ca
Merge branch 'develop' into NR_RRC_harq_hacks
2020-05-15 16:26:33 +02:00
Raphael Defosseux
11783e755a
Fixing errored/missing circular dependency protection
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2020-05-15 15:39:11 +02:00