X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Flwr_mac_handle_phy.c;h=5c22704f518ecaabb2f0befe4d6524b28f3c12d4;hb=05d098e6b94f629a932caaff404f2b703b123852;hp=9e0091443a35ca9edd447eee9e8709e7b233f968;hpb=56db1b2ff587365594f48f3274f806180eda4cb2;p=o-du%2Fl2.git

diff --git a/src/5gnrmac/lwr_mac_handle_phy.c b/src/5gnrmac/lwr_mac_handle_phy.c
index 9e0091443..5c22704f5 100644
--- a/src/5gnrmac/lwr_mac_handle_phy.c
+++ b/src/5gnrmac/lwr_mac_handle_phy.c
@@ -20,7 +20,7 @@
 #include "common_def.h"
 #include "lrg.h"
 #ifdef INTEL_FAPI
-#include "fapi.h"
+#include "nr5g_fapi_internal.h"
 #include "fapi_vendor_extension.h"
 #endif
 
@@ -114,7 +114,6 @@ uint8_t procSlotInd(fapi_slot_ind_t *fapiSlotInd)
       slotInd->cellId = lwrMacCb.cellCb[0].cellId; 
       slotInd->sfn = fapiSlotInd->sfn;
       slotInd->slot = fapiSlotInd->slot;
-
       FILL_PST_LWR_MAC_TO_MAC(pst, EVENT_SLOT_IND_TO_MAC);
       pst.selector = ODU_SELECTOR_LWLC;
       ret = (*sendSlotIndOpts[pst.selector])(&pst, slotInd);
@@ -188,18 +187,18 @@ uint8_t procRachInd(fapi_rach_indication_t  *fapiRachInd)
    RachPduInfo  *rachPdu = NULLP;
    RachInd      *rachInd = NULLP;
 
-   MAC_ALLOC_SHRABL_BUF(rachInd, sizeof(RachInd));
-   if(!rachInd)
-   {
-      DU_LOG("\nERROR  -->  LWR_MAC : Memory Allocation failed in procRachInd");
-      return RFAILED;
-   }
    if(!fapiRachInd->numPdus)
    {
       DU_LOG("\nDEBUG  -->  LWR_MAC : No PDU in RACH.indication at [%d, %d]", fapiRachInd->sfn, fapiRachInd->slot);
       return ROK;
    }
 
+   MAC_ALLOC_SHRABL_BUF(rachInd, sizeof(RachInd));
+   if(!rachInd)
+   {
+      DU_LOG("\nERROR  -->  LWR_MAC : Memory Allocation failed in procRachInd");
+      return RFAILED;
+   }
    rachInd->cellId = lwrMacCb.cellCb[0].cellId;
    rachInd->timingInfo.sfn = fapiRachInd->sfn;
    rachInd->timingInfo.slot = fapiRachInd->slot;
@@ -477,6 +476,7 @@ uint8_t procUciInd(fapi_uci_indication_t  *fapiUciInd)
 }
 #endif /* FAPI */
 
+#ifdef CALL_FLOW_DEBUG_LOG 
 /*******************************************************************
  * @brief Function prints src, dest, msg infor about all the msgs that
  received.
@@ -534,6 +534,8 @@ void callFlowFromPhyToLwrMac(uint16_t msgId)
    }
    DU_LOG("\nCall Flow: PHY -> ENTLWRMAC : %s\n",message);
 }
+#endif
+
 /*******************************************************************
  *
  * @brief Processes message from PHY
@@ -559,6 +561,7 @@ void procPhyMessages(uint16_t msgType, uint32_t msgSize, void *msg)
 #ifdef CALL_FLOW_DEBUG_LOG 
    callFlowFromPhyToLwrMac(header->msg_id);
 #endif
+
    switch(header->msg_id)
    {
 #ifdef INTEL_TIMER_MODE