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

4 files changed, 13 insertions, 13 deletions

diff --git a/os/hal/boards/OLIMEX_STM32_E407/board.c b/os/hal/boards/OLIMEX_STM32_E407/board.c
index e2144859f..4838d4b21 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 af007213d..6269abfcf 100644
--- a/os/hal/boards/OLIMEX_STM32_E407/board.h
+++ b/os/hal/boards/OLIMEX_STM32_E407/board.h
@@ -1,5 +1,5 @@
 /*

-    ChibiOS - Copyright (C) 2006-2014 Giovanni Di Sirio

+    ChibiOS/RT - Copyright (C) 2006-2013 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.

@@ -325,7 +325,7 @@
                                      PIN_ODR_HIGH(GPIOA_PIN5) |             \

                                      PIN_ODR_HIGH(GPIOA_PIN6) |             \

                                      PIN_ODR_HIGH(GPIOA_ETH_RMII_CRS_DV) |  \

-                                     PIN_ODR_HIGH(GPIOA_USB_HS_BUSON) |     \

+                                     PIN_ODR_LOW(GPIOA_USB_HS_BUSON) |      \

                                      PIN_ODR_HIGH(GPIOA_OTG_FS_VBUS) |      \

                                      PIN_ODR_HIGH(GPIOA_OTG_FS_ID) |        \

                                      PIN_ODR_HIGH(GPIOA_OTG_FS_DM) |        \

@@ -434,7 +434,7 @@
                                      PIN_PUPDR_PULLDOWN(GPIOB_OTG_HS_VBUS) |\

                                      PIN_PUPDR_FLOATING(GPIOB_OTG_HS_DM) |  \

                                      PIN_PUPDR_FLOATING(GPIOB_OTG_HS_DP))

-#define VAL_GPIOB_ODR               (PIN_ODR_HIGH(GPIOB_USB_FS_BUSON) |     \

+#define VAL_GPIOB_ODR               (PIN_ODR_LOW(GPIOB_USB_FS_BUSON) |      \

                                      PIN_ODR_HIGH(GPIOB_USB_HS_FAULT) |     \

                                      PIN_ODR_HIGH(GPIOB_BOOT1) |            \

                                      PIN_ODR_HIGH(GPIOB_JTAG_TDO) |         \

diff --git a/os/hal/boards/OLIMEX_STM32_E407/board.mk b/os/hal/boards/OLIMEX_STM32_E407/board.mk
index 4c82966b6..0f9c9e4a7 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}/os/hal/boards/OLIMEX_STM32_E407/board.c

+BOARDSRC = ${CHIBIOS}/boards/OLIMEX_STM32_E407/board.c

 

 # Required include directories

-BOARDINC = ${CHIBIOS}/os/hal/boards/OLIMEX_STM32_E407

+BOARDINC = ${CHIBIOS}/boards/OLIMEX_STM32_E407

diff --git a/os/hal/boards/OLIMEX_STM32_E407/cfg/board.chcfg b/os/hal/boards/OLIMEX_STM32_E407/cfg/board.chcfg
index 0818bbb3d..6d4e8d09b 100644
--- a/os/hal/boards/OLIMEX_STM32_E407/cfg/board.chcfg
+++ b/os/hal/boards/OLIMEX_STM32_E407/cfg/board.chcfg
@@ -50,7 +50,7 @@
             <pin7 ID="ETH_RMII_CRS_DV" Type="PushPull" Speed="Maximum"

                 Resistor="Floating" Level="High" Mode="Alternate" Alternate="11" />

             <pin8 ID="USB_HS_BUSON" Type="PushPull" Speed="Maximum"

-                Resistor="Floating" Level="High" Mode="Output" Alternate="0" />

+                Resistor="Floating" Level="Low" Mode="Output" Alternate="0" />

             <pin9 ID="OTG_FS_VBUS" Type="PushPull" Speed="Maximum" Resistor="PullDown"

                 Level="High" Mode="Input" Alternate="0" />

             <pin10 ID="OTG_FS_ID" Type="PushPull" Speed="Maximum" Resistor="Floating"

@@ -68,7 +68,7 @@
         </GPIOA>

         <GPIOB>

             <pin0 ID="USB_FS_BUSON" Type="PushPull" Speed="Maximum"

-                Resistor="Floating" Level="High" Mode="Output" Alternate="0" />

+                Resistor="Floating" Level="Low" Mode="Output" Alternate="0" />

             <pin1 ID="USB_HS_FAULT" Type="PushPull" Speed="Maximum"

                 Resistor="Floating" Level="High" Mode="Input" Alternate="0" />

             <pin2 ID="BOOT1" Type="PushPull" Speed="Maximum" Resistor="Floating"