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

Fixed bug 3449139, increased version numbers. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3552 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
gdisirio 2011-12-03 08:49:51 +00:00
parent a8a8535845
commit 0faef9a292
8 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/Doxyfile_chm
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.3.4 PROJECT_NUMBER = 2.3.5
# Using the PROJECT_BRIEF tag one can provide an optional one line description # Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer # for a project that appears at the top of each page and should give viewer

2
docs/Doxyfile_html
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.3.4 PROJECT_NUMBER = 2.3.5
# Using the PROJECT_BRIEF tag one can provide an optional one line description # Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer # for a project that appears at the top of each page and should give viewer

2
docs/rsc/header_chm.html
View File

@ -13,7 +13,7 @@
<tbody> <tbody>
<tr style="height: 56px;"> <tr style="height: 56px;">
<td style="padding-left: 0.5em;"> <td style="padding-left: 0.5em;">
<div id="projectname">ChibiOS/RT&#160;<span id="projectnumber">2.3.4</span></div> <div id="projectname">ChibiOS/RT&#160;<span id="projectnumber">2.3.5</span></div>
</td> </td>
</tr> </tr>
</tbody> </tbody>

2
docs/rsc/header_html.html
View File

@ -20,7 +20,7 @@ $(document).ready(initResizable);
<tbody> <tbody>
<tr style="height: 92px;"> <tr style="height: 92px;">
<td style="padding-left: 0.5em;"> <td style="padding-left: 0.5em;">
<div id="projectname">ChibiOS/RT<br><span id="projectnumber">2.3.4</span></div> <div id="projectname">ChibiOS/RT<br><span id="projectnumber">2.3.5</span></div>
</td> </td>
<td style="padding-left: 3em;"> <td style="padding-left: 3em;">
<script type="text/javascript"><!-- <script type="text/javascript"><!--

7
os/hal/platforms/STM32F4xx/hal_lld.c
View File

@ -62,8 +62,9 @@ void hal_lld_init(void) {
been initialized in the board initialization file (board.c).*/ been initialized in the board initialization file (board.c).*/
rccResetAHB1(!0); rccResetAHB1(!0);
rccResetAHB2(!0); rccResetAHB2(!0);
rccResetAHB3(!0);
rccResetAPB1(!RCC_APB1RSTR_PWRRST); rccResetAPB1(!RCC_APB1RSTR_PWRRST);
rccResetAPB2(!RCC_APB2RSTR_SYSCFGRST); rccResetAPB2(!0);
/* SysTick initialization using the system clock.*/ /* SysTick initialization using the system clock.*/
SysTick->LOAD = STM32_HCLK / CH_FREQUENCY - 1; SysTick->LOAD = STM32_HCLK / CH_FREQUENCY - 1;
@ -152,6 +153,10 @@ void stm32_clock_init(void) {
; ;
#endif #endif
#endif /* STM32_NO_INIT */ #endif /* STM32_NO_INIT */
/* SYSCFG clock enabled here because it is a multi-functional unit shared
among multiple drivers.*/
rccEnableAPB2(RCC_APB2ENR_SYSCFGEN, TRUE);
} }
/** @} */ /** @} */

8
os/hal/platforms/STM32L1xx/hal_lld.c
View File

@ -60,8 +60,8 @@ void hal_lld_init(void) {
/* Reset of all peripherals.*/ /* Reset of all peripherals.*/
rccResetAHB(!RCC_AHBRSTR_FLITFRST); rccResetAHB(!RCC_AHBRSTR_FLITFRST);
rccResetAPB1(!0); rccResetAPB1(!RCC_APB1RSTR_PWRRST);
rccResetAPB2(!RCC_APB2RSTR_SYSCFGRST); rccResetAPB2(!0);
/* SysTick initialization using the system clock.*/ /* SysTick initialization using the system clock.*/
SysTick->LOAD = STM32_HCLK / CH_FREQUENCY - 1; SysTick->LOAD = STM32_HCLK / CH_FREQUENCY - 1;
@ -170,6 +170,10 @@ void stm32_clock_init(void) {
; ;
#endif #endif
#endif /* STM32_NO_INIT */ #endif /* STM32_NO_INIT */
/* SYSCFG clock enabled here because it is a multi-functional unit shared
among multiple drivers.*/
rccEnableAPB2(RCC_APB2ENR_SYSCFGEN, TRUE);
} }
#else #else
void stm32_clock_init(void) {} void stm32_clock_init(void) {}

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

@ -40,7 +40,7 @@
/** /**
* @brief Kernel version string. * @brief Kernel version string.
*/ */
#define CH_KERNEL_VERSION "2.3.4unstable" #define CH_KERNEL_VERSION "2.3.5unstable"
/** /**
* @name Kernel version * @name Kernel version
@ -59,7 +59,7 @@
/** /**
* @brief Kernel version patch number. * @brief Kernel version patch number.
*/ */
#define CH_KERNEL_PATCH 4 #define CH_KERNEL_PATCH 5
/** @} */ /** @} */
/* /*

1
readme.txt
View File

@ -74,6 +74,7 @@
***************************************************************************** *****************************************************************************
*** 2.3.5 *** *** 2.3.5 ***
- FIX: Fixed SYSCFG clock not started in STM32L1/F4 HALs (bug 3449139).
- FIX: Fixed wrong definitions in STM32L-Discovery board file (bug 3449076). - FIX: Fixed wrong definitions in STM32L-Discovery board file (bug 3449076).
*** 2.3.4 *** *** 2.3.4 ***