X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_lim.c;h=e426f8f9761668205d4ad9cc7cc28575cc91f39d;hb=9940b262cb8423e9af0f6a19cc1f3f6fd61eaacd;hp=3a5c7ca4b59806848e55c553fea5099577929182;hpb=def50dc175cebc67238db5f1acd5ff322a2279bd;p=o-du%2Fl2.git

diff --git a/src/5gnrmac/rg_lim.c b/src/5gnrmac/rg_lim.c
index 3a5c7ca4b..e426f8f97 100755
--- a/src/5gnrmac/rg_lim.c
+++ b/src/5gnrmac/rg_lim.c
@@ -32,9 +32,6 @@
 @brief It has APIs exposed by Lower Interface Modulue of MAC. It acts as an 
 Interface handler for lower interface APIs.
 */
-static const char* RLOG_MODULE_NAME="MAC";
-static int RLOG_FILE_ID=182;
-static int RLOG_MODULE_ID=4096;
 /* header include files -- defines (.h) */
 #include "common_def.h"
 #include "rgu.h"           /* RGU defines */
@@ -56,113 +53,16 @@ static int RLOG_MODULE_ID=4096;
 
 /* local externs */
 #ifdef UNUSED_FUNC
-PRIVATE S16  rgLIMValidateSap ARGS((Inst inst,SuId suId));
+static S16  rgLIMValidateSap ARGS((Inst inst,SuId suId));
 #endif
-PRIVATE Void rgLIMUtlFreeDatIndEvnt ARGS((TfuDatIndInfo *datInd,
+static Void rgLIMUtlFreeDatIndEvnt ARGS((TfuDatIndInfo *datInd,
                                           Bool error));
 #ifdef RG_UNUSED
-PRIVATE Void rgLIMUtlFreeDatReqEvnt ARGS((TfuDatReqInfo *datReq,
+static Void rgLIMUtlFreeDatReqEvnt ARGS((TfuDatReqInfo *datReq,
                                           Bool error));
 #endif
 /* forward references */
 
-/**
- * @brief This API is invoked to send TFU SAP bind request to PHY.
- *
- * @details
- *
- *     Function : rgLIMTfuBndReq
- *      
- *      This API is invoked to send TFU SAP bind request to PHY. It fills in 
- *      the Pst structure, spId and suId values and invokes bind request
- *      primitive at TFU.
- *           
- *  @param[in]  Inst        inst
- *  @param[in]  SuId            suId 
- *  @param[in]  SpId            spId
- *  @return  S16
- *      -# ROK 
- *      -# RFAILED 
- **/
-#ifdef ANSI
-S16 rgLIMTfuBndReq
-(
-Inst    inst,
-SuId    suId, 
-SpId    spId
-)
-#else
-S16 rgLIMTfuBndReq(inst,suId, spId)
-Inst    inst;
-SuId    suId; 
-SpId    spId;
-#endif
-{
-   S16         ret;
-   RgLowSapCb  *tfuSap;
-   Pst         pst;
-
-
-   /* Get the lower SAP control block from the layer control block. */
-   tfuSap = &(rgCb[inst].tfuSap);
-   memcpy (&pst, &(tfuSap->sapCfg.sapPst), sizeof(Pst));
-   if((ret = RgLiTfuBndReq (&pst, suId, spId)) != ROK)
-   {
-      RLOG0(L_ERROR,"Call to RgLiTfuBndReq() failed");
-   }
-   return (ret);
-}  /* rgLIMTfuBndReq */
-
-
-/**
- * @brief This API is invoked to send TFU SAP unbind request to PHY.
- *
- * @details
- *
- *     Function : rgLIMTfuBndReq
- *      
- *      This API is invoked to send TFU SAP unbind request to PHY. It fills in 
- *      the Pst structure and spId value and invokes unbind request
- *      primitive at TFU.
- *           
- *  @param[in]  Inst        inst
- *  @param[in]  SpId            spId
- *  @param[in]  Reason          reason 
- *  @return  S16
- *      -# ROK 
- *      -# RFAILED 
- **/
-#ifdef ANSI
-S16 rgLIMTfuUbndReq
-(
-Inst    inst,
-SpId    spId, 
-Reason  reason
-)
-#else
-S16 rgLIMTfuUbndReq(inst,spId, reason)
-Inst    inst;
-SpId    spId; 
-Reason  reason;
-#endif
-{
-   S16         ret;
-   RgLowSapCb  *tfuSap;
-   Pst         pst;
-
-
-   /* Get the lower SAP control block from the layer control block. */
-   tfuSap = &(rgCb[inst].tfuSap);
-   memcpy (&pst, &(tfuSap->sapCfg.sapPst), sizeof(Pst));
-   if((ret = RgLiTfuUbndReq (&pst, tfuSap->sapCfg.spId, reason)) != ROK)
-   {
-      RLOG0(L_ERROR,"Call to RgLiTfuUbndReq() failed");
-   }
-   return (ret);
-
-}  /* rgLIMTfuUbndReq */
-
-
 /**
  * @brief Bind confirm API for TFU SAP 
  *
@@ -180,19 +80,12 @@ Reason  reason;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 S16 RgLiTfuBndCfm 
 (
 Pst     *pst,
 SuId    suId, 
 uint8_t status
 )
-#else
-S16 RgLiTfuBndCfm(pst, suId, status)
-Pst     *pst; 
-SuId    suId; 
-uint8_t status;
-#endif
 {
    Inst inst;
    S16 ret;
@@ -208,7 +101,7 @@ uint8_t status;
 
    if (suId != tfuSap->sapCfg.suId)
    {
-      RLOG2(L_ERROR,"Incorrect SuId. Configured (%d) Recieved (%d)",
+      DU_LOG("\nERROR  -->  MAC : Incorrect SuId. Configured (%d) Recieved (%d)",
             tfuSap->sapCfg.suId, suId);
       return RFAILED;
    }
@@ -227,17 +120,7 @@ uint8_t status;
   *   -# RFAILED
   */
 #ifdef UNUSED_FUNC
-#ifdef ANSI
-PRIVATE S16 rgLIMValidateSap
-(
- Inst    inst,
- SuId    suId
-)
-#else
-PRIVATE S16 rgLIMValidateSap(inst,suId)
- Inst    inst;
- SuId    suId;
-#endif
+static S16 rgLIMValidateSap(Inst  inst,SuId suId)
 {
    RgLowSapCb  *tfuSap;
 
@@ -247,13 +130,13 @@ PRIVATE S16 rgLIMValidateSap(inst,suId)
    /* First lets check the suId */
    if( suId != tfuSap->sapCfg.suId)
    {
-      RLOG2(L_ERROR,"Incorrect SuId. Configured (%d) Recieved (%d)",
+      DU_LOG("\nERROR  -->  MAC : Incorrect SuId. Configured (%d) Recieved (%d)",
             tfuSap->sapCfg.suId, suId);
       return RFAILED;
    }
    if (tfuSap->sapSta.sapState != LRG_BND)
    {
-      RLOG1(L_ERROR,"Lower SAP not enabled SuId (%d)",
+      DU_LOG("\nERROR  -->  MAC : Lower SAP not enabled SuId (%d)",
             tfuSap->sapCfg.suId);
       return RFAILED;
    }
@@ -273,17 +156,7 @@ PRIVATE S16 rgLIMValidateSap(inst,suId)
  * @param  [in] Bool          *error
  * @return 
  */
-#ifdef ANSI
-PRIVATE Void rgLIMUtlFreeDatIndEvnt 
-(
- TfuDatIndInfo *datInd,
- Bool          error
- )
-#else
-PRIVATE Void rgLIMUtlFreeDatIndEvnt(datInd, error)
- TfuDatIndInfo *datInd;
- Bool          error;
-#endif
+static Void rgLIMUtlFreeDatIndEvnt(TfuDatIndInfo *datInd,Bool error)
 {
 
    TfuDatInfo     *datInfo;
@@ -324,26 +197,19 @@ PRIVATE Void rgLIMUtlFreeDatIndEvnt(datInd, error)
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 S16 RgLiTfuDatInd
 (
 Pst                *pst, 
 SuId               suId, 
 TfuDatIndInfo    *datInd
 )
-#else
-S16 RgLiTfuDatInd(pst, suId, datInd)
-Pst                *pst; 
-SuId               suId; 
-TfuDatIndInfo    *datInd;
-#endif
 {
    Inst             inst;
    S16              ret;
-   VOLATILE uint32_t     startTime=0;
+   volatile uint32_t     startTime=0;
 
 
-  // printf("5GTF:: DatindRcvd\n");
+  // DU_LOG("5GTF:: DatindRcvd\n");
 
    RG_IS_INST_VALID(pst->dstInst);
    inst = pst->dstInst - RG_INST_START;
@@ -353,7 +219,7 @@ TfuDatIndInfo    *datInd;
 #ifndef NO_ERRCLS 
    if ((ret = rgLIMValidateSap (inst,suId)) != ROK)
    {
-      RLOG_ARG0(L_ERROR,DBG_CELLID,datInd->cellId,"SAP Validation failed");
+      DU_LOG("\nERROR  -->  MAC : SAP Validation failed");
       rgLIMUtlFreeDatIndEvnt(datInd, TRUE);
       return (ret);
    }
@@ -393,17 +259,7 @@ TfuDatIndInfo    *datInd;
  * @param  [in] Bool          *error
  * @return 
  */
-#ifdef ANSI
-PRIVATE Void rgLIMUtlFreeDatReqEvnt
-(
- TfuDatReqInfo *datReq,
- Bool          error
- )
-#else
-PRIVATE Void rgLIMUtlFreeDatReqEvnt(datReq, error)
- TfuDatReqInfo *datReq;
- Bool          error;
-#endif
+static Void rgLIMUtlFreeDatReqEvnt(TfuDatReqInfo *datReq,Bool  error)
 {
 
    TfuDatReqPduInfo *datInfo;
@@ -442,65 +298,6 @@ PRIVATE Void rgLIMUtlFreeDatReqEvnt(datReq, error)
    return;
 } /* end of rgLIMUtlFreeDatReqEvnt*/
 #endif
-/**
- * @brief This API is invoked to send Data to PHY.
- *
- * @details
- *
- *     Function : rgLIMTfuDatReq
- *      
- *      This API is invoked to send Data to PHY. It 
- *      fills in the Pst structure, spId value and invokes Data
- *      request primitive at TFU.
- *           
- *  @param[in]  Inst        inst
- *  @param[in]  TfuDatReqInfo *datReq
- *  @return  S16
- *      -# ROK 
- *      -# RFAILED 
- **/
-#ifdef ANSI
-S16 rgLIMTfuDatReq 
-(
-Inst          inst,
-TfuDatReqInfo *datReq
-)
-#else
-S16 rgLIMTfuDatReq(inst,datReq)
-Inst          inst;
-TfuDatReqInfo *datReq;
-#endif
-{
-   S16         ret;
-   RgLowSapCb  *tfuSap;
-
-
-   /* Get the lower SAP control block from the layer control block. */
-   tfuSap = &(rgCb[inst].tfuSap);
-
-#ifndef NO_ERRCLS
-   if (tfuSap->sapSta.sapState != LRG_BND)
-   {
-      RLOG_ARG1(L_ERROR,DBG_CELLID,datReq->cellId,"Lower SAP not bound (%d)",
-            tfuSap->sapSta.sapState);
-#ifdef RG_UNUSED
-      /* This case will never be hit if sap is not bound then we dont get TTI */
-      rgLIMUtlFreeDatReqEvnt(datReq, TRUE);
-#endif
-      return RFAILED;
-   }
-#endif
-
-   tfuSap->sapSts.numPduTxmit += datReq->pdus.count; 
-
-   /* Using existing pst - for optimization */
-   if((ret = RgLiTfuDatReq (&tfuSap->sapCfg.sapPst, tfuSap->sapCfg.spId, 
-                            datReq)) != ROK)
-   {
-      RLOG_ARG0(L_ERROR,DBG_CELLID,datReq->cellId,"Call to RgLiTfuDatReq() failed");
-   }
-   return (ret);
-}  /* rgLIMTfuDatReq*/
 
 #ifdef L2_OPTMZ
 /**
@@ -520,17 +317,7 @@ TfuDatReqInfo *datReq;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 rgLIMTfuDelDatReq 
-(
-Inst          inst,
-TfuDelDatReqInfo *delDatReq
-)
-#else
-S16 rgLIMTfuDatReq(inst,delDatReq)
-Inst          inst;
-TfuDelDatReqInfo *delDatReq;
-#endif
+S16 rgLIMTfuDelDatReq(Inst inst,TfuDelDatReqInfo *delDatReq)
 {
    S16         ret;
    RgLowSapCb  *tfuSap;
@@ -542,7 +329,7 @@ TfuDelDatReqInfo *delDatReq;
 #ifndef NO_ERRCLS
    if (tfuSap->sapSta.sapState != LRG_BND)
    {
-      RLOG_ARG1(L_ERROR,DBG_CELLID,delDatReq->cellId,"Lower SAP not bound (%d)",
+      DU_LOG("\nERROR  -->  MAC : Lower SAP not bound (%d)",
             tfuSap->sapSta.sapState);
       return RFAILED;
    }
@@ -551,7 +338,7 @@ TfuDelDatReqInfo *delDatReq;
    if((ret = RgLiTfuDelDatReq (&tfuSap->sapCfg.sapPst, tfuSap->sapCfg.spId, 
                             delDatReq)) != ROK)
    {
-      RLOG_ARG0(L_ERROR,DBG_CELLID,delDatReq->cellId,"Call to RgLiTfuDelDatReq() failed");
+      DU_LOG("\nERROR  -->  MAC : Call to RgLiTfuDelDatReq() failed");
    }
    return (ret);
 }  /* rgLIMTfuDatReq*/
@@ -573,23 +360,13 @@ TfuDelDatReqInfo *delDatReq;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-S16 RgLiTfuNonRtInd
-(
-Pst                 *pst,
-SuId                suId
-)
-#else
-S16 RgLiTfuNonRtInd(pst, suId)
-Pst                 *pst;
-SuId                suId;
-#endif
+S16 RgLiTfuNonRtInd(Pst  *pst,SuId  suId)
 {
 
 #ifdef NO_ERRCLS
    if (rgLIMValidateSap (pst->dstInst - RG_INST_START, suId) != ROK)
    {
-      RGDBGERRNEW(pst->dstInst - RG_INST_START, (rgPBuf(pst->dstInst - RG_INST_START),"RgLiTfuNonRtInd() SAP Validation failed.\n"));
+      DU_LOG("\nERROR  -->  MAC : RgLiTfuNonRtInd() SAP Validation failed.\n");
       return RFAILED;
    }
 #endif