};
-DuMacSliceRecfgReq packMacSliceReCfgReqOpts[] =
+DuMacSliceRecfgReq packMacSliceRecfgReqOpts[] =
{
packDuMacSliceRecfgReq, /* Loose coupling */
- MacProcSliceReCfgReq, /* TIght coupling */
+ MacProcSliceRecfgReq, /* TIght coupling */
packDuMacSliceRecfgReq /* Light weight-loose coupling */
};
/**************************************************************************
uint8_t duBuildAndSendMacCellStart()
{
Pst pst;
- OduCellId *cellId = NULL;
+ CellStartInfo *cellStart = NULL;
DU_LOG("\nINFO --> DU APP : Building and Sending cell start request to MAC");
/* Send Cell Start Request to MAC */
- DU_ALLOC_SHRABL_BUF(cellId, sizeof(OduCellId));
- if(!cellId)
+ DU_ALLOC_SHRABL_BUF(cellStart, sizeof(CellStartInfo));
+ if(!cellStart)
{
DU_LOG("\nERROR --> DU APP : Memory alloc failed while building cell start request");
return RFAILED;
{
if(duCb.actvCellLst[id])
{
- cellId->cellId = duCb.actvCellLst[id]->cellId;
+ cellStart->cellId = duCb.actvCellLst[id]->cellId;
/* Fill Pst */
FILL_PST_DUAPP_TO_MAC(pst, EVENT_MAC_CELL_START);
- return (*packMacCellStartOpts[pst.selector])(&pst, cellId);
+ return (*packMacCellStartOpts[pst.selector])(&pst, cellStart);
}
}
return ROK;
{
Pst pst;
uint16_t cellIdx=0;
- OduCellId *oduCellId = NULL;
-
+ CellStopInfo *cellStop = NULL;
+
DU_LOG("\nINFO --> DU APP : Building and Sending cell stop request to MAC");
GET_CELL_IDX(cellId, cellIdx);
if(duCb.actvCellLst[cellIdx] != NULLP)
{
/* Send Cell Stop Request to MAC */
- DU_ALLOC_SHRABL_BUF(oduCellId, sizeof(OduCellId));
- if(!oduCellId)
+ DU_ALLOC_SHRABL_BUF(cellStop, sizeof(CellStopInfo));
+ if(!cellStop)
{
- DU_LOG("\nERROR --> DU APP : duBuildAndSendMacCellStop(): Memory allocation failed ");
+ DU_LOG("\nERROR --> DU APP : Memory alloc failed while building cell stop request");
return RFAILED;
}
- memset(oduCellId, 0, sizeof(OduCellId));
- oduCellId->cellId = duCb.actvCellLst[cellIdx]->cellId;
+ memset(cellStop, 0, sizeof(CellStopInfo));
+ cellStop->cellId = duCb.actvCellLst[cellIdx]->cellId;
/* Fill Pst */
FILL_PST_DUAPP_TO_MAC(pst, EVENT_MAC_CELL_STOP);
- return (*packMacCellStopOpts[pst.selector])(&pst, oduCellId);
+ return (*packMacCellStopOpts[pst.selector])(&pst, cellStop);
}
else
{
return ROK;
}
-/*******************************************************************
- *
- * @brief Free tempSLiceCfg stored in duCfgParams
- *
- * @details
- *
- * Function : duFreeTempSliceCfg
- *
- * Functionality: Free tempSLiceCfg stored in duCfgParams
- *
- * @params[in] Post structure,
- *
- * @return Void
- *
- * ****************************************************************/
-
-void duFreeTempSliceCfg()
-{
- uint8_t policyIdx = 0, memberListTdx =0;
- CopyOfRecvdSliceCfg *tempSliceCfg = &duCfgParam.tempSliceCfg;
-
- if(tempSliceCfg->totalRrmPolicy)
- {
- for(policyIdx = 0; policyIdx<tempSliceCfg->totalRrmPolicy; policyIdx++)
- {
- if(tempSliceCfg->rrmPolicy[policyIdx]->numMemberList)
- {
- for(memberListTdx = 0; memberListTdx<tempSliceCfg->rrmPolicy[policyIdx]->numMemberList; memberListTdx++)
- {
- DU_FREE(tempSliceCfg->rrmPolicy[policyIdx]->memberList[memberListTdx], sizeof(PolicyMemberList));
- }
- DU_FREE(tempSliceCfg->rrmPolicy[policyIdx]->memberList, (tempSliceCfg->rrmPolicy[policyIdx]->numMemberList) * sizeof(PolicyMemberList*));
- }
- DU_FREE(tempSliceCfg->rrmPolicy[policyIdx], sizeof(RrmPolicy));
- }
- DU_FREE(tempSliceCfg->rrmPolicy, tempSliceCfg->totalRrmPolicy* sizeof(RrmPolicy*));
- }
- memset(tempSliceCfg, 0, sizeof(CopyOfRecvdSliceCfg));
-}
-
-/*******************************************************************
- *
- * @brief free the slice cfg rsp
- *
- * @details
- *
- * Function : duFreeSliceCfgRsp
- *
- * Functionality: free the slice cfg rsp
- *
- * @params[in] Post structure, MacSliceCfgRsp *cfgRsp
- *
- * @return ROK - success
- * RFAILED - failure
- *
- **********************************************************************/
-void duFreeSliceCfgRsp(Pst *pst, MacSliceCfgRsp *cfgRsp)
-{
- uint8_t cfgIdx;
-
- if(cfgRsp)
- {
- if(cfgRsp->numSliceCfgRsp)
- {
- for(cfgIdx = 0; cfgIdx<cfgRsp->numSliceCfgRsp; cfgIdx++)
- {
- DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, cfgRsp->listOfSliceCfgRsp[cfgIdx], sizeof(MacSliceRsp));
- }
- DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, cfgRsp->listOfSliceCfgRsp, cfgRsp->numSliceCfgRsp * sizeof(MacSliceRsp*));
- }
- DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, cfgRsp, sizeof(MacSliceCfgRsp));
- }
-}
-
/*******************************************************************
*
* @brief process the slice cfg rsp received from MAC
**********************************************************************/
uint8_t DuProcMacSliceCfgRsp(Pst *pst, MacSliceCfgRsp *cfgRsp)
{
- uint8_t cfgIdx = 0;
-
if(cfgRsp)
{
- if(cfgRsp->listOfSliceCfgRsp)
- {
- for(cfgIdx = 0; cfgIdx<cfgRsp->numSliceCfgRsp; cfgIdx++)
- {
- if(cfgRsp->listOfSliceCfgRsp[cfgIdx]->rsp == MAC_DU_APP_RSP_OK)
- {
- duCb.sliceState = SLICE_CONFIGURED;
- }
- }
- DU_LOG("\nINFO --> DU_APP : Slice Configuration is done successfully ");
- }
- duFreeSliceCfgRsp(pst, cfgRsp);
+ if(cfgRsp->rsp == MAC_DU_APP_RSP_OK)
+ {
+ duCb.sliceState = SLICE_CONFIGURED;
+ DU_LOG("\nINFO --> DU_APP : Slice configured successfully ");
+ }
+ else
+ {
+ DU_LOG("\nERROR --> DU_APP : Slice not available");
+ }
+ DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, cfgRsp, sizeof(MacSliceCfgRsp));
}
- duFreeTempSliceCfg();
return ROK;
}
-/*******************************************************************
- *
- * @brief Fill the slice configration and rrm policy ratio
- * information received form O1
- *
- * @details
- *
- * Function : fillSliceCfgReCfgInfo
- *
- * Functionality: Fill the slice configration and recfg info
- *
- * @params[in] Post structure
- *
- * @return ROK - success
- * RFAILED - failure
- *
- * ****************************************************************/
-
-uint8_t fillSliceCfgReCfgInfo(MacSliceCfgReq *sliceCfgReq, RrmPolicy *rrmPolicy[], uint8_t totalRrmPolicy, uint8_t totalSliceCount)
-{
- uint8_t sliceIdx = 0, cfgIdx = 0, memberListIdx = 0;
-
- if(totalRrmPolicy)
- {
- DU_ALLOC_SHRABL_BUF(sliceCfgReq->listOfSliceCfg, totalSliceCount*sizeof(MacSliceRrmPolicy*));
- if(sliceCfgReq->listOfSliceCfg == NULLP)
- {
- DU_LOG("\nERROR --> DU_APP : Memory allocation failed in fillSliceCfgReCfgInfo");
- return RFAILED;
- }
-
- for(sliceIdx = 0; sliceIdx<totalRrmPolicy; sliceIdx++)
- {
- for(memberListIdx = 0; memberListIdx<rrmPolicy[sliceIdx]->numMemberList; memberListIdx++)
- {
- DU_ALLOC_SHRABL_BUF(sliceCfgReq->listOfSliceCfg[cfgIdx], sizeof(MacSliceRrmPolicy));
- if(sliceCfgReq->listOfSliceCfg[cfgIdx] == NULLP)
- {
- DU_LOG("\nERROR --> DU_APP : Memory allocation failed in fillSliceCfgReCfgInfo");
- return RFAILED;
- }
-
-
- memcpy(&sliceCfgReq->listOfSliceCfg[cfgIdx]->snssai, &rrmPolicy[sliceIdx]->memberList[memberListIdx]->snssai, sizeof(Snssai));
-
- DU_ALLOC_SHRABL_BUF(sliceCfgReq->listOfSliceCfg[cfgIdx]->rrmPolicyRatio, sizeof(RrmPolicyRatio));
- if(sliceCfgReq->listOfSliceCfg[cfgIdx]->rrmPolicyRatio == NULLP)
- {
- DU_LOG("\nERROR --> DU_APP : Memory allocation failed in fillSliceCfgReCfgInfo");
- return RFAILED;
- }
-
- sliceCfgReq->listOfSliceCfg[cfgIdx]->rrmPolicyRatio->policyMaxRatio = rrmPolicy[sliceIdx]->policyMaxRatio;
- sliceCfgReq->listOfSliceCfg[cfgIdx]->rrmPolicyRatio->policyMinRatio = rrmPolicy[sliceIdx]->policyMinRatio;
- sliceCfgReq->listOfSliceCfg[cfgIdx]->rrmPolicyRatio->policyDedicatedRatio = rrmPolicy[sliceIdx]->policyDedicatedRatio;
- sliceCfgReq->numOfConfiguredSlice++;
- cfgIdx++;
- }
- }
- }
- return ROK;
-}
-
/*******************************************************************
*
* @brief Fill the slice configration and rrm policy related
* RFAILED - failure
*
* ****************************************************************/
-uint8_t BuildAndSendSliceConfigReq(RrmPolicy *rrmPolicy[], uint8_t totalRrmPolicy, uint8_t totalSliceCnt)
+uint8_t BuildAndSendSliceConfigReq()
{
Pst pst;
MacSliceCfgReq *sliceCfgReq;
}
else
{
- if(fillSliceCfgReCfgInfo(sliceCfgReq, rrmPolicy, totalRrmPolicy, totalSliceCnt) != ROK)
- {
- DU_LOG("\nERROR --> DU_APP : Failed to fill slice Configuration info in MacSliceCfgReq");
- return RFAILED;
- }
+ memcpy(sliceCfgReq, &duCfgParam.tempSliceCfg, sizeof(MacSliceCfgReq));
FILL_PST_DUAPP_TO_MAC(pst, EVENT_MAC_SLICE_CFG_REQ);
DU_LOG("\nDEBUG --> DU_APP : Sending Slice Cfg Request to MAC ");
return ROK;
}
-
/*******************************************************************
*
* @brief Fill the slice configration and rrm policy related
*
* @details
*
- * Function : BuildAndSendSliceReCfgReq
+ * Function : BuildAndSendSliceRecfgReq
*
* Functionality: Fill the slice configration and rrm policy related
*
* RFAILED - failure
*
* ****************************************************************/
-uint8_t BuildAndSendSliceReCfgReq(RrmPolicy *rrmPolicy[], uint8_t totalRrmPolicy, uint8_t totalSliceCount)
+uint8_t BuildAndSendSliceRecfgReq()
{
Pst pst;
- MacSliceCfgReq *sliceReCfgReq = NULLP;
+ MacSliceRecfgReq *sliceRecfgReq = NULLP;
DU_LOG("\nINFO --> DU_APP : Slice ReConfiguration Request received");
- DU_ALLOC_SHRABL_BUF(sliceReCfgReq, sizeof(MacSliceCfgReq));
- if(sliceReCfgReq == NULLP)
+ DU_ALLOC_SHRABL_BUF(sliceRecfgReq, sizeof(MacSliceRecfgReq));
+ if(sliceRecfgReq == NULLP)
{
- DU_LOG("\nERROR --> DU_APP : Memory allocation failed to BuildAndSendSliceReCfgReq");
+ DU_LOG("\nERROR --> DU_APP : Memory allocation failed to BuildAndSendSliceRecfgReq");
return RFAILED;
}
else
{
- if(fillSliceCfgReCfgInfo(sliceReCfgReq, rrmPolicy, totalRrmPolicy, totalSliceCount) != ROK)
- {
- DU_LOG("\nERROR --> DU_APP: Failed to fill slice cfg request info");
- return RFAILED;
- }
+ memcpy(sliceRecfgReq, &duCfgParam.tempSliceCfg, sizeof(MacSliceRecfgReq));
+
FILL_PST_DUAPP_TO_MAC(pst, EVENT_MAC_SLICE_RECFG_REQ);
DU_LOG("\nDEBUG --> DU_APP: Sending Slice ReCfg Request to MAC ");
- if( (*packMacSliceReCfgReqOpts[pst.selector])(&pst, sliceReCfgReq) == RFAILED)
+ if( (*packMacSliceRecfgReqOpts[pst.selector])(&pst, sliceRecfgReq) == RFAILED)
{
DU_LOG("\nERROR --> DU_APP: Failed to send Slice ReCfg Req to MAC");
- DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, sliceReCfgReq, sizeof(MacSliceCfgReq));
+ DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, sliceRecfgReq, sizeof(MacSliceRecfgReq));
}
}
return ROK;
*
* @details
*
- * Function : DuProcMacSliceReCfgRsp
+ * Function : DuProcMacSliceRecfgRsp
*
* Functionality: process the slice ReCfg rsp received from MAC
*
- * @params[in] Post structure, MacSliceCfgRsp *ReCfgRsp
+ * @params[in] Post structure, MacSliceRecfgRsp *ReCfgRsp
*
* @return ROK - success
* RFAILED - failure
*
**********************************************************************/
-uint8_t DuProcMacSliceReCfgRsp(Pst *pst, MacSliceCfgRsp *reCfgRsp)
+uint8_t DuProcMacSliceRecfgRsp(Pst *pst, MacSliceRecfgRsp *recfgRsp)
{
- uint8_t cfgIdx = 0;
-
- if(reCfgRsp)
+ if(recfgRsp)
{
- if(reCfgRsp->listOfSliceCfgRsp)
+ if(recfgRsp->rsp == MAC_DU_APP_RSP_OK)
{
- for(cfgIdx = 0; cfgIdx < reCfgRsp->numSliceCfgRsp; cfgIdx++)
- {
- if(reCfgRsp->listOfSliceCfgRsp[cfgIdx]->rsp == MAC_DU_APP_RSP_OK)
- {
- duCb.sliceState = SLICE_RECONFIGURED;
- }
- else
- {
- DU_LOG("\nERROR --> DU_APP : Slice not available");
- }
- }
- DU_LOG("\nINFO --> DU_APP : Slice ReCOnfiguration response received");
+ duCb.sliceState = SLICE_RECONFIGURED;
+ DU_LOG("\nINFO --> DU_APP : Slice Reconfigured successfully ");
+ }
+ else
+ {
+ DU_LOG("\nERROR --> DU_APP : Slice not available");
}
- duFreeSliceCfgRsp(pst, reCfgRsp);
+ DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, recfgRsp, sizeof(MacSliceCfgRsp));
}
- duFreeTempSliceCfg();
return ROK;
}
Code Review / o-du / l2.git / blobdiff