masayuki.harada
1ce1e8f82b
Merge branch 'oai_develop'
...
# Conflicts:
# ci-scripts/Jenkinsfile-gitlab
2020-10-26 15:03:58 +09: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
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
matzakos
dc63cab2b0
Merge remote-tracking branch 'origin/develop' into fix_rrc_x2_ticking
2020-10-16 11:35:54 +02: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
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
Robert Schmidt
9882460607
Remove Mutexes in phy_stub_UE.c
...
Various mutexes are present in the phy_stub_UE.c file. However, it will
only be run in a single thread; the multiple-thread implementation also
runs the higher layers concurrently, which leads to races and segfaults.
Therefore, remove these mutexes, as we don't need them.
2020-10-13 08:49:30 +02:00
Robert Schmidt
581de8b2d8
Limit UE UL RBs to 48
2020-10-13 08:49:30 +02:00
Robert Schmidt
41a440fad2
Do not schedule static slices if 0 RB(G)s
2020-10-13 08:49:29 +02:00
Robert Schmidt
ca1b0e2bbc
Bugfix RR algo: if a UE cannot be allocated, skip it
2020-10-13 08:49:29 +02:00
abdeljel
8aa270a7c0
Refactor HARQ retx in try_allocate_harq_retransmission()
2020-10-13 08:49:29 +02: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
Sakthivel Velumani
c9c1df0bff
fixed dlsim build error
...
also added a log message for DCI generation in MAC
2020-10-12 18:59:15 +02:00
Sakthivel Velumani
3a7079228e
scheduling slot 2 aslo
2020-10-12 18:59:14 +02:00
Robert Schmidt
72556206e9
Simplify set_Y()
2020-10-12 18:59:14 +02:00
Sakthivel Velumani
8a1be8aa2f
increased the number of pdcch candidates in ue
2020-10-12 18:59:14 +02:00
Sakthivel Velumani
6b3ddcc799
fixed cce indexing to allow multiple pdcch on single coreset
2020-10-12 18:59:14 +02:00
hardy
fd571e9014
Merge remote-tracking branch 'origin/small-bugfixes-w40' into integration_2020_wk41
2020-10-12 18:08:16 +02:00
hardy
e801d03836
Merge remote-tracking branch 'origin/rh_ci_oc' into integration_2020_wk41
2020-10-12 18:07:27 +02:00
Sakthivel Velumani
4074db8515
Hotfix for DL DCI issue in UE
...
Created two dci_pdu's to hold dci configuration for UL and DL DCI.
This wasn't a problem before as only one DCI was scheduled.
2020-10-12 18:07:24 +02:00
Raphael Defosseux
221e43bbb9
NASMESH: support for latest kernel version on RHEL
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2020-10-12 17:29:04 +02:00
yaojie
5db27b9305
Add RRCSetup
2020-10-12 09:29:56 +00:00
Xue Song
f4f8db4373
Merge branch 'develop_SA_RRC' into develop_SA_SIM
...
Modify RRCReconfiguration
2020-10-12 04:59:49 +00:00
Xue Song
994229963b
Modify RRCReconfiguration
2020-10-12 02:59:22 +00:00
Wu.Jing
ac6262e82b
fix gNB build error
2020-10-10 06:57:57 +00:00
yaojie
3b6f720125
RM3977
2020-10-10 06:25:29 +00:00