Maxim Integrated / Mbed OS MAXREFDES101_SOURCE

HSP Platform firmware evaluating ECG data and hearth rate over PPG data.

Dependencies:   max32630fthr Adafruit_FeatherOLED USBDevice

mbed_os_patches/fffix.patch@4:682a4ebb995a, 2021-03-25 (annotated)

Committer:
phonemacro
Date:
Thu Mar 25 21:59:17 2021 +0000
Revision:
4:682a4ebb995a
Parent:
1:f60eafbf009a 
fix compile errors from mbed OS changes.

Who changed what in which revision?

UserRevisionLine numberNew contents of line
gmehmet 1:f60eafbf009a 1 diff --git a/features/filesystem/fat/ChaN/ff.cpp b/features/filesystem/fat/ChaN/ff.cpp
gmehmet 1:f60eafbf009a 2 index 7e4561d809..3bda25e4a9 100644
gmehmet 1:f60eafbf009a 3 --- a/features/filesystem/fat/ChaN/ff.cpp
gmehmet 1:f60eafbf009a 4 +++ b/features/filesystem/fat/ChaN/ff.cpp
gmehmet 1:f60eafbf009a 5 @@ -3800,7 +3800,9 @@ FRESULT f_read (
gmehmet 1:f60eafbf009a 6 cc = fs->csize - csect;
gmehmet 1:f60eafbf009a 7 }
gmehmet 1:f60eafbf009a 8 if (disk_read(fs->pdrv, rbuff, sect, cc) != RES_OK) ABORT(fs, FR_DISK_ERR);
gmehmet 1:f60eafbf009a 9 -#if !FF_FS_READONLY && FF_FS_MINIMIZE <= 2 /* Replace one of the read sectors with cached data if it contains a dirty sector */
gmehmet 1:f60eafbf009a 10 +
gmehmet 1:f60eafbf009a 11 +/*
gmehmet 1:f60eafbf009a 12 +#if !FF_FS_READONLY && FF_FS_MINIMIZE <= 2
gmehmet 1:f60eafbf009a 13 #if FF_FS_TINY
gmehmet 1:f60eafbf009a 14 if (fs->wflag && fs->winsect - sect < cc) {
gmehmet 1:f60eafbf009a 15 mem_cpy(rbuff + ((fs->winsect - sect) * SS(fs)), fs->win, SS(fs));
gmehmet 1:f60eafbf009a 16 @@ -3811,6 +3813,8 @@ FRESULT f_read (
gmehmet 1:f60eafbf009a 17 }
gmehmet 1:f60eafbf009a 18 #endif
gmehmet 1:f60eafbf009a 19 #endif
gmehmet 1:f60eafbf009a 20 +*/
gmehmet 1:f60eafbf009a 21 +
gmehmet 1:f60eafbf009a 22 rcnt = SS(fs) * cc; /* Number of bytes transferred */
gmehmet 1:f60eafbf009a 23 continue;
gmehmet 1:f60eafbf009a 24 }
gmehmet 1:f60eafbf009a 25 @@ -3921,19 +3925,20 @@ FRESULT f_write (
gmehmet 1:f60eafbf009a 26 cc = fs->csize - csect;
gmehmet 1:f60eafbf009a 27 }
gmehmet 1:f60eafbf009a 28 if (disk_write(fs->pdrv, wbuff, sect, cc) != RES_OK) ABORT(fs, FR_DISK_ERR);
gmehmet 1:f60eafbf009a 29 +/*
gmehmet 1:f60eafbf009a 30 #if FF_FS_MINIMIZE <= 2
gmehmet 1:f60eafbf009a 31 #if FF_FS_TINY
gmehmet 1:f60eafbf009a 32 - if (fs->winsect - sect < cc) { /* Refill sector cache if it gets invalidated by the direct write */
gmehmet 1:f60eafbf009a 33 + if (fs->winsect - sect < cc) {
gmehmet 1:f60eafbf009a 34 mem_cpy(fs->win, wbuff + ((fs->winsect - sect) * SS(fs)), SS(fs));
gmehmet 1:f60eafbf009a 35 fs->wflag = 0;
gmehmet 1:f60eafbf009a 36 }
gmehmet 1:f60eafbf009a 37 #else
gmehmet 1:f60eafbf009a 38 - if (fp->sect - sect < cc) { /* Refill sector cache if it gets invalidated by the direct write */
gmehmet 1:f60eafbf009a 39 + if (fp->sect - sect < cc) {
gmehmet 1:f60eafbf009a 40 mem_cpy(fp->buf, wbuff + ((fp->sect - sect) * SS(fs)), SS(fs));
gmehmet 1:f60eafbf009a 41 fp->flag &= (BYTE)~FA_DIRTY;
gmehmet 1:f60eafbf009a 42 }
gmehmet 1:f60eafbf009a 43 #endif
gmehmet 1:f60eafbf009a 44 -#endif
gmehmet 1:f60eafbf009a 45 +#endif*/
gmehmet 1:f60eafbf009a 46 wcnt = SS(fs) * cc; /* Number of bytes transferred */
gmehmet 1:f60eafbf009a 47 #if FLUSH_ON_NEW_SECTOR
gmehmet 1:f60eafbf009a 48 need_sync = true;
gmehmet 1:f60eafbf009a 49 diff --git a/features/filesystem/fat/ChaN/ffconf.h b/features/filesystem/fat/ChaN/ffconf.h
gmehmet 1:f60eafbf009a 50 index 22e1294277..f446778695 100644
gmehmet 1:f60eafbf009a 51 --- a/features/filesystem/fat/ChaN/ffconf.h
gmehmet 1:f60eafbf009a 52 +++ b/features/filesystem/fat/ChaN/ffconf.h
gmehmet 1:f60eafbf009a 53 @@ -151,7 +151,7 @@
gmehmet 1:f60eafbf009a 54 */
gmehmet 1:f60eafbf009a 55
gmehmet 1:f60eafbf009a 56
gmehmet 1:f60eafbf009a 57 -#define FF_FS_RPATH 1
gmehmet 1:f60eafbf009a 58 +#define FF_FS_RPATH 0
gmehmet 1:f60eafbf009a 59 /* This option configures support for relative path.
gmehmet 1:f60eafbf009a 60 /
gmehmet 1:f60eafbf009a 61 / 0: Disable relative path and remove related functions.
gmehmet 1:f60eafbf009a 62 @@ -164,7 +164,7 @@
gmehmet 1:f60eafbf009a 63 / Drive/Volume Configurations
gmehmet 1:f60eafbf009a 64 /---------------------------------------------------------------------------*/
gmehmet 1:f60eafbf009a 65
gmehmet 1:f60eafbf009a 66 -#define FF_VOLUMES 4
gmehmet 1:f60eafbf009a 67 +#define FF_VOLUMES 1
gmehmet 1:f60eafbf009a 68 /* Number of volumes (logical drives) to be used. (1-10) */
gmehmet 1:f60eafbf009a 69
gmehmet 1:f60eafbf009a 70
gmehmet 1:f60eafbf009a 71 @@ -219,7 +219,7 @@
gmehmet 1:f60eafbf009a 72 / System Configurations
gmehmet 1:f60eafbf009a 73 /---------------------------------------------------------------------------*/
gmehmet 1:f60eafbf009a 74
gmehmet 1:f60eafbf009a 75 -#define FF_FS_TINY 1
gmehmet 1:f60eafbf009a 76 +#define FF_FS_TINY 0
gmehmet 1:f60eafbf009a 77 /* This option switches tiny buffer configuration. (0:Normal or 1:Tiny)
gmehmet 1:f60eafbf009a 78 / At the tiny configuration, size of file object (FIL) is shrinked FF_MAX_SS bytes.
gmehmet 1:f60eafbf009a 79 / Instead of private sector buffer eliminated from the file object, common sector
gmehmet 1:f60eafbf009a 80 @@ -289,7 +289,7 @@
gmehmet 1:f60eafbf009a 81 /* #include <windows.h> // O/S definitions */
gmehmet 1:f60eafbf009a 82
gmehmet 1:f60eafbf009a 83 #define FLUSH_ON_NEW_CLUSTER 0 /* Sync the file on every new cluster */
gmehmet 1:f60eafbf009a 84 -#define FLUSH_ON_NEW_SECTOR 1 /* Sync the file on every new sector */
gmehmet 1:f60eafbf009a 85 +#define FLUSH_ON_NEW_SECTOR 0 /* Sync the file on every new sector */
gmehmet 1:f60eafbf009a 86 /* Only one of these two defines needs to be set to 1. If both are set to 0
gmehmet 1:f60eafbf009a 87 the file is only sync when closed.
gmehmet 1:f60eafbf009a 88 Clusters are group of sectors (eg: 8 sectors). Flushing on new cluster means