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

Properly assigning the rx_ind.pdu pointer

Browse Source 
Also, the ul_slot was not properly wrapping.
It was increased to a value greater than the
largest slot value.
This commit is contained in:
Melissa Elkadi
2021-09-21 15:16:36 -07:00
parent 5ae3c8914a
commit c4e27cf8b4
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
+12 -1
View File
@@ -87,8 +87,9 @@ int8_t nr_ue_scheduled_response_stub(nr_scheduled_response_t *scheduled_response
fapi_nr_tx_request_body_t *tx_req_body = &scheduled_response->tx_request->tx_request_body[j]; fapi_nr_tx_request_body_t *tx_req_body = &scheduled_response->tx_request->tx_request_body[j];
rx_ind->pdu_list[j].handle = pusch_config_pdu->handle; rx_ind->pdu_list[j].handle = pusch_config_pdu->handle;
rx_ind->pdu_list[j].harq_id = pusch_config_pdu->pusch_data.harq_process_id; rx_ind->pdu_list[j].harq_id = pusch_config_pdu->pusch_data.harq_process_id;
rx_ind->pdu_list[j].pdu = tx_req_body->pdu;
rx_ind->pdu_list[j].pdu_length = tx_req_body->pdu_length; rx_ind->pdu_list[j].pdu_length = tx_req_body->pdu_length;
rx_ind->pdu_list[j].pdu = CALLOC(tx_req_body->pdu_length, sizeof(*rx_ind->pdu_list[j].pdu));
memcpy(rx_ind->pdu_list[j].pdu, tx_req_body->pdu, tx_req_body->pdu_length * sizeof(*rx_ind->pdu_list[j].pdu));
rx_ind->pdu_list[j].rnti = pusch_config_pdu->rnti; rx_ind->pdu_list[j].rnti = pusch_config_pdu->rnti;
rx_ind->pdu_list[j].timing_advance = scheduled_response->tx_request->tx_config.timing_advance; rx_ind->pdu_list[j].timing_advance = scheduled_response->tx_request->tx_config.timing_advance;
rx_ind->pdu_list[j].ul_cqi = scheduled_response->tx_request->tx_config.ul_cqi; rx_ind->pdu_list[j].ul_cqi = scheduled_response->tx_request->tx_config.ul_cqi;
@@ -120,14 +121,24 @@ int8_t nr_ue_scheduled_response_stub(nr_scheduled_response_t *scheduled_response
if (!put_queue(&nr_rx_ind_queue, rx_ind)) if (!put_queue(&nr_rx_ind_queue, rx_ind))
{ {
LOG_E(NR_MAC, "Put_queue failed for rx_ind\n"); LOG_E(NR_MAC, "Put_queue failed for rx_ind\n");
for (int i = 0; i < rx_ind->number_of_pdus; i++)
{
free(rx_ind->pdu_list[i].pdu);
rx_ind->pdu_list[i].pdu = NULL;
}
free(rx_ind->pdu_list); free(rx_ind->pdu_list);
rx_ind->pdu_list = NULL;
free(rx_ind); free(rx_ind);
rx_ind = NULL;
} }
if (!put_queue(&nr_crc_ind_queue, crc_ind)) if (!put_queue(&nr_crc_ind_queue, crc_ind))
{ {
LOG_E(NR_MAC, "Put_queue failed for crc_ind\n"); LOG_E(NR_MAC, "Put_queue failed for crc_ind\n");
free(crc_ind->crc_list); free(crc_ind->crc_list);
crc_ind->crc_list = NULL;
free(crc_ind); free(crc_ind);
crc_ind = NULL;
} }
LOG_I(PHY, "In %s: Filled queue rx/crc_ind which was filled by ulconfig. \n", __FUNCTION__); LOG_I(PHY, "In %s: Filled queue rx/crc_ind which was filled by ulconfig. \n", __FUNCTION__);
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
+8
View File
@@ -1293,6 +1293,14 @@ int nr_acknack_scheduling(int mod_id,
// advance ul_slot if it is not reachable by UE // advance ul_slot if it is not reachable by UE
pucch->ul_slot = max(pucch->ul_slot, slot + pdsch_to_harq_feedback[0]); pucch->ul_slot = max(pucch->ul_slot, slot + pdsch_to_harq_feedback[0]);
/* We are not sure sure what is happening with this max() above.
It seems that the ul_slot will be updated to be
max(current ul_slot, curernt dl_slot + sf_ahead). Is this
the intention/correct? */
if (pucch->ul_slot > 19) {
pucch->ul_slot = pucch->ul_slot % 20;
pucch->frame = (pucch->frame + 1) % 1024;
}
// Find the right timing_indicator value. // Find the right timing_indicator value.
int i = 0; int i = 0;