/* UE Cb */
typedef struct macUeCb
{
- uint16_t ueIdx; /* UE Idx assigned by DU APP */
+ uint16_t ueId; /* UE Id assigned by DU APP */
uint16_t crnti; /* UE CRNTI */
MacCellCb *cellCb; /* Pointer to cellCb to whihc this UE belongs */
UeState state; /* Is UE active ? */
{
uint8_t ret = ROK;
- ueCb->ueIdx = ueCfg->ueId;
+ ueCb->ueId = ueCfg->ueId;
ueCb->crnti = ueCfg->crnti;
ueCb->cellCb = macCb.macCell[cellIdx];
if(ueCfg->spCellCfgPres)
{
uint8_t ret =ROK;
- if((ueCb->ueIdx == ueCfg->ueId) && (ueCb->crnti == ueCfg->crnti)\
+ if((ueCb->ueId == ueCfg->ueId) && (ueCb->crnti == ueCfg->crnti)\
&&(ueCb->state == UE_STATE_ACTIVE))
{
DU_LOG("\nERROR --> MAC : CRNTI %d already configured ", ueCfg->crnti);
{
uint8_t ret = ROK;
- if((ueCb->ueIdx == ueCfg->ueId) && (ueCb->crnti == ueCfg->crnti)\
+ if((ueCb->ueId == ueCfg->ueId) && (ueCb->crnti == ueCfg->crnti)\
&&(ueCb->state == UE_STATE_ACTIVE))
{
DU_LOG("\nINFO --> MAC : Modifying Ue config Req for CRNTI %d ", ueCfg->crnti);
* Functionality:
* Function to return Mac Ue Cfg pointer
*
- * @params[in] cellIdx, ueIdx
+ * @params[in] cellIdx, ueId
*
* @return MacUeCfg pointer - success
* NULLP - failure
*
* ****************************************************************/
-MacUeCfg *getMacUeCfg(uint16_t cellIdx, uint8_t ueIdx)
+MacUeCfg *getMacUeCfg(uint16_t cellIdx, uint8_t ueId)
{
MacUeCfg *ueCfg = NULLP;
if(macCb.macCell[cellIdx])
{
- ueCfg = macCb.macCell[cellIdx]->ueCfgTmpData[ueIdx-1];
+ ueCfg = macCb.macCell[cellIdx]->ueCfgTmpData[ueId-1];
}
else
{
{
/*C-RNTI value is out of Acceptable range*/
DU_LOG("\nERROR --> MAC : MacProcSchUeDeleteRsp(): Invalid crnti[%d] ",schUeDelRsp->crnti);
- result = UEIDX_INVALID;
+ result = UEID_INVALID;
}
else
{
else
{
DU_LOG("\nERROR --> MAC : MacProcSchUeDeleteRsp(): crnti[%d] does not exist ",schUeDelRsp->crnti);
- result = UEIDX_INVALID;
+ result = UEID_INVALID;
}
}
}
}
else
{
- result = (schUeDelRsp->cause == INVALID_CELLID) ? CELLID_INVALID : UEIDX_INVALID;
+ result = (schUeDelRsp->cause == INVALID_CELLID) ? CELLID_INVALID : UEID_INVALID;
}
if(MacSendUeDeleteRsp(schUeDelRsp->cellId, schUeDelRsp->crnti, result) != ROK)
{
else
{
DU_LOG("\nERROR --> MAC : MacProcUeDeleteReq(): CRNTI is not matched");
- result = UEIDX_INVALID;
+ result = UEID_INVALID;
}
}
else
{
- DU_LOG("\nERROR --> MAC : MacProcUeDeleteReq(): Failed to find the MacUeCb of UeIdx = %d",ueDelete->ueId);
+ DU_LOG("\nERROR --> MAC : MacProcUeDeleteReq(): Failed to find the MacUeCb of UeId = %d",ueDelete->ueId);
result = CELLID_INVALID;
}
}
else
{
- DU_LOG("\nDEBUG --> RLC_DL: UE information is deleted for UEIdx[%d] and CellId[%d]",\
+ DU_LOG("\nDEBUG --> RLC_DL: UE information is deleted for UEId[%d] and CellId[%d]",\
cfg->ueId, cfg->cellId);
}
break;
RlcCfgCfmInfo *cfgRsp;
Pst rspPst;
- DU_LOG("\nDEBUG --> RLC: UE reconfig request received. CellID[%d] UEIDX[%d]",ueCfg->cellId, ueCfg->ueId);
+ DU_LOG("\nDEBUG --> RLC: UE reconfig request received. CellID[%d] UEID[%d]",ueCfg->cellId, ueCfg->ueId);
rlcUeCb = RLC_GET_RLCCB(pst->dstInst);
RLC_ALLOC(rlcUeCb, rlcUeCfg, sizeof(RlcCfgInfo));
*ueId = ueIdToAdd;
if(addNodeToLList(&cell->ueToBeScheduled, ueId, NULLP) != ROK)
{
- DU_LOG("\nERROR --> SCH : Failed to add UeIdx to cell->ueToBeScheduled list");
+ DU_LOG("\nERROR --> SCH : Failed to add ueId [%d] to cell->ueToBeScheduled list", *ueId);
return RFAILED;
}
return ROK;
else
{
DU_LOG("\nERROR --> SCH : MacSchUeDeleteReq(): SchUeCb not found");
- result = INVALID_UEIDX;
+ result = INVALID_UEID;
}
}
#define MAX_TDD_PERIODICITY_SLOTS 160
#endif
-/* TODO : Delete GET_UE_IDX once replaced with GET_UE_ID at all places */
-#define GET_UE_IDX( _crnti,_ueIdx) \
-{ \
- _ueIdx = _crnti - ODU_START_CRNTI + 1; \
-}
-
#define GET_UE_ID( _crnti,_ueId) \
{ \
_ueId = _crnti - ODU_START_CRNTI + 1; \
}
-#define GET_CRNTI( _crnti,_ueIdx) \
+#define GET_CRNTI( _crnti, _ueId) \
{ \
- _crnti = _ueIdx + ODU_START_CRNTI - 1; \
+ _crnti = _ueId + ODU_START_CRNTI - 1; \
}
/* Calculates cellIdx from cellId */
{
SUCCESS,
CELLID_INVALID,
- UEIDX_INVALID
+ UEID_INVALID
}UeDeleteStatus;
typedef enum
{
NOT_APPLICABLE,
INVALID_CELLID,
- INVALID_UEIDX
+ INVALID_UEID
}ErrorCause;
typedef enum
* Processes UE create Req to RLC UL
*
* @params[in] cellId,
- * ueIdx,
+ * ueId,
* Pointer to RlcUeCfg
* @return ROK - success
* RFAILED - failure
uint32_t msgLen = 0;
MsgType type = 0;
- GET_UE_IDX(puschPdu.rnti, ueId);
+ GET_UE_ID(puschPdu.rnti, ueId);
if(!ueDb.ueCb[ueId-1].msg3Sent)
{
ueDb.ueCb[ueId-1].ueId = ueId;
{
for(drbIdx = 0; drbIdx < NUM_DRB_TO_PUMP_DATA; drbIdx++) //Number of DRB times the loop will run
{
- DU_LOG("\nDEBUG --> PHY STUB: Sending UL User Data[DrbId:%d] for UEId %d\n",drbIdx,ueIdx);
+ DU_LOG("\nDEBUG --> PHY STUB: Sending UL User Data[DrbId:%d] for UEIdx %d\n",drbIdx,ueIdx);
l1SendUlUserData(drbIdx,ueIdx);
/* TODO :- sleep(1) will be removed once we will be able to
* send continuous data packet */