From 41e7ec9ad37a2ff9865411b996a9c0015f820d5f Mon Sep 17 00:00:00 2001 From: gdisirio Date: Mon, 28 Nov 2011 20:34:37 +0000 Subject: [PATCH 1/4] git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3543 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/hal/platforms/STM32/icu_lld.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/os/hal/platforms/STM32/icu_lld.c b/os/hal/platforms/STM32/icu_lld.c index e76f8a109..dfbcee5e6 100644 --- a/os/hal/platforms/STM32/icu_lld.c +++ b/os/hal/platforms/STM32/icu_lld.c @@ -360,7 +360,7 @@ void icu_lld_start(ICUDriver *icup) { icup->tim->ARR = 0xFFFF; /* CCMR1_CC1S = 01 = CH1 Input on TI1. - CCMR1_CC2S = 10 = CH2 Input on TI2.*/ + CCMR1_CC2S = 10 = CH2 Input on TI1.*/ icup->tim->CCMR1 = TIM_CCMR1_CC1S_0 | TIM_CCMR1_CC2S_1; /* SMCR_TS = 101, input is TI1FP1. From 1965f6c027c2e4ade1f2005d822009b511f346d9 Mon Sep 17 00:00:00 2001 From: gdisirio Date: Tue, 29 Nov 2011 07:53:31 +0000 Subject: [PATCH 2/4] Removed unnecessary undefs. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3544 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/hal/platforms/STM32/stm32.h | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/os/hal/platforms/STM32/stm32.h b/os/hal/platforms/STM32/stm32.h index 0ee083dcc..c051dafe0 100644 --- a/os/hal/platforms/STM32/stm32.h +++ b/os/hal/platforms/STM32/stm32.h @@ -63,21 +63,6 @@ #include "stm32l1xx.h" #endif -#undef TIM1 -#undef TIM2 -#undef TIM3 -#undef TIM4 -#undef TIM5 -#undef TIM6 -#undef TIM7 -#undef TIM8 -#undef TIM9 -#undef TIM10 -#undef TIM11 -#undef TIM12 -#undef TIM13 -#undef TIM14 - /*===========================================================================*/ /* Driver constants. */ /*===========================================================================*/ From a8a85358455c96d2ca9acd4697b25cc746ebb359 Mon Sep 17 00:00:00 2001 From: gdisirio Date: Sat, 3 Dec 2011 07:46:27 +0000 Subject: [PATCH 3/4] Fixed bug 3449076. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3551 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- boards/ST_STM3220G_EVAL/board.h | 21 +++------------------ boards/ST_STM32L_DISCOVERY/board.h | 2 +- readme.txt | 3 +++ 3 files changed, 7 insertions(+), 19 deletions(-) diff --git a/boards/ST_STM3220G_EVAL/board.h b/boards/ST_STM3220G_EVAL/board.h index e10a5203c..219a9a738 100644 --- a/boards/ST_STM3220G_EVAL/board.h +++ b/boards/ST_STM3220G_EVAL/board.h @@ -84,22 +84,7 @@ #define PIN_PUDR_FLOATING(n) (0 << ((n) * 2)) #define PIN_PUDR_PULLUP(n) (1 << ((n) * 2)) #define PIN_PUDR_PULLDOWN(n) (2 << ((n) * 2)) -#define PIN_AFIO_AF0(n) (0 << ((n % 8) * 4)) -#define PIN_AFIO_AF1(n) (1 << ((n % 8) * 4)) -#define PIN_AFIO_AF2(n) (2 << ((n % 8) * 4)) -#define PIN_AFIO_AF3(n) (3 << ((n % 8) * 4)) -#define PIN_AFIO_AF4(n) (4 << ((n % 8) * 4)) -#define PIN_AFIO_AF5(n) (5 << ((n % 8) * 4)) -#define PIN_AFIO_AF6(n) (6 << ((n % 8) * 4)) -#define PIN_AFIO_AF7(n) (7 << ((n % 8) * 4)) -#define PIN_AFIO_AF8(n) (8 << ((n % 8) * 4)) -#define PIN_AFIO_AF9(n) (9 << ((n % 8) * 4)) -#define PIN_AFIO_AF10(n) (10 << ((n % 8) * 4)) -#define PIN_AFIO_AF11(n) (11 << ((n % 8) * 4)) -#define PIN_AFIO_AF12(n) (12 << ((n % 8) * 4)) -#define PIN_AFIO_AF13(n) (13 << ((n % 8) * 4)) -#define PIN_AFIO_AF14(n) (14 << ((n % 8) * 4)) -#define PIN_AFIO_AF15(n) (15 << ((n % 8) * 4)) +#define PIN_AFIO_AF(n, v) ((v##U) << ((n % 8) * 4)) /* * Port A setup. @@ -157,8 +142,8 @@ PIN_PUDR_FLOATING(15))) #define VAL_GPIOC_ODR 0xFFFFFFFF #define VAL_GPIOC_AFRL 0x00000000 -#define VAL_GPIOC_AFRH (PIN_AFIO_AF7(10) | \ - PIN_AFIO_AF7(11)) +#define VAL_GPIOC_AFRH (PIN_AFIO_AF(7, 10) | \ + PIN_AFIO_AF(7, 11)) /* * Port D setup. diff --git a/boards/ST_STM32L_DISCOVERY/board.h b/boards/ST_STM32L_DISCOVERY/board.h index 6326c5e4d..978d91456 100644 --- a/boards/ST_STM32L_DISCOVERY/board.h +++ b/boards/ST_STM32L_DISCOVERY/board.h @@ -69,7 +69,7 @@ #define PIN_PUDR_FLOATING(n) (0U << ((n) * 2)) #define PIN_PUDR_PULLUP(n) (1U << ((n) * 2)) #define PIN_PUDR_PULLDOWN(n) (2U << ((n) * 2)) -#define PIN_AFIO_AF(n, v) ((v)U << ((n % 8) * 4)) +#define PIN_AFIO_AF(n, v) ((v##U) << ((n % 8) * 4)) /* * Port A setup. diff --git a/readme.txt b/readme.txt index 2dea2d1eb..c9fe0d8d9 100644 --- a/readme.txt +++ b/readme.txt @@ -73,6 +73,9 @@ *** Releases *** ***************************************************************************** +*** 2.3.5 *** +- FIX: Fixed wrong definitions in STM32L-Discovery board file (bug 3449076). + *** 2.3.4 *** - FIX: Fixed Extra initialization in STM32 SPI driver (bug 3436127) (backported to 2.2.8). From 0faef9a2928309385c52f25fb892ac46ced093ab Mon Sep 17 00:00:00 2001 From: gdisirio Date: Sat, 3 Dec 2011 08:49:51 +0000 Subject: [PATCH 4/4] Fixed bug 3449139, increased version numbers. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3552 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- docs/Doxyfile_chm | 2 +- docs/Doxyfile_html | 2 +- docs/rsc/header_chm.html | 2 +- docs/rsc/header_html.html | 2 +- os/hal/platforms/STM32F4xx/hal_lld.c | 7 ++++++- os/hal/platforms/STM32L1xx/hal_lld.c | 8 ++++++-- os/kernel/include/ch.h | 4 ++-- readme.txt | 1 + 8 files changed, 19 insertions(+), 9 deletions(-) diff --git a/docs/Doxyfile_chm b/docs/Doxyfile_chm index bcda68230..c1333cd33 100644 --- a/docs/Doxyfile_chm +++ b/docs/Doxyfile_chm @@ -31,7 +31,7 @@ PROJECT_NAME = ChibiOS/RT # This could be handy for archiving the generated documentation or # 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 # for a project that appears at the top of each page and should give viewer diff --git a/docs/Doxyfile_html b/docs/Doxyfile_html index 5cba063d7..bbf7156a0 100644 --- a/docs/Doxyfile_html +++ b/docs/Doxyfile_html @@ -31,7 +31,7 @@ PROJECT_NAME = ChibiOS/RT # This could be handy for archiving the generated documentation or # 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 # for a project that appears at the top of each page and should give viewer diff --git a/docs/rsc/header_chm.html b/docs/rsc/header_chm.html index 1365da6dd..4ce33e42f 100644 --- a/docs/rsc/header_chm.html +++ b/docs/rsc/header_chm.html @@ -13,7 +13,7 @@ -
ChibiOS/RT 2.3.4
+
ChibiOS/RT 2.3.5
diff --git a/docs/rsc/header_html.html b/docs/rsc/header_html.html index 202da80ca..243097201 100644 --- a/docs/rsc/header_html.html +++ b/docs/rsc/header_html.html @@ -20,7 +20,7 @@ $(document).ready(initResizable); -
ChibiOS/RT
2.3.4
+
ChibiOS/RT
2.3.5