From f235b249bab70f274ab47bb8010bd07439e486ed Mon Sep 17 00:00:00 2001 From: francescomani Date: Fri, 20 Sep 2024 10:45:41 +0200 Subject: [PATCH] remove FR1 in preprocessor name --- doc/SW_archi.md | 13 ++++--------- openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c | 6 +++--- openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c | 6 +++--- openair2/LAYER2/NR_MAC_gNB/mac_proto.h | 8 ++++---- openair2/LAYER2/NR_MAC_gNB/main.c | 4 ++-- 5 files changed, 16 insertions(+), 21 deletions(-) diff --git a/doc/SW_archi.md b/doc/SW_archi.md index 6ba78ad8f1..205da81b6b 100644 --- a/doc/SW_archi.md +++ b/doc/SW_archi.md @@ -220,14 +220,10 @@ Calls nr_schedule_ulsch(): It is divided into the "preprocessor" and the "postprocessor": the first makes the scheduling decisions, the second fills nFAPI structures to indicate to the PHY what it is supposed to do. To signal which users have how many resources, the preprocessor populates the -NR_sched_pusch_t (for values changing every TTI, e.g., frequency domain -allocation) and NR_sched_pusch_save_t (for values changing less frequently, at -least in FR1 [to my understanding], e.g., DMRS fields when the time domain -allocation stays between TTIs) structures. Furthermore, the preprocessor is an +NR_sched_pusch_t structures. Furthermore, the preprocessor is an exchangeable module that schedules differently based on a particular -use-case/deployment type, e.g., one user for phytest [in -nr_ul_preprocessor_phytest()], multiple users in FR1 -[nr_fr1_ulsch_preprocessor()], or maybe FR2 [does not exist yet]: +use-case/deployment type, e.g., one user for phytest in +[nr_ul_preprocessor_phytest()], multiple users in [nr_ulsch_preprocessor()]: * calls preprocessor via pre_processor_ul(): the preprocessor is responsible for allocating CCEs (using allocate_nr_CCEs()) and deciding on resource allocation for the UEs including TB size. Note that we do not yet have @@ -258,8 +254,7 @@ NR_UE_sched_ctrl_t structure of affected users. In particular, the field rbSize decides whether a user is to be allocated. Furthermore, the preprocessor is an exchangeable module that schedules differently based on a particular use-case/deployment type, e.g., one user for phytest [in -nr_preprocessor_phytest()], multiple users in FR1 -[nr_fr1_dlsch_preprocessor()], or maybe FR2 [does not exist yet]. +nr_preprocessor_phytest()], multiple users [nr_dlsch_preprocessor()]. * calls preprocessor via pre_processor_dl(): the preprocessor is responsible for allocating CCEs and PUCCH (using allocate_nr_CCEs() and nr_acknack_scheduling()) and deciding on the frequency/time domain diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c index 730e954f4b..69b06258dd 100644 --- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c +++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c @@ -861,7 +861,7 @@ static void pf_dl(module_id_t module_id, } } -static void nr_fr1_dlsch_preprocessor(module_id_t module_id, frame_t frame, sub_frame_t slot) +static void nr_dlsch_preprocessor(module_id_t module_id, frame_t frame, sub_frame_t slot) { NR_UEs_t *UE_info = &RC.nrmac[module_id]->UE_info; @@ -889,7 +889,7 @@ static void nr_fr1_dlsch_preprocessor(module_id_t module_id, frame_t frame, sub_ bw); // we set the whole BW as max number } -nr_pp_impl_dl nr_init_fr1_dlsch_preprocessor(int CC_id) { +nr_pp_impl_dl nr_init_dlsch_preprocessor(int CC_id) { /* during initialization: no mutex needed */ /* in the PF algorithm, we have to use the TBsize to compute the coefficient. * This would include the number of DMRS symbols, which in turn depends on @@ -914,7 +914,7 @@ nr_pp_impl_dl nr_init_fr1_dlsch_preprocessor(int CC_id) { } } - return nr_fr1_dlsch_preprocessor; + return nr_dlsch_preprocessor; } void nr_schedule_ue_spec(module_id_t module_id, diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c index 7f849253da..f754c88040 100644 --- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c +++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c @@ -2147,7 +2147,7 @@ static void pf_ul(module_id_t module_id, } } -static bool nr_fr1_ulsch_preprocessor(module_id_t module_id, frame_t frame, sub_frame_t slot) +static bool nr_ulsch_preprocessor(module_id_t module_id, frame_t frame, sub_frame_t slot) { gNB_MAC_INST *nr_mac = RC.nrmac[module_id]; // no UEs @@ -2180,7 +2180,7 @@ static bool nr_fr1_ulsch_preprocessor(module_id_t module_id, frame_t frame, sub_ return true; } -nr_pp_impl_ul nr_init_fr1_ulsch_preprocessor(int CC_id) +nr_pp_impl_ul nr_init_ulsch_preprocessor(int CC_id) { /* during initialization: no mutex needed */ /* in the PF algorithm, we have to use the TBsize to compute the coefficient. @@ -2208,7 +2208,7 @@ nr_pp_impl_ul nr_init_fr1_ulsch_preprocessor(int CC_id) >> 3; } } - return nr_fr1_ulsch_preprocessor; + return nr_ulsch_preprocessor; } void nr_schedule_ulsch(module_id_t module_id, frame_t frame, sub_frame_t slot, nfapi_nr_ul_dci_request_t *ul_dci_req) diff --git a/openair2/LAYER2/NR_MAC_gNB/mac_proto.h b/openair2/LAYER2/NR_MAC_gNB/mac_proto.h index 36c063bd32..d9be5572a7 100644 --- a/openair2/LAYER2/NR_MAC_gNB/mac_proto.h +++ b/openair2/LAYER2/NR_MAC_gNB/mac_proto.h @@ -82,8 +82,8 @@ void nr_schedule_ue_spec(module_id_t module_id, nfapi_nr_dl_tti_request_t *DL_req, nfapi_nr_tx_data_request_t *TX_req); -/* \brief default FR1 DL preprocessor init routine, returns preprocessor to call */ -nr_pp_impl_dl nr_init_fr1_dlsch_preprocessor(int CC_id); +/* \brief default DL preprocessor init routine, returns preprocessor to call */ +nr_pp_impl_dl nr_init_dlsch_preprocessor(int CC_id); void schedule_nr_sib1(module_id_t module_idP, frame_t frameP, @@ -108,8 +108,8 @@ void schedule_nr_mib(module_id_t module_idP, frame_t frameP, sub_frame_t slotP, * messages, statistics, HARQ handling, ... */ void nr_schedule_ulsch(module_id_t module_id, frame_t frame, sub_frame_t slot, nfapi_nr_ul_dci_request_t *ul_dci_req); -/* \brief default FR1 UL preprocessor init routine, returns preprocessor to call */ -nr_pp_impl_ul nr_init_fr1_ulsch_preprocessor(int CC_id); +/* \brief default UL preprocessor init routine, returns preprocessor to call */ +nr_pp_impl_ul nr_init_ulsch_preprocessor(int CC_id); /////// Random Access MAC-PHY interface functions and primitives /////// diff --git a/openair2/LAYER2/NR_MAC_gNB/main.c b/openair2/LAYER2/NR_MAC_gNB/main.c index f8e6d120de..809ab825aa 100644 --- a/openair2/LAYER2/NR_MAC_gNB/main.c +++ b/openair2/LAYER2/NR_MAC_gNB/main.c @@ -294,8 +294,8 @@ void mac_top_init_gNB(ngran_node_t node_type, RC.nrmac[i]->pre_processor_dl = nr_preprocessor_phytest; RC.nrmac[i]->pre_processor_ul = nr_ul_preprocessor_phytest; } else { - RC.nrmac[i]->pre_processor_dl = nr_init_fr1_dlsch_preprocessor(0); - RC.nrmac[i]->pre_processor_ul = nr_init_fr1_ulsch_preprocessor(0); + RC.nrmac[i]->pre_processor_dl = nr_init_dlsch_preprocessor(0); + RC.nrmac[i]->pre_processor_ul = nr_init_ulsch_preprocessor(0); } if (!IS_SOFTMODEM_NOSTATS_BIT) threadCreate(&RC.nrmac[i]->stats_thread, nrmac_stats_thread, (void*)RC.nrmac[i], "MAC_STATS", -1, sched_get_priority_min(SCHED_OAI)+1 );