CU testing fixes

[o-du/l2.git] / src / codec_utils / common / odu_common_codec.c

diff --git a/src/codec_utils/common/odu_common_codec.c b/src/codec_utils/common/odu_common_codec.c
index 7ca7923..5ea3c8d 100644 (file)
--- a/src/codec_utils/common/odu_common_codec.c
+++ b/src/codec_utils/common/odu_common_codec.c
@@ -28,40 +28,6 @@ int PrepFinalEncBuf(const void *buffer, size_t size, void *encodedBuf)
    return 0;
 } /* PrepFinalEncBuf */
 
-/*******************************************************************
- *
- * @brief Builds PLMN ID 
- *
- * @details
- *
- *    Function : plmnBuildId
- *
- *    Functionality: Building the PLMN ID
- *
- * @params[in] PLMNID plmn
- *             OCTET_STRING_t *octe
- * @return ROK     - success
- *         RFAILED - failure
- *
- * ****************************************************************/
-S16 buildPlmnId(Plmn plmn, OCTET_STRING_t *octe)
-{
-   U8 mncCnt;
-   mncCnt = 2;
-   octe->buf[0] = ((plmn.mcc[1] << 4) | (plmn.mcc[0]));
-   if(mncCnt == 2)
-   {
-      octe->buf[1]  = ((0xf0) | (plmn.mcc[2]));
-      octe->buf[2] = ((plmn.mnc[1] << 4) | (plmn.mnc[0]));
-   }
-   else
-   {
-      octe->buf[1] = ((plmn.mnc[0] << 4) | (plmn.mcc[2]));
-      octe->buf[2] = ((plmn.mnc[2] << 4) | (plmn.mnc[1]));
-   }
-   RETVALUE(ROK);
-}
-
 /*******************************************************************
  *
  * @brief Fills the RicId
@@ -73,21 +39,21 @@ S16 buildPlmnId(Plmn plmn, OCTET_STRING_t *octe)
  *    Functionality: Fills the RicId
  *
  * @params[in] BIT_STRING_t *nbid,
- *             U8 unusedBits
- *             U8 byteSize
- *             U8 val
+ *             uint8_t unusedBits
+ *             uint8_t byteSize
+ *             uint8_t val
  *
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
 
-S16 fillBitString(BIT_STRING_t *id, U8 unusedBits, U8 byteSize, U8 val)
+uint8_t fillBitString(BIT_STRING_t *id, uint8_t unusedBits, uint8_t byteSize, uint8_t val)
 {
-   U8 tmp;
+   uint8_t tmp;
    if(id->buf == NULLP)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    for (tmp = 0 ; tmp < (byteSize-1); tmp++)
@@ -96,7 +62,7 @@ S16 fillBitString(BIT_STRING_t *id, U8 unusedBits, U8 byteSize, U8 val)
    }
    id->buf[byteSize-1]   = val;
    id->bits_unused = unusedBits;
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /*******************************************************************
@@ -115,15 +81,22 @@ S16 fillBitString(BIT_STRING_t *id, U8 unusedBits, U8 byteSize, U8 val)
  *         RFAILED - failure
  *
  * ****************************************************************/
-S16 bitStringToInt(BIT_STRING_t *bitString, U16 *val)
+uint8_t bitStringToInt(BIT_STRING_t *bitString, void *value)
 {
-   U16 idx;
+   uint16_t idx;
+   uint32_t *val = NULLP;
+
    if(bitString->buf == NULL || bitString->size <= 0)
    {
       DU_LOG("\nDU_APP : Bit string is empty");
       return RFAILED;
    }
 
+   if(value)
+      val = (uint32_t *)value;
+   else
+      return RFAILED;
+
    for(idx=0; idx< bitString->size-1; idx++)
    {
       *val |= bitString->buf[idx];