From 1d7a676960b85d2ded2f2460eb13c77701ca9255 Mon Sep 17 00:00:00 2001 From: gdisirio Date: Sat, 27 Dec 2014 15:10:11 +0000 Subject: [PATCH] git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7598 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- .project | 11 +++++++++++ os/hal/boards/OLIMEX_STM32_E407/board.c | 12 ++++++------ os/hal/boards/OLIMEX_STM32_E407/board.h | 2 +- os/hal/boards/OLIMEX_STM32_E407/board.mk | 4 ++-- .../ports/ARMCMx/compilers/GCC/mk/port_stm32f37x.mk | 2 +- testhal/STM32/STM32F4xx/ADC/.cproject | 5 ++--- testhal/STM32/STM32F4xx/CAN/.cproject | 4 +--- testhal/STM32/STM32F4xx/DMA_STORM/.cproject | 4 +--- testhal/STM32/STM32F4xx/EXT/.cproject | 4 +--- testhal/STM32/STM32F4xx/GPT/.cproject | 4 +--- testhal/STM32/STM32F4xx/I2C/.cproject | 4 +--- testhal/STM32/STM32F4xx/IRQ_STORM/.cproject | 4 +--- testhal/STM32/STM32F4xx/IRQ_STORM_FPU/.cproject | 4 +--- testhal/STM32/STM32F4xx/PWM-ICU/.cproject | 4 +--- testhal/STM32/STM32F4xx/RTC/.cproject | 4 +--- testhal/STM32/STM32F4xx/SDC/.cproject | 4 +--- testhal/STM32/STM32F4xx/SPI/.cproject | 4 +--- testhal/STM32/STM32F4xx/UART/.cproject | 4 +--- 18 files changed, 35 insertions(+), 49 deletions(-) create mode 100644 .project diff --git a/.project b/.project new file mode 100644 index 000000000..82ecfaf5e --- /dev/null +++ b/.project @@ -0,0 +1,11 @@ + + + ChibiOS 3.0dev (whole tree) + + + + + + + + diff --git a/os/hal/boards/OLIMEX_STM32_E407/board.c b/os/hal/boards/OLIMEX_STM32_E407/board.c index 4838d4b21..e2144859f 100644 --- a/os/hal/boards/OLIMEX_STM32_E407/board.c +++ b/os/hal/boards/OLIMEX_STM32_E407/board.c @@ -77,10 +77,10 @@ void __early_init(void) { * @brief SDC card detection. */ bool sdc_lld_is_card_inserted(SDCDriver *sdcp) { - static bool last_status = false; - - if (blkIsTransferring(sdcp)) - return last_status; + static bool last_status = false; + + if (blkIsTransferring(sdcp)) + return last_status; return last_status = (bool)palReadPad(GPIOC, GPIOC_SD_D3); } @@ -88,8 +88,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 6269abfcf..e0034beaf 100644 --- a/os/hal/boards/OLIMEX_STM32_E407/board.h +++ b/os/hal/boards/OLIMEX_STM32_E407/board.h @@ -1,5 +1,5 @@ /* - ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio + ChibiOS - Copyright (C) 2006-2014 Giovanni Di Sirio Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/os/hal/boards/OLIMEX_STM32_E407/board.mk b/os/hal/boards/OLIMEX_STM32_E407/board.mk index 0f9c9e4a7..4c82966b6 100644 --- a/os/hal/boards/OLIMEX_STM32_E407/board.mk +++ b/os/hal/boards/OLIMEX_STM32_E407/board.mk @@ -1,5 +1,5 @@ # List of all the board related files. -BOARDSRC = ${CHIBIOS}/boards/OLIMEX_STM32_E407/board.c +BOARDSRC = ${CHIBIOS}/os/hal/boards/OLIMEX_STM32_E407/board.c # Required include directories -BOARDINC = ${CHIBIOS}/boards/OLIMEX_STM32_E407 +BOARDINC = ${CHIBIOS}/os/hal/boards/OLIMEX_STM32_E407 diff --git a/os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32f37x.mk b/os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32f37x.mk index 710062615..c27680266 100644 --- a/os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32f37x.mk +++ b/os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32f37x.mk @@ -8,7 +8,7 @@ PORTASM = $(CHIBIOS)/os/nil/ports/ARMCMx/compilers/GCC/nilcoreasm_v7m.s PORTINC = ${CHIBIOS}/os/ext/CMSIS/include \ ${CHIBIOS}/os/ext/CMSIS/ST \ - ${CHIBIOS}/os/common/ports/ARMCMx/devices/STM32F37x \ + ${CHIBIOS}/os/common/ports/ARMCMx/devices/STM32F3xx \ ${CHIBIOS}/os/nil/ports/ARMCMx \ ${CHIBIOS}/os/nil/ports/ARMCMx/compilers/GCC diff --git a/testhal/STM32/STM32F4xx/ADC/.cproject b/testhal/STM32/STM32F4xx/ADC/.cproject index fe8f3f8c5..2079f751b 100644 --- a/testhal/STM32/STM32F4xx/ADC/.cproject +++ b/testhal/STM32/STM32F4xx/ADC/.cproject @@ -1,7 +1,5 @@ - - - + @@ -49,4 +47,5 @@ + diff --git a/testhal/STM32/STM32F4xx/CAN/.cproject b/testhal/STM32/STM32F4xx/CAN/.cproject index fb00be23a..a4efe14e1 100644 --- a/testhal/STM32/STM32F4xx/CAN/.cproject +++ b/testhal/STM32/STM32F4xx/CAN/.cproject @@ -1,7 +1,5 @@ - - - + diff --git a/testhal/STM32/STM32F4xx/DMA_STORM/.cproject b/testhal/STM32/STM32F4xx/DMA_STORM/.cproject index e4f5dd683..54f5482a5 100644 --- a/testhal/STM32/STM32F4xx/DMA_STORM/.cproject +++ b/testhal/STM32/STM32F4xx/DMA_STORM/.cproject @@ -1,7 +1,5 @@ - - - + diff --git a/testhal/STM32/STM32F4xx/EXT/.cproject b/testhal/STM32/STM32F4xx/EXT/.cproject index b7cb49ea0..5d105b37d 100644 --- a/testhal/STM32/STM32F4xx/EXT/.cproject +++ b/testhal/STM32/STM32F4xx/EXT/.cproject @@ -1,7 +1,5 @@ - - - + diff --git a/testhal/STM32/STM32F4xx/GPT/.cproject b/testhal/STM32/STM32F4xx/GPT/.cproject index 11c951acb..dc39d1823 100644 --- a/testhal/STM32/STM32F4xx/GPT/.cproject +++ b/testhal/STM32/STM32F4xx/GPT/.cproject @@ -1,7 +1,5 @@ - - - + diff --git a/testhal/STM32/STM32F4xx/I2C/.cproject b/testhal/STM32/STM32F4xx/I2C/.cproject index 8ceae86ea..f3b6cd046 100644 --- a/testhal/STM32/STM32F4xx/I2C/.cproject +++ b/testhal/STM32/STM32F4xx/I2C/.cproject @@ -1,7 +1,5 @@ - - - + diff --git a/testhal/STM32/STM32F4xx/IRQ_STORM/.cproject b/testhal/STM32/STM32F4xx/IRQ_STORM/.cproject index bf4708179..d31439143 100644 --- a/testhal/STM32/STM32F4xx/IRQ_STORM/.cproject +++ b/testhal/STM32/STM32F4xx/IRQ_STORM/.cproject @@ -1,7 +1,5 @@ - - - + diff --git a/testhal/STM32/STM32F4xx/IRQ_STORM_FPU/.cproject b/testhal/STM32/STM32F4xx/IRQ_STORM_FPU/.cproject index 304afdf99..0a482c406 100644 --- a/testhal/STM32/STM32F4xx/IRQ_STORM_FPU/.cproject +++ b/testhal/STM32/STM32F4xx/IRQ_STORM_FPU/.cproject @@ -1,7 +1,5 @@ - - - + diff --git a/testhal/STM32/STM32F4xx/PWM-ICU/.cproject b/testhal/STM32/STM32F4xx/PWM-ICU/.cproject index 681cedec5..db7ee2be9 100644 --- a/testhal/STM32/STM32F4xx/PWM-ICU/.cproject +++ b/testhal/STM32/STM32F4xx/PWM-ICU/.cproject @@ -1,7 +1,5 @@ - - - + diff --git a/testhal/STM32/STM32F4xx/RTC/.cproject b/testhal/STM32/STM32F4xx/RTC/.cproject index 698b866bf..c7f0e4db6 100644 --- a/testhal/STM32/STM32F4xx/RTC/.cproject +++ b/testhal/STM32/STM32F4xx/RTC/.cproject @@ -1,7 +1,5 @@ - - - + diff --git a/testhal/STM32/STM32F4xx/SDC/.cproject b/testhal/STM32/STM32F4xx/SDC/.cproject index bcaaf7e95..d6ac1231c 100644 --- a/testhal/STM32/STM32F4xx/SDC/.cproject +++ b/testhal/STM32/STM32F4xx/SDC/.cproject @@ -1,7 +1,5 @@ - - - + diff --git a/testhal/STM32/STM32F4xx/SPI/.cproject b/testhal/STM32/STM32F4xx/SPI/.cproject index e05dca097..f406b6b09 100644 --- a/testhal/STM32/STM32F4xx/SPI/.cproject +++ b/testhal/STM32/STM32F4xx/SPI/.cproject @@ -1,7 +1,5 @@ - - - + diff --git a/testhal/STM32/STM32F4xx/UART/.cproject b/testhal/STM32/STM32F4xx/UART/.cproject index 7bb8c14a7..35b5421b1 100644 --- a/testhal/STM32/STM32F4xx/UART/.cproject +++ b/testhal/STM32/STM32F4xx/UART/.cproject @@ -1,7 +1,5 @@ - - - +