ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #91 from deepikabhavnani/conf_init_freq 

Config option for initialization frequency
pull/7774/head
Deepika 2018-04-05 12:14:29 -05:00 committed by GitHub
parent 48bdc8821b 0a04507c14
commit 6238fc964f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
SDBlockDevice.cpp
View File

@ -159,6 +159,11 @@
#define MBED_CONF_SD_CMD0_IDLE_STATE_RETRIES 5 /*!< Number of retries for sending CMDO */ #define MBED_CONF_SD_CMD0_IDLE_STATE_RETRIES 5 /*!< Number of retries for sending CMDO */
#endif #endif
#ifndef MBED_CONF_SD_INIT_FREQUENCY
#define MBED_CONF_SD_INIT_FREQUENCY 100000 /*!< Initialization frequency Range (100KHz-400KHz) */
#endif
#define SD_COMMAND_TIMEOUT MBED_CONF_SD_CMD_TIMEOUT #define SD_COMMAND_TIMEOUT MBED_CONF_SD_CMD_TIMEOUT
#define SD_CMD0_GO_IDLE_STATE_RETRIES MBED_CONF_SD_CMD0_IDLE_STATE_RETRIES #define SD_CMD0_GO_IDLE_STATE_RETRIES MBED_CONF_SD_CMD0_IDLE_STATE_RETRIES
#define SD_DBG 0 /*!< 1 - Enable debugging */ #define SD_DBG 0 /*!< 1 - Enable debugging */
@ -251,7 +256,9 @@ SDBlockDevice::SDBlockDevice(PinName mosi, PinName miso, PinName sclk, PinName c
_card_type = SDCARD_NONE; _card_type = SDCARD_NONE;
// Set default to 100kHz for initialisation and 1MHz for data transfer // Set default to 100kHz for initialisation and 1MHz for data transfer
_init_sck = 100000; MBED_STATIC_ASSERT(((MBED_CONF_SD_INIT_FREQUENCY >= 100000) && (MBED_CONF_SD_INIT_FREQUENCY <= 400000)),
"Initialization frequency should be between 100KHz to 400KHz");
_init_sck = MBED_CONF_SD_INIT_FREQUENCY;
_transfer_sck = hz; _transfer_sck = hz;
// Only HC block size is supported. // Only HC block size is supported.

3
config/mbed_lib.json
View File

@ -8,7 +8,8 @@
"DEVICE_SPI": 1, "DEVICE_SPI": 1,
"FSFAT_SDCARD_INSTALLED": 1, "FSFAT_SDCARD_INSTALLED": 1,
"CMD_TIMEOUT": 5000, "CMD_TIMEOUT": 5000,
"CMD0_IDLE_STATE_RETRIES" : 5 "CMD0_IDLE_STATE_RETRIES": 5,
"SD_INIT_FREQUENCY": 100000
}, },
"target_overrides": { "target_overrides": {
"DISCO_F051R8": { "DISCO_F051R8": {