X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fdu_app%2Fdu_mgr_main.c;h=f4791d29ed44998cb65daf0bb8a4fd460073065d;hb=4d45b914f9e94203603d3b9fdbcb1aad361301dd;hp=ceca4ebde8b98342ec1f1b1f4f72d95fa43423d9;hpb=d349ae65e1495488772f87e5cfa1ae71d9eab075;p=o-du%2Fl2.git

diff --git a/src/du_app/du_mgr_main.c b/src/du_app/du_mgr_main.c
index ceca4ebde..f4791d29e 100644
--- a/src/du_app/du_mgr_main.c
+++ b/src/du_app/du_mgr_main.c
@@ -17,16 +17,28 @@
 *******************************************************************************/
 
 /* This file is the entry point for DU APP */
-
+#include "common_def.h"
+#include "lrg.h"
+#include "legtp.h"
+#include "lrg.x"
+#include "lkw.x"
+#include "du_app_mac_inf.h"
+#include "du_app_rlc_inf.h"
+#include "du_cfg.h"
+#include "du_mgr.h"
 #include "du_mgr_main.h"
 #include "du_sctp.h"
+#include "du_egtp.h"
+
+extern uint8_t rlcUlActvTsk (Pst *, Buffer *);
+extern uint8_t rlcUlActvInit (Ent, Inst, Region, Reason);
+extern uint8_t rlcDlActvTsk (Pst *, Buffer *);
+extern uint8_t rlcDlActvInit (Ent, Inst, Region, Reason);
+extern uint8_t rgActvTsk (Pst *, Buffer *);
+extern uint8_t rgActvInit (Ent, Inst, Region, Reason);
 
-extern S16 kwUlActvTsk (Pst *, Buffer *);
-extern S16 kwUlActvInit (Ent, Inst, Region, Reason);
-extern S16 kwDlActvTsk (Pst *, Buffer *);
-extern S16 kwDlActvInit (Ent, Inst, Region, Reason);
-extern S16 rgActvTsk (Pst *, Buffer *);
-extern S16 rgActvInit (Ent, Inst, Region, Reason);
+/* Global variable */
+DuCfgParams duCfgParam;
 
 /*******************************************************************
  *
@@ -45,24 +57,62 @@ extern S16 rgActvInit (Ent, Inst, Region, Reason);
  *         RFAILED - failure
  *
  * ****************************************************************/
-S16 duAppInit(SSTskId sysTskId)
+uint8_t duAppInit(SSTskId sysTskId)
 {
-   /* Register DU APP TAPA Task for DU */
-   if(SRegTTsk((Ent)ENTDUAPP, (Inst)DU_INST, (Ttype)TTNORM, (Prior)PRIOR0,
+	/* Register DU APP TAPA Task for DU */
+	if(ODU_REG_TTSK((Ent)ENTDUAPP, (Inst)DU_INST, (Ttype)TTNORM, (Prior)PRIOR0,
             duActvInit, (ActvTsk)duActvTsk) != ROK)
    {
       return RFAILED;
    }
    /* Attach DU APP TAPA Task for DU */
-   if (SAttachTTsk((Ent)ENTDUAPP, (Inst)0, sysTskId)!= ROK)
+   if (ODU_ATTACH_TTSK((Ent)ENTDUAPP, (Inst)0, sysTskId)!= ROK)
    {
       return RFAILED;
    }
 
-   printf("\nDU APP created and registered \
-         to %d sys task\n", sysTskId);
+   DU_LOG("\nDU_APP : DU APP created and registered \
+   to %d sys task", sysTskId);
    return ROK;
 }
+
+/*******************************************************************
+ *
+ * @brief Initializes EGTP
+ *
+ * @details
+ *
+ *    Function : egtpInit
+ *
+ *    Functionality:
+ *       - Registers and attaches TAPA tasks belonging to 
+ *         DU_APP sys task
+ *
+ * @params[in] system task ID
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t egtpInit(SSTskId sysTskId)
+{
+   /* Register DU APP TAPA Task for DU */
+   if(ODU_REG_TTSK((Ent)ENTEGTP, (Inst)EGTP_INST, (Ttype)TTNORM, (Prior)PRIOR0,
+             egtpActvInit, (ActvTsk)egtpActvTsk) != ROK)
+   {
+      return RFAILED;
+   }
+   /* Attach DU APP TAPA Task for DU */
+   if (ODU_ATTACH_TTSK((Ent)ENTEGTP, (Inst)0, sysTskId)!= ROK)
+   {
+      return RFAILED;
+   }
+ 
+    DU_LOG("\nDU_APP : EGTP created and registered \
+    to %d sys task", sysTskId);
+    return ROK;
+}
+ 
+
 /*******************************************************************
  *
  * @brief Initializes SCTP task
@@ -79,21 +129,21 @@ S16 duAppInit(SSTskId sysTskId)
  *         RFAILED - failure
  *
  * ****************************************************************/
-S16 sctpInit(SSTskId sysTskId)
+uint8_t sctpInit(SSTskId sysTskId)
 {
    /* Register SCTP TAPA Task */
-   if(SRegTTsk((Ent)ENTSCTP, (Inst)0, (Ttype)TTNORM, (Prior)PRIOR0,
+   if(ODU_REG_TTSK((Ent)ENTSCTP, (Inst)0, (Ttype)TTNORM, (Prior)PRIOR0,
             sctpActvInit, (ActvTsk)sctpActvTsk) != ROK)
    {
       return RFAILED;
    }
    /* Attach SCTP TAPA Task */
-   if (SAttachTTsk((Ent)ENTSCTP, (Inst)SCTP_INST, sysTskId)!= ROK)
+   if (ODU_ATTACH_TTSK((Ent)ENTSCTP, (Inst)SCTP_INST, sysTskId)!= ROK)
    {
       return RFAILED;
    }
 
-   printf("\nSCTP TAPA task created and registered to %d sys task\n", 
+   DU_LOG("\nDU_APP : SCTP TAPA task created and registered to %d sys task", 
          sysTskId);
    return ROK;
 }
@@ -113,34 +163,34 @@ S16 sctpInit(SSTskId sysTskId)
  *         RFAILED - failure
  *
  * ****************************************************************/
-S16 rlcDlInit(SSTskId sysTskId)
+uint8_t rlcDlInit(SSTskId sysTskId)
 {
    /* Register RLC DL TAPA Task */
-   if(SRegTTsk((Ent)ENTKW, (Inst)1, (Ttype)TTNORM, (Prior)PRIOR0,
-            kwDlActvInit, (ActvTsk)kwDlActvTsk) != ROK)
+   if(ODU_REG_TTSK((Ent)ENTKW, (Inst)1, (Ttype)TTNORM, (Prior)PRIOR0,
+            rlcDlActvInit, (ActvTsk)rlcDlActvTsk) != ROK)
    {
       return RFAILED;
    }
    /* Attach RLC DL Task */
-   if (SAttachTTsk((Ent)ENTKW, (Inst)1, sysTskId)!= ROK)
+   if (ODU_ATTACH_TTSK((Ent)ENTKW, (Inst)1, sysTskId)!= ROK)
    {
       return RFAILED;
    }
 
    /* Register MAC TAPA Task */
-   if(SRegTTsk((Ent)ENTRG, (Inst)0, (Ttype)TTNORM, (Prior)PRIOR0,
+   if(ODU_REG_TTSK((Ent)ENTRG, (Inst)0, (Ttype)TTNORM, (Prior)PRIOR0,
             rgActvInit, (ActvTsk)rgActvTsk) != ROK)
    {
       return RFAILED;
    }
    /* Attach MAC Task */
-   if (SAttachTTsk((Ent)ENTRG, (Inst)0, sysTskId)!= ROK)
+   if (ODU_ATTACH_TTSK((Ent)ENTRG, (Inst)0, sysTskId)!= ROK)
    {
       return RFAILED;
    }
 
-   printf("\nRLC DL and MAC TAPA task created and registered to \
-         %d sys task\n", sysTskId);
+   DU_LOG("\nDU_APP : RLC DL and MAC TAPA task created and registered to \
+   %d sys task", sysTskId);
    return ROK;
 }
 
@@ -160,21 +210,21 @@ S16 rlcDlInit(SSTskId sysTskId)
  *         RFAILED - failure
  *
  * ****************************************************************/
-S16 rlcUlInit(SSTskId sysTskId)
+uint8_t rlcUlInit(SSTskId sysTskId)
 {
    /* Register RLC UL TAPA Task */
-   if(SRegTTsk((Ent)ENTKW, (Inst)0, (Ttype)TTNORM, (Prior)PRIOR0,
-            kwUlActvInit, (ActvTsk)kwUlActvTsk) != ROK)
+   if(ODU_REG_TTSK((Ent)ENTKW, (Inst)0, (Ttype)TTNORM, (Prior)PRIOR0,
+            rlcUlActvInit, (ActvTsk)rlcUlActvTsk) != ROK)
    {
       return RFAILED;
    }
    /* Attach RLC DL Task */
-   if (SAttachTTsk((Ent)ENTKW, (Inst)0, sysTskId)!= ROK)
+   if (ODU_ATTACH_TTSK((Ent)ENTKW, (Inst)0, sysTskId)!= ROK)
    {
       return RFAILED;
    }
-   printf("\nRLC UL TAPA task created and registered to \
-         %d sys task\n", sysTskId);
+   DU_LOG("\nDU_APP : RLC UL TAPA task created and registered to \
+   %d sys task", sysTskId);
    return ROK;
 }
 
@@ -194,14 +244,14 @@ S16 rlcUlInit(SSTskId sysTskId)
  *         RFAILED - failure
  *
  * ****************************************************************/
-S16 commonInit()
+uint8_t commonInit()
 {
    /* Declare system task Ids */
    SSTskId du_app_stsk, sctp_stsk, rlc_ul_stsk, rlc_mac_cl_stsk;
 
    pthread_attr_t attr;
 
-   SSetProcId(DU_PROC);
+   ODU_SET_PROC_ID(DU_PROC);
 
    /* system task for DU APP */
    SCreateSTsk(PRIOR0, &du_app_stsk);
@@ -220,25 +270,31 @@ S16 commonInit()
    /* Create TAPA tasks */
    if(duAppInit(du_app_stsk) != ROK)
    {
-      printf("\nDU APP TAPA Task initialization failed");
+      DU_LOG("\nDU_APP : DU APP TAPA Task initialization failed");
+      return RFAILED;
+   }
+
+   if(egtpInit(du_app_stsk) != ROK)
+   {
+      DU_LOG("\nDU_APP : EGTP TAPA Task initialization failed");
       return RFAILED;
    }
 
    if(sctpInit(sctp_stsk) != ROK)
    {
-      printf("\nSCTP TAPA Task initialization failed");
+      DU_LOG("\nDU_APP : SCTP TAPA Task initialization failed");
       return RFAILED;
    }
 
    if(rlcDlInit(rlc_mac_cl_stsk) != ROK)
    {
-      printf("\nRLC DL Tapa Task initialization failed");
+      DU_LOG("\nDU_APP : RLC DL Tapa Task initialization failed");
       return RFAILED;
    } 
 
    if(rlcUlInit(rlc_ul_stsk) != ROK)
    {
-     printf("\nRLC UL Tapa Task initialization failed");
+     DU_LOG("\nDU_APP : RLC UL Tapa Task initialization failed");
      return RFAILED;
    } 
    return ROK;
@@ -261,7 +317,7 @@ S16 commonInit()
  *         RFAILED - failure
  *
  * ****************************************************************/
-S16 duInit()
+uint8_t duInit()
 {
    int ret = ROK;
    if(commonInit() != ROK)
@@ -272,6 +328,10 @@ S16 duInit()
    return ret;
 }
 
+void init_log()
+{
+	openlog("ODU",LOG_CONS | LOG_PID | LOG_NDELAY, LOG_LOCAL1);
+}
 /*******************************************************************
  *
  * @brief Entry point for the DU APP 
@@ -289,26 +349,20 @@ S16 duInit()
  *         RFAILED - failure
  *
  * ****************************************************************/
-S16 tst(void)
+uint8_t tst(void)
 {
+	init_log();
 
-   //Initialize TAPA layers
-   if(duInit() != ROK)
-   {
+	//Initialize TAPA layers
+	if(duInit() != ROK)
+	{
       return RFAILED;
    } 
 
+
    //Read all the configs from du_utils.c into duCfgParams
    duReadCfg();
 
-#if 0
-   //Establish SCTP connection
-   while(ret == -1)
-   {
-      printf("\nEstablishing SCTP link with CU... \n");
-      //ret = establishSctp(); //To be implemeted in du_sctp.c
-   }
-#endif
    return ROK;
 }/* end of main()*/