Skip to content

Commit eb9882e

Browse files
committed
CI Cleanup II
Don't know what to do with platformio it doesn't like my .S file. ifdef out USE_ISR_SAFE_EXC_WRAPPER to block the new assemlby module from building on platformio only.
1 parent 91fc391 commit eb9882e

File tree

3 files changed

+10
-1
lines changed

3 files changed

+10
-1
lines changed

Diff for: cores/esp8266/exc-c-wrapper-handler.S

+7
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22
// https://github.com/qca/open-ath9k-htc-firmware/blob/master/sboot/magpie_1_1/sboot/athos/src/xtos/exc-c-wrapper-handler.S#L62-L67
33
//
44

5+
6+
7+
#ifndef PLATFORMIO
8+
9+
10+
511
// exc-c-wrapper-handler.S - General Exception Handler that Dispatches C Handlers
612

713
// Copyright (c) 2002-2004, 2006-2007, 2010 Tensilica Inc.
@@ -125,3 +131,4 @@ _xtos_c_wrapper_handler:
125131

126132
/* FIXME: what about _GeneralException ? */
127133
.size _xtos_c_wrapper_handler, . - _xtos_c_wrapper_handler
134+
#endif

Diff for: cores/esp8266/mmu_iram.h

+2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@
4444
The more I look at _xtos_c_wrapper_handler the more convinced I am that this
4545
USE_ISR_SAFE_EXC_WRAPPER is required.
4646
*/
47+
#ifndef PLATFORMIO
4748
#define USE_ISR_SAFE_EXC_WRAPPER
49+
#endif
4850

4951
#if defined( DEV_DEBUG_PRINT) || defined(DEV_DEBUG_MMU_IRAM) || defined(DEBUG_MMU)
5052
#include <esp8266_peri.h>

Diff for: libraries/esp8266/examples/irammem/irammem.ino

+1-1
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ void setup() {
266266
hfree, hmax, hfrag);
267267

268268
void *all = malloc(free_iram);
269-
ets_uart_printf("%p = malloc(%lu)\n", all, free_iram);
269+
ets_uart_printf("%p = malloc(%u)\n", all, free_iram);
270270
umm_info(NULL, true);
271271

272272
free_iram = ESP.getFreeHeap();

0 commit comments

Comments
 (0)