From b14eb58afe95c7e8c9be10b3c3bfcdc5528410f3 Mon Sep 17 00:00:00 2001 From: gdisirio Date: Mon, 11 Nov 2013 13:52:23 +0000 Subject: [PATCH] git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6451 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/hal/boards/OLIMEX_STM32_E407/board.c | 10 +++++----- os/hal/boards/OLIMEX_STM32_E407/board.h | 3 +-- os/hal/boards/OLIMEX_STM32_E407/cfg/board.chcfg | 9 +++++++-- os/hal/boards/OLIMEX_STM32_H407/board.c | 12 ++++++------ os/hal/boards/OLIMEX_STM32_H407/board.h | 1 - os/hal/boards/OLIMEX_STM32_H407/cfg/board.chcfg | 9 +++++++-- os/hal/boards/ST_STM32F429I_DISCOVERY/board.h | 1 - os/hal/boards/ST_STM32F4_DISCOVERY/board.h | 1 - os/hal/boards/ST_STM32L_DISCOVERY/cfg/board.chcfg | 8 +++++--- 9 files changed, 31 insertions(+), 23 deletions(-) diff --git a/os/hal/boards/OLIMEX_STM32_E407/board.c b/os/hal/boards/OLIMEX_STM32_E407/board.c index 24302cfd6..2e219171f 100644 --- a/os/hal/boards/OLIMEX_STM32_E407/board.c +++ b/os/hal/boards/OLIMEX_STM32_E407/board.c @@ -61,9 +61,9 @@ void __early_init(void) { */ bool sdc_lld_is_card_inserted(SDCDriver *sdcp) { static bool last_status = FALSE; - - if (blkIsTransferring(sdcp)) - return last_status; + + if (blkIsTransferring(sdcp)) + return last_status; return last_status = (bool)palReadPad(GPIOC, GPIOC_SD_D3); } @@ -71,8 +71,8 @@ bool sdc_lld_is_card_inserted(SDCDriver *sdcp) { * @brief SDC card write protection detection. */ bool sdc_lld_is_write_protected(SDCDriver *sdcp) { - - (void)sdcp; + + (void)sdcp; return FALSE; } #endif /* HAL_USE_SDC */ diff --git a/os/hal/boards/OLIMEX_STM32_E407/board.h b/os/hal/boards/OLIMEX_STM32_E407/board.h index fa326a08c..a9a046a81 100644 --- a/os/hal/boards/OLIMEX_STM32_E407/board.h +++ b/os/hal/boards/OLIMEX_STM32_E407/board.h @@ -44,7 +44,6 @@ #define STM32_HSECLK 12000000 #endif - /* * Board voltages. * Required for performance limits calculation. @@ -54,7 +53,7 @@ /* * MCU type as defined in the ST header. */ -#define STM32F401xx +#define STM32F40_41xxx /* * IO pins assignments. diff --git a/os/hal/boards/OLIMEX_STM32_E407/cfg/board.chcfg b/os/hal/boards/OLIMEX_STM32_E407/cfg/board.chcfg index f55bd1471..ff3ab4e3d 100644 --- a/os/hal/boards/OLIMEX_STM32_E407/cfg/board.chcfg +++ b/os/hal/boards/OLIMEX_STM32_E407/cfg/board.chcfg @@ -23,8 +23,13 @@ RMII STM32F40_41xxx - + RMII STM32F40_41xxx - + ST_STM32L_DISCOVERY + HSEFrequency="0" + HSEBypass="true" + LSEFrequency="32768" + LSEBypass="false" + />