X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fdu_app%2Fdu_cfg.h;h=836eec583c2bf2cb7574e50c17bba92fa87a32c0;hb=refs%2Fchanges%2F69%2F5269%2F9;hp=db3af6d18ab45e4560d9ca503a0348746b07fb81;hpb=6b44407d464a5a4e060999255233a7cfe78bb0fa;p=o-du%2Fl2.git diff --git a/src/du_app/du_cfg.h b/src/du_app/du_cfg.h index db3af6d18..836eec583 100644 --- a/src/du_app/du_cfg.h +++ b/src/du_app/du_cfg.h @@ -43,19 +43,22 @@ #define PLMN_MNC1 8 #define PLMN_MNC2 0 #define PLMN_SIZE 3 -#define NR_DL_ARFCN 385627 -#define NR_UL_ARFCN 386687 + +/* Spec 30.104 Table 5.4.2.3-1:Applicable NR-ARFCN per operating band in FR1 */ +#define NR_DL_ARFCN 428000 +#define NR_UL_ARFCN 390000 #define SUL_ARFCN 100 -#define NR_FREQ_BAND 257 -#define NR_FREQ_BAND_IND 78 +#define NR_FREQ_BAND 1 +#define NR_FREQ_BAND_IND 1 #define SUL_BAND 2 + #define TIME_CFG 0 #define CARRIER_IDX 1 #define NUM_TX_ANT 2 #define NUM_RX_ANT 2 #define FREQ_SHIFT_7P5KHZ FALSE -#define SSB_PBCH_PWR -5 -#define BCH_PAYLOAD MAC_GEN_FULL_PBCH_PAYLD +#define SSB_PBCH_PWR 0 +#define BCH_PAYLOAD PHY_GEN_TIMING_PBCH_BIT #define TOTAL_PRB_BW 106 #define SUBCARRIER_SPACING 0 #define NORMAL_CYCLIC_PREFIX 0 @@ -83,12 +86,12 @@ #define PRACH_CONFIG_IDX 88 #define PRACH_FREQ_START 0 #define PRACH_SEQ_LEN SHORT_SEQUENCE -#define PRACH_SUBCARRIER_SPACING 1 +#define PRACH_SUBCARRIER_SPACING 0 #define PRACH_RESTRICTED_SET_CFG 0 #define NUM_PRACH_FDM 1 -#define ROOT_SEQ_IDX 24 +#define ROOT_SEQ_IDX 0 #define NUM_ROOT_SEQ 1 -#define ZERO_CORRELATION_ZONE_CFG 6 +#define ZERO_CORRELATION_ZONE_CFG 4 #define NUM_UNUSED_ROOT_SEQ 0 #define UNUSED_ROOT_SEQ 1 #define SSB_PER_RACH 1 @@ -194,7 +197,7 @@ /* Macro definitions for F1 procedures */ #define CU_DU_NAME_LEN_MAX 30 /* Max length of CU/DU name string */ #define MAX_F1_CONNECTIONS 65536 /* Max num of F1 connections */ -#define MAX_PLMN 6 /* Max num of broadcast PLMN ids */ +#define MAX_PLMN 1 /* Max num of broadcast PLMN ids */ #define MAXNRARFCN 3279165 /* Maximum values of NRAFCN */ #define MAXNRCELLBANDS 2 /* Maximum number of frequency bands */ #define MAX_NUM_OF_SLICE_ITEMS 1024 /* Maximum number of signalled slice support items */ @@ -232,8 +235,6 @@ #define PHR_PROHIBHIT_TMR 0 #define PHR_PWR_FACTOR_CHANGE 3 #define PHR_MODE_OTHER_CG 0 -#define RLC_LCID 1 -#define SRB_ID_1 1 #define SN_FIELD_LEN 0 #define T_POLL_RETRANSMIT 8 #define POLL_PDU 0 @@ -261,6 +262,14 @@ #define LC_ID 1 #endif +/* MACRO definitions for modulcation order */ +#define MOD_ORDER_QPSK 2 +#define MOD_ORDER_QAM16 4 +#define MOD_ORDER_QAM64 6 +#define MOD_ORDER_QAM256 8 +#define PDSCH_MCS_INDEX 20 /* For 64QAM, valid mcs index: 17-28 in 38.214 - Table 5.1.3.1-1*/ +#define PUSCH_MCS_INDEX 10 /* For 16QAM, valid mcs index: 10-16 in 38.214 - Table 5.1.3.1-1*/ + typedef enum { GNBDU, @@ -801,7 +810,7 @@ typedef struct f1UacAssistInfo }F1UacAssistInfo; /* F1 setup related structures */ - +#if 0 typedef struct f1SetupReq { uint32_t transId; /* Uniquely identify transaction */ @@ -966,6 +975,7 @@ typedef struct f1NwkAccessRateRed uint32_t transId; /* Uniquely identifies transaction */ F1UacAssistInfo uacAssistInfo; /* UAC Assistance Information */ }F1NwkAccessRateRed; +#endif typedef struct f1Ipaddr { @@ -976,11 +986,11 @@ typedef struct f1Ipaddr typedef struct sctpParams { F1IpAddr duIpAddr; - U16 duPort[MAX_DU_PORT]; + uint16_t duPort[MAX_DU_PORT]; F1IpAddr cuIpAddr; - U16 cuPort; + uint16_t cuPort; F1IpAddr ricIpAddr; - U16 ricPort; + uint16_t ricPort; }SctpParams; typedef struct f1EgtpParams @@ -1190,9 +1200,9 @@ typedef struct duCfgParams /*function declarations */ void FillSlotConfig(); -S16 readClCfg(); -S16 readCfg(); -S16 duReadCfg(); +uint8_t readClCfg(); +uint8_t readCfg(); +uint8_t duReadCfg(); uint16_t calcSliv(uint8_t startSymbol, uint8_t lengthSymbol); #endif /* __DU_CONFIG_H__ */