* ****************************************************************/
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)
{
pduLen -= length;
rxPduIdx = rxPduIdx + length;
- /* Delete RA cb once RRC setup complete received */
- if(macCb.macCell[cellIdx]->macRaCb[ueIdx].crnti == rxDataIndPdu->rnti)
- {
- MAC_FREE(macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4Pdu, \
- macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4PduLen);
- MAC_FREE(macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4TxPdu, \
- macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4TbSize - TX_PAYLOAD_HDR_LEN);
- memset(&macCb.macCell[cellIdx]->macRaCb[ueIdx], 0, sizeof(MacRaCbInfo));
- }
-
/* Send UL Data to RLC */
ret = macProcUlData(cellId, rxDataIndPdu->rnti, slotInfo, lcId, length, pdu);
{
uint8_t lcgId = 0;
uint8_t bufferSizeIdx = 0;
- uint8_t crnti = 0;
+ uint16_t crnti = 0;
uint32_t bufferSize = 0;
pduLen--;
DataVolInfo dataVolInfo[MAX_NUM_LOGICAL_CHANNEL_GROUPS];
memset(dataVolInfo, 0,MAX_NUM_LOGICAL_CHANNEL_GROUPS * sizeof(DataVolInfo));
uint8_t lcgIdx = 0;
- uint8_t crnti = 0;
+ uint16_t crnti = 0;
uint8_t numLcg = 0;
uint8_t lcgIdxPos = 0;
pduLen--;