andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #826. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10149 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
Giovanni Di Sirio 2017-04-09 06:46:57 +00:00
parent 0c9bb01240
commit ac4772bb0a
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
os/hal/include/hal_sdc.h
View File

@ -92,6 +92,20 @@
#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__) #if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)
#define SDC_NICE_WAITING TRUE #define SDC_NICE_WAITING TRUE
#endif #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
/** @} */ /** @} */
/*===========================================================================*/ /*===========================================================================*/

4
os/hal/src/hal_sdc.c
View File

@ -183,10 +183,10 @@ static bool sdc_init(SDCDriver *sdcp) {
uint32_t resp[1]; uint32_t resp[1];
if ((sdcp->cardmode & SDC_MODE_CARDTYPE_MASK) == SDC_MODE_CARDTYPE_SDV20) { if ((sdcp->cardmode & SDC_MODE_CARDTYPE_MASK) == SDC_MODE_CARDTYPE_SDV20) {
ocr = 0xC0100000U; ocr = SDC_INIT_OCR_V20;
} }
else { else {
ocr = 0x80100000U; ocr = SDC_INIT_OCR;
} }
i = 0; i = 0;

2
readme.txt
View File

@ -157,6 +157,8 @@
- RT: Merged RT4. - RT: Merged RT4.
- NIL: Merged NIL2. - NIL: Merged NIL2.
- NIL: Added STM32F7 demo. - NIL: Added STM32F7 demo.
- HAL: Fixed invalid SDC OCR initialization value (bug #826)(backported
to 16.1.8).
- HAL: Fixed osThreadSetPriority() returns old priority instead of a status - HAL: Fixed osThreadSetPriority() returns old priority instead of a status
code (bug #823)(backported to 16.1.8). code (bug #823)(backported to 16.1.8).
- HAL: Fixed problem in rtcSTM32SetPeriodicWakeup() (bug #821)(backported - HAL: Fixed problem in rtcSTM32SetPeriodicWakeup() (bug #821)(backported