**********************************************************************/
/* 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 service interface */
-#include "cm_hash.h" /* common hash list */
-#include "cm_mblk.h" /* common memory link list library */
-#include "cm_llist.h" /* common linked list library */
-#include "cm_err.h" /* common error */
-#include "cm_lte.h" /* common LTE */
+#include "common_def.h"
#include "lrg.h" /* layer manager for MAC */
#include "crg.h" /* CRG interface includes*/
#include "rgu.h" /* RGU interface includes*/
#include "rg_err.h" /* MAC error includes*/
/* 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 "rg_pom_scell.x"
/* Matrix for Ue SCell Config Req*/
-PRIVATE CONSTANT RgPrgUeSCellCfgReq RgPrgPMacSMacUeSCellCfgReqMt[RG_PRG_MAX] =
+static const RgPrgUeSCellCfgReq RgPrgPMacSMacUeSCellCfgReqMt[RG_PRG_MAX] =
{
#ifdef LCPRG
cmPkPrgPMacSMacUeSCellCfgReq,
* -# ROK
**/
#ifdef ANSI
-PUBLIC S16 RgPrgPMacSMacUeSCellCfg
+S16 RgPrgPMacSMacUeSCellCfg
(
Pst *pst,
RgPrgUeSCellCfgInfo *ueSCellCfgInfo
)
#else
-PUBLIC S16 RgPrgPMacSMacUeSCellCfg(pst, ueSCellCfgInfo)
+S16 RgPrgPMacSMacUeSCellCfg(pst, ueSCellCfgInfo)
Pst *pst;
RgPrgUeSCellCfgInfo *ueSCellCfgInfo;
#endif
{
- TRC3(RgPrgPMacSMacUeSCellCfg);
-
- RETVALUE((*RgPrgPMacSMacUeSCellCfgReqMt[0])(pst, ueSCellCfgInfo));
+ return ((*RgPrgPMacSMacUeSCellCfgReqMt[0])(pst, ueSCellCfgInfo));
}
/* Matrix for config confirm from SMac to Pmac*/
-PRIVATE CONSTANT RgSMacPMacCfgCfm RgPrgSMacPMacCfgCfmMt[RG_PRG_MAX] =
+static const RgSMacPMacCfgCfm RgPrgSMacPMacCfgCfmMt[RG_PRG_MAX] =
{
#ifdef LCPRG
cmPkPrgSMacPMacCfgCfm,
* -# ROK
**/
#ifdef ANSI
-PUBLIC S16 RgPrgSMacPMacCfg
+S16 RgPrgSMacPMacCfg
(
Pst *pst,
RgPrgCfgCfmInfo *cfgCfm
)
#else
-PUBLIC S16 RgPrgSMacPMacCfg(pst, cfgCfm)
+S16 RgPrgSMacPMacCfg(pst, cfgCfm)
Pst *pst;
RgPrgCfgCfmInfo *cfgCfm;
#endif
{
- TRC3(RgPrgSMacPMacCfg);
-
- RETVALUE((*RgPrgSMacPMacCfgCfmMt[0])(pst, cfgCfm));
+ return ((*RgPrgSMacPMacCfgCfmMt[0])(pst, cfgCfm));
}
/* Matrix for Ue SCell delete req/Ue Id change req from PMac to SMac */
-PRIVATE CONSTANT RgUeSCellDelReq RgPrgPMacSMacUeSCellDelReqMt[RG_PRG_MAX] =
+static const RgUeSCellDelReq RgPrgPMacSMacUeSCellDelReqMt[RG_PRG_MAX] =
{
#ifdef LCPRG
cmPkPrgPMacSMacUeSCellDelReq,
* -# ROK
**/
#ifdef ANSI
-PUBLIC S16 RgPrgPMacSMacUeSCellDel
+S16 RgPrgPMacSMacUeSCellDel
(
Pst *pst,
RgPrgUeSCellDelInfo *ueSCellDelInfo
)
#else
-PUBLIC S16 RgPrgPMacSMacUeSCellDel(pst, ueSCellDelInfo)
+S16 RgPrgPMacSMacUeSCellDel(pst, ueSCellDelInfo)
Pst *pst;
RgPrgUeSCellDelInfo *ueSCellDelInfo;
#endif
{
- TRC3(RgPrgPMacSMacUeSCellDel);
-
- RETVALUE((*RgPrgPMacSMacUeSCellDelReqMt[0])(pst, ueSCellDelInfo));
+ return ((*RgPrgPMacSMacUeSCellDelReqMt[0])(pst, ueSCellDelInfo));
}
/* Matrix for Lch ReConfig Req*/
-PRIVATE CONSTANT RgPrgUeScellModLchReq RgPrgPMacSMacUeScellModLchReqMt[RG_PRG_MAX] =
+static const RgPrgUeScellModLchReq RgPrgPMacSMacUeScellModLchReqMt[RG_PRG_MAX] =
{
#ifdef LCPRG
cmPkPrgPMacSMacUeSCellLchModReq,
* -# ROK
**/
#ifdef ANSI
-PUBLIC S16 RgPrgPMacSMacUeScellLchMod
+S16 RgPrgPMacSMacUeScellLchMod
(
Pst *pst,
RgPrgUeSCellLchModInfo *lchCfgInfo
)
#else
-PUBLIC S16 RgPrgPMacSMacUeScellLchMod(pst, lchCfgInfo)
+S16 RgPrgPMacSMacUeScellLchMod(pst, lchCfgInfo)
Pst *pst;
RgPrgUeSCellLchModInfo *lchCfgInfo;
#endif
{
- TRC3(RgPrgPMacSMacUeScellLchMod);
-
- RETVALUE((*RgPrgPMacSMacUeScellModLchReqMt[0])(pst, lchCfgInfo));
+ return ((*RgPrgPMacSMacUeScellModLchReqMt[0])(pst, lchCfgInfo));
}
/* Matrix for delete Lch Req*/
-PRIVATE CONSTANT RgPrgUeScellDelLchReq RgPrgPMacSMacUeScellDelLchReqMt[RG_PRG_MAX] =
+static const RgPrgUeScellDelLchReq RgPrgPMacSMacUeScellDelLchReqMt[RG_PRG_MAX] =
{
#ifdef LCPRG
cmPkPrgPMacSMacUeSCellLchDelReq,
* -# ROK
**/
#ifdef ANSI
-PUBLIC S16 RgPrgPMacSMacUeScellLchDel
+S16 RgPrgPMacSMacUeScellLchDel
(
Pst *pst,
RgPrgUeSCellLchDelInfo *delLcCb
)
#else
-PUBLIC S16 RgPrgPMacSMacUeScellLchDel(pst, delLcCb)
+S16 RgPrgPMacSMacUeScellLchDel(pst, delLcCb)
Pst *pst;
RgPrgUeSCellLchDelInfo *delLcCb;
#endif
{
- TRC3(RgPrgPMacSMacUeScellLchDel);
-
- RETVALUE((*RgPrgPMacSMacUeScellDelLchReqMt[0])(pst, delLcCb));
+ return ((*RgPrgPMacSMacUeScellDelLchReqMt[0])(pst, delLcCb));
}
/* Matrix for Lch Config Req*/
-PRIVATE CONSTANT RgPrgUeScellAddLchReq RgPrgPMacSMacUeScellAddLchReqMt[RG_PRG_MAX] =
+static const RgPrgUeScellAddLchReq RgPrgPMacSMacUeScellAddLchReqMt[RG_PRG_MAX] =
{
#ifdef LCPRG
cmPkPrgPMacSMacUeSCellLchAddReq,
* -# ROK
**/
#ifdef ANSI
-PUBLIC S16 RgPrgPMacSMacUeScellLchAdd
+S16 RgPrgPMacSMacUeScellLchAdd
(
Pst *pst,
RgPrgUeSCellLchAddInfo *lchCfgInfo
)
#else
-PUBLIC S16 RgPrgPMacSMacUeScellLchAdd(pst, lchCfgInfo)
+S16 RgPrgPMacSMacUeScellLchAdd(pst, lchCfgInfo)
Pst *pst;
RgPrgUeSCellLchAddInfo *lchCfgInfo;
#endif
{
- TRC3(RgPrgPMacSMacUeScellLchAdd);
-
- RETVALUE((*RgPrgPMacSMacUeScellAddLchReqMt[0])(pst, lchCfgInfo));
+ return ((*RgPrgPMacSMacUeScellAddLchReqMt[0])(pst, lchCfgInfo));
}
#endif /* LTE_ADV */