From a0c73c5f92b86e659e6925bc47af8830eb8a6893 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@espressif.com>
Date: Thu, 18 Feb 2021 10:10:49 +1100
Subject: [PATCH] bt host: Don't redefine the assert macro

Required so that bt asserts obey the same configuration settings as other
asserts.

Progress towards https://github.com/espressif/esp-idf/issues/6306
---
 components/bt/common/include/bt_common.h            | 5 +----
 components/bt/host/bluedroid/bta/av/bta_av_aact.c   | 2 +-
 components/bt/host/bluedroid/bta/av/bta_av_main.c   | 2 +-
 components/bt/host/bluedroid/bta/dm/bta_dm_pm.c     | 2 +-
 components/bt/host/bluedroid/bta/sys/bta_sys_main.c | 2 +-
 components/bt/host/bluedroid/stack/avdt/avdt_ad.c   | 2 +-
 components/bt/host/bluedroid/stack/avrc/avrc_api.c  | 2 +-
 components/bt/host/bluedroid/stack/avrc/avrc_opt.c  | 2 +-
 8 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/components/bt/common/include/bt_common.h b/components/bt/common/include/bt_common.h
index 15662303e3..54984af6fb 100644
--- a/components/bt/common/include/bt_common.h
+++ b/components/bt/common/include/bt_common.h
@@ -16,6 +16,7 @@
 #ifndef _BT_COMMON_H_
 #define _BT_COMMON_H_
 
+#include <assert.h>
 #include "bt_user_config.h"
 #include "esp_log.h"
 
@@ -87,10 +88,6 @@
 #define BT_PRINT_D(tag, format, ...)   {esp_log_write(ESP_LOG_DEBUG,   tag, LOG_FORMAT(D, format), esp_log_timestamp(), tag, ##__VA_ARGS__); }
 #define BT_PRINT_V(tag, format, ...)   {esp_log_write(ESP_LOG_VERBOSE, tag, LOG_FORMAT(V, format), esp_log_timestamp(), tag, ##__VA_ARGS__); }
 
-#ifndef assert
-#define assert(x)   do { if (!(x)) BT_PRINT_E("BT", "bt host error %s %u\n", __FILE__, __LINE__); } while (0)
-#endif
-
 
 #if !UC_BT_STACK_NO_LOG
 /* define traces for BTC */
diff --git a/components/bt/host/bluedroid/bta/av/bta_av_aact.c b/components/bt/host/bluedroid/bta/av/bta_av_aact.c
index 35863d3217..60f7cdfa1c 100644
--- a/components/bt/host/bluedroid/bta/av/bta_av_aact.c
+++ b/components/bt/host/bluedroid/bta/av/bta_av_aact.c
@@ -27,7 +27,7 @@
 #include "common/bt_target.h"
 #if defined(BTA_AV_INCLUDED) && (BTA_AV_INCLUDED == TRUE)
 
-// #include <assert.h>
+#include <assert.h>
 #include "common/bt_trace.h"
 #include <string.h>
 
diff --git a/components/bt/host/bluedroid/bta/av/bta_av_main.c b/components/bt/host/bluedroid/bta/av/bta_av_main.c
index ae223fb635..561f0b60d0 100644
--- a/components/bt/host/bluedroid/bta/av/bta_av_main.c
+++ b/components/bt/host/bluedroid/bta/av/bta_av_main.c
@@ -22,7 +22,7 @@
  *
  ******************************************************************************/
 
-// #include <assert.h>
+#include <assert.h>
 #include <string.h>
 
 #include "common/bt_target.h"
diff --git a/components/bt/host/bluedroid/bta/dm/bta_dm_pm.c b/components/bt/host/bluedroid/bta/dm/bta_dm_pm.c
index 699de89314..812f998908 100644
--- a/components/bt/host/bluedroid/bta/dm/bta_dm_pm.c
+++ b/components/bt/host/bluedroid/bta/dm/bta_dm_pm.c
@@ -23,7 +23,7 @@
  *
  ******************************************************************************/
 
-// #include <assert.h>
+#include <assert.h>
 #include <string.h>
 
 #include "bta/bta_sys.h"
diff --git a/components/bt/host/bluedroid/bta/sys/bta_sys_main.c b/components/bt/host/bluedroid/bta/sys/bta_sys_main.c
index c495e14f09..58983d3a5d 100644
--- a/components/bt/host/bluedroid/bta/sys/bta_sys_main.c
+++ b/components/bt/host/bluedroid/bta/sys/bta_sys_main.c
@@ -23,7 +23,7 @@
  ******************************************************************************/
 #define LOG_TAG "bt_bta_sys_main"
 
-// #include <assert.h>
+#include <assert.h>
 #include <string.h>
 
 #include "osi/alarm.h"
diff --git a/components/bt/host/bluedroid/stack/avdt/avdt_ad.c b/components/bt/host/bluedroid/stack/avdt/avdt_ad.c
index 361c5b276f..b24c952d90 100644
--- a/components/bt/host/bluedroid/stack/avdt/avdt_ad.c
+++ b/components/bt/host/bluedroid/stack/avdt/avdt_ad.c
@@ -22,7 +22,7 @@
  *
  ******************************************************************************/
 
-// #include <assert.h>
+#include <assert.h>
 #include "common/bt_trace.h"
 #include <string.h>
 
diff --git a/components/bt/host/bluedroid/stack/avrc/avrc_api.c b/components/bt/host/bluedroid/stack/avrc/avrc_api.c
index beb823eac9..9972bbfde4 100644
--- a/components/bt/host/bluedroid/stack/avrc/avrc_api.c
+++ b/components/bt/host/bluedroid/stack/avrc/avrc_api.c
@@ -21,7 +21,7 @@
  *  Interface to AVRCP mandatory commands
  *
  ******************************************************************************/
-// #include <assert.h>
+#include <assert.h>
 #include "common/bt_trace.h"
 #include <string.h>
 #include "common/bt_target.h"
diff --git a/components/bt/host/bluedroid/stack/avrc/avrc_opt.c b/components/bt/host/bluedroid/stack/avrc/avrc_opt.c
index 9ecf966ee1..6f0663c08a 100644
--- a/components/bt/host/bluedroid/stack/avrc/avrc_opt.c
+++ b/components/bt/host/bluedroid/stack/avrc/avrc_opt.c
@@ -21,7 +21,7 @@
  *  Interface to AVRCP optional commands
  *
  ******************************************************************************/
-// #include <assert.h>
+#include <assert.h>
 #include "common/bt_target.h"
 #include <string.h>
 #include "stack/avrc_api.h"