some more cleanup

common/openairinterface5g_limits.h

@@ -14,8 +14,6 @@
 #        define NUMBER_OF_SCH_STATS_MAX 16
 #        define NUMBER_OF_NR_SCH_STATS_MAX 16
 
-#        define NUMBER_OF_NR_PDCCH_MAX 16
-
 #define MAX_MANAGED_ENB_PER_MOBILE  2
 #define MAX_MANAGED_GNB_PER_MOBILE  2
 

executables/nr-gnb.c

@@ -206,14 +206,6 @@ void rx_func(void *param) {
         gNB->pucch[j]->pucch_pdu.rnti = 0;
         pucch_removed++;
       }
-#if 0
-    for (j = 0; j < NUMBER_OF_NR_PDCCH_MAX; j++)
-      gNB->pdcch_pdu[j].frame = -1;
-    for (j = 0; j < NUMBER_OF_NR_PDCCH_MAX; j++)
-      gNB->ul_pdcch_pdu[j].frame = -1;
-    for (j = 0; j < NUMBER_OF_NR_PRACH_MAX; j++)
-      gNB->prach_vars.list[j].frame = -1;
-#endif
   }
   if (rnti_to_remove_count) LOG_W(NR_PHY, "to remove rnti_to_remove_count=%d, up_removed=%d down_removed=%d pucch_removed=%d\n", rnti_to_remove_count, up_removed, down_removed, pucch_removed);
   rnti_to_remove_count = 0;

openair1/PHY/NR_TRANSPORT/nr_prach.c

@@ -39,20 +39,19 @@ extern uint16_t prach_root_sequence_map_abc[138];
 extern uint16_t nr_du[838];
 extern const char *prachfmt[];
 
-void init_prach_list(PHY_VARS_gNB *gNB) {
-
+void init_prach_list(PHY_VARS_gNB *gNB)
+{
   AssertFatal(gNB!=NULL,"gNB is null\n");
   for (int i=0; i<NUMBER_OF_NR_PRACH_MAX; i++){
-		gNB->prach_vars.list[i].frame = -1;
-		gNB->prach_vars.list[i].slot  = -1;
-	}
+    gNB->prach_vars.list[i].frame = -1;
+    gNB->prach_vars.list[i].slot  = -1;
+  }
 }
 
-void free_nr_prach_entry(PHY_VARS_gNB *gNB, int prach_id) {
-
+void free_nr_prach_entry(PHY_VARS_gNB *gNB, int prach_id)
+{
   gNB->prach_vars.list[prach_id].frame = -1;
-	gNB->prach_vars.list[prach_id].slot  = -1;
-
+  gNB->prach_vars.list[prach_id].slot  = -1;
 }
 
 int16_t find_nr_prach(PHY_VARS_gNB *gNB,int frame, int slot, find_type_t type) {

openair1/PHY/defs_gNB.h

@@ -626,8 +626,6 @@ typedef struct PHY_VARS_gNB_s {
   NR_gNB_PUSCH       *pusch_vars[NUMBER_OF_NR_ULSCH_MAX];
   NR_gNB_PUCCH_t     **pucch;
   NR_gNB_SRS_t       **srs;
-  NR_gNB_PDCCH_t     pdcch_pdu[NUMBER_OF_NR_PDCCH_MAX];
-  NR_gNB_UL_PDCCH_t  ul_pdcch_pdu[NUMBER_OF_NR_PDCCH_MAX];
   NR_gNB_DLSCH_t     *dlsch[NUMBER_OF_NR_DLSCH_MAX][2];    // Nusers times two spatial streams
   NR_gNB_ULSCH_t     *ulsch[NUMBER_OF_NR_ULSCH_MAX];  // [Nusers times]
   /// statistics for DLSCH measurement collection