aboutsummaryrefslogtreecommitdiffstats
path: root/os
diff options
context:
space:
mode:
authorDiego Ismirlian <dismirlian (at) google's mail.com>2018-08-20 21:29:16 -0300
committerDiego Ismirlian <dismirlian (at) google's mail.com>2018-08-20 21:29:16 -0300
commit2366ead14ea7c0b2b782fce9ece511c391f89b6c (patch)
tree5c2bc7632037f0a8189036cd6068d09eea61a5bb /os
parentdd1799beda52bbcbea7f4b091280b1d8b80c8b77 (diff)
downloadChibiOS-Contrib-2366ead14ea7c0b2b782fce9ece511c391f89b6c.tar.gz
ChibiOS-Contrib-2366ead14ea7c0b2b782fce9ece511c391f89b6c.tar.bz2
ChibiOS-Contrib-2366ead14ea7c0b2b782fce9ece511c391f89b6c.zip
FATFS: update diskio to match FATFS version
Diffstat (limited to 'os')
-rw-r--r--os/various/fatfs_bindings/fatfs_diskio.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/os/various/fatfs_bindings/fatfs_diskio.c b/os/various/fatfs_bindings/fatfs_diskio.c
index 3d068f3..0104a11 100644
--- a/os/various/fatfs_bindings/fatfs_diskio.c
+++ b/os/various/fatfs_bindings/fatfs_diskio.c
@@ -213,12 +213,12 @@ DRESULT disk_ioctl (
switch (cmd) {
case CTRL_SYNC:
return RES_OK;
-#if _MAX_SS > _MIN_SS
+#if FF_MAX_SS > FF_MIN_SS
case GET_SECTOR_SIZE:
*((WORD *)buff) = MMCSD_BLOCK_SIZE;
return RES_OK;
#endif
-#if _USE_TRIM
+#if FF_USE_TRIM
case CTRL_TRIM:
mmcErase(&MMCD1, *((DWORD *)buff), *((DWORD *)buff + 1));
return RES_OK;
@@ -234,7 +234,7 @@ DRESULT disk_ioctl (
case GET_SECTOR_COUNT:
*((DWORD *)buff) = mmcsdGetCardCapacity(&SDCD1);
return RES_OK;
-#if _MAX_SS > _MIN_SS
+#if FF_MAX_SS > FF_MIN_SS
case GET_SECTOR_SIZE:
*((WORD *)buff) = MMCSD_BLOCK_SIZE;
return RES_OK;
@@ -242,7 +242,7 @@ DRESULT disk_ioctl (
case GET_BLOCK_SIZE:
*((DWORD *)buff) = 256; /* 512b blocks in one erase block */
return RES_OK;
-#if _USE_TRIM
+#if FF_USE_TRIM
case CTRL_TRIM:
sdcErase(&SDCD1, *((DWORD *)buff), *((DWORD *)buff + 1));
return RES_OK;
@@ -259,12 +259,12 @@ DRESULT disk_ioctl (
case GET_SECTOR_COUNT:
*((DWORD *)buff) = MSBLKD[0].info.blk_num;
return RES_OK;
-#if _MAX_SS > _MIN_SS
+#if FF_MAX_SS > FF_MIN_SS
case GET_SECTOR_SIZE:
*((WORD *)buff) = MSBLKD[0].info.blk_size;
return RES_OK;
#endif
-#if _USE_TRIM
+#if FF_USE_TRIM
#error "unimplemented yet!"
// case CTRL_TRIM:
// ....