maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove some unnecessary use of NB_ANTENNAS_RX at UE

Browse Source
This commit is contained in:
francescomani
2026-02-27 10:17:05 +01:00
parent 46b7670672
commit dea42f7e4a
3 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
executables/nr-ue.c
+1 -1
View File
@@ -726,7 +726,6 @@ void *UE_thread(void *arg)
PHY_VARS_NR_UE *UE = (PHY_VARS_NR_UE *)arg; PHY_VARS_NR_UE *UE = (PHY_VARS_NR_UE *)arg;
const NR_DL_FRAME_PARMS *fp = &UE->frame_parms; const NR_DL_FRAME_PARMS *fp = &UE->frame_parms;
// int tx_enabled = 0; // int tx_enabled = 0;
c16_t *rxp[fp->nb_antennas_rx];
enum stream_status_e stream_status = STREAM_STATUS_UNSYNC; enum stream_status_e stream_status = STREAM_STATUS_UNSYNC;
fapi_nr_config_request_t *cfg = &UE->nrUE_config; fapi_nr_config_request_t *cfg = &UE->nrUE_config;
sl_nr_phy_config_request_t *sl_cfg = NULL; sl_nr_phy_config_request_t *sl_cfg = NULL;
@@ -780,6 +779,7 @@ void *UE_thread(void *arg)
readFrame(UE, &tmp, duration_rx_to_tx, true); readFrame(UE, &tmp, duration_rx_to_tx, true);
} }
c16_t *rxp[fp->nb_antennas_rx];
while (!oai_exit) { while (!oai_exit) {
if (syncRunning) { if (syncRunning) {
notifiedFIFO_elt_t *res = pollNotifiedFIFO(&nf); notifiedFIFO_elt_t *res = pollNotifiedFIFO(&nf);
openair1/PHY/NR_UE_ESTIMATION/nr_estimation.h
+1 -1
View File
@@ -122,7 +122,7 @@ void nr_ue_ssb_rsrp_measurements(PHY_VARS_NR_UE *ue,
typedef struct { typedef struct {
UE_nr_rxtx_proc_t proc; UE_nr_rxtx_proc_t proc;
PHY_VARS_NR_UE *ue; PHY_VARS_NR_UE *ue;
c16_t *rxdata[NB_ANTENNAS_RX]; c16_t **rxdata;
uint32_t rxdata_size; uint32_t rxdata_size;
c16_t rxdata_ant[]; c16_t rxdata_ant[];
} nr_meas_task_args_t; } nr_meas_task_args_t;
openair1/PHY/NR_UE_TRANSPORT/sss_nr.c
+14 -15
View File
@@ -189,8 +189,8 @@ void insert_sss_nr(int16_t *sss_time,
static int pss_ch_est_nr(const NR_DL_FRAME_PARMS *frame_parms, static int pss_ch_est_nr(const NR_DL_FRAME_PARMS *frame_parms,
int nid2, int nid2,
c16_t pss_ext[NB_ANTENNAS_RX][LENGTH_PSS_NR], c16_t pss_ext[frame_parms->nb_antennas_rx][LENGTH_PSS_NR],
c16_t sss_ext[NB_ANTENNAS_RX][LENGTH_SSS_NR]) c16_t sss_ext[frame_parms->nb_antennas_rx][LENGTH_SSS_NR])
{ {
int16_t *pss = get_primary_synchro_nr2(nid2); int16_t *pss = get_primary_synchro_nr2(nid2);
@@ -250,15 +250,14 @@ static int pss_ch_est_nr(const NR_DL_FRAME_PARMS *frame_parms,
* *
*********************************************************************/ *********************************************************************/
static int do_pss_sss_extract_nr( static int do_pss_sss_extract_nr(const NR_DL_FRAME_PARMS *frame_parms,
const NR_DL_FRAME_PARMS *frame_parms, c16_t pss_ext[frame_parms->nb_antennas_rx][LENGTH_PSS_NR],
c16_t pss_ext[NB_ANTENNAS_RX][LENGTH_PSS_NR], c16_t sss_ext[frame_parms->nb_antennas_rx][LENGTH_SSS_NR],
c16_t sss_ext[NB_ANTENNAS_RX][LENGTH_SSS_NR], uint8_t doPss,
uint8_t doPss, uint8_t doSss,
uint8_t doSss, uint8_t subframe,
uint8_t subframe, int ssb_start_subcarrier,
int ssb_start_subcarrier, c16_t rxdataF[][frame_parms->samples_per_slot_wCP]) // add flag to indicate extracting only PSS, only SSS, or both
c16_t rxdataF[][frame_parms->samples_per_slot_wCP]) // add flag to indicate extracting only PSS, only SSS, or both
{ {
AssertFatal(frame_parms->nb_antennas_rx > 0, "UB as sss_ext is not set to any value\n"); AssertFatal(frame_parms->nb_antennas_rx > 0, "UB as sss_ext is not set to any value\n");
@@ -331,8 +330,8 @@ static int do_pss_sss_extract_nr(
*********************************************************************/ *********************************************************************/
static int pss_sss_extract_nr(const NR_DL_FRAME_PARMS *frame_parms, static int pss_sss_extract_nr(const NR_DL_FRAME_PARMS *frame_parms,
c16_t pss_ext[NB_ANTENNAS_RX][LENGTH_PSS_NR], c16_t pss_ext[frame_parms->nb_antennas_rx][LENGTH_PSS_NR],
c16_t sss_ext[NB_ANTENNAS_RX][LENGTH_SSS_NR], c16_t sss_ext[frame_parms->nb_antennas_rx][LENGTH_SSS_NR],
uint8_t subframe, uint8_t subframe,
int ssb_start_subcarrier, int ssb_start_subcarrier,
c16_t rxdataF[][frame_parms->samples_per_slot_wCP]) c16_t rxdataF[][frame_parms->samples_per_slot_wCP])
@@ -371,8 +370,8 @@ bool rx_sss_nr(const NR_DL_FRAME_PARMS *frame_parms,
c16_t rxdataF[][frame_parms->samples_per_slot_wCP]) c16_t rxdataF[][frame_parms->samples_per_slot_wCP])
{ {
uint8_t i; uint8_t i;
c16_t pss_ext[NB_ANTENNAS_RX][LENGTH_PSS_NR] = {0}; c16_t pss_ext[frame_parms->nb_antennas_rx][LENGTH_PSS_NR];
c16_t sss_ext[NB_ANTENNAS_RX][LENGTH_SSS_NR] = {0}; c16_t sss_ext[frame_parms->nb_antennas_rx][LENGTH_SSS_NR];
uint8_t Nid2 = GET_NID2(nid2); uint8_t Nid2 = GET_NID2(nid2);
uint16_t Nid1; uint16_t Nid1;
uint8_t phase; uint8_t phase;