francescomani
f0ea21476a
Merge remote-tracking branch 'origin/develop' into NR_handling_PMI_report
2022-04-06 10:04:20 +02: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
francescomani
7901ff998d
Merge remote-tracking branch 'origin/develop' into NR_handling_PMI_report
2022-04-03 16:38:32 +02:00
francescomani
ed9c35a170
Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4
2022-04-03 16:20:59 +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
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
Raymond Knopp
b7389ab3d1
Merge remote-tracking branch 'origin/develop' into tdd25period_for_MR
...
Conflicts:
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
2022-03-29 22:57:56 +02:00
francescomani
6e48ec9266
Merge remote-tracking branch 'origin/develop' into nr_mimo_precoding_codebook_I
2022-03-28 18:32:59 +02: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
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
7684803c64
Merge remote-tracking branch 'origin/nr-lc-sched' into integration_2022_wk12_a
2022-03-24 11:34:26 +01:00
rmagueta
199680d24d
Address reviewer comments
2022-03-21 17:37:29 +00:00
francescomani
4d289b92cc
fix xp=1 option and added RUNMODEM description for MIMO configuration
2022-03-21 11:59:31 +01:00
francescomani
7b9f53e9db
option for identity matrix if xp is 1
2022-03-21 10:01:13 +01:00
Raymond Knopp
e71578e7d0
Merge branch 'tdd25period_for_MR' into tdd2_5period_withRLCupdate
...
Conflicts:
openair2/LAYER2/NR_MAC_gNB/config.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
targets/ARCH/AW2SORI/oaiori.c
2022-03-13 07:30:44 +01:00
francescomani
1ab1fde7b8
fix for fdd and other warnings
2022-03-11 14:00:30 +01:00
rmagueta
bbe806a870
Merge remote-tracking branch 'origin/develop' into develop-CSI
...
# Conflicts:
# openair1/SIMULATION/NR_PHY/dlsim.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
# openair2/RRC/NR/MESSAGES/asn1_msg.c
# openair2/RRC/NR/MESSAGES/asn1_msg.h
# openair2/RRC/NR/nr_rrc_config.c
# openair2/RRC/NR/nr_rrc_config.h
# openair2/RRC/NR/rrc_gNB.c
# openair2/RRC/NR/rrc_gNB_nsa.c
2022-03-07 13:10:40 +00:00
francescomani
b8935b7761
Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4
2022-03-07 10:37:48 +01:00
francescomani
8dfc5d59b4
Merge remote-tracking branch 'origin/develop' into nr_mimo_precoding_codebook_I
2022-03-07 09:26:08 +01:00
Raymond Knopp
2bd90d5b49
Merge remote-tracking branch 'origin/develop' into tdd25period_for_MR
...
Conflicts:
openair2/RRC/NR/MESSAGES/asn1_msg.h
2022-03-07 07:38:03 +01:00
luis_pereira87
b2316f045e
Merge remote-tracking branch 'origin/develop' into fix-initialBWP-procedures
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
2022-03-07 01:19:20 +00:00
Raymond Knopp
f99754a5ea
Merge remote-tracking branch 'origin/develop' into tdd25period_for_MR
...
Conflicts:
openair1/PHY/NR_TRANSPORT/nr_dlsch.c
openair1/PHY/NR_TRANSPORT/nr_sch_dmrs.c
openair1/SIMULATION/NR_PHY/dlsim.c
openair1/SIMULATION/NR_PHY/ulsim.c
openair2/GNB_APP/gnb_config.c
openair2/LAYER2/NR_MAC_gNB/config.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
openair2/RRC/NR/MESSAGES/asn1_msg.c
2022-03-05 21:12:32 +01:00
Robert Schmidt
0220f4a6e9
Merge remote-tracking branch 'origin/NR_RRC_256QAM_DL' into integration_2022_wk09_b
2022-03-05 13:33:18 +01:00
luis_pereira87
3f0eee5019
Replace module_id by sib1 as input parameter in some functions where only sib1 is required
2022-03-04 15:38:48 +00:00
luis_pereira87
0d92901787
Merge remote-tracking branch 'origin/develop' into fix-initialBWP-procedures
2022-03-04 13:09:44 +00:00
rmagueta
7fdd7547be
Merge remote-tracking branch 'origin/develop' into develop-CSI
2022-03-02 13:14:09 +00:00
francescomani
9e26621d4b
Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4
2022-03-01 15:54:31 +01:00
francescomani
e443f75d47
Merge remote-tracking branch 'origin/develop' into nr_mimo_precoding_codebook_I
2022-03-01 11:20:14 +01:00
Robert Schmidt
61e608adb5
Support reconfiguration of number of HARQ processes
...
In F1, the time until the serving cell config comes from CU can be
longer than when we want to schedule a particular UE. Then, if we don't
configure the default number of HARQ processes, we can have a segfault.
In this commit, we initially configure 8 HARQ processes. When we get the
right number from RRC, we reconfigure.
2022-02-23 21:54:03 +01:00
francescomani
faf38c7e56
Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4
2022-02-23 14:20:39 +01:00
francescomani
4c8c11d9db
Merge remote-tracking branch 'origin/develop' into nr_mimo_precoding_codebook_I
2022-02-23 13:53:11 +01:00
luis_pereira87
47fc4750e1
Merge remote-tracking branch 'origin/develop' into fix-initialBWP-procedures
...
# Conflicts:
# openair1/SIMULATION/NR_PHY/dlsim.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
2022-02-23 11:34:37 +00:00
Guido Casati
0df80e648a
Replaced lcid_mask with arrays logic
...
- this will be later used to prioritise the LCs
2022-02-23 10:15:50 +01:00
francescomani
c61a0dd223
Merge remote-tracking branch 'origin/develop' into NR_RRC_256QAM_DL
2022-02-23 10:11:04 +01:00
Raymond Knopp
963ffe67c1
Merge remote-tracking branch 'origin/bugfix-nr-rlc-2022-w08' into tdd2_5period_withRLCupdate
...
Conflicts:
openair2/GNB_APP/gnb_config.c
openair2/LAYER2/NR_MAC_gNB/config.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
openair2/RRC/NR/MESSAGES/asn1_msg.c
2022-02-22 22:23:23 +01:00
rmagueta
6f19524e95
Merge remote-tracking branch 'origin/CSI-SA' into develop-CSI
...
# Conflicts:
# openair1/PHY/NR_TRANSPORT/nr_dlsch.c
# openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
# openair1/SIMULATION/NR_PHY/dlsim.c
# openair1/SIMULATION/NR_PHY/ulsim.c
# openair2/LAYER2/NR_MAC_gNB/config.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
# openair2/RRC/NR/MESSAGES/asn1_msg.c
# openair2/RRC/NR/nr_rrc_proto.h
# openair2/RRC/NR/rrc_gNB_nsa.c
# openair2/RRC/NR/rrc_gNB_reconfig.c
2022-02-22 15:10:20 +00:00
francescomani
30f6210932
Merge remote-tracking branch 'origin/develop' into nr_mimo_precoding_codebook_I
2022-02-21 15:16:39 +01:00
luis_pereira87
fb6936fe27
Merge remote-tracking branch 'origin/develop' into fix-initialBWP-procedures
...
# Conflicts:
# openair1/SIMULATION/NR_PHY/dlsim.c
# openair1/SIMULATION/NR_PHY/ulsim.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
# openair2/LAYER2/NR_MAC_gNB/mac_proto.h
# openair2/RRC/NR/rrc_gNB.c
2022-02-21 11:00:27 +00:00
francescomani
ec539fc6a5
Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4
2022-02-21 10:02:30 +01:00
francescomani
7bb7c4d290
Merge remote-tracking branch 'origin/develop' into NR_RRC_256QAM_DL
2022-02-21 09:24:07 +01:00
Robert Schmidt
86c4882245
Merge remote-tracking branch 'origin/NR_2port_CSIRS' into integration_2022_wk08
2022-02-20 19:48:34 +01:00
Raymond Knopp
6d9d1f0b94
changes for 2.5ms TDD period
2022-02-19 13:07:20 +01:00
Robert Schmidt
ff0fb53056
Merge remote-tracking branch 'origin/nr-fdd-scheduling' into integration_2022_wk07_c
2022-02-17 09:32:44 +01:00
francescomani
ec4ae32af0
N1 N2 and XP for DL antenna ports in config file
2022-02-14 19:00:55 +01:00
francescomani
c4f1812cc9
Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4
2022-02-14 18:14:19 +01:00
luis_pereira87
7e1b38db13
Fix segmentation fault in phy-test
2022-02-14 14:03:05 +00:00
Raymond Knopp
4756c5a167
added configurable "sf_ahead" for NR/LTE in RU section. Tested in NR with sf_ahead=2 (normally 3)
2022-02-13 22:15:48 +01:00
luis_pereira87
3dce1171d5
Fixes after merge
2022-02-09 11:16:38 +00:00
luis_pereira87
9610b7124c
Merge remote-tracking branch 'origin/develop' into fix-initialBWP-procedures
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/config.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
2022-02-09 11:10:31 +00:00