X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=inline;f=src%2Fdu_app%2Fdu_cfg.h;h=1d1ce122e0be88736a7d452262583710648733ea;hb=8660dd47a5ef27b62300fabf6b027852f1d5d026;hp=517ff7e3eb1cb3d6624401f8b194cf157fb3fe7b;hpb=3bc82007f2202c2feb9644137454888ce6e992ed;p=o-du%2Fl2.git

diff --git a/src/du_app/du_cfg.h b/src/du_app/du_cfg.h
index 517ff7e3e..1d1ce122e 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
@@ -118,6 +123,17 @@
 #define MAXNUMOFUACPERPLMN 64       /* Maximum number of signalled categories per PLMN */
 #define DEFAULT_CELLS      1        /* Max num of broadcast PLMN ids */
 
+
+/* Macro definitions for MIB/SIB1 */
+#define SYS_FRAME_NUM 0
+#define SPARE 0
+#define SSB_SC_OFFSET 8
+#define CORESET_ZERO 1
+#define SEARCH_SPACE_ZERO 8
+#define DU_RANAC 1
+#define CELL_IDENTITY 1
+
+
 typedef enum
 {
    GNBDU,
@@ -821,13 +837,22 @@ typedef struct f1Ipaddr
  U32  ipV4Addr; 
 }F1IpAddr;
 
-typedef struct f1SctpParams
+typedef struct
+{
+   U8 f1Itf;
+   U8 e2Itf;
+}ItfType;
+
+typedef struct sctpParams
 {
    F1IpAddr  duIpAddr;
-   U16       duPort;
+   U16       duPort[MAX_DU_PORT];
    F1IpAddr  cuIpAddr;
    U16       cuPort;
-}F1SctpParams;
+   F1IpAddr  ricIpAddr;
+   U16       ricPort;
+   ItfType   itfType;
+}SctpParams;
 
 typedef struct f1EgtpParams
 {
@@ -861,9 +886,30 @@ typedef struct schedulerCfg
    U8         maxDlUePerTti;  /*!< Max number of UE in DL per TTI */
 }SchedulerCfg;
 
+typedef struct mibParams
+{
+	uint8_t sysFrmNum;
+	long    subCarrierSpacingCommon;
+	long    ssb_SubcarrierOffset;
+	long    dmrs_TypeA_Position;
+	long    controlResourceSetZero;
+	long    searchSpaceZero;
+	long    cellBarred;
+	long    intraFreqReselection;
+}MibParams;
+
+typedef struct sib1Params
+{
+	PlmnId    plmn;
+	uint8_t   tac;
+	long      ranac;
+	U8        cellIdentity;
+	long      cellResvdForOpUse;
+}Sib1Params;
+
 typedef struct duCfgParams
 {
-   F1SctpParams       sctpParams;                    /* SCTP Params */
+   SctpParams         sctpParams;                    /* SCTP Params */
    F1EgtpParams       egtpParams;                    /* EGTP Params */
    U32                maxUe;
    U32                duId;
@@ -872,8 +918,10 @@ 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;
 
 typedef struct duCellCb
@@ -884,7 +932,7 @@ typedef struct duCellCb
 }DuCellCb;
 
 /*function declarations */
-void fillSlotConfig();
+void FillSlotConfig();
 S16 readClCfg();
 S16 readCfg();
 S16 duReadCfg();