fixeria
/
srsRAN
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix compilation issue with GCC 8.x using complex numbers.

This commit is contained in:
Pedro Alvarez 2019-03-13 10:53:33 +00:00 committed by Andre Puschmann
parent 3702a6660e
commit aa3a2a3dba
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
srsenb/src/phy/phch_worker.cc
View File

@ -1104,7 +1104,7 @@ int phch_worker::read_ce_abs(float *ce_abs) {
bzero(ce_abs, sizeof(float)*sz);
int g = (sz - 12*phy->cell.nof_prb)/2;
for (i = 0; i < 12*phy->cell.nof_prb; i++) {
ce_abs[g+i] = 20 * log10(cabs(enb_ul.ce[i]));
ce_abs[g+i] = 20 * log10(std::abs(std::complex<double>(enb_ul.ce[i])));
if (std::isinf(ce_abs[g + i])) {
ce_abs[g+i] = -80;
}
@ -1118,7 +1118,7 @@ int phch_worker::read_ce_arg(float *ce_arg) {
bzero(ce_arg, sizeof(float)*sz);
int g = (sz - 12*phy->cell.nof_prb)/2;
for (i = 0; i < 12*phy->cell.nof_prb; i++) {
ce_arg[g+i] = cargf(enb_ul.ce[i]) * 180.0f / (float) M_PI;
ce_arg[g+i] = std::arg(std::complex<float>(enb_ul.ce[i])) * 180.0f / (float) M_PI;
if (std::isinf(ce_arg[g + i])) {
ce_arg[g+i] = -80;
}

2
srsue/src/phy/phch_worker.cc
View File

@ -1590,7 +1590,7 @@ int phch_worker::read_ce_abs(float *ce_abs, uint32_t tx_antenna, uint32_t rx_ant
bzero(ce_abs, sizeof(float)*sz);
int g = (sz - 12*cell.nof_prb)/2;
for (i = 0; i < 12*cell.nof_prb; i++) {
ce_abs[g+i] = 20 * log10f(cabsf(ue_dl.ce_m[tx_antenna][rx_antenna][i]));
ce_abs[g+i] = 20 * log10f(std::abs(std::complex<float>(ue_dl.ce_m[tx_antenna][rx_antenna][i])));
if (std::isinf(ce_abs[g + i])) {
ce_abs[g+i] = -80;
}