Fix incorrect merge

openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c

@@ -105,7 +105,7 @@ NR_gNB_ULSCH_t *new_gNB_ulsch(uint8_t max_ldpc_iterations,uint16_t N_RB_UL, uint
 {
 
   NR_gNB_ULSCH_t *ulsch;
-  uint8_t exit_flag = 0,i,r;
+  uint8_t i,r;
   uint16_t a_segments = MAX_NUM_NR_ULSCH_SEGMENTS;  //number of segments to be allocated
 
   if (N_RB_UL != 273) {
@@ -116,63 +116,22 @@ NR_gNB_ULSCH_t *new_gNB_ulsch(uint8_t max_ldpc_iterations,uint16_t N_RB_UL, uint
   uint16_t ulsch_bytes = a_segments*1056;  // allocated bytes per segment
   ulsch = (NR_gNB_ULSCH_t *)malloc16(sizeof(NR_gNB_ULSCH_t));
 
-  if (ulsch) {
-
-    memset(ulsch,0,sizeof(NR_gNB_ULSCH_t));
-
   ulsch->max_ldpc_iterations = max_ldpc_iterations;
   ulsch->Mlimit = 4;
 
   for (i=0; i<NR_MAX_ULSCH_HARQ_PROCESSES; i++) {
 
-      ulsch->harq_processes[i] = (NR_UL_gNB_HARQ_t *)malloc16(sizeof(NR_UL_gNB_HARQ_t));
-
-      if (ulsch->harq_processes[i]) {
-
-        memset(ulsch->harq_processes[i],0,sizeof(NR_UL_gNB_HARQ_t));
-
-        ulsch->harq_processes[i]->b = (uint8_t*)malloc16(ulsch_bytes);
-
-        if (ulsch->harq_processes[i]->b)
-          memset(ulsch->harq_processes[i]->b,0,ulsch_bytes);
-        else
-          exit_flag=3;
-
+    ulsch->harq_processes[i] = (NR_UL_gNB_HARQ_t *)malloc16_clear(sizeof(NR_UL_gNB_HARQ_t));
+    ulsch->harq_processes[i]->b = (uint8_t*)malloc16_clear(ulsch_bytes);
     if (abstraction_flag == 0) {
       for (r=0; r<a_segments; r++) {
-
-            ulsch->harq_processes[i]->c[r] = (uint8_t*)malloc16(8448*sizeof(uint8_t));
-
-            if (ulsch->harq_processes[i]->c[r])
-              memset(ulsch->harq_processes[i]->c[r],0,8448*sizeof(uint8_t));
-            else
-              exit_flag=2;
-
-            ulsch->harq_processes[i]->d[r] = (int16_t*)malloc16((68*384)*sizeof(int16_t));
-
-            if (ulsch->harq_processes[i]->d[r])
-              memset(ulsch->harq_processes[i]->d[r],0,(68*384)*sizeof(int16_t));
-            else
-              exit_flag=2;
-
-            ulsch->harq_processes[i]->w[r] = (int16_t*)malloc16((3*(6144+64))*sizeof(int16_t));
-
-            if (ulsch->harq_processes[i]->w[r])
-              memset(ulsch->harq_processes[i]->w[r],0,(3*(6144+64))*sizeof(int16_t));
-            else
-              exit_flag=2;
+        ulsch->harq_processes[i]->c[r] = (uint8_t*)malloc16_clear(8448*sizeof(uint8_t));
+        ulsch->harq_processes[i]->d[r] = (int16_t*)malloc16_clear((68*384)*sizeof(int16_t));
+        ulsch->harq_processes[i]->w[r] = (int16_t*)malloc16_clear((3*(6144+64))*sizeof(int16_t));
       }
     }
-      } else {
-        exit_flag=1;
-      }
   }
 
-    if (exit_flag==0)
-      return(ulsch);
-  }
-  printf("new_gNB_ulsch with size %zu: exit_flag = %hhu\n",sizeof(NR_UL_gNB_HARQ_t), exit_flag);
-  free_gNB_ulsch(&ulsch,N_RB_UL);
   return(NULL);
 }
 

openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c

@@ -312,8 +312,6 @@ void nr_processDLSegment(void* arg) {
   t_nrLDPC_time_stats procTime = {0};
   t_nrLDPC_time_stats* p_procTime     = &procTime ;
 
-  t_nrLDPC_procBuf **p_nrLDPC_procBuf = harq_process->p_nrLDPC_procBuf;
-
   start_meas(&rdata->ts_deinterleave);
   //VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_DLSCH_DEINTERLEAVING, VCD_FUNCTION_IN);
   nr_deinterleaving_ldpc(E,