From 571f488ddb02cf4dfc11c600b083288f00d837fb Mon Sep 17 00:00:00 2001
From: francescomani <email@francescomani.it>
Date: Wed, 30 Nov 2022 10:35:51 +0100
Subject: [PATCH] remove NUMBER_OF_NR_CSIRS_MAX
---
common/openairinterface5g_limits.h | 1 -
openair1/PHY/defs_gNB.h | 2 +-
openair1/SCHED_NR/fapi_nr_l1.c | 6 +++---
openair1/SCHED_NR/phy_procedures_nr_gNB.c | 2 +-
4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/common/openairinterface5g_limits.h b/common/openairinterface5g_limits.h
index 8f3a2b40fd7..ad36fae476d 100644
--- a/common/openairinterface5g_limits.h
+++ b/common/openairinterface5g_limits.h
@@ -13,7 +13,6 @@
# define NUMBER_OF_NR_DLSCH_MAX 8
# define NUMBER_OF_NR_UCI_MAX 16
# define NUMBER_OF_NR_SRS_MAX 16
-# define NUMBER_OF_NR_CSIRS_MAX 16
# define NUMBER_OF_SCH_STATS_MAX 16
# define NUMBER_OF_NR_SCH_STATS_MAX 16
diff --git a/openair1/PHY/defs_gNB.h b/openair1/PHY/defs_gNB.h
index 73cad1fc87f..b21f3c11927 100644
--- a/openair1/PHY/defs_gNB.h
+++ b/openair1/PHY/defs_gNB.h
@@ -828,7 +828,7 @@ typedef struct processingData_L1tx {
PHY_VARS_gNB *gNB;
nfapi_nr_dl_tti_pdcch_pdu pdcch_pdu[NFAPI_NR_MAX_NB_CORESETS];
nfapi_nr_ul_dci_request_pdus_t ul_pdcch_pdu[NFAPI_NR_MAX_NB_CORESETS];
- NR_gNB_CSIRS_t csirs_pdu[NUMBER_OF_NR_CSIRS_MAX];
+ NR_gNB_CSIRS_t csirs_pdu[NR_SYMBOLS_PER_SLOT];
NR_gNB_DLSCH_t *dlsch[NUMBER_OF_NR_DLSCH_MAX][2];
NR_gNB_SSB_t ssb[64];
uint16_t num_pdsch_slot;
diff --git a/openair1/SCHED_NR/fapi_nr_l1.c b/openair1/SCHED_NR/fapi_nr_l1.c
index 49e6edd54e6..c6b6f691266 100644
--- a/openair1/SCHED_NR/fapi_nr_l1.c
+++ b/openair1/SCHED_NR/fapi_nr_l1.c
@@ -102,12 +102,12 @@ void handle_nr_nfapi_ssb_pdu(processingData_L1tx_t *msgTx,int frame,int slot,
void handle_nfapi_nr_csirs_pdu(processingData_L1tx_t *msgTx,
- int frame,int slot,
- nfapi_nr_dl_tti_csi_rs_pdu *csirs_pdu) {
+ int frame,int slot,
+ nfapi_nr_dl_tti_csi_rs_pdu *csirs_pdu) {
int found = 0;
- for (int id=0; id<NUMBER_OF_NR_CSIRS_MAX; id++) {
+ for (int id = 0; id < NR_SYMBOLS_PER_SLOT; id++) {
NR_gNB_CSIRS_t *csirs = &msgTx->csirs_pdu[id];
if (csirs->active == 0) {
LOG_D(PHY,"Frame %d Slot %d CSI_RS with ID %d is now active\n",frame,slot,id);
diff --git a/openair1/SCHED_NR/phy_procedures_nr_gNB.c b/openair1/SCHED_NR/phy_procedures_nr_gNB.c
index d53eed2c1ef..bed81d2f7ce 100644
--- a/openair1/SCHED_NR/phy_procedures_nr_gNB.c
+++ b/openair1/SCHED_NR/phy_procedures_nr_gNB.c
@@ -184,7 +184,7 @@ void phy_procedures_gNB_TX(processingData_L1tx_t *msgTx,
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_GENERATE_DLSCH,0);
}
- for (int i=0;i<NUMBER_OF_NR_CSIRS_MAX;i++){
+ for (int i = 0; i < NR_SYMBOLS_PER_SLOT; i++){
NR_gNB_CSIRS_t *csirs = &msgTx->csirs_pdu[i];
if (csirs->active == 1) {
LOG_D(PHY, "CSI-RS generation started in frame %d.%d\n",frame,slot);
--
GitLab