Skip to content

O
OpenXG-RAN
Commit b4c78a9c authored by francescomani's avatar francescomani
Browse files
Options

fix compilation issues after merge

parent 2593a821
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 9 deletions
openair2/GNB_APP/gnb_config.c
View file @ b4c78a9c
...@@ -2050,7 +2050,7 @@ void configure_gnb_du_mac(int inst) { ...@@ -2050,7 +2050,7 @@ void configure_gnb_du_mac(int inst) {
rrc->configuration.pdsch_AntennaPorts, rrc->configuration.pdsch_AntennaPorts,
rrc->configuration.pusch_AntennaPorts, rrc->configuration.pusch_AntennaPorts,
rrc->configuration.sib1_tda, rrc->configuration.sib1_tda,
rrc->configuration.minRXTXTIMEpdsch, rrc->configuration.minRXTXTIME,
rrc->configuration.scc, rrc->configuration.scc,
NULL, NULL,
0, 0,
......
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
View file @ b4c78a9c
...@@ -902,9 +902,7 @@ void nr_get_Msg3alloc(module_id_t module_id, ...@@ -902,9 +902,7 @@ void nr_get_Msg3alloc(module_id_t module_id,
const NR_TDD_UL_DL_Pattern_t *tdd = scc->tdd_UL_DL_ConfigurationCommon ? &scc->tdd_UL_DL_ConfigurationCommon->pattern1 : NULL; const NR_TDD_UL_DL_Pattern_t *tdd = scc->tdd_UL_DL_ConfigurationCommon ? &scc->tdd_UL_DL_ConfigurationCommon->pattern1 : NULL;
const int n_slots_frame = nr_slots_per_frame[mu]; const int n_slots_frame = nr_slots_per_frame[mu];
const int nrofUplinkSymbols = (frame_type==TDD) ? tdd->nrofUplinkSymbols : 11; // TODO change in favor of harmonization branch
uint8_t k2 = 0; uint8_t k2 = 0;
lte_frame_type_t frame_type = get_frame_type(*scc->downlinkConfigCommon->frequencyInfoDL->frequencyBandList.list.array[0], *scc->ssbSubcarrierSpacing);
if (frame_type == TDD) { if (frame_type == TDD) {
int nb_periods_per_frame = get_nb_periods_per_frame(scc->tdd_UL_DL_ConfigurationCommon->pattern1.dl_UL_TransmissionPeriodicity); int nb_periods_per_frame = get_nb_periods_per_frame(scc->tdd_UL_DL_ConfigurationCommon->pattern1.dl_UL_TransmissionPeriodicity);
int nb_slots_per_period = ((1<<mu)*10)/nb_periods_per_frame; int nb_slots_per_period = ((1<<mu)*10)/nb_periods_per_frame;
......
openair2/RRC/NR/rrc_gNB.c
View file @ b4c78a9c
...@@ -163,7 +163,7 @@ static void init_NR_SI(gNB_RRC_INST *rrc, gNB_RrcConfigurationReq *configuration ...@@ -163,7 +163,7 @@ static void init_NR_SI(gNB_RRC_INST *rrc, gNB_RrcConfigurationReq *configuration
rrc->carrier.pdsch_AntennaPorts, rrc->carrier.pdsch_AntennaPorts,
rrc->carrier.pusch_AntennaPorts, rrc->carrier.pusch_AntennaPorts,
rrc->carrier.sib1_tda, rrc->carrier.sib1_tda,
rrc->carrier.minRXTXTIMEpdsch, rrc->carrier.minRXTXTIME,
(NR_ServingCellConfigCommon_t *)rrc->carrier.servingcellconfigcommon, (NR_ServingCellConfigCommon_t *)rrc->carrier.servingcellconfigcommon,
&rrc->carrier.mib, &rrc->carrier.mib,
0, 0,
...@@ -318,7 +318,7 @@ void apply_macrlc_config(gNB_RRC_INST *rrc, ...@@ -318,7 +318,7 @@ void apply_macrlc_config(gNB_RRC_INST *rrc,
rrc->carrier.pdsch_AntennaPorts, rrc->carrier.pdsch_AntennaPorts,
rrc->carrier.pusch_AntennaPorts, rrc->carrier.pusch_AntennaPorts,
rrc->carrier.sib1_tda, rrc->carrier.sib1_tda,
rrc->carrier.minRXTXTIMEpdsch, rrc->carrier.minRXTXTIME,
NULL, NULL,
NULL, NULL,
0, 0,
...@@ -512,7 +512,7 @@ rrc_gNB_generate_RRCSetup_for_RRCReestablishmentRequest( ...@@ -512,7 +512,7 @@ rrc_gNB_generate_RRCSetup_for_RRCReestablishmentRequest(
rrc_instance_p->carrier.pdsch_AntennaPorts, rrc_instance_p->carrier.pdsch_AntennaPorts,
rrc_instance_p->carrier.pusch_AntennaPorts, rrc_instance_p->carrier.pusch_AntennaPorts,
rrc_instance_p->carrier.sib1_tda, rrc_instance_p->carrier.sib1_tda,
rrc_instance_p->carrier.minRXTXTIMEpdsch, rrc_instance_p->carrier.minRXTXTIME,
(NR_ServingCellConfigCommon_t *)rrc_instance_p->carrier.servingcellconfigcommon, (NR_ServingCellConfigCommon_t *)rrc_instance_p->carrier.servingcellconfigcommon,
&rrc_instance_p->carrier.mib, &rrc_instance_p->carrier.mib,
0, 0,
...@@ -1278,7 +1278,7 @@ rrc_gNB_process_RRCReconfigurationComplete( ...@@ -1278,7 +1278,7 @@ rrc_gNB_process_RRCReconfigurationComplete(
rrc->carrier.pdsch_AntennaPorts, rrc->carrier.pdsch_AntennaPorts,
rrc->carrier.pusch_AntennaPorts, rrc->carrier.pusch_AntennaPorts,
rrc->carrier.sib1_tda, rrc->carrier.sib1_tda,
rrc->carrier.minRXTXTIMEpdsch, rrc->carrier.minRXTXTIME,
NULL, NULL,
NULL, NULL,
0, 0,
......
openair2/RRC/NR/rrc_gNB_nsa.c
View file @ b4c78a9c
...@@ -352,7 +352,7 @@ void rrc_add_nsa_user(gNB_RRC_INST *rrc,struct rrc_gNB_ue_context_s *ue_context_ ...@@ -352,7 +352,7 @@ void rrc_add_nsa_user(gNB_RRC_INST *rrc,struct rrc_gNB_ue_context_s *ue_context_
rrc->carrier.pdsch_AntennaPorts, rrc->carrier.pdsch_AntennaPorts,
rrc->carrier.pusch_AntennaPorts, rrc->carrier.pusch_AntennaPorts,
rrc->carrier.sib1_tda, rrc->carrier.sib1_tda,
rrc->carrier.minRXTXTIMEpdsch, rrc->carrier.minRXTXTIME,
rrc->carrier.servingcellconfigcommon, rrc->carrier.servingcellconfigcommon,
&rrc->carrier.mib, &rrc->carrier.mib,
1, // add_ue flag 1, // add_ue flag
...@@ -364,7 +364,7 @@ void rrc_add_nsa_user(gNB_RRC_INST *rrc,struct rrc_gNB_ue_context_s *ue_context_ ...@@ -364,7 +364,7 @@ void rrc_add_nsa_user(gNB_RRC_INST *rrc,struct rrc_gNB_ue_context_s *ue_context_
rrc->carrier.pdsch_AntennaPorts, rrc->carrier.pdsch_AntennaPorts,
rrc->carrier.pusch_AntennaPorts, rrc->carrier.pusch_AntennaPorts,
rrc->carrier.sib1_tda, rrc->carrier.sib1_tda,
rrc->carrier.minRXTXTIMEpdsch, rrc->carrier.minRXTXTIME,
NULL, NULL,
NULL, NULL,
1, // add_ue flag 1, // add_ue flag
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment