X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_dbm_ul.c;h=a3d1b1056b4de4d7a0073df00ebd030c075d7050;hb=4d45b914f9e94203603d3b9fdbcb1aad361301dd;hp=2cbb236288e8f29e664161b01a8f9ed1596b25a0;hpb=5625a52ad68f6ad93684e68bbbdbaef0d462cf9a;p=o-du%2Fl2.git diff --git a/src/5gnrrlc/kw_dbm_ul.c b/src/5gnrrlc/kw_dbm_ul.c index 2cbb23628..a3d1b1056 100755 --- a/src/5gnrrlc/kw_dbm_ul.c +++ b/src/5gnrrlc/kw_dbm_ul.c @@ -33,18 +33,7 @@ static int RLOG_FILE_ID=194; /* header (.h) include files */ -#include "envopt.h" /* environment options */ -#include "envdep.h" /* environment dependent */ -#include "envind.h" /* environment independent */ - -#include "gen.h" /* general */ -#include "ssi.h" /* system services */ -#include "cm5.h" /* common timer defines */ -#include "cm_tkns.h" /* common tokens defines */ -#include "cm_mblk.h" /* common memory allocation library defines */ -#include "cm_llist.h" /* common link list defines */ -#include "cm_hash.h" /* common hash list defines */ -#include "cm_lte.h" /* common LTE defines */ +#include "common_def.h" #include "lkw.h" /* LKW defines */ #include "ckw.h" /* CKW defines */ #include "kwu.h" /* KWU defines */ @@ -56,16 +45,6 @@ static int RLOG_FILE_ID=194; #include "kw_ul.h" /* extern (.x) include files */ -#include "gen.x" /* general */ -#include "ssi.x" /* system services */ - -#include "cm5.x" /* common timer library */ -#include "cm_tkns.x" /* common tokens */ -#include "cm_mblk.x" /* common memory allocation */ -#include "cm_llist.x" /* common link list */ -#include "cm_hash.x" /* common hash list */ -#include "cm_lte.x" /* common LTE includes */ -#include "cm_lib.x" /* common memory allocation library */ #include "lkw.x" /* LKW */ #include "ckw.x" /* CKW */ #include "kwu.x" /* KWU */ @@ -97,14 +76,14 @@ static int RLOG_FILE_ID=194; #ifdef ANSI PUBLIC S16 kwDbmUlInit ( -KwCb *gCb +RlcCb *gCb ) #else PUBLIC S16 kwDbmUlInit(gCb) -KwCb *gCb; +RlcCb *gCb; #endif { - TRC3(kwUlDbmInit) + TRC3(rlcUlDbmInit) /* Initialize ueCb Hash List */ if(ROK != cmHashListInit(&(gCb->u.ulCb->ueLstCp), @@ -116,7 +95,7 @@ KwCb *gCb; KW_GET_MEM_POOL(gCb))) { RLOG0(L_ERROR, "UeLstCp Initialization Failed"); - RETVALUE(RFAILED); + return RFAILED; } /* Initialize cellCb Hash List */ @@ -130,7 +109,7 @@ KwCb *gCb; { cmHashListDeinit(&gCb->u.ulCb->ueLstCp); RLOG0(L_ERROR, "CellLstCp Initialization Failed"); - RETVALUE(RFAILED); + return RFAILED; } if(ROK != cmHashListInit(&(gCb->u.ulCb->transIdLstCp), @@ -144,7 +123,7 @@ KwCb *gCb; cmHashListDeinit(&gCb->u.ulCb->ueLstCp); cmHashListDeinit(&gCb->u.ulCb->cellLstCp); RLOG0(L_ERROR, "transIdLstCp Initialization Failed"); - RETVALUE(RFAILED); + return RFAILED; } /* kw005.201 added support for L2 Measurement */ @@ -152,7 +131,7 @@ KwCb *gCb; /* Initialize qcI Hash List */ #endif /* LTE_L2_MEAS */ - RETVALUE(ROK); + return ROK; } /* kwDbmUlInit */ @@ -166,11 +145,11 @@ KwCb *gCb; #ifdef ANSI PUBLIC Void kwDbmUlDeInit ( -KwCb *gCb +RlcCb *gCb ) #else PUBLIC Void kwDbmUlDeInit(gCb) -KwCb *gCb; +RlcCb *gCb; #endif { TRC3(kwDbmUlDeInit); @@ -187,7 +166,7 @@ KwCb *gCb; /* kw005.201 added support for L2 Measurement */ #ifdef LTE_L2_MEAS_RLC /* De Initialize qciCb Hash List */ - cmHashListDeinit(&(kwCb.kwL2Cb.qciHlCp)); + cmHashListDeinit(&(rlcCb.kwL2Cb.qciHlCp)); #endif /* LTE_L2_MEAS */ RETVOID; @@ -210,15 +189,15 @@ KwCb *gCb; #ifdef ANSI PUBLIC Void kwDbmFetchUlRbCbByRbId ( -KwCb *gCb, +RlcCb *gCb, CmLteRlcId *rlcId, -KwUlRbCb **rbCb +RlcUlRbCb **rbCb ) #else PUBLIC Void kwDbmFetchUlRbCbByRbId(gCb, rlcId, rbCb) -KwCb *gCb; +RlcCb *gCb; CmLteRlcId *rlcId; -KwUlRbCb **rbCb; +RlcUlRbCb **rbCb; #endif { TRC3(kwDbmFetchUlRbCbByRbId) @@ -228,7 +207,7 @@ KwUlRbCb **rbCb; /* Check for UE CB or CELL CB */ if (rlcId->ueId == 0) { - KwUlCellCb *cellCb; + RlcUlCellCb *cellCb; if(rlcId->rbId >= KW_MAX_RB_PER_CELL) { @@ -254,7 +233,7 @@ KwUlRbCb **rbCb; } else { - KwUlUeCb *ueCb; + RlcUlUeCb *ueCb; if (!(KW_VALIDATE_UE_RBID(rlcId->rbType, rlcId->rbId))) { @@ -300,22 +279,22 @@ KwUlRbCb **rbCb; #ifdef ANSI PUBLIC Void kwDbmFetchUlRbCbFromLchId ( -KwCb *gCb, +RlcCb *gCb, CmLteRnti ueId, CmLteCellId cellId, CmLteLcId lcId, -KwUlRbCb **rbCb +RlcUlRbCb **rbCb ) #else PUBLIC Void kwDbmFetchUlRbCbFromLchId(gCb, ueId, cellId, lcId, rbCb) -KwCb *gCb; +RlcCb *gCb; CmLteRnti ueId; CmLteCellId cellId; CmLteLcId lcId; -KwUlRbCb **rbCb; +RlcUlRbCb **rbCb; #endif { - KwUlUeCb *ueCb; + RlcUlUeCb *ueCb; TRC3(kwDbmFetchUlRbCbFromLchId) @@ -325,7 +304,7 @@ KwUlRbCb **rbCb; /* Check for UE CB or CELL CB */ if (ueId == 0) { - KwUlCellCb *cellCb; + RlcUlCellCb *cellCb; kwDbmFetchUlCellCb(gCb,cellId, &cellCb); if(!cellCb) @@ -366,14 +345,14 @@ KwUlRbCb **rbCb; #ifdef ANSI PUBLIC Void kwDbmDelAllUlRb ( -KwCb *gCb, -KwUlRbCb **rbCbLst, +RlcCb *gCb, +RlcUlRbCb **rbCbLst, U8 numRbCb ) #else PUBLIC Void kwDbmDelAllUlRb(gCb, rbCbLst, numRbCb) -KwCb *gCb; -KwUlRbCb **rbCbLst; +RlcCb *gCb; +RlcUlRbCb **rbCbLst; U8 numRbCb; #endif { @@ -396,7 +375,7 @@ U8 numRbCb; kwAmmFreeUlRbCb(gCb,rbCbLst[idx]); } - KW_FREE (gCb,rbCbLst[idx], sizeof (KwUlRbCb)); + RLC_FREE (gCb,rbCbLst[idx], sizeof (RlcUlRbCb)); } } @@ -409,7 +388,7 @@ U8 numRbCb; * * @details * This function is invoked by CFG to create UeCb and insert into the - * Ue hashlist of KwCb. + * Ue hashlist of RlcCb. * * @param[in] gCb RLC Instance Control Block * @param[in] ueId UE Identifier @@ -424,17 +403,17 @@ U8 numRbCb; #ifdef ANSI PUBLIC S16 kwDbmAddUlUeCb ( -KwCb *gCb, +RlcCb *gCb, CmLteRnti ueId, CmLteCellId cellId, -KwUlUeCb *ueCb +RlcUlUeCb *ueCb ) #else PUBLIC S16 kwDbmAddUlUeCb(gCb, ueId, cellId, ueCb) -KwCb *gCb; +RlcCb *gCb; CmLteRnti ueId; CmLteCellId cellId; -KwUlUeCb *ueCb; +RlcUlUeCb *ueCb; #endif { TRC3(kwDbmAddUlUeCb) @@ -451,13 +430,13 @@ KwUlUeCb *ueCb; RLOG_ARG1(L_ERROR,DBG_CELLID,cellId, "UeId[%u] HashList Insertion Failed", ueId); - RETVALUE(RFAILED); + return RFAILED; } /* kw005.201 ccpu00117318, updating the statistics */ gCb->genSts.numUe++; - RETVALUE(ROK); + return ROK; } @@ -478,13 +457,13 @@ KwUlUeCb *ueCb; #ifdef ANSI PUBLIC S16 kwDbmAddUlTransaction ( -KwCb *gCb, -KwUlCfgTmpData *cfg +RlcCb *gCb, +RlcUlCfgTmpData *cfg ) #else PUBLIC S16 kwDbmAddUlTransaction(gCb, cfg) -KwCb *gCb; -KwUlCfgTmpData *cfg; +RlcCb *gCb; +RlcUlCfgTmpData *cfg; #endif { TRC3(kwDbmAddUlTransaction) @@ -495,7 +474,7 @@ KwUlCfgTmpData *cfg; RLOG1(L_DEBUG, "(transId(%d))", cfg->transId); #endif - RETVALUE(cmHashListInsert(&(gCb->u.ulCb->transIdLstCp), + return (cmHashListInsert(&(gCb->u.ulCb->transIdLstCp), (PTR)cfg, (U8 *)&(cfg->transId), (U16) sizeof(cfg->transId))); @@ -521,15 +500,15 @@ KwUlCfgTmpData *cfg; #ifdef ANSI PUBLIC S16 kwDbmFindUlTransaction ( -KwCb *gCb, +RlcCb *gCb, U32 transId, -KwUlCfgTmpData **cfg +RlcUlCfgTmpData **cfg ) #else PUBLIC S16 kwDbmFindUlTransaction(gCb, cfg) -KwCb *gCb; +RlcCb *gCb; U32 transId; -KwUlCfgTmpData **cfg; +RlcUlCfgTmpData **cfg; #endif { TRC3(kwDbmFindUlTransaction) @@ -540,9 +519,9 @@ KwUlCfgTmpData **cfg; KW_DEF_SEQ_NUM,(PTR *) cfg)) { RLOG1(L_ERROR,"TransId [%ld] not found",transId); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -565,13 +544,13 @@ KwUlCfgTmpData **cfg; #ifdef ANSI PUBLIC S16 kwDbmDelUlTransaction ( -KwCb *gCb, -KwUlCfgTmpData *cfg +RlcCb *gCb, +RlcUlCfgTmpData *cfg ) #else PUBLIC S16 kwDbmDelUlTransaction(gCb, cfg) -KwCb *gCb; -KwUlCfgTmpData *cfg; +RlcCb *gCb; +RlcUlCfgTmpData *cfg; #endif { TRC3(kwDbmDelUlTransaction) @@ -580,10 +559,10 @@ KwUlCfgTmpData *cfg; if(cmHashListDelete(&(gCb->u.ulCb->transIdLstCp),(PTR) (cfg)) != ROK) { RLOG0(L_ERROR,"HashList Deletion failed"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -603,14 +582,14 @@ KwUlCfgTmpData *cfg; #ifdef ANSI PUBLIC S16 kwDbmDelAllUlTransactions ( -KwCb *gCb +RlcCb *gCb ) #else PUBLIC S16 kwDbmDelAllUlTransactions(gCb) -KwCb *gCb; +RlcCb *gCb; #endif { - KwUlCfgTmpData *cfg = NULL; + RlcUlCfgTmpData *cfg = NULL; TRC3(kwDbmDelAllUlTransctions) @@ -621,13 +600,13 @@ KwCb *gCb; { if(kwDbmDelUlTransaction(gCb, cfg) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } cfg = NULLP; } - RETVALUE(ROK); + return ROK; } @@ -636,7 +615,7 @@ KwCb *gCb; * * @details * This function is invoked by CFG to fetch UeCb from the Ue hashlist - * of KwCb. + * of RlcCb. * * @param[in] gCb RLC Instance Control Block * @param[in] ueId UE Identifier @@ -650,23 +629,23 @@ KwCb *gCb; #ifdef ANSI PUBLIC S16 kwDbmFetchUlUeCb ( -KwCb *gCb, +RlcCb *gCb, CmLteRnti ueId, CmLteCellId cellId, -KwUlUeCb **ueCb +RlcUlUeCb **ueCb ) #else PUBLIC S16 kwDbmFetchUlUeCb(gCb,ueId, cellId, ueCb) -KwCb *gCb; +RlcCb *gCb; CmLteRnti ueId; CmLteCellId cellId; -KwUlUeCb **ueCb; +RlcUlUeCb **ueCb; #endif { TRC3(kwDbmFetchUlUeCb) - RETVALUE(cmHashListFind(&(gCb->u.ulCb->ueLstCp), + return (cmHashListFind(&(gCb->u.ulCb->ueLstCp), (U8 *)&(ueId), sizeof(CmLteRnti), KW_DEF_SEQ_NUM, (PTR *) ueCb)); @@ -678,7 +657,7 @@ KwUlUeCb **ueCb; * * @details * This function is invoked by CFG to delete UeCb from the Ue hashlist - * of KwCb. + * of RlcCb. * * * @param[in] gCb RLC Instance Control Block @@ -691,14 +670,14 @@ KwUlUeCb **ueCb; #ifdef ANSI PUBLIC Void kwDbmDelUlUeCb ( -KwCb *gCb, -KwUlUeCb *ueCb, +RlcCb *gCb, +RlcUlUeCb *ueCb, Bool abortFlag ) #else PUBLIC Void kwDbmDelUlUeCb(gCb,eCb, abortFlag) -KwCb *gCb; -KwUlUeCb *ueCb; +RlcCb *gCb; +RlcUlUeCb *ueCb; Bool abortFlag; #endif { @@ -710,7 +689,7 @@ Bool abortFlag; #endif /* (!defined(KW_PDCP) || ! (defined(PJ_SEC_ASYNC) || defined(PJ_CMP_ASYNC)))*/ /* Delete all logical channels */ - KW_MEM_ZERO(ueCb->lCh,sizeof(KwUlLch) * KW_MAX_LCH_PER_UE); + KW_MEM_ZERO(ueCb->lCh,sizeof(RlcUlLch) * KW_MAX_LCH_PER_UE); /* Delete all SRB RbCbs in UeCb */ kwDbmDelAllUlRb(gCb,ueCb->srbCb, KW_MAX_SRB_PER_UE); @@ -728,7 +707,7 @@ Bool abortFlag; /* kw005.201 ccpu00117318, updating the statistics */ gCb->genSts.numUe--; /* Deallocate ueCb */ - KW_FREE(gCb,ueCb, sizeof(KwUlUeCb)); + RLC_FREE(gCb,ueCb, sizeof(RlcUlUeCb)); RETVOID; } @@ -738,7 +717,7 @@ Bool abortFlag; * * @details * This function is invoked by CFG to delete all UeCbs from the Ue - * hashlist of KwCb. + * hashlist of RlcCb. * * @param[in] gCb RLC Instance Control Block * @@ -747,14 +726,14 @@ Bool abortFlag; #ifdef ANSI PUBLIC Void kwDbmDelAllUlUe ( -KwCb *gCb +RlcCb *gCb ) #else PUBLIC Void kwDbmDelAllUlUe(gCb) -KwCb *gCb; +RlcCb *gCb; #endif { - KwUlUeCb *ueCb = NULLP; /* UE Control Block */ + RlcUlUeCb *ueCb = NULLP; /* UE Control Block */ TRC3(kwDbmDelAllUlUe) @@ -778,7 +757,7 @@ KwCb *gCb; * * @details * This function is invoked by CFG to create CellCb and insert into - * the Cell hashlist of KwCb. + * the Cell hashlist of RlcCb. * * @param[in] gCb RLC Instance Control Block * @param[in] cellId Cell Identifier @@ -791,18 +770,18 @@ KwCb *gCb; #ifdef ANSI PUBLIC S16 kwDbmAddUlCellCb ( -KwCb *gCb, +RlcCb *gCb, CmLteCellId cellId, -KwUlCellCb *cellCb +RlcUlCellCb *cellCb ) #else PUBLIC S16 kwDbmAddUlCellCb(gCb, cellId, cellCb) -KwCb *gCb; +RlcCb *gCb; CmLteCellId cellId; -KwUlCellCb *cellCb; +RlcUlCellCb *cellCb; #endif { - KwUlCellCb *tCellCb; + RlcUlCellCb *tCellCb; TRC3(kwDbmAddUlCellCb) @@ -818,10 +797,10 @@ KwUlCellCb *cellCb; { RLOG_ARG0(L_ERROR,DBG_CELLID,tCellCb->cellId, "HashList Insertion Failed"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -830,7 +809,7 @@ KwUlCellCb *cellCb; * * @details * This function is invoked by CFG to fetch UeCb from the Ue hashlist - * of KwCb. + * of RlcCb. * * @param[in] gCb RLC Instance Control Block * @param[in] cellId Cell Identifier @@ -844,15 +823,15 @@ KwUlCellCb *cellCb; #ifdef ANSI PUBLIC Void kwDbmFetchUlCellCb ( -KwCb *gCb, +RlcCb *gCb, CmLteCellId cellId, -KwUlCellCb **cellCb +RlcUlCellCb **cellCb ) #else PUBLIC Void kwDbmFetchUlCellCb(gCb, cellId, cellCb) -KwCb *gCb; +RlcCb *gCb; CmLteCellId cellId; -KwUlCellCb **cellCb; +RlcUlCellCb **cellCb; #endif { TRC3(kwDbmFetchUlCellCb) @@ -875,7 +854,7 @@ KwUlCellCb **cellCb; * * @details * This function is invoked by CFG to delete CellCb from the Cell hashlist - * of KwCb. + * of RlcCb. * * @param[in] gCb RLC Instance Control Block * @param[in] cellCb Cell Control Block @@ -885,13 +864,13 @@ KwUlCellCb **cellCb; #ifdef ANSI PUBLIC Void kwDbmDelUlCellCb ( -KwCb *gCb, -KwUlCellCb *cellCb +RlcCb *gCb, +RlcUlCellCb *cellCb ) #else PUBLIC Void kwDbmDelUlCellCb(gCb, cellCb) -KwCb *gCb; -KwUlCellCb *cellCb; +RlcCb *gCb; +RlcUlCellCb *cellCb; #endif { TRC3(kwDbmDelUlCellCb) @@ -907,7 +886,7 @@ KwUlCellCb *cellCb; "HashList Deletion Failed"); } /* Deallocate cellCb */ - KW_FREE(gCb, cellCb, sizeof(KwUlCellCb)); + RLC_FREE(gCb, cellCb, sizeof(RlcUlCellCb)); RETVOID; } /* kwDbmDelCellCb */ @@ -918,7 +897,7 @@ KwUlCellCb *cellCb; * * @details * This function is invoked by CFG to delete all UeCbs from the Ue - * hashlist of KwCb. + * hashlist of RlcCb. * @param[in] gCb RLC Instance Control Block * * @return Void @@ -926,14 +905,14 @@ KwUlCellCb *cellCb; #ifdef ANSI PUBLIC Void kwDbmDelAllUlCell ( -KwCb *gCb +RlcCb *gCb ) #else PUBLIC Void kwDbmDelAllUlCell(gCb) -KwCb *gCb; +RlcCb *gCb; #endif { - KwUlCellCb *cellCb = NULLP; /* Cell Control Block */ + RlcUlCellCb *cellCb = NULLP; /* Cell Control Block */ TRC3(kwDbmDelAllUlCell) @@ -957,7 +936,7 @@ KwCb *gCb; * * @details * This function is invoked by LMM to delete all UeCbs from the Ue - * hashlist of KwCb and cellCbs from the Cell hashlist of kwCb. + * hashlist of RlcCb and cellCbs from the Cell hashlist of rlcCb. * * @param[in] gCb RLC Instance Control Block * @@ -965,11 +944,11 @@ KwCb *gCb; #ifdef ANSI PUBLIC Void kwDbmUlShutdown ( -KwCb *gCb +RlcCb *gCb ) #else PUBLIC Void kwDbmUlShutdown(gCb) -KwCb *gCb; +RlcCb *gCb; #endif { TRC3(kwDbmUlShutdown)