X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Fdu_app_mac_inf.h;h=efb935da6f7910651c84760d2f0d37279a597eb1;hb=53901c3e0222965c2dd8822add20a4fbd3d6a6da;hp=cccce8ee741ae009fda015adac3e923f04d209bd;hpb=ed6746a6081339633c3baa314251fcc11b98ce10;p=o-du%2Fl2.git diff --git a/src/cm/du_app_mac_inf.h b/src/cm/du_app_mac_inf.h index cccce8ee7..efb935da6 100644 --- a/src/cm/du_app_mac_inf.h +++ b/src/cm/du_app_mac_inf.h @@ -21,8 +21,6 @@ #define __MACINT_H__ #define NUM_NUMEROLOGY 5 /* Number of numerology */ -#define MAXIMUM_TDD_PERIODICITY 5 -#define MAX_SYMB_PER_SLOT 14 #define NUM_SSB 1 /* max value is 64 */ #define SSB_MASK_SIZE 1 /* SSB mask size is 32bit for sub6 */ @@ -123,25 +121,6 @@ typedef enum RSSI_UNIT_DBFS }RSSIMeasUnit; -typedef enum -{ - DL_SLOT, - UL_SLOT, - GUARD_SLOT -}SlotConfig; - -typedef enum -{ - TX_PRDCTY_MS_0P5, - TX_PRDCTY_MS_0P625, - TX_PRDCTY_MS_1, - TX_PRDCTY_MS_1P25, - TX_PRDCTY_MS_2, - TX_PRDCTY_MS_2P5, - TX_PRDCTY_MS_5, - TX_PRDCTY_MS_10 -}DlUlTxPeriodicity; - typedef enum { BETA_PSS_0DB, @@ -563,13 +542,6 @@ typedef struct prachCfg uint8_t raRspWindow; /* RA Response Window */ }PrachCfg; -typedef struct tddCfg -{ - bool pres; - DlUlTxPeriodicity tddPeriod; /* DL UL Transmission periodicity */ - SlotConfig slotCfg[MAXIMUM_TDD_PERIODICITY][MAX_SYMB_PER_SLOT]; -}TDDCfg; - typedef struct sib1CellCfg { uint8_t *sib1Pdu; @@ -665,7 +637,9 @@ typedef struct macCellCfg bool freqShft; /* Indicates presence of 7.5kHz frequency shift */ SsbCfg ssbCfg; /* SSB configuration */ PrachCfg prachCfg; /* PRACH Configuration */ +#ifdef NR_TDD TDDCfg tddCfg; /* TDD periodicity and slot configuration */ +#endif RSSIMeasUnit rssiUnit; /* RSSI measurement unit */ Sib1CellCfg sib1Cfg; /* SIB1 config */ BwpDlConfig initialDlBwp; /* Initial DL BWP */