Skip to content

Commit e5177ac

Browse files
Rename ets_intr_(un)lock_nest to ets_intr_(un)lock
This saves having to modify libmain.a, libpp.a and libnet80211.a to use the nested versions. Adjusts fix_sdk_libs.sh accordingly.
1 parent 7fd5307 commit e5177ac

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

cores/esp8266/core_esp8266_main.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -128,14 +128,14 @@ extern "C" void optimistic_yield(uint32_t interval_us) {
128128
}
129129
}
130130

131-
extern "C" void ets_intr_lock_nest() {
131+
extern "C" void ets_intr_lock() {
132132
if (ets_intr_lock_stack_ptr < ETS_INTR_LOCK_NEST_MAX)
133133
ets_intr_lock_stack[ets_intr_lock_stack_ptr++] = xt_rsil(3);
134134
else
135135
xt_rsil(3);
136136
}
137137

138-
extern "C" void ets_intr_unlock_nest() {
138+
extern "C" void ets_intr_unlock() {
139139
if (ets_intr_lock_stack_ptr > 0)
140140
xt_wsr_ps(ets_intr_lock_stack[--ets_intr_lock_stack_ptr]);
141141
else

tools/sdk/lib/fix_sdk_libs.sh

-7
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,3 @@ xtensa-lx106-elf-objcopy --redefine-sym default_hostname=wifi_station_default_ho
1616
xtensa-lx106-elf-objcopy --redefine-sym default_hostname=wifi_station_default_hostname eagle_lwip_if.o
1717
xtensa-lx106-elf-ar r libmain.a eagle_lwip_if.o user_interface.o
1818
rm -f eagle_lwip_if.o user_interface.o
19-
20-
# Replace use of ROM ets_intr_(un)lock with nestable ets_intr_(un)lock_nest
21-
for f in libmain.a libpp.a libnet80211.a; do
22-
xtensa-lx106-elf-objcopy --redefine-sym ets_intr_lock=ets_intr_lock_nest $f;
23-
xtensa-lx106-elf-objcopy --redefine-sym ets_intr_unlock=ets_intr_unlock_nest $f;
24-
done
25-

0 commit comments

Comments
 (0)