Skip to content

Commit

Permalink
Merge pull request RIOT-OS#20416 from chrysn-pull-requests/alt20415
Browse files Browse the repository at this point in the history
cpu/esp: Use CPU_ESP8266 define instead of the removed MCU_ESP8266
  • Loading branch information
chrysn authored Feb 22, 2024
2 parents 7ddae48 + c3020ce commit 6e892d9
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion cpu/esp8266/vendor/esp-idf/esp8266/source/startup.c
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ static void user_init_entry(void *param)

phy_get_bb_evm();

#ifdef MCU_ESP8266
#ifdef CPU_ESP8266
/* initialize newlib system calls */
extern void syscalls_init (void);
syscalls_init ();
Expand Down
10 changes: 5 additions & 5 deletions cpu/esp_common/vendor/xtensa/xtensa_vectors.S
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ User Exception (including Level 1 Interrupt from user mode).

_UserExceptionVector:

#ifdef MCU_ESP8266
#ifdef CPU_ESP8266
wsr a0, EXCSAVE_1 /* preserve a0 */
j _UserExceptionTrampoline /* jump to handler trampoline */
#else
Expand All @@ -504,7 +504,7 @@ _UserExceptionVector:

.end literal_prefix

#ifdef MCU_ESP8266
#ifdef CPU_ESP8266
/*************************** LoadStoreError Handler BEGIN ********************/
/*
* PLEASE NOTE: The code between "LoadStoreError Handler BEGIN" and
Expand Down Expand Up @@ -549,7 +549,7 @@ _LoadStoreErrorHandlerStack:
_UserExceptionTrampoline:

wsr a1, EXCSAVE_2 /* preserve a1 */
#ifdef MCU_ESP8266
#ifdef CPU_ESP8266
rsr a1, exccause
beqi a1, CAUSE_LOADSTORE, _LoadStoreErrorHandler
#endif
Expand Down Expand Up @@ -2010,7 +2010,7 @@ _xt_nmi:
/* USER_EDIT:
ADD HIGH PRIORITY NON-MASKABLE INTERRUPT (NMI) HANDLER CODE HERE.
*/
#if defined(RIOT_VERSION) && defined(MCU_ESP8266)
#if defined(RIOT_VERSION) && defined(CPU_ESP8266)

rsr a0, EXCSAVE + XCHAL_NMILEVEL /* restore a0 as saved in _NMIExceptionHandler */

Expand Down Expand Up @@ -2116,7 +2116,7 @@ _xt_nmi:

/*************************** NMI Handler END ****************************/

#endif /* defined(RIOT_VERSION) && defined(MCU_ESP8266) */
#endif /* defined(RIOT_VERSION) && defined(CPU_ESP8266) */

.align 4
.L_xt_nmi_exit:
Expand Down

0 comments on commit 6e892d9

Please sign in to comment.