X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fdu_app%2Fdu_cfg.h;h=e051654724121334638478b0743614494077c3af;hb=e006592159c0a16a4c2f24cc50f712ff9461a000;hp=6e8e1a04b2fbdc702ec88b95d22562f70b9ff0de;hpb=4ab59561f7997dffa4247302e1ed558e43a376be;p=o-du%2Fl2.git

diff --git a/src/du_app/du_cfg.h b/src/du_app/du_cfg.h
index 6e8e1a04b..e05165472 100644
--- a/src/du_app/du_cfg.h
+++ b/src/du_app/du_cfg.h
@@ -111,11 +111,15 @@
 
 /* MACRCO Ddefine for PDSCH Configuration */
 #define PDSCH_K0  0
-#define PDSCH_START_SYMB_AND_LEN 53    
+#define PDSCH_START_SYMBOL  2
+#define PDSCH_LENGTH_SYMBOL 12
+
 
 /* MACRO Define for PUSCH Configuration */
-#define PUSCH_K0  3
-#define PUSCH_START_SYMB_AND_LEN 55
+#define PUSCH_K2  3
+#define PUSCH_START_SYMBOL  0
+#define PUSCH_LENGTH_SYMBOL 14
+
 #define PUSCH_MSG3_DELTA_PREAMBLE 0
 #define PUSCH_P0_NOMINAL_WITH_GRANT -70
 
@@ -158,13 +162,13 @@
 #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 DU_MAX_CELLS       1      /* Max num of cells served by gNB-DU */
+#define DU_MAX_UE          1      /* Maximum number of UE Ids */
 #define MAX_PLMN           6        /* 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 */
 #define MAXBPLMNNRMINUS1   1       /* Maximum number of PLMN Ids broadcast in an NR cell minus 1 */
 #define MAXNUMOFSIBTYPES   32       /* Maximum number of SIB types */
-#define MAX_UEID           512      /* Maximum number of UE Ids */
 #define MAX_TNL_ASSOC      32       /* Max num of TNL Assoc between CU and DU */
 #define MAXCELLINENB       256      /* Max num of cells served by eNB */
 #define MAX_NUM_OF_UE_ID       65536    /* Max num of UEs served by DU */
@@ -183,6 +187,38 @@
 #define DU_RANAC 1
 #define CELL_IDENTITY 32
 
+/* Macro definitions for DUtoCuRrcContainer */
+#define CELL_GRP_ID 1
+#define SCH_REQ_ID  0
+#define SR_PROHIBIT_TMR 5
+#define SR_TRANS_MAX 2
+#define PERIODIC_BSR_TMR 2
+#define RETX_BSR_TMR     5
+#define TAG_ID 0
+#define TIME_ALIGNMENT_TMR 7
+#define PHR_PERIODIC_TMR 7
+#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
+#define POLL_BYTE 43
+#define MAX_RETX_THRESHOLD 5
+#define T_REASSEMBLY 8
+#define T_STATUS_PROHIBHIT 7
+#define MAC_LC_PRIORITY 1
+#define PRIORTISIED_BIT_RATE 15
+#define BUCKET_SIZE_DURATION 5
+#define LC_GRP 0
+#define P_NR_FR1 0
+#define PDSCH_HARQ_ACK_CODEBOOK 1
+#define SERV_CELL_IDX 0
+#define RLM_SYNC_OUT_SYNC_THRESHOLD 0
+#define ACTIVE_DL_BWP_ID 0
+
 #ifdef EGTP_TEST
 #define UE_ID 1
 #define RB_ID 1
@@ -367,6 +403,19 @@ typedef enum
    PERMIT_HIGH_PRIOR_SESSION_AND_MOBILE_TERM_SERVICE
 }F1UacStandardAction;
 
+typedef enum
+{
+   PDSCH_MAPPING_TYPE_A,
+   PDSCH_MAPPING_TYPE_B,
+}pdschMappingType;
+
+typedef enum
+{
+   PUSCH_MAPPING_TYPE_A,
+   PUSCH_MAPPING_TYPE_B,
+}puschMappingType;
+
+
 typedef struct f1RrcVersion
 {
    char    rrcVer[30];     /* Latest RRC Version */
@@ -777,7 +826,7 @@ typedef struct f1GnbDuCfgUpd
   F1DuSrvdCellToDel   srvdCellLstMod[DU_MAX_CELLS];      /* Served cell list to be modified */
   NrEcgi              srvdCellLstDel[DU_MAX_CELLS];      /* Served cell list to be deleted */
   F1CellStatus        cellStatus[DU_MAX_CELLS];          /* Cell status */
-  F1DedSIDelUE        ueLst[MAX_UEID];                     /* Ue list that requires dedicated SI delivery */
+  F1DedSIDelUE        ueLst[DU_MAX_UE];                     /* Ue list that requires dedicated SI delivery */
   uint32_t            gnbDuId;
   F1TnlAssocToRmv     gnbDuTnlAssocRmv[MAX_TNL_ASSOC];  /* TNL Assoc list to remove */ 
 }F1GnbDuCfgUpd;
@@ -966,9 +1015,9 @@ typedef struct pdcchCfgCommon
 typedef struct pdschCfgCommon
 {
    uint8_t  present;
-   long   k0;
-   long   mapType;              /* Mapping Type */
-   long   startSymbAndLen;      /* Start Symbol and Length */
+   long     k0;
+   long     mapType;              /* Mapping Type */
+	uint16_t sliv;  
 }PdschCfgCommon;
 
 typedef struct bcchCfg
@@ -1028,12 +1077,12 @@ typedef struct rachCfgCommon
 
 typedef struct  puschCfgCommon
 {
-   uint8_t present;
-   long   k2;
-   long   mapType;
-   long   startSymbAndLen;
-   long   msg3DeltaPreamble;
-   long   p0NominalWithGrant;
+   uint8_t  present;
+   long     k2;
+   long     mapType;
+	uint16_t sliv;
+   long     msg3DeltaPreamble;
+   long     p0NominalWithGrant;
 }PuschCfgCommon;
 
 typedef struct pucchCfgCommon