Replaced old SSI function with new macros jira id - ODUHIGH-212

[o-du/l2.git] / src / 5gnrmac / lwr_mac_upr_inf.c

diff --git a/src/5gnrmac/lwr_mac_upr_inf.c b/src/5gnrmac/lwr_mac_upr_inf.c
index 0c91610..13b41a0 100644 (file)
--- a/src/5gnrmac/lwr_mac_upr_inf.c
+++ b/src/5gnrmac/lwr_mac_upr_inf.c
@@ -15,7 +15,7 @@
 #   limitations under the License.                                             #
 ################################################################################
 *******************************************************************************/
-
+#include "common_def.h"
 #include "lwr_mac_upr_inf.h"
 
 /*******************************************************************
@@ -35,16 +35,13 @@
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint16_t packCrcInd(Pst *pst, CrcInd *crcInd)
+uint8_t packCrcInd(Pst *pst, CrcInd *crcInd)
 {
-   if((pst->selector == MAC_SELECTOR_LC) || (pst->selector == MAC_SELECTOR_LWLC))
+   if((pst->selector == ODU_SELECTOR_LC) || (pst->selector == ODU_SELECTOR_LWLC))
    {
       return ROK;
    }
-   else
-   {
-      return RFAILED;
-   }
+   return RFAILED;
 }
 
 /*******************************************************************
@@ -64,16 +61,13 @@ uint16_t packCrcInd(Pst *pst, CrcInd *crcInd)
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint16_t packRxDataInd(Pst *pst, RxDataInd *rxDataInd)
+uint8_t packRxDataInd(Pst *pst, RxDataInd *rxDataInd)
 {
-   if((pst->selector == MAC_SELECTOR_LC) || (pst->selector == MAC_SELECTOR_LWLC))
+   if((pst->selector == ODU_SELECTOR_LC) || (pst->selector == ODU_SELECTOR_LWLC))
    {
       return ROK;
    }
-   else
-   {
-      return RFAILED;
-   }
+   return RFAILED;
 }
 
 
@@ -94,18 +88,15 @@ uint16_t packRxDataInd(Pst *pst, RxDataInd *rxDataInd)
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint16_t packRachInd(Pst *pst, RachInd *rachInd)
+uint8_t packRachInd(Pst *pst, RachInd *rachInd)
 {
-   if((pst->selector == MAC_SELECTOR_LC) || (pst->selector == MAC_SELECTOR_LWLC))
+   if((pst->selector == ODU_SELECTOR_LC) || (pst->selector == ODU_SELECTOR_LWLC))
    {
       return ROK;
    }
-   else
-   {
-      return RFAILED;
-   }
+   return RFAILED;
 }
- 
+
 /*******************************************************************
  *
  * @brief Loose coupled packing of slot indication
@@ -123,21 +114,21 @@ uint16_t packRachInd(Pst *pst, RachInd *rachInd)
  *         RFAILED - failure
  *
  * ****************************************************************/
-S16 packLcSlotInd (Pst *pst, SlotIndInfo *slotInd)
+uint8_t packLcSlotInd (Pst *pst, SlotIndInfo *slotInd)
 {
    Buffer *mBuf = NULLP;
-   if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK)
+   if (ODU_GET_MSG(pst->region, pst->pool, &mBuf) != ROK)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
- 
+
    /* pack SFN and slot value */
-   CMCHKPK(SPkU16,slotInd->sfn, mBuf);
-   CMCHKPK(SPkU16,slotInd->slot, mBuf);
- 
-   RETVALUE(SPstTsk(pst,mBuf));
+   CMCHKPK(oduUnpackUInt16,slotInd->sfn, mBuf);
+   CMCHKPK(oduUnpackUInt16,slotInd->slot, mBuf);
+
+   return ODU_POST_TASK(pst,mBuf);
 }
- 
+
 /*******************************************************************
  *
  * @brief Light weight loose coupled packing of slot indication
@@ -155,7 +146,7 @@ S16 packLcSlotInd (Pst *pst, SlotIndInfo *slotInd)
  *         RFAILED - failure
  *
  * ****************************************************************/
-S16 packLwlcSlotInd (Pst *pst, SlotIndInfo *slotInd)
+uint8_t packLwlcSlotInd (Pst *pst, SlotIndInfo *slotInd)
 {
    return ROK;
 }
@@ -176,9 +167,9 @@ S16 packLwlcSlotInd (Pst *pst, SlotIndInfo *slotInd)
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint16_t packStopInd(Pst *pst)
+uint8_t packStopInd(Pst *pst, uint16_t cellId)
 {
-   if((pst->selector == MAC_SELECTOR_LC) || (pst->selector == MAC_SELECTOR_LWLC))
+   if((pst->selector == ODU_SELECTOR_LC) || (pst->selector == ODU_SELECTOR_LWLC))
    {
       return ROK;
    }
@@ -188,6 +179,33 @@ uint16_t packStopInd(Pst *pst)
    }
 }
 
+/*******************************************************************
+ *
+ * @brief Packs and Sends UCI Ind to MAC
+ *
+ * @details
+ *
+ *    Function : packMacUciInd
+ *
+ *    Functionality:
+ *         Packs and Sends Uci Ind to MAC
+ *
+ * @params[in] Post structure pointer
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t packMacUciInd(Pst *pst, UciInd *uciInd)
+{
+   if((pst->selector == ODU_SELECTOR_LC) || (pst->selector == ODU_SELECTOR_LWLC))
+   {
+      return ROK;
+   }
+   else
+   {
+      return RFAILED;
+   }
+}
 /**********************************************************************
-         End of file
-**********************************************************************/
+  End of file
+ **********************************************************************/