Fixed bug 3581929.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4793 35acf78f-673a-0410-8e92-d51de3d6d3f4
master
gdisirio 2012-11-03 09:39:53 +00:00
parent ed90eed65f
commit 361e43c4dc
3 changed files with 28 additions and 2 deletions

View File

@ -51,6 +51,30 @@ void __early_init(void) {
stm32_clock_init(); stm32_clock_init();
} }
#if HAL_USE_MMC_SPI || defined(__DOXYGEN__)
/**
* @brief MMC_SPI card detection.
*/
bool_t mmc_lld_is_card_inserted(MMCDriver *mmcp) {
static bool_t last_status = FALSE;
(void)mmcp;
if ((palReadLatch(GPIOD) & PAL_PORT_BIT(GPIOD_SPI3_CS)) == 0)
return last_status;
return last_status = (bool_t)palReadPad(GPIOD, GPIOD_SPI3_CS);
}
/**
* @brief MMC_SPI card write protection detection.
*/
bool_t mmc_lld_is_write_protected(MMCDriver *mmcp) {
(void)mmcp;
/* TODO: Fill the implementation.*/
return FALSE;
}
#endif
/* /*
* Board-specific initialization code. * Board-specific initialization code.
*/ */

View File

@ -362,7 +362,7 @@
* *
* PD0 - GPIOD_USELESS0 (input pull-up). * PD0 - GPIOD_USELESS0 (input pull-up).
* PD1 - GPIOD_USELESS1 (input pull-up). * PD1 - GPIOD_USELESS1 (input pull-up).
* PD2 - GPIOD_SPI3_CS (output push-pull). * PD2 - GPIOD_SPI3_CS (output opendrain).
* PD3 - GPIOD_LCD_RST (output push-pull). * PD3 - GPIOD_LCD_RST (output push-pull).
* PD4 - GPIOD_USELESS4 (input pull-up). * PD4 - GPIOD_USELESS4 (input pull-up).
* PD5 - GPIOD_USELESS5 (input pull-up). * PD5 - GPIOD_USELESS5 (input pull-up).
@ -393,7 +393,7 @@
PIN_MODE_INPUT(GPIOD_USB_HS_FAULT) | \ PIN_MODE_INPUT(GPIOD_USB_HS_FAULT) | \
PIN_MODE_INPUT(GPIOD_USELESS14) | \ PIN_MODE_INPUT(GPIOD_USELESS14) | \
PIN_MODE_INPUT(GPIOD_USELESS15)) PIN_MODE_INPUT(GPIOD_USELESS15))
#define VAL_GPIOD_OTYPER 0x00000000 #define VAL_GPIOD_OTYPER PIN_OTYPE_OPENDRAIN(GPIOD_SPI3_CS)
#define VAL_GPIOD_OSPEEDR 0xFFFFFFFF #define VAL_GPIOD_OSPEEDR 0xFFFFFFFF
#define VAL_GPIOD_PUPDR (PIN_PUDR_PULLUP(GPIOD_USELESS0) | \ #define VAL_GPIOD_PUPDR (PIN_PUDR_PULLUP(GPIOD_USELESS0) | \
PIN_PUDR_PULLUP(GPIOD_USELESS1) | \ PIN_PUDR_PULLUP(GPIOD_USELESS1) | \

View File

@ -82,6 +82,8 @@
***************************************************************************** *****************************************************************************
*** 2.5.1 *** *** 2.5.1 ***
- FIX: Fixed STM32_P407: implement mmc_lld_is_card_inserted (bug 3581929)
(backported to 2.4.3).
- FIX: Fixed double chSysInit() call in MSP430F1611 demo (bug 3581304) - FIX: Fixed double chSysInit() call in MSP430F1611 demo (bug 3581304)
(backported to 2.2.10 and 2.4.3). (backported to 2.2.10 and 2.4.3).
- FIX: Fixed patch for various demos (bug 3579734). - FIX: Fixed patch for various demos (bug 3579734).