Skip to content

O
OpenXG-RAN
Commit 399b9334 authored by Aniq's avatar Aniq
Browse files
Options

pnf_p7_slot_ind function COMPLETED

parent 55384420
Hide whitespace changes
Inline Side-by-side
Showing with 239 additions and 141 deletions
nfapi/oai_integration/nfapi_pnf.c
View file @ 399b9334
...@@ -1679,7 +1679,7 @@ void oai_slot_ind(uint16_t sfn, uint16_t slot) { ...@@ -1679,7 +1679,7 @@ void oai_slot_ind(uint16_t sfn, uint16_t slot) {
if ((sfn % 100 == 0) && slot==0) { // DOUBT: Why 100? if ((sfn % 100 == 0) && slot==0) { // DOUBT: Why 100?
struct timespec ts; struct timespec ts;
clock_gettime(CLOCK_MONOTONIC, &ts); clock_gettime(CLOCK_MONOTONIC, &ts);
NFAPI_TRACE(NFAPI_TRACE_INFO, "[PNF] %s %d.%d (sfn:%u slot:%u) SFN/SLOT(TX):%u\n", __FUNCTION__, ts.tv_sec, ts.tv_nsec, sfn, slot, NFAPI_SFNSLOT2DEC(sfn_slot_tx)); NFAPI_TRACE(NFAPI_TRACE_INFO, "[PNF] %s %d.%d (sfn:%u slot:%u) SFN/SLOT(TX):%u\n", __FUNCTION__, ts.tv_sec, ts.tv_nsec, sfn, slot, NFAPI_SFNSLOT2DEC(sfn, slot));
} }
//TODO: send p7_config instead of p7_config_g //TODO: send p7_config instead of p7_config_g
...@@ -1687,7 +1687,7 @@ void oai_slot_ind(uint16_t sfn, uint16_t slot) { ...@@ -1687,7 +1687,7 @@ void oai_slot_ind(uint16_t sfn, uint16_t slot) {
// if (subframe_ret) { // if (subframe_ret) {
if (slot_ret) { if (slot_ret) {
NFAPI_TRACE(NFAPI_TRACE_INFO, "[PNF] %s(frame:%u slot:%u) SFN/SLOT(TX):%u - PROBLEM with pnf_p7_slot_ind()\n", __FUNCTION__, sfn, slot, sfn_slot_tx, NFAPI_SFNSLOT2DEC(sfn_slot_tx)); NFAPI_TRACE(NFAPI_TRACE_INFO, "[PNF] %s(frame:%u slot:%u) SFN/SLOT(TX):%u - PROBLEM with pnf_p7_slot_ind()\n", __FUNCTION__, sfn, slot, sfn_slot_tx, NFAPI_SFNSLOT2DEC(sfn, slot));
// printing anything causes error: probably because there isn't enough time to accomodate a print statement // printing anything causes error: probably because there isn't enough time to accomodate a print statement
} else { } else {
//NFAPI_TRACE(NFAPI_TRACE_INFO, "***NFAPI subframe handler finished *** \n"); //NFAPI_TRACE(NFAPI_TRACE_INFO, "***NFAPI subframe handler finished *** \n");
......
nfapi/open-nFAPI/nfapi/public_inc/nfapi_interface.h
View file @ 399b9334
...@@ -121,7 +121,7 @@ typedef struct { ...@@ -121,7 +121,7 @@ typedef struct {
#define NFAPI_TAG_LENGTH_PACKED_LEN 4 #define NFAPI_TAG_LENGTH_PACKED_LEN 4
// Convenience methods to convert between SFN/SLOT formats // Convenience methods to convert between SFN/SLOT formats
#define NFAPI_SFNSLOT2DEC(_sfn,_slot) ((((_sfn) >> 6) * 20) + ((_slot) & 0x3F)) // total count of slots #define NFAPI_SFNSLOT2DEC(_sfn,_slot) ( _sfn*20 + _slot ) // total count of slots
#define NFAPI_SFNSLOTDEC2SFNSLOT(_sfnslot_dec) ((((_sfnslot_dec) / 20) << 4) | (((_sfnslot_dec) - (((_sfnslot_dec) / 20) * 10)) & 0x3F)) #define NFAPI_SFNSLOTDEC2SFNSLOT(_sfnslot_dec) ((((_sfnslot_dec) / 20) << 4) | (((_sfnslot_dec) - (((_sfnslot_dec) / 20) * 10)) & 0x3F))
#define NFAPI_SFNSLOT2SFN(_sfnslot) ((_sfnslot) >> 6) #define NFAPI_SFNSLOT2SFN(_sfnslot) ((_sfnslot) >> 6)
......
nfapi/open-nFAPI/pnf/inc/pnf_p7.h
View file @ 399b9334
...@@ -38,6 +38,20 @@ typedef struct { ...@@ -38,6 +38,20 @@ typedef struct {
uint16_t tx_late; uint16_t tx_late;
} pnf_p7_stats_t; } pnf_p7_stats_t;
typedef struct { // TODO: replace with the stats
uint16_t dl_tti_ontime;
uint16_t dl_tti_late;
uint16_t ul_tti_ontime;
uint16_t ul_tti_late;
uint16_t ul_dci_ontime;
uint16_t ul_dci_late;
uint16_t tx_data_ontime;
uint16_t tx_data_late;
} pnf_p7_nr_stats_t;
typedef struct { typedef struct {
uint8_t* buffer; uint8_t* buffer;
uint16_t length; uint16_t length;
...@@ -99,7 +113,7 @@ typedef struct { ...@@ -99,7 +113,7 @@ typedef struct {
uint16_t slot; uint16_t slot;
uint16_t sfn_slot; uint16_t sfn_slot;
uint32_t slot_start_time_hr; uint32_t slot_start_time_hr;
int32_t sfn_slot_shift; int32_t slot_shift;
uint8_t timing_info_period_counter; uint8_t timing_info_period_counter;
uint8_t timing_info_aperiodic_send; // 0:false 1:true uint8_t timing_info_aperiodic_send; // 0:false 1:true
...@@ -113,6 +127,7 @@ typedef struct { ...@@ -113,6 +127,7 @@ typedef struct {
uint32_t tick; uint32_t tick;
pnf_p7_stats_t stats; pnf_p7_stats_t stats;
pnf_p7_nr_stats_t nr_stats;
} pnf_p7_t; } pnf_p7_t;
......
nfapi/open-nFAPI/pnf/public_inc/nfapi_pnf_interface.h
View file @ 399b9334
...@@ -555,12 +555,14 @@ typedef struct ...@@ -555,12 +555,14 @@ typedef struct
typedef struct typedef struct
{ {
uint16_t sfn_slot; //uint16_t sfn_slot
int16_t sfn;
int16_t slot;
//TODO: Change P7 structs to NR //TODO: Change P7 structs to NR
nfapi_nr_dl_tti_request_t dl_config_req;//nfapi_dl_config_request_t* dl_config_req; nfapi_nr_dl_tti_request_t* dl_tti_req;//nfapi_dl_config_request_t* dl_config_req;
nfapi_nr_ul_tti_request_t ul_config_req;//nfapi_ul_config_request_t* ul_config_req; nfapi_nr_ul_tti_request_t* ul_tti_req;//nfapi_ul_config_request_t* ul_config_req;
nfapi_nr_ul_dci_request_t hi_dci0_req;//nfapi_hi_dci0_request_t* hi_dci0_req; nfapi_nr_ul_dci_request_t* ul_dci_req;//nfapi_hi_dci0_request_t* hi_dci0_req;
nfapi_nr_tx_data_request_t* tx_req;//nfapi_tx_request_t* tx_req; nfapi_nr_tx_data_request_t* tx_data_req;//nfapi_tx_request_t* tx_req;
//TODO: check these two later //TODO: check these two later
nfapi_lbt_dl_config_request_t* lbt_dl_config_req; nfapi_lbt_dl_config_request_t* lbt_dl_config_req;
...@@ -640,6 +642,7 @@ typedef struct nfapi_pnf_p7_config ...@@ -640,6 +642,7 @@ typedef struct nfapi_pnf_p7_config
* \param req A pointer to the dl config request message structure * \param req A pointer to the dl config request message structure
* \return not currently used * \return not currently used
*/ */
int (*dl_tti_req_fn)(L1_rxtx_proc_t *proc,nfapi_pnf_p7_config_t* config, nfapi_nr_dl_tti_request_t* req);
int (*dl_config_req)(L1_rxtx_proc_t *proc,nfapi_pnf_p7_config_t* config, nfapi_dl_config_request_t* req); int (*dl_config_req)(L1_rxtx_proc_t *proc,nfapi_pnf_p7_config_t* config, nfapi_dl_config_request_t* req);
/*! A callback for the UL_CONFIG.request /*! A callback for the UL_CONFIG.request
...@@ -647,6 +650,7 @@ typedef struct nfapi_pnf_p7_config ...@@ -647,6 +650,7 @@ typedef struct nfapi_pnf_p7_config
* \param req A pointer to the ul config request message structure * \param req A pointer to the ul config request message structure
* \return not currently used * \return not currently used
*/ */
int (*ul_tti_req_fn)(L1_rxtx_proc_t *proc,nfapi_pnf_p7_config_t* config, nfapi_nr_ul_tti_request_t* req);
int (*ul_config_req)(L1_rxtx_proc_t *proc,nfapi_pnf_p7_config_t* config, nfapi_ul_config_request_t* req); int (*ul_config_req)(L1_rxtx_proc_t *proc,nfapi_pnf_p7_config_t* config, nfapi_ul_config_request_t* req);
/*! A callback for the HI_DCI0.request /*! A callback for the HI_DCI0.request
...@@ -654,8 +658,9 @@ typedef struct nfapi_pnf_p7_config ...@@ -654,8 +658,9 @@ typedef struct nfapi_pnf_p7_config
* \param req A pointer to the hi dci0 request message structure * \param req A pointer to the hi dci0 request message structure
* \return not currently used * \return not currently used
*/ */
int (*ul_dci_req_fn)(L1_rxtx_proc_t *proc,nfapi_pnf_p7_config_t* config, nfapi_nr_ul_dci_request_t* req);
int (*hi_dci0_req)(L1_rxtx_proc_t *proc,nfapi_pnf_p7_config_t* config, nfapi_hi_dci0_request_t* req); int (*hi_dci0_req)(L1_rxtx_proc_t *proc,nfapi_pnf_p7_config_t* config, nfapi_hi_dci0_request_t* req);
/*! A callback for the TX_REQ.request /*! A callback for the TX_REQ.request
* \param config A poiner to the PNF P7 config * \param config A poiner to the PNF P7 config
* \param req A pointer to the tx request message structure * \param req A pointer to the tx request message structure
...@@ -665,6 +670,7 @@ typedef struct nfapi_pnf_p7_config ...@@ -665,6 +670,7 @@ typedef struct nfapi_pnf_p7_config
* will 'keep' the pointers until they are transmitted the callee should set the pointers in the req to 0 * will 'keep' the pointers until they are transmitted the callee should set the pointers in the req to 0
* and then use the p7 codec config free function to release the pdu's when appropriate. * and then use the p7 codec config free function to release the pdu's when appropriate.
*/ */
int (*tx_data_req_fn)(nfapi_pnf_p7_config_t* config, nfapi_nr_tx_data_request_t* req);
int (*tx_req)(nfapi_pnf_p7_config_t* config, nfapi_tx_request_t* req); int (*tx_req)(nfapi_pnf_p7_config_t* config, nfapi_tx_request_t* req);
/*! A callback for the LBT_DL_CONFIG.request /*! A callback for the LBT_DL_CONFIG.request
......
nfapi/open-nFAPI/pnf/src/pnf_p7.c
View file @ 399b9334
...@@ -587,6 +587,53 @@ void pnf_pack_and_send_timing_info(pnf_p7_t* pnf_p7) ...@@ -587,6 +587,53 @@ void pnf_pack_and_send_timing_info(pnf_p7_t* pnf_p7)
pnf_p7->timing_info_ms_counter = 0; pnf_p7->timing_info_ms_counter = 0;
} }
void send_dummy_slot(pnf_p7_t* pnf_p7, uint16_t sfn, uint16_t slot)
{
struct timespec t;
clock_gettime( CLOCK_MONOTONIC, &t);
//NFAPI_TRACE(NFAPI_TRACE_INFO, "%s(sfn_sf:%d) t:%ld.%09ld\n", __FUNCTION__, NFAPI_SFNSF2DEC(sfn_sf), t.tv_sec, t.tv_nsec);
if(pnf_p7->_public.tx_data_req_fn && pnf_p7->_public.dummy_slot.tx_data_req)
{
pnf_p7->_public.dummy_slot.tx_data_req->SFN = sfn;
pnf_p7->_public.dummy_slot.tx_data_req->Slot = slot;
//NFAPI_TRACE(NFAPI_TRACE_INFO, "Dummy tx_req - enter\n");
(pnf_p7->_public.tx_data_req_fn)(&pnf_p7->_public, pnf_p7->_public.dummy_slot.tx_data_req);
//NFAPI_TRACE(NFAPI_TRACE_INFO, "Dummy tx_req - exit\n");
}
if(pnf_p7->_public.dl_tti_req_fn && pnf_p7->_public.dummy_slot.dl_tti_req)
{
pnf_p7->_public.dummy_slot.dl_tti_req->SFN = sfn;
pnf_p7->_public.dummy_slot.dl_tti_req->Slot = slot;
//NFAPI_TRACE(NFAPI_TRACE_INFO, "Dummy dl_config_req - enter\n");
(pnf_p7->_public.dl_tti_req_fn)(NULL, &(pnf_p7->_public), pnf_p7->_public.dummy_slot.dl_tti_req);
//NFAPI_TRACE(NFAPI_TRACE_INFO, "Dummy dl_config_req - exit\n");
}
if(pnf_p7->_public.ul_tti_req_fn && pnf_p7->_public.dummy_slot.ul_tti_req)
{
pnf_p7->_public.dummy_slot.ul_tti_req->SFN = sfn;
pnf_p7->_public.dummy_slot.ul_tti_req->Slot = slot;
NFAPI_TRACE(NFAPI_TRACE_INFO, "Dummy ul_config_req - enter\n");
(pnf_p7->_public.ul_tti_req_fn)(NULL, &pnf_p7->_public, pnf_p7->_public.dummy_slot.ul_tti_req);
}
if(pnf_p7->_public.ul_dci_req_fn && pnf_p7->_public.dummy_slot.ul_dci_req)
{
pnf_p7->_public.dummy_slot.ul_dci_req->SFN = sfn;
pnf_p7->_public.dummy_slot.ul_dci_req->Slot = slot;
NFAPI_TRACE(NFAPI_TRACE_INFO, "Dummy hi_dci0 - enter\n");
(pnf_p7->_public.ul_dci_req_fn)(NULL, &pnf_p7->_public, pnf_p7->_public.dummy_slot.ul_dci_req);
}
if(pnf_p7->_public.lbt_dl_config_req && pnf_p7->_public.dummy_subframe.lbt_dl_config_req) // TODO: Change later
{
pnf_p7->_public.dummy_slot.lbt_dl_config_req->sfn_sf = sfn;
NFAPI_TRACE(NFAPI_TRACE_INFO, "Dummy lbt - enter\n");
(pnf_p7->_public.lbt_dl_config_req)(&pnf_p7->_public, pnf_p7->_public.dummy_slot.lbt_dl_config_req);
}
}
void send_dummy_subframe(pnf_p7_t* pnf_p7, uint16_t sfn_sf) void send_dummy_subframe(pnf_p7_t* pnf_p7, uint16_t sfn_sf)
{ {
struct timespec t; struct timespec t;
...@@ -640,7 +687,7 @@ int pnf_p7_slot_ind(pnf_p7_t* pnf_p7, uint16_t phy_id, uint16_t sfn, uint16_t sl ...@@ -640,7 +687,7 @@ int pnf_p7_slot_ind(pnf_p7_t* pnf_p7, uint16_t phy_id, uint16_t sfn, uint16_t sl
// the frame // the frame
// todo : consider a more efficent lock mechasium // todo : consider a more efficent lock mechasium
//uint16_t NUM_SLOTS = 20;//10* 2^mu
if(pthread_mutex_lock(&(pnf_p7->mutex)) != 0) if(pthread_mutex_lock(&(pnf_p7->mutex)) != 0)
{ {
...@@ -656,55 +703,63 @@ int pnf_p7_slot_ind(pnf_p7_t* pnf_p7, uint16_t phy_id, uint16_t sfn, uint16_t sl ...@@ -656,55 +703,63 @@ int pnf_p7_slot_ind(pnf_p7_t* pnf_p7, uint16_t phy_id, uint16_t sfn, uint16_t sl
uint32_t sfn_slot_tx = sfnslot_add_slot(sfn, slot, slot_ahead); uint32_t sfn_slot_tx = sfnslot_add_slot(sfn, slot, slot_ahead);
uint32_t tx_sfn_slot_dec = 20*sfn + slot; uint16_t sfn_tx = sfn_slot_tx>>6;
uint16_t slot_tx = sfn_slot_tx & 0X3F;
// uint32_t tx_sfn_slot_dec = NFAPI_SFNSLOT2DEC(sfn,slot);
uint32_t tx_slot_dec = NFAPI_SFNSLOT2DEC(sfn,slot);
#if 0 //uint32_t tx_sfn_slot_dec = NFAPI_SFNSLOT2DEC(sfn_slot_tx);
uint32_t tx_sfn_slot_dec = NFAPI_SFNSLOT2DEC(sfn_slot_tx);
// If the subframe_buffer has been configured // If the subframe_buffer has been configured
if(pnf_p7->_public.slot_buffer_size!= 0) // for now value is same as sf_buffer_size if(pnf_p7->_public.slot_buffer_size!= 0) // for now value is same as sf_buffer_size
{ {
// apply the shift to the incoming sfn_sf // apply the shift to the incoming sfn_sf
if(pnf_p7->sfn_slot_shift != 0) // see in vnf_build_send_dl_node_sync if(pnf_p7->slot_shift != 0) // see in vnf_build_send_dl_node_sync
{ {
int32_t sfn_slot_dec = NFAPI_SFNSLOT2DEC(sfn_slot); // int32_t sfn_slot_dec = NFAPI_SFNSLOT2DEC(sfn,slot);
uint32_t slot_dec = NFAPI_SFNSLOT2DEC(sfn,slot);
int32_t shifted_sfn_slot = sfn_slot_dec += pnf_p7->sfn_slot_shift; // int32_t shifted_sfn_slot = sfn_slot_dec += pnf_p7->sfn_slot_shift;
uint16_t shifted_slot = slot + pnf_p7->slot_shift;
// adjust for wrap-around // adjust for wrap-around
if(shifted_sfn_slot < 0) if(shifted_slot < 0)
shifted_sfn_slot += NFAPI_MAX_SFNSLOTDEC; shifted_slot += NFAPI_MAX_SFNSLOTDEC;
else if(shifted_sfn_slot > NFAPI_MAX_SFNSLOTDEC) else if(shifted_slot > NFAPI_MAX_SFNSLOTDEC)
shifted_sfn_slot -= NFAPI_MAX_SFNSLOTDEC; shifted_slot -= NFAPI_MAX_SFNSLOTDEC;
NFAPI_TRACE(NFAPI_TRACE_INFO, "Applying shift %d to sfn/slot (%d -> %d)\n", pnf_p7->sfn_slot_shift, NFAPI_SFNSF2DEC(sfn_slot), shifted_sfn_slot); // NFAPI_TRACE(NFAPI_TRACE_INFO, "Applying shift %d to sfn/slot (%d -> %d)\n", pnf_p7->sfn_slot_shift, NFAPI_SFNSF2DEC(sfn_slot), shifted_sfn_slot);
sfn_slot = shifted_sfn_slot; slot = shifted_slot;
// //
// DJP - why does the shift not apply to pnf_p7->sfn_sf??? // DJP - why does the shift not apply to pnf_p7->sfn_sf???
// //
pnf_p7->sfn_slot_shift = 0; pnf_p7->slot_shift = 0;
} }
uint32_t sfn_slot_dec = NFAPI_SFNSLOT2DEC(sfn_slot); uint32_t slot_dec = NFAPI_SFNSLOT2DEC(sfn, slot);
uint8_t buffer_index = sfn_slot_dec % pnf_p7->_public.slot_buffer_size; uint8_t buffer_index = slot_dec % pnf_p7->_public.slot_buffer_size;
nfapi_pnf_p7_slot_buffer_t* slot_buffer = &(pnf_p7->subframe_buffer[buffer_index]); nfapi_pnf_p7_slot_buffer_t* slot_buffer = &(pnf_p7->slot_buffer[buffer_index]);
// see where the PNF_P7 slot buffer its getting filled
uint8_t tx_buffer_index = tx_sfn_slot_dec % pnf_p7->_public.slot_buffer_size; uint8_t tx_buffer_index = tx_slot_dec % pnf_p7->_public.slot_buffer_size;
nfapi_pnf_p7_slot_buffer_t* tx_slot_buffer = &(pnf_p7->slot_buffer[tx_buffer_index]); nfapi_pnf_p7_slot_buffer_t* tx_slot_buffer = &(pnf_p7->slot_buffer[tx_buffer_index]);
//printf("sfn_sf_dec:%d tx_sfn_sf_dec:%d\n", sfn_sf_dec, tx_sfn_sf_dec); //printf("sfn_sf_dec:%d tx_sfn_sf_dec:%d\n", sfn_sf_dec, tx_sfn_sf_dec);
if (0) NFAPI_TRACE(NFAPI_TRACE_INFO, "%s() shift:%d slot_buffer->sfn_sf:%d tx_slot_buffer->sfn_slot:%d sfn_sf:%d subframe_buffer[buffer_index:%u dl_config_req:%p tx_req:%p] " if (0) NFAPI_TRACE(NFAPI_TRACE_INFO, "%s() shift:%d slot_buffer->sfn_sf:%d tx_slot_buffer->sfn_slot:%d sfn_sf:%d subframe_buffer[buffer_index:%u dl_config_req:%p tx_req:%p] "
"TX:sfn_sf:%d:tx_buffer_index:%d[dl_config_req:%p tx_req:%p]\n", "TX:sfn_sf:%d:tx_buffer_index:%d[dl_config_req:%p tx_req:%p]\n",
__FUNCTION__, __FUNCTION__,
pnf_p7->sfn_slot_shift, pnf_p7->slot_shift,
NFAPI_SFNSF2DEC(slot_buffer->sfn_slot), NFAPI_SFNSLOT2DEC(slot_buffer->sfn, slot_buffer->slot),
NFAPI_SFNSF2DEC(tx_slot_buffer->sfn_slot), NFAPI_SFNSLOT2DEC(tx_slot_buffer->sfn, tx_slot_buffer->slot),
sfn_slot_dec, buffer_index, slot_buffer->dl_config_req, slot_buffer->tx_req, slot_dec, buffer_index, slot_buffer->dl_tti_req, slot_buffer->tx_data_req,
tx_sfn_slot_dec, tx_buffer_index, tx_slot_buffer->dl_config_req, tx_slot_buffer->tx_req); tx_slot_dec, tx_buffer_index, tx_slot_buffer->dl_tti_req, tx_slot_buffer->tx_data_req);
//TODO: Change later if required //TODO: Change later if required
...@@ -713,128 +768,143 @@ int pnf_p7_slot_ind(pnf_p7_t* pnf_p7, uint16_t phy_id, uint16_t sfn, uint16_t sl ...@@ -713,128 +768,143 @@ int pnf_p7_slot_ind(pnf_p7_t* pnf_p7, uint16_t phy_id, uint16_t sfn, uint16_t sl
// todo : how to handle the messages we don't have, send dummies for // todo : how to handle the messages we don't have, send dummies for
// now // now
//printf("tx_subframe_buffer->sfn_sf:%d sfn_sf_tx:%d\n", tx_subframe_buffer->sfn_sf, sfn_sf_tx); //printf("tx_subframe_buffer->sfn_sf:%d sfn_sf_tx:%d\n", tx_subframe_buffer->sfn_sf, sfn_sf_tx);
//printf("subframe_buffer->sfn_sf:%d sfn_sf:%d\n", subframe_buffer->sfn_sf, sfn_sf); //printf("subframe_buffer->sfn_sf:%d sfn_sf:%d\n", subframe_buffer->sfn_sf, sfn_sf);
if(tx_slot_buffer->sfn_slot == sfn_slot_tx) if(tx_slot_buffer->slot == slot_tx && tx_slot_buffer->sfn == sfn_tx)
{ {
if(tx_slot_buffer->tx_req != 0) if(tx_slot_buffer->tx_data_req != 0)
{ {
if(pnf_p7->_public.tx_req) if(pnf_p7->_public.tx_data_req_fn)
(pnf_p7->_public.tx_req)(&(pnf_p7->_public), tx_slot_buffer->tx_req); (pnf_p7->_public.tx_data_req_fn)(&(pnf_p7->_public), tx_slot_buffer->tx_data_req);
//deallocate_nfapi_tx_request(slot_buffer->tx_req, pnf_p7); //deallocate_nfapi_tx_request(slot_buffer->tx_req, pnf_p7);
} }
else else
{ {
// send dummy // send dummy
if(pnf_p7->_public.tx_req && pnf_p7->_public.dummy_slot.tx_req) if(pnf_p7->_public.tx_data_req_fn && pnf_p7->_public.dummy_slot.tx_data_req)
{ {
pnf_p7->_public.dummy_slot.tx_req->sfn_sf = sfn_slot_tx; // TODO: change tx_req to nfapi_nr_tx_data_request_t pnf_p7->_public.dummy_slot.tx_data_req->SFN = sfn_tx; // TODO: change tx_req to nfapi_nr_tx_data_request_t
(pnf_p7->_public.tx_req)(&(pnf_p7->_public), pnf_p7->_public.dummy_slot.tx_req); pnf_p7->_public.dummy_slot.tx_data_req->Slot = slot_tx;
(pnf_p7->_public.tx_data_req_fn)(&(pnf_p7->_public), pnf_p7->_public.dummy_slot.tx_data_req);
} }
} }
} }
if(tx_slot_buffer->dl_config_req != 0) if( tx_slot_buffer->dl_tti_req != 0) // ADDED & TO BYPASS ERROR
{ {
if(pnf_p7->_public.dl_config_req) if(pnf_p7->_public.dl_tti_req_fn)
(pnf_p7->_public.dl_config_req)(NULL, &(pnf_p7->_public), tx_slot_buffer->dl_config_req); (pnf_p7->_public.dl_tti_req_fn)(NULL, &(pnf_p7->_public), tx_slot_buffer->dl_tti_req);
//deallocate_nfapi_dl_config_request(subframe_buffer->dl_config_req, pnf_p7); //deallocate_nfapi_dl_config_request(subframe_buffer->dl_config_req, pnf_p7);
} }
else
{
// send dummy
if(pnf_p7->_public.dl_config_req && pnf_p7->_public.dummy_slot.dl_config_req)
{
pnf_p7->_public.dummy_slot.dl_config_req->sfn_sf = sfn_slot_tx; // TODO: Change dl_config_req to nfapi_nr_dl_tti_request_t
(pnf_p7->_public.dl_config_req)(NULL, &(pnf_p7->_public), pnf_p7->_public.dummy_slot.dl_config_req);
}
}
if(tx_subframe_buffer->hi_dci0_req != 0)
{
if(pnf_p7->_public.hi_dci0_req)
(pnf_p7->_public.hi_dci0_req)(NULL, &(pnf_p7->_public), tx_subframe_buffer->hi_dci0_req);
//deallocate_nfapi_hi_dci0_request(subframe_buffer->hi_dci0_req, pnf_p7); else
} {
else // send dummy
{ if(pnf_p7->_public.dl_tti_req_fn && pnf_p7->_public.dummy_slot.dl_tti_req)
//send dummy {
if(pnf_p7->_public.hi_dci0_req && pnf_p7->_public.dummy_subframe.hi_dci0_req) pnf_p7->_public.dummy_slot.dl_tti_req->SFN = sfn_tx; // TODO: Change dl_config_req to nfapi_nr_dl_tti_request_t
{ pnf_p7->_public.dummy_slot.dl_tti_req->Slot = slot_tx;
pnf_p7->_public.dummy_subframe.hi_dci0_req->sfn_sf = sfn_sf_tx; (pnf_p7->_public.dl_tti_req_fn)(NULL, &(pnf_p7->_public), pnf_p7->_public.dummy_slot.dl_tti_req);
(pnf_p7->_public.hi_dci0_req)(NULL, &(pnf_p7->_public), pnf_p7->_public.dummy_subframe.hi_dci0_req);
}
} }
}
if(tx_slot_buffer != 0)
{
if(pnf_p7->_public.ul_dci_req_fn)
(pnf_p7->_public.ul_dci_req_fn)(NULL, &(pnf_p7->_public), tx_slot_buffer->ul_dci_req);
if(tx_subframe_buffer->ue_release_req != 0) //deallocate_nfapi_hi_dci0_request(subframe_buffer->hi_dci0_req, pnf_p7);
}
else
{
//send dummy
if(pnf_p7->_public.ul_dci_req_fn && pnf_p7->_public.dummy_slot.ul_dci_req)
{ {
if(pnf_p7->_public.ue_release_req) pnf_p7->_public.dummy_slot.ul_dci_req->SFN = sfn_tx;
(pnf_p7->_public.ue_release_req)(&(pnf_p7->_public), tx_subframe_buffer->ue_release_req); pnf_p7->_public.dummy_slot.ul_dci_req->Slot = slot_tx;
(pnf_p7->_public.ul_dci_req_fn)(NULL, &(pnf_p7->_public), pnf_p7->_public.dummy_slot.ul_dci_req);
} }
else }
if(tx_slot_buffer->ue_release_req != 0) // TODO: check later if needed
{
if(pnf_p7->_public.ue_release_req)
(pnf_p7->_public.ue_release_req)(&(pnf_p7->_public), tx_slot_buffer->ue_release_req);
}
else
{
//send dummy
if(pnf_p7->_public.ue_release_req && pnf_p7->_public.dummy_slot.ue_release_req)
{ {
//send dummy pnf_p7->_public.dummy_slot.ue_release_req->sfn_sf = sfn_slot_tx;
if(pnf_p7->_public.ue_release_req && pnf_p7->_public.dummy_subframe.ue_release_req) (pnf_p7->_public.ue_release_req)(&(pnf_p7->_public), pnf_p7->_public.dummy_slot.ue_release_req);
{
pnf_p7->_public.dummy_subframe.ue_release_req->sfn_sf = sfn_sf_tx;
(pnf_p7->_public.ue_release_req)(&(pnf_p7->_public), pnf_p7->_public.dummy_subframe.ue_release_req);
}
} }
}
if(tx_subframe_buffer->dl_config_req != 0) // TODO: add deallocate fns for the new structs
{ if(tx_slot_buffer->dl_tti_req != 0)
deallocate_nfapi_dl_config_request(tx_subframe_buffer->dl_config_req, pnf_p7); {
tx_subframe_buffer->dl_config_req = 0; deallocate_nfapi_dl_config_request(tx_slot_buffer->dl_tti_req, pnf_p7);
} tx_slot_buffer->dl_tti_req = 0;
if(tx_subframe_buffer->tx_req != 0) }
{
deallocate_nfapi_tx_request(tx_subframe_buffer->tx_req, pnf_p7); if(tx_slot_buffer->tx_data_req != 0)
tx_subframe_buffer->tx_req = 0; {
} deallocate_nfapi_tx_request(tx_slot_buffer->tx_data_req, pnf_p7);
if(tx_subframe_buffer->hi_dci0_req != 0) tx_slot_buffer->tx_data_req = 0;
{ }
deallocate_nfapi_hi_dci0_request(tx_subframe_buffer->hi_dci0_req, pnf_p7);
tx_subframe_buffer->hi_dci0_req = 0; if(tx_slot_buffer->ul_dci_req != 0)
} {
if(tx_subframe_buffer->ue_release_req != 0){ deallocate_nfapi_hi_dci0_request(tx_slot_buffer->ul_dci_req, pnf_p7);
deallocate_nfapi_ue_release_request(tx_subframe_buffer->ue_release_req, pnf_p7); tx_slot_buffer->ul_dci_req = 0;
tx_subframe_buffer->ue_release_req = 0; }
}
} if(tx_slot_buffer->ue_release_req != 0){
deallocate_nfapi_ue_release_request(tx_slot_buffer->ue_release_req, pnf_p7);
tx_slot_buffer->ue_release_req = 0;
}
else else
{ {
// If we ever need to "send" a dummy ul_config this won't work!!! // If we ever need to "send" a dummy ul_config this won't work!!!
send_dummy_subframe(pnf_p7, sfn_sf_tx); // send_dummy_subframe(pnf_p7, sfn_sf_tx);
send_dummy_slot(pnf_p7, sfn_tx, slot_tx);
} }
if(subframe_buffer->sfn_sf == sfn_sf)
if(slot_buffer->sfn == sfn && slot_buffer->slot == slot )
{ {
if(subframe_buffer->ul_config_req != 0) if(slot_buffer->ul_tti_req != 0)
{ {
if(pnf_p7->_public.ul_config_req) if(pnf_p7->_public.ul_tti_req_fn)
(pnf_p7->_public.ul_config_req)(NULL, &(pnf_p7->_public), subframe_buffer->ul_config_req); (pnf_p7->_public.ul_tti_req_fn)(NULL, &(pnf_p7->_public), slot_buffer->ul_tti_req);
//deallocate_nfapi_ul_config_request(subframe_buffer->ul_config_req, pnf_p7); //deallocate_nfapi_ul_config_request(subframe_buffer->ul_config_req, pnf_p7);
} }
else else
{ {
// send dummy // send dummy
if(pnf_p7->_public.ul_config_req && pnf_p7->_public.dummy_subframe.ul_config_req) if(pnf_p7->_public.ul_tti_req_fn && pnf_p7->_public.dummy_slot.ul_tti_req)
{ {
pnf_p7->_public.dummy_subframe.ul_config_req->sfn_sf = sfn_sf; pnf_p7->_public.dummy_slot.ul_tti_req->SFN = sfn;
(pnf_p7->_public.ul_config_req)(NULL, &(pnf_p7->_public), pnf_p7->_public.dummy_subframe.ul_config_req); pnf_p7->_public.dummy_slot.ul_tti_req->Slot = slot;
(pnf_p7->_public.ul_tti_req_fn)(NULL, &(pnf_p7->_public), pnf_p7->_public.dummy_slot.ul_tti_req);
} }
} }
if(subframe_buffer->lbt_dl_config_req != 0) if(slot_buffer->lbt_dl_config_req != 0)
{ {
if(pnf_p7->_public.lbt_dl_config_req) if(pnf_p7->_public.lbt_dl_config_req)
(pnf_p7->_public.lbt_dl_config_req)(&(pnf_p7->_public), subframe_buffer->lbt_dl_config_req); (pnf_p7->_public.lbt_dl_config_req)(&(pnf_p7->_public), slot_buffer->lbt_dl_config_req);
//deallocate_nfapi_lbt_dl_config_request(subframe_buffer->lbt_dl_config_req, pnf_p7); //deallocate_nfapi_lbt_dl_config_request(subframe_buffer->lbt_dl_config_req, pnf_p7);
} }
...@@ -843,40 +913,46 @@ int pnf_p7_slot_ind(pnf_p7_t* pnf_p7, uint16_t phy_id, uint16_t sfn, uint16_t sl ...@@ -843,40 +913,46 @@ int pnf_p7_slot_ind(pnf_p7_t* pnf_p7, uint16_t phy_id, uint16_t sfn, uint16_t sl
// send dummy // send dummy
if(pnf_p7->_public.lbt_dl_config_req && pnf_p7->_public.dummy_subframe.lbt_dl_config_req) if(pnf_p7->_public.lbt_dl_config_req && pnf_p7->_public.dummy_subframe.lbt_dl_config_req)
{ {
pnf_p7->_public.dummy_subframe.lbt_dl_config_req->sfn_sf = sfn_sf; pnf_p7->_public.dummy_subframe.lbt_dl_config_req->sfn_sf = sfn;
(pnf_p7->_public.lbt_dl_config_req)(&(pnf_p7->_public), pnf_p7->_public.dummy_subframe.lbt_dl_config_req); (pnf_p7->_public.lbt_dl_config_req)(&(pnf_p7->_public), pnf_p7->_public.dummy_subframe.lbt_dl_config_req);
} } //Change later
} }
//if(subframe_buffer->dl_config_req != 0) //if(subframe_buffer->dl_config_req != 0)
//deallocate_nfapi_dl_config_request(subframe_buffer->dl_config_req, pnf_p7); //deallocate_nfapi_dl_config_request(subframe_buffer->dl_config_req, pnf_p7);
//if(subframe_buffer->tx_req != 0) //if(subframe_buffer->tx_req != 0)
//deallocate_nfapi_tx_request(subframe_buffer->tx_req, pnf_p7); //deallocate_nfapi_tx_request(subframe_buffer->tx_req, pnf_p7);
if(subframe_buffer->ul_config_req != 0) if(slot_buffer->ul_tti_req != 0)
{ {
deallocate_nfapi_ul_config_request(subframe_buffer->ul_config_req, pnf_p7); deallocate_nfapi_ul_config_request(slot_buffer->ul_tti_req, pnf_p7);
subframe_buffer->ul_config_req = 0; slot_buffer->ul_tti_req = 0;
}
//if(subframe_buffer->hi_dci0_req != 0)
//deallocate_nfapi_hi_dci0_request(subframe_buffer->hi_dci0_req, pnf_p7);
if(subframe_buffer->lbt_dl_config_req != 0)
{
deallocate_nfapi_lbt_dl_config_request(subframe_buffer->lbt_dl_config_req, pnf_p7);
subframe_buffer->lbt_dl_config_req = 0;
}
} // sfn_sf match
if (subframe_buffer->dl_config_req == 0 && subframe_buffer->tx_req == 0 && subframe_buffer->ul_config_req == 0 && subframe_buffer->lbt_dl_config_req == 0 && subframe_buffer->ue_release_req == 0) }
{ //if(subframe_buffer->hi_dci0_req != 0)
memset(&(pnf_p7->subframe_buffer[buffer_index]), 0, sizeof(nfapi_pnf_p7_subframe_buffer_t)); //deallocate_nfapi_hi_dci0_request(subframe_buffer->hi_dci0_req, pnf_p7);
pnf_p7->subframe_buffer[buffer_index].sfn_sf = -1; if(slot_buffer->lbt_dl_config_req != 0)
{
deallocate_nfapi_lbt_dl_config_request(slot_buffer->lbt_dl_config_req, pnf_p7);
slot_buffer->lbt_dl_config_req = 0;
}
} // sfn_sf match
// DONE till here
if ( slot_buffer->dl_tti_req == 0 &&
slot_buffer->tx_data_req == 0 &&
slot_buffer->ul_tti_req == 0 &&
slot_buffer->lbt_dl_config_req == 0 &&
slot_buffer->ue_release_req == 0)
{
memset(&(pnf_p7->slot_buffer[buffer_index]), 0, sizeof(nfapi_pnf_p7_slot_buffer_t));
pnf_p7->slot_buffer[buffer_index].sfn = -1;
pnf_p7->slot_buffer[buffer_index].slot = -1;
} }
//printf("pnf_p7->_public.timing_info_mode_periodic:%d pnf_p7->timing_info_period_counter:%d pnf_p7->_public.timing_info_period:%d\n", pnf_p7->_public.timing_info_mode_periodic, pnf_p7->timing_info_period_counter, pnf_p7->_public.timing_info_period); //printf("pnf_p7->_public.timing_info_mode_periodic:%d pnf_p7->timing_info_period_counter:%d pnf_p7->_public.timing_info_period:%d\n", pnf_p7->_public.timing_info_mode_periodic, pnf_p7->timing_info_period_counter, pnf_p7->_public.timing_info_period);
//printf("pnf_p7->_public.timing_info_mode_aperiodic:%d pnf_p7->timing_info_aperiodic_send:%d\n", pnf_p7->_public.timing_info_mode_aperiodic, pnf_p7->timing_info_aperiodic_send); //printf("pnf_p7->_public.timing_info_mode_aperiodic:%d pnf_p7->timing_info_aperiodic_send:%d\n", pnf_p7->_public.timing_info_mode_aperiodic, pnf_p7->timing_info_aperiodic_send);
//printf("pnf_p7->timing_info_ms_counter:%d\n", pnf_p7->timing_info_ms_counter); //printf("pnf_p7->timing_info_ms_counter:%d\n", pnf_p7->timing_info_ms_counter);
// send the periodic timing info if configured // send the periodic timing info if configured
if(pnf_p7->_public.timing_info_mode_periodic && (pnf_p7->timing_info_period_counter++) == pnf_p7->_public.timing_info_period) if(pnf_p7->_public.timing_info_mode_periodic && (pnf_p7->timing_info_period_counter++) == pnf_p7->_public.timing_info_period)
...@@ -904,7 +980,7 @@ int pnf_p7_slot_ind(pnf_p7_t* pnf_p7, uint16_t phy_id, uint16_t sfn, uint16_t sl ...@@ -904,7 +980,7 @@ int pnf_p7_slot_ind(pnf_p7_t* pnf_p7, uint16_t phy_id, uint16_t sfn, uint16_t sl
//printf("pnf_p7->tick:%d\n", pnf_p7->tick); //printf("pnf_p7->tick:%d\n", pnf_p7->tick);
if(pnf_p7->tick == 1000) if(pnf_p7->tick == 1000) // why?
{ {
NFAPI_TRACE(NFAPI_TRACE_INFO, "[PNF P7:%d] (ONTIME/LATE) DL:(%d/%d) UL:(%d/%d) HI:(%d/%d) TX:(%d/%d)\n", pnf_p7->_public.phy_id, NFAPI_TRACE(NFAPI_TRACE_INFO, "[PNF P7:%d] (ONTIME/LATE) DL:(%d/%d) UL:(%d/%d) HI:(%d/%d) TX:(%d/%d)\n", pnf_p7->_public.phy_id,
...@@ -916,7 +992,7 @@ int pnf_p7_slot_ind(pnf_p7_t* pnf_p7, uint16_t phy_id, uint16_t sfn, uint16_t sl ...@@ -916,7 +992,7 @@ int pnf_p7_slot_ind(pnf_p7_t* pnf_p7, uint16_t phy_id, uint16_t sfn, uint16_t sl
memset(&pnf_p7->stats, 0, sizeof(pnf_p7->stats)); memset(&pnf_p7->stats, 0, sizeof(pnf_p7->stats));
} }
pnf_p7->tick++; pnf_p7->tick++;
#endif
if(pthread_mutex_unlock(&(pnf_p7->mutex)) != 0) if(pthread_mutex_unlock(&(pnf_p7->mutex)) != 0)
{ {
......
openair1/SIMULATION/NR_PHY/ulsim.c
View file @ 399b9334
...@@ -65,6 +65,7 @@ RAN_CONTEXT_t RC; ...@@ -65,6 +65,7 @@ RAN_CONTEXT_t RC;
int32_t uplink_frequency_offset[MAX_NUM_CCs][4]; int32_t uplink_frequency_offset[MAX_NUM_CCs][4];
int sf_ahead=4 ; int sf_ahead=4 ;
int slot_ahead=6 ;
int sl_ahead=0; int sl_ahead=0;
double cpuf; double cpuf;
uint8_t nfapi_mode = 0; uint8_t nfapi_mode = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment