commit b746825418101ed2eabc4043eecbd76090b041ce
author Dave Rodgman <dave.rodgman@arm.com> Wed Apr 07 12:44:02 2021 +0100
committer Dave Rodgman <dave.rodgman@arm.com> Wed Apr 07 12:45:35 2021 +0100
tree 97fdc7cfd7d3ee480c639c9ecdb742f11975886b
parent b42025977706261ac51442f90a0a0c72a852b9a8

Capitalise MPS trace macros

Capitalise the MPS trace macros, as per the coding style (and make a slight
change to naming convention to avoid a name collision).

Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>

library/mps_trace.h

diff --git a/library/mps_trace.h b/library/mps_trace.h
index 048d573..7c23601 100644
--- a/library/mps_trace.h
+++ b/library/mps_trace.h
@@ -60,10 +60,10 @@
 
 typedef enum
 {
-    mbedtls_mps_trace_comment,
-    mbedtls_mps_trace_call,
-    mbedtls_mps_trace_error,
-    mbedtls_mps_trace_return
+    MBEDTLS_MPS_TRACE_TYPE_COMMENT,
+    MBEDTLS_MPS_TRACE_TYPE_CALL,
+    MBEDTLS_MPS_TRACE_TYPE_ERROR,
+    MBEDTLS_MPS_TRACE_TYPE_RETURN
 } mbedtls_mps_trace_type;
 
 #define MBEDTLS_MPS_TRACE_BIT_LAYER_1 1
@@ -141,7 +141,7 @@
     do {                                                                      \
         if( ! ( MBEDTLS_MPS_TRACE_MASK & ( 1u << mbedtls_mps_trace_id ) ) )   \
             break;                                                            \
-        MBEDTLS_MPS_TRACE( mbedtls_mps_trace_call, __VA_ARGS__ );             \
+        MBEDTLS_MPS_TRACE( MBEDTLS_MPS_TRACE_TYPE_CALL, __VA_ARGS__ );        \
         mbedtls_mps_trace_inc_depth();                                        \
     } while( 0 )
 
@@ -149,7 +149,7 @@
     do {                                                                    \
         if( ! ( MBEDTLS_MPS_TRACE_MASK & ( 1u << mbedtls_mps_trace_id ) ) ) \
             break;                                                          \
-        MBEDTLS_MPS_TRACE( mbedtls_mps_trace_return, "%d (-%#04x)",         \
+        MBEDTLS_MPS_TRACE( MBEDTLS_MPS_TRACE_TYPE_RETURN, "%d (-%#04x)",    \
                (int) (val), -((unsigned)(val)) );                           \
         mbedtls_mps_trace_dec_depth();                                      \
     } while( 0 )