zcy
/
tinySA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
master
barthess 2011-08-09 11:05:13 +00:00
parent 1bcc0f1dc2 68ae8aa1bc
commit 9bc63715a0
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
os/kernel/src/chdynamic.c
View File

@ -132,10 +132,10 @@ Thread *chThdCreateFromHeap(MemoryHeap *heapp, size_t size,
#if CH_DBG_FILL_THREADS #if CH_DBG_FILL_THREADS
_thread_memfill((uint8_t *)wsp, _thread_memfill((uint8_t *)wsp,
(uint8_t *)wsp + sizeof(Thread), (uint8_t *)wsp + sizeof(Thread),
THREAD_FILL_VALUE); CH_THREAD_FILL_VALUE);
_thread_memfill((uint8_t *)wsp + sizeof(Thread), _thread_memfill((uint8_t *)wsp + sizeof(Thread),
(uint8_t *)wsp + size, (uint8_t *)wsp + size,
STACK_FILL_VALUE); CH_STACK_FILL_VALUE);
#endif #endif
chSysLock(); chSysLock();
@ -183,10 +183,10 @@ Thread *chThdCreateFromMemoryPool(MemoryPool *mp, tprio_t prio,
#if CH_DBG_FILL_THREADS #if CH_DBG_FILL_THREADS
_thread_memfill((uint8_t *)wsp, _thread_memfill((uint8_t *)wsp,
(uint8_t *)wsp + sizeof(Thread), (uint8_t *)wsp + sizeof(Thread),
THREAD_FILL_VALUE); CH_THREAD_FILL_VALUE);
_thread_memfill((uint8_t *)wsp + sizeof(Thread), _thread_memfill((uint8_t *)wsp + sizeof(Thread),
(uint8_t *)wsp + mp->mp_object_size, (uint8_t *)wsp + mp->mp_object_size,
STACK_FILL_VALUE); CH_STACK_FILL_VALUE);
#endif #endif
chSysLock(); chSysLock();

3
readme.txt
View File

@ -89,6 +89,9 @@
(backported to 2.2.4). (backported to 2.2.4).
- FIX: Fixed timeout problem in the lwIP interface layer (bug 3302420) - FIX: Fixed timeout problem in the lwIP interface layer (bug 3302420)
(backported to 2.2.4). (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 - 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 location: ./os/ports/common/ARMCMx/CMSIS. Old CMSIS files have been
removed from the various platforms. removed from the various platforms.

8
testhal/STM32F1xx/I2C/Makefile
View File

@ -54,16 +54,16 @@ endif
PROJECT = ch PROJECT = ch
# Define linker script file here # Define linker script file here
LDSCRIPT= ch.ld LDSCRIPT= $(PORTLD)/STM32F103xB.ld
# Imported source files # Imported source files
CHIBIOS = ../../.. CHIBIOS = ../../..
include $(CHIBIOS)/boards/OLIMEX_STM32_P103/board.mk 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/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)/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 # C sources that can be compiled in ARM or THUMB mode depending on the global
# setting. # setting.