Thomas Schlichter
00d9af7a15
Merge remote-tracking branch 'eurecom/develop' into fhg-ra2
...
Conflicts:
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
2020-08-05 17:16:42 +02:00
hardy
292addf8d6
Merge remote-tracking branch 'origin/NR_DCI_01' into integration_2020_wk30
2020-07-27 13:47:22 +02:00
hardy
0b58e7a6f5
Merge remote-tracking branch 'origin/mac-flexran-improvements' into integration_2020_wk30
2020-07-27 13:47:00 +02:00
hardy
45ef34737c
Merge remote-tracking branch 'origin/NR_DCI_01' into integration_2020_wk30
2020-07-27 11:49:46 +02:00
hardy
607ebabbfe
Merge remote-tracking branch 'origin/improve_ue_stability' into integration_2020_wk30
2020-07-27 11:48:15 +02:00
cig
90dc9e9555
Set RA succeeded and UE mode to PUSCH after correct decoding of Msg2
2020-07-25 11:38:29 +02:00
cig
457c1b725a
Small fixes @ UE
2020-07-25 11:38:22 +02:00
Francesco Mani
1f74524d0d
fix for prepare dci 0_1
2020-07-23 11:48:25 +02:00
cig
bc243cee47
Bugfix in DMRS configuration at UE side:
...
- DM-RS type {1,2} was wrongly assigned to {1,2} instead of {0,1}
- Num DM-RS CDM groups without data is now taken into account in mthread
decoding function
- number of DM-RS CDM groups without data for format 1_0 according to 5.1.6.2
3GPP TS 38.214 version 15.9.0 Release 15:
-- the UE shall assume the number of DM-RS CDM groups without data is:
-- 1 (CDM group 0) for the case of PDSCH with allocation duration of 2 symb
-- 2 (CDM group {0,1}) for all other cases.
2020-07-22 23:52:16 +02:00
cig
ea86120c4b
Restructured UE DCI configuration function:
...
- moved RRC structs checks and mac configuration to config_ue.c
- new implementation of DCI configuration according to 3GPP TS 38.331
version 15.9.0 Release 15 and 3GPP TS 38.213 version 15.9.0 Release 15
2020-07-22 23:52:08 +02:00
Francesco Mani
390c648a81
bugfix in time domain assigment
2020-07-22 15:15:50 +02:00
Francesco Mani
39b22f17b3
calloc for dci_pdu
2020-07-22 15:11:17 +02:00
Francesco Mani
5331189c8b
bugfixes
2020-07-22 15:07:04 +02:00
Francesco Mani
0f0ede038d
removing a printf in pusch scheduling
2020-07-20 16:25:04 +02:00
Robert Schmidt
6eb00a0895
Enable multi-module support in pdcp_fifo_flush_sdus()
2020-07-20 09:33:35 +02:00
Robert Schmidt
4901daf759
FlexRAN: New protobuf slice structure + Static Slice handling
2020-07-20 09:13:19 +02:00
Robert Schmidt
872cfc03fe
Implement Static Slicing
2020-07-20 09:13:19 +02:00
Robert Schmidt
9956b96049
Use fptr for preproc and align UL PP definition
2020-07-20 09:13:19 +02:00
Robert Schmidt
2b4e529068
Simplify add_ue_list(), remove_ue_list(); add init_ue_list()
2020-07-20 09:13:19 +02:00
Robert Schmidt
714a2df097
Remove any slice-related information from OAI
2020-07-20 09:13:19 +02:00
Robert Schmidt
da09d63acd
Default pre-processor: efficiently build UE list
2020-07-20 09:13:19 +02:00
Robert Schmidt
6fcc4f5970
Format to dynamically handle UL SCHED
2020-07-20 09:13:19 +02:00
Robert Schmidt
fe7236d9c4
Add Maximum Throughput scheduler, wbCqi
...
Selects the UE with the highest CQI. If two UEs have the same CQI,
choses the one with highest number of bytes in RLC queue. Allocates as
many RBGs as possible, and potentially continues with the next UE.
2020-07-20 09:13:19 +02:00
Robert Schmidt
2de57fbc36
Add Proportional Fair scheduler, wbCqi
...
Selects UE with highest coefficient. Allocates until there are no more
RBGs to allocate, or UE has no more data. In the latter case, continues
with the next UE (second-highest coefficient).
2020-07-20 09:13:19 +02:00
Robert Schmidt
18a6961fcd
Format to dynamically handle default DL SCHED algo
2020-07-20 09:13:19 +02:00
Robert Schmidt
8c7d94133f
Bugfix RR DL: a retx UE might not be allocated again
2020-07-20 09:13:19 +02:00
Robert Schmidt
864fa84ba8
Default SCHED RR algo: optimize algo and defer RB calc.
...
- Loop only to next UE instead of jumping multiple
- mark used RBGs in rbg_mask
- Only calculate number of RBs based on CQI when UE is selected, instead
of calculating for all UEs which might be unnecessary.
- When looping the list of UEs for RB allocation, remove UEs that have
no data anymore instead of skipping them.
2020-07-20 09:13:19 +02:00
Robert Schmidt
82194319cf
Bugfix DLSCH: only warn when retx with less RB
...
The preprocessor pre-allocates a CCE. Thus, when arriving at the check
for the number of RBs for retransmission, it is too late to skip the UE.
Therefore, only print a warning.
The default schedulers allocate a correct amount of RBs for
retransmissions, therefore it is ok.
2020-07-20 09:13:19 +02:00
Robert Schmidt
d0baab6ed3
DLSCH: limit LC bytes according to preprocessor
2020-07-20 09:13:19 +02:00
Robert Schmidt
a96c3761cc
Log TBS in every window
2020-07-20 09:13:19 +02:00
cig
fe724b555d
Cleanup RA procedure
2020-07-16 18:03:22 +02:00
cig
68391d7243
Bugfix in RA window computation
2020-07-16 17:55:52 +02:00
Sakthivel Velumani
e325d007a6
Merge branch 'develop' into improve_ue_stability
2020-07-15 15:00:02 +02:00
Thomas Schlichter
c8a23e2d74
Merge remote-tracking branch 'develop'
2020-07-13 11:45:47 +02:00
Francesco Mani
079456d07a
Merge remote-tracking branch 'origin/develop' into NR_DCI_01
2020-07-10 16:57:35 +02:00
Raphael Defosseux
d7ffd70bbd
Merge remote-tracking branch 'origin/nr_vcd' into develop_integration_2020_w27
2020-07-10 09:34:16 +02:00
Raphael Defosseux
91104cb648
Merge remote-tracking branch 'origin/nr-rlc-bugfix-2020-w28' into develop_integration_2020_w27
2020-07-10 09:30:14 +02:00
Raphael Defosseux
4ddebabe7f
Merge remote-tracking branch 'origin/gcc-warnings-20200702' into develop_integration_2020_w27
2020-07-10 09:29:47 +02:00
Raphael Defosseux
da4f395a04
Merge remote-tracking branch 'origin/NR_RRC_harq_hacks' into develop_integration_2020_w27
2020-07-10 09:29:18 +02:00
Francesco Mani
e9f370ed02
Merge remote-tracking branch 'origin/NR_RRC_harq_hacks' into NR_DCI_01
2020-07-10 09:16:28 +02:00
Francesco Mani
5651b9073c
pusch config in mac gnb from rrc
2020-07-10 09:16:11 +02:00
Francesco Mani
d66aea3fe6
bugfixes in dci size
2020-07-09 17:57:39 +02:00
Francesco Mani
0f9519925d
fill dci pdu
2020-07-09 11:58:15 +02:00
Thomas Schlichter
c5357e6a59
Merge remote-tracking branch 'NR_RRC_harq_hacks'
2020-07-09 11:43:16 +02:00
Francesco Mani
d474f4a1b8
fix some warnings
2020-07-09 10:55:41 +02:00
Thomas Schlichter
aea3bc2d42
Merge remote-tracking branch 'NR_RRC_harq_hacks'
...
Conflicts:
openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c
openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
2020-07-09 10:27:27 +02:00
Francesco Mani
5fc3a991c9
dci size for 0_1 and some other modifications
2020-07-08 18:44:34 +02:00
Rakesh
e6713b7467
Merge remote-tracking branch 'origin/develop' into nr_vcd
2020-07-07 15:29:30 +02:00
Cedric Roux
62df572aed
nr-rlc: small bugfix
2020-07-06 11:24:55 +02:00
Raymond Knopp
bea3385f28
changes for ulsim to get functionality back. simulation behaviour for PUSCH is not good (BLER waterfall is way too steep even if SNR threshold is ok). Note develop does more or less the same thing but SNR threshold is lower.
2020-07-06 01:53:46 +02:00