--KwUiCkwBndReq
--KwUiCkwUbndReq
- --KwUiCkwCfgReq
+ --RlcProcCfgReq
--KwUiKwuBndReq
--KwUiKwuUbndReq
#endif
{
KwCkwSapCb *ckwSap;
- KwCb *tKwCb;
+ RlcCb *tRlcCb;
TRC3(KwUiCkwBndReq);
#if (ERRCLASS & ERRCLS_INT_PAR)
- if (pst->dstInst >= KW_MAX_RLC_INSTANCES)
+ if (pst->dstInst >= MAX_RLC_INSTANCES)
{
- RETVALUE(RFAILED);
+ return RFAILED;
}
#endif
- tKwCb = KW_GET_KWCB(pst->dstInst);
+ tRlcCb = RLC_GET_RLCCB(pst->dstInst);
RLOG2(L_DEBUG, "spId(%d), suId(%d)", spId, suId);
- ckwSap = &(tKwCb->u.ulCb->ckwSap);
+ ckwSap = &(tRlcCb->u.ulCb->ckwSap);
/* Take action based on the current state of the SAP */
switch(ckwSap->state)
{
ckwSap->pst.dstInst != pst->srcInst ||
ckwSap->suId != suId)
{
- KW_SEND_SAPID_ALARM(tKwCb,
+ KW_SEND_SAPID_ALARM(tRlcCb,
spId,
LKW_EVENT_CKW_BND_REQ,
LCM_CAUSE_INV_PAR_VAL);
RLOG0(L_ERROR, "CKW SAP already Bound");
KwUiCkwBndCfm(&(ckwSap->pst), ckwSap->suId, CM_BND_NOK);
- RETVALUE(RFAILED);
+ return RFAILED;
}
break;
}
{
#if (ERRCLASS & ERRCLS_INT_PAR)
RLOG0(L_ERROR, "Invalid CKW SAP State in Bind Req");
- KW_SEND_SAPID_ALARM(tKwCb,
+ KW_SEND_SAPID_ALARM(tRlcCb,
spId,
LKW_EVENT_CKW_BND_REQ,
LCM_CAUSE_INV_STATE);
#endif /* ERRCLASS & ERRCLS_INT_PAR */
KwUiCkwBndCfm(&(ckwSap->pst), ckwSap->suId, CM_BND_NOK);
- RETVALUE(RFAILED);
+ return RFAILED;
break;
}
}
KwUiCkwBndCfm(&(ckwSap->pst), ckwSap->suId, CM_BND_OK);
- RETVALUE(ROK);
+ return ROK;
}
\f
Reason reason;
#endif
{
- KwCb *tKwCb;
+ RlcCb *tRlcCb;
TRC3(KwUiCkwUbndReq)
#if (ERRCLASS & ERRCLS_INT_PAR)
- if (pst->dstInst >= KW_MAX_RLC_INSTANCES)
+ if (pst->dstInst >= MAX_RLC_INSTANCES)
{
- RETVALUE(RFAILED);
+ return RFAILED;
}
#endif /* ERRCLASS & ERRCLS_INT_PAR */
- tKwCb = KW_GET_KWCB(pst->dstInst);
+ tRlcCb = RLC_GET_RLCCB(pst->dstInst);
RLOG2(L_DEBUG,"spId(%d), reason(%d)",
spId,
UNUSED(reason);
#if (ERRCLASS & ERRCLS_INT_PAR)
- KW_GET_AND_VALIDATE_CKWSAP(tKwCb,
- (&(tKwCb->u.ulCb->ckwSap)),
+ KW_GET_AND_VALIDATE_CKWSAP(tRlcCb,
+ (&(tRlcCb->u.ulCb->ckwSap)),
EKW208,
"KwUiCkwUbndReq");
#endif /* ERRCLASS & ERRCLS_INT_PAR */
/* disable upper sap (CKW) */
- tKwCb->u.ulCb->ckwSap.state = KW_SAP_CFG;
- RETVALUE(ROK);
+ tRlcCb->u.ulCb->ckwSap.state = KW_SAP_CFG;
+ return ROK;
}
-/*******************************************************************
- *
- * @brief Handler for UE create request
- *
- * @details
- *
- * Function : RlcDuappProcUeCreateReq
- *
- * Functionality:
- * Handler for UE create request
- *
- * @params[in] pst - Post Structure
- * cfg - Configuration information for one or more RLC entities
- * @return ROK - success
- * RFAILED - failure
- *
- * ****************************************************************/
-PUBLIC S16 RlcDuappProcUeCreateReq(Pst *pst, CkwCfgInfo *ueCfg)
-{
- U8 idx;
- S16 ret=ROK;
-
- ueCfg->transId = 1;
-
- for(idx = 0; idx < ueCfg->numEnt; idx++)
- {
- ueCfg->entCfg[idx].cfgType = CKW_CFG_ADD;
- }
-
- ret = KwUiCkwCfgReq(pst, ueCfg);
- return ret;
-
-} /* RlcDuappUeCreateReq */
-
-\f
/**
* @brief
* Handler for configuring RLC entities.
* -# RFAILED
*/
#ifdef ANSI
-PUBLIC S16 KwUiCkwCfgReq
+PUBLIC S16 RlcProcCfgReq
(
Pst *pst,
-//SpId spId,
-CkwCfgInfo *cfg
+RlcCfgInfo *cfg
)
#else
-//PUBLIC S16 KwUiCkwCfgReq(pst, spId, cfg)
-PUBLIC S16 KwUiCkwCfgReq(pst, cfg)
+PUBLIC S16 RlcProcCfgReq(pst, cfg)
Pst *pst;
-//SpId spId;
-CkwCfgInfo *cfg;
+RlcCfgInfo *cfg;
#endif
{
- KwCb *tKwCb;
- KwUlCfgTmpData *cfgTmpData;
+ RlcCb *tRlcCb;
+ RlcUlCfgTmpData *cfgTmpData;
static U32 transCount;
- TRC3(KwUiCkwCfgReq)
+ TRC3(RlcProcCfgReq)
#if (ERRCLASS & ERRCLS_INT_PAR)
- if (pst->dstInst >= KW_MAX_RLC_INSTANCES)
+ if (pst->dstInst >= MAX_RLC_INSTANCES)
{
- KW_PST_FREE(pst->region, pst->pool, cfg, sizeof(CkwCfgInfo));
- RETVALUE(RFAILED);
+ RLC_PST_FREE(pst->region, pst->pool, cfg, sizeof(RlcCfgInfo));
+ return RFAILED;
}
#endif
- tKwCb = KW_GET_KWCB(pst->dstInst);
+ tRlcCb = RLC_GET_RLCCB(pst->dstInst);
- KW_ALLOC(tKwCb, cfgTmpData, sizeof (KwUlCfgTmpData));
+ RLC_ALLOC(tRlcCb, cfgTmpData, sizeof (RlcUlCfgTmpData));
if (cfgTmpData == NULLP)
{
- KW_PST_FREE(pst->region, pst->pool, cfg, sizeof(CkwCfgInfo));
- RETVALUE(RFAILED);
+ RLC_PST_FREE(pst->region, pst->pool, cfg, sizeof(RlcCfgInfo));
+ return RFAILED;
}
-
-
+
cfgTmpData->uprLyrTransId = cfg->transId; /*Save User TransId*/
cfgTmpData->transId = ++transCount; /*Generate new TransId*/
cfg->transId = cfgTmpData->transId;
cfgTmpData->cfgInfo = cfg;
+
- if (kwDbmAddUlTransaction(tKwCb, cfgTmpData) != ROK)
+ if (kwDbmAddUlTransaction(tRlcCb, cfgTmpData) != ROK)
{
RLOG0(L_ERROR, "Addition to UL transId Lst Failed");
- KW_PST_FREE(pst->region, pst->pool, cfg, sizeof(CkwCfgInfo));
+ RLC_PST_FREE(pst->region, pst->pool, cfg, sizeof(RlcCfgInfo));
- RETVALUE(RFAILED);
+ return RFAILED;
}
- kwHdlUiCkwUlCfgReq(tKwCb, cfgTmpData, cfg);
-
- KwUlUdxCfgReq(&(KW_GET_UDX_SAP(tKwCb)->pst),KW_GET_UDX_SAP(tKwCb)->spId,cfg);
+ rlcUlHdlCfgReq(tRlcCb, cfgTmpData, cfg);
+ rlcUlUdxCfgReq(&(KW_GET_UDX_SAP(tRlcCb)->pst),KW_GET_UDX_SAP(tRlcCb)->spId,cfg);
- RETVALUE(ROK);
+ return ROK;
}
/**
#endif
{
S16 ret = ROK;
- KwCb *tKwCb;
- KwUlCfgTmpData *cfgTmpData = NULLP;
+ RlcCb *tRlcCb;
+ RlcUlCfgTmpData *cfgTmpData = NULLP;
TRC3(KwUiCkwUeIdChgReq)
do
{
#if (ERRCLASS & ERRCLS_INT_PAR)
- if (pst->dstInst >= KW_MAX_RLC_INSTANCES)
+ if (pst->dstInst >= MAX_RLC_INSTANCES)
{
ret = RFAILED;
break;
}
#endif
- tKwCb = KW_GET_KWCB(pst->dstInst);
+ tRlcCb = RLC_GET_RLCCB(pst->dstInst);
#ifndef ALIGN_64BIT
RLOG_ARG2(L_DEBUG,DBG_CELLID,newUeInfo->cellId,
"KwUiCkwUeIdChgReq(pst, spId(%d), transId(%ld))",
transId);
#endif
- KW_ALLOC(tKwCb, cfgTmpData, sizeof (KwUlCfgTmpData));
+ RLC_ALLOC(tRlcCb, cfgTmpData, sizeof (RlcUlCfgTmpData));
if (!cfgTmpData)
{
ret = RFAILED;
cfgTmpData->ueInfo = ueInfo;
cfgTmpData->newUeInfo = newUeInfo;
- if (kwDbmAddUlTransaction(tKwCb, cfgTmpData))
+ if (kwDbmAddUlTransaction(tRlcCb, cfgTmpData))
{
RLOG0(L_ERROR, "Addition to UL transId Lst Failed");
ret = RFAILED;
* that was passed and could have been allocated in this function
*/
/* Freeing from proper region */
- KW_PST_FREE(pst->region, pst->pool, newUeInfo, sizeof(CkwUeInfo));
- KW_PST_FREE(pst->region, pst->pool, ueInfo, sizeof(CkwUeInfo));
+ RLC_PST_FREE(pst->region, pst->pool, newUeInfo, sizeof(CkwUeInfo));
+ RLC_PST_FREE(pst->region, pst->pool, ueInfo, sizeof(CkwUeInfo));
if(cfgTmpData)
{
- KW_FREE(tKwCb, cfgTmpData, sizeof (KwUlCfgTmpData));
+ RLC_FREE(tRlcCb, cfgTmpData, sizeof (RlcUlCfgTmpData));
}
- RETVALUE(RFAILED);
+ return RFAILED;
}
- if(ROK != kwCfgValidateUeIdChng(tKwCb,ueInfo,newUeInfo,cfgTmpData))
+ if(ROK != rlcCfgValidateUeIdChng(tRlcCb,ueInfo,newUeInfo,cfgTmpData))
{
RLOG_ARG0(L_ERROR,DBG_CELLID,cfgTmpData->ueInfo->cellId,
"Validation Failure for UeId change");
}
- KwUlUdxUeIdChgReq(&(KW_GET_UDX_SAP(tKwCb)->pst),
- KW_GET_UDX_SAP(tKwCb)->spId,
+ rlcUlUdxUeIdChgReq(&(KW_GET_UDX_SAP(tRlcCb)->pst),
+ KW_GET_UDX_SAP(tRlcCb)->spId,
transId,
ueInfo,
newUeInfo);
- RETVALUE(ROK);
+ return ROK;
}
\f
* -# RFAILED
*/
#ifdef ANSI
-PUBLIC Void kwHdlUiCkwUlCfgReq
+PUBLIC Void rlcUlHdlCfgReq
(
-KwCb *gCb,
-KwUlCfgTmpData *cfgTmpData,
-CkwCfgInfo *cfg
+RlcCb *gCb,
+RlcUlCfgTmpData *cfgTmpData,
+RlcCfgInfo *cfg
)
#else
-PUBLIC Void kwHdlUiCkwUlCfgReq(gCb, cfgTmpData, cfg)
-KwCb *gCb;
-KwUlCfgTmpData *cfgTmpData;
-CkwCfgInfo *cfg;
+PUBLIC Void rlcUlHdlCfgReq(gCb, cfgTmpData, cfg)
+RlcCb *gCb;
+RlcUlCfgTmpData *cfgTmpData;
+RlcCfgInfo *cfg;
#endif
{
U8 idx;
- TRC3(kwHdlUiCkwUlCfgReq)
+ TRC3(rlcUlHdlCfgReq)
cfgTmpData->ueId = cfg->ueId;
cfgTmpData->cellId = cfg->cellId;
if(cfg->entCfg[idx].dir & KW_DIR_UL)
{
/* Configuration is for UL , thus validating */
- if(ROK != kwCfgValidateUlRb(gCb,
+ if(ROK != rlcCfgValidateUlRb(gCb,
&cfg->entCfg[idx],
&cfgTmpData->cfgEntData[idx],
cfgTmpData))
/*If the configuration is for UL only then apply it */
if (cfgTmpData->cfgEntData[idx].entUlCfgCfm.status.status == CKW_CFG_CFM_OK)
{
- kwCfgApplyUlRb(gCb,
+ rlcCfgApplyUlRb(gCb,
&cfg->entCfg[idx],
&cfgTmpData->cfgEntData[idx],
cfgTmpData);
{
if(cfg->entCfg[idx].dir & KW_DIR_UL)
{
- if(ROK != kwCfgValidateReEstRb(gCb,
+ if(ROK != rlcCfgValidateReEstRb(gCb,
cfg->ueId,
cfg->cellId,
&cfg->entCfg[idx],
/*If the configuration is for UL only then apply it */
if (cfgTmpData->cfgEntData[idx].entUlCfgCfm.status.status == CKW_CFG_CFM_OK)
{
- kwCfgApplyReEstUlRb(gCb,
+ rlcCfgApplyReEstUlRb(gCb,
cfg->ueId,
cfg->cellId,
TRUE,
}
case CKW_CFG_DELETE_UE :
{
- if(ROK != kwCfgValidateDelUlUe(gCb,
+ if(ROK != rlcCfgValidateDelUlUe(gCb,
&cfg->entCfg[idx],
&cfgTmpData->cfgEntData[idx],
cfgTmpData))
}
case CKW_CFG_DELETE_CELL :
{
- if(ROK != kwCfgValidateDelUlCell(gCb,
+ if(ROK != rlcCfgValidateDelUlCell(gCb,
cfg->cellId,
&cfg->entCfg[idx],
&cfgTmpData->cfgEntData[idx],
#endif
{
KwKwuSapCb *kwuSap; /* SAP Config Block */
- KwCb *tKwCb;
+ RlcCb *tRlcCb;
TRC3(KwUiKwuBndReq)
#if (ERRCLASS & ERRCLS_INT_PAR)
- if (pst->dstInst >= KW_MAX_RLC_INSTANCES)
+ if (pst->dstInst >= MAX_RLC_INSTANCES)
{
- RETVALUE(RFAILED);
+ return RFAILED;
}
#endif
- tKwCb = KW_GET_KWCB(pst->dstInst);
+ tRlcCb = RLC_GET_RLCCB(pst->dstInst);
RLOG2(L_DEBUG, "KwUiKwuBndReq(pst, spId(%d), suId(%d))", spId, suId);
/* Validation of input parameters */
#if (ERRCLASS & ERRCLS_INT_PAR)
- if(!((spId < (S16) tKwCb->genCfg.maxKwuSaps) && (spId >=0)))
+ if(!((spId < (S16) tRlcCb->genCfg.maxKwuSaps) && (spId >=0)))
{
RLOG0(L_ERROR,"Invalid spId");
- KW_SEND_SAPID_ALARM(tKwCb,spId, LKW_EVENT_KWU_BND_REQ, LCM_CAUSE_INV_SAP);
- RETVALUE(RFAILED);
+ KW_SEND_SAPID_ALARM(tRlcCb,spId, LKW_EVENT_KWU_BND_REQ, LCM_CAUSE_INV_SAP);
+ return RFAILED;
}
#endif
/* Get Sap control block */
- kwuSap = (tKwCb->genCfg.rlcMode == LKW_RLC_MODE_DL) ?
- (tKwCb->u.dlCb->kwuDlSap + spId):
- (tKwCb->u.ulCb->kwuUlSap + spId);
+ kwuSap = (tRlcCb->genCfg.rlcMode == LKW_RLC_MODE_DL) ?
+ (tRlcCb->u.dlCb->kwuDlSap + spId):
+ (tRlcCb->u.ulCb->kwuUlSap + spId);
/* Take action based on the current state of the SAP */
switch(kwuSap->state)
kwuSap->pst.dstInst != pst->srcInst ||
kwuSap->suId != suId)
{
- KW_SEND_SAPID_ALARM(tKwCb,
+ KW_SEND_SAPID_ALARM(tRlcCb,
spId,
LKW_EVENT_KWU_BND_REQ,
LCM_CAUSE_INV_PAR_VAL);
RLOG1(L_ERROR,"RLC Mode [%d] : KWU SAP already Bound",
- tKwCb->genCfg.rlcMode);
+ tRlcCb->genCfg.rlcMode);
KwUiKwuBndCfm(&(kwuSap->pst), kwuSap->suId, CM_BND_NOK);
- RETVALUE(RFAILED);
+ return RFAILED;
}
break;
}
{
#if (ERRCLASS & ERRCLS_INT_PAR)
RLOG1(L_ERROR,"RLC Mode [%d]:Invalid KWU SAP State in Bind Req",
- tKwCb->genCfg.rlcMode);
- KW_SEND_SAPID_ALARM(tKwCb,
+ tRlcCb->genCfg.rlcMode);
+ KW_SEND_SAPID_ALARM(tRlcCb,
spId,
LKW_EVENT_KWU_BND_REQ,
LCM_CAUSE_INV_STATE);
#endif /* ERRCLASS & ERRCLS_INT_PAR */
KwUiKwuBndCfm(&(kwuSap->pst), kwuSap->suId, CM_BND_NOK);
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
KwUiKwuBndCfm(&(kwuSap->pst), kwuSap->suId, CM_BND_OK);
- RETVALUE(ROK);
+ return ROK;
}
\f
#endif
{
KwKwuSapCb *kwuSap; /* KWU SAP control block */
- KwCb *tKwCb;
+ RlcCb *tRlcCb;
TRC3(KwUiKwuUbndReq)
#if (ERRCLASS & ERRCLS_INT_PAR)
- if ((pst->dstInst >= KW_MAX_RLC_INSTANCES) ||
- (spId >= (S16) kwCb[pst->dstInst]->genCfg.maxKwuSaps) ||
+ if ((pst->dstInst >= MAX_RLC_INSTANCES) ||
+ (spId >= (S16) rlcCb[pst->dstInst]->genCfg.maxKwuSaps) ||
(spId < 0))
{
- RETVALUE (RFAILED);
+ return (RFAILED);
}
#endif
- tKwCb = KW_GET_KWCB(pst->dstInst);
+ tRlcCb = RLC_GET_RLCCB(pst->dstInst);
RLOG2(L_DEBUG, "spId(%d), reason(%d)",
spId,
reason);
/* Get Sap control block */
- kwuSap = (tKwCb->genCfg.rlcMode == LKW_RLC_MODE_DL) ?
- (tKwCb->u.dlCb->kwuDlSap + spId):
- (tKwCb->u.ulCb->kwuUlSap + spId);
+ kwuSap = (tRlcCb->genCfg.rlcMode == LKW_RLC_MODE_DL) ?
+ (tRlcCb->u.dlCb->kwuDlSap + spId):
+ (tRlcCb->u.ulCb->kwuUlSap + spId);
kwuSap->state = KW_SAP_CFG;
- RETVALUE(ROK);
+ return ROK;
}
/**
#endif
{
S16 ret = ROK; /* Return Value */
- KwDlRbCb *rbCb; /* RB Control Block */
- KwCb *tKwCb;
+ RlcDlRbCb *rbCb; /* RB Control Block */
+ RlcCb *tRlcCb;
TRC3(KwUiKwuDatReq)
DU_LOG("\nRLC : Received DL Data");
#if (ERRCLASS & ERRCLS_INT_PAR)
- if(pst->dstInst >= KW_MAX_RLC_INSTANCES)
+ if(pst->dstInst >= MAX_RLC_INSTANCES)
{
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
#endif
- tKwCb = KW_GET_KWCB(pst->dstInst);
+ tRlcCb = RLC_GET_RLCCB(pst->dstInst);
/* Fetch the RbCb */
- kwDbmFetchDlRbCbByRbId(tKwCb, &datReq->rlcId, &rbCb);
+ kwDbmFetchDlRbCbByRbId(tRlcCb, &datReq->rlcId, &rbCb);
if(!rbCb)
{
RLOG_ARG2(L_WARNING, DBG_UEID,datReq->rlcId.ueId, "CellId[%u]:DL RbId [%d] not found",
datReq->rlcId.cellId,datReq->rlcId.rbId);
- KW_FREE_BUF(mBuf);
+ RLC_FREE_BUF(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
/* Dispatch according to mode of the rbCb */
if (pst->srcEnt != ENTNH)
{
/* kw002.201 Freeing from proper region */
- KW_SHRABL_STATIC_BUF_FREE(pst->region, pst->pool, datReq,
+ RLC_SHRABL_STATIC_BUF_FREE(pst->region, pst->pool, datReq,
sizeof(KwuDatReqInfo));
- KW_FREE_BUF(mBuf);
+ RLC_FREE_BUF(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
- kwTmmQSdu(tKwCb,rbCb, datReq, mBuf);
+ kwTmmQSdu(tRlcCb,rbCb, datReq, mBuf);
break;
}
case CM_LTE_MODE_UM:
{
- kwUmmQSdu(tKwCb,rbCb, datReq, mBuf);
+ kwUmmQSdu(tRlcCb,rbCb, datReq, mBuf);
break;
}
case CM_LTE_MODE_AM:
{
- kwAmmQSdu(tKwCb,rbCb, mBuf, datReq);
+ kwAmmQSdu(tRlcCb,rbCb, mBuf, datReq);
break;
}
default:
break;
}
}
- RETVALUE(ret);
+ return (ret);
}
\f
KwuDiscSduInfo *discSdu;
#endif
{
- KW_SHRABL_STATIC_BUF_FREE(pst->region, pst->pool, discSdu, sizeof(KwuDiscSduInfo));
- RETVALUE(ROK);
+ RLC_SHRABL_STATIC_BUF_FREE(pst->region, pst->pool, discSdu, sizeof(KwuDiscSduInfo));
+ return ROK;
}
/********************************************************************30**
Code Review / o-du / l2.git / blobdiff