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

Merge pull request #187 from nanoframework/josesimoes-patch-1 

Fix F7 cache invalidation on write operation
This commit is contained in:
Fabien Poussin 2019-03-11 16:27:34 +01:00 committed by GitHub
parent 4dfaea2dec a3e3114580
commit 41f7e4f225
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
os/various/fatfs_bindings/fatfs_diskio.c
View File

@ -206,8 +206,6 @@ DRESULT disk_write (
UINT count /* Number of sectors to write (1..255) */
)
{
// invalidate cache on buffer
cacheBufferFlush(buff, count * MMCSD_BLOCK_SIZE);
switch (pdrv) {
#if HAL_USE_MMC_SPI
@ -218,11 +216,15 @@ DRESULT disk_write (
return RES_WRPRT;
if (mmcStartSequentialWrite(&FATFS_HAL_DEVICE, sector))
return RES_ERROR;
while (count > 0) {
if (mmcSequentialWrite(&FATFS_HAL_DEVICE, buff))
return RES_ERROR;
buff += MMCSD_BLOCK_SIZE;
count--;
// invalidate cache on buffer
cacheBufferFlush(buff, MMCSD_BLOCK_SIZE);
if (mmcSequentialWrite(&FATFS_HAL_DEVICE, buff))
return RES_ERROR;
buff += MMCSD_BLOCK_SIZE;
count--;
}
if (mmcStopSequentialWrite(&FATFS_HAL_DEVICE))
return RES_ERROR;
@ -231,8 +233,13 @@ DRESULT disk_write (
case SDC:
if (blkGetDriverState(&FATFS_HAL_DEVICE) != BLK_READY)
return RES_NOTRDY;
// invalidate cache on buffer
cacheBufferFlush(buff, count * MMCSD_BLOCK_SIZE);
if (sdcWrite(&FATFS_HAL_DEVICE, sector, buff, count))
return RES_ERROR;
return RES_OK;
#endif
#if HAL_USBH_USE_MSD
@ -240,6 +247,10 @@ DRESULT disk_write (
/* It is initialized externally, just reads the status.*/
if (blkGetDriverState(&MSBLKD[0]) != BLK_READY)
return RES_NOTRDY;
// invalidate cache on buffer
cacheBufferFlush(buff, count * MSBLKD[0].info.blk_size);
if (usbhmsdLUNWrite(&MSBLKD[0], sector, buff, count))
return RES_ERROR;
return RES_OK;