git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7598 35acf78f-673a-0410-8e92-d51de3d6d3f4

4 files changed, 10 insertions, 10 deletions

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