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

some cleanup and improvements for default PUCCH on gNB

Browse Source
This commit is contained in:
francescomani
2026-04-07 10:07:07 +02:00
parent 2407c35633
commit 5d8e79521e
2 changed files with 16 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
+16 -26
View File
@@ -1287,13 +1287,6 @@ const int default_pucch_numbsymb[] = {2,2,2,2,4,4,4,4,10,10,10,10,14,14,14,14,1
const int default_pucch_prboffset[] = {0,0,3,0,0,2,4,0,0,2,4,0,0,2,4,-1}; const int default_pucch_prboffset[] = {0,0,3,0,0,2,4,0,0,2,4,0,0,2,4,-1};
const int default_pucch_csset[] = {2,3,3,2,4,4,4,2,4,4,4,2,4,4,4,4}; const int default_pucch_csset[] = {2,3,3,2,4,4,4,2,4,4,4,2,4,4,4,4};
int nr_get_default_pucch_res(int pucch_ResourceCommon) {
AssertFatal(pucch_ResourceCommon>=0 && pucch_ResourceCommon < 16, "illegal pucch_ResourceCommon %d\n",pucch_ResourceCommon);
return(default_pucch_csset[pucch_ResourceCommon]);
}
void nr_configure_pdcch(nfapi_nr_dl_tti_pdcch_pdu_rel15_t *pdcch_pdu, NR_ControlResourceSet_t *coreset, NR_sched_pdcch_t *pdcch) void nr_configure_pdcch(nfapi_nr_dl_tti_pdcch_pdu_rel15_t *pdcch_pdu, NR_ControlResourceSet_t *coreset, NR_sched_pdcch_t *pdcch)
{ {
pdcch_pdu->BWPSize = pdcch->BWPSize; pdcch_pdu->BWPSize = pdcch->BWPSize;
@@ -1543,13 +1536,17 @@ void nr_configure_pucch(nfapi_nr_pucch_pdu_t *pucch_pdu,
pucch_pdu->freq_hop_flag = 1; pucch_pdu->freq_hop_flag = 1;
pucch_pdu->second_hop_prb = second_hop_prb; pucch_pdu->second_hop_prb = second_hop_prb;
pucch_pdu->format_type = default_pucch_fmt[rsetindex]; pucch_pdu->format_type = default_pucch_fmt[rsetindex];
pucch_pdu->initial_cyclic_shift = r_pucch%default_pucch_csset[rsetindex]; int initial_cyclic_shift_idx = (r_pucch % 8) % default_pucch_csset[rsetindex];
if (rsetindex==3||rsetindex==7||rsetindex==11) pucch_pdu->initial_cyclic_shift*=6; if (rsetindex == 3 || rsetindex == 7 || rsetindex == 11)
else if (rsetindex==1||rsetindex==2) pucch_pdu->initial_cyclic_shift*=4; pucch_pdu->initial_cyclic_shift = initial_cyclic_shift_idx * 6;
else pucch_pdu->initial_cyclic_shift*=3; else if (rsetindex == 1 || rsetindex == 2)
pucch_pdu->initial_cyclic_shift = initial_cyclic_shift_idx * 4;
else
pucch_pdu->initial_cyclic_shift = initial_cyclic_shift_idx * 3;
pucch_pdu->nr_of_symbols = nr_of_symb; pucch_pdu->nr_of_symbols = nr_of_symb;
pucch_pdu->start_symbol_index = start_symb; pucch_pdu->start_symbol_index = start_symb;
if (pucch_pdu->format_type == 1) pucch_pdu->time_domain_occ_idx = 0; // check this!! if (pucch_pdu->format_type == 1)
pucch_pdu->time_domain_occ_idx = 0; // check this!!
pucch_pdu->sr_flag = O_sr; pucch_pdu->sr_flag = O_sr;
pucch_pdu->prb_size=1; pucch_pdu->prb_size=1;
} }
@@ -1567,21 +1564,14 @@ void set_r_pucch_parms(int rsetindex,
int *prb_start, int *prb_start,
int *second_hop_prb, int *second_hop_prb,
int *nr_of_symbols, int *nr_of_symbols,
int *start_symbol_index) { int *start_symbol_index)
{
// procedure described in 38.213 section 9.2.1 // procedure described in 38.213 section 9.2.1
int prboffset = (r_pucch % 8) / default_pucch_csset[rsetindex];
int prboffset = r_pucch/default_pucch_csset[rsetindex]; int offset1 = default_pucch_prboffset[rsetindex] + prboffset;
int prboffsetm8 = (r_pucch-8)/default_pucch_csset[rsetindex]; int offset2 = bwp_size - 1 - default_pucch_prboffset[rsetindex] - prboffset;
*prb_start = (r_pucch >> 3) == 0 ? offset1 : offset2;
*prb_start = (r_pucch>>3)==0 ? *second_hop_prb = (r_pucch >> 3) == 0 ? offset2 : offset1;
default_pucch_prboffset[rsetindex] + prboffset:
bwp_size-1-default_pucch_prboffset[rsetindex]-prboffsetm8;
*second_hop_prb = (r_pucch>>3)==0?
bwp_size-1-default_pucch_prboffset[rsetindex]-prboffset:
default_pucch_prboffset[rsetindex] + prboffsetm8;
*nr_of_symbols = default_pucch_numbsymb[rsetindex]; *nr_of_symbols = default_pucch_numbsymb[rsetindex];
*start_symbol_index = default_pucch_firstsymb[rsetindex]; *start_symbol_index = default_pucch_firstsymb[rsetindex];
} }
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
-1
View File
@@ -298,7 +298,6 @@ bool add_connected_nr_ue(gNB_MAC_INST *nr_mac, NR_UE_info_t *UE);
bool nr_check_Msg4_MsgB_Ack(module_id_t module_id, frame_t frame, slot_t slot, NR_UE_info_t *UE, bool success); bool nr_check_Msg4_MsgB_Ack(module_id_t module_id, frame_t frame, slot_t slot, NR_UE_info_t *UE, bool success);
void mac_remove_nr_ue(gNB_MAC_INST *nr_mac, rnti_t rnti); void mac_remove_nr_ue(gNB_MAC_INST *nr_mac, rnti_t rnti);
NR_UE_info_t *get_new_nr_ue_inst(uid_allocator_t *uia, rnti_t rnti, NR_CellGroupConfig_t *CellGroup, const nr_mac_config_t *config); NR_UE_info_t *get_new_nr_ue_inst(uid_allocator_t *uia, rnti_t rnti, NR_CellGroupConfig_t *CellGroup, const nr_mac_config_t *config);
int nr_get_default_pucch_res(int pucch_ResourceCommon);
nfapi_nr_pusch_pdu_t *prepare_pusch_pdu(nfapi_nr_ul_tti_request_t *future_ul_tti_req, nfapi_nr_pusch_pdu_t *prepare_pusch_pdu(nfapi_nr_ul_tti_request_t *future_ul_tti_req,
const NR_UE_info_t *UE, const NR_UE_info_t *UE,
const NR_ServingCellConfigCommon_t *scc, const NR_ServingCellConfigCommon_t *scc,