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 */
#include "rg_sch_inf.h" /* layer management defines for LTE-MAC */
#include "rg_env.h" /* customisable defines and macros for MAC */
#include "rg.h" /* defines and macros for MAC */
-#include "du_log.h"
/* 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_app_mac_inf.h"
#include "rg.x" /* typedefs for MAC */
-#include "mac_sch_interface.h"
-/* local defines */
-
-/* local typedefs */
-
/* local externs */
-#ifdef UNUSE_FUN
+#ifdef UNUSED_FUNC
PRIVATE S16 rgLIMValidateSap ARGS((Inst inst,SuId suId));
#endif
PRIVATE Void rgLIMUtlFreeDatIndEvnt ARGS((TfuDatIndInfo *datInd,
Bool error));
-
-/* function pointers for packing slot ind from mac to sch */
-//S16 packMacSchSlotInd(Pst *pst, SlotIndInfo *slotInd);
-
-MacSchSlotIndFunc macSchSlotIndOpts[] =
-{
- packMacSchSlotInd,
- macSchSlotInd,
- packMacSchSlotInd
-};
-
#ifdef RG_UNUSED
PRIVATE Void rgLIMUtlFreeDatReqEvnt ARGS((TfuDatReqInfo *datReq,
Bool error));
* -# 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;
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 */
* -# 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;
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 */
*
* @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);
{
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
* -# ROK
* -# RFAILED
*/
-#ifdef UNUSE_FUN
+#ifdef UNUSED_FUNC
#ifdef ANSI
PRIVATE S16 rgLIMValidateSap
(
{
RgLowSapCb *tfuSap;
- TRC2(rgLIMValidateSap)
tfuSap = &(rgCb[inst].tfuSap);
{
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
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
}
}
RG_FREE_MEM(datInd);
- RETVOID;
+ return;
} /* end of rgLIMUtlFreeDatIndEvnt*/
/**
* -# 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;
{
Inst inst;
S16 ret;
- VOLATILE U32 startTime=0;
+ VOLATILE uint32_t startTime=0;
- TRC3(RgLiTfuDatInd);
// printf("5GTF:: DatindRcvd\n");
{
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 */
/*stoping Task*/
SStopTask(startTime, PID_MAC_TFU_DATIND);
- RETVALUE(ret);
+ return (ret);
} /* RgLiTfuDatInd*/
#ifdef RG_UNUSED
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.
}
}
RG_FREE_MEM(datReq);
- RETVOID;
+ return;
} /* end of rgLIMUtlFreeDatReqEvnt*/
#endif
/**
* -# 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
S16 ret;
RgLowSapCb *tfuSap;
- TRC2(rgLIMTfuDatReq)
/* Get the lower SAP control block from the layer control block. */
tfuSap = &(rgCb[inst].tfuSap);
/* 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
{
RLOG_ARG0(L_ERROR,DBG_CELLID,datReq->cellId,"Call to RgLiTfuDatReq() failed");
}
- RETVALUE(ret);
+ return (ret);
} /* rgLIMTfuDatReq*/
#ifdef L2_OPTMZ
* -# 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
S16 ret;
RgLowSapCb *tfuSap;
- TRC2(rgLIMTfuDelDatReq)
/* Get the lower SAP control block from the layer control block. */
tfuSap = &(rgCb[inst].tfuSap);
{
RLOG_ARG1(L_ERROR,DBG_CELLID,delDatReq->cellId,"Lower SAP not bound (%d)",
tfuSap->sapSta.sapState);
- RETVALUE(RFAILED);
+ return RFAILED;
}
#endif
{
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 : sendSlotIndMacToSch
- *
- * This API is invoked by MAC to send slot ind to scheduler.
- *
- * @param[in] SlotIndInfo *slotInd
- * @return S16
- * -# ROK
- * -# RFAILED
- **/
-int sendSlotIndMacToSch(SlotIndInfo *slotInd)
-{
- int ret = ROK;
- /* fill Pst structure to send to lwr_mac to MAC */
- Pst pst;
- pst.srcProcId = 0;
- pst.dstProcId = 0;
- pst.srcEnt = ENTRG;
- pst.dstEnt = ENTRG;
- pst.srcInst = 0;
- pst.dstInst = 1;
- pst.event = EVENT_SLOT_IND_TO_SCH;
- pst.region = 0;
- pst.pool = 0;
- pst.selector = MAC_SELECTOR_TC;
-
- return(*macSchSlotIndOpts[pst.selector])(&pst,slotInd);
-}
-
-/**
- * @brief Transmission time interval indication from PHY.
- *
- * @details
- *
- * Function : fapiMacSlotInd
- *
- * 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] SlotIndInfo *slotInd
- * @return S16
- * -# ROK
- * -# RFAILED
- **/
-PUBLIC S16 fapiMacSlotInd
-(
-Pst *pst,
-SlotIndInfo *slotInd
-)
-{
- S16 ret;
- VOLATILE U32 startTime=0;
- Inst inst;
-
- RG_IS_INST_VALID(pst->dstInst);
- inst = pst->dstInst - RG_INST_START;
- /*starting Task*/
- SStartTask(&startTime, PID_MAC_TTI_IND);
-
- /* send slot indication to scheduler */
- ret = sendSlotIndMacToSch(slotInd);
- if(ret != ROK)
- {
- DU_LOG("\nsending of slot ind msg from MAC to SCH failed");
- RETVALUE(ret);
- }
-
- /* Now call the TOM (Tfu ownership module) primitive to process further */
- ret = macProcessSlotInd(inst,*slotInd);
- if(ret != ROK)
- {
- DU_LOG("\nmacProcessSlotInd failed");
- RETVALUE(ret);
- }
-
-
- /*stoping Task*/
- SStopTask(startTime, PID_MAC_TTI_IND);
-
- RETVALUE(ret);
-} /* fapiMacSlotInd */
-
#if defined(TENB_T2K3K_SPECIFIC_CHANGES) && defined(LTE_TDD)
/**
* @brief Transmission of non-rt indication from CL.
* -# 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
Code Review / o-du / l2.git / blobdiff