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

Merge remote-tracking branch 'origin/episys/david/processing_crc_ind_rx_ind_per_pdu' into episys/mel/merge_bw_testing_abs

Browse Source
This commit is contained in:
Melissa Elkadi
2021-09-28 13:18:06 -07:00
parent 62118252dd 60dca0657b
commit df79567b16
2 changed files with 74 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
executables/nr-ue.c
+9 -9
View File
@@ -366,15 +366,6 @@ static void *NRUE_phy_stub_standalone_pnf_task(void *arg)
free(rach_ind);
nr_Msg1_transmitted(mod_id, CC_id, frame, gNB_id);
}
if (rx_ind && rx_ind->number_of_pdus > 0)
{
NR_UL_IND_t UL_INFO = {
.rx_ind = *rx_ind,
};
send_nsa_standalone_msg(&UL_INFO, rx_ind->header.message_id);
free(rx_ind->pdu_list);
free(rx_ind);
}
if (crc_ind && crc_ind->number_crcs > 0)
{
NR_UL_IND_t UL_INFO = {
@@ -384,6 +375,15 @@ static void *NRUE_phy_stub_standalone_pnf_task(void *arg)
free(crc_ind->crc_list);
free(crc_ind);
}
if (rx_ind && rx_ind->number_of_pdus > 0)
{
NR_UL_IND_t UL_INFO = {
.rx_ind = *rx_ind,
};
send_nsa_standalone_msg(&UL_INFO, rx_ind->header.message_id);
free(rx_ind->pdu_list);
free(rx_ind);
}
}
return NULL;
}
openair2/NR_PHY_INTERFACE/NR_IF_Module.c
+65 -8
View File
@@ -78,7 +78,7 @@ void handle_nr_rach(NR_UL_IND_t *UL_info)
UL_INFO.module_id = UL_info->module_id;
UL_INFO.CC_id = UL_info->CC_id;
int frame_diff = UL_info->frame - rach_ind->sfn;
int frame_diff = UL_info->frame - rach_ind->sfn;
if (frame_diff < 0)
{
frame_diff += 1024;
@@ -209,7 +209,7 @@ void handle_nr_ulsch(NR_UL_IND_t *UL_info)
if (!crc_ind)
{
LOG_D(NR_PHY, "No crc indication with the same SFN SLOT of rx indication %u %u\n", rx_ind->sfn, rx_ind->slot);
requeue(&gnb_rx_ind_queue, rx_ind);
put_queue(&gnb_rx_ind_queue, rx_ind);
return;
}
@@ -227,8 +227,9 @@ void handle_nr_ulsch(NR_UL_IND_t *UL_info)
);
if (rx_ind && UL_INFO.rx_ind.number_of_pdus > 0 && crc_ind && UL_INFO.crc_ind.number_crcs > 0) {
for (int i = 0; i < UL_INFO.rx_ind.number_of_pdus; i++) {
for (int j = 0; j < UL_INFO.crc_ind.number_crcs; j++) {
int i, j;
for (i = 0; i < UL_INFO.rx_ind.number_of_pdus; i++) {
for (j = 0; j < UL_INFO.crc_ind.number_crcs; j++) {
// find crc_indication j corresponding rx_indication i
const nfapi_nr_rx_data_pdu_t *rx = &UL_INFO.rx_ind.pdu_list[i];
const nfapi_nr_crc_t *crc = &UL_INFO.crc_ind.crc_list[j];
@@ -267,14 +268,70 @@ void handle_nr_ulsch(NR_UL_IND_t *UL_info)
handle_nr_ul_harq(UL_INFO.CC_id, UL_INFO.module_id, UL_INFO.frame, UL_INFO.slot, crc);
break;
} // for (j=0;j<UL_INFO.crc_ind.number_crcs;j++)
int last = UL_INFO.crc_ind.number_crcs -1;
if (j < last)
{
crc_ind->crc_list[j].handle = crc_ind->crc_list[last].handle;
crc_ind->crc_list[j].harq_id = crc_ind->crc_list[last].harq_id;
crc_ind->crc_list[j].num_cb = crc_ind->crc_list[last].num_cb;
crc_ind->crc_list[j].rnti = crc_ind->crc_list[last].rnti;
crc_ind->crc_list[j].tb_crc_status = crc_ind->crc_list[last].tb_crc_status;
crc_ind->crc_list[j].timing_advance = crc_ind->crc_list[last].timing_advance;
crc_ind->crc_list[j].ul_cqi = crc_ind->crc_list[last].ul_cqi;
UL_INFO.crc_ind.number_crcs--;
}
else if (j == last)
{
UL_INFO.crc_ind.number_crcs--;
}
last = UL_INFO.rx_ind.number_of_pdus -1;
if (i < last)
{
int last = UL_INFO.rx_ind.number_of_pdus -1;
rx_ind->pdu_list[i].handle = rx_ind->pdu_list[last].handle;
rx_ind->pdu_list[i].harq_id = rx_ind->pdu_list[last].harq_id;
rx_ind->pdu_list[i].pdu = rx_ind->pdu_list[last].pdu;
rx_ind->pdu_list[i].pdu_length = rx_ind->pdu_list[last].pdu_length;
rx_ind->pdu_list[i].rnti = rx_ind->pdu_list[last].rnti;
rx_ind->pdu_list[i].timing_advance = rx_ind->pdu_list[last].timing_advance;
rx_ind->pdu_list[i].ul_cqi = rx_ind->pdu_list[last].ul_cqi;
UL_INFO.rx_ind.number_of_pdus--;
i--;
}
else if (i == last)
{
UL_INFO.rx_ind.number_of_pdus--;
}
} // for (i=0;i<UL_INFO.rx_ind.number_of_pdus;i++)
if (crc_ind && crc_ind->number_crcs > 0)
if (UL_INFO.crc_ind.number_crcs > 0)
{
crc_ind->number_crcs = UL_INFO.crc_ind.number_crcs;
requeue(&gnb_crc_ind_queue, crc_ind);
}
if (UL_INFO.rx_ind.number_of_pdus > 0)
{
rx_ind->number_of_pdus = UL_INFO.rx_ind.number_of_pdus;
requeue(&gnb_rx_ind_queue, rx_ind);
}
if (UL_INFO.crc_ind.number_crcs == 0)
{
free(crc_ind->crc_list);
free(crc_ind);
if (rx_ind && rx_ind->number_of_pdus > 0)
crc_ind->crc_list = NULL;
free(crc_ind);
crc_ind = NULL;
}
if (UL_INFO.rx_ind.number_of_pdus == 0)
{
free(rx_ind->pdu_list);
free(rx_ind);
rx_ind->pdu_list = NULL;
free(rx_ind);
rx_ind = NULL;
}
} else if ((rx_ind && UL_INFO.rx_ind.number_of_pdus != 0)
|| (crc_ind && UL_INFO.crc_ind.number_crcs != 0)) {
LOG_E(NR_PHY,