* ****************************************************************/
uint8_t unpackRxData(uint16_t cellId, SlotTimingInfo slotInfo, RxDataIndPdu *rxDataIndPdu)
{
+ uint8_t ueId = 0; /* UE Identity */
uint8_t ueIdx = 0; /* Iterator for UE list */
uint8_t lcId = 0; /* LC ID of a sub pdu */
uint8_t fBit = 0; /* Value of F Bit in MAC sub-header */
- uint8_t rxPduIdx = 0; /* Iterator for received PDU */
+ uint8_t rxPduIdx = 0; /* Iterator for received PDU */
uint16_t length = 0; /* Length of payload in a sub-PDU */
uint8_t *pdu = NULLP; /* Payload in sub-PDU */
uint16_t pduLen = 0; /* Length of undecoded PDU */
}
pduLen = rxDataIndPdu->pduLength;
rxDataPdu = rxDataIndPdu->pduData;
- GET_UE_IDX(rxDataIndPdu->rnti, ueIdx);
- ueIdx = ueIdx -1;
+ GET_UE_ID(rxDataIndPdu->rnti, ueId);
+ ueIdx = ueId -1;
while(pduLen > 0)
{
DU_LOG("\nDEBUG --> MAC: Received DL data for sfn=%d slot=%d numPdu= %d", \
dlData->slotInfo.sfn, dlData->slotInfo.slot, dlData->numPdu);
- GET_UE_IDX(dlData->rnti, ueId);
+ GET_UE_ID(dlData->rnti, ueId);
/* Copy the pdus to be muxed into mac Dl data */
macDlData.ueId = ueId;
* ****************************************************************/
uint8_t MacProcDlCcchInd(Pst *pst, DlCcchIndInfo *dlCcchIndInfo)
{
- uint8_t ueIdx = 0;
+ uint8_t ueId = 0, ueIdx = 0;
uint16_t cellIdx;
uint16_t idx;
DlRlcBoInfo dlBoInfo;
dlBoInfo.dataVolume = (dlCcchIndInfo->dlCcchMsgLen + 3) + (MAX_CRI_SIZE + 1);
/* storing Msg4 Pdu in raCb */
- GET_UE_IDX(dlBoInfo.crnti, ueIdx);
- ueIdx = ueIdx -1;
+ GET_UE_ID(dlBoInfo.crnti, ueId);
+ ueIdx = ueId -1;
if(macCb.macCell[cellIdx]->macRaCb[ueIdx].crnti == dlCcchIndInfo->crnti)
{
macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4PduLen = dlCcchIndInfo->dlCcchMsgLen;
* ****************************************************************/
void createMacRaCb(RachIndInfo *rachIndInfo)
{
- uint8_t ueIdx = 0;
+ uint8_t ueId = 0, ueIdx = 0;
uint16_t crnti = 0;
uint16_t cellIdx = 0;
if(crnti == -1)
return;
- GET_UE_IDX(crnti, ueIdx);
- ueIdx = ueIdx -1;
+ GET_UE_ID(crnti, ueId);
+ ueIdx = ueId -1;
/* store in rach ind structure */
rachIndInfo->crnti = crnti;
uint8_t MacProcDlAlloc(Pst *pst, DlSchedInfo *dlSchedInfo)
{
uint8_t schInfoIdx = 0;
- uint8_t ueIdx;
- uint16_t cellIdx;
+ uint8_t ueId = 0, ueIdx = 0;
+ uint16_t cellIdx = 0;
MacDlSlot *currDlSlot = NULLP;
#ifdef CALL_FLOW_DEBUG_LOG
{
if(dlSchedInfo->dlMsgAlloc[ueIdx]->dlMsgSchedInfo[schInfoIdx].dlMsgInfo.isMsg4Pdu)
{
- GET_UE_IDX(dlSchedInfo->dlMsgAlloc[ueIdx]->dlMsgSchedInfo[schInfoIdx].dlMsgInfo.crnti, ueIdx);
- ueIdx = ueIdx -1;
+ GET_UE_ID(dlSchedInfo->dlMsgAlloc[ueIdx]->dlMsgSchedInfo[schInfoIdx].dlMsgInfo.crnti, ueId);
+ ueIdx = ueId -1;
macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4TbSize = \
dlSchedInfo->dlMsgAlloc[ueIdx]->dlMsgSchedInfo[schInfoIdx].dlMsgPdschCfg.codeword[0].tbSize;
}
**/
void fillMsg4Pdu(uint16_t cellId, DlMsgSchInfo *msg4SchInfo)
{
- uint8_t ueIdx;
+ uint8_t ueId = 0, ueIdx = 0;
uint16_t cellIdx;
uint16_t msg4TxPduLen;
MacDlData msg4DlData;
memset(&msg4DlData, 0, sizeof(MacDlData));
memset(&macCeData, 0, sizeof(MacCeInfo));
- GET_UE_IDX(msg4SchInfo->dlMsgInfo.crnti, ueIdx);
- ueIdx = ueIdx -1;
+ GET_UE_ID(msg4SchInfo->dlMsgInfo.crnti, ueId);
+ ueIdx = ueId -1;
if(macCb.macCell[cellIdx] == NULLP)
{
/* Filling UE delete response */
deleteRsp->cellId = cellId;
- GET_UE_IDX(crnti,deleteRsp->ueId);
+ GET_UE_ID(crnti, deleteRsp->ueId);
deleteRsp->result = result;
/* Fill Post structure and send UE delete response*/
uint8_t MacProcSchUeDeleteRsp(Pst *pst, SchUeDeleteRsp *schUeDelRsp)
{
- uint8_t ueIdx =0, isCrntiValid = 0;
+ uint8_t ueId =0, isCrntiValid = 0;
uint16_t cellIdx=0;
uint8_t ret = RFAILED;
UeDeleteStatus result;
}
else
{
- GET_UE_IDX(schUeDelRsp->crnti, ueIdx);
- if(macCb.macCell[cellIdx]->ueCb[ueIdx -1].crnti == schUeDelRsp->crnti)
+ GET_UE_ID(schUeDelRsp->crnti, ueId);
+ if(macCb.macCell[cellIdx]->ueCb[ueId -1].crnti == schUeDelRsp->crnti)
{
/*Commenting as S-NSSAI and PDU session will be stored in MAC DB in future scope*/
#if 0
/*Looping around LCs to free S-NSSAI memory*/
- for(lcIdx = 0; lcIdx < (macCb.macCell[cellIdx]->ueCb[ueIdx -1].ulInfo.numUlLc); lcIdx++)
+ for(lcIdx = 0; lcIdx < (macCb.macCell[cellIdx]->ueCb[ueId -1].ulInfo.numUlLc); lcIdx++)
{
- MAC_FREE(macCb.macCell[cellIdx]->ueCb[ueIdx -1].ulInfo.lcCb[lcIdx].snssai, sizeof(Snssai));
+ MAC_FREE(macCb.macCell[cellIdx]->ueCb[ueId -1].ulInfo.lcCb[lcIdx].snssai, sizeof(Snssai));
}
- for(lcIdx = 0; lcIdx < (macCb.macCell[cellIdx]->ueCb[ueIdx -1].dlInfo.numDlLc); lcIdx++)
+ for(lcIdx = 0; lcIdx < (macCb.macCell[cellIdx]->ueCb[ueId -1].dlInfo.numDlLc); lcIdx++)
{
- MAC_FREE(macCb.macCell[cellIdx]->ueCb[ueIdx -1].dlInfo.lcCb[lcIdx].snssai, sizeof(Snssai));
+ MAC_FREE(macCb.macCell[cellIdx]->ueCb[ueId -1].dlInfo.lcCb[lcIdx].snssai, sizeof(Snssai));
}
#endif
- memset(&macCb.macCell[cellIdx]->ueCb[ueIdx -1], 0, sizeof(MacUeCb));
+ memset(&macCb.macCell[cellIdx]->ueCb[ueId -1], 0, sizeof(MacUeCb));
macCb.macCell[cellIdx]->numActvUe--;
result = SUCCESS;
ret = ROK;
#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) \
{ \
_crnti = _ueIdx + ODU_START_CRNTI - 1; \