From: lal.harshita Date: Tue, 15 Mar 2022 11:21:03 +0000 (+0530) Subject: [Epic-ID: ODUHIGH-406][Task-ID: ODUHIGH-428]Slot Indication at DUAPP X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?p=o-du%2Fl2.git;a=commitdiff_plain;h=5bca27d3d33c085718de6e894b875c845d7456d2 [Epic-ID: ODUHIGH-406][Task-ID: ODUHIGH-428]Slot Indication at DUAPP Signed-off-by: lal.harshita Change-Id: Ibaf9bd10d042ed2c59e1cbe830f6c07b87e1b1b3 Signed-off-by: lal.harshita --- diff --git a/src/5gnrmac/mac_slot_ind.c b/src/5gnrmac/mac_slot_ind.c index 1aa842db8..3a3d008d7 100644 --- a/src/5gnrmac/mac_slot_ind.c +++ b/src/5gnrmac/mac_slot_ind.c @@ -314,6 +314,49 @@ int sendCellUpIndMacToDuApp(uint16_t cellId) return ret; } /* sendCellUpIndMacToDuApp */ +/******************************************************************* + * + * @brief Send slot indication to DU APP + * + * @details + * + * Function : sendSlotIndToDuApp + * + * Functionality: + * Send cell up indication to DU APP + * + * @params[in] Cell Up indication info + * @return ROK - success + * RFAILED - failure + * + * ****************************************************************/ +uint8_t sendSlotIndToDuApp(SlotTimingInfo *slotInd) +{ + Pst pst; + uint16_t ret; + SlotTimingInfo *slotIndInfo; + + /* Allocate sharable memory */ + MAC_ALLOC_SHRABL_BUF(slotIndInfo, sizeof(SlotTimingInfo)); + if(!slotIndInfo) + { + DU_LOG("\nERROR --> MAC : Memory allocation failed for slot indication"); + return RFAILED; + } + memcpy(slotIndInfo, slotInd,sizeof(SlotTimingInfo)); + + /* Fill Pst */ + FILL_PST_MAC_TO_DUAPP(pst, EVENT_MAC_SLOT_IND); + + ret = MacDuAppSlotInd(&pst, slotIndInfo); + if(ret != ROK) + { + DU_LOG("\nERROR --> MAC: Failed to send slot up indication to DU APP"); + MAC_FREE_SHRABL_BUF(MAC_MEM_REGION, MAC_POOL, slotIndInfo, sizeof(SlotTimingInfo)); + } + + return ret; +} /******************************************************************* * * @brief Process slot indication at MAC @@ -411,16 +454,25 @@ uint8_t fapiMacSlotInd(Pst *pst, SlotTimingInfo *slotInd) } #endif - /* send slot indication to du app */ + /*First Slot Ind is for CellUp. Any other Slot, will be notified to DUAPP as + * SLOT_IND*/ if(gSlotCount == 1) { + /* send cell up indication to du app */ ret = sendCellUpIndMacToDuApp(slotInd->cellId); - if(ret != ROK) - { - DU_LOG("\nERROR --> MAC :Sending of slot ind msg from MAC to DU APP failed"); - MAC_FREE_SHRABL_BUF(pst->region, pst->pool, slotInd, sizeof(SlotTimingInfo)); - return ret; - } + + } + else + { + /* send slot indication to du app */ + ret = sendSlotIndToDuApp(slotInd); + } + + if(ret != ROK) + { + DU_LOG("\nERROR --> MAC :Sending of slot ind msg from MAC to DU APP failed"); + MAC_FREE_SHRABL_BUF(pst->region, pst->pool, slotInd, sizeof(SlotTimingInfo)); + return ret; } /*stoping Task*/ diff --git a/src/5gnrmac/mac_upr_inf_api.c b/src/5gnrmac/mac_upr_inf_api.c index 6e6b962af..4b1f77637 100644 --- a/src/5gnrmac/mac_upr_inf_api.c +++ b/src/5gnrmac/mac_upr_inf_api.c @@ -30,6 +30,14 @@ DuMacCellUpInd packMacCellUpIndOpts[] = duHandleCellUpInd, packMacCellUpInd }; + +DuMacSlotInd packMacSlotIndOpts[] = +{ + packMacSlotInd, + duHandleSlotInd, + packMacSlotInd +}; + /* Funtion pointer options for stop indication */ DuMacStopInd packMacStopIndOpts[] = { @@ -86,6 +94,26 @@ uint8_t MacDuAppCellUpInd(Pst *pst, OduCellId *cellId) return (*packMacCellUpIndOpts[pst->selector])(pst, cellId); } +/******************************************************************* + * + * @brief Send slot indication to DU APP + * + * @details + * + * Function : MacDuAppSlotInd + * + * Functionality: + * send slot indication to DU APP + * + * @params[in] Post structure pointer, SlotTimingInfo *slotIndInfo + * @return ROK - success + * RFAILED - failure + * + * ****************************************************************/ +uint8_t MacDuAppSlotInd(Pst *pst, SlotTimingInfo *slotIndInfo) +{ + return (*packMacSlotIndOpts[pst->selector])(pst, slotIndInfo); +} /******************************************************************* * * @brief Send stop indication to MAC diff --git a/src/5gnrmac/mac_upr_inf_api.h b/src/5gnrmac/mac_upr_inf_api.h index 1bcd9b920..1b4d1075d 100644 --- a/src/5gnrmac/mac_upr_inf_api.h +++ b/src/5gnrmac/mac_upr_inf_api.h @@ -24,6 +24,7 @@ uint8_t MacDuAppStopInd(Pst *pst, OduCellId *cellId); uint8_t MacDuAppUlCcchInd(Pst *pst, UlCcchIndInfo *ulCcchIndInfo); uint8_t MacSendUlDataToRlc(Pst *pst, RlcData *ulData); uint8_t MacSendSchedResultRptToRlc(Pst *pst, RlcSchedResultRpt *schedRpt); +uint8_t MacDuAppSlotInd(Pst *pst, SlotTimingInfo *slotIndInfo); /********************************************************************** End of file diff --git a/src/5gnrrlc/rlc_msg_hdl.c b/src/5gnrrlc/rlc_msg_hdl.c index 6259ef2a6..9fbb0d7eb 100644 --- a/src/5gnrrlc/rlc_msg_hdl.c +++ b/src/5gnrrlc/rlc_msg_hdl.c @@ -704,7 +704,7 @@ uint8_t RlcProcUeReconfigReq(Pst *pst, RlcUeCfg *ueCfg) uint8_t ret = ROK; RlcCfgInfo *rlcUeCfg = NULLP; //Seed code Rlc cfg struct RlcCb *rlcUeCb = NULLP; - RlcCfgCfmInfo *cfgRsp; + RlcCfgCfmInfo cfgRsp; Pst rspPst; DU_LOG("\nDEBUG --> RLC: UE reconfig request received. CellID[%d] UEID[%d]",ueCfg->cellId, ueCfg->ueId); @@ -724,9 +724,8 @@ uint8_t RlcProcUeReconfigReq(Pst *pst, RlcUeCfg *ueCfg) { DU_LOG("\nERROR --> RLC: Failed to fill configuration at RlcProcUeReconfigReq()"); FILL_PST_RLC_TO_DUAPP(rspPst, RLC_UL_INST, EVENT_RLC_UE_RECONFIG_RSP); - memset(cfgRsp, 0, sizeof(RlcCfgCfmInfo)); - fillRlcCfgFailureRsp(cfgRsp, ueCfg); - SendRlcUeCfgRspToDu(&rspPst, cfgRsp); + fillRlcCfgFailureRsp(&cfgRsp, ueCfg); + SendRlcUeCfgRspToDu(&rspPst, &cfgRsp); } else { diff --git a/src/5gnrsch/sch.h b/src/5gnrsch/sch.h index 5295b0f16..b8258bf6a 100644 --- a/src/5gnrsch/sch.h +++ b/src/5gnrsch/sch.h @@ -436,6 +436,8 @@ void updateBsrAndLcList(CmLListCp *lcLL, BsrInfo *bsrInfo, uint8_t status); /*Paging Functions*/ void schProcPagingCfg(SchCellCb *cell); void schCfgPdcchMonOccOfPO(SchCellCb *cell); +void schIncrSlot(SlotTimingInfo *timingInfo, uint8_t incr, uint16_t numSlotsPerRF); + /********************************************************************** End of file **********************************************************************/ diff --git a/src/cm/common_def.h b/src/cm/common_def.h index aad5bfdae..563cbad33 100644 --- a/src/cm/common_def.h +++ b/src/cm/common_def.h @@ -204,20 +204,6 @@ _isLcidValid = ((_lcId >= SRB0_LCID && _lcId <= MAX_DRB_LCID) ? 1 : 0);\ } -#define GET_PAGING_CYCLE(enmValue, T) { \ - if (enmValue == 0) T = 32; \ - else if (enmValue == 1) T = 64; \ - else if (enmValue == 2) T = 128; \ - else if (enmValue == 3) T = 256; \ - else T = 0; \ -} - -#define GET_NUM_PAGING_OCC(enmValue, PO) { \ - if (enmValue == 0) PO = 4; \ - else if (enmValue == 1) PO = 2; \ - else if (enmValue == 2) PO = 1; \ - else PO = 0; \ -} typedef enum { UE_CFG_INACTIVE, diff --git a/src/cm/du_app_mac_inf.c b/src/cm/du_app_mac_inf.c index 0aa496441..7e2caf123 100644 --- a/src/cm/du_app_mac_inf.c +++ b/src/cm/du_app_mac_inf.c @@ -1498,6 +1498,76 @@ uint8_t unpackDuMacSliceReCfgRsp(MacDuSliceReCfgRspFunc func, Pst *pst, Buffer * ODU_PUT_MSG_BUF(mBuf); return RFAILED; } + +/******************************************************************* + * + * @brief Pack and send Slot ind from MAC to DU APP + * + * @details + * + * Function : packDuMacSliceReCfgRsp + * + * Functionality: + * Pack and send Slot ind from MAC to DU APP + * + * @params[in] Pst *pst, SlotTimingInfo *slotIndInfo + * @return ROK - success + * RFAILED - failure + * + * ****************************************************************/ +uint8_t packMacSlotInd(Pst *pst, SlotTimingInfo *slotIndInfo) +{ + Buffer *mBuf = NULLP; + + if(pst->selector == ODU_SELECTOR_LWLC) + { + if (ODU_GET_MSG_BUF(pst->region, pst->pool, &mBuf) != ROK) + { + DU_LOG("\nERROR --> MAC : Memory allocation failed at packMacSlotInd"); + return RFAILED; + } + /* pack the address of the structure */ + CMCHKPK(oduPackPointer,(PTR)slotIndInfo, mBuf); + } + else + { + DU_LOG("\nERROR --> MAC: Only LWLC supported for packMacSlotInd"); + return RFAILED; + } + + return ODU_POST_TASK(pst,mBuf); +} + +/******************************************************************* + * + * @brief Unpack Slot indication from MAC to DU APP + * + * @details + * + * Function :unpackDuMacSlotInd + * + * Functionality: Unpack Slot Indication from MAC to DU APP + * + * @params[in] DuMacSlotInd func, Pst *pst, Buffer *mBuf + * @return ROK - success + * RFAILED - failure + * + * ****************************************************************/ +uint8_t unpackDuMacSlotInd(DuMacSlotInd func, Pst *pst, Buffer *mBuf) +{ + if(pst->selector == ODU_SELECTOR_LWLC) + { + SlotTimingInfo *slotIndInfo; + + /* unpack the address of the structure */ + CMCHKUNPK(oduUnpackPointer, (PTR *)&slotIndInfo, mBuf); + ODU_PUT_MSG_BUF(mBuf); + return (*func)(pst, slotIndInfo); + } + + ODU_PUT_MSG_BUF(mBuf); + return RFAILED; +} /********************************************************************** End of file **********************************************************************/ diff --git a/src/cm/du_app_mac_inf.h b/src/cm/du_app_mac_inf.h index a29d53d52..098becfb3 100644 --- a/src/cm/du_app_mac_inf.h +++ b/src/cm/du_app_mac_inf.h @@ -79,11 +79,29 @@ #define EVENT_MAC_SLICE_CFG_RSP 217 #define EVENT_MAC_SLICE_RECFG_REQ 218 #define EVENT_MAC_SLICE_RECFG_RSP 219 +#define EVENT_MAC_SLOT_IND 220 #define BSR_PERIODIC_TIMER_SF_10 10 #define BSR_RETX_TIMER_SF_320 320 #define BSR_SR_DELAY_TMR_2560 2560 +#define GET_PAGING_CYCLE(enmValue, T) { \ + if (enmValue == 0) T = 32; \ + else if (enmValue == 1) T = 64; \ + else if (enmValue == 2) T = 128; \ + else if (enmValue == 3) T = 256; \ + else T = 0; \ +} + +#define GET_NUM_PAGING_OCC(enmValue, PO) { \ + if (enmValue == 0) PO = 4; \ + else if (enmValue == 1) PO = 2; \ + else if (enmValue == 2) PO = 1; \ + else PO = 0; \ +} + +#define PAGING_SCHED_DELTA 4 + typedef enum { MAC_DU_APP_RSP_NOK, @@ -1342,6 +1360,11 @@ typedef uint8_t (*DuMacCellUpInd) ARGS(( Pst *pst, OduCellId *cellId )); +/* Functions for slot Ind from MAC to DU APP*/ +typedef uint8_t (*DuMacSlotInd) ARGS(( + Pst *pst, + SlotTimingInfo *slotIndInfo)); + /* Functions for stop Ind from MAC to DU APP*/ typedef uint8_t (*DuMacStopInd) ARGS(( Pst *pst, @@ -1498,6 +1521,9 @@ uint8_t unpackMacSliceReCfgReq(DuMacSliceRecfgReq func, Pst *pst, Buffer *mBuf); uint8_t DuProcMacSliceReCfgRsp(Pst *pst, MacSliceCfgRsp *cfgRsp); uint8_t packDuMacSliceReCfgRsp(Pst *pst, MacSliceCfgRsp *cfgRsp); uint8_t unpackDuMacSliceReCfgRsp(MacDuSliceReCfgRspFunc func, Pst *pst, Buffer *mBuf); +uint8_t duHandleSlotInd(Pst *pst, SlotTimingInfo *slotIndInfo); +uint8_t packMacSlotInd(Pst *pst, SlotTimingInfo *slotIndInfo); +uint8_t unpackDuMacSlotInd(DuMacSlotInd func, Pst *pst, Buffer *mBuf); #endif diff --git a/src/du_app/du_cell_mgr.c b/src/du_app/du_cell_mgr.c index a86d418f2..32e8e7941 100644 --- a/src/du_app/du_cell_mgr.c +++ b/src/du_app/du_cell_mgr.c @@ -158,6 +158,52 @@ uint8_t duGetCellCb(uint16_t cellId, DuCellCb **cellCb) return ROK; } +/***************************************************************** +* @brief Handles slot indication from MAC +* +* @details +* +* Function : duHandleSlotInd +* +* Functionality: +* Handles slot indication from MAC +* +* @params[in] Post structure pointer +* SlotTimingInfo *slotIndInfo +* @return ROK - success +* RFAILED - failure +* +* +*****************************************************************/ +uint8_t duHandleSlotInd(Pst *pst, SlotTimingInfo *slotIndInfo) +{ + uint8_t cellIdx = 0, ret = ROK; + DuCellCb *duCellCb; + + if(slotIndInfo) + { + GET_CELL_IDX(slotIndInfo->cellId, cellIdx); + duCellCb = duCb.actvCellLst[cellIdx]; + + if(duCellCb) + { + duCellCb->currSlotInfo.sfn = slotIndInfo->sfn; + duCellCb->currSlotInfo.slot = slotIndInfo->slot; + } + else + { + DU_LOG("\nERROR --> DU APP : CellId[%d] doesnot exist", slotIndInfo->cellId); + ret = RFAILED; + } + DU_FREE_SHRABL_BUF(pst->region, pst->pool, slotIndInfo, sizeof(SlotTimingInfo)); + } + else + { + DU_LOG("\nERROR --> DU APP : Recevied null pointer from MAC"); + ret = RFAILED; + } + return(ret); +} /******************************************************************* * * @brief Handles cell up indication from MAC diff --git a/src/du_app/du_cfg.c b/src/du_app/du_cfg.c index 9b5db13b0..e54336ebc 100644 --- a/src/du_app/du_cfg.c +++ b/src/du_app/du_cfg.c @@ -366,7 +366,7 @@ uint8_t readMacCfg() duCfgParam.macCellCfg.initialUlBwp.pucchCommon.pucchGroupHopping = PUCCH_GROUP_HOPPING; /* Plmn And SNSSAI Configuration */ - memset(&duCfgParam.macCellCfg.plmnInfoList.plmn, &duCfgParam.srvdCellLst[0].duCellInfo.cellInfo.srvdPlmn[0].plmn,\ + memcpy(&duCfgParam.macCellCfg.plmnInfoList.plmn, &duCfgParam.srvdCellLst[0].duCellInfo.cellInfo.srvdPlmn[0].plmn,\ sizeof(Plmn)); taiSliceSuppLst = &duCfgParam.srvdCellLst[0].duCellInfo.cellInfo.srvdPlmn[0].taiSliceSuppLst; duCfgParam.macCellCfg.plmnInfoList.numSupportedSlice = taiSliceSuppLst->numSupportedSlices; diff --git a/src/du_app/du_e2ap_msg_hdl.c b/src/du_app/du_e2ap_msg_hdl.c index 1f9fd08f6..6c18c3973 100644 --- a/src/du_app/du_e2ap_msg_hdl.c +++ b/src/du_app/du_e2ap_msg_hdl.c @@ -381,7 +381,7 @@ void FreeE2SetupReq(E2AP_PDU_t *e2apMsg) if(e2NodeAddItem->value.choice.E2nodeComponentConfigAddition_Item.e2nodeComponentID.choice.e2nodeComponentInterfaceTypeF1) { DU_FREE(e2NodeAddItem->value.choice.E2nodeComponentConfigAddition_Item.e2nodeComponentID.choice.\ - e2nodeComponentInterfaceTypeF1->gNB_DU_ID.buf,\ + e2nodeComponentInterfaceTypeF1->gNB_DU_ID.buf,\ e2NodeAddItem->value.choice.E2nodeComponentConfigAddition_Item.e2nodeComponentID.choice.\ e2nodeComponentInterfaceTypeF1->gNB_DU_ID.size); DU_FREE(e2NodeAddItem->value.choice.E2nodeComponentConfigAddition_Item.e2nodeComponentID.choice.e2nodeComponentInterfaceTypeF1,\ diff --git a/src/du_app/du_f1ap_msg_hdl.c b/src/du_app/du_f1ap_msg_hdl.c index b175d4a86..45fae51a8 100644 --- a/src/du_app/du_f1ap_msg_hdl.c +++ b/src/du_app/du_f1ap_msg_hdl.c @@ -11356,30 +11356,30 @@ uint8_t extractSrbListToSetup(SRBs_ToBeSetup_List_t *srbCfg, DuUeCfg *ueCfgDb) { srbItem = &srbCfg->list.array[srbIdx]->value.choice.SRBs_ToBeSetup_Item; if(ueCfgDb->numMacLcs > MAX_NUM_LC) - { + { DU_LOG("\nERROR --> F1AP: MAX LC Reached in MAC"); - ret = RFAILED; - break; - } + ret = RFAILED; + break; + } if(ueCfgDb->numRlcLcs > MAX_NUM_LC) - { + { DU_LOG("\nERROR --> F1AP: MAX LC Reached in RLC"); - ret = RFAILED; - break; - } - memset(&ueCfgDb->macLcCfg[ueCfgDb->numMacLcs], 0, sizeof(LcCfg)); - memset(&ueCfgDb->rlcLcCfg[ueCfgDb->numRlcLcs], 0, sizeof(RlcBearerCfg)); + ret = RFAILED; + break; + } + memset(&ueCfgDb->macLcCfg[ueCfgDb->numMacLcs], 0, sizeof(LcCfg)); + memset(&ueCfgDb->rlcLcCfg[ueCfgDb->numRlcLcs], 0, sizeof(RlcBearerCfg)); ret = procSrbListToSetup(srbItem, &ueCfgDb->macLcCfg[ueCfgDb->numMacLcs],\ - &ueCfgDb->rlcLcCfg[ueCfgDb->numRlcLcs]); - ueCfgDb->numRlcLcs++; - ueCfgDb->numMacLcs++; - DU_LOG("\nDEBUG --> DUAPP: extractSrbListToSetup: SRBID: %d [RLC,MAC,NumDrb]:[%x,%x,%x]",\ - srbItem->sRBID, ueCfgDb->numRlcLcs, ueCfgDb->numMacLcs, ueCfgDb->numDrb); - if(ret == RFAILED) - { + &ueCfgDb->rlcLcCfg[ueCfgDb->numRlcLcs]); + ueCfgDb->numRlcLcs++; + ueCfgDb->numMacLcs++; + DU_LOG("\nDEBUG --> DUAPP: extractSrbListToSetup: SRBID: %ld [RLC,MAC,NumDrb]:[%x,%x,%x]",\ + srbItem->sRBID, ueCfgDb->numRlcLcs, ueCfgDb->numMacLcs, ueCfgDb->numDrb); + if(ret == RFAILED) + { DU_LOG("\nERROR --> F1AP: Failed at extractSrbListToSetup()"); - break; - } + break; + } } } else @@ -14948,7 +14948,7 @@ void freeAperDecodeUeContextReleaseCommand(F1AP_PDU_t *f1apMsg) uint8_t procF1UeContextReleaseCommand(F1AP_PDU_t *f1apMsg) { uint8_t ieIdx=0, ret=ROK, ueIdx=0; - uint16_t cellIdx =0, cellId = 0, crnti = 0; + uint16_t cellIdx =0, cellId = 0; bool ueIdxFound = false; uint32_t gnbCuUeF1apId=0, gnbDuUeF1apId=0; DuUeCb *duUeCb = NULLP; @@ -14988,7 +14988,6 @@ uint8_t procF1UeContextReleaseCommand(F1AP_PDU_t *f1apMsg) (duCb.actvCellLst[cellIdx]->ueCb[ueIdx].gnbCuUeF1apId == gnbCuUeF1apId)) { cellId = duCb.actvCellLst[cellIdx]->cellId; - crnti = duCb.actvCellLst[cellIdx]->ueCb[ueIdx].crnti; duUeCb = &duCb.actvCellLst[cellIdx]->ueCb[ueIdx]; ueIdxFound = true; break; diff --git a/src/du_app/du_mgr.h b/src/du_app/du_mgr.h index 795e62717..c91545630 100644 --- a/src/du_app/du_mgr.h +++ b/src/du_app/du_mgr.h @@ -169,6 +169,12 @@ typedef struct duUeCb RlcUeCfg rlcUeCfg; /* Rlc Ue Cfg */ }DuUeCb; +typedef struct slotInfo +{ + uint16_t sfn; + uint16_t slot; +}SlotInfo; + typedef struct duCellCb { uint16_t cellId; /* Internal cell Id */ @@ -178,6 +184,7 @@ typedef struct duCellCb CellStatus cellStatus; /* Cell status */ uint32_t numActvUes; /* Total Active UEs */ DuUeCb ueCb[MAX_NUM_UE]; /* UE CONTEXT */ + SlotInfo currSlotInfo; }DuCellCb; typedef struct duLSapCb diff --git a/src/du_app/du_mgr_msg_router.c b/src/du_app/du_mgr_msg_router.c index 33a8526ff..95aff3e06 100644 --- a/src/du_app/du_mgr_msg_router.c +++ b/src/du_app/du_mgr_msg_router.c @@ -244,6 +244,11 @@ void callFlowduActvTsk(Pst *pst) strcpy(message,"EVENT_MAC_CELL_UP_IND"); break; } + case EVENT_MAC_SLOT_IND: + { + strcpy(message,"EVENT_MAC_SLOT_IND"); + break; + } case EVENT_MAC_STOP_IND: { strcpy(message,"EVENT_MAC_STOP_IND"); @@ -511,6 +516,11 @@ uint8_t duActvTsk(Pst *pst, Buffer *mBuf) ret = unpackMacCellUpInd(duHandleCellUpInd, pst, mBuf); break; } + case EVENT_MAC_SLOT_IND: + { + ret = unpackDuMacSlotInd(duHandleSlotInd, pst, mBuf); + break; + } case EVENT_MAC_STOP_IND: { ret = unpackMacStopInd(duHandleStopInd, pst, mBuf); diff --git a/src/du_app/du_msg_hdl.c b/src/du_app/du_msg_hdl.c index c1826e1e4..bb3c69c09 100644 --- a/src/du_app/du_msg_hdl.c +++ b/src/du_app/du_msg_hdl.c @@ -344,7 +344,6 @@ uint8_t duBuildRlcUsapCfg(uint8_t elemId, Ent ent, Inst inst) uint8_t duProcCfgComplete() { uint8_t ret = ROK; - uint16_t cellId = 0; uint16_t idx; for(idx=0; idx< DEFAULT_CELLS; idx++) { @@ -2168,8 +2167,9 @@ uint8_t DuProcRlcSliceMetrics(Pst *pst, SlicePmList *sliceStats) for(sliceRecord = 0; sliceRecord < sliceStats->numSlice; sliceRecord++) { - DU_LOG("\nINFO --> DU_APP: SliceIndx:%d, DlTput %.5lf, UlTput:%.5lf", sliceStats->sliceRecord[sliceRecord].networkSliceIdentifier,\ - sliceStats->sliceRecord[sliceRecord].ThpDl, sliceStats->sliceRecord[sliceRecord].ThpUl); + DU_LOG("\nINFO --> DU_APP: SliceId[SST-SD]:%d-%d, DlTput %.5lf, UlTput:%.5lf", sliceStats->sliceRecord[sliceRecord].networkSliceIdentifier.sst,\ + sliceStats->sliceRecord[sliceRecord].networkSliceIdentifier.sd,sliceStats->sliceRecord[sliceRecord].ThpDl,\ + sliceStats->sliceRecord[sliceRecord].ThpUl); } #ifdef O1_ENABLE if(sliceStats) diff --git a/src/du_app/du_sctp.c b/src/du_app/du_sctp.c index 96f7adab1..0f86d6485 100644 --- a/src/du_app/du_sctp.c +++ b/src/du_app/du_sctp.c @@ -78,7 +78,7 @@ uint8_t sctpActvInit(Ent entity, Inst inst, Region region, Reason reason) * * @return void ***************************************************************************/ -uint8_t callFlowSctpActvTsk(Pst *pst) +void callFlowSctpActvTsk(Pst *pst) { char sourceTask[50]; char destTask[50]="ENTSCTP";