cmUnpkRguUbndReq(RgUiRguUbndReq, pst, mBuf);
break;
case EVTRLCDLDAT:
- unpackSendDlData(RgUiRguDDatReq, pst, mBuf);
+ unpackDlData(RgUiRguDDatReq, pst, mBuf);
break;
case EVTRLCBOSTA:
- unpackSendBOStatus(RgUiRguDStaRsp, pst, mBuf);
+ unpackBOStatus(RgUiRguDStaRsp, pst, mBuf);
break;
#ifdef LTE_L2_MEAS
PRIVATE CONSTANT RguCDatInd RgUiRguCDatIndMt[RG_MAX_RGU_USR] =
{
#ifdef LCRGUIRGU
-// cmPkRguCDatInd, /* Call packRcvdUlData instead */
+// cmPkRguCDatInd, /* TODO : Call packRcvdUlData instead */
#else
PtUiRguCDatInd,
#endif
PtUiRguCDatInd,
#endif
#ifdef LWLCRGUIRGU
-// cmPkRguCDatInd, /* Call packRcvdUlData instead */
+// cmPkRguCDatInd, /* TODO:Call packRcvdUlData instead */
#else
PtUiRguCDatInd,
#endif
PRIVATE CONSTANT RguDDatInd RgUiRguDDatIndMt[RG_MAX_RGU_USR] =
{
#ifdef LCRGUIRGU
-// cmPkRguDDatInd, /* Call packRcvdUlData instead */
+// cmPkRguDDatInd, /* TODO: Call packRcvdUlData instead */
#else
PtUiRguDDatInd,
#endif
PtUiRguDDatInd,
#endif
#ifdef LWLCRGUIRGU
-// cmPkRguDDatInd, /* Call packRcvdUlData instead */
+// cmPkRguDDatInd, /* TODO: Call packRcvdUlData instead */
#else
PtUiRguDDatInd,
#endif
PRIVATE CONSTANT RguCStaInd RgUiRguCStaIndMt[RG_MAX_RGU_USR] =
{
#ifdef LCRGUIRGU
- //cmPkRguCStaInd, /* Call packSchedRep instead of cmPkRguCStaInd */
+ //cmPkRguCStaInd, /* TODO: Call packSchedRep instead of cmPkRguCStaInd */
#else
PtUiRguCStaInd,
#endif
PtUiRguCStaInd,
#endif
#ifdef LWLCRGUIRGU
- //cmPkRguCStaInd, /* Call packSchedRep instead of cmPkRguCStaInd */
+ //cmPkRguCStaInd, /* TODO: Call packSchedRep instead of cmPkRguCStaInd */
#else
PtUiRguCStaInd,
#endif
PRIVATE CONSTANT RguDStaInd RgUiRguDStaIndMt[RG_MAX_RGU_USR] =
{
#ifdef LCRGUIRGU
- //cmPkRguDStaInd, /* Call packSchedRep instead of cmPkRguDStaInd */
+ //cmPkRguDStaInd, /* TODO: Call packSchedRep instead of cmPkRguDStaInd */
#else
PtUiRguDStaInd,
#endif
PtUiRguDStaInd,
#endif
#ifdef LWLCRGUIRGU
- //cmPkRguDStaInd, /* Call packSchedRep instead of cmPkRguDStaInd */
+ //cmPkRguDStaInd, /* TODO: Call packSchedRep instead of cmPkRguDStaInd */
#else
PtUiRguDStaInd,
#endif
*
*/
-#ifdef ANSI
-PUBLIC S16 RlcMacProcUlData
-(
-Pst* pst,
-SuId suId,
-RlcMacData *ulData
-)
-#else
-PUBLIC S16 RlcMacProcUlData(pst, suId, ulData)
-Pst* pst;
-SuId suId;
-RlcMacData *ulData;
-#endif
+PUBLIC S16 RlcMacProcUlData(Pst *pst, SuId suId, RlcMacData *ulData)
{
U8 idx;
U8 lcId; /* Logical Channel */
* RFAILED - failure
*
* ****************************************************************/
-#ifdef ANSI
-PUBLIC S16 RlcMacProcSchedRep
-(
-Pst *pst,
-SuId suId,
-RlcMacSchedRep *schRep
-)
-#else
-PUBLIC S16 RlcMacProcSchedRep(pst, suId, schRep)
-Pst *pst;
-SuId suId;
-RlcMacSchedRep *schRep;
-#endif
+PUBLIC S16 RlcMacProcSchedRep(Pst *pst, SuId suId,RlcMacSchedRep *schRep)
{
U8 idx; /* Iterator */
U8 nmbDLch = 0; /* Number of dedicated logical channles */
PUBLIC RguDDatReq rlcMacSendDlDataOpts[] =
{
#ifdef LCKWLIRGU
- packSendDlData, /* 0 - loosely coupled */
+ packDlData, /* 0 - loosely coupled */
#endif /* LCRGUIRGU */
#ifdef RG
RgUiRguDDatReq, /* 1 - tightly coupled, MAC */
#endif /* RG */
#ifdef LCKWLIRGU
- packSendDlData, /* 0 - loosely coupled */
+ packDlData, /* 0 - loosely coupled */
#endif /* LCRGUIRGU */
};
PUBLIC RguDStaRsp rlcMacSendBOStatusOpts[] =
{
#ifdef LCKWLIRGU
- packSendBOStatus, /* 0 - loosely coupled */
+ packBOStatus, /* 0 - loosely coupled */
#endif /* LCRGUIRGU */
#ifdef RG
RgUiRguDStaRsp, /* 1 - tightly coupled, MAC */
#endif /* RG */
#ifdef LCKWLIRGU
- packSendBOStatus, /* 0 - LWLC loosely coupled */
+ packBOStatus, /* 0 - LWLC loosely coupled */
#endif /* LCRGUIRGU */
};
PUBLIC S16 RlcDuappProcUeCreateReq(Pst *pst, CkwCfgInfo *ueCfg)
{
U8 idx;
+ S16 ret=ROK;
ueCfg->transId = 1;
ueCfg->entCfg[idx].cfgType = CKW_CFG_ADD;
}
- KwUiCkwCfgReq(pst, ueCfg);
+ ret = KwUiCkwCfgReq(pst, ueCfg);
+ return ret;
+
} /* RlcDuappUeCreateReq */
\f
CkwCfgInfo *cfg;
#endif
{
- S16 ret = ROK;
KwCb *tKwCb;
KwUlCfgTmpData *cfgTmpData;
#endif
tKwCb = KW_GET_KWCB(pst->dstInst);
-/* HLAL */
-#if 0
- RLOG1(L_DEBUG, "spId(%d)", spId);
-
- /* Validate SAP ID under ERRORCLS */
- KW_VALDATE_SAP(tKwCb, spId, (&(tKwCb->u.ulCb->ckwSap)), ret);
- if (ret != ROK)
- {
- KW_PST_FREE(pst->region, pst->pool, cfg, sizeof(CkwCfgInfo));
- RETVALUE(RFAILED);
- }
-#endif
-
KW_ALLOC(tKwCb, cfgTmpData, sizeof (KwUlCfgTmpData));
if (cfgTmpData == NULLP)
CMCHKPK(cmPkPtr,(PTR) cfgInfo, mBuf);
break;
}
-/* HLAL */
-#if 0
-#ifdef LCCKW
- case CKW_SEL_LC:
- {
- ret1 = cmPkCkwCfgInfo( (cfgInfo), pst, mBuf);
-#if (ERRCLASS & ERRCLS_ADD_RES)
- if(ret1 != ROK)
- {
- SPutMsg(mBuf);
- SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
- __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
- (ErrVal)ECKW012, (ErrVal)ret1, "Packing failure");
- RETVALUE( ret1 );
- }
-#endif /* ERRCLASS & ERRCLS_ADD_RES */
- if (SPutSBuf(pst->region, pst->pool, (Data *)cfgInfo,
- sizeof(CkwCfgInfo)) != ROK)
- {
- SPutMsg(mBuf);
- RETVALUE(RFAILED);
- }
-
- break;
- }
-#endif /* LCCKW */
-#endif /* HLAL */
}
pst->event = (Event) RLC_EVT_UE_CREATE_REQ;
CMCHKUNPK(cmUnpkPtr,(PTR *) &cfgInfo, mBuf);
break;
}
-/* HLAL */
-#if 0
-#ifdef LCCKW
- case CKW_SEL_LC:
- {
- ret1 = cmUnpkCkwCfgInfo( (cfgInfo), pst, mBuf);
-#if(ERRCLASS & ERRCLS_DEBUG)
- if(ret1 != ROK)
- {
- SPutMsg(mBuf);
- SLogError(pst->dstEnt, pst->dstInst, pst->dstProcId,
- __FILE__, __LINE__, (ErrCls)ERRCLS_DEBUG,
- (ErrVal)ECKW034, (ErrVal)ret1, "Unpacking failure");
- RETVALUE( ret1 );
- }
-#endif /* ERRCLASS & ERRCLS_DEBUG */
- break;
- }
-#endif /* LCCKW */
-#endif /* HLAL */
-
}
SPutMsg(mBuf);
*
* @details
*
-* Function : packSendDlData
+* Function : packDlData
*
* @param[in] Pst* pst
* @param[in] SpId spId
* -# ROK
**/
#ifdef ANSI
-PUBLIC S16 packSendDlData
+PUBLIC S16 packDlData
(
Pst* pst,
SpId spId,
RlcMacData *dlData
)
#else
-PUBLIC S16 packSendDlData(pst, spId, dlData)
+PUBLIC S16 packDlData(pst, spId, dlData)
Pst* pst;
SpId spId;
RlcMacData dlData;
#endif
{
Buffer *mBuf = NULLP;
- TRC3(packSendDlData)
+ TRC3(packDlData)
if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
*
* @details
*
-* Function : unpackSendDlData
+* Function : unpackDlData
*
* @param[in] Pst* pst
* @param[in] SpId spId
* -# ROK
**/
#ifdef ANSI
-PUBLIC S16 unpackSendDlData
+PUBLIC S16 unpackDlData
(
RguDDatReq func,
Pst *pst,
Buffer *mBuf
)
#else
-PUBLIC S16 unpackSendDlData(func, pst, mBuf)
+PUBLIC S16 unpackDlData(func, pst, mBuf)
RguDDatReq func;
Pst *pst;
Buffer *mBuf;
// RguDDatReqInfo *datReq;
RlcMacData *dlData;
- TRC3(unpackSendDlData)
+ TRC3(unpackDlData)
if (SUnpkS16(&spId, mBuf) != ROK) {
SPutMsg(mBuf);
*
* @details
*
-* Function : packSendBOStatus,
+* Function : packBOStatus,
*
* @param[in] Pst* pst
* @param[in] SpId spId
* -# ROK
**/
#ifdef ANSI
-PUBLIC S16 packSendBOStatus
+PUBLIC S16 packBOStatus
(
Pst* pst,
SpId spId,
RlcMacBOStatus *boStatus
)
#else
-PUBLIC S16 packSendBOStatus(pst, spId, staRsp)
+PUBLIC S16 packBOStatus(pst, spId, staRsp)
Pst* pst;
SpId spId;
RlcMacBOStatus *boStatus;
*
* @details
*
-* Function : unpackSendBOStatus
+* Function : unpackBOStatus
*
* @param[in] Pst* pst
* @param[in] SpId spId
* -# ROK
**/
#ifdef ANSI
-PUBLIC S16 unpackSendBOStatus
+PUBLIC S16 unpackBOStatus
(
RguDStaRsp func,
Pst *pst,
Buffer *mBuf
)
#else
-PUBLIC S16 unpackSendBOStatus(func, pst, mBuf)
+PUBLIC S16 unpackBOStatus(func, pst, mBuf)
RguDStaRsp func;
Pst *pst;
Buffer *mBuf;
SpId spId;
RlcMacBOStatus *boSta;
- TRC3(unpackSendBOStatus)
+ TRC3(unpackBOStatus)
if (SUnpkS16(&spId, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
));
/** @brief Request from RLC to MAC for forwarding SDUs on
* dedicated channel for transmission */
-EXTERN S16 packSendDlData ARGS((
+EXTERN S16 packDlData ARGS((
Pst* pst,
SpId spId,
RlcMacData * datReq
));
/** @brief Request from RLC to MAC for forwarding SDUs on
* dedicated channel for transmission */
-EXTERN S16 unpackSendDlData ARGS((
+EXTERN S16 unpackDlData ARGS((
RguDDatReq func,
Pst* pst,
Buffer *mBuf
));
/** @brief Primitive invoked from RLC to MAC to
* inform the BO report for dedicated channels*/
-EXTERN S16 packSendBOStatus ARGS((
+EXTERN S16 packBOStatus ARGS((
Pst* pst,
SpId spId,
RlcMacBOStatus* boStatus
));
/** @brief Primitive invoked from RLC to MAC to
* inform the BO report for dedicated channels*/
-EXTERN S16 unpackSendBOStatus ARGS((
+EXTERN S16 unpackBOStatus ARGS((
RguDStaRsp func,
Pst* pst,
Buffer *mBuf