Skip to content

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

scope compilation fixes

parent 0d664103
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 16 deletions
openair1/PHY/TOOLS/nr_phy_qt_scope.cpp
View file @ d664190f
...@@ -697,7 +697,7 @@ void PainterWidgetGnb::makeConnections(int type) ...@@ -697,7 +697,7 @@ void PainterWidgetGnb::makeConnections(int type)
break; break;
} }
case PlotTypeGnb::CIR: { case PlotTypeGnb::CIR: {
newChart = new CIRPlot((complex16 *)p->gNB->pusch_vars[0]->ul_ch_estimates_time[0], frame_parms->ofdm_symbol_size); newChart = new CIRPlot((complex16 *)p->gNB->pusch_vars[0].ul_ch_estimates_time[0], frame_parms->ofdm_symbol_size);
break; break;
} }
...@@ -705,12 +705,12 @@ void PainterWidgetGnb::makeConnections(int type) ...@@ -705,12 +705,12 @@ void PainterWidgetGnb::makeConnections(int type)
int num_re = frame_parms->N_RB_UL * 12 * frame_parms->symbols_per_slot; int num_re = frame_parms->N_RB_UL * 12 * frame_parms->symbols_per_slot;
int Qm = 2; int Qm = 2;
int coded_bits_per_codeword = num_re * Qm; int coded_bits_per_codeword = num_re * Qm;
newChart = new LLRPlot((int16_t *)p->gNB->pusch_vars[0]->llr, coded_bits_per_codeword); newChart = new LLRPlot((int16_t *)p->gNB->pusch_vars[0].llr, coded_bits_per_codeword);
break; break;
} }
case PlotTypeGnb::puschIQ: { case PlotTypeGnb::puschIQ: {
int num_re = frame_parms->N_RB_UL * 12 * frame_parms->symbols_per_slot; int num_re = frame_parms->N_RB_UL * 12 * frame_parms->symbols_per_slot;
newChart = new IQPlot((complex16 *)p->gNB->pusch_vars[0]->rxdataF_comp[0], num_re); newChart = new IQPlot((complex16 *)p->gNB->pusch_vars[0].rxdataF_comp[0], num_re);
break; break;
} }
case PlotTypeGnb::puschSNR: { case PlotTypeGnb::puschSNR: {
......
openair1/PHY/TOOLS/nr_phy_scope.c
View file @ d664190f
...@@ -473,10 +473,10 @@ static void timeResponse (OAIgraph_t *graph, scopeData_t *p, int nb_UEs) { ...@@ -473,10 +473,10 @@ static void timeResponse (OAIgraph_t *graph, scopeData_t *p, int nb_UEs) {
int uestart = 0; // xforms scope designed to display nb_UEs signals int uestart = 0; // xforms scope designed to display nb_UEs signals
#endif #endif
for (int ue = uestart; ue < nb_UEs; ue++) { for (int ue = uestart; ue < nb_UEs; ue++) {
if ( p->gNB->pusch_vars && p->gNB->pusch_vars[ue] && if (p->gNB->pusch_vars &&
p->gNB->pusch_vars[ue]->ul_ch_estimates_time && p->gNB->pusch_vars[ue].ul_ch_estimates_time &&
p->gNB->pusch_vars[ue]->ul_ch_estimates_time[ant] ) { p->gNB->pusch_vars[ue].ul_ch_estimates_time[ant] ) {
scopeSample_t *data= (scopeSample_t *)p->gNB->pusch_vars[ue]->ul_ch_estimates_time[ant]; scopeSample_t *data= (scopeSample_t *)p->gNB->pusch_vars[ue].ul_ch_estimates_time[ant];
if (data != NULL) { if (data != NULL) {
for (int i=0; i<len; i++) { for (int i=0; i<len; i++) {
...@@ -527,10 +527,9 @@ static void puschLLR (OAIgraph_t *graph, scopeData_t *p, int nb_UEs) { ...@@ -527,10 +527,9 @@ static void puschLLR (OAIgraph_t *graph, scopeData_t *p, int nb_UEs) {
int coded_bits_per_codeword = num_re*Qm; int coded_bits_per_codeword = num_re*Qm;
for (int ue = uestart; ue < nb_UEs; ue++) { for (int ue = uestart; ue < nb_UEs; ue++) {
if ( p->gNB->pusch_vars && if (p->gNB->pusch_vars &&
p->gNB->pusch_vars[ue] && p->gNB->pusch_vars[ue].llr ) {
p->gNB->pusch_vars[ue]->llr ) { int16_t *pusch_llr = (int16_t *)p->gNB->pusch_vars[ue].llr;
int16_t *pusch_llr = (int16_t *)p->gNB->pusch_vars[ue]->llr;
float *llr=NULL, *bit=NULL; float *llr=NULL, *bit=NULL;
int nx = coded_bits_per_codeword; int nx = coded_bits_per_codeword;
#ifdef WEBSRVSCOPE #ifdef WEBSRVSCOPE
...@@ -557,11 +556,10 @@ static void puschIQ (OAIgraph_t *graph, scopeData_t *p, int nb_UEs) { ...@@ -557,11 +556,10 @@ static void puschIQ (OAIgraph_t *graph, scopeData_t *p, int nb_UEs) {
int uestart = 0; // xforms scope designed to display nb_UEs signals int uestart = 0; // xforms scope designed to display nb_UEs signals
#endif #endif
for (int ue = uestart; ue < nb_UEs; ue++) { for (int ue = uestart; ue < nb_UEs; ue++) {
if ( p->gNB->pusch_vars && if (p->gNB->pusch_vars &&
p->gNB->pusch_vars[ue] && p->gNB->pusch_vars[ue].rxdataF_comp &&
p->gNB->pusch_vars[ue]->rxdataF_comp && p->gNB->pusch_vars[ue].rxdataF_comp[0] ) {
p->gNB->pusch_vars[ue]->rxdataF_comp[0] ) { scopeSample_t *pusch_comp = (scopeSample_t *)p->gNB->pusch_vars[ue].rxdataF_comp[0];
scopeSample_t *pusch_comp = (scopeSample_t *)p->gNB->pusch_vars[ue]->rxdataF_comp[0];
float *I=NULL, *Q=NULL; float *I=NULL, *Q=NULL;
#ifdef WEBSRVSCOPE #ifdef WEBSRVSCOPE
newsz = websrv_cpiqbuff_tomsg(graph, pusch_comp, sz, 0, 0); newsz = websrv_cpiqbuff_tomsg(graph, pusch_comp, sz, 0, 0);
......
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