drivers: remove file paths from log statements

Function name and error string are usually sufficient to find the place which has triggered an error. __FILE__ macro generates a string which has absolute file name (with our build system), so there is a lot of long strings present in the program because of that.

Fixes https://github.com/espressif/esp-idf/issues/126

diff --git a/components/driver/gpio.c b/components/driver/gpio.c
index d5d4d9d40a03382b6e65f15cc860740923faea54..b2737bc7b8c1bee0b237655eeae606913701a3c0 100644 (file)
--- a/components/driver/gpio.c
+++ b/components/driver/gpio.c
@@ -20,11 +20,12 @@
 #include "soc/soc.h"
 #include "esp_log.h"
 
-static const char* GPIO_TAG = "GPIO";
-#define GPIO_CHECK(a, str, ret_val) if (!(a)) {                                         \
-        ESP_LOGE(GPIO_TAG,"%s:%d (%s):%s", __FILE__, __LINE__, __FUNCTION__, str);    \
-        return (ret_val);                                                               \
-        }
+static const char* GPIO_TAG = "gpio";
+#define GPIO_CHECK(a, str, ret_val) \
+    if (!(a)) { \
+        ESP_LOGE(GPIO_TAG,"%s(%d): %s", __FUNCTION__, __LINE__, str); \
+        return (ret_val); \
+    }
 
 const uint32_t GPIO_PIN_MUX_REG[GPIO_PIN_COUNT] = {
     GPIO_PIN_REG_0,

diff --git a/components/driver/ledc.c b/components/driver/ledc.c
index 893c78a6bebd8b8a280c775ab634af5e2c0a25a5..1a0e527d5089fb87cff1aeadbe01d26e8b76b167 100644 (file)
--- a/components/driver/ledc.c
+++ b/components/driver/ledc.c
@@ -20,12 +20,13 @@
 #include "driver/ledc.h"
 #include "esp_log.h"
 
-static const char* LEDC_TAG = "LEDC";
+static const char* LEDC_TAG = "ledc";
 static portMUX_TYPE ledc_spinlock = portMUX_INITIALIZER_UNLOCKED;
-#define LEDC_CHECK(a, str, ret_val) if (!(a)) {                                         \
-        ESP_LOGE(LEDC_TAG,"%s:%d (%s):%s", __FILE__, __LINE__, __FUNCTION__, str);    \
-        return (ret_val);                                                               \
-        }
+#define LEDC_CHECK(a, str, ret_val) \
+    if (!(a)) { \
+        ESP_LOGE(LEDC_TAG,"%s(%d): %s", __FUNCTION__, __LINE__, str); \
+        return (ret_val); \
+    }
 
 esp_err_t ledc_timer_set(ledc_mode_t speed_mode, ledc_timer_t timer_sel, uint32_t div_num, uint32_t bit_num, ledc_clk_src_t clk_src)
 {

diff --git a/components/driver/pcnt.c b/components/driver/pcnt.c
index b39d53a8002c668b7e78d531d8d4992b925344bc..67f0044f51d0d40467a6e47142c8088ffa8da4c6 100644 (file)
--- a/components/driver/pcnt.c
+++ b/components/driver/pcnt.c
@@ -23,12 +23,14 @@
 #define PCNT_COUNT_MODE_ERR_STR "PCNT COUNTER MODE ERROR"
 #define PCNT_CTRL_MODE_ERR_STR  "PCNT CTRL MODE ERROR"
 #define PCNT_EVT_TYPE_ERR_STR   "PCNT value type error"
-#define PCNT_CHECK(a,str,ret_val) if(!(a)) { \
-           ESP_LOGE(PCNT_TAG,"%s:%d (%s):%s", __FILE__, __LINE__, __FUNCTION__, str); \
-               return (ret_val); \
-        }
 
-static const char* PCNT_TAG = "PCNT";
+static const char* PCNT_TAG = "pcnt";
+#define PCNT_CHECK(a, str, ret_val) \
+    if (!(a)) { \
+        ESP_LOGE(PCNT_TAG,"%s(%d): %s", __FUNCTION__, __LINE__, str); \
+        return (ret_val); \
+    }
+
 static portMUX_TYPE pcnt_spinlock = portMUX_INITIALIZER_UNLOCKED;
 
 #define PCNT_ENTER_CRITICAL(mux)    portENTER_CRITICAL(mux)

diff --git a/components/driver/rmt.c b/components/driver/rmt.c
index 9fc36d49c2e35cc5e5a61b4a3d87a6f04dd26a4f..16e9693af97817efd80d3616fb8e94083fc6a3c2 100644 (file)
--- a/components/driver/rmt.c
+++ b/components/driver/rmt.c
@@ -43,13 +43,15 @@
 #define RMT_DRIVER_ERROR_STR      "RMT DRIVER ERR"
 #define RMT_DRIVER_LENGTH_ERROR_STR  "RMT PARAM LEN ERROR"
 
-static const char* RMT_TAG = "RMT";
+static const char* RMT_TAG = "rmt";
 static bool s_rmt_driver_installed = false;
 
-#define RMT_CHECK(a, str, ret) if (!(a)) {                                           \
-        ESP_LOGE(RMT_TAG,"%s:%d (%s):%s", __FILE__, __LINE__, __FUNCTION__, str);    \
-        return (ret);                                                                \
-        }
+#define RMT_CHECK(a, str, ret_val) \
+    if (!(a)) { \
+        ESP_LOGE(RMT_TAG,"%s(%d): %s", __FUNCTION__, __LINE__, str); \
+        return (ret_val); \
+    }
+
 static portMUX_TYPE rmt_spinlock = portMUX_INITIALIZER_UNLOCKED;
 
 typedef struct {

diff --git a/components/driver/timer.c b/components/driver/timer.c
index b305a414686a87e694a68d67a03f3a65b783e807..8aab200722b84a72e2942b647fbefa9cf1ec450f 100644 (file)
--- a/components/driver/timer.c
+++ b/components/driver/timer.c
@@ -20,11 +20,13 @@
 #include "driver/timer.h"\r
 #include "driver/periph_ctrl.h"\r
 \r
-static const char* TIMER_TAG = "TIMER_GROUP";\r
-#define TIMER_CHECK(a, str, ret_val) if (!(a)) {                                       \\r
-        ESP_LOGE(TIMER_TAG,"%s:%d (%s):%s", __FILE__, __LINE__, __FUNCTION__, str);    \\r
-        return (ret_val);                                                              \\r
-        }\r
+static const char* TIMER_TAG = "timer_group";\r
+#define TIMER_CHECK(a, str, ret_val) \\r
+    if (!(a)) { \\r
+        ESP_LOGE(TIMER_TAG,"%s(%d): %s", __FUNCTION__, __LINE__, str); \\r
+        return (ret_val); \\r
+    }\r
+\r
 #define TIMER_GROUP_NUM_ERROR   "TIMER GROUP NUM ERROR"\r
 #define TIMER_NUM_ERROR         "HW TIMER NUM ERROR"\r
 #define TIMER_PARAM_ADDR_ERROR  "HW TIMER PARAM ADDR ERROR"\r

diff --git a/components/driver/uart.c b/components/driver/uart.c
index 59b4904dcd7ece413a1ecb4dbb6815afd81f288f..6b894de963c679533ae8bbd5b6dcb22cc900c38d 100644 (file)
--- a/components/driver/uart.c
+++ b/components/driver/uart.c
@@ -27,11 +27,13 @@
 #include "driver/uart.h"\r
 #include "driver/gpio.h"\r
 \r
-static const char* UART_TAG = "UART";\r
-#define UART_CHECK(a, str, ret) if (!(a)) {                                             \\r
-        ESP_LOGE(UART_TAG,"%s:%d (%s):%s", __FILE__, __LINE__, __FUNCTION__, str);    \\r
-        return (ret);                                                                   \\r
-        }\r
+static const char* UART_TAG = "uart";\r
+#define UART_CHECK(a, str, ret_val) \\r
+    if (!(a)) { \\r
+        ESP_LOGE(UART_TAG,"%s(%d): %s", __FUNCTION__, __LINE__, str); \\r
+        return (ret_val); \\r
+    }\r
+\r
 #define UART_EMPTY_THRESH_DEFAULT  (10)\r
 #define UART_FULL_THRESH_DEFAULT  (120)\r
 #define UART_TOUT_THRESH_DEFAULT   (10)\r