From 838b284aa41e97662dd36488c160e16abcec34b6 Mon Sep 17 00:00:00 2001 From: Laurent THOMAS Date: Tue, 10 Oct 2023 15:45:21 +0200 Subject: [PATCH] remove-global-rx_spatial_power_in_gnb --- openair1/PHY/NR_ESTIMATION/nr_measurements_gNB.c | 4 +--- openair1/PHY/defs_gNB.h | 4 ---- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/openair1/PHY/NR_ESTIMATION/nr_measurements_gNB.c b/openair1/PHY/NR_ESTIMATION/nr_measurements_gNB.c index 5158a31b93..260677890f 100644 --- a/openair1/PHY/NR_ESTIMATION/nr_measurements_gNB.c +++ b/openair1/PHY/NR_ESTIMATION/nr_measurements_gNB.c @@ -216,8 +216,7 @@ void nr_gnb_measurements(PHY_VARS_gNB *gNB, ulsch_measurements_gNB *ulsch_measurements = &ulsch->ulsch_measurements; int rx_power[fp->nb_antennas_rx]; - allocCast2D(rx_spatial_power, int, ulsch_measurements->rx_spatial_power, nrOfLayers, fp->nb_antennas_rx, true); - allocCast2D(rx_spatial_power_dB, unsigned short, ulsch_measurements->rx_spatial_power_dB, nrOfLayers, fp->nb_antennas_rx, true); + int rx_spatial_power[nrOfLayers][fp->nb_antennas_rx]; for (int aarx = 0; aarx < fp->nb_antennas_rx; aarx++){ rx_power[aarx] = 0; @@ -230,7 +229,6 @@ void nr_gnb_measurements(PHY_VARS_gNB *gNB, rx_spatial_power[aatx][aarx] = 0; } - rx_spatial_power_dB[aatx][aarx] = (unsigned short)dB_fixed(rx_spatial_power[aatx][aarx]); rx_power[aarx] += rx_spatial_power[aatx][aarx]; } LOG_D(PHY, "[RNTI %04x] RX power in antenna %d = %d\n", ulsch->rnti, aarx, rx_power[aarx]); diff --git a/openair1/PHY/defs_gNB.h b/openair1/PHY/defs_gNB.h index ae2ce9d0a7..e4b7180186 100644 --- a/openair1/PHY/defs_gNB.h +++ b/openair1/PHY/defs_gNB.h @@ -237,10 +237,6 @@ static inline int crcType(int nbSeg, int len) } typedef struct { - //! estimated received spatial signal power (linear) - fourDimArray_t * rx_spatial_power; - //! estimated received spatial signal power (dB) - fourDimArray_t * rx_spatial_power_dB; //! estimated rssi (dBm) int rx_rssi_dBm; //! estimated correlation (wideband linear) between spatial channels (computed in dlsch_demodulation)