X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_dl.h;h=45fcc2fc8d833dbe1e53744ab452d53f89d36a06;hb=def50dc175cebc67238db5f1acd5ff322a2279bd;hp=052161fe3d894d63f59c1ce0604c194571a8c544;hpb=5831bf6b3454aa200a92cd3e84209650734e4863;p=o-du%2Fl2.git diff --git a/src/5gnrrlc/kw_dl.h b/src/5gnrrlc/kw_dl.h index 052161fe3..45fcc2fc8 100755 --- a/src/5gnrrlc/kw_dl.h +++ b/src/5gnrrlc/kw_dl.h @@ -34,34 +34,34 @@ #ifndef __KW_DLH__ #define __KW_DLH__ -#define KW_DL_INST 1 -#define KW_MAX_RNG_DEQ_INDX 8 +#define RLC_DL_INST 1 +#define RLC_MAX_RNG_DEQ_INDX 8 /* Below are the status used within RLC */ -#define KW_SDU_OPAT_NOUPDATE 0 -#define KW_SDU_OPAT_UPD_TX 1 -#define KW_SDU_OPAT_UPD_RETX 2 +#define RLC_SDU_OPAT_NOUPDATE 0 +#define RLC_SDU_OPAT_UPD_TX 1 +#define RLC_SDU_OPAT_UPD_RETX 2 /* Below are the status which needs to be updated to MAC */ -#define KW_RGU_SDU_OPAT_NOUPDATE 0 -#define KW_RGU_SDU_OPAT_UPDATE 1 -#define KW_RGU_SDU_OPAT_BREACH 2 +#define RLC_RGU_SDU_OPAT_NOUPDATE 0 +#define RLC_RGU_SDU_OPAT_UPDATE 1 +#define RLC_RGU_SDU_OPAT_BREACH 2 /* PDB Values for various QCI bearers : This value is considered after taking into account a 20ms delay at the network */ -#define KW_PDB_VALUE_FOR_QCI1 80 -#define KW_PDB_VALUE_FOR_QCI2 130 -#define KW_PDB_VALUE_FOR_QCI3 30 -#define KW_PDB_VALUE_FOR_QCI4 280 -#define KW_PDB_VALUE_FOR_QCI5 80 -#define KW_PDB_VALUE_FOR_QCI6 280 -#define KW_PDB_VALUE_FOR_QCI7 80 -#define KW_PDB_VALUE_FOR_QCI8 280 -#define KW_PDB_VALUE_FOR_QCI9 280 +#define RLC_PDB_VALUE_FOR_QCI1 80 +#define RLC_PDB_VALUE_FOR_QCI2 130 +#define RLC_PDB_VALUE_FOR_QCI3 30 +#define RLC_PDB_VALUE_FOR_QCI4 280 +#define RLC_PDB_VALUE_FOR_QCI5 80 +#define RLC_PDB_VALUE_FOR_QCI6 280 +#define RLC_PDB_VALUE_FOR_QCI7 80 +#define RLC_PDB_VALUE_FOR_QCI8 280 +#define RLC_PDB_VALUE_FOR_QCI9 280 -#define KW_DATA_BITMASK 0x80 /* Data bitmask is used to fill D/C bit for data*/ +#define RLC_DATA_BITMASK 0x80 /* Data bitmask is used to fill D/C bit for data*/ /** - * @def KW_MEAS_IS_DL_IP_MEAS_ON_FOR_RB + * @def RLC_MEAS_IS_DL_IP_MEAS_ON_FOR_RB * * This macro is used to check if DL IP throughput measurement is ON * or off for the passed rb @@ -73,85 +73,85 @@ * */ #ifdef LTE_L2_MEAS -#define KW_MEAS_IS_DL_ANY_MEAS_ON_FOR_RB(_gCb, _rbCb) \ +#define RLC_MEAS_IS_DL_ANY_MEAS_ON_FOR_RB(_gCb, _rbCb) \ ((_rbCb->rlcId.rbType == CM_LTE_DRB) && \ - (_gCb->u.dlCb->kwL2Cb.measOn[_rbCb->qci])) + (_gCb->u.dlCb->rlcL2Cb.measOn[_rbCb->qci])) -#define KW_MEAS_IS_DL_IP_MEAS_ON_FOR_RB(_gCb, _rbCb) \ +#define RLC_MEAS_IS_DL_IP_MEAS_ON_FOR_RB(_gCb, _rbCb) \ ((_rbCb->rlcId.rbType == CM_LTE_DRB) && \ - (_gCb->u.dlCb->kwL2Cb.measOn[_rbCb->qci] & LKW_L2MEAS_DL_IP) && \ + (_gCb->u.dlCb->rlcL2Cb.measOn[_rbCb->qci] & LKW_L2MEAS_DL_IP) && \ (_rbCb->rbL2Cb.measOn & LKW_L2MEAS_DL_IP)) -#define KW_MEAS_IS_DL_DELAY_MEAS_ON_FOR_RB(_gCb, _rbCb) \ +#define RLC_MEAS_IS_DL_DELAY_MEAS_ON_FOR_RB(_gCb, _rbCb) \ ((_rbCb->rlcId.rbType == CM_LTE_DRB) && \ - (_gCb->u.dlCb->kwL2Cb.measOn[_rbCb->qci] & LKW_L2MEAS_DL_DELAY)) + (_gCb->u.dlCb->rlcL2Cb.measOn[_rbCb->qci] & LKW_L2MEAS_DL_DELAY)) -#define KW_MEAS_IS_DL_UU_LOSS_MEAS_ON_FOR_RB(_gCb, _rbCb) \ +#define RLC_MEAS_IS_DL_UU_LOSS_MEAS_ON_FOR_RB(_gCb, _rbCb) \ ((_rbCb->rlcId.rbType == CM_LTE_DRB) && \ - (_gCb->u.dlCb->kwL2Cb.measOn[_rbCb->qci] & LKW_L2MEAS_UU_LOSS)) -#define KW_UPD_PDCP_L2_DLDELAY_STS(_rlcCb, _kwRbCb, _delay) \ + (_gCb->u.dlCb->rlcL2Cb.measOn[_rbCb->qci] & LKW_L2MEAS_UU_LOSS)) +#define RLC_UPD_PDCP_L2_DLDELAY_STS(_rlcCb, _rlcRbCb, _delay) \ { \ - if(((_kwRbCb)->rlcId.rbType == CM_LTE_DRB) && \ - ((_rlcCb)->u.dlCb->kwL2Cb.measOn[_kwRbCb->qci] & LKW_L2MEAS_DL_DELAY)) \ + if(((_rlcRbCb)->rlcId.rbType == CM_LTE_DRB) && \ + ((_rlcCb)->u.dlCb->rlcL2Cb.measOn[_rlcRbCb->qci] & LKW_L2MEAS_DL_DELAY)) \ { \ - (_kwRbCb)->rbL2Cb.l2Sts[KW_L2MEAS_DL_DELAY]->dlPjSduDelay.sduDelay += _delay; \ - (_kwRbCb)->rbL2Cb.l2Sts[KW_L2MEAS_DL_DELAY]->dlPjSduDelay.numSdus++; \ + (_rlcRbCb)->rbL2Cb.l2Sts[RLC_L2MEAS_DL_DELAY]->dlPjSduDelay.sduDelay += _delay; \ + (_rlcRbCb)->rbL2Cb.l2Sts[RLC_L2MEAS_DL_DELAY]->dlPjSduDelay.numSdus++; \ } \ } -#define KW_UPD_L2_UU_LOSS_PKTS(_rlcCb, _kwRbCb, _val) \ +#define RLC_UPD_L2_UU_LOSS_PKTS(_rlcCb, _rlcRbCb, _val) \ { \ - if(((_kwRbCb)->rlcId.rbType == CM_LTE_DRB) && \ - ((_rlcCb)->u.dlCb->kwL2Cb.measOn[_kwRbCb->qci] & LKW_L2MEAS_UU_LOSS)) \ + if(((_rlcRbCb)->rlcId.rbType == CM_LTE_DRB) && \ + ((_rlcCb)->u.dlCb->rlcL2Cb.measOn[_rlcRbCb->qci] & LKW_L2MEAS_UU_LOSS)) \ { \ - (_kwRbCb)->rbL2Cb.l2Sts[KW_L2MEAS_UU_LOSS]->uuLoss.dLoss += _val; \ + (_rlcRbCb)->rbL2Cb.l2Sts[RLC_L2MEAS_UU_LOSS]->uuLoss.dLoss += _val; \ } \ } -#define KW_UPD_L2_UU_LOSS_POS_PKTS(_rlcCb,_kwRbCb,_val) \ +#define RLC_UPD_L2_UU_LOSS_POS_PKTS(_rlcCb,_rlcRbCb,_val) \ { \ - if(((_kwRbCb)->rlcId.rbType == CM_LTE_DRB) && \ - ((_rlcCb)->u.dlCb->kwL2Cb.measOn[_kwRbCb->qci] & LKW_L2MEAS_UU_LOSS)) \ + if(((_rlcRbCb)->rlcId.rbType == CM_LTE_DRB) && \ + ((_rlcCb)->u.dlCb->rlcL2Cb.measOn[_rlcRbCb->qci] & LKW_L2MEAS_UU_LOSS)) \ { \ - (_kwRbCb)->rbL2Cb.l2Sts[KW_L2MEAS_UU_LOSS]->uuLoss.posPkts += _val; \ + (_rlcRbCb)->rbL2Cb.l2Sts[RLC_L2MEAS_UU_LOSS]->uuLoss.posPkts += _val; \ } \ } /* Discard new changes starts */ -#define KW_UPD_L2_DL_DISC_SDU_STS(_rlcCb,_kwRbCb) \ +#define RLC_UPD_L2_DL_DISC_SDU_STS(_rlcCb,_rlcRbCb) \ { \ - if(((_kwRbCb)->rlcId.rbType == CM_LTE_DRB) && \ - ((_rlcCb)->u.dlCb->kwL2Cb.measOn[_kwRbCb->qci] & LKW_L2MEAS_DL_DISC)) \ + if(((_rlcRbCb)->rlcId.rbType == CM_LTE_DRB) && \ + ((_rlcCb)->u.dlCb->rlcL2Cb.measOn[_rlcRbCb->qci] & LKW_L2MEAS_DL_DISC)) \ { \ - (_kwRbCb)->rbL2Cb.l2Sts[KW_L2MEAS_DL_DISC]->dlDisc.discSdus++; \ + (_rlcRbCb)->rbL2Cb.l2Sts[RLC_L2MEAS_DL_DISC]->dlDisc.discSdus++; \ } \ } -#define KW_UPD_L2_DL_TOT_SDU_STS(_rlcCb,_kwRbCb) \ +#define RLC_UPD_L2_DL_TOT_SDU_STS(_rlcCb,_rlcRbCb) \ { \ - if(((_kwRbCb)->rlcId.rbType == CM_LTE_DRB) && \ - ((_rlcCb)->u.dlCb->kwL2Cb.measOn[_kwRbCb->qci] & LKW_L2MEAS_DL_DISC)) \ + if(((_rlcRbCb)->rlcId.rbType == CM_LTE_DRB) && \ + ((_rlcCb)->u.dlCb->rlcL2Cb.measOn[_rlcRbCb->qci] & LKW_L2MEAS_DL_DISC)) \ { \ - (_kwRbCb)->rbL2Cb.l2Sts[KW_L2MEAS_DL_DISC]->dlDisc.totSdus++; \ + (_rlcRbCb)->rbL2Cb.l2Sts[RLC_L2MEAS_DL_DISC]->dlDisc.totSdus++; \ } \ } -#define KW_UPD_L2_DECR_NONIP_PER_QCI_RB_COUNT(_rlcCb, _kwRbCb) \ +#define RLC_UPD_L2_DECR_NONIP_PER_QCI_RB_COUNT(_rlcCb, _rlcRbCb) \ { \ - if(((_kwRbCb)->rlcId.rbType == CM_LTE_DRB) && \ - ((_rlcCb)->u.dlCb->kwL2Cb.measOn[_kwRbCb->qci] & LKW_L2MEAS_DL_DISC)) \ + if(((_rlcRbCb)->rlcId.rbType == CM_LTE_DRB) && \ + ((_rlcCb)->u.dlCb->rlcL2Cb.measOn[_rlcRbCb->qci] & LKW_L2MEAS_DL_DISC)) \ { \ - U32 idx1; \ + uint32_t idx1; \ for (idx1 = 0; idx1 < LKW_MAX_L2MEAS; idx1++) \ { \ - if(_rlcCb->u.dlCb->kwL2Cb.kwL2EvtCb[idx1].measCb.measType & LKW_L2MEAS_DL_DISC) \ + if(_rlcCb->u.dlCb->rlcL2Cb.rlcL2EvtCb[idx1].measCb.measType & LKW_L2MEAS_DL_DISC) \ { \ - if(_rlcCb->u.dlCb->kwL2Cb.kwL2EvtCb[idx1].measCb.val.nonIpThMeas.measData[(_kwRbCb)->qci].totDrbsPerQci > 0) \ + if(_rlcCb->u.dlCb->rlcL2Cb.rlcL2EvtCb[idx1].measCb.val.nonIpThMeas.measData[(_rlcRbCb)->qci].totDrbsPerQci > 0) \ { \ - _rlcCb->u.dlCb->kwL2Cb.kwL2EvtCb[idx1].measCb.val.nonIpThMeas.measData[(_kwRbCb)->qci].totDrbsPerQci--; \ - if (_rlcCb->u.dlCb->kwL2Cb.kwL2EvtCb[idx1].measCb.val.nonIpThMeas.measData[(_kwRbCb)->qci].totDrbsPerQci == 0) \ + _rlcCb->u.dlCb->rlcL2Cb.rlcL2EvtCb[idx1].measCb.val.nonIpThMeas.measData[(_rlcRbCb)->qci].totDrbsPerQci--; \ + if (_rlcCb->u.dlCb->rlcL2Cb.rlcL2EvtCb[idx1].measCb.val.nonIpThMeas.measData[(_rlcRbCb)->qci].totDrbsPerQci == 0) \ { \ - _rlcCb->u.dlCb->kwL2Cb.kwL2EvtCb[idx1].measCb.val.nonIpThMeas.qci[(_kwRbCb)->qci] = 0; \ - cmMemset((U8 *)&_rlcCb->u.dlCb->kwL2Cb.kwL2EvtCb[idx1].measCb.val.nonIpThMeas.measData[(_kwRbCb)->qci], 0, \ - sizeof(_rlcCb->u.dlCb->kwL2Cb.kwL2EvtCb[idx1].measCb.val.nonIpThMeas.measData[(_kwRbCb)->qci])); \ + _rlcCb->u.dlCb->rlcL2Cb.rlcL2EvtCb[idx1].measCb.val.nonIpThMeas.qci[(_rlcRbCb)->qci] = 0; \ + memset(&_rlcCb->u.dlCb->rlcL2Cb.rlcL2EvtCb[idx1].measCb.val.nonIpThMeas.measData[(_rlcRbCb)->qci], 0, \ + sizeof(_rlcCb->u.dlCb->rlcL2Cb.rlcL2EvtCb[idx1].measCb.val.nonIpThMeas.measData[(_rlcRbCb)->qci])); \ } \ } \ } \ @@ -159,12 +159,12 @@ } \ } #else -#define KW_UPD_PDCP_L2_DLDELAY_STS(_rlcCb, _kwRbCb, _delay) -#define KW_MEAS_IS_DL_IP_MEAS_ON_FOR_RB(_gCb, _rbCb) -#define KW_MEAS_IS_DL_DELAY_MEAS_ON_FOR_RB(_gCb, _rbCb) -#define KW_UPD_L2_DL_DISC_SDU_STS(_rlcCb,_kwRbCb) -#define KW_UPD_L2_DL_TOT_SDU_STS(_rlcCb, _kwRbCb) -#define KW_UPD_L2_DECR_NONIP_PER_QCI_RB_COUNT(_rlcCb, _kwRbCb) +#define RLC_UPD_PDCP_L2_DLDELAY_STS(_rlcCb, _rlcRbCb, _delay) +#define RLC_MEAS_IS_DL_IP_MEAS_ON_FOR_RB(_gCb, _rbCb) +#define RLC_MEAS_IS_DL_DELAY_MEAS_ON_FOR_RB(_gCb, _rbCb) +#define RLC_UPD_L2_DL_DISC_SDU_STS(_rlcCb,_rlcRbCb) +#define RLC_UPD_L2_DL_TOT_SDU_STS(_rlcCb, _rlcRbCb) +#define RLC_UPD_L2_DECR_NONIP_PER_QCI_RB_COUNT(_rlcCb, _rlcRbCb) #endif