From 91a91738c0d7f4128edd5f2806b6b5292a698608 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Per=20=C3=85strand?= <per.astrand@arm.com>
Date: Fri, 25 Sep 2020 15:04:26 +0200
Subject: Move to inttypes format specifiers for printf

Change-Id: I799add461ab0db5b86c78a440937d722620e6d3b
---
 .../inference_process/src/inference_process.cc         |  6 ++++--
 applications/message_process/src/message_process.cc    | 18 +++++++++++-------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/applications/inference_process/src/inference_process.cc b/applications/inference_process/src/inference_process.cc
index 5807530..7f4a309 100644
--- a/applications/inference_process/src/inference_process.cc
+++ b/applications/inference_process/src/inference_process.cc
@@ -24,6 +24,8 @@
 
 #include "inference_process.hpp"
 
+#include <inttypes.h>
+
 #ifndef TENSOR_ARENA_SIZE
 #define TENSOR_ARENA_SIZE (1024)
 #endif
@@ -44,7 +46,7 @@ void print_output_data(TfLiteTensor *output, size_t bytesToPrint) {
     }
     printf("%d],\n", output->dims->data[dims_size - 1]);
 
-    printf("\"data_address\": \"%08x\",\n", (uint32_t)output->data.data);
+    printf("\"data_address\": \"%08" PRIx32 "\",\n", (uint32_t)output->data.data);
     printf("\"data\":\"");
     for (int i = 0; i < numBytesToPrint - 1; ++i) {
         if (i % 16 == 0 && i != 0) {
@@ -135,7 +137,7 @@ bool InferenceProcess::runJob(InferenceJob &job) {
     // Get model handle and verify that the version is correct
     const tflite::Model *model = ::tflite::GetModel(job.networkModel.data);
     if (model->version() != TFLITE_SCHEMA_VERSION) {
-        printf("Model provided is schema version %d not equal to supported version %d.\n",
+        printf("Model provided is schema version %" PRIu32 " not equal to supported version %d.\n",
                model->version(),
                TFLITE_SCHEMA_VERSION);
         return true;
diff --git a/applications/message_process/src/message_process.cc b/applications/message_process/src/message_process.cc
index b201f32..db8b446 100644
--- a/applications/message_process/src/message_process.cc
+++ b/applications/message_process/src/message_process.cc
@@ -21,6 +21,7 @@
 #include <cstddef>
 #include <cstdio>
 #include <cstring>
+#include <inttypes.h>
 
 using namespace std;
 using namespace InferenceProcess;
@@ -150,7 +151,7 @@ bool MessageProcess::handleMessage() {
         return false;
     }
 
-    printf("Message. type=%u, length=%u\n", msg.type, msg.length);
+    printf("Message. type=%" PRIu32 ", length=%" PRIu32 "\n", msg.type, msg.length);
 
     // Read payload
     if (!queueIn.read(data.data, msg.length)) {
@@ -168,25 +169,28 @@ bool MessageProcess::handleMessage() {
 
         ethosu_core_inference_req &req = data.inferenceReq;
 
-        printf("InferenceReq. user_arg=0x%x, network={0x%x, %u}", req.user_arg, req.network.ptr, req.network.size);
+        printf("InferenceReq. user_arg=0x%" PRIx64 ", network={0x%" PRIu32 ", %" PRIu32 "}",
+               req.user_arg,
+               req.network.ptr,
+               req.network.size);
 
-        printf(", ifm_count=%u, ifm=[", req.ifm_count);
+        printf(", ifm_count=%" PRIu32 ", ifm=[", req.ifm_count);
         for (uint32_t i = 0; i < req.ifm_count; ++i) {
             if (i > 0) {
                 printf(", ");
             }
 
-            printf("{0x%x, %u}", req.ifm[i].ptr, req.ifm[i].size);
+            printf("{0x%" PRIx32 ", %" PRIu32 "}", req.ifm[i].ptr, req.ifm[i].size);
         }
         printf("]");
 
-        printf(", ofm_count=%u, ofm=[", req.ofm_count);
+        printf(", ofm_count=%" PRIu32 ", ofm=[", req.ofm_count);
         for (uint32_t i = 0; i < req.ofm_count; ++i) {
             if (i > 0) {
                 printf(", ");
             }
 
-            printf("{0x%x, %u}", req.ofm[i].ptr, req.ofm[i].size);
+            printf("{0x%" PRIx32 ", %" PRIu32 "}", req.ofm[i].ptr, req.ofm[i].size);
         }
         printf("]\n");
 
@@ -235,7 +239,7 @@ void MessageProcess::sendInferenceRsp(uint64_t userArg, vector<DataPtr> &ofm, bo
         rsp.ofm_size[i] = ofm[i].size;
     }
 
-    printf("Sending inference response. userArg=0x%llx, ofm_count=%u, status=%u\n",
+    printf("Sending inference response. userArg=0x%" PRIx64 ", ofm_count=%" PRIu32 ", status=%" PRIu32 "\n",
            rsp.user_arg,
            rsp.ofm_count,
            rsp.status);
-- 
cgit v1.2.1