Pre-Release v0.5 #54
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							@@ -1,170 +1,208 @@
 | 
			
		||||
/*------------------------------------------------------------------------*/
 | 
			
		||||
/* Sample Code of OS Dependent Functions for FatFs                        */
 | 
			
		||||
/* (C)ChaN, 2018                                                          */
 | 
			
		||||
/* A Sample Code of User Provided OS Dependent Functions for FatFs        */
 | 
			
		||||
/*------------------------------------------------------------------------*/
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
#include <fatfs/ff.h>
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
#if FF_USE_LFN == 3	/* Dynamic memory allocation */
 | 
			
		||||
#if FF_USE_LFN == 3	/* Use dynamic memory allocation */
 | 
			
		||||
 | 
			
		||||
/*------------------------------------------------------------------------*/
 | 
			
		||||
/* Allocate a memory block                                                */
 | 
			
		||||
/* Allocate/Free a Memory Block                                           */
 | 
			
		||||
/*------------------------------------------------------------------------*/
 | 
			
		||||
 | 
			
		||||
#include <stdlib.h>		/* with POSIX API */
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
void* ff_memalloc (	/* Returns pointer to the allocated memory block (null if not enough core) */
 | 
			
		||||
	UINT msize		/* Number of bytes to allocate */
 | 
			
		||||
)
 | 
			
		||||
{
 | 
			
		||||
	return malloc(msize);	/* Allocate a new memory block with POSIX API */
 | 
			
		||||
	return malloc((size_t)msize);	/* Allocate a new memory block */
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
/*------------------------------------------------------------------------*/
 | 
			
		||||
/* Free a memory block                                                    */
 | 
			
		||||
/*------------------------------------------------------------------------*/
 | 
			
		||||
 | 
			
		||||
void ff_memfree (
 | 
			
		||||
	void* mblock	/* Pointer to the memory block to free (nothing to do if null) */
 | 
			
		||||
	void* mblock	/* Pointer to the memory block to free (no effect if null) */
 | 
			
		||||
)
 | 
			
		||||
{
 | 
			
		||||
	free(mblock);	/* Free the memory block with POSIX API */
 | 
			
		||||
	free(mblock);	/* Free the memory block */
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
#if FF_FS_REENTRANT	/* Mutal exclusion */
 | 
			
		||||
 | 
			
		||||
/*------------------------------------------------------------------------*/
 | 
			
		||||
/* Create a Synchronization Object                                        */
 | 
			
		||||
/* Definitions of Mutex                                                   */
 | 
			
		||||
/*------------------------------------------------------------------------*/
 | 
			
		||||
/* This function is called in f_mount() function to create a new
 | 
			
		||||
/  synchronization object for the volume, such as semaphore and mutex.
 | 
			
		||||
/  When a 0 is returned, the f_mount() function fails with FR_INT_ERR.
 | 
			
		||||
*/
 | 
			
		||||
 | 
			
		||||
//const osMutexDef_t Mutex[FF_VOLUMES];	/* Table of CMSIS-RTOS mutex */
 | 
			
		||||
#define OS_TYPE	0	/* 0:Win32, 1:uITRON4.0, 2:uC/OS-II, 3:FreeRTOS, 4:CMSIS-RTOS */
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
int ff_cre_syncobj (	/* 1:Function succeeded, 0:Could not create the sync object */
 | 
			
		||||
	BYTE vol,			/* Corresponding volume (logical drive number) */
 | 
			
		||||
	FF_SYNC_t* sobj		/* Pointer to return the created sync object */
 | 
			
		||||
)
 | 
			
		||||
{
 | 
			
		||||
	/* Win32 */
 | 
			
		||||
	*sobj = CreateMutex(NULL, FALSE, NULL);
 | 
			
		||||
	return (int)(*sobj != INVALID_HANDLE_VALUE);
 | 
			
		||||
#if   OS_TYPE == 0	/* Win32 */
 | 
			
		||||
#include <windows.h>
 | 
			
		||||
static HANDLE Mutex[FF_VOLUMES + 1];	/* Table of mutex handle */
 | 
			
		||||
 | 
			
		||||
	/* uITRON */
 | 
			
		||||
//	T_CSEM csem = {TA_TPRI,1,1};
 | 
			
		||||
//	*sobj = acre_sem(&csem);
 | 
			
		||||
//	return (int)(*sobj > 0);
 | 
			
		||||
#elif OS_TYPE == 1	/* uITRON */
 | 
			
		||||
#include "itron.h"
 | 
			
		||||
#include "kernel.h"
 | 
			
		||||
static mtxid Mutex[FF_VOLUMES + 1];		/* Table of mutex ID */
 | 
			
		||||
 | 
			
		||||
	/* uC/OS-II */
 | 
			
		||||
//	OS_ERR err;
 | 
			
		||||
//	*sobj = OSMutexCreate(0, &err);
 | 
			
		||||
//	return (int)(err == OS_NO_ERR);
 | 
			
		||||
#elif OS_TYPE == 2	/* uc/OS-II */
 | 
			
		||||
#include "includes.h"
 | 
			
		||||
static OS_EVENT *Mutex[FF_VOLUMES + 1];	/* Table of mutex pinter */
 | 
			
		||||
 | 
			
		||||
	/* FreeRTOS */
 | 
			
		||||
//	*sobj = xSemaphoreCreateMutex();
 | 
			
		||||
//	return (int)(*sobj != NULL);
 | 
			
		||||
#elif OS_TYPE == 3	/* FreeRTOS */
 | 
			
		||||
#include "FreeRTOS.h"
 | 
			
		||||
#include "semphr.h"
 | 
			
		||||
static SemaphoreHandle_t Mutex[FF_VOLUMES + 1];	/* Table of mutex handle */
 | 
			
		||||
 | 
			
		||||
	/* CMSIS-RTOS */
 | 
			
		||||
//	*sobj = osMutexCreate(&Mutex[vol]);
 | 
			
		||||
//	return (int)(*sobj != NULL);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
/*------------------------------------------------------------------------*/
 | 
			
		||||
/* Delete a Synchronization Object                                        */
 | 
			
		||||
/*------------------------------------------------------------------------*/
 | 
			
		||||
/* This function is called in f_mount() function to delete a synchronization
 | 
			
		||||
/  object that created with ff_cre_syncobj() function. When a 0 is returned,
 | 
			
		||||
/  the f_mount() function fails with FR_INT_ERR.
 | 
			
		||||
*/
 | 
			
		||||
 | 
			
		||||
int ff_del_syncobj (	/* 1:Function succeeded, 0:Could not delete due to an error */
 | 
			
		||||
	FF_SYNC_t sobj		/* Sync object tied to the logical drive to be deleted */
 | 
			
		||||
)
 | 
			
		||||
{
 | 
			
		||||
	/* Win32 */
 | 
			
		||||
	return (int)CloseHandle(sobj);
 | 
			
		||||
 | 
			
		||||
	/* uITRON */
 | 
			
		||||
//	return (int)(del_sem(sobj) == E_OK);
 | 
			
		||||
 | 
			
		||||
	/* uC/OS-II */
 | 
			
		||||
//	OS_ERR err;
 | 
			
		||||
//	OSMutexDel(sobj, OS_DEL_ALWAYS, &err);
 | 
			
		||||
//	return (int)(err == OS_NO_ERR);
 | 
			
		||||
 | 
			
		||||
	/* FreeRTOS */
 | 
			
		||||
//  vSemaphoreDelete(sobj);
 | 
			
		||||
//	return 1;
 | 
			
		||||
 | 
			
		||||
	/* CMSIS-RTOS */
 | 
			
		||||
//	return (int)(osMutexDelete(sobj) == osOK);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
/*------------------------------------------------------------------------*/
 | 
			
		||||
/* Request Grant to Access the Volume                                     */
 | 
			
		||||
/*------------------------------------------------------------------------*/
 | 
			
		||||
/* This function is called on entering file functions to lock the volume.
 | 
			
		||||
/  When a 0 is returned, the file function fails with FR_TIMEOUT.
 | 
			
		||||
*/
 | 
			
		||||
 | 
			
		||||
int ff_req_grant (	/* 1:Got a grant to access the volume, 0:Could not get a grant */
 | 
			
		||||
	FF_SYNC_t sobj	/* Sync object to wait */
 | 
			
		||||
)
 | 
			
		||||
{
 | 
			
		||||
	/* Win32 */
 | 
			
		||||
	return (int)(WaitForSingleObject(sobj, FF_FS_TIMEOUT) == WAIT_OBJECT_0);
 | 
			
		||||
 | 
			
		||||
	/* uITRON */
 | 
			
		||||
//	return (int)(wai_sem(sobj) == E_OK);
 | 
			
		||||
 | 
			
		||||
	/* uC/OS-II */
 | 
			
		||||
//	OS_ERR err;
 | 
			
		||||
//	OSMutexPend(sobj, FF_FS_TIMEOUT, &err));
 | 
			
		||||
//	return (int)(err == OS_NO_ERR);
 | 
			
		||||
 | 
			
		||||
	/* FreeRTOS */
 | 
			
		||||
//	return (int)(xSemaphoreTake(sobj, FF_FS_TIMEOUT) == pdTRUE);
 | 
			
		||||
 | 
			
		||||
	/* CMSIS-RTOS */
 | 
			
		||||
//	return (int)(osMutexWait(sobj, FF_FS_TIMEOUT) == osOK);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
/*------------------------------------------------------------------------*/
 | 
			
		||||
/* Release Grant to Access the Volume                                     */
 | 
			
		||||
/*------------------------------------------------------------------------*/
 | 
			
		||||
/* This function is called on leaving file functions to unlock the volume.
 | 
			
		||||
*/
 | 
			
		||||
 | 
			
		||||
void ff_rel_grant (
 | 
			
		||||
	FF_SYNC_t sobj	/* Sync object to be signaled */
 | 
			
		||||
)
 | 
			
		||||
{
 | 
			
		||||
	/* Win32 */
 | 
			
		||||
	ReleaseMutex(sobj);
 | 
			
		||||
 | 
			
		||||
	/* uITRON */
 | 
			
		||||
//	sig_sem(sobj);
 | 
			
		||||
 | 
			
		||||
	/* uC/OS-II */
 | 
			
		||||
//	OSMutexPost(sobj);
 | 
			
		||||
 | 
			
		||||
	/* FreeRTOS */
 | 
			
		||||
//	xSemaphoreGive(sobj);
 | 
			
		||||
 | 
			
		||||
	/* CMSIS-RTOS */
 | 
			
		||||
//	osMutexRelease(sobj);
 | 
			
		||||
}
 | 
			
		||||
#elif OS_TYPE == 4	/* CMSIS-RTOS */
 | 
			
		||||
#include "cmsis_os.h"
 | 
			
		||||
static osMutexId Mutex[FF_VOLUMES + 1];	/* Table of mutex ID */
 | 
			
		||||
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
/*------------------------------------------------------------------------*/
 | 
			
		||||
/* Create a Mutex                                                         */
 | 
			
		||||
/*------------------------------------------------------------------------*/
 | 
			
		||||
/* This function is called in f_mount function to create a new mutex
 | 
			
		||||
/  or semaphore for the volume. When a 0 is returned, the f_mount function
 | 
			
		||||
/  fails with FR_INT_ERR.
 | 
			
		||||
*/
 | 
			
		||||
 | 
			
		||||
int ff_mutex_create (	/* Returns 1:Function succeeded or 0:Could not create the mutex */
 | 
			
		||||
	int vol				/* Mutex ID: Volume mutex (0 to FF_VOLUMES - 1) or system mutex (FF_VOLUMES) */
 | 
			
		||||
)
 | 
			
		||||
{
 | 
			
		||||
#if OS_TYPE == 0	/* Win32 */
 | 
			
		||||
	Mutex[vol] = CreateMutex(NULL, FALSE, NULL);
 | 
			
		||||
	return (int)(Mutex[vol] != INVALID_HANDLE_VALUE);
 | 
			
		||||
 | 
			
		||||
#elif OS_TYPE == 1	/* uITRON */
 | 
			
		||||
	T_CMTX cmtx = {TA_TPRI,1};
 | 
			
		||||
 | 
			
		||||
	Mutex[vol] = acre_mtx(&cmtx);
 | 
			
		||||
	return (int)(Mutex[vol] > 0);
 | 
			
		||||
 | 
			
		||||
#elif OS_TYPE == 2	/* uC/OS-II */
 | 
			
		||||
	OS_ERR err;
 | 
			
		||||
 | 
			
		||||
	Mutex[vol] = OSMutexCreate(0, &err);
 | 
			
		||||
	return (int)(err == OS_NO_ERR);
 | 
			
		||||
 | 
			
		||||
#elif OS_TYPE == 3	/* FreeRTOS */
 | 
			
		||||
	Mutex[vol] = xSemaphoreCreateMutex();
 | 
			
		||||
	return (int)(Mutex[vol] != NULL);
 | 
			
		||||
 | 
			
		||||
#elif OS_TYPE == 4	/* CMSIS-RTOS */
 | 
			
		||||
	osMutexDef(cmsis_os_mutex);
 | 
			
		||||
 | 
			
		||||
	Mutex[vol] = osMutexCreate(osMutex(cmsis_os_mutex));
 | 
			
		||||
	return (int)(Mutex[vol] != NULL);
 | 
			
		||||
 | 
			
		||||
#endif
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
/*------------------------------------------------------------------------*/
 | 
			
		||||
/* Delete a Mutex                                                         */
 | 
			
		||||
/*------------------------------------------------------------------------*/
 | 
			
		||||
/* This function is called in f_mount function to delete a mutex or
 | 
			
		||||
/  semaphore of the volume created with ff_mutex_create function.
 | 
			
		||||
*/
 | 
			
		||||
 | 
			
		||||
void ff_mutex_delete (	/* Returns 1:Function succeeded or 0:Could not delete due to an error */
 | 
			
		||||
	int vol				/* Mutex ID: Volume mutex (0 to FF_VOLUMES - 1) or system mutex (FF_VOLUMES) */
 | 
			
		||||
)
 | 
			
		||||
{
 | 
			
		||||
#if OS_TYPE == 0	/* Win32 */
 | 
			
		||||
	CloseHandle(Mutex[vol]);
 | 
			
		||||
 | 
			
		||||
#elif OS_TYPE == 1	/* uITRON */
 | 
			
		||||
	del_mtx(Mutex[vol]);
 | 
			
		||||
 | 
			
		||||
#elif OS_TYPE == 2	/* uC/OS-II */
 | 
			
		||||
	OS_ERR err;
 | 
			
		||||
 | 
			
		||||
	OSMutexDel(Mutex[vol], OS_DEL_ALWAYS, &err);
 | 
			
		||||
 | 
			
		||||
#elif OS_TYPE == 3	/* FreeRTOS */
 | 
			
		||||
	vSemaphoreDelete(Mutex[vol]);
 | 
			
		||||
 | 
			
		||||
#elif OS_TYPE == 4	/* CMSIS-RTOS */
 | 
			
		||||
	osMutexDelete(Mutex[vol]);
 | 
			
		||||
 | 
			
		||||
#endif
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
/*------------------------------------------------------------------------*/
 | 
			
		||||
/* Request a Grant to Access the Volume                                   */
 | 
			
		||||
/*------------------------------------------------------------------------*/
 | 
			
		||||
/* This function is called on enter file functions to lock the volume.
 | 
			
		||||
/  When a 0 is returned, the file function fails with FR_TIMEOUT.
 | 
			
		||||
*/
 | 
			
		||||
 | 
			
		||||
int ff_mutex_take (	/* Returns 1:Succeeded or 0:Timeout */
 | 
			
		||||
	int vol			/* Mutex ID: Volume mutex (0 to FF_VOLUMES - 1) or system mutex (FF_VOLUMES) */
 | 
			
		||||
)
 | 
			
		||||
{
 | 
			
		||||
#if OS_TYPE == 0	/* Win32 */
 | 
			
		||||
	return (int)(WaitForSingleObject(Mutex[vol], FF_FS_TIMEOUT) == WAIT_OBJECT_0);
 | 
			
		||||
 | 
			
		||||
#elif OS_TYPE == 1	/* uITRON */
 | 
			
		||||
	return (int)(tloc_mtx(Mutex[vol], FF_FS_TIMEOUT) == E_OK);
 | 
			
		||||
 | 
			
		||||
#elif OS_TYPE == 2	/* uC/OS-II */
 | 
			
		||||
	OS_ERR err;
 | 
			
		||||
 | 
			
		||||
	OSMutexPend(Mutex[vol], FF_FS_TIMEOUT, &err));
 | 
			
		||||
	return (int)(err == OS_NO_ERR);
 | 
			
		||||
 | 
			
		||||
#elif OS_TYPE == 3	/* FreeRTOS */
 | 
			
		||||
	return (int)(xSemaphoreTake(Mutex[vol], FF_FS_TIMEOUT) == pdTRUE);
 | 
			
		||||
 | 
			
		||||
#elif OS_TYPE == 4	/* CMSIS-RTOS */
 | 
			
		||||
	return (int)(osMutexWait(Mutex[vol], FF_FS_TIMEOUT) == osOK);
 | 
			
		||||
 | 
			
		||||
#endif
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
/*------------------------------------------------------------------------*/
 | 
			
		||||
/* Release a Grant to Access the Volume                                   */
 | 
			
		||||
/*------------------------------------------------------------------------*/
 | 
			
		||||
/* This function is called on leave file functions to unlock the volume.
 | 
			
		||||
*/
 | 
			
		||||
 | 
			
		||||
void ff_mutex_give (
 | 
			
		||||
	int vol			/* Mutex ID: Volume mutex (0 to FF_VOLUMES - 1) or system mutex (FF_VOLUMES) */
 | 
			
		||||
)
 | 
			
		||||
{
 | 
			
		||||
#if OS_TYPE == 0	/* Win32 */
 | 
			
		||||
	ReleaseMutex(Mutex[vol]);
 | 
			
		||||
 | 
			
		||||
#elif OS_TYPE == 1	/* uITRON */
 | 
			
		||||
	unl_mtx(Mutex[vol]);
 | 
			
		||||
 | 
			
		||||
#elif OS_TYPE == 2	/* uC/OS-II */
 | 
			
		||||
	OSMutexPost(Mutex[vol]);
 | 
			
		||||
 | 
			
		||||
#elif OS_TYPE == 3	/* FreeRTOS */
 | 
			
		||||
	xSemaphoreGive(Mutex[vol]);
 | 
			
		||||
 | 
			
		||||
#elif OS_TYPE == 4	/* CMSIS-RTOS */
 | 
			
		||||
	osMutexRelease(Mutex[vol]);
 | 
			
		||||
 | 
			
		||||
#endif
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#endif	/* FF_FS_REENTRANT */
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -1,13 +1,13 @@
 | 
			
		||||
/*------------------------------------------------------------------------*/
 | 
			
		||||
/* Unicode handling functions for FatFs R0.13+                            */
 | 
			
		||||
/* Unicode Handling Functions for FatFs R0.13 and Later                   */
 | 
			
		||||
/*------------------------------------------------------------------------*/
 | 
			
		||||
/* This module will occupy a huge memory in the .rodata section when the  */
 | 
			
		||||
/* FatFs is configured for LFN with DBCS. If the system has a Unicode     */
 | 
			
		||||
/* library for the code conversion, this module should be modified to use */
 | 
			
		||||
/* it to avoid silly memory consumption.                                  */
 | 
			
		||||
/*------------------------------------------------------------------------*/
 | 
			
		||||
/* This module will occupy a huge memory in the .const section when the    /
 | 
			
		||||
/  FatFs is configured for LFN with DBCS. If the system has any Unicode    /
 | 
			
		||||
/  utilitiy for the code conversion, this module should be modified to use /
 | 
			
		||||
/  that function to avoid silly memory consumption.                        /
 | 
			
		||||
/-------------------------------------------------------------------------*/
 | 
			
		||||
/*
 | 
			
		||||
/ Copyright (C) 2014, ChaN, all right reserved.
 | 
			
		||||
/ Copyright (C) 2022, ChaN, all right reserved.
 | 
			
		||||
/
 | 
			
		||||
/ FatFs module is an open source software. Redistribution and use of FatFs in
 | 
			
		||||
/ source and binary forms, with or without modification, are permitted provided
 | 
			
		||||
@@ -25,7 +25,7 @@
 | 
			
		||||
 | 
			
		||||
#include <fatfs/ff.h>
 | 
			
		||||
 | 
			
		||||
#if FF_USE_LFN	/* This module will be blanked if non-LFN configuration */
 | 
			
		||||
#if FF_USE_LFN != 0	/* This module will be blanked if in non-LFN configuration */
 | 
			
		||||
 | 
			
		||||
#define MERGE2(a, b) a ## b
 | 
			
		||||
#define CVTBL(tbl, cp) MERGE2(tbl, cp)
 | 
			
		||||
@@ -15214,8 +15214,8 @@ static const WCHAR uc869[] = {	/*  CP869(Greek 2) to Unicode conversion table */
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
/*------------------------------------------------------------------------*/
 | 
			
		||||
/* OEM <==> Unicode conversions for static code page configuration        */
 | 
			
		||||
/* SBCS fixed code page                                                   */
 | 
			
		||||
/* OEM <==> Unicode Conversions for Static Code Page Configuration with   */
 | 
			
		||||
/* SBCS Fixed Code Page                                                   */
 | 
			
		||||
/*------------------------------------------------------------------------*/
 | 
			
		||||
 | 
			
		||||
#if FF_CODE_PAGE != 0 && FF_CODE_PAGE < 900
 | 
			
		||||
@@ -15225,7 +15225,7 @@ WCHAR ff_uni2oem (	/* Returns OEM code character, zero on error */
 | 
			
		||||
)
 | 
			
		||||
{
 | 
			
		||||
	WCHAR c = 0;
 | 
			
		||||
	const WCHAR *p = CVTBL(uc, FF_CODE_PAGE);
 | 
			
		||||
	const WCHAR* p = CVTBL(uc, FF_CODE_PAGE);
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
	if (uni < 0x80) {	/* ASCII? */
 | 
			
		||||
@@ -15247,7 +15247,7 @@ WCHAR ff_oem2uni (	/* Returns Unicode character in UTF-16, zero on error */
 | 
			
		||||
)
 | 
			
		||||
{
 | 
			
		||||
	WCHAR c = 0;
 | 
			
		||||
	const WCHAR *p = CVTBL(uc, FF_CODE_PAGE);
 | 
			
		||||
	const WCHAR* p = CVTBL(uc, FF_CODE_PAGE);
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
	if (oem < 0x80) {	/* ASCII? */
 | 
			
		||||
@@ -15267,8 +15267,8 @@ WCHAR ff_oem2uni (	/* Returns Unicode character in UTF-16, zero on error */
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
/*------------------------------------------------------------------------*/
 | 
			
		||||
/* OEM <==> Unicode conversions for static code page configuration        */
 | 
			
		||||
/* DBCS fixed code page                                                   */
 | 
			
		||||
/* OEM <==> Unicode Conversions for Static Code Page Configuration with   */
 | 
			
		||||
/* DBCS Fixed Code Page                                                   */
 | 
			
		||||
/*------------------------------------------------------------------------*/
 | 
			
		||||
 | 
			
		||||
#if FF_CODE_PAGE >= 900
 | 
			
		||||
@@ -15277,7 +15277,7 @@ WCHAR ff_uni2oem (	/* Returns OEM code character, zero on error */
 | 
			
		||||
	WORD	cp		/* Code page for the conversion */
 | 
			
		||||
)
 | 
			
		||||
{
 | 
			
		||||
	const WCHAR *p;
 | 
			
		||||
	const WCHAR* p;
 | 
			
		||||
	WCHAR c = 0, uc;
 | 
			
		||||
	UINT i = 0, n, li, hi;
 | 
			
		||||
 | 
			
		||||
@@ -15313,7 +15313,7 @@ WCHAR ff_oem2uni (	/* Returns Unicode character in UTF-16, zero on error */
 | 
			
		||||
	WORD	cp		/* Code page for the conversion */
 | 
			
		||||
)
 | 
			
		||||
{
 | 
			
		||||
	const WCHAR *p;
 | 
			
		||||
	const WCHAR* p;
 | 
			
		||||
	WCHAR c = 0;
 | 
			
		||||
	UINT i = 0, n, li, hi;
 | 
			
		||||
 | 
			
		||||
@@ -15346,7 +15346,7 @@ WCHAR ff_oem2uni (	/* Returns Unicode character in UTF-16, zero on error */
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
/*------------------------------------------------------------------------*/
 | 
			
		||||
/* OEM <==> Unicode conversions for dynamic code page configuration       */
 | 
			
		||||
/* OEM <==> Unicode Conversions for Dynamic Code Page Configuration       */
 | 
			
		||||
/*------------------------------------------------------------------------*/
 | 
			
		||||
 | 
			
		||||
#if FF_CODE_PAGE == 0
 | 
			
		||||
@@ -15360,7 +15360,7 @@ WCHAR ff_uni2oem (	/* Returns OEM code character, zero on error */
 | 
			
		||||
	WORD	cp		/* Code page for the conversion */
 | 
			
		||||
)
 | 
			
		||||
{
 | 
			
		||||
	const WCHAR *p;
 | 
			
		||||
	const WCHAR* p;
 | 
			
		||||
	WCHAR c = 0, uc;
 | 
			
		||||
	UINT i, n, li, hi;
 | 
			
		||||
 | 
			
		||||
@@ -15412,7 +15412,7 @@ WCHAR ff_oem2uni (	/* Returns Unicode character in UTF-16, zero on error */
 | 
			
		||||
	WORD	cp		/* Code page for the conversion */
 | 
			
		||||
)
 | 
			
		||||
{
 | 
			
		||||
	const WCHAR *p;
 | 
			
		||||
	const WCHAR* p;
 | 
			
		||||
	WCHAR c = 0;
 | 
			
		||||
	UINT i, n, li, hi;
 | 
			
		||||
 | 
			
		||||
@@ -15458,14 +15458,14 @@ WCHAR ff_oem2uni (	/* Returns Unicode character in UTF-16, zero on error */
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
/*------------------------------------------------------------------------*/
 | 
			
		||||
/* Unicode up-case conversion                                             */
 | 
			
		||||
/* Unicode Up-case Conversion                                             */
 | 
			
		||||
/*------------------------------------------------------------------------*/
 | 
			
		||||
 | 
			
		||||
DWORD ff_wtoupper (	/* Returns up-converted code point */
 | 
			
		||||
	DWORD uni		/* Unicode code point to be up-converted */
 | 
			
		||||
)
 | 
			
		||||
{
 | 
			
		||||
	const WORD *p;
 | 
			
		||||
	const WORD* p;
 | 
			
		||||
	WORD uc, bc, nc, cmd;
 | 
			
		||||
	static const WORD cvt1[] = {	/* Compressed up conversion table for U+0000 - U+0FFF */
 | 
			
		||||
		/* Basic Latin */
 | 
			
		||||
@@ -15590,4 +15590,4 @@ DWORD ff_wtoupper (	/* Returns up-converted code point */
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
#endif /* #if FF_USE_LFN */
 | 
			
		||||
#endif /* #if FF_USE_LFN != 0 */
 | 
			
		||||
 
 | 
			
		||||
@@ -1,8 +1,8 @@
 | 
			
		||||
/*----------------------------------------------------------------------------/
 | 
			
		||||
/  FatFs - Generic FAT Filesystem module  R0.14b                              /
 | 
			
		||||
/  FatFs - Generic FAT Filesystem module  R0.15                               /
 | 
			
		||||
/-----------------------------------------------------------------------------/
 | 
			
		||||
/
 | 
			
		||||
/ Copyright (C) 2021, ChaN, all right reserved.
 | 
			
		||||
/ Copyright (C) 2022, ChaN, all right reserved.
 | 
			
		||||
/
 | 
			
		||||
/ FatFs module is an open source software. Redistribution and use of FatFs in
 | 
			
		||||
/ source and binary forms, with or without modification, are permitted provided
 | 
			
		||||
@@ -20,7 +20,7 @@
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
#ifndef FF_DEFINED
 | 
			
		||||
#define FF_DEFINED	86631	/* Revision ID */
 | 
			
		||||
#define FF_DEFINED	80286	/* Revision ID */
 | 
			
		||||
 | 
			
		||||
#ifdef __cplusplus
 | 
			
		||||
extern "C" {
 | 
			
		||||
@@ -131,10 +131,11 @@ extern const char* VolumeStr[FF_VOLUMES];	/* User defied volume ID */
 | 
			
		||||
 | 
			
		||||
typedef struct {
 | 
			
		||||
	BYTE	fs_type;		/* Filesystem type (0:not mounted) */
 | 
			
		||||
	BYTE	pdrv;			/* Associated physical drive */
 | 
			
		||||
	BYTE	pdrv;			/* Volume hosting physical drive */
 | 
			
		||||
	BYTE	ldrv;			/* Logical drive number (used only when FF_FS_REENTRANT) */
 | 
			
		||||
	BYTE	n_fats;			/* Number of FATs (1 or 2) */
 | 
			
		||||
	BYTE	wflag;			/* win[] flag (b0:dirty) */
 | 
			
		||||
	BYTE	fsi_flag;		/* FSINFO flags (b7:disabled, b0:dirty) */
 | 
			
		||||
	BYTE	wflag;			/* win[] status (b0:dirty) */
 | 
			
		||||
	BYTE	fsi_flag;		/* FSINFO status (b7:disabled, b0:dirty) */
 | 
			
		||||
	WORD	id;				/* Volume mount ID */
 | 
			
		||||
	WORD	n_rootdir;		/* Number of root directory entries (FAT12/16) */
 | 
			
		||||
	WORD	csize;			/* Cluster size [sectors] */
 | 
			
		||||
@@ -147,9 +148,6 @@ typedef struct {
 | 
			
		||||
#if FF_FS_EXFAT
 | 
			
		||||
	BYTE*	dirbuf;			/* Directory entry block scratchpad buffer for exFAT */
 | 
			
		||||
#endif
 | 
			
		||||
#if FF_FS_REENTRANT
 | 
			
		||||
	FF_SYNC_t	sobj;		/* Identifier of sync object */
 | 
			
		||||
#endif
 | 
			
		||||
#if !FF_FS_READONLY
 | 
			
		||||
	DWORD	last_clst;		/* Last allocated cluster */
 | 
			
		||||
	DWORD	free_clst;		/* Number of free clusters */
 | 
			
		||||
@@ -163,10 +161,10 @@ typedef struct {
 | 
			
		||||
#endif
 | 
			
		||||
#endif
 | 
			
		||||
	DWORD	n_fatent;		/* Number of FAT entries (number of clusters + 2) */
 | 
			
		||||
	DWORD	fsize;			/* Size of an FAT [sectors] */
 | 
			
		||||
	DWORD	fsize;			/* Number of sectors per FAT */
 | 
			
		||||
	LBA_t	volbase;		/* Volume base sector */
 | 
			
		||||
	LBA_t	fatbase;		/* FAT base sector */
 | 
			
		||||
	LBA_t	dirbase;		/* Root directory base sector/cluster */
 | 
			
		||||
	LBA_t	dirbase;		/* Root directory base sector (FAT12/16) or cluster (FAT32/exFAT) */
 | 
			
		||||
	LBA_t	database;		/* Data base sector */
 | 
			
		||||
#if FF_FS_EXFAT
 | 
			
		||||
	LBA_t	bitbase;		/* Allocation bitmap base sector */
 | 
			
		||||
@@ -181,7 +179,7 @@ typedef struct {
 | 
			
		||||
 | 
			
		||||
typedef struct {
 | 
			
		||||
	FATFS*	fs;				/* Pointer to the hosting volume of this object */
 | 
			
		||||
	WORD	id;				/* Hosting volume mount ID */
 | 
			
		||||
	WORD	id;				/* Hosting volume's mount ID */
 | 
			
		||||
	BYTE	attr;			/* Object attribute */
 | 
			
		||||
	BYTE	stat;			/* Object chain status (b1-0: =0:not contiguous, =2:contiguous, =3:fragmented in this session, b2:sub-directory stretched) */
 | 
			
		||||
	DWORD	sclust;			/* Object data start cluster (0:no cluster or root directory) */
 | 
			
		||||
@@ -250,7 +248,7 @@ typedef struct {
 | 
			
		||||
	WORD	ftime;			/* Modified time */
 | 
			
		||||
	BYTE	fattrib;		/* File attribute */
 | 
			
		||||
#if FF_USE_LFN
 | 
			
		||||
	TCHAR	altname[FF_SFN_BUF + 1];/* Altenative file name */
 | 
			
		||||
	TCHAR	altname[FF_SFN_BUF + 1];/* Alternative file name */
 | 
			
		||||
	TCHAR	fname[FF_LFN_BUF + 1];	/* Primary file name */
 | 
			
		||||
#else
 | 
			
		||||
	TCHAR	fname[12 + 1];	/* File name */
 | 
			
		||||
@@ -298,8 +296,10 @@ typedef enum {
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
/*--------------------------------------------------------------*/
 | 
			
		||||
/* FatFs Module Application Interface                           */
 | 
			
		||||
/*--------------------------------------------------------------*/
 | 
			
		||||
/* FatFs module application interface                           */
 | 
			
		||||
 | 
			
		||||
FRESULT f_open (FIL* fp, const TCHAR* path, BYTE mode);				/* Open or create a file */
 | 
			
		||||
FRESULT f_close (FIL* fp);											/* Close an open file object */
 | 
			
		||||
@@ -336,6 +336,8 @@ int f_puts (const TCHAR* str, FIL* cp);								/* Put a string to the file */
 | 
			
		||||
int f_printf (FIL* fp, const TCHAR* str, ...);						/* Put a formatted string to the file */
 | 
			
		||||
TCHAR* f_gets (TCHAR* buff, int len, FIL* fp);						/* Get a string from the file */
 | 
			
		||||
 | 
			
		||||
/* Some API fucntions are implemented as macro */
 | 
			
		||||
 | 
			
		||||
#define f_eof(fp) ((int)((fp)->fptr == (fp)->obj.objsize))
 | 
			
		||||
#define f_error(fp) ((fp)->err)
 | 
			
		||||
#define f_tell(fp) ((fp)->fptr)
 | 
			
		||||
@@ -349,38 +351,43 @@ TCHAR* f_gets (TCHAR* buff, int len, FIL* fp);						/* Get a string from the fil
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
/*--------------------------------------------------------------*/
 | 
			
		||||
/* Additional user defined functions                            */
 | 
			
		||||
/* Additional Functions                                         */
 | 
			
		||||
/*--------------------------------------------------------------*/
 | 
			
		||||
 | 
			
		||||
/* RTC function */
 | 
			
		||||
/* RTC function (provided by user) */
 | 
			
		||||
#if !FF_FS_READONLY && !FF_FS_NORTC
 | 
			
		||||
DWORD get_fattime (void);
 | 
			
		||||
DWORD get_fattime (void);	/* Get current time */
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
/* LFN support functions */
 | 
			
		||||
#if FF_USE_LFN >= 1						/* Code conversion (defined in unicode.c) */
 | 
			
		||||
 | 
			
		||||
/* LFN support functions (defined in ffunicode.c) */
 | 
			
		||||
 | 
			
		||||
#if FF_USE_LFN >= 1
 | 
			
		||||
WCHAR ff_oem2uni (WCHAR oem, WORD cp);	/* OEM code to Unicode conversion */
 | 
			
		||||
WCHAR ff_uni2oem (DWORD uni, WORD cp);	/* Unicode to OEM code conversion */
 | 
			
		||||
DWORD ff_wtoupper (DWORD uni);			/* Unicode upper-case conversion */
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
/* O/S dependent functions (samples available in ffsystem.c) */
 | 
			
		||||
 | 
			
		||||
#if FF_USE_LFN == 3		/* Dynamic memory allocation */
 | 
			
		||||
void* ff_memalloc (UINT msize);		/* Allocate memory block */
 | 
			
		||||
void ff_memfree (void* mblock);		/* Free memory block */
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
/* Sync functions */
 | 
			
		||||
#if FF_FS_REENTRANT
 | 
			
		||||
int ff_cre_syncobj (BYTE vol, FF_SYNC_t* sobj);	/* Create a sync object */
 | 
			
		||||
int ff_req_grant (FF_SYNC_t sobj);		/* Lock sync object */
 | 
			
		||||
void ff_rel_grant (FF_SYNC_t sobj);		/* Unlock sync object */
 | 
			
		||||
int ff_del_syncobj (FF_SYNC_t sobj);	/* Delete a sync object */
 | 
			
		||||
#if FF_FS_REENTRANT	/* Sync functions */
 | 
			
		||||
int ff_mutex_create (int vol);		/* Create a sync object */
 | 
			
		||||
void ff_mutex_delete (int vol);		/* Delete a sync object */
 | 
			
		||||
int ff_mutex_take (int vol);		/* Lock sync object */
 | 
			
		||||
void ff_mutex_give (int vol);		/* Unlock sync object */
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
/*--------------------------------------------------------------*/
 | 
			
		||||
/* Flags and offset address                                     */
 | 
			
		||||
 | 
			
		||||
/* Flags and Offset Address                                     */
 | 
			
		||||
/*--------------------------------------------------------------*/
 | 
			
		||||
 | 
			
		||||
/* File access mode and open method flags (3rd argument of f_open) */
 | 
			
		||||
#define	FA_READ				0x01
 | 
			
		||||
 
 | 
			
		||||
@@ -1,8 +1,8 @@
 | 
			
		||||
/*---------------------------------------------------------------------------/
 | 
			
		||||
/  FatFs Functional Configurations
 | 
			
		||||
/  Configurations of FatFs Module
 | 
			
		||||
/---------------------------------------------------------------------------*/
 | 
			
		||||
 | 
			
		||||
#define FFCONF_DEF	86631	/* Revision ID */
 | 
			
		||||
#define FFCONF_DEF	80286	/* Revision ID */
 | 
			
		||||
 | 
			
		||||
/*---------------------------------------------------------------------------/
 | 
			
		||||
/ Function Configurations
 | 
			
		||||
@@ -68,7 +68,7 @@
 | 
			
		||||
/   2: Enable with LF-CRLF conversion.
 | 
			
		||||
/
 | 
			
		||||
/  FF_PRINT_LLI = 1 makes f_printf() support long long argument and FF_PRINT_FLOAT = 1/2
 | 
			
		||||
   makes f_printf() support floating point argument. These features want C99 or later.
 | 
			
		||||
/  makes f_printf() support floating point argument. These features want C99 or later.
 | 
			
		||||
/  When FF_LFN_UNICODE >= 1 with LFN enabled, string functions convert the character
 | 
			
		||||
/  encoding in it. FF_STRF_ENCODE selects assumption of character encoding ON THE FILE
 | 
			
		||||
/  to be read/written via those functions.
 | 
			
		||||
@@ -178,7 +178,7 @@
 | 
			
		||||
/  logical drives. Number of items must not be less than FF_VOLUMES. Valid
 | 
			
		||||
/  characters for the volume ID strings are A-Z, a-z and 0-9, however, they are
 | 
			
		||||
/  compared in case-insensitive. If FF_STR_VOLUME_ID >= 1 and FF_VOLUME_STRS is
 | 
			
		||||
/  not defined, a user defined volume string table needs to be defined as:
 | 
			
		||||
/  not defined, a user defined volume string table is needed as:
 | 
			
		||||
/
 | 
			
		||||
/  const char* VolumeStr[FF_VOLUMES] = {"ram","flash","sd","usb",...
 | 
			
		||||
*/
 | 
			
		||||
@@ -190,7 +190,7 @@
 | 
			
		||||
/  number and only an FAT volume found on the physical drive will be mounted.
 | 
			
		||||
/  When this function is enabled (1), each logical drive number can be bound to
 | 
			
		||||
/  arbitrary physical drive and partition listed in the VolToPart[]. Also f_fdisk()
 | 
			
		||||
/  funciton will be available. */
 | 
			
		||||
/  function will be available. */
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
#define FF_MIN_SS		512
 | 
			
		||||
@@ -240,10 +240,10 @@
 | 
			
		||||
#define FF_FS_NORTC		0
 | 
			
		||||
#define FF_NORTC_MON	1
 | 
			
		||||
#define FF_NORTC_MDAY	1
 | 
			
		||||
#define FF_NORTC_YEAR	2020
 | 
			
		||||
/* The option FF_FS_NORTC switches timestamp functiton. If the system does not have
 | 
			
		||||
/  any RTC function or valid timestamp is not needed, set FF_FS_NORTC = 1 to disable
 | 
			
		||||
/  the timestamp function. Every object modified by FatFs will have a fixed timestamp
 | 
			
		||||
#define FF_NORTC_YEAR	2022
 | 
			
		||||
/* The option FF_FS_NORTC switches timestamp feature. If the system does not have
 | 
			
		||||
/  an RTC or valid timestamp is not needed, set FF_FS_NORTC = 1 to disable the
 | 
			
		||||
/  timestamp feature. Every object modified by FatFs will have a fixed timestamp
 | 
			
		||||
/  defined by FF_NORTC_MON, FF_NORTC_MDAY and FF_NORTC_YEAR in local time.
 | 
			
		||||
/  To enable timestamp function (FF_FS_NORTC = 0), get_fattime() function need to be
 | 
			
		||||
/  added to the project to read current time form real-time clock. FF_NORTC_MON,
 | 
			
		||||
@@ -253,7 +253,7 @@
 | 
			
		||||
 | 
			
		||||
#define FF_FS_NOFSINFO	0
 | 
			
		||||
/* If you need to know correct free space on the FAT32 volume, set bit 0 of this
 | 
			
		||||
/  option, and f_getfree() function at first time after volume mount will force
 | 
			
		||||
/  option, and f_getfree() function at the first time after volume mount will force
 | 
			
		||||
/  a full FAT scan. Bit 1 controls the use of last allocated cluster number.
 | 
			
		||||
/
 | 
			
		||||
/  bit0=0: Use free cluster count in the FSINFO if available.
 | 
			
		||||
@@ -275,26 +275,21 @@
 | 
			
		||||
/      lock control is independent of re-entrancy. */
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
/* #include <somertos.h>	// O/S definitions */
 | 
			
		||||
#define FF_FS_REENTRANT	0
 | 
			
		||||
#define FF_FS_TIMEOUT	1000
 | 
			
		||||
#define FF_SYNC_t		HANDLE
 | 
			
		||||
/* The option FF_FS_REENTRANT switches the re-entrancy (thread safe) of the FatFs
 | 
			
		||||
/  module itself. Note that regardless of this option, file access to different
 | 
			
		||||
/  volume is always re-entrant and volume control functions, f_mount(), f_mkfs()
 | 
			
		||||
/  and f_fdisk() function, are always not re-entrant. Only file/directory access
 | 
			
		||||
/  to the same volume is under control of this function.
 | 
			
		||||
/  to the same volume is under control of this featuer.
 | 
			
		||||
/
 | 
			
		||||
/   0: Disable re-entrancy. FF_FS_TIMEOUT and FF_SYNC_t have no effect.
 | 
			
		||||
/   0: Disable re-entrancy. FF_FS_TIMEOUT have no effect.
 | 
			
		||||
/   1: Enable re-entrancy. Also user provided synchronization handlers,
 | 
			
		||||
/      ff_req_grant(), ff_rel_grant(), ff_del_syncobj() and ff_cre_syncobj()
 | 
			
		||||
/      function, must be added to the project. Samples are available in
 | 
			
		||||
/      option/syscall.c.
 | 
			
		||||
/      ff_mutex_create(), ff_mutex_delete(), ff_mutex_take() and ff_mutex_give()
 | 
			
		||||
/      function, must be added to the project. Samples are available in ffsystem.c.
 | 
			
		||||
/
 | 
			
		||||
/  The FF_FS_TIMEOUT defines timeout period in unit of time tick.
 | 
			
		||||
/  The FF_SYNC_t defines O/S dependent sync object type. e.g. HANDLE, ID, OS_EVENT*,
 | 
			
		||||
/  SemaphoreHandle_t and etc. A header file for O/S definitions needs to be
 | 
			
		||||
/  included somewhere in the scope of ff.h. */
 | 
			
		||||
/  The FF_FS_TIMEOUT defines timeout period in unit of O/S time tick.
 | 
			
		||||
*/
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user