From 5ac703b58039661a62af076590f5394fb7d02edf Mon Sep 17 00:00:00 2001 From: Sakthivel Velumani Date: Thu, 28 Nov 2024 15:01:14 -0500 Subject: [PATCH] Code cleanup Add const to function input pointer. --- executables/nr-ue.c | 7 ++++--- openair1/SCHED_NR_UE/phy_frame_config_nr.h | 2 +- openair1/SCHED_NR_UE/phy_frame_config_nr_ue.c | 12 ++++++------ openair2/LAYER2/NR_MAC_UE/mac_proto.h | 2 +- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/executables/nr-ue.c b/executables/nr-ue.c index e2882b4224..e883170438 100644 --- a/executables/nr-ue.c +++ b/executables/nr-ue.c @@ -443,6 +443,7 @@ static void UE_synch(void *arg) { static void RU_write(nr_rxtx_thread_data_t *rxtxD, bool sl_tx_action) { PHY_VARS_NR_UE *UE = rxtxD->UE; + const fapi_nr_config_request_t *cfg = &UE->nrUE_config; const UE_nr_rxtx_proc_t *proc = &rxtxD->proc; NR_DL_FRAME_PARMS *fp = &UE->frame_parms; @@ -466,10 +467,10 @@ static void RU_write(nr_rxtx_thread_data_t *rxtxD, bool sl_tx_action) flags = TX_BURST_START_AND_END; } else { int slots_frame = fp->slots_per_frame; - int curr_slot = nr_ue_slot_select(&UE->nrUE_config, slot); + int curr_slot = nr_ue_slot_select(cfg, slot); if (curr_slot != NR_DOWNLINK_SLOT) { - int next_slot = nr_ue_slot_select(&UE->nrUE_config, (slot + 1) % slots_frame); - int prev_slot = nr_ue_slot_select(&UE->nrUE_config, (slot + slots_frame - 1) % slots_frame); + int next_slot = nr_ue_slot_select(cfg, (slot + 1) % slots_frame); + int prev_slot = nr_ue_slot_select(cfg, (slot + slots_frame - 1) % slots_frame); if (prev_slot == NR_DOWNLINK_SLOT) flags = TX_BURST_START; else if (next_slot == NR_DOWNLINK_SLOT) diff --git a/openair1/SCHED_NR_UE/phy_frame_config_nr.h b/openair1/SCHED_NR_UE/phy_frame_config_nr.h index 59df0ba959..359722a7be 100644 --- a/openair1/SCHED_NR_UE/phy_frame_config_nr.h +++ b/openair1/SCHED_NR_UE/phy_frame_config_nr.h @@ -72,7 +72,7 @@ int slot_select_nr(NR_DL_FRAME_PARMS *frame_parms, int nr_frame, int nr_slot); * @param nr_slot : slot number @returns int : downlink, uplink or mixed slot type */ -int nr_ue_slot_select(fapi_nr_config_request_t *cfg, int nr_slot); +int nr_ue_slot_select(const fapi_nr_config_request_t *cfg, int nr_slot); /** \brief This function frees tdd configuration for nr * @param frame_parms NR DL Frame parameters diff --git a/openair1/SCHED_NR_UE/phy_frame_config_nr_ue.c b/openair1/SCHED_NR_UE/phy_frame_config_nr_ue.c index f2541d21b3..4fbe241223 100644 --- a/openair1/SCHED_NR_UE/phy_frame_config_nr_ue.c +++ b/openair1/SCHED_NR_UE/phy_frame_config_nr_ue.c @@ -39,7 +39,7 @@ * *********************************************************************/ -int nr_ue_slot_select(fapi_nr_config_request_t *cfg, int nr_slot) +int nr_ue_slot_select(const fapi_nr_config_request_t *cfg, int nr_slot) { if (cfg->cell_config.frame_duplex_type == FDD) return NR_UPLINK_SLOT | NR_DOWNLINK_SLOT; @@ -47,7 +47,7 @@ int nr_ue_slot_select(fapi_nr_config_request_t *cfg, int nr_slot) int period = cfg->tdd_table_1.tdd_period_in_slots + (cfg->tdd_table_2 ? cfg->tdd_table_2->tdd_period_in_slots : 0); int rel_slot = nr_slot % period; - fapi_nr_tdd_table_t *tdd_table = &cfg->tdd_table_1; + const fapi_nr_tdd_table_t *tdd_table = &cfg->tdd_table_1; if (cfg->tdd_table_2 && rel_slot >= tdd_table->tdd_period_in_slots) { rel_slot -= tdd_table->tdd_period_in_slots; tdd_table = cfg->tdd_table_2; @@ -56,7 +56,7 @@ int nr_ue_slot_select(fapi_nr_config_request_t *cfg, int nr_slot) if (tdd_table->max_tdd_periodicity_list == NULL) // this happens before receiving TDD configuration return NR_DOWNLINK_SLOT; - fapi_nr_max_tdd_periodicity_t *current_slot = &tdd_table->max_tdd_periodicity_list[rel_slot]; + const fapi_nr_max_tdd_periodicity_t *current_slot = &tdd_table->max_tdd_periodicity_list[rel_slot]; // if the 1st symbol is UL the whole slot is UL if (current_slot->max_num_of_symbol_per_slot_list[0].slot_config == 1) @@ -109,7 +109,7 @@ uint8_t sl_determine_if_sidelink_slot(uint8_t sl_startsym, uint8_t sl_lensym, ui * Mixed Slot is a sidelink slot if the uplink symbols in Mixed slot * overlaps with Sidelink start symbol and number of symbols. */ -int sl_nr_ue_slot_select(sl_nr_phy_config_request_t *cfg, int slot, uint8_t frame_duplex_type) +int sl_nr_ue_slot_select(const sl_nr_phy_config_request_t *cfg, int slot, uint8_t frame_duplex_type) { int ul_sym = 0, slot_type = 0; @@ -122,9 +122,9 @@ int sl_nr_ue_slot_select(sl_nr_phy_config_request_t *cfg, int slot, uint8_t fram int period = cfg->tdd_table.tdd_period_in_slots; int rel_slot = slot % period; - fapi_nr_tdd_table_t *tdd_table = &cfg->tdd_table; + const fapi_nr_tdd_table_t *tdd_table = &cfg->tdd_table; - fapi_nr_max_tdd_periodicity_t *current_slot = &tdd_table->max_tdd_periodicity_list[rel_slot]; + const fapi_nr_max_tdd_periodicity_t *current_slot = &tdd_table->max_tdd_periodicity_list[rel_slot]; for (int symbol_count = 0; symbol_count < NR_NUMBER_OF_SYMBOLS_PER_SLOT; symbol_count++) { if (current_slot->max_num_of_symbol_per_slot_list[symbol_count].slot_config == 1) { diff --git a/openair2/LAYER2/NR_MAC_UE/mac_proto.h b/openair2/LAYER2/NR_MAC_UE/mac_proto.h index 094d1e5965..2f3acadeca 100644 --- a/openair2/LAYER2/NR_MAC_UE/mac_proto.h +++ b/openair2/LAYER2/NR_MAC_UE/mac_proto.h @@ -447,7 +447,7 @@ uint8_t sl_determine_sci_1a_len(uint16_t *num_subchannels, * @param nr_slot : slot number * @param frame duplex type : Frame type @returns int : 0 or Sidelink slot type */ -int sl_nr_ue_slot_select(sl_nr_phy_config_request_t *cfg, int nr_slot, uint8_t frame_duplex_type); +int sl_nr_ue_slot_select(const sl_nr_phy_config_request_t *cfg, int nr_slot, uint8_t frame_duplex_type); void nr_ue_sidelink_scheduler(nr_sidelink_indication_t *sl_ind, NR_UE_MAC_INST_t *mac);