X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Frlc_utils.h;h=1fd31eeb47c268e6118f0ceecf254ef902681e37;hb=2aa3cc7f94edf59f4fdb04ad81c7a14322bde00e;hp=092dcd628ad1a2bdf308a558d3d937df14838ce7;hpb=e698840bb6fcecc68be5b1d1fd17436bd1d5e83f;p=o-du%2Fl2.git diff --git a/src/5gnrrlc/rlc_utils.h b/src/5gnrrlc/rlc_utils.h index 092dcd628..1fd31eeb4 100755 --- a/src/5gnrrlc/rlc_utils.h +++ b/src/5gnrrlc/rlc_utils.h @@ -39,6 +39,7 @@ extern "C" { #endif /* __cplusplus */ #include "du_log.h" +#include "du_app_rlc_inf.h" #define EKWxxx 1 @@ -1115,7 +1116,6 @@ do \ #define RLC_DL_INST 1 #define PDCP_SN 1 -#define RLC_REASSEMBLY_TMR_BASE 5 /* Used to calculate timer value from enum values */ /* Fill Pst structure for sending msg from RLC to DUAPP */ #define FILL_PST_RLC_TO_DUAPP(_pst, _srcInst, _event) \ @@ -1708,13 +1708,6 @@ typedef struct rlcUlCb #endif /* LTE_L2_MEAS */ }RlcUlCb; -typedef enum -{ - SEARCH, - CREATE, - DELETE -}RlcSnssaiActionType; - typedef struct rlcThptPerUe { uint16_t ueId; @@ -1725,13 +1718,15 @@ typedef struct rlcTptPerSnssai { Snssai *snssai; uint64_t dataVol; + double tpt; }RlcTptPerSnssai; typedef struct rlcSnssaiTputInfo { CmTimer snssaiThptTmr; /* Throughput Timer */ - CmLListCp *tputPerSnssaiList; + CmLListCp *dlTputPerSnssaiList; + CmLListCp *ulTputPerSnssaiList; }RlcSnssaiTputInfo; typedef struct rlcUeTputInfo @@ -1786,6 +1781,7 @@ typedef struct rlcCb RlcCb *rlcCb[MAX_RLC_INSTANCES]; /*!< RLC global control block */ +CmLListCp *arrTputPerSnssai[DIR_BOTH]; /*Stores the address of Througput LL*/ /**************************************************************************** * Declarations ***************************************************************************/ @@ -1807,9 +1803,12 @@ uint8_t rlcUeDeleteTmrExpiry(PTR cb); void rlcSnssaiThptTmrExpiry(PTR cb); RlcTptPerSnssai* rlcHandleSnssaiTputlist(RlcCb *gCb, Snssai *snssai,\ - RlcSnssaiActionType action); -void rlcCalculateTputPerSnssai(CmLListCp *snssaiList); -void rlcDelTputSnssaiList(RlcCb *gCb); + ActionTypeLL action, Direction dir); +uint8_t rlcCalculateTputPerSnssai(CmLListCp *snssaiList, Direction dir); +uint8_t rlcDelTputSnssaiList(RlcCb *gCb, Direction dir); +uint8_t BuildSliceReportToDu(uint8_t snssaiCnt); +bool rlcFindSliceEntry(SliceIdentifier snssaiVal, uint8_t *snssaiIdx,\ + SlicePmList *sliceStats); #ifdef LTE_L2_MEAS Void rlcLmmSendAlarm ARGS (( RlcCb *gCb,