Merge branch 'master' into release

PelionIoT · Apr 27, 2016 · 5ec9299 · 5ec9299
2 parents 433ba46 + b3e575f
commit 5ec9299
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/mbed-trace/mbed_trace.h b/mbed-trace/mbed_trace.h
@@ -276,7 +276,9 @@ char* mbed_trace_array(const uint8_t* buf, uint16_t len);
 #else // defined(__GNUC__) || defined(__CC_ARM)
 int  mbed_trace_init( void );
 void mbed_trace_free( void );
+void mbed_trace_buffer_sizes(int lineLength, int tmpLength);
 void mbed_trace_config_set(uint8_t config);
+uint8_t mbed_trace_config_get(void);
 void mbed_trace_prefix_function_set( char* (*pref_f)(size_t) );
 void mbed_trace_suffix_function_set(char* (*suffix_f)(void) );
 void mbed_trace_print_function_set( void (*print_f)(const char*) );
@@ -301,11 +303,14 @@ char* mbed_trace_ipv6_prefix(const uint8_t *prefix, uint8_t prefix_len);
 // trace functionality not supported
 #define mbed_trace_init(...)                ((void) 0)
 #define mbed_trace_free(...)                ((void) 0)
+#define mbed_trace_buffer_sizes(...)        ((void) 0)
 #define mbed_trace_config_set(...)          ((void) 0)
+#define mbed_trace_config_get(...)          ((void) 0)
 #define mbed_trace_prefix_function_set(...) ((void) 0)
 #define mbed_trace_suffix_function_set(...) ((void) 0)
 #define mbed_trace_print_function_set(...)  ((void) 0)
 #define mbed_trace_cmdprint_function_set(...)  ((void) 0)
+#define mbed_trace_exclude_filters_set(...) ((void) 0)
 #define mbed_trace_exclude_filters_get(...) ((void) 0)
 #define mbed_trace_include_filters_set(...) ((void) 0)
 #define mbed_trace_include_filters_get(...) ((void) 0)

diff --git a/module.json b/module.json
@@ -1,6 +1,6 @@
 {
   "name": "mbed-trace",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Trace library for mbed devices",
   "keywords": [
     "trace",

diff --git a/source/mbed_trace.c b/source/mbed_trace.c
@@ -422,7 +422,7 @@ const char *mbed_trace_last(void)
 }
 /* Helping functions */
 #define tmp_data_left()  m_trace.tmp_data_length-(m_trace.tmp_data_ptr-m_trace.tmp_data)
-#if YOTTA_CFG_MTRACE_FEA_IPV6 == 1
+#if YOTTA_CFG_MBED_TRACE_FEA_IPV6 == 1
 char *mbed_trace_ipv6(const void *addr_ptr)
 {
     char *str = m_trace.tmp_data_ptr;
@@ -474,7 +474,7 @@ char *mbed_trace_ipv6_prefix(const uint8_t *prefix, uint8_t prefix_len)
     m_trace.tmp_data_ptr += retval + 1;
     return str;
 }
-#endif //YOTTA_CFG_MTRACE_FEA_IPV6
+#endif //YOTTA_CFG_MBED_TRACE_FEA_IPV6
 char *mbed_trace_array(const uint8_t *buf, uint16_t len)
 {
     int i, bLeft = tmp_data_left();