Merge pull request RIOT-OS#18335 from gschorcht/cpu/esp32/cleanup_esp…

…_log_for_esp32x_socs cpu/esp32: cleanup of esp_log_write
maribu · Jul 21, 2022 · 4ef8b34 · 4ef8b34
2 parents f40ac51 + d6ecb74
commit 4ef8b34
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 35 deletions.
diff --git a/cpu/esp32/esp-idf/esp_idf_support.c b/cpu/esp32/esp-idf/esp_idf_support.c
@@ -87,8 +87,6 @@ static esp_log_level_entry_t _log_levels[] = {
     { .tag = "*", .level = LOG_DEBUG },
 };
 
-static char _printf_buf[PRINTF_BUFSIZ];
-
 /*
  * provided by: /path/to/esp-idf/component/log/log.c
  */
@@ -131,39 +129,8 @@ void IRAM_ATTR esp_log_writev(esp_log_level_t level,
     if ((unsigned)act_level > CONFIG_LOG_DEFAULT_LEVEL) {
         return;
     }
-#if 0   /* seems not to be required any longer */
-    /*
-     * The format of log output from ESP SDK libraries is "X (s) t: message\n"
-     * where X is the log level, d the system time in milliseconds and t the
-     * tag. To be able to enable these additional information by module
-     * `esp_log_tagged`, we have to separate these information from the
-     * message here.
-     */
-    const char* msg = (strchr (format, ':') + 2);
-
-    va_list arglist;
-    va_copy(arglist, args);
-
-    /* remove time and tag argument from argument list */
-    va_arg(arglist, unsigned);
-    va_arg(arglist, const char*);
-    vsnprintf(_printf_buf, PRINTF_BUFSIZ, msg, arglist);
-    va_end(arglist);
-#else
-    va_list arglist;
-    va_copy(arglist, args);
-    vsnprintf(_printf_buf, PRINTF_BUFSIZ, format, arglist);
-    va_end(arglist);
-#endif
 
-    switch (act_level) {
-        case LOG_NONE   : return;
-        case LOG_ERROR  : LOG_TAG_ERROR  (tag, "%s", _printf_buf); break;
-        case LOG_WARNING: LOG_TAG_WARNING(tag, "%s", _printf_buf); break;
-        case LOG_INFO   : LOG_TAG_INFO   (tag, "%s", _printf_buf); break;
-        case LOG_DEBUG  : LOG_TAG_DEBUG  (tag, "%s", _printf_buf); break;
-        case LOG_ALL    : LOG_TAG_ALL    (tag, "%s", _printf_buf); break;
-    }
+    vprintf(format, args);
 }
 
 /*

diff --git a/cpu/esp_common/include/esp_common_log.h b/cpu/esp_common/include/esp_common_log.h
@@ -28,6 +28,7 @@ extern "C" {
 
 #include <stdio.h>
 #include <stdint.h>
+#include <inttypes.h>
 
 #include "log.h"
 
@@ -56,7 +57,7 @@ extern int ets_printf(const char *fmt, ...);
 
 #if MODULE_ESP_LOG_TAGGED
 
-#define LOG_FORMAT(letter, format)  LOG_COLOR_ ## letter #letter " (%d) [%s] " format LOG_RESET_COLOR
+#define LOG_FORMAT(letter, format)  LOG_COLOR_ ## letter #letter " (%" PRIu32 ") [%s] " format LOG_RESET_COLOR
 
 #define LOG_TAG(level, letter, tag, format, ...) \
                  do { \