Merge "[Epic-Id: ODUHIGH-576][Task-Id: ODUHIGH-594][SubTask-Id: ODUHIGH-605]|[NFAPI_B...

diff --cc src/5gnrmac/nfapi_common.h
index 2c9f613,fe58092..15fa810
--- 1/src/5gnrmac/nfapi_common.h
--- 2/src/5gnrmac/nfapi_common.h
+++ b/src/5gnrmac/nfapi_common.h
@@@ -112,7 -141,9 +141,9 @@@ void nfapiFillMsgHdr(Buffer *mBuf, uint
  void nFapiExtractP5Hdr(nFapi_p5_hdr *p5Hdr, Buffer *mBuf);
  void nFapiExtractMsgHdr(nFapi_msg_header *msgHdr, Buffer *mBuf);
  
 -NfapiPnfEvent convertNfapiP5TagValToMsgId(uint16_t tagVal);
 +uint8_t convertNfapiP5TagValToMsgId(uint16_t tagVal,  NfapiPnfEvent *nfapiPnfEvent, EventState *phyEvent);
  uint8_t nfapiP7UdpRecvMsg();
- 
+ void nfapiGenerateTicks();
+ uint8_t nfapiSendSlotIndToMac();
+ uint8_t nfapiTriggerP7Clock();
  #endif

diff --cc src/5gnrmac/nfapi_udp_p7.c
Simple merge