update elmfat to R0.08b

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1336 bbd45198-f89e-11dd-88c7-29a3b14d5316

14 files changed, 2229 insertions, 1778 deletions

diff --git a/components/dfs/filesystems/elmfat/00readme.txt b/components/dfs/filesystems/elmfat/00readme.txt
index c46a0fa1aa..50805ccaad 100644
--- a/components/dfs/filesystems/elmfat/00readme.txt
+++ b/components/dfs/filesystems/elmfat/00readme.txt
@@ -1,4 +1,4 @@
-FatFs Module Source Files R0.07e                        (C)ChaN, 2009

+FatFs Module Source Files R0.08b                       (C)ChaN, 2011

 

 

 FILES

@@ -7,7 +7,6 @@ FILES
   ff.h       Common include file for FatFs and application module.

   ff.c       FatFs module.

   diskio.h   Common include file for FatFs and disk I/O module.

-  diskio.c   Skeleton of low level disk I/O module.

   integer.h  Alternative type definitions for integer variables.

   option     Optional external functions.

 

@@ -24,7 +23,7 @@ AGREEMENTS
  small embedded systems. This is a free software and is opened for education,

  research and commercial developments under license policy of following trems.

 

-  Copyright (C) 2009, ChaN, all right reserved.

+  Copyright (C) 2011, ChaN, all right reserved.

 

  * The FatFs module is a free software and there is NO WARRANTY.

  * No restriction on use. You can use, modify and redistribute it for

@@ -103,8 +102,26 @@ REVISION HISTORY
                        Added f_chdrive().

                        Added proper case conversion for extended characters.

 

-  Nov 03,'2009 R0.07e  Separated out configuration options from ff.h to ffconf.h.

+  Nov 03, 2009 R0.07e  Separated out configuration options from ff.h to ffconf.h.

                        Added a configuration option, _LFN_UNICODE.

                        Fixed f_unlink() fails to remove a sub-dir on _FS_RPATH.

                        Fixed name matching error on the 13 char boundary.

                        Changed f_readdir() to return the SFN with always upper case on non-LFN cfg.

+

+  May 15, 2010, R0.08  Added a memory configuration option. (_USE_LFN)

+                       Added file lock feature. (_FS_SHARE)

+                       Added fast seek feature. (_USE_FASTSEEK)

+                       Changed some types on the API, XCHAR->TCHAR.

+                       Changed fname member in the FILINFO structure on Unicode cfg.

+                       String functions support UTF-8 encoding files on Unicode cfg.

+

+  Aug 16,'10 R0.08a    Added f_getcwd(). (_FS_RPATH = 2)

+                       Added sector erase feature. (_USE_ERASE)

+                       Moved file lock semaphore table from fs object to the bss.

+                       Fixed a wrong directory entry is created on non-LFN cfg when the given name contains ';'.

+                       Fixed f_mkfs() creates wrong FAT32 volume.

+

+  Jan 15,'11 R0.08b    Fast seek feature is also applied to f_read() and f_write().

+                       f_lseek() reports required table size on creating CLMP.

+                       Extended format syntax of f_printf function.

+                       Ignores duplicated directory separators in given path names.

diff --git a/components/dfs/filesystems/elmfat/dfs_elm.c b/components/dfs/filesystems/elmfat/dfs_elm.c
index c720c42279..ffdf483d20 100644
--- a/components/dfs/filesystems/elmfat/dfs_elm.c
+++ b/components/dfs/filesystems/elmfat/dfs_elm.c
@@ -8,7 +8,7 @@
 #include <dfs_fs.h>

 #include <dfs_def.h>

 

-static rt_device_t disk[_DRIVES] = {0};

+static rt_device_t disk[_VOLUMES] = {0};

 

 static int elm_result_to_dfs(FRESULT result)

 {

@@ -48,7 +48,7 @@ static int elm_result_to_dfs(FRESULT result)
 	case FR_MKFS_ABORTED:

 		status = -DFS_STATUS_EINVAL;

 		break;

-		

+

 	default:

 		status = -1;

 		break;

@@ -64,14 +64,14 @@ int dfs_elm_mount(struct dfs_filesystem* fs, unsigned long rwflag, const void* d
 	rt_uint32_t index;

 

 	/* handle RT-Thread device routine */

-	for (index = 0; index < _DRIVES; index ++)

+	for (index = 0; index < _VOLUMES; index ++)

 	{

 		if (disk[index] == RT_NULL)

 		{

 			break;

 		}

 	}

-	if (index == _DRIVES) return -DFS_STATUS_ENOSPC;

+	if (index == _VOLUMES) return -DFS_STATUS_ENOSPC;

 

 	/* get device */

 	disk[index] = fs->dev_id;

@@ -106,7 +106,7 @@ int dfs_elm_unmount(struct dfs_filesystem* fs)
 	RT_ASSERT(fat != RT_NULL);

 

 	/* find the device index and then umount it */

-	for (index = 0; index < _DRIVES; index ++)

+	for (index = 0; index < _VOLUMES; index ++)

 	{

 		if (disk[index] == fs->dev_id)

 		{

@@ -132,7 +132,7 @@ int dfs_elm_mkfs(const char* device_name)
 	FRESULT result;

 

 	/* find device name */

-	for (drv = 0; drv < _DRIVES; drv ++)

+	for (drv = 0; drv < _VOLUMES; drv ++)

 	{

 		dev = disk[drv];

 		if (rt_strncmp(dev->parent.name, device_name, RT_NAME_MAX) == 0)

@@ -167,12 +167,12 @@ int dfs_elm_statfs(struct dfs_filesystem* fs, struct statfs *buf)
 

 	f = (FATFS*) fs->data;

 

-	rt_snprintf(driver, sizeof(driver), "%d:", f->drive);

+	rt_snprintf(driver, sizeof(driver), "%d:", f->drv);

 	res = f_getfree(driver, &fre_clust, &f);

 	if (res) return elm_result_to_dfs(res);

-	

+

 	/* Get total sectors and free sectors */

-	tot_sect = (f->max_clust - 2) * f->csize;

+	tot_sect = (f->n_fatent - 2) * f->csize;

 	fre_sect = fre_clust * f->csize;

 

 	buf->f_bfree = fre_sect;

@@ -189,10 +189,10 @@ int dfs_elm_open(struct dfs_fd* file)
 	FRESULT result;

 	char *drivers_fn;

 

-#if (_DRIVES > 1)

+#if (_VOLUMES > 1)

 	int vol;

 	extern int elm_get_vol(FATFS *fat);

-	

+

 	/* add path for ELM FatFS driver support */

 	vol = elm_get_vol((FATFS *)file->fs->data);

 	if (vol < 0) return -DFS_STATUS_ENOENT;

@@ -213,7 +213,7 @@ int dfs_elm_open(struct dfs_fd* file)
 			result = f_mkdir(drivers_fn);

 			if (result != FR_OK)

 			{

-#if _DRIVES > 1

+#if _VOLUMES > 1

 				rt_free(drivers_fn);

 #endif

 				return elm_result_to_dfs(result);

@@ -224,14 +224,14 @@ int dfs_elm_open(struct dfs_fd* file)
 		dir = (DIR *)rt_malloc(sizeof(DIR));

 		if (dir == RT_NULL)

 		{

-#if _DRIVES > 1

+#if _VOLUMES > 1

 			rt_free(drivers_fn);

 #endif

 			return -DFS_STATUS_ENOMEM;

 		}

 

 		result = f_opendir(dir, drivers_fn);

-#if _DRIVES > 1

+#if _VOLUMES > 1

 		rt_free(drivers_fn);

 #endif

 		if (result != FR_OK)

@@ -264,7 +264,7 @@ int dfs_elm_open(struct dfs_fd* file)
 		}

 

 		result = f_open(fd, drivers_fn, mode);

-#if _DRIVES > 1

+#if _VOLUMES > 1

 		rt_free(drivers_fn);

 #endif

 		if (result == FR_OK)

@@ -464,7 +464,7 @@ int dfs_elm_unlink(struct dfs_filesystem* fs, const char* path)
 {

 	FRESULT result;

 

-#if _DRIVES > 1

+#if _VOLUMES > 1

 	int vol;

 	char *drivers_fn;

 	extern int elm_get_vol(FATFS *fat);

@@ -482,7 +482,7 @@ int dfs_elm_unlink(struct dfs_filesystem* fs, const char* path)
 #endif

 

 	result = f_unlink(drivers_fn);

-#if _DRIVES > 1

+#if _VOLUMES > 1

 	rt_free(drivers_fn);

 #endif

 	return elm_result_to_dfs(result);

@@ -492,7 +492,7 @@ int dfs_elm_rename(struct dfs_filesystem* fs, const char* oldpath, const char* n
 {

 	FRESULT result;

 

-#if _DRIVES > 1

+#if _VOLUMES > 1

 	char *drivers_oldfn, *drivers_newfn;

 	int vol;

 	extern int elm_get_vol(FATFS *fat);

@@ -504,7 +504,7 @@ int dfs_elm_rename(struct dfs_filesystem* fs, const char* oldpath, const char* n
 	drivers_oldfn = rt_malloc(256);

 	if (drivers_oldfn == RT_NULL) return -DFS_STATUS_ENOMEM;

 	drivers_newfn = rt_malloc(256);

-	if (drivers_newfn == RT_NULL) 

+	if (drivers_newfn == RT_NULL)

 	{

 		rt_free(drivers_oldfn);

 		return -DFS_STATUS_ENOMEM;

@@ -520,7 +520,7 @@ int dfs_elm_rename(struct dfs_filesystem* fs, const char* oldpath, const char* n
 #endif

 

 	result = f_rename(drivers_oldfn, drivers_newfn);

-#if _DRIVES > 1

+#if _VOLUMES > 1

 	rt_free(drivers_oldfn);

 	rt_free(drivers_newfn);

 #endif

@@ -533,7 +533,7 @@ int dfs_elm_stat(struct dfs_filesystem* fs, const char *path, struct stat *st)
 	FRESULT result;

 

 

-#if _DRIVES > 1

+#if _VOLUMES > 1

 	int vol;

 	char *drivers_fn;

 	extern int elm_get_vol(FATFS *fat);

@@ -557,7 +557,7 @@ int dfs_elm_stat(struct dfs_filesystem* fs, const char *path, struct stat *st)
 #endif

 

 	result = f_stat(drivers_fn, &file_info);

-#if _DRIVES > 1

+#if _VOLUMES > 1

 	rt_free(drivers_fn);

 #endif

 	if (result == FR_OK)

@@ -587,7 +587,7 @@ int dfs_elm_stat(struct dfs_filesystem* fs, const char *path, struct stat *st)
 	return elm_result_to_dfs(result);

 }

 

-static const struct dfs_filesystem_operation dfs_elm = 

+static const struct dfs_filesystem_operation dfs_elm =

 {

 	"elm",

 	dfs_elm_mount,

@@ -669,7 +669,7 @@ DRESULT disk_ioctl (BYTE drv, BYTE ctrl, void *buff)
 	rt_device_t device = disk[drv];

 

 	if (device == RT_NULL) return RES_ERROR;

-	

+

 	if (ctrl == GET_SECTOR_COUNT)

 	{

 		struct rt_device_blk_geometry geometry;

@@ -687,7 +687,7 @@ DRESULT disk_ioctl (BYTE drv, BYTE ctrl, void *buff)
 		rt_memset(&geometry, 0, sizeof(geometry));

 		rt_device_control(device, RT_DEVICE_CTRL_BLK_GETGEOME, &geometry);

 

-		*(DWORD*)buff = geometry.bytes_per_sector;

+		*(WORD*)buff = geometry.bytes_per_sector;

 	}

 	else if (ctrl == GET_BLOCK_SIZE) /* Get erase block size in unit of sectors (DWORD) */

 	{

@@ -708,7 +708,7 @@ rt_time_t get_fattime()
 }

 

 #if _FS_REENTRANT

-BOOL ff_cre_syncobj(BYTE drv, _SYNC_t* m)

+int ff_cre_syncobj(BYTE drv, _SYNC_t* m)

 {

     char name[8];

     rt_mutex_t mutex;

@@ -718,24 +718,24 @@ BOOL ff_cre_syncobj(BYTE drv, _SYNC_t* m)
     if (mutex != RT_NULL)

     {

         *m = mutex;

-        return TRUE;

+        return RT_TRUE;

     }

 

-    return FALSE;

+    return RT_FALSE;

 }

 

-BOOL ff_del_syncobj(_SYNC_t m)

+int ff_del_syncobj(_SYNC_t m)

 {

     rt_mutex_delete(m);

 

-    return TRUE;

+    return RT_TRUE;

 }

 

-BOOL ff_req_grant(_SYNC_t m)

+int ff_req_grant(_SYNC_t m)

 {

-    if (rt_mutex_take(m, _FS_TIMEOUT) == RT_EOK) return TRUE;

+    if (rt_mutex_take(m, _FS_TIMEOUT) == RT_EOK) return RT_TRUE;

 

-    return FALSE;

+    return RT_FALSE;

 }

 

 void ff_rel_grant(_SYNC_t m)

diff --git a/components/dfs/filesystems/elmfat/diskio.c b/components/dfs/filesystems/elmfat/diskio.c
deleted file mode 100644
index c2c1d44184..0000000000
--- a/components/dfs/filesystems/elmfat/diskio.c
+++ /dev/null
@@ -1,202 +0,0 @@
-/*-----------------------------------------------------------------------*/

-/* Low level disk I/O module skeleton for FatFs     (C)ChaN, 2007        */

-/*-----------------------------------------------------------------------*/

-/* This is a stub disk I/O module that acts as front end of the existing */

-/* disk I/O modules and attach it to FatFs module with common interface. */

-/*-----------------------------------------------------------------------*/

-

-#include "diskio.h"

-

-/*-----------------------------------------------------------------------*/

-/* Correspondence between physical drive number and physical drive.      */

-

-#define ATA		0

-#define MMC		1

-#define USB		2

-

-

-

-/*-----------------------------------------------------------------------*/

-/* Inidialize a Drive                                                    */

-

-DSTATUS disk_initialize (

-	BYTE drv				/* Physical drive nmuber (0..) */

-)

-{

-	DSTATUS stat;

-	int result;

-

-	switch (drv) {

-	case ATA :

-		result = ATA_disk_initialize();

-		// translate the reslut code here

-

-		return stat;

-

-	case MMC :

-		result = MMC_disk_initialize();

-		// translate the reslut code here

-

-		return stat;

-

-	case USB :

-		result = USB_disk_initialize();

-		// translate the reslut code here

-

-		return stat;

-	}

-	return STA_NOINIT;

-}

-

-

-

-/*-----------------------------------------------------------------------*/

-/* Return Disk Status                                                    */

-

-DSTATUS disk_status (

-	BYTE drv		/* Physical drive nmuber (0..) */

-)

-{

-	DSTATUS stat;

-	int result;

-

-	switch (drv) {

-	case ATA :

-		result = ATA_disk_status();

-		// translate the reslut code here

-

-		return stat;

-

-	case MMC :

-		result = MMC_disk_status();

-		// translate the reslut code here

-

-		return stat;

-

-	case USB :

-		result = USB_disk_status();

-		// translate the reslut code here

-

-		return stat;

-	}

-	return STA_NOINIT;

-}

-

-

-

-/*-----------------------------------------------------------------------*/

-/* Read Sector(s)                                                        */

-

-DRESULT disk_read (

-	BYTE drv,		/* Physical drive nmuber (0..) */

-	BYTE *buff,		/* Data buffer to store read data */

-	DWORD sector,	/* Sector address (LBA) */

-	BYTE count		/* Number of sectors to read (1..255) */

-)

-{

-	DRESULT res;

-	int result;

-

-	switch (drv) {

-	case ATA :

-		result = ATA_disk_read(buff, sector, count);

-		// translate the reslut code here

-

-		return res;

-

-	case MMC :

-		result = MMC_disk_read(buff, sector, count);

-		// translate the reslut code here

-

-		return res;

-

-	case USB :

-		result = USB_disk_read(buff, sector, count);

-		// translate the reslut code here

-

-		return res;

-	}

-	return RES_PARERR;

-}

-

-

-

-/*-----------------------------------------------------------------------*/

-/* Write Sector(s)                                                       */

-

-#if _READONLY == 0

-DRESULT disk_write (

-	BYTE drv,			/* Physical drive nmuber (0..) */

-	const BYTE *buff,	/* Data to be written */

-	DWORD sector,		/* Sector address (LBA) */

-	BYTE count			/* Number of sectors to write (1..255) */

-)

-{

-	DRESULT res;

-	int result;

-

-	switch (drv) {

-	case ATA :

-		result = ATA_disk_write(buff, sector, count);

-		// translate the reslut code here

-

-		return res;

-

-	case MMC :

-		result = MMC_disk_write(buff, sector, count);

-		// translate the reslut code here

-

-		return res;

-

-	case USB :

-		result = USB_disk_write(buff, sector, count);

-		// translate the reslut code here

-

-		return res;

-	}

-	return RES_PARERR;

-}

-#endif /* _READONLY */

-

-

-

-/*-----------------------------------------------------------------------*/

-/* Miscellaneous Functions                                               */

-

-DRESULT disk_ioctl (

-	BYTE drv,		/* Physical drive nmuber (0..) */

-	BYTE ctrl,		/* Control code */

-	void *buff		/* Buffer to send/receive control data */

-)

-{

-	DRESULT res;

-	int result;

-

-	switch (drv) {

-	case ATA :

-		// pre-process here

-

-		result = ATA_disk_ioctl(ctrl, buff);

-		// post-process here

-

-		return res;

-

-	case MMC :

-		// pre-process here

-

-		result = MMC_disk_ioctl(ctrl, buff);

-		// post-process here

-

-		return res;

-

-	case USB :

-		// pre-process here

-

-		result = USB_disk_ioctl(ctrl, buff);

-		// post-process here

-

-		return res;

-	}

-	return RES_PARERR;

-}

-

diff --git a/components/dfs/filesystems/elmfat/diskio.h b/components/dfs/filesystems/elmfat/diskio.h
index 27d93e8e2a..2fa4b280f2 100644
--- a/components/dfs/filesystems/elmfat/diskio.h
+++ b/components/dfs/filesystems/elmfat/diskio.h
@@ -1,11 +1,11 @@
 /*-----------------------------------------------------------------------

-/  Low level disk interface modlue include file  R0.07   (C)ChaN, 2009

+/  Low level disk interface modlue include file

 /-----------------------------------------------------------------------*/

 

 #ifndef _DISKIO

 

-#define _READONLY	0	/* 1: Read-only mode */

-#define _USE_IOCTL	1

+#define _READONLY	0	/* 1: Remove write functions */

+#define _USE_IOCTL	1	/* 1: Use disk_ioctl fucntion */

 

 #include "integer.h"

 

@@ -26,7 +26,7 @@ typedef enum {
 /*---------------------------------------*/

 /* Prototypes for disk control functions */

 

-BOOL assign_drives (int argc, char *argv[]);

+int assign_drives (int, int);

 DSTATUS disk_initialize (BYTE);

 DSTATUS disk_status (BYTE);

 DRESULT disk_read (BYTE, BYTE*, DWORD, BYTE);

@@ -44,26 +44,34 @@ DRESULT disk_ioctl (BYTE, BYTE, void*);
 #define STA_PROTECT		0x04	/* Write protected */

 

 

-/* Command code for disk_ioctrl() */

+/* Command code for disk_ioctrl fucntion */

+

+/* Generic command (defined for FatFs) */

+#define CTRL_SYNC			0	/* Flush disk cache (for write functions) */

+#define GET_SECTOR_COUNT	1	/* Get media size (for only f_mkfs()) */

+#define GET_SECTOR_SIZE		2	/* Get sector size (for multiple sector size (_MAX_SS >= 1024)) */

+#define GET_BLOCK_SIZE		3	/* Get erase block size (for only f_mkfs()) */

+#define CTRL_ERASE_SECTOR	4	/* Force erased a block of sectors (for only _USE_ERASE) */

 

 /* Generic command */

-#define CTRL_SYNC			0	/* Mandatory for write functions */

-#define GET_SECTOR_COUNT	1	/* Mandatory for only f_mkfs() */

-#define GET_SECTOR_SIZE		2	/* Mandatory for multiple sector size cfg */

-#define GET_BLOCK_SIZE		3	/* Mandatory for only f_mkfs() */

-#define CTRL_POWER			4

-#define CTRL_LOCK			5

-#define CTRL_EJECT			6

-/* MMC/SDC command */

-#define MMC_GET_TYPE		10

-#define MMC_GET_CSD			11

-#define MMC_GET_CID			12

-#define MMC_GET_OCR			13

-#define MMC_GET_SDSTAT		14

-/* ATA/CF command */

-#define ATA_GET_REV			20

-#define ATA_GET_MODEL		21

-#define ATA_GET_SN			22

+#define CTRL_POWER			5	/* Get/Set power status */

+#define CTRL_LOCK			6	/* Lock/Unlock media removal */

+#define CTRL_EJECT			7	/* Eject media */

+

+/* MMC/SDC specific ioctl command */

+#define MMC_GET_TYPE		10	/* Get card type */

+#define MMC_GET_CSD			11	/* Get CSD */

+#define MMC_GET_CID			12	/* Get CID */

+#define MMC_GET_OCR			13	/* Get OCR */

+#define MMC_GET_SDSTAT		14	/* Get SD status */

+

+/* ATA/CF specific ioctl command */

+#define ATA_GET_REV			20	/* Get F/W revision */

+#define ATA_GET_MODEL		21	/* Get model name */

+#define ATA_GET_SN			22	/* Get serial number */

+

+/* NAND specific ioctl command */

+#define NAND_FORMAT			30	/* Create physical format */

 

 

 #define _DISKIO

diff --git a/components/dfs/filesystems/elmfat/ff.c b/components/dfs/filesystems/elmfat/ff.c
index 40b2d03f4c..3fc2513d63 100644
--- a/components/dfs/filesystems/elmfat/ff.c
+++ b/components/dfs/filesystems/elmfat/ff.c
@@ -1,11 +1,11 @@
 /*----------------------------------------------------------------------------/

-/  FatFs - FAT file system module  R0.07e                    (C)ChaN, 2009

+/  FatFs - FAT file system module  R0.08b                 (C)ChaN, 2011

 /-----------------------------------------------------------------------------/

 / FatFs module is a generic FAT file system module for small embedded systems.

 / This is a free software that opened for education, research and commercial

-/ developments under license policy of following trems.

+/ developments under license policy of following terms.

 /

-/  Copyright (C) 2009, ChaN, all right reserved.

+/  Copyright (C) 2011, ChaN, all right reserved.

 /

 / * The FatFs module is a free software and there is NO WARRANTY.

 / * No restriction on use. You can use, modify and redistribute it for

@@ -19,19 +19,19 @@
 /

 / Jun 01,'06 R0.02  Added FAT12 support.

 /                   Removed unbuffered mode.

-/                   Fixed a problem on small (<32M) patition.

+/                   Fixed a problem on small (<32M) partition.

 / Jun 10,'06 R0.02a Added a configuration option (_FS_MINIMUM).

 /

 / Sep 22,'06 R0.03  Added f_rename().

 /                   Changed option _FS_MINIMUM to _FS_MINIMIZE.

-/ Dec 11,'06 R0.03a Improved cluster scan algolithm to write files fast.

+/ Dec 11,'06 R0.03a Improved cluster scan algorithm to write files fast.

 /                   Fixed f_mkdir() creates incorrect directory on FAT32.

 /

 / Feb 04,'07 R0.04  Supported multiple drive system.

 /                   Changed some interfaces for multiple drive system.

 /                   Changed f_mountdrv() to f_mount().

 /                   Added f_mkfs().

-/ Apr 01,'07 R0.04a Supported multiple partitions on a plysical drive.

+/ Apr 01,'07 R0.04a Supported multiple partitions on a physical drive.

 /                   Added a capability of extending file size to f_lseek().

 /                   Added minimization level 3.

 /                   Fixed an endian sensitive code in f_mkfs().

@@ -46,23 +46,21 @@
 / Feb 03,'08 R0.05a Added f_truncate() and f_utime().

 /                   Fixed off by one error at FAT sub-type determination.

 /                   Fixed btr in f_read() can be mistruncated.

-/                   Fixed cached sector is not flushed when create and close

-/                   without write.

+/                   Fixed cached sector is not flushed when create and close without write.

 /

 / Apr 01,'08 R0.06  Added fputc(), fputs(), fprintf() and fgets().

-/                   Improved performance of f_lseek() on moving to the same

-/                   or following cluster.

+/                   Improved performance of f_lseek() on moving to the same or following cluster.

 /

-/ Apr 01,'09 R0.07  Merged Tiny-FatFs as a buffer configuration option.

-/                   Added long file name support.

-/                   Added multiple code page support.

+/ Apr 01,'09 R0.07  Merged Tiny-FatFs as a configuration option. (_FS_TINY)

+/                   Added long file name feature.

+/                   Added multiple code page feature.

 /                   Added re-entrancy for multitask operation.

 /                   Added auto cluster size selection to f_mkfs().

 /                   Added rewind option to f_readdir().

 /                   Changed result code of critical errors.

 /                   Renamed string functions to avoid name collision.

 / Apr 14,'09 R0.07a Separated out OS dependent code on reentrant cfg.

-/                   Added multiple sector size support.

+/                   Added multiple sector size feature.

 / Jun 21,'09 R0.07c Fixed f_unlink() can return FR_OK on error.

 /                   Fixed wrong cache control in f_lseek().

 /                   Added relative path feature.

@@ -72,44 +70,311 @@
 /                   Fixed f_unlink() fails to remove a sub-dir on _FS_RPATH.

 /                   Fixed name matching error on the 13 char boundary.

 /                   Added a configuration option, _LFN_UNICODE.

-/                   Changed f_readdir() to return the SFN with always upper

-/                   case on non-LFN cfg.

+/                   Changed f_readdir() to return the SFN with always upper case on non-LFN cfg.

+/

+/ May 15,'10 R0.08  Added a memory configuration option. (_USE_LFN = 3)

+/                   Added file lock feature. (_FS_SHARE)

+/                   Added fast seek feature. (_USE_FASTSEEK)

+/                   Changed some types on the API, XCHAR->TCHAR.

+/                   Changed fname member in the FILINFO structure on Unicode cfg.

+/                   String functions support UTF-8 encoding files on Unicode cfg.

+/ Aug 16,'10 R0.08a Added f_getcwd(). (_FS_RPATH = 2)

+/                   Added sector erase feature. (_USE_ERASE)

+/                   Moved file lock semaphore table from fs object to the bss.

+/                   Fixed a wrong directory entry is created on non-LFN cfg when the given name contains ';'.

+/                   Fixed f_mkfs() creates wrong FAT32 volume.

+/ Jan 15,'11 R0.08b Fast seek feature is also applied to f_read() and f_write().

+/                   f_lseek() reports required table size on creating CLMP.

+/                   Extended format syntax of f_printf function.

+/                   Ignores duplicated directory separators in given path names.

 /---------------------------------------------------------------------------*/

 

 #include "ff.h"			/* FatFs configurations and declarations */

 #include "diskio.h"		/* Declarations of low level disk I/O functions */

 

+

 /*--------------------------------------------------------------------------

 

    Module Private Definitions

 

 ---------------------------------------------------------------------------*/

 

-#if _FATFS != 0x007E

+#if _FATFS != 8237

 #error Wrong include file (ff.h).

 #endif

 

+

+/* Definitions on sector size */

+#if _MAX_SS != 512 && _MAX_SS != 1024 && _MAX_SS != 2048 && _MAX_SS != 4096

+#error Wrong sector size.

+#endif

+#if _MAX_SS != 512

+#define	SS(fs)	((fs)->ssize)	/* Multiple sector size */

+#else

+#define	SS(fs)	512U			/* Fixed sector size */

+#endif

+

+

+/* Reentrancy related */

 #if _FS_REENTRANT

 #if _USE_LFN == 1

 #error Static LFN work area must not be used in re-entrant configuration.

 #endif

 #define	ENTER_FF(fs)		{ if (!lock_fs(fs)) return FR_TIMEOUT; }

 #define	LEAVE_FF(fs, res)	{ unlock_fs(fs, res); return res; }

-

 #else

 #define	ENTER_FF(fs)

 #define LEAVE_FF(fs, res)	return res

-

 #endif

 

 #define	ABORT(fs, res)		{ fp->flag |= FA__ERROR; LEAVE_FF(fs, res); }

 

-#ifndef NULL

-#define	NULL	0

+

+/* File shareing feature */

+#if _FS_SHARE

+#if _FS_READONLY

+#error _FS_SHARE must be 0 on read-only cfg.

+#endif

+typedef struct {

+	FATFS *fs;				/* File ID 1, volume (NULL:blank entry) */

+	DWORD clu;				/* File ID 2, directory */

+	WORD idx;				/* File ID 3, directory index */

+	WORD ctr;				/* File open counter, 0:none, 0x01..0xFF:read open count, 0x100:write mode */

+} FILESEM;

+#endif

+

+

+/* Misc definitions */

+#define LD_CLUST(dir)	(((DWORD)LD_WORD(dir+DIR_FstClusHI)<<16) | LD_WORD(dir+DIR_FstClusLO))

+#define ST_CLUST(dir,cl) {ST_WORD(dir+DIR_FstClusLO, cl); ST_WORD(dir+DIR_FstClusHI, (DWORD)cl>>16);}

+

+

+/* DBCS code ranges and SBCS extend char conversion table */

+

+#if _CODE_PAGE == 932	/* Japanese Shift-JIS */

+#define _DF1S	0x81	/* DBC 1st byte range 1 start */

+#define _DF1E	0x9F	/* DBC 1st byte range 1 end */

+#define _DF2S	0xE0	/* DBC 1st byte range 2 start */

+#define _DF2E	0xFC	/* DBC 1st byte range 2 end */

+#define _DS1S	0x40	/* DBC 2nd byte range 1 start */

+#define _DS1E	0x7E	/* DBC 2nd byte range 1 end */

+#define _DS2S	0x80	/* DBC 2nd byte range 2 start */

+#define _DS2E	0xFC	/* DBC 2nd byte range 2 end */

+

+#elif _CODE_PAGE == 936	/* Simplified Chinese GBK */

+#define _DF1S	0x81

+#define _DF1E	0xFE

+#define _DS1S	0x40

+#define _DS1E	0x7E

+#define _DS2S	0x80

+#define _DS2E	0xFE

+

+#elif _CODE_PAGE == 949	/* Korean */

+#define _DF1S	0x81

+#define _DF1E	0xFE

+#define _DS1S	0x41

+#define _DS1E	0x5A

+#define _DS2S	0x61

+#define _DS2E	0x7A

+#define _DS3S	0x81

+#define _DS3E	0xFE

+

+#elif _CODE_PAGE == 950	/* Traditional Chinese Big5 */

+#define _DF1S	0x81

+#define _DF1E	0xFE

+#define _DS1S	0x40

+#define _DS1E	0x7E

+#define _DS2S	0xA1

+#define _DS2E	0xFE

+

+#elif _CODE_PAGE == 437	/* U.S. (OEM) */

+#define _DF1S	0

+#define _EXCVT {0x80,0x9A,0x90,0x41,0x8E,0x41,0x8F,0x80,0x45,0x45,0x45,0x49,0x49,0x49,0x8E,0x8F,0x90,0x92,0x92,0x4F,0x99,0x4F,0x55,0x55,0x59,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \

+				0x41,0x49,0x4F,0x55,0xA5,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0x21,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \

+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \

+				0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}

+

+#elif _CODE_PAGE == 720	/* Arabic (OEM) */

+#define _DF1S	0

+#define _EXCVT {0x80,0x81,0x45,0x41,0x84,0x41,0x86,0x43,0x45,0x45,0x45,0x49,0x49,0x8D,0x8E,0x8F,0x90,0x92,0x92,0x93,0x94,0x95,0x49,0x49,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \

+				0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \

+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \

+				0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}

+

+#elif _CODE_PAGE == 737	/* Greek (OEM) */

+#define _DF1S	0

+#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x92,0x92,0x93,0x94,0x95,0x96,0x97,0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87, \

+				0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0xAA,0x92,0x93,0x94,0x95,0x96,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \

+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \

+				0x97,0xEA,0xEB,0xEC,0xE4,0xED,0xEE,0xE7,0xE8,0xF1,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}

+

+#elif _CODE_PAGE == 775	/* Baltic (OEM) */

+#define _DF1S	0

+#define _EXCVT {0x80,0x9A,0x91,0xA0,0x8E,0x95,0x8F,0x80,0xAD,0xED,0x8A,0x8A,0xA1,0x8D,0x8E,0x8F,0x90,0x92,0x92,0xE2,0x99,0x95,0x96,0x97,0x97,0x99,0x9A,0x9D,0x9C,0x9D,0x9E,0x9F, \

+				0xA0,0xA1,0xE0,0xA3,0xA3,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \

+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xB5,0xB6,0xB7,0xB8,0xBD,0xBE,0xC6,0xC7,0xA5,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \

+				0xE0,0xE1,0xE2,0xE3,0xE5,0xE5,0xE6,0xE3,0xE8,0xE8,0xEA,0xEA,0xEE,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}

+

+#elif _CODE_PAGE == 850	/* Multilingual Latin 1 (OEM) */

+#define _DF1S	0

+#define _EXCVT {0x80,0x9A,0x90,0xB6,0x8E,0xB7,0x8F,0x80,0xD2,0xD3,0xD4,0xD8,0xD7,0xDE,0x8E,0x8F,0x90,0x92,0x92,0xE2,0x99,0xE3,0xEA,0xEB,0x59,0x99,0x9A,0x9D,0x9C,0x9D,0x9E,0x9F, \

+				0xB5,0xD6,0xE0,0xE9,0xA5,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0x21,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \

+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC7,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \

+				0xE0,0xE1,0xE2,0xE3,0xE5,0xE5,0xE6,0xE7,0xE7,0xE9,0xEA,0xEB,0xED,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}

+

+#elif _CODE_PAGE == 852	/* Latin 2 (OEM) */

+#define _DF1S	0

+#define _EXCVT {0x80,0x9A,0x90,0xB6,0x8E,0xDE,0x8F,0x80,0x9D,0xD3,0x8A,0x8A,0xD7,0x8D,0x8E,0x8F,0x90,0x91,0x91,0xE2,0x99,0x95,0x95,0x97,0x97,0x99,0x9A,0x9B,0x9B,0x9D,0x9E,0x9F, \

+				0xB5,0xD6,0xE0,0xE9,0xA4,0xA4,0xA6,0xA6,0xA8,0xA8,0xAA,0x8D,0xAC,0xB8,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBD,0xBF, \

+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC6,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD1,0xD1,0xD2,0xD3,0xD2,0xD5,0xD6,0xD7,0xB7,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \

+				0xE0,0xE1,0xE2,0xE3,0xE3,0xD5,0xE6,0xE6,0xE8,0xE9,0xE8,0xEB,0xED,0xED,0xDD,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xEB,0xFC,0xFC,0xFE,0xFF}

+

+#elif _CODE_PAGE == 855	/* Cyrillic (OEM) */

+#define _DF1S	0

+#define _EXCVT {0x81,0x81,0x83,0x83,0x85,0x85,0x87,0x87,0x89,0x89,0x8B,0x8B,0x8D,0x8D,0x8F,0x8F,0x91,0x91,0x93,0x93,0x95,0x95,0x97,0x97,0x99,0x99,0x9B,0x9B,0x9D,0x9D,0x9F,0x9F, \

+				0xA1,0xA1,0xA3,0xA3,0xA5,0xA5,0xA7,0xA7,0xA9,0xA9,0xAB,0xAB,0xAD,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB6,0xB6,0xB8,0xB8,0xB9,0xBA,0xBB,0xBC,0xBE,0xBE,0xBF, \

+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC7,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD1,0xD1,0xD3,0xD3,0xD5,0xD5,0xD7,0xD7,0xDD,0xD9,0xDA,0xDB,0xDC,0xDD,0xE0,0xDF, \

+				0xE0,0xE2,0xE2,0xE4,0xE4,0xE6,0xE6,0xE8,0xE8,0xEA,0xEA,0xEC,0xEC,0xEE,0xEE,0xEF,0xF0,0xF2,0xF2,0xF4,0xF4,0xF6,0xF6,0xF8,0xF8,0xFA,0xFA,0xFC,0xFC,0xFD,0xFE,0xFF}

+

+#elif _CODE_PAGE == 857	/* Turkish (OEM) */

+#define _DF1S	0

+#define _EXCVT {0x80,0x9A,0x90,0xB6,0x8E,0xB7,0x8F,0x80,0xD2,0xD3,0xD4,0xD8,0xD7,0x98,0x8E,0x8F,0x90,0x92,0x92,0xE2,0x99,0xE3,0xEA,0xEB,0x98,0x99,0x9A,0x9D,0x9C,0x9D,0x9E,0x9E, \

+				0xB5,0xD6,0xE0,0xE9,0xA5,0xA5,0xA6,0xA6,0xA8,0xA9,0xAA,0xAB,0xAC,0x21,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \

+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC7,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \

+				0xE0,0xE1,0xE2,0xE3,0xE5,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xDE,0x59,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}

+

+#elif _CODE_PAGE == 858	/* Multilingual Latin 1 + Euro (OEM) */

+#define _DF1S	0

+#define _EXCVT {0x80,0x9A,0x90,0xB6,0x8E,0xB7,0x8F,0x80,0xD2,0xD3,0xD4,0xD8,0xD7,0xDE,0x8E,0x8F,0x90,0x92,0x92,0xE2,0x99,0xE3,0xEA,0xEB,0x59,0x99,0x9A,0x9D,0x9C,0x9D,0x9E,0x9F, \

+				0xB5,0xD6,0xE0,0xE9,0xA5,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0x21,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \

+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC7,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD1,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \

+				0xE0,0xE1,0xE2,0xE3,0xE5,0xE5,0xE6,0xE7,0xE7,0xE9,0xEA,0xEB,0xED,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}

+

+#elif _CODE_PAGE == 862	/* Hebrew (OEM) */

+#define _DF1S	0

+#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \

+				0x41,0x49,0x4F,0x55,0xA5,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0x21,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \

+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \

+				0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}

+

+#elif _CODE_PAGE == 866	/* Russian (OEM) */

+#define _DF1S	0

+#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \

+				0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \

+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \

+				0x90,0x91,0x92,0x93,0x9d,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F,0xF0,0xF0,0xF2,0xF2,0xF4,0xF4,0xF6,0xF6,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}

+

+#elif _CODE_PAGE == 874	/* Thai (OEM, Windows) */

+#define _DF1S	0

+#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \

+				0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \

+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \

+				0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}

+

+#elif _CODE_PAGE == 1250 /* Central Europe (Windows) */

+#define _DF1S	0

+#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x8A,0x9B,0x8C,0x8D,0x8E,0x8F, \

+				0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xA3,0xB4,0xB5,0xB6,0xB7,0xB8,0xA5,0xAA,0xBB,0xBC,0xBD,0xBC,0xAF, \

+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \

+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF}

+

+#elif _CODE_PAGE == 1251 /* Cyrillic (Windows) */

+#define _DF1S	0

+#define _EXCVT {0x80,0x81,0x82,0x82,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x80,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x8A,0x9B,0x8C,0x8D,0x8E,0x8F, \

+				0xA0,0xA2,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB2,0xA5,0xB5,0xB6,0xB7,0xA8,0xB9,0xAA,0xBB,0xA3,0xBD,0xBD,0xAF, \

+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \

+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF}

+

+#elif _CODE_PAGE == 1252 /* Latin 1 (Windows) */

+#define _DF1S	0

+#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0xAd,0x9B,0x8C,0x9D,0xAE,0x9F, \

+				0xA0,0x21,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \

+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \

+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0x9F}

+

+#elif _CODE_PAGE == 1253 /* Greek (Windows) */

+#define _DF1S	0

+#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \

+				0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \

+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xA2,0xB8,0xB9,0xBA, \

+				0xE0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xF2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xFB,0xBC,0xFD,0xBF,0xFF}

+

+#elif _CODE_PAGE == 1254 /* Turkish (Windows) */

+#define _DF1S	0

+#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x8A,0x9B,0x8C,0x9D,0x9E,0x9F, \

+				0xA0,0x21,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \

+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \

+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0x9F}

+

+#elif _CODE_PAGE == 1255 /* Hebrew (Windows) */

+#define _DF1S	0

+#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \

+				0xA0,0x21,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \

+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \

+				0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}

+

+#elif _CODE_PAGE == 1256 /* Arabic (Windows) */

+#define _DF1S	0

+#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x8C,0x9D,0x9E,0x9F, \

+				0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \

+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \

+				0x41,0xE1,0x41,0xE3,0xE4,0xE5,0xE6,0x43,0x45,0x45,0x45,0x45,0xEC,0xED,0x49,0x49,0xF0,0xF1,0xF2,0xF3,0x4F,0xF5,0xF6,0xF7,0xF8,0x55,0xFA,0x55,0x55,0xFD,0xFE,0xFF}

+

+#elif _CODE_PAGE == 1257 /* Baltic (Windows) */

+#define _DF1S	0

+#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \

+				0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xA8,0xB9,0xAA,0xBB,0xBC,0xBD,0xBE,0xAF, \

+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \

+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF}

+

+#elif _CODE_PAGE == 1258 /* Vietnam (OEM, Windows) */

+#define _DF1S	0

+#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0xAC,0x9D,0x9E,0x9F, \

+				0xA0,0x21,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \

+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \

+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xEC,0xCD,0xCE,0xCF,0xD0,0xD1,0xF2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xFE,0x9F}

+

+#elif _CODE_PAGE == 1	/* ASCII (for only non-LFN cfg) */

+#if _USE_LFN

+#error Cannot use LFN feature without valid code page.

 #endif

+#define _DF1S	0

+

+#else

+#error Unknown code page

+

+#endif

+

+

+/* Character code support macros */

+#define IsUpper(c)	(((c)>='A')&&((c)<='Z'))

+#define IsLower(c)	(((c)>='a')&&((c)<='z'))

+#define IsDigit(c)	(((c)>='0')&&((c)<='9'))

+

+#if _DF1S		/* Code page is DBCS */

+

+#ifdef _DF2S	/* Two 1st byte areas */

+#define IsDBCS1(c)	(((BYTE)(c) >= _DF1S && (BYTE)(c) <= _DF1E) || ((BYTE)(c) >= _DF2S && (BYTE)(c) <= _DF2E))

+#else			/* One 1st byte area */

+#define IsDBCS1(c)	((BYTE)(c) >= _DF1S && (BYTE)(c) <= _DF1E)

+#endif

+

+#ifdef _DS3S	/* Three 2nd byte areas */

+#define IsDBCS2(c)	(((BYTE)(c) >= _DS1S && (BYTE)(c) <= _DS1E) || ((BYTE)(c) >= _DS2S && (BYTE)(c) <= _DS2E) || ((BYTE)(c) >= _DS3S && (BYTE)(c) <= _DS3E))

+#else			/* Two 2nd byte areas */

+#define IsDBCS2(c)	(((BYTE)(c) >= _DS1S && (BYTE)(c) <= _DS1E) || ((BYTE)(c) >= _DS2S && (BYTE)(c) <= _DS2E))

+#endif

+

+#else			/* Code page is SBCS */

+

+#define IsDBCS1(c)	0

+#define IsDBCS2(c)	0

+

+#endif /* _DF1S */

+

 

 /* Name status flags */

-#define NS			11		/* Offset of name status byte */

+#define NS			11		/* Index of name status byte in fn[] */

 #define NS_LOSS		0x01	/* Out of 8.3 format */

 #define NS_LFN		0x02	/* Force to create LFN entry */

 #define NS_LAST		0x04	/* Last segment */

@@ -118,43 +383,123 @@
 #define NS_DOT		0x20	/* Dot entry */

 

 

+/* FAT sub-type boundaries */

+/* Note that the FAT spec by Microsoft says 4085 but Windows works with 4087! */

+#define MIN_FAT16	4086	/* Minimum number of clusters for FAT16 */

+#define	MIN_FAT32	65526	/* Minimum number of clusters for FAT32 */

 

 

-/*--------------------------------------------------------------------------

+/* FatFs refers the members in the FAT structures as byte array instead of

+/ structure member because the structure is not binary compatible between

+/ different platforms */

 

-   Private Work Area

+#define BS_jmpBoot			0	/* Jump instruction (3) */

+#define BS_OEMName			3	/* OEM name (8) */

+#define BPB_BytsPerSec		11	/* Sector size [byte] (2) */

+#define BPB_SecPerClus		13	/* Cluster size [sector] (1) */

+#define BPB_RsvdSecCnt		14	/* Size of reserved area [sector] (2) */

+#define BPB_NumFATs			16	/* Number of FAT copies (1) */

+#define BPB_RootEntCnt		17	/* Number of root dir entries for FAT12/16 (2) */

+#define BPB_TotSec16		19	/* Volume size [sector] (2) */

+#define BPB_Media			21	/* Media descriptor (1) */

+#define BPB_FATSz16			22	/* FAT size [sector] (2) */

+#define BPB_SecPerTrk		24	/* Track size [sector] (2) */

+#define BPB_NumHeads		26	/* Number of heads (2) */

+#define BPB_HiddSec			28	/* Number of special hidden sectors (4) */

+#define BPB_TotSec32		32	/* Volume size [sector] (4) */

+#define BS_DrvNum			36	/* Physical drive number (2) */

+#define BS_BootSig			38	/* Extended boot signature (1) */

+#define BS_VolID			39	/* Volume serial number (4) */

+#define BS_VolLab			43	/* Volume label (8) */

+#define BS_FilSysType		54	/* File system type (1) */

+#define BPB_FATSz32			36	/* FAT size [sector] (4) */

+#define BPB_ExtFlags		40	/* Extended flags (2) */

+#define BPB_FSVer			42	/* File system version (2) */

+#define BPB_RootClus		44	/* Root dir first cluster (4) */

+#define BPB_FSInfo			48	/* Offset of FSInfo sector (2) */

+#define BPB_BkBootSec		50	/* Offset of backup boot sectot (2) */

+#define BS_DrvNum32			64	/* Physical drive number (2) */

+#define BS_BootSig32		66	/* Extended boot signature (1) */

+#define BS_VolID32			67	/* Volume serial number (4) */

+#define BS_VolLab32			71	/* Volume label (8) */

+#define BS_FilSysType32		82	/* File system type (1) */

+#define	FSI_LeadSig			0	/* FSI: Leading signature (4) */

+#define	FSI_StrucSig		484	/* FSI: Structure signature (4) */

+#define	FSI_Free_Count		488	/* FSI: Number of free clusters (4) */

+#define	FSI_Nxt_Free		492	/* FSI: Last allocated cluster (4) */

+#define MBR_Table			446	/* MBR: Partition table offset (2) */

+#define	SZ_PTE				16	/* MBR: Size of a partition table entry */

+#define BS_55AA				510	/* Boot sector signature (2) */

 

----------------------------------------------------------------------------*/

+#define	DIR_Name			0	/* Short file name (11) */

+#define	DIR_Attr			11	/* Attribute (1) */

+#define	DIR_NTres			12	/* NT flag (1) */

+#define	DIR_CrtTime			14	/* Created time (2) */

+#define	DIR_CrtDate			16	/* Created date (2) */

+#define	DIR_FstClusHI		20	/* Higher 16-bit of first cluster (2) */

+#define	DIR_WrtTime			22	/* Modified time (2) */

+#define	DIR_WrtDate			24	/* Modified date (2) */

+#define	DIR_FstClusLO		26	/* Lower 16-bit of first cluster (2) */

+#define	DIR_FileSize		28	/* File size (4) */

+#define	LDIR_Ord			0	/* LFN entry order and LLE flag (1) */

+#define	LDIR_Attr			11	/* LFN attribute (1) */

+#define	LDIR_Type			12	/* LFN type (1) */

+#define	LDIR_Chksum			13	/* Sum of corresponding SFN entry */

+#define	LDIR_FstClusLO		26	/* Filled by zero (0) */

+#define	SZ_DIR				32		/* Size of a directory entry */

+#define	LLE					0x40	/* Last long entry flag in LDIR_Ord */

+#define	DDE					0xE5	/* Deleted directory enrty mark in DIR_Name[0] */

+#define	NDDE				0x05	/* Replacement of a character collides with DDE */

 

-#if _DRIVES < 1 || _DRIVES > 9

-#error Number of drives must be 1-9.

-#endif

+

+/*------------------------------------------------------------*/

+/* Work area                                                  */

+

+#if _VOLUMES

 static

-FATFS *FatFs[_DRIVES];	/* Pointer to the file system objects (logical drives) */

+FATFS *FatFs[_VOLUMES];	/* Pointer to the file system objects (logical drives) */

+#else

+#error Number of drives must not be 0.

+#endif

 

 static

 WORD Fsid;				/* File system mount ID */

 

 #if _FS_RPATH

 static

-BYTE Drive;				/* Current drive */

+BYTE CurrVol;			/* Current drive */

 #endif

 

-

-#if _USE_LFN == 1	/* LFN with static LFN working buffer */

+#if _FS_SHARE

 static

-WCHAR LfnBuf[_MAX_LFN + 1];

-#define	NAMEBUF(sp,lp)	BYTE sp[12]; WCHAR *lp = LfnBuf

-#define INITBUF(dj,sp,lp)	dj.fn = sp; dj.lfn = lp

+FILESEM	Files[_FS_SHARE];	/* File lock semaphores */

+#endif

+

+#if _USE_LFN == 0			/* No LFN */

+#define	DEF_NAMEBUF			BYTE sfn[12]

+#define INIT_BUF(dobj)		(dobj).fn = sfn

+#define	FREE_BUF()

 

-#elif _USE_LFN > 1	/* LFN with dynamic LFN working buffer */

-#define	NAMEBUF(sp,lp)	BYTE sp[12]; WCHAR lbuf[_MAX_LFN + 1], *lp = lbuf

-#define INITBUF(dj,sp,lp)	dj.fn = sp; dj.lfn = lp

+#elif _USE_LFN == 1			/* LFN with static LFN working buffer */

+static WCHAR LfnBuf[_MAX_LFN+1];

+#define	DEF_NAMEBUF			BYTE sfn[12]

+#define INIT_BUF(dobj)		{ (dobj).fn = sfn; (dobj).lfn = LfnBuf; }

+#define	FREE_BUF()

 

-#else				/* No LFN */

-#define	NAMEBUF(sp,lp)	BYTE sp[12]

-#define INITBUF(dj,sp,lp)	dj.fn = sp

+#elif _USE_LFN == 2 		/* LFN with dynamic LFN working buffer on the stack */

+#define	DEF_NAMEBUF			BYTE sfn[12]; WCHAR lbuf[_MAX_LFN+1]

+#define INIT_BUF(dobj)		{ (dobj).fn = sfn; (dobj).lfn = lbuf; }

+#define	FREE_BUF()

 

+#elif _USE_LFN == 3 		/* LFN with dynamic LFN working buffer on the heap */

+#define	DEF_NAMEBUF			BYTE sfn[12]; WCHAR *lfn

+#define INIT_BUF(dobj)		{ lfn = ff_memalloc((_MAX_LFN + 1) * 2); \

+							  if (!lfn) LEAVE_FF((dobj).fs, FR_NOT_ENOUGH_CORE); \

+							  (dobj).lfn = lfn;	(dobj).fn = sfn; }

+#define	FREE_BUF()			ff_memfree(lfn)

+

+#else

+#error Wrong LFN configuration.

 #endif

 

 

@@ -173,24 +518,36 @@ WCHAR LfnBuf[_MAX_LFN + 1];
 

 /* Copy memory to memory */

 static

-void mem_cpy (void* dst, const void* src, int cnt) {

-	char *d = (char*)dst;

-	const char *s = (const char *)src;

-	while (cnt--) *d++ = *s++;

+void mem_cpy (void* dst, const void* src, UINT cnt) {

+	BYTE *d = (BYTE*)dst;

+	const BYTE *s = (const BYTE*)src;

+

+#if _WORD_ACCESS == 1

+	while (cnt >= sizeof(int)) {

+		*(int*)d = *(int*)s;

+		d += sizeof(int); s += sizeof(int);

+		cnt -= sizeof(int);

+	}

+#endif

+	while (cnt--)

+		*d++ = *s++;

 }

 

 /* Fill memory */

 static

-void mem_set (void* dst, int val, int cnt) {

-	char *d = (char*)dst;

-	while (cnt--) *d++ = (char)val;

+void mem_set (void* dst, int val, UINT cnt) {

+	BYTE *d = (BYTE*)dst;

+

+	while (cnt--)

+		*d++ = (BYTE)val;

 }

 

 /* Compare memory to memory */

 static

-int mem_cmp (const void* dst, const void* src, int cnt) {

-	const char *d = (const char *)dst, *s = (const char *)src;

+int mem_cmp (const void* dst, const void* src, UINT cnt) {

+	const BYTE *d = (const BYTE *)dst, *s = (const BYTE *)src;

 	int r = 0;

+

 	while (cnt-- && (r = *d++ - *s++) == 0) ;

 	return r;

 }

@@ -210,7 +567,7 @@ int chk_chr (const char* str, int chr) {
 #if _FS_REENTRANT

 

 static

-BOOL lock_fs (

+int lock_fs (

 	FATFS *fs		/* File system object */

 )

 {

@@ -236,13 +593,126 @@ void unlock_fs (
 

 

 /*-----------------------------------------------------------------------*/

+/* File shareing control functions                                       */

+/*-----------------------------------------------------------------------*/

+#if _FS_SHARE

+

+static

+FRESULT chk_lock (	/* Check if the file can be accessed */

+	DIR* dj,		/* Directory object pointing the file to be checked */

+	int acc			/* Desired access (0:Read, 1:Write, 2:Delete/Rename) */

+)

+{

+	UINT i, be;

+

+	/* Search file semaphore table */

+	for (i = be = 0; i < _FS_SHARE; i++) {

+		if (Files[i].fs) {	/* Existing entry */

+			if (Files[i].fs == dj->fs &&	 	/* Check if the file matched with an open file */

+				Files[i].clu == dj->sclust &&

+				Files[i].idx == dj->index) break;

+		} else {			/* Blank entry */

+			be++;

+		}

+	}

+	if (i == _FS_SHARE)	/* The file is not opened */

+		return (be || acc == 2) ? FR_OK : FR_TOO_MANY_OPEN_FILES;	/* Is there a blank entry for new file? */

+

+	/* The file has been opened. Reject any open against writing file and all write mode open */

+	return (acc || Files[i].ctr == 0x100) ? FR_LOCKED : FR_OK;

+}

+

+

+static

+int enq_lock (	/* Check if an entry is available for a new file */

+	FATFS* fs	/* File system object */

+)

+{

+	UINT i;

+

+	for (i = 0; i < _FS_SHARE && Files[i].fs; i++) ;

+	return (i == _FS_SHARE) ? 0 : 1;

+}

+

+

+static

+UINT inc_lock (	/* Increment file open counter and returns its index (0:int error) */

+	DIR* dj,	/* Directory object pointing the file to register or increment */

+	int acc		/* Desired access mode (0:Read, !0:Write) */

+)

+{

+	UINT i;

+

+

+	for (i = 0; i < _FS_SHARE; i++) {	/* Find the file */

+		if (Files[i].fs == dj->fs &&

+			Files[i].clu == dj->sclust &&

+			Files[i].idx == dj->index) break;

+	}

+

+	if (i == _FS_SHARE) {				/* Not opened. Register it as new. */

+		for (i = 0; i < _FS_SHARE && Files[i].fs; i++) ;

+		if (i == _FS_SHARE) return 0;	/* No space to register (int err) */

+		Files[i].fs = dj->fs;

+		Files[i].clu = dj->sclust;

+		Files[i].idx = dj->index;

+		Files[i].ctr = 0;

+	}

+

+	if (acc && Files[i].ctr) return 0;	/* Access violation (int err) */

+

+	Files[i].ctr = acc ? 0x100 : Files[i].ctr + 1;	/* Set semaphore value */

+

+	return i + 1;

+}

+

+

+static

+FRESULT dec_lock (	/* Decrement file open counter */

+	UINT i			/* Semaphore index */

+)

+{

+	WORD n;

+	FRESULT res;

+

+

+	if (--i < _FS_SHARE) {

+		n = Files[i].ctr;

+		if (n == 0x100) n = 0;

+		if (n) n--;

+		Files[i].ctr = n;

+		if (!n) Files[i].fs = 0;

+		res = FR_OK;

+	} else {

+		res = FR_INT_ERR;

+	}

+	return res;

+}

+

+

+static

+void clear_lock (	/* Clear lock entries of the volume */

+	FATFS *fs

+)

+{

+	UINT i;

+

+	for (i = 0; i < _FS_SHARE; i++) {

+		if (Files[i].fs == fs) Files[i].fs = 0;

+	}

+}

+#endif

+

+

+

+/*-----------------------------------------------------------------------*/

 /* Change window offset                                                  */

 /*-----------------------------------------------------------------------*/

 

 static

 FRESULT move_window (

 	FATFS *fs,		/* File system object */

-	DWORD sector	/* Sector number to make apperance in the fs->win[] */

+	DWORD sector	/* Sector number to make appearance in the fs->win[] */

 )					/* Move to zero only writes back dirty window */

 {

 	DWORD wsect;

@@ -252,20 +722,20 @@ FRESULT move_window (
 	if (wsect != sector) {	/* Changed current window */

 #if !_FS_READONLY

 		if (fs->wflag) {	/* Write back dirty window if needed */

-			if (disk_write(fs->drive, fs->win, wsect, 1) != RES_OK)

+			if (disk_write(fs->drv, fs->win, wsect, 1) != RES_OK)

 				return FR_DISK_ERR;

 			fs->wflag = 0;

-			if (wsect < (fs->fatbase + fs->sects_fat)) {	/* In FAT area */

+			if (wsect < (fs->fatbase + fs->fsize)) {	/* In FAT area */

 				BYTE nf;

-				for (nf = fs->n_fats; nf > 1; nf--) {	/* Refrect the change to all FAT copies */

-					wsect += fs->sects_fat;

-					disk_write(fs->drive, fs->win, wsect, 1);

+				for (nf = fs->n_fats; nf > 1; nf--) {	/* Reflect the change to all FAT copies */

+					wsect += fs->fsize;

+					disk_write(fs->drv, fs->win, wsect, 1);

 				}

 			}

 		}

 #endif

 		if (sector) {

-			if (disk_read(fs->drive, fs->win, sector, 1) != RES_OK)

+			if (disk_read(fs->drv, fs->win, sector, 1) != RES_OK)

 				return FR_DISK_ERR;

 			fs->winsect = sector;

 		}

@@ -294,17 +764,19 @@ FRESULT sync (	/* FR_OK: successful, FR_DISK_ERR: failed */
 		/* Update FSInfo sector if needed */

 		if (fs->fs_type == FS_FAT32 && fs->fsi_flag) {

 			fs->winsect = 0;

+			/* Create FSInfo structure */

 			mem_set(fs->win, 0, 512);

 			ST_WORD(fs->win+BS_55AA, 0xAA55);

 			ST_DWORD(fs->win+FSI_LeadSig, 0x41615252);

 			ST_DWORD(fs->win+FSI_StrucSig, 0x61417272);

 			ST_DWORD(fs->win+FSI_Free_Count, fs->free_clust);

 			ST_DWORD(fs->win+FSI_Nxt_Free, fs->last_clust);

-			disk_write(fs->drive, fs->win, fs->fsi_sector, 1);

+			/* Write it into the FSInfo sector */

+			disk_write(fs->drv, fs->win, fs->fsi_sector, 1);

 			fs->fsi_flag = 0;

 		}

 		/* Make sure that no pending write process in the physical drive */

-		if (disk_ioctl(fs->drive, CTRL_SYNC, (void*)NULL) != RES_OK)

+		if (disk_ioctl(fs->drv, CTRL_SYNC, (void*)0) != RES_OK)

 			res = FR_DISK_ERR;

 	}

 

@@ -316,42 +788,61 @@ FRESULT sync (	/* FR_OK: successful, FR_DISK_ERR: failed */
 

 

 /*-----------------------------------------------------------------------*/

+/* Get sector# from cluster#                                             */

+/*-----------------------------------------------------------------------*/

+

+

+DWORD clust2sect (	/* !=0: Sector number, 0: Failed - invalid cluster# */

+	FATFS *fs,		/* File system object */

+	DWORD clst		/* Cluster# to be converted */

+)

+{

+	clst -= 2;

+	if (clst >= (fs->n_fatent - 2)) return 0;		/* Invalid cluster# */

+	return clst * fs->csize + fs->database;

+}

+

+

+

+

+/*-----------------------------------------------------------------------*/

 /* FAT access - Read value of a FAT entry                                */

 /*-----------------------------------------------------------------------*/

 

 

-DWORD get_fat (	/* 0xFFFFFFFF:Disk error, 1:Interal error, Else:Cluster status */

+DWORD get_fat (	/* 0xFFFFFFFF:Disk error, 1:Internal error, Else:Cluster status */

 	FATFS *fs,	/* File system object */

 	DWORD clst	/* Cluster# to get the link information */

 )

 {

 	UINT wc, bc;

-	DWORD fsect;

+	BYTE *p;

 

 

-	if (clst < 2 || clst >= fs->max_clust)	/* Range check */

+	if (clst < 2 || clst >= fs->n_fatent)	/* Chack range */

 		return 1;

 

-	fsect = fs->fatbase;

 	switch (fs->fs_type) {

 	case FS_FAT12 :

-		bc = clst; bc += bc / 2;

-		if (move_window(fs, fsect + (bc / SS(fs)))) break;

-		wc = fs->win[bc & (SS(fs) - 1)]; bc++;

-		if (move_window(fs, fsect + (bc / SS(fs)))) break;

-		wc |= (WORD)fs->win[bc & (SS(fs) - 1)] << 8;

+		bc = (UINT)clst; bc += bc / 2;

+		if (move_window(fs, fs->fatbase + (bc / SS(fs)))) break;

+		wc = fs->win[bc % SS(fs)]; bc++;

+		if (move_window(fs, fs->fatbase + (bc / SS(fs)))) break;

+		wc |= fs->win[bc % SS(fs)] << 8;

 		return (clst & 1) ? (wc >> 4) : (wc & 0xFFF);

 

 	case FS_FAT16 :

-		if (move_window(fs, fsect + (clst / (SS(fs) / 2)))) break;

-		return LD_WORD(&fs->win[((WORD)clst * 2) & (SS(fs) - 1)]);

+		if (move_window(fs, fs->fatbase + (clst / (SS(fs) / 2)))) break;

+		p = &fs->win[clst * 2 % SS(fs)];

+		return LD_WORD(p);

 

 	case FS_FAT32 :

-		if (move_window(fs, fsect + (clst / (SS(fs) / 4)))) break;

-		return LD_DWORD(&fs->win[((WORD)clst * 4) & (SS(fs) - 1)]) & 0x0FFFFFFF;

+		if (move_window(fs, fs->fatbase + (clst / (SS(fs) / 4)))) break;

+		p = &fs->win[clst * 4 % SS(fs)];

+		return LD_DWORD(p) & 0x0FFFFFFF;

 	}

 

-	return 0xFFFFFFFF;	/* An error occured at the disk I/O layer */

+	return 0xFFFFFFFF;	/* An error occurred at the disk I/O layer */

 }

 

 

@@ -364,46 +855,47 @@ DWORD get_fat (	/* 0xFFFFFFFF:Disk error, 1:Interal error, Else:Cluster status *
 

 FRESULT put_fat (

 	FATFS *fs,	/* File system object */

-	DWORD clst,	/* Cluster# to be changed in range of 2 to fs->max_clust - 1 */

+	DWORD clst,	/* Cluster# to be changed in range of 2 to fs->n_fatent - 1 */

 	DWORD val	/* New value to mark the cluster */

 )

 {

 	UINT bc;

 	BYTE *p;

-	DWORD fsect;

 	FRESULT res;

 

 

-	if (clst < 2 || clst >= fs->max_clust) {	/* Range check */

+	if (clst < 2 || clst >= fs->n_fatent) {	/* Check range */

 		res = FR_INT_ERR;

 

 	} else {

-		fsect = fs->fatbase;

 		switch (fs->fs_type) {

 		case FS_FAT12 :

 			bc = clst; bc += bc / 2;

-			res = move_window(fs, fsect + (bc / SS(fs)));

+			res = move_window(fs, fs->fatbase + (bc / SS(fs)));

 			if (res != FR_OK) break;

-			p = &fs->win[bc & (SS(fs) - 1)];

+			p = &fs->win[bc % SS(fs)];

 			*p = (clst & 1) ? ((*p & 0x0F) | ((BYTE)val << 4)) : (BYTE)val;

 			bc++;

 			fs->wflag = 1;

-			res = move_window(fs, fsect + (bc / SS(fs)));

+			res = move_window(fs, fs->fatbase + (bc / SS(fs)));

 			if (res != FR_OK) break;

-			p = &fs->win[bc & (SS(fs) - 1)];

+			p = &fs->win[bc % SS(fs)];

 			*p = (clst & 1) ? (BYTE)(val >> 4) : ((*p & 0xF0) | ((BYTE)(val >> 8) & 0x0F));

 			break;

 

 		case FS_FAT16 :

-			res = move_window(fs, fsect + (clst / (SS(fs) / 2)));

+			res = move_window(fs, fs->fatbase + (clst / (SS(fs) / 2)));

 			if (res != FR_OK) break;

-			ST_WORD(&fs->win[((WORD)clst * 2) & (SS(fs) - 1)], (WORD)val);

+			p = &fs->win[clst * 2 % SS(fs)];

+			ST_WORD(p, (WORD)val);

 			break;

 

 		case FS_FAT32 :

-			res = move_window(fs, fsect + (clst / (SS(fs) / 4)));

+			res = move_window(fs, fs->fatbase + (clst / (SS(fs) / 4)));

 			if (res != FR_OK) break;

-			ST_DWORD(&fs->win[((WORD)clst * 4) & (SS(fs) - 1)], val);

+			p = &fs->win[clst * 4 % SS(fs)];

+			val |= LD_DWORD(p) & 0xF0000000;

+			ST_DWORD(p, val);

 			break;

 

 		default :

@@ -431,14 +923,16 @@ FRESULT remove_chain (
 {

 	FRESULT res;

 	DWORD nxt;

+#if _USE_ERASE

+	DWORD scl = clst, ecl = clst, resion[2];

+#endif

 

-

-	if (clst < 2 || clst >= fs->max_clust) {	/* Check the range of cluster# */

+	if (clst < 2 || clst >= fs->n_fatent) {	/* Check range */

 		res = FR_INT_ERR;

 

 	} else {

 		res = FR_OK;

-		while (clst < fs->max_clust) {			/* Not a last link? */

+		while (clst < fs->n_fatent) {			/* Not a last link? */

 			nxt = get_fat(fs, clst);			/* Get cluster status */

 			if (nxt == 0) break;				/* Empty cluster? */

 			if (nxt == 1) { res = FR_INT_ERR; break; }	/* Internal error? */

@@ -449,6 +943,16 @@ FRESULT remove_chain (
 				fs->free_clust++;

 				fs->fsi_flag = 1;

 			}

+#if _USE_ERASE

+			if (ecl + 1 == nxt) {	/* Next cluster is contiguous */

+				ecl = nxt;

+			} else {				/* End of contiguous clusters */

+				resion[0] = clust2sect(fs, scl);					/* Start sector */

+				resion[1] = clust2sect(fs, ecl) + fs->csize - 1;	/* End sector */

+				disk_ioctl(fs->drv, CTRL_ERASE_SECTOR, resion);		/* Erase the block */

+				scl = ecl = nxt;

+			}

+#endif

 			clst = nxt;	/* Next cluster */

 		}

 	}

@@ -470,79 +974,89 @@ DWORD create_chain (	/* 0:No free cluster, 1:Internal error, 0xFFFFFFFF:Disk err
 	DWORD clst			/* Cluster# to stretch. 0 means create a new chain. */

 )

 {

-	DWORD cs, ncl, scl, mcl;

+	DWORD cs, ncl, scl;

+	FRESULT res;

 

 

-	mcl = fs->max_clust;

-	if (clst == 0) {		/* Create new chain */

+	if (clst == 0) {		/* Create a new chain */

 		scl = fs->last_clust;			/* Get suggested start point */

-		if (scl == 0 || scl >= mcl) scl = 1;

+		if (!scl || scl >= fs->n_fatent) scl = 1;

 	}

-	else {					/* Stretch existing chain */

+	else {					/* Stretch the current chain */

 		cs = get_fat(fs, clst);			/* Check the cluster status */

 		if (cs < 2) return 1;			/* It is an invalid cluster */

-		if (cs < mcl) return cs;		/* It is already followed by next cluster */

+		if (cs < fs->n_fatent) return cs;	/* It is already followed by next cluster */

 		scl = clst;

 	}

 

 	ncl = scl;				/* Start cluster */

 	for (;;) {

 		ncl++;							/* Next cluster */

-		if (ncl >= mcl) {				/* Wrap around */

+		if (ncl >= fs->n_fatent) {		/* Wrap around */

 			ncl = 2;

-			if (ncl > scl) return 0;	/* No free custer */

+			if (ncl > scl) return 0;	/* No free cluster */

 		}

 		cs = get_fat(fs, ncl);			/* Get the cluster status */

 		if (cs == 0) break;				/* Found a free cluster */

-		if (cs == 0xFFFFFFFF || cs == 1)/* An error occured */

+		if (cs == 0xFFFFFFFF || cs == 1)/* An error occurred */

 			return cs;

-		if (ncl == scl) return 0;		/* No free custer */

+		if (ncl == scl) return 0;		/* No free cluster */

 	}

 

-	if (put_fat(fs, ncl, 0x0FFFFFFF))	/* Mark the new cluster "in use" */

-		return 0xFFFFFFFF;

-	if (clst != 0) {					/* Link it to the previous one if needed */

-		if (put_fat(fs, clst, ncl))

-			return 0xFFFFFFFF;

+	res = put_fat(fs, ncl, 0x0FFFFFFF);	/* Mark the new cluster "last link" */

+	if (res == FR_OK && clst != 0) {

+		res = put_fat(fs, clst, ncl);	/* Link it to the previous one if needed */

 	}

-

-	fs->last_clust = ncl;				/* Update FSINFO */

-	if (fs->free_clust != 0xFFFFFFFF) {

-		fs->free_clust--;

-		fs->fsi_flag = 1;

+	if (res == FR_OK) {

+		fs->last_clust = ncl;			/* Update FSINFO */

+		if (fs->free_clust != 0xFFFFFFFF) {

+			fs->free_clust--;

+			fs->fsi_flag = 1;

+		}

+	} else {

+		ncl = (res == FR_DISK_ERR) ? 0xFFFFFFFF : 1;

 	}

 

-	return ncl;		/* Return new cluster number */

+	return ncl;		/* Return new cluster number or error code */

 }

 #endif /* !_FS_READONLY */

 

 

 

-

 /*-----------------------------------------------------------------------*/

-/* Get sector# from cluster#                                             */

+/* FAT handling - Convert offset into cluster with link map table        */

 /*-----------------------------------------------------------------------*/

 

-

-DWORD clust2sect (	/* !=0: Sector number, 0: Failed - invalid cluster# */

-	FATFS *fs,		/* File system object */

-	DWORD clst		/* Cluster# to be converted */

+#if _USE_FASTSEEK

+static

+DWORD clmt_clust (	/* <2:Error, >=2:Cluster number */

+	FIL* fp,		/* Pointer to the file object */

+	DWORD ofs		/* File offset to be converted to cluster# */

 )

 {

-	clst -= 2;

-	if (clst >= (fs->max_clust - 2)) return 0;		/* Invalid cluster# */

-	return clst * fs->csize + fs->database;

-}

+	DWORD cl, ncl, *tbl;

+

 

+	tbl = fp->cltbl + 1;	/* Top of CLMT */

+	cl = ofs / SS(fp->fs) / fp->fs->csize;	/* Cluster order from top of the file */

+	for (;;) {

+		ncl = *tbl++;			/* Number of cluters in the fragment */

+		if (!ncl) return 0;		/* End of table? (error) */

+		if (cl < ncl) break;	/* In this fragment? */

+		cl -= ncl; tbl++;		/* Next fragment */

+	}

+	return cl + *tbl;	/* Return the cluster number */

+}

+#endif	/* _USE_FASTSEEK */

 

 

 

 /*-----------------------------------------------------------------------*/

-/* Directory handling - Seek directory index                             */

+/* Directory handling - Set directory index                              */

 /*-----------------------------------------------------------------------*/

 

 static

-FRESULT dir_seek (

+FRESULT dir_sdi (

 	DIR *dj,		/* Pointer to directory object */

 	WORD idx		/* Directory index number */

 )

@@ -553,31 +1067,31 @@ FRESULT dir_seek (
 

 	dj->index = idx;

 	clst = dj->sclust;

-	if (clst == 1 || clst >= dj->fs->max_clust)	/* Check start cluster range */

+	if (clst == 1 || clst >= dj->fs->n_fatent)	/* Check start cluster range */

 		return FR_INT_ERR;

 	if (!clst && dj->fs->fs_type == FS_FAT32)	/* Replace cluster# 0 with root cluster# if in FAT32 */

 		clst = dj->fs->dirbase;

 

-	if (clst == 0) {	/* Static table */

+	if (clst == 0) {	/* Static table (root-dir in FAT12/16) */

 		dj->clust = clst;

 		if (idx >= dj->fs->n_rootdir)		/* Index is out of range */

 			return FR_INT_ERR;

-		dj->sect = dj->fs->dirbase + idx / (SS(dj->fs) / 32);	/* Sector# */

+		dj->sect = dj->fs->dirbase + idx / (SS(dj->fs) / SZ_DIR);	/* Sector# */

 	}

-	else {				/* Dynamic table */

-		ic = SS(dj->fs) / 32 * dj->fs->csize;	/* Entries per cluster */

+	else {				/* Dynamic table (sub-dirs or root-dir in FAT32) */

+		ic = SS(dj->fs) / SZ_DIR * dj->fs->csize;	/* Entries per cluster */

 		while (idx >= ic) {	/* Follow cluster chain */

 			clst = get_fat(dj->fs, clst);				/* Get next cluster */

 			if (clst == 0xFFFFFFFF) return FR_DISK_ERR;	/* Disk error */

-			if (clst < 2 || clst >= dj->fs->max_clust)	/* Reached to end of table or int error */

+			if (clst < 2 || clst >= dj->fs->n_fatent)	/* Reached to end of table or int error */

 				return FR_INT_ERR;

 			idx -= ic;

 		}

 		dj->clust = clst;

-		dj->sect = clust2sect(dj->fs, clst) + idx / (SS(dj->fs) / 32);	/* Sector# */

+		dj->sect = clust2sect(dj->fs, clst) + idx / (SS(dj->fs) / SZ_DIR);	/* Sector# */

 	}

 

-	dj->dir = dj->fs->win + (idx % (SS(dj->fs) / 32)) * 32;	/* Ptr to the entry in the sector */

+	dj->dir = dj->fs->win + (idx % (SS(dj->fs) / SZ_DIR)) * SZ_DIR;	/* Ptr to the entry in the sector */

 

 	return FR_OK;	/* Seek succeeded */

 }

@@ -590,9 +1104,9 @@ FRESULT dir_seek (
 /*-----------------------------------------------------------------------*/

 

 static

-FRESULT dir_next (	/* FR_OK:Succeeded, FR_NO_FILE:End of table, FR_DENIED:EOT and could not streach */

+FRESULT dir_next (	/* FR_OK:Succeeded, FR_NO_FILE:End of table, FR_DENIED:EOT and could not stretch */

 	DIR *dj,		/* Pointer to directory object */

-	BOOL streach	/* FALSE: Do not streach table, TRUE: Streach table if needed */

+	int stretch		/* 0: Do not stretch table, 1: Stretch table if needed */

 )

 {

 	DWORD clst;

@@ -603,7 +1117,7 @@ FRESULT dir_next (	/* FR_OK:Succeeded, FR_NO_FILE:End of table, FR_DENIED:EOT an
 	if (!i || !dj->sect)	/* Report EOT when index has reached 65535 */

 		return FR_NO_FILE;

 

-	if (!(i % (SS(dj->fs) / 32))) {	/* Sector changed? */

+	if (!(i % (SS(dj->fs) / SZ_DIR))) {	/* Sector changed? */

 		dj->sect++;					/* Next sector */

 

 		if (dj->clust == 0) {	/* Static table */

@@ -611,19 +1125,19 @@ FRESULT dir_next (	/* FR_OK:Succeeded, FR_NO_FILE:End of table, FR_DENIED:EOT an
 				return FR_NO_FILE;

 		}

 		else {					/* Dynamic table */

-			if (((i / (SS(dj->fs) / 32)) & (dj->fs->csize - 1)) == 0) {	/* Cluster changed? */

+			if (((i / (SS(dj->fs) / SZ_DIR)) & (dj->fs->csize - 1)) == 0) {	/* Cluster changed? */

 				clst = get_fat(dj->fs, dj->clust);				/* Get next cluster */

 				if (clst <= 1) return FR_INT_ERR;

 				if (clst == 0xFFFFFFFF) return FR_DISK_ERR;

-				if (clst >= dj->fs->max_clust) {				/* When it reached end of dynamic table */

+				if (clst >= dj->fs->n_fatent) {					/* When it reached end of dynamic table */

 #if !_FS_READONLY

 					BYTE c;

-					if (!streach) return FR_NO_FILE;			/* When do not streach, report EOT */

-					clst = create_chain(dj->fs, dj->clust);		/* Streach cluster chain */

+					if (!stretch) return FR_NO_FILE;			/* When do not stretch, report EOT */

+					clst = create_chain(dj->fs, dj->clust);		/* Stretch cluster chain */

 					if (clst == 0) return FR_DENIED;			/* No free cluster */

 					if (clst == 1) return FR_INT_ERR;

 					if (clst == 0xFFFFFFFF) return FR_DISK_ERR;

-					/* Clean-up streached table */

+					/* Clean-up stretched table */

 					if (move_window(dj->fs, 0)) return FR_DISK_ERR;	/* Flush active window */

 					mem_set(dj->fs->win, 0, SS(dj->fs));			/* Clear window buffer */

 					dj->fs->winsect = clust2sect(dj->fs, clst);	/* Cluster start sector */

@@ -644,7 +1158,7 @@ FRESULT dir_next (	/* FR_OK:Succeeded, FR_NO_FILE:End of table, FR_DENIED:EOT an
 	}

 

 	dj->index = i;

-	dj->dir = dj->fs->win + (i % (SS(dj->fs) / 32)) * 32;

+	dj->dir = dj->fs->win + (i % (SS(dj->fs) / SZ_DIR)) * SZ_DIR;

 

 	return FR_OK;

 }

@@ -661,43 +1175,43 @@ const BYTE LfnOfs[] = {1,3,5,7,9,14,16,18,20,22,24,28,30};	/* Offset of LFN char
 

 

 static

-BOOL cmp_lfn (			/* TRUE:Matched, FALSE:Not matched */

+int cmp_lfn (			/* 1:Matched, 0:Not matched */

 	WCHAR *lfnbuf,		/* Pointer to the LFN to be compared */

 	BYTE *dir			/* Pointer to the directory entry containing a part of LFN */

 )

 {

-	int i, s;

+	UINT i, s;

 	WCHAR wc, uc;

 

 

-	i = ((dir[LDIR_Ord] & 0xBF) - 1) * 13;	/* Get offset in the LFN buffer */

+	i = ((dir[LDIR_Ord] & ~LLE) - 1) * 13;	/* Get offset in the LFN buffer */

 	s = 0; wc = 1;

 	do {

 		uc = LD_WORD(dir+LfnOfs[s]);	/* Pick an LFN character from the entry */

 		if (wc) {	/* Last char has not been processed */

 			wc = ff_wtoupper(uc);		/* Convert it to upper case */

 			if (i >= _MAX_LFN || wc != ff_wtoupper(lfnbuf[i++]))	/* Compare it */

-				return FALSE;			/* Not matched */

+				return 0;				/* Not matched */

 		} else {

-			if (uc != 0xFFFF) return FALSE;	/* Check filler */

+			if (uc != 0xFFFF) return 0;	/* Check filler */

 		}

 	} while (++s < 13);				/* Repeat until all chars in the entry are checked */

 

-	if ((dir[LDIR_Ord] & 0x40) && wc && lfnbuf[i])	/* Last segment matched but different length */

-		return FALSE;

+	if ((dir[LDIR_Ord] & LLE) && wc && lfnbuf[i])	/* Last segment matched but different length */

+		return 0;

 

-	return TRUE;					/* The part of LFN matched */

+	return 1;						/* The part of LFN matched */

 }

 

 

 

 static

-BOOL pick_lfn (			/* TRUE:Succeeded, FALSE:Buffer overflow */

+int pick_lfn (			/* 1:Succeeded, 0:Buffer overflow */

 	WCHAR *lfnbuf,		/* Pointer to the Unicode-LFN buffer */

 	BYTE *dir			/* Pointer to the directory entry */

 )

 {

-	int i, s;

+	UINT i, s;

 	WCHAR wc, uc;

 

 

@@ -705,21 +1219,21 @@ BOOL pick_lfn (			/* TRUE:Succeeded, FALSE:Buffer overflow */
 

 	s = 0; wc = 1;

 	do {

-		uc = LD_WORD(dir+LfnOfs[s]);			/* Pick an LFN character from the entry */

+		uc = LD_WORD(dir+LfnOfs[s]);		/* Pick an LFN character from the entry */

 		if (wc) {	/* Last char has not been processed */

-			if (i >= _MAX_LFN) return FALSE;	/* Buffer overflow? */

-			lfnbuf[i++] = wc = uc;				/* Store it */

+			if (i >= _MAX_LFN) return 0;	/* Buffer overflow? */

+			lfnbuf[i++] = wc = uc;			/* Store it */

 		} else {

-			if (uc != 0xFFFF) return FALSE;		/* Check filler */

+			if (uc != 0xFFFF) return 0;		/* Check filler */

 		}

 	} while (++s < 13);						/* Read all character in the entry */

 

-	if (dir[LDIR_Ord] & 0x40) {				/* Put terminator if it is the last LFN part */

-		if (i >= _MAX_LFN) return FALSE;	/* Buffer overflow? */

+	if (dir[LDIR_Ord] & LLE) {				/* Put terminator if it is the last LFN part */

+		if (i >= _MAX_LFN) return 0;		/* Buffer overflow? */

 		lfnbuf[i] = 0;

 	}

 

-	return TRUE;

+	return 1;

 }

 

 

@@ -732,7 +1246,7 @@ void fit_lfn (
 	BYTE sum				/* SFN sum */

 )

 {

-	int i, s;

+	UINT i, s;

 	WCHAR wc;

 

 

@@ -748,7 +1262,7 @@ void fit_lfn (
 		ST_WORD(dir+LfnOfs[s], wc);	/* Put it */

 		if (!wc) wc = 0xFFFF;		/* Padding chars following last char */

 	} while (++s < 13);

-	if (wc == 0xFFFF || !lfnbuf[i]) ord |= 0x40;	/* Bottom LFN part is the start of LFN sequence */

+	if (wc == 0xFFFF || !lfnbuf[i]) ord |= LLE;	/* Bottom LFN part is the start of LFN sequence */

 	dir[LDIR_Ord] = ord;			/* Set the LFN order */

 }

 

@@ -762,28 +1276,30 @@ void fit_lfn (
 /*-----------------------------------------------------------------------*/

 #if _USE_LFN

 void gen_numname (

-	BYTE *dst,			/* Pointer to genartated SFN */

+	BYTE *dst,			/* Pointer to generated SFN */

 	const BYTE *src,	/* Pointer to source SFN to be modified */

 	const WCHAR *lfn,	/* Pointer to LFN */

-	WORD num			/* Sequense number */

+	WORD seq			/* Sequence number */

 )

 {

-	char ns[8];

-	int i, j;

+	BYTE ns[8], c;

+	UINT i, j;

 

 

 	mem_cpy(dst, src, 11);

 

-	if (num > 5) {	/* On many collisions, generate a hash number instead of sequencial number */

-		do num = (num >> 1) + (num << 15) + (WORD)*lfn++; while (*lfn);

+	if (seq > 5) {	/* On many collisions, generate a hash number instead of sequential number */

+		do seq = (seq >> 1) + (seq << 15) + (WORD)*lfn++; while (*lfn);

 	}

 

-	/* itoa */

+	/* itoa (hexdecimal) */

 	i = 7;

 	do {

-		ns[i--] = (num % 10) + '0';

-		num /= 10;

-	} while (num);

+		c = (seq % 16) + '0';

+		if (c > '9') c += 7;

+		ns[i--] = c;

+		seq /= 16;

+	} while (seq);

 	ns[i] = '~';

 

 	/* Append the number */

@@ -812,7 +1328,7 @@ BYTE sum_sfn (
 )

 {

 	BYTE sum = 0;

-	int n = 11;

+	UINT n = 11;

 

 	do sum = (sum >> 1) + (sum << 7) + *dir++; while (--n);

 	return sum;

@@ -837,7 +1353,7 @@ FRESULT dir_find (
 	BYTE a, ord, sum;

 #endif

 

-	res = dir_seek(dj, 0);			/* Rewind directory object */

+	res = dir_sdi(dj, 0);			/* Rewind directory object */

 	if (res != FR_OK) return res;

 

 #if _USE_LFN

@@ -851,14 +1367,14 @@ FRESULT dir_find (
 		if (c == 0) { res = FR_NO_FILE; break; }	/* Reached to end of table */

 #if _USE_LFN	/* LFN configuration */

 		a = dir[DIR_Attr] & AM_MASK;

-		if (c == 0xE5 || ((a & AM_VOL) && a != AM_LFN)) {	/* An entry without valid data */

+		if (c == DDE || ((a & AM_VOL) && a != AM_LFN)) {	/* An entry without valid data */

 			ord = 0xFF;

 		} else {

 			if (a == AM_LFN) {			/* An LFN entry is found */

 				if (dj->lfn) {

-					if (c & 0x40) {		/* Is it start of LFN sequence? */

+					if (c & LLE) {		/* Is it start of LFN sequence? */

 						sum = dir[LDIR_Chksum];

-						c &= 0xBF; ord = c;	/* LFN start order */

+						c &= ~LLE; ord = c;	/* LFN start order */

 						dj->lfn_idx = dj->index;

 					}

 					/* Check validity of the LFN entry and compare it with given name */

@@ -874,7 +1390,7 @@ FRESULT dir_find (
 		if (!(dir[DIR_Attr] & AM_VOL) && !mem_cmp(dir, dj->fn, 11)) /* Is it a valid entry? */

 			break;

 #endif

-		res = dir_next(dj, FALSE);		/* Next entry */

+		res = dir_next(dj, 0);		/* Next entry */

 	} while (res == FR_OK);

 

 	return res;

@@ -907,13 +1423,13 @@ FRESULT dir_read (
 		if (c == 0) { res = FR_NO_FILE; break; }	/* Reached to end of table */

 #if _USE_LFN	/* LFN configuration */

 		a = dir[DIR_Attr] & AM_MASK;

-		if (c == 0xE5 || (!_FS_RPATH && c == '.') || ((a & AM_VOL) && a != AM_LFN)) {	/* An entry without valid data */

+		if (c == DDE || (!_FS_RPATH && c == '.') || ((a & AM_VOL) && a != AM_LFN)) {	/* An entry without valid data */

 			ord = 0xFF;

 		} else {

 			if (a == AM_LFN) {			/* An LFN entry is found */

-				if (c & 0x40) {			/* Is it start of LFN sequence? */

+				if (c & LLE) {			/* Is it start of LFN sequence? */

 					sum = dir[LDIR_Chksum];

-					c &= 0xBF; ord = c;

+					c &= ~LLE; ord = c;

 					dj->lfn_idx = dj->index;

 				}

 				/* Check LFN validity and capture it */

@@ -925,10 +1441,10 @@ FRESULT dir_read (
 			}

 		}

 #else		/* Non LFN configuration */

-		if (c != 0xE5 && (_FS_RPATH || c != '.') && !(dir[DIR_Attr] & AM_VOL))	/* Is it a valid entry? */

+		if (c != DDE && (_FS_RPATH || c != '.') && !(dir[DIR_Attr] & AM_VOL))	/* Is it a valid entry? */

 			break;

 #endif

-		res = dir_next(dj, FALSE);				/* Next entry */

+		res = dir_next(dj, 0);				/* Next entry */

 		if (res != FR_OK) break;

 	}

 

@@ -960,10 +1476,11 @@ FRESULT dir_register (	/* FR_OK:Successful, FR_DENIED:No free entry or too many
 	fn = dj->fn; lfn = dj->lfn;

 	mem_cpy(sn, fn, 12);

 

-	if (_FS_RPATH && (sn[NS] & NS_DOT)) return FR_INVALID_NAME;	/* Cannot create dot entry */

+	if (_FS_RPATH && (sn[NS] & NS_DOT))		/* Cannot create dot entry */

+		return FR_INVALID_NAME;

 

 	if (sn[NS] & NS_LOSS) {			/* When LFN is out of 8.3 format, generate a numbered name */

-		fn[NS] = 0; dj->lfn = NULL;			/* Find only SFN */

+		fn[NS] = 0; dj->lfn = 0;			/* Find only SFN */

 		for (n = 1; n < 100; n++) {

 			gen_numname(fn, sn, lfn, n);	/* Generate a numbered name */

 			res = dir_find(dj);				/* Check if the name collides with existing SFN */

@@ -974,7 +1491,7 @@ FRESULT dir_register (	/* FR_OK:Successful, FR_DENIED:No free entry or too many
 		fn[NS] = sn[NS]; dj->lfn = lfn;

 	}

 

-	if (sn[NS] & NS_LFN) {			/* When LFN is to be created, reserve reserve an SFN + LFN entries. */

+	if (sn[NS] & NS_LFN) {			/* When LFN is to be created, reserve an SFN + LFN entries. */

 		for (ne = 0; lfn[ne]; ne++) ;

 		ne = (ne + 25) / 13;

 	} else {						/* Otherwise reserve only an SFN entry. */

@@ -982,24 +1499,24 @@ FRESULT dir_register (	/* FR_OK:Successful, FR_DENIED:No free entry or too many
 	}

 

 	/* Reserve contiguous entries */

-	res = dir_seek(dj, 0);

+	res = dir_sdi(dj, 0);

 	if (res != FR_OK) return res;

 	n = is = 0;

 	do {

 		res = move_window(dj->fs, dj->sect);

 		if (res != FR_OK) break;

 		c = *dj->dir;				/* Check the entry status */

-		if (c == 0xE5 || c == 0) {	/* Is it a blank entry? */

-			if (n == 0) is = dj->index;	/* First index of the contigulus entry */

-			if (++n == ne) break;	/* A contiguous entry that requiered count is found */

+		if (c == DDE || c == 0) {	/* Is it a blank entry? */

+			if (n == 0) is = dj->index;	/* First index of the contiguous entry */

+			if (++n == ne) break;	/* A contiguous entry that required count is found */

 		} else {

 			n = 0;					/* Not a blank entry. Restart to search */

 		}

-		res = dir_next(dj, TRUE);	/* Next entry with table streach */

+		res = dir_next(dj, 1);		/* Next entry with table stretch */

 	} while (res == FR_OK);

 

 	if (res == FR_OK && ne > 1) {	/* Initialize LFN entry if needed */

-		res = dir_seek(dj, is);

+		res = dir_sdi(dj, is);

 		if (res == FR_OK) {

 			sum = sum_sfn(dj->fn);	/* Sum of the SFN tied to the LFN */

 			ne--;

@@ -1008,20 +1525,20 @@ FRESULT dir_register (	/* FR_OK:Successful, FR_DENIED:No free entry or too many
 				if (res != FR_OK) break;

 				fit_lfn(dj->lfn, dj->dir, (BYTE)ne, sum);

 				dj->fs->wflag = 1;

-				res = dir_next(dj, FALSE);	/* Next entry */

+				res = dir_next(dj, 0);	/* Next entry */

 			} while (res == FR_OK && --ne);

 		}

 	}

 

 #else	/* Non LFN configuration */

-	res = dir_seek(dj, 0);

+	res = dir_sdi(dj, 0);

 	if (res == FR_OK) {

 		do {	/* Find a blank entry for the SFN */

 			res = move_window(dj->fs, dj->sect);

 			if (res != FR_OK) break;

 			c = *dj->dir;

-			if (c == 0xE5 || c == 0) break;	/* Is it a blank entry? */

-			res = dir_next(dj, TRUE);		/* Next entry with table streach */

+			if (c == DDE || c == 0) break;	/* Is it a blank entry? */

+			res = dir_next(dj, 1);			/* Next entry with table stretch */

 		} while (res == FR_OK);

 	}

 #endif

@@ -1030,9 +1547,11 @@ FRESULT dir_register (	/* FR_OK:Successful, FR_DENIED:No free entry or too many
 		res = move_window(dj->fs, dj->sect);

 		if (res == FR_OK) {

 			dir = dj->dir;

-			mem_set(dir, 0, 32);		/* Clean the entry */

+			mem_set(dir, 0, SZ_DIR);	/* Clean the entry */

 			mem_cpy(dir, dj->fn, 11);	/* Put SFN */

+#if _USE_LFN

 			dir[DIR_NTres] = *(dj->fn+NS) & (NS_BODY | NS_EXT);	/* Put NT flag */

+#endif

 			dj->fs->wflag = 1;

 		}

 	}

@@ -1058,25 +1577,25 @@ FRESULT dir_remove (	/* FR_OK: Successful, FR_DISK_ERR: A disk error */
 	WORD i;

 

 	i = dj->index;	/* SFN index */

-	res = dir_seek(dj, (WORD)((dj->lfn_idx == 0xFFFF) ? i : dj->lfn_idx));	/* Goto the SFN or top of the LFN entries */

+	res = dir_sdi(dj, (WORD)((dj->lfn_idx == 0xFFFF) ? i : dj->lfn_idx));	/* Goto the SFN or top of the LFN entries */

 	if (res == FR_OK) {

 		do {

 			res = move_window(dj->fs, dj->sect);

 			if (res != FR_OK) break;

-			*dj->dir = 0xE5;			/* Mark the entry "deleted" */

+			*dj->dir = DDE;			/* Mark the entry "deleted" */

 			dj->fs->wflag = 1;

 			if (dj->index >= i) break;	/* When reached SFN, all entries of the object has been deleted. */

-			res = dir_next(dj, FALSE);	/* Next entry */

+			res = dir_next(dj, 0);		/* Next entry */

 		} while (res == FR_OK);

 		if (res == FR_NO_FILE) res = FR_INT_ERR;

 	}

 

 #else			/* Non LFN configuration */

-	res = dir_seek(dj, dj->index);

+	res = dir_sdi(dj, dj->index);

 	if (res == FR_OK) {

 		res = move_window(dj->fs, dj->sect);

 		if (res == FR_OK) {

-			*dj->dir = 0xE5;			/* Mark the entry "deleted" */

+			*dj->dir = DDE;			/* Mark the entry "deleted" */

 			dj->fs->wflag = 1;

 		}

 	}

@@ -1096,23 +1615,23 @@ FRESULT dir_remove (	/* FR_OK: Successful, FR_DISK_ERR: A disk error */
 static

 FRESULT create_name (

 	DIR *dj,			/* Pointer to the directory object */

-	const XCHAR **path	/* Pointer to pointer to the segment in the path string */

+	const TCHAR **path	/* Pointer to pointer to the segment in the path string */

 )

 {

 #ifdef _EXCVT

-	static const BYTE cvt[] = _EXCVT;

+	static const BYTE excvt[] = _EXCVT;	/* Upper conversion table for extended chars */

 #endif

 

 #if _USE_LFN	/* LFN configuration */

 	BYTE b, cf;

 	WCHAR w, *lfn;

-	int i, ni, si, di;

-	const XCHAR *p;

+	UINT i, ni, si, di;

+	const TCHAR *p;

 

 	/* Create LFN in Unicode */

-	si = di = 0;

-	p = *path;

+	for (p = *path; *p == '/' || *p == '\\'; p++) ;	/* Strip duplicated separator */

 	lfn = dj->lfn;

+	si = di = 0;

 	for (;;) {

 		w = p[si++];					/* Get a character */

 		if (w < ' ' || w == '/' || w == '\\') break;	/* Break on end of segment */

@@ -1120,24 +1639,24 @@ FRESULT create_name (
 			return FR_INVALID_NAME;

 #if !_LFN_UNICODE

 		w &= 0xFF;

-		if (IsDBCS1(w)) {				/* If it is a DBC 1st byte */

-			b = p[si++];				/* Get 2nd byte */

-			if (!IsDBCS2(b))			/* Reject invalid code for DBC */

-				return FR_INVALID_NAME;

-			w = (w << 8) + b;

+		if (IsDBCS1(w)) {				/* Check if it is a DBC 1st byte (always false on SBCS cfg) */

+			b = (BYTE)p[si++];			/* Get 2nd byte */

+			if (!IsDBCS2(b))

+				return FR_INVALID_NAME;	/* Reject invalid sequence */

+			w = (w << 8) + b;			/* Create a DBC */

 		}

-		w = ff_convert(w, 1);			/* Convert OEM to Unicode */

+		w = ff_convert(w, 1);			/* Convert ANSI/OEM to Unicode */

 		if (!w) return FR_INVALID_NAME;	/* Reject invalid code */

 #endif

 		if (w < 0x80 && chk_chr("\"*:<>\?|\x7F", w)) /* Reject illegal chars for LFN */

 			return FR_INVALID_NAME;

 		lfn[di++] = w;					/* Store the Unicode char */

 	}

-	*path = &p[si];						/* Rerurn pointer to the next segment */

+	*path = &p[si];						/* Return pointer to the next segment */

 	cf = (w < ' ') ? NS_LAST : 0;		/* Set last segment flag if end of path */

 #if _FS_RPATH

-	if ((di == 1 && lfn[di - 1] == '.') || /* Is this a dot entry? */

-		(di == 2 && lfn[di - 1] == '.' && lfn[di - 2] == '.')) {

+	if ((di == 1 && lfn[di-1] == '.') || /* Is this a dot entry? */

+		(di == 2 && lfn[di-1] == '.' && lfn[di-2] == '.')) {

 		lfn[di] = 0;

 		for (i = 0; i < 11; i++)

 			dj->fn[i] = (i < di) ? '.' : ' ';

@@ -1146,11 +1665,11 @@ FRESULT create_name (
 	}

 #endif

 	while (di) {						/* Strip trailing spaces and dots */

-		w = lfn[di - 1];

+		w = lfn[di-1];

 		if (w != ' ' && w != '.') break;

 		di--;

 	}

-	if (!di) return FR_INVALID_NAME;	/* Reject null string */

+	if (!di) return FR_INVALID_NAME;	/* Reject nul string */

 

 	lfn[di] = 0;						/* LFN is created */

 

@@ -1163,7 +1682,7 @@ FRESULT create_name (
 	b = i = 0; ni = 8;

 	for (;;) {

 		w = lfn[si++];					/* Get an LFN char */

-		if (!w) break;					/* Break on enf of the LFN */

+		if (!w) break;					/* Break on end of the LFN */

 		if (w == ' ' || (w == '.' && si != di)) {	/* Remove spaces and dots */

 			cf |= NS_LOSS | NS_LFN; continue;

 		}

@@ -1181,21 +1700,21 @@ FRESULT create_name (
 		if (w >= 0x80) {				/* Non ASCII char */

 #ifdef _EXCVT

 			w = ff_convert(w, 0);		/* Unicode -> OEM code */

-			if (w) w = cvt[w - 0x80];	/* Convert extended char to upper (SBCS) */

+			if (w) w = excvt[w - 0x80];	/* Convert extended char to upper (SBCS) */

 #else

 			w = ff_convert(ff_wtoupper(w), 0);	/* Upper converted Unicode -> OEM code */

 #endif

 			cf |= NS_LFN;				/* Force create LFN entry */

 		}

 

-		if (_DF1S && w >= 0x100) {		/* Double byte char */

+		if (_DF1S && w >= 0x100) {		/* Double byte char (always false on SBCS cfg) */

 			if (i >= ni - 1) {

 				cf |= NS_LOSS | NS_LFN; i = ni; continue;

 			}

 			dj->fn[i++] = (BYTE)(w >> 8);

 		} else {						/* Single byte char */

-			if (!w || chk_chr("+,;[=]", w)) {		/* Replace illegal chars for SFN */

-				w = '_'; cf |= NS_LOSS | NS_LFN;	/* Lossy conversion */

+			if (!w || chk_chr("+,;=[]", w)) {	/* Replace illegal chars for SFN */

+				w = '_'; cf |= NS_LOSS | NS_LFN;/* Lossy conversion */

 			} else {

 				if (IsUpper(w)) {		/* ASCII large capital */

 					b |= 2;

@@ -1209,7 +1728,7 @@ FRESULT create_name (
 		dj->fn[i++] = (BYTE)w;

 	}

 

-	if (dj->fn[0] == 0xE5) dj->fn[0] = 0x05;	/* If the first char collides with deleted mark, replace it with 0x05 */

+	if (dj->fn[0] == DDE) dj->fn[0] = NDDE;	/* If the first char collides with deleted mark, replace it with 0x05 */

 

 	if (ni == 8) b <<= 2;

 	if ((b & 0x0C) == 0x0C || (b & 0x03) == 0x03)	/* Create LFN entry when there are composite capitals */

@@ -1226,53 +1745,53 @@ FRESULT create_name (
 

 #else	/* Non-LFN configuration */

 	BYTE b, c, d, *sfn;

-	int ni, si, i;

+	UINT ni, si, i;

 	const char *p;

 

 	/* Create file name in directory form */

+	for (p = *path; *p == '/' || *p == '\\'; p++) ;	/* Strip duplicated separator */

 	sfn = dj->fn;

 	mem_set(sfn, ' ', 11);

 	si = i = b = 0; ni = 8;

-	p = *path;

 #if _FS_RPATH

 	if (p[si] == '.') { /* Is this a dot entry? */

 		for (;;) {

-			c = p[si++];

+			c = (BYTE)p[si++];

 			if (c != '.' || si >= 3) break;

 			sfn[i++] = c;

 		}

 		if (c != '/' && c != '\\' && c > ' ') return FR_INVALID_NAME;

-		*path = &p[si];									/* Rerurn pointer to the next segment */

+		*path = &p[si];									/* Return pointer to the next segment */

 		sfn[NS] = (c <= ' ') ? NS_LAST | NS_DOT : NS_DOT;	/* Set last segment flag if end of path */

 		return FR_OK;

 	}

 #endif

 	for (;;) {

-		c = p[si++];

+		c = (BYTE)p[si++];

 		if (c <= ' ' || c == '/' || c == '\\') break;	/* Break on end of segment */

 		if (c == '.' || i >= ni) {

 			if (ni != 8 || c != '.') return FR_INVALID_NAME;

 			i = 8; ni = 11;

 			b <<= 2; continue;

 		}

-		if (c >= 0x80) {				/* Extended char */

+		if (c >= 0x80) {				/* Extended char? */

+			b |= 3;						/* Eliminate NT flag */

 #ifdef _EXCVT

-			c = cvt[c - 0x80];			/* Convert extend char (SBCS) */

+			c = excvt[c-0x80];			/* Upper conversion (SBCS) */

 #else

-			b |= 3;						/* Eliminate NT flag if ext char is exist */

 #if !_DF1S	/* ASCII only cfg */

 			return FR_INVALID_NAME;

 #endif

 #endif

 		}

-		if (IsDBCS1(c)) {				/* DBC 1st byte? */

-			d = p[si++];				/* Get 2nd byte */

+		if (IsDBCS1(c)) {				/* Check if it is a DBC 1st byte (always false on SBCS cfg) */

+			d = (BYTE)p[si++];			/* Get 2nd byte */

 			if (!IsDBCS2(d) || i >= ni - 1)	/* Reject invalid DBC */

 				return FR_INVALID_NAME;

 			sfn[i++] = c;

 			sfn[i++] = d;

 		} else {						/* Single byte code */

-			if (chk_chr(" \"*+,[=]|\x7F", c))	/* Reject illegal chrs for SFN */

+			if (chk_chr("\"*+,:;<=>\?[]|\x7F", c))	/* Reject illegal chrs for SFN */

 				return FR_INVALID_NAME;

 			if (IsUpper(c)) {			/* ASCII large capital? */

 				b |= 2;

@@ -1284,15 +1803,15 @@ FRESULT create_name (
 			sfn[i++] = c;

 		}

 	}

-	*path = &p[si];						/* Rerurn pointer to the next segment */

+	*path = &p[si];						/* Return pointer to the next segment */

 	c = (c <= ' ') ? NS_LAST : 0;		/* Set last segment flag if end of path */

 

-	if (!i) return FR_INVALID_NAME;		/* Reject null string */

-	if (sfn[0] == 0xE5) sfn[0] = 0x05;	/* When first char collides with 0xE5, replace it with 0x05 */

+	if (!i) return FR_INVALID_NAME;		/* Reject nul string */

+	if (sfn[0] == DDE) sfn[0] = NDDE;	/* When first char collides with DDE, replace it with 0x05 */

 

 	if (ni == 8) b <<= 2;

-	if ((b & 0x03) == 0x01) c |= NS_EXT;	/* NT flag (Extension has only small capital) */

-	if ((b & 0x0C) == 0x04) c |= NS_BODY;	/* NT flag (Filename has only small capital) */

+	if ((b & 0x03) == 0x01) c |= NS_EXT;	/* NT flag (Name extension has only small capital) */

+	if ((b & 0x0C) == 0x04) c |= NS_BODY;	/* NT flag (Name body has only small capital) */

 

 	sfn[NS] = c;		/* Store NT flag, File name is created */

 

@@ -1313,9 +1832,9 @@ void get_fileinfo (		/* No return code */
 	FILINFO *fno	 	/* Pointer to the file information to be filled */

 )

 {

-	int i;

-	BYTE c, nt, *dir;

-	char *p;

+	UINT i;

+	BYTE nt, *dir;

+	TCHAR *p, c;

 

 

 	p = fno->fname;

@@ -1325,8 +1844,14 @@ void get_fileinfo (		/* No return code */
 		for (i = 0; i < 8; i++) {	/* Copy name body */

 			c = dir[i];

 			if (c == ' ') break;

-			if (c == 0x05) c = 0xE5;

+			if (c == NDDE) c = (TCHAR)DDE;

 			if (_USE_LFN && (nt & NS_BODY) && IsUpper(c)) c += 0x20;

+#if _LFN_UNICODE

+			if (IsDBCS1(c) && i < 7 && IsDBCS2(dir[i+1]))

+				c = (c << 8) | dir[++i];

+			c = ff_convert(c, 1);

+			if (!c) c = '?';

+#endif

 			*p++ = c;

 		}

 		if (dir[8] != ' ') {		/* Copy name extension */

@@ -1335,6 +1860,12 @@ void get_fileinfo (		/* No return code */
 				c = dir[i];

 				if (c == ' ') break;

 				if (_USE_LFN && (nt & NS_EXT) && IsUpper(c)) c += 0x20;

+#if _LFN_UNICODE

+				if (IsDBCS1(c) && i < 10 && IsDBCS2(dir[i+1]))

+					c = (c << 8) | dir[++i];

+				c = ff_convert(c, 1);

+				if (!c) c = '?';

+#endif

 				*p++ = c;

 			}

 		}

@@ -1343,11 +1874,11 @@ void get_fileinfo (		/* No return code */
 		fno->fdate = LD_WORD(dir+DIR_WrtDate);		/* Date */

 		fno->ftime = LD_WORD(dir+DIR_WrtTime);		/* Time */

 	}

-	*p = 0;

+	*p = 0;		/* Terminate SFN str by a \0 */

 

 #if _USE_LFN

-	if (fno->lfname) {

-		XCHAR *tp = fno->lfname;

+	if (fno->lfname && fno->lfsize) {

+		TCHAR *tp = fno->lfname;

 		WCHAR w, *lfn;

 

 		i = 0;

@@ -1357,14 +1888,14 @@ void get_fileinfo (		/* No return code */
 #if !_LFN_UNICODE

 				w = ff_convert(w, 0);			/* Unicode -> OEM conversion */

 				if (!w) { i = 0; break; }		/* Could not convert, no LFN */

-				if (_DF1S && w >= 0x100)		/* Put 1st byte if it is a DBC */

-					tp[i++] = (XCHAR)(w >> 8);

+				if (_DF1S && w >= 0x100)		/* Put 1st byte if it is a DBC (always false on SBCS cfg) */

+					tp[i++] = (TCHAR)(w >> 8);

 #endif

-				if (i >= fno->lfsize - 1) { i = 0; break; }	/* Buffer overrun, no LFN */

-				tp[i++] = (XCHAR)w;

+				if (i >= fno->lfsize - 1) { i = 0; break; }	/* Buffer overflow, no LFN */

+				tp[i++] = (TCHAR)w;

 			}

 		}

-		tp[i] = 0;	/* Terminator */

+		tp[i] = 0;	/* Terminate the LFN str by a \0 */

 	}

 #endif

 }

@@ -1380,18 +1911,17 @@ void get_fileinfo (		/* No return code */
 static

 FRESULT follow_path (	/* FR_OK(0): successful, !=0: error code */

 	DIR *dj,			/* Directory object to return last directory and found object */

-	const XCHAR *path	/* Full-path string to find a file or directory */

+	const TCHAR *path	/* Full-path string to find a file or directory */

 )

 {

 	FRESULT res;

-	BYTE *dir, last;

+	BYTE *dir, ns;

 

 

-	while (!_USE_LFN && *path == ' ') path++;	/* Skip leading spaces */

 #if _FS_RPATH

 	if (*path == '/' || *path == '\\') { /* There is a heading separator */

 		path++;	dj->sclust = 0;		/* Strip it and start from the root dir */

-	} else {							/* No heading saparator */

+	} else {							/* No heading separator */

 		dj->sclust = dj->fs->cdir;	/* Start from the current dir */

 	}

 #else

@@ -1400,27 +1930,34 @@ FRESULT follow_path (	/* FR_OK(0): successful, !=0: error code */
 	dj->sclust = 0;						/* Start from the root dir */

 #endif

 

-	if ((UINT)*path < ' ') {			/* Null path means the start directory itself */

-		res = dir_seek(dj, 0);

-		dj->dir = NULL;

+	if ((UINT)*path < ' ') {			/* Nul path means the start directory itself */

+		res = dir_sdi(dj, 0);

+		dj->dir = 0;

 

 	} else {							/* Follow path */

 		for (;;) {

 			res = create_name(dj, &path);	/* Get a segment */

 			if (res != FR_OK) break;

 			res = dir_find(dj);				/* Find it */

-			last = *(dj->fn+NS) & NS_LAST;

-			if (res != FR_OK) {				/* Could not find the object */

-				if (res == FR_NO_FILE && !last)

-					res = FR_NO_PATH;

+			ns = *(dj->fn+NS);

+			if (res != FR_OK) {				/* Failed to find the object */

+				if (res != FR_NO_FILE) break;	/* Abort if any hard error occured */

+				/* Object not found */

+				if (_FS_RPATH && (ns & NS_DOT)) {	/* If dot entry is not exit */

+					dj->sclust = 0; dj->dir = 0;	/* It is the root dir */

+					res = FR_OK;

+					if (!(ns & NS_LAST)) continue;

+				} else {							/* Could not find the object */

+					if (!(ns & NS_LAST)) res = FR_NO_PATH;

+				}

 				break;

 			}

-			if (last) break;				/* Last segment match. Function completed. */

-			dir = dj->dir;					/* There is next segment. Follow the sub directory */

-			if (!(dir[DIR_Attr] & AM_DIR)) { /* Cannot follow because it is a file */

+			if (ns & NS_LAST) break;			/* Last segment match. Function completed. */

+			dir = dj->dir;						/* There is next segment. Follow the sub directory */

+			if (!(dir[DIR_Attr] & AM_DIR)) {	/* Cannot follow because it is a file */

 				res = FR_NO_PATH; break;

 			}

-			dj->sclust = ((DWORD)LD_WORD(dir+DIR_FstClusHI) << 16) | LD_WORD(dir+DIR_FstClusLO);

+			dj->sclust = LD_CLUST(dir);

 		}

 	}

 

@@ -1435,12 +1972,12 @@ FRESULT follow_path (	/* FR_OK(0): successful, !=0: error code */
 /*-----------------------------------------------------------------------*/

 

 static

-BYTE check_fs (	/* 0:The FAT boot record, 1:Valid boot record but not an FAT, 2:Not a boot record, 3:Error */

+BYTE check_fs (	/* 0:The FAT BR, 1:Valid BR but not an FAT, 2:Not a BR, 3:Disk error */

 	FATFS *fs,	/* File system object */

 	DWORD sect	/* Sector# (lba) to check if it is an FAT boot record or not */

 )

 {

-	if (disk_read(fs->drive, fs->win, sect, 1) != RES_OK)	/* Load boot record */

+	if (disk_read(fs->drv, fs->win, sect, 1) != RES_OK)	/* Load boot record */

 		return 3;

 	if (LD_WORD(&fs->win[BS_55AA]) != 0xAA55)		/* Check record signature (always placed at offset 510 even if the sector size is >512) */

 		return 2;

@@ -1457,131 +1994,163 @@ BYTE check_fs (	/* 0:The FAT boot record, 1:Valid boot record but not an FAT, 2:
 

 

 /*-----------------------------------------------------------------------*/

-/* Make sure that the file system is valid                               */

+/* Check if the file system object is valid or not                       */

 /*-----------------------------------------------------------------------*/

 

-

-FRESULT chk_mounted (	/* FR_OK(0): successful, !=0: any error occured */

-	const XCHAR **path,	/* Pointer to pointer to the path name (drive number) */

+static

+FRESULT chk_mounted (	/* FR_OK(0): successful, !=0: any error occurred */

+	const TCHAR **path,	/* Pointer to pointer to the path name (drive number) */

 	FATFS **rfs,		/* Pointer to pointer to the found file system object */

 	BYTE chk_wp			/* !=0: Check media write protection for write access */

 )

 {

-	BYTE fmt, *tbl;

+	BYTE fmt, b, *tbl;

 	UINT vol;

 	DSTATUS stat;

-	DWORD bsect, fsize, tsect, mclst;

-	const XCHAR *p = *path;

+	DWORD bsect, fasize, tsect, sysect, nclst, szbfat;

+	WORD nrsv;

+	const TCHAR *p = *path;

 	FATFS *fs;

 

 	/* Get logical drive number from the path name */

-	vol = p[0] - '0';				/* Is there a drive number? */

-	if (vol <= 9 && p[1] == ':') {	/* Found a drive number, get and strip it */

-		p += 2; *path = p;			/* Return pointer to the path name */

-	} else {						/* No drive number is given */

+	vol = p[0] - '0';					/* Is there a drive number? */

+	if (vol <= 9 && p[1] == ':') {		/* Found a drive number, get and strip it */

+		p += 2; *path = p;				/* Return pointer to the path name */

+	} else {							/* No drive number is given */

 #if _FS_RPATH

-		vol = Drive;				/* Use current drive */

+		vol = CurrVol;					/* Use current drive */

 #else

-		vol = 0;					/* Use drive 0 */

+		vol = 0;						/* Use drive 0 */

 #endif

 	}

 

 	/* Check if the logical drive is valid or not */

-	if (vol >= _DRIVES) 			/* Is the drive number valid? */

+	if (vol >= _VOLUMES) 				/* Is the drive number valid? */

 		return FR_INVALID_DRIVE;

-	*rfs = fs = FatFs[vol];			/* Returen pointer to the corresponding file system object */

-	if (!fs) return FR_NOT_ENABLED;	/* Is the file system object available? */

+	*rfs = fs = FatFs[vol];				/* Return pointer to the corresponding file system object */

+	if (!fs) return FR_NOT_ENABLED;		/* Is the file system object available? */

 

-	ENTER_FF(fs);					/* Lock file system */

+	ENTER_FF(fs);						/* Lock file system */

 

-	if (fs->fs_type) {				/* If the logical drive has been mounted */

-		stat = disk_status(fs->drive);

-		if (!(stat & STA_NOINIT)) {	/* and the physical drive is kept initialized (has not been changed), */

+	if (fs->fs_type) {					/* If the logical drive has been mounted */

+		stat = disk_status(fs->drv);

+		if (!(stat & STA_NOINIT)) {		/* and the physical drive is kept initialized (has not been changed), */

 #if !_FS_READONLY

 			if (chk_wp && (stat & STA_PROTECT))	/* Check write protection if needed */

 				return FR_WRITE_PROTECTED;

 #endif

-			return FR_OK;			/* The file system object is valid */

+			return FR_OK;				/* The file system object is valid */

 		}

 	}

 

-	/* The logical drive must be mounted. Following code attempts to mount the volume */

+	/* The logical drive must be mounted. */

+	/* Following code attempts to mount a volume. (analyze BPB and initialize the fs object) */

 

 	fs->fs_type = 0;					/* Clear the file system object */

-	fs->drive = (BYTE)LD2PD(vol);		/* Bind the logical drive and a physical drive */

-	stat = disk_initialize(fs->drive);	/* Initialize low level disk I/O layer */

-	if (stat & STA_NOINIT)				/* Check if the drive is ready */

-		return FR_NOT_READY;

-#if _MAX_SS != 512						/* Get disk sector size if needed */

-	if (disk_ioctl(fs->drive, GET_SECTOR_SIZE, &SS(fs)) != RES_OK || SS(fs) > _MAX_SS)

-		return FR_NO_FILESYSTEM;

+	fs->drv = (BYTE)LD2PD(vol);			/* Bind the logical drive and a physical drive */

+	stat = disk_initialize(fs->drv);	/* Initialize low level disk I/O layer */

+	if (stat & STA_NOINIT)				/* Check if the initialization succeeded */

+		return FR_NOT_READY;			/* Failed to initialize due to no media or hard error */

+#if _MAX_SS != 512						/* Get disk sector size (variable sector size cfg only) */

+	if (disk_ioctl(fs->drv, GET_SECTOR_SIZE, &fs->ssize) != RES_OK)

+		return FR_DISK_ERR;

 #endif

 #if !_FS_READONLY

 	if (chk_wp && (stat & STA_PROTECT))	/* Check disk write protection if needed */

 		return FR_WRITE_PROTECTED;

 #endif

-	/* Search FAT partition on the drive */

-	fmt = check_fs(fs, bsect = 0);		/* Check sector 0 as an SFD format */

-	if (fmt == 1) {						/* Not an FAT boot record, it may be patitioned */

-		/* Check a partition listed in top of the partition table */

-		tbl = &fs->win[MBR_Table + LD2PT(vol) * 16];	/* Partition table */

+	/* Search FAT partition on the drive. Supports only generic partitionings, FDISK and SFD. */

+	fmt = check_fs(fs, bsect = 0);		/* Check sector 0 if it is a VBR */

+	if (fmt == 1) {						/* Not an FAT-VBR, the disk may be partitioned */

+		/* Check the partition listed in top of the partition table */

+		tbl = &fs->win[MBR_Table + LD2PT(vol) * SZ_PTE];/* Partition table */

 		if (tbl[4]) {									/* Is the partition existing? */

 			bsect = LD_DWORD(&tbl[8]);					/* Partition offset in LBA */

 			fmt = check_fs(fs, bsect);					/* Check the partition */

 		}

 	}

 	if (fmt == 3) return FR_DISK_ERR;

-	if (fmt || LD_WORD(fs->win+BPB_BytsPerSec) != SS(fs))	/* No valid FAT patition is found */

+	if (fmt) return FR_NO_FILESYSTEM;					/* No FAT volume is found */

+

+	/* Following code initializes the file system object */

+

+	if (LD_WORD(fs->win+BPB_BytsPerSec) != SS(fs))		/* (BPB_BytsPerSec must be equal to the physical sector size) */

 		return FR_NO_FILESYSTEM;

 

-	/* Initialize the file system object */

-	fsize = LD_WORD(fs->win+BPB_FATSz16);				/* Number of sectors per FAT */

-	if (!fsize) fsize = LD_DWORD(fs->win+BPB_FATSz32);

-	fs->sects_fat = fsize;

-	fs->n_fats = fs->win[BPB_NumFATs];					/* Number of FAT copies */

-	fsize *= fs->n_fats;								/* (Number of sectors in FAT area) */

-	fs->fatbase = bsect + LD_WORD(fs->win+BPB_RsvdSecCnt); /* FAT start sector (lba) */

-	fs->csize = fs->win[BPB_SecPerClus];				/* Number of sectors per cluster */

-	fs->n_rootdir = LD_WORD(fs->win+BPB_RootEntCnt);	/* Nmuber of root directory entries */

+	fasize = LD_WORD(fs->win+BPB_FATSz16);				/* Number of sectors per FAT */

+	if (!fasize) fasize = LD_DWORD(fs->win+BPB_FATSz32);

+	fs->fsize = fasize;

+

+	fs->n_fats = b = fs->win[BPB_NumFATs];				/* Number of FAT copies */

+	if (b != 1 && b != 2) return FR_NO_FILESYSTEM;		/* (Must be 1 or 2) */

+	fasize *= b;										/* Number of sectors for FAT area */

+

+	fs->csize = b = fs->win[BPB_SecPerClus];			/* Number of sectors per cluster */

+	if (!b || (b & (b - 1))) return FR_NO_FILESYSTEM;	/* (Must be power of 2) */

+

+	fs->n_rootdir = LD_WORD(fs->win+BPB_RootEntCnt);	/* Number of root directory entries */

+	if (fs->n_rootdir % (SS(fs) / SZ_DIR)) return FR_NO_FILESYSTEM;	/* (BPB_RootEntCnt must be sector aligned) */

+

 	tsect = LD_WORD(fs->win+BPB_TotSec16);				/* Number of sectors on the volume */

 	if (!tsect) tsect = LD_DWORD(fs->win+BPB_TotSec32);

-	fs->max_clust = mclst = (tsect						/* Last cluster# + 1 (Number of clusters + 2) */

-		- LD_WORD(fs->win+BPB_RsvdSecCnt) - fsize - fs->n_rootdir / (SS(fs)/32)

-		) / fs->csize + 2;

 

-	fmt = FS_FAT12;										/* Determine the FAT sub type */

-	if (mclst >= 0xFF7) fmt = FS_FAT16;					/* Number of clusters >= 0xFF5 */

-	if (mclst >= 0xFFF7) fmt = FS_FAT32;				/* Number of clusters >= 0xFFF5 */

+	nrsv = LD_WORD(fs->win+BPB_RsvdSecCnt);				/* Number of reserved sectors */

+	if (!nrsv) return FR_NO_FILESYSTEM;					/* (BPB_RsvdSecCnt must not be 0) */

+

+	/* Determine the FAT sub type */

+	sysect = nrsv + fasize + fs->n_rootdir / (SS(fs) / SZ_DIR);	/* RSV+FAT+DIR */

+	if (tsect < sysect) return FR_NO_FILESYSTEM;		/* (Invalid volume size) */

+	nclst = (tsect - sysect) / fs->csize;				/* Number of clusters */

+	if (!nclst) return FR_NO_FILESYSTEM;				/* (Invalid volume size) */

+	fmt = FS_FAT12;

+	if (nclst >= MIN_FAT16) fmt = FS_FAT16;

+	if (nclst >= MIN_FAT32) fmt = FS_FAT32;

 

-	if (fmt == FS_FAT32)

+	/* Boundaries and Limits */

+	fs->n_fatent = nclst + 2;							/* Number of FAT entries */

+	fs->database = bsect + sysect;						/* Data start sector */

+	fs->fatbase = bsect + nrsv; 						/* FAT start sector */

+	if (fmt == FS_FAT32) {

+		if (fs->n_rootdir) return FR_NO_FILESYSTEM;		/* (BPB_RootEntCnt must be 0) */

 		fs->dirbase = LD_DWORD(fs->win+BPB_RootClus);	/* Root directory start cluster */

-	else

-		fs->dirbase = fs->fatbase + fsize;				/* Root directory start sector (lba) */

-	fs->database = fs->fatbase + fsize + fs->n_rootdir / (SS(fs)/32);	/* Data start sector (lba) */

+		szbfat = fs->n_fatent * 4;						/* (Required FAT size) */

+	} else {

+		if (!fs->n_rootdir)	return FR_NO_FILESYSTEM;	/* (BPB_RootEntCnt must not be 0) */

+		fs->dirbase = fs->fatbase + fasize;				/* Root directory start sector */

+		szbfat = (fmt == FS_FAT16) ?					/* (Required FAT size) */

+			fs->n_fatent * 2 : fs->n_fatent * 3 / 2 + (fs->n_fatent & 1);

+	}

+	if (fs->fsize < (szbfat + (SS(fs) - 1)) / SS(fs))	/* (BPB_FATSz must not be less than required) */

+		return FR_NO_FILESYSTEM;

 

 #if !_FS_READONLY

-	/* Initialize allocation information */

+	/* Initialize cluster allocation information */

 	fs->free_clust = 0xFFFFFFFF;

-	fs->wflag = 0;

-	/* Get fsinfo if needed */

+	fs->last_clust = 0;

+

+	/* Get fsinfo if available */

 	if (fmt == FS_FAT32) {

 	 	fs->fsi_flag = 0;

 		fs->fsi_sector = bsect + LD_WORD(fs->win+BPB_FSInfo);

-		if (disk_read(fs->drive, fs->win, fs->fsi_sector, 1) == RES_OK &&

+		if (disk_read(fs->drv, fs->win, fs->fsi_sector, 1) == RES_OK &&

 			LD_WORD(fs->win+BS_55AA) == 0xAA55 &&

 			LD_DWORD(fs->win+FSI_LeadSig) == 0x41615252 &&

 			LD_DWORD(fs->win+FSI_StrucSig) == 0x61417272) {

-			fs->last_clust = LD_DWORD(fs->win+FSI_Nxt_Free);

-			fs->free_clust = LD_DWORD(fs->win+FSI_Free_Count);

+				fs->last_clust = LD_DWORD(fs->win+FSI_Nxt_Free);

+				fs->free_clust = LD_DWORD(fs->win+FSI_Free_Count);

 		}

 	}

 #endif

 	fs->fs_type = fmt;		/* FAT sub-type */

+	fs->id = ++Fsid;		/* File system mount ID */

 	fs->winsect = 0;		/* Invalidate sector cache */

+	fs->wflag = 0;

 #if _FS_RPATH

 	fs->cdir = 0;			/* Current directory (root dir) */

 #endif

-	fs->id = ++Fsid;		/* File system mount ID */

+#if _FS_SHARE				/* Clear file lock semaphores */

+	clear_lock(fs);

+#endif

 

 	return FR_OK;

 }

@@ -1604,7 +2173,7 @@ FRESULT validate (	/* FR_OK(0): The object is valid, !=0: Invalid */
 

 	ENTER_FF(fs);		/* Lock file system */

 

-	if (disk_status(fs->drive) & STA_NOINIT)

+	if (disk_status(fs->drv) & STA_NOINIT)

 		return FR_NOT_READY;

 

 	return FR_OK;

@@ -1622,7 +2191,7 @@ FRESULT validate (	/* FR_OK(0): The object is valid, !=0: Invalid */
 

 

 /*-----------------------------------------------------------------------*/

-/* Mount/Unmount a Locical Drive                                         */

+/* Mount/Unmount a Logical Drive                                         */

 /*-----------------------------------------------------------------------*/

 

 FRESULT f_mount (

@@ -1633,11 +2202,14 @@ FRESULT f_mount (
 	FATFS *rfs;

 

 

-	if (vol >= _DRIVES)				/* Check if the drive number is valid */

+	if (vol >= _VOLUMES)			/* Check if the drive number is valid */

 		return FR_INVALID_DRIVE;

 	rfs = FatFs[vol];				/* Get current fs object */

 

 	if (rfs) {

+#if _FS_SHARE

+		clear_lock(rfs);

+#endif

 #if _FS_REENTRANT					/* Discard sync object of the current volume */

 		if (!ff_del_syncobj(rfs->sobj)) return FR_INT_ERR;

 #endif

@@ -1664,93 +2236,125 @@ FRESULT f_mount (
 

 FRESULT f_open (

 	FIL *fp,			/* Pointer to the blank file object */

-	const XCHAR *path,	/* Pointer to the file name */

+	const TCHAR *path,	/* Pointer to the file name */

 	BYTE mode			/* Access mode and file open mode flags */

 )

 {

 	FRESULT res;

 	DIR dj;

-	NAMEBUF(sfn, lfn);

 	BYTE *dir;

+	DEF_NAMEBUF;

 

 

-	fp->fs = NULL;		/* Clear file object */

+	fp->fs = 0;			/* Clear file object */

+

 #if !_FS_READONLY

-	mode &= (FA_READ | FA_WRITE | FA_CREATE_ALWAYS | FA_OPEN_ALWAYS | FA_CREATE_NEW);

-	res = chk_mounted(&path, &dj.fs, (BYTE)(mode & (FA_WRITE | FA_CREATE_ALWAYS | FA_OPEN_ALWAYS | FA_CREATE_NEW)));

+	mode &= FA_READ | FA_WRITE | FA_CREATE_ALWAYS | FA_OPEN_ALWAYS | FA_CREATE_NEW;

+	res = chk_mounted(&path, &dj.fs, (BYTE)(mode & ~FA_READ));

 #else

 	mode &= FA_READ;

 	res = chk_mounted(&path, &dj.fs, 0);

 #endif

-	if (res != FR_OK) LEAVE_FF(dj.fs, res);

-	INITBUF(dj, sfn, lfn);

-	res = follow_path(&dj, path);	/* Follow the file path */

+	INIT_BUF(dj);

+	if (res == FR_OK)

+		res = follow_path(&dj, path);	/* Follow the file path */

+	dir = dj.dir;

 

-#if !_FS_READONLY

+#if !_FS_READONLY	/* R/W configuration */

+	if (res == FR_OK) {

+		if (!dir)	/* Current dir itself */

+			res = FR_INVALID_NAME;

+#if _FS_SHARE

+		else

+			res = chk_lock(&dj, (mode & ~FA_READ) ? 1 : 0);

+#endif

+	}

 	/* Create or Open a file */

 	if (mode & (FA_CREATE_ALWAYS | FA_OPEN_ALWAYS | FA_CREATE_NEW)) {

-		DWORD ps, cl;

+		DWORD dw, cl;

 

-		if (res != FR_OK) {			/* No file, create new */

-			if (res == FR_NO_FILE)	/* There is no file to open, create a new entry */

+		if (res != FR_OK) {					/* No file, create new */

+			if (res == FR_NO_FILE)			/* There is no file to open, create a new entry */

+#if _FS_SHARE

+				res = enq_lock(dj.fs) ? dir_register(&dj) : FR_TOO_MANY_OPEN_FILES;

+#else

 				res = dir_register(&dj);

-			if (res != FR_OK) LEAVE_FF(dj.fs, res);

-			mode |= FA_CREATE_ALWAYS;

-			dir = dj.dir;			/* Created entry (SFN entry) */

+#endif

+			mode |= FA_CREATE_ALWAYS;		/* File is created */

+			dir = dj.dir;					/* New entry */

 		}

-		else {						/* Any object is already existing */

-			if (mode & FA_CREATE_NEW)			/* Cannot create new */

-				LEAVE_FF(dj.fs, FR_EXIST);

-			dir = dj.dir;

-			if (!dir || (dir[DIR_Attr] & (AM_RDO | AM_DIR)))	/* Cannot overwrite it (R/O or DIR) */

-				LEAVE_FF(dj.fs, FR_DENIED);

-			if (mode & FA_CREATE_ALWAYS) {		/* Resize it to zero on over write mode */

-				cl = ((DWORD)LD_WORD(dir+DIR_FstClusHI) << 16) | LD_WORD(dir+DIR_FstClusLO);	/* Get start cluster */

-				ST_WORD(dir+DIR_FstClusHI, 0);	/* cluster = 0 */

-				ST_WORD(dir+DIR_FstClusLO, 0);

-				ST_DWORD(dir+DIR_FileSize, 0);	/* size = 0 */

-				dj.fs->wflag = 1;

-				ps = dj.fs->winsect;			/* Remove the cluster chain */

-				if (cl) {

-					res = remove_chain(dj.fs, cl);

-					if (res) LEAVE_FF(dj.fs, res);

-					dj.fs->last_clust = cl - 1;	/* Reuse the cluster hole */

-				}

-				res = move_window(dj.fs, ps);

-				if (res != FR_OK) LEAVE_FF(dj.fs, res);

+		else {								/* Any object is already existing */

+			if (dir[DIR_Attr] & (AM_RDO | AM_DIR)) {	/* Cannot overwrite it (R/O or DIR) */

+				res = FR_DENIED;

+			} else {

+				if (mode & FA_CREATE_NEW)	/* Cannot create as new file */

+					res = FR_EXIST;

 			}

 		}

-		if (mode & FA_CREATE_ALWAYS) {

+		if (res == FR_OK && (mode & FA_CREATE_ALWAYS)) {	/* Truncate it if overwrite mode */

+			dw = get_fattime();					/* Created time */

+			ST_DWORD(dir+DIR_CrtTime, dw);

 			dir[DIR_Attr] = 0;					/* Reset attribute */

-			ps = get_fattime();

-			ST_DWORD(dir+DIR_CrtTime, ps);		/* Created time */

+			ST_DWORD(dir+DIR_FileSize, 0);		/* size = 0 */

+			cl = LD_CLUST(dir);					/* Get start cluster */

+			ST_CLUST(dir, 0);					/* cluster = 0 */

 			dj.fs->wflag = 1;

-			mode |= FA__WRITTEN;				/* Set file changed flag */

+			if (cl) {							/* Remove the cluster chain if exist */

+				dw = dj.fs->winsect;

+				res = remove_chain(dj.fs, cl);

+				if (res == FR_OK) {

+					dj.fs->last_clust = cl - 1;	/* Reuse the cluster hole */

+					res = move_window(dj.fs, dw);

+				}

+			}

 		}

 	}

-	/* Open an existing file */

-	else {

-#endif /* !_FS_READONLY */

-		if (res != FR_OK) LEAVE_FF(dj.fs, res);	/* Follow failed */

-		dir = dj.dir;

-		if (!dir || (dir[DIR_Attr] & AM_DIR))	/* It is a directory */

-			LEAVE_FF(dj.fs, FR_NO_FILE);

-#if !_FS_READONLY

-		if ((mode & FA_WRITE) && (dir[DIR_Attr] & AM_RDO)) /* R/O violation */

-			LEAVE_FF(dj.fs, FR_DENIED);

+	else {	/* Open an existing file */

+		if (res == FR_OK) {						/* Follow succeeded */

+			if (dir[DIR_Attr] & AM_DIR) {		/* It is a directory */

+				res = FR_NO_FILE;

+			} else {

+				if ((mode & FA_WRITE) && (dir[DIR_Attr] & AM_RDO)) /* R/O violation */

+					res = FR_DENIED;

+			}

+		}

 	}

-	fp->dir_sect = dj.fs->winsect;		/* Pointer to the directory entry */

-	fp->dir_ptr = dj.dir;

+	if (res == FR_OK) {

+		if (mode & FA_CREATE_ALWAYS)			/* Set file change flag if created or overwritten */

+			mode |= FA__WRITTEN;

+		fp->dir_sect = dj.fs->winsect;			/* Pointer to the directory entry */

+		fp->dir_ptr = dir;

+#if _FS_SHARE

+		fp->lockid = inc_lock(&dj, (mode & ~FA_READ) ? 1 : 0);

+		if (!fp->lockid) res = FR_INT_ERR;

+#endif

+	}

+

+#else				/* R/O configuration */

+	if (res == FR_OK) {					/* Follow succeeded */

+		if (!dir) {						/* Current dir itself */

+			res = FR_INVALID_NAME;

+		} else {

+			if (dir[DIR_Attr] & AM_DIR)	/* It is a directory */

+				res = FR_NO_FILE;

+		}

+	}

+#endif

+	FREE_BUF();

+

+	if (res == FR_OK) {

+		fp->flag = mode;					/* File access mode */

+		fp->sclust = LD_CLUST(dir);			/* File start cluster */

+		fp->fsize = LD_DWORD(dir+DIR_FileSize);	/* File size */

+		fp->fptr = 0;						/* File pointer */

+		fp->dsect = 0;

+#if _USE_FASTSEEK

+		fp->cltbl = 0;						/* Normal seek mode */

 #endif

-	fp->flag = mode;					/* File access mode */

-	fp->org_clust =						/* File start cluster */

-		((DWORD)LD_WORD(dir+DIR_FstClusHI) << 16) | LD_WORD(dir+DIR_FstClusLO);

-	fp->fsize = LD_DWORD(dir+DIR_FileSize);	/* File size */

-	fp->fptr = 0; fp->csect = 255;		/* File pointer */

-	fp->dsect = 0;

-	fp->fs = dj.fs; fp->id = dj.fs->id;	/* Owner file system object of the file */

+		fp->fs = dj.fs; fp->id = dj.fs->id;	/* Validate file object */

+	}

 

-	LEAVE_FF(dj.fs, FR_OK);

+	LEAVE_FF(dj.fs, res);

 }

 

 

@@ -1770,73 +2374,79 @@ FRESULT f_read (
 	FRESULT res;

 	DWORD clst, sect, remain;

 	UINT rcnt, cc;

-	BYTE *rbuff = buff;

+	BYTE csect, *rbuff = buff;

 

 

-	*br = 0;	/* Initialize bytes read */

+	*br = 0;	/* Initialize byte counter */

 

-	res = validate(fp->fs, fp->id);					/* Check validity of the object */

+	res = validate(fp->fs, fp->id);				/* Check validity */

 	if (res != FR_OK) LEAVE_FF(fp->fs, res);

-	if (fp->flag & FA__ERROR)						/* Check abort flag */

+	if (fp->flag & FA__ERROR)					/* Aborted file? */

 		LEAVE_FF(fp->fs, FR_INT_ERR);

-	if (!(fp->flag & FA_READ)) 						/* Check access mode */

+	if (!(fp->flag & FA_READ)) 					/* Check access mode */

 		LEAVE_FF(fp->fs, FR_DENIED);

 	remain = fp->fsize - fp->fptr;

-	if (btr > remain) btr = (UINT)remain;			/* Truncate btr by remaining bytes */

+	if (btr > remain) btr = (UINT)remain;		/* Truncate btr by remaining bytes */

 

-	for ( ;  btr;									/* Repeat until all data transferred */

+	for ( ;  btr;								/* Repeat until all data read */

 		rbuff += rcnt, fp->fptr += rcnt, *br += rcnt, btr -= rcnt) {

-		if ((fp->fptr % SS(fp->fs)) == 0) {			/* On the sector boundary? */

-			if (fp->csect >= fp->fs->csize) {		/* On the cluster boundary? */

-				clst = (fp->fptr == 0) ?			/* On the top of the file? */

-					fp->org_clust : get_fat(fp->fs, fp->curr_clust);

-				if (clst <= 1) ABORT(fp->fs, FR_INT_ERR);

+		if ((fp->fptr % SS(fp->fs)) == 0) {		/* On the sector boundary? */

+			csect = (BYTE)(fp->fptr / SS(fp->fs) & (fp->fs->csize - 1));	/* Sector offset in the cluster */

+			if (!csect) {						/* On the cluster boundary? */

+				if (fp->fptr == 0) {			/* On the top of the file? */

+					clst = fp->sclust;			/* Follow from the origin */

+				} else {						/* Middle or end of the file */

+#if _USE_FASTSEEK

+					if (fp->cltbl)

+						clst = clmt_clust(fp, fp->fptr);	/* Get cluster# from the CLMT */

+					else

+#endif

+						clst = get_fat(fp->fs, fp->clust);	/* Follow cluster chain on the FAT */

+				}

+				if (clst < 2) ABORT(fp->fs, FR_INT_ERR);

 				if (clst == 0xFFFFFFFF) ABORT(fp->fs, FR_DISK_ERR);

-				fp->curr_clust = clst;				/* Update current cluster */

-				fp->csect = 0;						/* Reset sector offset in the cluster */

+				fp->clust = clst;				/* Update current cluster */

 			}

-			sect = clust2sect(fp->fs, fp->curr_clust);	/* Get current sector */

+			sect = clust2sect(fp->fs, fp->clust);	/* Get current sector */

 			if (!sect) ABORT(fp->fs, FR_INT_ERR);

-			sect += fp->csect;

-			cc = btr / SS(fp->fs);					/* When remaining bytes >= sector size, */

-			if (cc) {								/* Read maximum contiguous sectors directly */

-				if (fp->csect + cc > fp->fs->csize)	/* Clip at cluster boundary */

-					cc = fp->fs->csize - fp->csect;

-				if (disk_read(fp->fs->drive, rbuff, sect, (BYTE)cc) != RES_OK)

+			sect += csect;

+			cc = btr / SS(fp->fs);				/* When remaining bytes >= sector size, */

+			if (cc) {							/* Read maximum contiguous sectors directly */

+				if (csect + cc > fp->fs->csize)	/* Clip at cluster boundary */

+					cc = fp->fs->csize - csect;

+				if (disk_read(fp->fs->drv, rbuff, sect, (BYTE)cc) != RES_OK)

 					ABORT(fp->fs, FR_DISK_ERR);

-#if !_FS_READONLY && _FS_MINIMIZE <= 2

+#if !_FS_READONLY && _FS_MINIMIZE <= 2			/* Replace one of the read sectors with cached data if it contains a dirty sector */

 #if _FS_TINY

-				if (fp->fs->wflag && fp->fs->winsect - sect < cc)		/* Replace one of the read sectors with cached data if it contains a dirty sector */

+				if (fp->fs->wflag && fp->fs->winsect - sect < cc)

 					mem_cpy(rbuff + ((fp->fs->winsect - sect) * SS(fp->fs)), fp->fs->win, SS(fp->fs));

 #else

-				if ((fp->flag & FA__DIRTY) && fp->dsect - sect < cc)	/* Replace one of the read sectors with cached data if it contains a dirty sector */

+				if ((fp->flag & FA__DIRTY) && fp->dsect - sect < cc)

 					mem_cpy(rbuff + ((fp->dsect - sect) * SS(fp->fs)), fp->buf, SS(fp->fs));

 #endif

 #endif

-				fp->csect += (BYTE)cc;				/* Next sector address in the cluster */

-				rcnt = SS(fp->fs) * cc;				/* Number of bytes transferred */

+				rcnt = SS(fp->fs) * cc;			/* Number of bytes transferred */

 				continue;

 			}

 #if !_FS_TINY

+			if (fp->dsect != sect) {			/* Load data sector if not in cache */

 #if !_FS_READONLY

-			if (fp->flag & FA__DIRTY) {			/* Write sector I/O buffer if needed */

-				if (disk_write(fp->fs->drive, fp->buf, fp->dsect, 1) != RES_OK)

-					ABORT(fp->fs, FR_DISK_ERR);

-				fp->flag &= ~FA__DIRTY;

-			}

+				if (fp->flag & FA__DIRTY) {		/* Write-back dirty sector cache */

+					if (disk_write(fp->fs->drv, fp->buf, fp->dsect, 1) != RES_OK)

+						ABORT(fp->fs, FR_DISK_ERR);

+					fp->flag &= ~FA__DIRTY;

+				}

 #endif

-			if (fp->dsect != sect) {			/* Fill sector buffer with file data */

-				if (disk_read(fp->fs->drive, fp->buf, sect, 1) != RES_OK)

+				if (disk_read(fp->fs->drv, fp->buf, sect, 1) != RES_OK)	/* Fill sector cache */

 					ABORT(fp->fs, FR_DISK_ERR);

 			}

 #endif

 			fp->dsect = sect;

-			fp->csect++;							/* Next sector address in the cluster */

 		}

 		rcnt = SS(fp->fs) - (fp->fptr % SS(fp->fs));	/* Get partial sector data from sector buffer */

 		if (rcnt > btr) rcnt = btr;

 #if _FS_TINY

-		if (move_window(fp->fs, fp->dsect))			/* Move sector window */

+		if (move_window(fp->fs, fp->dsect))		/* Move sector window */

 			ABORT(fp->fs, FR_DISK_ERR);

 		mem_cpy(rbuff, &fp->fs->win[fp->fptr % SS(fp->fs)], rcnt);	/* Pick partial sector */

 #else

@@ -1866,88 +2476,92 @@ FRESULT f_write (
 	DWORD clst, sect;

 	UINT wcnt, cc;

 	const BYTE *wbuff = buff;

+	BYTE csect;

 

 

-	*bw = 0;	/* Initialize bytes written */

+	*bw = 0;	/* Initialize byte counter */

 

-	res = validate(fp->fs, fp->id);					/* Check validity of the object */

+	res = validate(fp->fs, fp->id);			/* Check validity */

 	if (res != FR_OK) LEAVE_FF(fp->fs, res);

-	if (fp->flag & FA__ERROR)						/* Check abort flag */

+	if (fp->flag & FA__ERROR)				/* Aborted file? */

 		LEAVE_FF(fp->fs, FR_INT_ERR);

-	if (!(fp->flag & FA_WRITE))						/* Check access mode */

+	if (!(fp->flag & FA_WRITE))				/* Check access mode */

 		LEAVE_FF(fp->fs, FR_DENIED);

-	if (fp->fsize + btw < fp->fsize) btw = 0;		/* File size cannot reach 4GB */

+	if ((DWORD)(fp->fsize + btw) < fp->fsize) btw = 0;	/* File size cannot reach 4GB */

 

-	for ( ;  btw;									/* Repeat until all data transferred */

+	for ( ;  btw;							/* Repeat until all data written */

 		wbuff += wcnt, fp->fptr += wcnt, *bw += wcnt, btw -= wcnt) {

-		if ((fp->fptr % SS(fp->fs)) == 0) {			/* On the sector boundary? */

-			if (fp->csect >= fp->fs->csize) {		/* On the cluster boundary? */

-				if (fp->fptr == 0) {				/* On the top of the file? */

-					clst = fp->org_clust;			/* Follow from the origin */

-					if (clst == 0)					/* When there is no cluster chain, */

-						fp->org_clust = clst = create_chain(fp->fs, 0);	/* Create a new cluster chain */

-				} else {							/* Middle or end of the file */

-					clst = create_chain(fp->fs, fp->curr_clust);			/* Follow or streach cluster chain */

+		if ((fp->fptr % SS(fp->fs)) == 0) {	/* On the sector boundary? */

+			csect = (BYTE)(fp->fptr / SS(fp->fs) & (fp->fs->csize - 1));	/* Sector offset in the cluster */

+			if (!csect) {					/* On the cluster boundary? */

+				if (fp->fptr == 0) {		/* On the top of the file? */

+					clst = fp->sclust;		/* Follow from the origin */

+					if (clst == 0)			/* When no cluster is allocated, */

+						fp->sclust = clst = create_chain(fp->fs, 0);	/* Create a new cluster chain */

+				} else {					/* Middle or end of the file */

+#if _USE_FASTSEEK

+					if (fp->cltbl)

+						clst = clmt_clust(fp, fp->fptr);	/* Get cluster# from the CLMT */

+					else

+#endif

+						clst = create_chain(fp->fs, fp->clust);	/* Follow or stretch cluster chain on the FAT */

 				}

-				if (clst == 0) break;				/* Could not allocate a new cluster (disk full) */

+				if (clst == 0) break;		/* Could not allocate a new cluster (disk full) */

 				if (clst == 1) ABORT(fp->fs, FR_INT_ERR);

 				if (clst == 0xFFFFFFFF) ABORT(fp->fs, FR_DISK_ERR);

-				fp->curr_clust = clst;				/* Update current cluster */

-				fp->csect = 0;						/* Reset sector address in the cluster */

+				fp->clust = clst;			/* Update current cluster */

 			}

 #if _FS_TINY

-			if (fp->fs->winsect == fp->dsect && move_window(fp->fs, 0))	/* Write back data buffer prior to following direct transfer */

+			if (fp->fs->winsect == fp->dsect && move_window(fp->fs, 0))	/* Write-back sector cache */

 				ABORT(fp->fs, FR_DISK_ERR);

 #else

-			if (fp->flag & FA__DIRTY) {		/* Write back data buffer prior to following direct transfer */

-				if (disk_write(fp->fs->drive, fp->buf, fp->dsect, 1) != RES_OK)

+			if (fp->flag & FA__DIRTY) {		/* Write-back sector cache */

+				if (disk_write(fp->fs->drv, fp->buf, fp->dsect, 1) != RES_OK)

 					ABORT(fp->fs, FR_DISK_ERR);

 				fp->flag &= ~FA__DIRTY;

 			}

 #endif

-			sect = clust2sect(fp->fs, fp->curr_clust);	/* Get current sector */

+			sect = clust2sect(fp->fs, fp->clust);	/* Get current sector */

 			if (!sect) ABORT(fp->fs, FR_INT_ERR);

-			sect += fp->csect;

-			cc = btw / SS(fp->fs);					/* When remaining bytes >= sector size, */

-			if (cc) {								/* Write maximum contiguous sectors directly */

-				if (fp->csect + cc > fp->fs->csize)	/* Clip at cluster boundary */

-					cc = fp->fs->csize - fp->csect;

-				if (disk_write(fp->fs->drive, wbuff, sect, (BYTE)cc) != RES_OK)

+			sect += csect;

+			cc = btw / SS(fp->fs);			/* When remaining bytes >= sector size, */

+			if (cc) {						/* Write maximum contiguous sectors directly */

+				if (csect + cc > fp->fs->csize)	/* Clip at cluster boundary */

+					cc = fp->fs->csize - csect;

+				if (disk_write(fp->fs->drv, wbuff, sect, (BYTE)cc) != RES_OK)

 					ABORT(fp->fs, FR_DISK_ERR);

 #if _FS_TINY

-				if (fp->fs->winsect - sect < cc) {	/* Refill sector cache if it gets dirty by the direct write */

+				if (fp->fs->winsect - sect < cc) {	/* Refill sector cache if it gets invalidated by the direct write */

 					mem_cpy(fp->fs->win, wbuff + ((fp->fs->winsect - sect) * SS(fp->fs)), SS(fp->fs));

 					fp->fs->wflag = 0;

 				}

 #else

-				if (fp->dsect - sect < cc) {		/* Refill sector cache if it gets dirty by the direct write */

+				if (fp->dsect - sect < cc) { /* Refill sector cache if it gets invalidated by the direct write */

 					mem_cpy(fp->buf, wbuff + ((fp->dsect - sect) * SS(fp->fs)), SS(fp->fs));

 					fp->flag &= ~FA__DIRTY;

 				}

 #endif

-				fp->csect += (BYTE)cc;				/* Next sector address in the cluster */

-				wcnt = SS(fp->fs) * cc;				/* Number of bytes transferred */

+				wcnt = SS(fp->fs) * cc;		/* Number of bytes transferred */

 				continue;

 			}

 #if _FS_TINY

-			if (fp->fptr >= fp->fsize) {			/* Avoid silly buffer filling at growing edge */

+			if (fp->fptr >= fp->fsize) {	/* Avoid silly cache filling at growing edge */

 				if (move_window(fp->fs, 0)) ABORT(fp->fs, FR_DISK_ERR);

 				fp->fs->winsect = sect;

 			}

 #else

-			if (fp->dsect != sect) {				/* Fill sector buffer with file data */

+			if (fp->dsect != sect) {		/* Fill sector cache with file data */

 				if (fp->fptr < fp->fsize &&

-					disk_read(fp->fs->drive, fp->buf, sect, 1) != RES_OK)

+					disk_read(fp->fs->drv, fp->buf, sect, 1) != RES_OK)

 						ABORT(fp->fs, FR_DISK_ERR);

 			}

 #endif

 			fp->dsect = sect;

-			fp->csect++;							/* Next sector address in the cluster */

 		}

-		wcnt = SS(fp->fs) - (fp->fptr % SS(fp->fs));	/* Put partial sector into file I/O buffer */

+		wcnt = SS(fp->fs) - (fp->fptr % SS(fp->fs));/* Put partial sector into file I/O buffer */

 		if (wcnt > btw) wcnt = btw;

 #if _FS_TINY

-		if (move_window(fp->fs, fp->dsect))			/* Move sector window */

+		if (move_window(fp->fs, fp->dsect))	/* Move sector window */

 			ABORT(fp->fs, FR_DISK_ERR);

 		mem_cpy(&fp->fs->win[fp->fptr % SS(fp->fs)], wbuff, wcnt);	/* Fit partial sector */

 		fp->fs->wflag = 1;

@@ -1958,7 +2572,7 @@ FRESULT f_write (
 	}

 

 	if (fp->fptr > fp->fsize) fp->fsize = fp->fptr;	/* Update file size if needed */

-	fp->flag |= FA__WRITTEN;						/* Set file changed flag */

+	fp->flag |= FA__WRITTEN;						/* Set file change flag */

 

 	LEAVE_FF(fp->fs, FR_OK);

 }

@@ -1984,7 +2598,7 @@ FRESULT f_sync (
 		if (fp->flag & FA__WRITTEN) {	/* Has the file been written? */

 #if !_FS_TINY	/* Write-back dirty buffer */

 			if (fp->flag & FA__DIRTY) {

-				if (disk_write(fp->fs->drive, fp->buf, fp->dsect, 1) != RES_OK)

+				if (disk_write(fp->fs->drv, fp->buf, fp->dsect, 1) != RES_OK)

 					LEAVE_FF(fp->fs, FR_DISK_ERR);

 				fp->flag &= ~FA__DIRTY;

 			}

@@ -1995,9 +2609,8 @@ FRESULT f_sync (
 				dir = fp->dir_ptr;

 				dir[DIR_Attr] |= AM_ARC;					/* Set archive bit */

 				ST_DWORD(dir+DIR_FileSize, fp->fsize);		/* Update file size */

-				ST_WORD(dir+DIR_FstClusLO, fp->org_clust);	/* Update start cluster */

-				ST_WORD(dir+DIR_FstClusHI, fp->org_clust >> 16);

-				tim = get_fattime();			/* Updated time */

+				ST_CLUST(dir, fp->sclust);					/* Update start cluster */

+				tim = get_fattime();						/* Update updated time */

 				ST_DWORD(dir+DIR_WrtTime, tim);

 				fp->flag &= ~FA__WRITTEN;

 				fp->fs->wflag = 1;

@@ -2024,14 +2637,28 @@ FRESULT f_close (
 {

 	FRESULT res;

 

-

 #if _FS_READONLY

-	res = validate(fp->fs, fp->id);

-	if (res == FR_OK) fp->fs = NULL;

-	LEAVE_FF(fp->fs, res);

+	FATFS *fs = fp->fs;

+	res = validate(fs, fp->id);

+	if (res == FR_OK) fp->fs = 0;	/* Discard file object */

+	LEAVE_FF(fs, res);

+

 #else

-	res = f_sync(fp);

-	if (res == FR_OK) fp->fs = NULL;

+	res = f_sync(fp);		/* Flush cached data */

+#if _FS_SHARE

+	if (res == FR_OK) {		/* Decrement open counter */

+#if _FS_REENTRANT

+		res = validate(fp->fs, fp->id);

+		if (res == FR_OK) {

+			res = dec_lock(fp->lockid);

+			unlock_fs(fp->fs, FR_OK);

+		}

+#else

+		res = dec_lock(fp->lockid);

+#endif

+	}

+#endif

+	if (res == FR_OK) fp->fs = 0;	/* Discard file object */

 	return res;

 #endif

 }

@@ -2040,48 +2667,46 @@ FRESULT f_close (
 

 

 /*-----------------------------------------------------------------------*/

-/* Change Current Drive/Directory                                        */

+/* Current Drive/Directory Handlings                                     */

 /*-----------------------------------------------------------------------*/

 

-#if _FS_RPATH

+#if _FS_RPATH >= 1

 

 FRESULT f_chdrive (

 	BYTE drv		/* Drive number */

 )

 {

-	if (drv >= _DRIVES) return FR_INVALID_DRIVE;

+	if (drv >= _VOLUMES) return FR_INVALID_DRIVE;

 

-	Drive = drv;

+	CurrVol = drv;

 

 	return FR_OK;

 }

 

 

 

-

 FRESULT f_chdir (

-	const XCHAR *path	/* Pointer to the directory path */

+	const TCHAR *path	/* Pointer to the directory path */

 )

 {

 	FRESULT res;

 	DIR dj;

-	NAMEBUF(sfn, lfn);

-	BYTE *dir;

+	DEF_NAMEBUF;

 

 

 	res = chk_mounted(&path, &dj.fs, 0);

 	if (res == FR_OK) {

-		INITBUF(dj, sfn, lfn);

-		res = follow_path(&dj, path);		/* Follow the file path */

+		INIT_BUF(dj);

+		res = follow_path(&dj, path);		/* Follow the path */

+		FREE_BUF();

 		if (res == FR_OK) {					/* Follow completed */

-			dir = dj.dir;					/* Pointer to the entry */

-			if (!dir) {

-				dj.fs->cdir = 0;			/* No entry (root dir) */

+			if (!dj.dir) {

+				dj.fs->cdir = dj.sclust;	/* Start directory itself */

 			} else {

-				if (dir[DIR_Attr] & AM_DIR)	/* Reached to the dir */

-					dj.fs->cdir = ((DWORD)LD_WORD(dir+DIR_FstClusHI) << 16) | LD_WORD(dir+DIR_FstClusLO);

+				if (dj.dir[DIR_Attr] & AM_DIR)	/* Reached to the directory */

+					dj.fs->cdir = LD_CLUST(dj.dir);

 				else

-					res = FR_NO_PATH;		/* Could not reach the dir (it is a file) */

+					res = FR_NO_PATH;		/* Reached but a file */

 			}

 		}

 		if (res == FR_NO_FILE) res = FR_NO_PATH;

@@ -2090,7 +2715,78 @@ FRESULT f_chdir (
 	LEAVE_FF(dj.fs, res);

 }

 

+

+#if _FS_RPATH >= 2

+FRESULT f_getcwd (

+	TCHAR *path,	/* Pointer to the directory path */

+	UINT sz_path	/* Size of path */

+)

+{

+	FRESULT res;

+	DIR dj;

+	UINT i, n;

+	DWORD ccl;

+	TCHAR *tp;

+	FILINFO fno;

+	DEF_NAMEBUF;

+

+

+	*path = 0;

+	res = chk_mounted((const TCHAR**)&path, &dj.fs, 0);	/* Get current volume */

+	if (res == FR_OK) {

+		INIT_BUF(dj);

+		i = sz_path;		/* Bottom of buffer (dir stack base) */

+		dj.sclust = dj.fs->cdir;			/* Start to follow upper dir from current dir */

+		while ((ccl = dj.sclust) != 0) {	/* Repeat while current dir is a sub-dir */

+			res = dir_sdi(&dj, 1);			/* Get parent dir */

+			if (res != FR_OK) break;

+			res = dir_read(&dj);

+			if (res != FR_OK) break;

+			dj.sclust = LD_CLUST(dj.dir);	/* Goto parent dir */

+			res = dir_sdi(&dj, 0);

+			if (res != FR_OK) break;

+			do {							/* Find the entry links to the child dir */

+				res = dir_read(&dj);

+				if (res != FR_OK) break;

+				if (ccl == LD_CLUST(dj.dir)) break;	/* Found the entry */

+				res = dir_next(&dj, 0);

+			} while (res == FR_OK);

+			if (res == FR_NO_FILE) res = FR_INT_ERR;/* It cannot be 'not found'. */

+			if (res != FR_OK) break;

+#if _USE_LFN

+			fno.lfname = path;

+			fno.lfsize = i;

 #endif

+			get_fileinfo(&dj, &fno);		/* Get the dir name and push it to the buffer */

+			tp = fno.fname;

+			if (_USE_LFN && *path) tp = path;

+			for (n = 0; tp[n]; n++) ;

+			if (i < n + 3) {

+				res = FR_NOT_ENOUGH_CORE; break;

+			}

+			while (n) path[--i] = tp[--n];

+			path[--i] = '/';

+		}

+		tp = path;

+		if (res == FR_OK) {

+			*tp++ = '0' + CurrVol;			/* Put drive number */

+			*tp++ = ':';

+			if (i == sz_path) {				/* Root-dir */

+				*tp++ = '/';

+			} else {						/* Sub-dir */

+				do		/* Add stacked path str */

+					*tp++ = path[i++];

+				while (i < sz_path);

+			}

+		}

+		*tp = 0;

+		FREE_BUF();

+	}

+

+	LEAVE_FF(dj.fs, res);

+}

+#endif /* _FS_RPATH >= 2 */

+#endif /* _FS_RPATH >= 1 */

 

 

 

@@ -2105,94 +2801,153 @@ FRESULT f_lseek (
 )

 {

 	FRESULT res;

-	DWORD clst, bcs, nsect, ifptr;

 

 

 	res = validate(fp->fs, fp->id);		/* Check validity of the object */

 	if (res != FR_OK) LEAVE_FF(fp->fs, res);

 	if (fp->flag & FA__ERROR)			/* Check abort flag */

 		LEAVE_FF(fp->fs, FR_INT_ERR);

-	if (ofs > fp->fsize					/* In read-only mode, clip offset with the file size */

+

+#if _USE_FASTSEEK

+	if (fp->cltbl) {	/* Fast seek */

+		DWORD cl, pcl, ncl, tcl, dsc, tlen, ulen, *tbl;

+

+		if (ofs == CREATE_LINKMAP) {	/* Create CLMT */

+			tbl = fp->cltbl;

+			tlen = *tbl++; ulen = 2;	/* Given table size and required table size */

+			cl = fp->sclust;			/* Top of the chain */

+			if (cl) {

+				do {

+					/* Get a fragment */

+					tcl = cl; ncl = 0; ulen += 2;	/* Top, length and used items */

+					do {

+						pcl = cl; ncl++;

+						cl = get_fat(fp->fs, cl);

+						if (cl <= 1) ABORT(fp->fs, FR_INT_ERR);

+						if (cl == 0xFFFFFFFF) ABORT(fp->fs, FR_DISK_ERR);

+					} while (cl == pcl + 1);

+					if (ulen <= tlen) {		/* Store the length and top of the fragment */

+						*tbl++ = ncl; *tbl++ = tcl;

+					}

+				} while (cl < fp->fs->n_fatent);	/* Repeat until end of chain */

+			}

+			*fp->cltbl = ulen;	/* Number of items used */

+			if (ulen <= tlen)

+				*tbl = 0;		/* Terminate table */

+			else

+				res = FR_NOT_ENOUGH_CORE;	/* Given table size is smaller than required */

+

+		} else {						/* Fast seek */

+			if (ofs > fp->fsize)		/* Clip offset at the file size */

+				ofs = fp->fsize;

+			fp->fptr = ofs;				/* Set file pointer */

+			if (ofs) {

+				fp->clust = clmt_clust(fp, ofs - 1);

+				dsc = clust2sect(fp->fs, fp->clust);

+				if (!dsc) ABORT(fp->fs, FR_INT_ERR);

+				dsc += (ofs - 1) / SS(fp->fs) & (fp->fs->csize - 1);

+				if (fp->fptr % SS(fp->fs) && dsc != fp->dsect) {	/* Refill sector cache if needed */

+#if !_FS_TINY

 #if !_FS_READONLY

-		 && !(fp->flag & FA_WRITE)

+					if (fp->flag & FA__DIRTY) {		/* Write-back dirty sector cache */

+						if (disk_write(fp->fs->drv, fp->buf, fp->dsect, 1) != RES_OK)

+							ABORT(fp->fs, FR_DISK_ERR);

+						fp->flag &= ~FA__DIRTY;

+					}

+#endif

+					if (disk_read(fp->fs->drv, fp->buf, dsc, 1) != RES_OK)	/* Load current sector */

+						ABORT(fp->fs, FR_DISK_ERR);

 #endif

-		) ofs = fp->fsize;

+					fp->dsect = dsc;

+				}

+			}

+		}

+	} else

+#endif

+

+	/* Normal Seek */

+	{

+		DWORD clst, bcs, nsect, ifptr;

 

-	ifptr = fp->fptr;

-	fp->fptr = nsect = 0; fp->csect = 255;

-	if (ofs > 0) {

-		bcs = (DWORD)fp->fs->csize * SS(fp->fs);	/* Cluster size (byte) */

-		if (ifptr > 0 &&

-			(ofs - 1) / bcs >= (ifptr - 1) / bcs) {	/* When seek to same or following cluster, */

-			fp->fptr = (ifptr - 1) & ~(bcs - 1);	/* start from the current cluster */

-			ofs -= fp->fptr;

-			clst = fp->curr_clust;

-		} else {									/* When seek to back cluster, */

-			clst = fp->org_clust;					/* start from the first cluster */

+		if (ofs > fp->fsize					/* In read-only mode, clip offset with the file size */

 #if !_FS_READONLY

-			if (clst == 0) {						/* If no cluster chain, create a new chain */

-				clst = create_chain(fp->fs, 0);

-				if (clst == 1) ABORT(fp->fs, FR_INT_ERR);

-				if (clst == 0xFFFFFFFF) ABORT(fp->fs, FR_DISK_ERR);

-				fp->org_clust = clst;

-			}

+			 && !(fp->flag & FA_WRITE)

 #endif

-			fp->curr_clust = clst;

-		}

-		if (clst != 0) {

-			while (ofs > bcs) {						/* Cluster following loop */

+			) ofs = fp->fsize;

+

+		ifptr = fp->fptr;

+		fp->fptr = nsect = 0;

+		if (ofs) {

+			bcs = (DWORD)fp->fs->csize * SS(fp->fs);	/* Cluster size (byte) */

+			if (ifptr > 0 &&

+				(ofs - 1) / bcs >= (ifptr - 1) / bcs) {	/* When seek to same or following cluster, */

+				fp->fptr = (ifptr - 1) & ~(bcs - 1);	/* start from the current cluster */

+				ofs -= fp->fptr;

+				clst = fp->clust;

+			} else {									/* When seek to back cluster, */

+				clst = fp->sclust;						/* start from the first cluster */

 #if !_FS_READONLY

-				if (fp->flag & FA_WRITE) {			/* Check if in write mode or not */

-					clst = create_chain(fp->fs, clst);	/* Force streached if in write mode */

-					if (clst == 0) {				/* When disk gets full, clip file size */

-						ofs = bcs; break;

-					}

-				} else

+				if (clst == 0) {						/* If no cluster chain, create a new chain */

+					clst = create_chain(fp->fs, 0);

+					if (clst == 1) ABORT(fp->fs, FR_INT_ERR);

+					if (clst == 0xFFFFFFFF) ABORT(fp->fs, FR_DISK_ERR);

+					fp->sclust = clst;

+				}

 #endif

-					clst = get_fat(fp->fs, clst);	/* Follow cluster chain if not in write mode */

-				if (clst == 0xFFFFFFFF) ABORT(fp->fs, FR_DISK_ERR);

-				if (clst <= 1 || clst >= fp->fs->max_clust) ABORT(fp->fs, FR_INT_ERR);

-				fp->curr_clust = clst;

-				fp->fptr += bcs;

-				ofs -= bcs;

+				fp->clust = clst;

 			}

-			fp->fptr += ofs;

-			fp->csect = (BYTE)(ofs / SS(fp->fs));	/* Sector offset in the cluster */

-			if (ofs % SS(fp->fs)) {

-				nsect = clust2sect(fp->fs, clst);	/* Current sector */

-				if (!nsect) ABORT(fp->fs, FR_INT_ERR);

-				nsect += fp->csect;

-				fp->csect++;

+			if (clst != 0) {

+				while (ofs > bcs) {						/* Cluster following loop */

+#if !_FS_READONLY

+					if (fp->flag & FA_WRITE) {			/* Check if in write mode or not */

+						clst = create_chain(fp->fs, clst);	/* Force stretch if in write mode */

+						if (clst == 0) {				/* When disk gets full, clip file size */

+							ofs = bcs; break;

+						}

+					} else

+#endif

+						clst = get_fat(fp->fs, clst);	/* Follow cluster chain if not in write mode */

+					if (clst == 0xFFFFFFFF) ABORT(fp->fs, FR_DISK_ERR);

+					if (clst <= 1 || clst >= fp->fs->n_fatent) ABORT(fp->fs, FR_INT_ERR);

+					fp->clust = clst;

+					fp->fptr += bcs;

+					ofs -= bcs;

+				}

+				fp->fptr += ofs;

+				if (ofs % SS(fp->fs)) {

+					nsect = clust2sect(fp->fs, clst);	/* Current sector */

+					if (!nsect) ABORT(fp->fs, FR_INT_ERR);

+					nsect += ofs / SS(fp->fs);

+				}

 			}

 		}

-	}

-	if (fp->fptr % SS(fp->fs) && nsect != fp->dsect) {

+		if (fp->fptr % SS(fp->fs) && nsect != fp->dsect) {	/* Fill sector cache if needed */

 #if !_FS_TINY

 #if !_FS_READONLY

-		if (fp->flag & FA__DIRTY) {			/* Write-back dirty buffer if needed */

-			if (disk_write(fp->fs->drive, fp->buf, fp->dsect, 1) != RES_OK)

-				ABORT(fp->fs, FR_DISK_ERR);

-			fp->flag &= ~FA__DIRTY;

-		}

+			if (fp->flag & FA__DIRTY) {			/* Write-back dirty sector cache */

+				if (disk_write(fp->fs->drv, fp->buf, fp->dsect, 1) != RES_OK)

+					ABORT(fp->fs, FR_DISK_ERR);

+				fp->flag &= ~FA__DIRTY;

+			}

 #endif

-		if (disk_read(fp->fs->drive, fp->buf, nsect, 1) != RES_OK)

-			ABORT(fp->fs, FR_DISK_ERR);

+			if (disk_read(fp->fs->drv, fp->buf, nsect, 1) != RES_OK)	/* Fill sector cache */

+				ABORT(fp->fs, FR_DISK_ERR);

 #endif

-		fp->dsect = nsect;

-	}

+			fp->dsect = nsect;

+		}

 #if !_FS_READONLY

-	if (fp->fptr > fp->fsize) {			/* Set changed flag if the file size is extended */

-		fp->fsize = fp->fptr;

-		fp->flag |= FA__WRITTEN;

-	}

+		if (fp->fptr > fp->fsize) {			/* Set file change flag if the file size is extended */

+			fp->fsize = fp->fptr;

+			fp->flag |= FA__WRITTEN;

+		}

 #endif

+	}

 

 	LEAVE_FF(fp->fs, res);

 }

 

 

 

-

 #if _FS_MINIMIZE <= 1

 /*-----------------------------------------------------------------------*/

 /* Create a Directroy Object                                             */

@@ -2200,30 +2955,29 @@ FRESULT f_lseek (
 

 FRESULT f_opendir (

 	DIR *dj,			/* Pointer to directory object to create */

-	const XCHAR *path	/* Pointer to the directory path */

+	const TCHAR *path	/* Pointer to the directory path */

 )

 {

 	FRESULT res;

-	NAMEBUF(sfn, lfn);

-	BYTE *dir;

+	DEF_NAMEBUF;

 

 

 	res = chk_mounted(&path, &dj->fs, 0);

 	if (res == FR_OK) {

-		INITBUF((*dj), sfn, lfn);

+		INIT_BUF(*dj);

 		res = follow_path(dj, path);			/* Follow the path to the directory */

+		FREE_BUF();

 		if (res == FR_OK) {						/* Follow completed */

-			dir = dj->dir;

-			if (dir) {							/* It is not the root dir */

-				if (dir[DIR_Attr] & AM_DIR) {	/* The object is a directory */

-					dj->sclust = ((DWORD)LD_WORD(dir+DIR_FstClusHI) << 16) | LD_WORD(dir+DIR_FstClusLO);

+			if (dj->dir) {						/* It is not the root dir */

+				if (dj->dir[DIR_Attr] & AM_DIR) {	/* The object is a directory */

+					dj->sclust = LD_CLUST(dj->dir);

 				} else {						/* The object is not a directory */

 					res = FR_NO_PATH;

 				}

 			}

 			if (res == FR_OK) {

 				dj->id = dj->fs->id;

-				res = dir_seek(dj, 0);			/* Rewind dir */

+				res = dir_sdi(dj, 0);			/* Rewind dir */

 			}

 		}

 		if (res == FR_NO_FILE) res = FR_NO_PATH;

@@ -2245,28 +2999,29 @@ FRESULT f_readdir (
 )

 {

 	FRESULT res;

-	NAMEBUF(sfn, lfn);

+	DEF_NAMEBUF;

 

 

 	res = validate(dj->fs, dj->id);			/* Check validity of the object */

 	if (res == FR_OK) {

-		INITBUF((*dj), sfn, lfn);

 		if (!fno) {

-			res = dir_seek(dj, 0);

+			res = dir_sdi(dj, 0);			/* Rewind the directory object */

 		} else {

-			res = dir_read(dj);

-			if (res == FR_NO_FILE) {

+			INIT_BUF(*dj);

+			res = dir_read(dj);				/* Read an directory item */

+			if (res == FR_NO_FILE) {		/* Reached end of dir */

 				dj->sect = 0;

 				res = FR_OK;

 			}

 			if (res == FR_OK) {				/* A valid entry is found */

 				get_fileinfo(dj, fno);		/* Get the object information */

-				res = dir_next(dj, FALSE);	/* Increment index for next */

+				res = dir_next(dj, 0);		/* Increment index for next */

 				if (res == FR_NO_FILE) {

 					dj->sect = 0;

 					res = FR_OK;

 				}

 			}

+			FREE_BUF();

 		}

 	}

 

@@ -2281,25 +3036,26 @@ FRESULT f_readdir (
 /*-----------------------------------------------------------------------*/

 

 FRESULT f_stat (

-	const XCHAR *path,	/* Pointer to the file path */

+	const TCHAR *path,	/* Pointer to the file path */

 	FILINFO *fno		/* Pointer to file information to return */

 )

 {

 	FRESULT res;

 	DIR dj;

-	NAMEBUF(sfn, lfn);

+	DEF_NAMEBUF;

 

 

 	res = chk_mounted(&path, &dj.fs, 0);

 	if (res == FR_OK) {

-		INITBUF(dj, sfn, lfn);

+		INIT_BUF(dj);

 		res = follow_path(&dj, path);	/* Follow the file path */

-		if (res == FR_OK) {				/* Follwo completed */

-			if (dj.dir)	/* Found an object */

+		if (res == FR_OK) {				/* Follow completed */

+			if (dj.dir)		/* Found an object */

 				get_fileinfo(&dj, fno);

-			else		/* It is root dir */

+			else			/* It is root dir */

 				res = FR_INVALID_NAME;

 		}

+		FREE_BUF();

 	}

 

 	LEAVE_FF(dj.fs, res);

@@ -2313,7 +3069,7 @@ FRESULT f_stat (
 /*-----------------------------------------------------------------------*/

 

 FRESULT f_getfree (

-	const XCHAR *path,	/* Pointer to the logical drive number (root dir) */

+	const TCHAR *path,	/* Pointer to the logical drive number (root dir) */

 	DWORD *nclst,		/* Pointer to the variable to return number of free clusters */

 	FATFS **fatfs		/* Pointer to pointer to corresponding file system object to return */

 )

@@ -2326,51 +3082,48 @@ FRESULT f_getfree (
 

 	/* Get drive number */

 	res = chk_mounted(&path, fatfs, 0);

-	if (res != FR_OK) LEAVE_FF(*fatfs, res);

-

-	/* If number of free cluster is valid, return it without cluster scan. */

-	if ((*fatfs)->free_clust <= (*fatfs)->max_clust - 2) {

-		*nclst = (*fatfs)->free_clust;

-		LEAVE_FF(*fatfs, FR_OK);

-	}

-

-	/* Get number of free clusters */

-	fat = (*fatfs)->fs_type;

-	n = 0;

-	if (fat == FS_FAT12) {

-		clst = 2;

-		do {

-			stat = get_fat(*fatfs, clst);

-			if (stat == 0xFFFFFFFF) LEAVE_FF(*fatfs, FR_DISK_ERR);

-			if (stat == 1) LEAVE_FF(*fatfs, FR_INT_ERR);

-			if (stat == 0) n++;

-		} while (++clst < (*fatfs)->max_clust);

-	} else {

-		clst = (*fatfs)->max_clust;

-		sect = (*fatfs)->fatbase;

-		i = 0; p = 0;

-		do {

-			if (!i) {

-				res = move_window(*fatfs, sect++);

-				if (res != FR_OK)

-					LEAVE_FF(*fatfs, res);

-				p = (*fatfs)->win;

-				i = SS(*fatfs);

-			}

-			if (fat == FS_FAT16) {

-				if (LD_WORD(p) == 0) n++;

-				p += 2; i -= 2;

+	if (res == FR_OK) {

+		/* If free_clust is valid, return it without full cluster scan */

+		if ((*fatfs)->free_clust <= (*fatfs)->n_fatent - 2) {

+			*nclst = (*fatfs)->free_clust;

+		} else {

+			/* Get number of free clusters */

+			fat = (*fatfs)->fs_type;

+			n = 0;

+			if (fat == FS_FAT12) {

+				clst = 2;

+				do {

+					stat = get_fat(*fatfs, clst);

+					if (stat == 0xFFFFFFFF) { res = FR_DISK_ERR; break; }

+					if (stat == 1) { res = FR_INT_ERR; break; }

+					if (stat == 0) n++;

+				} while (++clst < (*fatfs)->n_fatent);

 			} else {

-				if ((LD_DWORD(p) & 0x0FFFFFFF) == 0) n++;

-				p += 4; i -= 4;

+				clst = (*fatfs)->n_fatent;

+				sect = (*fatfs)->fatbase;

+				i = 0; p = 0;

+				do {

+					if (!i) {

+						res = move_window(*fatfs, sect++);

+						if (res != FR_OK) break;

+						p = (*fatfs)->win;

+						i = SS(*fatfs);

+					}

+					if (fat == FS_FAT16) {

+						if (LD_WORD(p) == 0) n++;

+						p += 2; i -= 2;

+					} else {

+						if ((LD_DWORD(p) & 0x0FFFFFFF) == 0) n++;

+						p += 4; i -= 4;

+					}

+				} while (--clst);

 			}

-		} while (--clst);

+			(*fatfs)->free_clust = n;

+			if (fat == FS_FAT32) (*fatfs)->fsi_flag = 1;

+			*nclst = n;

+		}

 	}

-	(*fatfs)->free_clust = n;

-	if (fat == FS_FAT32) (*fatfs)->fsi_flag = 1;

-	*nclst = n;

-

-	LEAVE_FF(*fatfs, FR_OK);

+	LEAVE_FF(*fatfs, res);

 }

 

 

@@ -2389,30 +3142,34 @@ FRESULT f_truncate (
 

 

 	res = validate(fp->fs, fp->id);		/* Check validity of the object */

-	if (res != FR_OK) LEAVE_FF(fp->fs, res);

-	if (fp->flag & FA__ERROR)			/* Check abort flag */

-		LEAVE_FF(fp->fs, FR_INT_ERR);

-	if (!(fp->flag & FA_WRITE))			/* Check access mode */

-		LEAVE_FF(fp->fs, FR_DENIED);

-

-	if (fp->fsize > fp->fptr) {

-		fp->fsize = fp->fptr;	/* Set file size to current R/W point */

-		fp->flag |= FA__WRITTEN;

-		if (fp->fptr == 0) {	/* When set file size to zero, remove entire cluster chain */

-			res = remove_chain(fp->fs, fp->org_clust);

-			fp->org_clust = 0;

-		} else {				/* When truncate a part of the file, remove remaining clusters */

-			ncl = get_fat(fp->fs, fp->curr_clust);

-			res = FR_OK;

-			if (ncl == 0xFFFFFFFF) res = FR_DISK_ERR;

-			if (ncl == 1) res = FR_INT_ERR;

-			if (res == FR_OK && ncl < fp->fs->max_clust) {

-				res = put_fat(fp->fs, fp->curr_clust, 0x0FFFFFFF);

-				if (res == FR_OK) res = remove_chain(fp->fs, ncl);

+	if (res == FR_OK) {

+		if (fp->flag & FA__ERROR) {			/* Check abort flag */

+			res = FR_INT_ERR;

+		} else {

+			if (!(fp->flag & FA_WRITE))		/* Check access mode */

+				res = FR_DENIED;

+		}

+	}

+	if (res == FR_OK) {

+		if (fp->fsize > fp->fptr) {

+			fp->fsize = fp->fptr;	/* Set file size to current R/W point */

+			fp->flag |= FA__WRITTEN;

+			if (fp->fptr == 0) {	/* When set file size to zero, remove entire cluster chain */

+				res = remove_chain(fp->fs, fp->sclust);

+				fp->sclust = 0;

+			} else {				/* When truncate a part of the file, remove remaining clusters */

+				ncl = get_fat(fp->fs, fp->clust);

+				res = FR_OK;

+				if (ncl == 0xFFFFFFFF) res = FR_DISK_ERR;

+				if (ncl == 1) res = FR_INT_ERR;

+				if (res == FR_OK && ncl < fp->fs->n_fatent) {

+					res = put_fat(fp->fs, fp->clust, 0x0FFFFFFF);

+					if (res == FR_OK) res = remove_chain(fp->fs, ncl);

+				}

 			}

 		}

+		if (res != FR_OK) fp->flag |= FA__ERROR;

 	}

-	if (res != FR_OK) fp->flag |= FA__ERROR;

 

 	LEAVE_FF(fp->fs, res);

 }

@@ -2425,50 +3182,63 @@ FRESULT f_truncate (
 /*-----------------------------------------------------------------------*/

 

 FRESULT f_unlink (

-	const XCHAR *path		/* Pointer to the file or directory path */

+	const TCHAR *path		/* Pointer to the file or directory path */

 )

 {

 	FRESULT res;

 	DIR dj, sdj;

-	NAMEBUF(sfn, lfn);

 	BYTE *dir;

 	DWORD dclst;

+	DEF_NAMEBUF;

 

 

 	res = chk_mounted(&path, &dj.fs, 1);

-	if (res != FR_OK) LEAVE_FF(dj.fs, res);

-

-	INITBUF(dj, sfn, lfn);

-	res = follow_path(&dj, path);			/* Follow the file path */

-	if (_FS_RPATH && res == FR_OK && (dj.fn[NS] & NS_DOT))

-		res = FR_INVALID_NAME;

-	if (res != FR_OK) LEAVE_FF(dj.fs, res); /* Follow failed */

-

-	dir = dj.dir;

-	if (!dir)								/* Is it the root directory? */

-		LEAVE_FF(dj.fs, FR_INVALID_NAME);

-	if (dir[DIR_Attr] & AM_RDO)				/* Is it a R/O object? */

-		LEAVE_FF(dj.fs, FR_DENIED);

-	dclst = ((DWORD)LD_WORD(dir+DIR_FstClusHI) << 16) | LD_WORD(dir+DIR_FstClusLO);

-

-	if (dir[DIR_Attr] & AM_DIR) {			/* It is a sub-directory */

-		if (dclst < 2) LEAVE_FF(dj.fs, FR_INT_ERR);

-		mem_cpy(&sdj, &dj, sizeof(DIR));	/* Check if the sub-dir is empty or not */

-		sdj.sclust = dclst;

-		res = dir_seek(&sdj, 2);

-		if (res != FR_OK) LEAVE_FF(dj.fs, res);

-		res = dir_read(&sdj);

-		if (res == FR_OK) res = FR_DENIED;	/* Not empty sub-dir */

-		if (res != FR_NO_FILE) LEAVE_FF(dj.fs, res);

-	}

-

-	res = dir_remove(&dj);					/* Remove directory entry */

 	if (res == FR_OK) {

-		if (dclst)

-			res = remove_chain(dj.fs, dclst);	/* Remove the cluster chain */

-		if (res == FR_OK) res = sync(dj.fs);

+		INIT_BUF(dj);

+		res = follow_path(&dj, path);		/* Follow the file path */

+		if (_FS_RPATH && res == FR_OK && (dj.fn[NS] & NS_DOT))

+			res = FR_INVALID_NAME;			/* Cannot remove dot entry */

+#if _FS_SHARE

+		if (res == FR_OK) res = chk_lock(&dj, 2);	/* Cannot remove open file */

+#endif

+		if (res == FR_OK) {					/* The object is accessible */

+			dir = dj.dir;

+			if (!dir) {

+				res = FR_INVALID_NAME;		/* Cannot remove the start directory */

+			} else {

+				if (dir[DIR_Attr] & AM_RDO)

+					res = FR_DENIED;		/* Cannot remove R/O object */

+			}

+			dclst = LD_CLUST(dir);

+			if (res == FR_OK && (dir[DIR_Attr] & AM_DIR)) {	/* Is it a sub-dir? */

+				if (dclst < 2) {

+					res = FR_INT_ERR;

+				} else {

+					mem_cpy(&sdj, &dj, sizeof(DIR));	/* Check if the sub-dir is empty or not */

+					sdj.sclust = dclst;

+					res = dir_sdi(&sdj, 2);		/* Exclude dot entries */

+					if (res == FR_OK) {

+						res = dir_read(&sdj);

+						if (res == FR_OK			/* Not empty dir */

+#if _FS_RPATH

+						|| dclst == sdj.fs->cdir	/* Current dir */

+#endif

+						) res = FR_DENIED;

+						if (res == FR_NO_FILE) res = FR_OK;	/* Empty */

+					}

+				}

+			}

+			if (res == FR_OK) {

+				res = dir_remove(&dj);		/* Remove the directory entry */

+				if (res == FR_OK) {

+					if (dclst)				/* Remove the cluster chain if exist */

+						res = remove_chain(dj.fs, dclst);

+					if (res == FR_OK) res = sync(dj.fs);

+				}

+			}

+		}

+		FREE_BUF();

 	}

-

 	LEAVE_FF(dj.fs, res);

 }

 

@@ -2480,72 +3250,66 @@ FRESULT f_unlink (
 /*-----------------------------------------------------------------------*/

 

 FRESULT f_mkdir (

-	const XCHAR *path		/* Pointer to the directory path */

+	const TCHAR *path		/* Pointer to the directory path */

 )

 {

 	FRESULT res;

 	DIR dj;

-	NAMEBUF(sfn, lfn);

 	BYTE *dir, n;

-	DWORD dsect, dclst, pclst, tim;

+	DWORD dsc, dcl, pcl, tim = get_fattime();

+	DEF_NAMEBUF;

 

 

 	res = chk_mounted(&path, &dj.fs, 1);

-	if (res != FR_OK) LEAVE_FF(dj.fs, res);

-

-	INITBUF(dj, sfn, lfn);

-	res = follow_path(&dj, path);			/* Follow the file path */

-	if (res == FR_OK) res = FR_EXIST;		/* Any file or directory is already existing */

-	if (_FS_RPATH && res == FR_NO_FILE && (dj.fn[NS] & NS_DOT))

-		res = FR_INVALID_NAME;

-	if (res != FR_NO_FILE)					/* Any error occured */

-		LEAVE_FF(dj.fs, res);

-

-	dclst = create_chain(dj.fs, 0);			/* Allocate a new cluster for new directory table */

-	res = FR_OK;

-	if (dclst == 0) res = FR_DENIED;

-	if (dclst == 1) res = FR_INT_ERR;

-	if (dclst == 0xFFFFFFFF) res = FR_DISK_ERR;

-	if (res == FR_OK)

-		res = move_window(dj.fs, 0);

-	if (res != FR_OK) LEAVE_FF(dj.fs, res);

-	dsect = clust2sect(dj.fs, dclst);

-

-	dir = dj.fs->win;						/* Initialize the new directory table */

-	mem_set(dir, 0, SS(dj.fs));

-	mem_set(dir+DIR_Name, ' ', 8+3);		/* Create "." entry */

-	dir[DIR_Name] = '.';

-	dir[DIR_Attr] = AM_DIR;

-	tim = get_fattime();

-	ST_DWORD(dir+DIR_WrtTime, tim);

-	ST_WORD(dir+DIR_FstClusLO, dclst);

-	ST_WORD(dir+DIR_FstClusHI, dclst >> 16);

-	mem_cpy(dir+32, dir, 32); 			/* Create ".." entry */

-	dir[33] = '.';

-	pclst = dj.sclust;

-	if (dj.fs->fs_type == FS_FAT32 && pclst == dj.fs->dirbase)

-		pclst = 0;

-	ST_WORD(dir+32+DIR_FstClusLO, pclst);

-	ST_WORD(dir+32+DIR_FstClusHI, pclst >> 16);

-	for (n = 0; n < dj.fs->csize; n++) {	/* Write dot entries and clear left sectors */

-		dj.fs->winsect = dsect++;

-		dj.fs->wflag = 1;

-		res = move_window(dj.fs, 0);

-		if (res) LEAVE_FF(dj.fs, res);

-		mem_set(dir, 0, SS(dj.fs));

-	}

-

-	res = dir_register(&dj);

-	if (res != FR_OK) {

-		remove_chain(dj.fs, dclst);

-	} else {

-		dir = dj.dir;

-		dir[DIR_Attr] = AM_DIR;					/* Attribute */

-		ST_DWORD(dir+DIR_WrtTime, tim);			/* Crated time */

-		ST_WORD(dir+DIR_FstClusLO, dclst);		/* Table start cluster */

-		ST_WORD(dir+DIR_FstClusHI, dclst >> 16);

-		dj.fs->wflag = 1;

-		res = sync(dj.fs);

+	if (res == FR_OK) {

+		INIT_BUF(dj);

+		res = follow_path(&dj, path);			/* Follow the file path */

+		if (res == FR_OK) res = FR_EXIST;		/* Any object with same name is already existing */

+		if (_FS_RPATH && res == FR_NO_FILE && (dj.fn[NS] & NS_DOT))

+			res = FR_INVALID_NAME;

+		if (res == FR_NO_FILE) {				/* Can create a new directory */

+			dcl = create_chain(dj.fs, 0);		/* Allocate a cluster for the new directory table */

+			res = FR_OK;

+			if (dcl == 0) res = FR_DENIED;		/* No space to allocate a new cluster */

+			if (dcl == 1) res = FR_INT_ERR;

+			if (dcl == 0xFFFFFFFF) res = FR_DISK_ERR;

+			if (res == FR_OK)					/* Flush FAT */

+				res = move_window(dj.fs, 0);

+			if (res == FR_OK) {					/* Initialize the new directory table */

+				dsc = clust2sect(dj.fs, dcl);

+				dir = dj.fs->win;

+				mem_set(dir, 0, SS(dj.fs));

+				mem_set(dir+DIR_Name, ' ', 8+3);	/* Create "." entry */

+				dir[DIR_Name] = '.';

+				dir[DIR_Attr] = AM_DIR;

+				ST_DWORD(dir+DIR_WrtTime, tim);

+				ST_CLUST(dir, dcl);

+				mem_cpy(dir+SZ_DIR, dir, SZ_DIR); 	/* Create ".." entry */

+				dir[33] = '.'; pcl = dj.sclust;

+				if (dj.fs->fs_type == FS_FAT32 && pcl == dj.fs->dirbase)

+					pcl = 0;

+				ST_CLUST(dir+SZ_DIR, pcl);

+				for (n = dj.fs->csize; n; n--) {	/* Write dot entries and clear following sectors */

+					dj.fs->winsect = dsc++;

+					dj.fs->wflag = 1;

+					res = move_window(dj.fs, 0);

+					if (res != FR_OK) break;

+					mem_set(dir, 0, SS(dj.fs));

+				}

+			}

+			if (res == FR_OK) res = dir_register(&dj);	/* Register the object to the directoy */

+			if (res != FR_OK) {

+				remove_chain(dj.fs, dcl);			/* Could not register, remove cluster chain */

+			} else {

+				dir = dj.dir;

+				dir[DIR_Attr] = AM_DIR;				/* Attribute */

+				ST_DWORD(dir+DIR_WrtTime, tim);		/* Created time */

+				ST_CLUST(dir, dcl);					/* Table start cluster */

+				dj.fs->wflag = 1;

+				res = sync(dj.fs);

+			}

+		}

+		FREE_BUF();

 	}

 

 	LEAVE_FF(dj.fs, res);

@@ -2555,25 +3319,26 @@ FRESULT f_mkdir (
 

 

 /*-----------------------------------------------------------------------*/

-/* Change File Attribute                                                 */

+/* Change Attribute                                                      */

 /*-----------------------------------------------------------------------*/

 

 FRESULT f_chmod (

-	const XCHAR *path,	/* Pointer to the file path */

+	const TCHAR *path,	/* Pointer to the file path */

 	BYTE value,			/* Attribute bits */

 	BYTE mask			/* Attribute mask to change */

 )

 {

 	FRESULT res;

 	DIR dj;

-	NAMEBUF(sfn, lfn);

 	BYTE *dir;

+	DEF_NAMEBUF;

 

 

 	res = chk_mounted(&path, &dj.fs, 1);

 	if (res == FR_OK) {

-		INITBUF(dj, sfn, lfn);

+		INIT_BUF(dj);

 		res = follow_path(&dj, path);		/* Follow the file path */

+		FREE_BUF();

 		if (_FS_RPATH && res == FR_OK && (dj.fn[NS] & NS_DOT))

 			res = FR_INVALID_NAME;

 		if (res == FR_OK) {

@@ -2600,27 +3365,28 @@ FRESULT f_chmod (
 /*-----------------------------------------------------------------------*/

 

 FRESULT f_utime (

-	const XCHAR *path,	/* Pointer to the file/directory name */

-	const FILINFO *fno	/* Pointer to the timestamp to be set */

+	const TCHAR *path,	/* Pointer to the file/directory name */

+	const FILINFO *fno	/* Pointer to the time stamp to be set */

 )

 {

 	FRESULT res;

 	DIR dj;

-	NAMEBUF(sfn, lfn);

 	BYTE *dir;

+	DEF_NAMEBUF;

 

 

 	res = chk_mounted(&path, &dj.fs, 1);

 	if (res == FR_OK) {

-		INITBUF(dj, sfn, lfn);

+		INIT_BUF(dj);

 		res = follow_path(&dj, path);	/* Follow the file path */

+		FREE_BUF();

 		if (_FS_RPATH && res == FR_OK && (dj.fn[NS] & NS_DOT))

 			res = FR_INVALID_NAME;

 		if (res == FR_OK) {

 			dir = dj.dir;

-			if (!dir) {				/* Root directory */

+			if (!dir) {					/* Root directory */

 				res = FR_INVALID_NAME;

-			} else {				/* File or sub-directory */

+			} else {					/* File or sub-directory */

 				ST_WORD(dir+DIR_WrtTime, fno->ftime);

 				ST_WORD(dir+DIR_WrtDate, fno->fdate);

 				dj.fs->wflag = 1;

@@ -2640,64 +3406,70 @@ FRESULT f_utime (
 /*-----------------------------------------------------------------------*/

 

 FRESULT f_rename (

-	const XCHAR *path_old,	/* Pointer to the old name */

-	const XCHAR *path_new	/* Pointer to the new name */

+	const TCHAR *path_old,	/* Pointer to the old name */

+	const TCHAR *path_new	/* Pointer to the new name */

 )

 {

 	FRESULT res;

-	DIR dj_old, dj_new;

-	NAMEBUF(sfn, lfn);

+	DIR djo, djn;

 	BYTE buf[21], *dir;

 	DWORD dw;

+	DEF_NAMEBUF;

 

 

-	INITBUF(dj_old, sfn, lfn);

-	res = chk_mounted(&path_old, &dj_old.fs, 1);

+	res = chk_mounted(&path_old, &djo.fs, 1);

 	if (res == FR_OK) {

-		dj_new.fs = dj_old.fs;

-		res = follow_path(&dj_old, path_old);	/* Check old object */

-		if (_FS_RPATH && res == FR_OK && (dj_old.fn[NS] & NS_DOT))

+		djn.fs = djo.fs;

+		INIT_BUF(djo);

+		res = follow_path(&djo, path_old);		/* Check old object */

+		if (_FS_RPATH && res == FR_OK && (djo.fn[NS] & NS_DOT))

 			res = FR_INVALID_NAME;

-	}

-	if (res != FR_OK) LEAVE_FF(dj_old.fs, res);	/* The old object is not found */

-

-	if (!dj_old.dir) LEAVE_FF(dj_old.fs, FR_NO_FILE);	/* Is root dir? */

-	mem_cpy(buf, dj_old.dir+DIR_Attr, 21);		/* Save the object information */

-

-	mem_cpy(&dj_new, &dj_old, sizeof(DIR));

-	res = follow_path(&dj_new, path_new);		/* Check new object */

-	if (res == FR_OK) res = FR_EXIST;			/* The new object name is already existing */

-	if (res == FR_NO_FILE) { 					/* Is it a valid path and no name collision? */

-		res = dir_register(&dj_new);			/* Register the new object */

-		if (res == FR_OK) {

-			dir = dj_new.dir;					/* Copy object information into new entry */

-			mem_cpy(dir+13, buf+2, 19);

-			dir[DIR_Attr] = buf[0] | AM_ARC;

-			dj_old.fs->wflag = 1;

-			if (dir[DIR_Attr] & AM_DIR) {		/* Update .. entry in the directory if needed */

-				dw = clust2sect(dj_new.fs, (DWORD)LD_WORD(dir+DIR_FstClusHI) | LD_WORD(dir+DIR_FstClusLO));

-				if (!dw) {

-					res = FR_INT_ERR;

-				} else {

-					res = move_window(dj_new.fs, dw);

-					dir = dj_new.fs->win+32;

-					if (res == FR_OK && dir[1] == '.') {

-						dw = (dj_new.fs->fs_type == FS_FAT32 && dj_new.sclust == dj_new.fs->dirbase) ? 0 : dj_new.sclust;

-						ST_WORD(dir+DIR_FstClusLO, dw);

-						ST_WORD(dir+DIR_FstClusHI, dw >> 16);

-						dj_new.fs->wflag = 1;

+#if _FS_SHARE

+		if (res == FR_OK) res = chk_lock(&djo, 2);

+#endif

+		if (res == FR_OK) {						/* Old object is found */

+			if (!djo.dir) {						/* Is root dir? */

+				res = FR_NO_FILE;

+			} else {

+				mem_cpy(buf, djo.dir+DIR_Attr, 21);		/* Save the object information except for name */

+				mem_cpy(&djn, &djo, sizeof(DIR));		/* Check new object */

+				res = follow_path(&djn, path_new);

+				if (res == FR_OK) res = FR_EXIST;		/* The new object name is already existing */

+				if (res == FR_NO_FILE) { 				/* Is it a valid path and no name collision? */

+/* Start critical section that any interruption or error can cause cross-link */

+					res = dir_register(&djn);			/* Register the new entry */

+					if (res == FR_OK) {

+						dir = djn.dir;					/* Copy object information except for name */

+						mem_cpy(dir+13, buf+2, 19);

+						dir[DIR_Attr] = buf[0] | AM_ARC;

+						djo.fs->wflag = 1;

+						if (djo.sclust != djn.sclust && (dir[DIR_Attr] & AM_DIR)) {		/* Update .. entry in the directory if needed */

+							dw = clust2sect(djn.fs, LD_CLUST(dir));

+							if (!dw) {

+								res = FR_INT_ERR;

+							} else {

+								res = move_window(djn.fs, dw);

+								dir = djn.fs->win+SZ_DIR;	/* .. entry */

+								if (res == FR_OK && dir[1] == '.') {

+									dw = (djn.fs->fs_type == FS_FAT32 && djn.sclust == djn.fs->dirbase) ? 0 : djn.sclust;

+									ST_CLUST(dir, dw);

+									djn.fs->wflag = 1;

+								}

+							}

+						}

+						if (res == FR_OK) {

+							res = dir_remove(&djo);		/* Remove old entry */

+							if (res == FR_OK)

+								res = sync(djo.fs);

+						}

 					}

+/* End critical section */

 				}

 			}

-			if (res == FR_OK) {

-				res = dir_remove(&dj_old);			/* Remove old entry */

-				if (res == FR_OK)

-					res = sync(dj_old.fs);

-			}

 		}

+		FREE_BUF();

 	}

-

-	LEAVE_FF(dj_old.fs, res);

+	LEAVE_FF(djo.fs, res);

 }

 

 #endif /* !_FS_READONLY */

@@ -2708,7 +3480,7 @@ FRESULT f_rename (
 

 

 /*-----------------------------------------------------------------------*/

-/* Forward data to the stream directly (Available on only _FS_TINY cfg)  */

+/* Forward data to the stream directly (available on only tiny cfg)      */

 /*-----------------------------------------------------------------------*/

 #if _USE_FORWARD && _FS_TINY

 

@@ -2722,9 +3494,10 @@ FRESULT f_forward (
 	FRESULT res;

 	DWORD remain, clst, sect;

 	UINT rcnt;

+	BYTE csect;

 

 

-	*bf = 0;

+	*bf = 0;	/* Initialize byte counter */

 

 	res = validate(fp->fs, fp->id);					/* Check validity of the object */

 	if (res != FR_OK) LEAVE_FF(fp->fs, res);

@@ -2736,22 +3509,21 @@ FRESULT f_forward (
 	remain = fp->fsize - fp->fptr;

 	if (btr > remain) btr = (UINT)remain;			/* Truncate btr by remaining bytes */

 

-	for ( ;  btr && (*func)(NULL, 0);				/* Repeat until all data transferred or stream becomes busy */

+	for ( ;  btr && (*func)(0, 0);					/* Repeat until all data transferred or stream becomes busy */

 		fp->fptr += rcnt, *bf += rcnt, btr -= rcnt) {

+		csect = (BYTE)(fp->fptr / SS(fp->fs) & (fp->fs->csize - 1));	/* Sector offset in the cluster */

 		if ((fp->fptr % SS(fp->fs)) == 0) {			/* On the sector boundary? */

-			if (fp->csect >= fp->fs->csize) {		/* On the cluster boundary? */

+			if (!csect) {							/* On the cluster boundary? */

 				clst = (fp->fptr == 0) ?			/* On the top of the file? */

-					fp->org_clust : get_fat(fp->fs, fp->curr_clust);

+					fp->sclust : get_fat(fp->fs, fp->clust);

 				if (clst <= 1) ABORT(fp->fs, FR_INT_ERR);

 				if (clst == 0xFFFFFFFF) ABORT(fp->fs, FR_DISK_ERR);

-				fp->curr_clust = clst;				/* Update current cluster */

-				fp->csect = 0;						/* Reset sector address in the cluster */

+				fp->clust = clst;					/* Update current cluster */

 			}

-			fp->csect++;							/* Next sector address in the cluster */

 		}

-		sect = clust2sect(fp->fs, fp->curr_clust);	/* Get current data sector */

+		sect = clust2sect(fp->fs, fp->clust);		/* Get current data sector */

 		if (!sect) ABORT(fp->fs, FR_INT_ERR);

-		sect += fp->csect - 1;

+		sect += csect;

 		if (move_window(fp->fs, sect))				/* Move sector window */

 			ABORT(fp->fs, FR_DISK_ERR);

 		fp->dsect = sect;

@@ -2771,34 +3543,29 @@ FRESULT f_forward (
 /*-----------------------------------------------------------------------*/

 /* Create File System on the Drive                                       */

 /*-----------------------------------------------------------------------*/

-#define N_ROOTDIR	512			/* Multiple of 32 and <= 2048 */

-#define N_FATS		2			/* 1 or 2 */

-#define MAX_SECTOR	131072000UL	/* Maximum partition size */

-#define MIN_SECTOR	512UL		/* Minimum partition size */

+#define N_ROOTDIR	512		/* Number of root dir entries for FAT12/16 */

+#define N_FATS		1		/* Number of FAT copies (1 or 2) */

 

 

 FRESULT f_mkfs (

-	BYTE drv,			/* Logical drive number */

-	BYTE partition,		/* Partitioning rule 0:FDISK, 1:SFD */

-	DWORD allocsize		/* Allocation unit size [bytes] */

+	BYTE drv,		/* Logical drive number */

+	BYTE sfd,		/* Partitioning rule 0:FDISK, 1:SFD */

+	UINT au			/* Allocation unit size [bytes] */

 )

 {

-	static const DWORD sstbl[] = { 2048000, 1024000, 512000, 256000, 128000, 64000, 32000, 16000, 8000, 4000,   0 };

-	static const WORD cstbl[] =  {   32768,   16384,   8192,   4096,   2048, 16384,  8192,  4096, 2048, 1024, 512 };

-	BYTE fmt, m, *tbl;

-	DWORD b_part, b_fat, b_dir, b_data;		/* Area offset (LBA) */

-	DWORD n_part, n_rsv, n_fat, n_dir;		/* Area size */

-	DWORD n_clst, d, n;

-	WORD as;

+	static const WORD vst[] = { 1024,   512,  256,  128,   64,    32,   16,    8,    4,    2,   0};

+	static const WORD cst[] = {32768, 16384, 8192, 4096, 2048, 16384, 8192, 4096, 2048, 1024, 512};

+	BYTE fmt, md, *tbl;

+	DWORD n_clst, vs, n, wsect;

+	UINT i;

+	DWORD b_vol, b_fat, b_dir, b_data;	/* Offset (LBA) */

+	DWORD n_vol, n_rsv, n_fat, n_dir;	/* Size */

 	FATFS *fs;

 	DSTATUS stat;

 

 

-	/* Check validity of the parameters */

-	if (drv >= _DRIVES) return FR_INVALID_DRIVE;

-	if (partition >= 2) return FR_MKFS_ABORTED;

-

 	/* Check mounted drive and clear work area */

+	if (drv >= _VOLUMES) return FR_INVALID_DRIVE;

 	fs = FatFs[drv];

 	if (!fs) return FR_NOT_ENABLED;

 	fs->fs_type = 0;

@@ -2808,180 +3575,186 @@ FRESULT f_mkfs (
 	stat = disk_initialize(drv);

 	if (stat & STA_NOINIT) return FR_NOT_READY;

 	if (stat & STA_PROTECT) return FR_WRITE_PROTECTED;

-#if _MAX_SS != 512						/* Get disk sector size */

-	if (disk_ioctl(drv, GET_SECTOR_SIZE, &SS(fs)) != RES_OK

-		|| SS(fs) > _MAX_SS)

-		return FR_MKFS_ABORTED;

+#if _MAX_SS != 512					/* Get disk sector size */

+	if (disk_ioctl(drv, GET_SECTOR_SIZE, &SS(fs)) != RES_OK)

+		return FR_DISK_ERR;

 #endif

-	if (disk_ioctl(drv, GET_SECTOR_COUNT, &n_part) != RES_OK || n_part < MIN_SECTOR)

-		return FR_MKFS_ABORTED;

-	if (n_part > MAX_SECTOR) n_part = MAX_SECTOR;

-	b_part = (!partition) ? 63 : 0;		/* Boot sector */

-	n_part -= b_part;

-	for (d = 512; d <= 32768U && d != allocsize; d <<= 1) ;	/* Check validity of the allocation unit size */

-	if (d != allocsize) allocsize = 0;

-	if (!allocsize) {					/* Auto selection of cluster size */

-		d = n_part;

-		for (as = SS(fs); as > 512U; as >>= 1) d >>= 1;

-		for (n = 0; d < sstbl[n]; n++) ;

-		allocsize = cstbl[n];

+	if (disk_ioctl(drv, GET_SECTOR_COUNT, &n_vol) != RES_OK || n_vol < 128)

+		return FR_DISK_ERR;

+	b_vol = (sfd) ? 0 : 63;	/* Volume start sector */

+	n_vol -= b_vol;

+	if (au & (au - 1)) au = 0;	/* Check validity of the AU size */

+	if (!au) {					/* AU auto selection */

+		vs = n_vol / (2000 / (SS(fs) / 512));

+		for (i = 0; vs < vst[i]; i++) ;

+		au = cst[i];

 	}

-	if (allocsize < SS(fs)) allocsize = SS(fs);

+	au /= SS(fs);		/* Number of sectors per cluster */

+	if (au == 0) au = 1;

+	if (au > 128) au = 128;

 

-	allocsize /= SS(fs);		/* Number of sectors per cluster */

-

-	/* Pre-compute number of clusters and FAT type */

-	n_clst = n_part / allocsize;

+	/* Pre-compute number of clusters and FAT syb-type */

+	n_clst = n_vol / au;

 	fmt = FS_FAT12;

-	if (n_clst >= 0xFF5) fmt = FS_FAT16;

-	if (n_clst >= 0xFFF5) fmt = FS_FAT32;

+	if (n_clst >= MIN_FAT16) fmt = FS_FAT16;

+	if (n_clst >= MIN_FAT32) fmt = FS_FAT32;

 

 	/* Determine offset and size of FAT structure */

-	switch (fmt) {

-	case FS_FAT12:

-		n_fat = ((n_clst * 3 + 1) / 2 + 3 + SS(fs) - 1) / SS(fs);

-		n_rsv = 1 + partition;

-		n_dir = N_ROOTDIR * 32 / SS(fs);

-		break;

-	case FS_FAT16:

-		n_fat = ((n_clst * 2) + 4 + SS(fs) - 1) / SS(fs);

-		n_rsv = 1 + partition;

-		n_dir = N_ROOTDIR * 32 / SS(fs);

-		break;

-	default:

+	if (fmt == FS_FAT32) {

 		n_fat = ((n_clst * 4) + 8 + SS(fs) - 1) / SS(fs);

-		n_rsv = 33 - partition;

+		n_rsv = 32;

 		n_dir = 0;

+	} else {

+		n_fat = (fmt == FS_FAT12) ? (n_clst * 3 + 1) / 2 + 3 : (n_clst * 2) + 4;

+		n_fat = (n_fat + SS(fs) - 1) / SS(fs);

+		n_rsv = 1;

+		n_dir = (DWORD)N_ROOTDIR * SZ_DIR / SS(fs);

 	}

-	b_fat = b_part + n_rsv;			/* FATs start sector */

-	b_dir = b_fat + n_fat * N_FATS;	/* Directory start sector */

-	b_data = b_dir + n_dir;			/* Data start sector */

+	b_fat = b_vol + n_rsv;				/* FAT area start sector */

+	b_dir = b_fat + n_fat * N_FATS;		/* Directory area start sector */

+	b_data = b_dir + n_dir;				/* Data area start sector */

+	if (n_vol < b_data + au) return FR_MKFS_ABORTED;	/* Too small volume */

 

 	/* Align data start sector to erase block boundary (for flash memory media) */

-	if (disk_ioctl(drv, GET_BLOCK_SIZE, &n) != RES_OK) return FR_MKFS_ABORTED;

-	n = (b_data + n - 1) & ~(n - 1);

-	n_fat += (n - b_data) / N_FATS;

-	/* b_dir and b_data are no longer used below */

+	if (disk_ioctl(drv, GET_BLOCK_SIZE, &n) != RES_OK || !n || n > 32768) n = 1;

+	n = (b_data + n - 1) & ~(n - 1);	/* Next nearest erase block from current data start */

+	n = (n - b_data) / N_FATS;

+	if (fmt == FS_FAT32) {		/* FAT32: Move FAT offset */

+		n_rsv += n;

+		b_fat += n;

+	} else {					/* FAT12/16: Expand FAT size */

+		n_fat += n;

+	}

 

-	/* Determine number of cluster and final check of validity of the FAT type */

-	n_clst = (n_part - n_rsv - n_fat * N_FATS - n_dir) / allocsize;

-	if (   (fmt == FS_FAT16 && n_clst < 0xFF5)

-		|| (fmt == FS_FAT32 && n_clst < 0xFFF5))

+	/* Determine number of clusters and final check of validity of the FAT sub-type */

+	n_clst = (n_vol - n_rsv - n_fat * N_FATS - n_dir) / au;

+	if (   (fmt == FS_FAT16 && n_clst < MIN_FAT16)

+		|| (fmt == FS_FAT32 && n_clst < MIN_FAT32))

 		return FR_MKFS_ABORTED;

 

-	/* Create partition table if needed */

-	if (!partition) {

-		DWORD n_disk = b_part + n_part;

+	/* Create partition table if required */

+	if (sfd) {	/* No patition table (SFD) */

+		md = 0xF0;

+	} else {	/* With patition table (FDISK) */

+		DWORD n_disk = b_vol + n_vol;

 

 		mem_set(fs->win, 0, SS(fs));

 		tbl = fs->win+MBR_Table;

-		ST_DWORD(tbl, 0x00010180);		/* Partition start in CHS */

+		ST_DWORD(tbl, 0x00010180);			/* Partition start in CHS */

 		if (n_disk < 63UL * 255 * 1024) {	/* Partition end in CHS */

 			n_disk = n_disk / 63 / 255;

 			tbl[7] = (BYTE)n_disk;

 			tbl[6] = (BYTE)((n_disk >> 2) | 63);

 		} else {

-			ST_WORD(&tbl[6], 0xFFFF);

+			ST_WORD(&tbl[6], 0xFFFF);	/* CHS saturated */

 		}

 		tbl[5] = 254;

-		if (fmt != FS_FAT32)			/* System ID */

-			tbl[4] = (n_part < 0x10000) ? 0x04 : 0x06;

+		if (fmt != FS_FAT32)				/* System ID */

+			tbl[4] = (n_vol < 0x10000) ? 0x04 : 0x06;

 		else

 			tbl[4] = 0x0c;

-		ST_DWORD(tbl+8, 63);			/* Partition start in LBA */

-		ST_DWORD(tbl+12, n_part);		/* Partition size in LBA */

-		ST_WORD(tbl+64, 0xAA55);		/* Signature */

-		if (disk_write(drv, fs->win, 0, 1) != RES_OK)

+		ST_DWORD(tbl+8, 63);				/* Partition start in LBA */

+		ST_DWORD(tbl+12, n_vol);			/* Partition size in LBA */

+		ST_WORD(fs->win+BS_55AA, 0xAA55);	/* MBR signature */

+		if (disk_write(drv, fs->win, 0, 1) != RES_OK)	/* Put the MBR into first physical sector */

 			return FR_DISK_ERR;

-		partition = 0xF8;

-	} else {

-		partition = 0xF0;

+		md = 0xF8;

 	}

 

-	/* Create boot record */

-	tbl = fs->win;								/* Clear buffer */

+	/* Create volume boot record */

+	tbl = fs->win;							/* Clear sector */

 	mem_set(tbl, 0, SS(fs));

-	ST_DWORD(tbl+BS_jmpBoot, 0x90FEEB);			/* Boot code (jmp $, nop) */

-	ST_WORD(tbl+BPB_BytsPerSec, SS(fs));		/* Sector size */

-	tbl[BPB_SecPerClus] = (BYTE)allocsize;		/* Sectors per cluster */

-	ST_WORD(tbl+BPB_RsvdSecCnt, n_rsv);			/* Reserved sectors */

-	tbl[BPB_NumFATs] = N_FATS;					/* Number of FATs */

-	ST_WORD(tbl+BPB_RootEntCnt, SS(fs) / 32 * n_dir); /* Number of rootdir entries */

-	if (n_part < 0x10000) {						/* Number of total sectors */

-		ST_WORD(tbl+BPB_TotSec16, n_part);

+	mem_cpy(tbl, "\xEB\xFE\x90" "MSDOS5.0", 11);/* Boot jump code, OEM name */

+	i = SS(fs);								/* Sector size */

+	ST_WORD(tbl+BPB_BytsPerSec, i);

+	tbl[BPB_SecPerClus] = (BYTE)au;			/* Sectors per cluster */

+	ST_WORD(tbl+BPB_RsvdSecCnt, n_rsv);		/* Reserved sectors */

+	tbl[BPB_NumFATs] = N_FATS;				/* Number of FATs */

+	i = (fmt == FS_FAT32) ? 0 : N_ROOTDIR;	/* Number of rootdir entries */

+	ST_WORD(tbl+BPB_RootEntCnt, i);

+	if (n_vol < 0x10000) {					/* Number of total sectors */

+		ST_WORD(tbl+BPB_TotSec16, n_vol);

 	} else {

-		ST_DWORD(tbl+BPB_TotSec32, n_part);

+		ST_DWORD(tbl+BPB_TotSec32, n_vol);

 	}

-	tbl[BPB_Media] = partition;					/* Media descripter */

-	ST_WORD(tbl+BPB_SecPerTrk, 63);				/* Number of sectors per track */

-	ST_WORD(tbl+BPB_NumHeads, 255);				/* Number of heads */

-	ST_DWORD(tbl+BPB_HiddSec, b_part);			/* Hidden sectors */

-	n = get_fattime();							/* Use current time as a VSN */

-	if (fmt != FS_FAT32) {

-		ST_DWORD(tbl+BS_VolID, n);				/* Volume serial number */

-		ST_WORD(tbl+BPB_FATSz16, n_fat);		/* Number of secters per FAT */

-		tbl[BS_DrvNum] = 0x80;					/* Drive number */

-		tbl[BS_BootSig] = 0x29;					/* Extended boot signature */

-		mem_cpy(tbl+BS_VolLab, "NO NAME    FAT     ", 19);	/* Volume lavel, FAT signature */

+	tbl[BPB_Media] = md;					/* Media descriptor */

+	ST_WORD(tbl+BPB_SecPerTrk, 63);			/* Number of sectors per track */

+	ST_WORD(tbl+BPB_NumHeads, 255);			/* Number of heads */

+	ST_DWORD(tbl+BPB_HiddSec, b_vol);		/* Hidden sectors */

+	n = get_fattime();						/* Use current time as VSN */

+	if (fmt == FS_FAT32) {

+		ST_DWORD(tbl+BS_VolID32, n);		/* VSN */

+		ST_DWORD(tbl+BPB_FATSz32, n_fat);	/* Number of sectors per FAT */

+		ST_DWORD(tbl+BPB_RootClus, 2);		/* Root directory start cluster (2) */

+		ST_WORD(tbl+BPB_FSInfo, 1);			/* FSInfo record offset (VBR+1) */

+		ST_WORD(tbl+BPB_BkBootSec, 6);		/* Backup boot record offset (VBR+6) */

+		tbl[BS_DrvNum32] = 0x80;			/* Drive number */

+		tbl[BS_BootSig32] = 0x29;			/* Extended boot signature */

+		mem_cpy(tbl+BS_VolLab32, "NO NAME    " "FAT32   ", 19);	/* Volume label, FAT signature */

 	} else {

-		ST_DWORD(tbl+BS_VolID32, n);			/* Volume serial number */

-		ST_DWORD(tbl+BPB_FATSz32, n_fat);		/* Number of secters per FAT */

-		ST_DWORD(tbl+BPB_RootClus, 2);			/* Root directory cluster (2) */

-		ST_WORD(tbl+BPB_FSInfo, 1);				/* FSInfo record offset (bs+1) */

-		ST_WORD(tbl+BPB_BkBootSec, 6);			/* Backup boot record offset (bs+6) */

-		tbl[BS_DrvNum32] = 0x80;				/* Drive number */

-		tbl[BS_BootSig32] = 0x29;				/* Extended boot signature */

-		mem_cpy(tbl+BS_VolLab32, "NO NAME    FAT32   ", 19);	/* Volume lavel, FAT signature */

-	}

-	ST_WORD(tbl+BS_55AA, 0xAA55);				/* Signature */

-	if (SS(fs) > 512U) {

-		ST_WORD(tbl+SS(fs)-2, 0xAA55);

+		ST_DWORD(tbl+BS_VolID, n);			/* VSN */

+		ST_WORD(tbl+BPB_FATSz16, n_fat);	/* Number of sectors per FAT */

+		tbl[BS_DrvNum] = 0x80;				/* Drive number */

+		tbl[BS_BootSig] = 0x29;				/* Extended boot signature */

+		mem_cpy(tbl+BS_VolLab, "NO NAME    " "FAT     ", 19);	/* Volume label, FAT signature */

 	}

-	if (disk_write(drv, tbl, b_part+0, 1) != RES_OK)

+	ST_WORD(tbl+BS_55AA, 0xAA55);			/* Signature (Offset is fixed here regardless of sector size) */

+	if (disk_write(drv, tbl, b_vol, 1) != RES_OK)	/* Write VBR */

 		return FR_DISK_ERR;

-	if (fmt == FS_FAT32)

-		disk_write(drv, tbl, b_part+6, 1);

+	if (fmt == FS_FAT32)							/* Write backup VBR if needed (VBR+6) */

+		disk_write(drv, tbl, b_vol + 6, 1);

 

 	/* Initialize FAT area */

-	for (m = 0; m < N_FATS; m++) {

-		mem_set(tbl, 0, SS(fs));		/* 1st sector of the FAT  */

+	wsect = b_fat;

+	for (i = 0; i < N_FATS; i++) {		/* Initialize each FAT copy */

+		mem_set(tbl, 0, SS(fs));			/* 1st sector of the FAT  */

+		n = md;								/* Media descriptor byte */

 		if (fmt != FS_FAT32) {

-			n = (fmt == FS_FAT12) ? 0x00FFFF00 : 0xFFFFFF00;

-			n |= partition;

-			ST_DWORD(tbl, n);				/* Reserve cluster #0-1 (FAT12/16) */

+			n |= (fmt == FS_FAT12) ? 0x00FFFF00 : 0xFFFFFF00;

+			ST_DWORD(tbl+0, n);				/* Reserve cluster #0-1 (FAT12/16) */

 		} else {

-			ST_DWORD(tbl+0, 0xFFFFFFF8);	/* Reserve cluster #0-1 (FAT32) */

+			n |= 0xFFFFFF00;

+			ST_DWORD(tbl+0, n);				/* Reserve cluster #0-1 (FAT32) */

 			ST_DWORD(tbl+4, 0xFFFFFFFF);

 			ST_DWORD(tbl+8, 0x0FFFFFFF);	/* Reserve cluster #2 for root dir */

 		}

-		if (disk_write(drv, tbl, b_fat++, 1) != RES_OK)

+		if (disk_write(drv, tbl, wsect++, 1) != RES_OK)

 			return FR_DISK_ERR;

-		mem_set(tbl, 0, SS(fs));		/* Following FAT entries are filled by zero */

-		for (n = 1; n < n_fat; n++) {

-			if (disk_write(drv, tbl, b_fat++, 1) != RES_OK)

+		mem_set(tbl, 0, SS(fs));			/* Fill following FAT entries with zero */

+		for (n = 1; n < n_fat; n++) {		/* This loop may take a time on FAT32 volume due to many single sector writes */

+			if (disk_write(drv, tbl, wsect++, 1) != RES_OK)

 				return FR_DISK_ERR;

 		}

 	}

 

-	/* Initialize Root directory */

-	m = (BYTE)((fmt == FS_FAT32) ? allocsize : n_dir);

+	/* Initialize root directory */

+	i = (fmt == FS_FAT32) ? au : n_dir;

 	do {

-		if (disk_write(drv, tbl, b_fat++, 1) != RES_OK)

+		if (disk_write(drv, tbl, wsect++, 1) != RES_OK)

 			return FR_DISK_ERR;

-	} while (--m);

+	} while (--i);

 

-	/* Create FSInfo record if needed */

+#if _USE_ERASE	/* Erase data area if needed */

+	{

+		DWORD eb[2];

+

+		eb[0] = wsect; eb[1] = wsect + (n_clst - ((fmt == FS_FAT32) ? 1 : 0)) * au - 1;

+		disk_ioctl(drv, CTRL_ERASE_SECTOR, eb);

+	}

+#endif

+

+	/* Create FSInfo if needed */

 	if (fmt == FS_FAT32) {

-		ST_WORD(tbl+BS_55AA, 0xAA55);

 		ST_DWORD(tbl+FSI_LeadSig, 0x41615252);

 		ST_DWORD(tbl+FSI_StrucSig, 0x61417272);

-		ST_DWORD(tbl+FSI_Free_Count, n_clst - 1);

-		ST_DWORD(tbl+FSI_Nxt_Free, 0xFFFFFFFF);

-		disk_write(drv, tbl, b_part+1, 1);

-		disk_write(drv, tbl, b_part+7, 1);

+		ST_DWORD(tbl+FSI_Free_Count, n_clst - 1);	/* Number of free clusters */

+		ST_DWORD(tbl+FSI_Nxt_Free, 2);				/* Last allocated cluster# */

+		ST_WORD(tbl+BS_55AA, 0xAA55);

+		disk_write(drv, tbl, b_vol + 1, 1);	/* Write original (VBR+1) */

+		disk_write(drv, tbl, b_vol + 7, 1);	/* Write backup (VBR+7) */

 	}

 

-	return (disk_ioctl(drv, CTRL_SYNC, (void*)NULL) == RES_OK) ? FR_OK : FR_DISK_ERR;

+	return (disk_ioctl(drv, CTRL_SYNC, (void*)0) == RES_OK) ? FR_OK : FR_DISK_ERR;

 }

 

 #endif /* _USE_MKFS && !_FS_READONLY */

@@ -2993,28 +3766,51 @@ FRESULT f_mkfs (
 /*-----------------------------------------------------------------------*/

 /* Get a string from the file                                            */

 /*-----------------------------------------------------------------------*/

-char* f_gets (

-	char* buff,	/* Pointer to the string buffer to read */

-	int len,	/* Size of string buffer */

-	FIL* fil	/* Pointer to the file object */

+TCHAR* f_gets (

+	TCHAR* buff,	/* Pointer to the string buffer to read */

+	int len,		/* Size of string buffer (characters) */

+	FIL* fil		/* Pointer to the file object */

 )

 {

-	int i = 0;

-	char *p = buff;

+	int n = 0;

+	TCHAR c, *p = buff;

+	BYTE s[2];

 	UINT rc;

 

 

-	while (i < len - 1) {			/* Read bytes until buffer gets filled */

-		f_read(fil, p, 1, &rc);

-		if (rc != 1) break;			/* Break when no data to read */

+	while (n < len - 1) {			/* Read bytes until buffer gets filled */

+		f_read(fil, s, 1, &rc);

+		if (rc != 1) break;			/* Break on EOF or error */

+		c = s[0];

+#if _LFN_UNICODE					/* Read a character in UTF-8 encoding */

+		if (c >= 0x80) {

+			if (c < 0xC0) continue;	/* Skip stray trailer */

+			if (c < 0xE0) {			/* Two-byte sequense */

+				f_read(fil, s, 1, &rc);

+				if (rc != 1) break;

+				c = ((c & 0x1F) << 6) | (s[0] & 0x3F);

+				if (c < 0x80) c = '?';

+			} else {

+				if (c < 0xF0) {		/* Three-byte sequense */

+					f_read(fil, s, 2, &rc);

+					if (rc != 2) break;

+					c = (c << 12) | ((s[0] & 0x3F) << 6) | (s[1] & 0x3F);

+					if (c < 0x800) c = '?';

+				} else {			/* Reject four-byte sequense */

+					c = '?';

+				}

+			}

+		}

+#endif

 #if _USE_STRFUNC >= 2

-		if (*p == '\r') continue;	/* Strip '\r' */

+		if (c == '\r') continue;	/* Strip '\r' */

 #endif

-		i++;

-		if (*p++ == '\n') break;	/* Break when reached end of line */

+		*p++ = c;

+		n++;

+		if (c == '\n') break;		/* Break on EOL */

 	}

 	*p = 0;

-	return i ? buff : NULL;			/* When no data read (eof or error), return with error. */

+	return n ? buff : 0;			/* When no data read (eof or error), return with error. */

 }

 

 

@@ -3025,24 +3821,40 @@ char* f_gets (
 /* Put a character to the file                                           */

 /*-----------------------------------------------------------------------*/

 int f_putc (

-	int chr,	/* A character to be output */

-	FIL* fil	/* Ponter to the file object */

+	TCHAR c,	/* A character to be output */

+	FIL* fil	/* Pointer to the file object */

 )

 {

-	UINT bw;

-	char c;

+	UINT bw, btw;

+	BYTE s[3];

 

 

 #if _USE_STRFUNC >= 2

-	if (chr == '\n') f_putc ('\r', fil);	/* LF -> CRLF conversion */

+	if (c == '\n') f_putc ('\r', fil);	/* LF -> CRLF conversion */

 #endif

-	if (!fil) {	/* Special value may be used to switch the destination to any other device */

-	/*	put_console(chr);	*/

-		return chr;

+

+#if _LFN_UNICODE	/* Write the character in UTF-8 encoding */

+	if (c < 0x80) {			/* 7-bit */

+		s[0] = (BYTE)c;

+		btw = 1;

+	} else {

+		if (c < 0x800) {	/* 11-bit */

+			s[0] = (BYTE)(0xC0 | (c >> 6));

+			s[1] = (BYTE)(0x80 | (c & 0x3F));

+			btw = 2;

+		} else {			/* 16-bit */

+			s[0] = (BYTE)(0xE0 | (c >> 12));

+			s[1] = (BYTE)(0x80 | ((c >> 6) & 0x3F));

+			s[2] = (BYTE)(0x80 | (c & 0x3F));

+			btw = 3;

+		}

 	}

-	c = (char)chr;

-	f_write(fil, &c, 1, &bw);	/* Write a byte to the file */

-	return bw ? chr : EOF;		/* Return the result */

+#else				/* Write the character without conversion */

+	s[0] = (BYTE)c;

+	btw = 1;

+#endif

+	f_write(fil, s, btw, &bw);		/* Write the char to the file */

+	return (bw == btw) ? 1 : EOF;	/* Return the result */

 }

 

 

@@ -3052,7 +3864,7 @@ int f_putc (
 /* Put a string to the file                                              */

 /*-----------------------------------------------------------------------*/

 int f_puts (

-	const char* str,	/* Pointer to the string to be output */

+	const TCHAR* str,	/* Pointer to the string to be output */

 	FIL* fil			/* Pointer to the file object */

 )

 {

@@ -3073,15 +3885,16 @@ int f_puts (
 /*-----------------------------------------------------------------------*/

 int f_printf (

 	FIL* fil,			/* Pointer to the file object */

-	const char* str,	/* Pointer to the format string */

+	const TCHAR* str,	/* Pointer to the format string */

 	...					/* Optional arguments... */

 )

 {

 	va_list arp;

-	UCHAR c, f, r;

-	ULONG val;

-	char s[16];

-	int i, w, res, cc;

+	BYTE f, r;

+	UINT i, j, w;

+	ULONG v;

+	TCHAR c, d, s[16], *p;

+	int res, cc;

 

 

 	va_start(arp, str);

@@ -3089,7 +3902,7 @@ int f_printf (
 	for (cc = res = 0; cc != EOF; res += cc) {

 		c = *str++;

 		if (c == 0) break;			/* End of string */

-		if (c != '%') {				/* Non escape cahracter */

+		if (c != '%') {				/* Non escape character */

 			cc = f_putc(c, fil);

 			if (cc != EOF) cc = 1;

 			continue;

@@ -3098,51 +3911,65 @@ int f_printf (
 		c = *str++;

 		if (c == '0') {				/* Flag: '0' padding */

 			f = 1; c = *str++;

+		} else {

+			if (c == '-') {			/* Flag: left justified */

+				f = 2; c = *str++;

+			}

 		}

-		while (c >= '0' && c <= '9') {	/* Precision */

-			w = w * 10 + (c - '0');

+		while (IsDigit(c)) {		/* Precision */

+			w = w * 10 + c - '0';

 			c = *str++;

 		}

-		if (c == 'l') {				/* Prefix: Size is long int */

-			f |= 2; c = *str++;

-		}

-		if (c == 's') {				/* Type is string */

-			cc = f_puts(va_arg(arp, char*), fil);

-			continue;

+		if (c == 'l' || c == 'L') {	/* Prefix: Size is long int */

+			f |= 4; c = *str++;

 		}

-		if (c == 'c') {				/* Type is character */

-			cc = f_putc(va_arg(arp, int), fil);

-			if (cc != EOF) cc = 1;

+		if (!c) break;

+		d = c;

+		if (IsLower(d)) d -= 0x20;

+		switch (d) {				/* Type is... */

+		case 'S' :					/* String */

+			p = va_arg(arp, TCHAR*);

+			for (j = 0; p[j]; j++) ;

+			res = 0;

+			while (!(f & 2) && j++ < w) res += (cc = f_putc(' ', fil));

+			res += (cc = f_puts(p, fil));

+			while (j++ < w) res += (cc = f_putc(' ', fil));

+			if (cc != EOF) cc = res;

 			continue;

+		case 'C' :					/* Character */

+			cc = f_putc((TCHAR)va_arg(arp, int), fil); continue;

+		case 'B' :					/* Binary */

+			r = 2; break;

+		case 'O' :					/* Octal */

+			r = 8; break;

+		case 'D' :					/* Signed decimal */

+		case 'U' :					/* Unsigned decimal */

+			r = 10; break;

+		case 'X' :					/* Hexdecimal */

+			r = 16; break;

+		default:					/* Unknown type (passthrough) */

+			cc = f_putc(c, fil); continue;

 		}

-		r = 0;

-		if (c == 'd') r = 10;		/* Type is signed decimal */

-		if (c == 'u') r = 10;		/* Type is unsigned decimal */

-		if (c == 'X') r = 16;		/* Type is unsigned hexdecimal */

-		if (r == 0) break;			/* Unknown type */

-		if (f & 2) {				/* Get the value */

-			val = (ULONG)va_arg(arp, long);

-		} else {

-			val = (c == 'd') ? (ULONG)(long)va_arg(arp, int) : (ULONG)va_arg(arp, unsigned int);

-		}

-		/* Put numeral string */

-		if (c == 'd') {

-			if (val & 0x80000000) {

-				val = 0 - val;

-				f |= 4;

-			}

+

+		/* Get an argument and put it in numeral */

+		v = (f & 4) ? va_arg(arp, long) : ((d == 'D') ? (long)va_arg(arp, int) : va_arg(arp, unsigned int));

+		if (d == 'D' && (v & 0x80000000)) {

+			v = 0 - v;

+			f |= 8;

 		}

-		i = sizeof(s) - 1; s[i] = 0;

+		i = 0;

 		do {

-			c = (UCHAR)(val % r + '0');

-			if (c > '9') c += 7;

-			s[--i] = c;

-			val /= r;

-		} while (i && val);

-		if (i && (f & 4)) s[--i] = '-';

-		w = sizeof(s) - 1 - w;

-		while (i && i > w) s[--i] = (f & 1) ? '0' : ' ';

-		cc = f_puts(&s[i], fil);

+			d = (TCHAR)(v % r); v /= r;

+			if (d > 9) d += (c == 'x') ? 0x27 : 0x07;

+			s[i++] = d + '0';

+		} while (v && i < sizeof(s) / sizeof(s[0]));

+		if (f & 8) s[i++] = '-';

+		j = i; d = (f & 1) ? '0' : ' ';

+		res = 0;

+		while (!(f & 2) && j++ < w) res += (cc = f_putc(d, fil));

+		do res += (cc = f_putc(s[--i], fil)); while(i);

+		while (j++ < w) res += (cc = f_putc(' ', fil));

+		if (cc != EOF) cc = res;

 	}

 

 	va_end(arp);

@@ -3153,12 +3980,12 @@ int f_printf (
 #endif /* _USE_STRFUNC */

 

 #include <rtthread.h>

-#if _DRIVES > 1

+#if _VOLUMES > 1

 int elm_get_vol(FATFS *fat)

 {

 	int vol;

 

-	for (vol = 0; vol < _DRIVES; vol ++)

+	for (vol = 0; vol < _VOLUMES; vol ++)

 	{

 		if (FatFs[vol] == fat) return vol;

 	}

@@ -3166,4 +3993,3 @@ int elm_get_vol(FATFS *fat)
 	return -1;

 }

 #endif

-

diff --git a/components/dfs/filesystems/elmfat/ff.h b/components/dfs/filesystems/elmfat/ff.h
index 499f3cad28..191e3a4838 100644
--- a/components/dfs/filesystems/elmfat/ff.h
+++ b/components/dfs/filesystems/elmfat/ff.h
@@ -1,390 +1,173 @@
 /*---------------------------------------------------------------------------/

-/  FatFs - FAT file system module include file  R0.07e       (C)ChaN, 2009

+/  FatFs - FAT file system module include file  R0.08b    (C)ChaN, 2011

 /----------------------------------------------------------------------------/

 / FatFs module is a generic FAT file system module for small embedded systems.

 / This is a free software that opened for education, research and commercial

 / developments under license policy of following trems.

 /

-/  Copyright (C) 2009, ChaN, all right reserved.

+/  Copyright (C) 2011, ChaN, all right reserved.

 /

 / * The FatFs module is a free software and there is NO WARRANTY.

 / * No restriction on use. You can use, modify and redistribute it for

 /   personal, non-profit or commercial product UNDER YOUR RESPONSIBILITY.

 / * Redistributions of source code must retain the above copyright notice.

+/

 /----------------------------------------------------------------------------*/

 

 #ifndef _FATFS

-#define _FATFS	0x007E

+#define _FATFS	8237	/* Revision ID */

+

+#ifdef __cplusplus

+extern "C" {

+#endif

 

 #include <rtthread.h>

 #include "integer.h"	/* Basic integer types */

 #include "ffconf.h"		/* FatFs configuration options */

 

-#if _FATFS != _FFCONFIG

+#if _FATFS != _FFCONF

 #error Wrong configuration file (ffconf.h).

 #endif

 

 

-/* DBCS code ranges and SBCS extend char conversion table */

-

-#if _CODE_PAGE == 932	/* Japanese Shift-JIS */

-#define _DF1S	0x81	/* DBC 1st byte range 1 start */

-#define _DF1E	0x9F	/* DBC 1st byte range 1 end */

-#define _DF2S	0xE0	/* DBC 1st byte range 2 start */

-#define _DF2E	0xFC	/* DBC 1st byte range 2 end */

-#define _DS1S	0x40	/* DBC 2nd byte range 1 start */

-#define _DS1E	0x7E	/* DBC 2nd byte range 1 end */

-#define _DS2S	0x80	/* DBC 2nd byte range 2 start */

-#define _DS2E	0xFC	/* DBC 2nd byte range 2 end */

-

-#elif _CODE_PAGE == 936	/* Simplified Chinese GBK */

-#define _DF1S	0x81

-#define _DF1E	0xFE

-#define _DS1S	0x40

-#define _DS1E	0x7E

-#define _DS2S	0x80

-#define _DS2E	0xFE

-

-#elif _CODE_PAGE == 949	/* Korean */

-#define _DF1S	0x81

-#define _DF1E	0xFE

-#define _DS1S	0x41

-#define _DS1E	0x5A

-#define _DS2S	0x61

-#define _DS2E	0x7A

-#define _DS3S	0x81

-#define _DS3E	0xFE

-

-#elif _CODE_PAGE == 950	/* Traditional Chinese Big5 */

-#define _DF1S	0x81

-#define _DF1E	0xFE

-#define _DS1S	0x40

-#define _DS1E	0x7E

-#define _DS2S	0xA1

-#define _DS2E	0xFE

-

-#elif _CODE_PAGE == 437	/* U.S. (OEM) */

-#define _DF1S	0

-#define _EXCVT {0x80,0x9A,0x90,0x41,0x8E,0x41,0x8F,0x80,0x45,0x45,0x45,0x49,0x49,0x49,0x8E,0x8F,0x90,0x92,0x92,0x4F,0x99,0x4F,0x55,0x55,0x59,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \

-				0x41,0x49,0x4F,0x55,0xA5,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0x21,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \

-				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \

-				0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}

-

-#elif _CODE_PAGE == 720	/* Arabic (OEM) */

-#define _DF1S	0

-#define _EXCVT {0x80,0x81,0x45,0x41,0x84,0x41,0x86,0x43,0x45,0x45,0x45,0x49,0x49,0x8D,0x8E,0x8F,0x90,0x92,0x92,0x93,0x94,0x95,0x49,0x49,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \

-				0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \

-				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \

-				0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}

-

-#elif _CODE_PAGE == 737	/* Greek (OEM) */

-#define _DF1S	0

-#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x92,0x92,0x93,0x94,0x95,0x96,0x97,0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87, \

-				0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0xAA,0x92,0x93,0x94,0x95,0x96,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \

-				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \

-				0x97,0xEA,0xEB,0xEC,0xE4,0xED,0xEE,0xE7,0xE8,0xF1,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}

-

-#elif _CODE_PAGE == 775	/* Baltic (OEM) */

-#define _DF1S	0

-#define _EXCVT {0x80,0x9A,0x91,0xA0,0x8E,0x95,0x8F,0x80,0xAD,0xED,0x8A,0x8A,0xA1,0x8D,0x8E,0x8F,0x90,0x92,0x92,0xE2,0x99,0x95,0x96,0x97,0x97,0x99,0x9A,0x9D,0x9C,0x9D,0x9E,0x9F, \

-				0xA0,0xA1,0xE0,0xA3,0xA3,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \

-				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xB5,0xB6,0xB7,0xB8,0xBD,0xBE,0xC6,0xC7,0xA5,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \

-				0xE0,0xE1,0xE2,0xE3,0xE5,0xE5,0xE6,0xE3,0xE8,0xE8,0xEA,0xEA,0xEE,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}

-

-#elif _CODE_PAGE == 850	/* Multilingual Latin 1 (OEM) */

-#define _DF1S	0

-#define _EXCVT {0x80,0x9A,0x90,0xB6,0x8E,0xB7,0x8F,0x80,0xD2,0xD3,0xD4,0xD8,0xD7,0xDE,0x8E,0x8F,0x90,0x92,0x92,0xE2,0x99,0xE3,0xEA,0xEB,0x59,0x99,0x9A,0x9D,0x9C,0x9D,0x9E,0x9F, \

-				0xB5,0xD6,0xE0,0xE9,0xA5,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0x21,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \

-				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC7,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \

-				0xE0,0xE1,0xE2,0xE3,0xE5,0xE5,0xE6,0xE7,0xE7,0xE9,0xEA,0xEB,0xED,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}

-

-#elif _CODE_PAGE == 852	/* Latin 2 (OEM) */

-#define _DF1S	0

-#define _EXCVT {0x80,0x9A,0x90,0xB6,0x8E,0xDE,0x8F,0x80,0x9D,0xD3,0x8A,0x8A,0xD7,0x8D,0x8E,0x8F,0x90,0x91,0x91,0xE2,0x99,0x95,0x95,0x97,0x97,0x99,0x9A,0x9B,0x9B,0x9D,0x9E,0x9F, \

-				0xB5,0xD6,0xE0,0xE9,0xA4,0xA4,0xA6,0xA6,0xA8,0xA8,0xAA,0x8D,0xAC,0xB8,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBD,0xBF, \

-				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC6,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD1,0xD1,0xD2,0xD3,0xD2,0xD5,0xD6,0xD7,0xB7,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \

-				0xE0,0xE1,0xE2,0xE3,0xE3,0xD5,0xE6,0xE6,0xE8,0xE9,0xE8,0xEB,0xED,0xED,0xDD,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xEB,0xFC,0xFC,0xFE,0xFF}

-

-#elif _CODE_PAGE == 855	/* Cyrillic (OEM) */

-#define _DF1S	0

-#define _EXCVT {0x81,0x81,0x83,0x83,0x85,0x85,0x87,0x87,0x89,0x89,0x8B,0x8B,0x8D,0x8D,0x8F,0x8F,0x91,0x91,0x93,0x93,0x95,0x95,0x97,0x97,0x99,0x99,0x9B,0x9B,0x9D,0x9D,0x9F,0x9F, \

-				0xA1,0xA1,0xA3,0xA3,0xA5,0xA5,0xA7,0xA7,0xA9,0xA9,0xAB,0xAB,0xAD,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB6,0xB6,0xB8,0xB8,0xB9,0xBA,0xBB,0xBC,0xBE,0xBE,0xBF, \

-				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC7,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD1,0xD1,0xD3,0xD3,0xD5,0xD5,0xD7,0xD7,0xDD,0xD9,0xDA,0xDB,0xDC,0xDD,0xE0,0xDF, \

-				0xE0,0xE2,0xE2,0xE4,0xE4,0xE6,0xE6,0xE8,0xE8,0xEA,0xEA,0xEC,0xEC,0xEE,0xEE,0xEF,0xF0,0xF2,0xF2,0xF4,0xF4,0xF6,0xF6,0xF8,0xF8,0xFA,0xFA,0xFC,0xFC,0xFD,0xFE,0xFF}

-

-#elif _CODE_PAGE == 857	/* Turkish (OEM) */

-#define _DF1S	0

-#define _EXCVT {0x80,0x9A,0x90,0xB6,0x8E,0xB7,0x8F,0x80,0xD2,0xD3,0xD4,0xD8,0xD7,0x98,0x8E,0x8F,0x90,0x92,0x92,0xE2,0x99,0xE3,0xEA,0xEB,0x98,0x99,0x9A,0x9D,0x9C,0x9D,0x9E,0x9E, \

-				0xB5,0xD6,0xE0,0xE9,0xA5,0xA5,0xA6,0xA6,0xA8,0xA9,0xAA,0xAB,0xAC,0x21,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \

-				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC7,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \

-				0xE0,0xE1,0xE2,0xE3,0xE5,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xDE,0x59,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}

-

-#elif _CODE_PAGE == 858	/* Multilingual Latin 1 + Euro (OEM) */

-#define _DF1S	0

-#define _EXCVT {0x80,0x9A,0x90,0xB6,0x8E,0xB7,0x8F,0x80,0xD2,0xD3,0xD4,0xD8,0xD7,0xDE,0x8E,0x8F,0x90,0x92,0x92,0xE2,0x99,0xE3,0xEA,0xEB,0x59,0x99,0x9A,0x9D,0x9C,0x9D,0x9E,0x9F, \

-				0xB5,0xD6,0xE0,0xE9,0xA5,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0x21,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \

-				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC7,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD1,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \

-				0xE0,0xE1,0xE2,0xE3,0xE5,0xE5,0xE6,0xE7,0xE7,0xE9,0xEA,0xEB,0xED,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}

-

-#elif _CODE_PAGE == 862	/* Hebrew (OEM) */

-#define _DF1S	0

-#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \

-				0x41,0x49,0x4F,0x55,0xA5,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0x21,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \

-				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \

-				0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}

-

-#elif _CODE_PAGE == 866	/* Russian (OEM) */

-#define _DF1S	0

-#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \

-				0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \

-				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \

-				0x90,0x91,0x92,0x93,0x9d,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F,0xF0,0xF0,0xF2,0xF2,0xF4,0xF4,0xF6,0xF6,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}

-

-#elif _CODE_PAGE == 874	/* Thai (OEM, Windows) */

-#define _DF1S	0

-#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \

-				0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \

-				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \

-				0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}

-

-#elif _CODE_PAGE == 1250 /* Central Europe (Windows) */

-#define _DF1S	0

-#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x8A,0x9B,0x8C,0x8D,0x8E,0x8F, \

-				0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xA3,0xB4,0xB5,0xB6,0xB7,0xB8,0xA5,0xAA,0xBB,0xBC,0xBD,0xBC,0xAF, \

-				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \

-				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF}

-

-#elif _CODE_PAGE == 1251 /* Cyrillic (Windows) */

-#define _DF1S	0

-#define _EXCVT {0x80,0x81,0x82,0x82,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x80,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x8A,0x9B,0x8C,0x8D,0x8E,0x8F, \

-				0xA0,0xA2,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB2,0xA5,0xB5,0xB6,0xB7,0xA8,0xB9,0xAA,0xBB,0xA3,0xBD,0xBD,0xAF, \

-				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \

-				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF}

-

-#elif _CODE_PAGE == 1252 /* Latin 1 (Windows) */

-#define _DF1S	0

-#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0xAd,0x9B,0x8C,0x9D,0xAE,0x9F, \

-				0xA0,0x21,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \

-				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \

-				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0x9F}

-

-#elif _CODE_PAGE == 1253 /* Greek (Windows) */

-#define _DF1S	0

-#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \

-				0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \

-				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xA2,0xB8,0xB9,0xBA, \

-				0xE0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xF2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xFB,0xBC,0xFD,0xBF,0xFF}

-

-#elif _CODE_PAGE == 1254 /* Turkish (Windows) */

-#define _DF1S	0

-#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x8A,0x9B,0x8C,0x9D,0x9E,0x9F, \

-				0xA0,0x21,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \

-				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \

-				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0x9F}

-

-#elif _CODE_PAGE == 1255 /* Hebrew (Windows) */

-#define _DF1S	0

-#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \

-				0xA0,0x21,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \

-				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \

-				0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}

 

-#elif _CODE_PAGE == 1256 /* Arabic (Windows) */

-#define _DF1S	0

-#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x8C,0x9D,0x9E,0x9F, \

-				0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \

-				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \

-				0x41,0xE1,0x41,0xE3,0xE4,0xE5,0xE6,0x43,0x45,0x45,0x45,0x45,0xEC,0xED,0x49,0x49,0xF0,0xF1,0xF2,0xF3,0x4F,0xF5,0xF6,0xF7,0xF8,0x55,0xFA,0x55,0x55,0xFD,0xFE,0xFF}

-

-#elif _CODE_PAGE == 1257 /* Baltic (Windows) */

-#define _DF1S	0

-#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \

-				0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xA8,0xB9,0xAA,0xBB,0xBC,0xBD,0xBE,0xAF, \

-				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \

-				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF}

-

-#elif _CODE_PAGE == 1258 /* Vietnam (OEM, Windows) */

-#define _DF1S	0

-#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0xAC,0x9D,0x9E,0x9F, \

-				0xA0,0x21,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \

-				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \

-				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xEC,0xCD,0xCE,0xCF,0xD0,0xD1,0xF2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xFE,0x9F}

-

-#elif _CODE_PAGE == 1	/* ASCII (for only non-LFN cfg) */

-#define _DF1S	0

-

-#else

-#error Unknown code page

-

-#endif

-

-

-

-/* Character code support macros */

-

-#define IsUpper(c)	(((c)>='A')&&((c)<='Z'))

-#define IsLower(c)	(((c)>='a')&&((c)<='z'))

-

-#if _DF1S		/* DBCS configuration */

-

-#ifdef _DF2S	/* Two 1st byte areas */

-#define IsDBCS1(c)	(((BYTE)(c) >= _DF1S && (BYTE)(c) <= _DF1E) || ((BYTE)(c) >= _DF2S && (BYTE)(c) <= _DF2E))

-#else			/* One 1st byte area */

-#define IsDBCS1(c)	((BYTE)(c) >= _DF1S && (BYTE)(c) <= _DF1E)

-#endif

-

-#ifdef _DS3S	/* Three 2nd byte areas */

-#define IsDBCS2(c)	(((BYTE)(c) >= _DS1S && (BYTE)(c) <= _DS1E) || ((BYTE)(c) >= _DS2S && (BYTE)(c) <= _DS2E) || ((BYTE)(c) >= _DS3S && (BYTE)(c) <= _DS3E))

-#else			/* Two 2nd byte areas */

-#define IsDBCS2(c)	(((BYTE)(c) >= _DS1S && (BYTE)(c) <= _DS1E) || ((BYTE)(c) >= _DS2S && (BYTE)(c) <= _DS2E))

-#endif

-

-#else			/* SBCS configuration */

-

-#define IsDBCS1(c)	0

-#define IsDBCS2(c)	0

-

-#endif /* _DF1S */

-

-

-

-/* Definitions corresponds to multi partition */

+/* Definitions of volume management */

 

 #if _MULTI_PARTITION		/* Multiple partition configuration */

-

-typedef struct _PARTITION {

+#define LD2PD(vol) (VolToPart[vol].pd)	/* Get physical drive# */

+#define LD2PT(vol) (VolToPart[vol].pt)	/* Get partition# */

+typedef struct {

 	BYTE pd;	/* Physical drive# */

 	BYTE pt;	/* Partition # (0-3) */

 } PARTITION;

-

-extern

-const PARTITION Drives[];			/* Logical drive# to physical location conversion table */

-#define LD2PD(drv) (Drives[drv].pd)	/* Get physical drive# */

-#define LD2PT(drv) (Drives[drv].pt)	/* Get partition# */

+extern const PARTITION VolToPart[];	/* Volume - Physical location resolution table */

 

 #else						/* Single partition configuration */

-

-#define LD2PD(drv) (drv)	/* Physical drive# is equal to the logical drive# */

-#define LD2PT(drv) 0		/* Always mounts the 1st partition */

+#define LD2PD(vol) (vol)	/* Logical drive# is bound to the same physical drive# */

+#define LD2PT(vol) 0		/* Always mounts the 1st partition */

 

 #endif

 

 

 

-/* Definitions corresponds to multiple sector size */

-

-#if _MAX_SS == 512		/* Single sector size */

-#define	SS(fs)	512U

-

-#elif _MAX_SS == 1024 || _MAX_SS == 2048 || _MAX_SS == 4096	/* Multiple sector size */

-#define	SS(fs)	((fs)->s_size)

-

-#else

-#error Sector size must be 512, 1024, 2048 or 4096.

+/* Type of path name strings on FatFs API */

 

+#if _LFN_UNICODE			/* Unicode string */

+#if !_USE_LFN

+#error _LFN_UNICODE must be 0 in non-LFN cfg.

+#endif

+#ifndef _INC_TCHAR

+typedef WCHAR TCHAR;

+#define _T(x) L ## x

+#define _TEXT(x) L ## x

 #endif

 

+#else						/* ANSI/OEM string */

+#ifndef _INC_TCHAR

+typedef char TCHAR;

+#define _T(x) x

+#define _TEXT(x) x

+#endif

 

-

-/* Type of file name on FatFs API */

-

-#if _LFN_UNICODE && _USE_LFN

-typedef WCHAR XCHAR;	/* Unicode */

-#else

-typedef char XCHAR;		/* SBCS, DBCS */

 #endif

 

 

 

-/* File system object structure */

+/* File system object structure (FATFS) */

 

-typedef struct _FATFS_ {

-	BYTE	fs_type;	/* FAT sub type */

-	BYTE	drive;		/* Physical drive number */

-	BYTE	csize;		/* Number of sectors per cluster */

-	BYTE	n_fats;		/* Number of FAT copies */

-	BYTE	wflag;		/* win[] dirty flag (1:must be written back) */

-	BYTE	fsi_flag;	/* fsinfo dirty flag (1:must be written back) */

-	WORD	id;			/* File system mount ID */

-	WORD	n_rootdir;	/* Number of root directory entries (0 on FAT32) */

-#if _FS_REENTRANT

-	_SYNC_t	sobj;		/* Identifier of sync object */

-#endif

+typedef struct {

+	BYTE	fs_type;		/* FAT sub-type (0:Not mounted) */

+	BYTE	drv;			/* Physical drive number */

+	BYTE	csize;			/* Sectors per cluster (1,2,4...128) */

+	BYTE	n_fats;			/* Number of FAT copies (1,2) */

+	BYTE	wflag;			/* win[] dirty flag (1:must be written back) */

+	BYTE	fsi_flag;		/* fsinfo dirty flag (1:must be written back) */

+	WORD	id;				/* File system mount ID */

+	WORD	n_rootdir;		/* Number of root directory entries (FAT12/16) */

 #if _MAX_SS != 512

-	WORD	s_size;		/* Sector size */

+	WORD	ssize;			/* Bytes per sector (512,1024,2048,4096) */

+#endif

+#if _FS_REENTRANT

+	_SYNC_t	sobj;			/* Identifier of sync object */

 #endif

 #if !_FS_READONLY

-	DWORD	last_clust;	/* Last allocated cluster */

-	DWORD	free_clust;	/* Number of free clusters */

-	DWORD	fsi_sector;	/* fsinfo sector */

+	DWORD	last_clust;		/* Last allocated cluster */

+	DWORD	free_clust;		/* Number of free clusters */

+	DWORD	fsi_sector;		/* fsinfo sector (FAT32) */

 #endif

 #if _FS_RPATH

-	DWORD	cdir;		/* Current directory (0:root)*/

+	DWORD	cdir;			/* Current directory start cluster (0:root) */

 #endif

-	DWORD	sects_fat;	/* Sectors per fat */

-	DWORD	max_clust;	/* Maximum cluster# + 1. Number of clusters is max_clust - 2 */

-	DWORD	fatbase;	/* FAT start sector */

-	DWORD	dirbase;	/* Root directory start sector (Cluster# on FAT32) */

-	DWORD	database;	/* Data start sector */

-	DWORD	winsect;	/* Current sector appearing in the win[] */

-	BYTE	win[_MAX_SS];/* Disk access window for Directory/FAT */

+	DWORD	n_fatent;		/* Number of FAT entries (= number of clusters + 2) */

+	DWORD	fsize;			/* Sectors per FAT */

+	DWORD	fatbase;		/* FAT start sector */

+	DWORD	dirbase;		/* Root directory start sector (FAT32:Cluster#) */

+	DWORD	database;		/* Data start sector */

+	DWORD	winsect;		/* Current sector appearing in the win[] */

+	BYTE	win[_MAX_SS];	/* Disk access window for Directory, FAT (and Data on tiny cfg) */

 } FATFS;

 

 

 

-/* Directory object structure */

+/* File object structure (FIL) */

 

-typedef struct _DIR_ {

-	FATFS*	fs;			/* Pointer to the owner file system object */

-	WORD	id;			/* Owner file system mount ID */

-	WORD	index;		/* Current read/write index number */

-	DWORD	sclust;		/* Table start cluster (0:Static table) */

-	DWORD	clust;		/* Current cluster */

-	DWORD	sect;		/* Current sector */

-	BYTE*	dir;		/* Pointer to the current SFN entry in the win[] */

-	BYTE*	fn;			/* Pointer to the SFN (in/out) {file[8],ext[3],status[1]} */

-#if _USE_LFN

-	WCHAR*	lfn;		/* Pointer to the LFN working buffer */

-	WORD	lfn_idx;	/* Last matched LFN index number (0xFFFF:No LFN) */

+typedef struct {

+	FATFS*	fs;				/* Pointer to the owner file system object */

+	WORD	id;				/* Owner file system mount ID */

+	BYTE	flag;			/* File status flags */

+	BYTE	pad1;

+	DWORD	fptr;			/* File read/write pointer (0 on file open) */

+	DWORD	fsize;			/* File size */

+	DWORD	sclust;			/* File start cluster (0 when fsize==0) */

+	DWORD	clust;			/* Current cluster */

+	DWORD	dsect;			/* Current data sector */

+#if !_FS_READONLY

+	DWORD	dir_sect;		/* Sector containing the directory entry */

+	BYTE*	dir_ptr;		/* Ponter to the directory entry in the window */

 #endif

-} DIR;

+#if _USE_FASTSEEK

+	DWORD*	cltbl;			/* Pointer to the cluster link map table (null on file open) */

+#endif

+#if _FS_SHARE

+	UINT	lockid;			/* File lock ID (index of file semaphore table) */

+#endif

+#if !_FS_TINY

+	BYTE	buf[_MAX_SS];	/* File data read/write buffer */

+#endif

+} FIL;

 

 

 

-/* File object structure */

+/* Directory object structure (DIR) */

 

-typedef struct _FIL_ {

-	FATFS*	fs;			/* Pointer to the owner file system object */

-	WORD	id;			/* Owner file system mount ID */

-	BYTE	flag;		/* File status flags */

-	BYTE	csect;		/* Sector address in the cluster */

-	DWORD	fptr;		/* File R/W pointer */

-	DWORD	fsize;		/* File size */

-	DWORD	org_clust;	/* File start cluster */

-	DWORD	curr_clust;	/* Current cluster */

-	DWORD	dsect;		/* Current data sector */

-#if !_FS_READONLY

-	DWORD	dir_sect;	/* Sector containing the directory entry */

-	BYTE*	dir_ptr;	/* Ponter to the directory entry in the window */

-#endif

-#if !_FS_TINY

-	BYTE	buf[_MAX_SS];/* File R/W buffer */

+typedef struct {

+	FATFS*	fs;				/* Pointer to the owner file system object */

+	WORD	id;				/* Owner file system mount ID */

+	WORD	index;			/* Current read/write index number */

+	DWORD	sclust;			/* Table start cluster (0:Root dir) */

+	DWORD	clust;			/* Current cluster */

+	DWORD	sect;			/* Current sector */

+	BYTE*	dir;			/* Pointer to the current SFN entry in the win[] */

+	BYTE*	fn;				/* Pointer to the SFN (in/out) {file[8],ext[3],status[1]} */

+#if _USE_LFN

+	WCHAR*	lfn;			/* Pointer to the LFN working buffer */

+	WORD	lfn_idx;		/* Last matched LFN index number (0xFFFF:No LFN) */

 #endif

-} FIL;

+} DIR;

 

 

 

-/* File status structure */

+/* File status structure (FILINFO) */

 

-typedef struct _FILINFO_ {

-	DWORD	fsize;		/* File size */

-	WORD	fdate;		/* Last modified date */

-	WORD	ftime;		/* Last modified time */

-	BYTE	fattrib;	/* Attribute */

-	char	fname[13];	/* Short file name (8.3 format) */

+typedef struct {

+	DWORD	fsize;			/* File size */

+	WORD	fdate;			/* Last modified date */

+	WORD	ftime;			/* Last modified time */

+	BYTE	fattrib;		/* Attribute */

+	TCHAR	fname[13];		/* Short file name (8.3 format) */

 #if _USE_LFN

-	XCHAR*	lfname;		/* Pointer to the LFN buffer */

-	int 	lfsize;		/* Size of LFN buffer [chrs] */

+	TCHAR*	lfname;			/* Pointer to the LFN buffer */

+	UINT 	lfsize;			/* Size of LFN buffer in TCHAR */

 #endif

 } FILINFO;

 

@@ -393,22 +176,25 @@ typedef struct _FILINFO_ {
 /* File function return code (FRESULT) */

 

 typedef enum {

-	FR_OK = 0,			/* 0 */

-	FR_DISK_ERR,		/* 1 */

-	FR_INT_ERR,			/* 2 */

-	FR_NOT_READY,		/* 3 */

-	FR_NO_FILE,			/* 4 */

-	FR_NO_PATH,			/* 5 */

-	FR_INVALID_NAME,	/* 6 */

-	FR_DENIED,			/* 7 */

-	FR_EXIST,			/* 8 */

-	FR_INVALID_OBJECT,	/* 9 */

-	FR_WRITE_PROTECTED,	/* 10 */

-	FR_INVALID_DRIVE,	/* 11 */

-	FR_NOT_ENABLED,		/* 12 */

-	FR_NO_FILESYSTEM,	/* 13 */

-	FR_MKFS_ABORTED,	/* 14 */

-	FR_TIMEOUT			/* 15 */

+	FR_OK = 0,				/* (0) Succeeded */

+	FR_DISK_ERR,			/* (1) A hard error occured in the low level disk I/O layer */

+	FR_INT_ERR,				/* (2) Assertion failed */

+	FR_NOT_READY,			/* (3) The physical drive cannot work */

+	FR_NO_FILE,				/* (4) Could not find the file */

+	FR_NO_PATH,				/* (5) Could not find the path */

+	FR_INVALID_NAME,		/* (6) The path name format is invalid */

+	FR_DENIED,				/* (7) Acces denied due to prohibited access or directory full */

+	FR_EXIST,				/* (8) Acces denied due to prohibited access */

+	FR_INVALID_OBJECT,		/* (9) The file/directory object is invalid */

+	FR_WRITE_PROTECTED,		/* (10) The physical drive is write protected */

+	FR_INVALID_DRIVE,		/* (11) The logical drive number is invalid */

+	FR_NOT_ENABLED,			/* (12) The volume has no work area */

+	FR_NO_FILESYSTEM,		/* (13) There is no valid FAT volume on the physical drive */

+	FR_MKFS_ABORTED,		/* (14) The f_mkfs() aborted due to any parameter error */

+	FR_TIMEOUT,				/* (15) Could not get a grant to access the volume within defined period */

+	FR_LOCKED,				/* (16) The operation is rejected according to the file shareing policy */

+	FR_NOT_ENOUGH_CORE,		/* (17) LFN working buffer could not be allocated */

+	FR_TOO_MANY_OPEN_FILES	/* (18) Number of open files > _FS_SHARE */

 } FRESULT;

 

 

@@ -417,66 +203,73 @@ typedef enum {
 /* FatFs module application interface                           */

 

 FRESULT f_mount (BYTE, FATFS*);						/* Mount/Unmount a logical drive */

-FRESULT f_open (FIL*, const XCHAR*, BYTE);			/* Open or create a file */

+FRESULT f_open (FIL*, const TCHAR*, BYTE);			/* Open or create a file */

 FRESULT f_read (FIL*, void*, UINT, UINT*);			/* Read data from a file */

-FRESULT f_write (FIL*, const void*, UINT, UINT*);	/* Write data to a file */

 FRESULT f_lseek (FIL*, DWORD);						/* Move file pointer of a file object */

 FRESULT f_close (FIL*);								/* Close an open file object */

-FRESULT f_opendir (DIR*, const XCHAR*);				/* Open an existing directory */

+FRESULT f_opendir (DIR*, const TCHAR*);				/* Open an existing directory */

 FRESULT f_readdir (DIR*, FILINFO*);					/* Read a directory item */

-FRESULT f_stat (const XCHAR*, FILINFO*);			/* Get file status */

-FRESULT f_getfree (const XCHAR*, DWORD*, FATFS**);	/* Get number of free clusters on the drive */

+FRESULT f_stat (const TCHAR*, FILINFO*);			/* Get file status */

+FRESULT f_write (FIL*, const void*, UINT, UINT*);	/* Write data to a file */

+FRESULT f_getfree (const TCHAR*, DWORD*, FATFS**);	/* Get number of free clusters on the drive */

 FRESULT f_truncate (FIL*);							/* Truncate file */

 FRESULT f_sync (FIL*);								/* Flush cached data of a writing file */

-FRESULT f_unlink (const XCHAR*);					/* Delete an existing file or directory */

-FRESULT	f_mkdir (const XCHAR*);						/* Create a new directory */

-FRESULT f_chmod (const XCHAR*, BYTE, BYTE);			/* Change attriburte of the file/dir */

-FRESULT f_utime (const XCHAR*, const FILINFO*);		/* Change timestamp of the file/dir */

-FRESULT f_rename (const XCHAR*, const XCHAR*);		/* Rename/Move a file or directory */

+FRESULT f_unlink (const TCHAR*);					/* Delete an existing file or directory */

+FRESULT	f_mkdir (const TCHAR*);						/* Create a new directory */

+FRESULT f_chmod (const TCHAR*, BYTE, BYTE);			/* Change attriburte of the file/dir */

+FRESULT f_utime (const TCHAR*, const FILINFO*);		/* Change timestamp of the file/dir */

+FRESULT f_rename (const TCHAR*, const TCHAR*);		/* Rename/Move a file or directory */

 FRESULT f_forward (FIL*, UINT(*)(const BYTE*,UINT), UINT, UINT*);	/* Forward data to the stream */

-FRESULT f_mkfs (BYTE, BYTE, DWORD);					/* Create a file system on the drive */

-FRESULT f_chdir (const XCHAR*);						/* Change current directory */

+FRESULT f_mkfs (BYTE, BYTE, UINT);					/* Create a file system on the drive */

 FRESULT f_chdrive (BYTE);							/* Change current drive */

+FRESULT f_chdir (const TCHAR*);						/* Change current directory */

+FRESULT f_getcwd (TCHAR*, UINT);					/* Get current directory */

+int f_putc (TCHAR, FIL*);							/* Put a character to the file */

+int f_puts (const TCHAR*, FIL*);					/* Put a string to the file */

+int f_printf (FIL*, const TCHAR*, ...);				/* Put a formatted string to the file */

+TCHAR* f_gets (TCHAR*, int, FIL*);					/* Get a string from the file */

 

-#if _USE_STRFUNC

-int f_putc (int, FIL*);								/* Put a character to the file */

-int f_puts (const char*, FIL*);						/* Put a string to the file */

-int f_printf (FIL*, const char*, ...);				/* Put a formatted string to the file */

-char* f_gets (char*, int, FIL*);					/* Get a string from the file */

-#define f_eof(fp) (((fp)->fptr == (fp)->fsize) ? 1 : 0)

-#define f_error(fp) (((fp)->flag & FA__ERROR) ? 1 : 0)

 #ifndef EOF

-#define EOF -1

-#endif

+#define EOF (-1)

 #endif

 

+#define f_eof(fp) (((fp)->fptr == (fp)->fsize) ? 1 : 0)

+#define f_error(fp) (((fp)->flag & FA__ERROR) ? 1 : 0)

+#define f_tell(fp) ((fp)->fptr)

+#define f_size(fp) ((fp)->fsize)

+

+

 

 

 /*--------------------------------------------------------------*/

-/* User defined functions                                       */

+/* Additional user defined functions                            */

 

-/* Real time clock */

+/* RTC function */

 #if !_FS_READONLY

-DWORD get_fattime (void);	/* 31-25: Year(0-127 org.1980), 24-21: Month(1-12), 20-16: Day(1-31) */

-							/* 15-11: Hour(0-23), 10-5: Minute(0-59), 4-0: Second(0-29 *2) */

+DWORD get_fattime (void);

 #endif

 

-/* Unicode - OEM code conversion */

-#if _USE_LFN

-WCHAR ff_convert (WCHAR, UINT);

-WCHAR ff_wtoupper (WCHAR);

+/* Unicode support functions */

+#if _USE_LFN						/* Unicode - OEM code conversion */

+WCHAR ff_convert (WCHAR, UINT);		/* OEM-Unicode bidirectional conversion */

+WCHAR ff_wtoupper (WCHAR);			/* Unicode upper-case conversion */

+#if _USE_LFN == 3					/* Memory functions */

+void* ff_memalloc (UINT);			/* Allocate memory block */

+void ff_memfree (void*);			/* Free memory block */

+#endif

 #endif

 

 /* Sync functions */

 #if _FS_REENTRANT

-BOOL ff_cre_syncobj(BYTE, _SYNC_t*);

-BOOL ff_del_syncobj(_SYNC_t);

-BOOL ff_req_grant(_SYNC_t);

-void ff_rel_grant(_SYNC_t);

+int ff_cre_syncobj (BYTE, _SYNC_t*);/* Create a sync object */

+int ff_req_grant (_SYNC_t);			/* Lock sync object */

+void ff_rel_grant (_SYNC_t);		/* Unlock sync object */

+int ff_del_syncobj (_SYNC_t);		/* Delete a sync object */

 #endif

 

 

 

+

 /*--------------------------------------------------------------*/

 /* Flags and offset address                                     */

 

@@ -485,7 +278,9 @@ void ff_rel_grant(_SYNC_t);
 

 #define	FA_READ				0x01

 #define	FA_OPEN_EXISTING	0x00

-#if _FS_READONLY == 0

+#define FA__ERROR			0x80

+

+#if !_FS_READONLY

 #define	FA_WRITE			0x02

 #define	FA_CREATE_NEW		0x04

 #define	FA_CREATE_ALWAYS	0x08

@@ -493,7 +288,6 @@ void ff_rel_grant(_SYNC_t);
 #define FA__WRITTEN			0x20

 #define FA__DIRTY			0x40

 #endif

-#define FA__ERROR			0x80

 

 

 /* FAT sub type (FATFS.fs_type) */

@@ -515,66 +309,8 @@ void ff_rel_grant(_SYNC_t);
 #define AM_MASK	0x3F	/* Mask of defined bits */

 

 

-/* FatFs refers the members in the FAT structures with byte offset instead

-/ of structure member because there are incompatibility of the packing option

-/ between various compilers. */

-

-#define BS_jmpBoot			0

-#define BS_OEMName			3

-#define BPB_BytsPerSec		11

-#define BPB_SecPerClus		13

-#define BPB_RsvdSecCnt		14

-#define BPB_NumFATs			16

-#define BPB_RootEntCnt		17

-#define BPB_TotSec16		19

-#define BPB_Media			21

-#define BPB_FATSz16			22

-#define BPB_SecPerTrk		24

-#define BPB_NumHeads		26

-#define BPB_HiddSec			28

-#define BPB_TotSec32		32

-#define BS_55AA				510

-

-#define BS_DrvNum			36

-#define BS_BootSig			38

-#define BS_VolID			39

-#define BS_VolLab			43

-#define BS_FilSysType		54

-

-#define BPB_FATSz32			36

-#define BPB_ExtFlags		40

-#define BPB_FSVer			42

-#define BPB_RootClus		44

-#define BPB_FSInfo			48

-#define BPB_BkBootSec		50

-#define BS_DrvNum32			64

-#define BS_BootSig32		66

-#define BS_VolID32			67

-#define BS_VolLab32			71

-#define BS_FilSysType32		82

-

-#define	FSI_LeadSig			0

-#define	FSI_StrucSig		484

-#define	FSI_Free_Count		488

-#define	FSI_Nxt_Free		492

-

-#define MBR_Table			446

-

-#define	DIR_Name			0

-#define	DIR_Attr			11

-#define	DIR_NTres			12

-#define	DIR_CrtTime			14

-#define	DIR_CrtDate			16

-#define	DIR_FstClusHI		20

-#define	DIR_WrtTime			22

-#define	DIR_WrtDate			24

-#define	DIR_FstClusLO		26

-#define	DIR_FileSize		28

-#define	LDIR_Ord			0

-#define	LDIR_Attr			11

-#define	LDIR_Type			12

-#define	LDIR_Chksum			13

-#define	LDIR_FstClusLO		26

+/* Fast seek function */

+#define CREATE_LINKMAP	0xFFFFFFFF

 

 

 

@@ -587,11 +323,14 @@ void ff_rel_grant(_SYNC_t);
 #define	ST_WORD(ptr,val)	*(WORD*)(BYTE*)(ptr)=(WORD)(val)

 #define	ST_DWORD(ptr,val)	*(DWORD*)(BYTE*)(ptr)=(DWORD)(val)

 #else					/* Use byte-by-byte access to the FAT structure */

-#define	LD_WORD(ptr)		(WORD)(((WORD)*(BYTE*)((ptr)+1)<<8)|(WORD)*(BYTE*)(ptr))

-#define	LD_DWORD(ptr)		(DWORD)(((DWORD)*(BYTE*)((ptr)+3)<<24)|((DWORD)*(BYTE*)((ptr)+2)<<16)|((WORD)*(BYTE*)((ptr)+1)<<8)|*(BYTE*)(ptr))

-#define	ST_WORD(ptr,val)	*(BYTE*)(ptr)=(BYTE)(val); *(BYTE*)((ptr)+1)=(BYTE)((WORD)(val)>>8)

-#define	ST_DWORD(ptr,val)	*(BYTE*)(ptr)=(BYTE)(val); *(BYTE*)((ptr)+1)=(BYTE)((WORD)(val)>>8); *(BYTE*)((ptr)+2)=(BYTE)((DWORD)(val)>>16); *(BYTE*)((ptr)+3)=(BYTE)((DWORD)(val)>>24)

+#define	LD_WORD(ptr)		(WORD)(((WORD)*((BYTE*)(ptr)+1)<<8)|(WORD)*(BYTE*)(ptr))

+#define	LD_DWORD(ptr)		(DWORD)(((DWORD)*((BYTE*)(ptr)+3)<<24)|((DWORD)*((BYTE*)(ptr)+2)<<16)|((WORD)*((BYTE*)(ptr)+1)<<8)|*(BYTE*)(ptr))

+#define	ST_WORD(ptr,val)	*(BYTE*)(ptr)=(BYTE)(val); *((BYTE*)(ptr)+1)=(BYTE)((WORD)(val)>>8)

+#define	ST_DWORD(ptr,val)	*(BYTE*)(ptr)=(BYTE)(val); *((BYTE*)(ptr)+1)=(BYTE)((WORD)(val)>>8); *((BYTE*)(ptr)+2)=(BYTE)((DWORD)(val)>>16); *((BYTE*)(ptr)+3)=(BYTE)((DWORD)(val)>>24)

 #endif

 

+#ifdef __cplusplus

+}

+#endif

 

 #endif /* _FATFS */

diff --git a/components/dfs/filesystems/elmfat/ffconf.h b/components/dfs/filesystems/elmfat/ffconf.h
index 41f30b51e1..615a79fa8e 100644
--- a/components/dfs/filesystems/elmfat/ffconf.h
+++ b/components/dfs/filesystems/elmfat/ffconf.h
@@ -1,52 +1,57 @@
 /*---------------------------------------------------------------------------/

-/  FatFs - FAT file system module configuration file  R0.07e  (C)ChaN, 2009

+/  FatFs - FAT file system module configuration file  R0.08b (C)ChaN, 2011

 /----------------------------------------------------------------------------/

 /

 / CAUTION! Do not forget to make clean the project after any changes to

 / the configuration options.

 /

 /----------------------------------------------------------------------------*/

-#ifndef _FFCONFIG

-#define _FFCONFIG 0x007E

+#ifndef _FFCONF

+#define _FFCONF 8237	/* Revision ID */

+

 

 /*---------------------------------------------------------------------------/

 / Function and Buffer Configurations

 /----------------------------------------------------------------------------*/

 

-#define	_FS_TINY	0		/* 0 or 1 */

+#define	_FS_TINY		0	/* 0:Normal or 1:Tiny */

 /* When _FS_TINY is set to 1, FatFs uses the sector buffer in the file system

 /  object instead of the sector buffer in the individual file object for file

 /  data transfer. This reduces memory consumption 512 bytes each file object. */

 

 

-#define _FS_READONLY	0	/* 0 or 1 */

+#define _FS_READONLY	0	/* 0:Read/Write or 1:Read only */

 /* Setting _FS_READONLY to 1 defines read only configuration. This removes

 /  writing functions, f_write, f_sync, f_unlink, f_mkdir, f_chmod, f_rename,

 /  f_truncate and useless f_getfree. */

 

 

-#define _FS_MINIMIZE	0	/* 0, 1, 2 or 3 */

+#define _FS_MINIMIZE	0	/* 0 to 3 */

 /* The _FS_MINIMIZE option defines minimization level to remove some functions.

 /

 /   0: Full function.

 /   1: f_stat, f_getfree, f_unlink, f_mkdir, f_chmod, f_truncate and f_rename

 /      are removed.

-/   2: f_opendir and f_readdir are removed in addition to level 1.

-/   3: f_lseek is removed in addition to level 2. */

+/   2: f_opendir and f_readdir are removed in addition to 1.

+/   3: f_lseek is removed in addition to 2. */

 

 

-#define	_USE_STRFUNC	0	/* 0, 1 or 2 */

+#define	_USE_STRFUNC	0	/* 0:Disable or 1/2:Enable */

 /* To enable string functions, set _USE_STRFUNC to 1 or 2. */

 

 

-#define	_USE_MKFS	1		/* 0 or 1 */

+#define	_USE_MKFS		1	/* 0:Disable or 1:Enable */

 /* To enable f_mkfs function, set _USE_MKFS to 1 and set _FS_READONLY to 0 */

 

 

-#define	_USE_FORWARD	0	/* 0 or 1 */

+#define	_USE_FORWARD	0	/* 0:Disable or 1:Enable */

 /* To enable f_forward function, set _USE_FORWARD to 1 and set _FS_TINY to 1. */

 

 

+#define	_USE_FASTSEEK	1	/* 0:Disable or 1:Enable */

+/* To enable fast seek feature, set _USE_FASTSEEK to 1. */

+

+

 

 /*---------------------------------------------------------------------------/

 / Locale and Namespace Configurations

@@ -84,37 +89,43 @@
 /	1    - ASCII only (Valid for non LFN cfg.)

 */

 

+

 #ifdef RT_DFS_ELM_USE_LFN

 #define _USE_LFN RT_DFS_ELM_USE_LFN

 #define _MAX_LFN RT_DFS_ELM_MAX_LFN

 #else

-#define	_USE_LFN	0		/* 0, 1 or 2 */

+#define	_USE_LFN	0		/* 0 to 3 */

 #define	_MAX_LFN	255		/* Maximum LFN length to handle (12 to 255) */

 #endif

-

 /* The _USE_LFN option switches the LFN support.

 /

-/   0: Disable LFN. _MAX_LFN and _LFN_UNICODE have no effect.

-/   1: Enable LFN with static working buffer on the bss. NOT REENTRANT.

+/   0: Disable LFN feature. _MAX_LFN and _LFN_UNICODE have no effect.

+/   1: Enable LFN with static working buffer on the BSS. Always NOT reentrant.

 /   2: Enable LFN with dynamic working buffer on the STACK.

+/   3: Enable LFN with dynamic working buffer on the HEAP.

 /

-/  The LFN working buffer occupies (_MAX_LFN + 1) * 2 bytes. When enable LFN,

-/  two Unicode handling functions ff_convert() and ff_wtoupper() must be added

-/  to the project. */

+/  The LFN working buffer occupies (_MAX_LFN + 1) * 2 bytes. To enable LFN,

+/  Unicode handling functions ff_convert() and ff_wtoupper() must be added

+/  to the project. When enable to use heap, memory control functions

+/  ff_memalloc() and ff_memfree() must be added to the project. */

+

 

 #ifdef RT_DFS_ELM_LFN_UNICODE

-#define _LFN_UNICODE	1	/* 0 or 1 */

+#define _LFN_UNICODE	1	/* 0:ANSI/OEM or 1:Unicode */

 #else

-#define	_LFN_UNICODE	0	/* 0 or 1 */

+#define	_LFN_UNICODE	0	/* 0:ANSI/OEM or 1:Unicode */

 #endif

 /* To switch the character code set on FatFs API to Unicode,

-/  enable LFN feature and set _LFN_UNICODE to 1.

-*/

+/  enable LFN feature and set _LFN_UNICODE to 1. */

 

 

-#define _FS_RPATH	0		/* 0 or 1 */

-/* When _FS_RPATH is set to 1, relative path feature is enabled and f_chdir,

-/  f_chdrive function are available.

+#define _FS_RPATH		0	/* 0 to 2 */

+/* The _FS_RPATH option configures relative path feature.

+/

+/   0: Disable relative path feature and remove related functions.

+/   1: Enable relative path. f_chdrive() and f_chdir() are available.

+/   2: f_getcwd() is available in addition to 1.

+/

 /  Note that output of the f_readdir fnction is affected by this option. */

 

 

@@ -122,10 +133,11 @@
 /*---------------------------------------------------------------------------/

 / Physical Drive Configurations

 /----------------------------------------------------------------------------*/

+

 #ifdef RT_DFS_ELM_DRIVES

-#define _DRIVES RT_DFS_ELM_DRIVES

+#define _VOLUMES RT_DFS_ELM_DRIVES

 #else

-#define _DRIVES		1

+#define _VOLUMES	1

 #endif

 /* Number of volumes (logical drives) to be used. */

 

@@ -137,46 +149,56 @@
 #endif

 /* Maximum sector size to be handled.

 /  Always set 512 for memory card and hard disk but a larger value may be

-/  required for floppy disk (512/1024) and optical disk (512/2048).

-/  When _MAX_SS is larger than 512, GET_SECTOR_SIZE command must be implememted

-/  to the disk_ioctl function. */

+/  required for on-board flash memory, floppy disk and optical disk.

+/  When _MAX_SS is larger than 512, it configures FatFs to variable sector size

+/  and GET_SECTOR_SIZE command must be implememted to the disk_ioctl function. */

 

 

-#define	_MULTI_PARTITION	0	/* 0 or 1 */

-/* When _MULTI_PARTITION is set to 0, each volume is bound to the same physical

-/ drive number and can mount only first primaly partition. When it is set to 1,

-/ each volume is tied to the partitions listed in Drives[]. */

+#define	_MULTI_PARTITION	0	/* 0:Single partition or 1:Multiple partition */

+/* When set to 0, each volume is bound to the same physical drive number and

+/ it can mount only first primaly partition. When it is set to 1, each volume

+/ is tied to the partitions listed in VolToPart[]. */

+

+

+#define	_USE_ERASE	0	/* 0:Disable or 1:Enable */

+/* To enable sector erase feature, set _USE_ERASE to 1. CTRL_ERASE_SECTOR command

+/  should be added to the disk_ioctl functio. */

 

 

 

 /*---------------------------------------------------------------------------/

 / System Configurations

 /----------------------------------------------------------------------------*/

+

 #ifdef RT_DFS_ELM_WORD_ACCESS

 #define _WORD_ACCESS	1

 #else

-#define _WORD_ACCESS	0

+#define _WORD_ACCESS	0	/* 0 or 1 */

 #endif

-

-/* The _WORD_ACCESS option defines which access method is used to the word

-/  data on the FAT volume.

+/* Set 0 first and it is always compatible with all platforms. The _WORD_ACCESS

+/  option defines which access method is used to the word data on the FAT volume.

 /

-/   0: Byte-by-byte access. Always compatible with all platforms.

+/   0: Byte-by-byte access.

 /   1: Word access. Do not choose this unless following condition is met.

 /

-/  When the byte order on the memory is big-endian or address miss-aligned

-/  word access results incorrect behavior, the _WORD_ACCESS must be set to 0.

+/  When the byte order on the memory is big-endian or address miss-aligned word

+/  access results incorrect behavior, the _WORD_ACCESS must be set to 0.

 /  If it is not the case, the value can also be set to 1 to improve the

 /  performance and code size. */

 

+

+/* A header file that defines sync object types on the O/S, such as

+/  windows.h, ucos_ii.h and semphr.h, must be included prior to ff.h. */

+

 #ifdef RT_DFS_ELM_REENTRANT

 #define _FS_REENTRANT	RT_DFS_ELM_REENTRANT			/* 0 or 1 */

 #else

-#define _FS_REENTRANT	0

+#define _FS_REENTRANT	0		/* 0:Disable or 1:Enable */

 #endif

-#define _FS_TIMEOUT		1000		/* Timeout period in unit of time ticks */

+#define _FS_TIMEOUT		1000	/* Timeout period in unit of time ticks */

 #define	_SYNC_t			rt_mutex_t	/* O/S dependent type of sync object. e.g. HANDLE, OS_EVENT*, ID and etc.. */

-/* The _FS_REENTRANT option switches the reentrancy of the FatFs module.

+

+/* The _FS_REENTRANT option switches the reentrancy (thread safe) of the FatFs module.

 /

 /   0: Disable reentrancy. _SYNC_t and _FS_TIMEOUT have no effect.

 /   1: Enable reentrancy. Also user provided synchronization handlers,

@@ -184,4 +206,9 @@
 /      function must be added to the project. */

 

 

+#define	_FS_SHARE	0	/* 0:Disable or >=1:Enable */

+/* To enable file shareing feature, set _FS_SHARE to 1 or greater. The value

+   defines how many files can be opened simultaneously. */

+

+

 #endif /* _FFCONFIG */

diff --git a/components/dfs/filesystems/elmfat/integer.h b/components/dfs/filesystems/elmfat/integer.h
index 1d6bac3684..c2eaa39bae 100644
--- a/components/dfs/filesystems/elmfat/integer.h
+++ b/components/dfs/filesystems/elmfat/integer.h
@@ -3,10 +3,14 @@
 /*-------------------------------------------*/

 

 #ifndef _INTEGER

+#define _INTEGER

+

+#ifdef _WIN32	/* FatFs development platform */

 

-#if 0

 #include <windows.h>

-#else

+#include <tchar.h>

+

+#else			/* Embedded platform */

 

 /* These types must be 16-bit, 32-bit or larger integer */

 typedef int				INT;

@@ -28,10 +32,6 @@ typedef long			LONG;
 typedef unsigned long	ULONG;

 typedef unsigned long	DWORD;

 

-/* Boolean type */

-typedef enum { FALSE = 0, TRUE } BOOL;

-

 #endif

 

-#define _INTEGER

 #endif

diff --git a/components/dfs/filesystems/elmfat/option/cc932.c b/components/dfs/filesystems/elmfat/option/cc932.c
index 779ef68dbf..a5bb707cad 100644
--- a/components/dfs/filesystems/elmfat/option/cc932.c
+++ b/components/dfs/filesystems/elmfat/option/cc932.c
@@ -9,7 +9,7 @@
 #define _TINY_TABLE	0

 

 #if !_USE_LFN || _CODE_PAGE != 932

-#error This file is not needed in current configuration.

+#error This file is not needed in current configuration. Remove from the project.

 #endif

 

 

@@ -111,7 +111,7 @@ const WCHAR uni2sjis[] = {
 	0x3088, 0x82E6, 0x3089, 0x82E7, 0x308A, 0x82E8, 0x308B, 0x82E9,

 	0x308C, 0x82EA, 0x308D, 0x82EB, 0x308E, 0x82EC, 0x308F, 0x82ED,

 	0x3090, 0x82EE, 0x3091, 0x82EF, 0x3092, 0x82F0, 0x3093, 0x82F1,

-	0x3094, 0x8394, 0x309B, 0x814A, 0x309C, 0x814B, 0x309D, 0x8154,

+	0x309B, 0x814A, 0x309C, 0x814B, 0x309D, 0x8154,

 	0x309E, 0x8155, 0x30A1, 0x8340, 0x30A2, 0x8341, 0x30A3, 0x8342,

 	0x30A4, 0x8343, 0x30A5, 0x8344, 0x30A6, 0x8345, 0x30A7, 0x8346,

 	0x30A8, 0x8347, 0x30A9, 0x8348, 0x30AA, 0x8349, 0x30AB, 0x834A,

@@ -1979,7 +1979,7 @@ const WCHAR sjis2uni[] = {
 	0x8386, 0x30E6, 0x8387, 0x30E7, 0x8388, 0x30E8, 0x8389, 0x30E9,

 	0x838A, 0x30EA, 0x838B, 0x30EB, 0x838C, 0x30EC, 0x838D, 0x30ED,

 	0x838E, 0x30EE, 0x838F, 0x30EF, 0x8390, 0x30F0, 0x8391, 0x30F1,

-	0x8392, 0x30F2, 0x8393, 0x30F3, 0x8394, 0x3094, 0x8394, 0x30F4,

+	0x8392, 0x30F2, 0x8393, 0x30F3, 0x8394, 0x30F4,

 	0x8395, 0x30F5, 0x8396, 0x30F6, 0x839F, 0x0391, 0x83A0, 0x0392,

 	0x83A1, 0x0393, 0x83A2, 0x0394, 0x83A3, 0x0395, 0x83A4, 0x0396,

 	0x83A5, 0x0397, 0x83A6, 0x0398, 0x83A7, 0x0399, 0x83A8, 0x039A,

@@ -3760,9 +3760,9 @@ WCHAR ff_convert (	/* Converted code, 0 means conversion error */
 			do {

 				c = *p;

 				p += 2;

+			} while (c && c != src);

 			p -= 3;

 			c = *p;

-			} while (c && c != src);

 		} else {		/* Unicode to OEMCP */

 			li = 0; hi = sizeof(uni2sjis) / 4 - 1;

 			for (n = 16; n; n--) {

diff --git a/components/dfs/filesystems/elmfat/option/cc936.c b/components/dfs/filesystems/elmfat/option/cc936.c
index 276a83f9b1..6e58e89748 100644
--- a/components/dfs/filesystems/elmfat/option/cc936.c
+++ b/components/dfs/filesystems/elmfat/option/cc936.c
@@ -8,7 +8,7 @@
 

 

 #if !_USE_LFN || _CODE_PAGE != 936

-#error This file is not needed in current configuration.

+#error This file is not needed in current configuration. Remove from the project.

 #endif

 

 static

diff --git a/components/dfs/filesystems/elmfat/option/cc949.c b/components/dfs/filesystems/elmfat/option/cc949.c
index 5dcb0a8789..626268b054 100644
--- a/components/dfs/filesystems/elmfat/option/cc949.c
+++ b/components/dfs/filesystems/elmfat/option/cc949.c
@@ -1,14 +1,14 @@
 /*------------------------------------------------------------------------*/

 /* Unicode - OEM code bidirectional converter  (C)ChaN, 2009              */

 /*                                                                        */

-/* CP949 (Korean)                                                         */

+/* CP949 (Korean EUC-KR)                                                  */

 /*------------------------------------------------------------------------*/

 

 #include "../ff.h"

 

 

 #if !_USE_LFN || _CODE_PAGE != 949

-#error This file is not needed in current configuration.

+#error This file is not needed in current configuration. Remove from the project.

 #endif

 

 

diff --git a/components/dfs/filesystems/elmfat/option/cc950.c b/components/dfs/filesystems/elmfat/option/cc950.c
index aa02a75746..f58c9a496c 100644
--- a/components/dfs/filesystems/elmfat/option/cc950.c
+++ b/components/dfs/filesystems/elmfat/option/cc950.c
@@ -8,7 +8,7 @@
 

 

 #if !_USE_LFN || _CODE_PAGE != 950

-#error This file is not needed in current configuration.

+#error This file is not needed in current configuration. Remove from the project.

 #endif

 

 

diff --git a/components/dfs/filesystems/elmfat/option/ccsbcs.c b/components/dfs/filesystems/elmfat/option/ccsbcs.c
index 359755ac5e..eb0ab4ebbf 100644
--- a/components/dfs/filesystems/elmfat/option/ccsbcs.c
+++ b/components/dfs/filesystems/elmfat/option/ccsbcs.c
@@ -329,7 +329,7 @@ const WCHAR Tbl[] = {	/*  CP1251(0x80-0xFF) to Unicode conversion table */
 	0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417,

 	0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F,

 	0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427,

-	0x0428, 0x0429, 0x042A, 0x042D, 0x042C, 0x042D, 0x042E, 0x042F,

+	0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F,

 	0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437,

 	0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F,

 	0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447,

@@ -351,7 +351,7 @@ const WCHAR Tbl[] = {	/*  CP1252(0x80-0xFF) to Unicode conversion table */
 	0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7,

 	0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,

 	0x00D0, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7,

-	0x00D8, 0x00D9, 0x00DA, 0x00BD, 0x00DC, 0x00DD, 0x00DE, 0x00DF,

+	0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x00DE, 0x00DF,

 	0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7,

 	0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,

 	0x00F0, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7,

@@ -494,7 +494,7 @@ const WCHAR Tbl[] = {	/*  CP1258(0x80-0xFF) to Unicode conversion table */
 

 

 #if !_TBLDEF || !_USE_LFN

-#error This file is not needed in current configuration

+#error This file is not needed in current configuration. Remove from the project.

 #endif

 

 

diff --git a/components/dfs/filesystems/elmfat/option/syncobj.c b/components/dfs/filesystems/elmfat/option/syscall.c
index 8fa6607400..beb7385731 100644
--- a/components/dfs/filesystems/elmfat/option/syncobj.c
+++ b/components/dfs/filesystems/elmfat/option/syscall.c
@@ -1,17 +1,17 @@
 /*------------------------------------------------------------------------*/

-/* Sample code of OS dependent synchronization object controls            */

-/* for FatFs R0.07d  (C)ChaN, 2009                                        */

+/* Sample code of OS dependent controls for FatFs R0.08                   */

+/* (C)ChaN, 2010                                                          */

 /*------------------------------------------------------------------------*/

 

-#include <windows.h>	// Win32

-//#include <ucos_ii.h>	// uC/OS-II

+#include <stdlib.h>		/* ANSI memory controls */

+#include <malloc.h>		/* ANSI memory controls */

 

 #include "../ff.h"

 

-#if _FS_REENTRANT

 

+#if _FS_REENTRANT

 /*------------------------------------------------------------------------*/

-/* Create a Synchronization Object for a Volume

+/* Create a Synchronization Object

 /*------------------------------------------------------------------------*/

 /* This function is called in f_mount function to create a new

 /  synchronization object, such as semaphore and mutex. When a FALSE is

@@ -25,14 +25,17 @@ BOOL ff_cre_syncobj (	/* TRUE:Function succeeded, FALSE:Could not create due to
 {

 	BOOL ret;

 

-	*sobj = CreateMutex(NULL, FALSE, NULL);					// Win32

-	ret = (*sobj != INVALID_HANDLE_VALUE) ? TRUE : FALSE;	//

+	*sobj = CreateMutex(NULL, FALSE, NULL);					/* Win32 */

+	ret = (*sobj != INVALID_HANDLE_VALUE) ? TRUE : FALSE;

 

-//	*sobj = VolumeSemId[vol];	// uITRON (give a static created sync object)

-//	ret = TRUE;					// The initial value of the semaphore must be 1.

+//	*sobj = SyncObjects[vol];	/* uITRON (give a static created sync object) */

+//	ret = TRUE;					/* The initial value of the semaphore must be 1. */

 

-//	*sobj = OSMutexCreate(0, &err);				// uC/OS-II

-//	ret = (err == OS_NO_ERR) ? TRUE : FALSE;	//

+//	*sobj = OSMutexCreate(0, &err);				/* uC/OS-II */

+//	ret = (err == OS_NO_ERR) ? TRUE : FALSE;

+

+//	*sobj = xSemaphoreCreateMutex();			/* FreeRTOS */

+//	ret = (*sobj != NULL) ? TRUE : FALSE;

 

 	return ret;

 }

@@ -53,12 +56,14 @@ BOOL ff_del_syncobj (	/* TRUE:Function succeeded, FALSE:Could not delete due to
 {

 	BOOL ret;

 

-	ret = CloseHandle(sobj);	// Win32

+	ret = CloseHandle(sobj);	/* Win32 *

+

+//	ret = TRUE;					/* uITRON (nothing to do) *

 

-//	ret = TRUE;					// uITRON (nothing to do)

+//	OSMutexDel(sobj, OS_DEL_ALWAYS, &err);		/* uC/OS-II */

+//	ret = (err == OS_NO_ERR) ? TRUE : FALSE;

 

-//	OSMutexDel(sobj, OS_DEL_ALWAYS, &err);		// uC/OS-II

-//	ret = (err == OS_NO_ERR) ? TRUE : FALSE;	//

+//	ret = TRUE;					/* FreeRTOS (nothing to do) */

 

 	return ret;

 }

@@ -78,12 +83,14 @@ BOOL ff_req_grant (	/* TRUE:Got a grant to access the volume, FALSE:Could not ge
 {

 	BOOL ret;

 

-	ret = (WaitForSingleObject(sobj, _FS_TIMEOUT) == WAIT_OBJECT_0) ? TRUE : FALSE;	// Win32

+	ret = (WaitForSingleObject(sobj, _FS_TIMEOUT) == WAIT_OBJECT_0) ? TRUE : FALSE;	/* Win32 */

 

-//	ret = (wai_sem(sobj) == E_OK) ? TRUE : FALSE;	// uITRON

+//	ret = (wai_sem(sobj) == E_OK) ? TRUE : FALSE;	/* uITRON */

 

-//	OSMutexPend(sobj, _FS_TIMEOUT, &err));				// uC/OS-II

-//	ret = (err == OS_NO_ERR) ? TRUE : FALSE;		//

+//	OSMutexPend(sobj, _FS_TIMEOUT, &err));			/* uC/OS-II */

+//	ret = (err == OS_NO_ERR) ? TRUE : FALSE;

+

+//	ret = (xSemaphoreTake(sobj, _FS_TIMEOUT) == pdTRUE) ? TRUE : FALSE;	/* FreeRTOS */

 

 	return ret;

 }

@@ -100,16 +107,45 @@ void ff_rel_grant (
 	_SYNC_t sobj	/* Sync object to be signaled */

 )

 {

-	ReleaseMutex(sobj);	// Win32

+	ReleaseMutex(sobj);		/* Win32 */

+

+//	sig_sem(sobj);			/* uITRON */

+

+//	OSMutexPost(sobj);		/* uC/OS-II */

 

-//	sig_sem(sobj);		// uITRON

+//	xSemaphoreGive(sobj);	/* FreeRTOS */

 

-//	OSMutexPost(sobj);	// uC/OS-II

 }

 

+#endif

+

+

 

-#else

 

-#error This file is not needed in this configuration.

+#if _USE_LFN == 3	/* LFN with a working buffer on the heap */

+/*------------------------------------------------------------------------*/

+/* Allocate a memory block                                                */

+/*------------------------------------------------------------------------*/

+/* If a NULL is returned, the file function fails with FR_NOT_ENOUGH_CORE.

+*/

+

+void* ff_memalloc (	/* Returns pointer to the allocated memory block */

+	UINT size		/* Number of bytes to allocate */

+)

+{

+	return malloc(size);

+}

+

+

+/*------------------------------------------------------------------------*/

+/* Free a memory block                                                    */

+/*------------------------------------------------------------------------*/

+

+void ff_memfree(

+	void* mblock	/* Pointer to the memory block to free */

+)

+{

+	free(mblock);

+}

 

 #endif