Commit 048ca235 authored by Francesco Mani's avatar Francesco Mani

Merge branch 'NR_RRCConfiguration' of...

Merge branch 'NR_RRCConfiguration' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRCConfiguration
parents e583c51b 6a026e77
...@@ -355,6 +355,7 @@ void nr_phy_config_request_sim(PHY_VARS_gNB *gNB, ...@@ -355,6 +355,7 @@ void nr_phy_config_request_sim(PHY_VARS_gNB *gNB,
gNB_config->carrier_config.num_tx_ant.value = fp->nb_antennas_tx; gNB_config->carrier_config.num_tx_ant.value = fp->nb_antennas_tx;
gNB_config->carrier_config.num_rx_ant.value = fp->nb_antennas_rx; gNB_config->carrier_config.num_rx_ant.value = fp->nb_antennas_rx;
gNB_config->tdd_table.tdd_period.value = 0;
//gNB_config->subframe_config.dl_cyclic_prefix_type.value = (fp->Ncp == NORMAL) ? NFAPI_CP_NORMAL : NFAPI_CP_EXTENDED; //gNB_config->subframe_config.dl_cyclic_prefix_type.value = (fp->Ncp == NORMAL) ? NFAPI_CP_NORMAL : NFAPI_CP_EXTENDED;
gNB->mac_enabled = 1; gNB->mac_enabled = 1;
......
...@@ -402,8 +402,8 @@ int main(int argc, char **argv) ...@@ -402,8 +402,8 @@ int main(int argc, char **argv)
RC.nb_nr_L1_inst=1; RC.nb_nr_L1_inst=1;
phy_init_nr_gNB(gNB,0,0); phy_init_nr_gNB(gNB,0,0);
nr_phy_init_RU(RU); nr_phy_init_RU(ru);
set_tdd_config_nr(frame_parms, 5000, set_tdd_config_nr(&gNB->gNB_config, 5000,
7, 6, 7, 6,
2, 4); 2, 4);
...@@ -517,8 +517,8 @@ int main(int argc, char **argv) ...@@ -517,8 +517,8 @@ int main(int argc, char **argv)
subframe, subframe,
0); //Nf */ //commented for testing purpose 0); //Nf */ //commented for testing purpose
UE_nr_rxtx_proc_t proc={0}; UE_nr_rxtx_proc_t proc={0};
nr_ue_prach_procedures(UE,&proc,0,0,0); nr_ue_prach_procedures(UE,&proc,0,0,0);
/* tx_lev_dB not used later, no need to set */ /* tx_lev_dB not used later, no need to set */
...@@ -590,7 +590,7 @@ nr_ue_prach_procedures(UE,&proc,0,0,0); ...@@ -590,7 +590,7 @@ nr_ue_prach_procedures(UE,&proc,0,0,0);
} }
} }
uint16_t preamble_rx; uint16_t preamble_rx;
rx_nr_prach_ru(RU, rx_nr_prach_ru(ru,
0, 0,
subframe); subframe);
gNB->prach_vars.rxsigF = ru->prach_rxsigF; gNB->prach_vars.rxsigF = ru->prach_rxsigF;
......
...@@ -165,7 +165,7 @@ gNBs = ...@@ -165,7 +165,7 @@ gNBs =
#tdd-UL-DL-ConfigurationCommon #tdd-UL-DL-ConfigurationCommon
# subcarrierSpacing # subcarrierSpacing
# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
referenceSubcarrierSpacing = 2; referenceSubcarrierSpacing = 1;
# pattern1 # pattern1
# dl_UL_TransmissionPeriodicity # dl_UL_TransmissionPeriodicity
# 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10 # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
......
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