esp32: Use esp_restart from reset_to_bootloader; redeclare it NORETURN

jepler · jepler · commit 1dbb59271c60 · 2020-09-28T18:56:01.000-05:00
diff --git a/ports/esp32s2/supervisor/port.c b/ports/esp32s2/supervisor/port.c
@@ -56,6 +56,8 @@ uint32_t heap_size;
 
 STATIC esp_timer_handle_t _tick_timer;
 
+extern void esp_restart(void) NORETURN;
+
 void tick_timer_cb(void* arg) {
     supervisor_tick();
 }
@@ -118,6 +120,7 @@ void reset_port(void) {
 }
 
 void reset_to_bootloader(void) {
+    esp_restart();
 }
 
 void reset_cpu(void) {

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,8 @@ uint32_t heap_size;`
`56`	`56`
`57`	`57`	`STATIC esp_timer_handle_t _tick_timer;`
`58`	`58`
	`59`	`+extern void esp_restart(void) NORETURN;`
	`60`	`+`
`59`	`61`	`void tick_timer_cb(void* arg) {`
`60`	`62`	`supervisor_tick();`
`61`	`63`	`}`
`@@ -118,6 +120,7 @@ void reset_port(void) {`
`118`	`120`	`}`
`119`	`121`
`120`	`122`	`void reset_to_bootloader(void) {`
	`123`	`+ esp_restart();`
`121`	`124`	`}`
`122`	`125`
`123`	`126`	`void reset_cpu(void) {`