diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2014-04-22 08:38:11 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2014-04-22 08:38:11 +0000 |
| commit | 2f7fab8fb348668b5a06bb0ed4f133ea0797029e (patch) | |
| tree | ff73da215fdf2e7795a297a03eee7ae92e465996 /os/hal | |
| parent | 83400e32964bf72fdd565ddf071a2e26b94bce2f (diff) | |
| download | ChibiOS-2f7fab8fb348668b5a06bb0ed4f133ea0797029e.tar.gz ChibiOS-2f7fab8fb348668b5a06bb0ed4f133ea0797029e.tar.bz2 ChibiOS-2f7fab8fb348668b5a06bb0ed4f133ea0797029e.zip | |
Fixed bug #485.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6873 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal')
| -rw-r--r-- | os/hal/ports/STM32/LLD/mac_lld.c | 2 | ||||
| -rw-r--r-- | os/hal/src/mmc_spi.c | 1 |
2 files changed, 3 insertions, 0 deletions
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);
|