rmagueta
4ee6005a50
Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
2022-04-06 13:30:04 +01:00
rmagueta
4f29c73bb6
Merge remote-tracking branch 'origin/develop' into develop-CSI
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/config.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
2022-04-06 10:11:49 +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
rmagueta
e628c8c2c4
Fix build after merge
2022-04-01 20:13:06 +01:00
rmagueta
2deec7fa09
Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements
...
# Conflicts:
# openair1/PHY/INIT/nr_init_ue.c
# openair2/GNB_APP/gnb_config.c
# openair2/GNB_APP/gnb_paramdef.h
# openair2/RRC/NR/MESSAGES/asn1_msg.c
# openair2/RRC/NR/rrc_gNB_reconfig.c
2022-04-01 19:36:57 +01:00
Robert Schmidt
5d63a756e6
Merge remote-tracking branch 'origin/fix-initialBWP-procedures' into integration_2022_wk13b
2022-04-01 18:40:30 +02:00
rmagueta
25614263ba
Fix build after merge
2022-04-01 16:15:58 +01:00
rmagueta
c83df1b677
Merge remote-tracking branch 'origin/develop' into develop-CSI
...
# Conflicts:
# openair1/PHY/INIT/nr_init_ue.c
# openair2/GNB_APP/gnb_config.c
# openair2/RRC/NR/MESSAGES/asn1_msg.c
# openair2/RRC/NR/MESSAGES/asn1_msg.h
# targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf
# targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
# targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.162PRB.2x2.usrpn300.conf
2022-04-01 15:56:47 +01:00
rmagueta
da1e542a31
Fix dl_antenna_ports after merge
2022-03-30 20:14:57 +01:00
rmagueta
4c0427ea6c
Merge remote-tracking branch 'origin/nr_mimo_precoding_codebook_I' into develop-CSI-Measurements
...
# Conflicts:
# openair1/PHY/INIT/nr_init_ue.c
# openair2/GNB_APP/gnb_config.c
# openair2/GNB_APP/gnb_paramdef.h
# targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf
# targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
# targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.162PRB.2x2.usrpn300.conf
2022-03-30 19:23:22 +01: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
1d1aaa30e7
Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements
...
# Conflicts:
# openair1/PHY/INIT/nr_init.c
# openair1/PHY/INIT/nr_init_ue.c
# openair1/PHY/NR_TRANSPORT/nr_csi_rs.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
2022-03-28 15:06:23 +01:00
rmagueta
181e576698
Fix warning after merge
2022-03-28 13:53:35 +01:00
rmagueta
0abcf3d9c4
Merge remote-tracking branch 'origin/develop' into develop-CSI
...
# Conflicts:
# openair1/PHY/INIT/nr_init.c
# openair1/PHY/INIT/nr_init_ue.c
# openair1/PHY/NR_REFSIG/nr_gold.c
# openair1/PHY/NR_TRANSPORT/nr_csi_rs.c
# openair1/PHY/defs_nr_common.h
# openair2/LAYER2/NR_MAC_gNB/config.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
2022-03-28 13:32:46 +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
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
rmagueta
e834acfaf2
Temporary commit to test CSI-RS without core
2022-03-22 18:25:29 +00:00
rmagueta
17504695f8
Fix updated configurations that was reverted in merge
2022-03-22 18:02:12 +00:00
rmagueta
a47861628b
Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements
...
# Conflicts:
# openair1/PHY/INIT/nr_init.c
# openair1/PHY/INIT/nr_init_ue.c
# openair1/PHY/NR_REFSIG/nr_gold.c
# openair1/PHY/NR_TRANSPORT/nr_csi_rs.c
# openair1/PHY/defs_nr_common.h
# openair2/LAYER2/NR_MAC_gNB/config.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
# openair2/RRC/NR/MESSAGES/asn1_msg.c
# openair2/RRC/NR/nr_rrc_proto.h
# openair2/RRC/NR/rrc_gNB_reconfig.c
# targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
2022-03-22 17:18:22 +00:00
francescomani
12f9dd95eb
Merge remote-tracking branch 'origin/develop' into nr_mimo_precoding_codebook_I
2022-03-22 09:44:40 +01:00
Raymond Knopp
d840ca0dee
Merge remote-tracking branch 'origin/develop' into tdd25period_for_MR
...
Conflicts:
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
2022-03-22 07:03: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
199680d24d
Address reviewer comments
2022-03-21 17:37:29 +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
francescomani
3dc7da3b22
fix for bad merge issues
2022-03-20 15:08:56 +01: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
luis_pereira87
f439095c6e
Fix bug after merge
2022-03-17 18:19:42 +00:00
Robert Schmidt
b1eaa6606b
Merge remote-tracking branch 'origin/NR_MIMO_memory' into integration_2022_wk11
2022-03-17 17:45:00 +01:00
rmagueta
190eaa1e42
Move CSI-RS configuration from fill_initial_SpCellConfig() to update_cellGroupConfig()
2022-03-17 16:36:50 +00:00
rmagueta
8704f81025
Remove duplicated code
2022-03-17 16:35:06 +00:00
francescomani
8ef72fb939
Merge remote-tracking branch 'origin/develop' into nr_mimo_precoding_codebook_I
2022-03-17 07:51:35 +01:00
rmagueta
b59b84e904
Merge remote-tracking branch 'origin/develop' into develop-CSI
2022-03-17 01:03:35 +00: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
rmagueta
2f2bc2a5e8
Merge remote-tracking branch 'origin/nr_csirs_rrc_harmonization' into develop-CSI
...
# Conflicts:
# openair2/RRC/NR/MESSAGES/asn1_msg.c
# openair2/RRC/NR/nr_rrc_config.c
# openair2/RRC/NR/nr_rrc_config.h
# openair2/RRC/NR/rrc_gNB_reconfig.c
2022-03-16 17:45:39 +00:00
rmagueta
3f88cc1fb1
Intermediate commit: move CSI configuration to a separate function
2022-03-16 17:19:36 +00: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
francescomani
1ab1fde7b8
fix for fdd and other warnings
2022-03-11 14:00:30 +01:00
Robert Schmidt
0c5242ea85
Apply review comment
2022-03-11 11:36:07 +00:00
rmagueta