diff options
| author | barthess <barthess@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2011-08-09 11:05:13 +0000 |
|---|---|---|
| committer | barthess <barthess@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2011-08-09 11:05:13 +0000 |
| commit | 9bc63715a08a8deeb3f9afe3cf646302a21d02b4 (patch) | |
| tree | c25c8cbf24915bc082c9bbb1381cf3e940131a59 | |
| parent | 1bcc0f1dc26c3358ca0c17f0b52e8b44dbc89d42 (diff) | |
| parent | 68ae8aa1bca89d841dc539562dd53cd546fe2649 (diff) | |
| download | ChibiOS-9bc63715a08a8deeb3f9afe3cf646302a21d02b4.tar.gz ChibiOS-9bc63715a08a8deeb3f9afe3cf646302a21d02b4.tar.bz2 ChibiOS-9bc63715a08a8deeb3f9afe3cf646302a21d02b4.zip | |
I2C. Syncing with trunk (final step)
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/i2c_dev@3217 35acf78f-673a-0410-8e92-d51de3d6d3f4
| -rw-r--r-- | os/kernel/src/chdynamic.c | 8 | ||||
| -rw-r--r-- | readme.txt | 3 | ||||
| -rw-r--r-- | testhal/STM32F1xx/I2C/Makefile | 8 |
3 files changed, 11 insertions, 8 deletions
diff --git a/os/kernel/src/chdynamic.c b/os/kernel/src/chdynamic.c index acd23c244..fd60071e8 100644 --- a/os/kernel/src/chdynamic.c +++ b/os/kernel/src/chdynamic.c @@ -132,10 +132,10 @@ Thread *chThdCreateFromHeap(MemoryHeap *heapp, size_t size, #if CH_DBG_FILL_THREADS
_thread_memfill((uint8_t *)wsp,
(uint8_t *)wsp + sizeof(Thread),
- THREAD_FILL_VALUE);
+ CH_THREAD_FILL_VALUE);
_thread_memfill((uint8_t *)wsp + sizeof(Thread),
(uint8_t *)wsp + size,
- STACK_FILL_VALUE);
+ CH_STACK_FILL_VALUE);
#endif
chSysLock();
@@ -183,10 +183,10 @@ Thread *chThdCreateFromMemoryPool(MemoryPool *mp, tprio_t prio, #if CH_DBG_FILL_THREADS
_thread_memfill((uint8_t *)wsp,
(uint8_t *)wsp + sizeof(Thread),
- THREAD_FILL_VALUE);
+ CH_THREAD_FILL_VALUE);
_thread_memfill((uint8_t *)wsp + sizeof(Thread),
(uint8_t *)wsp + mp->mp_object_size,
- STACK_FILL_VALUE);
+ CH_STACK_FILL_VALUE);
#endif
chSysLock();
diff --git a/readme.txt b/readme.txt index 143eb69bb..821716715 100644 --- a/readme.txt +++ b/readme.txt @@ -89,6 +89,9 @@ (backported to 2.2.4).
- FIX: Fixed timeout problem in the lwIP interface layer (bug 3302420)
(backported to 2.2.4).
+- NEW: The ARMCMx startup file (crt0.c) now is able to fill the stack areas
+ with a filler (default behavior). This is required in order to easily assess
+ the stack usage at runtime.
- NEW: Added the new CMSIS 2.1 headers, now CMSIS resides into a shared
location: ./os/ports/common/ARMCMx/CMSIS. Old CMSIS files have been
removed from the various platforms.
diff --git a/testhal/STM32F1xx/I2C/Makefile b/testhal/STM32F1xx/I2C/Makefile index 9f95a5914..b8b1b0741 100644 --- a/testhal/STM32F1xx/I2C/Makefile +++ b/testhal/STM32F1xx/I2C/Makefile @@ -54,16 +54,16 @@ endif PROJECT = ch
# Define linker script file here
-LDSCRIPT= ch.ld
+LDSCRIPT= $(PORTLD)/STM32F103xB.ld
# Imported source files
CHIBIOS = ../../..
include $(CHIBIOS)/boards/OLIMEX_STM32_P103/board.mk
-include $(CHIBIOS)/os/hal/platforms/STM32/platform.mk
+include $(CHIBIOS)/os/hal/platforms/STM32F1xx/platform.mk
include $(CHIBIOS)/os/hal/hal.mk
-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32/port.mk
+include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F1xx/port.mk
include $(CHIBIOS)/os/kernel/kernel.mk
-include $(CHIBIOS)/test/test.mk
+#include $(CHIBIOS)/test/test.mk
# C sources that can be compiled in ARM or THUMB mode depending on the global
# setting.
|