arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-19 23:22:16 +03:00
Code

Attribute __real_system_restart_local() as (noreturn) (#7167)

Browse Source 
* Attribute `__real_system_restart_local()` as `(noreturn)`
* As well as `abort()`.
* Aggragate two decls into `coredecls.h`.
This commit is contained in:
Takayuki 'January June' Suwa 2020-03-27 06:28:09 +09:00 committed by GitHub
parent 726df6967c
commit 631f66bd08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cores/esp8266/Esp.cpp
View File

@ -193,9 +193,6 @@ bool EspClass::rtcUserMemoryWrite(uint32_t offset, uint32_t *data, size_t size)
} }
} }
extern "C" void __real_system_restart_local();
void EspClass::reset(void) void EspClass::reset(void)
{ {
__real_system_restart_local(); __real_system_restart_local();

3
cores/esp8266/core_esp8266_postmortem.cpp
View File

@ -32,11 +32,10 @@
#include "pgmspace.h" #include "pgmspace.h"
#include "gdb_hooks.h" #include "gdb_hooks.h"
#include "StackThunk.h" #include "StackThunk.h"
#include "coredecls.h"
extern "C" { extern "C" {
extern void __real_system_restart_local();
// These will be pointers to PROGMEM const strings // These will be pointers to PROGMEM const strings
static const char* s_panic_file = 0; static const char* s_panic_file = 0;
static int s_panic_line = 0; static int s_panic_line = 0;

1
cores/esp8266/coredecls.h
View File

@ -21,6 +21,7 @@ void esp_schedule();
void tune_timeshift64 (uint64_t now_us); void tune_timeshift64 (uint64_t now_us);
void disable_extra4k_at_link_time (void) __attribute__((noinline)); void disable_extra4k_at_link_time (void) __attribute__((noinline));
bool sntp_set_timezone_in_seconds(int32_t timezone); bool sntp_set_timezone_in_seconds(int32_t timezone);
void __real_system_restart_local() __attribute__((noreturn));
uint32_t sqrt32 (uint32_t n); uint32_t sqrt32 (uint32_t n);
uint32_t crc32 (const void* data, size_t length, uint32_t crc = 0xffffffff); uint32_t crc32 (const void* data, size_t length, uint32_t crc = 0xffffffff);