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
[Epic-ID: ODUHIGH-463][Task-ID: ODUHIGH-496] Create setup with 2 GNB with SCTP associ...
[o-du/l2.git]
/
src
/
du_app
/
du_cell_mgr.c
diff --git
a/src/du_app/du_cell_mgr.c
b/src/du_app/du_cell_mgr.c
index
bb1c8ea
..
ee1c4f6
100644
(file)
--- a/
src/du_app/du_cell_mgr.c
+++ b/
src/du_app/du_cell_mgr.c
@@
-212,7
+212,7
@@
uint8_t checkPagingRecord(DuCellCb *cellCb)
/*No Page is present for pf thus exiting*/
return ROK;
}
/*No Page is present for pf thus exiting*/
return ROK;
}
-
+
do
{
pagInfo = handlePageInfoLL(pf, NULLD, &(pagInfoLLFromPF->pagInfoList), TRAVERSE_ALL);
do
{
pagInfo = handlePageInfoLL(pf, NULLD, &(pagInfoLLFromPF->pagInfoList), TRAVERSE_ALL);
@@
-246,13
+246,13
@@
uint8_t checkPagingRecord(DuCellCb *cellCb)
*
* Functionality: Send pcch indication to MAC
*
*
* Functionality: Send pcch indication to MAC
*
- * @Params[in]
Mac
PcchInd *pcchInd
+ * @Params[in]
Dl
PcchInd *pcchInd
* @return ROK - success
* RFAILED - failure
*
* ****************************************************************/
* @return ROK - success
* RFAILED - failure
*
* ****************************************************************/
-uint8_t sendDlPcchIndToMac(
Mac
PcchInd *pcchInd)
+uint8_t sendDlPcchIndToMac(
Dl
PcchInd *pcchInd)
{
uint8_t ret = ROK;
Pst pst;
{
uint8_t ret = ROK;
Pst pst;
@@
-262,8
+262,6
@@
uint8_t sendDlPcchIndToMac(MacPcchInd *pcchInd)
/* Fill Pst */
FILL_PST_DUAPP_TO_MAC(pst, EVENT_MAC_DL_PCCH_IND);
/* Fill Pst */
FILL_PST_DUAPP_TO_MAC(pst, EVENT_MAC_DL_PCCH_IND);
- DU_LOG("\nDEBUG --> DU_APP: Sending DL PCCH indication to MAC for cellId[%d] at PF[%d]",\
- pcchInd->cellId, pcchInd->pf);
ret = (*packMacDlPcchIndOpts[pst.selector])(&pst, pcchInd);
if(ret == RFAILED)
{
ret = (*packMacDlPcchIndOpts[pst.selector])(&pst, pcchInd);
if(ret == RFAILED)
{
@@
-272,7
+270,7
@@
uint8_t sendDlPcchIndToMac(MacPcchInd *pcchInd)
}
else
{
}
else
{
- DU_LOG("\nERROR --> DU
_
APP: sendDlPcchIndToMac(): Received pcchInd is NULLP");
+ DU_LOG("\nERROR --> DU
APP: sendDlPcchIndToMac(): Received pcchInd is NULLP");
ret = RFAILED;
}
return ret;
ret = RFAILED;
}
return ret;
@@
-362,8
+360,8
@@
uint8_t duHandleCellUpInd(Pst *pst, OduCellId *cellId)
cellCb->cellStatus = ACTIVATED;
gCellStatus = CELL_UP;
cellCb->cellStatus = ACTIVATED;
gCellStatus = CELL_UP;
- if(duCfgParam.tempSliceCfg.
r
rmPolicy)
- BuildAndSendSliceConfigReq(
duCfgParam.tempSliceCfg.rrmPolicy, duCfgParam.tempSliceCfg.totalRrmPolicy, duCfgParam.tempSliceCfg.totalSliceCount
);
+ if(duCfgParam.tempSliceCfg.
numOfR
rmPolicy)
+ BuildAndSendSliceConfigReq();
#ifdef O1_ENABLE
DU_LOG("\nINFO --> DU APP : Raise cell UP alarm for cell id=%d", cellId->cellId);
raiseCellAlrm(CELL_UP_ALARM_ID, cellId->cellId);
#ifdef O1_ENABLE
DU_LOG("\nINFO --> DU APP : Raise cell UP alarm for cell id=%d", cellId->cellId);
raiseCellAlrm(CELL_UP_ALARM_ID, cellId->cellId);
@@
-475,9
+473,9
@@
uint8_t sendCellDeleteReqToMac(uint16_t cellId)
{
Pst pst;
uint8_t ret=ROK;
{
Pst pst;
uint8_t ret=ROK;
- MacCellDelete *cellDelete = NULLP;
+ MacCellDelete
Req
*cellDelete = NULLP;
- DU_ALLOC_SHRABL_BUF(cellDelete, sizeof(MacCellDelete));
+ DU_ALLOC_SHRABL_BUF(cellDelete, sizeof(MacCellDelete
Req
));
if(cellDelete)
{
cellDelete->cellId = cellId;
if(cellDelete)
{
cellDelete->cellId = cellId;
@@
-489,7
+487,7
@@
uint8_t sendCellDeleteReqToMac(uint16_t cellId)
if(ret == RFAILED)
{
DU_LOG("\nERROR --> DU APP : sendCellDeleteReqToMac(): Failed to send Cell delete Req to MAC");
if(ret == RFAILED)
{
DU_LOG("\nERROR --> DU APP : sendCellDeleteReqToMac(): Failed to send Cell delete Req to MAC");
- DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, cellDelete, sizeof(MacCellDelete));
+ DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, cellDelete, sizeof(MacCellDelete
Req
));
}
}
else
}
}
else
@@
-626,7
+624,7
@@
uint8_t BuildAndSendDlPcchIndToMac(uint16_t cellId, uint16_t pf, uint8_t i_s, Cm
PCCH_Message_t *pcchMsg = NULLP;
asn_enc_rval_t encRetVal;
PagingRrc_t *pagingMsg = NULLP;
PCCH_Message_t *pcchMsg = NULLP;
asn_enc_rval_t encRetVal;
PagingRrc_t *pagingMsg = NULLP;
-
Mac
PcchInd *macPcchInd = NULLP;
+
Dl
PcchInd *macPcchInd = NULLP;
uint8_t recordIdx = 0, ret = RFAILED;
/*As per 38.473 Sec 9.3.1.39,5G-S-TMSI :48 Bits >> Bytes and 0 UnusedBits */
uint8_t recordIdx = 0, ret = RFAILED;
/*As per 38.473 Sec 9.3.1.39,5G-S-TMSI :48 Bits >> Bytes and 0 UnusedBits */
@@
-731,7
+729,7
@@
uint8_t BuildAndSendDlPcchIndToMac(uint16_t cellId, uint16_t pf, uint8_t i_s, Cm
memset(encBuf, 0, ENC_BUF_MAX_LEN);
encBufSize = 0;
/* Encode the PCCH RRC PDU as APER */
memset(encBuf, 0, ENC_BUF_MAX_LEN);
encBufSize = 0;
/* Encode the PCCH RRC PDU as APER */
- encRetVal =
a
per_encode(&asn_DEF_PCCH_Message, 0, pcchMsg, PrepFinalEncBuf,\
+ encRetVal =
u
per_encode(&asn_DEF_PCCH_Message, 0, pcchMsg, PrepFinalEncBuf,\
encBuf);
if(encRetVal.encoded == ENCODE_FAIL)
encBuf);
if(encRetVal.encoded == ENCODE_FAIL)
@@
-744,7
+742,7
@@
uint8_t BuildAndSendDlPcchIndToMac(uint16_t cellId, uint16_t pf, uint8_t i_s, Cm
{
DU_LOG("\nDEBUG --> F1AP : Created APER encoded buffer for RRC PDU for Pcch indication \n");
{
DU_LOG("\nDEBUG --> F1AP : Created APER encoded buffer for RRC PDU for Pcch indication \n");
- DU_ALLOC_SHRABL_BUF(macPcchInd, sizeof(
Mac
PcchInd));
+ DU_ALLOC_SHRABL_BUF(macPcchInd, sizeof(
Dl
PcchInd));
if(macPcchInd == NULLP)
{
DU_LOG("\nERROR --> DU APP: BuildAndSendDlPcchIndToMac(); (macPcchInd) Memory Alloction failed!");
if(macPcchInd == NULLP)
{
DU_LOG("\nERROR --> DU APP: BuildAndSendDlPcchIndToMac(); (macPcchInd) Memory Alloction failed!");
@@
-766,7
+764,7
@@
uint8_t BuildAndSendDlPcchIndToMac(uint16_t cellId, uint16_t pf, uint8_t i_s, Cm
if(ret != ROK)
{
DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, macPcchInd->pcchPdu, macPcchInd->pduLen);
if(ret != ROK)
{
DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, macPcchInd->pcchPdu, macPcchInd->pduLen);
- DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, macPcchInd, sizeof(
Mac
PcchInd));
+ DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, macPcchInd, sizeof(
Dl
PcchInd));
break;
}
}
break;
}
}
@@
-1012,7
+1010,6
@@
uint8_t calcAndFillPagingInfoInCellCb(DuCellCb* cellCb, DuPagingMsg *rcvdF1apPag
rcvdF1apPagingParam->pagingFrame = (sfn % MAX_SFN);
rcvdF1apPagingParam->i_s = ((uint32_t)(floor(rcvdF1apPagingParam->pagUeId / N)) % ns);
rcvdF1apPagingParam->pagingFrame = (sfn % MAX_SFN);
rcvdF1apPagingParam->i_s = ((uint32_t)(floor(rcvdF1apPagingParam->pagUeId / N)) % ns);
- DU_LOG("\nINFO --> DU APP : Successfully filled paging parameter in DuCellCb");
memcpy(&cellCb->tmpPagingInfoOfUe, rcvdF1apPagingParam, sizeof(DuPagingMsg));
}
else
memcpy(&cellCb->tmpPagingInfoOfUe, rcvdF1apPagingParam, sizeof(DuPagingMsg));
}
else