/* header include files -- defines (.h) */
#include "common_def.h"
-#include "rgu.h"
-#include "tfu.h"
-#include "rg_sch_inf.h"
-#include "rg_env.h"
#include "lrg.h"
-#include "crg.h"
-#include "rg.h"
-#include "du_log.h"
-#include "lwr_mac.h"
-
-/* header/extern include files (.x) */
-#include "rgu.x"
-#include "tfu.x"
-#include "rg_sch_inf.x"
+#include "rgu.h"
#include "lrg.x"
-#include "crg.x"
-#include "rg_prg.x"
+#include "rgu.x"
#include "du_app_mac_inf.h"
+#include "mac_sch_interface.h"
#include "mac_upr_inf_api.h"
-#include "rg.x"
+#include "lwr_mac.h"
+#ifdef INTEL_FAPI
+#include "fapi_interface.h"
+#endif
#include "lwr_mac_fsm.h"
+#include "lwr_mac_upr_inf.h"
#include "mac.h"
+#include "mac_utils.h"
/* This file contains message handling functionality for MAC */
* RFAILED - failure
*
****************************************************************/
-int sendDlRlcBoInfoMacToSch(DlRlcBOInfo *dlBoInfo)
+uint8_t sendDlRlcBoInfoMacToSch(DlRlcBOInfo *dlBoInfo)
{
Pst pst;
- fillMacToSchPst(&pst);
- pst.event = EVENT_DL_RLC_BO_INFO_TO_SCH;
-
+ FILL_PST_MAC_TO_SCH(pst, EVENT_DL_RLC_BO_INFO_TO_SCH);
return(*macSchDlRlcBoInfoOpts[pst.selector])(&pst, dlBoInfo);
}
* RFAILED - failure
*
****************************************************************/
-int sendCrcIndMacToSch(CrcIndInfo *crcInd)
+uint8_t sendCrcIndMacToSch(CrcIndInfo *crcInd)
{
Pst pst;
- fillMacToSchPst(&pst);
- pst.event = EVENT_CRC_IND_TO_SCH;
-
+ FILL_PST_MAC_TO_SCH(pst, EVENT_CRC_IND_TO_SCH);
return(*macSchCrcIndOpts[pst.selector])(&pst, crcInd);
}
* RFAILED - failure
*
* ****************************************************************/
-uint16_t fapiMacCrcInd(Pst *pst, CrcInd *crcInd)
+uint8_t fapiMacCrcInd(Pst *pst, CrcInd *crcInd)
{
+ uint16_t cellIdx;
CrcIndInfo crcIndInfo;
DU_LOG("\nMAC : Received CRC indication");
+ GET_CELL_IDX(crcInd->cellId, cellIdx);
/* Considering one pdu and one preamble */
- crcIndInfo.cellId = macCb.macCell->cellId;;
+ crcIndInfo.cellId = macCb.macCell[cellIdx]->cellId;;
crcIndInfo.crnti = crcInd->crcInfo[0].rnti;
crcIndInfo.timingInfo.sfn = crcInd->timingInfo.sfn;
crcIndInfo.timingInfo.slot = crcInd->timingInfo.slot;
* RFAILED - failure
*
* ****************************************************************/
-uint16_t fapiMacRxDataInd(Pst *pst, RxDataInd *rxDataInd)
+uint8_t fapiMacRxDataInd(Pst *pst, RxDataInd *rxDataInd)
{
uint16_t pduIdx;
for(pduIdx = 0; pduIdx < rxDataInd->numPdus; pduIdx++)
{
- unpackRxData(&rxDataInd->pdus[pduIdx]);
+ unpackRxData(rxDataInd->cellId, &rxDataInd->pdus[pduIdx]);
}
return ROK;
}
*
* @details
*
- * Function : MacHdlCellStartReq
+ * Function : MacProcCellStartReq
*
* Functionality:
* Handles cell start reuqest from DU APP
* RFAILED - failure
*
* ****************************************************************/
-uint16_t MacHdlCellStartReq(Pst *pst, MacCellStartInfo *cellStartInfo)
+uint8_t MacProcCellStartReq(Pst *pst, MacCellStartInfo *cellStartInfo)
{
DU_LOG("\nMAC : Handling cell start request");
sendToLowerMac(START_REQUEST, 0, cellStartInfo);
*
* @details
*
- * Function : MacHdlCellStartReq
+ * Function : MacProcCellStartReq
*
* Functionality:
* Handles cell stop request from DU APP
* RFAILED - failure
*
* ****************************************************************/
-uint16_t MacHdlCellStopReq(Pst *pst, MacCellStopInfo *cellStopInfo)
+uint8_t MacProcCellStopReq(Pst *pst, MacCellStopInfo *cellStopInfo)
{
#ifdef INTEL_FAPI
DU_LOG("\nMAC : Sending cell stop request to Lower Mac");
*
* @details
*
- * Function : MacHdlDlCcchInd
+ * Function : MacProcDlCcchInd
*
* Functionality:
* Handles DL CCCH Ind from DU APP
* RFAILED - failure
*
* ****************************************************************/
-uint16_t MacHdlDlCcchInd(Pst *pst, DlCcchIndInfo *dlCcchIndInfo)
+uint8_t MacProcDlCcchInd(Pst *pst, DlCcchIndInfo *dlCcchIndInfo)
{
+ uint16_t cellIdx;
uint16_t idx;
DlRlcBOInfo dlBoInfo;
memset(&dlBoInfo, 0, sizeof(DlRlcBOInfo));
DU_LOG("\nMAC : Handling DL CCCH IND");
- /* TODO : Fill DL RLC Buffer status info */
+ GET_CELL_IDX(dlCcchIndInfo->cellId, cellIdx);
+
dlBoInfo.cellId = dlCcchIndInfo->cellId;
dlBoInfo.crnti = dlCcchIndInfo->crnti;
dlBoInfo.numLc = 0;
dlBoInfo.numLc++;
/* storing Msg4 Pdu in raCb */
- if(macCb.macCell->macRaCb[0].crnti == dlCcchIndInfo->crnti)
+ if(macCb.macCell[cellIdx]->macRaCb[0].crnti == dlCcchIndInfo->crnti)
{
- macCb.macCell->macRaCb[0].msg4PduLen = dlCcchIndInfo->dlCcchMsgLen;
- MAC_ALLOC(macCb.macCell->macRaCb[0].msg4Pdu, \
- macCb.macCell->macRaCb[0].msg4PduLen);
- if(macCb.macCell->macRaCb[0].msg4Pdu)
+ macCb.macCell[cellIdx]->macRaCb[0].msg4PduLen = dlCcchIndInfo->dlCcchMsgLen;
+ MAC_ALLOC(macCb.macCell[cellIdx]->macRaCb[0].msg4Pdu, \
+ macCb.macCell[cellIdx]->macRaCb[0].msg4PduLen);
+ if(macCb.macCell[cellIdx]->macRaCb[0].msg4Pdu)
{
for(idx = 0; idx < dlCcchIndInfo->dlCcchMsgLen; idx++)
{
- macCb.macCell->macRaCb[0].msg4Pdu[idx] =\
+ macCb.macCell[cellIdx]->macRaCb[0].msg4Pdu[idx] =\
dlCcchIndInfo->dlCcchMsg[idx];
}
}
* RFAILED - failure
*
* ****************************************************************/
-uint16_t macSendUlCcchInd(uint8_t *rrcContainer, uint16_t cellId, uint16_t crnti)
+uint8_t macSendUlCcchInd(uint8_t *rrcContainer, uint16_t cellId, uint16_t crnti)
{
Pst pst;
uint8_t ret = ROK;
ulCcchIndInfo->ulCcchMsg = rrcContainer;
/* Fill Pst */
- pst.selector = ODU_SELECTOR_LWLC;
- pst.srcEnt = ENTRG;
- pst.dstEnt = ENTDUAPP;
- pst.dstInst = 0;
- pst.srcInst = macCb.macInst;
- pst.dstProcId = rgCb[pst.srcInst].rgInit.procId;
- pst.srcProcId = rgCb[pst.srcInst].rgInit.procId;
- pst.region = MAC_MEM_REGION;
- pst.pool = MAC_POOL;
- pst.event = EVENT_MAC_UL_CCCH_IND;
- pst.route = 0;
- pst.prior = 0;
- pst.intfVer = 0;
+ FILL_PST_MAC_TO_DUAPP(pst, EVENT_MAC_UL_CCCH_IND);
if(MacDuAppUlCcchInd(&pst, ulCcchIndInfo) != ROK)
{