X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fdu_app%2Fdu_cfg.h;h=584f4c8768ffed80fc7c10ee8075df0ced688d2b;hb=37f19c79962b15d20faa1c8eada1dea28bc5e2a4;hp=8063f6c43e698a3983ef1ac230c80f9a3d3afa36;hpb=5cc86eb25cc33a2cc1472325cffc5634a6c203c6;p=o-du%2Fl2.git diff --git a/src/du_app/du_cfg.h b/src/du_app/du_cfg.h index 8063f6c43..584f4c876 100644 --- a/src/du_app/du_cfg.h +++ b/src/du_app/du_cfg.h @@ -30,8 +30,7 @@ #define RIC_IP_V4_ADDR "192.168.130.80" #define DU_PORT 38472 #define CU_PORT 38472 -#define RIC_PORT 36422 /* using X2 port since E2 port not defined */ - +#define RIC_PORT 36421 #endif #define DU_EGTP_PORT 39001 @@ -66,7 +65,7 @@ #define PLMN_MNC2 0 #define PLMN_SIZE 3 -/* Spec 30.104 Table 5.4.2.3-1:Applicable NR-ARFCN per operating band in FR1 */ +/* Spec 38.104 Table 5.4.2.3-1:Applicable NR-ARFCN per operating band in FR1 */ #define SUL_ARFCN 100 #define SUL_BAND 2 @@ -149,9 +148,10 @@ #define SIB1_VALUE_TAG 10 /* MACRO Ddefine for PDSCH Configuration */ -#define PDSCH_K0 0 -#define PDSCH_START_SYMBOL 2 -#define PDSCH_LENGTH_SYMBOL 12 +#define PDSCH_K0_CFG1 0 +#define PDSCH_K0_CFG2 1 +#define PDSCH_START_SYMBOL 3 +#define PDSCH_LENGTH_SYMBOL 11 #define PDSCH_RES_ALLOC_TYPE 1 /* Resource allocation type */ #define PDSCH_MAX_CODEWORD_SCH_BY_DCI 0 /* Max num of codewords scheduled by DCI */ #define PDSCH_RBG_SIZE 0 /* 0: config1 */ @@ -159,8 +159,8 @@ /* MACRO Define for PUSCH Configuration */ #define PUSCH_K2 3 -#define PUSCH_START_SYMBOL 0 -#define PUSCH_LENGTH_SYMBOL 14 +#define PUSCH_START_SYMBOL 3 +#define PUSCH_LENGTH_SYMBOL 11 #define PUSCH_MSG3_DELTA_PREAMBLE 0 #define PUSCH_P0_NOMINAL_WITH_GRANT -70 @@ -299,6 +299,12 @@ typedef enum GNBCU }F1Entity; +typedef enum +{ + SERV_CELL_TO_MODIFY, + SERV_CELL_TO_DELETE +}ServCellAction; + typedef enum { UNSPECIFIED, @@ -1081,12 +1087,18 @@ typedef struct pdcchCfgCommon long raSearchSpc; /* Id of search space for Random Access proc */ }PdcchCfgCommon; -typedef struct pdschCfgCommon +typedef struct pdschTimeDomainRsrcAlloc { - uint8_t present; long k0; long mapType; /* Mapping Type */ uint16_t sliv; +}PdschTimeDomainRsrcAlloc; + +typedef struct pdschCfgCommon +{ + uint8_t present; + uint8_t numTimeDomRsrcAlloc; + PdschTimeDomainRsrcAlloc timeDomAlloc[MAX_NUM_DL_ALLOC]; }PdschCfgCommon; typedef struct bcchCfg