PUCCH CHANGES AT SCH AND LOWER MAC

[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 3b1c558..c9855a2 100644 (file)
--- a/src/cm/du_app_mac_inf.h
+++ b/src/cm/du_app_mac_inf.h
@@ -29,12 +29,21 @@
 #define SIB1_NEW_TX_PERIOD      160
 #define SIB1_REPETITION_PERIOD   20
 #define CORESET_0_INDEX      0
+#define CORESET_1_INDEX      1
+#define CORESET_2_INDEX      2
+#define CORESET_3_INDEX      3
+#define CORESET_4_INDEX      4
 #define SEARCHSPACE_0_INDEX   0
 #define SEARCHSPACE_1_INDEX   1
+#define SEARCHSPACE_2_INDEX   2
+#define SEARCHSPACE_3_INDEX   3
+#define SEARCHSPACE_4_INDEX   4
 #define SS_MONITORING_SLOT_SL1   0 /* all slots */
 #define SS_MONITORING_SYMBOL     0x2000; /* symbol-0, set 14th bit */
 #define SIB1_MCS  4
 
+#define SRB_ID_0 0
+#define SRB_ID_1 1
 /* Macros for coupling */
 #define DU_MAC_LC  0
 #define DU_MAC_TC  1
@@ -169,6 +178,7 @@ typedef struct prachCfg
    RstSetCfg     prachRstSetCfg;      /* PRACH restricted set config */
        uint16_t      msg1FreqStart;       /* Msg1-FrequencyStart */
    uint8_t       msg1Fdm;             /* PRACH FDM (1,2,4,8) */
+       uint8_t       rootSeqLen;          /* Root sequence length */
    PrachFdmInfo  fdm[8];              /* FDM info */
    uint8_t       ssbPerRach;          /* SSB per RACH occassion */
    Bool          prachMultCarrBand;   /* Multiple carriers in Band */
@@ -225,7 +235,9 @@ typedef struct searchSpaceCfg
 
 typedef struct pdcchConfigCommon
 {
-   SearchSpaceCfg raSearchSpace;
+   /* only one search space is configured during SIB1 */
+   SearchSpaceCfg commonSearchSpace;
+   uint8_t raSearchSpaceId;
 }PdcchConfigCommon;
 
 typedef struct pdschConfigCommon
@@ -236,6 +248,12 @@ typedef struct pdschConfigCommon
        uint8_t lengthSymbol;
 }PdschConfigCommon;
 
+typedef struct pucchConfigCommon
+{
+   uint8_t pucchResourceCommon;
+       uint8_t pucchGroupHopping;
+}PucchConfigCommon;
+
 typedef struct puschConfigCommon
 {
    /* PUSCH-TimeDomainResourceAllocation info */
@@ -256,28 +274,29 @@ typedef struct bwpUlConfig
 {
    BwpParams      bwp;
        // rach config common sent in PrachCfg
-       // pucch info not required
+       PucchConfigCommon pucchCommon;
        PuschConfigCommon puschCommon;
 }BwpUlConfig;
 
 typedef struct macCellCfg
 {
-   U16            transId;
-   U16            cellId;     /* Cell Id */
-   U8             numTlv;     /* Number of configuration TLVs */
-   U8             carrierId;  /* Carrired Index */
-   U16            phyCellId;  /* Physical cell id */
-   DuplexMode     dupType;    /* Duplex type: TDD/FDD */
-   CarrierCfg     dlCarrCfg;  /* DL Carrier configuration */
-   CarrierCfg     ulCarrCfg;  /* UL Carrier configuration */
-   Bool           freqShft;   /* Indicates presence of 7.5kHz frequency shift */
-   SsbCfg         ssbCfg;     /* SSB configuration */          
-   PrachCfg       prachCfg;   /* PRACH Configuration */
-   TDDCfg         tddCfg;     /* TDD periodicity and slot configuration */
-   RSSIMeasUnit   rssiUnit;   /* RSSI measurement unit */
-   Sib1CellCfg    sib1Cfg;
-       BwpDlConfig    initialDlBwp;
-       BwpUlConfig    initialUlBwp;
+       U16            transId;          /* Trans Id */
+       U16            cellId;           /* Cell Id */
+       U8             numTlv;           /* Number of configuration TLVs */
+       U8             carrierId;        /* Carrired Index */
+       U16            phyCellId;        /* Physical cell id */
+       DuplexMode     dupType;          /* Duplex type: TDD/FDD */
+       CarrierCfg     dlCarrCfg;        /* DL Carrier configuration */
+       CarrierCfg     ulCarrCfg;        /* UL Carrier configuration */
+       Bool           freqShft;         /* Indicates presence of 7.5kHz frequency shift */
+   SsbCfg         ssbCfg;           /* SSB configuration */          
+   PrachCfg       prachCfg;         /* PRACH Configuration */
+   TDDCfg         tddCfg;           /* TDD periodicity and slot configuration */
+   RSSIMeasUnit   rssiUnit;         /* RSSI measurement unit */
+   Sib1CellCfg    sib1Cfg;          /* SIB1 config */
+       BwpDlConfig    initialDlBwp;     /* Initial DL BWP */
+       BwpUlConfig    initialUlBwp;     /* Initial UL BWP */
+       uint8_t        dmrsTypeAPos;     /* DMRS Type A position */
 }MacCellCfg;
 
 typedef struct macCellCfgCfm
@@ -315,6 +334,7 @@ typedef struct dlCcchInd
    uint16_t      cellId;
    uint16_t      crnti;
    DlCcchMsgType msgType;
+   uint16_t      dlCcchMsgLen;
    uint8_t       *dlCcchMsg;
 }DlCcchIndInfo;