Skip to content

O
OpenXG-RAN
Commit a66f6907 authored by Francesco Mani's avatar Francesco Mani
Browse files
Options

bufix in calling phy pucch function

parent 80571bb8
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 24 deletions
openair1/SCHED_NR/phy_procedures_nr_gNB.c
View file @ a66f6907
...@@ -387,30 +387,35 @@ void phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx) ...@@ -387,30 +387,35 @@ void phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx)
for (int i=0;i<NUMBER_OF_NR_PUCCH_MAX;i++){ for (int i=0;i<NUMBER_OF_NR_PUCCH_MAX;i++){
NR_gNB_PUCCH_t *pucch = gNB->pucch[i]; NR_gNB_PUCCH_t *pucch = gNB->pucch[i];
if (pucch) { if (pucch) {
nfapi_nr_pucch_pdu_t *pucch_pdu = &pucch[i].pucch_pdu; if ((pucch->active == 1) &&
uint16_t num_ucis; (pucch->frame == frame_rx) &&
(pucch->slot == slot_rx) ) {
switch (pucch_pdu->format_type) {
case 0: nfapi_nr_pucch_pdu_t *pucch_pdu = &pucch[i].pucch_pdu;
/* uint16_t num_ucis;
num_ucis = gNB->UL_INFO.uci_ind.num_ucis;
gNB->UL_INFO.uci_ind.uci_list = &gNB->uci_pdu_list[0]; switch (pucch_pdu->format_type) {
gNB->UL_INFO.uci_ind.sfn = frame_rx; case 0:
gNB->UL_INFO.uci_ind.slot = slot_rx;
gNB->uci_pdu_list[num_ucis].pdu_type = NFAPI_NR_UCI_FORMAT_0_1_PDU_TYPE; num_ucis = gNB->UL_INFO.uci_ind.num_ucis;
gNB->uci_pdu_list[num_ucis].pdu_size = sizeof(nfapi_nr_uci_pucch_pdu_format_0_1_t); gNB->UL_INFO.uci_ind.uci_list = &gNB->uci_pdu_list[0];
nfapi_nr_uci_pucch_pdu_format_0_1_t *uci_pdu_format0 = &gNB->uci_pdu_list[num_ucis].pucch_pdu_format_0_1; gNB->UL_INFO.uci_ind.sfn = frame_rx;
gNB->UL_INFO.uci_ind.slot = slot_rx;
nr_decode_pucch0(gNB, gNB->uci_pdu_list[num_ucis].pdu_type = NFAPI_NR_UCI_FORMAT_0_1_PDU_TYPE;
slot_rx, gNB->uci_pdu_list[num_ucis].pdu_size = sizeof(nfapi_nr_uci_pucch_pdu_format_0_1_t);
uci_pdu_format0, nfapi_nr_uci_pucch_pdu_format_0_1_t *uci_pdu_format0 = &gNB->uci_pdu_list[num_ucis].pucch_pdu_format_0_1;
pucch_pdu);
nr_decode_pucch0(gNB,
gNB->UL_INFO.uci_ind.num_ucis += 1;*/ slot_rx,
pucch->active = 0; uci_pdu_format0,
break; pucch_pdu);
default:
AssertFatal(1==0,"Only PUCCH format 0 is currently supported\n"); gNB->UL_INFO.uci_ind.num_ucis += 1;
pucch->active = 0;
break;
default:
AssertFatal(1==0,"Only PUCCH format 0 is currently supported\n");
}
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment