From ac4772bb0a259439dcd64265abab122b3274b009 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Sun, 9 Apr 2017 06:46:57 +0000 Subject: Fixed bug #826. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10149 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/hal/include/hal_sdc.h | 14 ++++++++++++++ os/hal/src/hal_sdc.c | 4 ++-- 2 files changed, 16 insertions(+), 2 deletions(-) (limited to 'os') diff --git a/os/hal/include/hal_sdc.h b/os/hal/include/hal_sdc.h index 98a0492ab..6466b1d97 100644 --- a/os/hal/include/hal_sdc.h +++ b/os/hal/include/hal_sdc.h @@ -92,6 +92,20 @@ #if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__) #define SDC_NICE_WAITING TRUE #endif + +/** + * @brief OCR initialization constant for V20 cards. + */ +#if !defined(SDC_INIT_OCR_V20) || defined(__DOXYGEN__) +#define SDC_INIT_OCR_V20 0x50FF8000U +#endif + +/** + * @brief OCR initialization constant for non-V20 cards. + */ +#if !defined(SDC_INIT_OCR) || defined(__DOXYGEN__) +#define SDC_INIT_OCR 0x80100000U +#endif /** @} */ /*===========================================================================*/ diff --git a/os/hal/src/hal_sdc.c b/os/hal/src/hal_sdc.c index 80cbca3bf..70a85b10f 100644 --- a/os/hal/src/hal_sdc.c +++ b/os/hal/src/hal_sdc.c @@ -183,10 +183,10 @@ static bool sdc_init(SDCDriver *sdcp) { uint32_t resp[1]; if ((sdcp->cardmode & SDC_MODE_CARDTYPE_MASK) == SDC_MODE_CARDTYPE_SDV20) { - ocr = 0xC0100000U; + ocr = SDC_INIT_OCR_V20; } else { - ocr = 0x80100000U; + ocr = SDC_INIT_OCR; } i = 0; -- cgit v1.2.3