pdcch_dmrs malloc fix

openair1/PHY/INIT/nr_init.c

@@ -121,8 +121,11 @@ int phy_init_nr_gNB(PHY_VARS_gNB *gNB,
   nr_polar_init(&fp->pbch_polar_params, 1);
   //PDCCH DMRS init
   pdcch_dmrs = (uint32_t ***)malloc16(fp->slots_per_frame*sizeof(uint32_t**));
-  for (int slot=0; slot<fp->slots_per_frame; slot++)
+  for (int slot=0; slot<fp->slots_per_frame; slot++) {
     pdcch_dmrs[slot] = (uint32_t **)malloc16(fp->symbols_per_slot);
+    for (int symb=0; symb<fp->symbols_per_slot; symb++)
+      pdcch_dmrs[slot][symb] = (uint32_t *)malloc16(NR_MAX_PDCCH_DMRS_LENGTH_DWORD);
+  }
 
   nr_init_pdcch_dmrs(gNB, cfg->sch_config.physical_cell_id.value);
 
@@ -278,7 +281,6 @@ void phy_free_nr_gNB(PHY_VARS_gNB *gNB)
 {
 //  NR_DL_FRAME_PARMS* const fp       = &gNB->frame_parms;
   nfapi_config_request_t *cfg       = &gNB->gNB_config;
-  NR_DL_FRAME_PARMS *fp             = &gNB->frame_parms;
   NR_gNB_COMMON* const common_vars  = &gNB->common_vars;
   LTE_eNB_PUSCH** const pusch_vars   = gNB->pusch_vars;
   LTE_eNB_SRS* const srs_vars        = gNB->srs_vars;
@@ -297,9 +299,6 @@ void phy_free_nr_gNB(PHY_VARS_gNB *gNB)
   free_and_zero(common_vars->rxdataF);
 
   // PDCCH DMRS sequences
-  pdcch_dmrs = (uint32_t ***)malloc16(fp->slots_per_frame*sizeof(uint32_t**));
-  for (int slot=0; slot<fp->slots_per_frame; slot++)
-    free_and_zero(pdcch_dmrs[slot]);
   free_and_zero(pdcch_dmrs);
 
   // Channel estimates for SRS

openair1/PHY/NR_REFSIG/nr_gold.c

@@ -56,7 +56,7 @@ void nr_init_pbch_dmrs(PHY_VARS_gNB* gNB)
 void nr_init_pdcch_dmrs(PHY_VARS_gNB* gNB, uint32_t Nid)
 {
 
-  uint32_t n, x1, x2;
+  uint32_t x1, x2;
   uint8_t reset = 1;
   NR_DL_FRAME_PARMS *fp = &gNB->frame_parms;
   uint32_t ***pdcch_dmrs = gNB->nr_gold_pdcch_dmrs;

openair1/PHY/defs_gNB.h

@@ -291,7 +291,7 @@ typedef struct PHY_VARS_gNB_s {
   uint32_t nr_gold_pbch_dmrs[2][64][NR_PBCH_DMRS_LENGTH_DWORD];
 
   /// PDCCH DMRS sequence
-  uint32_t **nr_gold_pdcch_dmrs[NR_MAX_PDCCH_DMRS_LENGTH_DWORD];
+  uint32_t ***nr_gold_pdcch_dmrs;
 
   /// Indicator set to 0 after first SR
   uint8_t first_sr[NUMBER_OF_UE_MAX];