Skip to content

O
OpenXG-RAN
Commit ef63aa45 authored by rmagueta's avatar rmagueta
Browse files
Options

Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements

parents e628c8c2 a772400f
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 13 deletions
ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml
View file @ ef63aa45
......@@ -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">
......
ci-scripts/xml_files/fr1_nsa_2x2_quectel_attach_detach.xml
View file @ ef63aa45
......@@ -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">
......
ci-scripts/xml_files/fr1_sa_oaiue_b200.xml
View file @ ef63aa45
......@@ -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">
......
ci-scripts/xml_files/fr1_sa_oaiue_n310.xml
View file @ ef63aa45
......@@ -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">
......
ci-scripts/xml_files/fr1_sa_oaiue_x300.xml
View file @ ef63aa45
......@@ -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">
......
ci-scripts/xml_files/fr1_sa_quectel.xml
View file @ ef63aa45
......@@ -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">
......
ci-scripts/xml_files/fr1_sa_quectel_162prb.xml
View file @ ef63aa45
......@@ -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">
......
ci-scripts/xml_files/fr1_sa_quectel_stages.xml
View file @ ef63aa45
......@@ -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">
......
ci-scripts/xml_files/fr1_sa_quectel_stages_162prb.xml
View file @ ef63aa45
......@@ -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">
......
openair1/PHY/INIT/nr_init.c
View file @ ef63aa45
......@@ -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++){
......
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