*/
/* 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"
#include "crg.h"
#include "rgu.h"
#include "rg_err.h"
/* header/extern include files (.x) */
-#include "gen.x" /* general layer */
-#include "ssi.x" /* system service interface */
-#include "cm5.x" /* common timers */
-#include "cm_lib.x" /* common library */
-#include "cm_hash.x" /* common hash list */
-#include "cm_mblk.x" /* common memory link list library */
-#include "cm_llist.x" /* common linked list library */
-#include "cm_tkns.x" /* common tokens */
-#include "cm_lte.x" /* common LTE */
#include "lrg.x"
#include "crg.x"
#include "rgu.x"
#include "tfu.x"
#include "rg_sch_inf.x"
#include "rg_prg.x" /* PRG interface typedefs*/
-#include "du_mgr_mac_inf.h"
+#include "du_app_mac_inf.h"
#include "rg.x"
#ifdef LTE_ADV
#include "rg_pom_scell.x"
* -# RFAILED
**/
#ifdef ANSI
-PUBLIC S16 RgPrgPMacSMacUeSCellLchModReq
+S16 RgPrgPMacSMacUeSCellLchModReq
(
Pst *pst,
RgPrgUeSCellLchModInfo *lchCfgCb
)
#else
-PUBLIC S16 RgPrgPMacSMacUeSCellLchModReq(pst, lchCfgCb)
+S16 RgPrgPMacSMacUeSCellLchModReq(pst, lchCfgCb)
Pst *pst;
RgPrgUeSCellLchModInfo *lchCfgCb;
#endif
/* Send positive confirmation to primary cell*/
RgPrgSMacPMacCfg(&cfmPst, &cfgCfm);
- RETVALUE(ROK);
+ return ROK;
} /* RgPrgPMacSMacUeSCellLchModReq */
* -# RFAILED
**/
#ifdef ANSI
-PUBLIC S16 rgPomSndUeSCellLchDelToSmac
+S16 rgPomSndUeSCellLchDelToSmac
(
Inst inst,
CrgDel *lcDel,
Bool *isCfmRqrd
)
#else
-PUBLIC S16 rgPomSndUeSCellLchDelToSmac(inst,lcDel,isCfmRqrd)
+S16 rgPomSndUeSCellLchDelToSmac(inst,lcDel,isCfmRqrd)
Inst inst;
CrgDel *lcDel;
Bool *isCfmRqrd;
RGDBGERRNEW(inst,(rgPBuf(inst),
"[%d]Active Cell does not exist %d\n",
lcDel->u.lchDel.crnti, lcDel->u.lchDel.cellId));
- RETVALUE(RFAILED);
+ return RFAILED;
}
RGDBGPRM(inst,(rgPBuf(inst),
{
RGDBGERRNEW(inst,(rgPBuf(inst),
"[%d]Ue does not exist\n", lcDel->u.lchDel.crnti));
- RETVALUE(RFAILED);
+ return RFAILED;
}
for(idx = 0; idx < RG_MAX_SCELL_PER_UE ; idx++)
{
*isCfmRqrd = FALSE;
}
}
- RETVALUE(ROK);
+ return ROK;
}
* -# RFAILED
**/
#ifdef ANSI
-PUBLIC S16 rgPomSndUeSCellLchModToSmac
+S16 rgPomSndUeSCellLchModToSmac
(
Inst inst,
RgCellCb *cell,
Bool *isCfmRqrd
)
#else
-PUBLIC S16 rgPomSndUeSCellLchModToSmac(inst, cell, ue, lchRecfg, isCfmRqrd)
+S16 rgPomSndUeSCellLchModToSmac(inst, cell, ue, lchRecfg, isCfmRqrd)
Inst inst;
RgCellCb *cell;
RgUeCb *ue;
*isCfmRqrd = FALSE;
}
}
- RETVALUE(ROK);
+ return ROK;
}
/**
* -# RFAILED
**/
#ifdef ANSI
-PUBLIC S16 rgPomSndUeSCellLchAddToSmac
+S16 rgPomSndUeSCellLchAddToSmac
(
Inst inst,
RgCellCb *cell,
Bool *isCfmRqrd
)
#else
-PUBLIC S16 rgPomSndUeSCellLchAddToSmac(inst, cell, ue, lchCfg, isCfmRqrd)
+S16 rgPomSndUeSCellLchAddToSmac(inst, cell, ue, lchCfg, isCfmRqrd)
Inst inst;
RgCellCb *cell;
RgUeCb *ue;
*isCfmRqrd = FALSE;
}
}
- RETVALUE(ROK);
+ return ROK;
} /* rgPomSndUeSCellLchAddToSmac */
/**
* -# RFAILED
**/
#ifdef ANSI
-PUBLIC S16 RgPrgPMacSMacUeSCellLchDelReq
+S16 RgPrgPMacSMacUeSCellLchDelReq
(
Pst *pst,
RgPrgUeSCellLchDelInfo *delLcCb
)
#else
-PUBLIC S16 RgPrgPMacSMacUeSCellLchDelReq(pst, delLcCb)
+S16 RgPrgPMacSMacUeSCellLchDelReq(pst, delLcCb)
Pst *pst;
RgPrgUeSCellLchDelInfo *delLcCb;
#endif
/* Send positive confirmation to primary cell*/
RgPrgSMacPMacCfg(&cfmPst, &cfgCfm);
- RETVALUE(ROK);
+ return ROK;
} /* RgPrgPMacSMacUeSCellLchDelReq */
* -# RFAILED
**/
#ifdef ANSI
-PUBLIC S16 RgPrgPMacSMacUeSCellLchAddReq
+S16 RgPrgPMacSMacUeSCellLchAddReq
(
Pst *pst,
RgPrgUeSCellLchAddInfo *lchCfgCb
)
#else
-PUBLIC S16 RgPrgPMacSMacUeSCellLchAddReq(pst, lchCfgCb)
+S16 RgPrgPMacSMacUeSCellLchAddReq(pst, lchCfgCb)
Pst *pst;
RgPrgUeSCellLchAddInfo *lchCfgCb;
#endif
/* Send positive confirmation to primary cell*/
RgPrgSMacPMacCfg(&cfmPst, &cfgCfm);
- RETVALUE(ROK);
+ return ROK;
} /* RgPrgPMacSMacUeSCellLchAddReq */
/**
* @brief Validates the logical channel configuration request from PMAC to SMAC.
* -# RFAILED
**/
#ifdef ANSI
-PUBLIC S16 rgPomVldtAddLch
+S16 rgPomVldtAddLch
(
Inst inst,
RgPrgUeSCellLchAddInfo *lcCfg,
RgUeCb **ue
)
#else
-PUBLIC S16 rgPomVldtAddLch(inst,lcCfg, cell, ue)
+S16 rgPomVldtAddLch(inst,lcCfg, cell, ue)
Inst inst;
RgPrgUeSCellLchAddInfo *lcCfg;
RgCellCb **cell;
{
RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]UEID Validation for dedicated LC failed\n",
lcCfg->crnti));
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
else
{
RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]UEID Invalid logical channel type %d\n",\
lcCfg->crnti, lcCfg->lcType));
- RETVALUE(RFAILED);
+ return RFAILED;
}
#ifdef LTE_L2_MEAS
if ( lcCfg->qci < RG_QCI_MIN ||
{
RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]UEID Invalid qci %x\n",
lcCfg->crnti, lcCfg->qci));
- RETVALUE(RFAILED);
+ return RFAILED;
}
/*validate qci */
#endif /*LTE_L2_MEAS */
RGDBGINFONEW(inst,(rgPBuf(inst),"[%d]UEID CRG LCconfig validation done:cellId:%d lcId:%d\n",
lcCfg->crnti, lcCfg->cellId, lcCfg->lcId));
- RETVALUE(ROK);
+ return ROK;
}
/**
* @brief Handler for the logical channel configuration request from
* -# RFAILED
**/
#ifdef ANSI
-PUBLIC S16 rgPomUeSCellLcAdd
+S16 rgPomUeSCellLcAdd
(
Inst inst,
RgCellCb *cell,
RgPrgUeSCellLchAddInfo *lcCfg
)
#else
-PUBLIC S16 rgPomUeSCellLcAdd(inst,cell, ue, lcCfg)
+S16 rgPomUeSCellLcAdd(inst,cell, ue, lcCfg)
Inst inst;
RgCellCb *cell;
RgUeCb *ue;
{
RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]Dedicated logical channel configuration"
"failed in SCell%d\n", lcCfg->crnti, lcCfg->lcId));
- RETVALUE(RFAILED);
+ return RFAILED;
}
RGDBGINFONEW(inst,(rgPBuf(inst), "[%d]SCell LC config done: cellId %d lcId %d\n",
lcCfg->crnti, lcCfg->cellId, lcCfg->lcId));
- RETVALUE(ROK);
+ return ROK;
} /* rgPomUeSCellLcAdd */
/***********************************************************
{
RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]Active Cell does not exist: Cell %d\n",
lcCfg->crnti, lcCfg->cellId));
- RETVALUE(RFAILED);
+ return RFAILED;
}
/* Fetch the Ue */
{
RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]UE does not exist for dedicated logical"
"channel %d\n", lcCfg->crnti, lcCfg->lcId));
- RETVALUE(RFAILED);
+ return RFAILED;
}
/* Validate logical channel Id */
{
RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]Invalid logical channel Id %d\n",
lcCfg->crnti, lcCfg->lcId));
- RETVALUE(RFAILED);
+ return RFAILED;
}*/
/* Validate downlink info */
if (lcCfg->dir & PRG_DIR_TX)
{
RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]UE: Dedicated DL LC %d already configured\n",
lcCfg->crnti, lcCfg->lcId));
- RETVALUE(RFAILED);
+ return RFAILED;
}
/* dirVld = TRUE;*/
}
{
RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]UE: Invalid lcgId for uplink logical"
"channel %d\n", lcCfg->crnti, lcCfg->ulInfo.lcgId));
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (rgDBMGetUlDedLcCb((*ue), lcCfg->lcId) != NULLP)
{
RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]UE: Dedicated UL LC %d already configured\n",
lcCfg->crnti, lcCfg->lcId));
- RETVALUE(RFAILED);
+ return RFAILED;
}
/* dirVld = TRUE;*/
}
{
RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]Invalid Direction %d \n",
lcCfg->crnti, lcCfg->dir));
- RETVALUE(RFAILED);
+ return RFAILED;
}
*/
RGDBGINFONEW(inst,(rgPBuf(inst), "[%d]Dedicated logical channel %d validated"
"for cell %d\n", lcCfg->crnti, lcCfg->lcId, lcCfg->cellId));
- RETVALUE(ROK);
+ return ROK;
} /* rgPomVldtSCellDedLchCfg */
/***********************************************************
*
rgDBMInsDlDedLcCb(ue, lcCfg->lcId);
}
RGDBGINFO(inst,(rgPBuf(inst), "Dedicated LC config done\n"));
- RETVALUE(ROK);
+ return ROK;
} /* rgPomUeSCellDedLcCfg */
/**
* -# ROK
**/
#ifdef ANSI
-PUBLIC S16 rgPomVltdModLch
+S16 rgPomVltdModLch
(
Inst inst,
RgPrgUeSCellLchModInfo *lchCfgCb,
RgUlLcCb **ulLc
)
#else
-PUBLIC S16 rgPomVltdModLch(inst, lchCfgCb, cell, ue, ulLc)
+S16 rgPomVltdModLch(inst, lchCfgCb, cell, ue, ulLc)
Inst inst;
RgPrgUeSCellLchModInfo *lchCfgCb;
RgCellCb **cell;
|| ((*cell)->cellId != lchCfgCb->cellId))
{
RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]Active Cell does not exist %d\n",lchCfgCb->crnti, lchCfgCb->cellId));
- RETVALUE(RFAILED);
+ return RFAILED;
}
/* Fetch the Ue for dedicated channels */
if ((*ue = rgDBMGetUeCb(*cell, lchCfgCb->crnti)) == NULLP)
{
RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]Ue does not exist for dedicated logical channel\n",
lchCfgCb->crnti));
- RETVALUE(RFAILED);
+ return RFAILED;
}
if ((*ulLc = rgDBMGetUlDedLcCb((*ue), lchCfgCb->lcId)) == NULLP)
{
RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]Dedicated UL LC does not exist %d\n",
lchCfgCb->crnti, lchCfgCb->lcId));
- RETVALUE(RFAILED);
+ return RFAILED;
}
/* if (lchCfgCb->ulLchRecfg.lcgId > (RG_MAX_LCG_PER_UE - 1))
{
RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]Invalid lcgId for uplink logical channel: lcg %d"
"lc %d\n",lchCfgCb->crnti, lchCfgCb->ulLchRecfg.lcgId, lchCfgCb->lcId));
- RETVALUE(RFAILED);
+ return RFAILED;
}*/
- RETVALUE(ROK);
+ return ROK;
} /*rgPomVltdModLch*/
/**
* @brief Handler for the logical channel re-configuration request from
* -# RFAILED
**/
#ifdef ANSI
-PUBLIC S16 rgPomUeSCellLcMod
+S16 rgPomUeSCellLcMod
(
Inst inst,
RgUeCb *ue,
RgPrgUeSCellLchModInfo *lchCfgCb
)
#else
-PUBLIC S16 rgPomUeSCellLcMod(inst,cell, ue, ulLc, lchCfgCb)
+S16 rgPomUeSCellLcMod(inst,cell, ue, ulLc, lchCfgCb)
Inst inst;
RgUeCb *ue;
RgUlLcCb *ulLc;
RGDBGINFO(inst,(rgPBuf(inst), "LC %d of Ue %d of cell %d Reconfigured\n",
lchCfgCb->lcId, ue->ueId, cell->cellId));
- RETVALUE(ROK);
+ return ROK;
} /* rgPomUeSCellLcMod */
/**
* @brief Function to validate SCellLchDel.
* -# ROK
**/
#ifdef ANSI
-PUBLIC S16 rgPomVltdDelLch
+S16 rgPomVltdDelLch
(
Inst inst,
RgPrgUeSCellLchDelInfo *delLcCb,
RgDlLcCb **dlLc
)
#else
-PUBLIC S16 rgPomVltdDelLch(inst, delLcCb, cell, ue, ulLc, dlLc)
+S16 rgPomVltdDelLch(inst, delLcCb, cell, ue, ulLc, dlLc)
Inst inst;
RgPrgUeSCellLchDelInfo *delLcCb;
RgCellCb **cell;
|| ((*cell)->cellId != delLcCb->cellId))
{
RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]Active Cell does not exist %d\n",delLcCb->crnti, delLcCb->cellId));
- RETVALUE(RFAILED);
+ return RFAILED;
}
/* Fetch the Ue for dedicated channels */
if ((*ue = rgDBMGetUeCb(*cell, delLcCb->crnti)) == NULLP)
{
RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]Ue does not exist for dedicated logical channel\n",
delLcCb->crnti));
- RETVALUE(RFAILED);
+ return RFAILED;
}
if ((*ulLc = rgDBMGetUlDedLcCb((*ue), delLcCb->lcId)) == NULLP)
{
RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]Dedicated UL LC does not exist %d\n",
delLcCb->crnti, delLcCb->lcId));
- RETVALUE(RFAILED);
+ return RFAILED;
}
if ((*dlLc = rgDBMGetDlDedLcCb((*ue), delLcCb->lcId)) == NULLP)
{
RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]DL LC %d does not exist\n",
delLcCb->crnti, delLcCb->lcId));
- RETVALUE(RFAILED);
+ return RFAILED;
}
- RETVALUE(ROK);
+ return ROK;
} /*rgPomVltdDelLch*/
/**
* @brief Handler for the logical channel delete request from
* -# RFAILED
**/
#ifdef ANSI
-PUBLIC S16 rgPomUeSCellLcDel
+S16 rgPomUeSCellLcDel
(
Inst inst,
RgPrgUeSCellLchDelInfo *delLcCb,
RgDlLcCb *dlLc
)
#else
-PUBLIC S16 rgPomUeSCellLcDel(inst,delLcCb,ue,ulLc,dlLc)
+S16 rgPomUeSCellLcDel(inst,delLcCb,ue,ulLc,dlLc)
Inst inst;
RgPrgUeSCellLchDelInfo *delLcCb;
RgUeCb *ue;
{
RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]Invalid direction %d for LC Delete\n",
delLcCb->crnti, delLcCb->dir));
- RETVALUE(RFAILED);
+ return RFAILED;
}*/
RGDBGINFONEW(inst,(rgPBuf(inst), "[%d]UE's Logical channel %d deleted from cell %d\n",
delLcCb->crnti, delLcCb->lcId,
delLcCb->cellId));
- RETVALUE(ROK);
+ return ROK;
} /* rgPomUeSCellLcDel */
#endif /*LTE_ADV */
/**********************************************************************