andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed bug 3288112. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_2.2.x@2879 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
gdisirio 2011-04-16 06:33:14 +00:00
parent dc2c413d56
commit 2bc6fb4029
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/Doxyfile
View File

@ -31,7 +31,7 @@ PROJECT_NAME = ChibiOS/RT
# This could be handy for archiving the generated documentation or # This could be handy for archiving the generated documentation or
# if some version control system is used. # if some version control system is used.
PROJECT_NUMBER = 2.2.3 PROJECT_NUMBER = 2.2.4
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put. # base path where the generated documentation will be put.

12
os/hal/include/spi.h
View File

@ -264,12 +264,14 @@ typedef enum {
* @notapi * @notapi
*/ */
#define _spi_isr_code(spip) { \ #define _spi_isr_code(spip) { \
if ((spip)->spd_config->spc_endcb) { \ if ((spip)->config->end_cb) { \
(spip)->spd_state = SPI_COMPLETE; \ (spip)->state = SPI_COMPLETE; \
(spip)->spd_config->spc_endcb(spip); \ (spip)->config->end_cb(spip); \
if ((spip)->spd_state == SPI_COMPLETE) \ if ((spip)->state == SPI_COMPLETE) \
(spip)->spd_state = SPI_READY; \ (spip)->state = SPI_READY; \
} \ } \
else \
(spip)->state = SPI_READY; \
_spi_wakeup_isr(spip); \ _spi_wakeup_isr(spip); \
} }

4
os/kernel/include/ch.h
View File

@ -46,7 +46,7 @@
/** /**
* @brief Kernel version string. * @brief Kernel version string.
*/ */
#define CH_KERNEL_VERSION "2.2.3" #define CH_KERNEL_VERSION "2.2.4"
/** /**
* @brief Kernel version major number. * @brief Kernel version major number.
@ -61,7 +61,7 @@
/** /**
* @brief Kernel version patch number. * @brief Kernel version patch number.
*/ */
#define CH_KERNEL_PATCH 3 #define CH_KERNEL_PATCH 4
/* /*
* Common values. * Common values.

3
readme.txt
View File

@ -68,6 +68,9 @@
*** Releases *** *** Releases ***
***************************************************************************** *****************************************************************************
*** 2.2.4 ***
- FIX: Fixed missing state transition in SPI driver (bug 3288112).
*** 2.2.3 *** *** 2.2.3 ***
- FIX: Fixed insufficient idle thread stack in Cortex-M0-GCC port - FIX: Fixed insufficient idle thread stack in Cortex-M0-GCC port
(bug 3226671). (bug 3226671).