diff --git a/ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml b/ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml index 5dbd36f00d323af2240bb675acfb251827b020f5..56694920ba593fbc6d048c7169e8df00c2940893 100644 --- a/ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml +++ b/ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml @@ -81,7 +81,7 @@ <air_interface>nr</air_interface> <eNB_Stats>yes</eNB_Stats> <rt_stats_cfg>datalog_rt_stats.2x2.yaml</rt_stats_cfg> - <USRP_IPAddress>192.168.18.240</USRP_IPAddress> + <USRP_IPAddress>192.168.18.252</USRP_IPAddress> </testCase> <testCase id="000001"> diff --git a/ci-scripts/xml_files/fr1_nsa_2x2_quectel_attach_detach.xml b/ci-scripts/xml_files/fr1_nsa_2x2_quectel_attach_detach.xml index 02544f273baae039405add42c5d89ef67c07cf8c..840521481e82fa69d058b59ed830eeec1dd77f93 100644 --- a/ci-scripts/xml_files/fr1_nsa_2x2_quectel_attach_detach.xml +++ b/ci-scripts/xml_files/fr1_nsa_2x2_quectel_attach_detach.xml @@ -100,7 +100,7 @@ <air_interface>nr</air_interface> <eNB_Stats>yes</eNB_Stats> <rt_stats_cfg>datalog_rt_stats.2x2.yaml</rt_stats_cfg> - <USRP_IPAddress>192.168.18.240</USRP_IPAddress> + <USRP_IPAddress>192.168.18.252</USRP_IPAddress> </testCase> <testCase id="000001"> diff --git a/ci-scripts/xml_files/fr1_sa_oaiue_b200.xml b/ci-scripts/xml_files/fr1_sa_oaiue_b200.xml index 774d5751c5949fc468cb660dbbbd6fb530555827..55268b909d7451a55345acd44bbfbb157d86d5b0 100644 --- a/ci-scripts/xml_files/fr1_sa_oaiue_b200.xml +++ b/ci-scripts/xml_files/fr1_sa_oaiue_b200.xml @@ -60,7 +60,7 @@ <air_interface>nr</air_interface> <eNB_Trace>yes</eNB_Trace> <eNB_Stats>yes</eNB_Stats> - <USRP_IPAddress>192.168.18.240</USRP_IPAddress> + <USRP_IPAddress>192.168.18.252</USRP_IPAddress> </testCase> <testCase id="000001"> diff --git a/ci-scripts/xml_files/fr1_sa_oaiue_n310.xml b/ci-scripts/xml_files/fr1_sa_oaiue_n310.xml index bfa2208d3dc426cc60edf8cebda52a7f3baf0ead..53b696c6eb0fffbd8c198bfefedd445d12297bd8 100644 --- a/ci-scripts/xml_files/fr1_sa_oaiue_n310.xml +++ b/ci-scripts/xml_files/fr1_sa_oaiue_n310.xml @@ -60,7 +60,7 @@ <air_interface>nr</air_interface> <eNB_Trace>yes</eNB_Trace> <eNB_Stats>yes</eNB_Stats> - <USRP_IPAddress>192.168.18.240</USRP_IPAddress> + <USRP_IPAddress>192.168.18.252</USRP_IPAddress> </testCase> <testCase id="000001"> diff --git a/ci-scripts/xml_files/fr1_sa_oaiue_x300.xml b/ci-scripts/xml_files/fr1_sa_oaiue_x300.xml index c43bdd2a7c932197bf6a91e4a7a4e6b2105281f2..8c2f7052e4eb52101575ba8646345d59f16f6f76 100644 --- a/ci-scripts/xml_files/fr1_sa_oaiue_x300.xml +++ b/ci-scripts/xml_files/fr1_sa_oaiue_x300.xml @@ -60,7 +60,7 @@ <air_interface>nr</air_interface> <eNB_Trace>yes</eNB_Trace> <eNB_Stats>yes</eNB_Stats> - <USRP_IPAddress>192.168.18.240</USRP_IPAddress> + <USRP_IPAddress>192.168.18.252</USRP_IPAddress> </testCase> <testCase id="000001"> diff --git a/ci-scripts/xml_files/fr1_sa_quectel.xml b/ci-scripts/xml_files/fr1_sa_quectel.xml index 8d15015c0747e4c84d46dcc7322421f7c0d2b080..576456ebc96959cd3e9e4284c84e02ecce1d1685 100644 --- a/ci-scripts/xml_files/fr1_sa_quectel.xml +++ b/ci-scripts/xml_files/fr1_sa_quectel.xml @@ -70,7 +70,7 @@ <eNB_Trace>yes</eNB_Trace> <eNB_Stats>yes</eNB_Stats> <rt_stats_cfg>datalog_rt_stats.2x2.yaml</rt_stats_cfg> - <USRP_IPAddress>192.168.18.240</USRP_IPAddress> + <USRP_IPAddress>192.168.18.252</USRP_IPAddress> </testCase> <testCase id="000001"> diff --git a/ci-scripts/xml_files/fr1_sa_quectel_162prb.xml b/ci-scripts/xml_files/fr1_sa_quectel_162prb.xml index f756083ea6668bf28e64b1fc9d6c357b1410cc29..c5f2ddad5f479a4691330392499fdb1d7226838d 100644 --- a/ci-scripts/xml_files/fr1_sa_quectel_162prb.xml +++ b/ci-scripts/xml_files/fr1_sa_quectel_162prb.xml @@ -68,7 +68,7 @@ <eNB_Trace>yes</eNB_Trace> <eNB_Stats>yes</eNB_Stats> <rt_stats_cfg>datalog_rt_stats.2x2.yaml</rt_stats_cfg> - <USRP_IPAddress>192.168.18.240</USRP_IPAddress> + <USRP_IPAddress>192.168.18.252</USRP_IPAddress> </testCase> <testCase id="000001"> diff --git a/ci-scripts/xml_files/fr1_sa_quectel_stages.xml b/ci-scripts/xml_files/fr1_sa_quectel_stages.xml index 0ab8bf6b0845f4a67f37196c84a61ca24ebc2483..2707fd4ebff998441de2c9a23d42458976fdcd05 100644 --- a/ci-scripts/xml_files/fr1_sa_quectel_stages.xml +++ b/ci-scripts/xml_files/fr1_sa_quectel_stages.xml @@ -74,7 +74,7 @@ <eNB_Trace>yes</eNB_Trace> <eNB_Stats>yes</eNB_Stats> <rt_stats_cfg>datalog_rt_stats.2x2.yaml</rt_stats_cfg> - <USRP_IPAddress>192.168.18.240</USRP_IPAddress> + <USRP_IPAddress>192.168.18.252</USRP_IPAddress> </testCase> <testCase id="000001"> diff --git a/ci-scripts/xml_files/fr1_sa_quectel_stages_162prb.xml b/ci-scripts/xml_files/fr1_sa_quectel_stages_162prb.xml index 5feed7558657b039d75c1d16ca8b3f9ffce85d40..661bcb32fe0c5112cb437921dce8c79b38ec6cc0 100644 --- a/ci-scripts/xml_files/fr1_sa_quectel_stages_162prb.xml +++ b/ci-scripts/xml_files/fr1_sa_quectel_stages_162prb.xml @@ -74,7 +74,7 @@ <eNB_Trace>yes</eNB_Trace> <eNB_Stats>yes</eNB_Stats> <rt_stats_cfg>datalog_rt_stats.2x2.yaml</rt_stats_cfg> - <USRP_IPAddress>192.168.18.240</USRP_IPAddress> + <USRP_IPAddress>192.168.18.252</USRP_IPAddress> </testCase> <testCase id="000001"> diff --git a/openair1/PHY/INIT/nr_init.c b/openair1/PHY/INIT/nr_init.c index 06b0016140f381fbc1528a0b494609c31c5bbb47..26f25cec6c1873e14c68f9575b95667af3073070 100644 --- a/openair1/PHY/INIT/nr_init.c +++ b/openair1/PHY/INIT/nr_init.c @@ -758,13 +758,14 @@ void phy_free_nr_gNB(PHY_VARS_gNB *gNB) } free_and_zero(pusch_dmrs); - uint32_t ***csi_rs = gNB->nr_csi_rs_info->nr_gold_csi_rs; + uint32_t ***nr_gold_csi_rs = gNB->nr_csi_rs_info->nr_gold_csi_rs; for (int slot = 0; slot < fp->slots_per_frame; slot++) { for (int symb = 0; symb < fp->symbols_per_slot; symb++) - free_and_zero(csi_rs[slot][symb]); - free_and_zero(csi_rs[slot]); + free_and_zero(nr_gold_csi_rs[slot][symb]); + free_and_zero(nr_gold_csi_rs[slot]); } - free_and_zero(csi_rs); + free_and_zero(nr_gold_csi_rs); + free_and_zero(gNB->nr_csi_rs_info); for (int id = 0; id < NUMBER_OF_NR_SRS_MAX; id++) { for (int i = 0; i < Prx; i++){