Merge "Documentation fixes"

[o-du/l2.git] / src / cm / du_app_mac_inf.h

diff --git a/src/cm/du_app_mac_inf.h b/src/cm/du_app_mac_inf.h
index 6d30e3e..8a927fa 100644 (file)
--- a/src/cm/du_app_mac_inf.h
+++ b/src/cm/du_app_mac_inf.h
@@ -66,11 +66,15 @@
 #define EVENT_MAC_STOP_IND           205
 #define EVENT_MAC_UL_CCCH_IND        206
 #define EVENT_MAC_DL_CCCH_IND        207
-#define EVENT_MAC_UE_CONFIG_REQ      208
-#define EVENT_MAC_UE_CONFIG_RSP      209
+#define EVENT_MAC_UE_CREATE_REQ      208
+#define EVENT_MAC_UE_CREATE_RSP      209
 #define EVENT_MAC_UE_RECONFIG_REQ    210
 #define EVENT_MAC_UE_RECONFIG_RSP    211
 
+#define BSR_PERIODIC_TIMER_SF_10 10
+#define BSR_RETX_TIMER_SF_320 320
+#define BSR_SR_DELAY_TMR_2560 2560
+
 typedef enum
 {
    MAC_DU_APP_RSP_NOK,
@@ -190,57 +194,6 @@ typedef enum
    TIME_ALIGNMENT_TIMER_INFINITY
 }TimeAlignmentTimer;
 
-typedef enum
-{
-   BSR_PERIODIC_TIMER_SF_1,
-   BSR_PERIODIC_TIMER_SF_5,
-   BSR_PERIODIC_TIMER_SF_10,
-   BSR_PERIODIC_TIMER_SF_16,
-   BSR_PERIODIC_TIMER_SF_20,
-   BSR_PERIODIC_TIMER_SF_32,
-   BSR_PERIODIC_TIMER_SF_40,
-   BSR_PERIODIC_TIMER_SF_64,
-   BSR_PERIODIC_TIMER_SF_80,
-   BSR_PERIODIC_TIMER_SF_128,
-   BSR_PERIODIC_TIMER_SF_160,
-   BSR_PERIODIC_TIMER_SF_320,
-   BSR_PERIODIC_TIMER_SF_640,
-   BSR_PERIODIC_TIMER_SF_1280,
-   BSR_PERIODIC_TIMER_SF_2560,
-   BSR_PERIODIC_TIMER_INFINITY
-}BsrPeriodicTimer;
-
-typedef enum
-{
-   BSR_RETX_TIMER_SF_10,
-   BSR_RETX_TIMER_SF_20,
-   BSR_RETX_TIMER_SF_40,
-   BSR_RETX_TIMER_SF_80,
-   BSR_RETX_TIMER_SF_160,
-   BSR_RETX_TIMER_SF_320,
-   BSR_RETX_TIMER_SF_640,
-   BSR_RETX_TIMER_SF_1280,
-   BSR_RETX_TIMER_SF_2560,
-   BSR_RETX_TIMER_SF_5120,
-   BSR_RETX_TIMER_SF_10240,
-   BSR_RETX_TIMER_SPARE_5,
-   BSR_RETX_TIMER_SPARE_4,
-   BSR_RETX_TIMER_SPARE_3,
-   BSR_RETX_TIMER_SPARE_2,
-   BSR_RETX_TIMER_SPARE_1
-}BsrReTxTimer;
-
-typedef enum
-{
-   BSR_SR_DELAY_TMR_20,
-   BSR_SR_DELAY_TMR_40,
-   BSR_SR_DELAY_TMR_64,
-   BSR_SR_DELAY_TMR_128,
-   BSR_SR_DELAY_TMR_512,
-   BSR_SR_DELAY_TMR_1024,
-   BSR_SR_DELAY_TMR_2560,
-   BSR_SR_DELAY_TMR_SPARE_1
-}BsrSrDelayTimer;
 typedef enum
 {
    PHR_PERIODIC_TIMER_SF_10,
@@ -542,7 +495,7 @@ typedef struct failureCause
 typedef struct carrierCfg
 {
    bool  pres;
-   uint16_t   bw;             /* DL/UL bandwidth */
+   uint32_t   bw;             /* DL/UL bandwidth */
    uint32_t   freq;           /* Absolute frequency of DL/UL point A in KHz */
    uint16_t   k0[NUM_NUMEROLOGY];          /* K0 for DL/UL */
    uint16_t   gridSize[NUM_NUMEROLOGY];    /* DL/UL Grid size for each numerologies */
@@ -687,7 +640,6 @@ typedef struct bwpUlConfig
 typedef struct macCellCfg
 {
    uint16_t            cellId;           /* Cell Id */
-   uint8_t             numTlv;           /* Number of configuration TLVs */
    uint8_t             carrierId;        /* Carrired Index */
    uint16_t            phyCellId;        /* Physical cell id */
    DuplexMode     dupType;          /* Duplex type: TDD/FDD */
@@ -739,9 +691,9 @@ typedef struct dlCcchInd
 
 typedef struct bsrTmrCfg
 {
-   BsrPeriodicTimer periodicTimer;
-   BsrReTxTimer retxTimer;
-   BsrSrDelayTimer srDelayTimer;
+   uint16_t     periodicTimer;
+   uint16_t     retxTimer;
+   uint16_t     srDelayTimer;
 }BsrTmrCfg;