oofatfs: Remove _FS_DISK_READ_ALIGNED
This workaround is no longer needed, so it can be removed. Closes: #2332
This commit is contained in:
parent
1e6c08fc30
commit
eef742bf45
|
@ -3382,11 +3382,7 @@ FRESULT f_read (
|
||||||
if (!sect) ABORT(fs, FR_INT_ERR);
|
if (!sect) ABORT(fs, FR_INT_ERR);
|
||||||
sect += csect;
|
sect += csect;
|
||||||
cc = btr / SS(fs); /* When remaining bytes >= sector size, */
|
cc = btr / SS(fs); /* When remaining bytes >= sector size, */
|
||||||
if (cc
|
if (cc) {/* Read maximum contiguous sectors directly */
|
||||||
#if _FS_DISK_READ_ALIGNED
|
|
||||||
&& (((int)rbuff & 3) == 0)
|
|
||||||
#endif
|
|
||||||
) {/* Read maximum contiguous sectors directly */
|
|
||||||
if (csect + cc > fs->csize) { /* Clip at cluster boundary */
|
if (csect + cc > fs->csize) { /* Clip at cluster boundary */
|
||||||
cc = fs->csize - csect;
|
cc = fs->csize - csect;
|
||||||
}
|
}
|
||||||
|
|
|
@ -343,12 +343,6 @@
|
||||||
/ SemaphoreHandle_t and etc.. A header file for O/S definitions needs to be
|
/ SemaphoreHandle_t and etc.. A header file for O/S definitions needs to be
|
||||||
/ included somewhere in the scope of ff.h. */
|
/ 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 */
|
/* #include <windows.h> // O/S definitions */
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -102,7 +102,6 @@ CFLAGS += -Wno-undef
|
||||||
CFLAGS += -Wno-cast-align
|
CFLAGS += -Wno-cast-align
|
||||||
|
|
||||||
NRF_DEFINES += -DCONFIG_GPIO_AS_PINRESET
|
NRF_DEFINES += -DCONFIG_GPIO_AS_PINRESET
|
||||||
NRF_DEFINES += -D_FS_DISK_READ_ALIGNED=1
|
|
||||||
CFLAGS += $(NRF_DEFINES)
|
CFLAGS += $(NRF_DEFINES)
|
||||||
|
|
||||||
CFLAGS += \
|
CFLAGS += \
|
||||||
|
|
Loading…
Reference in New Issue