maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
francescomani
2025-12-09 13:45:25 +01:00
parent f2a7fb5336
commit 55c8a7bef0
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
+5 -5
View File
@@ -104,7 +104,7 @@ static int16_t ssb_index_from_prach(module_id_t module_idP,
int config_period = cc->prach_info.x; 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 = 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 = 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; + (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 //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 // so that a pattern between PRACH occasions and SS/PBCH block indexes repeats at most every 160 msec
int total_RA_occasions = 0; int total_RA_occasions = 0;
for (int i = 1; (1 << (i - 1)) <= prach_info.max_association_period; i++) { for (int i = 1; (1 << (i - 1)) <= prach_info.max_association_period; i++) {
cc->max_association_period = (1 << (i - 1)); cc->association_period = (1 << (i - 1));
int temp_RA_occasions = cc->total_prach_occasions_per_config_period * cc->max_association_period; 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)) { if(temp_RA_occasions >= (int) (num_active_ssb / num_ssb_per_RO)) {
total_RA_occasions = temp_RA_occasions; total_RA_occasions = temp_RA_occasions;
repetition = (uint16_t)((total_RA_occasions * num_ssb_per_RO) / num_active_ssb); 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->total_prach_occasions,
cc->num_active_ssb, cc->num_active_ssb,
unused_RA_occasion, unused_RA_occasion,
cc->max_association_period, cc->association_period,
prach_info.N_RA_sfn, prach_info.N_RA_sfn,
cc->total_prach_occasions_per_config_period); 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; nfapi_nr_prach_pdu_t *prach_pdu = &newpdu->prach_pdu;
for (int td_index = 0; td_index < N_t_slot; td_index++) { for (int td_index = 0; td_index < N_t_slot; td_index++) {
uint32_t config_period = cc->prach_info.x; 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; (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? if (prach_occasion_id >= cc->total_prach_occasions) // to be confirmed: unused occasion?
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
+1 -1
View File
@@ -319,7 +319,7 @@ typedef struct {
//Total available prach occasions //Total available prach occasions
int total_prach_occasions; int total_prach_occasions;
//Max Association period //Max Association period
int max_association_period; int association_period;
//SSB index //SSB index
uint8_t ssb_index[MAX_NUM_OF_SSB]; uint8_t ssb_index[MAX_NUM_OF_SSB];
//CB preambles for each SSB //CB preambles for each SSB