From 046ff2e628d1628533b16d36d8c2564bf2004778 Mon Sep 17 00:00:00 2001
From: Anton Maklakov <anton@espressif.com>
Date: Mon, 6 Nov 2017 18:22:45 +0800
Subject: [PATCH] Make error codes looks like literals in the code of them
 (easy for searching). Minor fixes, typos

---
 components/bt/bt.c                        | 2 +-
 components/esp32/event_default_handlers.c | 2 +-
 components/esp32/include/rom/uart.h       | 5 ++---
 components/heap/include/esp_heap_caps.h   | 4 ++--
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/components/bt/bt.c b/components/bt/bt.c
index 0d848e214..0a69d40b4 100644
--- a/components/bt/bt.c
+++ b/components/bt/bt.c
@@ -85,7 +85,7 @@ extern uint32_t _data_end_btdm_rom;
 do{\
     esp_err_t __err = (api_call);\
     if ((ret) != __err) {\
-        BT_DEBUG("%s %d %s ret=%d\n", __FUNCTION__, __LINE__, (info), __err);\
+        BT_DEBUG("%s %d %s ret=0x%X\n", __FUNCTION__, __LINE__, (info), __err);\
         return __err;\
     }\
 } while(0)
diff --git a/components/esp32/event_default_handlers.c b/components/esp32/event_default_handlers.c
index 6b127e609..7de0cbb74 100644
--- a/components/esp32/event_default_handlers.c
+++ b/components/esp32/event_default_handlers.c
@@ -41,7 +41,7 @@ static const char* TAG = "event";
 do{\
     esp_err_t __err = (api_call);\
     if ((ret) != __err) {\
-        ESP_LOGE(TAG, "%s %d %s ret=%d", __FUNCTION__, __LINE__, (info), __err);\
+        ESP_LOGE(TAG, "%s %d %s ret=0x%X", __FUNCTION__, __LINE__, (info), __err);\
         return __err;\
     }\
 } while(0)
diff --git a/components/esp32/include/rom/uart.h b/components/esp32/include/rom/uart.h
index 8f075392c..0a3e1aeb6 100644
--- a/components/esp32/include/rom/uart.h
+++ b/components/esp32/include/rom/uart.h
@@ -128,7 +128,6 @@ typedef enum {
 } RcvMsgBuffState;
 
 typedef struct {
-//    uint32_t     RcvBuffSize;
     uint8_t *pRcvMsgBuff;
     uint8_t *pWritePos;
     uint8_t *pReadPos;
@@ -248,7 +247,7 @@ STATUS uart_tx_one_char(uint8_t TxChar);
   *
   * @return OK.
   */
-STATUS uart_tx_one_char2(uint8_t TxChar);//for send message
+STATUS uart_tx_one_char2(uint8_t TxChar);
 
 /**
   * @brief Wait until uart tx full empty.
@@ -285,7 +284,7 @@ static inline void IRAM_ATTR uart_tx_wait_idle(uint8_t uart_no) {
 STATUS uart_rx_one_char(uint8_t *pRxChar);
 
 /**
-  * @brief Get an input char to message channel, wait until successful.
+  * @brief Get an input char from message channel, wait until successful.
   *        Please do not call this function in SDK.
   *
   * @param  None
diff --git a/components/heap/include/esp_heap_caps.h b/components/heap/include/esp_heap_caps.h
index c9a983dba..5a7aa6bc2 100644
--- a/components/heap/include/esp_heap_caps.h
+++ b/components/heap/include/esp_heap_caps.h
@@ -67,7 +67,7 @@ void *heap_caps_malloc(size_t size, uint32_t caps);
 void heap_caps_free( void *ptr);
 
 /**
- * @brief Reallocate memory previously allocated via heap_caps_malloc() or heaps_caps_realloc().
+ * @brief Reallocate memory previously allocated via heap_caps_malloc() or heap_caps_realloc().
  *
  * Equivalent semantics to libc realloc(), for capability-aware memory.
  *
@@ -90,7 +90,7 @@ void *heap_caps_realloc( void *ptr, size_t size, int caps);
  *
  * Equivalent semantics to libc calloc(), for capability-aware memory.
  *
- * In IDF, ``calloc(p)`` is equivalent to ``heaps_caps_calloc(p, MALLOC_CAP_8BIT)``.
+ * In IDF, ``calloc(p)`` is equivalent to ``heap_caps_calloc(p, MALLOC_CAP_8BIT)``.
  *
  * @param n    Number of continuing chunks of memory to allocate
  * @param size Size, in bytes, of a chunk of memory to allocate