X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Flwr_mac_phy.c;h=a9bf88d3cff995d268b4300b3b9e7fc92ceac234;hb=e54c2aae19e97065def9e5ab2d1488477b1ea209;hp=c927a5c6fe140744cd924c7e2706a8d4a7350d77;hpb=514d4c21e79d37636005186dd9ac5510742b7618;p=o-du%2Fl2.git

diff --git a/src/5gnrmac/lwr_mac_phy.c b/src/5gnrmac/lwr_mac_phy.c
index c927a5c6f..a9bf88d3c 100644
--- a/src/5gnrmac/lwr_mac_phy.c
+++ b/src/5gnrmac/lwr_mac_phy.c
@@ -25,19 +25,23 @@
 #include "mac_sch_interface.h"
 #include "lwr_mac_upr_inf.h"
 #include "mac.h"
-#include "lwr_mac_phy.h"
 #include "lwr_mac_fsm.h"
+#include "lwr_mac_phy.h"
 #include "mac_utils.h"
 #include "lwr_mac_utils.h"
 #include "lwr_mac.h"
 #ifdef INTEL_FAPI
-#include "fapi.h"
+#include "nr5g_fapi_internal.h"
 #include "fapi_vendor_extension.h"
 #endif
 #ifdef INTEL_WLS_MEM
 #include "wls_lib.h"
 #endif
 
+#ifdef INTEL_WLS_MEM
+CmLListCp wlsBlockToFreeList[WLS_MEM_FREE_PRD];
+#endif
+
 uint8_t rgClHndlCfgReq ARGS((void *msg));
 void l1ProcessFapiRequest ARGS((uint8_t msgType, uint32_t msgLen, void *msg));
 
@@ -63,7 +67,7 @@ void LwrMacStartWlsRcvr()
    Pst pst;
    Buffer *mBuf;
 
-   DU_LOG("\nLWR MAC: Requesting to start WLS receiver thread");
+   DU_LOG("\nINFO  -->  LWR MAC : Requesting to start WLS receiver thread");
 
    /* Filling post */
    memset(&pst, 0, sizeof(Pst));
@@ -71,7 +75,7 @@ void LwrMacStartWlsRcvr()
 
    if (ODU_GET_MSG_BUF(pst.region, pst.pool, &mBuf) != ROK)
    {
-      DU_LOG("\nLWR MAC : Memory allocation failed for LwrMacStartWlsRcvr");
+      DU_LOG("\nERROR  -->  LWR MAC : Memory allocation failed for LwrMacStartWlsRcvr");
       return;
    }
 
@@ -137,8 +141,8 @@ void LwrMacEnqueueWlsBlock()
  * ****************************************************************/
 void addWlsBlockToFree(void *msg, uint32_t msgLen, uint8_t idx)
 {
-   CmLList         *node;
-   WlsBlockToFree  *block;
+   CmLList         *node = NULLP;
+   WlsBlockToFree  *block = NULLP;
    MAC_ALLOC(block, sizeof(WlsBlockToFree));
    if(block)
    {
@@ -227,7 +231,6 @@ void LwrMacRecvPhyMsg()
 	    continue;
 	 }
 
-	 printf("\nLWR_MAC: numMsgToGet %d", numMsgToGet);
 	 while(numMsgToGet--)
 	 {
 	    currElem = NULLP;
@@ -272,9 +275,51 @@ uint8_t LwrMacSendToL1(void *msg)
 {
    uint8_t ret = ROK;
 #ifdef INTEL_FAPI
-   uint16_t msgLen;
+   uint32_t msgLen =0;
    p_fapi_api_queue_elem_t currMsg = NULLP;
 
+#ifdef CALL_FLOW_DEBUG_LOG   
+   char message[100];
+
+   currMsg = (p_fapi_api_queue_elem_t)msg;
+   while(currMsg)
+   {
+      switch(currMsg->msg_type)
+      {
+         case FAPI_PARAM_REQUEST:
+            strcpy(message, "FAPI_PARAM_REQUEST");
+            break;
+         case FAPI_CONFIG_REQUEST:
+            strcpy(message, "FAPI_CONFIG_REQUEST");
+            break;
+         case FAPI_START_REQUEST:
+            strcpy(message, "FAPI_START_REQUEST");
+            break;
+         case FAPI_DL_TTI_REQUEST:
+            strcpy(message, "FAPI_DL_TTI_REQUEST");
+            break;
+         case FAPI_TX_DATA_REQUEST:
+            strcpy(message, "FAPI_TX_DATA_REQUEST");
+            break;
+         case FAPI_UL_TTI_REQUEST:
+            strcpy(message, "FAPI_UL_TTI_REQUEST");
+            break;
+         case FAPI_STOP_REQUEST:
+            strcpy(message, "FAPI_STOP_REQUEST");
+            break;
+         case FAPI_UL_DCI_REQUEST:
+            strcpy(message, "FAPI_UL_DCI_REQUEST");
+            break;
+         default:
+            strcpy(message, "INVALID_MSG");
+            break;
+      }
+      DU_LOG("\nCall Flow: ENTLWRMAC -> PHY : %s\n",message);
+      currMsg = currMsg->p_next;
+   }
+#endif
+
+
 #ifdef INTEL_WLS_MEM
    void * wlsHdlr = NULLP;
 
@@ -283,10 +328,10 @@ uint8_t LwrMacSendToL1(void *msg)
    {
       currMsg = (p_fapi_api_queue_elem_t)msg;
       msgLen = currMsg->msg_len + sizeof(fapi_api_queue_elem_t);
-      addWlsBlockToFree(currMsg, msgLen, (slotIndIdx-1));
+      addWlsBlockToFree(currMsg, msgLen, (lwrMacCb.phySlotIndCntr-1));
       if(currMsg->p_next == NULLP)
       {
-	 DU_LOG("\nThere cannot be only one block to send");
+	 DU_LOG("\nERROR  -->  LWR MAC : There cannot be only one block to send");
 	 return RFAILED;
       }
 
@@ -294,7 +339,7 @@ uint8_t LwrMacSendToL1(void *msg)
       ret = WLS_Put(wlsHdlr, WLS_VA2PA(wlsHdlr, currMsg), msgLen, currMsg->msg_type, WLS_SG_FIRST);
       if(ret != 0)
       {
-	 DU_LOG("\nFailure in sending message to PHY");
+	 DU_LOG("\nERROR  -->  LWR MAC : Failure in sending message to PHY");
 	 return RFAILED;
       }
       currMsg = currMsg->p_next;
@@ -303,13 +348,13 @@ uint8_t LwrMacSendToL1(void *msg)
       {
 	 /* Sending the next msg */
 	 msgLen = currMsg->msg_len + sizeof(fapi_api_queue_elem_t);
-	 addWlsBlockToFree(currMsg, msgLen, (slotIndIdx-1));
+	 addWlsBlockToFree(currMsg, msgLen, (lwrMacCb.phySlotIndCntr-1));
 	 if(currMsg->p_next != NULLP)
 	 {
 	    ret = WLS_Put(wlsHdlr, WLS_VA2PA(wlsHdlr, currMsg), msgLen, currMsg->msg_type, WLS_SG_NEXT);
 	    if(ret != 0)
 	    {
-	       DU_LOG("\nFailure in sending message to PHY");
+	       DU_LOG("\nERROR  -->  LWR MAC : Failure in sending message to PHY");
 	       return RFAILED;
 	    }
 	    currMsg = currMsg->p_next;
@@ -320,7 +365,7 @@ uint8_t LwrMacSendToL1(void *msg)
 	    ret = WLS_Put(wlsHdlr, WLS_VA2PA(wlsHdlr, currMsg), msgLen, currMsg->msg_type, WLS_SG_LAST);
 	    if(ret != 0)
 	    {
-	       DU_LOG("\nFailure in sending message to PHY");
+	       DU_LOG("\nERROR  -->  LWR MAC : Failure in sending message to PHY");
 	       return RFAILED;
 	    }
 	    currMsg = NULLP;