mirrors
/
micropython
mirror of https://github.com/micropython/micropython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

stmhal/usbd_msc_storage: Use storage functions instead of disk ones.

This commit is contained in:
Damien George 2017-01-27 23:10:18 +11:00
parent 4565d42e70
commit 3242cf2d36
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
stmhal/usbd_msc_storage.c
View File

@ -37,7 +37,6 @@
#include "usbd_msc_storage.h" #include "usbd_msc_storage.h"
#include "py/misc.h" #include "py/misc.h"
#include "lib/fatfs/diskio.h"
#include "storage.h" #include "storage.h"
#include "sdcard.h" #include "sdcard.h"
@ -121,7 +120,7 @@ int8_t FLASH_STORAGE_StartStopUnit(uint8_t lun, uint8_t started) {
int8_t FLASH_STORAGE_PreventAllowMediumRemoval(uint8_t lun, uint8_t param) { int8_t FLASH_STORAGE_PreventAllowMediumRemoval(uint8_t lun, uint8_t param) {
// sync the flash so that the cache is cleared and the device can be unplugged/turned off // sync the flash so that the cache is cleared and the device can be unplugged/turned off
disk_ioctl(0, CTRL_SYNC, NULL); storage_flush();
return 0; return 0;
} }
@ -134,7 +133,7 @@ int8_t FLASH_STORAGE_PreventAllowMediumRemoval(uint8_t lun, uint8_t param) {
* @retval Status * @retval Status
*/ */
int8_t FLASH_STORAGE_Read(uint8_t lun, uint8_t *buf, uint32_t blk_addr, uint16_t blk_len) { int8_t FLASH_STORAGE_Read(uint8_t lun, uint8_t *buf, uint32_t blk_addr, uint16_t blk_len) {
disk_read(0, buf, blk_addr, blk_len); storage_read_blocks(buf, blk_addr, blk_len);
/* /*
for (int i = 0; i < blk_len; i++) { for (int i = 0; i < blk_len; i++) {
if (!storage_read_block(buf + i * FLASH_BLOCK_SIZE, blk_addr + i)) { if (!storage_read_block(buf + i * FLASH_BLOCK_SIZE, blk_addr + i)) {
@ -154,7 +153,7 @@ int8_t FLASH_STORAGE_Read(uint8_t lun, uint8_t *buf, uint32_t blk_addr, uint16_t
* @retval Status * @retval Status
*/ */
int8_t FLASH_STORAGE_Write (uint8_t lun, uint8_t *buf, uint32_t blk_addr, uint16_t blk_len) { int8_t FLASH_STORAGE_Write (uint8_t lun, uint8_t *buf, uint32_t blk_addr, uint16_t blk_len) {
disk_write(0, buf, blk_addr, blk_len); storage_write_blocks(buf, blk_addr, blk_len);
/* /*
for (int i = 0; i < blk_len; i++) { for (int i = 0; i < blk_len; i++) {
if (!storage_write_block(buf + i * FLASH_BLOCK_SIZE, blk_addr + i)) { if (!storage_write_block(buf + i * FLASH_BLOCK_SIZE, blk_addr + i)) {