hardy
1e343f6052
Merge remote-tracking branch 'origin/handling-Msg4-Ack-failure' into integration_2021_wk49_a
2021-12-02 08:28:21 +01:00
hardy
4be0407bd9
Merge remote-tracking branch 'origin/nr_ldpc_dlsch_decoding_parallel' into integration_2021_wk48_d
2021-12-01 12:31:50 +01:00
Melissa Elkadi
df72429b04
Merge branch 'eurecom-episys-merge-nsa' into episys/master-nsa
2021-11-24 08:54:14 -08:00
Melissa Elkadi
92ef60d07f
This commit does the following:
...
1. Reverts GTPU_need_ITTI back to develop
2. Removed gdb helper and co files
3. Reverts changes to logging mechanism
4. Reverts changes to assert that were unnecessary
5. Reverts changes to VNF that occured from a bad merge
6. Removes unnecessary else() in gNB softmodem
2021-11-23 15:49:47 -08:00
Melissa Elkadi
8d1196a9cd
Merge branch 'episys/5gcn_traffic_testing' into episys/david/multi_ue_sa
2021-11-22 07:15:59 -08:00
luis_pereira87
780314d32b
Change some printf with rnti values in dec to hex
2021-11-22 07:13:56 +00:00
David Kim
c974609c2f
Updated the execution condition for pdcp_run.
2021-11-19 14:31:41 -08:00
David Kim
202862bce1
Updated for multiple UEs CBRA procedure.
...
1. Added rnti filter for multiple UEs.
2. Adjusted mode offset for SA mode.
2021-11-19 13:42:34 -08:00
Melissa Elkadi
6f69e836a8
This commit allows IP traffic to work for 2 UEs in NSA mode
...
The nr_rrc_ue_process_RadioBearerConfig() function
call in the RRC layer of the NRUE was removed when
it should not have been for NSA mode. This is now
added back in for NSA mode. Also, the call to
pdcp_run should only be when were NOT in NOS1 mode
and ARE in SA mode. This was fixed as well.
Ue-to-Ue IP traffic in NSA works, but eventually
the NSA UE will crash due to an incorrect PDCCH
configuration. This is a bug we will need to look
into. It doesnt always crash, only about 40% of
the time. And even when the NRUE does crash, it
happens towards the end of the simulation.
2021-11-18 11:45:47 -08:00
Melissa Elkadi
16d82de9cf
Only call pdcp_run for SA 5GCN mode, not NSA mode
2021-11-18 11:08:53 -08:00
Melissa Elkadi
2da73cfed7
Merge branch 'episys/master-nsa' into episys/5gcn_traffic_testing
2021-11-18 08:29:36 -08:00
Melissa Elkadi
6c49b7c799
Fixing AssertFatal command
2021-11-18 05:35:34 -08:00
Melissa Elkadi
236f980ba0
Merge branch 'episys/master-nsa' into episys/5gcn_traffic_testing
2021-11-17 15:12:59 -08:00
Melissa Elkadi
8241eb8e90
Merge branch 'eurecom-develop' into eurecom-episys-merge-nsa
2021-11-17 14:34:51 -08:00
Melissa Elkadi
40e213dd9d
Merge branch 'eurecom-develop' into episys/master-nsa
2021-11-17 14:31:30 -08:00
Deokseong "David" Kim
efc797f35d
Integrated ra procedure for both nsa and sa.
2021-11-17 21:13:36 +00:00
Laurent THOMAS
a38e368be2
fix gtp-u address between NSA and SA modes
2021-11-16 22:03:27 +01:00
Laurent THOMAS
66073d50fc
merge develop
2021-11-15 10:25:52 +01:00
luis_pereira87
7738462b0c
Add missing stats after merge
2021-11-15 07:44:54 +00:00
luis_pereira87
1e96501286
Merge remote-tracking branch 'origin/develop' into bler_txoptim
...
# Conflicts:
# executables/nr-gnb.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
# openair2/LAYER2/NR_MAC_gNB/main.c
2021-11-15 07:16:06 +00:00
Raymond Knopp
c2fbcbcabc
Merge branch 'bler_txoptim' of https://gitlab.eurecom.fr/oai/openairinterface5g into bler_txoptim
2021-11-14 17:28:56 +01:00
Raymond Knopp
02b17c79d6
commit before merge. minor changes for testing
2021-11-14 17:28:24 +01:00
Raymond Knopp
c8d9adca58
Merge remote-tracking branch 'origin/develop' into tx-proc-optim
2021-11-14 11:22:04 +01:00
Melissa Elkadi
368977b3bb
The NRUE and gNB are connected to the 5GCN!
...
When IP traffic is started on the NRUE, the
gNB immediately crashes
2021-11-12 09:03:47 -08:00
Raymond Knopp
95343c6658
Merge remote-tracking branch 'origin/develop' into tx-proc-optim
...
Conflicts:
common/utils/nr/nr_common.h
openair1/PHY/NR_TRANSPORT/pucch_rx.c
2021-11-11 08:34:06 +01:00
Raymond Knopp
07d735f93c
step-by-step merging from tx-proc-optim-lts. Everything except NR_TRANSPORT merged. Some issues with 64QAM modulation
2021-11-11 08:28:10 +01:00
Melissa Elkadi
046258f1ba
Merge branch 'eurecom-develop' into eurecom-episys-merge-nsa
2021-11-09 15:17:58 -08:00
rmagueta
70d3c7973c
Merge remote-tracking branch 'origin/develop' into bler_txoptim
2021-11-09 10:39:49 +00:00
hardy
ffba98cadf
Merge remote-tracking branch 'origin/thread-blocking-fix' into integration_2021_wk45_c
2021-11-09 10:19:29 +01:00
hardy
4b9f7ec404
Merge remote-tracking branch 'origin/ci-test-newstats' into integration_2021_wk45_c
2021-11-09 10:19:10 +01:00
Melissa Elkadi
dbf2aba843
Reverting white space change
2021-11-08 14:41:51 -08:00
Melissa Elkadi
dbacbfd0cd
Removing more unnecessary filtering in NRUE
...
Got rid of unnecessary mac->scc check as well
2021-11-08 11:28:41 -08:00
Melissa Elkadi
fa4617c0bf
Fixing MR based on OAI feedback
...
The following was changed in this commit:
- A new struct in the mac instance was created
for all emulated L1 fields.
- NR UE RRC state bug was fixed
- Checking the RAR rnti based on the MAC instance
ra.ra_rnti and not hardcoding to 0x10b
- Modified the name of the new emulate_l2 flag
to make sense: emulate_l1
2021-11-08 10:59:28 -08:00
hardy
c3955ec7b8
Merge remote-tracking branch 'origin/nr_timing_fixes' into integration_2021_wk45_b
2021-11-08 13:13:12 +01:00
hardy
4c2c7f92a5
Merge remote-tracking branch 'origin/code-cleanup-2021oct24' into integration_2021_wk45_b
2021-11-08 13:12:52 +01:00
mjoang
4a9c74f41b
rebase to develop
2021-11-05 22:46:09 -04:00
Melissa Elkadi
85e066054f
Checking for emulate_l2 instead of NSA flag
2021-11-05 15:45:48 -07:00
Melissa Elkadi
f04f8e7d7b
Setting ra_state breaks RA Procedure for NSA mode
...
Also, changed some if statement formatting.
2021-11-05 11:29:45 -07:00
Melissa Elkadi
479784a064
Calling proper nr_ue_get_rach function
...
Also, reverted a DCI filtering change to exist again.
2021-11-04 13:15:58 -07:00
Melissa Elkadi
7e10b4a106
Reverting nr-uesoftmodem to match master and added SA mode
2021-11-04 12:16:39 -07:00
Melissa Elkadi
f4448023df
Merge branch 'episys/master-nsa' into episys/mel/sa_development_init
2021-11-04 11:48:34 -07:00
hardy
60a91cc207
Merge remote-tracking branch 'origin/NR_MAC_statisticsthread' into ci-test-newstats
2021-11-04 17:00:34 +01:00
Laurent THOMAS
9d1fe78e2e
merge develop, no working yet
2021-11-04 12:53:01 +01:00
luis_pereira87
29eca46833
Merge remote-tracking branch 'origin/develop' into bler_txoptim
...
# Conflicts:
# openair1/PHY/NR_TRANSPORT/pucch_rx.c
# openair2/GNB_APP/gnb_config.c
2021-11-04 11:32:03 +00:00
Sakthivel Velumani
3799aeb86b
Merge branch 'develop' into NR_MAC_statisticsthread
2021-11-04 15:54:37 +05:30
Melissa Elkadi
edd710f6a9
Removing bad log and changing RA state when we get prach
2021-11-03 15:52:49 -07:00
Melissa Elkadi
54a894e534
Updated the following for SA development:
...
1. The preamble index in the NRUE is random for SA.
Using the preamble index from the mac->ra is
correct.
2. The dl_pathloss calculated is from L1. We should
shunt this feature out for our emulated mode. If
we add the abstraction later, we can model the
pathloss in the proxy and update it in the RA
procedure of the NRUE.
3. Checking that the crnti != t_crnti is not valid
for SA mode. And may only be needed for multi-UE
in NSA mode. We might be able to delete it all
together. For now, we only use for NSA mode.
4. Checking the RAR based on rnti = 10b and not the
RA_STATE is better.
2021-11-03 10:54:33 -07:00
Laurent THOMAS
d49165f07a
merge develop
2021-11-03 17:28:06 +01:00
Melissa Elkadi
b8444ecbc1
Merge branch 'eurecom-develop' into episys/mel/sa_development_init
2021-11-03 08:54:06 -07:00
Melissa Elkadi
e8f965d010
Merge branch 'eurecom-develop' into eurecom-episys-merge-nsa
2021-11-03 06:32:38 -07:00