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

make dlsim compile again

Browse Source
This commit is contained in:
Francesco Mani
2019-05-21 15:07:26 +02:00
parent ef0056f1ea
commit acc88008d4
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/SIMULATION/NR_PHY/dlsim.c
+10 -4
View File
@@ -113,7 +113,8 @@ void config_common(int Mod_idP,
int CC_idP, int CC_idP,
int Nid_cell, int Nid_cell,
int nr_bandP, int nr_bandP,
uint64_t ssb_pattern, uint64_t SSB_positions,
uint16_t ssb_periodicity,
uint64_t dl_CarrierFreqP, uint64_t dl_CarrierFreqP,
uint32_t dl_BandwidthP uint32_t dl_BandwidthP
); );
@@ -166,7 +167,7 @@ int main(int argc, char **argv)
//int pbch_tx_ant; //int pbch_tx_ant;
int N_RB_DL=273,mu=1; int N_RB_DL=273,mu=1;
uint64_t ssb_pattern = 0x01; uint16_t ssb_periodicity = 10;
//unsigned char frame_type = 0; //unsigned char frame_type = 0;
unsigned char pbch_phase = 0; unsigned char pbch_phase = 0;
@@ -520,7 +521,7 @@ int main(int argc, char **argv)
mac_top_init_gNB(); mac_top_init_gNB();
gNB_mac = RC.nrmac[0]; gNB_mac = RC.nrmac[0];
config_common(0,0,Nid_cell,78,ssb_pattern,(uint64_t)3640000000L,N_RB_DL); config_common(0,0,Nid_cell,78,SSB_positions,ssb_periodicity,(uint64_t)3640000000L,N_RB_DL);
config_nr_mib(0,0,1,kHz30,0,0,0,0,0); config_nr_mib(0,0,1,kHz30,0,0,0,0,0);
nr_l2_init_ue(); nr_l2_init_ue();
@@ -681,6 +682,10 @@ int main(int argc, char **argv)
UE_mac->scheduled_response.frame = frame; UE_mac->scheduled_response.frame = frame;
UE_mac->scheduled_response.slot = slot; UE_mac->scheduled_response.slot = slot;
UE_mac->phy_config.config_req.pbch_config.system_frame_number = frame;
UE_mac->phy_config.config_req.pbch_config.ssb_index = 0;
UE_mac->phy_config.config_req.pbch_config.half_frame_bit = 0;
for (SNR=snr0; SNR<snr1; SNR+=.2) { for (SNR=snr0; SNR<snr1; SNR+=.2) {
n_errors = 0; n_errors = 0;
@@ -731,7 +736,8 @@ int main(int argc, char **argv)
&UE_proc, &UE_proc,
0, 0,
do_pdcch_flag, do_pdcch_flag,
normal_txrx); normal_txrx,
UE_mac->phy_config.config_req.pbch_config);
if (n_trials==1) { if (n_trials==1) {
LOG_M("rxsigF0.m","rxsF0", UE->common_vars.common_vars_rx_data_per_thread[0].rxdataF[0],slot_length_complex_samples_no_prefix,1,1); LOG_M("rxsigF0.m","rxsF0", UE->common_vars.common_vars_rx_data_per_thread[0].rxdataF[0],slot_length_complex_samples_no_prefix,1,1);