cleanup after removing harq state in L0

openair1/PHY/INIT/nr_init.c

@@ -250,9 +250,7 @@ int phy_init_nr_gNB(PHY_VARS_gNB *gNB,
 
   int N_RB_UL = cfg->carrier_config.ul_grid_size[cfg->ssb_config.scs_common.value].value;
 
-  printf("Before ULSCH init : %p\n",gNB->dlsch[0][0]->harq_processes[0]);
   for (int ULSCH_id=0; ULSCH_id<NUMBER_OF_NR_ULSCH_MAX; ULSCH_id++) {
-    printf("ULSCH_id %d : %p\n",ULSCH_id,gNB->dlsch[0][0]->harq_processes[0]);
     pusch_vars[ULSCH_id] = (NR_gNB_PUSCH *)malloc16_clear( sizeof(NR_gNB_PUSCH) );
     pusch_vars[ULSCH_id]->rxdataF_ext           = (int32_t **)malloc16(Prx*sizeof(int32_t *) );
     pusch_vars[ULSCH_id]->rxdataF_ext2          = (int32_t **)malloc16(Prx*sizeof(int32_t *) );
@@ -269,7 +267,6 @@ int phy_init_nr_gNB(PHY_VARS_gNB *gNB,
     pusch_vars[ULSCH_id]->ul_ch_magb            = (int32_t **)malloc16(Prx*sizeof(int32_t *) );
     pusch_vars[ULSCH_id]->rho                   = (int32_t **)malloc16_clear(Prx*sizeof(int32_t*) );
 
-    printf("ULSCH_id %d (before rx antenna alloc) : %p\n",ULSCH_id,gNB->dlsch[0][0]->harq_processes[0]);
     for (i=0; i<Prx; i++) {
       pusch_vars[ULSCH_id]->rxdataF_ext[i]           = (int32_t *)malloc16_clear( sizeof(int32_t)*N_RB_UL*12*fp->symbols_per_slot );
       pusch_vars[ULSCH_id]->rxdataF_ext2[i]          = (int32_t *)malloc16_clear( sizeof(int32_t)*N_RB_UL*12*fp->symbols_per_slot );
@@ -286,16 +283,13 @@ int phy_init_nr_gNB(PHY_VARS_gNB *gNB,
       pusch_vars[ULSCH_id]->ul_ch_magb[i]            = (int32_t *)malloc16_clear( fp->symbols_per_slot*sizeof(int32_t)*N_RB_UL*12 );
       pusch_vars[ULSCH_id]->rho[i]                   = (int32_t *)malloc16_clear( sizeof(int32_t)*(fp->N_RB_UL*12*7*2) );
     }
-    printf("ULSCH_id %d (before llr alloc) : %p\n",ULSCH_id,gNB->dlsch[0][0]->harq_processes[0]);
     pusch_vars[ULSCH_id]->llr = (int16_t *)malloc16_clear( (8*((3*8*6144)+12))*sizeof(int16_t) ); // [hna] 6144 is LTE and (8*((3*8*6144)+12)) is not clear
-    printf("ULSCH_id %d (after llr alloc) : %p\n",ULSCH_id,gNB->dlsch[0][0]->harq_processes[0]);
     pusch_vars[ULSCH_id]->ul_valid_re_per_slot  = (int16_t *)malloc16_clear( sizeof(int16_t)*fp->symbols_per_slot);
   } //ulsch_id
 /*
   for (ulsch_id=0; ulsch_id<NUMBER_OF_UE_MAX; ulsch_id++)
     gNB->UE_stats_ptr[ulsch_id] = &gNB->UE_stats[ulsch_id];
 */
-  printf("After ULSCH init : %p\n",gNB->dlsch[0][0]->harq_processes[0]);
   return (0);
 }
 

openair1/PHY/NR_TRANSPORT/nr_dlsch.c

@@ -137,7 +137,7 @@ uint8_t nr_generate_pdsch(PHY_VARS_gNB *gNB,
     if (dlsch->slot_tx[slot] == 0) continue;
 
     int harq_pid = 0;//dlsch->harq_ids[frame%2][slot];
-    NR_DL_gNB_HARQ_t *harq = dlsch->harq_processes[harq_pid];
+    NR_DL_gNB_HARQ_t *harq = &dlsch->harq_process;
     nfapi_nr_dl_tti_pdsch_pdu_rel15_t *rel15 = &harq->pdsch_pdu.pdsch_pdu_rel15;
     uint32_t scrambled_output[NR_MAX_NB_CODEWORDS][NR_MAX_PDSCH_ENCODED_LENGTH>>5];
     int16_t **mod_symbs = (int16_t**)dlsch->mod_symbs;

openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c

@@ -51,7 +51,6 @@
 
 void free_gNB_dlsch(NR_gNB_DLSCH_t **dlschptr, uint16_t N_RB)
 {
-  int i;
   int r;
 
   NR_gNB_DLSCH_t *dlsch = *dlschptr;
@@ -63,78 +62,67 @@ void free_gNB_dlsch(NR_gNB_DLSCH_t **dlschptr, uint16_t N_RB)
       a_segments = a_segments*N_RB;
       a_segments = a_segments/273 +1;
     }  
-
-
-
+    
+    
+    
 #ifdef DEBUG_DLSCH_FREE
     LOG_D(PHY,"Freeing dlsch %p\n",dlsch);
 #endif
-
-    for (i=0; i<dlsch->Mdlharq; i++) {
+    NR_DL_gNB_HARQ_t *harq=&dlsch->harq_process;
+    if (harq->b) {
+      free16(harq->b,a_segments*1056);
+      harq->b = NULL;
 #ifdef DEBUG_DLSCH_FREE
-      LOG_D(PHY,"Freeing dlsch process %d\n",i);
+      LOG_D(PHY,"Freeing harq->b (%p)\n",harq->b);
 #endif
-
-      if (dlsch->harq_processes[i]) {
+      
+      if (harq->e) {
+	free16(harq->e,14*N_RB*12*8);
+	harq->e = NULL;
 #ifdef DEBUG_DLSCH_FREE
-        LOG_D(PHY,"Freeing dlsch process %d (%p)\n",i,dlsch->harq_processes[i]);
+	printf("Freeing dlsch process %d e (%p)\n",i,harq->e);
 #endif
-
-        if (dlsch->harq_processes[i]->b) {
-          free16(dlsch->harq_processes[i]->b,a_segments*1056);
-          dlsch->harq_processes[i]->b = NULL;
-#ifdef DEBUG_DLSCH_FREE
-          LOG_D(PHY,"Freeing dlsch process %d b (%p)\n",i,dlsch->harq_processes[i]->b);
-#endif
-        }
-
-        if (dlsch->harq_processes[i]->e) {
-          free16(dlsch->harq_processes[i]->e,14*N_RB*12*8);
-          dlsch->harq_processes[i]->e = NULL;
-#ifdef DEBUG_DLSCH_FREE
-          printf("Freeing dlsch process %d e (%p)\n",i,dlsch->harq_processes[i]->e);
-#endif
-        }
-
-        if (dlsch->harq_processes[i]->f) {
-          free16(dlsch->harq_processes[i]->f,14*N_RB*12*8);
-          dlsch->harq_processes[i]->f = NULL;
+      }
+      
+      if (harq->f) {
+	free16(harq->f,14*N_RB*12*8);
+	harq->f = NULL;
 #ifdef DEBUG_DLSCH_FREE
-          printf("Freeing dlsch process %d f (%p)\n",i,dlsch->harq_processes[i]->f);
+	printf("Freeing dlsch process %d f (%p)\n",i,harq->f);
 #endif
-        }
-
+      }
+      
 #ifdef DEBUG_DLSCH_FREE
-        LOG_D(PHY,"Freeing dlsch process %d c (%p)\n",i,dlsch->harq_processes[i]->c);
+      LOG_D(PHY,"Freeing dlsch process %d c (%p)\n",i,harq->c);
 #endif
-
-        for (r=0; r<a_segments; r++) {
-
+      
+      for (r=0; r<a_segments; r++) {
+	
 #ifdef DEBUG_DLSCH_FREE
-          LOG_D(PHY,"Freeing dlsch process %d c[%d] (%p)\n",i,r,dlsch->harq_processes[i]->c[r]);
+	LOG_D(PHY,"Freeing dlsch process %d c[%d] (%p)\n",i,r,harq->c[r]);
 #endif
-
-          if (dlsch->harq_processes[i]->c[r]) {
-            free16(dlsch->harq_processes[i]->c[r],1056);
-            dlsch->harq_processes[i]->c[r] = NULL;
-          }
-          if (dlsch->harq_processes[i]->d[r]) {
-            free16(dlsch->harq_processes[i]->d[r],3*8448);
-            dlsch->harq_processes[i]->d[r] = NULL;
-          }
-
-	    }
-	free16(dlsch->harq_processes[i],sizeof(NR_DL_gNB_HARQ_t));
-	dlsch->harq_processes[i] = NULL;
+	
+	if (harq->c[r]) {
+	  free16(harq->c[r],1056);
+	  harq->c[r] = NULL;
+	}
+	if (harq->d[r]) {
+	  free16(harq->d[r],3*8448);
+	  harq->d[r] = NULL;
+	}
+	
       }
+      free16(harq,sizeof(NR_DL_gNB_HARQ_t));
+      harq = NULL;
     }
-
+  }
+  
     free16(dlsch,sizeof(NR_gNB_DLSCH_t));
     *dlschptr = NULL;
-  }
-
 }
 
+
+
 NR_gNB_DLSCH_t *new_gNB_dlsch(NR_DL_FRAME_PARMS *frame_parms,
                               unsigned char Kmimo,
                               unsigned char Mdlharq,
@@ -144,7 +132,7 @@ NR_gNB_DLSCH_t *new_gNB_dlsch(NR_DL_FRAME_PARMS *frame_parms,
 {
 
   NR_gNB_DLSCH_t *dlsch;
-  unsigned char exit_flag = 0,i,r,aa,layer;
+  unsigned char i,r,aa,layer;
   int re;
   uint16_t a_segments = MAX_NUM_NR_DLSCH_SEGMENTS;  //number of segments to be allocated
 
@@ -156,126 +144,67 @@ NR_gNB_DLSCH_t *new_gNB_dlsch(NR_DL_FRAME_PARMS *frame_parms,
   uint16_t dlsch_bytes = a_segments*1056;  // allocated bytes per segment
 
   
-  dlsch = (NR_gNB_DLSCH_t *)malloc16(sizeof(NR_gNB_DLSCH_t));
-
-  if (dlsch) {
-    bzero(dlsch,sizeof(NR_gNB_DLSCH_t));
-    dlsch->Kmimo = Kmimo;
-    dlsch->Mdlharq = Mdlharq;
-    dlsch->Mlimit = 4;
-    dlsch->Nsoft = Nsoft;
-
-    for (layer=0; layer<NR_MAX_NB_LAYERS; layer++) {
-      dlsch->ue_spec_bf_weights[layer] = (int32_t**)malloc16(64*sizeof(int32_t*));
-
-      for (aa=0; aa<64; aa++) {
-         dlsch->ue_spec_bf_weights[layer][aa] = (int32_t *)malloc16(OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES*sizeof(int32_t));
-         for (re=0;re<OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES; re++) {
-           dlsch->ue_spec_bf_weights[layer][aa][re] = 0x00007fff;
-         }
-      }
-
-      dlsch->txdataF[layer] = (int32_t *)malloc16((NR_MAX_PDSCH_ENCODED_LENGTH/NR_MAX_NB_LAYERS)*sizeof(int32_t)); // NR_MAX_NB_LAYERS is already included in NR_MAX_PDSCH_ENCODED_LENGTH
-    }
-
-    for (int q=0; q<NR_MAX_NB_CODEWORDS; q++)
-      dlsch->mod_symbs[q] = (int32_t *)malloc16(NR_MAX_PDSCH_ENCODED_LENGTH*sizeof(int32_t));
-
-     dlsch->calib_dl_ch_estimates = (int32_t**)malloc16(64*sizeof(int32_t*));
-     for (aa=0; aa<64; aa++) {
-       dlsch->calib_dl_ch_estimates[aa] = (int32_t *)malloc16(OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES*sizeof(int32_t));
-
-     }
-
-    for (i=0; i<20; i++) {
-      dlsch->harq_ids[0][i] = 0;
-      dlsch->harq_ids[1][i] = 0;
-    }
-
-    for (i=0; i<Mdlharq; i++) {
-      dlsch->harq_processes[i] = (NR_DL_gNB_HARQ_t *)malloc16(sizeof(NR_DL_gNB_HARQ_t));
-      LOG_T(PHY, "Required mem size %d  dlsch->harq_processes[%d] %p\n",
-    		  dlsch_bytes, i,dlsch->harq_processes[i]);
-
-      if (dlsch->harq_processes[i]) {
-        bzero(dlsch->harq_processes[i],sizeof(NR_DL_gNB_HARQ_t));
-        //    dlsch->harq_processes[i]->first_tx=1;
-        dlsch->harq_processes[i]->b = (unsigned char*)malloc16(dlsch_bytes);
-        dlsch->harq_processes[i]->pdu = (uint8_t*)malloc16(dlsch_bytes);
-        if (dlsch->harq_processes[i]->pdu) {
-          bzero(dlsch->harq_processes[i]->pdu,dlsch_bytes);
-          nr_emulate_dlsch_payload(dlsch->harq_processes[i]->pdu, (dlsch_bytes)>>3);
-        } else {
-          LOG_D(PHY,"Can't allocate PDU\n");
-          exit_flag=1;
-        }
-
-        if (dlsch->harq_processes[i]->b) {
-          bzero(dlsch->harq_processes[i]->b,dlsch_bytes);
-        } else {
-          LOG_D(PHY,"Can't get b\n");
-          exit_flag=1;
-        }
-
-        if (abstraction_flag==0) {
-          for (r=0; r<a_segments; r++) {
-            // account for filler in first segment and CRCs for multiple segment case
-            // [hna] 8448 is the maximum CB size in NR
-            //       68*348 = 68*(maximum size of Zc)
-            //       In section 5.3.2 in 38.212, the for loop is up to N + 2*Zc (maximum size of N is 66*Zc, therefore 68*Zc)
-            dlsch->harq_processes[i]->c[r] = (uint8_t*)malloc16(8448);
-            dlsch->harq_processes[i]->d[r] = (uint8_t*)malloc16(68*384); //max size for coded output
-            if (dlsch->harq_processes[i]->c[r]) {
-              bzero(dlsch->harq_processes[i]->c[r],8448);
-            } else {
-              LOG_D(PHY,"Can't get c\n");
-              exit_flag=2;
-            }
-            if (dlsch->harq_processes[i]->d[r]) {
-              bzero(dlsch->harq_processes[i]->d[r],(3*8448));
-            } else {
-              LOG_D(PHY,"Can't get d\n");
-              exit_flag=2;
-            }
-          }
-          dlsch->harq_processes[i]->e = (uint8_t*)malloc16(14*N_RB*12*8);
-          if (dlsch->harq_processes[i]->e) {
-            bzero(dlsch->harq_processes[i]->e,14*N_RB*12*8);
-          } else {
-            printf("Can't get e\n");
-            exit_flag=1;
-          }
-          dlsch->harq_processes[i]->f = (uint8_t*)malloc16(14*N_RB*12*8);
-          if (dlsch->harq_processes[i]->f) {
-            bzero(dlsch->harq_processes[i]->f,14*N_RB*12*8);
-          } else {
-            printf("Can't get f\n");
-            exit_flag=1;
-          }
-        }
-      } else {
-        LOG_D(PHY,"Can't get harq_p %d\n",i);
-        exit_flag=3;
-      }
-    }
-
-    if (exit_flag==0) {
-      for (i=0; i<Mdlharq; i++) {
-        dlsch->harq_processes[i]->round=0;
+  AssertFatal((dlsch = (NR_gNB_DLSCH_t *)malloc16(sizeof(NR_gNB_DLSCH_t)))!=NULL,"cannot allocate dlsch\n");
+  
+  bzero(dlsch,sizeof(NR_gNB_DLSCH_t));
+  dlsch->Kmimo = Kmimo;
+  dlsch->Mdlharq = Mdlharq;
+  dlsch->Mlimit = 4;
+  dlsch->Nsoft = Nsoft;
+  
+  for (layer=0; layer<NR_MAX_NB_LAYERS; layer++) {
+    dlsch->ue_spec_bf_weights[layer] = (int32_t**)malloc16(64*sizeof(int32_t*));
+    
+    for (aa=0; aa<64; aa++) {
+      dlsch->ue_spec_bf_weights[layer][aa] = (int32_t *)malloc16(OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES*sizeof(int32_t));
+      for (re=0;re<OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES; re++) {
+	dlsch->ue_spec_bf_weights[layer][aa][re] = 0x00007fff;
       }
-
-      return(dlsch);
     }
+    
+    dlsch->txdataF[layer] = (int32_t *)malloc16((NR_MAX_PDSCH_ENCODED_LENGTH/NR_MAX_NB_LAYERS)*sizeof(int32_t)); // NR_MAX_NB_LAYERS is already included in NR_MAX_PDSCH_ENCODED_LENGTH
   }
-
-  LOG_D(PHY,"new_gNB_dlsch exit flag %d, size of  %ld\n",
-	exit_flag, sizeof(NR_gNB_DLSCH_t));
-
-  free_gNB_dlsch(&dlsch,N_RB);
-
-  return(NULL);
-
-
+  
+  for (int q=0; q<NR_MAX_NB_CODEWORDS; q++)
+    dlsch->mod_symbs[q] = (int32_t *)malloc16(NR_MAX_PDSCH_ENCODED_LENGTH*sizeof(int32_t));
+  
+  dlsch->calib_dl_ch_estimates = (int32_t**)malloc16(64*sizeof(int32_t*));
+  for (aa=0; aa<64; aa++) {
+    dlsch->calib_dl_ch_estimates[aa] = (int32_t *)malloc16(OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES*sizeof(int32_t));
+    
+  }
+  
+  for (i=0; i<20; i++) {
+    dlsch->harq_ids[0][i] = 0;
+    dlsch->harq_ids[1][i] = 0;
+  }
+  
+  NR_DL_gNB_HARQ_t *harq = &dlsch->harq_process;
+  
+  bzero(harq,sizeof(NR_DL_gNB_HARQ_t));
+  AssertFatal((harq->b = (unsigned char*)malloc16(dlsch_bytes))!=NULL,"cannot allocate memory for harq->b\n");
+  AssertFatal((harq->pdu = (uint8_t*)malloc16(dlsch_bytes))!=NULL,"cannot allocate memory for harq->pdu\n");
+  bzero(harq->pdu,dlsch_bytes);
+  nr_emulate_dlsch_payload(harq->pdu, (dlsch_bytes)>>3);
+  bzero(harq->b,dlsch_bytes);
+  
+  
+  for (r=0; r<a_segments; r++) {
+    // account for filler in first segment and CRCs for multiple segment case
+    // [hna] 8448 is the maximum CB size in NR
+    //       68*348 = 68*(maximum size of Zc)
+    //       In section 5.3.2 in 38.212, the for loop is up to N + 2*Zc (maximum size of N is 66*Zc, therefore 68*Zc)
+    AssertFatal((harq->c[r] = (uint8_t*)malloc16(8448))!=NULL,"cannot allocate harq->c[%d]\n",r);
+    AssertFatal((harq->d[r] = (uint8_t*)malloc16(68*384))!=NULL,"cannot allocate harq->d[%d]\n",r);; //max size for coded output
+    bzero(harq->c[r],8448);
+    bzero(harq->d[r],(3*8448));
+    AssertFatal((harq->e = (uint8_t*)malloc16(14*N_RB*12*8))!=NULL,"cannot allocate harq->e\n");
+    bzero(harq->e,14*N_RB*12*8);
+    AssertFatal((harq->f = (uint8_t*)malloc16(14*N_RB*12*8))!=NULL,"cannot allocate harq->f\n");
+    bzero(harq->f,14*N_RB*12*8);
+  }
+  
+  return(dlsch);
 }
 
 void clean_gNB_dlsch(NR_gNB_DLSCH_t *dlsch)
@@ -284,28 +213,21 @@ void clean_gNB_dlsch(NR_gNB_DLSCH_t *dlsch)
   unsigned char Mdlharq;
   unsigned char i,j,r;
 
-  if (dlsch) {
-    Mdlharq = dlsch->Mdlharq;
-    dlsch->rnti = 0;
-    dlsch->active = 0;
+  AssertFatal(dlsch!=NULL,"dlsch is null\n");
+  Mdlharq = dlsch->Mdlharq;
+  dlsch->rnti = 0;
+  dlsch->active = 0;
+  NR_DL_gNB_HARQ_t *harq=&dlsch->harq_process;
 
-    for (i=0; i<10; i++) {
+  for (i=0; i<10; i++) {
       dlsch->harq_ids[0][i] = Mdlharq;
       dlsch->harq_ids[1][i] = Mdlharq;
-    }
-    for (i=0; i<Mdlharq; i++) {
-      if (dlsch->harq_processes[i]) {
-        //  dlsch->harq_processes[i]->Ndi    = 0;
-        //dlsch->harq_processes[i]->status = 0;
-        dlsch->harq_processes[i]->round  = 0;
-
-	for (j=0; j<96; j++)
-	  for (r=0; r<MAX_NUM_NR_DLSCH_SEGMENTS; r++)
-	    if (dlsch->harq_processes[i]->d[r])
-	      dlsch->harq_processes[i]->d[r][j] = NR_NULL;
-
-      }
-    }
+  }
+  for (i=0; i<Mdlharq; i++) {
+    for (j=0; j<96; j++)
+      for (r=0; r<MAX_NUM_NR_DLSCH_SEGMENTS; r++)
+	if (harq->d[r])
+	  harq->d[r][j] = NR_NULL;
   }
 }
 
@@ -322,13 +244,12 @@ int nr_dlsch_encoding(PHY_VARS_gNB *gNB,
 
   unsigned int G;
   unsigned int crc=1;
-  uint8_t harq_pid = 0;//dlsch->harq_ids[frame%2][slot];
-  AssertFatal(harq_pid<8 && harq_pid>=0,"illegal harq_pid %d\b",harq_pid);
-  nfapi_nr_dl_tti_pdsch_pdu_rel15_t *rel15 = &dlsch->harq_processes[harq_pid]->pdsch_pdu.pdsch_pdu_rel15;
+  NR_DL_gNB_HARQ_t *harq=&dlsch->harq_process;
+  nfapi_nr_dl_tti_pdsch_pdu_rel15_t *rel15 = &harq->pdsch_pdu.pdsch_pdu_rel15;
   uint16_t nb_rb = rel15->rbSize;
   uint8_t nb_symb_sch = rel15->NrOfSymbols;
   uint32_t A, Kb, F=0;
-  uint32_t *Zc = &dlsch->harq_processes[harq_pid]->Z;
+  uint32_t *Zc = &dlsch->harq_process.Z;
   uint8_t mod_order = rel15->qamModOrder[0];
   uint16_t Kr=0,r;
   uint32_t r_offset=0;
@@ -347,7 +268,6 @@ int nr_dlsch_encoding(PHY_VARS_gNB *gNB,
   float Coderate = 0.0;
   uint8_t Nl = 4;
 
-  dlsch->harq_processes[harq_pid]->round = 0;// regenerate all code segments every round. was nr_rv_round_map[rel15->rvIndex[0]];
   
   VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_gNB_DLSCH_ENCODING, VCD_FUNCTION_IN);
 
@@ -367,174 +287,156 @@ int nr_dlsch_encoding(PHY_VARS_gNB *gNB,
   }
 
   if (stats) {
-    //    stats->round_trials[dlsch->harq_processes[harq_pid]->round]++;
     stats->rnti = dlsch->rnti;
-    //if (dlsch->harq_processes[harq_pid]->round == 0){
-      stats->total_bytes_tx += rel15->TBSize[0];
-      stats->current_RI   = rel15->nrOfLayers;
-      stats->current_Qm   = rel15->qamModOrder[0];
-      //}
+    stats->total_bytes_tx += rel15->TBSize[0];
+    stats->current_RI   = rel15->nrOfLayers;
+    stats->current_Qm   = rel15->qamModOrder[0];
   }
   G = nr_get_G(nb_rb, nb_symb_sch, nb_re_dmrs, length_dmrs,mod_order,rel15->nrOfLayers);
 
   LOG_D(PHY,"dlsch coding A %d G %d mod_order %d\n", A,G, mod_order);
 
-  //  if (dlsch->harq_processes[harq_pid]->Ndi == 1) {  // this is a new packet
-  if (1) { //dlsch->harq_processes[harq_pid]->round == 0) {  // this is a new packet
-#ifdef DEBUG_DLSCH_CODING
-  LOG_D(PHY,"encoding thinks this is a new packet \n");
-#endif
-  /*    
-    int i;
-    LOG_D(PHY,"dlsch (tx): \n");
-    for (i=0;i<(A>>3);i++)
-      LOG_D(PHY,"%02x\n",a[i]);
-    LOG_D(PHY,"\n");
-  */
-
-    if (A > 3824) {
-      // Add 24-bit crc (polynomial A) to payload
-      crc = crc24a(a,A)>>8;
-      a[A>>3] = ((uint8_t*)&crc)[2];
-      a[1+(A>>3)] = ((uint8_t*)&crc)[1];
-      a[2+(A>>3)] = ((uint8_t*)&crc)[0];
-      //printf("CRC %x (A %d)\n",crc,A);
-      //printf("a0 %d a1 %d a2 %d\n", a[A>>3], a[1+(A>>3)], a[2+(A>>3)]);
+  if (A > 3824) {
+    // Add 24-bit crc (polynomial A) to payload
+    crc = crc24a(a,A)>>8;
+    a[A>>3] = ((uint8_t*)&crc)[2];
+    a[1+(A>>3)] = ((uint8_t*)&crc)[1];
+    a[2+(A>>3)] = ((uint8_t*)&crc)[0];
+    //printf("CRC %x (A %d)\n",crc,A);
+    //printf("a0 %d a1 %d a2 %d\n", a[A>>3], a[1+(A>>3)], a[2+(A>>3)]);
+    
+    harq->B = A+24;
+    //    harq->b = a;
+    
+    AssertFatal((A/8)+4 <= MAX_NR_DLSCH_PAYLOAD_BYTES,"A %d is too big (A/8+4 = %d > %d)\n",A,(A/8)+4,MAX_NR_DLSCH_PAYLOAD_BYTES);
+    
+    memcpy(harq->b,a,(A/8)+4);  // why is this +4 if the CRC is only 3 bytes?
+  }
+  else {
+    // Add 16-bit crc (polynomial A) to payload
+    crc = crc16(a,A)>>16;
+    a[A>>3] = ((uint8_t*)&crc)[1];
+    a[1+(A>>3)] = ((uint8_t*)&crc)[0];
+    //printf("CRC %x (A %d)\n",crc,A);
+    //printf("a0 %d a1 %d \n", a[A>>3], a[1+(A>>3)]);
+    
+    harq->B = A+16;
+    //    harq->b = a;
+    
+    AssertFatal((A/8)+3 <= MAX_NR_DLSCH_PAYLOAD_BYTES,"A %d is too big (A/8+3 = %d > %d)\n",A,(A/8)+3,MAX_NR_DLSCH_PAYLOAD_BYTES);
+    
+    memcpy(harq->b,a,(A/8)+3);  // using 3 bytes to mimic the case of 24 bit crc
+  }
+  if (R<1000)
+    Coderate = (float) R /(float) 1024;
+  else  // to scale for mcs 20 and 26 in table 5.1.3.1-2 which are decimal and input 2* in nr_tbs_tools
+    Coderate = (float) R /(float) 2048;
   
-      dlsch->harq_processes[harq_pid]->B = A+24;
-      //    dlsch->harq_processes[harq_pid]->b = a;
-   
-      AssertFatal((A/8)+4 <= MAX_NR_DLSCH_PAYLOAD_BYTES,"A %d is too big (A/8+4 = %d > %d)\n",A,(A/8)+4,MAX_NR_DLSCH_PAYLOAD_BYTES);
-
-      memcpy(dlsch->harq_processes[harq_pid]->b,a,(A/8)+4);  // why is this +4 if the CRC is only 3 bytes?
-    }
-    else {
-      // Add 16-bit crc (polynomial A) to payload
-      crc = crc16(a,A)>>16;
-      a[A>>3] = ((uint8_t*)&crc)[1];
-      a[1+(A>>3)] = ((uint8_t*)&crc)[0];
-      //printf("CRC %x (A %d)\n",crc,A);
-      //printf("a0 %d a1 %d \n", a[A>>3], a[1+(A>>3)]);
+  if ((A <=292) || ((A<=3824) && (Coderate <= 0.6667)) || Coderate <= 0.25)
+    harq->BG = 2;
+  else
+    harq->BG = 1;
   
-      dlsch->harq_processes[harq_pid]->B = A+16;
-      //    dlsch->harq_processes[harq_pid]->b = a;
-   
-      AssertFatal((A/8)+3 <= MAX_NR_DLSCH_PAYLOAD_BYTES,"A %d is too big (A/8+3 = %d > %d)\n",A,(A/8)+3,MAX_NR_DLSCH_PAYLOAD_BYTES);
-
-      memcpy(dlsch->harq_processes[harq_pid]->b,a,(A/8)+3);  // using 3 bytes to mimic the case of 24 bit crc
-    }
-    if (R<1000)
-      Coderate = (float) R /(float) 1024;
-    else  // to scale for mcs 20 and 26 in table 5.1.3.1-2 which are decimal and input 2* in nr_tbs_tools
-      Coderate = (float) R /(float) 2048;
-
-    if ((A <=292) || ((A<=3824) && (Coderate <= 0.6667)) || Coderate <= 0.25)
-		dlsch->harq_processes[harq_pid]->BG = 2;
-    else
-		dlsch->harq_processes[harq_pid]->BG = 1;
-
-    start_meas(dlsch_segmentation_stats);
-    Kb = nr_segmentation(dlsch->harq_processes[harq_pid]->b,
-		         dlsch->harq_processes[harq_pid]->c,
-		         dlsch->harq_processes[harq_pid]->B,
-		         &dlsch->harq_processes[harq_pid]->C,
-		         &dlsch->harq_processes[harq_pid]->K,
-		         Zc, 
-		         &dlsch->harq_processes[harq_pid]->F,
-             dlsch->harq_processes[harq_pid]->BG);
-    stop_meas(dlsch_segmentation_stats);
-    F = dlsch->harq_processes[harq_pid]->F;
-
-    Kr = dlsch->harq_processes[harq_pid]->K;
+  start_meas(dlsch_segmentation_stats);
+  Kb = nr_segmentation(harq->b,
+		       harq->c,
+		       harq->B,
+		       &harq->C,
+		       &harq->K,
+		       Zc, 
+		       &harq->F,
+		       harq->BG);
+  stop_meas(dlsch_segmentation_stats);
+  F = harq->F;
+  
+  Kr = harq->K;
 #ifdef DEBUG_DLSCH_CODING
-    uint16_t Kr_bytes;
-    Kr_bytes = Kr>>3;
+  uint16_t Kr_bytes;
+  Kr_bytes = Kr>>3;
 #endif
 
-    //printf("segment Z %d k %d Kr %d BG %d C %d\n", *Zc,dlsch->harq_processes[harq_pid]->K,Kr,BG,dlsch->harq_processes[harq_pid]->C);
-
-    for (r=0; r<dlsch->harq_processes[harq_pid]->C; r++) {
-      //d_tmp[r] = &dlsch->harq_processes[harq_pid]->d[r][0];
-      //channel_input[r] = &dlsch->harq_processes[harq_pid]->d[r][0];
+  //printf("segment Z %d k %d Kr %d BG %d C %d\n", *Zc,harq->K,Kr,BG,harq->C);
+  
+  for (r=0; r<harq->C; r++) {
+    //d_tmp[r] = &harq->d[r][0];
+    //channel_input[r] = &harq->d[r][0];
 #ifdef DEBUG_DLSCH_CODING
-      LOG_D(PHY,"Encoder: B %d F %d \n",dlsch->harq_processes[harq_pid]->B, dlsch->harq_processes[harq_pid]->F);
-      LOG_D(PHY,"start ldpc encoder segment %d/%d\n",r,dlsch->harq_processes[harq_pid]->C);
-      LOG_D(PHY,"input %d %d %d %d %d \n", dlsch->harq_processes[harq_pid]->c[r][0], dlsch->harq_processes[harq_pid]->c[r][1], dlsch->harq_processes[harq_pid]->c[r][2],dlsch->harq_processes[harq_pid]->c[r][3], dlsch->harq_processes[harq_pid]->c[r][4]);
-      for (int cnt =0 ; cnt < 22*(*Zc)/8; cnt ++){
-      LOG_D(PHY,"%d ", dlsch->harq_processes[harq_pid]->c[r][cnt]);
-      }
-      LOG_D(PHY,"\n");
-
-#endif
-      //ldpc_encoder_orig((unsigned char*)dlsch->harq_processes[harq_pid]->c[r],dlsch->harq_processes[harq_pid]->d[r],*Zc,Kb,Kr,BG,0);
-      //ldpc_encoder_optim((unsigned char*)dlsch->harq_processes[harq_pid]->c[r],(unsigned char*)&dlsch->harq_processes[harq_pid]->d[r][0],*Zc,Kb,Kr,BG,NULL,NULL,NULL,NULL);
-    }
-    encoder_implemparams_t impp;
-    impp.n_segments=dlsch->harq_processes[harq_pid]->C;
-    impp.tprep = tprep;
-    impp.tinput = tinput;
-    impp.tparity = tparity;
-    impp.toutput = toutput;
-
-    for(int j=0;j<(dlsch->harq_processes[harq_pid]->C/8+1);j++) {
-      impp.macro_num=j;
-      nrLDPC_encoder(dlsch->harq_processes[harq_pid]->c,dlsch->harq_processes[harq_pid]->d,*Zc,Kb,Kr,dlsch->harq_processes[harq_pid]->BG,&impp);
+    LOG_D(PHY,"Encoder: B %d F %d \n",harq->B, harq->F);
+    LOG_D(PHY,"start ldpc encoder segment %d/%d\n",r,harq->C);
+    LOG_D(PHY,"input %d %d %d %d %d \n", harq->c[r][0], harq->c[r][1], harq->c[r][2],harq->c[r][3], harq->c[r][4]);
+    for (int cnt =0 ; cnt < 22*(*Zc)/8; cnt ++){
+      LOG_D(PHY,"%d ", harq->c[r][cnt]);
     }
-
-
-#ifdef DEBUG_DLSCH_CODING
-      write_output("enc_input0.m","enc_in0",&dlsch->harq_processes[harq_pid]->c[0][0],Kr_bytes,1,4);
-      write_output("enc_output0.m","enc0",&dlsch->harq_processes[harq_pid]->d[0][0],(3*8*Kr_bytes)+12,1,4);
+    LOG_D(PHY,"\n");
+    
 #endif
-
+    //ldpc_encoder_orig((unsigned char*)harq->c[r],harq->d[r],*Zc,Kb,Kr,BG,0);
+    //ldpc_encoder_optim((unsigned char*)harq->c[r],(unsigned char*)&harq->d[r][0],*Zc,Kb,Kr,BG,NULL,NULL,NULL,NULL);
   }
+  encoder_implemparams_t impp;
+  impp.n_segments=harq->C;
+  impp.tprep = tprep;
+  impp.tinput = tinput;
+  impp.tparity = tparity;
+  impp.toutput = toutput;
+  
+  for(int j=0;j<(harq->C/8+1);j++) {
+    impp.macro_num=j;
+    nrLDPC_encoder(harq->c,harq->d,*Zc,Kb,Kr,harq->BG,&impp);
+  }
+  
 
-    F = dlsch->harq_processes[harq_pid]->F;
-
-    Kr = dlsch->harq_processes[harq_pid]->K;
-  for (r=0; r<dlsch->harq_processes[harq_pid]->C; r++) {
-
+#ifdef DEBUG_DLSCH_CODING
+  write_output("enc_input0.m","enc_in0",&harq->c[0][0],Kr_bytes,1,4);
+  write_output("enc_output0.m","enc0",&harq->d[0][0],(3*8*Kr_bytes)+12,1,4);
+#endif
+ 
+  F = harq->F;
+  
+  Kr = harq->K;
+  for (r=0; r<harq->C; r++) {
+    
     if (F>0) {
       for (int k=(Kr-F-2*(*Zc)); k<Kr-2*(*Zc); k++) {
 	// writing into positions d[r][k-2Zc] as in clause 5.3.2 step 2) in 38.212
-        dlsch->harq_processes[harq_pid]->d[r][k] = NR_NULL;
+        harq->d[r][k] = NR_NULL;
 	//if (k<(Kr-F+8))
-	//printf("r %d filler bits [%d] = %d \n", r,k, dlsch->harq_processes[harq_pid]->d[r][k]);
+	//printf("r %d filler bits [%d] = %d \n", r,k, harq->d[r][k]);
       }
     }
-
-
-
+    
+    
+    
 #ifdef DEBUG_DLSCH_CODING
-  LOG_D(PHY,"rvidx in encoding = %d\n", rel15->rvIndex[0]);
+    LOG_D(PHY,"rvidx in encoding = %d\n", rel15->rvIndex[0]);
 #endif
-
-    E = nr_get_E(G, dlsch->harq_processes[harq_pid]->C, mod_order, rel15->nrOfLayers, r);
-
+    
+    E = nr_get_E(G, harq->C, mod_order, rel15->nrOfLayers, r);
+    
     //#ifdef DEBUG_DLSCH_CODING
     LOG_D(PHY,"Rate Matching, Code segment %d/%d (coded bits (G) %u, E %d, Filler bits %d, Filler offset %d mod_order %d, nb_rb %d)...\n",
 	  r,
-	  dlsch->harq_processes[harq_pid]->C,
+	  harq->C,
 	  G,
 	  E,
 	  F,
 	  Kr-F-2*(*Zc),
 	  mod_order,nb_rb);
-
+    
     // for tbslbrm calculation according to 5.4.2.1 of 38.212
     if (rel15->nrOfLayers < Nl)
       Nl = rel15->nrOfLayers;
-
+    
     Tbslbrm = nr_compute_tbslbrm(rel15->mcsTable[0],nb_rb,Nl);
-
+    
     start_meas(dlsch_rate_matching_stats);
     nr_rate_matching_ldpc(Ilbrm,
                           Tbslbrm,
-                          dlsch->harq_processes[harq_pid]->BG,
+                          harq->BG,
                           *Zc,
-                          dlsch->harq_processes[harq_pid]->d[r],
-                          dlsch->harq_processes[harq_pid]->e+r_offset,
-                          dlsch->harq_processes[harq_pid]->C,
+                          harq->d[r],
+                          harq->e+r_offset,
+                          harq->C,
                           F,
                           Kr-F-2*(*Zc),
                           rel15->rvIndex[0],
@@ -542,22 +444,22 @@ int nr_dlsch_encoding(PHY_VARS_gNB *gNB,
     stop_meas(dlsch_rate_matching_stats);
 #ifdef DEBUG_DLSCH_CODING
     for (int i =0; i<16; i++)
-      printf("output ratematching e[%d]= %d r_offset %u\n", i,dlsch->harq_processes[harq_pid]->e[i+r_offset], r_offset);
+      printf("output ratematching e[%d]= %d r_offset %u\n", i,harq->e[i+r_offset], r_offset);
 #endif
 
     start_meas(dlsch_interleaving_stats);
     nr_interleaving_ldpc(E,
 			 mod_order,
-			 dlsch->harq_processes[harq_pid]->e+r_offset,
-			 dlsch->harq_processes[harq_pid]->f+r_offset);
+			 harq->e+r_offset,
+			 harq->f+r_offset);
     stop_meas(dlsch_interleaving_stats);
 
 #ifdef DEBUG_DLSCH_CODING
     for (int i =0; i<16; i++)
-      printf("output interleaving f[%d]= %d r_offset %u\n", i,dlsch->harq_processes[harq_pid]->f[i+r_offset], r_offset);
+      printf("output interleaving f[%d]= %d r_offset %u\n", i,harq->f[i+r_offset], r_offset);
 
-    if (r==dlsch->harq_processes[harq_pid]->C-1)
-      write_output("enc_output.m","enc",dlsch->harq_processes[harq_pid]->f,G,1,4);
+    if (r==harq->C-1)
+      write_output("enc_output.m","enc",harq->f,G,1,4);
 #endif
 
     r_offset += E;

openair1/PHY/NR_TRANSPORT/nr_dlsch_tools.c

@@ -289,12 +289,12 @@ void nr_fill_dlsch(PHY_VARS_gNB *gNB,
   AssertFatal( (dlsch_id>=0) && (dlsch_id<NUMBER_OF_NR_DLSCH_MAX),
               "illegal or no dlsch_id found!!! rnti %04x dlsch_id %d\n",rel15->rnti,dlsch_id);
   NR_gNB_DLSCH_t  *dlsch = gNB->dlsch[dlsch_id][0];
-  NR_DL_gNB_HARQ_t **harq  = dlsch->harq_processes;
+  NR_DL_gNB_HARQ_t *harq  = &dlsch->harq_process;
   /// DLSCH struct
-  memcpy((void*)&harq[0/*dlsch->harq_ids[frame%2][slot]*/]->pdsch_pdu, (void*)pdsch_pdu, sizeof(nfapi_nr_dl_tti_pdsch_pdu));
+  memcpy((void*)&harq->pdsch_pdu, (void*)pdsch_pdu, sizeof(nfapi_nr_dl_tti_pdsch_pdu));
   gNB->num_pdsch_rnti[slot]++;
   AssertFatal(sdu!=NULL,"sdu is null\n");
-  harq[0/*dlsch->harq_ids[frame%2][slot]*/]->pdu = sdu;
+  harq->pdu = sdu;
 
 
 }

openair1/PHY/defs_gNB.h

@@ -94,8 +94,6 @@ typedef struct {
   uint32_t frame;
   /// Subframe where current HARQ round was sent
   uint32_t subframe;
-  /// Index of current HARQ round for this DLSCH
-  uint8_t round;
   /// MIMO mode for this DLSCH
   MIMO_mode_t mimo_mode;
   /// Concatenated sequences
@@ -138,8 +136,8 @@ typedef struct {
 } NR_gNB_SCH_STATS_t;
 
 typedef struct {
-  /// Pointers to 16 HARQ processes for the DLSCH
-  NR_DL_gNB_HARQ_t *harq_processes[NR_MAX_NB_HARQ_PROCESSES];
+  /// Pointers to variables related to DLSCH harq process
+  NR_DL_gNB_HARQ_t harq_process;
   /// TX buffers for UE-spec transmission (antenna ports 5 or 7..14, prior to precoding)
   int32_t *txdataF[NR_MAX_NB_LAYERS];
   /// Modulated symbols buffer

openair1/SIMULATION/NR_PHY/dlsim.c

@@ -666,6 +666,9 @@ int main(int argc, char **argv)
   rrc_mac_config_req_gNB(0,0,1,pusch_tgt_snrx10,pucch_tgt_snrx10,NULL,1,secondaryCellGroup->spCellConfig->reconfigurationWithSync->newUE_Identity,secondaryCellGroup);
   phy_init_nr_gNB(gNB,0,0);
   N_RB_DL = gNB->frame_parms.N_RB_DL;
+  NR_UE_info_t *UE_info = &RC.nrmac[0]->UE_info;
+  UE_info->num_UEs=1;
+
   // stub to configure frame_parms
   //  nr_phy_config_request_sim(gNB,N_RB_DL,N_RB_DL,mu,Nid_cell,SSB_positions);
   // call MAC to configure common parameters
@@ -831,10 +834,10 @@ int main(int argc, char **argv)
   scheduled_response.thread_id = UE_proc.thread_id;
 
   nr_ue_phy_config_request(&UE_mac->phy_config);
-  NR_UE_info_t *UE_info = &RC.nrmac[0]->UE_info;
   //NR_COMMON_channels_t *cc = RC.nrmac[0]->common_channels;
   snrRun = 0;
 
+
   for (SNR = snr0; SNR < snr1; SNR += .2) {
 
     varArray_t *table_tx=initVarArray(1000,sizeof(double));
@@ -880,7 +883,7 @@ int main(int argc, char **argv)
       NR_DL_UE_HARQ_t *UE_harq_process = dlsch0->harq_processes[harq_pid];
 
       NR_gNB_DLSCH_t *gNB_dlsch = gNB->dlsch[0][0];
-      nfapi_nr_dl_tti_pdsch_pdu_rel15_t *rel15 = &gNB_dlsch->harq_processes[slot]->pdsch_pdu.pdsch_pdu_rel15;
+      nfapi_nr_dl_tti_pdsch_pdu_rel15_t *rel15 = &gNB_dlsch->harq_process.pdsch_pdu.pdsch_pdu_rel15;
       
       UE_harq_process->harq_ack.ack = 0;
       round = 0;
@@ -896,7 +899,6 @@ int main(int argc, char **argv)
 
 
         UE_info->UE_sched_ctrl[0].harq_processes[harq_pid].round = round;
-        gNB->dlsch[0][0]->harq_processes[harq_pid]->round = round;
         for (int i=0; i<MAX_NUM_CORESET; i++)
           gNB_mac->UE_info.num_pdcch_cand[0][i] = 0;
       
@@ -1045,8 +1047,8 @@ int main(int argc, char **argv)
       
       for (i = 0; i < available_bits; i++) {
 	
-	if(((gNB_dlsch->harq_processes[harq_pid]->f[i] == 0) && (UE_llr[i] <= 0)) || 
-	   ((gNB_dlsch->harq_processes[harq_pid]->f[i] == 1) && (UE_llr[i] >= 0)))
+	if(((gNB_dlsch->harq_process.f[i] == 0) && (UE_llr[i] <= 0)) || 
+	   ((gNB_dlsch->harq_process.f[i] == 1) && (UE_llr[i] >= 0)))
 	  {
 	    if(errors_scrambling == 0) {
 	      LOG_D(PHY,"\n");
@@ -1059,7 +1061,7 @@ int main(int argc, char **argv)
       for (i = 0; i < TBS; i++) {
 
 	estimated_output_bit[i] = (UE_harq_process->b[i/8] & (1 << (i & 7))) >> (i & 7);
-	test_input_bit[i]       = (gNB_dlsch->harq_processes[harq_pid]->b[i / 8] & (1 << (i & 7))) >> (i & 7); // Further correct for multiple segments
+	test_input_bit[i]       = (gNB_dlsch->harq_process.b[i / 8] & (1 << (i & 7))) >> (i & 7); // Further correct for multiple segments
 	
 	if (estimated_output_bit[i] != test_input_bit[i]) {
 	  if(errors_bit == 0)
@@ -1099,9 +1101,9 @@ int main(int argc, char **argv)
     if (print_perf==1) {
       printf("\ngNB TX function statistics (per %d us slot, NPRB %d, mcs %d, TBS %d, Kr %d (Zc %d))\n",
 	     1000>>*scc->ssbSubcarrierSpacing, g_rbSize, g_mcsIndex,
-	     gNB->dlsch[0][0]->harq_processes[0]->pdsch_pdu.pdsch_pdu_rel15.TBSize[0]<<3,
-	     gNB->dlsch[0][0]->harq_processes[0]->K,
-	     gNB->dlsch[0][0]->harq_processes[0]->K/((gNB->dlsch[0][0]->harq_processes[0]->pdsch_pdu.pdsch_pdu_rel15.TBSize[0]<<3)>3824?22:10));
+	     gNB->dlsch[0][0]->harq_process.pdsch_pdu.pdsch_pdu_rel15.TBSize[0]<<3,
+	     gNB->dlsch[0][0]->harq_process.K,
+	     gNB->dlsch[0][0]->harq_process.K/((gNB->dlsch[0][0]->harq_process.pdsch_pdu.pdsch_pdu_rel15.TBSize[0]<<3)>3824?22:10));
       printDistribution(&gNB->phy_proc_tx,table_tx,"PHY proc tx");
       printStatIndent2(&gNB->dlsch_encoding_stats,"DLSCH encoding time");
       printStatIndent3(&gNB->dlsch_segmentation_stats,"DLSCH segmentation time");

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c

@@ -1597,7 +1597,7 @@ int find_nr_RA_id(module_id_t mod_idP, int CC_idP, rnti_t rntiP) {
 int add_new_nr_ue(module_id_t mod_idP, rnti_t rntiP, NR_CellGroupConfig_t *secondaryCellGroup)
 {
   NR_UE_info_t *UE_info = &RC.nrmac[mod_idP]->UE_info;
-  LOG_W(MAC, "[gNB %d] Adding UE with rnti %x (num_UEs %d)\n",
+  LOG_I(MAC, "[gNB %d] Adding UE with rnti %x (num_UEs %d)\n",
         mod_idP,
         rntiP,
         UE_info->num_UEs);