Code Review
/
o-du
/
l2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
JIRA ID:[ODUHIGH-279]:Code initialization for TDD resource matrix
[o-du/l2.git]
/
src
/
5gnrmac
/
mac_ue_mgr.c
diff --git
a/src/5gnrmac/mac_ue_mgr.c
b/src/5gnrmac/mac_ue_mgr.c
index
0f38987
..
9f32e9c
100644
(file)
--- a/
src/5gnrmac/mac_ue_mgr.c
+++ b/
src/5gnrmac/mac_ue_mgr.c
@@
-77,7
+77,7
@@
uint8_t fillMacCellGroupCfg(MacCellGrpCfg macCellGrp, SchMacCellGrpCfg *macCell
schedReqCfg->addModListCount = macCellGrp.schReqCfg.addModListCount;
if(schedReqCfg->addModListCount > MAX_NUM_SR_CFG_PER_CELL_GRP)
{
schedReqCfg->addModListCount = macCellGrp.schReqCfg.addModListCount;
if(schedReqCfg->addModListCount > MAX_NUM_SR_CFG_PER_CELL_GRP)
{
- DU_LOG("\nMAC : Scheduling Request Add/Mod Count %d exceeds max limit %d", \
+ DU_LOG("\n
ERROR -->
MAC : Scheduling Request Add/Mod Count %d exceeds max limit %d", \
schedReqCfg->addModListCount, MAX_NUM_SR_CFG_PER_CELL_GRP);
return RFAILED;
}
schedReqCfg->addModListCount, MAX_NUM_SR_CFG_PER_CELL_GRP);
return RFAILED;
}
@@
-97,7
+97,7
@@
uint8_t fillMacCellGroupCfg(MacCellGrpCfg macCellGrp, SchMacCellGrpCfg *macCell
tagCfg->addModListCount = macCellGrp.tagCfg.addModListCount;
if(tagCfg->addModListCount > MAX_NUM_TAGS)
{
tagCfg->addModListCount = macCellGrp.tagCfg.addModListCount;
if(tagCfg->addModListCount > MAX_NUM_TAGS)
{
- DU_LOG("\nMAC : Scheduling Request Add/Mod Count %d exceeds max limit %d", \
+ DU_LOG("\n
ERROR -->
MAC : Scheduling Request Add/Mod Count %d exceeds max limit %d", \
tagCfg->addModListCount, MAX_NUM_TAGS);
return RFAILED;
}
tagCfg->addModListCount, MAX_NUM_TAGS);
return RFAILED;
}
@@
-174,7
+174,7
@@
uint8_t fillPdschServCellCfg(PdschServCellCfg macPdschCfg, SchPdschServCellCfg *
MAC_ALLOC_SHRABL_BUF(schPdschCfg->maxMimoLayers, sizeof(uint8_t));
if(!schPdschCfg->maxMimoLayers)
{
MAC_ALLOC_SHRABL_BUF(schPdschCfg->maxMimoLayers, sizeof(uint8_t));
if(!schPdschCfg->maxMimoLayers)
{
- DU_LOG("\nMAC :Memory Alloc MimoLayers Failed at fillPdschServCellCfg()");
+ DU_LOG("\n
ERROR -->
MAC :Memory Alloc MimoLayers Failed at fillPdschServCellCfg()");
return RFAILED;
}
}
return RFAILED;
}
}
@@
-195,7
+195,7
@@
uint8_t fillPdschServCellCfg(PdschServCellCfg macPdschCfg, SchPdschServCellCfg *
MAC_ALLOC_SHRABL_BUF(schPdschCfg->maxCodeBlkGrpPerTb, sizeof(SchMaxCodeBlkGrpPerTB));
if(!schPdschCfg->maxCodeBlkGrpPerTb)
{
MAC_ALLOC_SHRABL_BUF(schPdschCfg->maxCodeBlkGrpPerTb, sizeof(SchMaxCodeBlkGrpPerTB));
if(!schPdschCfg->maxCodeBlkGrpPerTb)
{
- DU_LOG("\nMAC :Memory Alloc for code Block Failed at fillPdschServCellCfg()");
+ DU_LOG("\n
ERROR -->
MAC :Memory Alloc for code Block Failed at fillPdschServCellCfg()");
return RFAILED;
}
}
return RFAILED;
}
}
@@
-213,7
+213,7
@@
uint8_t fillPdschServCellCfg(PdschServCellCfg macPdschCfg, SchPdschServCellCfg *
MAC_ALLOC_SHRABL_BUF(schPdschCfg->codeBlkGrpFlushInd, sizeof(bool));
if(!schPdschCfg->codeBlkGrpFlushInd)
{
MAC_ALLOC_SHRABL_BUF(schPdschCfg->codeBlkGrpFlushInd, sizeof(bool));
if(!schPdschCfg->codeBlkGrpFlushInd)
{
- DU_LOG("\nMAC :Memory Alloc for Flush Ind Failed at fillPdschServCellCfg()");
+ DU_LOG("\n
ERROR -->
MAC :Memory Alloc for Flush Ind Failed at fillPdschServCellCfg()");
return RFAILED;
}
}
return RFAILED;
}
}
@@
-231,7
+231,7
@@
uint8_t fillPdschServCellCfg(PdschServCellCfg macPdschCfg, SchPdschServCellCfg *
MAC_ALLOC_SHRABL_BUF(schPdschCfg->xOverhead, sizeof(SchPdschXOverhead));
if(!schPdschCfg->xOverhead)
{
MAC_ALLOC_SHRABL_BUF(schPdschCfg->xOverhead, sizeof(SchPdschXOverhead));
if(!schPdschCfg->xOverhead)
{
- DU_LOG("\nMAC :Memory Alloc for xOverHead Failed at fillPdschServCellCfg()");
+ DU_LOG("\n
ERROR -->
MAC :Memory Alloc for xOverHead Failed at fillPdschServCellCfg()");
return RFAILED;
}
}
return RFAILED;
}
}
@@
-276,7
+276,7
@@
uint8_t fillInitalUlBwpPuschCfg(PuschCfg macPuschCfg, SchPuschCfg *schPuschCfg)
schPuschCfg->numTimeDomRsrcAlloc = macPuschCfg.numTimeDomRsrcAlloc;
if(schPuschCfg->numTimeDomRsrcAlloc > MAX_NUM_UL_ALLOC)
{
schPuschCfg->numTimeDomRsrcAlloc = macPuschCfg.numTimeDomRsrcAlloc;
if(schPuschCfg->numTimeDomRsrcAlloc > MAX_NUM_UL_ALLOC)
{
- DU_LOG("\nMAC : Number of Time domain resource allocation [%d] exceeds max limit [%d]",\
+ DU_LOG("\n
ERROR -->
MAC : Number of Time domain resource allocation [%d] exceeds max limit [%d]",\
schPuschCfg->numTimeDomRsrcAlloc, MAX_NUM_UL_ALLOC);
return RFAILED;
}
schPuschCfg->numTimeDomRsrcAlloc, MAX_NUM_UL_ALLOC);
return RFAILED;
}
@@
-380,7
+380,7
@@
uint8_t fillResrcList(PucchResrcCfg *macResrcCfg, SchPucchResrcCfg *schResrcCfg)
MAC_ALLOC(schResrcCfg->resrcToAddModList[arrIdx].SchPucchFormat.format0, sizeof(SchPucchFormat0));
if(schResrcCfg->resrcToAddModList[arrIdx].SchPucchFormat.format0 == NULLP)
{
MAC_ALLOC(schResrcCfg->resrcToAddModList[arrIdx].SchPucchFormat.format0, sizeof(SchPucchFormat0));
if(schResrcCfg->resrcToAddModList[arrIdx].SchPucchFormat.format0 == NULLP)
{
- DU_LOG("\nERROR --> MAC : Failed to allocate memory for Format0 in fillResrcList()");
+ DU_LOG("\nERROR -->
MAC : Failed to allocate memory for Format0 in fillResrcList()");
return RFAILED;
}
schResrcCfg->resrcToAddModList[arrIdx].SchPucchFormat.format0->initialCyclicShift =\
return RFAILED;
}
schResrcCfg->resrcToAddModList[arrIdx].SchPucchFormat.format0->initialCyclicShift =\
@@
-396,7
+396,7
@@
uint8_t fillResrcList(PucchResrcCfg *macResrcCfg, SchPucchResrcCfg *schResrcCfg)
MAC_ALLOC(schResrcCfg->resrcToAddModList[arrIdx].SchPucchFormat.format1, sizeof(SchPucchFormat1));
if(schResrcCfg->resrcToAddModList[arrIdx].SchPucchFormat.format1 == NULLP)
{
MAC_ALLOC(schResrcCfg->resrcToAddModList[arrIdx].SchPucchFormat.format1, sizeof(SchPucchFormat1));
if(schResrcCfg->resrcToAddModList[arrIdx].SchPucchFormat.format1 == NULLP)
{
- DU_LOG("\nERROR --> MAC : Failed to allocate memory for Format1 in fillResrcList()");
+ DU_LOG("\nERROR -->
MAC : Failed to allocate memory for Format1 in fillResrcList()");
return RFAILED;
}
schResrcCfg->resrcToAddModList[arrIdx].SchPucchFormat.format1->initialCyclicShift =\
return RFAILED;
}
schResrcCfg->resrcToAddModList[arrIdx].SchPucchFormat.format1->initialCyclicShift =\
@@
-1089,7
+1089,7
@@
uint8_t fillInitDlBwpPdcchCfg(PdcchConfig macPdcchCfg, SchPdcchConfig *schPdcchC
schPdcchCfg->numCRsetToAddMod = macPdcchCfg.numCRsetToAddMod;
if(schPdcchCfg->numCRsetToAddMod > MAX_NUM_CRSET)
{
schPdcchCfg->numCRsetToAddMod = macPdcchCfg.numCRsetToAddMod;
if(schPdcchCfg->numCRsetToAddMod > MAX_NUM_CRSET)
{
- DU_LOG("\nMAC : Number of CORESET to ADD/MOD [%d] exceeds max limit [%d]",\
+ DU_LOG("\n
ERROR -->
MAC : Number of CORESET to ADD/MOD [%d] exceeds max limit [%d]",\
schPdcchCfg->numCRsetToAddMod, MAX_NUM_CRSET);
return RFAILED;
}
schPdcchCfg->numCRsetToAddMod, MAX_NUM_CRSET);
return RFAILED;
}
@@
-1113,7
+1113,7
@@
uint8_t fillInitDlBwpPdcchCfg(PdcchConfig macPdcchCfg, SchPdcchConfig *schPdcchC
schPdcchCfg->numCRsetToRel = macPdcchCfg.numCRsetToRel;
if(schPdcchCfg->numCRsetToAddMod > MAX_NUM_CRSET)
{
schPdcchCfg->numCRsetToRel = macPdcchCfg.numCRsetToRel;
if(schPdcchCfg->numCRsetToAddMod > MAX_NUM_CRSET)
{
- DU_LOG("\nMAC : Number of CORESET to release [%d] exceeds max limit [%d]",\
+ DU_LOG("\n
ERROR -->
MAC : Number of CORESET to release [%d] exceeds max limit [%d]",\
schPdcchCfg->numCRsetToRel, MAX_NUM_CRSET);
return RFAILED;
}
schPdcchCfg->numCRsetToRel, MAX_NUM_CRSET);
return RFAILED;
}
@@
-1127,7
+1127,7
@@
uint8_t fillInitDlBwpPdcchCfg(PdcchConfig macPdcchCfg, SchPdcchConfig *schPdcchC
schPdcchCfg->numSearchSpcToAddMod = macPdcchCfg.numSearchSpcToAddMod;
if(schPdcchCfg->numSearchSpcToAddMod > MAX_NUM_SEARCH_SPC)
{
schPdcchCfg->numSearchSpcToAddMod = macPdcchCfg.numSearchSpcToAddMod;
if(schPdcchCfg->numSearchSpcToAddMod > MAX_NUM_SEARCH_SPC)
{
- DU_LOG("\nMAC : Number of search space to ADD/MOD [%d] exceeds max [%d]", \
+ DU_LOG("\n
ERROR -->
MAC : Number of search space to ADD/MOD [%d] exceeds max [%d]", \
schPdcchCfg->numSearchSpcToAddMod, MAX_NUM_SEARCH_SPC);
return RFAILED;
}
schPdcchCfg->numSearchSpcToAddMod, MAX_NUM_SEARCH_SPC);
return RFAILED;
}
@@
-1161,7
+1161,7
@@
uint8_t fillInitDlBwpPdcchCfg(PdcchConfig macPdcchCfg, SchPdcchConfig *schPdcchC
schPdcchCfg->numSearchSpcToRel = macPdcchCfg.numSearchSpcToRel;
if(schPdcchCfg->numSearchSpcToRel > MAX_NUM_SEARCH_SPC)
{
schPdcchCfg->numSearchSpcToRel = macPdcchCfg.numSearchSpcToRel;
if(schPdcchCfg->numSearchSpcToRel > MAX_NUM_SEARCH_SPC)
{
- DU_LOG("\nMAC : Number of search space to release [%d] exceeds max [%d]", \
+ DU_LOG("\n
ERROR -->
MAC : Number of search space to release [%d] exceeds max [%d]", \
schPdcchCfg->numSearchSpcToRel, MAX_NUM_SEARCH_SPC);
return RFAILED;
}
schPdcchCfg->numSearchSpcToRel, MAX_NUM_SEARCH_SPC);
return RFAILED;
}
@@
-1200,7
+1200,7
@@
uint8_t fillInitDlBwpPdschCfg(PdschConfig macPdschCfg, SchPdschConfig *schPdschC
schPdschCfg->numTimeDomRsrcAlloc = macPdschCfg.numTimeDomRsrcAlloc;
if(schPdschCfg->numTimeDomRsrcAlloc > MAX_NUM_DL_ALLOC)
{
schPdschCfg->numTimeDomRsrcAlloc = macPdschCfg.numTimeDomRsrcAlloc;
if(schPdschCfg->numTimeDomRsrcAlloc > MAX_NUM_DL_ALLOC)
{
- DU_LOG("\nMAC : Number of time domain resource allocation [%d], exceeds\
+ DU_LOG("\n
ERROR -->
MAC : Number of time domain resource allocation [%d], exceeds\
max limit [%d]", schPdschCfg->numTimeDomRsrcAlloc, MAX_NUM_DL_ALLOC);
return RFAILED;
}
max limit [%d]", schPdschCfg->numTimeDomRsrcAlloc, MAX_NUM_DL_ALLOC);
return RFAILED;
}
@@
-1253,7
+1253,7
@@
uint8_t fillInitialDlBwp(InitialDlBwp macInitDlBwp, SchInitalDlBwp *schInitDlBwp
{
if(fillInitDlBwpPdcchCfg(macInitDlBwp.pdcchCfg, &schInitDlBwp->pdcchCfg) != ROK)
{
{
if(fillInitDlBwpPdcchCfg(macInitDlBwp.pdcchCfg, &schInitDlBwp->pdcchCfg) != ROK)
{
- DU_LOG("\nMAC : fillInitDlBwpPdcchCfg() failed");
+ DU_LOG("\n
ERROR -->
MAC : fillInitDlBwpPdcchCfg() failed");
return RFAILED;
}
}
return RFAILED;
}
}
@@
-1263,7
+1263,7
@@
uint8_t fillInitialDlBwp(InitialDlBwp macInitDlBwp, SchInitalDlBwp *schInitDlBwp
{
if(fillInitDlBwpPdschCfg(macInitDlBwp.pdschCfg,&schInitDlBwp->pdschCfg) != ROK)
{
{
if(fillInitDlBwpPdschCfg(macInitDlBwp.pdschCfg,&schInitDlBwp->pdschCfg) != ROK)
{
- DU_LOG("\nMAC : fillInitDlBwpPdschCfg() failed");
+ DU_LOG("\n
ERROR -->
MAC : fillInitDlBwpPdschCfg() failed");
return RFAILED;
}
}
return RFAILED;
}
}
@@
-1298,14
+1298,14
@@
uint8_t fillSpCellCfg(SpCellCfg macSpCellCfg, SchSpCellCfg *schSpCellCfg)
if(fillInitialDlBwp(macSpCellCfg.servCellCfg.initDlBwp, \
&servCellCfg->initDlBwp) != ROK )
{
if(fillInitialDlBwp(macSpCellCfg.servCellCfg.initDlBwp, \
&servCellCfg->initDlBwp) != ROK )
{
- DU_LOG("\nMAC : fillInitialDlBwp() failed");
+ DU_LOG("\n
ERROR -->
MAC : fillInitialDlBwp() failed");
return RFAILED;
}
servCellCfg->numDlBwpToAdd = macSpCellCfg.servCellCfg.numDlBwpToAdd;
if(servCellCfg->numDlBwpToAdd > MAX_NUM_BWP)
{
return RFAILED;
}
servCellCfg->numDlBwpToAdd = macSpCellCfg.servCellCfg.numDlBwpToAdd;
if(servCellCfg->numDlBwpToAdd > MAX_NUM_BWP)
{
- DU_LOG("\nMAC : Number of DL BWP to ADD/MOD [%d] exceeds max limit [%d]",\
+ DU_LOG("\n
ERROR -->
MAC : Number of DL BWP to ADD/MOD [%d] exceeds max limit [%d]",\
servCellCfg->numDlBwpToAdd, MAX_NUM_BWP);
return RFAILED;
}
servCellCfg->numDlBwpToAdd, MAX_NUM_BWP);
return RFAILED;
}
@@
-1326,7
+1326,7
@@
uint8_t fillSpCellCfg(SpCellCfg macSpCellCfg, SchSpCellCfg *schSpCellCfg)
if(fillPdschServCellCfg(macSpCellCfg.servCellCfg.pdschServCellCfg, \
&servCellCfg->pdschServCellCfg) != ROK)
{
if(fillPdschServCellCfg(macSpCellCfg.servCellCfg.pdschServCellCfg, \
&servCellCfg->pdschServCellCfg) != ROK)
{
- DU_LOG("\nMAC : fillPdschServCellCfg() failed");
+ DU_LOG("\n
ERROR -->
MAC : fillPdschServCellCfg() failed");
return RFAILED;
}
return RFAILED;
}
@@
-1334,14
+1334,14
@@
uint8_t fillSpCellCfg(SpCellCfg macSpCellCfg, SchSpCellCfg *schSpCellCfg)
if(fillInitialUlBwp(macSpCellCfg.servCellCfg.initUlBwp, \
&servCellCfg->initUlBwp) != ROK)
{
if(fillInitialUlBwp(macSpCellCfg.servCellCfg.initUlBwp, \
&servCellCfg->initUlBwp) != ROK)
{
- DU_LOG("\nMAC : fillInitialUlBwp() failed");
+ DU_LOG("\n
ERROR -->
MAC : fillInitialUlBwp() failed");
return RFAILED;
}
servCellCfg->numUlBwpToAdd = macSpCellCfg.servCellCfg.numUlBwpToAdd;
if(servCellCfg->numUlBwpToAdd > MAX_NUM_BWP)
{
return RFAILED;
}
servCellCfg->numUlBwpToAdd = macSpCellCfg.servCellCfg.numUlBwpToAdd;
if(servCellCfg->numUlBwpToAdd > MAX_NUM_BWP)
{
- DU_LOG("\nMAC : Number of UL BWP to ADD/MOD [%d] exceeds max limit [%d]",\
+ DU_LOG("\n
ERROR -->
MAC : Number of UL BWP to ADD/MOD [%d] exceeds max limit [%d]",\
servCellCfg->numUlBwpToAdd, MAX_NUM_BWP);
return RFAILED;
}
servCellCfg->numUlBwpToAdd, MAX_NUM_BWP);
return RFAILED;
}
@@
-1383,7
+1383,7
@@
uint8_t sendUeReqToSch(Pst *pst, SchUeCfg *schUeCfg)
FILL_PST_MAC_TO_SCH(schPst, EVENT_MODIFY_UE_CONFIG_REQ_TO_SCH);
return(*macSchModUeConfigReqOpts[schPst.selector])(&schPst,schUeCfg);
default:
FILL_PST_MAC_TO_SCH(schPst, EVENT_MODIFY_UE_CONFIG_REQ_TO_SCH);
return(*macSchModUeConfigReqOpts[schPst.selector])(&schPst,schUeCfg);
default:
- DU_LOG("\n Invalid Pst received %d", pst->event);
+ DU_LOG("\n
ERROR -->
Invalid Pst received %d", pst->event);
return RFAILED;
}
}
return RFAILED;
}
}
@@
-1493,7
+1493,7
@@
uint8_t fillLogicalChannelCfg(SchLcCfg *schLcCfg, LcCfg *macLcCfg)
MAC_ALLOC(schLcCfg->drbQos, sizeof(SchDrbQosInfo));
if(!schLcCfg->drbQos)
{
MAC_ALLOC(schLcCfg->drbQos, sizeof(SchDrbQosInfo));
if(!schLcCfg->drbQos)
{
- DU_LOG("\nMAC : Memory alloc failed at drbQos at fillLogicalChannelCfg()");
+ DU_LOG("\n
ERROR -->
MAC : Memory alloc failed at drbQos at fillLogicalChannelCfg()");
ret = RFAILED;
}
}
ret = RFAILED;
}
}
@@
-1518,7
+1518,7
@@
uint8_t fillLogicalChannelCfg(SchLcCfg *schLcCfg, LcCfg *macLcCfg)
MAC_ALLOC(schLcCfg->snssai, sizeof(SchSnssai));
if(!schLcCfg->snssai)
{
MAC_ALLOC(schLcCfg->snssai, sizeof(SchSnssai));
if(!schLcCfg->snssai)
{
- DU_LOG("\nMAC : Memory alloc failed at snssai at fillLogicalChannelCfg()");
+ DU_LOG("\n
ERROR -->
MAC : Memory alloc failed at snssai at fillLogicalChannelCfg()");
ret = RFAILED;
}
}
ret = RFAILED;
}
}
@@
-1575,7
+1575,7
@@
uint8_t fillSchLcCfgList(SchUeCfg *schUeCfg, MacUeCfg *ueCfg)
{
if(fillLogicalChannelCfg(&schUeCfg->schLcCfg[lcIdx], &ueCfg->lcCfgList[lcIdx]) != ROK)
{
{
if(fillLogicalChannelCfg(&schUeCfg->schLcCfg[lcIdx], &ueCfg->lcCfgList[lcIdx]) != ROK)
{
- DU_LOG("\nMAC : fillLogicalChannelCfg() failed for lc Idx[%d]", lcIdx);
+ DU_LOG("\n
ERROR -->
MAC : fillLogicalChannelCfg() failed for lc Idx[%d]", lcIdx);
return RFAILED;
}
schUeCfg->numLcs++;
return RFAILED;
}
schUeCfg->numLcs++;
@@
-1609,7
+1609,7
@@
uint8_t fillSchUeCfg(Pst *pst, SchUeCfg *schUeCfg, MacUeCfg *ueCfg)
memset(&schUeCfg->macCellGrpCfg, 0, sizeof(SchMacCellGrpCfg));
if(fillMacCellGroupCfg(ueCfg->macCellGrpCfg, &schUeCfg->macCellGrpCfg) != ROK)
{
memset(&schUeCfg->macCellGrpCfg, 0, sizeof(SchMacCellGrpCfg));
if(fillMacCellGroupCfg(ueCfg->macCellGrpCfg, &schUeCfg->macCellGrpCfg) != ROK)
{
- DU_LOG("\nMAC : fillMacCellGroupCfg() failed");
+ DU_LOG("\n
ERROR -->
MAC : fillMacCellGroupCfg() failed");
return RFAILED;
}
return RFAILED;
}
@@
-1617,7
+1617,7
@@
uint8_t fillSchUeCfg(Pst *pst, SchUeCfg *schUeCfg, MacUeCfg *ueCfg)
memset(&schUeCfg->phyCellGrpCfg, 0,sizeof(SchPhyCellGrpCfg));
if(fillPhyCellGroupCfg(ueCfg->phyCellGrpCfg, &schUeCfg->phyCellGrpCfg) != ROK)
{
memset(&schUeCfg->phyCellGrpCfg, 0,sizeof(SchPhyCellGrpCfg));
if(fillPhyCellGroupCfg(ueCfg->phyCellGrpCfg, &schUeCfg->phyCellGrpCfg) != ROK)
{
- DU_LOG("\nMAC : fillPhyCellGroupCfg() failed");
+ DU_LOG("\n
ERROR -->
MAC : fillPhyCellGroupCfg() failed");
return RFAILED;
}
return RFAILED;
}
@@
-1625,7
+1625,7
@@
uint8_t fillSchUeCfg(Pst *pst, SchUeCfg *schUeCfg, MacUeCfg *ueCfg)
memset(&schUeCfg->spCellCfg, 0, sizeof(SchSpCellCfg));
if(fillSpCellCfg(ueCfg->spCellCfg, &schUeCfg->spCellCfg) != ROK)
{
memset(&schUeCfg->spCellCfg, 0, sizeof(SchSpCellCfg));
if(fillSpCellCfg(ueCfg->spCellCfg, &schUeCfg->spCellCfg) != ROK)
{
- DU_LOG("\nMAC : fillSpCellCfg() failed");
+ DU_LOG("\n
ERROR -->
MAC : fillSpCellCfg() failed");
return RFAILED;
}
return RFAILED;
}
@@
-1634,7
+1634,7
@@
uint8_t fillSchUeCfg(Pst *pst, SchUeCfg *schUeCfg, MacUeCfg *ueCfg)
MAC_ALLOC(schUeCfg->ambrCfg, sizeof(SchAmbrCfg));
if(!schUeCfg->ambrCfg)
{
MAC_ALLOC(schUeCfg->ambrCfg, sizeof(SchAmbrCfg));
if(!schUeCfg->ambrCfg)
{
- DU_LOG("\nMAC : Memory allocation failed in sendReconfigReqToSch");
+ DU_LOG("\n
ERROR -->
MAC : Memory allocation failed in sendReconfigReqToSch");
return RFAILED;
}
schUeCfg->ambrCfg->ulBr = ueCfg->ambrCfg->ulBr;
return RFAILED;
}
schUeCfg->ambrCfg->ulBr = ueCfg->ambrCfg->ulBr;
@@
-1657,7
+1657,7
@@
uint8_t fillSchUeCfg(Pst *pst, SchUeCfg *schUeCfg, MacUeCfg *ueCfg)
ret = fillSchLcCfgList(schUeCfg, ueCfg);
if(ret == RFAILED)
{
ret = fillSchLcCfgList(schUeCfg, ueCfg);
if(ret == RFAILED)
{
- DU_LOG("\nMAC : Failed to copy LCs at fillSchUeCfg()");
+ DU_LOG("\n
ERROR -->
MAC : Failed to copy LCs at fillSchUeCfg()");
return ret;
}
return ret;
return ret;
}
return ret;
@@
-1765,7
+1765,7
@@
uint8_t fillMacLcCfgList(MacUeCb *ueCb, MacUeCfg *ueCfg)
/*Nothing to Modify in DL LC CB */
/*Modify UL LC CB */
ueCb->ulInfo.lcCb[ueLcIdx].lcGrpId = ueCfg->lcCfgList[lcIdx].ulLcCfg.lcGroup;
/*Nothing to Modify in DL LC CB */
/*Modify UL LC CB */
ueCb->ulInfo.lcCb[ueLcIdx].lcGrpId = ueCfg->lcCfgList[lcIdx].ulLcCfg.lcGroup;
- DU_LOG("\nMAC: Successfully Modified LC context for lcId[%d]", ueCfg->lcCfgList[lcIdx].lcId);
+ DU_LOG("\n
INFO -->
MAC: Successfully Modified LC context for lcId[%d]", ueCfg->lcCfgList[lcIdx].lcId);
break;
}
if(ueCfg->lcCfgList[lcIdx].configType == CONFIG_DEL)
break;
}
if(ueCfg->lcCfgList[lcIdx].configType == CONFIG_DEL)
@@
-1777,7
+1777,7
@@
uint8_t fillMacLcCfgList(MacUeCb *ueCb, MacUeCfg *ueCfg)
memset(&ueCb->ulInfo.lcCb[ueLcIdx], 0, sizeof(UlLcCb));
(ueCb->ulInfo.numUlLc)--;
updateMacUlCb(ueLcIdx, &ueCb->ulInfo);
memset(&ueCb->ulInfo.lcCb[ueLcIdx], 0, sizeof(UlLcCb));
(ueCb->ulInfo.numUlLc)--;
updateMacUlCb(ueLcIdx, &ueCb->ulInfo);
- DU_LOG("\nMAC: Successfully Deleted LC context for lcId[%d]", ueCfg->lcCfgList[lcIdx].lcId);
+ DU_LOG("\n
INFO -->
MAC: Successfully Deleted LC context for lcId[%d]", ueCfg->lcCfgList[lcIdx].lcId);
break;
}
}
break;
}
}
@@
-1822,7
+1822,7
@@
uint8_t fillMacUeCb(MacUeCb *ueCb, MacUeCfg *ueCfg, uint8_t cellIdx)
ret = fillMacLcCfgList(ueCb, ueCfg);
if(ret == RFAILED)
{
ret = fillMacLcCfgList(ueCb, ueCfg);
if(ret == RFAILED)
{
- DU_LOG("\nMAC: Failed while filing MAC LC List at fillMacUeCb()");
+ DU_LOG("\n
ERROR -->
MAC: Failed while filing MAC LC List at fillMacUeCb()");
}
return ret;
}
}
return ret;
}
@@
-1920,7
+1920,7
@@
uint8_t createUeCb(uint8_t cellIdx, MacUeCb *ueCb, MacUeCfg *ueCfg)
if((ueCb->ueIdx == ueCfg->ueIdx) && (ueCb->crnti == ueCfg->crnti)\
&&(ueCb->state == UE_STATE_ACTIVE))
{
if((ueCb->ueIdx == ueCfg->ueIdx) && (ueCb->crnti == ueCfg->crnti)\
&&(ueCb->state == UE_STATE_ACTIVE))
{
- DU_LOG("\n MAC : CRNTI %d already configured ", ueCfg->crnti);
+ DU_LOG("\n
ERROR -->
MAC : CRNTI %d already configured ", ueCfg->crnti);
return ROKDUP;
}
else
return ROKDUP;
}
else
@@
-1929,7
+1929,7
@@
uint8_t createUeCb(uint8_t cellIdx, MacUeCb *ueCb, MacUeCfg *ueCfg)
ret = fillMacUeCb(ueCb, ueCfg, cellIdx);
if(ret != ROK)
{
ret = fillMacUeCb(ueCb, ueCfg, cellIdx);
if(ret != ROK)
{
- DU_LOG("\nMAC : Failed to create Ue Cb at createUeCb()");
+ DU_LOG("\n
ERROR -->
MAC : Failed to create Ue Cb at createUeCb()");
return ret;
}
else
return ret;
}
else
@@
-1965,11
+1965,11
@@
uint8_t modifyUeCb(uint8_t cellIdx, MacUeCb *ueCb, MacUeCfg *ueCfg)
if((ueCb->ueIdx == ueCfg->ueIdx) && (ueCb->crnti == ueCfg->crnti)\
&&(ueCb->state == UE_STATE_ACTIVE))
{
if((ueCb->ueIdx == ueCfg->ueIdx) && (ueCb->crnti == ueCfg->crnti)\
&&(ueCb->state == UE_STATE_ACTIVE))
{
- DU_LOG("\n MAC : Modifying Ue config Req for CRNTI %d ", ueCfg->crnti);
+ DU_LOG("\n
INFO -->
MAC : Modifying Ue config Req for CRNTI %d ", ueCfg->crnti);
ret = fillMacUeCb(ueCb, ueCfg, cellIdx);
if(ret != ROK)
{
ret = fillMacUeCb(ueCb, ueCfg, cellIdx);
if(ret != ROK)
{
- DU_LOG("\nMAC : Failed to modify MacUeCb at modifyUeCb()");
+ DU_LOG("\n
ERROR -->
MAC : Failed to modify MacUeCb at modifyUeCb()");
return ret;
}
else
return ret;
}
else
@@
-2010,14
+2010,14
@@
uint8_t procMacUeCfgData(Pst *pst, MacUeCfg *ueCfg)
/* Validate cell id */
if(macCb.macCell[cellIdx]->cellId != ueCfg->cellId)
{
/* Validate cell id */
if(macCb.macCell[cellIdx]->cellId != ueCfg->cellId)
{
- DU_LOG("\nMAC : Cell Id %d not configured", ueCfg->cellId);
+ DU_LOG("\n
ERROR -->
MAC : Cell Id %d not configured", ueCfg->cellId);
return RFAILED;
}
/* Check if max number of UE configured */
if(macCb.macCell[cellIdx]->numActvUe > MAX_NUM_UE)
{
return RFAILED;
}
/* Check if max number of UE configured */
if(macCb.macCell[cellIdx]->numActvUe > MAX_NUM_UE)
{
- DU_LOG("MAC : Max number of UE [%d] already configured", MAX_NUM_UE);
+ DU_LOG("
\nERROR -->
MAC : Max number of UE [%d] already configured", MAX_NUM_UE);
return RFAILED;
}
return RFAILED;
}
@@
-2028,12
+2028,12
@@
uint8_t procMacUeCfgData(Pst *pst, MacUeCfg *ueCfg)
case EVENT_UE_CONFIG_RSP_TO_MAC:
ret = createUeCb(cellIdx, ueCb, ueCfg);
if(ret != ROK)
case EVENT_UE_CONFIG_RSP_TO_MAC:
ret = createUeCb(cellIdx, ueCb, ueCfg);
if(ret != ROK)
- DU_LOG("\nMAC: AddUeConfigReq for cellIdx :%d failed in procMacUeCfgData()", cellIdx);
+ DU_LOG("\n
ERROR -->
MAC: AddUeConfigReq for cellIdx :%d failed in procMacUeCfgData()", cellIdx);
break;
case EVENT_UE_RECONFIG_RSP_TO_MAC:
ret = modifyUeCb(cellIdx, ueCb, ueCfg);
if(ret != ROK)
break;
case EVENT_UE_RECONFIG_RSP_TO_MAC:
ret = modifyUeCb(cellIdx, ueCb, ueCfg);
if(ret != ROK)
- DU_LOG("\nMAC: ModifyUeConfigReq for cellIdx :%d failed at procMacUeCfgData()", cellIdx);
+ DU_LOG("\n
ERROR -->
MAC: ModifyUeConfigReq for cellIdx :%d failed at procMacUeCfgData()", cellIdx);
break;
default:
break;
break;
default:
break;
@@
-2066,7
+2066,7
@@
uint8_t copyToTmpData(MacUeCfg *ueCfg)
MAC_ALLOC(tmpData, sizeof(MacUeCfg));
if(!tmpData)
{
MAC_ALLOC(tmpData, sizeof(MacUeCfg));
if(!tmpData)
{
- DU_LOG("\nMAC: Memory Alloc Failed at copyToTmpData()");
+ DU_LOG("\n
ERROR -->
MAC: Memory Alloc Failed at copyToTmpData()");
return RFAILED;
}
memcpy(tmpData, ueCfg, sizeof(MacUeCfg));
return RFAILED;
}
memcpy(tmpData, ueCfg, sizeof(MacUeCfg));
@@
-2096,7
+2096,7
@@
uint8_t MacProcUeCreateReq(Pst *pst, MacUeCfg *ueCfg)
SchUeCfg schUeCfg;
memset(&schUeCfg, 0, sizeof(SchUeCfg));
SchUeCfg schUeCfg;
memset(&schUeCfg, 0, sizeof(SchUeCfg));
- DU_LOG("\nMAC : UE Create Request for CRNTI[%d]", ueCfg->crnti);
+ DU_LOG("\n
INFO -->
MAC : UE Create Request for CRNTI[%d]", ueCfg->crnti);
if(ueCfg)
{
if(ueCfg)
{
@@
-2107,23
+2107,23
@@
uint8_t MacProcUeCreateReq(Pst *pst, MacUeCfg *ueCfg)
/*Sending Cfg Req to SCH */
ret = fillSchUeCfg(pst, &schUeCfg, ueCfg);
if(ret != ROK)
/*Sending Cfg Req to SCH */
ret = fillSchUeCfg(pst, &schUeCfg, ueCfg);
if(ret != ROK)
- DU_LOG("\nMAC : Failed to fill Sch Ue Cfg at MacProcUeCreateReq()");
+ DU_LOG("\n
ERROR -->
MAC : Failed to fill Sch Ue Cfg at MacProcUeCreateReq()");
else
{
/* Fill event and send UE create request to SCH */
ret = sendUeReqToSch(pst, &schUeCfg);
if(ret != ROK)
else
{
/* Fill event and send UE create request to SCH */
ret = sendUeReqToSch(pst, &schUeCfg);
if(ret != ROK)
- DU_LOG("\nMAC : Failed to send UE Create request to SCH");
+ DU_LOG("\n
ERROR -->
MAC : Failed to send UE Create request to SCH");
}
}
else
{
}
}
else
{
- DU_LOG("\nMAC : Failed to store MAC UE CFG ");
+ DU_LOG("\n
ERROR -->
MAC : Failed to store MAC UE CFG ");
}
}
else
{
}
}
else
{
- DU_LOG("\nMAC : MAC UE Create request processing failed");
+ DU_LOG("\n
ERROR -->
MAC : MAC UE Create request processing failed");
ret = RFAILED;
}
/* FREE shared memory */
ret = RFAILED;
}
/* FREE shared memory */
@@
-2156,7
+2156,7
@@
uint8_t MacSendUeCreateRsp(MacRsp result, SchUeCfgRsp *schCfgRsp)
MAC_ALLOC_SHRABL_BUF(cfgRsp, sizeof(MacUeCfgRsp));
if(!cfgRsp)
{
MAC_ALLOC_SHRABL_BUF(cfgRsp, sizeof(MacUeCfgRsp));
if(!cfgRsp)
{
- DU_LOG("\nMAC: Memory allocation for UE config response failed");
+ DU_LOG("\n
ERROR -->
MAC: Memory allocation for UE config response failed");
return RFAILED;
}
return RFAILED;
}
@@
-2196,7
+2196,7
@@
uint8_t MacSendUeReconfigRsp(MacRsp result, SchUeCfgRsp *schCfgRsp)
MAC_ALLOC_SHRABL_BUF(cfgRsp, sizeof(MacUeCfgRsp));
if(!cfgRsp)
{
MAC_ALLOC_SHRABL_BUF(cfgRsp, sizeof(MacUeCfgRsp));
if(!cfgRsp)
{
- DU_LOG("\nMAC: Memory allocation for UE Reconfig response failed");
+ DU_LOG("\n
ERROR -->
MAC: Memory allocation for UE Reconfig response failed");
return RFAILED;
}
return RFAILED;
}
@@
-2239,7
+2239,7
@@
MacUeCfg *getMacUeCfg(uint16_t cellIdx, uint8_t ueIdx)
}
else
{
}
else
{
- DU_LOG("\nMAC: Failed to get macCellCb in getMacUeCfg()");
+ DU_LOG("\n
ERROR -->
MAC: Failed to get macCellCb in getMacUeCfg()");
}
return ueCfg;
}
}
return ueCfg;
}
@@
-2273,7
+2273,7
@@
uint8_t MacProcSchUeCfgRsp(Pst *pst, SchUeCfgRsp *schCfgRsp)
ueCfg = getMacUeCfg(cellIdx, schCfgRsp->ueIdx);
if(ueCfg == NULLP)
{
ueCfg = getMacUeCfg(cellIdx, schCfgRsp->ueIdx);
if(ueCfg == NULLP)
{
- DU_LOG("\nMAC : Failed to find the Mac Ue Cfg for event [%d] in MacProcSchUeCfgRsp()", pst->event);
+ DU_LOG("\n
ERROR -->
MAC : Failed to find the Mac Ue Cfg for event [%d] in MacProcSchUeCfgRsp()", pst->event);
ret = RFAILED;
}
ret = RFAILED;
}
@@
-2283,7
+2283,7
@@
uint8_t MacProcSchUeCfgRsp(Pst *pst, SchUeCfgRsp *schCfgRsp)
{
if(schCfgRsp->rsp != RSP_NOK)
{
{
if(schCfgRsp->rsp != RSP_NOK)
{
- DU_LOG("\nMAC: SCH UeConfigRsp for CRNTI[%d] is success in MacProcSchUeCfgRsp()", schCfgRsp->crnti);
+ DU_LOG("\n
INFO -->
MAC: SCH UeConfigRsp for CRNTI[%d] is success in MacProcSchUeCfgRsp()", schCfgRsp->crnti);
if(ret == ROK)
{
ret = procMacUeCfgData(pst, ueCfg);
if(ret == ROK)
{
ret = procMacUeCfgData(pst, ueCfg);
@@
-2295,7
+2295,7
@@
uint8_t MacProcSchUeCfgRsp(Pst *pst, SchUeCfgRsp *schCfgRsp)
}
else
{
}
else
{
- DU_LOG("\nMAC: SCH UeConfigRsp for CRNTI[%d] is failed in MacProcSchUeCfgRsp()", schCfgRsp->crnti);
+ DU_LOG("\n
ERROR -->
MAC: SCH UeConfigRsp for CRNTI[%d] is failed in MacProcSchUeCfgRsp()", schCfgRsp->crnti);
}
ret = MacSendUeCreateRsp(result, schCfgRsp);
}
}
ret = MacSendUeCreateRsp(result, schCfgRsp);
}
@@
-2305,7
+2305,7
@@
uint8_t MacProcSchUeCfgRsp(Pst *pst, SchUeCfgRsp *schCfgRsp)
{
if(schCfgRsp->rsp != RSP_NOK)
{
{
if(schCfgRsp->rsp != RSP_NOK)
{
- DU_LOG("\nMAC: SCH UeReconfigRsp for CRNTI[%d] is success in MacProcSchUeCfgRsp()", schCfgRsp->crnti);
+ DU_LOG("\n
INFO -->
MAC: SCH UeReconfigRsp for CRNTI[%d] is success in MacProcSchUeCfgRsp()", schCfgRsp->crnti);
if(ret == ROK)
{
ret = procMacUeCfgData(pst, ueCfg);
if(ret == ROK)
{
ret = procMacUeCfgData(pst, ueCfg);
@@
-2317,7
+2317,7
@@
uint8_t MacProcSchUeCfgRsp(Pst *pst, SchUeCfgRsp *schCfgRsp)
}
else
{
}
else
{
- DU_LOG("\nMAC: SCH UeReconfigRsp for CRNTI[%d] is failed in MacProcSchUeCfgRsp()", schCfgRsp->crnti);
+ DU_LOG("\n
ERROR -->
MAC: SCH UeReconfigRsp for CRNTI[%d] is failed in MacProcSchUeCfgRsp()", schCfgRsp->crnti);
}
ret = MacSendUeReconfigRsp(result, schCfgRsp);
}
}
ret = MacSendUeReconfigRsp(result, schCfgRsp);
}
@@
-2353,7
+2353,7
@@
uint8_t MacProcUeReconfigReq(Pst *pst, MacUeCfg *ueCfg)
SchUeCfg schUeCfg;
memset(&schUeCfg, 0, sizeof(SchUeCfg));
SchUeCfg schUeCfg;
memset(&schUeCfg, 0, sizeof(SchUeCfg));
- DU_LOG("\nMAC : UE Reconfig Request for CRNTI[%d]", ueCfg->crnti);
+ DU_LOG("\n
INFO -->
MAC : UE Reconfig Request for CRNTI[%d]", ueCfg->crnti);
if(ueCfg)
{
if(ueCfg)
{
@@
-2364,23
+2364,23
@@
uint8_t MacProcUeReconfigReq(Pst *pst, MacUeCfg *ueCfg)
/*Sending Cfg Req to SCH */
ret = fillSchUeCfg(pst, &schUeCfg, ueCfg);
if(ret != ROK)
/*Sending Cfg Req to SCH */
ret = fillSchUeCfg(pst, &schUeCfg, ueCfg);
if(ret != ROK)
- DU_LOG("\nMAC : Failed to fill sch Ue Cfg at MacProcUeReconfigReq()");
+ DU_LOG("\n
ERROR -->
MAC : Failed to fill sch Ue Cfg at MacProcUeReconfigReq()");
else
{
/* Fill event and send UE create request to SCH */
ret = sendUeReqToSch(pst, &schUeCfg);
if(ret != ROK)
else
{
/* Fill event and send UE create request to SCH */
ret = sendUeReqToSch(pst, &schUeCfg);
if(ret != ROK)
- DU_LOG("\nMAC : Failed to send UE Reconfig Request to SCH");
+ DU_LOG("\n
ERROR -->
MAC : Failed to send UE Reconfig Request to SCH");
}
}
else
{
}
}
else
{
- DU_LOG("\nMAC : Failed to store MAC UE Cb ");
+ DU_LOG("\n
ERROR -->
MAC : Failed to store MAC UE Cb ");
}
}
else
{
}
}
else
{
- DU_LOG("\nMAC : MAC UE Create request processing failed");
+ DU_LOG("\n
ERROR -->
MAC : MAC UE Create request processing failed");
ret = RFAILED;
}
/* FREE shared memory */
ret = RFAILED;
}
/* FREE shared memory */