From 0392211c8a8cbe3dfbff3e6bbb21805aac2b661d Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Sat, 28 Apr 2018 11:20:04 +0000 Subject: Fixed bug #942. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11965 110e8d01-0319-4d1e-a829-52ad28d1bb01 --- os/hal/boards/ST_STM32F769I_DISCOVERY/board.c | 6 +++--- os/hal/boards/ST_STM32F769I_DISCOVERY/board.h | 6 +++--- os/hal/boards/ST_STM32F769I_DISCOVERY/cfg/board.chcfg | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'os/hal') diff --git a/os/hal/boards/ST_STM32F769I_DISCOVERY/board.c b/os/hal/boards/ST_STM32F769I_DISCOVERY/board.c index 94ec0b449..f371e03ca 100644 --- a/os/hal/boards/ST_STM32F769I_DISCOVERY/board.c +++ b/os/hal/boards/ST_STM32F769I_DISCOVERY/board.c @@ -218,9 +218,9 @@ void __early_init(void) { * @brief SDC card detection. */ bool sdc_lld_is_card_inserted(SDCDriver *sdcp) { - - (void)sdcp; - + + (void)sdcp; + return !palReadLine(LINE_SD_DETECT); } diff --git a/os/hal/boards/ST_STM32F769I_DISCOVERY/board.h b/os/hal/boards/ST_STM32F769I_DISCOVERY/board.h index a919ad35c..1f6a907da 100644 --- a/os/hal/boards/ST_STM32F769I_DISCOVERY/board.h +++ b/os/hal/boards/ST_STM32F769I_DISCOVERY/board.h @@ -1173,7 +1173,7 @@ * PG5 - FMC_BA1 (alternate 12). * PG6 - EXT_SDA (input pullup). * PG7 - SAI1_MCLKA (alternate 6). - * PG8 - FMC_SDCLK (input floating). + * PG8 - FMC_SDCLK (alternate 12). * PG9 - SD_D0 (alternate 11). * PG10 - SD_D1 (alternate 11). * PG11 - RMII_TX_EN (alternate 11). @@ -1190,7 +1190,7 @@ PIN_MODE_ALTERNATE(GPIOG_FMC_BA1) | \ PIN_MODE_INPUT(GPIOG_EXT_SDA) | \ PIN_MODE_ALTERNATE(GPIOG_SAI1_MCLKA) | \ - PIN_MODE_INPUT(GPIOG_FMC_SDCLK) | \ + PIN_MODE_ALTERNATE(GPIOG_FMC_SDCLK) | \ PIN_MODE_ALTERNATE(GPIOG_SD_D0) | \ PIN_MODE_ALTERNATE(GPIOG_SD_D1) | \ PIN_MODE_ALTERNATE(GPIOG_RMII_TX_EN) | \ @@ -1270,7 +1270,7 @@ PIN_AFIO_AF(GPIOG_FMC_BA1, 12U) | \ PIN_AFIO_AF(GPIOG_EXT_SDA, 0U) | \ PIN_AFIO_AF(GPIOG_SAI1_MCLKA, 6U)) -#define VAL_GPIOG_AFRH (PIN_AFIO_AF(GPIOG_FMC_SDCLK, 0U) | \ +#define VAL_GPIOG_AFRH (PIN_AFIO_AF(GPIOG_FMC_SDCLK, 12U) | \ PIN_AFIO_AF(GPIOG_SD_D0, 11U) | \ PIN_AFIO_AF(GPIOG_SD_D1, 11U) | \ PIN_AFIO_AF(GPIOG_RMII_TX_EN, 11U) | \ diff --git a/os/hal/boards/ST_STM32F769I_DISCOVERY/cfg/board.chcfg b/os/hal/boards/ST_STM32F769I_DISCOVERY/cfg/board.chcfg index 29d29c70f..9add71721 100644 --- a/os/hal/boards/ST_STM32F769I_DISCOVERY/cfg/board.chcfg +++ b/os/hal/boards/ST_STM32F769I_DISCOVERY/cfg/board.chcfg @@ -884,8 +884,8 @@ Level="High" Speed="Maximum" Resistor="Floating" - Mode="Input" - Alternate="0" /> + Mode="Alternate" + Alternate="12" />