X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fdu_app%2Fdu_cfg.h;h=6dbee7566ab50063d3ddcb549a4491038d1205e7;hb=18fbca81feebe0cf45f205c1c580c574741292b0;hp=4505daa9cc4ae007898db506931fe905c5e19873;hpb=4251a5e285343f17415ef9898638dd6698ac2345;p=o-du%2Fl2.git diff --git a/src/du_app/du_cfg.h b/src/du_app/du_cfg.h index 4505daa9c..6dbee7566 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_mgr_mac_inf.h" #include "du_log.h" #include "BIT_STRING.h" @@ -118,6 +118,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, @@ -861,6 +872,27 @@ 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 */ @@ -872,8 +904,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