Remove msgTx->ssb and replace with normal array

There is no point in tracking the "active" state: the SSB PDU will be
sent from MAC to L1, encoded, and then "discarded" (by marking the
number of SSB PDUs as 0). Hence, remove this intermediate type.

executables/nr-gnb.c

@@ -362,7 +362,6 @@ void init_gNB_Tpool(int inst)
   processingData_L1tx_t *msgDataTx = (processingData_L1tx_t *)NotifiedFifoData(msgL1Tx);
   memset(msgDataTx, 0, sizeof(processingData_L1tx_t));
   init_DLSCH_struct(gNB, msgDataTx);
-  memset(msgDataTx->ssb, 0, 64 * sizeof(NR_gNB_SSB_t));
   // this will be removed when the msgDataTx is not necessary anymore
   gNB->msgDataTx = msgDataTx;
 

openair1/PHY/defs_gNB.h

@@ -129,11 +129,6 @@ typedef struct {
   uint32_t G;
 } NR_gNB_DLSCH_t;
 
-typedef struct {
-  bool active;
-  nfapi_nr_dl_tti_ssb_pdu ssb_pdu;
-} NR_gNB_SSB_t;
-
 typedef struct {
   uint8_t NumPRSResources;
   prs_config_t prs_cfg[NR_MAX_PRS_RESOURCES_PER_SET];
@@ -604,7 +599,8 @@ typedef struct processingData_L1tx {
   nfapi_nr_dl_tti_pdcch_pdu ul_pdcch_pdu[NFAPI_NR_MAX_NB_CORESETS];
   NR_gNB_CSIRS_t csirs_pdu[NR_SYMBOLS_PER_SLOT];
   NR_gNB_DLSCH_t **dlsch;
-  NR_gNB_SSB_t ssb[64];
+  nfapi_nr_dl_tti_ssb_pdu ssb_pdu[64];
+  int n_ssb_pdu;
   uint16_t num_pdsch_slot;
   int num_dl_pdcch;
   int num_ul_pdcch;

openair1/SCHED_NR/fapi_nr_l1.c

@@ -47,12 +47,7 @@ static void handle_nr_nfapi_ssb_pdu(processingData_L1tx_t *msgTx, int frame, int
   uint8_t i_ssb = dl_tti_pdu->ssb_pdu.ssb_pdu_rel15.SsbBlockIndex;
 
   LOG_D(NR_PHY,"%d.%d : ssb index %d pbch_pdu: %x\n",frame,slot,i_ssb,dl_tti_pdu->ssb_pdu.ssb_pdu_rel15.bchPayload);
-  if (msgTx->ssb[i_ssb].active)
-    AssertFatal(1==0,"SSB PDU with index %d already active\n",i_ssb);
-  else {
-    msgTx->ssb[i_ssb].active = true;
-    memcpy((void*)&msgTx->ssb[i_ssb].ssb_pdu,&dl_tti_pdu->ssb_pdu,sizeof(dl_tti_pdu->ssb_pdu));
-  }
+  msgTx->ssb_pdu[msgTx->n_ssb_pdu++] = dl_tti_pdu->ssb_pdu;
 }
 
 static void handle_nfapi_nr_csirs_pdu(processingData_L1tx_t *msgTx, int frame, int slot, nfapi_nr_dl_tti_csi_rs_pdu *csirs_pdu)

openair1/SCHED_NR/phy_procedures_nr_gNB.c

@@ -243,12 +243,9 @@ void phy_procedures_gNB_TX(processingData_L1tx_t *msgTx,
   }
 
   VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_gNB_COMMON_TX,1);
-  for (int i = 0; i < fp->Lmax; i++) {
-    if (msgTx->ssb[i].active) {
-      nr_common_signal_procedures(gNB, frame, slot, &msgTx->ssb[i].ssb_pdu);
-      msgTx->ssb[i].active = false;
-    }
-  }
+  for (int i = 0; i < msgTx->n_ssb_pdu; i++)
+    nr_common_signal_procedures(gNB, frame, slot, &msgTx->ssb_pdu[i]);
+  msgTx->n_ssb_pdu = 0;
 
   VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_gNB_COMMON_TX,0);
 

openair1/SIMULATION/NR_PHY/dlsim.c

@@ -979,7 +979,6 @@ int main(int argc, char **argv)
   init_DLSCH_struct(gNB, msgDataTx);
   msgDataTx->slot = slot;
   msgDataTx->frame = frame;
-  memset(msgDataTx->ssb, 0, 64*sizeof(NR_gNB_SSB_t));
   gNB->msgDataTx = msgDataTx;
 
   // Buffers to store internal memory of slot process
@@ -1117,8 +1116,8 @@ int main(int argc, char **argv)
           LOG_D(PHY,"[DLSIM] PTRS Symbols in a slot: %2u, RE per Symbol: %3u, RE in a slot %4d\n", ptrsSymbPerSlot, ptrsRePerSymb, ptrsSymbPerSlot * ptrsRePerSymb);
         }
 
-        msgDataTx->ssb[0].ssb_pdu.ssb_pdu_rel15.bchPayload=0x001234;
-        msgDataTx->ssb[0].ssb_pdu.ssb_pdu_rel15.SsbBlockIndex = 0;
+        msgDataTx->ssb_pdu[0].ssb_pdu_rel15.bchPayload = 0x001234;
+        msgDataTx->ssb_pdu[0].ssb_pdu_rel15.SsbBlockIndex = 0;
         msgDataTx->gNB = gNB;
 
         start_meas(&gNB->phy_proc_tx);

openair1/SIMULATION/NR_PHY/pbchsim.c

@@ -530,10 +530,10 @@ int main(int argc, char **argv)
 
         const int sc_offset = frame_parms->freq_range == FR1 ? ssb_subcarrier_offset<<mu : ssb_subcarrier_offset;
         const int prb_offset = frame_parms->freq_range == FR1 ? gNB->gNB_config.ssb_table.ssb_offset_point_a.value<<mu : gNB->gNB_config.ssb_table.ssb_offset_point_a.value << (mu - 2);
-        msgDataTx.ssb[i].ssb_pdu.ssb_pdu_rel15.bchPayload = 0x55dd33;
-        msgDataTx.ssb[i].ssb_pdu.ssb_pdu_rel15.SsbBlockIndex = i;
-        msgDataTx.ssb[i].ssb_pdu.ssb_pdu_rel15.SsbSubcarrierOffset = sc_offset;
-        msgDataTx.ssb[i].ssb_pdu.ssb_pdu_rel15.ssbOffsetPointA = prb_offset;
+        msgDataTx.ssb_pdu[i].ssb_pdu_rel15.bchPayload = 0x55dd33;
+        msgDataTx.ssb_pdu[i].ssb_pdu_rel15.SsbBlockIndex = i;
+        msgDataTx.ssb_pdu[i].ssb_pdu_rel15.SsbSubcarrierOffset = sc_offset;
+        msgDataTx.ssb_pdu[i].ssb_pdu_rel15.ssbOffsetPointA = prb_offset;
 
         start_symbol = nr_get_ssb_start_symbol(frame_parms,i);
         int slot = start_symbol/14;
@@ -541,7 +541,7 @@ int main(int argc, char **argv)
         for (aa=0; aa<gNB->frame_parms.nb_antennas_tx; aa++)
           memset(gNB->common_vars.txdataF[0][aa], 0, frame_parms->samples_per_slot_wCP * sizeof(int32_t));
 
-        nr_common_signal_procedures (gNB,frame,slot, &msgDataTx.ssb[i].ssb_pdu);
+        nr_common_signal_procedures (gNB,frame,slot, &msgDataTx.ssb_pdu[i]);
 
         int samp = frame_parms->get_samples_slot_timestamp(slot, frame_parms, 0);
         for (aa=0; aa<gNB->frame_parms.nb_antennas_tx; aa++) {
@@ -744,7 +744,7 @@ int main(int argc, char **argv)
                                                              gNB->gNB_config.ssb_table.ssb_subcarrier_offset.value,
                                                              frame_parms->Lmax);
           int payload_ret = (result.xtra_byte == xtra_byte);
-          nfapi_nr_dl_tti_ssb_pdu_rel15_t *pdu = &msgDataTx.ssb[ssb_index].ssb_pdu.ssb_pdu_rel15;
+          nfapi_nr_dl_tti_ssb_pdu_rel15_t *pdu = &msgDataTx.ssb_pdu[ssb_index].ssb_pdu_rel15;
           for (int i = 0; i < 3; i++)
             payload_ret += (result.decoded_output[i] == ((pdu->bchPayload >> (8 * i)) & 0xff));
           // printf("ret %d\n", payload_ret);