Melissa Elkadi
046258f1ba
Merge branch 'eurecom-develop' into eurecom-episys-merge-nsa
2021-11-09 15:17:58 -08:00
David Kim
0429f7e872
Merge remote-tracking branch 'origin/episys/master-nsa' into episys/david/nsa_ci_debug_for_sa
2021-11-09 11:10:40 -08:00
Mario Joa-Ng
b965cbbb0a
Using rnti to assign different pucch resource to different UE.
2021-11-09 13:24:26 -05:00
Melissa Elkadi
83f8d71233
Fixing indentation in if statement and adding conf file
2021-11-09 09:44:48 -08:00
francescomani
47847f1701
bugfix in ul preprocessor
2021-11-09 15:57:31 +01:00
rmagueta
70d3c7973c
Merge remote-tracking branch 'origin/develop' into bler_txoptim
2021-11-09 10:39:49 +00:00
hardy
4b9f7ec404
Merge remote-tracking branch 'origin/ci-test-newstats' into integration_2021_wk45_c
2021-11-09 10:19:10 +01:00
francescomani
1624e81141
fixes in UL scheduler at UE
2021-11-09 10:18:39 +01:00
David Kim
d564d8f94d
Updated to emulate_l1 instead of nsa in gNB indication.
2021-11-08 21:27:55 -08:00
David Kim
e5ac73a552
Merge remote-tracking branch 'origin/episys/mel/sa_development_init' into episys/david/nsa_ci_debug_for_sa
2021-11-08 21:21:44 -08:00
David Kim
b13fce5385
Removed NSA mode further in nrUE codes and fixed format.
2021-11-08 16:04:39 -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
francescomani
911b38776f
to avoid unnecessary error message for mixed slot in fdd
2021-11-08 18:07:38 +01:00
francescomani
bde7e3a378
fixing initialization of UL_tti_req_ahead
2021-11-08 17:39:58 +01:00
francescomani
6ce5f98c62
some fixes
2021-11-08 16:52:00 +01:00
francescomani
c9f2f54df3
using minRXTXTIMEpdsch in acknack scheduling (for common case)
2021-11-08 15:18:05 +01:00
hardy
88fd5df1f0
Merge remote-tracking branch 'origin/nr_multiple_ue' into integration_2021_wk45_b
2021-11-08 13:13:56 +01:00
hardy
cf41f0ccda
Merge remote-tracking branch 'origin/NR_debug_sib1_reception' into integration_2021_wk45_b
2021-11-08 13:13:35 +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
hardy
9c1336157e
Merge remote-tracking branch 'origin/NR_SA_band_96' into integration_2021_wk45_b
2021-11-08 13:12:28 +01:00
francescomani
3808937231
Merge remote-tracking branch 'origin/NR_UE_acknack' into nr-fdd-scheduling
2021-11-08 11:53:50 +01:00
francescomani
30cc2b764f
removing min_fb_time from acknack scheduling
2021-11-08 11:00:59 +01:00
francescomani
3fcbfdadad
Minimum value of DL to ACK
2021-11-08 10:26:14 +01:00
francescomani
6413a67485
adding assertion in case of reconfiguration of nb of harq processes
2021-11-08 09:34:52 +01:00
Mario Joa-Ng
33927d85a8
handle the case where dl_harq lists have been created.
2021-11-08 09:11:26 +01:00
Melissa Elkadi
85e066054f
Checking for emulate_l2 instead of NSA flag
2021-11-05 15:45:48 -07:00
Melissa Elkadi
f536682367
Fixing formatting and added AssertFatal
2021-11-05 14:59:00 -07:00
David Kim
d51314f57d
Updated coding format in unified way.
2021-11-05 14:42:39 -07:00
David Kim
6420c3166b
Removed unrequired comments.
2021-11-05 14:34:18 -07:00
David Kim
8d6b112c17
Removed unrequired nsa conditions.
2021-11-05 12:35:15 -07:00
Melissa Elkadi
fbd791d4a4
Removing unnecessary DCI filtering.
...
The DCIs are filtered already in the NRUE when
the NFAPI messages are handled.
2021-11-05 12:22:00 -07:00
Melissa Elkadi
a2a823d54b
Removing log
2021-11-05 11:56:28 -07:00
Melissa Elkadi
3569ba630c
Reverted log level and gNB_RA_sched for NSA mode
2021-11-05 11:49:34 -07:00
David Kim
fc1815170e
Fixed a bug on setting the number of pdus.
2021-11-05 09:48:48 -07:00
Guido Casati
565fb88342
Simplified set_tdd_config_nr_ue function
...
- reviewed redundant code
- removed unnecessary return
2021-11-05 16:05:10 +01:00
Guido Casati
755c8d5055
Fixed calculation of num dmrs per prb at gnb side
...
- the param was hardcoded to 12 at gNB side
while it was computed at UE side
- the same function used at UE side has been moved to the common file
- now the computation at gNB side is consistent with the UE
2021-11-05 16:05:10 +01:00
Guido Casati
a5f18dbb20
Enhancements to the overall MAC logging
...
- updating to NR_MAC tag
- minor cleanups
- added more relavant info for debugging purposes
2021-11-05 16:05:10 +01:00
Guido Casati
0286138f33
Adaptations of the MAC scheduling to support FDD
...
- removed calls to the TDD UL/DL configuration common in FDD mode
- bugfix in the generation of prach info from index
- initial adaptation of gNB schedulers
- adapted PUCCH ack/nack scheduling by taking into account 6 slots min
delay in FDD mode (to be integrated with latest development of PUCCH)
- made the use of nr_slots_per_frame more consistent
2021-11-05 16:05:01 +01:00
francescomani
3a58b398c8
use of 1st active bwp in add ue function
2021-11-05 11:47:23 +01:00
matzakos
24cd2887d2
Change size parameter in encoding function for initial cellgroupconfig
2021-11-05 11:20:44 +01:00
francescomani
72f40d6fb1
fix for SA nr of dl harq
2021-11-05 11:05:39 +01:00
Melissa Elkadi
bf8a37f878
CBRA and CFRA procedure complete!!
2021-11-04 18:27:26 -07:00
Melissa Elkadi
954a64a1c0
SA mode SIB processing
...
In SA mode, we will not be able to process the SIB if
we change for mac->scc_SIB == NULL : return;
So we change the statement for NSA mode
2021-11-04 17:58:01 -07:00
Melissa Elkadi
7c484fba33
Changing how we filter DCI's fixes NSA mode
...
It will likely break SA mode because it will
filter out Msg3. I will come back to this and
fix it for Msg3.
2021-11-04 17:17:55 -07:00
Melissa Elkadi
f9b8461548
Reverting more changing that were unnecessary for SA
2021-11-04 16:40:44 -07:00
Melissa Elkadi
59458c9690
Reverting changes that did not fix SA mode
2021-11-04 16:36:50 -07:00
David Kim
ae8e0ea3da
Reverted unncessary changes.
2021-11-04 13:46:24 -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
e0991d3cec
Reverting log changes for MR
2021-11-04 12:44:30 -07:00