diff options
| author | Jeff Epler <jepler@gmail.com> | 2020-03-03 20:13:53 -0600 |
|---|---|---|
| committer | Jeff Epler <jepler@gmail.com> | 2020-03-03 20:13:53 -0600 |
| commit | da31acfcc45e5ad43c8ea515650ef16540de7fbb (patch) | |
| tree | dba7d3ef6c7099c8d79e7dde7bd42d132e435498 /lib | |
| parent | c0bfa117661766cdc7d5a3daca88008a669b5a90 (diff) | |
| parent | e98991fd7e472f8d43ae60ad62ef1c32fd250fea (diff) | |
Merge remote-tracking branch 'origin/master' into ulab
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/oofatfs/ff.c | 6 | ||||
| -rw-r--r-- | lib/oofatfs/ffconf.h | 6 |
2 files changed, 1 insertions, 11 deletions
diff --git a/lib/oofatfs/ff.c b/lib/oofatfs/ff.c index 71bd19702..e961c789d 100644 --- a/lib/oofatfs/ff.c +++ b/lib/oofatfs/ff.c @@ -3382,11 +3382,7 @@ FRESULT f_read ( if (!sect) ABORT(fs, FR_INT_ERR); sect += csect; cc = btr / SS(fs); /* When remaining bytes >= sector size, */ - if (cc -#if _FS_DISK_READ_ALIGNED - && (((int)rbuff & 3) == 0) -#endif - ) {/* Read maximum contiguous sectors directly */ + if (cc) {/* Read maximum contiguous sectors directly */ if (csect + cc > fs->csize) { /* Clip at cluster boundary */ cc = fs->csize - csect; } diff --git a/lib/oofatfs/ffconf.h b/lib/oofatfs/ffconf.h index a3795fa3f..214311b4c 100644 --- a/lib/oofatfs/ffconf.h +++ b/lib/oofatfs/ffconf.h @@ -343,12 +343,6 @@ / SemaphoreHandle_t and etc.. A header file for O/S definitions needs to be / included somewhere in the scope of ff.h. */ -// Set to nonzero if buffers passed to disk_read have a word alignment -// restriction -#ifndef _FS_DISK_READ_ALIGNED -#define _FS_DISK_READ_ALIGNED 0 -#endif - /* #include <windows.h> // O/S definitions */ |