From 71c02394e58f237c0423ec95ad0532da2bd8454c Mon Sep 17 00:00:00 2001
From: Renz Bagaporo <renz.bagaporo@espressif.com>
Date: Thu, 5 Mar 2020 16:15:59 +0800
Subject: [PATCH] esp32s2: remove esp_intr.h header

---
 components/esp32s2/include/esp_intr.h        | 78 +-------------------
 components/mbedtls/port/esp32s2/esp_bignum.c |  1 -
 2 files changed, 3 insertions(+), 76 deletions(-)

diff --git a/components/esp32s2/include/esp_intr.h b/components/esp32s2/include/esp_intr.h
index ea36d0de3..d41f80c32 100644
--- a/components/esp32s2/include/esp_intr.h
+++ b/components/esp32s2/include/esp_intr.h
@@ -12,78 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef __ESP_INTR_H__
-#define __ESP_INTR_H__
-
-#include "esp32s2/rom/ets_sys.h"
-#include "freertos/xtensa_api.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define ESP_CCOMPARE_INTR_ATTACH(func, arg) \
-    xt_set_interrupt_handler(ETS_CCOMPARE_INUM, (func), (void *)(arg))
-
-#define ESP_EPWM_INTR_ATTACH(func, arg) \
-    xt_set_interrupt_handler(ETS_EPWM_INUM, (func), (void *)(arg))
-
-#define ESP_MPWM_INTR_ATTACH(func, arg) \
-    xt_set_interrupt_handler(ETS_MPWM_INUM, (func), (void *)(arg))
-
-#define ESP_SPI1_INTR_ATTACH(func, arg) \
-    xt_set_interrupt_handler(ETS_SPI1_INUM, (func), (void *)(arg))
-
-#define ESP_SPI2_INTR_ATTACH(func, arg) \
-    xt_set_interrupt_handler(ETS_SPI2_INUM, (func), (void *)(arg))
-
-#define ESP_SPI3_INTR_ATTACH(func, arg) \
-    xt_set_interrupt_handler(ETS_SPI3_INUM, (func), (void *)(arg))
-
-#define ESP_I2S0_INTR_ATTACH(func, arg) \
-    xt_set_interrupt_handler(ETS_I2S0_INUM, (func), (void *)(arg))
-
-#define ESP_PCNT_INTR_ATTACH(func, arg) \
-    xt_set_interrupt_handler(ETS_PCNT_INUM, (func), (void *)(arg))
-
-#define ESP_LEDC_INTR_ATTACH(func, arg) \
-    xt_set_interrupt_handler(ETS_LEDC_INUM, (func), (void *)(arg))
-
-#define ESP_WMAC_INTR_ATTACH(func, arg) \
-    xt_set_interrupt_handler(ETS_WMAC_INUM, (func), (void *)(arg))
-
-#define ESP_FRC_TIMER1_INTR_ATTACH(func, arg) \
-    xt_set_interrupt_handler(ETS_FRC_TIMER1_INUM, (func), (void *)(arg))
-
-#define ESP_FRC_TIMER2_INTR_ATTACH(func, arg) \
-    xt_set_interrupt_handler(ETS_FRC_TIMER2_INUM, (func), (void *)(arg))
-
-#define ESP_GPIO_INTR_ATTACH(func, arg) \
-    xt_set_interrupt_handler(ETS_GPIO_INUM, (func), (void *)(arg))
-
-#define ESP_UART0_INTR_ATTACH(func, arg) \
-    xt_set_interrupt_handler(ETS_UART0_INUM, (func), (void *)(arg))
-
-#define ESP_WDT_INTR_ATTACH(func, arg) \
-    xt_set_interrupt_handler(ETS_WDT_INUM, (func), (void *)(arg))
-
-#define ESP_RTC_INTR_ATTACH(func, arg) \
-    xt_set_interrupt_handler(ETS_RTC_INUM, (func), (void *)(arg))
-
-#define ESP_SLC_INTR_ATTACH(func, arg) \
-    xt_set_interrupt_handler(ETS_SLC_INUM, (func), (void *)(arg))
-
-#define ESP_RMT_CTRL_INTRL(func,arg)\
-    xt_set_interrupt_handler(ETS_RMT_CTRL_INUM, (func), (void *)(arg))
-
-#define ESP_INTR_ENABLE(inum) \
-    xt_ints_on((1<<inum))
-
-#define ESP_INTR_DISABLE(inum) \
-    xt_ints_off((1<<inum))
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __ESP_INTR_H__ */
+#pragma once
+#warning esp_intr.h is deprecated, please include esp_intr_alloc.h instead
+#include "esp_intr_alloc.h"
\ No newline at end of file
diff --git a/components/mbedtls/port/esp32s2/esp_bignum.c b/components/mbedtls/port/esp32s2/esp_bignum.c
index 104bcebe9..6a8a88a56 100644
--- a/components/mbedtls/port/esp32s2/esp_bignum.c
+++ b/components/mbedtls/port/esp32s2/esp_bignum.c
@@ -32,7 +32,6 @@
 #include "soc/hwcrypto_reg.h"
 #include "esp_system.h"
 #include "esp_log.h"
-#include "esp_intr.h"
 #include "esp_intr_alloc.h"
 #include "esp_attr.h"