From 600b02f38f3530c3bf3585090b685443ad8c11c8 Mon Sep 17 00:00:00 2001 From: barthess Date: Thu, 5 Jan 2012 12:12:40 +0000 Subject: minor changes in NONSTANDARD_STM32F4_BARTHESS1/board.h git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3738 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- boards/NONSTANDARD_STM32F4_BARTHESS1/board.h | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'boards') diff --git a/boards/NONSTANDARD_STM32F4_BARTHESS1/board.h b/boards/NONSTANDARD_STM32F4_BARTHESS1/board.h index 3f2183e2c..07527f382 100644 --- a/boards/NONSTANDARD_STM32F4_BARTHESS1/board.h +++ b/boards/NONSTANDARD_STM32F4_BARTHESS1/board.h @@ -323,11 +323,11 @@ /* 0x00000000 */ #define VAL_GPIOC_OTYPER 0x00000000 /* 0x00000000 */ -#define VAL_GPIOC_OSPEEDR (PIN_OSPEED_100M(GPIOC_SDIO_D0) | \ - PIN_OSPEED_100M(GPIOC_SDIO_D1) | \ - PIN_OSPEED_100M(GPIOC_SDIO_D2) | \ - PIN_OSPEED_100M(GPIOC_SDIO_D3) | \ - PIN_OSPEED_100M(GPIOC_SDIO_CK) | \ +#define VAL_GPIOC_OSPEEDR (PIN_OSPEED_25M(GPIOC_SDIO_D0) | \ + PIN_OSPEED_25M(GPIOC_SDIO_D1) | \ + PIN_OSPEED_25M(GPIOC_SDIO_D2) | \ + PIN_OSPEED_25M(GPIOC_SDIO_D3) | \ + PIN_OSPEED_25M(GPIOC_SDIO_CK) | \ PIN_OSPEED_2M(GPIOC_TAMPER_RTC)) /* 0x00000000 */ #define VAL_GPIOC_PUPDR (PIN_PUDR_FLOATING(GPIOC_AN_CURRENT_SENS) | \ @@ -338,11 +338,11 @@ PIN_PUDR_FLOATING(GPIOC_AN33_2) | \ PIN_PUDR_PULLUP(6) | \ PIN_PUDR_PULLUP(7) | \ - PIN_PUDR_FLOATING(GPIOC_SDIO_D0) | \ - PIN_PUDR_FLOATING(GPIOC_SDIO_D1) | \ - PIN_PUDR_FLOATING(GPIOC_SDIO_D2) | \ - PIN_PUDR_FLOATING(GPIOC_SDIO_D3) | \ - PIN_PUDR_FLOATING(GPIOC_SDIO_CK) | \ + PIN_PUDR_PULLUP(GPIOC_SDIO_D0) | \ + PIN_PUDR_PULLUP(GPIOC_SDIO_D1) | \ + PIN_PUDR_PULLUP(GPIOC_SDIO_D2) | \ + PIN_PUDR_PULLUP(GPIOC_SDIO_D3) | \ + PIN_PUDR_PULLUP(GPIOC_SDIO_CK) | \ PIN_PUDR_FLOATING(GPIOC_TAMPER_RTC) | \ PIN_PUDR_FLOATING(GPIOC_OSC32_IN) | \ PIN_PUDR_FLOATING(GPIOC_OSC32_OUT)) @@ -374,9 +374,10 @@ /* 0x00000000 */ #define VAL_GPIOD_OTYPER 0x00000000 /* 0x00000000 */ -#define VAL_GPIOD_OSPEEDR (PIN_OSPEED_100M(GPIOD_SDIO_CMD)) +#define VAL_GPIOD_OSPEEDR (PIN_OSPEED_25M(GPIOD_SDIO_CMD)) /* 0x00000000 */ -#define VAL_GPIOD_PUPDR (PIN_PUDR_PULLDOWN(GPIOD_PWM1) | \ +#define VAL_GPIOD_PUPDR (PIN_PUDR_PULLUP(GPIOD_SDIO_CMD) | \ + PIN_PUDR_PULLDOWN(GPIOD_PWM1) | \ PIN_PUDR_PULLDOWN(GPIOD_PWM2) | \ PIN_PUDR_PULLDOWN(GPIOD_PWM3) | \ PIN_PUDR_PULLDOWN(GPIOD_PWM4)) -- cgit v1.2.3