X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcu_stub%2Fcu_stub.h;h=342a680406d28112e6a7bcae6c372693530c58be;hb=efd3fd582205e5c94878e6bcae6d6282dd6f1d25;hp=d87c10c6a1a279ae339db51956131ba0e09abe93;hpb=8660dd47a5ef27b62300fabf6b027852f1d5d026;p=o-du%2Fl2.git

diff --git a/src/cu_stub/cu_stub.h b/src/cu_stub/cu_stub.h
index d87c10c6a..342a68040 100644
--- a/src/cu_stub/cu_stub.h
+++ b/src/cu_stub/cu_stub.h
@@ -19,36 +19,6 @@
 #ifndef __CU_MGR_MAIN_H__
 #define __CU_MGR_MAIN_H__
 
-
-#include "stdio.h"
-#include "stdlib.h"
-#include "string.h"
-#include "stdbool.h"
-#include "ctype.h"
-#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 "ss_queue.h"
-#include "ss_task.h"
-#include "ss_msg.h"
-#include "cm_inet.h"
-#include "cm_llist.h"      /* Common link list  defines  */
-#include "cm_hash.h"       /* Common hashlist  defines */
-
-#include "gen.x"           /* General */
-#include "ssi.x"   /* System services */
-#include "ss_queue.x"
-#include "ss_task.x"
-#include "ss_msg.x"
-#include "cm_lib.x"
-#include "cm_inet.x"
-#include "cm_llist.x"      /* Common link list  defines  */
-#include "cm_hash.x"       /* Common hashlist  defines */
-
-#include "du_log.h"
 #define MAX_IPV6_LEN 16
 #define CU_DU_NAME_LEN_MAX 30      /* Max length of CU/DU name string */
 
@@ -58,75 +28,62 @@
 #define DU_PORT 38472
 
 /* allocate and zero out a static buffer */
-#define CU_ALLOC(_datPtr, _size)                                \
-{                                                               \
-   S16 _ret;                                                    \
+#define CU_ALLOC(_datPtr, _size)                             \
+{                                                            \
+   S16 _ret;                                                 \
    _ret = SGetSBuf(CU_APP_MEM_REG, CU_POOL,                  \
-                     (Data **)&_datPtr, _size);                  \
-   if(_ret == ROK)                                              \
-      cmMemset((U8*)_datPtr, 0, _size);                         \
-   else                                                         \
-      _datPtr = NULLP;                                          \
+                     (Data **)&_datPtr, _size);              \
+   if(_ret == ROK)                                           \
+      memset(_datPtr, 0, _size);                      \
+   else                                                      \
+      _datPtr = NULLP;                                       \
 }
  
 /* free a static buffer */
-#define CU_FREE(_datPtr, _size)                                 \
+#define CU_FREE(_datPtr, _size)                              \
+   if(_datPtr)                                               \
    SPutSBuf(CU_APP_MEM_REG, CU_POOL,                         \
          (Data *)_datPtr, _size);
 
 
 typedef struct ipAddr
 {
- Bool ipV4Pres;
- U32  ipV4Addr;
- Bool ipV6Pres;
- U8   ipV6Addr[MAX_IPV6_LEN];
+ Bool      ipV4Pres;
+ uint32_t  ipV4Addr;
+ Bool      ipV6Pres;
+ uint8_t   ipV6Addr[MAX_IPV6_LEN];
 }SctpIpAddr;
 
 typedef struct RrcVersion
 {
-  U8    rrcVer;     /* Latest RRC Version */
-  U32   extRrcVer;  /* Latest RRC version extended */
+  uint8_t    rrcVer;     /* Latest RRC Version */
+  uint32_t   extRrcVer;  /* Latest RRC version extended */
 }RrcVersion;
 
-typedef struct
-{
-   U8 f1Itf;
-   U8 e2Itf;
-}ItfType;
-
 typedef struct egtpParams
 {
    SctpIpAddr  localIp;
-   U16         localPort;
+   uint16_t    localPort;
    SctpIpAddr  destIp;
-   U16         destPort;
-   U32       minTunnelId;
-   U32       maxTunnelId;
+   uint16_t    destPort;
+   uint32_t    minTunnelId;
+   uint32_t    maxTunnelId;
 }EgtpParams;
 
-typedef struct sctpParamsCu
+typedef struct CuSctpParams
 {
    SctpIpAddr  duIpAddr;
-   U16         duPort;
+   uint16_t    duPort;
    SctpIpAddr  cuIpAddr;
-   U16         cuPort;
-   ItfType     itfType;
-}SctpParamsCu;
-
-typedef struct fPLMN
-{
-   U8 mcc[3];
-   U8 mnc[3];
-}Plmn;
-
+   uint16_t    cuPort;
+}CuSctpParams;
 
 typedef struct cuCfgParams
 {
-   U32              cuId;
+   uint32_t         cuId;
    char             cuName[CU_DU_NAME_LEN_MAX];
-   SctpParamsCu     sctpParams;
-   Plmn            plmn;
+   CuSctpParams     sctpParams;
+   Plmn             plmn;
    EgtpParams       egtpParams;
    RrcVersion       rrcVersion;
 }CuCfgParams;
@@ -135,6 +92,8 @@ CuCfgParams cuCfgParams; //global variable to hold all configs
 void readCuCfg();
 void cuAppInmsgHdlr(Buffer *mBuf);
 void sctpNtfyInd(CmInetSctpNotification *ntfy);
+uint8_t egtpInitReq();
+void *cuConsoleHandler(void *);
 
 #endif