aboutsummaryrefslogtreecommitdiffstats
path: root/os
diff options
context:
space:
mode:
authorisiora <none@example.com>2018-04-13 14:09:09 +0000
committerisiora <none@example.com>2018-04-13 14:09:09 +0000
commitac27be4322458f206bfe175cfcb45b6217723117 (patch)
tree4260c1cf45f2d946b6ea7ddc6edb1486f732fc22 /os
parentf0bb318ecc6fe06eaadfed6f729eb9defb70a709 (diff)
downloadChibiOS-ac27be4322458f206bfe175cfcb45b6217723117.tar.gz
ChibiOS-ac27be4322458f206bfe175cfcb45b6217723117.tar.bz2
ChibiOS-ac27be4322458f206bfe175cfcb45b6217723117.zip
Minor changes.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11936 110e8d01-0319-4d1e-a829-52ad28d1bb01
Diffstat (limited to 'os')
-rw-r--r--os/hal/ports/SAMA/LLD/SDMMCv1/ch_sdmmc_device.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/os/hal/ports/SAMA/LLD/SDMMCv1/ch_sdmmc_device.c b/os/hal/ports/SAMA/LLD/SDMMCv1/ch_sdmmc_device.c
index 806fc4305..5861508b2 100644
--- a/os/hal/ports/SAMA/LLD/SDMMCv1/ch_sdmmc_device.c
+++ b/os/hal/ports/SAMA/LLD/SDMMCv1/ch_sdmmc_device.c
@@ -85,9 +85,10 @@ uint8_t sdmmc_device_lowlevelcfg(SdmmcDriver *driver)
/* Program capabilities for SDMMC0 */
sdmmc_set_capabilities((Sdmmc*) SDMMC0, caps0, CAPS0_MASK, 0, 0);
- /* Configure SDMMC0 pins */
#if 0
- /** SDMMC0 pin Card Detect (CD) */
+ /* Configure SDMMC0 pins */
+
+ /** SDMMC0 pin Card Detect (CD) */
palSetGroupMode(PIOA, (1u << PIOA_PIN13), 0U,
PAL_SAMA_FUNC_PERIPH_A | PAL_MODE_INPUT_PULLUP);
@@ -121,8 +122,8 @@ uint8_t sdmmc_device_lowlevelcfg(SdmmcDriver *driver)
/* Program capabilities for SDMMC1 */
sdmmc_set_capabilities(SDMMC1, caps0, CAPS0_MASK, 0, 0);
- /* Configure SDMMC1 pins */
#if 0
+ /* Configure SDMMC1 pins */
/** SDMMC1 pin Card Detect (CD) */
palSetGroupMode(PIOA, (1u << PIOA_PIN30), 0U,
PAL_SAMA_FUNC_PERIPH_E | PAL_MODE_INPUT_PULLUP);
@@ -138,6 +139,7 @@ uint8_t sdmmc_device_lowlevelcfg(SdmmcDriver *driver)
palSetGroupMode(PIOA, 0x003c0000, 0U,
PAL_SAMA_FUNC_PERIPH_E | PAL_MODE_INPUT_PULLUP);
#endif
+
res = 1;
}
break;
@@ -146,6 +148,7 @@ uint8_t sdmmc_device_lowlevelcfg(SdmmcDriver *driver)
break;
}
+
if (res) {
//check res
res = IS_CACHE_ALIGNED(driver->config->data_buf);