Skip to content

Commit ebfe665

Browse files
committed
CP/M-IDE - FatFS v0.15
1 parent c317664 commit ebfe665

File tree

8 files changed

+6229
-6236
lines changed

8 files changed

+6229
-6236
lines changed

ROMs/CPM-IDE/acia/ffconf.h

Lines changed: 321 additions & 326 deletions
Large diffs are not rendered by default.

ROMs/CPM-IDE/acia85/ffconf.h

Lines changed: 20 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*---------------------------------------------------------------------------/
2-
/ FatFs Functional Configurations
2+
/ Configurations of FatFs Module
33
/---------------------------------------------------------------------------*/
44

5-
#define FFCONF_DEF 86631 /* Revision ID */
5+
#define FFCONF_DEF 80286 /* Revision ID */
66

77
/*---------------------------------------------------------------------------/
88
/ Function Configurations
@@ -72,7 +72,7 @@
7272
/ 2: Enable with LF-CRLF conversion.
7373
/
7474
/ FF_PRINT_LLI = 1 makes f_printf() support long long argument and FF_PRINT_FLOAT = 1/2
75-
makes f_printf() support floating point argument. These features want C99 or later.
75+
/ makes f_printf() support floating point argument. These features want C99 or later.
7676
/ When FF_LFN_UNICODE >= 1 with LFN enabled, string functions convert the character
7777
/ encoding in it. FF_STRF_ENCODE selects assumption of character encoding ON THE FILE
7878
/ to be read/written via those functions.
@@ -152,7 +152,7 @@
152152
#define FF_LFN_BUF 255
153153
#define FF_SFN_BUF 12
154154
/* This set of options defines size of file name members in the FILINFO structure
155-
/ which is used to read out directory items. These values should be suffcient for
155+
/ which is used to read out directory items. These values should be sufficient for
156156
/ the file names to read. The maximum possible length of the read file name depends
157157
/ on character encoding. When LFN is not enabled, these options have no effect. */
158158

@@ -213,11 +213,11 @@
213213
/ function will be available. */
214214

215215

216-
#define FF_MIN_SS 512
217-
#define FF_MAX_SS 512
216+
#define FF_MIN_SS 512
217+
#define FF_MAX_SS 512
218218
/* This set of options configures the range of sector size to be supported. (512,
219219
/ 1024, 2048 or 4096) Always set both 512 for most systems, generic memory card and
220-
/ harddisk. But a larger value may be required for on-board flash memory and some
220+
/ harddisk, but a larger value may be required for on-board flash memory and some
221221
/ type of optical media. When FF_MAX_SS is larger than FF_MIN_SS, FatFs is configured
222222
/ for variable sector size mode and disk_ioctl() function needs to implement
223223
/ GET_SECTOR_SIZE command. */
@@ -228,12 +228,12 @@
228228
/ To enable the 64-bit LBA, also exFAT needs to be enabled. (FF_FS_EXFAT == 1) */
229229

230230

231-
#define FF_MIN_GPT 0x10000000
231+
#define FF_MIN_GPT 0x10000000
232232
/* Minimum number of sectors to switch GPT as partitioning format in f_mkfs and
233233
/ f_fdisk function. 0x100000000 max. This option has no effect when FF_LBA64 == 0. */
234234

235235

236-
#define FF_USE_TRIM 0
236+
#define FF_USE_TRIM 0
237237
/* This option switches support for ATA-TRIM. (0:Disable or 1:Enable)
238238
/ To enable Trim function, also CTRL_TRIM command should be implemented to the
239239
/ disk_ioctl() function. */
@@ -265,10 +265,10 @@
265265

266266
#define FF_NORTC_MON 1
267267
#define FF_NORTC_MDAY 1
268-
#define FF_NORTC_YEAR 2020
269-
/* The option FF_FS_NORTC switches timestamp function. If the system does not have
270-
/ any RTC function or valid timestamp is not needed, set FF_FS_NORTC = 1 to disable
271-
/ the timestamp function. Every object modified by FatFs will have a fixed timestamp
268+
#define FF_NORTC_YEAR 2022
269+
/* The option FF_FS_NORTC switches timestamp feature. If the system does not have
270+
/ an RTC or valid timestamp is not needed, set FF_FS_NORTC = 1 to disable the
271+
/ timestamp feature. Every object modified by FatFs will have a fixed timestamp
272272
/ defined by FF_NORTC_MON, FF_NORTC_MDAY and FF_NORTC_YEAR in local time.
273273
/ To enable timestamp function (FF_FS_NORTC = 0), get_fattime() function need to be
274274
/ added to the project to read current time form real-time clock. FF_NORTC_MON,
@@ -278,7 +278,7 @@
278278

279279
#define FF_FS_NOFSINFO 0
280280
/* If you need to know correct free space on the FAT32 volume, set bit 0 of this
281-
/ option, and f_getfree() function at first time after volume mount will force
281+
/ option, and f_getfree() function at the first time after volume mount will force
282282
/ a full FAT scan. Bit 1 controls the use of last allocated cluster number.
283283
/
284284
/ bit0=0: Use free cluster count in the FSINFO if available.
@@ -300,26 +300,21 @@
300300
/ lock control is independent of re-entrancy. */
301301

302302

303-
/* #include <somertos.h> // O/S definitions */
304303
#define FF_FS_REENTRANT 0
305304
#define FF_FS_TIMEOUT 1000
306-
#define FF_SYNC_t HANDLE
307305
/* The option FF_FS_REENTRANT switches the re-entrancy (thread safe) of the FatFs
308306
/ module itself. Note that regardless of this option, file access to different
309307
/ volume is always re-entrant and volume control functions, f_mount(), f_mkfs()
310308
/ and f_fdisk() function, are always not re-entrant. Only file/directory access
311-
/ to the same volume is under control of this function.
309+
/ to the same volume is under control of this feature.
312310
/
313-
/ 0: Disable re-entrancy. FF_FS_TIMEOUT and FF_SYNC_t have no effect.
311+
/ 0: Disable re-entrancy. FF_FS_TIMEOUT have no effect.
314312
/ 1: Enable re-entrancy. Also user provided synchronization handlers,
315-
/ ff_req_grant(), ff_rel_grant(), ff_del_syncobj() and ff_cre_syncobj()
316-
/ function, must be added to the project. Samples are available in
317-
/ option/syscall.c.
313+
/ ff_mutex_create(), ff_mutex_delete(), ff_mutex_take() and ff_mutex_give()
314+
/ function, must be added to the project. Samples are available in ffsystem.c.
318315
/
319-
/ The FF_FS_TIMEOUT defines timeout period in unit of time tick.
320-
/ The FF_SYNC_t defines O/S dependent sync object type. e.g. HANDLE, ID, OS_EVENT*,
321-
/ SemaphoreHandle_t and etc. A header file for O/S definitions needs to be
322-
/ included somewhere in the scope of ff.h. */
316+
/ The FF_FS_TIMEOUT defines timeout period in unit of O/S time tick.
317+
*/
323318

324319

325320

ROMs/CPM-IDE/pro/ffconf.h

Lines changed: 20 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*---------------------------------------------------------------------------/
2-
/ FatFs Functional Configurations
2+
/ Configurations of FatFs Module
33
/---------------------------------------------------------------------------*/
44

5-
#define FFCONF_DEF 86631 /* Revision ID */
5+
#define FFCONF_DEF 80286 /* Revision ID */
66

77
/*---------------------------------------------------------------------------/
88
/ Function Configurations
@@ -72,7 +72,7 @@
7272
/ 2: Enable with LF-CRLF conversion.
7373
/
7474
/ FF_PRINT_LLI = 1 makes f_printf() support long long argument and FF_PRINT_FLOAT = 1/2
75-
makes f_printf() support floating point argument. These features want C99 or later.
75+
/ makes f_printf() support floating point argument. These features want C99 or later.
7676
/ When FF_LFN_UNICODE >= 1 with LFN enabled, string functions convert the character
7777
/ encoding in it. FF_STRF_ENCODE selects assumption of character encoding ON THE FILE
7878
/ to be read/written via those functions.
@@ -152,7 +152,7 @@
152152
#define FF_LFN_BUF 255
153153
#define FF_SFN_BUF 12
154154
/* This set of options defines size of file name members in the FILINFO structure
155-
/ which is used to read out directory items. These values should be suffcient for
155+
/ which is used to read out directory items. These values should be sufficient for
156156
/ the file names to read. The maximum possible length of the read file name depends
157157
/ on character encoding. When LFN is not enabled, these options have no effect. */
158158

@@ -213,11 +213,11 @@
213213
/ function will be available. */
214214

215215

216-
#define FF_MIN_SS 512
217-
#define FF_MAX_SS 512
216+
#define FF_MIN_SS 512
217+
#define FF_MAX_SS 512
218218
/* This set of options configures the range of sector size to be supported. (512,
219219
/ 1024, 2048 or 4096) Always set both 512 for most systems, generic memory card and
220-
/ harddisk. But a larger value may be required for on-board flash memory and some
220+
/ harddisk, but a larger value may be required for on-board flash memory and some
221221
/ type of optical media. When FF_MAX_SS is larger than FF_MIN_SS, FatFs is configured
222222
/ for variable sector size mode and disk_ioctl() function needs to implement
223223
/ GET_SECTOR_SIZE command. */
@@ -228,12 +228,12 @@
228228
/ To enable the 64-bit LBA, also exFAT needs to be enabled. (FF_FS_EXFAT == 1) */
229229

230230

231-
#define FF_MIN_GPT 0x10000000
231+
#define FF_MIN_GPT 0x10000000
232232
/* Minimum number of sectors to switch GPT as partitioning format in f_mkfs and
233233
/ f_fdisk function. 0x100000000 max. This option has no effect when FF_LBA64 == 0. */
234234

235235

236-
#define FF_USE_TRIM 0
236+
#define FF_USE_TRIM 0
237237
/* This option switches support for ATA-TRIM. (0:Disable or 1:Enable)
238238
/ To enable Trim function, also CTRL_TRIM command should be implemented to the
239239
/ disk_ioctl() function. */
@@ -265,10 +265,10 @@
265265

266266
#define FF_NORTC_MON 1
267267
#define FF_NORTC_MDAY 1
268-
#define FF_NORTC_YEAR 2020
269-
/* The option FF_FS_NORTC switches timestamp function. If the system does not have
270-
/ any RTC function or valid timestamp is not needed, set FF_FS_NORTC = 1 to disable
271-
/ the timestamp function. Every object modified by FatFs will have a fixed timestamp
268+
#define FF_NORTC_YEAR 2022
269+
/* The option FF_FS_NORTC switches timestamp feature. If the system does not have
270+
/ an RTC or valid timestamp is not needed, set FF_FS_NORTC = 1 to disable the
271+
/ timestamp feature. Every object modified by FatFs will have a fixed timestamp
272272
/ defined by FF_NORTC_MON, FF_NORTC_MDAY and FF_NORTC_YEAR in local time.
273273
/ To enable timestamp function (FF_FS_NORTC = 0), get_fattime() function need to be
274274
/ added to the project to read current time form real-time clock. FF_NORTC_MON,
@@ -278,7 +278,7 @@
278278

279279
#define FF_FS_NOFSINFO 0
280280
/* If you need to know correct free space on the FAT32 volume, set bit 0 of this
281-
/ option, and f_getfree() function at first time after volume mount will force
281+
/ option, and f_getfree() function at the first time after volume mount will force
282282
/ a full FAT scan. Bit 1 controls the use of last allocated cluster number.
283283
/
284284
/ bit0=0: Use free cluster count in the FSINFO if available.
@@ -300,26 +300,21 @@
300300
/ lock control is independent of re-entrancy. */
301301

302302

303-
/* #include <somertos.h> // O/S definitions */
304303
#define FF_FS_REENTRANT 0
305304
#define FF_FS_TIMEOUT 1000
306-
#define FF_SYNC_t HANDLE
307305
/* The option FF_FS_REENTRANT switches the re-entrancy (thread safe) of the FatFs
308306
/ module itself. Note that regardless of this option, file access to different
309307
/ volume is always re-entrant and volume control functions, f_mount(), f_mkfs()
310308
/ and f_fdisk() function, are always not re-entrant. Only file/directory access
311-
/ to the same volume is under control of this function.
309+
/ to the same volume is under control of this feature.
312310
/
313-
/ 0: Disable re-entrancy. FF_FS_TIMEOUT and FF_SYNC_t have no effect.
311+
/ 0: Disable re-entrancy. FF_FS_TIMEOUT have no effect.
314312
/ 1: Enable re-entrancy. Also user provided synchronization handlers,
315-
/ ff_req_grant(), ff_rel_grant(), ff_del_syncobj() and ff_cre_syncobj()
316-
/ function, must be added to the project. Samples are available in
317-
/ option/syscall.c.
313+
/ ff_mutex_create(), ff_mutex_delete(), ff_mutex_take() and ff_mutex_give()
314+
/ function, must be added to the project. Samples are available in ffsystem.c.
318315
/
319-
/ The FF_FS_TIMEOUT defines timeout period in unit of time tick.
320-
/ The FF_SYNC_t defines O/S dependent sync object type. e.g. HANDLE, ID, OS_EVENT*,
321-
/ SemaphoreHandle_t and etc. A header file for O/S definitions needs to be
322-
/ included somewhere in the scope of ff.h. */
316+
/ The FF_FS_TIMEOUT defines timeout period in unit of O/S time tick.
317+
*/
323318

324319

325320

0 commit comments

Comments
 (0)