X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fdu_app%2Fdu_mgr.h;h=0378748799d8efcd2a561e85f4e71dfbd924f77b;hb=a31737d4988c5e02d4998c16973b1048fa2be9a4;hp=ee9dbbf50eda7937c16b76aa8e79f2d333d5124c;hpb=15c1e4f846f9935150615a5e9e7f94500bd62790;p=o-du%2Fl2.git

diff --git a/src/du_app/du_mgr.h b/src/du_app/du_mgr.h
index ee9dbbf50..037874879 100644
--- a/src/du_app/du_mgr.h
+++ b/src/du_app/du_mgr.h
@@ -75,7 +75,8 @@ typedef enum
 {
    UE_CTXT_UNKNOWN,
    UE_CTXT_SETUP,
-   UE_CTXT_MOD
+   UE_CTXT_MOD,
+   UE_CTXT_RELEASE
 }UeCtxtActionType;
 
 /** F1AP Msg IE **/
@@ -97,6 +98,23 @@ typedef struct f1DlRrcMsg
    uint8_t  *rrcMsgPdu;
 }F1DlRrcMsg;
 
+typedef struct gtpTnlCfg
+{
+   uint32_t ulTnlAddress;  /* remote Address */
+   uint32_t dlTnlAddress;  /* local Address */
+   uint32_t teId;
+}GtpTnlCfg;
+
+typedef struct upTnlCfg
+{
+   ConfigType configType;
+   uint8_t cellId;
+   uint8_t ueIdx;
+   uint8_t drbId;
+   GtpTnlCfg *tnlCfg1; /* Tunnel 1 */
+   GtpTnlCfg *tnlCfg2; /* Tunnel 2 */
+}UpTnlCfg;
+
 typedef struct duUeCfg
 {
    void *cellGrpCfg;
@@ -106,6 +124,8 @@ typedef struct duUeCfg
    uint8_t numMacLcs;        /* Mac Ue Cfg */
    LcCfg   macLcCfg[MAX_NUM_LC];
    AmbrCfg *ambrCfg;
+   uint8_t numDrb;
+   UpTnlCfg upTnlInfo[MAX_NUM_DRB];  /* User plane TNL Info*/
 }DuUeCfg;
 
 typedef struct f1UeContextSetup
@@ -113,6 +133,7 @@ typedef struct f1UeContextSetup
    UeCtxtActionType actionType;
    uint8_t cellIdx;
    DuUeCfg  duUeCfg;        
+   bool     dlRrcMsgPres;
    F1DlRrcMsg  *dlRrcMsg;
 }F1UeContextSetupDb;
 
@@ -143,7 +164,6 @@ typedef struct duCellCb
    CellCfgParams  cellInfo;         /* Cell info */
    /* pointer to store the address of macCellCfg params used to send du-app to MAC */
    MacCellCfg    *duMacCellCfg;
-   bool           firstSlotIndRcvd;
    CellStatus     cellStatus;       /* Cell status */
    uint32_t       numActvUes;       /* Total Active UEs */
    DuUeCb         ueCb[MAX_NUM_UE];  /* UE CONTEXT */
@@ -184,6 +204,8 @@ typedef struct duCb
    DuCellCb*     actvCellLst[MAX_NUM_CELL];    /* List of cells activated/to be activated of type DuCellCb */
    uint32_t       numUe;            /* current number of UEs */
    UeCcchCtxt     ueCcchCtxt[MAX_NUM_UE]; /* mapping of gnbDuUeF1apId to CRNTI required for CCCH processing*/
+   uint8_t       numDrb;           /* current number of DRbs*/
+   UpTnlCfg*     upTnlCfg[MAX_NUM_DRB]; /* tunnel info for every Drb */
 }DuCb;
 
 
@@ -235,13 +257,11 @@ uint8_t duBuildEgtpCfgReq();
 uint8_t duHdlEgtpCfgComplete(CmStatus cfm);
 uint8_t duSendEgtpSrvOpenReq();
 uint8_t duHdlEgtpSrvOpenComplete(CmStatus cfm);
-uint8_t duSendEgtpTnlMgmtReq(uint8_t action, uint32_t lclTeid, uint32_t remTeid);
-uint8_t duHdlEgtpTnlMgmtCfm(EgtpTnlEvt tnlEvtCfm);
-uint8_t duSendEgtpTestData();
+uint8_t duSendEgtpTnlMgmtReq(uint8_t action, uint32_t teIdMod, GtpTnlCfg *tnlInfo);
 uint8_t duSendEgtpDatInd(Buffer *mBuf);
 uint8_t duHdlSchCfgComplete(Pst *pst, RgMngmt *cfm);
-uint8_t duBuildAndSendMacCellStartReq();
-uint8_t duBuildAndSendMacCellStopReq();
+uint8_t duBuildAndSendMacCellStart();
+uint8_t duBuildAndSendMacCellStop(uint16_t cellId);
 #endif
 
 /**********************************************************************