Robert Schmidt
fcb07ef5fd
Merge remote-tracking branch 'origin/NR_SSB_fix' into integration_2022_wk29
2022-07-19 18:12:40 +02:00
francescomani
79586c03f4
fix for pointa and ssboffset
2022-07-07 08:57:37 +02:00
Roberto Louro Magueta
53f0773624
Merge remote-tracking branch 'origin/develop' into develop-SRS-Measurements
2022-07-05 11:07:43 +01:00
Robert Schmidt
4662ccc46a
Merge remote-tracking branch 'origin/stats' into integration_2022_wk26
2022-06-29 23:15:06 +02:00
Robert Schmidt
94ca30e82b
Merge remote-tracking branch 'origin/NR_layers_in_harq' into integration_2022_wk26
2022-06-29 23:14:42 +02:00
Roberto Louro Magueta
86755bc495
Merge remote-tracking branch 'origin/develop' into develop-SRS-Measurements
...
# Conflicts:
# openair2/RRC/NR/MESSAGES/asn1_msg.c
2022-06-27 11:06:55 +01:00
Robert Schmidt
0b91791f67
Use (std) bool instead of custom bool types
...
OAI is riddled with boolean_t, FALSE, TRUE, etc. This makes no sense, as
there is a standard bool type, and could lead to nasty bugs if a
definition of a bool is non-standard (0 == false, true == !false). This
commit removes all non-standard bools in the whole project.
2022-06-27 10:07:48 +02:00
luis_pereira87
a9faf533b4
Fix SA with COTS UE in monolithic mode after merge
2022-06-24 14:51:38 +01:00
Ilario FAVERO
c5b8fa5418
New command line arg for disabling stats: --disable-stats
2022-06-24 14:32:39 +02:00
francescomani
1565667908
remove rtx from list
2022-06-23 17:42:55 +02:00
Roberto Louro Magueta
1a4686b021
Remove UE->Msg4_ACKed from condition in nr_schedule_srs
2022-06-23 14:52:05 +01:00
Robert Schmidt
5cebe354c5
Merge remote-tracking branch 'origin/bugfix-minor-update-nr-rlc-tests' into integration_2022_wk25
2022-06-23 14:14:37 +02:00
Robert Schmidt
b37050ac6e
Merge remote-tracking branch 'origin/F1_interop_ACC_n78' into integration_2022_wk25
2022-06-23 14:09:33 +02:00
Cedric Roux
4505e780c5
nr rlc: minor: update tests
...
Behavior for ack/nack generation has changed not too long ago but the tests
were not checked and updated.
2022-06-23 11:44:01 +02:00
Robert Schmidt
644422ebec
Merge remote-tracking branch 'origin/NR_PUCCH_RRC_Resources' into integration_2022_wk25
2022-06-22 17:20:38 +02:00
francescomani
6f481e09f6
abort rtx if RI decreased
2022-06-22 16:15:31 +02:00
francescomani
2659dce8b8
removing flag init_UL_tti_req_ahead
2022-06-21 13:49:31 +02:00
francescomani
a4e2c2b799
addressing review
2022-06-20 11:58:06 +02:00
francescomani
fb6fa64bc7
Merge remote-tracking branch 'origin/develop' into NR_remove_ssb_offset_from_configfile
2022-06-20 09:33:50 +02:00
Cedric Roux
5cd674483b
Merge remote-tracking branch 'origin/develop' into F1_interop_ACC_n78
2022-06-19 18:41:27 +02:00
Roberto Louro Magueta
8fee72e81f
Merge remote-tracking branch 'origin/develop' into develop-SRS-Measurements
2022-06-19 02:16:41 +01:00
luis_pereira87
78267db68b
Revert "Update downlink MCS table" block of code to function nr_set_pdsch_semi_static to get downlink working again in NSA
2022-06-17 16:17:15 +01:00
Robert Schmidt
9ff4630071
Merge remote-tracking branch 'origin/NR_RRC_MAC_CellGroup' into integration_2022_wk24
2022-06-17 12:11:37 +02:00
luis_pereira87
9e27394ecc
Reset feedback_slot and round values when resetting HARQ processes
2022-06-17 10:35:01 +01:00
Roberto Louro Magueta
f6cbde5343
Add const qualifier in some variables
2022-06-16 12:49:13 +01:00
luis_pereira87
cc33856ba8
Reset HARQ processes after RA when Msg3 carries a DCCH or DTCH message.
...
Reset ul_failure flag only after sending Msg4 otherwise gNB starts scheduling too early
2022-06-15 17:24:47 +01:00
Roberto Louro Magueta
7f21567f83
Merge remote-tracking branch 'origin/develop' into 5g-nr-low-snr-performance
...
# Conflicts:
# cmake_targets/autotests/test_case_list.xml
# openair1/SIMULATION/NR_PHY/dlsim.c
# openair1/SIMULATION/NR_PHY/ulsim.c
2022-06-15 11:17:06 +01:00
Cedric Roux
2521e46593
Merge remote-tracking branch 'origin/F1C_extensions_develop' into F1_interop_ACC_n78
...
Conflicts:
openair2/F1AP/f1ap_du_interface_management.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
openair2/LAYER2/NR_MAC_gNB/main.c
openair2/RRC/NR/MESSAGES/asn1_msg.c
openair2/RRC/NR/MESSAGES/asn1_msg.h
openair2/RRC/NR/rrc_gNB.c
openair3/ocp-gtpu/gtp_itf.cpp
2022-06-15 11:28:37 +02:00
luis_pereira87
527003492d
Revert call to process_CellGroup function in rrc_mac_config_req_gNB to fix F1 user plane working
2022-06-15 09:34:55 +01:00
luis_pereira87
7cee46777f
Cosmetic changes
2022-06-13 23:20:37 +01:00
Cedric Roux
33b69bdf30
nr rlc: bugfix: use hard-coded mapping between drb ID and mac lcid
...
This will probably impact negatively the Accelleran interoperability
but the previous version is not correct and breaks the oai nr ue.
To be checked in a CU/DU scenario with Accelleran.
2022-06-13 18:28:07 +02:00
Cedric Roux
1ad8f254c2
Merge remote-tracking branch 'origin/develop' into F1_interop_ACC_n78
2022-06-13 16:59:59 +02:00
rmagueta
7b770042ad
Merge remote-tracking branch 'origin/develop' into develop-SRS-Measurements
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/main.c
# openair2/RRC/NR/MESSAGES/asn1_msg.c
2022-06-13 12:00:11 +01:00
francescomani
045de837ab
Merge remote-tracking branch 'origin/develop' into NR_PUCCH_RRC_Resources
2022-06-13 10:25:05 +02:00
luis_pereira87
983760e9a4
Fix after merge with develop
2022-06-13 08:21:05 +01:00
luis_pereira87
131db89dfc
Merge remote-tracking branch 'origin/develop' into NR_RRC_MAC_CellGroup
...
# Conflicts:
# openair1/PHY/INIT/nr_init.c
# openair2/LAYER2/NR_MAC_gNB/config.c
2022-06-13 08:19:39 +01:00
luis_pereira87
e850a8ece7
Fix initial connection setup when there is Msg4 retransmissions and UE comes with a new RA with Msg3 carrying DCCH or DTCH message
2022-06-10 23:18:18 +01:00
Robert Schmidt
b193ccf6ee
Merge remote-tracking branch 'origin/develop' into 5g-nr-low-snr-performance
2022-06-10 13:50:47 +02:00
Robert Schmidt
3793edf686
Merge remote-tracking branch 'origin/NR_coreset_harmonization' into integration_2022_wk23
2022-06-09 17:47:37 +02:00
Robert Schmidt
4b0d4e38c4
Merge remote-tracking branch 'origin/fix-test-caracal' into integration_2022_wk23
2022-06-09 17:46:54 +02:00
Robert Schmidt
28ad0eaacb
Merge remote-tracking branch 'origin/NR_fix_msg3_rtx' into integration_2022_wk23
2022-06-09 17:46:45 +02:00
Robert Schmidt
9127577bf3
Merge remote-tracking branch 'origin/fixing_removed_LOG_As' into integration_2022_wk23
2022-06-09 17:46:36 +02:00
francescomani
8adcf8368a
reverting activation of timer at transmission
2022-06-09 14:48:42 +02:00
francescomani
f5e9c4ec36
applying Robert's patch
2022-06-09 13:26:04 +02:00
luis_pereira87
e7a491415c
Improvements on RRC passing CellGroup to MAC to get COTS UE working
2022-06-09 10:08:28 +01:00
francescomani
0aec0d91c6
temporary workaround for RRC passing CG to MAC (forced encoding of message at MAC)
2022-06-09 09:35:42 +01:00
Roberto Louro Magueta
8c577ff253
Merge remote-tracking branch 'origin/develop' into develop-SRS-Measurements
...
# Conflicts:
# openair2/RRC/NR/MESSAGES/asn1_msg.c
# targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
2022-06-09 00:56:55 +01:00
Robert Schmidt
12c0f52fea
Merge remote-tracking branch 'origin/develop' into F1_interop_ACC_n78
2022-06-08 19:45:17 +02:00
francescomani
85b48193d4
fix msg3 retransmissions with OAI UE
2022-06-08 16:45:30 +02:00
Cedric Roux
f71766c3ee
Merge remote-tracking branch 'origin/develop' into F1_interop_ACC_n78
...
Conflicts:
openair2/F1AP/f1ap_du_ue_context_management.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
openair2/RRC/NR/MESSAGES/asn1_msg.h
openair2/RRC/NR/rrc_gNB.c
openair3/ocp-gtpu/gtp_itf.cpp
There were some important conflicts in openair3/ocp-gtpu/gtp_itf.cpp
I rewrote a bit the function Gtpv1uHandleGpdu(). It might have been
done wrongly.
To be tested and fixed if needed.
To redo the merge, if needed:
git checkout 9b2a163ebb
git merge 5ea828e149
2022-06-08 15:48:24 +02:00