Skip to content

Improve support for eMMC cards #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jwoloch wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Improve support for eMMC cards #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions os/hal/include/hal_sdc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@ extern "C" {
bool sdcGetInfo(SDCDriver *sdcp, BlockDeviceInfo *bdip);
bool sdcErase(SDCDriver *sdcp, uint32_t startblk, uint32_t endblk);
bool _sdc_wait_for_transfer_state(SDCDriver *sdcp);
bool _sdc_wait_for_transfer_state_nocrc(SDCDriver *sdcp);
#ifdef __cplusplus
}
#endif
Expand Down
26 changes: 22 additions & 4 deletions os/hal/src/hal_sdc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,13 +499,18 @@ static bool mmc_set_bus_width(SDCDriver *sdcp) {
*
* @notapi
*/
bool _sdc_wait_for_transfer_state(SDCDriver *sdcp) {
bool _sdc_wait_transfer_state_internal(SDCDriver *sdcp, bool crc_check) {
uint32_t resp[1];
bool cmd_fail;

while (true) {
if (sdc_lld_send_cmd_short_crc(sdcp, MMCSD_CMD_SEND_STATUS,
sdcp->rca, resp) ||
MMCSD_R1_ERROR(resp[0])) {
if (crc_check) {
cmd_fail = sdc_lld_send_cmd_short_crc(sdcp, MMCSD_CMD_SEND_STATUS, sdcp->rca, resp);
} else {
cmd_fail = sdc_lld_send_cmd_short(sdcp, MMCSD_CMD_SEND_STATUS, sdcp->rca, resp);
}

if (cmd_fail || MMCSD_R1_ERROR(resp[0])) {
return HAL_FAILED;
}

Expand All @@ -527,6 +532,14 @@ bool _sdc_wait_for_transfer_state(SDCDriver *sdcp) {
}
}

bool _sdc_wait_for_transfer_state(SDCDriver *sdcp) {
return _sdc_wait_transfer_state_internal(sdcp, true);
}

bool _sdc_wait_for_transfer_state_nocrc(SDCDriver *sdcp) {
return _sdc_wait_transfer_state_internal(sdcp, false);
}

/*===========================================================================*/
/* Driver exported functions. */
/*===========================================================================*/
Expand Down Expand Up @@ -723,6 +736,11 @@ bool sdcConnect(SDCDriver *sdcp) {
}
sdc_lld_set_data_clk(sdcp, clk);

/* Not checking CRC here according to JEDEC Standard No. 84-B51 6.6.2 */
if (HAL_SUCCESS != _sdc_wait_for_transfer_state_nocrc(sdcp)) {
goto failed;
}

/* Block length fixed at 512 bytes.*/
if (sdc_lld_send_cmd_short_crc(sdcp, MMCSD_CMD_SET_BLOCKLEN,
MMCSD_BLOCK_SIZE, resp) ||
Expand Down