From 3198b9fe30d425684817ed1b82bfe7a86a4f414b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=BAben=20Soares=20Silva?= <rsilva@allbesmart.pt>
Date: Tue, 23 Jul 2024 14:27:17 +0100
Subject: [PATCH] Move utility macros to common FAPI library

---
 nfapi/open-nFAPI/fapi/inc/nr_fapi.h          | 25 +++++++++++++++++++
 nfapi/open-nFAPI/fapi/inc/nr_fapi_p5_utils.h | 26 --------------------
 2 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/nfapi/open-nFAPI/fapi/inc/nr_fapi.h b/nfapi/open-nFAPI/fapi/inc/nr_fapi.h
index a1036ad234..9e110710d2 100644
--- a/nfapi/open-nFAPI/fapi/inc/nr_fapi.h
+++ b/nfapi/open-nFAPI/fapi/inc/nr_fapi.h
@@ -34,6 +34,31 @@
 #include "assertions.h"
 #include "debug.h"
 
+#define EQ_TLV(_tlv_a, _tlv_b)        \
+  do {                                \
+    EQ(_tlv_a.tl.tag, _tlv_b.tl.tag); \
+    EQ(_tlv_a.value, _tlv_b.value);   \
+  } while (0)
+
+#define EQ(_a, _b)      \
+  do {                  \
+    if ((_a) != (_b)) { \
+      return false;     \
+    }                   \
+  } while (0)
+
+#define COPY_TL(_dst_tl, _src_tl)    \
+  do {                               \
+    _dst_tl.tag = _src_tl.tag;       \
+    _dst_tl.length = _src_tl.length; \
+  } while (0)
+
+#define COPY_TLV(_dst, _src)   \
+  do {                         \
+    COPY_TL(_dst.tl, _src.tl); \
+    _dst.value = _src.value;   \
+  } while (0)
+
 typedef struct {
   uint8_t num_msg;
   uint8_t opaque_handle;
diff --git a/nfapi/open-nFAPI/fapi/inc/nr_fapi_p5_utils.h b/nfapi/open-nFAPI/fapi/inc/nr_fapi_p5_utils.h
index a3ea596449..0950b24b3e 100644
--- a/nfapi/open-nFAPI/fapi/inc/nr_fapi_p5_utils.h
+++ b/nfapi/open-nFAPI/fapi/inc/nr_fapi_p5_utils.h
@@ -25,32 +25,6 @@
 #include "stdint.h"
 #include "nr_fapi.h"
 #include "nfapi/oai_integration/vendor_ext.h"
-
-#define EQ_TLV(_tlv_a, _tlv_b)        \
-  do {                                \
-    EQ(_tlv_a.tl.tag, _tlv_b.tl.tag); \
-    EQ(_tlv_a.value, _tlv_b.value);   \
-  } while (0)
-
-#define EQ(_a, _b)      \
-  do {                  \
-    if ((_a) != (_b)) { \
-      return false;     \
-    }                   \
-  } while (0)
-
-#define COPY_TL(_dst_tl, _src_tl)    \
-  do {                               \
-    _dst_tl.tag = _src_tl.tag;       \
-    _dst_tl.length = _src_tl.length; \
-  } while (0)
-
-#define COPY_TLV(_dst, _src)   \
-  do {                         \
-    COPY_TL(_dst.tl, _src.tl); \
-    _dst.value = _src.value;   \
-  } while (0)
-
 void copy_vendor_extension_value(nfapi_vendor_extension_tlv_t *dst, const nfapi_vendor_extension_tlv_t *src);
 
 bool eq_param_request(const nfapi_nr_param_request_scf_t *unpacked_req, const nfapi_nr_param_request_scf_t *req);