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

trying to get oai sfnTo work

Browse Source
This commit is contained in:
Andrew Burger
2020-06-10 13:30:06 -07:00
parent e7eabf3f0f
commit 898d402ac0
2 changed files with 54 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/PHY_INTERFACE/phy_stub_UE.c
+51 -38
View File
@@ -1136,7 +1136,7 @@ int ue_init_standalone_socket(const char *addr, int port)
void *ue_standalone_pnf_task(void *context) void *ue_standalone_pnf_task(void *context)
{ {
uint16_t sfn_sf = 0;
const char *standalone_addr = "127.0.0.1"; const char *standalone_addr = "127.0.0.1";
int standalone_port = 3289; int standalone_port = 3289;
char buffer[1024]; char buffer[1024];
@@ -1152,51 +1152,64 @@ void *ue_standalone_pnf_task(void *context)
continue; continue;
} }
nfapi_p7_message_header_t header; if (len == 2 && len > 0)
if (nfapi_p7_message_header_unpack((void *)buffer, len, &header, sizeof(header), NULL) < 0) { {
LOG_E(MAC, "Header unpack failed for standalone pnf\n"); memcpy((void *)&sfn_sf, buffer, sizeof(sfn_sf));
continue; if (sfn_sf % 300 == 0)
{
LOG_I(MAC, "Unpacked sfn_sf sf: %u sfn: %u\n", NFAPI_SFNSF2SFN(sfn_sf),
NFAPI_SFNSF2SF(sfn_sf));
}
} }
else
{
nfapi_p7_message_header_t header;
if (nfapi_p7_message_header_unpack((void *)buffer, len, &header, sizeof(header), NULL) < 0)
{
LOG_E(MAC, "Header unpack failed for standalone pnf\n");
continue;
}
switch (header.message_id) switch (header.message_id)
{
case NFAPI_DL_CONFIG_REQUEST:
{
nfapi_dl_config_request_t dl_config_req;
if (nfapi_p7_message_unpack((void *)buffer, len, &dl_config_req,
sizeof(dl_config_req), NULL) < 0)
{ {
LOG_E(MAC, "Message dl_config_req failed to unpack\n"); case NFAPI_DL_CONFIG_REQUEST:
}
else
{ {
// check to see if dl_config_req is null nfapi_dl_config_request_t dl_config_req;
memcpy_dl_config_req(NULL, NULL, &dl_config_req); if (nfapi_p7_message_unpack((void *)buffer, len, &dl_config_req,
sizeof(dl_config_req), NULL) < 0)
{
LOG_E(MAC, "Message dl_config_req failed to unpack\n");
}
else
{
// check to see if dl_config_req is null
memcpy_dl_config_req(NULL, NULL, &dl_config_req);
}
break;
} }
break; case NFAPI_TX_REQUEST:
}
case NFAPI_TX_REQUEST:
{
nfapi_tx_request_t tx_req;
// lock this tx_req
if (nfapi_p7_message_unpack((void *)buffer, len, &tx_req,
sizeof(tx_req), NULL) < 0)
{ {
LOG_E(MAC, "Message tx_req failed to unpack\n"); nfapi_tx_request_t tx_req;
// lock this tx_req
if (nfapi_p7_message_unpack((void *)buffer, len, &tx_req,
sizeof(tx_req), NULL) < 0)
{
LOG_E(MAC, "Message tx_req failed to unpack\n");
}
else
{
// check to see if tx_req is null
memcpy_tx_req(NULL, &tx_req);
}
break;
} }
else case NFAPI_HI_DCI0_REQUEST:
{ break;
// check to see if tx_req is null
memcpy_tx_req(NULL, &tx_req);
}
break;
}
case NFAPI_HI_DCI0_REQUEST:
break;
default: default:
LOG_E(MAC, "Case Statement has no corresponding nfapi message\n"); LOG_E(MAC, "Case Statement has no corresponding nfapi message\n");
break; break;
}
} }
} }
} }
targets/RT/USER/lte-ue.c
+3 -3
View File
@@ -1288,9 +1288,9 @@ static void *UE_phy_stub_single_thread_rxn_txnp4(void *arg)
next_ra_frame++; next_ra_frame++;
if (next_ra_frame > 500) { if (next_ra_frame > 500) {
// check if we have PRACH opportunity // check if we have PRACH opportunity
LOG_I(MAC, "is_prach_subframe: %d UE_mac_inst[ue_MOD_id].SI_Decoded: %u\n", // LOG_I(MAC, "is_prach_subframe: %d UE_mac_inst[ue_MOD_id].SI_Decoded: %u\n",
is_prach_subframe(&UE->frame_parms, proc->frame_tx, proc->subframe_tx), // is_prach_subframe(&UE->frame_parms, proc->frame_tx, proc->subframe_tx),
UE_mac_inst[ue_Mod_id].SI_Decoded); // UE_mac_inst[ue_Mod_id].SI_Decoded);
if (is_prach_subframe(&UE->frame_parms, proc->frame_tx, proc->subframe_tx) && UE_mac_inst[ue_Mod_id].SI_Decoded == 1) { if (is_prach_subframe(&UE->frame_parms, proc->frame_tx, proc->subframe_tx) && UE_mac_inst[ue_Mod_id].SI_Decoded == 1) {
// The one working strangely... // The one working strangely...
//if (is_prach_subframe(&UE->frame_parms,proc->frame_tx, proc->subframe_tx && Mod_id == (module_id_t) init_ra_UE) ) { //if (is_prach_subframe(&UE->frame_parms,proc->frame_tx, proc->subframe_tx && Mod_id == (module_id_t) init_ra_UE) ) {