#ifdef LTE_L2_MEAS_RLC
if (measCb->measType & LKW_L2MEAS_ACT_UE)
{
- if((rlcRbCb->mode == CM_LTE_MODE_UM) &&
+ if((rlcRbCb->mode == RLC_MODE_UM) &&
(rlcRbCb->dir & RLC_DIR_DL ))
{
if (rlcRbCb->m.um.umDl.sduQ.count)
}
}
}
- else if (rlcRbCb->mode == CM_LTE_MODE_AM)
+ else if (rlcRbCb->mode == RLC_MODE_AM)
{
if ((rlcRbCb->m.am.amDl.cntrlBo) ||
(rlcRbCb->m.am.amDl.retxBo) ||
* -#ROK
* -#RFAILED
*/
-#ifdef ANSI
-static S16 rlcCfgFillUlRbCb
-(
-RlcCb *gCb,
-RlcUlRbCb *rbCb,
-RlcUlUeCb *ueCb,
-RlcEntCfgInfo *entCfg
-)
-#else
-static S16 rlcCfgFillUlRbCb(gCb,rbCb, ueCb, entCfg)
-RlcCb *gCb;
-RlcUlRbCb *rbCb;
-RlcUlUeCb *ueCb;
-RlcEntCfgInfo *entCfg;
-#endif
+static S16 rlcCfgFillUlRbCb(RlcCb *gCb,RlcUlRbCb *rbCb,RlcUlUeCb *ueCb,RlcEntCfgInfo *entCfg)
{
RLOG_ARG3(L_DEBUG,DBG_UEID,rbCb->rlcId.ueId,
/* Initialize according to entMode */
switch (entCfg->entMode)
{
- case CM_LTE_MODE_TM:
+ case RLC_MODE_TM:
{
rbCb->lch.lChId = entCfg->lCh[0].lChId;
rbCb->lch.lChType = entCfg->lCh[0].type;
rbCb->dir = entCfg->dir;
break;
}
- case CM_LTE_MODE_UM:
+ case RLC_MODE_UM:
{
rbCb->lch.lChId = entCfg->lCh[0].lChId;
rbCb->lch.lChType = entCfg->lCh[0].type;
/* the bitmask for SN = 10 is 0x3ff and for SN = 5 is 0x1f */
rbCb->m.umUl.modBitMask = (rbCb->m.umUl.umWinSz << 1) - 1;
- rbCb->m.umUl.reOrdTmrInt =
- entCfg->m.umInfo.ul.reOrdTmr;
- cmInitTimers(&(rbCb->m.umUl.reOrdTmr), 1);
+ rbCb->m.umUl.reAsmblTmrInt =
+ entCfg->m.umInfo.ul.reAsmblTmr;
+ cmInitTimers(&(rbCb->m.umUl.reAsmblTmr), 1);
ueCb->lCh[rbCb->lch.lChId - 1].ulRbCb = rbCb;
break;
}
- case CM_LTE_MODE_AM:
+ case RLC_MODE_AM:
{
/* Down Link Information
* indx = 1 as Up Link */
* -#ROK
* -#RFAILED
*/
-#ifdef ANSI
-static S16 rlcCfgUpdateUlRb
-(
-RlcCb *gCb,
-RlcUlRbCb *rbCb,
-void *ptr,
-RlcEntCfgInfo *entCfg
-)
-#else
-static S16 rlcCfgUpdateUlRb(gCb,rbCb, ptr, entCfg)
-RlcCb *gCb;
-RlcUlRbCb *rbCb;
-void *ptr;
-RlcEntCfgInfo *entCfg;
-#endif
+static S16 rlcCfgUpdateUlRb(RlcCb *gCb,RlcUlRbCb *rbCb,void *ptr,RlcEntCfgInfo *entCfg)
{
switch (rbCb->mode)
{
- case CM_LTE_MODE_TM:
+ case RLC_MODE_TM:
{
RlcUlCellCb *cellCb = (RlcUlCellCb *)ptr;
rbCb->dir = entCfg->dir;
cellCb->lCh[rbCb->lch.lChId - 1].ulRbCb = rbCb;
break;
}
- case CM_LTE_MODE_UM:
+ case RLC_MODE_UM:
{
RlcUlUeCb *ueCb = (RlcUlUeCb *)ptr;
ueCb->lCh[rbCb->lch.lChId - 1].ulRbCb = NULLP;
rlcCfgFillUlRbCb(gCb,rbCb, ueCb, entCfg);
break;
}
- case CM_LTE_MODE_AM:
+ case RLC_MODE_AM:
{
RlcUlUeCb *ueCb = (RlcUlUeCb *)ptr;
* -# ROK
* -# RFAILED
*/
-#ifdef ANSI
-S16 rlcValidateRbCfgParams
-(
-RlcCb *gCb,
-CmLteRnti ueId,
-CmLteCellId cellId,
-RlcEntCfgInfo *cfgToValidate,
-CmStatus *status
-)
-#else
-S16 rlcValidateRbCfgParams(gCb,ueId, cellId, cfgToValidate, status)
-RlcCb *gCb;
-CmLteRnti ueId;
-CmLteCellId cellId;
-RlcEntCfgInfo *cfgToValidate;
-CmStatus *status;
-#endif
+S16 rlcValidateRbCfgParams(RlcCb *gCb,CmLteRnti ueId,CmLteCellId cellId,RlcEntCfgInfo *cfgToValidate,CmStatus *status)
{
if (cellId == 0)
{
{
/* Validate LChId for UM and AM modes */
if ((cfgToValidate->lCh[0].lChId <= 0) ||
- ((cfgToValidate->entMode == CM_LTE_MODE_AM) &&
+ ((cfgToValidate->entMode == RLC_MODE_AM) &&
(cfgToValidate->lCh[1].lChId <= 0)))
{
status->reason = CKW_CFG_REAS_INVALID_LCHID;
return RFAILED;
}
- if((cfgToValidate->entMode == CM_LTE_MODE_UM) &&
- (cfgToValidate->m.umInfo.ul.snLen != RLC_UM_CFG_5BIT_SN_LEN) &&
- (cfgToValidate->m.umInfo.ul.snLen != RLC_UM_CFG_10BIT_SN_LEN))
+ if((cfgToValidate->entMode == RLC_MODE_UM) &&
+ (cfgToValidate->m.umInfo.ul.snLen != RLC_UM_CFG_6BIT_SN_LEN) &&
+ (cfgToValidate->m.umInfo.ul.snLen != RLC_UM_CFG_12BIT_SN_LEN))
{
RLOG_ARG2(L_ERROR,DBG_UEID,ueId,
"CellId[%u]:UM Mode RB[%d],Invalid SN Len[%d]",
}
if ((cfgToValidate->lCh[0].type != CM_LTE_LCH_CCCH) &&
- (cfgToValidate->entMode != CM_LTE_MODE_TM))
+ (cfgToValidate->entMode != RLC_MODE_TM))
{
- status->reason= (cfgToValidate->entMode != CM_LTE_MODE_TM)? CKW_CFG_REAS_RB_MODE_MIS:
+ status->reason= (cfgToValidate->entMode != RLC_MODE_TM)? CKW_CFG_REAS_RB_MODE_MIS:
CKW_CFG_REAS_LCHTYPE_MIS;
return RFAILED;
}
return RFAILED;
}
- if(cfgToValidate->entMode == CM_LTE_MODE_TM)
+ if(cfgToValidate->entMode == RLC_MODE_TM)
{
status->reason = CKW_CFG_REAS_LCHTYPE_MIS;
return RFAILED;
}
if (!(((cfgToValidate->lCh[0].type == CM_LTE_LCH_DCCH) &&
- (cfgToValidate->entMode != CM_LTE_MODE_UM))||
+ (cfgToValidate->entMode != RLC_MODE_UM))||
(cfgToValidate->lCh[0].type == CM_LTE_LCH_DTCH)) )
{
status->reason = CKW_CFG_REAS_RB_MODE_MIS;
* -# ROK
* -# RFAILED
*/
-#ifdef ANSI
S16 rlcCfgValidateUlRb
(
RlcCb *gCb,
RlcUlEntTmpData *cfgEntData,
RlcUlCfgTmpData *cfgTmpData
)
-#else
-S16 rlcCfgValidateUlRb(gCb,cfgToValidate, cfgEntData, cfgTmpData)
-RlcCb *gCb;
-RlcEntCfgInfo *cfgToValidate;
-RlcUlEntTmpData *cfgEntData;
-RlcUlCfgTmpData *cfgTmpData;
-#endif
{
RLOG_ARG2(L_DEBUG,DBG_UEID,cfgTmpData->ueId,
}
}
/*Allocating the memory for receive buffer */
- if(CM_LTE_MODE_UM == cfgToValidate->entMode)
+ if(RLC_MODE_UM == cfgToValidate->entMode)
{
- uint16_t winLen;
+ uint16_t hashIndex;
-
+ /* Spec 38.322 Section 7.2
+ * UM_Window_Size = 32 when a 6 bit SN is configured,
+ * UM_Window_Size = 2048 when a 12 bit SN is configured.
+ */
cfgEntData->rbCb->m.umUl.umWinSz = RLC_POWER(2,
- ((cfgToValidate->m.umInfo.ul.snLen *5)-1));
- winLen = cfgEntData->rbCb->m.umUl.umWinSz << 1;
- RLC_ALLOC(gCb,
- cfgEntData->rbCb->m.umUl.recBuf,
- (winLen * sizeof(RlcUmRecBuf*)));
+ ((cfgToValidate->m.umInfo.ul.snLen *6)-1));
+ RLC_ALLOC(gCb, cfgEntData->rbCb->m.umUl.recBufLst,
+ (RLC_RCV_BUF_BIN_SIZE * sizeof(CmLListCp)));
+ for(hashIndex = 0; hashIndex < RLC_RCV_BUF_BIN_SIZE; hashIndex++ )
+ {
+ cmLListInit(&(cfgEntData->rbCb->m.umUl.recBufLst[hashIndex]));
+ }
}
- else if(CM_LTE_MODE_AM == cfgToValidate->entMode)
+ else if(RLC_MODE_AM == cfgToValidate->entMode)
{
#ifndef LTE_TDD
uint32_t hashIndex;
* -# ROK
* -# RFAILED
*/
-#ifdef ANSI
S16 rlcCfgRollBackUlRb
(
RlcCb *gCb,
RlcEntCfgInfo *cfg,
RlcUlEntTmpData *cfgEntData
)
-#else
-S16 rlcCfgRollBackUlRb(gCb, cfg, cfgEntData)
-(
-RlcCb *gCb;
-CmLteRnti ueId;
-RlcEntCfgInfo *cfg;
-RlcUlEntTmpData *cfgEntData;
-)
-#endif
{
if(CKW_CFG_ADD == cfg->cfgType)
{
- if(CM_LTE_MODE_UM == cfg->entMode)
+ if(RLC_MODE_UM == cfg->entMode)
{
- RLC_FREE(gCb,
- cfgEntData->rbCb->m.umUl.recBuf,
- (cfgEntData->rbCb->m.umUl.umWinSz << 1) * sizeof(RlcUmRecBuf*));
+ RLC_FREE(gCb, cfgEntData->rbCb->m.umUl.recBufLst, (RLC_RCV_BUF_BIN_SIZE * sizeof(CmLListCp)));
}
- else if(CM_LTE_MODE_AM == cfg->entMode)
+ else if(RLC_MODE_AM == cfg->entMode)
{
#ifndef LTE_TDD
RLC_FREE(gCb,cfgEntData->rbCb->m.amUl.recBufLst, (RLC_RCV_BUF_BIN_SIZE * sizeof(CmLListCp)));
* -# ROK
* -# RFAILED
*/
-#ifdef ANSI
Void rlcCfgApplyUlRb
(
RlcCb *gCb,
RlcUlEntTmpData *cfgEntData,
RlcUlCfgTmpData *cfgTmpData
)
-#else
-Void rlcCfgApplyUlRb(gCb, cfgToApply, cfgEntData, cfgTmpData)
-(
-RlcCb *gCb;
-RlcEntCfgInfo *cfgToAply;
-RlcUlEntTmpData *cfgEntData;
-RlcUlCfgTmpData *cfgTmpData;
-)
-#endif
{
switch(cfgToAply->cfgType)
NULLP;
/* Free the Buffers of RbCb */
- if( CM_LTE_MODE_UM == cfgEntData->rbCb->mode )
+ if( RLC_MODE_UM == cfgEntData->rbCb->mode )
{
rlcUmmFreeUlRbCb(gCb, cfgEntData->rbCb);
}
- else if(CM_LTE_MODE_AM == cfgEntData->rbCb->mode)
+ else if(RLC_MODE_AM == cfgEntData->rbCb->mode)
{
rlcAmmFreeUlRbCb(gCb,cfgEntData->rbCb);
}
* -# ROK
* -# RFAILED
*/
-#ifdef ANSI
S16 rlcCfgValidateDelUlUe
(
RlcCb *gCb,
RlcUlEntTmpData *cfgEntData,
RlcUlCfgTmpData *cfgTmpData
)
-#else
-S16 rlcCfgValidateDelUlUe(gCb,cfgToValidate, cfgEntData,cfgTmpData)
-RlcCb *gCb;
-RlcEntCfgInfo *cfgToValidate;
-RlcUlEntTmpData *cfgEntData;
-RlcUlCfgTmpData *cfgTmpData;
-#endif
{
RLOG_ARG2(L_DEBUG,DBG_UEID,cfgTmpData->ueId,
* @return S16
* -# ROK
*/
-#ifdef ANSI
Void rlcCfgApplyDelUlUe
(
RlcCb *gCb,
RlcUlCfgTmpData *cfgTmpData
)
-#else
-Void rlcCfgApplyDelUlUe(gCb, cfgTmpData)
-(
-RlcCb *gCb;
-RlcUlCfgTmpData *cfgTmpData;
-)
-#endif
{
#ifdef LTE_L2_MEAS
* -# ROK
* -# RFAILED
*/
-#ifdef ANSI
S16 rlcCfgValidateDelUlCell
(
RlcCb *gCb,
RlcUlEntTmpData *cfgEntData,
RlcUlCfgTmpData *cfgTmpData
)
-#else
-S16 rlcCfgValidateDelUlCell(gCb, cellId, cfgToValidate, cfgTmpData)
-RlcCb *gCb;
-CmLteCellId cellId;
-RlcEntCfgInfo *cfgToValidate;
-RlcUlEntTmpData *cfgEntData;
-RlcUlCfgTmpData *cfgTmpData;
-#endif
{
RLOG_ARG1(L_DEBUG,DBG_CELLID,cellId ,"cfgType(%d)",
* @return S16
* -# ROK
*/
-#ifdef ANSI
-Void rlcCfgApplyDelUlCell
-(
-RlcCb *gCb,
-RlcUlCfgTmpData *cfgInfo
-)
-#else
-Void rlcCfgApplyDelUlCell(gCb, cfgEntData)
-(
-RlcCb *gCb;
-RlcUlCfgTmpData *cfgInfo;
-)
-#endif
+Void rlcCfgApplyDelUlCell(RlcCb *gCb,RlcUlCfgTmpData *cfgInfo)
{
rlcDbmDelUlCellCb(gCb,cfgInfo->cellCb);
* -# ROK
* -# RFAILED
*/
-#ifdef ANSI
S16 rlcCfgValidateReEstRb
(
RlcCb *gCb,
RlcEntCfgInfo *cfgToValidate,
RlcUlEntTmpData *cfgEntData
)
-#else
-S16 rlcCfgValidateReEstRb(gCb,ueId, cellId, cfgToValidate, cfgEntData)
-RlcCb *gCb;
-CmLteRnti ueId;
-CmLteCellId cellId;
-RlcEntCfgInfo *cfgToValidate;
-RlcUlEntTmpData *cfgEntData;
-#endif
{
CmLteRlcId rlcId; /* RLC Identifier */
* @return S16
* -# ROK
*/
-#ifdef ANSI
Void rlcCfgApplyReEstUlRb
(
-RlcCb *gCb,
-CmLteRnti ueId,
-CmLteCellId cellId,
-Bool sndReEstInd,
-RlcUlEntTmpData *cfgEntData
-)
-#else
-Void rlcCfgApplyReEstUlRb(gCb, ueId, cellId, sndReEstInd, cfgEntData)
-(
-RlcCb *gCb;
-CmLteRnti ueId;
-CmLteCellId cellId;
-Bool sndReEstInd;
-RlcUlEntTmpData *cfgEntData;
+RlcCb *gCb,
+CmLteRnti ueId,
+CmLteCellId cellId,
+Bool sndReEstInd,
+RlcUlEntTmpData *cfgEntData
)
-#endif
{
CmLteRlcId rlcId; /* RLC Identifier */
cfgEntData->rbCb->rlcId.ueId = ueId;
switch (cfgEntData->rbCb->mode)
{
- case CM_LTE_MODE_TM:
+ case RLC_MODE_TM:
{
rlcTmmUlReEstablish(gCb,cfgEntData->rbCb);
break;
}
- case CM_LTE_MODE_UM:
+ case RLC_MODE_UM:
{
rlcUmmUlReEstablish(gCb,&rlcId,cfgEntData->rbCb);
break;
}
- case CM_LTE_MODE_AM:
+ case RLC_MODE_AM:
{
rlcAmmUlReEstablish(gCb,rlcId,sndReEstInd,cfgEntData->rbCb);
break;
* -# ROK
* -# RFAILED
*/
-#ifdef ANSI
S16 rlcCfgValidateUeIdChng
(
-RlcCb *gCb,
+RlcCb *gCb,
CkwUeInfo *ueInfo,
CkwUeInfo *newUeInfo,
-RlcUlCfgTmpData *cfgTmpData
+RlcUlCfgTmpData *cfgTmpData
)
-#else
-S16 rlcCfgValidateUeIdChng(gCb,ueInfo,newUeInfo,cfgTmpData)
-RlcCb *gCb;
-CkwUeInfo *ueInfo;
-CkwUeInfo *newUeInfo;
-RlcUlCfgTmpData *cfgTmpData;
-#endif
{
RlcUlUeCb *ueCb;
* @return S16
* -# ROK
*/
-#ifdef ANSI
Void rlcCfgApplyUlUeIdChng
(
-RlcCb *gCb,
-CkwUeInfo *ueInfo,
-CkwUeInfo *newUeInfo,
-RlcUlCfgTmpData *cfgTmpData
-)
-#else
-Void rlcCfgApplyUlUeIdChng(gCb, ueId, cellId, cfgTmpData)
-(
-RlcCb *gCb;
+RlcCb *gCb,
CkwUeInfo *ueInfo,
CkwUeInfo *newUeInfo,
-RlcUlCfgTmpData *cfgTmpData;
+RlcUlCfgTmpData *cfgTmpData
)
-#endif
{
#ifdef LTE_L2_MEAS