luis_pereira87
1a3c8e5440
Merge remote-tracking branch 'origin/develop' into NR_RRC_processing_timer
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/config.c
# openair2/LAYER2/NR_MAC_gNB/mac_proto.h
2022-04-06 11:52:55 +01:00
luis_pereira87
6ccaaacaf0
Merge remote-tracking branch 'origin/develop' into NR_RRC_processing_timer
...
# Conflicts:
# openair2/RRC/NR/rrc_gNB.c
# openair2/RRC/NR/rrc_gNB_nsa.c
2022-04-05 12:46:14 +01:00
luis_pereira87
29f47c49c1
Fix segmentation fault for NSA
2022-04-04 11:05:52 +01:00
Robert Schmidt
ec82ddea38
Don't call calculate_preferred_dl_tda() in do-ra mode
...
In --do-ra mode, calculate_preferred_dl_tda() would be called without a
BWP. Then, get_searchspace() would search in the scc, leading to a
segfault. Therefore, don't call calculate_preferred_dl_tda() in do-ra
mode.
2022-04-03 19:25:14 +02:00
Robert Schmidt
5d63a756e6
Merge remote-tracking branch 'origin/fix-initialBWP-procedures' into integration_2022_wk13b
2022-04-01 18:40:30 +02:00
Raphael Defosseux
426ded6e31
fix(build): fix warnings on circular dependency
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2022-03-30 16:42:12 +02:00
Robert Schmidt
69fcab9243
Merge remote-tracking branch 'origin/nr_mimo_precoding_codebook_I' into integration_2022_wk13
2022-03-29 22:09:34 +02:00
francescomani
6e48ec9266
Merge remote-tracking branch 'origin/develop' into nr_mimo_precoding_codebook_I
2022-03-28 18:32:59 +02:00
Robert Schmidt
ab654ac15c
Merge remote-tracking branch 'origin/force-256qam-off' into integration_2022_wk13
2022-03-28 17:48:22 +02:00
rmagueta
8e5ea001b1
Fix warning after merge
2022-03-28 11:57:29 +01:00
rmagueta
c11f6082a6
Merge remote-tracking branch 'origin/develop' into NR_RRC_processing_timer
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
# openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
2022-03-28 11:57:07 +01:00
rmagueta
a020c51772
Fix warning after merge
2022-03-28 10:31:50 +01:00
rmagueta
495b3f39c5
Merge remote-tracking branch 'origin/develop' into fix-initialBWP-procedures
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
2022-03-28 10:12:29 +01:00
rmagueta
6c1f1a02bb
Avoid CU from trying to access RC.nrmac
2022-03-25 16:11:34 +00:00
Robert Schmidt
bf58c6b475
Merge remote-tracking branch 'origin/fix_rballoc_mask_type' into integration_2022_wk12_a
2022-03-25 08:29:52 +01:00
luis_pereira87
ed4cc7c257
Fix segmentation fault when using CU-DU split
2022-03-24 15:37:26 +00:00
luis_pereira87
9a884af00a
Fix rballoc_mask variable type from uint8_t to uint16_t
2022-03-24 14:19:02 +00:00
Robert Schmidt
7684803c64
Merge remote-tracking branch 'origin/nr-lc-sched' into integration_2022_wk12_a
2022-03-24 11:34:26 +01:00
luis_pereira87
4510041aa6
Fix RRC processing time to match RRC ticks (at 1 ms) and add implementation for RRCSetup processing time
2022-03-23 17:08:36 +00:00
luis_pereira87
daf3fb0e2c
Enable nr_rrc_processing_timer for RRCSetup
2022-03-23 13:29:07 +00:00
luis_pereira87
6f5ea27e09
Improve nr_rrc_processing_timer procedures
2022-03-23 13:11:04 +00:00
luis_pereira87
726cebaa9d
Create function to enable nr_rrc_processing_timer
2022-03-23 11:17:52 +00:00
rmagueta
bc7a404629
Move rrc_processing_timer from MAC to RRC
2022-03-22 20:18:23 +00:00
luis_pereira87
f5c4ccf479
Merge remote-tracking branch 'origin/develop' into NR_RRC_processing_timer
2022-03-22 18:51:48 +00:00
francescomani
12f9dd95eb
Merge remote-tracking branch 'origin/develop' into nr_mimo_precoding_codebook_I
2022-03-22 09:44:40 +01:00
luis_pereira87
eb8e4b4999
Merge remote-tracking branch 'origin/develop' into fix-initialBWP-procedures
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
# openair2/LAYER2/NR_MAC_gNB/mac_proto.h
2022-03-22 05:47:56 +00:00
rmagueta
a9bbf18d9f
Simplification of rrc_processing_delay computation
2022-03-21 17:14:50 +00:00
luis_pereira87
65e47c882f
Handle RRC processing time at gNB
2022-03-21 14:35:41 +00:00
rmagueta
f0f8acb06a
Merge remote-tracking branch 'origin/develop' into fix-initialBWP-procedures
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
2022-03-21 10:10:21 +00:00
Robert Schmidt
70265d9c64
Refactor fill_default_secondaryCellGroup(): less parameters
2022-03-18 18:54:57 +01:00
Robert Schmidt
e89dfc0243
Refactor RRC: do not duplicate configuration in rrc_gNB_carrier_t
2022-03-18 18:49:09 +01:00
Robert Schmidt
f646b9a57c
Add parameter to disable 256 QAM activation
2022-03-18 18:49:09 +01:00
Robert Schmidt
d3b80b4785
Merge remote-tracking branch 'origin/nr-ue-fixes' into integration_2022_wk11
2022-03-18 16:48:43 +01:00
Robert Schmidt
b1eaa6606b
Merge remote-tracking branch 'origin/NR_MIMO_memory' into integration_2022_wk11
2022-03-17 17:45:00 +01:00
francescomani
8ef72fb939
Merge remote-tracking branch 'origin/develop' into nr_mimo_precoding_codebook_I
2022-03-17 07:51:35 +01:00
Robert Schmidt
7cbca077e0
Merge remote-tracking branch 'origin/NR_UL_VRB_MAP_improv' into integration_2022_wk11
2022-03-16 23:26:59 +01:00
Robert Schmidt
b0dd17f938
Merge remote-tracking branch 'origin/NR_SR_bugfix' into integration_2022_wk10
2022-03-14 19:11:17 +01:00
luis_pereira87
9b737d0985
Move ternary operators to outside of functions input parameters
2022-03-14 11:48:09 +00:00
Robert Schmidt
0c5242ea85
Apply review comment
2022-03-11 11:36:07 +00:00
francescomani
48cd851cab
SA SR bugfix
2022-03-10 18:31:46 +01:00
francescomani
ddbc306246
Merge branch 'NR_UL_VRB_MAP_improv' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_UL_VRB_MAP_improv
2022-03-09 14:57:33 +01:00
francescomani
e7508533b6
review fix
2022-03-09 14:57:26 +01:00
Robert Schmidt
73bd9034aa
Use strtok_r() to split strings in gnb_config.c
2022-03-09 14:39:38 +01:00
francescomani
deee2a9ca1
Merge remote-tracking branch 'origin/develop' into NR_MIMO_memory
2022-03-08 09:16:18 +01:00
Robert Schmidt
d8209228e7
Hide warning of unused variable
...
From the comment above the line with the warning:
> This asn1cCalloc leaks memory but also masks a bug.
> If we delete this asn1cCalloc statement, eNB will crash in NSA mode.
> Please don't delete the following line unless the bug has been found
2022-03-07 23:24:50 +01:00
Robert Schmidt
9714877ee0
Merge remote-tracking branch 'origin/remove-NR_UE_PBCH' into integration_2022_wk10
2022-03-07 23:12:49 +01:00
Robert Schmidt
e285b003dc
Merge remote-tracking branch 'origin/isolate-lfds' into integration_2022_wk10
2022-03-07 23:11:55 +01:00
Thomas Schlichter
e3901a499b
call process_CellGroup() after add_new_nr_ue() in gNB_scheduler_ulsch.c
...
In case of do-ra mode (NSA) the OAI UE needs this, so the gNB correctly establishes the DRB.
2022-03-07 16:22:50 +01:00
Thomas Schlichter
e7500354c1
harmonize RLC and PDCP configurations in nr_DRB_preconfiguration() and fill_default_secondaryCellGroup()
...
nr_DRB_preconfiguration() is used in phy-test mode by both, OAI UE and gNB, and in all other modes by OAI UE.
Because of inconsistencies, data transfer with OAI UE was only reliably working in phy-test mode.
Ultimately, OAI UE should use nr_DRB_preconfiguration() only in phy-test mode and do proper DRB configuration instead in all other modes!
2022-03-07 16:02:01 +01:00
francescomani
1dac24844b
Merge remote-tracking branch 'origin/develop' into NR_UL_VRB_MAP_improv
2022-03-07 09:47:19 +01:00