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

Merge remote-tracking branch 'upstream/master'

pull/17/head
Matthew Else 2013-07-26 15:50:59 +01:00
parent 3b71d6dedb 5f0bd9d283
commit 8c2ede6f4f
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/mbed/api/toolchain.h
View File

@ -16,7 +16,7 @@
#ifndef MBED_TOOLCHAIN_H
#define MBED_TOOLCHAIN_H
#if defined(TOOLCHAIN_ARM) || defined(TOOLCHAIN_uARM)
#if defined(TOOLCHAIN_ARM)
#include <rt_sys.h>
#endif

6
libraries/rtos/rtx/cmsis_os.h
View File

@ -115,11 +115,9 @@ used throughout the whole project.
#define CMSIS_OS_RTX
// The stack space occupied is mainly dependent on the underling C standard library
#if defined(TOOLCHAIN_GCC_ARM) || defined(TOOLCHAIN_CS_ARM) || defined(TOOLCHAIN_CR_ARM) || defined(TOOLCHAIN_GCC_CR)
#if defined(TOOLCHAIN_GCC) || defined(TOOLCHAIN_ARM_STD)
# define WORDS_STACK_SIZE 512
#elif defined(TOOLCHAIN_ARM)
# define WORDS_STACK_SIZE 512
#elif defined(TOOLCHAIN_uARM)
#elif defined(TOOLCHAIN_ARM_MICRO)
# define WORDS_STACK_SIZE 128
#endif