diff --git a/openair2/LAYER2/nr_pdcp/asn1_utils.c b/openair2/LAYER2/nr_pdcp/asn1_utils.c
index 6b45a73acf..5ec86be3c6 100644
--- a/openair2/LAYER2/nr_pdcp/asn1_utils.c
+++ b/openair2/LAYER2/nr_pdcp/asn1_utils.c
@@ -19,63 +19,30 @@
  *      contact@openairinterface.org
  */
 
+#include "nr_pdcp_asn1_utils.h"
 #include "common/utils/LOG/log.h"
 #include "nr_pdcp_entity.h"
+#include "nr_pdcp_configuration.h"
 
-int decode_t_reordering(int v)
-{
-  static const int tab[36] = {0,   1,   2,   4,   5,   8,   10,  15,  20,  30,   40,   50,   60,   80,   100,  120,  140,  160,
-                              180, 200, 220, 240, 260, 280, 300, 500, 750, 1000, 1250, 1500, 1750, 2000, 2250, 2500, 2750, 3000};
-
-  if (v < 0 || v > 35) {
-    LOG_E(RLC, "%s:%d:%s: fatal\n", __FILE__, __LINE__, __FUNCTION__);
-    exit(1);
-  }
-
-  return tab[v];
+#define ENCODE_DECODE(a, b)                          \
+int decode_##a(int v)                                \
+{                                                    \
+  static const int tab[] = { VALUES_NR_PDCP_##b };   \
+  AssertFatal(v >= 0 && v < SIZEOF_NR_PDCP_##b,      \
+              "bad encoded value " #a " %d\n", v);   \
+  return tab[v];                                     \
+}                                                    \
+                                                     \
+int encode_##a(int v)                                \
+{                                                    \
+  static const int tab[] = { VALUES_NR_PDCP_##b };   \
+  for (int ret = 0; ret < SIZEOF_NR_PDCP_##b; ret++) \
+    if (tab[ret] == v)                               \
+      return ret;                                    \
+  AssertFatal(0, "bad " #a " value %d\n", v);        \
 }
 
-int decode_sn_size_ul(long s)
-{
-  if (s == 0) return SHORT_SN_SIZE;
-  if (s == 1) return LONG_SN_SIZE;
-  LOG_E(RLC, "%s:%d:%s: fatal\n", __FILE__, __LINE__, __FUNCTION__);
-  exit(1);
-}
-
-int decode_sn_size_dl(long s)
-{
-  if (s == 0) return SHORT_SN_SIZE;
-  if (s == 1) return LONG_SN_SIZE;
-  LOG_E(RLC, "%s:%d:%s: fatal\n", __FILE__, __LINE__, __FUNCTION__);
-  exit(1);
-}
-
-int decode_discard_timer(long v)
-{
-  static const int tab[16] = {
-      10,
-      20,
-      30,
-      40,
-      50,
-      60,
-      75,
-      100,
-      150,
-      200,
-      250,
-      300,
-      500,
-      750,
-      1500,
-      -1,
-  };
-
-  if (v < 0 || v > 15) {
-    LOG_E(RLC, "%s:%d:%s: fatal\n", __FILE__, __LINE__, __FUNCTION__);
-    exit(1);
-  }
-
-  return tab[v];
-}
+ENCODE_DECODE(t_reordering, T_REORDERING)
+ENCODE_DECODE(sn_size_ul, SN_SIZE)
+ENCODE_DECODE(sn_size_dl, SN_SIZE)
+ENCODE_DECODE(discard_timer, DISCARD_TIMER)
diff --git a/openair2/LAYER2/nr_pdcp/nr_pdcp_asn1_utils.h b/openair2/LAYER2/nr_pdcp/nr_pdcp_asn1_utils.h
index d525bce287..2628b29069 100644
--- a/openair2/LAYER2/nr_pdcp/nr_pdcp_asn1_utils.h
+++ b/openair2/LAYER2/nr_pdcp/nr_pdcp_asn1_utils.h
@@ -23,8 +23,13 @@
 #define _OPENAIR2_LAYER2_NR_PDCP_ASN1_UTILS_H_
 
 int decode_t_reordering(int v);
-int decode_sn_size_ul(long s);
-int decode_sn_size_dl(long s);
-int decode_discard_timer(long v);
+int decode_sn_size_ul(int v);
+int decode_sn_size_dl(int v);
+int decode_discard_timer(int v);
+
+int encode_t_reordering(int v);
+int encode_sn_size_ul(int v);
+int encode_sn_size_dl(int v);
+int encode_discard_timer(int v);
 
 #endif /* _OPENAIR2_LAYER2_NR_PDCP_ASN1_UTILS_H_ */