diff options
| author | danicampora <danicampora@gmail.com> | 2015-03-15 20:50:56 +0100 |
|---|---|---|
| committer | danicampora <danicampora@gmail.com> | 2015-03-16 00:42:13 +0100 |
| commit | 09623580262ecbd747f4feabd62eceb524ec16af (patch) | |
| tree | 4f0ebb7613aef14cc81e7aa9baca9f757493e571 | |
| parent | 1080802e8f4defc792228cc36d0514f5b6f09e82 (diff) | |
cc3200: Align SD card driver with new SDK release(1.1.0).
| -rw-r--r-- | cc3200/fatfs/src/drivers/sd_diskio.c | 4 | ||||
| -rw-r--r-- | cc3200/mods/pybsd.c | 8 |
2 files changed, 12 insertions, 0 deletions
diff --git a/cc3200/fatfs/src/drivers/sd_diskio.c b/cc3200/fatfs/src/drivers/sd_diskio.c index fbe73ebde..57ff5ae62 100644 --- a/cc3200/fatfs/src/drivers/sd_diskio.c +++ b/cc3200/fatfs/src/drivers/sd_diskio.c @@ -360,6 +360,8 @@ DRESULT sd_disk_read (BYTE* pBuffer, DWORD ulSectorNumber, UINT SectorCount) { pBuffer += 4; } CardSendCmd(CMD_STOP_TRANS, 0); + // Wait for the command to complete + while (!(MAP_SDHostIntStatus(SDHOST_BASE) & SDHOST_INT_TC)); Res = RES_OK; } } @@ -430,6 +432,8 @@ DRESULT sd_disk_write (const BYTE* pBuffer, DWORD ulSectorNumber, UINT SectorCou // Wait for transfer complete while (!(MAP_SDHostIntStatus(SDHOST_BASE) & SDHOST_INT_TC)); CardSendCmd(CMD_STOP_TRANS, 0); + // Wait for the command to complete + while (!(MAP_SDHostIntStatus(SDHOST_BASE) & SDHOST_INT_TC)); Res = RES_OK; } } diff --git a/cc3200/mods/pybsd.c b/cc3200/mods/pybsd.c index 6d326ded5..c54dfc705 100644 --- a/cc3200/mods/pybsd.c +++ b/cc3200/mods/pybsd.c @@ -131,11 +131,17 @@ STATIC mp_obj_t pybsd_make_new (mp_obj_t type_in, mp_uint_t n_args, mp_uint_t n_ pin_verify_af (pybsd_obj.af_cmd); // configure the sdhost pins + // TODO: all pin configs must go through pin_config() MAP_PinTypeSDHost(pybsd_obj.pin_d0->pin_num, pybsd_obj.af_d0); MAP_PinTypeSDHost(pybsd_obj.pin_clk->pin_num, pybsd_obj.af_clk); MAP_PinDirModeSet(pybsd_obj.pin_clk->pin_num, PIN_DIR_MODE_OUT); MAP_PinTypeSDHost(pybsd_obj.pin_cmd->pin_num, pybsd_obj.af_cmd); + // enable pull-ups on data and cmd + // TODO: all pin configs must go through pin_config() + MAP_PinConfigSet(pybsd_obj.pin_d0->pin_num, PIN_STRENGTH_4MA, PIN_TYPE_STD_PU); + MAP_PinConfigSet(pybsd_obj.pin_cmd->pin_num, PIN_STRENGTH_4MA, PIN_TYPE_STD_PU); + // card detect pin was provided if (n_args == 7) { pybsd_obj.pin_sd_detect = (pin_obj_t *)pin_find(args[6]); @@ -152,6 +158,8 @@ STATIC mp_obj_t pybsd_make_new (mp_obj_t type_in, mp_uint_t n_args, mp_uint_t n_ nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, mpexception_num_type_invalid_arguments)); } + // TODO: register with the sleep module!! + pybsd_obj.base.type = &pyb_sd_type; return &pybsd_obj; } |