ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix event queue being stuck in non-RTOS mode, causing all sorts of weird behavior

pull/15339/head
Jamie Smith 2022-09-10 00:07:27 -07:00 committed by Jay Sridharan
parent 92921dc8c5
commit 02b6bdb295
10 changed files with 12 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
connectivity/FEATURE_BLE/source/cordio/TESTS/cordio_hci/driver/CMakeLists.txt
View File

@ -8,5 +8,4 @@ mbed_greentea_add_test(
main.cpp main.cpp
TEST_REQUIRED_LIBS TEST_REQUIRED_LIBS
mbed-ble mbed-ble
mbed-events
) )

1
connectivity/libraries/ppp/CMakeLists.txt
View File

@ -55,7 +55,6 @@ target_compile_definitions(mbed-ppp
target_link_libraries(mbed-ppp target_link_libraries(mbed-ppp
PUBLIC PUBLIC
mbed-events
mbed-netsocket-api mbed-netsocket-api
PRIVATE PRIVATE
mbed-rtos-flags mbed-rtos-flags

1
connectivity/lorawan/CMakeLists.txt
View File

@ -35,6 +35,5 @@ target_compile_definitions(mbed-lorawan
target_link_libraries(mbed-lorawan target_link_libraries(mbed-lorawan
PUBLIC PUBLIC
mbed-events
mbed-mbedtls mbed-mbedtls
) )

1
connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/CMakeLists.txt
View File

@ -27,7 +27,6 @@ target_link_libraries(mbed-nanostack-hal_mbed_cmsis_rtos
mbed-core-flags mbed-core-flags
mbed-randlib mbed-randlib
mbed-nanostack-sal_stack-event_loop mbed-nanostack-sal_stack-event_loop
mbed-events
mbed-nanostack-libservice mbed-nanostack-libservice
mbed-nanostack-sal_stack mbed-nanostack-sal_stack
PRIVATE PRIVATE

1
connectivity/netsocket/CMakeLists.txt
View File

@ -53,7 +53,6 @@ target_link_libraries(mbed-netsocket-api
PUBLIC PUBLIC
mbed-core-flags mbed-core-flags
mbed-mbedtls mbed-mbedtls
mbed-events
) )
add_library(mbed-netsocket INTERFACE) add_library(mbed-netsocket INTERFACE)

5
connectivity/nfc/CMakeLists.txt
View File

@ -47,8 +47,3 @@ target_compile_definitions(mbed-nfc
PUBLIC PUBLIC
MBED_CONF_NFC_PRESENT=1 MBED_CONF_NFC_PRESENT=1
) )
target_link_libraries(mbed-nfc
PUBLIC
mbed-events
)

27
events/CMakeLists.txt
View File

@ -9,31 +9,26 @@ if(MBED_ENABLE_OS_INTERNAL_TESTS)
endif() endif()
endif() endif()
add_library(mbed-events STATIC EXCLUDE_FROM_ALL) # Note: The event queue library gets a different implementation when the RTOS is or is not included.
# So, we add it to the core Mbed lib so that it will be built once for each Mbed version.
target_include_directories(mbed-events target_include_directories(mbed-core-flags
PUBLIC INTERFACE
. .
./include ./include
./include/events ./include/events
./include/events/internal ./include/events/internal
) )
target_sources(mbed-events target_compile_definitions(mbed-core-flags
PRIVATE INTERFACE
MBED_CONF_EVENTS_PRESENT=1
)
target_sources(mbed-core-sources
INTERFACE
source/EventQueue.cpp source/EventQueue.cpp
source/equeue.c source/equeue.c
source/equeue_mbed.cpp source/equeue_mbed.cpp
source/equeue_posix.c source/equeue_posix.c
source/mbed_shared_queues.cpp source/mbed_shared_queues.cpp
) )
target_compile_definitions(mbed-events
PUBLIC
MBED_CONF_EVENTS_PRESENT=1
)
target_link_libraries(mbed-events
PUBLIC
mbed-core-flags
)

2
events/tests/TESTS/events/equeue/CMakeLists.txt
View File

@ -15,6 +15,4 @@ mbed_greentea_add_test(
${TEST_TARGET} ${TEST_TARGET}
TEST_SOURCES TEST_SOURCES
main.cpp main.cpp
TEST_REQUIRED_LIBS
mbed-events
) )

2
events/tests/TESTS/events/queue/CMakeLists.txt
View File

@ -15,6 +15,4 @@ mbed_greentea_add_test(
${TEST_TARGET} ${TEST_TARGET}
TEST_SOURCES TEST_SOURCES
main.cpp main.cpp
TEST_REQUIRED_LIBS
mbed-events
) )

2
events/tests/TESTS/events/timing/CMakeLists.txt
View File

@ -15,6 +15,4 @@ mbed_greentea_add_test(
${TEST_TARGET} ${TEST_TARGET}
TEST_SOURCES TEST_SOURCES
main.cpp main.cpp
TEST_REQUIRED_LIBS
mbed-events
) )