Robert Schmidt
c3796c044f
Merge branch 'develop' into integration_2021_wk13_b
2021-04-16 07:23:46 +02:00
hardy
b5ffe11bd8
Merge remote-tracking branch 'origin/develop-SA-CBRA' into integration_2020_wk15
...
Conflicts:
openair1/PHY/TOOLS/nr_phy_scope.c
targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
2021-04-14 15:14:03 +02:00
hardy
c4745c3e46
Merge remote-tracking branch 'origin/new-gtpu' into integration_2020_wk15
...
Conflicts:
cmake_targets/CMakeLists.txt
openair1/PHY/TOOLS/time_meas.h
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
openair2/LAYER2/RLC/rlc.h
2021-04-14 14:56:04 +02:00
hardy
246afc7ccb
Merge remote-tracking branch 'origin/sim-channels' into integration_2020_wk15
2021-04-14 14:37:09 +02:00
Robert Schmidt
71ecec6744
Fix: mark delayed HARQ feedback as free
2021-04-14 12:19:12 +02:00
Robert Schmidt
b10ba9f88c
Fix: don't go beyond 3rd retx
2021-04-14 12:19:12 +02:00
Robert Schmidt
8edacdede4
UL Scheduler: Check vrb_map_UL against symb map
2021-04-14 12:19:04 +02:00
Laurent THOMAS
86881b1463
merge again develop
2021-04-13 22:45:41 +02:00
Laurent THOMAS
86f1c69f26
Fix code review remarks, merge develop, revert some merge errors
2021-04-13 22:28:02 +02:00
rmagueta
3c59974b23
Fix phy-test DL traffic
2021-04-13 15:26:44 +01:00
Robert Schmidt
e04affbc7c
UL scheduler: use correct TDA
2021-04-13 13:15:59 +02:00
Robert Schmidt
aca57eb969
DL scheduler: correctly calculate mixed slot TDA, check TDA before scheduling
2021-04-13 13:15:59 +02:00
rmagueta
e8f8297892
Fix search space and coreset for Msg2 and Msg4 at gNB
2021-04-12 19:20:23 +01:00
Robert Schmidt
7f774d5fbc
Merge branch 'develop' into integration_2021_wk13_b
2021-04-12 17:23:21 +02:00
rmagueta
a8ca37a782
Add support for InitialBWP in nr_configure_pdcch
2021-04-12 13:48:47 +01:00
rmagueta
ddfc737c65
Fix search space for Msg2 and Msg4 at gNB
2021-04-09 19:46:35 +01:00
Laurent Thomas
ab3ac5b29e
Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into sim-channels
2021-04-09 14:49:48 +02:00
Laurent Thomas
7c6ece0f51
Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into new-gtpu
2021-04-09 12:39:36 +02:00
Laurent Thomas
307098da4a
merge develop
2021-04-09 12:39:33 +02:00
rmagueta
b2b3f38344
Skip invalid MAC CCCH messages for being processed at both gNB and UE
2021-04-08 16:04:19 +01:00
rmagueta
2efe75130d
Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA
2021-04-08 14:10:14 +01:00
luis_pereira87
04b28e5f2a
Fix Msg4 mac pdu with padding
2021-04-07 16:31:06 +01:00
luis_pereira87
2ec6ee5f5b
Fix Msg4 mac pdu with padding
2021-04-07 16:03:26 +01:00
rmagueta
79864d001b
Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA
2021-04-06 11:38:33 +01:00
Laurent Thomas
89598e3bad
Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into sanitize-v1
2021-04-06 12:11:29 +02:00
Cedric Roux
1a5f10be90
bugfix: nr: free RA process when UE is removed
...
The bug was:
connect a phone, disconnect, repeat five times. The fifth time the phone
does not reconnect because there is no free RA process.
When an UE is removed, we have to free associated RA processes.
2021-04-06 10:40:37 +02:00
Laurent OpenCells
4511e70fac
fix from ci results
2021-04-05 12:56:52 +02:00
hardy
dac2388ed1
Merge remote-tracking branch 'origin/fix-nr-rlc-range-nack' into integration_2021_wk14_a
2021-04-04 08:18:25 +02:00
Laurent OpenCells
c0ef3e6f88
fix gcc reported issues
2021-04-03 23:37:58 +02:00
Laurent OpenCells
fed90543bc
Merge branch 'develop' of gitlab.eurecom.fr:oai/openairinterface5g into sanitize-v1
2021-04-02 18:43:28 +02:00
rmagueta
d964cf60b8
Fix for RA when Msg3 fails
2021-04-01 18:45:29 +01:00
rmagueta
4a807dd083
Minor improvements and LOG updates
2021-04-01 14:11:14 +01:00
rmagueta
1aab76a48d
Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA
...
# Conflicts:
# openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
2021-04-01 11:19:28 +01:00
rmagueta
1175463c7e
Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA
2021-03-31 15:33:48 +01:00
rmagueta
8c9ed555d9
Remove runtime callocs for dmrs_AdditionalPosition
2021-03-31 15:32:45 +01:00
Raymond Knopp
f851af22f2
fixing previous commit
2021-03-31 14:39:55 +01:00
rmagueta
53f77219d4
Rework default PDSCH time domain resource allocation tables
2021-03-31 14:31:19 +01:00
hardy
4896e80e2c
Merge remote-tracking branch 'origin/NR_MAC_SSB' into integration_2021_wk13_d
2021-03-31 13:47:58 +02:00
Laurent THOMAS
de5e64c722
Merge branch 'develop' of gitlab.eurecom.fr:oai/openairinterface5g into sanitize-v1
2021-03-31 10:13:50 +02:00
Laurent THOMAS
e1c73a0632
Merge branch 'develop' of gitlab.eurecom.fr:oai/openairinterface5g into sim-channels
2021-03-31 09:45:53 +02:00
Laurent THOMAS
c2257d8687
Merge branch 'develop' of gitlab.eurecom.fr:oai/openairinterface5g into sanitize-v1
2021-03-30 19:46:45 +02:00
Laurent THOMAS
29dd729a93
Merge branch 'develop' of gitlab.eurecom.fr:oai/openairinterface5g into sim-channels
2021-03-30 19:45:10 +02:00
Cedric Roux
fe4a9b005a
nr: add some comments to pdcp nia2 integrity
2021-03-30 16:01:57 +02:00
francescomani
579f0290f6
Merge remote-tracking branch 'origin/develop' into NR_MAC_SSB
2021-03-30 15:10:28 +02:00
rmagueta
feb2651ea7
Fix issues due to merge
2021-03-30 12:38:31 +01:00
rmagueta
b55b11b125
Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA
...
# Conflicts:
# openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
# openair2/RRC/NR/rrc_gNB_reconfig.c
2021-03-30 11:51:56 +01:00
Cedric Roux
18cb68ecc2
nr pdcp: first draft of NIA2 integrity
...
This code has not been tested with a COTS UE. We need SRB1/2 (so we need SA)
to test.
The activation of security and integrity for SRB1 will need more code
(new functions) because it happens after some time, not at creation time
of the PDCP entity and there is no way to do this with current code.
2021-03-30 11:57:51 +02:00
Cedric Roux
14c823037f
nr pdcp: bugfix: D/C bit set only for DRBs
2021-03-30 11:57:51 +02:00
Robert Schmidt
f5a1d356db
Refactor after merge
...
With the merge of fix_NR_DLUL_PF, gNB_dlsch_ulsch_scheduler() has no
nb_periods_per_frame variable. There are two changes here:
1) calculate this locally for initializing tdd_beam_association
2) do not pass it into schedule_nr_mib(). Further, use the following:
nb_periods_per_frame = slots_per_frame / slots_per_period
slots_per_frame / nb_periods_per_frame =
= slots_per_frame / (slots_per_frame / slots_per_period)
= slots_per_period
2021-03-30 10:49:00 +02:00
Robert Schmidt
576df55450
Merge remote-tracking branch 'origin/fix_NR_DLUL_PF' into integration_2021_wk12
2021-03-30 10:48:57 +02:00