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

Updating matacher function for de-queuing

Browse Source
This commit is contained in:
Melissa Elkadi
2021-06-28 16:58:01 -07:00
parent f61d5b74b1
commit 5ee9bc2cc9
1 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
executables/nr-ue.c
+19 -7
View File
@@ -189,20 +189,32 @@ static void reset_queue(queue_t *q)
static bool sfn_slot_matcher(void *wanted, void *candidate) static bool sfn_slot_matcher(void *wanted, void *candidate)
{ {
nr_queue_candidate *ind = candidate; nfapi_p7_message_header_t *msg = candidate;
int sfn_sf = *(int*)wanted; int sfn_sf = *(int*)wanted;
if (NFAPI_SFNSLOT2SFN(sfn_sf) == ind->rach_ind.sfn && NFAPI_SFNSLOT2SLOT(sfn_sf) == ind->rach_ind.slot) switch (msg->message_id)
{ {
return true; case NFAPI_NR_PHY_MSG_TYPE_RACH_INDICATION:
{
nfapi_nr_rach_indication_t *ind = candidate;
return NFAPI_SFNSLOT2SFN(sfn_sf) == ind->sfn && NFAPI_SFNSLOT2SLOT(sfn_sf) == ind->slot;
} }
else if (NFAPI_SFNSLOT2SFN(sfn_sf) == ind->rx_ind.sfn && NFAPI_SFNSLOT2SLOT(sfn_sf) == ind->rx_ind.slot)
case NFAPI_NR_PHY_MSG_TYPE_RX_DATA_INDICATION:
{ {
return true; nfapi_nr_rx_data_indication_t *ind = candidate;
return NFAPI_SFNSLOT2SFN(sfn_sf) == ind->sfn && NFAPI_SFNSLOT2SLOT(sfn_sf) == ind->slot;
} }
else if (NFAPI_SFNSLOT2SFN(sfn_sf) == ind->crc_ind.sfn && NFAPI_SFNSLOT2SLOT(sfn_sf) == ind->crc_ind.slot)
case NFAPI_NR_PHY_MSG_TYPE_CRC_INDICATION:
{ {
return true; nfapi_nr_crc_indication_t *ind = candidate;
return NFAPI_SFNSLOT2SFN(sfn_sf) == ind->sfn && NFAPI_SFNSLOT2SLOT(sfn_sf) == ind->slot;
}
default:
LOG_E(NR_MAC, "sfn_slot_match bad ID: %d\n", msg->message_id);
} }
return false; return false;