From c6477ff10d983aa8dcb152be2bc673352d5bd69c Mon Sep 17 00:00:00 2001
From: Jeroen Domburg <git@j0h.nl>
Date: Thu, 27 Oct 2016 12:37:19 +0800
Subject: [PATCH] Fix int clear, actually call int init code

---
 components/esp32/cpu_start.c     | 3 +++
 components/esp32/crosscore_int.c | 4 ++--
 components/esp32/lib             | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/components/esp32/cpu_start.c b/components/esp32/cpu_start.c
index 5c7a411c8e..0c94f39e30 100644
--- a/components/esp32/cpu_start.c
+++ b/components/esp32/cpu_start.c
@@ -41,6 +41,7 @@
 #include "esp_event.h"
 #include "esp_spi_flash.h"
 #include "esp_ipc.h"
+#include "esp_crosscore_int.h"
 #include "esp_log.h"
 
 #include "trax.h"
@@ -146,6 +147,7 @@ void start_cpu0_default(void)
     uart_div_modify(0, (APB_CLK_FREQ << 4) / 115200);
     ets_setup_syscalls();
     do_global_ctors();
+    esp_crosscore_int_init();
     esp_ipc_init();
     spi_flash_init();
     xTaskCreatePinnedToCore(&main_task, "main",
@@ -165,6 +167,7 @@ void start_cpu1_default(void)
     while (port_xSchedulerRunning[0] == 0) {
         ;
     }
+    esp_crosscore_int_init();
     ESP_LOGI(TAG, "Starting scheduler on APP CPU.");
     xPortStartScheduler();
 }
diff --git a/components/esp32/crosscore_int.c b/components/esp32/crosscore_int.c
index 95f2762f23..a98b13583c 100644
--- a/components/esp32/crosscore_int.c
+++ b/components/esp32/crosscore_int.c
@@ -57,7 +57,7 @@ static void esp_crosscore_isr(void *arg) {
 	if (xPortGetCoreID()==0) {
 		WRITE_PERI_REG(DPORT_CPU_INTR_FROM_CPU_0_REG, 0);
 	} else {
-		WRITE_PERI_REG(DPORT_CPU_INTR_FROM_CPU_0_REG, 1);
+		WRITE_PERI_REG(DPORT_CPU_INTR_FROM_CPU_1_REG, 0);
 	}
 	//Grab the reason and clear it.
 	portENTER_CRITICAL(&reasonSpinlock);
@@ -77,6 +77,7 @@ static void esp_crosscore_isr(void *arg) {
 //on each active core.
 void esp_crosscore_int_init() {
 	portENTER_CRITICAL(&reasonSpinlock);
+	ets_printf("init cpu %d\n", xPortGetCoreID());
 	reason[xPortGetCoreID()]=0;
 	portEXIT_CRITICAL(&reasonSpinlock);
 	ESP_INTR_DISABLE(ETS_FROM_CPU_INUM);
@@ -87,7 +88,6 @@ void esp_crosscore_int_init() {
 	}
 	xt_set_interrupt_handler(ETS_FROM_CPU_INUM, esp_crosscore_isr, (void*)&reason[xPortGetCoreID()]);
 	ESP_INTR_ENABLE(ETS_FROM_CPU_INUM);
-
 }
 
 void esp_crosscore_int_send_yield(int coreId) {
diff --git a/components/esp32/lib b/components/esp32/lib
index a1e5f8b953..b9561aa5db 160000
--- a/components/esp32/lib
+++ b/components/esp32/lib
@@ -1 +1 @@
-Subproject commit a1e5f8b953c7934677ba7a6ed0a6dd2da0e6bd0f
+Subproject commit b9561aa5db15443d11f8bb5aefdfc5da540d8f2d
-- 
2.40.0