X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Frgr.h;h=76521a19d0d13a7e4c8d5a444e775a11de3c4313;hb=112672aee2b176d420e1474b13a5655c3d1e92b4;hp=fe416f43f4926d4fdf4c4c8bc42c9d7e96b80ee9;hpb=5625a52ad68f6ad93684e68bbbdbaef0d462cf9a;p=o-du%2Fl2.git

diff --git a/src/cm/rgr.h b/src/cm/rgr.h
index fe416f43f..76521a19d 100755
--- a/src/cm/rgr.h
+++ b/src/cm/rgr.h
@@ -54,7 +54,7 @@
 #endif /* LTE_L2_MEAS*/
 
 /* Configuration/Reconfiguration MACROs*/
-#define RGR_CONFIG   1      /*!< Macro for Configuration Request*/
+#define SCH_CONFIG   1      /*!< Macro for Configuration Request*/
 #define RGR_RECONFIG 2      /*!< Macro for Reconfiguration Request*/
 #define RGR_DELETE   3      /*!< Macro for Delete Request*/
 #define RGR_RESET    4      /*!< Macro for Reset Request*/
@@ -70,7 +70,7 @@
 #define RGR_LCH_CFG   3     /*!< Macro for Logical Channel Configuration Type */ 
 #define RGR_LCG_CFG   4     /*!< Macro for Logical Group Configuration Type */
 #define RGR_SCELL_UE_CFG 5  /*!< MACRO for Scell release */
-#define RGR_ENB_CFG   6     /*!< MACRO for ENB Scheduler Configuration Type */
+#define MAC_GNB_CFG   6     /*!< MACRO for ENB Scheduler Configuration Type */
 
 /* Cell-wide reconfiguration MACROs */
 #define RGR_CELL_DL_CMNRATE_RECFG (1<<0)  /*!< Macro for Downlink Common Coderate Reconfiguration */
@@ -250,24 +250,11 @@
 #define RGR_CFG_CFM_TX_COMPLETE  0x01  /*!< Negative confirmation: configuration failed */
 
 /* Event corresponding to each primitive at this interface */
-#define EVTRGRBNDREQ   1     /*!< Bind Request */
-#define EVTRGRBNDCFM   2     /*!< Bind Confirm */
-#define EVTRGRUBNDREQ  3     /*!< Unbind Request */
-#define EVTRGRCFGREQ   4     /*!< Configuration Request */
-#define EVTRGRCFGCFM   5     /*!< Configuration Confirm */
+#define EVTMACSCHCFGCFM    5     /*!< Configuration Confirm */
 /* rgr_h_001.main_2: Added TTI indication from MAC to RGR user */
 /** @name RGR_RRM_TICK */
 /** @{ */
 #define EVTRGRTTIIND   6     /*!< TTI Tick to RRM */
-/** @} */
-/* rgr_h_001.main_3-ADD-Added for SI Enhancement. */
-/** @name RGR_SI_SCH */
-/** @{ */
-#ifdef RGR_SI_SCH
-#define EVTRGRSICFGREQ 7     /*!< SI Configuration Request */
-#define EVTRGRSICFGCFM 8     /*!< SI Configuration Confirm */
-#endif /*RGR_SI_SCH*/
-/** @} */
 /*rgr_h_001.main_8 ADD added changes for CQI Management*/
 /** @name RGR_CQI_REPT */
 /** @{ */
@@ -279,18 +266,10 @@
 /** @} */
 #define EVTRGRUESTAIND 10       /*!< RGR UE Status Indication */
 
-#ifdef RGR_SI_SCH
-#define EVTRGRWARNINGSICFGREQ 11    /*!< Warning SI Configuration Request */
-#define EVTRGRWARNINGSISTOPREQ 12   /*!< Warning SI Stop Request */
-#define EVTRGRWARNINGSICFGCFM 13     /*!< Warning SI Configuration Confirm */
-#endif /*RGR_SI_SCH*/
-/** @} */
-
 /** @{ */
 /* LTE_ADV_FLAG_REMOVED_START */
 #define EVTRGRLOADINFIND 14  /*!< LOAD INF Indication (SCTP -> SCH -> APP) (Received at X2AP)*/
 
-#define EVTRGRLOADINFREQ 15  /*!< LOAD INF Request (APP -> MAC -> SCTP) (To Remote X2AP) */
 /* LTE_ADV_FLAG_REMOVED_END */
 /** @} */
 /* Activation time limit in terms of number of frames */
@@ -325,9 +304,6 @@
 #endif
 #define RGR_MAX_DL_CQI_SUBBAND   13 /*!< Maximum number of Sub-Bands */
 /** @} */
-/* Selector(coupling) values */
-#define RGR_SEL_TC              1   /*!< For Tight Coupling */
-#define RGR_SEL_LC              0   /*!< For Loose coupling */
 
 /* Pack/ Unpack error code */
 #define ERGRXXX                 0