rename max_association_period to association_period to better reflect the role of the field

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c

@@ -104,7 +104,7 @@ static int16_t ssb_index_from_prach(module_id_t module_idP,
   int config_period = cc->prach_info.x;
   //  prach_occasion_id = subframe_index * N_t_slot * N_RA_slot * fdm + N_RA_slot_index * N_t_slot * fdm + freq_index + fdm * start_symbol_index;
   prach_occasion_id =
-      (((frameP % (cc->max_association_period * config_period)) / config_period) * cc->total_prach_occasions_per_config_period)
+      (((frameP % (cc->association_period * config_period)) / config_period) * cc->total_prach_occasions_per_config_period)
       + (RA_sfn_index + slot_index) * cc->prach_info.N_t_slot * fdm + start_symbol_index * fdm + freq_index;
 
   //one SSB have more than one continuous RO
@@ -194,8 +194,8 @@ void find_SSB_and_RO_available(gNB_MAC_INST *nrmac)
   // so that a pattern between PRACH occasions and SS/PBCH block indexes repeats at most every 160 msec
   int total_RA_occasions = 0;
   for (int i = 1; (1 << (i - 1)) <= prach_info.max_association_period; i++) {
-    cc->max_association_period = (1 << (i - 1));
-    int temp_RA_occasions = cc->total_prach_occasions_per_config_period * cc->max_association_period;
+    cc->association_period = (1 << (i - 1));
+    int temp_RA_occasions = cc->total_prach_occasions_per_config_period * cc->association_period;
     if(temp_RA_occasions >= (int) (num_active_ssb / num_ssb_per_RO)) {
       total_RA_occasions = temp_RA_occasions;
       repetition = (uint16_t)((total_RA_occasions * num_ssb_per_RO) / num_active_ssb);
@@ -215,7 +215,7 @@ void find_SSB_and_RO_available(gNB_MAC_INST *nrmac)
         cc->total_prach_occasions,
         cc->num_active_ssb,
         unused_RA_occasion,
-        cc->max_association_period,
+        cc->association_period,
         prach_info.N_RA_sfn,
         cc->total_prach_occasions_per_config_period);
 }
@@ -408,7 +408,7 @@ void schedule_nr_prach(module_id_t module_idP, frame_t frameP, slot_t slotP)
         nfapi_nr_prach_pdu_t *prach_pdu = &newpdu->prach_pdu;
         for (int td_index = 0; td_index < N_t_slot; td_index++) {
           uint32_t config_period = cc->prach_info.x;
-          prach_occasion_id = (((frameP % (cc->max_association_period * config_period))/config_period) * cc->total_prach_occasions_per_config_period) +
+          prach_occasion_id = (((frameP % (cc->association_period * config_period))/config_period) * cc->total_prach_occasions_per_config_period) +
                               (RA_sfn_index + slot_index) * N_t_slot * fdm + td_index * fdm + fdm_index;
 
           if (prach_occasion_id >= cc->total_prach_occasions) // to be confirmed: unused occasion?

openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h

@@ -319,7 +319,7 @@ typedef struct {
   //Total available prach occasions
   int total_prach_occasions;
   //Max Association period
-  int max_association_period;
+  int association_period;
   //SSB index
   uint8_t ssb_index[MAX_NUM_OF_SSB];
   //CB preambles for each SSB