X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Fmac_upr_inf_api.c;h=4b1f776371c0f507584a2bf095e33c800c5d34bb;hb=de6a435729e3cad9d4a66329080b8206a64f452c;hp=be8c36d0303f716de429a8df847df59d53c4a6a8;hpb=6b44407d464a5a4e060999255233a7cfe78bb0fa;p=o-du%2Fl2.git

diff --git a/src/5gnrmac/mac_upr_inf_api.c b/src/5gnrmac/mac_upr_inf_api.c
index be8c36d03..4b1f77637 100644
--- a/src/5gnrmac/mac_upr_inf_api.c
+++ b/src/5gnrmac/mac_upr_inf_api.c
@@ -19,18 +19,25 @@
 /* This file contains the definitions for Upper Interface APIs that are
  * invoked from MAC */
 #include "common_def.h"
-#include "rgu.h"
-#include "rgu.x"
 #include "du_app_mac_inf.h"
+#include "rlc_mac_inf.h"
 #include "mac_upr_inf_api.h"
 
-/* Funtion pointer options for slot indication */
-DuMacSlotInd packMacSlotIndOpts[] =
+/* Funtion pointer options for cell up indication */
+DuMacCellUpInd packMacCellUpIndOpts[] =
+{
+   packMacCellUpInd,
+   duHandleCellUpInd,
+   packMacCellUpInd
+};
+
+DuMacSlotInd packMacSlotIndOpts[] = 
 {
    packMacSlotInd,
    duHandleSlotInd,
    packMacSlotInd
 };
+
 /* Funtion pointer options for stop indication */
 DuMacStopInd packMacStopIndOpts[] =
 {
@@ -55,29 +62,58 @@ RlcMacUlDataFunc rlcMacSendUlDataOpts[] =
    packRlcUlData
 };
 
+/* Funtion pointer options for schedule result reporting */
+RlcMacSchedResultRptFunc rlcMacSchedResultRptOpts[] =
+{
+   packRlcSchedResultRpt,
+   RlcProcSchedResultRpt,
+   packRlcSchedResultRpt
+};
+	 
+
 /*******************************************************************
  *
- * @brief Send slot indication to MAC
+ * @brief Send cell up indication to DU APP
  *
  * @details
  *
- *    Function : MacDuAppSlotInd
+ *    Function : MacDuAppCellUpInd
  *
  *    Functionality:
  *       Select appropriate function using selector value and
- *       send to MAC
+ *       send cell up indication to DU APP
  *
  * @params[in]  Post structure pointer
- *              Slot info pointer 
+ *              Cell UP info
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t MacDuAppSlotInd(Pst *pst, SlotIndInfo *slotInfo)
+uint8_t MacDuAppCellUpInd(Pst *pst, OduCellId *cellId)
 {
-   return (*packMacSlotIndOpts[pst->selector])(pst, slotInfo);
+   return (*packMacCellUpIndOpts[pst->selector])(pst, cellId);
 }
 
+/*******************************************************************
+ *
+ * @brief Send slot indication to DU APP
+ *
+ * @details
+ *
+ *    Function : MacDuAppSlotInd
+ *
+ *    Functionality:
+ *       send slot indication to DU APP
+ *
+ * @params[in]  Post structure pointer, SlotTimingInfo *slotIndInfo
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t MacDuAppSlotInd(Pst *pst, SlotTimingInfo *slotIndInfo)
+{
+   return (*packMacSlotIndOpts[pst->selector])(pst, slotIndInfo);
+}
 /*******************************************************************
  *
  * @brief Send stop indication to MAC
@@ -94,9 +130,9 @@ uint8_t MacDuAppSlotInd(Pst *pst, SlotIndInfo *slotInfo)
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t MacDuAppStopInd(Pst *pst, MacCellStopInfo *cellStopId)
+uint8_t MacDuAppStopInd(Pst *pst, OduCellId *cellId)
 {
-   return (*packMacStopIndOpts[pst->selector])(pst, cellStopId);
+   return (*packMacStopIndOpts[pst->selector])(pst, cellId);
 }
 
 /*******************************************************************
@@ -137,11 +173,31 @@ uint8_t MacDuAppUlCcchInd(Pst *pst, UlCcchIndInfo *ulCcchIndInfo)
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t MacSendUlDataToRlc(Pst *pst, RlcMacData *ulData)
+uint8_t MacSendUlDataToRlc(Pst *pst, RlcData *ulData)
 {
    return (*rlcMacSendUlDataOpts[pst->selector])(pst, ulData);
 }
 
+/*******************************************************************
+ *
+ * @brief Send Schedule result report to RLC
+ *
+ * @details
+ *
+ *    Function : MacSendSchedResultRptToRlc
+ *
+ *    Functionality: Send Schedule result report to RLC
+ *
+ * @params[in] Post structure
+ *             Schedule result report
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t MacSendSchedResultRptToRlc(Pst *pst, RlcSchedResultRpt *schedRpt)
+{
+   return (*rlcMacSchedResultRptOpts[pst->selector])(pst, schedRpt);
+}
 
 /**********************************************************************
   End of file