X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fdu_app%2Fdu_cfg.h;h=f7dd4d88f7f16ef69db18231f7c45a04eb84b786;hb=571b7d1991b8ea5cc64a76f38940d5ac9b4b84e2;hp=25be7716bf2ef788a19a8ca3bbc48d6dd0a6f38a;hpb=3a52fbb41a099e37ef072276055cf765828db299;p=o-du%2Fl2.git diff --git a/src/du_app/du_cfg.h b/src/du_app/du_cfg.h index 25be7716b..f7dd4d88f 100644 --- a/src/du_app/du_cfg.h +++ b/src/du_app/du_cfg.h @@ -20,7 +20,7 @@ #define __DU_CONFIG_H__ #include "du_mgr.h" -#include "lcl.h" +#include "du_app_mac_inf.h" #include "du_log.h" #include "BIT_STRING.h" @@ -29,8 +29,10 @@ #define DU_ID 1 #define DU_IP_V4_ADDR "10.0.2.20" #define CU_IP_V4_ADDR "10.0.2.25" +#define RIC_IP_V4_ADDR "10.0.2.30" #define DU_PORT 38472 #define CU_PORT 38472 +#define RIC_PORT 38482 #define DU_EGTP_PORT 39001 #define CU_EGTP_PORT 39002 #define NR_PCI 1 @@ -81,6 +83,9 @@ #define DU_PROC 0 #define DU_INST 0 #define DU_POOL 1 +#define MAX_DU_PORT 2 +#define F1_INTERFACE 0 +#define E2_INTERFACE 1 #define SCTP_INST 0 #define EGTP_INST 0 @@ -832,13 +837,15 @@ typedef struct f1Ipaddr U32 ipV4Addr; }F1IpAddr; -typedef struct f1SctpParams +typedef struct sctpParams { F1IpAddr duIpAddr; - U16 duPort; + U16 duPort[MAX_DU_PORT]; F1IpAddr cuIpAddr; U16 cuPort; -}F1SctpParams; + F1IpAddr ricIpAddr; + U16 ricPort; +}SctpParams; typedef struct f1EgtpParams { @@ -895,7 +902,7 @@ typedef struct sib1Params typedef struct duCfgParams { - F1SctpParams sctpParams; /* SCTP Params */ + SctpParams sctpParams; /* SCTP Params */ F1EgtpParams egtpParams; /* EGTP Params */ U32 maxUe; U32 duId; @@ -904,7 +911,8 @@ typedef struct duCfgParams CellCfgParams cellCfg[DU_MAX_CELLS]; /* Cell info config*/ F1DuSrvdCellInfo srvdCellLst[DU_MAX_CELLS]; /* Serving cell list *///TODO: this must be removed eventually F1RrcVersion rrcVersion; /* RRC version */ - ClCellCfg clCellCfg; /* CL cell configuration */ + + MacCellCfg macCellCfg; /* MAC cell configuration */ MibParams mibParams; /* MIB Params */ Sib1Params sib1Params; /* SIB1 Params */ }DuCfgParams;