From 1ea164468ff1d27b03696d9b6bf0deb3e129c6eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=BAben=20Soares=20Silva?= <rsilva@allbesmart.pt>
Date: Mon, 2 Dec 2024 09:29:12 +0000
Subject: [PATCH] Refactor fapi_nr_p5_message_unpack to have the same signature
 as nfapi_nr_p5_message_header_unpack.

This change is done in preparation to add the header unpack functions to the VNF and PNF structures as function pointers, used to peek the message headers prior to processing.
Add a faux fapi_nr_p7_message_header_unpack with the same signature as nfapi_nr_p7_message_header_unpack, to be used for the P7 header unpack function pointer.
---
 nfapi/open-nFAPI/fapi/inc/nr_fapi.h           |  7 +++++-
 nfapi/open-nFAPI/fapi/src/nr_fapi.c           | 23 +++++++++++++++----
 nfapi/open-nFAPI/fapi/src/nr_fapi_p5.c        |  7 +++---
 nfapi/open-nFAPI/fapi/src/nr_fapi_p7.c        |  9 ++++----
 nfapi/tests/p5/nr_fapi_config_request_test.c  |  2 +-
 nfapi/tests/p5/nr_fapi_config_response_test.c |  2 +-
 .../tests/p5/nr_fapi_error_indication_test.c  |  2 +-
 nfapi/tests/p5/nr_fapi_param_request_test.c   |  2 +-
 nfapi/tests/p5/nr_fapi_param_response_test.c  |  2 +-
 nfapi/tests/p5/nr_fapi_start_request_test.c   |  2 +-
 nfapi/tests/p5/nr_fapi_start_response_test.c  |  2 +-
 nfapi/tests/p5/nr_fapi_stop_indication_test.c |  2 +-
 nfapi/tests/p5/nr_fapi_stop_request_test.c    |  2 +-
 nfapi/tests/p7/nr_fapi_crc_indication_test.c  |  2 +-
 nfapi/tests/p7/nr_fapi_dl_tti_request_test.c  |  2 +-
 nfapi/tests/p7/nr_fapi_rach_indication_test.c |  2 +-
 .../p7/nr_fapi_rx_data_indication_test.c      |  2 +-
 nfapi/tests/p7/nr_fapi_slot_indication_test.c |  2 +-
 nfapi/tests/p7/nr_fapi_srs_indication_test.c  |  2 +-
 nfapi/tests/p7/nr_fapi_tx_data_request_test.c |  2 +-
 nfapi/tests/p7/nr_fapi_uci_indication_test.c  |  2 +-
 nfapi/tests/p7/nr_fapi_ul_dci_request_test.c  |  2 +-
 nfapi/tests/p7/nr_fapi_ul_tti_request_test.c  |  2 +-
 23 files changed, 50 insertions(+), 34 deletions(-)

diff --git a/nfapi/open-nFAPI/fapi/inc/nr_fapi.h b/nfapi/open-nFAPI/fapi/inc/nr_fapi.h
index ee405792d2..fcf4b97973 100644
--- a/nfapi/open-nFAPI/fapi/inc/nr_fapi.h
+++ b/nfapi/open-nFAPI/fapi/inc/nr_fapi.h
@@ -77,10 +77,15 @@ bool isFAPIMessageIDValid(uint16_t id);
 
 int check_nr_fapi_unpack_length(nfapi_nr_phy_msg_type_e msgId, uint32_t unpackedBufLen);
 
-int fapi_nr_message_header_unpack(uint8_t **pMessageBuf,
+int fapi_nr_message_header_unpack(void *pMessageBuf,
                                   uint32_t messageBufLen,
                                   void *pUnpackedBuf,
                                   uint32_t unpackedBufLen,
                                   nfapi_p4_p5_codec_config_t *config);
+int fapi_nr_p7_message_header_unpack(void *pMessageBuf,
+                                  uint32_t messageBufLen,
+                                  void *pUnpackedBuf,
+                                  uint32_t unpackedBufLen,
+                                  nfapi_p7_codec_config_t *config);
 
 #endif // OPENAIRINTERFACE_NR_FAPI_H
diff --git a/nfapi/open-nFAPI/fapi/src/nr_fapi.c b/nfapi/open-nFAPI/fapi/src/nr_fapi.c
index c36fff4b34..475b6c07dd 100644
--- a/nfapi/open-nFAPI/fapi/src/nr_fapi.c
+++ b/nfapi/open-nFAPI/fapi/src/nr_fapi.c
@@ -165,13 +165,26 @@ int check_nr_fapi_unpack_length(nfapi_nr_phy_msg_type_e msgId, uint32_t unpacked
   return retLen;
 }
 
-int fapi_nr_message_header_unpack(uint8_t **pMessageBuf,
+int fapi_nr_p7_message_header_unpack(void *pMessageBuf,
+                                     uint32_t messageBufLen,
+                                     void *pUnpackedBuf,
+                                     uint32_t unpackedBufLen,
+                                     nfapi_p7_codec_config_t *config)
+{
+  return fapi_nr_message_header_unpack(pMessageBuf,
+                                       messageBufLen,
+                                       pUnpackedBuf,
+                                       unpackedBufLen,
+                                       NULL);
+}
+
+int fapi_nr_message_header_unpack(void *pMessageBuf,
                                   uint32_t messageBufLen,
                                   void *pUnpackedBuf,
                                   uint32_t unpackedBufLen,
                                   nfapi_p4_p5_codec_config_t *config)
 {
-  uint8_t **pReadPackedMessage = pMessageBuf;
+  uint8_t *pReadPackedMessage = pMessageBuf;
   nfapi_nr_p4_p5_message_header_t *header = pUnpackedBuf;
   fapi_message_header_t fapi_msg = {0};
 
@@ -179,10 +192,10 @@ int fapi_nr_message_header_unpack(uint8_t **pMessageBuf,
       || unpackedBufLen < sizeof(fapi_message_header_t)) {
     return -1;
   }
-  uint8_t *end = *pMessageBuf + messageBufLen;
+  uint8_t *end = pMessageBuf + messageBufLen;
   // process the header
   int result =
-      (pull8(pReadPackedMessage, &fapi_msg.num_msg, end) && pull8(pReadPackedMessage, &fapi_msg.opaque_handle, end)
-       && pull16(pReadPackedMessage, &header->message_id, end) && pull32(pReadPackedMessage, &header->message_length, end));
+      (pull8(&pReadPackedMessage, &fapi_msg.num_msg, end) && pull8(&pReadPackedMessage, &fapi_msg.opaque_handle, end)
+       && pull16(&pReadPackedMessage, &header->message_id, end) && pull32(&pReadPackedMessage, &header->message_length, end));
   return (result);
 }
diff --git a/nfapi/open-nFAPI/fapi/src/nr_fapi_p5.c b/nfapi/open-nFAPI/fapi/src/nr_fapi_p5.c
index 6bf2ff37ea..554898cbd4 100644
--- a/nfapi/open-nFAPI/fapi/src/nr_fapi_p5.c
+++ b/nfapi/open-nFAPI/fapi/src/nr_fapi_p5.c
@@ -135,22 +135,21 @@ int fapi_nr_p5_message_unpack(void *pMessageBuf,
                               nfapi_p4_p5_codec_config_t *config)
 {
   fapi_message_header_t *pMessageHeader = pUnpackedBuf;
-  uint8_t *pReadPackedMessage = pMessageBuf;
 
   AssertFatal(pMessageBuf != NULL && pUnpackedBuf != NULL, "P5 unpack supplied pointers are null");
-  uint8_t *end = (uint8_t *)pMessageBuf + messageBufLen;
   AssertFatal(messageBufLen >= NFAPI_HEADER_LENGTH && unpackedBufLen >= sizeof(fapi_message_header_t),
               "P5 unpack supplied message buffer is too small %d, %d\n",
               messageBufLen,
               unpackedBufLen);
   // clean the supplied buffer for - tag value blanking
   (void)memset(pUnpackedBuf, 0, unpackedBufLen);
-  if (fapi_nr_message_header_unpack(&pReadPackedMessage, NFAPI_HEADER_LENGTH, pMessageHeader, sizeof(fapi_message_header_t), 0)
+  if (fapi_nr_message_header_unpack(pMessageBuf, NFAPI_HEADER_LENGTH, pMessageHeader, sizeof(fapi_message_header_t), 0)
       < 0) {
     // failed to read the header
     return -1;
   }
-
+  uint8_t *pReadPackedMessage = pMessageBuf + NFAPI_HEADER_LENGTH;
+  uint8_t *end = (uint8_t *)pMessageBuf + messageBufLen;
   int result = -1;
 
   if (check_nr_fapi_unpack_length(pMessageHeader->message_id, unpackedBufLen) == 0) {
diff --git a/nfapi/open-nFAPI/fapi/src/nr_fapi_p7.c b/nfapi/open-nFAPI/fapi/src/nr_fapi_p7.c
index 7b840fc126..4f73e4596c 100644
--- a/nfapi/open-nFAPI/fapi/src/nr_fapi_p7.c
+++ b/nfapi/open-nFAPI/fapi/src/nr_fapi_p7.c
@@ -143,20 +143,19 @@ int fapi_nr_p7_message_unpack(void *pMessageBuf,
   int result = 0;
   nfapi_nr_p7_message_header_t *pMessageHeader = (nfapi_nr_p7_message_header_t *)pUnpackedBuf;
   fapi_message_header_t fapi_hdr;
-  uint8_t *pReadPackedMessage = pMessageBuf;
-
   AssertFatal(pMessageBuf != NULL && pUnpackedBuf != NULL, "P7 unpack supplied pointers are null");
-  uint8_t *end = (uint8_t *)pMessageBuf + messageBufLen;
+
   AssertFatal(messageBufLen >= NFAPI_HEADER_LENGTH && unpackedBufLen >= sizeof(fapi_message_header_t),
               "P5 unpack supplied message buffer is too small %d, %d\n",
               messageBufLen,
               unpackedBufLen);
 
-
-  if (fapi_nr_message_header_unpack(&pReadPackedMessage, NFAPI_HEADER_LENGTH, &fapi_hdr, sizeof(fapi_message_header_t), 0) < 0) {
+  if (fapi_nr_message_header_unpack(pMessageBuf, NFAPI_HEADER_LENGTH, &fapi_hdr, sizeof(fapi_message_header_t), 0) < 0) {
     // failed to read the header
     return -1;
   }
+  uint8_t *pReadPackedMessage = pMessageBuf + NFAPI_HEADER_LENGTH;
+  uint8_t *end = (uint8_t *)pMessageBuf + messageBufLen;
   pMessageHeader->message_length = fapi_hdr.message_length;
   pMessageHeader->message_id = fapi_hdr.message_id;
   if ((uint8_t *)(pMessageBuf + pMessageHeader->message_length) > end) {
diff --git a/nfapi/tests/p5/nr_fapi_config_request_test.c b/nfapi/tests/p5/nr_fapi_config_request_test.c
index 82ce60ca3b..bfb3f7fa21 100644
--- a/nfapi/tests/p5/nr_fapi_config_request_test.c
+++ b/nfapi/tests/p5/nr_fapi_config_request_test.c
@@ -334,7 +334,7 @@ static void test_pack_unpack(nfapi_nr_config_request_scf_t *req)
     header_buffer[idx] = msg_buf[idx];
   }
   uint8_t *pReadPackedMessage = header_buffer;
-  int unpack_header_result = fapi_nr_message_header_unpack(&pReadPackedMessage, NFAPI_HEADER_LENGTH, &header, sizeof(header), 0);
+  int unpack_header_result = fapi_nr_message_header_unpack(pReadPackedMessage, NFAPI_HEADER_LENGTH, &header, sizeof(header), 0);
   DevAssert(unpack_header_result >= 0);
   DevAssert(header.message_id == req->header.message_id);
   DevAssert(header.message_length == req->header.message_length);
diff --git a/nfapi/tests/p5/nr_fapi_config_response_test.c b/nfapi/tests/p5/nr_fapi_config_response_test.c
index bc44b4b6fd..36a6389c0c 100644
--- a/nfapi/tests/p5/nr_fapi_config_response_test.c
+++ b/nfapi/tests/p5/nr_fapi_config_response_test.c
@@ -92,7 +92,7 @@ void test_pack_unpack(nfapi_nr_config_response_scf_t *req)
     header_buffer[idx] = msg_buf[idx];
   }
   uint8_t *pReadPackedMessage = header_buffer;
-  int unpack_header_result = fapi_nr_message_header_unpack(&pReadPackedMessage, NFAPI_HEADER_LENGTH, &header, sizeof(header), 0);
+  int unpack_header_result = fapi_nr_message_header_unpack(pReadPackedMessage, NFAPI_HEADER_LENGTH, &header, sizeof(header), 0);
   DevAssert(unpack_header_result >= 0);
   DevAssert(header.message_id == req->header.message_id);
   DevAssert(header.message_length == req->header.message_length);
diff --git a/nfapi/tests/p5/nr_fapi_error_indication_test.c b/nfapi/tests/p5/nr_fapi_error_indication_test.c
index 85ef17b536..772b9bccea 100644
--- a/nfapi/tests/p5/nr_fapi_error_indication_test.c
+++ b/nfapi/tests/p5/nr_fapi_error_indication_test.c
@@ -40,7 +40,7 @@ void test_pack_unpack(nfapi_nr_error_indication_scf_t *req)
     header_buffer[idx] = msg_buf[idx];
   }
   uint8_t *pReadPackedMessage = header_buffer;
-  int unpack_header_result = fapi_nr_message_header_unpack(&pReadPackedMessage, NFAPI_HEADER_LENGTH, &header, sizeof(header), 0);
+  int unpack_header_result = fapi_nr_message_header_unpack(pReadPackedMessage, NFAPI_HEADER_LENGTH, &header, sizeof(header), 0);
   DevAssert(unpack_header_result >= 0);
   DevAssert(header.message_id == req->header.message_id);
   DevAssert(header.message_length == req->header.message_length);
diff --git a/nfapi/tests/p5/nr_fapi_param_request_test.c b/nfapi/tests/p5/nr_fapi_param_request_test.c
index d42717eaeb..0af3fd9633 100644
--- a/nfapi/tests/p5/nr_fapi_param_request_test.c
+++ b/nfapi/tests/p5/nr_fapi_param_request_test.c
@@ -41,7 +41,7 @@ void test_pack_unpack(nfapi_nr_param_request_scf_t *req)
     header_buffer[idx] = msg_buf[idx];
   }
   uint8_t *pReadPackedMessage = header_buffer;
-  int unpack_header_result = fapi_nr_message_header_unpack(&pReadPackedMessage, NFAPI_HEADER_LENGTH, &header, sizeof(header), 0);
+  int unpack_header_result = fapi_nr_message_header_unpack(pReadPackedMessage, NFAPI_HEADER_LENGTH, &header, sizeof(header), 0);
   DevAssert(unpack_header_result >= 0);
   DevAssert(header.message_id == req->header.message_id);
   DevAssert(header.message_length == req->header.message_length);
diff --git a/nfapi/tests/p5/nr_fapi_param_response_test.c b/nfapi/tests/p5/nr_fapi_param_response_test.c
index 1ba14c1655..e94e805bcb 100644
--- a/nfapi/tests/p5/nr_fapi_param_response_test.c
+++ b/nfapi/tests/p5/nr_fapi_param_response_test.c
@@ -233,7 +233,7 @@ void test_pack_unpack(nfapi_nr_param_response_scf_t *req)
     header_buffer[idx] = msg_buf[idx];
   }
   uint8_t *pReadPackedMessage = header_buffer;
-  int unpack_header_result = fapi_nr_message_header_unpack(&pReadPackedMessage, NFAPI_HEADER_LENGTH, &header, sizeof(header), 0);
+  int unpack_header_result = fapi_nr_message_header_unpack(pReadPackedMessage, NFAPI_HEADER_LENGTH, &header, sizeof(header), 0);
   DevAssert(unpack_header_result >= 0);
   DevAssert(header.message_id == req->header.message_id);
   DevAssert(header.message_length == req->header.message_length);
diff --git a/nfapi/tests/p5/nr_fapi_start_request_test.c b/nfapi/tests/p5/nr_fapi_start_request_test.c
index 9a36528db6..d908fbe023 100644
--- a/nfapi/tests/p5/nr_fapi_start_request_test.c
+++ b/nfapi/tests/p5/nr_fapi_start_request_test.c
@@ -41,7 +41,7 @@ void test_pack_unpack(nfapi_nr_start_request_scf_t *req)
     header_buffer[idx] = msg_buf[idx];
   }
   uint8_t *pReadPackedMessage = header_buffer;
-  int unpack_header_result = fapi_nr_message_header_unpack(&pReadPackedMessage, NFAPI_HEADER_LENGTH, &header, sizeof(header), 0);
+  int unpack_header_result = fapi_nr_message_header_unpack(pReadPackedMessage, NFAPI_HEADER_LENGTH, &header, sizeof(header), 0);
   DevAssert(unpack_header_result >= 0);
   DevAssert(header.message_id == req->header.message_id);
   DevAssert(header.message_length == req->header.message_length);
diff --git a/nfapi/tests/p5/nr_fapi_start_response_test.c b/nfapi/tests/p5/nr_fapi_start_response_test.c
index bb3a096734..9d9423de83 100644
--- a/nfapi/tests/p5/nr_fapi_start_response_test.c
+++ b/nfapi/tests/p5/nr_fapi_start_response_test.c
@@ -41,7 +41,7 @@ void test_pack_unpack(nfapi_nr_start_response_scf_t *req)
     header_buffer[idx] = msg_buf[idx];
   }
   uint8_t *pReadPackedMessage = header_buffer;
-  int unpack_header_result = fapi_nr_message_header_unpack(&pReadPackedMessage, NFAPI_HEADER_LENGTH, &header, sizeof(header), 0);
+  int unpack_header_result = fapi_nr_message_header_unpack(pReadPackedMessage, NFAPI_HEADER_LENGTH, &header, sizeof(header), 0);
   DevAssert(unpack_header_result >= 0);
   DevAssert(header.message_id == req->header.message_id);
   DevAssert(header.message_length == req->header.message_length);
diff --git a/nfapi/tests/p5/nr_fapi_stop_indication_test.c b/nfapi/tests/p5/nr_fapi_stop_indication_test.c
index 4b5d9d4319..e4205d982c 100644
--- a/nfapi/tests/p5/nr_fapi_stop_indication_test.c
+++ b/nfapi/tests/p5/nr_fapi_stop_indication_test.c
@@ -41,7 +41,7 @@ void test_pack_unpack(nfapi_nr_stop_indication_scf_t *req)
     header_buffer[idx] = msg_buf[idx];
   }
   uint8_t *pReadPackedMessage = header_buffer;
-  int unpack_header_result = fapi_nr_message_header_unpack(&pReadPackedMessage, NFAPI_HEADER_LENGTH, &header, sizeof(header), 0);
+  int unpack_header_result = fapi_nr_message_header_unpack(pReadPackedMessage, NFAPI_HEADER_LENGTH, &header, sizeof(header), 0);
   DevAssert(unpack_header_result >= 0);
   DevAssert(header.message_id == req->header.message_id);
   DevAssert(header.message_length == req->header.message_length);
diff --git a/nfapi/tests/p5/nr_fapi_stop_request_test.c b/nfapi/tests/p5/nr_fapi_stop_request_test.c
index 74e5ea31ff..3536ad2272 100644
--- a/nfapi/tests/p5/nr_fapi_stop_request_test.c
+++ b/nfapi/tests/p5/nr_fapi_stop_request_test.c
@@ -41,7 +41,7 @@ void test_pack_unpack(nfapi_nr_stop_request_scf_t *req)
     header_buffer[idx] = msg_buf[idx];
   }
   uint8_t *pReadPackedMessage = header_buffer;
-  int unpack_header_result = fapi_nr_message_header_unpack(&pReadPackedMessage, NFAPI_HEADER_LENGTH, &header, sizeof(header), 0);
+  int unpack_header_result = fapi_nr_message_header_unpack(pReadPackedMessage, NFAPI_HEADER_LENGTH, &header, sizeof(header), 0);
   DevAssert(unpack_header_result >= 0);
   DevAssert(header.message_id == req->header.message_id);
   DevAssert(header.message_length == req->header.message_length);
diff --git a/nfapi/tests/p7/nr_fapi_crc_indication_test.c b/nfapi/tests/p7/nr_fapi_crc_indication_test.c
index 472959b0d6..71bb8eca1b 100644
--- a/nfapi/tests/p7/nr_fapi_crc_indication_test.c
+++ b/nfapi/tests/p7/nr_fapi_crc_indication_test.c
@@ -72,7 +72,7 @@ static void test_pack_unpack(nfapi_nr_crc_indication_t *req)
     header_buffer[idx] = msg_buf[idx];
   }
   uint8_t *pReadPackedMessage = header_buffer;
-  int unpack_header_result = fapi_nr_message_header_unpack(&pReadPackedMessage, NFAPI_HEADER_LENGTH, &header, sizeof(header), 0);
+  int unpack_header_result = fapi_nr_p7_message_header_unpack(pReadPackedMessage, NFAPI_HEADER_LENGTH, &header, sizeof(header), 0);
   DevAssert(unpack_header_result >= 0);
   DevAssert(header.message_id == req->header.message_id);
   DevAssert(header.message_length == req->header.message_length);
diff --git a/nfapi/tests/p7/nr_fapi_dl_tti_request_test.c b/nfapi/tests/p7/nr_fapi_dl_tti_request_test.c
index 2cc95260f0..599a3b85a5 100644
--- a/nfapi/tests/p7/nr_fapi_dl_tti_request_test.c
+++ b/nfapi/tests/p7/nr_fapi_dl_tti_request_test.c
@@ -241,7 +241,7 @@ static void test_pack_unpack(nfapi_nr_dl_tti_request_t *req)
     header_buffer[idx] = msg_buf[idx];
   }
   uint8_t *pReadPackedMessage = header_buffer;
-  int unpack_header_result = fapi_nr_message_header_unpack(&pReadPackedMessage, NFAPI_HEADER_LENGTH, &header, sizeof(header), 0);
+  int unpack_header_result = fapi_nr_p7_message_header_unpack(pReadPackedMessage, NFAPI_HEADER_LENGTH, &header, sizeof(header), 0);
   DevAssert(unpack_header_result >= 0);
   DevAssert(header.message_id == req->header.message_id);
   DevAssert(header.message_length == req->header.message_length);
diff --git a/nfapi/tests/p7/nr_fapi_rach_indication_test.c b/nfapi/tests/p7/nr_fapi_rach_indication_test.c
index fd4a0fac32..83f569a7d1 100644
--- a/nfapi/tests/p7/nr_fapi_rach_indication_test.c
+++ b/nfapi/tests/p7/nr_fapi_rach_indication_test.c
@@ -71,7 +71,7 @@ static void test_pack_unpack(nfapi_nr_rach_indication_t *req)
     header_buffer[idx] = msg_buf[idx];
   }
   uint8_t *pReadPackedMessage = header_buffer;
-  int unpack_header_result = fapi_nr_message_header_unpack(&pReadPackedMessage, NFAPI_HEADER_LENGTH, &header, sizeof(header), 0);
+  int unpack_header_result = fapi_nr_p7_message_header_unpack(pReadPackedMessage, NFAPI_HEADER_LENGTH, &header, sizeof(header), 0);
   DevAssert(unpack_header_result >= 0);
   DevAssert(header.message_id == req->header.message_id);
   DevAssert(header.message_length == req->header.message_length);
diff --git a/nfapi/tests/p7/nr_fapi_rx_data_indication_test.c b/nfapi/tests/p7/nr_fapi_rx_data_indication_test.c
index 2f382cf797..18445a0ee2 100644
--- a/nfapi/tests/p7/nr_fapi_rx_data_indication_test.c
+++ b/nfapi/tests/p7/nr_fapi_rx_data_indication_test.c
@@ -69,7 +69,7 @@ static void test_pack_unpack(nfapi_nr_rx_data_indication_t *req)
     header_buffer[idx] = msg_buf[idx];
   }
   uint8_t *pReadPackedMessage = header_buffer;
-  int unpack_header_result = fapi_nr_message_header_unpack(&pReadPackedMessage, NFAPI_HEADER_LENGTH, &header, sizeof(header), 0);
+  int unpack_header_result = fapi_nr_p7_message_header_unpack(pReadPackedMessage, NFAPI_HEADER_LENGTH, &header, sizeof(header), 0);
   DevAssert(unpack_header_result >= 0);
   DevAssert(header.message_id == req->header.message_id);
   DevAssert(header.message_length == req->header.message_length);
diff --git a/nfapi/tests/p7/nr_fapi_slot_indication_test.c b/nfapi/tests/p7/nr_fapi_slot_indication_test.c
index 96c030479c..414b52332f 100644
--- a/nfapi/tests/p7/nr_fapi_slot_indication_test.c
+++ b/nfapi/tests/p7/nr_fapi_slot_indication_test.c
@@ -47,7 +47,7 @@ static void test_pack_unpack(nfapi_nr_slot_indication_scf_t *req)
     header_buffer[idx] = msg_buf[idx];
   }
   uint8_t *pReadPackedMessage = header_buffer;
-  int unpack_header_result = fapi_nr_message_header_unpack(&pReadPackedMessage, NFAPI_HEADER_LENGTH, &header, sizeof(header), 0);
+  int unpack_header_result = fapi_nr_message_header_unpack(pReadPackedMessage, NFAPI_HEADER_LENGTH, &header, sizeof(header), 0);
   DevAssert(unpack_header_result >= 0);
   DevAssert(header.message_id == req->header.message_id);
   DevAssert(header.message_length == req->header.message_length);
diff --git a/nfapi/tests/p7/nr_fapi_srs_indication_test.c b/nfapi/tests/p7/nr_fapi_srs_indication_test.c
index 1271606b77..363aa43962 100644
--- a/nfapi/tests/p7/nr_fapi_srs_indication_test.c
+++ b/nfapi/tests/p7/nr_fapi_srs_indication_test.c
@@ -78,7 +78,7 @@ static void test_pack_unpack(nfapi_nr_srs_indication_t *req)
     header_buffer[idx] = msg_buf[idx];
   }
   uint8_t *pReadPackedMessage = header_buffer;
-  int unpack_header_result = fapi_nr_message_header_unpack(&pReadPackedMessage, NFAPI_HEADER_LENGTH, &header, sizeof(header), 0);
+  int unpack_header_result = fapi_nr_p7_message_header_unpack(pReadPackedMessage, NFAPI_HEADER_LENGTH, &header, sizeof(header), 0);
   DevAssert(unpack_header_result >= 0);
   DevAssert(header.message_id == req->header.message_id);
   DevAssert(header.message_length == req->header.message_length);
diff --git a/nfapi/tests/p7/nr_fapi_tx_data_request_test.c b/nfapi/tests/p7/nr_fapi_tx_data_request_test.c
index e67b5bf3ca..660c514b9c 100644
--- a/nfapi/tests/p7/nr_fapi_tx_data_request_test.c
+++ b/nfapi/tests/p7/nr_fapi_tx_data_request_test.c
@@ -132,7 +132,7 @@ static void test_pack_unpack(nfapi_nr_tx_data_request_t *req)
     header_buffer[idx] = msg_buf[idx];
   }
   uint8_t *pReadPackedMessage = header_buffer;
-  int unpack_header_result = fapi_nr_message_header_unpack(&pReadPackedMessage, NFAPI_HEADER_LENGTH, &header, sizeof(header), 0);
+  int unpack_header_result = fapi_nr_p7_message_header_unpack(pReadPackedMessage, NFAPI_HEADER_LENGTH, &header, sizeof(header), 0);
   DevAssert(unpack_header_result >= 0);
   DevAssert(header.message_id == req->header.message_id);
   DevAssert(header.message_length == req->header.message_length);
diff --git a/nfapi/tests/p7/nr_fapi_uci_indication_test.c b/nfapi/tests/p7/nr_fapi_uci_indication_test.c
index 9e2dcda6be..53f8469325 100644
--- a/nfapi/tests/p7/nr_fapi_uci_indication_test.c
+++ b/nfapi/tests/p7/nr_fapi_uci_indication_test.c
@@ -199,7 +199,7 @@ static void test_pack_unpack(nfapi_nr_uci_indication_t *req)
     header_buffer[idx] = msg_buf[idx];
   }
   uint8_t *pReadPackedMessage = header_buffer;
-  int unpack_header_result = fapi_nr_message_header_unpack(&pReadPackedMessage, NFAPI_HEADER_LENGTH, &header, sizeof(header), 0);
+  int unpack_header_result = fapi_nr_p7_message_header_unpack(pReadPackedMessage, NFAPI_HEADER_LENGTH, &header, sizeof(header), 0);
   DevAssert(unpack_header_result >= 0);
   DevAssert(header.message_id == req->header.message_id);
   DevAssert(header.message_length == req->header.message_length);
diff --git a/nfapi/tests/p7/nr_fapi_ul_dci_request_test.c b/nfapi/tests/p7/nr_fapi_ul_dci_request_test.c
index b1bc910da8..709c1c9db9 100644
--- a/nfapi/tests/p7/nr_fapi_ul_dci_request_test.c
+++ b/nfapi/tests/p7/nr_fapi_ul_dci_request_test.c
@@ -103,7 +103,7 @@ static void test_pack_unpack(nfapi_nr_ul_dci_request_t *req)
     header_buffer[idx] = msg_buf[idx];
   }
   uint8_t *pReadPackedMessage = header_buffer;
-  int unpack_header_result = fapi_nr_message_header_unpack(&pReadPackedMessage, NFAPI_HEADER_LENGTH, &header, sizeof(header), 0);
+  int unpack_header_result = fapi_nr_p7_message_header_unpack(pReadPackedMessage, NFAPI_HEADER_LENGTH, &header, sizeof(header), 0);
   DevAssert(unpack_header_result >= 0);
   DevAssert(header.message_id == req->header.message_id);
   DevAssert(header.message_length == req->header.message_length);
diff --git a/nfapi/tests/p7/nr_fapi_ul_tti_request_test.c b/nfapi/tests/p7/nr_fapi_ul_tti_request_test.c
index 4f65cbfc9e..f7087c92ef 100644
--- a/nfapi/tests/p7/nr_fapi_ul_tti_request_test.c
+++ b/nfapi/tests/p7/nr_fapi_ul_tti_request_test.c
@@ -422,7 +422,7 @@ static void test_pack_unpack(nfapi_nr_ul_tti_request_t *req)
     header_buffer[idx] = msg_buf[idx];
   }
   uint8_t *pReadPackedMessage = header_buffer;
-  int unpack_header_result = fapi_nr_message_header_unpack(&pReadPackedMessage, NFAPI_HEADER_LENGTH, &header, sizeof(header), 0);
+  int unpack_header_result = fapi_nr_p7_message_header_unpack(pReadPackedMessage, NFAPI_HEADER_LENGTH, &header, sizeof(header), 0);
   DevAssert(unpack_header_result >= 0);
   DevAssert(header.message_id == req->header.message_id);
   DevAssert(header.message_length == req->header.message_length);