From 0f57c8e699d6f020bc98e5c65f13d2d66b2f1188 Mon Sep 17 00:00:00 2001 From: francescomani Date: Thu, 10 Nov 2022 11:29:24 +0100 Subject: [PATCH] remove generate_nr_prach --- executables/nr-ue.c | 10 +++------- openair2/LAYER2/NR_MAC_UE/mac_defs.h | 1 - openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c | 12 +++--------- openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c | 3 --- 4 files changed, 6 insertions(+), 20 deletions(-) diff --git a/executables/nr-ue.c b/executables/nr-ue.c index 4c55e0b54c..dd5ce02045 100644 --- a/executables/nr-ue.c +++ b/executables/nr-ue.c @@ -312,18 +312,15 @@ static void check_nr_prach(NR_UE_MAC_INST_t *mac, nr_uplink_indication_t *ul_inf ul_info->frame_tx, ul_info->gNB_index, ul_info->slot_tx); - if (nr_prach == 1) - { + if (nr_prach == 1) { L1_nsa_prach_procedures(ul_info->frame_tx, ul_info->slot_tx, prach_pdu); ul_config->number_pdus = 0; ul_info->ue_sched_mode = SCHED_PUSCH; } - else if (nr_prach == 2) - { + else if (nr_prach == 2) { LOG_I(NR_PHY, "In %s: [UE %d] RA completed, setting UE mode to PUSCH\n", __FUNCTION__, ul_info->module_id); } - else if(nr_prach == 3) - { + else if(nr_prach == 3) { LOG_I(NR_PHY, "In %s: [UE %d] RA failed, setting UE mode to PRACH\n", __FUNCTION__, ul_info->module_id); } } @@ -401,7 +398,6 @@ static void *NRUE_phy_stub_standalone_pnf_task(void *arg) continue; } - mac->ra.generate_nr_prach = 0; int CC_id = 0; uint8_t gNB_id = 0; nr_uplink_indication_t ul_info; diff --git a/openair2/LAYER2/NR_MAC_UE/mac_defs.h b/openair2/LAYER2/NR_MAC_UE/mac_defs.h index 7383cc53ad..5cc47f2241 100644 --- a/openair2/LAYER2/NR_MAC_UE/mac_defs.h +++ b/openair2/LAYER2/NR_MAC_UE/mac_defs.h @@ -228,7 +228,6 @@ typedef struct { typedef enum { RA_UE_IDLE = 0, - GENERATE_IDLE = 0, GENERATE_PREAMBLE = 1, WAIT_RAR = 2, WAIT_CONTENTION_RESOLUTION = 3, diff --git a/openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c b/openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c index 2c162d5087..68b0818672 100644 --- a/openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c +++ b/openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c @@ -894,8 +894,6 @@ uint8_t nr_ue_get_rach(module_id_t mod_id, if(ra->cfra) { // Reset RA_active flag: it disables Msg3 retransmission (8.3 of TS 38.213) nr_ra_succeeded(mod_id, frame, nr_slot_tx); - } else { - ra->generate_nr_prach = GENERATE_IDLE; } } else if (ra->RA_window_cnt == 0 && !ra->RA_RAPID_found) { @@ -910,7 +908,7 @@ uint8_t nr_ue_get_rach(module_id_t mod_id, // Fill in preamble and PRACH resources ra->RA_window_cnt--; - if (ra->generate_nr_prach == GENERATE_PREAMBLE) { + if (ra->ra_state == GENERATE_PREAMBLE) { nr_get_prach_resources(mod_id, CC_id, gNB_id, prach_resources, rach_ConfigDedicated); } } else if (ra->RA_backoff_cnt > 0) { @@ -919,10 +917,9 @@ uint8_t nr_ue_get_rach(module_id_t mod_id, ra->RA_backoff_cnt--; - if ((ra->RA_backoff_cnt > 0 && ra->generate_nr_prach == GENERATE_PREAMBLE) || ra->RA_backoff_cnt == 0) { + if ((ra->RA_backoff_cnt > 0 && ra->ra_state == GENERATE_PREAMBLE) || ra->RA_backoff_cnt == 0) { nr_get_prach_resources(mod_id, CC_id, gNB_id, prach_resources, rach_ConfigDedicated); } - } } } @@ -931,8 +928,7 @@ uint8_t nr_ue_get_rach(module_id_t mod_id, nr_ue_contention_resolution(mod_id, CC_id, frame, nr_slot_tx, prach_resources); } - LOG_D(MAC,"ra->generate_nr_prach %d ra->ra_state %d (GENERATE_IDLE %d)\n",ra->generate_nr_prach,ra->ra_state,GENERATE_IDLE); - return ra->generate_nr_prach; + return ra->ra_state; } void nr_get_RA_window(NR_UE_MAC_INST_t *mac){ @@ -1039,7 +1035,6 @@ void nr_ra_succeeded(module_id_t mod_id, frame_t frame, int slot){ LOG_D(MAC, "In %s: [UE %d] clearing RA_active flag...\n", __FUNCTION__, mod_id); ra->RA_active = 0; - ra->generate_nr_prach = GENERATE_IDLE; ra->ra_state = RA_SUCCEEDED; } @@ -1058,7 +1053,6 @@ void nr_ra_failed(uint8_t mod_id, uint8_t CC_id, NR_PRACH_RESOURCES_t *prach_res ra->first_Msg3 = 1; ra->ra_PreambleIndex = -1; - ra->generate_nr_prach = RA_FAILED; ra->ra_state = RA_UE_IDLE; prach_resources->RA_PREAMBLE_TRANSMISSION_COUNTER++; diff --git a/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c b/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c index 2ac5a6ec7c..1bb36e8228 100644 --- a/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c +++ b/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c @@ -2661,7 +2661,6 @@ void nr_ue_prach_scheduler(module_id_t module_idP, frame_t frameP, sub_frame_t s NR_UE_MAC_INST_t *mac = get_mac_inst(module_idP); RA_config_t *ra = &mac->ra; ra->RA_offset = 2; // to compensate the rx frame offset at the gNB - ra->generate_nr_prach = GENERATE_IDLE; // Reset flag for PRACH generation if(ra->ra_state != GENERATE_PREAMBLE) return; @@ -2701,8 +2700,6 @@ void nr_ue_prach_scheduler(module_id_t module_idP, frame_t frameP, sub_frame_t s if (is_nr_prach_slot) { AssertFatal(NULL != prach_occasion_info_p,"PRACH Occasion Info not returned in a valid NR Prach Slot\n"); - ra->generate_nr_prach = GENERATE_PREAMBLE; - init_RA(module_idP, &ra->prach_resources, setup, rach_ConfigGeneric, ra->rach_ConfigDedicated); nr_get_RA_window(mac);