diff options
| author | Fabien Poussin <fabien.poussin@gmail.com> | 2018-09-27 08:28:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-27 08:28:59 +0200 |
| commit | 38bcaedef46834e8a903c0c4a05884d221d2fc2e (patch) | |
| tree | 3b42ac586b21ea36c3e5af49edff0d1e357502ea /os/various/fatfs_bindings/fatfs_diskio.c | |
| parent | fe95e90b80a28dd2f40bfee1ad90822b99519c6a (diff) | |
| parent | 6f018973caa979897d4c932222b53e705113b612 (diff) | |
| download | ChibiOS-Contrib-38bcaedef46834e8a903c0c4a05884d221d2fc2e.tar.gz ChibiOS-Contrib-38bcaedef46834e8a903c0c4a05884d221d2fc2e.tar.bz2 ChibiOS-Contrib-38bcaedef46834e8a903c0c4a05884d221d2fc2e.zip | |
Merge pull request #167 from ObKo/chibios-18.2.x
Diffstat (limited to 'os/various/fatfs_bindings/fatfs_diskio.c')
| -rw-r--r-- | os/various/fatfs_bindings/fatfs_diskio.c | 12 |
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 80d1502..eb732fd 100644 --- a/os/various/fatfs_bindings/fatfs_diskio.c +++ b/os/various/fatfs_bindings/fatfs_diskio.c @@ -243,12 +243,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; @@ -264,7 +264,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; @@ -272,7 +272,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; @@ -289,12 +289,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: // .... |