Francesco Mani
62dbda5c83
Merge remote-tracking branch 'origin/develop' into NR_RA_updates
2020-10-15 10:18:16 +02:00
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
Thomas Schlichter
2a4153eb29
fixup previous merge with develop branch
2020-10-07 17:54:39 +02:00
Robert Schmidt
a389e6f5e9
Fixup: reserve space for TA command
2020-10-07 17:54:39 +02:00
matzakos
1a5874d40f
Fix to avoid RRC->X2AP ticking every msec when x2ap task is not enabled
...
-Since the aim of itti RRC_SUBFRAME_PROCESS message (MAC->RRC) is to trigger an itti X2AP_SUBFRAME_PROCESS message (RRC->X2AP), avoid creating
RRC_SUBFRAME_PROCESS message if x2ap task is not enabled. Not sure if this is the best solution. We could also avoid only sending the second itti X2AP_SUBFRAME_PROCESS message.
2020-10-07 14:37:02 +02:00
Raphael Defosseux
5411461582
Merge remote-tracking branch 'origin/develop' into integration_2020_wk40
2020-10-07 10:53:36 +02:00
Shweta Shrivastava
2305470a75
Fix for using K2 offset other than 2
2020-10-06 13:26:45 -05:00
Francesco Mani
87b02489b0
using crnti as tcrnti
2020-10-06 14:12:29 +02:00
hardy
d61f45ecb9
Merge remote-tracking branch 'origin/ulsch_decode_mthread' into integration_2020_wk40
2020-10-06 11:00:09 +02:00
Francesco Mani
8d6e0a43d1
adding cfra flag
2020-10-05 18:04:20 +02:00
Francesco Mani
3ac23f80f9
Merge remote-tracking branch 'origin/NR_DL_scheduler' into nr_ue_msg3
2020-10-05 14:56:18 +02:00
Robert Schmidt
2904367165
Fixup: reserve space for TA command
2020-10-05 13:14:58 +02:00
Robert Schmidt
2e41782a12
Add configurable UE as param for nr_generate_dlsch_pdu()
2020-10-05 13:14:58 +02:00
Robert Schmidt
eb263af39e
Remove statistics from nr_generate_dlsch_pdu()
2020-10-05 13:14:58 +02:00
Robert Schmidt
4ecb236df6
nr_fill_nfapi_dl_pdu(): pdu index and nPDUs counting
2020-10-05 13:14:58 +02:00
Robert Schmidt
cbd6250fdf
Directly construct tx_req nFAPI message in DL postprocessor
2020-10-05 13:14:58 +02:00
Robert Schmidt
22cb1567d4
allocate only necessary amount of RBs
2020-10-05 13:14:58 +02:00
Robert Schmidt
d145d8d662
Consider retransmissions in the preprocessor
2020-10-05 13:14:58 +02:00
Robert Schmidt
0ef332ef75
DL Post processor: distinguish tx/retx
2020-10-05 13:14:58 +02:00
Robert Schmidt
acffd17d6f
Store retx Info
2020-10-05 13:14:58 +02:00
Robert Schmidt
8a004df0c9
Create UE MAC Context after successful RA
2020-10-05 13:14:58 +02:00
Robert Schmidt
ee850206e4
fixup: throughput correct only if first TDD slot
2020-10-05 13:14:58 +02:00
Robert Schmidt
f80ab8797a
Use vrb_map in in DL for NSA mode
2020-10-05 13:14:58 +02:00
Robert Schmidt
d7d21efcf5
Post-processor: enable multi-UE handling
2020-10-05 13:14:58 +02:00
Robert Schmidt
059f585e06
Preprocessor: check for number of UEs
2020-10-05 13:14:58 +02:00
Robert Schmidt
abd608b6cb
Mark active in add_new_nr_ue() only if phytest
2020-10-05 13:14:58 +02:00
Robert Schmidt
d921581922
Remove fiveG_connected and use active
2020-10-05 13:14:58 +02:00
Robert Schmidt
793cbda97e
Simplify allocate_rn_CCEs()
2020-10-05 13:14:58 +02:00
Robert Schmidt
1a73ea6c6d
Make UE_info.active C99 bool
2020-10-05 13:14:58 +02:00
Robert Schmidt
0032bcc905
add_nr_ue_list()
2020-10-05 13:14:58 +02:00
Robert Schmidt
d0667d9ea4
Add NR_UE_list_t type
2020-10-05 13:14:58 +02:00
Robert Schmidt
e956c17bf8
Rename NR_UE_list_t to NR_UE_info_t
...
The name NR_UE_list_t is misleading: beyond being a simple "list", this
structure carries all/most UE-related MAC information. If at all, it is
a container for multiple lists. The next commit introduces a
NR_UE_list_t structure that organizes UEs in lists such that it is
easier to go through the UEs.
2020-10-05 13:14:58 +02:00
Thomas Schlichter
97354f1e2f
Merge remote-tracking branch 'NR_UE_UL_DCI_improvements' into integration_2020_wk40
...
Conflicts:
openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
2020-10-05 12:15:59 +02:00
Thomas Schlichter
8b4d1a0f0f
Merge remote-tracking branch 'NR_DL_scheduler' into integration_2020_wk40
2020-10-05 12:13:13 +02:00
Robert Schmidt
f28679b360
PreProc IF: save MCS-info per UE
2020-10-05 10:29:45 +02:00
Robert Schmidt
f9dd8292f8
PreProc IF: Freq domain allocation per UE
2020-10-05 10:29:45 +02:00
Robert Schmidt
6c7ff44cd9
PreProc IF: save Time domain assignment info per UE
2020-10-05 10:29:45 +02:00
Robert Schmidt
112b30d79a
PreProc IF: save PUCCH info per UE
2020-10-05 10:29:45 +02:00
Robert Schmidt
34a31a20b7
PreProc IF: save CCE info per UE
2020-10-05 10:29:45 +02:00
Robert Schmidt
dcdee083ac
PreProc IF: RLC status per UE
2020-10-05 10:29:45 +02:00
Robert Schmidt
d12180b25b
Start PreProc interface, add UE active BWP
2020-10-05 10:29:45 +02:00
Robert Schmidt
f86e4305f6
Reduce log DLSCH scheduler
2020-10-05 10:29:45 +02:00
Robert Schmidt
1b5558537f
Move HARQ calculations out of nr_fill_nfapi_dl_pdu()
2020-10-05 10:29:45 +02:00
Robert Schmidt
4cebd0dd92
Only send random data if phytest
2020-10-05 10:29:45 +02:00
Robert Schmidt
7f51eca9d3
Remove UE-specific ulsch bitmap, special phy test slot
...
when in phy test, only schedule UE to be in slot 8
2020-10-05 10:29:45 +02:00
Robert Schmidt
14613222f3
clean up gNB_dlsch_ulsch_scheduler(), remove UE-specific DL bitmap
2020-10-05 10:29:45 +02:00
Robert Schmidt
de2cf2393b
Do not allocate CCE in nr_configure_pdcch()
...
nr_configure_pdcch() allocates the CCE, but this is not wanted, e.g., in
multi-user scheduling, since it might not be possible to allocate the
CCEs for these UEs. This commit makes the following changes:
- remove CCE allocation in nr_configure_pdcch()
- remove coreset search in nr_configure_pdcch()
- add functions get_coreset() and get_searchspace() to retrieve coresets
and search spaces easily
- in nr_fill_nfapi_dl_pdu(), add extra parameters for aggregation level
and CCE indices and the searchspace and coreset of a UE, which might
be different for each UE
- allocate CCEs manually in phytest, RA, and DLSCH schedulers
2020-10-05 10:29:45 +02:00
Robert Schmidt
43f177e7df
Restructure nr_schedule_ue_spec()
2020-10-05 10:29:44 +02:00
Robert Schmidt
3de6b619be
Move TBS calculation out of nr_fill_nfapi_dl_pdu
2020-10-05 10:29:44 +02:00
Robert Schmidt
685c540353
nr_fill_nfapi_dl_pdu(): MCS + other params configurable
2020-10-05 10:29:44 +02:00