X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Fmac_sch_interface.h;h=1272f68ef5ad8ebbb95221210e23915d5422c99c;hb=refs%2Fchanges%2F77%2F4377%2F11;hp=513fc7e2645f4b87f425c82e3916373b83214268;hpb=746426865b5742eb3d79ae2457081c47c1c2c4c1;p=o-du%2Fl2.git

diff --git a/src/cm/mac_sch_interface.h b/src/cm/mac_sch_interface.h
index 513fc7e26..1272f68ef 100644
--- a/src/cm/mac_sch_interface.h
+++ b/src/cm/mac_sch_interface.h
@@ -25,10 +25,6 @@
 #define EVENT_CRC_IND_TO_SCH         6
 #define EVENT_DL_RLC_BO_INFO_TO_SCH  7
 
-/* selector */
-#define MAC_SCH_LC_SELECTOR 0
-#define MAC_SCH_TC_SELECTOR 1
-#define MAC_SCH_LWLC_SELECTOR 2
 
 /*macros*/
 #define NO_SSB 0
@@ -304,6 +300,12 @@ typedef struct schPdschCfgCmn
    uint8_t lengthSymbol;
 }SchPdschCfgCmn;
 
+typedef struct schPucchCfgCmn
+{
+   uint8_t pucchResourceCommon;
+   uint8_t pucchGroupHopping;
+}SchPucchCfgCmn;
+
 typedef struct schPuschCfgCmn
 {
    uint8_t k2;
@@ -322,6 +324,7 @@ typedef struct schBwpDlCfg
 typedef struct schBwpUlCfg
 {
    SchBwpParams   bwp;
+	SchPucchCfgCmn pucchCommon;
 	SchPuschCfgCmn puschCommon;
 }SchBwpUlCfg;
 
@@ -406,6 +409,7 @@ typedef struct rarAlloc
 
 typedef struct msg4Info
 {
+   uint16_t crnti;
 	uint8_t  ndi;
 	uint8_t  harqProcNum;
 	uint8_t  dlAssignIdx;
@@ -413,7 +417,6 @@ typedef struct msg4Info
 	uint8_t  pucchResInd;
 	uint8_t  harqFeedbackInd;
 	uint8_t  dciFormatId;
-   uint16_t crnti;
    uint8_t  *msg4Pdu;
    uint16_t  msg4PduLen;
 }Msg4Info;
@@ -469,6 +472,18 @@ typedef struct schPuschInfo
    TbInfo           tbInfo;       /* TB info */
 }SchPuschInfo;
 
+typedef struct schPucchInfo
+{
+   uint16_t         rnti;
+   uint8_t          pucchFormat;
+   FreqDomainAlloc  fdAlloc;      /* Freq domain allocation */
+   TimeDomainAlloc  tdAlloc;      /* Time domain allocation */
+	uint8_t          srFlag;
+	uint8_t          harqFlag;
+	uint8_t          numHarqBits;
+	uint8_t          uciFlag;
+	uint8_t          numUciBits;
+}SchPucchInfo;
 
 typedef struct ulSchedInfo
 {
@@ -478,6 +493,7 @@ typedef struct ulSchedInfo
 	uint8_t       dataType;       /* Type of info being scheduled */
 	PrachSchInfo  prachSchInfo;   /* Prach scheduling info */
 	SchPuschInfo  schPuschInfo;   /* Pusch scheduling info */
+	SchPucchInfo  schPucchInfo;   /* Pusch scheduling info */
 }UlSchedInfo;
 
 typedef struct rachIndInfo