maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build after merge

Browse Source
This commit is contained in:
rmagueta
2022-04-12 14:31:39 +01:00
parent d5421a9c87
commit d6072cb5d2
15 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/PHY/INIT/nr_init.c
+1 -1
View File
@@ -608,7 +608,7 @@ int phy_init_nr_gNB(PHY_VARS_gNB *gNB,
}
}
gNB->csi_gold_init = cfg->cell_config.phy_cell_id.value;
gNB->nr_csi_rs_info->csi_gold_init = cfg->cell_config.phy_cell_id.value;
nr_init_csi_rs(&gNB->frame_parms, gNB->nr_csi_rs_info->nr_gold_csi_rs, cfg->cell_config.phy_cell_id.value);
for (int id=0; id<NUMBER_OF_NR_SRS_MAX; id++) {
openair1/PHY/NR_TRANSPORT/nr_csi_rs.c
+2 -2
View File
@@ -86,8 +86,8 @@ void nr_generate_csi_rs(NR_DL_FRAME_PARMS frame_parms,
AssertFatal(b!=0, "Invalid CSI frequency domain mapping: no bit selected in bitmap\n");
// if the scrambling id is not the one previously used to initialize we need to re-initialize the rs
if (csi_params->scramb_id != gNB->csi_gold_init) {
gNB->csi_gold_init = csi_params->scramb_id;
if (csi_params->scramb_id != nr_csi_rs_info->csi_gold_init) {
nr_csi_rs_info->csi_gold_init = csi_params->scramb_id;
nr_init_csi_rs(&frame_parms, nr_csi_rs_info->nr_gold_csi_rs, csi_params->scramb_id);
}
openair1/PHY/NR_TRANSPORT/nr_transport_proto.h
-1
View File
@@ -340,7 +340,6 @@ void nr_generate_csi_rs(NR_DL_FRAME_PARMS frame_parms,
int16_t amp,
nr_csi_rs_info_t *nr_csi_rs_info,
nfapi_nr_dl_tti_csi_rs_pdu_rel15_t *csi_params,
uint16_t cell_id,
int slot);
void free_nr_prach_entry(PHY_VARS_gNB *gNB, int prach_id);
openair1/PHY/NR_UE_TRANSPORT/csi_rx.c
-1
View File
@@ -389,7 +389,6 @@ int nr_ue_csi_rs_procedures(PHY_VARS_NR_UE *ue, UE_nr_rxtx_proc_t *proc, uint8_t
AMP,
ue->nr_csi_rs_info,
(nfapi_nr_dl_tti_csi_rs_pdu_rel15_t *) csirs_config_pdu,
ue->frame_parms.first_carrier_offset,
proc->nr_slot_rx);
nr_get_csi_rs_signal(ue,
openair1/PHY/defs_gNB.h
-1
View File
@@ -850,7 +850,6 @@ typedef struct PHY_VARS_gNB_s {
/// counter to average prach energh over first 100 prach opportunities
int prach_energy_counter;
int csi_gold_init;
int pdcch_gold_init;
int pdsch_gold_init[2];
int pusch_gold_init[2];
openair1/PHY/defs_nr_common.h
+1
View File
@@ -256,6 +256,7 @@ typedef struct {
uint8_t j[16];
uint8_t koverline[16];
uint8_t loverline[16];
uint16_t csi_gold_init;
uint32_t ***nr_gold_csi_rs;
uint8_t csi_rs_generated_signal_bits;
int32_t **csi_rs_generated_signal;
openair1/SCHED_NR/phy_procedures_nr_gNB.c
+1 -1
View File
@@ -177,7 +177,7 @@ void phy_procedures_gNB_TX(processingData_L1tx_t *msgTx,
if (csirs->active == 1) {
LOG_D(PHY, "CSI-RS generation started in frame %d.%d\n",frame,slot);
nfapi_nr_dl_tti_csi_rs_pdu_rel15_t *csi_params = &csirs->csirs_pdu.csi_rs_pdu_rel15;
nr_generate_csi_rs(gNB->frame_parms, gNB->common_vars.txdataF, AMP, gNB->nr_csi_rs_info, csi_params, gNB->gNB_config.cell_config.phy_cell_id.value, slot);
nr_generate_csi_rs(gNB->frame_parms, gNB->common_vars.txdataF, AMP, gNB->nr_csi_rs_info, csi_params, slot);
csirs->active = 0;
}
}
targets/PROJECTS/GENERIC-NR-5GC/CONF/cu_gnb.conf
+1 -1
View File
@@ -48,7 +48,7 @@ gNBs =
pdsch_AntennaPorts = 1;
pusch_AntennaPorts = 1;
min_rxtxtime = 6;
sib1_tda = 0;
sib1_tda = 1;
pdcch_ConfigSIB1 = (
{
targets/PROJECTS/GENERIC-NR-5GC/CONF/du_gnb.conf
+1 -1
View File
@@ -38,7 +38,7 @@ gNBs =
ssb_SubcarrierOffset = 0;
min_rxtxtime = 6;
sib1_tda = 0;
sib1_tda = 1;
pdcch_ConfigSIB1 = (
{
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.tm1.106PRB.usrpn300.gtp-itti.conf
+1 -1
View File
@@ -37,7 +37,7 @@ gNBs =
////////// Physical parameters:
ssb_SubcarrierOffset = 0;
sib1_tda = 0;
sib1_tda = 1;
servingCellConfigCommon = (
{
#spCellConfigCommon
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf
+1 -1
View File
@@ -36,7 +36,7 @@ gNBs =
pdsch_AntennaPorts_N1 = 1;
pusch_AntennaPorts = 1;
min_rxtxtime = 2;
sib1_tda = 0;
sib1_tda = 1;
do_CSIRS = 1;
do_SRS = 0;
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.106PRB.usrpn300.conf
+1 -1
View File
@@ -36,7 +36,7 @@ gNBs =
pdsch_AntennaPorts = 1;
pusch_AntennaPorts = 1;
min_rxtxtime = 6;
sib1_tda = 0;
sib1_tda = 1;
pdcch_ConfigSIB1 = (
{
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.2x2.usrpn300.conf
+1 -1
View File
@@ -36,7 +36,7 @@ gNBs =
pdsch_AntennaPorts_N1 = 2;
pusch_AntennaPorts = 2;
min_rxtxtime = 2;
sib1_tda = 0;
sib1_tda = 1;
do_CSIRS = 1;
do_SRS = 0;
ul_prbblacklist = "51,52,53,54"
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
+1 -1
View File
@@ -36,7 +36,7 @@ gNBs =
pdsch_AntennaPorts_N1 = 1;
pusch_AntennaPorts = 1;
min_rxtxtime = 2;
sib1_tda = 0;
sib1_tda = 1;
do_CSIRS = 1;
do_SRS = 0;
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.162PRB.2x2.usrpn300.conf
+1 -1
View File
@@ -36,7 +36,7 @@ gNBs =
pdsch_AntennaPorts_N1 = 2;
pusch_AntennaPorts = 2;
min_rxtxtime = 2;
sib1_tda = 0;
sib1_tda = 1;
do_CSIRS = 1;
do_SRS = 0;
ul_prbblacklist = "79,80,81,82"