X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fphy_stub%2Fl1_bdy1.c;h=aeda96e2c3e40a1578d31afaca3dea1085c33c56;hb=46fa0c4b110175e7bc5d56f1e419fe4005db36b9;hp=2a1391ee1d02e13cf744c43aa297fb3f330c35d7;hpb=d2d9dcbd92e8f1be15dd5891aaf9ada9bc071e1a;p=o-du%2Fl2.git

diff --git a/src/phy_stub/l1_bdy1.c b/src/phy_stub/l1_bdy1.c
index 2a1391ee1..aeda96e2c 100644
--- a/src/phy_stub/l1_bdy1.c
+++ b/src/phy_stub/l1_bdy1.c
@@ -27,12 +27,13 @@
 #include "gen.x"
 #include "ssi.x"
 
-#include "rg_cl_phy.h"
 #include "lwr_mac.h"
+#include "lwr_mac_phy.h"
 #ifdef FAPI
 #include "fapi.h"
 #endif
 #include "lphy_stub.h"
+#include "du_log.h"
 
 #define MAX_SLOT_VALUE   9
 #define MAX_SFN_VALUE    1023
@@ -45,8 +46,7 @@ EXTERN void fillTlvs ARGS((fapi_uint16_tlv_t *tlv, uint16_t tag, uint16_t
 length, uint16_t value, uint32_t *msgLen));
 EXTERN void fillMsgHeader ARGS((fapi_msg_t *hdr, uint16_t msgType, uint16_t msgLen));
 #endif
-EXTERN void sendToLowerMac ARGS((uint16_t msgType, uint32_t msgLen,void *msg));
-EXTERN void handlePhyMessages ARGS((void *msg));
+EXTERN void handlePhyMessages(uint16_t msgType, uint32_t msgSize, void *msg);
 
 /*******************************************************************
  *
@@ -146,8 +146,8 @@ S16 l1BldAndSndParamRsp(void *msg)
 
   fillMsgHeader(&fapiParamRsp->header, FAPI_PARAM_RESPONSE, msgLen);
   fapiParamRsp->error_code = MSG_OK;
-  printf("\nPHY_STUB: Sending Param Request to Lower Mac");
-  sendToLowerMac(fapiParamRsp->header.message_type_id, sizeof(fapi_param_resp_t), (void *)fapiParamRsp);
+  DU_LOG("\nPHY_STUB: Sending Param Request to Lower Mac");
+  handlePhyMessages(fapiParamRsp->header.message_type_id, sizeof(fapi_param_resp_t), (void *)fapiParamRsp);
 #endif
   return ROK;
 }
@@ -172,7 +172,6 @@ S16 l1BldAndSndParamRsp(void *msg)
 S16 l1BldAndSndConfigRsp(void *msg)
 {
 #ifdef FAPI
-   uint8_t index = 0;
    uint32_t msgLen = 0;
    fapi_config_resp_t *fapiConfigRsp = (fapi_config_resp_t *)msg;
 
@@ -184,8 +183,8 @@ S16 l1BldAndSndConfigRsp(void *msg)
       fapiConfigRsp->error_code = MSG_OK;
       msgLen += sizeof(fapi_config_resp_t);
       fillMsgHeader(&fapiConfigRsp->header, FAPI_CONFIG_RESPONSE, msgLen);
-      printf("\nPHY_STUB: Sending Config Response to Lower Mac");
-      sendToLowerMac(fapiConfigRsp->header.message_type_id, sizeof(fapi_config_resp_t), (void *)fapiConfigRsp);
+      DU_LOG("\nPHY_STUB: Sending Config Response to Lower Mac");
+      handlePhyMessages(fapiConfigRsp->header.message_type_id, sizeof(fapi_config_resp_t), (void *)fapiConfigRsp);
       return ROK;
    }
 #else
@@ -212,11 +211,11 @@ S16 l1BldAndSndConfigRsp(void *msg)
 
 PUBLIC void l1HdlParamReq(uint32_t msgLen, void *msg)
 {
-   printf("\nPHY_STUB: Received Param Request in PHY");
+   DU_LOG("\nPHY_STUB: Received Param Request in PHY");
    /* Handling PARAM RESPONSE */
    if(l1BldAndSndParamRsp(msg)!= ROK)
    {
-      printf("\nPHY_STUB: Failed Sending Param Response");
+      DU_LOG("\nPHY_STUB: Failed Sending Param Response");
    }
 } 
 
@@ -240,7 +239,7 @@ PUBLIC void l1HdlParamReq(uint32_t msgLen, void *msg)
 
 PUBLIC void l1HdlConfigReq(uint32_t msgLen, void *msg)
 {
-   printf("\nPHY_STUB: Received Config Request in PHY");
+   DU_LOG("\nPHY_STUB: Received Config Request in PHY");
 
    /* Handling CONFIG RESPONSE */
    if(l1BldAndSndConfigRsp(msg)!= ROK)
@@ -272,7 +271,7 @@ PUBLIC S16 buildAndSendSlotIndication()
    fapi_slot_ind_t *slotIndMsg;
    if(SGetSBuf(0, 0, (Data **)&slotIndMsg, sizeof(slotIndMsg)) != ROK)
    {
-       printf("\nPHY_STUB: Memory allocation failed for slot Indication Message");
+       DU_LOG("\nPHY_STUB: Memory allocation failed for slot Indication Message");
        return RFAILED;
    }
    else
@@ -291,8 +290,8 @@ PUBLIC S16 buildAndSendSlotIndication()
       slotIndMsg->sfn = sfnValue;
       slotIndMsg->slot = slotValue;
       fillMsgHeader(&slotIndMsg->header, FAPI_SLOT_INDICATION, sizeof(fapi_slot_ind_t));
-      printf("\nPHY_STUB [%d:%d] ",sfnValue,slotValue);
-      handlePhyMessages((void*)slotIndMsg);
+      DU_LOG("\nPHY_STUB [%d:%d] ",sfnValue,slotValue);
+      handlePhyMessages(slotIndMsg->header.message_type_id, sizeof(fapi_slot_ind_t), (void*)slotIndMsg);
       SPutSBuf(0, 0, (Data *)slotIndMsg, sizeof(slotIndMsg));
    }
 #endif
@@ -329,7 +328,7 @@ PUBLIC S16 l1HdlStartReq(uint32_t msgLen, void *msg)
    }
    else
    {
-      printf("\n PHY_STUB: Received Start Req in PHY State", clGlobalCp.phyState);
+      DU_LOG("\n PHY_STUB: Received Start Req in PHY State %d", clGlobalCp.phyState);
       return RFAILED;
    }
 }
@@ -375,16 +374,16 @@ PUBLIC S16 l1HdlDlTtiReq(uint16_t msgLen, void *msg)
    uint8_t numPdus = dlTtiReq->nPdus;
 	if(numPdus == 0)
 	{
-		printf("no  PDU \n");
+		DU_LOG("\nNo PDU \n");
    }
 	while(numPdus)
 	{
 		if(dlTtiReq->pdus->pduType == 3) //SSB_PDU_TYPE
-			printf("SSB PDU\n");
+			DU_LOG("\nSSB PDU\n");
 		else if(dlTtiReq->pdus->pduType == 0)
-			printf("SIB1 PDCCH PDU\n");
+			DU_LOG("\nSIB1 PDCCH PDU\n");
 		else if(dlTtiReq->pdus->pduType == 1)
-			printf("SIB1 PDSCH PDU\n");
+		   DU_LOG("\nSIB1 PDSCH PDU\n");
 
 		numPdus--;
 	}
@@ -430,7 +429,7 @@ void processFapiRequest(uint8_t msgType, uint32_t msgLen, void *msg)
          l1HdlDlTtiReq(msgLen, msg);
          break;
       default:
-         printf("\nPHY_STUB: Invalid message type[%x] received at PHY", msgType);
+         DU_LOG("\nPHY_STUB: Invalid message type[%x] received at PHY", msgType);
          break;
 #endif
    }