X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_lim.c;h=3a5c7ca4b59806848e55c553fea5099577929182;hb=def50dc175cebc67238db5f1acd5ff322a2279bd;hp=ccead37e86f1a3caeea3175990463f20c87db6a4;hpb=18fbca81feebe0cf45f205c1c580c574741292b0;p=o-du%2Fl2.git diff --git a/src/5gnrmac/rg_lim.c b/src/5gnrmac/rg_lim.c index ccead37e8..3a5c7ca4b 100755 --- a/src/5gnrmac/rg_lim.c +++ b/src/5gnrmac/rg_lim.c @@ -36,17 +36,7 @@ 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 "envopt.h" /* environment options */ -#include "envdep.h" /* environment dependent */ -#include "envind.h" /* environment independent */ -#include "gen.h" /* general layer */ -#include "ssi.h" /* system services */ -#include "cm5.h" /* common timers defines */ -#include "cm_hash.h" /* common hash list defines */ -#include "cm_llist.h" /* common linked list defines */ -#include "cm_mblk.h" /* memory management */ -#include "cm_tkns.h" /* common tokens */ -#include "cm_lte.h" /* common tokens */ +#include "common_def.h" #include "rgu.h" /* RGU defines */ #include "tfu.h" /* RGU defines */ #include "lrg.h" /* layer management defines for LTE-MAC */ @@ -55,32 +45,19 @@ static int RLOG_MODULE_ID=4096; #include "rg_env.h" /* customisable defines and macros for MAC */ #include "rg.h" /* defines and macros for MAC */ - /* header/extern include files (.x) */ -#include "gen.x" /* general layer typedefs */ -#include "ssi.x" /* system services typedefs */ -#include "cm5.x" /* common timers */ -#include "cm_hash.x" /* common hash list */ -#include "cm_lib.x" /* common library */ -#include "cm_llist.x" /* common linked list */ -#include "cm_mblk.x" /* memory management */ -#include "cm_tkns.x" /* common tokens */ -#include "cm_lte.x" /* common tokens */ #include "rgu.x" /* RGU types */ #include "tfu.x" /* RGU types */ #include "lrg.x" /* layer management typedefs for MAC */ #include "crg.x" /* layer management typedefs for MAC */ #include "rg_sch_inf.x" /* SCH interface typedefs */ #include "rg_prg.x" /* PRG interface typedefs */ -#include "du_mgr_mac_inf.h" #include "rg.x" /* typedefs for MAC */ -/* local defines */ - -/* local typedefs */ - /* local externs */ +#ifdef UNUSED_FUNC PRIVATE S16 rgLIMValidateSap ARGS((Inst inst,SuId suId)); +#endif PRIVATE Void rgLIMUtlFreeDatIndEvnt ARGS((TfuDatIndInfo *datInd, Bool error)); #ifdef RG_UNUSED @@ -108,14 +85,14 @@ PRIVATE Void rgLIMUtlFreeDatReqEvnt ARGS((TfuDatReqInfo *datReq, * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgLIMTfuBndReq +S16 rgLIMTfuBndReq ( Inst inst, SuId suId, SpId spId ) #else -PUBLIC S16 rgLIMTfuBndReq(inst,suId, spId) +S16 rgLIMTfuBndReq(inst,suId, spId) Inst inst; SuId suId; SpId spId; @@ -125,16 +102,15 @@ SpId spId; RgLowSapCb *tfuSap; Pst pst; - TRC2(rgLIMTfuBndReq); /* Get the lower SAP control block from the layer control block. */ tfuSap = &(rgCb[inst].tfuSap); - (Void)cmMemcpy ((U8*)&pst, (U8*)&(tfuSap->sapCfg.sapPst), sizeof(Pst)); + memcpy (&pst, &(tfuSap->sapCfg.sapPst), sizeof(Pst)); if((ret = RgLiTfuBndReq (&pst, suId, spId)) != ROK) { RLOG0(L_ERROR,"Call to RgLiTfuBndReq() failed"); } - RETVALUE(ret); + return (ret); } /* rgLIMTfuBndReq */ @@ -157,14 +133,14 @@ SpId spId; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgLIMTfuUbndReq +S16 rgLIMTfuUbndReq ( Inst inst, SpId spId, Reason reason ) #else -PUBLIC S16 rgLIMTfuUbndReq(inst,spId, reason) +S16 rgLIMTfuUbndReq(inst,spId, reason) Inst inst; SpId spId; Reason reason; @@ -174,16 +150,15 @@ Reason reason; RgLowSapCb *tfuSap; Pst pst; - TRC2(rgLIMTfuUbndReq); /* Get the lower SAP control block from the layer control block. */ tfuSap = &(rgCb[inst].tfuSap); - cmMemcpy ((U8*)&pst, (U8*)&(tfuSap->sapCfg.sapPst), sizeof(Pst)); + memcpy (&pst, &(tfuSap->sapCfg.sapPst), sizeof(Pst)); if((ret = RgLiTfuUbndReq (&pst, tfuSap->sapCfg.spId, reason)) != ROK) { RLOG0(L_ERROR,"Call to RgLiTfuUbndReq() failed"); } - RETVALUE(ret); + return (ret); } /* rgLIMTfuUbndReq */ @@ -200,30 +175,29 @@ Reason reason; * * @param[in] Pst *pst * @param[in] SuId suId - * @param[in] U8 status + * @param[in] uint8_t status * @return S16 * -# ROK * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 RgLiTfuBndCfm +S16 RgLiTfuBndCfm ( Pst *pst, SuId suId, -U8 status +uint8_t status ) #else -PUBLIC S16 RgLiTfuBndCfm(pst, suId, status) +S16 RgLiTfuBndCfm(pst, suId, status) Pst *pst; SuId suId; -U8 status; +uint8_t status; #endif { Inst inst; S16 ret; RgLowSapCb *tfuSap; - TRC3(RgLiTfuBndCfm); RG_IS_INST_VALID(pst->dstInst); @@ -236,10 +210,10 @@ U8 status; { RLOG2(L_ERROR,"Incorrect SuId. Configured (%d) Recieved (%d)", tfuSap->sapCfg.suId, suId); - RETVALUE(RFAILED); + return RFAILED; } ret = rgLMMBndCfm (pst, suId, status); - RETVALUE(ret); + return (ret); } /* RgLiTfuBndCfm */ /** @brief This function Validates the SAP information received along with the @@ -252,6 +226,7 @@ U8 status; * -# ROK * -# RFAILED */ +#ifdef UNUSED_FUNC #ifdef ANSI PRIVATE S16 rgLIMValidateSap ( @@ -266,7 +241,6 @@ PRIVATE S16 rgLIMValidateSap(inst,suId) { RgLowSapCb *tfuSap; - TRC2(rgLIMValidateSap) tfuSap = &(rgCb[inst].tfuSap); @@ -275,17 +249,17 @@ PRIVATE S16 rgLIMValidateSap(inst,suId) { RLOG2(L_ERROR,"Incorrect SuId. Configured (%d) Recieved (%d)", tfuSap->sapCfg.suId, suId); - RETVALUE(RFAILED); + return RFAILED; } if (tfuSap->sapSta.sapState != LRG_BND) { RLOG1(L_ERROR,"Lower SAP not enabled SuId (%d)", tfuSap->sapCfg.suId); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* end of rgLIMValidateSap */ - +#endif /** @brief This function frees up the TfuDatIndInfo structure * * @details @@ -315,7 +289,6 @@ PRIVATE Void rgLIMUtlFreeDatIndEvnt(datInd, error) TfuDatInfo *datInfo; CmLList *node; - TRC2(rgLIMUtlFreeDatIndEvnt); /* Steps of freeing up the TfuDatInd. * 1. loop through the datIndLst and free up all the buffers. * 2. free up the whole event @@ -331,7 +304,7 @@ PRIVATE Void rgLIMUtlFreeDatIndEvnt(datInd, error) } } RG_FREE_MEM(datInd); - RETVOID; + return; } /* end of rgLIMUtlFreeDatIndEvnt*/ /** @@ -352,14 +325,14 @@ PRIVATE Void rgLIMUtlFreeDatIndEvnt(datInd, error) * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 RgLiTfuDatInd +S16 RgLiTfuDatInd ( Pst *pst, SuId suId, TfuDatIndInfo *datInd ) #else -PUBLIC S16 RgLiTfuDatInd(pst, suId, datInd) +S16 RgLiTfuDatInd(pst, suId, datInd) Pst *pst; SuId suId; TfuDatIndInfo *datInd; @@ -367,9 +340,8 @@ TfuDatIndInfo *datInd; { Inst inst; S16 ret; - VOLATILE U32 startTime=0; + VOLATILE uint32_t startTime=0; - TRC3(RgLiTfuDatInd); // printf("5GTF:: DatindRcvd\n"); @@ -383,7 +355,7 @@ TfuDatIndInfo *datInd; { RLOG_ARG0(L_ERROR,DBG_CELLID,datInd->cellId,"SAP Validation failed"); rgLIMUtlFreeDatIndEvnt(datInd, TRUE); - RETVALUE(ret); + return (ret); } #endif /* Now call the TOM (Tfu ownership module) primitive to process further */ @@ -404,7 +376,7 @@ TfuDatIndInfo *datInd; /*stoping Task*/ SStopTask(startTime, PID_MAC_TFU_DATIND); - RETVALUE(ret); + return (ret); } /* RgLiTfuDatInd*/ #ifdef RG_UNUSED @@ -436,9 +408,8 @@ PRIVATE Void rgLIMUtlFreeDatReqEvnt(datReq, error) TfuDatReqPduInfo *datInfo; CmLList *node; - U8 i; + uint8_t i; - TRC2(rgLIMUtlFreeDatReqEvnt); /* Steps of freeing up the TfuDatReq. * 1. Free the bch buffer. * 2. loop through the pdus list and free up all the buffers. @@ -468,7 +439,7 @@ PRIVATE Void rgLIMUtlFreeDatReqEvnt(datReq, error) } } RG_FREE_MEM(datReq); - RETVOID; + return; } /* end of rgLIMUtlFreeDatReqEvnt*/ #endif /** @@ -489,13 +460,13 @@ PRIVATE Void rgLIMUtlFreeDatReqEvnt(datReq, error) * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgLIMTfuDatReq +S16 rgLIMTfuDatReq ( Inst inst, TfuDatReqInfo *datReq ) #else -PUBLIC S16 rgLIMTfuDatReq(inst,datReq) +S16 rgLIMTfuDatReq(inst,datReq) Inst inst; TfuDatReqInfo *datReq; #endif @@ -503,7 +474,6 @@ TfuDatReqInfo *datReq; S16 ret; RgLowSapCb *tfuSap; - TRC2(rgLIMTfuDatReq) /* Get the lower SAP control block from the layer control block. */ tfuSap = &(rgCb[inst].tfuSap); @@ -517,7 +487,7 @@ TfuDatReqInfo *datReq; /* This case will never be hit if sap is not bound then we dont get TTI */ rgLIMUtlFreeDatReqEvnt(datReq, TRUE); #endif - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -529,7 +499,7 @@ TfuDatReqInfo *datReq; { RLOG_ARG0(L_ERROR,DBG_CELLID,datReq->cellId,"Call to RgLiTfuDatReq() failed"); } - RETVALUE(ret); + return (ret); } /* rgLIMTfuDatReq*/ #ifdef L2_OPTMZ @@ -551,13 +521,13 @@ TfuDatReqInfo *datReq; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgLIMTfuDelDatReq +S16 rgLIMTfuDelDatReq ( Inst inst, TfuDelDatReqInfo *delDatReq ) #else -PUBLIC S16 rgLIMTfuDatReq(inst,delDatReq) +S16 rgLIMTfuDatReq(inst,delDatReq) Inst inst; TfuDelDatReqInfo *delDatReq; #endif @@ -565,7 +535,6 @@ TfuDelDatReqInfo *delDatReq; S16 ret; RgLowSapCb *tfuSap; - TRC2(rgLIMTfuDelDatReq) /* Get the lower SAP control block from the layer control block. */ tfuSap = &(rgCb[inst].tfuSap); @@ -575,7 +544,7 @@ TfuDelDatReqInfo *delDatReq; { RLOG_ARG1(L_ERROR,DBG_CELLID,delDatReq->cellId,"Lower SAP not bound (%d)", tfuSap->sapSta.sapState); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -584,69 +553,10 @@ TfuDelDatReqInfo *delDatReq; { RLOG_ARG0(L_ERROR,DBG_CELLID,delDatReq->cellId,"Call to RgLiTfuDelDatReq() failed"); } - RETVALUE(ret); + return (ret); } /* rgLIMTfuDatReq*/ #endif /*L2_OPTMZ */ -/** - * @brief Transmission time interval indication from PHY. - * - * @details - * - * Function : RgLiTfuTtiInd - * - * This API is invoked by PHY to indicate TTI indication to MAC for a cell. - * - * @param[in] Pst *pst - * @param[in] SuId suId - * @param[in] TfuTtiIndInfo *ttiInd - * @return S16 - * -# ROK - * -# RFAILED - **/ -#ifdef ANSI -PUBLIC S16 RgLiTfuTtiInd -( -Pst *pst, -SuId suId, -TfuTtiIndInfo *ttiInd -) -#else -PUBLIC S16 RgLiTfuTtiInd(pst, suId, ttiInd) -Pst *pst; -SuId suId; -TfuTtiIndInfo *ttiInd; -#endif -{ - S16 ret; - VOLATILE U32 startTime=0; - Inst inst; - - TRC3(RgLiTfuTtiInd); - - RG_IS_INST_VALID(pst->dstInst); - inst = pst->dstInst - RG_INST_START; - /*starting Task*/ - SStartTask(&startTime, PID_MAC_TTI_IND); - -#ifdef NO_ERRCLS - if ((ret = rgLIMValidateSap (pst->dstInst - RG_INST_START,suId)) != ROK) - { - RLOG_ARG0(L_ERROR,DBG_CELLID,ttiInd->cells[0].cellId,"SAP Validation failed"); - RETVALUE(ret); - } -#endif - - /* Now call the TOM (Tfu ownership module) primitive to process further */ - ret = rgTOMTtiInd(inst,ttiInd); - - - /*stoping Task*/ - SStopTask(startTime, PID_MAC_TTI_IND); - - RETVALUE(ret); -} /* RgLiTfuTtiInd */ - #if defined(TENB_T2K3K_SPECIFIC_CHANGES) && defined(LTE_TDD) /** * @brief Transmission of non-rt indication from CL. @@ -664,28 +574,27 @@ TfuTtiIndInfo *ttiInd; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 RgLiTfuNonRtInd +S16 RgLiTfuNonRtInd ( Pst *pst, SuId suId ) #else -PUBLIC S16 RgLiTfuNonRtInd(pst, suId) +S16 RgLiTfuNonRtInd(pst, suId) Pst *pst; SuId suId; #endif { - TRC3(RgLiTfuNonRtInd); #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")); - RETVALUE(RFAILED); + return RFAILED; } #endif rgDHMFreeTbBufs(pst->dstInst - RG_INST_START); - RETVALUE(ROK); + return ROK; } /* RgLiTfuNonRtInd */ #endif