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

Merge pull request #6110 from geky/equeue-fix-no-rtos 

equeue: Removed RTOS dependencies with RTOS not present
pull/6134/merge
Cruz Monrreal 2018-02-16 16:16:15 -06:00 committed by GitHub
parent 0ceecb946d 9755cca919
commit ff41a10658
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -112,6 +112,10 @@ matrix:
# Check that example compiles # Check that example compiles
- sed -n '/``` cpp/,/```/{/```$/Q;/```/d;p;}' $EVENTS/README.md > main.cpp - sed -n '/``` cpp/,/```/{/```$/Q;/```/d;p;}' $EVENTS/README.md > main.cpp
- python tools/make.py -t GCC_ARM -m K64F --source=. --build=BUILD/K64F/GCC_ARM -j0 - python tools/make.py -t GCC_ARM -m K64F --source=. --build=BUILD/K64F/GCC_ARM -j0
# Check that example compiles without rtos
- sed -n '/``` cpp/,/```/{/```$/Q;/```/d;p;}' $EVENTS/README.md > main.cpp
- rm -r rtos features/netsocket features/frameworks BUILD
- python tools/make.py -t GCC_ARM -m DISCO_F401VC --source=. --build=BUILD/DISCO_F401VC/GCC_ARM -j0
# Run local equeue tests # Run local equeue tests
- make -C $EVENTS/equeue test - make -C $EVENTS/equeue test

2
events/equeue/equeue_platform.h
View File

@ -49,7 +49,7 @@ extern "C" {
// Platform includes // Platform includes
#if defined(EQUEUE_PLATFORM_POSIX) #if defined(EQUEUE_PLATFORM_POSIX)
#include <pthread.h> #include <pthread.h>
#elif defined(EQUEUE_PLATFORM_MBED) #elif defined(EQUEUE_PLATFORM_MBED) && defined(MBED_CONF_RTOS_PRESENT)
#include "cmsis_os2.h" #include "cmsis_os2.h"
#include "mbed_rtos_storage.h" #include "mbed_rtos_storage.h"
#endif #endif