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

remove unnecessary input in get_cce_index

Browse Source
This commit is contained in:
francescomani
2025-09-01 17:17:06 +02:00
parent fbb78ad825
commit 169de8cdca
6 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
+1 -3
View File
@@ -915,7 +915,6 @@ static void nr_generate_Msg3_retransmission(module_id_t module_idP,
ss,
coreset,
&UE->UE_sched_ctrl.sched_pdcch,
true,
0);
if (CCEIndex < 0) {
LOG_E(NR_MAC, "UE %04x cannot find free CCE!\n", UE->rnti);
@@ -1507,7 +1506,7 @@ static void nr_generate_Msg2(module_id_t module_idP,
}
uint8_t aggregation_level;
int CCEIndex = get_cce_index(nr_mac, CC_id, slotP, 0, &aggregation_level, beam.idx, ss, coreset, &sched_ctrl->sched_pdcch, true, 0);
int CCEIndex = get_cce_index(nr_mac, CC_id, slotP, 0, &aggregation_level, beam.idx, ss, coreset, &sched_ctrl->sched_pdcch, 0);
if (CCEIndex < 0) {
LOG_W(NR_MAC, "UE %04x: %d.%d cannot find free CCE for Msg2!\n", UE->rnti, frameP, slotP);
@@ -1707,7 +1706,6 @@ static void nr_generate_Msg4_MsgB(module_id_t module_idP,
ss,
coreset,
&sched_ctrl->sched_pdcch,
true,
0);
if (CCEIndex < 0) {
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
-2
View File
@@ -551,7 +551,6 @@ static bool allocate_dl_retransmission(module_id_t module_id,
sched_ctrl->search_space,
sched_ctrl->coreset,
&sched_ctrl->sched_pdcch,
false,
sched_ctrl->pdcch_cl_adjust);
if (CCEIndex<0) {
sched_ctrl->dl_cce_fail++;
@@ -811,7 +810,6 @@ static void pf_dl(module_id_t module_id,
sched_ctrl->search_space,
sched_ctrl->coreset,
&sched_ctrl->sched_pdcch,
false,
sched_ctrl->pdcch_cl_adjust);
if (CCEIndex < 0) {
sched_ctrl->dl_cce_fail++;
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
-2
View File
@@ -139,7 +139,6 @@ void nr_preprocessor_phytest(module_id_t module_id, frame_t frame, slot_t slot)
sched_ctrl->search_space,
sched_ctrl->coreset,
&sched_ctrl->sched_pdcch,
false,
0);
AssertFatal(CCEIndex >= 0, "Could not find CCE for UE %04x\n", UE->rnti);
@@ -286,7 +285,6 @@ void nr_ul_preprocessor_phytest(gNB_MAC_INST *nr_mac, post_process_pusch_t *pp_p
sched_ctrl->search_space,
sched_ctrl->coreset,
&sched_ctrl->sched_pdcch,
false,
0);
if (CCEIndex < 0) {
LOG_E(MAC, "%s(): CCE list not empty, couldn't schedule PUSCH\n", __func__);
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
+1 -2
View File
@@ -572,10 +572,9 @@ int get_cce_index(const gNB_MAC_INST *nrmac,
const NR_SearchSpace_t *ss,
const NR_ControlResourceSet_t *coreset,
NR_sched_pdcch_t *sched_pdcch,
bool is_common,
float pdcch_cl_adjust)
{
const uint32_t Y = is_common ? 0 : get_Y(ss, slot, rnti);
const uint32_t Y = get_Y(ss, slot, rnti);
uint8_t nr_of_candidates;
int agg_level_search_order[NUM_PDCCH_AGG_LEVELS];
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
-2
View File
@@ -1876,7 +1876,6 @@ static bool allocate_ul_retransmission(gNB_MAC_INST *nrmac,
sched_ctrl->search_space,
sched_ctrl->coreset,
&sched_ctrl->sched_pdcch,
false,
sched_ctrl->pdcch_cl_adjust);
if (CCEIndex<0) {
LOG_D(NR_MAC, "[UE %04x][%4d.%2d] no free CCE for retransmission UL DCI UE\n", UE->rnti, frame, slot);
@@ -2125,7 +2124,6 @@ static int pf_ul(gNB_MAC_INST *nrmac,
sched_ctrl->search_space,
sched_ctrl->coreset,
&sched_ctrl->sched_pdcch,
false,
sched_ctrl->pdcch_cl_adjust);
if (CCEIndex < 0) {
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
-1
View File
@@ -431,7 +431,6 @@ int get_cce_index(const gNB_MAC_INST *nrmac,
const NR_SearchSpace_t *ss,
const NR_ControlResourceSet_t *coreset,
NR_sched_pdcch_t *sched_pdcch,
bool is_common,
float pdcch_cl_adjust);
bool nr_find_nb_rb(uint16_t Qm,