nr_fill_rx_indication() increments itself, remove full memset for the related...

nr_fill_rx_indication() increments itself, remove full memset for the related struct (100 elements, one used)
Signed-off-by: Laurent THOMAS <laurent.thomas@open-cells.com>

nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_interface.h

@@ -155,8 +155,6 @@ typedef struct {
 ///
 #define NFAPI_RX_IND_MAX_PDU 100
 typedef struct {
-  uint16_t sfn;
-  uint16_t slot;
   uint16_t number_pdus;
   fapi_nr_rx_indication_body_t rx_indication_body[NFAPI_RX_IND_MAX_PDU];
 } fapi_nr_rx_indication_t;

openair1/PHY/NR_UE_ESTIMATION/nr_ue_measurements.c

@@ -162,7 +162,9 @@ static void send_ssb_rsrp_meas(PHY_VARS_NR_UE *ue,
       .sinr_dB = sinr_dB,
   };
 
-  fapi_nr_rx_indication_t rx_ind = {0};
+  fapi_nr_rx_indication_t rx_ind;
+  rx_ind.number_pdus = 0;
+  nr_fill_rx_indication(&rx_ind, FAPI_NR_MEAS_IND, ue, 0, 0, NULL, proc, &l1_measurements);
   nr_downlink_indication_t dl_indication = (nr_downlink_indication_t){.gNB_index = proc->gNB_id,
                                                                       .module_id = ue->Mod_id,
                                                                       .cc_id = ue->CC_id,
@@ -170,7 +172,6 @@ static void send_ssb_rsrp_meas(PHY_VARS_NR_UE *ue,
                                                                       .frame = proc->frame_rx,
                                                                       .slot = proc->nr_slot_rx,
                                                                       .rx_ind = &rx_ind};
-  nr_fill_rx_indication(&rx_ind, FAPI_NR_MEAS_IND, ue, 0, 0, NULL, proc, &l1_measurements);
   ue->if_inst->dl_indication(&dl_indication);
 }
 

openair1/PHY/NR_UE_TRANSPORT/csi_rx.c

@@ -1050,7 +1050,8 @@ void nr_ue_csi_rs_procedures(PHY_VARS_NR_UE *ue,
       .cqi = cqi,
       .radiolink_monitoring = RLM_no_monitoring, // TODO do be activated in case of RLM based on CSI-RS
   };
-  fapi_nr_rx_indication_t rx_ind = {0};
+  fapi_nr_rx_indication_t rx_ind;
+  rx_ind.number_pdus = 0;
   nr_fill_rx_indication(&rx_ind, FAPI_NR_MEAS_IND, ue, 0, 0, NULL, proc, (void *)&l1_measurements);
   nr_downlink_indication_t dl_indication = (nr_downlink_indication_t){
       .gNB_index = proc->gNB_id,

openair1/PHY/NR_UE_TRANSPORT/nr_initial_sync.c

@@ -453,7 +453,8 @@ nr_initial_sync_t nr_initial_sync(UE_nr_rxtx_proc_t *proc,
 
   // In initial sync, we indicate PBCH to MAC after the scan is complete.
   if (ue->if_inst && ue->if_inst->dl_indication) {
-    fapi_nr_rx_indication_t rx_ind = {0};
+    fapi_nr_rx_indication_t rx_ind;
+    rx_ind.number_pdus = 0;
     nr_fill_rx_indication(&rx_ind, FAPI_NR_RX_PDU_TYPE_SSB, ue, 0, 0, NULL, proc, res ? (void *)&res->pbchResult : NULL);
     nr_downlink_indication_t dl_indication = (nr_downlink_indication_t){
         .gNB_index = proc->gNB_id,

openair1/PHY/NR_UE_TRANSPORT/nr_pbch.c

@@ -400,7 +400,8 @@ int nr_pbch_decode(PHY_VARS_NR_UE *ue,
 
   if (decoderState) {
     if (ue && ue->if_inst && ue->if_inst->dl_indication) { // decoding failed in synced state
-      fapi_nr_rx_indication_t rx_ind = {0};
+      fapi_nr_rx_indication_t rx_ind;
+      rx_ind.number_pdus = 0;
       nr_fill_rx_indication(&rx_ind, FAPI_NR_RX_PDU_TYPE_SSB, ue, 0, 0, NULL, proc, NULL);
       nr_downlink_indication_t dl_indication = (nr_downlink_indication_t){.gNB_index = proc->gNB_id,
                                                                           .module_id = ue->Mod_id,
@@ -466,7 +467,8 @@ int nr_pbch_decode(PHY_VARS_NR_UE *ue,
 #endif
 
   if (ue && ue->if_inst && ue->if_inst->dl_indication) {
-    fapi_nr_rx_indication_t rx_ind = {0};
+    fapi_nr_rx_indication_t rx_ind;
+    rx_ind.number_pdus = 0;
     nr_fill_rx_indication(&rx_ind, FAPI_NR_RX_PDU_TYPE_SSB, ue, 0, 0, NULL, proc, (void *)result);
     nr_downlink_indication_t dl_indication = (nr_downlink_indication_t){
         .gNB_index = proc->gNB_id,

openair1/SCHED_NR_UE/phy_procedures_nr_ue.c

@@ -70,7 +70,7 @@ void nr_fill_rx_indication(fapi_nr_rx_indication_t *rx_ind,
   AssertFatal(rx_ind->number_pdus < NFAPI_RX_IND_MAX_PDU - 1, "Exceeded rx_ind array size\n");
   fapi_nr_rx_indication_body_t *rx = rx_ind->rx_indication_body + rx_ind->number_pdus;
   rx_ind->number_pdus++;
-  rx->pdu_type = pdu_type;
+  *rx = (fapi_nr_rx_indication_body_t){.pdu_type = pdu_type};
   switch (pdu_type){
     case FAPI_NR_RX_PDU_TYPE_SIB:
     case FAPI_NR_RX_PDU_TYPE_RAR:
@@ -724,7 +724,8 @@ static void nr_ue_dlsch_procedures(PHY_VARS_NR_UE *ue,
 
   // send to mac
   if (ue->if_inst && ue->if_inst->dl_indication) {
-    fapi_nr_rx_indication_t rx_ind = {0};
+    fapi_nr_rx_indication_t rx_ind;
+    rx_ind.number_pdus = 0;
     nr_fill_rx_indication(&rx_ind, ind_type, ue, cw_idx, harq_pid, dlsch, proc, dl_harq->b);
     nr_downlink_indication_t dl_indication = (nr_downlink_indication_t){
         .gNB_index = proc->gNB_id,