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

bufix in calling phy pucch function

Browse Source
This commit is contained in:
Francesco Mani
2020-04-22 11:11:22 +02:00
parent 80571bb81e
commit a66f6907de
1 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/SCHED_NR/phy_procedures_nr_gNB.c
+26 -21
View File
@@ -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) { nfapi_nr_pucch_pdu_t *pucch_pdu = &pucch[i].pucch_pdu;
case 0: 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];
gNB->UL_INFO.uci_ind.sfn = frame_rx;
gNB->UL_INFO.uci_ind.slot = slot_rx;
gNB->uci_pdu_list[num_ucis].pdu_type = NFAPI_NR_UCI_FORMAT_0_1_PDU_TYPE;
gNB->uci_pdu_list[num_ucis].pdu_size = sizeof(nfapi_nr_uci_pucch_pdu_format_0_1_t);
nfapi_nr_uci_pucch_pdu_format_0_1_t *uci_pdu_format0 = &gNB->uci_pdu_list[num_ucis].pucch_pdu_format_0_1;
nr_decode_pucch0(gNB, switch (pucch_pdu->format_type) {
slot_rx, case 0:
uci_pdu_format0,
pucch_pdu);
gNB->UL_INFO.uci_ind.num_ucis += 1;*/ num_ucis = gNB->UL_INFO.uci_ind.num_ucis;
pucch->active = 0; gNB->UL_INFO.uci_ind.uci_list = &gNB->uci_pdu_list[0];
break; gNB->UL_INFO.uci_ind.sfn = frame_rx;
default: gNB->UL_INFO.uci_ind.slot = slot_rx;
AssertFatal(1==0,"Only PUCCH format 0 is currently supported\n"); gNB->uci_pdu_list[num_ucis].pdu_type = NFAPI_NR_UCI_FORMAT_0_1_PDU_TYPE;
gNB->uci_pdu_list[num_ucis].pdu_size = sizeof(nfapi_nr_uci_pucch_pdu_format_0_1_t);
nfapi_nr_uci_pucch_pdu_format_0_1_t *uci_pdu_format0 = &gNB->uci_pdu_list[num_ucis].pucch_pdu_format_0_1;
nr_decode_pucch0(gNB,
slot_rx,
uci_pdu_format0,
pucch_pdu);
gNB->UL_INFO.uci_ind.num_ucis += 1;
pucch->active = 0;
break;
default:
AssertFatal(1==0,"Only PUCCH format 0 is currently supported\n");
}
} }
} }
} }