X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2F5gnrrlc%2Fkw_tmr.c;h=3e189d7e70fb2d3d8bb06b7bd4536db43361dc1d;hb=4d45b914f9e94203603d3b9fdbcb1aad361301dd;hp=f050a9589ff8e1de2a43ea231b82b5a2ceffa018;hpb=5625a52ad68f6ad93684e68bbbdbaef0d462cf9a;p=o-du%2Fl2.git diff --git a/src/5gnrrlc/kw_tmr.c b/src/5gnrrlc/kw_tmr.c index f050a9589..3e189d7e7 100755 --- a/src/5gnrrlc/kw_tmr.c +++ b/src/5gnrrlc/kw_tmr.c @@ -38,18 +38,7 @@ static int RLOG_FILE_ID=202; /* 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 */ @@ -63,15 +52,6 @@ static int RLOG_FILE_ID=202; #include "kw_dl.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 */ @@ -125,13 +105,13 @@ PRIVATE Void kwBndTmrExpiry(PTR cb); #ifdef ANSI PUBLIC Void kwStartTmr ( -KwCb *gCb, +RlcCb *gCb, PTR cb, S16 tmrEvnt ) #else PUBLIC Void kwStartTmr (gCb,cb, tmrEvnt) -KwCb *gCb; +RlcCb *gCb; PTR cb; S16 tmrEvnt; #endif @@ -151,7 +131,7 @@ S16 tmrEvnt; { case KW_EVT_UMUL_REORD_TMR: { - KwUmUl* umUl = &(((KwUlRbCb *)cb)->m.umUl); + KwUmUl* umUl = &(((RlcUlRbCb *)cb)->m.umUl); /* kw005.201 Changed wait calculation ccpu00117634*/ KW_TMR_CALCUATE_WAIT(arg.wait, umUl->reOrdTmrInt, gCb->genCfg.timeRes); @@ -161,7 +141,7 @@ S16 tmrEvnt; } case KW_EVT_AMUL_REORD_TMR: { - KwAmUl* amUl = &(((KwUlRbCb *)cb)->m.amUl); + KwAmUl* amUl = &(((RlcUlRbCb *)cb)->m.amUl); /* kw005.201 Changed wait calculation ccpu00117634*/ KW_TMR_CALCUATE_WAIT(arg.wait, amUl->reOrdTmrInt, gCb->genCfg.timeRes); @@ -171,7 +151,7 @@ S16 tmrEvnt; } case KW_EVT_AMUL_STA_PROH_TMR: { - KwAmUl* amUl = &(((KwUlRbCb *)cb)->m.amUl); + KwAmUl* amUl = &(((RlcUlRbCb *)cb)->m.amUl); /* kw005.201 Changed wait calculation ccpu00117634*/ KW_TMR_CALCUATE_WAIT(arg.wait, amUl->staProhTmrInt, @@ -183,7 +163,7 @@ S16 tmrEvnt; } case KW_EVT_AMDL_POLL_RETX_TMR: { - KwAmDl* amDl = &(((KwDlRbCb *)cb)->m.amDl); + KwAmDl* amDl = &(((RlcDlRbCb *)cb)->m.amDl); /* kw005.201 Changed wait calculation ccpu00117634*/ KW_TMR_CALCUATE_WAIT(arg.wait, amDl->pollRetxTmrInt, @@ -251,13 +231,13 @@ S16 tmrEvnt; #ifdef ANSI PUBLIC Void kwStopTmr ( -KwCb *gCb, +RlcCb *gCb, PTR cb, U8 tmrType ) #else PUBLIC Void kwStopTmr (gCb, cb, tmrType) -KwCb *gCb; +RlcCb *gCb; PTR cb; U8 tmrType; #endif @@ -275,25 +255,25 @@ U8 tmrType; { case KW_EVT_UMUL_REORD_TMR: { - arg.timers = &((KwUlRbCb *)cb)->m.umUl.reOrdTmr; + arg.timers = &((RlcUlRbCb *)cb)->m.umUl.reOrdTmr; arg.max = KW_MAX_UM_TMR; break; } case KW_EVT_AMUL_REORD_TMR: { - arg.timers = &((KwUlRbCb *)cb)->m.amUl.reOrdTmr; + arg.timers = &((RlcUlRbCb *)cb)->m.amUl.reOrdTmr; arg.max = KW_MAX_AM_TMR; break; } case KW_EVT_AMUL_STA_PROH_TMR: { - arg.timers = &((KwUlRbCb *)cb)->m.amUl.staProhTmr; + arg.timers = &((RlcUlRbCb *)cb)->m.amUl.staProhTmr; arg.max = KW_MAX_AM_TMR; break; } case KW_EVT_AMDL_POLL_RETX_TMR: { - arg.timers = &((KwDlRbCb *)cb)->m.amDl.pollRetxTmr; + arg.timers = &((RlcDlRbCb *)cb)->m.amDl.pollRetxTmr; arg.max = KW_MAX_AM_TMR; break; } @@ -364,28 +344,28 @@ S16 tmrEvnt; { case KW_EVT_UMUL_REORD_TMR: { - KwUlRbCb *ulRbCb = (KwUlRbCb *)cb; - kwUmmReOrdTmrExp(KW_GET_KWCB(ulRbCb->inst), ulRbCb); + RlcUlRbCb *ulRbCb = (RlcUlRbCb *)cb; + kwUmmReOrdTmrExp(RLC_GET_RLCCB(ulRbCb->inst), ulRbCb); break; } case KW_EVT_AMUL_REORD_TMR: { - KwUlRbCb *ulRbCb = (KwUlRbCb *)cb; - kwAmmReOrdTmrExp(KW_GET_KWCB(ulRbCb->inst), ulRbCb); + RlcUlRbCb *ulRbCb = (RlcUlRbCb *)cb; + kwAmmReOrdTmrExp(RLC_GET_RLCCB(ulRbCb->inst), ulRbCb); break; } case KW_EVT_AMUL_STA_PROH_TMR: { - KwUlRbCb *ulRbCb = (KwUlRbCb *)cb; - kwAmmStaProTmrExp(KW_GET_KWCB(ulRbCb->inst), ulRbCb); + RlcUlRbCb *ulRbCb = (RlcUlRbCb *)cb; + kwAmmStaProTmrExp(RLC_GET_RLCCB(ulRbCb->inst), ulRbCb); break; } case KW_EVT_AMDL_POLL_RETX_TMR: { - KwDlRbCb *dlRbCb = (KwDlRbCb *)cb; - KwCb *gCb = KW_GET_KWCB(dlRbCb->inst); + RlcDlRbCb *dlRbCb = (RlcDlRbCb *)cb; + RlcCb *gCb = RLC_GET_RLCCB(dlRbCb->inst); kwAmmPollRetxTmrExp(gCb, dlRbCb); @@ -422,13 +402,13 @@ S16 tmrEvnt; #ifdef ANSI PUBLIC Bool kwChkTmr ( -KwCb *gCb, +RlcCb *gCb, PTR cb, S16 tmrEvnt ) #else PUBLIC Bool kwChkTmr(gCb,cb, tmrEvnt) -KwCb *gCb; +RlcCb *gCb; PTR cb; S16 tmrEvnt; #endif @@ -439,22 +419,22 @@ S16 tmrEvnt; { case KW_EVT_UMUL_REORD_TMR: { - return (((KwUlRbCb *)cb)->m.umUl.reOrdTmr.tmrEvnt == + return (((RlcUlRbCb *)cb)->m.umUl.reOrdTmr.tmrEvnt == KW_EVT_UMUL_REORD_TMR); } case KW_EVT_AMUL_REORD_TMR: { - return (((KwUlRbCb *)cb)->m.amUl.reOrdTmr.tmrEvnt == + return (((RlcUlRbCb *)cb)->m.amUl.reOrdTmr.tmrEvnt == KW_EVT_AMUL_REORD_TMR); } case KW_EVT_AMUL_STA_PROH_TMR: { - return (((KwUlRbCb *)cb)->m.amUl.staProhTmr.tmrEvnt == + return (((RlcUlRbCb *)cb)->m.amUl.staProhTmr.tmrEvnt == KW_EVT_AMUL_STA_PROH_TMR); } case KW_EVT_AMDL_POLL_RETX_TMR: { - return (((KwDlRbCb *)cb)->m.amDl.pollRetxTmr.tmrEvnt == + return (((RlcDlRbCb *)cb)->m.amDl.pollRetxTmr.tmrEvnt == KW_EVT_AMDL_POLL_RETX_TMR); } case KW_EVT_WAIT_BNDCFM: @@ -467,7 +447,7 @@ S16 tmrEvnt; } } - RETVALUE(FALSE); + return (FALSE); } /** @@ -503,7 +483,7 @@ PTR cb; if (rguSapCb->retryCnt < KW_MAX_SAP_BND_RETRY) { /* start timer to wait for bind confirm */ - kwStartTmr(KW_GET_KWCB(rguSapCb->pst.srcInst), + kwStartTmr(RLC_GET_RLCCB(rguSapCb->pst.srcInst), (PTR)rguSapCb, KW_EVT_WAIT_BNDCFM); @@ -518,7 +498,7 @@ PTR cb; /* Send alarm to the layer manager */ #ifdef LTE_L2_MEAS - kwLmmSendAlarm(KW_GET_KWCB(rguSapCb->pst.srcInst), + kwLmmSendAlarm(RLC_GET_RLCCB(rguSapCb->pst.srcInst), LCM_CATEGORY_INTERFACE, LCM_EVENT_BND_FAIL, LCM_CAUSE_TMR_EXPIRED, @@ -526,7 +506,7 @@ PTR cb; 0, 0); #else - kwLmmSendAlarm(KW_GET_KWCB(rguSapCb->pst.srcInst), + kwLmmSendAlarm(RLC_GET_RLCCB(rguSapCb->pst.srcInst), LCM_CATEGORY_INTERFACE, LCM_EVENT_BND_FAIL, LCM_CAUSE_TMR_EXPIRED,