Cleanup of logs and asserts used in packing/unpacking procedures.

Change FAPI packing/unpacking to make use of existing nFAPI structs.
Change unitary tests to use existing nFAPI structs when testing for FAPI support.
Update PARAM.response tlv comparison.

nfapi/open-nFAPI/fapi/inc/nr_fapi.h

@@ -44,10 +44,11 @@
 #include "nfapi_interface.h"
 #include "nfapi_nr_interface_scf.h"
 #include "nfapi.h"
-
-#include "common/utils/LOG/log.h"
+#include "assertions.h"
 #include "debug.h"
 
+#define DEBUG_FAPI_NFAPI_MSGS 0
+
 typedef struct {
   uint8_t num_msg;
   uint8_t opaque_handle;

nfapi/tests/p5/nr_fapi_param_request_test.c

@@ -3,28 +3,22 @@
 int main(int n, char *v[])
 {
   srand(time(NULL));
-#ifndef _STANDALONE_TESTING_
   logInit();
   set_glog(OAILOG_DISABLE);
-#endif
 
-  fapi_nr_param_request_scf_t req;
+  nfapi_nr_param_request_scf_t req;
   memset(&req, 0, sizeof(req));
   req.header.message_id = NFAPI_NR_PHY_MSG_TYPE_PARAM_REQUEST;
-  req.header.num_msg = rand16();
-  req.header.opaque_handle = rand16();
+  // FAPI doesn't have these 2 following parameters, dont use
+  req.header.phy_id = 0;
+  req.header.spare = 0;
   uint8_t msg_buf[8192];
   uint16_t msg_len = sizeof(req);
 
   // first test the packing procedure
-  printf("Test the packing procedure by checking the return value\n");
   int pack_result = fapi_nr_p5_message_pack(&req, msg_len, msg_buf, sizeof(msg_buf), NULL);
-
   // PARAM.request message body length is 0
-  AssertFatal(pack_result == 0 + NFAPI_HEADER_LENGTH,
-              "fapi_p5_message_pack packed_length not equal to NFAPI_HEADER_LENGTH + body length (8+0)! Reported value was %d\n",
-              pack_result);
-  printf("fapi_p5_message_pack packed_length 0x%02x\n", pack_result);
+  DevAssert(pack_result == 0 + NFAPI_HEADER_LENGTH);
   for (int i = 0; i < pack_result; i++) {
     printf("0x%02x ", msg_buf[i]);
   }
@@ -43,54 +37,16 @@ int main(int n, char *v[])
   printf("Test the header unpacking and compare with initial message\n");
   int unpack_header_result = fapi_nr_p5_message_header_unpack(&pReadPackedMessage, NFAPI_HEADER_LENGTH, &header, sizeof(header), 0);
   AssertFatal(unpack_header_result >= 0, "nfapi_p5_message_header_unpack failed with return %d\n", unpack_header_result);
-  printf("num_msg: 0x%02x\n", header.num_msg);
-  AssertFatal(header.num_msg == req.header.num_msg,
-              "num_msg was not the same as the packed value! Unpacked value was 0x%02x , and Packed value was 0x%02x\n",
-              header.num_msg,
-              req.header.num_msg);
-  printf("opaque_handle: 0x%02x\n", header.opaque_handle);
-  AssertFatal(header.opaque_handle == req.header.opaque_handle,
-              "Spare was not the same as the packed value! Unpacked value was 0x%02x , and Packed value was 0x%02x\n",
-              header.opaque_handle,
-              req.header.opaque_handle);
-  printf("Message ID : 0x%02x\n", header.message_id);
-  AssertFatal(header.message_id == req.header.message_id,
-              "Message ID was not the same as the packed value! Unpacked value was 0x%02x , and Packed value was 0x%02x\n",
-              header.message_id,
-              req.header.message_id);
-  printf("Message length : 0x%02x\n", header.message_length);
-  AssertFatal(header.message_length == req.header.message_length,
-              "Message length was not the same as the packed value! Unpacked value was 0x%02x , and Packed value was 0x%02x\n",
-              header.message_length,
-              req.header.message_length);
-
-  printf("Test the unpacking and compare with initial message\n");
+  DevAssert(header.message_id == req.header.message_id);
+  DevAssert(header.message_length == req.header.message_length);
   // test the unpacking and compare with initial message
-  fapi_nr_param_request_scf_t unpacked_req;
+  nfapi_nr_param_request_scf_t unpacked_req;
   memset(&unpacked_req, 0, sizeof(unpacked_req));
   int unpack_result =
       fapi_nr_p5_message_unpack(msg_buf, header.message_length + NFAPI_HEADER_LENGTH, &unpacked_req, sizeof(unpacked_req), NULL);
-  AssertFatal(unpack_result >= 0, "fapi_nr_p5_message_unpack failed with return %d\n", unpack_result);
-  printf("num_msg: 0x%02x\n", unpacked_req.header.num_msg);
-  AssertFatal(unpacked_req.header.num_msg == req.header.num_msg,
-              "num_msg was not the same as the packed value! Unpacked value was 0x%02x , and Packed value was 0x%02x\n",
-              unpacked_req.header.num_msg,
-              req.header.num_msg);
-  printf("opaque_handle: 0x%02x\n", unpacked_req.header.opaque_handle);
-  AssertFatal(unpacked_req.header.opaque_handle == req.header.opaque_handle,
-              "opaque_handle was not the same as the packed value! Unpacked value was 0x%02x , and Packed value was 0x%02x\n",
-              unpacked_req.header.opaque_handle,
-              req.header.opaque_handle);
-  printf("Message id : 0x%02x\n", unpacked_req.header.message_id);
-  AssertFatal(unpacked_req.header.message_id == req.header.message_id,
-              "Message id was not 0x%02x, was 0x%02x\n",
-              req.header.message_id,
-              unpacked_req.header.message_id);
-  printf("Message length : 0x%02x\n", unpacked_req.header.message_length);
-  AssertFatal(unpacked_req.header.message_length == req.header.message_length,
-              "Message length was not the same as the value previously packed, was 0x%02x\n",
-              unpacked_req.header.message_length);
-
+  DevAssert(unpack_result >= 0);
+  DevAssert(unpacked_req.header.message_id == req.header.message_id);
+  DevAssert(unpacked_req.header.message_length == req.header.message_length);
   // All tests successful!
   return 0;
 }