#ifndef __ODU_COMMON_CODEC_H__
#define __ODU_COMMON_CODEC_H__
-#include "envopt.h" /* Environment options */
-#include "envdep.h" /* Environment dependent */
-#include "envind.h" /* Environment independent */
-
-#include "gen.h" /* General */
-#include "gen.x" /* General */
-#include "ssi.h"
-#include "OCTET_STRING.h"
-#include "BIT_STRING.h"
-#include "asn_codecs.h"
-
-#define ENC_BUF_MAX_LEN 400
+/*Buffer length which is used for allocation of encoded F1AP messages at CU*/
+#define ENC_BUF_MAX_LEN 2000
#define ENCODE_FAIL -1
-
-typedef struct PlmnIdentity
-{
- uint8_t mcc[3];
- uint8_t mnc[3];
-}Plmn;
-
-int PrepFinalEncBuf(const void *buffer, size_t size, void *encodedBuf);
-S16 buildPlmnId(Plmn plmn, OCTET_STRING_t *octe);
-S16 fillBitString(BIT_STRING_t *id, U8 unusedBits, U8 byteSize, U8 val);
+#define TEID_BIT_SIZE 24
char encBuf[ENC_BUF_MAX_LEN];
int encBufSize;
+int PrepFinalEncBuf(const void *buffer, size_t size, void *encodedBuf);
+uint8_t fillBitString(BIT_STRING_t *id, uint8_t unusedBits, uint8_t byteSize, uint64_t val);
+uint8_t bitStringToInt(BIT_STRING_t *bitString, void *val);
+void fillTeIdString(uint8_t bufSize, uint32_t val, uint8_t *buf);
+void teIdStringToInt(uint8_t *buf, uint32_t *val);
+
#endif
/**********************************************************************