**/
uint8_t MacProcDlAlloc(Pst *pst, DlSchedInfo *dlSchedInfo)
{
+ uint8_t ueIdx;
uint16_t cellIdx;
MacDlSlot *currDlSlot = NULLP;
+#ifdef CALL_FLOW_DEBUG_LOG
+ DU_LOG("\nCall Flow: ENTSCH -> ENTMAC : EVENT_DL_SCH_INFO\n");
+#endif
if(dlSchedInfo != NULLP)
{
GET_CELL_IDX(dlSchedInfo->cellId, cellIdx);
/* Check if the downlink pdu is msg4 */
if(dlSchedInfo->dlMsgAlloc->dlMsgInfo.isMsg4Pdu)
{
- macCb.macCell[cellIdx]->macRaCb[0].msg4TbSize = dlSchedInfo->dlMsgAlloc->dlMsgPdschCfg.codeword[0].tbSize;
+ GET_UE_IDX(dlSchedInfo->dlMsgAlloc->dlMsgInfo.crnti, ueIdx);
+ ueIdx = ueIdx -1;
+ macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4TbSize = \
+ dlSchedInfo->dlMsgAlloc->dlMsgPdschCfg.codeword[0].tbSize;
}
else
{
{
uint8_t ueIdx;
uint16_t cellIdx;
+ uint16_t msg4TxPduLen;
MacDlData msg4DlData;
MacCeInfo macCeData;
GET_UE_IDX(msg4Alloc->dlMsgInfo.crnti, ueIdx);
ueIdx = ueIdx -1;
+
+ if(macCb.macCell[cellIdx] == NULLP)
+ {
+ DU_LOG("\nERROR --> MAC: Cell Id[%d] not found", cellId);
+ return;
+ }
+
if(macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4Pdu != NULLP)
{
- MAC_ALLOC(msg4DlData.pduInfo[ueIdx].dlPdu, \
- macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4PduLen);
- if(msg4DlData.pduInfo[ueIdx].dlPdu != NULLP)
+ MAC_ALLOC(msg4DlData.pduInfo[msg4DlData.numPdu].dlPdu, macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4PduLen);
+ if(msg4DlData.pduInfo[msg4DlData.numPdu].dlPdu != NULLP)
{
- fillMsg4DlData(&msg4DlData, macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4PduLen,\
+ msg4TxPduLen = macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4TbSize - TX_PAYLOAD_HDR_LEN;
+
+ fillMsg4DlData(&msg4DlData, macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4PduLen, \
macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4Pdu);
- fillMacCe(&macCeData, macCb.macCell[cellIdx]->macRaCb[ueIdx].msg3Pdu);
- /* Forming Mux Pdu */
- macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4TxPdu = NULLP;
- MAC_ALLOC(macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4TxPdu, \
- macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4TbSize);
- if(macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4TxPdu != NULLP)
- {
- memset(macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4TxPdu, 0, \
- macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4TbSize);
- macMuxPdu(&msg4DlData, &macCeData, macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4TxPdu,\
- macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4TbSize);
-
- }
- else
- {
- DU_LOG("\nERROR --> MAC: Failed allocating memory for msg4TxPdu");
- }
- /* Free memory allocated */
- MAC_FREE(msg4DlData.pduInfo[0].dlPdu, macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4PduLen);
+ fillMacCe(&macCeData, macCb.macCell[cellIdx]->macRaCb[ueIdx].msg3Pdu);
+ /* Forming Mux Pdu */
+ macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4TxPdu = NULLP;
+ MAC_ALLOC(macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4TxPdu, msg4TxPduLen);
+ if(macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4TxPdu != NULLP)
+ {
+ memset(macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4TxPdu, 0, msg4TxPduLen);
+ macMuxPdu(&msg4DlData, &macCeData, macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4TxPdu, msg4TxPduLen);
+ }
+ else
+ {
+ DU_LOG("\nERROR --> MAC: Failed allocating memory for msg4TxPdu");
+ }
+ /* Free memory allocated */
+ MAC_FREE(msg4DlData.pduInfo[msg4DlData.numPdu-1].dlPdu, macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4PduLen);
+ msg4DlData.numPdu--;
}
}
/* storing msg4 Pdu in macDlSlot */
if(macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4TxPdu)
{
- msg4Alloc->dlMsgInfo.dlMsgPduLen = macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4TbSize;
+ msg4Alloc->dlMsgInfo.dlMsgPduLen = msg4TxPduLen;
MAC_ALLOC(msg4Alloc->dlMsgInfo.dlMsgPdu, msg4Alloc->dlMsgInfo.dlMsgPduLen);
if(msg4Alloc->dlMsgInfo.dlMsgPdu != NULLP)
{
- memcpy(msg4Alloc->dlMsgInfo.dlMsgPdu, macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4TxPdu, \
- msg4Alloc->dlMsgInfo.dlMsgPduLen);
+ memcpy(msg4Alloc->dlMsgInfo.dlMsgPdu, macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4TxPdu, \
+ msg4Alloc->dlMsgInfo.dlMsgPduLen);
}
}
else
uint16_t cellIdx = 0;
GET_CELL_IDX(slotInd.cellId, cellIdx);
-
+
+ if(macCb.macCell[cellIdx] == NULLP)
+ {
+ DU_LOG("ERROR --> MAC : macProcSlotInd(): CellId[%d] does not exist. Error occurred at SFN [%d] Slot [%d]",\
+ slotInd.cellId, slotInd.sfn, slotInd.slot);
+ return RFAILED;
+ }
/* Store current time info */
macCb.macCell[cellIdx]->currTime.cellId = slotInd.cellId;
macCb.macCell[cellIdx]->currTime.slot = slotInd.slot;
/* Trigger for DL TTI REQ */
fillDlTtiReq(slotInd);
- /* TODO : check if this too needs to be sent in sequence with Dl and Ul TTI req.
- * If so , move trigger for fillUlDciReq to lower mac */
- /* Trigger for UL DCI REQ */
- fillUlDciReq(slotInd);
-
return ROK;
} /* macProcSlotInd */
uint8_t fapiMacSlotInd(Pst *pst, SlotIndInfo *slotInd)
{
uint8_t ret = ROK;
+ uint16_t cellIdx;
volatile uint32_t startTime=0;
#ifdef ODU_SLOT_IND_DEBUG_LOG
ODU_START_TASK(&startTime, PID_MAC_TTI_IND);
gSlotCount++;
+ if(gSlotCount == 1)
+ {
+ GET_CELL_IDX(slotInd->cellId, cellIdx);
+ macCb.macCell[cellIdx]->state = CELL_STATE_UP;
+ }
+
/* When testing L2 with Intel-L1, any changes specific to
* timer mode testing must be guarded under INTEL_TIMER_MODE*/
#ifndef INTEL_TIMER_MODE