From 2f7fab8fb348668b5a06bb0ed4f133ea0797029e Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Tue, 22 Apr 2014 08:38:11 +0000
Subject: Fixed bug #485.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6873 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 os/hal/ports/STM32/LLD/mac_lld.c | 2 ++
 os/hal/src/mmc_spi.c             | 1 +
 2 files changed, 3 insertions(+)

(limited to 'os')

diff --git a/os/hal/ports/STM32/LLD/mac_lld.c b/os/hal/ports/STM32/LLD/mac_lld.c
index ab259912f..9f1b5e3db 100644
--- a/os/hal/ports/STM32/LLD/mac_lld.c
+++ b/os/hal/ports/STM32/LLD/mac_lld.c
@@ -297,9 +297,11 @@ void mac_lld_start(MACDriver *macp) {
 
   /* MAC clocks activation and commanded reset procedure.*/
   rccEnableETH(FALSE);
+#if defined(STM32_MAC_DMABMR_SR)
   ETH->DMABMR |= ETH_DMABMR_SR;
   while(ETH->DMABMR & ETH_DMABMR_SR)
     ;
+#endif
 
   /* ISR vector enabled.*/
   nvicEnableVector(ETH_IRQn,
diff --git a/os/hal/src/mmc_spi.c b/os/hal/src/mmc_spi.c
index 682ed273b..4ffaecfd4 100644
--- a/os/hal/src/mmc_spi.c
+++ b/os/hal/src/mmc_spi.c
@@ -447,6 +447,7 @@ bool mmcConnect(MMCDriver *mmcp) {
 
   /* Connection procedure in progress.*/
   mmcp->state = BLK_CONNECTING;
+  mmcp->block_addresses = FALSE;
 
   /* Slow clock mode and 128 clock pulses.*/
   spiStart(mmcp->config->spip, mmcp->config->lscfg);
-- 
cgit v1.2.3