oofatfs: Remove _FS_DISK_READ_ALIGNED

jepler · jepler · commit eef742bf45f5 · 2020-02-28T10:04:28.000-06:00
This workaround is no longer needed, so it can be removed. Closes: adafruit#2332
diff --git 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
@@ -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  */
 
 
diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
@@ -102,7 +102,6 @@ CFLAGS += -Wno-undef
 CFLAGS += -Wno-cast-align
 
 NRF_DEFINES += -DCONFIG_GPIO_AS_PINRESET
-NRF_DEFINES += -D_FS_DISK_READ_ALIGNED=1
 CFLAGS += $(NRF_DEFINES)
 
 CFLAGS += \
