]> cloudbase.mooo.com Git - z180-stamp.git/blobdiff - fatfs/src/ff.c
Import fatfs R0.12b
[z180-stamp.git] / fatfs / src / ff.c
index 9c887c45965fe1f44edde5d09b4dcacad88071f6..ffc5240970e454888e2243ac0af86850946ee215 100644 (file)
 /*----------------------------------------------------------------------------/\r
-/  FatFs - FAT file system module  R0.10c                (C)ChaN, 2014\r
+/  FatFs - Generic FAT file system module  R0.12b                             /\r
 /-----------------------------------------------------------------------------/\r
-/ FatFs module is a generic FAT file system module for small embedded systems.\r
-/ This is a free software that opened for education, research and commercial\r
-/ developments under license policy of following terms.\r
 /\r
-/  Copyright (C) 2014, ChaN, all right reserved.\r
+/ Copyright (C) 2016, ChaN, all right reserved.\r
 /\r
-/ * The FatFs module is a free software and there is NO WARRANTY.\r
-/ * No restriction on use. You can use, modify and redistribute it for\r
-/   personal, non-profit or commercial products UNDER YOUR RESPONSIBILITY.\r
-/ * Redistributions of source code must retain the above copyright notice.\r
-/\r
-/-----------------------------------------------------------------------------/\r
-/ Feb 26,'06 R0.00  Prototype.\r
-/\r
-/ Apr 29,'06 R0.01  First stable version.\r
-/\r
-/ Jun 01,'06 R0.02  Added FAT12 support.\r
-/                   Removed unbuffered mode.\r
-/                   Fixed a problem on small (<32M) partition.\r
-/ Jun 10,'06 R0.02a Added a configuration option (_FS_MINIMUM).\r
-/\r
-/ Sep 22,'06 R0.03  Added f_rename().\r
-/                   Changed option _FS_MINIMUM to _FS_MINIMIZE.\r
-/ Dec 11,'06 R0.03a Improved cluster scan algorithm to write files fast.\r
-/                   Fixed f_mkdir() creates incorrect directory on FAT32.\r
-/\r
-/ Feb 04,'07 R0.04  Supported multiple drive system.\r
-/                   Changed some interfaces for multiple drive system.\r
-/                   Changed f_mountdrv() to f_mount().\r
-/                   Added f_mkfs().\r
-/ Apr 01,'07 R0.04a Supported multiple partitions on a physical drive.\r
-/                   Added a capability of extending file size to f_lseek().\r
-/                   Added minimization level 3.\r
-/                   Fixed an endian sensitive code in f_mkfs().\r
-/ May 05,'07 R0.04b Added a configuration option _USE_NTFLAG.\r
-/                   Added FSINFO support.\r
-/                   Fixed DBCS name can result FR_INVALID_NAME.\r
-/                   Fixed short seek (<= csize) collapses the file object.\r
-/\r
-/ Aug 25,'07 R0.05  Changed arguments of f_read(), f_write() and f_mkfs().\r
-/                   Fixed f_mkfs() on FAT32 creates incorrect FSINFO.\r
-/                   Fixed f_mkdir() on FAT32 creates incorrect directory.\r
-/ Feb 03,'08 R0.05a Added f_truncate() and f_utime().\r
-/                   Fixed off by one error at FAT sub-type determination.\r
-/                   Fixed btr in f_read() can be mistruncated.\r
-/                   Fixed cached sector is not flushed when create and close without write.\r
-/\r
-/ Apr 01,'08 R0.06  Added fputc(), fputs(), fprintf() and fgets().\r
-/                   Improved performance of f_lseek() on moving to the same or following cluster.\r
-/\r
-/ Apr 01,'09 R0.07  Merged Tiny-FatFs as a configuration option. (_FS_TINY)\r
-/                   Added long file name feature.\r
-/                   Added multiple code page feature.\r
-/                   Added re-entrancy for multitask operation.\r
-/                   Added auto cluster size selection to f_mkfs().\r
-/                   Added rewind option to f_readdir().\r
-/                   Changed result code of critical errors.\r
-/                   Renamed string functions to avoid name collision.\r
-/ Apr 14,'09 R0.07a Separated out OS dependent code on reentrant cfg.\r
-/                   Added multiple sector size feature.\r
-/ Jun 21,'09 R0.07c Fixed f_unlink() can return FR_OK on error.\r
-/                   Fixed wrong cache control in f_lseek().\r
-/                   Added relative path feature.\r
-/                   Added f_chdir() and f_chdrive().\r
-/                   Added proper case conversion to extended character.\r
-/ Nov 03,'09 R0.07e Separated out configuration options from ff.h to ffconf.h.\r
-/                   Fixed f_unlink() fails to remove a sub-directory on _FS_RPATH.\r
-/                   Fixed name matching error on the 13 character boundary.\r
-/                   Added a configuration option, _LFN_UNICODE.\r
-/                   Changed f_readdir() to return the SFN with always upper case on non-LFN cfg.\r
-/\r
-/ May 15,'10 R0.08  Added a memory configuration option. (_USE_LFN = 3)\r
-/                   Added file lock feature. (_FS_SHARE)\r
-/                   Added fast seek feature. (_USE_FASTSEEK)\r
-/                   Changed some types on the API, XCHAR->TCHAR.\r
-/                   Changed .fname in the FILINFO structure on Unicode cfg.\r
-/                   String functions support UTF-8 encoding files on Unicode cfg.\r
-/ Aug 16,'10 R0.08a Added f_getcwd().\r
-/                   Added sector erase feature. (_USE_ERASE)\r
-/                   Moved file lock semaphore table from fs object to the bss.\r
-/                   Fixed a wrong directory entry is created on non-LFN cfg when the given name contains ';'.\r
-/                   Fixed f_mkfs() creates wrong FAT32 volume.\r
-/ Jan 15,'11 R0.08b Fast seek feature is also applied to f_read() and f_write().\r
-/                   f_lseek() reports required table size on creating CLMP.\r
-/                   Extended format syntax of f_printf().\r
-/                   Ignores duplicated directory separators in given path name.\r
-/\r
-/ Sep 06,'11 R0.09  f_mkfs() supports multiple partition to complete the multiple partition feature.\r
-/                   Added f_fdisk().\r
-/ Aug 27,'12 R0.09a Changed f_open() and f_opendir() reject null object pointer to avoid crash.\r
-/                   Changed option name _FS_SHARE to _FS_LOCK.\r
-/                   Fixed assertion failure due to OS/2 EA on FAT12/16 volume.\r
-/ Jan 24,'13 R0.09b Added f_setlabel() and f_getlabel().\r
-/\r
-/ Oct 02,'13 R0.10  Added selection of character encoding on the file. (_STRF_ENCODE)\r
-/                   Added f_closedir().\r
-/                   Added forced full FAT scan for f_getfree(). (_FS_NOFSINFO)\r
-/                   Added forced mount feature with changes of f_mount().\r
-/                   Improved behavior of volume auto detection.\r
-/                   Improved write throughput of f_puts() and f_printf().\r
-/                   Changed argument of f_chdrive(), f_mkfs(), disk_read() and disk_write().\r
-/                   Fixed f_write() can be truncated when the file size is close to 4GB.\r
-/                   Fixed f_open(), f_mkdir() and f_setlabel() can return incorrect error code.\r
-/ Jan 15,'14 R0.10a Added arbitrary strings as drive number in the path name. (_STR_VOLUME_ID)\r
-/                   Added a configuration option of minimum sector size. (_MIN_SS)\r
-/                   2nd argument of f_rename() can have a drive number and it will be ignored.\r
-/                   Fixed f_mount() with forced mount fails when drive number is >= 1.\r
-/                   Fixed f_close() invalidates the file object without volume lock.\r
-/                   Fixed f_closedir() returns but the volume lock is left acquired.\r
-/                   Fixed creation of an entry with LFN fails on too many SFN collisions.\r
-/ May 19,'14 R0.10b Fixed a hard error in the disk I/O layer can collapse the directory entry.\r
-/                   Fixed LFN entry is not deleted on delete/rename an object with lossy converted SFN.\r
-/ Nov 09,'14 R0.10c Added a configuration option for the platforms without RTC. (_FS_NORTC)\r
-/                   Fixed volume label created by Mac OS X cannot be retrieved with f_getlabel().\r
-/                   Fixed a potential problem of FAT access that can appear on disk error.\r
-/                   Fixed null pointer dereference on attempting to delete the root direcotry.\r
-/---------------------------------------------------------------------------*/\r
+/ FatFs module is an open source software. Redistribution and use of FatFs in\r
+/ source and binary forms, with or without modification, are permitted provided\r
+/ that the following condition is met:\r
 \r
-#include "ff.h"                        /* Declarations of FatFs API */\r
-#include "diskio.h"            /* Declarations of disk I/O functions */\r
+/ 1. Redistributions of source code must retain the above copyright notice,\r
+/    this condition and the following disclaimer.\r
+/\r
+/ This software is provided by the copyright holder and contributors "AS IS"\r
+/ and any warranties related to this software are DISCLAIMED.\r
+/ The copyright owner or contributors be NOT LIABLE for any damages caused\r
+/ by use of this software.\r
+/----------------------------------------------------------------------------*/\r
 \r
 \r
+#include "ff.h"                        /* Declarations of FatFs API */\r
+#include "diskio.h"            /* Declarations of device I/O functions */\r
 \r
 \r
 /*--------------------------------------------------------------------------\r
 \r
 ---------------------------------------------------------------------------*/\r
 \r
-#if _FATFS != 80376    /* Revision ID */\r
+#if _FATFS != 68020    /* Revision ID */\r
 #error Wrong include file (ff.h).\r
 #endif\r
 \r
 \r
+#define        ABORT(fs, res)          { fp->err = (BYTE)(res); LEAVE_FF(fs, res); }\r
+\r
+\r
 /* Reentrancy related */\r
 #if _FS_REENTRANT\r
 #if _USE_LFN == 1\r
 #define LEAVE_FF(fs, res)      return res\r
 #endif\r
 \r
-#define        ABORT(fs, res)          { fp->err = (BYTE)(res); LEAVE_FF(fs, res); }\r
 \r
 \r
 /* Definitions of sector size */\r
 #endif\r
 \r
 \r
-/* Timestamp feature */\r
-#if _FS_NORTC\r
-#define GET_FATTIME()  ((DWORD)_NORTC_YEAR << 25 | (DWORD)_NORTC_MON << 21 | (DWORD)_NORTC_MDAY << 16)\r
+/* Timestamp */\r
+#if _FS_NORTC == 1\r
+#if _NORTC_YEAR < 1980 || _NORTC_YEAR > 2107 || _NORTC_MON < 1 || _NORTC_MON > 12 || _NORTC_MDAY < 1 || _NORTC_MDAY > 31\r
+#error Invalid _FS_NORTC settings\r
+#endif\r
+#define GET_FATTIME()  ((DWORD)(_NORTC_YEAR - 1980) << 25 | (DWORD)_NORTC_MON << 21 | (DWORD)_NORTC_MDAY << 16)\r
 #else\r
 #define GET_FATTIME()  get_fattime()\r
 #endif\r
 \r
 \r
-/* File access control feature */\r
-#if _FS_LOCK\r
+/* File lock controls */\r
+#if _FS_LOCK != 0\r
 #if _FS_READONLY\r
 #error _FS_LOCK must be 0 at read-only configuration\r
 #endif\r
 typedef struct {\r
        FATFS *fs;              /* Object ID 1, volume (NULL:blank entry) */\r
        DWORD clu;              /* Object ID 2, directory (0:root) */\r
-       WORD idx;               /* Object ID 3, directory index */\r
+       DWORD ofs;              /* Object ID 3, directory offset */\r
        WORD ctr;               /* Object open counter, 0:none, 0x01..0xFF:read mode open count, 0x100:write mode */\r
 } FILESEM;\r
 #endif\r
 \r
 \r
 \r
-/* DBCS code ranges and SBCS extend character conversion table */\r
+/* DBCS code ranges and SBCS upper conversion tables */\r
 \r
 #if _CODE_PAGE == 932  /* Japanese Shift-JIS */\r
 #define _DF1S  0x81    /* DBC 1st byte range 1 start */\r
@@ -223,156 +125,196 @@ typedef struct {
 #define _DS2S  0xA1\r
 #define _DS2E  0xFE\r
 \r
-#elif _CODE_PAGE == 437        /* U.S. (OEM) */\r
-#define _DF1S  0\r
-#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, \\r
-                               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, \\r
-                               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, \\r
-                               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}\r
-\r
-#elif _CODE_PAGE == 720        /* Arabic (OEM) */\r
-#define _DF1S  0\r
-#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, \\r
-                               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, \\r
-                               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, \\r
-                               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}\r
-\r
-#elif _CODE_PAGE == 737        /* Greek (OEM) */\r
+#elif _CODE_PAGE == 437        /* U.S. */\r
 #define _DF1S  0\r
-#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, \\r
-                               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, \\r
-                               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, \\r
-                               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}\r
-\r
-#elif _CODE_PAGE == 775        /* Baltic (OEM) */\r
-#define _DF1S  0\r
-#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, \\r
-                               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, \\r
-                               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, \\r
-                               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}\r
-\r
-#elif _CODE_PAGE == 850        /* Multilingual Latin 1 (OEM) */\r
-#define _DF1S  0\r
-#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, \\r
-                               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, \\r
-                               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, \\r
-                               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}\r
-\r
-#elif _CODE_PAGE == 852        /* Latin 2 (OEM) */\r
+#define _EXCVT {0x80,0x9A,0x45,0x41,0x8E,0x41,0x8F,0x80,0x45,0x45,0x45,0x49,0x49,0x49,0x8E,0x8F, \\r
+                               0x90,0x92,0x92,0x4F,0x99,0x4F,0x55,0x55,0x59,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \\r
+                               0x41,0x49,0x4F,0x55,0xA5,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF, \\r
+                               0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \\r
+                               0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF, \\r
+                               0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \\r
+                               0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF, \\r
+                               0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}\r
+\r
+#elif _CODE_PAGE == 720        /* Arabic */\r
 #define _DF1S  0\r
-#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, \\r
-                               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, \\r
-                               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, \\r
-                               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}\r
-\r
-#elif _CODE_PAGE == 855        /* Cyrillic (OEM) */\r
+#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F, \\r
+                               0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \\r
+                               0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF, \\r
+                               0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \\r
+                               0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF, \\r
+                               0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \\r
+                               0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF, \\r
+                               0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}\r
+\r
+#elif _CODE_PAGE == 737        /* Greek */\r
 #define _DF1S  0\r
-#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, \\r
-                               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, \\r
-                               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, \\r
-                               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}\r
-\r
-#elif _CODE_PAGE == 857        /* Turkish (OEM) */\r
+#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F, \\r
+                               0x90,0x92,0x92,0x93,0x94,0x95,0x96,0x97,0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87, \\r
+                               0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0xAA,0x92,0x93,0x94,0x95,0x96, \\r
+                               0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \\r
+                               0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF, \\r
+                               0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \\r
+                               0x97,0xEA,0xEB,0xEC,0xE4,0xED,0xEE,0xEF,0xF5,0xF0,0xEA,0xEB,0xEC,0xED,0xEE,0xEF, \\r
+                               0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}\r
+\r
+#elif _CODE_PAGE == 771        /* KBL */\r
 #define _DF1S  0\r
-#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, \\r
-                               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, \\r
-                               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, \\r
-                               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}\r
-\r
-#elif _CODE_PAGE == 858        /* Multilingual Latin 1 + Euro (OEM) */\r
+#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F, \\r
+                               0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \\r
+                               0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F, \\r
+                               0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \\r
+                               0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF, \\r
+                               0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDC,0xDE,0xDE, \\r
+                               0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \\r
+                               0xF0,0xF0,0xF2,0xF2,0xF4,0xF4,0xF6,0xF6,0xF8,0xF8,0xFA,0xFA,0xFC,0xFC,0xFE,0xFF}\r
+\r
+#elif _CODE_PAGE == 775        /* Baltic */\r
 #define _DF1S  0\r
-#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, \\r
-                               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, \\r
-                               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, \\r
-                               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}\r
-\r
-#elif _CODE_PAGE == 862        /* Hebrew (OEM) */\r
+#define _EXCVT {0x80,0x9A,0x91,0xA0,0x8E,0x95,0x8F,0x80,0xAD,0xED,0x8A,0x8A,0xA1,0x8D,0x8E,0x8F, \\r
+                               0x90,0x92,0x92,0xE2,0x99,0x95,0x96,0x97,0x97,0x99,0x9A,0x9D,0x9C,0x9D,0x9E,0x9F, \\r
+                               0xA0,0xA1,0xE0,0xA3,0xA3,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF, \\r
+                               0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \\r
+                               0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF, \\r
+                               0xB5,0xB6,0xB7,0xB8,0xBD,0xBE,0xC6,0xC7,0xA5,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \\r
+                               0xE0,0xE1,0xE2,0xE3,0xE5,0xE5,0xE6,0xE3,0xE8,0xE8,0xEA,0xEA,0xEE,0xED,0xEE,0xEF, \\r
+                               0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}\r
+\r
+#elif _CODE_PAGE == 850        /* Latin 1 */\r
 #define _DF1S  0\r
-#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, \\r
-                               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, \\r
-                               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, \\r
-                               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}\r
-\r
-#elif _CODE_PAGE == 866        /* Russian (OEM) */\r
+#define _EXCVT {0x43,0x55,0x45,0x41,0x41,0x41,0x41,0x43,0x45,0x45,0x45,0x49,0x49,0x49,0x41,0x41, \\r
+                               0x45,0x92,0x92,0x4F,0x4F,0x4F,0x55,0x55,0x59,0x4F,0x55,0x4F,0x9C,0x4F,0x9E,0x9F, \\r
+                               0x41,0x49,0x4F,0x55,0xA5,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF, \\r
+                               0xB0,0xB1,0xB2,0xB3,0xB4,0x41,0x41,0x41,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \\r
+                               0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0x41,0x41,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF, \\r
+                               0xD1,0xD1,0x45,0x45,0x45,0x49,0x49,0x49,0x49,0xD9,0xDA,0xDB,0xDC,0xDD,0x49,0xDF, \\r
+                               0x4F,0xE1,0x4F,0x4F,0x4F,0x4F,0xE6,0xE8,0xE8,0x55,0x55,0x55,0x59,0x59,0xEE,0xEF, \\r
+                               0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}\r
+\r
+#elif _CODE_PAGE == 852        /* Latin 2 */\r
 #define _DF1S  0\r
-#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, \\r
-                               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, \\r
-                               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, \\r
-                               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}\r
-\r
-#elif _CODE_PAGE == 874        /* Thai (OEM, Windows) */\r
+#define _EXCVT {0x80,0x9A,0x90,0xB6,0x8E,0xDE,0x8F,0x80,0x9D,0xD3,0x8A,0x8A,0xD7,0x8D,0x8E,0x8F, \\r
+                               0x90,0x91,0x91,0xE2,0x99,0x95,0x95,0x97,0x97,0x99,0x9A,0x9B,0x9B,0x9D,0x9E,0xAC, \\r
+                               0xB5,0xD6,0xE0,0xE9,0xA4,0xA4,0xA6,0xA6,0xA8,0xA8,0xAA,0x8D,0xAC,0xB8,0xAE,0xAF, \\r
+                               0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBD,0xBF, \\r
+                               0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC6,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF, \\r
+                               0xD1,0xD1,0xD2,0xD3,0xD2,0xD5,0xD6,0xD7,0xB7,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \\r
+                               0xE0,0xE1,0xE2,0xE3,0xE3,0xD5,0xE6,0xE6,0xE8,0xE9,0xE8,0xEB,0xED,0xED,0xDD,0xEF, \\r
+                               0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xEB,0xFC,0xFC,0xFE,0xFF}\r
+\r
+#elif _CODE_PAGE == 855        /* Cyrillic */\r
 #define _DF1S  0\r
-#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, \\r
-                               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, \\r
-                               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, \\r
-                               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}\r
-\r
-#elif _CODE_PAGE == 1250 /* Central Europe (Windows) */\r
+#define _EXCVT {0x81,0x81,0x83,0x83,0x85,0x85,0x87,0x87,0x89,0x89,0x8B,0x8B,0x8D,0x8D,0x8F,0x8F, \\r
+                               0x91,0x91,0x93,0x93,0x95,0x95,0x97,0x97,0x99,0x99,0x9B,0x9B,0x9D,0x9D,0x9F,0x9F, \\r
+                               0xA1,0xA1,0xA3,0xA3,0xA5,0xA5,0xA7,0xA7,0xA9,0xA9,0xAB,0xAB,0xAD,0xAD,0xAE,0xAF, \\r
+                               0xB0,0xB1,0xB2,0xB3,0xB4,0xB6,0xB6,0xB8,0xB8,0xB9,0xBA,0xBB,0xBC,0xBE,0xBE,0xBF, \\r
+                               0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC7,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF, \\r
+                               0xD1,0xD1,0xD3,0xD3,0xD5,0xD5,0xD7,0xD7,0xDD,0xD9,0xDA,0xDB,0xDC,0xDD,0xE0,0xDF, \\r
+                               0xE0,0xE2,0xE2,0xE4,0xE4,0xE6,0xE6,0xE8,0xE8,0xEA,0xEA,0xEC,0xEC,0xEE,0xEE,0xEF, \\r
+                               0xF0,0xF2,0xF2,0xF4,0xF4,0xF6,0xF6,0xF8,0xF8,0xFA,0xFA,0xFC,0xFC,0xFD,0xFE,0xFF}\r
+\r
+#elif _CODE_PAGE == 857        /* Turkish */\r
 #define _DF1S  0\r
-#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, \\r
-                               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, \\r
-                               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, \\r
-                               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}\r
-\r
-#elif _CODE_PAGE == 1251 /* Cyrillic (Windows) */\r
+#define _EXCVT {0x80,0x9A,0x90,0xB6,0x8E,0xB7,0x8F,0x80,0xD2,0xD3,0xD4,0xD8,0xD7,0x49,0x8E,0x8F, \\r
+                               0x90,0x92,0x92,0xE2,0x99,0xE3,0xEA,0xEB,0x98,0x99,0x9A,0x9D,0x9C,0x9D,0x9E,0x9E, \\r
+                               0xB5,0xD6,0xE0,0xE9,0xA5,0xA5,0xA6,0xA6,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF, \\r
+                               0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \\r
+                               0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC7,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF, \\r
+                               0xD0,0xD1,0xD2,0xD3,0xD4,0x49,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \\r
+                               0xE0,0xE1,0xE2,0xE3,0xE5,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xDE,0xED,0xEE,0xEF, \\r
+                               0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}\r
+\r
+#elif _CODE_PAGE == 860        /* Portuguese */\r
 #define _DF1S  0\r
-#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, \\r
-                               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, \\r
-                               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, \\r
-                               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}\r
-\r
-#elif _CODE_PAGE == 1252 /* Latin 1 (Windows) */\r
+#define _EXCVT {0x80,0x9A,0x90,0x8F,0x8E,0x91,0x86,0x80,0x89,0x89,0x92,0x8B,0x8C,0x98,0x8E,0x8F, \\r
+                               0x90,0x91,0x92,0x8C,0x99,0xA9,0x96,0x9D,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \\r
+                               0x86,0x8B,0x9F,0x96,0xA5,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF, \\r
+                               0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \\r
+                               0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF, \\r
+                               0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \\r
+                               0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF, \\r
+                               0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}\r
+\r
+#elif _CODE_PAGE == 861        /* Icelandic */\r
 #define _DF1S  0\r
-#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, \\r
-                               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, \\r
-                               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, \\r
-                               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}\r
-\r
-#elif _CODE_PAGE == 1253 /* Greek (Windows) */\r
+#define _EXCVT {0x80,0x9A,0x90,0x41,0x8E,0x41,0x8F,0x80,0x45,0x45,0x45,0x8B,0x8B,0x8D,0x8E,0x8F, \\r
+                               0x90,0x92,0x92,0x4F,0x99,0x8D,0x55,0x97,0x97,0x99,0x9A,0x9D,0x9C,0x9D,0x9E,0x9F, \\r
+                               0xA4,0xA5,0xA6,0xA7,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF, \\r
+                               0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \\r
+                               0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF, \\r
+                               0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \\r
+                               0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF, \\r
+                               0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}\r
+\r
+#elif _CODE_PAGE == 862        /* Hebrew */\r
 #define _DF1S  0\r
-#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, \\r
-                               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, \\r
-                               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, \\r
-                               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}\r
-\r
-#elif _CODE_PAGE == 1254 /* Turkish (Windows) */\r
+#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F, \\r
+                               0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \\r
+                               0x41,0x49,0x4F,0x55,0xA5,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF, \\r
+                               0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \\r
+                               0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF, \\r
+                               0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \\r
+                               0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF, \\r
+                               0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}\r
+\r
+#elif _CODE_PAGE == 863        /* Canadian-French */\r
 #define _DF1S  0\r
-#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, \\r
-                               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, \\r
-                               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, \\r
-                               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}\r
-\r
-#elif _CODE_PAGE == 1255 /* Hebrew (Windows) */\r
+#define _EXCVT {0x43,0x55,0x45,0x41,0x41,0x41,0x86,0x43,0x45,0x45,0x45,0x49,0x49,0x8D,0x41,0x8F, \\r
+                               0x45,0x45,0x45,0x4F,0x45,0x49,0x55,0x55,0x98,0x4F,0x55,0x9B,0x9C,0x55,0x55,0x9F, \\r
+                               0xA0,0xA1,0x4F,0x55,0xA4,0xA5,0xA6,0xA7,0x49,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF, \\r
+                               0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \\r
+                               0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF, \\r
+                               0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \\r
+                               0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF, \\r
+                               0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}\r
+\r
+#elif _CODE_PAGE == 864        /* Arabic */\r
 #define _DF1S  0\r
-#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, \\r
-                               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, \\r
-                               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, \\r
-                               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}\r
-\r
-#elif _CODE_PAGE == 1256 /* Arabic (Windows) */\r
+#define _EXCVT {0x80,0x9A,0x45,0x41,0x8E,0x41,0x8F,0x80,0x45,0x45,0x45,0x49,0x49,0x49,0x8E,0x8F, \\r
+                               0x90,0x92,0x92,0x4F,0x99,0x4F,0x55,0x55,0x59,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \\r
+                               0x41,0x49,0x4F,0x55,0xA5,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF, \\r
+                               0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \\r
+                               0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF, \\r
+                               0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \\r
+                               0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF, \\r
+                               0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}\r
+\r
+#elif _CODE_PAGE == 865        /* Nordic */\r
 #define _DF1S  0\r
-#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, \\r
-                               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, \\r
-                               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, \\r
-                               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}\r
-\r
-#elif _CODE_PAGE == 1257 /* Baltic (Windows) */\r
+#define _EXCVT {0x80,0x9A,0x90,0x41,0x8E,0x41,0x8F,0x80,0x45,0x45,0x45,0x49,0x49,0x49,0x8E,0x8F, \\r
+                               0x90,0x92,0x92,0x4F,0x99,0x4F,0x55,0x55,0x59,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \\r
+                               0x41,0x49,0x4F,0x55,0xA5,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF, \\r
+                               0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \\r
+                               0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF, \\r
+                               0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \\r
+                               0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF, \\r
+                               0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}\r
+\r
+#elif _CODE_PAGE == 866        /* Russian */\r
 #define _DF1S  0\r
-#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, \\r
-                               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, \\r
-                               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, \\r
-                               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}\r
-\r
-#elif _CODE_PAGE == 1258 /* Vietnam (OEM, Windows) */\r
+#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F, \\r
+                               0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \\r
+                               0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F, \\r
+                               0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \\r
+                               0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF, \\r
+                               0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \\r
+                               0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \\r
+                               0xF0,0xF0,0xF2,0xF2,0xF4,0xF4,0xF6,0xF6,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}\r
+\r
+#elif _CODE_PAGE == 869        /* Greek 2 */\r
 #define _DF1S  0\r
-#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, \\r
-                               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, \\r
-                               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, \\r
-                               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}\r
+#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F, \\r
+                               0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x86,0x9C,0x8D,0x8F,0x90, \\r
+                               0x91,0x90,0x92,0x95,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF, \\r
+                               0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \\r
+                               0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF, \\r
+                               0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xA4,0xA5,0xA6,0xD9,0xDA,0xDB,0xDC,0xA7,0xA8,0xDF, \\r
+                               0xA9,0xAA,0xAC,0xAD,0xB5,0xB6,0xB7,0xB8,0xBD,0xBE,0xC6,0xC7,0xCF,0xCF,0xD0,0xEF, \\r
+                               0xF0,0xF1,0xD1,0xD2,0xD3,0xF5,0xD4,0xF7,0xF8,0xF9,0xD5,0x96,0x95,0x98,0xFE,0xFF}\r
 \r
 #elif _CODE_PAGE == 1  /* ASCII (for only non-LFN cfg) */\r
-#if _USE_LFN\r
-#error Cannot use LFN feature without valid code page.\r
+#if _USE_LFN != 0\r
+#error Cannot enable LFN without valid code page.\r
 #endif\r
 #define _DF1S  0\r
 \r
@@ -387,7 +329,7 @@ typedef struct {
 #define IsLower(c)     (((c)>='a')&&((c)<='z'))\r
 #define IsDigit(c)     (((c)>='0')&&((c)<='9'))\r
 \r
-#if _DF1S              /* Code page is DBCS */\r
+#if _DF1S != 0 /* Code page is DBCS */\r
 \r
 #ifdef _DF2S   /* Two 1st byte areas */\r
 #define IsDBCS1(c)     (((BYTE)(c) >= _DF1S && (BYTE)(c) <= _DF1E) || ((BYTE)(c) >= _DF2S && (BYTE)(c) <= _DF2E))\r
@@ -409,6 +351,18 @@ typedef struct {
 #endif /* _DF1S */\r
 \r
 \r
+/* File attribute bits (internal use) */\r
+#define        AM_VOL          0x08    /* Volume label */\r
+#define AM_LFN         0x0F    /* LFN entry */\r
+#define AM_MASK                0x3F    /* Mask of defined bits */\r
+\r
+\r
+/* File access control and file status flags (internal use) */\r
+#define FA_SEEKEND     0x20    /* Seek to end of the file on file open */\r
+#define FA_MODIFIED    0x40    /* File has been modified */\r
+#define FA_DIRTY       0x80    /* FIL.buf[] needs to be written-back */\r
+\r
+\r
 /* Name status flags */\r
 #define NSFLAG         11              /* Index of name status byte in fn[] */\r
 #define NS_LOSS                0x01    /* Out of 8.3 format */\r
@@ -417,87 +371,153 @@ typedef struct {
 #define NS_BODY                0x08    /* Lower case flag (body) */\r
 #define NS_EXT         0x10    /* Lower case flag (ext) */\r
 #define NS_DOT         0x20    /* Dot entry */\r
+#define NS_NOLFN       0x40    /* Do not find LFN */\r
+#define NS_NONAME      0x80    /* Not followed */\r
 \r
 \r
-/* FAT sub-type boundaries (Differ from specs but correct for real DOS/Windows) */\r
-#define MIN_FAT16      4086U   /* Minimum number of clusters as FAT16 */\r
-#define        MIN_FAT32       65526U  /* Minimum number of clusters as FAT32 */\r
+/* Limits and boundaries (differ from specs but correct for real DOS/Windows) */\r
+#define MAX_FAT12      0xFF5                   /* Maximum number of FAT12 clusters */\r
+#define        MAX_FAT16       0xFFF5                  /* Maximum number of FAT16 clusters */\r
+#define        MAX_FAT32       0xFFFFFF5               /* Maximum number of FAT32 clusters */\r
+#define        MAX_EXFAT       0x7FFFFFFD              /* Maximum number of exFAT clusters (limited by implementation) */\r
+#define MAX_DIR                0x200000                /* Maximum size of FAT directory */\r
+#define MAX_DIR_EX     0x10000000              /* Maximum size of exFAT directory */\r
 \r
 \r
 /* FatFs refers the members in the FAT structures as byte array instead of\r
-/ structure member because the structure is not binary compatible between\r
+/ structure members because the structure is not binary compatible between\r
 / different platforms */\r
 \r
-#define BS_jmpBoot                     0               /* x86 jump instruction (3) */\r
-#define BS_OEMName                     3               /* OEM name (8) */\r
-#define BPB_BytsPerSec         11              /* Sector size [byte] (2) */\r
-#define BPB_SecPerClus         13              /* Cluster size [sector] (1) */\r
-#define BPB_RsvdSecCnt         14              /* Size of reserved area [sector] (2) */\r
-#define BPB_NumFATs                    16              /* Number of FAT copies (1) */\r
-#define BPB_RootEntCnt         17              /* Number of root directory entries for FAT12/16 (2) */\r
-#define BPB_TotSec16           19              /* Volume size [sector] (2) */\r
-#define BPB_Media                      21              /* Media descriptor (1) */\r
-#define BPB_FATSz16                    22              /* FAT size [sector] (2) */\r
-#define BPB_SecPerTrk          24              /* Track size [sector] (2) */\r
-#define BPB_NumHeads           26              /* Number of heads (2) */\r
-#define BPB_HiddSec                    28              /* Number of special hidden sectors (4) */\r
-#define BPB_TotSec32           32              /* Volume size [sector] (4) */\r
-#define BS_DrvNum                      36              /* Physical drive number (2) */\r
-#define BS_BootSig                     38              /* Extended boot signature (1) */\r
-#define BS_VolID                       39              /* Volume serial number (4) */\r
-#define BS_VolLab                      43              /* Volume label (8) */\r
-#define BS_FilSysType          54              /* File system type (1) */\r
-#define BPB_FATSz32                    36              /* FAT size [sector] (4) */\r
-#define BPB_ExtFlags           40              /* Extended flags (2) */\r
-#define BPB_FSVer                      42              /* File system version (2) */\r
-#define BPB_RootClus           44              /* Root directory first cluster (4) */\r
-#define BPB_FSInfo                     48              /* Offset of FSINFO sector (2) */\r
-#define BPB_BkBootSec          50              /* Offset of backup boot sector (2) */\r
-#define BS_DrvNum32                    64              /* Physical drive number (2) */\r
-#define BS_BootSig32           66              /* Extended boot signature (1) */\r
-#define BS_VolID32                     67              /* Volume serial number (4) */\r
-#define BS_VolLab32                    71              /* Volume label (8) */\r
-#define BS_FilSysType32                82              /* File system type (1) */\r
-#define        FSI_LeadSig                     0               /* FSI: Leading signature (4) */\r
-#define        FSI_StrucSig            484             /* FSI: Structure signature (4) */\r
-#define        FSI_Free_Count          488             /* FSI: Number of free clusters (4) */\r
-#define        FSI_Nxt_Free            492             /* FSI: Last allocated cluster (4) */\r
-#define MBR_Table                      446             /* MBR: Partition table offset (2) */\r
+#define BS_JmpBoot                     0               /* x86 jump instruction (3-byte) */\r
+#define BS_OEMName                     3               /* OEM name (8-byte) */\r
+#define BPB_BytsPerSec         11              /* Sector size [byte] (WORD) */\r
+#define BPB_SecPerClus         13              /* Cluster size [sector] (BYTE) */\r
+#define BPB_RsvdSecCnt         14              /* Size of reserved area [sector] (WORD) */\r
+#define BPB_NumFATs                    16              /* Number of FATs (BYTE) */\r
+#define BPB_RootEntCnt         17              /* Size of root directory area for FAT12/16 [entry] (WORD) */\r
+#define BPB_TotSec16           19              /* Volume size (16-bit) [sector] (WORD) */\r
+#define BPB_Media                      21              /* Media descriptor byte (BYTE) */\r
+#define BPB_FATSz16                    22              /* FAT size (16-bit) [sector] (WORD) */\r
+#define BPB_SecPerTrk          24              /* Track size for int13h [sector] (WORD) */\r
+#define BPB_NumHeads           26              /* Number of heads for int13h (WORD) */\r
+#define BPB_HiddSec                    28              /* Volume offset from top of the drive (DWORD) */\r
+#define BPB_TotSec32           32              /* Volume size (32-bit) [sector] (DWORD) */\r
+#define BS_DrvNum                      36              /* Physical drive number for int13h (BYTE) */\r
+#define BS_NTres                       37              /* Error flag (BYTE) */\r
+#define BS_BootSig                     38              /* Extended boot signature (BYTE) */\r
+#define BS_VolID                       39              /* Volume serial number (DWORD) */\r
+#define BS_VolLab                      43              /* Volume label string (8-byte) */\r
+#define BS_FilSysType          54              /* File system type string (8-byte) */\r
+#define BS_BootCode                    62              /* Boot code (448-byte) */\r
+#define BS_55AA                                510             /* Signature word (WORD) */\r
+\r
+#define BPB_FATSz32                    36              /* FAT32: FAT size [sector] (DWORD) */\r
+#define BPB_ExtFlags32         40              /* FAT32: Extended flags (WORD) */\r
+#define BPB_FSVer32                    42              /* FAT32: File system version (WORD) */\r
+#define BPB_RootClus32         44              /* FAT32: Root directory cluster (DWORD) */\r
+#define BPB_FSInfo32           48              /* FAT32: Offset of FSINFO sector (WORD) */\r
+#define BPB_BkBootSec32                50              /* FAT32: Offset of backup boot sector (WORD) */\r
+#define BS_DrvNum32                    64              /* FAT32: Physical drive number for int13h (BYTE) */\r
+#define BS_NTres32                     65              /* FAT32: Error flag (BYTE) */\r
+#define BS_BootSig32           66              /* FAT32: Extended boot signature (BYTE) */\r
+#define BS_VolID32                     67              /* FAT32: Volume serial number (DWORD) */\r
+#define BS_VolLab32                    71              /* FAT32: Volume label string (8-byte) */\r
+#define BS_FilSysType32                82              /* FAT32: File system type string (8-byte) */\r
+#define BS_BootCode32          90              /* FAT32: Boot code (420-byte) */\r
+\r
+#define BPB_ZeroedEx           11              /* exFAT: MBZ field (53-byte) */\r
+#define BPB_VolOfsEx           64              /* exFAT: Volume offset from top of the drive [sector] (QWORD) */\r
+#define BPB_TotSecEx           72              /* exFAT: Volume size [sector] (QWORD) */\r
+#define BPB_FatOfsEx           80              /* exFAT: FAT offset from top of the volume [sector] (DWORD) */\r
+#define BPB_FatSzEx                    84              /* exFAT: FAT size [sector] (DWORD) */\r
+#define BPB_DataOfsEx          88              /* exFAT: Data offset from top of the volume [sector] (DWORD) */\r
+#define BPB_NumClusEx          92              /* exFAT: Number of clusters (DWORD) */\r
+#define BPB_RootClusEx         96              /* exFAT: Root directory cluster (DWORD) */\r
+#define BPB_VolIDEx                    100             /* exFAT: Volume serial number (DWORD) */\r
+#define BPB_FSVerEx                    104             /* exFAT: File system version (WORD) */\r
+#define BPB_VolFlagEx          106             /* exFAT: Volume flags (BYTE) */\r
+#define BPB_ActFatEx           107             /* exFAT: Active FAT flags (BYTE) */\r
+#define BPB_BytsPerSecEx       108             /* exFAT: Log2 of sector size in byte (BYTE) */\r
+#define BPB_SecPerClusEx       109             /* exFAT: Log2 of cluster size in sector (BYTE) */\r
+#define BPB_NumFATsEx          110             /* exFAT: Number of FATs (BYTE) */\r
+#define BPB_DrvNumEx           111             /* exFAT: Physical drive number for int13h (BYTE) */\r
+#define BPB_PercInUseEx                112             /* exFAT: Percent in use (BYTE) */\r
+#define        BPB_RsvdEx                      113             /* exFAT: Reserved (7-byte) */\r
+#define BS_BootCodeEx          120             /* exFAT: Boot code (390-byte) */\r
+\r
+#define        FSI_LeadSig                     0               /* FAT32 FSI: Leading signature (DWORD) */\r
+#define        FSI_StrucSig            484             /* FAT32 FSI: Structure signature (DWORD) */\r
+#define        FSI_Free_Count          488             /* FAT32 FSI: Number of free clusters (DWORD) */\r
+#define        FSI_Nxt_Free            492             /* FAT32 FSI: Last allocated cluster (DWORD) */\r
+\r
+#define MBR_Table                      446             /* MBR: Offset of partition table in the MBR */\r
 #define        SZ_PTE                          16              /* MBR: Size of a partition table entry */\r
-#define BS_55AA                                510             /* Signature word (2) */\r
-\r
-#define        DIR_Name                        0               /* Short file name (11) */\r
-#define        DIR_Attr                        11              /* Attribute (1) */\r
-#define        DIR_NTres                       12              /* NT flag (1) */\r
-#define DIR_CrtTimeTenth       13              /* Created time sub-second (1) */\r
-#define        DIR_CrtTime                     14              /* Created time (2) */\r
-#define        DIR_CrtDate                     16              /* Created date (2) */\r
-#define DIR_LstAccDate         18              /* Last accessed date (2) */\r
-#define        DIR_FstClusHI           20              /* Higher 16-bit of first cluster (2) */\r
-#define        DIR_WrtTime                     22              /* Modified time (2) */\r
-#define        DIR_WrtDate                     24              /* Modified date (2) */\r
-#define        DIR_FstClusLO           26              /* Lower 16-bit of first cluster (2) */\r
-#define        DIR_FileSize            28              /* File size (4) */\r
-#define        LDIR_Ord                        0               /* LFN entry order and LLE flag (1) */\r
-#define        LDIR_Attr                       11              /* LFN attribute (1) */\r
-#define        LDIR_Type                       12              /* LFN type (1) */\r
-#define        LDIR_Chksum                     13              /* Sum of corresponding SFN entry */\r
-#define        LDIR_FstClusLO          26              /* Filled by zero (0) */\r
-#define        SZ_DIR                          32              /* Size of a directory entry */\r
-#define        LLE                                     0x40    /* Last long entry flag in LDIR_Ord */\r
-#define        DDE                                     0xE5    /* Deleted directory entry mark in DIR_Name[0] */\r
-#define        NDDE                            0x05    /* Replacement of the character collides with DDE */\r
-\r
-\r
-\r
-\r
-/*------------------------------------------------------------*/\r
-/* Module private work area                                   */\r
-/*------------------------------------------------------------*/\r
-/* Remark: Uninitialized variables with static duration are\r
-/  guaranteed zero/null at start-up. If not, either the linker\r
-/  or start-up routine being used is out of ANSI-C standard.\r
-*/\r
+#define PTE_Boot                       0               /* MBR PTE: Boot indicator */\r
+#define PTE_StHead                     1               /* MBR PTE: Start head */\r
+#define PTE_StSec                      2               /* MBR PTE: Start sector */\r
+#define PTE_StCyl                      3               /* MBR PTE: Start cylinder */\r
+#define PTE_System                     4               /* MBR PTE: System ID */\r
+#define PTE_EdHead                     5               /* MBR PTE: End head */\r
+#define PTE_EdSec                      6               /* MBR PTE: End sector */\r
+#define PTE_EdCyl                      7               /* MBR PTE: End cylinder */\r
+#define PTE_StLba                      8               /* MBR PTE: Start in LBA */\r
+#define PTE_SizLba                     12              /* MBR PTE: Size in LBA */\r
+\r
+#define        DIR_Name                        0               /* Short file name (11-byte) */\r
+#define        DIR_Attr                        11              /* Attribute (BYTE) */\r
+#define        DIR_NTres                       12              /* Lower case flag (BYTE) */\r
+#define DIR_CrtTime10          13              /* Created time sub-second (BYTE) */\r
+#define        DIR_CrtTime                     14              /* Created time (DWORD) */\r
+#define DIR_LstAccDate         18              /* Last accessed date (WORD) */\r
+#define        DIR_FstClusHI           20              /* Higher 16-bit of first cluster (WORD) */\r
+#define        DIR_ModTime                     22              /* Modified time (DWORD) */\r
+#define        DIR_FstClusLO           26              /* Lower 16-bit of first cluster (WORD) */\r
+#define        DIR_FileSize            28              /* File size (DWORD) */\r
+#define        LDIR_Ord                        0               /* LFN entry order and LLE flag (BYTE) */\r
+#define        LDIR_Attr                       11              /* LFN attribute (BYTE) */\r
+#define        LDIR_Type                       12              /* LFN type (BYTE) */\r
+#define        LDIR_Chksum                     13              /* Checksum of the SFN entry (BYTE) */\r
+#define        LDIR_FstClusLO          26              /* Must be zero (WORD) */\r
+#define        XDIR_Type                       0               /* Type of exFAT directory entry (BYTE) */\r
+#define        XDIR_NumLabel           1               /* Number of volume label characters (BYTE) */\r
+#define        XDIR_Label                      2               /* Volume label (11-WORD) */\r
+#define        XDIR_CaseSum            4               /* Sum of case conversion table (DWORD) */\r
+#define        XDIR_NumSec                     1               /* Number of secondary entries (BYTE) */\r
+#define        XDIR_SetSum                     2               /* Sum of the set of directory entries (WORD) */\r
+#define        XDIR_Attr                       4               /* File attribute (WORD) */\r
+#define        XDIR_CrtTime            8               /* Created time (DWORD) */\r
+#define        XDIR_ModTime            12              /* Modified time (DWORD) */\r
+#define        XDIR_AccTime            16              /* Last accessed time (DWORD) */\r
+#define        XDIR_CrtTime10          20              /* Created time subsecond (BYTE) */\r
+#define        XDIR_ModTime10          21              /* Modified time subsecond (BYTE) */\r
+#define        XDIR_CrtTZ                      22              /* Created timezone (BYTE) */\r
+#define        XDIR_ModTZ                      23              /* Modified timezone (BYTE) */\r
+#define        XDIR_AccTZ                      24              /* Last accessed timezone (BYTE) */\r
+#define        XDIR_GenFlags           33              /* Gneral secondary flags (WORD) */\r
+#define        XDIR_NumName            35              /* Number of file name characters (BYTE) */\r
+#define        XDIR_NameHash           36              /* Hash of file name (WORD) */\r
+#define XDIR_ValidFileSize     40              /* Valid file size (QWORD) */\r
+#define        XDIR_FstClus            52              /* First cluster of the file data (DWORD) */\r
+#define        XDIR_FileSize           56              /* File/Directory size (QWORD) */\r
+\r
+#define        SZDIRE                          32              /* Size of a directory entry */\r
+#define        LLEF                            0x40    /* Last long entry flag in LDIR_Ord */\r
+#define        DDEM                            0xE5    /* Deleted directory entry mark set to DIR_Name[0] */\r
+#define        RDDEM                           0x05    /* Replacement of the character collides with DDEM */\r
+\r
+\r
+\r
+\r
+\r
+/*--------------------------------------------------------------------------\r
+\r
+   Module Private Work Area\r
+\r
+---------------------------------------------------------------------------*/\r
+\r
+/* Remark: Variables here without initial value shall be guaranteed zero/null\r
+/  at start-up. If not, either the linker or start-up routine being used is\r
+/  not compliance with C standard. */\r
 \r
 #if _VOLUMES < 1 || _VOLUMES > 9\r
 #error Wrong _VOLUMES setting\r
@@ -505,42 +525,61 @@ typedef struct {
 static FATFS *FatFs[_VOLUMES]; /* Pointer to the file system objects (logical drives) */\r
 static WORD Fsid;                              /* File system mount ID */\r
 \r
-#if _FS_RPATH && _VOLUMES >= 2\r
+#if _FS_RPATH != 0 && _VOLUMES >= 2\r
 static BYTE CurrVol;                   /* Current drive */\r
 #endif\r
 \r
-#if _FS_LOCK\r
+#if _FS_LOCK != 0\r
 static FILESEM Files[_FS_LOCK];        /* Open object lock semaphores */\r
 #endif\r
 \r
-#if _USE_LFN == 0                      /* Non LFN feature */\r
-#define        DEF_NAMEBUF                     BYTE sfn[12]\r
-#define INIT_BUF(dobj)         (dobj).fn = sfn\r
-#define        FREE_BUF()\r
+#if _USE_LFN == 0                      /* Non-LFN configuration */\r
+#define        DEF_NAMBUF\r
+#define INIT_NAMBUF(fs)\r
+#define        FREE_NAMBUF()\r
 #else\r
 #if _MAX_LFN < 12 || _MAX_LFN > 255\r
 #error Wrong _MAX_LFN setting\r
 #endif\r
-#if _USE_LFN == 1                      /* LFN feature with static working buffer */\r
-static WCHAR LfnBuf[_MAX_LFN+1];\r
-#define        DEF_NAMEBUF                     BYTE sfn[12]\r
-#define INIT_BUF(dobj)         { (dobj).fn = sfn; (dobj).lfn = LfnBuf; }\r
-#define        FREE_BUF()\r
-#elif _USE_LFN == 2            /* LFN feature with dynamic working buffer on the stack */\r
-#define        DEF_NAMEBUF                     BYTE sfn[12]; WCHAR lbuf[_MAX_LFN+1]\r
-#define INIT_BUF(dobj)         { (dobj).fn = sfn; (dobj).lfn = lbuf; }\r
-#define        FREE_BUF()\r
-#elif _USE_LFN == 3            /* LFN feature with dynamic working buffer on the heap */\r
-#define        DEF_NAMEBUF                     BYTE sfn[12]; WCHAR *lfn\r
-#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; }\r
-#define        FREE_BUF()                      ff_memfree(lfn)\r
+\r
+#if _USE_LFN == 1              /* LFN enabled with static working buffer */\r
+#if _FS_EXFAT\r
+static BYTE    DirBuf[SZDIRE*19];      /* Directory entry block scratchpad buffer (19 entries in size) */\r
+#endif\r
+static WCHAR LfnBuf[_MAX_LFN+1];       /* LFN enabled with static working buffer */\r
+#define        DEF_NAMBUF\r
+#define INIT_NAMBUF(fs)\r
+#define        FREE_NAMBUF()\r
+\r
+#elif _USE_LFN == 2    /* LFN enabled with dynamic working buffer on the stack */\r
+#if _FS_EXFAT\r
+#define        DEF_NAMBUF              WCHAR lbuf[_MAX_LFN+1]; BYTE dbuf[SZDIRE*19];\r
+#define INIT_NAMBUF(fs)        { (fs)->lfnbuf = lbuf; (fs)->dirbuf = dbuf; }\r
+#define        FREE_NAMBUF()\r
+#else\r
+#define        DEF_NAMBUF              WCHAR lbuf[_MAX_LFN+1];\r
+#define INIT_NAMBUF(fs)        { (fs)->lfnbuf = lbuf; }\r
+#define        FREE_NAMBUF()\r
+#endif\r
+\r
+#elif _USE_LFN == 3    /* LFN enabled with dynamic working buffer on the heap */\r
+#if _FS_EXFAT\r
+#define        DEF_NAMBUF              WCHAR *lfn;\r
+#define INIT_NAMBUF(fs)        { lfn = ff_memalloc((_MAX_LFN+1)*2 + SZDIRE*19); if (!lfn) LEAVE_FF(fs, FR_NOT_ENOUGH_CORE); (fs)->lfnbuf = lfn; (fs)->dirbuf = (BYTE*)(lfn+_MAX_LFN+1); }\r
+#define        FREE_NAMBUF()   ff_memfree(lfn)\r
+#else\r
+#define        DEF_NAMBUF              WCHAR *lfn;\r
+#define INIT_NAMBUF(fs)        { lfn = ff_memalloc((_MAX_LFN+1)*2); if (!lfn) LEAVE_FF(fs, FR_NOT_ENOUGH_CORE); (fs)->lfnbuf = lfn; }\r
+#define        FREE_NAMBUF()   ff_memfree(lfn)\r
+#endif\r
+\r
 #else\r
 #error Wrong _USE_LFN setting\r
 #endif\r
 #endif\r
 \r
 #ifdef _EXCVT\r
-static const BYTE ExCvt[] = _EXCVT;    /* Upper conversion table for extended characters */\r
+static const BYTE ExCvt[] = _EXCVT;    /* Upper conversion table for SBCS extended characters */\r
 #endif\r
 \r
 \r
@@ -555,6 +594,85 @@ static const BYTE ExCvt[] = _EXCVT;        /* Upper conversion table for extended chara
 ---------------------------------------------------------------------------*/\r
 \r
 \r
+/*-----------------------------------------------------------------------*/\r
+/* Load/Store multi-byte word in the FAT structure                       */\r
+/*-----------------------------------------------------------------------*/\r
+\r
+static\r
+WORD ld_word (const BYTE* ptr) /*       Load a 2-byte little-endian word */\r
+{\r
+       WORD rv;\r
+\r
+       rv = ptr[1];\r
+       rv = rv << 8 | ptr[0];\r
+       return rv;\r
+}\r
+\r
+static\r
+DWORD ld_dword (const BYTE* ptr)       /* Load a 4-byte little-endian word */\r
+{\r
+       DWORD rv;\r
+\r
+       rv = ptr[3];\r
+       rv = rv << 8 | ptr[2];\r
+       rv = rv << 8 | ptr[1];\r
+       rv = rv << 8 | ptr[0];\r
+       return rv;\r
+}\r
+\r
+#if _FS_EXFAT\r
+static\r
+QWORD ld_qword (const BYTE* ptr)       /* Load an 8-byte little-endian word */\r
+{\r
+       QWORD rv;\r
+\r
+       rv = ptr[7];\r
+       rv = rv << 8 | ptr[6];\r
+       rv = rv << 8 | ptr[5];\r
+       rv = rv << 8 | ptr[4];\r
+       rv = rv << 8 | ptr[3];\r
+       rv = rv << 8 | ptr[2];\r
+       rv = rv << 8 | ptr[1];\r
+       rv = rv << 8 | ptr[0];\r
+       return rv;\r
+}\r
+#endif\r
+\r
+#if !_FS_READONLY\r
+static\r
+void st_word (BYTE* ptr, WORD val)     /* Store a 2-byte word in little-endian */\r
+{\r
+       *ptr++ = (BYTE)val; val >>= 8;\r
+       *ptr++ = (BYTE)val;\r
+}\r
+\r
+static\r
+void st_dword (BYTE* ptr, DWORD val)   /* Store a 4-byte word in little-endian */\r
+{\r
+       *ptr++ = (BYTE)val; val >>= 8;\r
+       *ptr++ = (BYTE)val; val >>= 8;\r
+       *ptr++ = (BYTE)val; val >>= 8;\r
+       *ptr++ = (BYTE)val;\r
+}\r
+\r
+#if _FS_EXFAT\r
+static\r
+void st_qword (BYTE* ptr, QWORD val)   /* Store an 8-byte word in little-endian */\r
+{\r
+       *ptr++ = (BYTE)val; val >>= 8;\r
+       *ptr++ = (BYTE)val; val >>= 8;\r
+       *ptr++ = (BYTE)val; val >>= 8;\r
+       *ptr++ = (BYTE)val; val >>= 8;\r
+       *ptr++ = (BYTE)val; val >>= 8;\r
+       *ptr++ = (BYTE)val; val >>= 8;\r
+       *ptr++ = (BYTE)val; val >>= 8;\r
+       *ptr++ = (BYTE)val;\r
+}\r
+#endif\r
+#endif /* !_FS_READONLY */\r
+\r
+\r
+\r
 /*-----------------------------------------------------------------------*/\r
 /* String functions                                                      */\r
 /*-----------------------------------------------------------------------*/\r
@@ -565,39 +683,35 @@ void mem_cpy (void* dst, const void* src, UINT cnt) {
        BYTE *d = (BYTE*)dst;\r
        const BYTE *s = (const BYTE*)src;\r
 \r
-#if _WORD_ACCESS == 1\r
-       while (cnt >= sizeof (int)) {\r
-               *(int*)d = *(int*)s;\r
-               d += sizeof (int); s += sizeof (int);\r
-               cnt -= sizeof (int);\r
+       if (cnt) {\r
+               do *d++ = *s++; while (--cnt);\r
        }\r
-#endif\r
-       while (cnt--)\r
-               *d++ = *s++;\r
 }\r
 \r
-/* Fill memory */\r
+/* Fill memory block */\r
 static\r
 void mem_set (void* dst, int val, UINT cnt) {\r
        BYTE *d = (BYTE*)dst;\r
 \r
-       while (cnt--)\r
-               *d++ = (BYTE)val;\r
+       do *d++ = (BYTE)val; while (--cnt);\r
 }\r
 \r
-/* Compare memory to memory */\r
+/* Compare memory block */\r
 static\r
-int mem_cmp (const void* dst, const void* src, UINT cnt) {\r
+int mem_cmp (const void* dst, const void* src, UINT cnt) {     /* ZR:same, NZ:different */\r
        const BYTE *d = (const BYTE *)dst, *s = (const BYTE *)src;\r
        int r = 0;\r
 \r
-       while (cnt-- && (r = *d++ - *s++) == 0) ;\r
+       do {\r
+               r = *d++ - *s++;\r
+       } while (--cnt && r == 0);\r
+\r
        return r;\r
 }\r
 \r
 /* Check if chr is contained in the string */\r
 static\r
-int chk_chr (const char* str, int chr) {\r
+int chk_chr (const char* str, int chr) {       /* NZ:contained, ZR:not contained */\r
        while (*str && *str != chr) str++;\r
        return *str;\r
 }\r
@@ -605,10 +719,10 @@ int chk_chr (const char* str, int chr) {
 \r
 \r
 \r
+#if _FS_REENTRANT\r
 /*-----------------------------------------------------------------------*/\r
 /* Request/Release grant to access the volume                            */\r
 /*-----------------------------------------------------------------------*/\r
-#if _FS_REENTRANT\r
 static\r
 int lock_fs (\r
        FATFS* fs               /* File system object */\r
@@ -624,23 +738,19 @@ void unlock_fs (
        FRESULT res             /* Result code to be returned */\r
 )\r
 {\r
-       if (fs &&\r
-               res != FR_NOT_ENABLED &&\r
-               res != FR_INVALID_DRIVE &&\r
-               res != FR_INVALID_OBJECT &&\r
-               res != FR_TIMEOUT) {\r
+       if (fs && res != FR_NOT_ENABLED && res != FR_INVALID_DRIVE && res != FR_TIMEOUT) {\r
                ff_rel_grant(fs->sobj);\r
        }\r
 }\r
-#endif\r
 \r
+#endif\r
 \r
 \r
 \r
+#if _FS_LOCK != 0\r
 /*-----------------------------------------------------------------------*/\r
 /* File lock control functions                                           */\r
 /*-----------------------------------------------------------------------*/\r
-#if _FS_LOCK\r
 \r
 static\r
 FRESULT chk_lock (     /* Check if the file can be accessed */\r
@@ -653,15 +763,16 @@ FRESULT chk_lock (        /* Check if the file can be accessed */
        /* Search file semaphore table */\r
        for (i = be = 0; i < _FS_LOCK; i++) {\r
                if (Files[i].fs) {      /* Existing entry */\r
-                       if (Files[i].fs == dp->fs &&            /* Check if the object matched with an open object */\r
-                               Files[i].clu == dp->sclust &&\r
-                               Files[i].idx == dp->index) break;\r
+                       if (Files[i].fs == dp->obj.fs &&                /* Check if the object matched with an open object */\r
+                               Files[i].clu == dp->obj.sclust &&\r
+                               Files[i].ofs == dp->dptr) break;\r
                } else {                        /* Blank entry */\r
                        be = 1;\r
                }\r
        }\r
-       if (i == _FS_LOCK)      /* The object is not opened */\r
+       if (i == _FS_LOCK) {    /* The object is not opened */\r
                return (be || acc == 2) ? FR_OK : FR_TOO_MANY_OPEN_FILES;       /* Is there a blank entry for new object? */\r
+       }\r
 \r
        /* The object has been opened. Reject any open against writing file and all write mode open */\r
        return (acc || Files[i].ctr == 0x100) ? FR_LOCKED : FR_OK;\r
@@ -688,17 +799,17 @@ UINT inc_lock (   /* Increment object open counter and returns its index (0:Intern
 \r
 \r
        for (i = 0; i < _FS_LOCK; i++) {        /* Find the object */\r
-               if (Files[i].fs == dp->fs &&\r
-                       Files[i].clu == dp->sclust &&\r
-                       Files[i].idx == dp->index) break;\r
+               if (Files[i].fs == dp->obj.fs &&\r
+                       Files[i].clu == dp->obj.sclust &&\r
+                       Files[i].ofs == dp->dptr) break;\r
        }\r
 \r
        if (i == _FS_LOCK) {                            /* Not opened. Register it as new. */\r
                for (i = 0; i < _FS_LOCK && Files[i].fs; i++) ;\r
                if (i == _FS_LOCK) return 0;    /* No free entry to register (int err) */\r
-               Files[i].fs = dp->fs;\r
-               Files[i].clu = dp->sclust;\r
-               Files[i].idx = dp->index;\r
+               Files[i].fs = dp->obj.fs;\r
+               Files[i].clu = dp->obj.sclust;\r
+               Files[i].ofs = dp->dptr;\r
                Files[i].ctr = 0;\r
        }\r
 \r
@@ -722,9 +833,9 @@ FRESULT dec_lock (  /* Decrement object open counter */
        if (--i < _FS_LOCK) {   /* Shift index number origin from 0 */\r
                n = Files[i].ctr;\r
                if (n == 0x100) n = 0;          /* If write mode open, delete the entry */\r
-               if (n) n--;                                     /* Decrement read mode open count */\r
+               if (n > 0) n--;                         /* Decrement read mode open count */\r
                Files[i].ctr = n;\r
-               if (!n) Files[i].fs = 0;        /* Delete the entry if open count gets zero */\r
+               if (n == 0) Files[i].fs = 0;    /* Delete the entry if open count gets zero */\r
                res = FR_OK;\r
        } else {\r
                res = FR_INT_ERR;                       /* Invalid index nunber */\r
@@ -744,8 +855,8 @@ void clear_lock (   /* Clear lock entries of the volume */
                if (Files[i].fs == fs) Files[i].fs = 0;\r
        }\r
 }\r
-#endif\r
 \r
+#endif /* _FS_LOCK != 0 */\r
 \r
 \r
 \r
@@ -754,8 +865,8 @@ void clear_lock (   /* Clear lock entries of the volume */
 /*-----------------------------------------------------------------------*/\r
 #if !_FS_READONLY\r
 static\r
-FRESULT sync_window (\r
-       FATFS* fs               /* File system object */\r
+FRESULT sync_window (  /* Returns FR_OK or FR_DISK_ERROR */\r
+       FATFS* fs                       /* File system object */\r
 )\r
 {\r
        DWORD wsect;\r
@@ -783,9 +894,9 @@ FRESULT sync_window (
 \r
 \r
 static\r
-FRESULT move_window (\r
-       FATFS* fs,              /* File system object */\r
-       DWORD sector    /* Sector number to make appearance in the fs->win[] */\r
+FRESULT move_window (  /* Returns FR_OK or FR_DISK_ERROR */\r
+       FATFS* fs,                      /* File system object */\r
+       DWORD sector            /* Sector number to make appearance in the fs->win[] */\r
 )\r
 {\r
        FRESULT res = FR_OK;\r
@@ -809,12 +920,13 @@ FRESULT move_window (
 \r
 \r
 \r
+#if !_FS_READONLY\r
 /*-----------------------------------------------------------------------*/\r
 /* Synchronize file system and strage device                             */\r
 /*-----------------------------------------------------------------------*/\r
-#if !_FS_READONLY\r
+\r
 static\r
-FRESULT sync_fs (      /* FR_OK: successful, FR_DISK_ERR: failed */\r
+FRESULT sync_fs (      /* FR_OK:succeeded, !=0:error */\r
        FATFS* fs               /* File system object */\r
 )\r
 {\r
@@ -823,38 +935,37 @@ FRESULT sync_fs ( /* FR_OK: successful, FR_DISK_ERR: failed */
 \r
        res = sync_window(fs);\r
        if (res == FR_OK) {\r
-               /* Update FSINFO sector if needed */\r
+               /* Update FSInfo sector if needed */\r
                if (fs->fs_type == FS_FAT32 && fs->fsi_flag == 1) {\r
-                       /* Create FSINFO structure */\r
+                       /* Create FSInfo structure */\r
                        mem_set(fs->win, 0, SS(fs));\r
-                       ST_WORD(fs->win+BS_55AA, 0xAA55);\r
-                       ST_DWORD(fs->win+FSI_LeadSig, 0x41615252);\r
-                       ST_DWORD(fs->win+FSI_StrucSig, 0x61417272);\r
-                       ST_DWORD(fs->win+FSI_Free_Count, fs->free_clust);\r
-                       ST_DWORD(fs->win+FSI_Nxt_Free, fs->last_clust);\r
-                       /* Write it into the FSINFO sector */\r
+                       st_word(fs->win + BS_55AA, 0xAA55);\r
+                       st_dword(fs->win + FSI_LeadSig, 0x41615252);\r
+                       st_dword(fs->win + FSI_StrucSig, 0x61417272);\r
+                       st_dword(fs->win + FSI_Free_Count, fs->free_clst);\r
+                       st_dword(fs->win + FSI_Nxt_Free, fs->last_clst);\r
+                       /* Write it into the FSInfo sector */\r
                        fs->winsect = fs->volbase + 1;\r
                        disk_write(fs->drv, fs->win, fs->winsect, 1);\r
                        fs->fsi_flag = 0;\r
                }\r
                /* Make sure that no pending write process in the physical drive */\r
-               if (disk_ioctl(fs->drv, CTRL_SYNC, 0) != RES_OK)\r
-                       res = FR_DISK_ERR;\r
+               if (disk_ioctl(fs->drv, CTRL_SYNC, 0) != RES_OK) res = FR_DISK_ERR;\r
        }\r
 \r
        return res;\r
 }\r
-#endif\r
 \r
+#endif\r
 \r
 \r
 \r
 /*-----------------------------------------------------------------------*/\r
 /* Get sector# from cluster#                                             */\r
 /*-----------------------------------------------------------------------*/\r
-/* Hidden API for hacks and disk tools */\r
 \r
-DWORD clust2sect (     /* !=0: Sector number, 0: Failed - invalid cluster# */\r
+static\r
+DWORD clust2sect (     /* !=0:Sector number, 0:Failed (invalid cluster#) */\r
        FATFS* fs,              /* File system object */\r
        DWORD clst              /* Cluster# to be converted */\r
 )\r
@@ -870,19 +981,19 @@ DWORD clust2sect (        /* !=0: Sector number, 0: Failed - invalid cluster# */
 /*-----------------------------------------------------------------------*/\r
 /* FAT access - Read value of a FAT entry                                */\r
 /*-----------------------------------------------------------------------*/\r
-/* Hidden API for hacks and disk tools */\r
 \r
-DWORD get_fat (        /* 0xFFFFFFFF:Disk error, 1:Internal error, 2..0x0FFFFFFF:Cluster status */\r
-       FATFS* fs,      /* File system object */\r
-       DWORD clst      /* FAT item index (cluster#) to get the value */\r
+static\r
+DWORD get_fat (        /* 0xFFFFFFFF:Disk error, 1:Internal error, 2..0x7FFFFFFF:Cluster status */\r
+       _FDID* obj,     /* Corresponding object */\r
+       DWORD clst      /* Cluster number to get the value */\r
 )\r
 {\r
        UINT wc, bc;\r
-       BYTE *p;\r
        DWORD val;\r
+       FATFS *fs = obj->fs;\r
 \r
 \r
-       if (clst < 2 || clst >= fs->n_fatent) { /* Check range */\r
+       if (clst < 2 || clst >= fs->n_fatent) { /* Check if in valid range */\r
                val = 1;        /* Internal error */\r
 \r
        } else {\r
@@ -895,21 +1006,42 @@ DWORD get_fat (  /* 0xFFFFFFFF:Disk error, 1:Internal error, 2..0x0FFFFFFF:Cluste
                        wc = fs->win[bc++ % SS(fs)];\r
                        if (move_window(fs, fs->fatbase + (bc / SS(fs))) != FR_OK) break;\r
                        wc |= fs->win[bc % SS(fs)] << 8;\r
-                       val = clst & 1 ? wc >> 4 : (wc & 0xFFF);\r
+                       val = (clst & 1) ? (wc >> 4) : (wc & 0xFFF);\r
                        break;\r
 \r
                case FS_FAT16 :\r
                        if (move_window(fs, fs->fatbase + (clst / (SS(fs) / 2))) != FR_OK) break;\r
-                       p = &fs->win[clst * 2 % SS(fs)];\r
-                       val = LD_WORD(p);\r
+                       val = ld_word(fs->win + clst * 2 % SS(fs));\r
                        break;\r
 \r
                case FS_FAT32 :\r
                        if (move_window(fs, fs->fatbase + (clst / (SS(fs) / 4))) != FR_OK) break;\r
-                       p = &fs->win[clst * 4 % SS(fs)];\r
-                       val = LD_DWORD(p) & 0x0FFFFFFF;\r
+                       val = ld_dword(fs->win + clst * 4 % SS(fs)) & 0x0FFFFFFF;\r
                        break;\r
-\r
+#if _FS_EXFAT\r
+               case FS_EXFAT :\r
+                       if (obj->objsize) {\r
+                               DWORD cofs = clst - obj->sclust;        /* Offset from start cluster */\r
+                               DWORD clen = (DWORD)((obj->objsize - 1) / SS(fs)) / fs->csize;  /* Number of clusters - 1 */\r
+\r
+                               if (obj->stat == 2) {   /* Is there no valid chain on the FAT? */\r
+                                       if (cofs <= clen) {\r
+                                               val = (cofs == clen) ? 0x7FFFFFFF : clst + 1;   /* Generate the value */\r
+                                               break;\r
+                                       }\r
+                               }\r
+                               if (obj->stat == 3 && cofs < obj->n_cont) {     /* Is it in the contiguous part? */\r
+                                       val = clst + 1;         /* Generate the value */\r
+                                       break;\r
+                               }\r
+                               if (obj->stat != 2) {   /* Get value from FAT if FAT chain is valid */\r
+                                       if (move_window(fs, fs->fatbase + (clst / (SS(fs) / 4))) != FR_OK) break;\r
+                                       val = ld_dword(fs->win + clst * 4 % SS(fs)) & 0x7FFFFFFF;\r
+                                       break;\r
+                               }\r
+                       }\r
+                       /* go next */\r
+#endif\r
                default:\r
                        val = 1;        /* Internal error */\r
                }\r
@@ -921,209 +1053,367 @@ DWORD get_fat (        /* 0xFFFFFFFF:Disk error, 1:Internal error, 2..0x0FFFFFFF:Cluste
 \r
 \r
 \r
+#if !_FS_READONLY\r
 /*-----------------------------------------------------------------------*/\r
 /* FAT access - Change value of a FAT entry                              */\r
 /*-----------------------------------------------------------------------*/\r
-/* Hidden API for hacks and disk tools */\r
 \r
-#if !_FS_READONLY\r
-FRESULT put_fat (\r
-       FATFS* fs,      /* File system object */\r
-       DWORD clst,     /* FAT item index (cluster#) to be set */\r
-       DWORD val       /* New value to mark the cluster */\r
+static\r
+FRESULT put_fat (      /* FR_OK(0):succeeded, !=0:error */\r
+       FATFS* fs,              /* Corresponding file system object */\r
+       DWORD clst,             /* FAT index number (cluster number) to be changed */\r
+       DWORD val               /* New value to be set to the entry */\r
 )\r
 {\r
        UINT bc;\r
        BYTE *p;\r
-       FRESULT res;\r
+       FRESULT res = FR_INT_ERR;\r
 \r
 \r
-       if (clst < 2 || clst >= fs->n_fatent) { /* Check range */\r
-               res = FR_INT_ERR;\r
-\r
-       } else {\r
+       if (clst >= 2 && clst < fs->n_fatent) { /* Check if in valid range */\r
                switch (fs->fs_type) {\r
-               case FS_FAT12 :\r
+               case FS_FAT12 : /* Bitfield items */\r
                        bc = (UINT)clst; bc += bc / 2;\r
                        res = move_window(fs, fs->fatbase + (bc / SS(fs)));\r
                        if (res != FR_OK) break;\r
-                       p = &fs->win[bc++ % SS(fs)];\r
+                       p = fs->win + bc++ % SS(fs);\r
                        *p = (clst & 1) ? ((*p & 0x0F) | ((BYTE)val << 4)) : (BYTE)val;\r
                        fs->wflag = 1;\r
                        res = move_window(fs, fs->fatbase + (bc / SS(fs)));\r
                        if (res != FR_OK) break;\r
-                       p = &fs->win[bc % SS(fs)];\r
+                       p = fs->win + bc % SS(fs);\r
                        *p = (clst & 1) ? (BYTE)(val >> 4) : ((*p & 0xF0) | ((BYTE)(val >> 8) & 0x0F));\r
                        fs->wflag = 1;\r
                        break;\r
 \r
-               case FS_FAT16 :\r
+               case FS_FAT16 : /* WORD aligned items */\r
                        res = move_window(fs, fs->fatbase + (clst / (SS(fs) / 2)));\r
                        if (res != FR_OK) break;\r
-                       p = &fs->win[clst * 2 % SS(fs)];\r
-                       ST_WORD(p, (WORD)val);\r
+                       st_word(fs->win + clst * 2 % SS(fs), (WORD)val);\r
                        fs->wflag = 1;\r
                        break;\r
 \r
-               case FS_FAT32 :\r
+               case FS_FAT32 : /* DWORD aligned items */\r
+#if _FS_EXFAT\r
+               case FS_EXFAT :\r
+#endif\r
                        res = move_window(fs, fs->fatbase + (clst / (SS(fs) / 4)));\r
                        if (res != FR_OK) break;\r
-                       p = &fs->win[clst * 4 % SS(fs)];\r
-                       val |= LD_DWORD(p) & 0xF0000000;\r
-                       ST_DWORD(p, val);\r
+                       if (!_FS_EXFAT || fs->fs_type != FS_EXFAT) {\r
+                               val = (val & 0x0FFFFFFF) | (ld_dword(fs->win + clst * 4 % SS(fs)) & 0xF0000000);\r
+                       }\r
+                       st_dword(fs->win + clst * 4 % SS(fs), val);\r
                        fs->wflag = 1;\r
                        break;\r
-\r
-               default :\r
-                       res = FR_INT_ERR;\r
                }\r
        }\r
-\r
        return res;\r
 }\r
+\r
 #endif /* !_FS_READONLY */\r
 \r
 \r
 \r
 \r
+#if _FS_EXFAT && !_FS_READONLY\r
 /*-----------------------------------------------------------------------*/\r
-/* FAT handling - Remove a cluster chain                                 */\r
+/* exFAT: Accessing FAT and Allocation Bitmap                            */\r
 /*-----------------------------------------------------------------------*/\r
-#if !_FS_READONLY\r
+\r
+/*---------------------------------------------*/\r
+/* exFAT: Find a contiguous free cluster block */\r
+/*---------------------------------------------*/\r
+\r
 static\r
-FRESULT remove_chain (\r
-       FATFS* fs,                      /* File system object */\r
-       DWORD clst                      /* Cluster# to remove a chain from */\r
+DWORD find_bitmap (    /* 0:No free cluster, 2..:Free cluster found, 0xFFFFFFFF:Disk error */\r
+       FATFS* fs,      /* File system object */\r
+       DWORD clst,     /* Cluster number to scan from */\r
+       DWORD ncl       /* Number of contiguous clusters to find (1..) */\r
+)\r
+{\r
+       BYTE bm, bv;\r
+       UINT i;\r
+       DWORD val, scl, ctr;\r
+\r
+\r
+       clst -= 2;      /* The first bit in the bitmap corresponds to cluster #2 */\r
+       if (clst >= fs->n_fatent - 2) clst = 0;\r
+       scl = val = clst; ctr = 0;\r
+       for (;;) {\r
+               if (move_window(fs, fs->database + val / 8 / SS(fs)) != FR_OK) return 0xFFFFFFFF;       /* (assuming bitmap is located top of the cluster heap) */\r
+               i = val / 8 % SS(fs); bm = 1 << (val % 8);\r
+               do {\r
+                       do {\r
+                               bv = fs->win[i] & bm; bm <<= 1;         /* Get bit value */\r
+                               if (++val >= fs->n_fatent - 2) {        /* Next cluster (with wrap-around) */\r
+                                       val = 0; bm = 0; i = 4096;\r
+                               }\r
+                               if (!bv) {      /* Is it a free cluster? */\r
+                                       if (++ctr == ncl) return scl + 2;       /* Check run length */\r
+                               } else {\r
+                                       scl = val; ctr = 0;             /* Encountered a live cluster, restart to scan */\r
+                               }\r
+                               if (val == clst) return 0;      /* All cluster scanned? */\r
+                       } while (bm);\r
+                       bm = 1;\r
+               } while (++i < SS(fs));\r
+       }\r
+}\r
+\r
+\r
+/*------------------------------------*/\r
+/* exFAT: Set/Clear a block of bitmap */\r
+/*------------------------------------*/\r
+\r
+static\r
+FRESULT change_bitmap (\r
+       FATFS* fs,      /* File system object */\r
+       DWORD clst,     /* Cluster number to change from */\r
+       DWORD ncl,      /* Number of clusters to be changed */\r
+       int bv          /* bit value to be set (0 or 1) */\r
+)\r
+{\r
+       BYTE bm;\r
+       UINT i;\r
+       DWORD sect;\r
+\r
+\r
+       clst -= 2;      /* The first bit corresponds to cluster #2 */\r
+       sect = fs->database + clst / 8 / SS(fs);        /* Sector address (assuming bitmap is located top of the cluster heap) */\r
+       i = clst / 8 % SS(fs);                                          /* Byte offset in the sector */\r
+       bm = 1 << (clst % 8);                                           /* Bit mask in the byte */\r
+       for (;;) {\r
+               if (move_window(fs, sect++) != FR_OK) return FR_DISK_ERR;\r
+               do {\r
+                       do {\r
+                               if (bv == (int)((fs->win[i] & bm) != 0)) return FR_INT_ERR;     /* Is the bit expected value? */\r
+                               fs->win[i] ^= bm;       /* Flip the bit */\r
+                               fs->wflag = 1;\r
+                               if (--ncl == 0) return FR_OK;   /* All bits processed? */\r
+                       } while (bm <<= 1);             /* Next bit */\r
+                       bm = 1;\r
+               } while (++i < SS(fs));         /* Next byte */\r
+               i = 0;\r
+       }\r
+}\r
+\r
+\r
+/*---------------------------------------------*/\r
+/* Complement contiguous part of the FAT chain */\r
+/*---------------------------------------------*/\r
+\r
+static\r
+FRESULT fill_fat_chain (\r
+       _FDID* obj      /* Pointer to the corresponding object */\r
 )\r
 {\r
        FRESULT res;\r
+       DWORD cl, n;\r
+\r
+       if (obj->stat == 3) {   /* Has the object been changed 'fragmented'? */\r
+               for (cl = obj->sclust, n = obj->n_cont; n; cl++, n--) { /* Create cluster chain on the FAT */\r
+                       res = put_fat(obj->fs, cl, cl + 1);\r
+                       if (res != FR_OK) return res;\r
+               }\r
+               obj->stat = 0;  /* Change status 'FAT chain is valid' */\r
+       }\r
+       return FR_OK;\r
+}\r
+\r
+#endif /* _FS_EXFAT && !_FS_READONLY */\r
+\r
+\r
+\r
+#if !_FS_READONLY\r
+/*-----------------------------------------------------------------------*/\r
+/* FAT handling - Remove a cluster chain                                 */\r
+/*-----------------------------------------------------------------------*/\r
+static\r
+FRESULT remove_chain ( /* FR_OK(0):succeeded, !=0:error */\r
+       _FDID* obj,                     /* Corresponding object */\r
+       DWORD clst,                     /* Cluster to remove a chain from */\r
+       DWORD pclst                     /* Previous cluster of clst (0:an entire chain) */\r
+)\r
+{\r
+       FRESULT res = FR_OK;\r
        DWORD nxt;\r
+       FATFS *fs = obj->fs;\r
+#if _FS_EXFAT || _USE_TRIM\r
+       DWORD scl = clst, ecl = clst;\r
+#endif\r
 #if _USE_TRIM\r
-       DWORD scl = clst, ecl = clst, rt[2];\r
+       DWORD rt[2];\r
 #endif\r
 \r
-       if (clst < 2 || clst >= fs->n_fatent) { /* Check range */\r
-               res = FR_INT_ERR;\r
+       if (clst < 2 || clst >= fs->n_fatent) return FR_INT_ERR;        /* Check if in valid range */\r
 \r
-       } else {\r
-               res = FR_OK;\r
-               while (clst < fs->n_fatent) {                   /* Not a last link? */\r
-                       nxt = get_fat(fs, clst);                        /* Get cluster status */\r
-                       if (nxt == 0) break;                            /* Empty cluster? */\r
-                       if (nxt == 1) { res = FR_INT_ERR; break; }      /* Internal error? */\r
-                       if (nxt == 0xFFFFFFFF) { res = FR_DISK_ERR; break; }    /* Disk error? */\r
-                       res = put_fat(fs, clst, 0);                     /* Mark the cluster "empty" */\r
-                       if (res != FR_OK) break;\r
-                       if (fs->free_clust != 0xFFFFFFFF) {     /* Update FSINFO */\r
-                               fs->free_clust++;\r
-                               fs->fsi_flag |= 1;\r
+       /* Mark the previous cluster 'EOC' on the FAT if it exists */\r
+       if (pclst && (!_FS_EXFAT || fs->fs_type != FS_EXFAT || obj->stat != 2)) {\r
+               res = put_fat(fs, pclst, 0xFFFFFFFF);\r
+               if (res != FR_OK) return res;\r
+       }\r
+\r
+       /* Remove the chain */\r
+       do {\r
+               nxt = get_fat(obj, clst);                       /* Get cluster status */\r
+               if (nxt == 0) break;                            /* Empty cluster? */\r
+               if (nxt == 1) return FR_INT_ERR;        /* Internal error? */\r
+               if (nxt == 0xFFFFFFFF) return FR_DISK_ERR;      /* Disk error? */\r
+               if (!_FS_EXFAT || fs->fs_type != FS_EXFAT) {\r
+                       res = put_fat(fs, clst, 0);             /* Mark the cluster 'free' on the FAT */\r
+                       if (res != FR_OK) return res;\r
+               }\r
+               if (fs->free_clst < fs->n_fatent - 2) { /* Update FSINFO */\r
+                       fs->free_clst++;\r
+                       fs->fsi_flag |= 1;\r
+               }\r
+#if _FS_EXFAT || _USE_TRIM\r
+               if (ecl + 1 == nxt) {   /* Is next cluster contiguous? */\r
+                       ecl = nxt;\r
+               } else {                                /* End of contiguous cluster block */ \r
+#if _FS_EXFAT\r
+                       if (fs->fs_type == FS_EXFAT) {\r
+                               res = change_bitmap(fs, scl, ecl - scl + 1, 0); /* Mark the cluster block 'free' on the bitmap */\r
+                               if (res != FR_OK) return res;\r
                        }\r
+#endif\r
 #if _USE_TRIM\r
-                       if (ecl + 1 == nxt) {   /* Is next cluster contiguous? */\r
-                               ecl = nxt;\r
-                       } else {                                /* End of contiguous clusters */ \r
-                               rt[0] = clust2sect(fs, scl);                                    /* Start sector */\r
-                               rt[1] = clust2sect(fs, ecl) + fs->csize - 1;    /* End sector */\r
-                               disk_ioctl(fs->drv, CTRL_TRIM, rt);                             /* Erase the block */\r
-                               scl = ecl = nxt;\r
-                       }\r
+                       rt[0] = clust2sect(fs, scl);                                    /* Start sector */\r
+                       rt[1] = clust2sect(fs, ecl) + fs->csize - 1;    /* End sector */\r
+                       disk_ioctl(fs->drv, CTRL_TRIM, rt);                             /* Inform device the block can be erased */\r
 #endif\r
-                       clst = nxt;     /* Next cluster */\r
+                       scl = ecl = nxt;\r
                }\r
-       }\r
+#endif\r
+               clst = nxt;                                     /* Next cluster */\r
+       } while (clst < fs->n_fatent);  /* Repeat while not the last link */\r
 \r
-       return res;\r
-}\r
+#if _FS_EXFAT\r
+       if (fs->fs_type == FS_EXFAT) {\r
+               if (pclst == 0) {       /* Does object have no chain? */\r
+                       obj->stat = 0;          /* Change the object status 'initial' */\r
+               } else {\r
+                       if (obj->stat == 3 && pclst >= obj->sclust && pclst <= obj->sclust + obj->n_cont) {     /* Did the chain got contiguous? */\r
+                               obj->stat = 2;  /* Change the object status 'contiguous' */\r
+                       }\r
+               }\r
+       }\r
 #endif\r
+       return FR_OK;\r
+}\r
 \r
 \r
 \r
 \r
 /*-----------------------------------------------------------------------*/\r
-/* FAT handling - Stretch or Create a cluster chain                      */\r
+/* FAT handling - Stretch a chain or Create a new chain                  */\r
 /*-----------------------------------------------------------------------*/\r
-#if !_FS_READONLY\r
 static\r
 DWORD create_chain (   /* 0:No free cluster, 1:Internal error, 0xFFFFFFFF:Disk error, >=2:New cluster# */\r
-       FATFS* fs,                      /* File system object */\r
-       DWORD clst                      /* Cluster# to stretch. 0 means create a new chain. */\r
+       _FDID* obj,                     /* Corresponding object */\r
+       DWORD clst                      /* Cluster# to stretch, 0:Create a new chain */\r
 )\r
 {\r
        DWORD cs, ncl, scl;\r
        FRESULT res;\r
+       FATFS *fs = obj->fs;\r
 \r
 \r
-       if (clst == 0) {                /* Create a new chain */\r
-               scl = fs->last_clust;                   /* Get suggested start point */\r
-               if (!scl || scl >= fs->n_fatent) scl = 1;\r
+       if (clst == 0) {        /* Create a new chain */\r
+               scl = fs->last_clst;                            /* Get suggested cluster to start from */\r
+               if (scl == 0 || scl >= fs->n_fatent) scl = 1;\r
        }\r
-       else {                                  /* Stretch the current chain */\r
-               cs = get_fat(fs, clst);                 /* Check the cluster status */\r
-               if (cs < 2) return 1;                   /* Invalid value */\r
+       else {                          /* Stretch current chain */\r
+               cs = get_fat(obj, clst);                        /* Check the cluster status */\r
+               if (cs < 2) return 1;                           /* Invalid value */\r
                if (cs == 0xFFFFFFFF) return cs;        /* A disk error occurred */\r
                if (cs < fs->n_fatent) return cs;       /* It is already followed by next cluster */\r
                scl = clst;\r
        }\r
 \r
-       ncl = scl;                              /* Start cluster */\r
-       for (;;) {\r
-               ncl++;                                                  /* Next cluster */\r
-               if (ncl >= fs->n_fatent) {              /* Check wrap around */\r
-                       ncl = 2;\r
-                       if (ncl > scl) return 0;        /* No free cluster */\r
+#if _FS_EXFAT\r
+       if (fs->fs_type == FS_EXFAT) {  /* On the exFAT volume */\r
+               ncl = find_bitmap(fs, scl, 1);                          /* Find a free cluster */\r
+               if (ncl == 0 || ncl == 0xFFFFFFFF) return ncl;  /* No free cluster or hard error? */\r
+               res = change_bitmap(fs, ncl, 1, 1);                     /* Mark the cluster 'in use' */\r
+               if (res == FR_INT_ERR) return 1;\r
+               if (res == FR_DISK_ERR) return 0xFFFFFFFF;\r
+               if (clst == 0) {                                                        /* Is it a new chain? */\r
+                       obj->stat = 2;                                                  /* Set status 'contiguous chain' */\r
+               } else {                                                                        /* This is a stretched chain */\r
+                       if (obj->stat == 2 && ncl != scl + 1) { /* Is the chain got fragmented? */\r
+                               obj->n_cont = scl - obj->sclust;        /* Set size of the contiguous part */\r
+                               obj->stat = 3;                                          /* Change status 'just fragmented' */\r
+                       }\r
+               }\r
+       } else\r
+#endif\r
+       {       /* On the FAT12/16/32 volume */\r
+               ncl = scl;      /* Start cluster */\r
+               for (;;) {\r
+                       ncl++;                                                  /* Next cluster */\r
+                       if (ncl >= fs->n_fatent) {              /* Check wrap-around */\r
+                               ncl = 2;\r
+                               if (ncl > scl) return 0;        /* No free cluster */\r
+                       }\r
+                       cs = get_fat(obj, ncl);                 /* Get the cluster status */\r
+                       if (cs == 0) break;                             /* Found a free cluster */\r
+                       if (cs == 1 || cs == 0xFFFFFFFF) return cs;     /* An error occurred */\r
+                       if (ncl == scl) return 0;               /* No free cluster */\r
                }\r
-               cs = get_fat(fs, ncl);                  /* Get the cluster status */\r
-               if (cs == 0) break;                             /* Found a free cluster */\r
-               if (cs == 0xFFFFFFFF || cs == 1)/* An error occurred */\r
-                       return cs;\r
-               if (ncl == scl) return 0;               /* No free cluster */\r
        }\r
 \r
-       res = put_fat(fs, ncl, 0x0FFFFFFF);     /* Mark the new cluster "last link" */\r
-       if (res == FR_OK && clst != 0) {\r
-               res = put_fat(fs, clst, ncl);   /* Link it to the previous one if needed */\r
-       }\r
-       if (res == FR_OK) {\r
-               fs->last_clust = ncl;                   /* Update FSINFO */\r
-               if (fs->free_clust != 0xFFFFFFFF) {\r
-                       fs->free_clust--;\r
-                       fs->fsi_flag |= 1;\r
+       if (_FS_EXFAT && fs->fs_type == FS_EXFAT && obj->stat == 2) {   /* Is it a contiguous chain? */\r
+               res = FR_OK;                                            /* FAT does not need to be written */\r
+       } else {\r
+               res = put_fat(fs, ncl, 0xFFFFFFFF);     /* Mark the new cluster 'EOC' */\r
+               if (res == FR_OK && clst) {\r
+                       res = put_fat(fs, clst, ncl);   /* Link it from the previous one if needed */\r
                }\r
+       }\r
+\r
+       if (res == FR_OK) {                     /* Update FSINFO if function succeeded. */\r
+               fs->last_clst = ncl;\r
+               if (fs->free_clst < fs->n_fatent - 2) fs->free_clst--;\r
+               fs->fsi_flag |= 1;\r
        } else {\r
-               ncl = (res == FR_DISK_ERR) ? 0xFFFFFFFF : 1;\r
+               ncl = (res == FR_DISK_ERR) ? 0xFFFFFFFF : 1;    /* Failed. Create error status */\r
        }\r
 \r
-       return ncl;             /* Return new cluster number or error code */\r
+       return ncl;             /* Return new cluster number or error status */\r
 }\r
+\r
 #endif /* !_FS_READONLY */\r
 \r
 \r
 \r
 \r
+#if _USE_FASTSEEK\r
 /*-----------------------------------------------------------------------*/\r
 /* FAT handling - Convert offset into cluster with link map table        */\r
 /*-----------------------------------------------------------------------*/\r
 \r
-#if _USE_FASTSEEK\r
 static\r
 DWORD clmt_clust (     /* <2:Error, >=2:Cluster number */\r
        FIL* fp,                /* Pointer to the file object */\r
-       DWORD ofs               /* File offset to be converted to cluster# */\r
+       FSIZE_t ofs             /* File offset to be converted to cluster# */\r
 )\r
 {\r
        DWORD cl, ncl, *tbl;\r
+       FATFS *fs = fp->obj.fs;\r
 \r
 \r
        tbl = fp->cltbl + 1;    /* Top of CLMT */\r
-       cl = ofs / SS(fp->fs) / fp->fs->csize;  /* Cluster order from top of the file */\r
+       cl = (DWORD)(ofs / SS(fs) / fs->csize); /* Cluster order from top of the file */\r
        for (;;) {\r
                ncl = *tbl++;                   /* Number of cluters in the fragment */\r
-               if (!ncl) return 0;             /* End of table? (error) */\r
+               if (ncl == 0) return 0; /* End of table? (error) */\r
                if (cl < ncl) break;    /* In this fragment? */\r
                cl -= ncl; tbl++;               /* Next fragment */\r
        }\r
        return cl + *tbl;       /* Return the cluster number */\r
 }\r
+\r
 #endif /* _USE_FASTSEEK */\r
 \r
 \r
@@ -1134,42 +1424,43 @@ DWORD clmt_clust (      /* <2:Error, >=2:Cluster number */
 /*-----------------------------------------------------------------------*/\r
 \r
 static\r
-FRESULT dir_sdi (\r
+FRESULT dir_sdi (      /* FR_OK(0):succeeded, !=0:error */\r
        DIR* dp,                /* Pointer to directory object */\r
-       UINT idx                /* Index of directory table */\r
+       DWORD ofs               /* Offset of directory table */\r
 )\r
 {\r
-       DWORD clst, sect;\r
-       UINT ic;\r
+       DWORD csz, clst;\r
+       FATFS *fs = dp->obj.fs;\r
 \r
 \r
-       dp->index = (WORD)idx;  /* Current index */\r
-       clst = dp->sclust;              /* Table start cluster (0:root) */\r
-       if (clst == 1 || clst >= dp->fs->n_fatent)      /* Check start cluster range */\r
+       if (ofs >= (DWORD)((_FS_EXFAT && fs->fs_type == FS_EXFAT) ? MAX_DIR_EX : MAX_DIR) || ofs % SZDIRE) {    /* Check range of offset and alignment */\r
                return FR_INT_ERR;\r
-       if (!clst && dp->fs->fs_type == FS_FAT32)       /* Replace cluster# 0 with root cluster# if in FAT32 */\r
-               clst = dp->fs->dirbase;\r
+       }\r
+       dp->dptr = ofs;                         /* Set current offset */\r
+       clst = dp->obj.sclust;          /* Table start cluster (0:root) */\r
+       if (clst == 0 && fs->fs_type >= FS_FAT32) {     /* Replace cluster# 0 with root cluster# */\r
+               clst = fs->dirbase;\r
+               if (_FS_EXFAT) dp->obj.stat = 0;        /* exFAT: Root dir has an FAT chain */\r
+       }\r
 \r
        if (clst == 0) {        /* Static table (root-directory in FAT12/16) */\r
-               if (idx >= dp->fs->n_rootdir)   /* Is index out of range? */\r
-                       return FR_INT_ERR;\r
-               sect = dp->fs->dirbase;\r
-       }\r
-       else {                          /* Dynamic table (root-directory in FAT32 or sub-directory) */\r
-               ic = SS(dp->fs) / SZ_DIR * dp->fs->csize;       /* Entries per cluster */\r
-               while (idx >= ic) {     /* Follow cluster chain */\r
-                       clst = get_fat(dp->fs, clst);                           /* Get next cluster */\r
+               if (ofs / SZDIRE >= fs->n_rootdir)      return FR_INT_ERR;      /* Is index out of range? */\r
+               dp->sect = fs->dirbase;\r
+\r
+       } else {                        /* Dynamic table (sub-directory or root-directory in FAT32+) */\r
+               csz = (DWORD)fs->csize * SS(fs);        /* Bytes per cluster */\r
+               while (ofs >= csz) {                            /* Follow cluster chain */\r
+                       clst = get_fat(&dp->obj, clst);                         /* Get next cluster */\r
                        if (clst == 0xFFFFFFFF) return FR_DISK_ERR;     /* Disk error */\r
-                       if (clst < 2 || clst >= dp->fs->n_fatent)       /* Reached to end of table or internal error */\r
-                               return FR_INT_ERR;\r
-                       idx -= ic;\r
+                       if (clst < 2 || clst >= fs->n_fatent) return FR_INT_ERR;        /* Reached to end of table or internal error */\r
+                       ofs -= csz;\r
                }\r
-               sect = clust2sect(dp->fs, clst);\r
+               dp->sect = clust2sect(fs, clst);\r
        }\r
-       dp->clust = clst;       /* Current cluster# */\r
-       if (!sect) return FR_INT_ERR;\r
-       dp->sect = sect + idx / (SS(dp->fs) / SZ_DIR);                                  /* Sector# of the directory entry */\r
-       dp->dir = dp->fs->win + (idx % (SS(dp->fs) / SZ_DIR)) * SZ_DIR; /* Ptr to the entry in the sector */\r
+       dp->clust = clst;                                       /* Current cluster# */\r
+       if (!dp->sect) return FR_INT_ERR;\r
+       dp->sect += ofs / SS(fs);                       /* Sector# of the directory entry */\r
+       dp->dir = fs->win + (ofs % SS(fs));     /* Pointer to the entry in the win[] */\r
 \r
        return FR_OK;\r
 }\r
@@ -1182,62 +1473,63 @@ FRESULT dir_sdi (
 /*-----------------------------------------------------------------------*/\r
 \r
 static\r
-FRESULT dir_next (     /* FR_OK:Succeeded, FR_NO_FILE:End of table, FR_DENIED:Could not stretch */\r
+FRESULT dir_next (     /* FR_OK(0):succeeded, FR_NO_FILE:End of table, FR_DENIED:Could not stretch */\r
        DIR* dp,                /* Pointer to the directory object */\r
        int stretch             /* 0: Do not stretch table, 1: Stretch table if needed */\r
 )\r
 {\r
-       DWORD clst;\r
-       UINT i;\r
-\r
+       DWORD ofs, clst;\r
+       FATFS *fs = dp->obj.fs;\r
+#if !_FS_READONLY\r
+       UINT n;\r
+#endif\r
 \r
-       i = dp->index + 1;\r
-       if (!(i & 0xFFFF) || !dp->sect) /* Report EOT when index has reached 65535 */\r
-               return FR_NO_FILE;\r
+       ofs = dp->dptr + SZDIRE;        /* Next entry */\r
+       if (!dp->sect || ofs >= (DWORD)((_FS_EXFAT && fs->fs_type == FS_EXFAT) ? MAX_DIR_EX : MAX_DIR)) return FR_NO_FILE;      /* Report EOT when offset has reached max value */\r
 \r
-       if (!(i % (SS(dp->fs) / SZ_DIR))) {     /* Sector changed? */\r
-               dp->sect++;                                     /* Next sector */\r
+       if (ofs % SS(fs) == 0) {        /* Sector changed? */\r
+               dp->sect++;                             /* Next sector */\r
 \r
                if (!dp->clust) {               /* Static table */\r
-                       if (i >= dp->fs->n_rootdir)     /* Report EOT if it reached end of static table */\r
-                               return FR_NO_FILE;\r
+                       if (ofs / SZDIRE >= fs->n_rootdir) {    /* Report EOT if it reached end of static table */\r
+                               dp->sect = 0; return FR_NO_FILE;\r
+                       }\r
                }\r
                else {                                  /* Dynamic table */\r
-                       if (((i / (SS(dp->fs) / SZ_DIR)) & (dp->fs->csize - 1)) == 0) { /* Cluster changed? */\r
-                               clst = get_fat(dp->fs, dp->clust);                              /* Get next cluster */\r
-                               if (clst <= 1) return FR_INT_ERR;\r
-                               if (clst == 0xFFFFFFFF) return FR_DISK_ERR;\r
-                               if (clst >= dp->fs->n_fatent) {                                 /* If it reached end of dynamic table, */\r
+                       if ((ofs / SS(fs) & (fs->csize - 1)) == 0) {            /* Cluster changed? */\r
+                               clst = get_fat(&dp->obj, dp->clust);                    /* Get next cluster */\r
+                               if (clst <= 1) return FR_INT_ERR;                               /* Internal error */\r
+                               if (clst == 0xFFFFFFFF) return FR_DISK_ERR;             /* Disk error */\r
+                               if (clst >= fs->n_fatent) {                                             /* Reached end of dynamic table */\r
 #if !_FS_READONLY\r
-                                       UINT c;\r
-                                       if (!stretch) return FR_NO_FILE;                        /* If do not stretch, report EOT */\r
-                                       clst = create_chain(dp->fs, dp->clust);         /* Stretch cluster chain */\r
+                                       if (!stretch) {                                                         /* If no stretch, report EOT */\r
+                                               dp->sect = 0; return FR_NO_FILE;\r
+                                       }\r
+                                       clst = create_chain(&dp->obj, dp->clust);       /* Allocate a cluster */\r
                                        if (clst == 0) return FR_DENIED;                        /* No free cluster */\r
-                                       if (clst == 1) return FR_INT_ERR;\r
-                                       if (clst == 0xFFFFFFFF) return FR_DISK_ERR;\r
-                                       /* Clean-up stretched table */\r
-                                       if (sync_window(dp->fs)) return FR_DISK_ERR;/* Flush disk access window */\r
-                                       mem_set(dp->fs->win, 0, SS(dp->fs));            /* Clear window buffer */\r
-                                       dp->fs->winsect = clust2sect(dp->fs, clst);     /* Cluster start sector */\r
-                                       for (c = 0; c < dp->fs->csize; c++) {           /* Fill the new cluster with 0 */\r
-                                               dp->fs->wflag = 1;\r
-                                               if (sync_window(dp->fs)) return FR_DISK_ERR;\r
-                                               dp->fs->winsect++;\r
+                                       if (clst == 1) return FR_INT_ERR;                       /* Internal error */\r
+                                       if (clst == 0xFFFFFFFF) return FR_DISK_ERR;     /* Disk error */\r
+                                       /* Clean-up the stretched table */\r
+                                       if (_FS_EXFAT) dp->obj.stat |= 4;                       /* The directory needs to be updated */\r
+                                       if (sync_window(fs) != FR_OK) return FR_DISK_ERR;       /* Flush disk access window */\r
+                                       mem_set(fs->win, 0, SS(fs));                            /* Clear window buffer */\r
+                                       for (n = 0, fs->winsect = clust2sect(fs, clst); n < fs->csize; n++, fs->winsect++) {    /* Fill the new cluster with 0 */\r
+                                               fs->wflag = 1;\r
+                                               if (sync_window(fs) != FR_OK) return FR_DISK_ERR;\r
                                        }\r
-                                       dp->fs->winsect -= c;                                           /* Rewind window offset */\r
+                                       fs->winsect -= n;                                                       /* Restore window offset */\r
 #else\r
-                                       if (!stretch) return FR_NO_FILE;                        /* If do not stretch, report EOT (this is to suppress warning) */\r
-                                       return FR_NO_FILE;                                                      /* Report EOT */\r
+                                       if (!stretch) dp->sect = 0;                                     /* If no stretch, report EOT (this is to suppress warning) */\r
+                                       dp->sect = 0; return FR_NO_FILE;                        /* Report EOT */\r
 #endif\r
                                }\r
-                               dp->clust = clst;                               /* Initialize data for new cluster */\r
-                               dp->sect = clust2sect(dp->fs, clst);\r
+                               dp->clust = clst;               /* Initialize data for new cluster */\r
+                               dp->sect = clust2sect(fs, clst);\r
                        }\r
                }\r
        }\r
-\r
-       dp->index = (WORD)i;    /* Current index */\r
-       dp->dir = dp->fs->win + (i % (SS(dp->fs) / SZ_DIR)) * SZ_DIR;   /* Current entry in the window */\r
+       dp->dptr = ofs;                                         /* Current entry */\r
+       dp->dir = fs->win + ofs % SS(fs);       /* Pointer to the entry in the win[] */\r
 \r
        return FR_OK;\r
 }\r
@@ -1245,58 +1537,66 @@ FRESULT dir_next (      /* FR_OK:Succeeded, FR_NO_FILE:End of table, FR_DENIED:Could
 \r
 \r
 \r
+#if !_FS_READONLY\r
 /*-----------------------------------------------------------------------*/\r
-/* Directory handling - Reserve directory entry                          */\r
+/* Directory handling - Reserve a block of directory entries             */\r
 /*-----------------------------------------------------------------------*/\r
 \r
-#if !_FS_READONLY\r
 static\r
-FRESULT dir_alloc (\r
-       DIR* dp,        /* Pointer to the directory object */\r
-       UINT nent       /* Number of contiguous entries to allocate (1-21) */\r
+FRESULT dir_alloc (    /* FR_OK(0):succeeded, !=0:error */\r
+       DIR* dp,                /* Pointer to the directory object */\r
+       UINT nent               /* Number of contiguous entries to allocate */\r
 )\r
 {\r
        FRESULT res;\r
        UINT n;\r
+       FATFS *fs = dp->obj.fs;\r
 \r
 \r
        res = dir_sdi(dp, 0);\r
        if (res == FR_OK) {\r
                n = 0;\r
                do {\r
-                       res = move_window(dp->fs, dp->sect);\r
+                       res = move_window(fs, dp->sect);\r
                        if (res != FR_OK) break;\r
-                       if (dp->dir[0] == DDE || dp->dir[0] == 0) {     /* Is it a free entry? */\r
+#if _FS_EXFAT\r
+                       if ((fs->fs_type == FS_EXFAT) ? (int)((dp->dir[XDIR_Type] & 0x80) == 0) : (int)(dp->dir[DIR_Name] == DDEM || dp->dir[DIR_Name] == 0)) {\r
+#else\r
+                       if (dp->dir[DIR_Name] == DDEM || dp->dir[DIR_Name] == 0) {\r
+#endif\r
                                if (++n == nent) break; /* A block of contiguous free entries is found */\r
                        } else {\r
                                n = 0;                                  /* Not a blank entry. Restart to search */\r
                        }\r
-                       res = dir_next(dp, 1);          /* Next entry with table stretch enabled */\r
-               } while (res == FR_OK);\r
+                       res = dir_next(dp, 1);\r
+               } while (res == FR_OK); /* Next entry with table stretch enabled */\r
        }\r
+\r
        if (res == FR_NO_FILE) res = FR_DENIED; /* No directory entry to allocate */\r
        return res;\r
 }\r
-#endif\r
+\r
+#endif /* !_FS_READONLY */\r
 \r
 \r
 \r
 \r
 /*-----------------------------------------------------------------------*/\r
-/* Directory handling - Load/Store start cluster number                  */\r
+/* FAT: Directory handling - Load/Store start cluster number             */\r
 /*-----------------------------------------------------------------------*/\r
 \r
 static\r
-DWORD ld_clust (\r
-       FATFS* fs,      /* Pointer to the fs object */\r
-       BYTE* dir       /* Pointer to the directory entry */\r
+DWORD ld_clust (       /* Returns the top cluster value of the SFN entry */\r
+       FATFS* fs,              /* Pointer to the fs object */\r
+       const BYTE* dir /* Pointer to the key entry */\r
 )\r
 {\r
        DWORD cl;\r
 \r
-       cl = LD_WORD(dir+DIR_FstClusLO);\r
-       if (fs->fs_type == FS_FAT32)\r
-               cl |= (DWORD)LD_WORD(dir+DIR_FstClusHI) << 16;\r
+       cl = ld_word(dir + DIR_FstClusLO);\r
+       if (fs->fs_type == FS_FAT32) {\r
+               cl |= (DWORD)ld_word(dir + DIR_FstClusHI) << 16;\r
+       }\r
 \r
        return cl;\r
 }\r
@@ -1305,128 +1605,143 @@ DWORD ld_clust (
 #if !_FS_READONLY\r
 static\r
 void st_clust (\r
-       BYTE* dir,      /* Pointer to the directory entry */\r
+       FATFS* fs,      /* Pointer to the fs object */\r
+       BYTE* dir,      /* Pointer to the key entry */\r
        DWORD cl        /* Value to be set */\r
 )\r
 {\r
-       ST_WORD(dir+DIR_FstClusLO, cl);\r
-       ST_WORD(dir+DIR_FstClusHI, cl >> 16);\r
+       st_word(dir + DIR_FstClusLO, (WORD)cl);\r
+       if (fs->fs_type == FS_FAT32) {\r
+               st_word(dir + DIR_FstClusHI, (WORD)(cl >> 16));\r
+       }\r
 }\r
 #endif\r
 \r
 \r
 \r
-\r
-/*-----------------------------------------------------------------------*/\r
-/* LFN handling - Test/Pick/Fit an LFN segment from/to directory entry   */\r
-/*-----------------------------------------------------------------------*/\r
-#if _USE_LFN\r
+#if _USE_LFN != 0\r
+/*------------------------------------------------------------------------*/\r
+/* FAT-LFN: LFN handling                                                  */\r
+/*------------------------------------------------------------------------*/\r
 static\r
 const BYTE LfnOfs[] = {1,3,5,7,9,14,16,18,20,22,24,28,30};     /* Offset of LFN characters in the directory entry */\r
 \r
 \r
+/*--------------------------------------------------------*/\r
+/* FAT-LFN: Compare a part of file name with an LFN entry */\r
+/*--------------------------------------------------------*/\r
 static\r
-int cmp_lfn (                  /* 1:Matched, 0:Not matched */\r
-       WCHAR* lfnbuf,          /* Pointer to the LFN to be compared */\r
-       BYTE* dir                       /* Pointer to the directory entry containing a part of LFN */\r
+int cmp_lfn (                          /* 1:matched, 0:not matched */\r
+       const WCHAR* lfnbuf,    /* Pointer to the LFN working buffer to be compared */\r
+       BYTE* dir                               /* Pointer to the directory entry containing the part of LFN */\r
 )\r
 {\r
        UINT i, s;\r
        WCHAR wc, uc;\r
 \r
 \r
-       i = ((dir[LDIR_Ord] & ~LLE) - 1) * 13;  /* Get offset in the LFN buffer */\r
-       s = 0; wc = 1;\r
-       do {\r
-               uc = LD_WORD(dir+LfnOfs[s]);    /* Pick an LFN character from the entry */\r
-               if (wc) {       /* Last character has not been processed */\r
-                       wc = ff_wtoupper(uc);           /* Convert it to upper case */\r
-                       if (i >= _MAX_LFN || wc != ff_wtoupper(lfnbuf[i++]))    /* Compare it */\r
-                               return 0;                               /* Not matched */\r
+       if (ld_word(dir + LDIR_FstClusLO) != 0) return 0;       /* Check LDIR_FstClusLO */\r
+\r
+       i = ((dir[LDIR_Ord] & 0x3F) - 1) * 13;  /* Offset in the LFN buffer */\r
+\r
+       for (wc = 1, s = 0; s < 13; s++) {              /* Process all characters in the entry */\r
+               uc = ld_word(dir + LfnOfs[s]);          /* Pick an LFN character */\r
+               if (wc) {\r
+                       if (i >= _MAX_LFN || ff_wtoupper(uc) != ff_wtoupper(lfnbuf[i++])) {     /* Compare it */\r
+                               return 0;                                       /* Not matched */\r
+                       }\r
+                       wc = uc;\r
                } else {\r
-                       if (uc != 0xFFFF) return 0;     /* Check filler */\r
+                       if (uc != 0xFFFF) return 0;             /* Check filler */\r
                }\r
-       } while (++s < 13);                             /* Repeat until all characters in the entry are checked */\r
+       }\r
 \r
-       if ((dir[LDIR_Ord] & LLE) && wc && lfnbuf[i])   /* Last segment matched but different length */\r
-               return 0;\r
+       if ((dir[LDIR_Ord] & LLEF) && wc && lfnbuf[i]) return 0;        /* Last segment matched but different length */\r
 \r
-       return 1;                                               /* The part of LFN matched */\r
+       return 1;               /* The part of LFN matched */\r
 }\r
 \r
 \r
-\r
+#if _FS_MINIMIZE <= 1 || _FS_RPATH >= 2 || _USE_LABEL || _FS_EXFAT\r
+/*-----------------------------------------------------*/\r
+/* FAT-LFN: Pick a part of file name from an LFN entry */\r
+/*-----------------------------------------------------*/\r
 static\r
-int pick_lfn (                 /* 1:Succeeded, 0:Buffer overflow */\r
-       WCHAR* lfnbuf,          /* Pointer to the Unicode-LFN buffer */\r
-       BYTE* dir                       /* Pointer to the directory entry */\r
+int pick_lfn (                 /* 1:succeeded, 0:buffer overflow or invalid LFN entry */\r
+       WCHAR* lfnbuf,          /* Pointer to the LFN working buffer */\r
+       BYTE* dir                       /* Pointer to the LFN entry */\r
 )\r
 {\r
        UINT i, s;\r
        WCHAR wc, uc;\r
 \r
 \r
+       if (ld_word(dir + LDIR_FstClusLO) != 0) return 0;       /* Check LDIR_FstClusLO */\r
+\r
        i = ((dir[LDIR_Ord] & 0x3F) - 1) * 13;  /* Offset in the LFN buffer */\r
 \r
-       s = 0; wc = 1;\r
-       do {\r
-               uc = LD_WORD(dir+LfnOfs[s]);            /* Pick an LFN character from the entry */\r
-               if (wc) {       /* Last character has not been processed */\r
+       for (wc = 1, s = 0; s < 13; s++) {              /* Process all characters in the entry */\r
+               uc = ld_word(dir + LfnOfs[s]);          /* Pick an LFN character */\r
+               if (wc) {\r
                        if (i >= _MAX_LFN) return 0;    /* Buffer overflow? */\r
                        lfnbuf[i++] = wc = uc;                  /* Store it */\r
                } else {\r
                        if (uc != 0xFFFF) return 0;             /* Check filler */\r
                }\r
-       } while (++s < 13);                                             /* Read all character in the entry */\r
+       }\r
 \r
-       if (dir[LDIR_Ord] & LLE) {                              /* Put terminator if it is the last LFN part */\r
+       if (dir[LDIR_Ord] & LLEF) {                             /* Put terminator if it is the last LFN part */\r
                if (i >= _MAX_LFN) return 0;            /* Buffer overflow? */\r
                lfnbuf[i] = 0;\r
        }\r
 \r
-       return 1;\r
+       return 1;               /* The part of LFN is valid */\r
 }\r
+#endif\r
 \r
 \r
 #if !_FS_READONLY\r
+/*-----------------------------------------*/\r
+/* FAT-LFN: Create an entry of LFN entries */\r
+/*-----------------------------------------*/\r
 static\r
-void fit_lfn (\r
-       const WCHAR* lfnbuf,    /* Pointer to the LFN buffer */\r
-       BYTE* dir,                              /* Pointer to the directory entry */\r
-       BYTE ord,                               /* LFN order (1-20) */\r
-       BYTE sum                                /* SFN sum */\r
+void put_lfn (\r
+       const WCHAR* lfn,       /* Pointer to the LFN */\r
+       BYTE* dir,                      /* Pointer to the LFN entry to be created */\r
+       BYTE ord,                       /* LFN order (1-20) */\r
+       BYTE sum                        /* Checksum of the corresponding SFN */\r
 )\r
 {\r
        UINT i, s;\r
        WCHAR wc;\r
 \r
 \r
-       dir[LDIR_Chksum] = sum;                 /* Set check sum */\r
+       dir[LDIR_Chksum] = sum;                 /* Set checksum */\r
        dir[LDIR_Attr] = AM_LFN;                /* Set attribute. LFN entry */\r
        dir[LDIR_Type] = 0;\r
-       ST_WORD(dir+LDIR_FstClusLO, 0);\r
+       st_word(dir + LDIR_FstClusLO, 0);\r
 \r
-       i = (ord - 1) * 13;                             /* Get offset in the LFN buffer */\r
+       i = (ord - 1) * 13;                             /* Get offset in the LFN working buffer */\r
        s = wc = 0;\r
        do {\r
-               if (wc != 0xFFFF) wc = lfnbuf[i++];     /* Get an effective character */\r
-               ST_WORD(dir+LfnOfs[s], wc);     /* Put it */\r
-               if (!wc) wc = 0xFFFF;           /* Padding characters following last character */\r
+               if (wc != 0xFFFF) wc = lfn[i++];        /* Get an effective character */\r
+               st_word(dir + LfnOfs[s], wc);           /* Put it */\r
+               if (wc == 0) wc = 0xFFFF;               /* Padding characters for left locations */\r
        } while (++s < 13);\r
-       if (wc == 0xFFFF || !lfnbuf[i]) ord |= LLE;     /* Bottom LFN part is the start of LFN sequence */\r
+       if (wc == 0xFFFF || !lfn[i]) ord |= LLEF;       /* Last LFN part is the start of LFN sequence */\r
        dir[LDIR_Ord] = ord;                    /* Set the LFN order */\r
 }\r
 \r
-#endif\r
-#endif\r
-\r
+#endif /* !_FS_READONLY */\r
+#endif /* _USE_LFN != 0 */\r
 \r
 \r
 \r
+#if _USE_LFN != 0 && !_FS_READONLY\r
 /*-----------------------------------------------------------------------*/\r
-/* Create numbered name                                                  */\r
+/* FAT-LFN: Create a Numbered SFN                                        */\r
 /*-----------------------------------------------------------------------*/\r
-#if _USE_LFN\r
+\r
 static\r
 void gen_numname (\r
        BYTE* dst,                      /* Pointer to the buffer to store numbered SFN */\r
@@ -1437,14 +1752,14 @@ void gen_numname (
 {\r
        BYTE ns[8], c;\r
        UINT i, j;\r
+       WCHAR wc;\r
+       DWORD sr;\r
 \r
 \r
        mem_cpy(dst, src, 11);\r
 \r
-       if (seq > 5) {  /* On many collisions, generate a hash number instead of sequential number */\r
-               WCHAR wc;\r
-               DWORD sr = seq;\r
-\r
+       if (seq > 5) {  /* In case of many collisions, generate a hash number instead of sequential number */\r
+               sr = seq;\r
                while (*lfn) {  /* Create a CRC */\r
                        wc = *lfn++;\r
                        for (i = 0; i < 16; i++) {\r
@@ -1459,7 +1774,7 @@ void gen_numname (
        /* itoa (hexdecimal) */\r
        i = 7;\r
        do {\r
-               c = (seq % 16) + '0';\r
+               c = (BYTE)((seq % 16) + '0');\r
                if (c > '9') c += 7;\r
                ns[i--] = c;\r
                seq /= 16;\r
@@ -1477,15 +1792,15 @@ void gen_numname (
                dst[j++] = (i < 8) ? ns[i++] : ' ';\r
        } while (j < 8);\r
 }\r
-#endif\r
-\r
+#endif /* _USE_LFN != 0 && !_FS_READONLY */\r
 \r
 \r
 \r
+#if _USE_LFN != 0\r
 /*-----------------------------------------------------------------------*/\r
-/* Calculate sum of an SFN                                               */\r
+/* FAT-LFN: Calculate checksum of an SFN entry                           */\r
 /*-----------------------------------------------------------------------*/\r
-#if _USE_LFN\r
+\r
 static\r
 BYTE sum_sfn (\r
        const BYTE* dir         /* Pointer to the SFN entry */\r
@@ -1497,386 +1812,814 @@ BYTE sum_sfn (
        do sum = (sum >> 1) + (sum << 7) + *dir++; while (--n);\r
        return sum;\r
 }\r
-#endif\r
 \r
+#endif /* _USE_LFN != 0 */\r
 \r
 \r
 \r
+#if _FS_EXFAT\r
 /*-----------------------------------------------------------------------*/\r
-/* Directory handling - Find an object in the directory                  */\r
+/* exFAT: Checksum                                                       */\r
 /*-----------------------------------------------------------------------*/\r
 \r
 static\r
-FRESULT dir_find (\r
-       DIR* dp                 /* Pointer to the directory object linked to the file name */\r
+WORD xdir_sum (                        /* Get checksum of the directoly block */\r
+       const BYTE* dir         /* Directory entry block to be calculated */\r
 )\r
 {\r
-       FRESULT res;\r
-       BYTE c, *dir;\r
-#if _USE_LFN\r
-       BYTE a, ord, sum;\r
+       UINT i, szblk;\r
+       WORD sum;\r
+\r
+\r
+       szblk = (dir[XDIR_NumSec] + 1) * SZDIRE;\r
+       for (i = sum = 0; i < szblk; i++) {\r
+               if (i == XDIR_SetSum) { /* Skip sum field */\r
+                       i++;\r
+               } else {\r
+                       sum = ((sum & 1) ? 0x8000 : 0) + (sum >> 1) + dir[i];\r
+               }\r
+       }\r
+       return sum;\r
+}\r
+\r
+\r
+\r
+static\r
+WORD xname_sum (               /* Get check sum (to be used as hash) of the name */\r
+       const WCHAR* name       /* File name to be calculated */\r
+)\r
+{\r
+       WCHAR chr;\r
+       WORD sum = 0;\r
+\r
+\r
+       while ((chr = *name++) != 0) {\r
+               chr = ff_wtoupper(chr);         /* File name needs to be ignored case */\r
+               sum = ((sum & 1) ? 0x8000 : 0) + (sum >> 1) + (chr & 0xFF);\r
+               sum = ((sum & 1) ? 0x8000 : 0) + (sum >> 1) + (chr >> 8);\r
+       }\r
+       return sum;\r
+}\r
+\r
+\r
+#if !_FS_READONLY && _USE_MKFS\r
+static\r
+DWORD xsum32 (\r
+       BYTE  dat,      /* Data to be sumed */\r
+       DWORD sum       /* Previous value */\r
+)\r
+{\r
+       sum = ((sum & 1) ? 0x80000000 : 0) + (sum >> 1) + dat;\r
+       return sum;\r
+}\r
 #endif\r
 \r
-       res = dir_sdi(dp, 0);                   /* Rewind directory object */\r
+\r
+#if _FS_MINIMIZE <= 1 || _FS_RPATH >= 2\r
+/*------------------------------------------------------*/\r
+/* exFAT: Get object information from a directory block */\r
+/*------------------------------------------------------*/\r
+\r
+static\r
+void get_xdir_info (\r
+       BYTE* dirb,                     /* Pointer to the direcotry entry block 85+C0+C1s */\r
+       FILINFO* fno            /* Buffer to store the extracted file information */\r
+)\r
+{\r
+       UINT di, si;\r
+       WCHAR w;\r
+#if !_LFN_UNICODE\r
+       UINT nc;\r
+#endif\r
+\r
+       /* Get file name */\r
+#if _LFN_UNICODE\r
+       if (dirb[XDIR_NumName] <= _MAX_LFN) {\r
+               for (si = SZDIRE * 2, di = 0; di < dirb[XDIR_NumName]; si += 2, di++) {\r
+                       if ((si % SZDIRE) == 0) si += 2;        /* Skip entry type field */\r
+                       w = ld_word(dirb + si);                         /* Get a character */\r
+                       fno->fname[di] = w;                                     /* Store it */\r
+               }\r
+       } else {\r
+               di = 0; /* Buffer overflow and inaccessible object */\r
+       }\r
+#else\r
+       for (si = SZDIRE * 2, di = nc = 0; nc < dirb[XDIR_NumName]; si += 2, nc++) {\r
+               if ((si % SZDIRE) == 0) si += 2;        /* Skip entry type field */\r
+               w = ld_word(dirb + si);                         /* Get a character */\r
+               w = ff_convert(w, 0);                           /* Unicode -> OEM */\r
+               if (w == 0) { di = 0; break; }          /* Could not be converted and inaccessible object */\r
+               if (_DF1S && w >= 0x100) {                      /* Put 1st byte if it is a DBC (always false at SBCS cfg) */\r
+                       fno->fname[di++] = (char)(w >> 8);\r
+               }\r
+               if (di >= _MAX_LFN) { di = 0; break; }  /* Buffer overflow and inaccessible object */\r
+               fno->fname[di++] = (char)w;\r
+       }\r
+#endif\r
+       if (di == 0) fno->fname[di++] = '?';    /* Inaccessible object? */\r
+       fno->fname[di] = 0;                                             /* Terminate file name */\r
+\r
+       fno->altname[0] = 0;                                                    /* No SFN */\r
+       fno->fattrib = dirb[XDIR_Attr];                                 /* Attribute */\r
+       fno->fsize = (fno->fattrib & AM_DIR) ? 0 : ld_qword(dirb + XDIR_FileSize);      /* Size */\r
+       fno->ftime = ld_word(dirb + XDIR_ModTime + 0);  /* Time */\r
+       fno->fdate = ld_word(dirb + XDIR_ModTime + 2);  /* Date */\r
+}\r
+\r
+#endif /* _FS_MINIMIZE <= 1 || _FS_RPATH >= 2 */\r
+\r
+\r
+/*-----------------------------------*/\r
+/* exFAT: Get a directry entry block */\r
+/*-----------------------------------*/\r
+\r
+static\r
+FRESULT load_xdir (    /* FR_INT_ERR: invalid entry block */\r
+       DIR* dp                 /* Pointer to the reading direcotry object pointing the 85 entry */\r
+)\r
+{\r
+       FRESULT res;\r
+       UINT i, nent;\r
+       BYTE* dirb = dp->obj.fs->dirbuf;        /* Pointer to the on-memory direcotry entry block 85+C0+C1s */\r
+\r
+\r
+       /* Load 85 entry */\r
+       res = move_window(dp->obj.fs, dp->sect);\r
+       if (res != FR_OK) return res;\r
+       if (dp->dir[XDIR_Type] != 0x85) return FR_INT_ERR;\r
+       mem_cpy(dirb, dp->dir, SZDIRE);\r
+       nent = dirb[XDIR_NumSec] + 1;\r
+\r
+       /* Load C0 entry */\r
+       res = dir_next(dp, 0);\r
+       if (res != FR_OK) return res;\r
+       res = move_window(dp->obj.fs, dp->sect);\r
        if (res != FR_OK) return res;\r
+       if (dp->dir[XDIR_Type] != 0xC0) return FR_INT_ERR;\r
+       mem_cpy(dirb + SZDIRE, dp->dir, SZDIRE);\r
+\r
+       /* Load C1 entries */\r
+       if (nent < 3 || nent > 19) return FR_NO_FILE;\r
+       i = SZDIRE * 2; nent *= SZDIRE;\r
+       do {\r
+               res = dir_next(dp, 0);\r
+               if (res != FR_OK) return res;\r
+               res = move_window(dp->obj.fs, dp->sect);\r
+               if (res != FR_OK) return res;\r
+               if (dp->dir[XDIR_Type] != 0xC1) return FR_INT_ERR;\r
+               mem_cpy(dirb + i, dp->dir, SZDIRE);\r
+               i += SZDIRE;\r
+       } while (i < nent);\r
+\r
+       /* Sanity check */\r
+       if (xdir_sum(dirb) != ld_word(dirb + XDIR_SetSum)) return FR_INT_ERR;\r
+\r
+       return FR_OK;\r
+}\r
+\r
 \r
-#if _USE_LFN\r
-       ord = sum = 0xFF; dp->lfn_idx = 0xFFFF; /* Reset LFN sequence */\r
+#if !_FS_READONLY || _FS_RPATH != 0 \r
+/*------------------------------------------------*/\r
+/* exFAT: Load the object's directory entry block */\r
+/*------------------------------------------------*/\r
+static\r
+FRESULT load_obj_dir ( \r
+       DIR* dp,                        /* Blank directory object to be used to access containing direcotry */\r
+       const _FDID* obj        /* Object with containing directory information */\r
+)\r
+{\r
+       FRESULT res;\r
+\r
+\r
+       /* Open object containing directory */\r
+       dp->obj.fs = obj->fs;\r
+       dp->obj.sclust = obj->c_scl;\r
+       dp->obj.stat = (BYTE)obj->c_size;\r
+       dp->obj.objsize = obj->c_size & 0xFFFFFF00;\r
+       dp->blk_ofs = obj->c_ofs;\r
+\r
+       res = dir_sdi(dp, dp->blk_ofs); /* Goto the block location */\r
+       if (res == FR_OK) {\r
+               res = load_xdir(dp);            /* Load the object's entry block */\r
+       }\r
+       return res;\r
+}\r
 #endif\r
+\r
+\r
+#if !_FS_READONLY\r
+/*-----------------------------------------------*/\r
+/* exFAT: Store the directory block to the media */\r
+/*-----------------------------------------------*/\r
+static\r
+FRESULT store_xdir (\r
+       DIR* dp                         /* Pointer to the direcotry object */\r
+)\r
+{\r
+       FRESULT res;\r
+       UINT nent;\r
+       BYTE* dirb = dp->obj.fs->dirbuf;        /* Pointer to the direcotry entry block 85+C0+C1s */\r
+\r
+       /* Create set sum */\r
+       st_word(dirb + XDIR_SetSum, xdir_sum(dirb));\r
+       nent = dirb[XDIR_NumSec] + 1;\r
+\r
+       /* Store the set of directory to the volume */\r
+       res = dir_sdi(dp, dp->blk_ofs);\r
+       while (res == FR_OK) {\r
+               res = move_window(dp->obj.fs, dp->sect);\r
+               if (res != FR_OK) break;\r
+               mem_cpy(dp->dir, dirb, SZDIRE);\r
+               dp->obj.fs->wflag = 1;\r
+               if (--nent == 0) break;\r
+               dirb += SZDIRE;\r
+               res = dir_next(dp, 0);\r
+       }\r
+       return (res == FR_OK || res == FR_DISK_ERR) ? res : FR_INT_ERR;\r
+}\r
+\r
+\r
+\r
+/*-------------------------------------------*/\r
+/* exFAT: Create a new directory enrty block */\r
+/*-------------------------------------------*/\r
+\r
+static\r
+void create_xdir (\r
+       BYTE* dirb,                     /* Pointer to the direcotry entry block buffer */\r
+       const WCHAR* lfn        /* Pointer to the nul terminated file name */\r
+)\r
+{\r
+       UINT i;\r
+       BYTE nb, nc;\r
+       WCHAR chr;\r
+\r
+\r
+       mem_set(dirb, 0, 2 * SZDIRE);                   /* Initialize 85+C0 entry */\r
+       dirb[XDIR_Type] = 0x85;\r
+       dirb[XDIR_Type + SZDIRE] = 0xC0;\r
+       st_word(dirb + XDIR_NameHash, xname_sum(lfn));  /* Set name hash */\r
+\r
+       i = SZDIRE * 2; /* C1 offset */\r
+       nc = 0; nb = 1; chr = 1;\r
        do {\r
-               res = move_window(dp->fs, dp->sect);\r
+               dirb[i++] = 0xC1; dirb[i++] = 0;        /* Entry type C1 */\r
+               do {    /* Fill name field */\r
+                       if (chr && (chr = lfn[nc]) != 0) nc++;  /* Get a character if exist */\r
+                       st_word(dirb + i, chr); i += 2; /* Store it */\r
+               } while (i % SZDIRE);\r
+               nb++;\r
+       } while (lfn[nc]);      /* Fill next entry if any char follows */\r
+\r
+       dirb[XDIR_NumName] = nc;        /* Set name length */\r
+       dirb[XDIR_NumSec] = nb;         /* Set number of C0+C1s */\r
+}\r
+\r
+#endif /* !_FS_READONLY */\r
+#endif /* _FS_EXFAT */\r
+\r
+\r
+\r
+#if _FS_MINIMIZE <= 1 || _FS_RPATH >= 2 || _USE_LABEL || _FS_EXFAT\r
+/*-----------------------------------------------------------------------*/\r
+/* Read an object from the directory                                     */\r
+/*-----------------------------------------------------------------------*/\r
+\r
+static\r
+FRESULT dir_read (\r
+       DIR* dp,                /* Pointer to the directory object */\r
+       int vol                 /* Filtered by 0:file/directory or 1:volume label */\r
+)\r
+{\r
+       FRESULT res = FR_NO_FILE;\r
+       FATFS *fs = dp->obj.fs;\r
+       BYTE a, c;\r
+#if _USE_LFN != 0\r
+       BYTE ord = 0xFF, sum = 0xFF;\r
+#endif\r
+\r
+       while (dp->sect) {\r
+               res = move_window(fs, dp->sect);\r
                if (res != FR_OK) break;\r
-               dir = dp->dir;                                  /* Ptr to the directory entry of current index */\r
-               c = dir[DIR_Name];\r
-               if (c == 0) { res = FR_NO_FILE; break; }        /* Reached to end of table */\r
-#if _USE_LFN   /* LFN configuration */\r
-               a = dir[DIR_Attr] & AM_MASK;\r
-               if (c == DDE || ((a & AM_VOL) && a != AM_LFN)) {        /* An entry without valid data */\r
-                       ord = 0xFF; dp->lfn_idx = 0xFFFF;       /* Reset LFN sequence */\r
-               } else {\r
-                       if (a == AM_LFN) {                      /* An LFN entry is found */\r
-                               if (dp->lfn) {\r
-                                       if (c & LLE) {          /* Is it start of LFN sequence? */\r
-                                               sum = dir[LDIR_Chksum];\r
-                                               c &= ~LLE; ord = c;     /* LFN start order */\r
-                                               dp->lfn_idx = dp->index;        /* Start index of LFN */\r
+               c = dp->dir[DIR_Name];  /* Test for the entry type */\r
+               if (c == 0) { res = FR_NO_FILE; break; }        /* Reached to end of the directory */\r
+#if _FS_EXFAT\r
+               if (fs->fs_type == FS_EXFAT) {  /* On the exFAT volume */\r
+                       if (_USE_LABEL && vol) {\r
+                               if (c == 0x83) break;   /* Volume label entry? */\r
+                       } else {\r
+                               if (c == 0x85) {                /* Start of the file entry block? */\r
+                                       dp->blk_ofs = dp->dptr; /* Get location of the block */\r
+                                       res = load_xdir(dp);    /* Load the entry block */\r
+                                       if (res == FR_OK) {\r
+                                               dp->obj.attr = fs->dirbuf[XDIR_Attr] & AM_MASK; /* Get attribute */\r
                                        }\r
-                                       /* Check validity of the LFN entry and compare it with given name */\r
-                                       ord = (c == ord && sum == dir[LDIR_Chksum] && cmp_lfn(dp->lfn, dir)) ? ord - 1 : 0xFF;\r
+                                       break;\r
+                               }\r
+                       }\r
+               } else\r
+#endif\r
+               {       /* On the FAT12/16/32 volume */\r
+                       dp->obj.attr = a = dp->dir[DIR_Attr] & AM_MASK; /* Get attribute */\r
+#if _USE_LFN != 0      /* LFN configuration */\r
+                       if (c == DDEM || c == '.' || (int)((a & ~AM_ARC) == AM_VOL) != vol) {   /* An entry without valid data */\r
+                               ord = 0xFF;\r
+                       } else {\r
+                               if (a == AM_LFN) {                      /* An LFN entry is found */\r
+                                       if (c & LLEF) {                 /* Is it start of an LFN sequence? */\r
+                                               sum = dp->dir[LDIR_Chksum];\r
+                                               c &= (BYTE)~LLEF; ord = c;\r
+                                               dp->blk_ofs = dp->dptr;\r
+                                       }\r
+                                       /* Check LFN validity and capture it */\r
+                                       ord = (c == ord && sum == dp->dir[LDIR_Chksum] && pick_lfn(fs->lfnbuf, dp->dir)) ? ord - 1 : 0xFF;\r
+                               } else {                                        /* An SFN entry is found */\r
+                                       if (ord || sum != sum_sfn(dp->dir)) {   /* Is there a valid LFN? */\r
+                                               dp->blk_ofs = 0xFFFFFFFF;                       /* It has no LFN. */\r
+                                       }\r
+                                       break;\r
                                }\r
-                       } else {                                        /* An SFN entry is found */\r
-                               if (!ord && sum == sum_sfn(dir)) break; /* LFN matched? */\r
-                               if (!(dp->fn[NSFLAG] & NS_LOSS) && !mem_cmp(dir, dp->fn, 11)) break;    /* SFN matched? */\r
-                               ord = 0xFF; dp->lfn_idx = 0xFFFF;       /* Reset LFN sequence */\r
                        }\r
-               }\r
 #else          /* Non LFN configuration */\r
-               if (!(dir[DIR_Attr] & AM_VOL) && !mem_cmp(dir, dp->fn, 11)) /* Is it a valid entry? */\r
-                       break;\r
+                       if (c != DDEM && c != '.' && a != AM_LFN && (int)((a & ~AM_ARC) == AM_VOL) == vol) {    /* Is it a valid entry? */\r
+                               break;\r
+                       }\r
 #endif\r
+               }\r
                res = dir_next(dp, 0);          /* Next entry */\r
-       } while (res == FR_OK);\r
+               if (res != FR_OK) break;\r
+       }\r
 \r
+       if (res != FR_OK) dp->sect = 0;         /* Terminate the read operation on error or EOT */\r
        return res;\r
 }\r
 \r
+#endif /* _FS_MINIMIZE <= 1 || _USE_LABEL || _FS_RPATH >= 2 */\r
 \r
 \r
 \r
 /*-----------------------------------------------------------------------*/\r
-/* Read an object from the directory                                     */\r
+/* Directory handling - Find an object in the directory                  */\r
 /*-----------------------------------------------------------------------*/\r
-#if _FS_MINIMIZE <= 1 || _USE_LABEL || _FS_RPATH >= 2\r
+\r
 static\r
-FRESULT dir_read (\r
-       DIR* dp,                /* Pointer to the directory object */\r
-       int vol                 /* Filtered by 0:file/directory or 1:volume label */\r
+FRESULT dir_find (     /* FR_OK(0):succeeded, !=0:error */\r
+       DIR* dp                 /* Pointer to the directory object with the file name */\r
 )\r
 {\r
        FRESULT res;\r
-       BYTE a, c, *dir;\r
-#if _USE_LFN\r
-       BYTE ord = 0xFF, sum = 0xFF;\r
+       FATFS *fs = dp->obj.fs;\r
+       BYTE c;\r
+#if _USE_LFN != 0\r
+       BYTE a, ord, sum;\r
 #endif\r
 \r
-       res = FR_NO_FILE;\r
-       while (dp->sect) {\r
-               res = move_window(dp->fs, dp->sect);\r
+       res = dir_sdi(dp, 0);                   /* Rewind directory object */\r
+       if (res != FR_OK) return res;\r
+#if _FS_EXFAT\r
+       if (fs->fs_type == FS_EXFAT) {  /* On the exFAT volume */\r
+               BYTE nc;\r
+               UINT di, ni;\r
+               WORD hash = xname_sum(fs->lfnbuf);              /* Hash value of the name to find */\r
+\r
+               while ((res = dir_read(dp, 0)) == FR_OK) {      /* Read an item */\r
+                       if (ld_word(fs->dirbuf + XDIR_NameHash) != hash) continue;      /* Skip the comparison if hash value mismatched */\r
+                       for (nc = fs->dirbuf[XDIR_NumName], di = SZDIRE * 2, ni = 0; nc; nc--, di += 2, ni++) { /* Compare the name */\r
+                               if ((di % SZDIRE) == 0) di += 2;\r
+                               if (ff_wtoupper(ld_word(fs->dirbuf + di)) != ff_wtoupper(fs->lfnbuf[ni])) break;\r
+                       }\r
+                       if (nc == 0 && !fs->lfnbuf[ni]) break;  /* Name matched? */\r
+               }\r
+               return res;\r
+       }\r
+#endif\r
+       /* On the FAT12/16/32 volume */\r
+#if _USE_LFN != 0\r
+       ord = sum = 0xFF; dp->blk_ofs = 0xFFFFFFFF;     /* Reset LFN sequence */\r
+#endif\r
+       do {\r
+               res = move_window(fs, dp->sect);\r
                if (res != FR_OK) break;\r
-               dir = dp->dir;                                  /* Ptr to the directory entry of current index */\r
-               c = dir[DIR_Name];\r
+               c = dp->dir[DIR_Name];\r
                if (c == 0) { res = FR_NO_FILE; break; }        /* Reached to end of table */\r
-               a = dir[DIR_Attr] & AM_MASK;\r
-#if _USE_LFN   /* LFN configuration */\r
-               if (c == DDE || (!_FS_RPATH && c == '.') || (int)((a & ~AM_ARC) == AM_VOL) != vol) {    /* An entry without valid data */\r
-                       ord = 0xFF;\r
+#if _USE_LFN != 0      /* LFN configuration */\r
+               dp->obj.attr = a = dp->dir[DIR_Attr] & AM_MASK;\r
+               if (c == DDEM || ((a & AM_VOL) && a != AM_LFN)) {       /* An entry without valid data */\r
+                       ord = 0xFF; dp->blk_ofs = 0xFFFFFFFF;   /* Reset LFN sequence */\r
                } else {\r
                        if (a == AM_LFN) {                      /* An LFN entry is found */\r
-                               if (c & LLE) {                  /* Is it start of LFN sequence? */\r
-                                       sum = dir[LDIR_Chksum];\r
-                                       c &= ~LLE; ord = c;\r
-                                       dp->lfn_idx = dp->index;\r
+                               if (!(dp->fn[NSFLAG] & NS_NOLFN)) {\r
+                                       if (c & LLEF) {         /* Is it start of LFN sequence? */\r
+                                               sum = dp->dir[LDIR_Chksum];\r
+                                               c &= (BYTE)~LLEF; ord = c;      /* LFN start order */\r
+                                               dp->blk_ofs = dp->dptr; /* Start offset of LFN */\r
+                                       }\r
+                                       /* Check validity of the LFN entry and compare it with given name */\r
+                                       ord = (c == ord && sum == dp->dir[LDIR_Chksum] && cmp_lfn(fs->lfnbuf, dp->dir)) ? ord - 1 : 0xFF;\r
                                }\r
-                               /* Check LFN validity and capture it */\r
-                               ord = (c == ord && sum == dir[LDIR_Chksum] && pick_lfn(dp->lfn, dir)) ? ord - 1 : 0xFF;\r
                        } else {                                        /* An SFN entry is found */\r
-                               if (ord || sum != sum_sfn(dir)) /* Is there a valid LFN? */\r
-                                       dp->lfn_idx = 0xFFFF;           /* It has no LFN. */\r
-                               break;\r
+                               if (!ord && sum == sum_sfn(dp->dir)) break;     /* LFN matched? */\r
+                               if (!(dp->fn[NSFLAG] & NS_LOSS) && !mem_cmp(dp->dir, dp->fn, 11)) break;        /* SFN matched? */\r
+                               ord = 0xFF; dp->blk_ofs = 0xFFFFFFFF;   /* Reset LFN sequence */\r
                        }\r
                }\r
 #else          /* Non LFN configuration */\r
-               if (c != DDE && (_FS_RPATH || c != '.') && a != AM_LFN && (int)((a & ~AM_ARC) == AM_VOL) == vol)        /* Is it a valid entry? */\r
-                       break;\r
+               dp->obj.attr = dp->dir[DIR_Attr] & AM_MASK;\r
+               if (!(dp->dir[DIR_Attr] & AM_VOL) && !mem_cmp(dp->dir, dp->fn, 11)) break;      /* Is it a valid entry? */\r
 #endif\r
-               res = dir_next(dp, 0);                          /* Next entry */\r
-               if (res != FR_OK) break;\r
-       }\r
-\r
-       if (res != FR_OK) dp->sect = 0;\r
+               res = dir_next(dp, 0);  /* Next entry */\r
+       } while (res == FR_OK);\r
 \r
        return res;\r
 }\r
-#endif /* _FS_MINIMIZE <= 1 || _USE_LABEL || _FS_RPATH >= 2 */\r
 \r
 \r
 \r
 \r
+#if !_FS_READONLY\r
 /*-----------------------------------------------------------------------*/\r
 /* Register an object to the directory                                   */\r
 /*-----------------------------------------------------------------------*/\r
-#if !_FS_READONLY\r
+\r
 static\r
-FRESULT dir_register ( /* FR_OK:Successful, FR_DENIED:No free entry or too many SFN collision, FR_DISK_ERR:Disk error */\r
+FRESULT dir_register ( /* FR_OK:succeeded, FR_DENIED:no free entry or too many SFN collision, FR_DISK_ERR:disk error */\r
        DIR* dp                         /* Target directory with object name to be created */\r
 )\r
 {\r
        FRESULT res;\r
-#if _USE_LFN   /* LFN configuration */\r
-       UINT n, nent;\r
-       BYTE sn[12], *fn, sum;\r
-       WCHAR *lfn;\r
-\r
-\r
-       fn = dp->fn; lfn = dp->lfn;\r
-       mem_cpy(sn, fn, 12);\r
-\r
-       if (_FS_RPATH && (sn[NSFLAG] & NS_DOT))         /* Cannot create dot entry */\r
-               return FR_INVALID_NAME;\r
+       FATFS *fs = dp->obj.fs;\r
+#if _USE_LFN != 0      /* LFN configuration */\r
+       UINT n, nlen, nent;\r
+       BYTE sn[12], sum;\r
+\r
+\r
+       if (dp->fn[NSFLAG] & (NS_DOT | NS_NONAME)) return FR_INVALID_NAME;      /* Check name validity */\r
+       for (nlen = 0; fs->lfnbuf[nlen]; nlen++) ;      /* Get lfn length */\r
+\r
+#if _FS_EXFAT\r
+       if (fs->fs_type == FS_EXFAT) {  /* On the exFAT volume */\r
+               DIR dj;\r
+\r
+               nent = (nlen + 14) / 15 + 2;    /* Number of entries to allocate (85+C0+C1s) */\r
+               res = dir_alloc(dp, nent);              /* Allocate entries */\r
+               if (res != FR_OK) return res;\r
+               dp->blk_ofs = dp->dptr - SZDIRE * (nent - 1);                   /* Set block position */\r
+\r
+               if (dp->obj.sclust != 0 && (dp->obj.stat & 4)) {        /* Has the sub-directory been stretched? */\r
+                       dp->obj.stat &= 3;\r
+                       dp->obj.objsize += (DWORD)fs->csize * SS(fs);   /* Increase object size by cluster size */\r
+                       res = fill_fat_chain(&dp->obj); /* Complement FAT chain if needed */\r
+                       if (res != FR_OK) return res;\r
+                       res = load_obj_dir(&dj, &dp->obj);\r
+                       if (res != FR_OK) return res;   /* Load the object status */\r
+                       st_qword(fs->dirbuf + XDIR_FileSize, dp->obj.objsize);          /* Update the allocation status */\r
+                       st_qword(fs->dirbuf + XDIR_ValidFileSize, dp->obj.objsize);\r
+                       fs->dirbuf[XDIR_GenFlags] = dp->obj.stat | 1;\r
+                       res = store_xdir(&dj);                  /* Store the object status */\r
+                       if (res != FR_OK) return res;\r
+               }\r
 \r
+               create_xdir(fs->dirbuf, fs->lfnbuf);    /* Create on-memory directory block to be written later */\r
+               return FR_OK;\r
+       }\r
+#endif\r
+       /* On the FAT12/16/32 volume */\r
+       mem_cpy(sn, dp->fn, 12);\r
        if (sn[NSFLAG] & NS_LOSS) {                     /* When LFN is out of 8.3 format, generate a numbered name */\r
-               fn[NSFLAG] = 0; dp->lfn = 0;                    /* Find only SFN */\r
+               dp->fn[NSFLAG] = NS_NOLFN;              /* Find only SFN */\r
                for (n = 1; n < 100; n++) {\r
-                       gen_numname(fn, sn, lfn, n);    /* Generate a numbered name */\r
+                       gen_numname(dp->fn, sn, fs->lfnbuf, n); /* Generate a numbered name */\r
                        res = dir_find(dp);                             /* Check if the name collides with existing SFN */\r
                        if (res != FR_OK) break;\r
                }\r
                if (n == 100) return FR_DENIED;         /* Abort if too many collisions */\r
                if (res != FR_NO_FILE) return res;      /* Abort if the result is other than 'not collided' */\r
-               fn[NSFLAG] = sn[NSFLAG]; dp->lfn = lfn;\r
+               dp->fn[NSFLAG] = sn[NSFLAG];\r
        }\r
 \r
-       if (sn[NSFLAG] & NS_LFN) {                      /* When LFN is to be created, allocate entries for an SFN + LFNs. */\r
-               for (n = 0; lfn[n]; n++) ;\r
-               nent = (n + 25) / 13;\r
-       } else {                                                /* Otherwise allocate an entry for an SFN  */\r
-               nent = 1;\r
-       }\r
+       /* Create an SFN with/without LFNs. */\r
+       nent = (sn[NSFLAG] & NS_LFN) ? (nlen + 12) / 13 + 1 : 1;        /* Number of entries to allocate */\r
        res = dir_alloc(dp, nent);              /* Allocate entries */\r
-\r
        if (res == FR_OK && --nent) {   /* Set LFN entry if needed */\r
-               res = dir_sdi(dp, dp->index - nent);\r
+               res = dir_sdi(dp, dp->dptr - nent * SZDIRE);\r
                if (res == FR_OK) {\r
-                       sum = sum_sfn(dp->fn);  /* Sum value of the SFN tied to the LFN */\r
+                       sum = sum_sfn(dp->fn);  /* Checksum value of the SFN tied to the LFN */\r
                        do {                                    /* Store LFN entries in bottom first */\r
-                               res = move_window(dp->fs, dp->sect);\r
+                               res = move_window(fs, dp->sect);\r
                                if (res != FR_OK) break;\r
-                               fit_lfn(dp->lfn, dp->dir, (BYTE)nent, sum);\r
-                               dp->fs->wflag = 1;\r
+                               put_lfn(fs->lfnbuf, dp->dir, (BYTE)nent, sum);\r
+                               fs->wflag = 1;\r
                                res = dir_next(dp, 0);  /* Next entry */\r
                        } while (res == FR_OK && --nent);\r
                }\r
        }\r
+\r
 #else  /* Non LFN configuration */\r
        res = dir_alloc(dp, 1);         /* Allocate an entry for SFN */\r
+\r
 #endif\r
 \r
-       if (res == FR_OK) {                             /* Set SFN entry */\r
-               res = move_window(dp->fs, dp->sect);\r
+       /* Set SFN entry */\r
+       if (res == FR_OK) {\r
+               res = move_window(fs, dp->sect);\r
                if (res == FR_OK) {\r
-                       mem_set(dp->dir, 0, SZ_DIR);    /* Clean the entry */\r
-                       mem_cpy(dp->dir, dp->fn, 11);   /* Put SFN */\r
-#if _USE_LFN\r
+                       mem_set(dp->dir, 0, SZDIRE);    /* Clean the entry */\r
+                       mem_cpy(dp->dir + DIR_Name, dp->fn, 11);        /* Put SFN */\r
+#if _USE_LFN != 0\r
                        dp->dir[DIR_NTres] = dp->fn[NSFLAG] & (NS_BODY | NS_EXT);       /* Put NT flag */\r
 #endif\r
-                       dp->fs->wflag = 1;\r
+                       fs->wflag = 1;\r
                }\r
        }\r
 \r
        return res;\r
 }\r
-#endif /* !_FS_READONLY */\r
 \r
+#endif /* !_FS_READONLY */\r
 \r
 \r
 \r
+#if !_FS_READONLY && _FS_MINIMIZE == 0\r
 /*-----------------------------------------------------------------------*/\r
 /* Remove an object from the directory                                   */\r
 /*-----------------------------------------------------------------------*/\r
-#if !_FS_READONLY && !_FS_MINIMIZE\r
+\r
 static\r
-FRESULT dir_remove (   /* FR_OK: Successful, FR_DISK_ERR: A disk error */\r
+FRESULT dir_remove (   /* FR_OK:Succeeded, FR_DISK_ERR:A disk error */\r
        DIR* dp                         /* Directory object pointing the entry to be removed */\r
 )\r
 {\r
        FRESULT res;\r
-#if _USE_LFN   /* LFN configuration */\r
-       UINT i;\r
+       FATFS *fs = dp->obj.fs;\r
+#if _USE_LFN != 0      /* LFN configuration */\r
+       DWORD last = dp->dptr;\r
 \r
-       i = dp->index;  /* SFN index */\r
-       res = dir_sdi(dp, (dp->lfn_idx == 0xFFFF) ? i : dp->lfn_idx);   /* Goto the SFN or top of the LFN entries */\r
+       res = (dp->blk_ofs == 0xFFFFFFFF) ? FR_OK : dir_sdi(dp, dp->blk_ofs);   /* Goto top of the entry block if LFN is exist */\r
        if (res == FR_OK) {\r
                do {\r
-                       res = move_window(dp->fs, dp->sect);\r
+                       res = move_window(fs, dp->sect);\r
                        if (res != FR_OK) break;\r
-                       mem_set(dp->dir, 0, SZ_DIR);    /* Clear and mark the entry "deleted" */\r
-                       *dp->dir = DDE;\r
-                       dp->fs->wflag = 1;\r
-                       if (dp->index >= i) break;      /* When reached SFN, all entries of the object has been deleted. */\r
-                       res = dir_next(dp, 0);          /* Next entry */\r
+                       /* Mark an entry 'deleted' */\r
+                       if (_FS_EXFAT && fs->fs_type == FS_EXFAT) {     /* On the exFAT volume */\r
+                               dp->dir[XDIR_Type] &= 0x7F;\r
+                       } else {                                                                        /* On the FAT12/16/32 volume */\r
+                               dp->dir[DIR_Name] = DDEM;\r
+                       }\r
+                       fs->wflag = 1;\r
+                       if (dp->dptr >= last) break;    /* If reached last entry then all entries of the object has been deleted. */\r
+                       res = dir_next(dp, 0);  /* Next entry */\r
                } while (res == FR_OK);\r
                if (res == FR_NO_FILE) res = FR_INT_ERR;\r
        }\r
-\r
 #else                  /* Non LFN configuration */\r
-       res = dir_sdi(dp, dp->index);\r
+\r
+       res = move_window(fs, dp->sect);\r
        if (res == FR_OK) {\r
-               res = move_window(dp->fs, dp->sect);\r
-               if (res == FR_OK) {\r
-                       mem_set(dp->dir, 0, SZ_DIR);    /* Clear and mark the entry "deleted" */\r
-                       *dp->dir = DDE;\r
-                       dp->fs->wflag = 1;\r
-               }\r
+               dp->dir[DIR_Name] = DDEM;\r
+               fs->wflag = 1;\r
        }\r
 #endif\r
 \r
        return res;\r
 }\r
-#endif /* !_FS_READONLY */\r
 \r
+#endif /* !_FS_READONLY && _FS_MINIMIZE == 0 */\r
 \r
 \r
 \r
+#if _FS_MINIMIZE <= 1 || _FS_RPATH >= 2\r
 /*-----------------------------------------------------------------------*/\r
 /* Get file information from directory entry                             */\r
 /*-----------------------------------------------------------------------*/\r
-#if _FS_MINIMIZE <= 1 || _FS_RPATH >= 2\r
+\r
 static\r
 void get_fileinfo (            /* No return code */\r
        DIR* dp,                        /* Pointer to the directory object */\r
        FILINFO* fno            /* Pointer to the file information to be filled */\r
 )\r
 {\r
-       UINT i;\r
-       TCHAR *p, c;\r
+       UINT i, j;\r
+       TCHAR c;\r
+       DWORD tm;\r
+#if _USE_LFN != 0\r
+       WCHAR w, lfv;\r
+       FATFS *fs = dp->obj.fs;\r
+#endif\r
 \r
 \r
-       p = fno->fname;\r
-       if (dp->sect) {         /* Get SFN */\r
-               BYTE *dir = dp->dir;\r
+       fno->fname[0] = 0;              /* Invaidate file info */\r
+       if (!dp->sect) return;  /* Exit if read pointer has reached end of directory */\r
 \r
-               i = 0;\r
-               while (i < 11) {                /* Copy name body and extension */\r
-                       c = (TCHAR)dir[i++];\r
-                       if (c == ' ') continue;                 /* Skip padding spaces */\r
-                       if (c == NDDE) c = (TCHAR)DDE;  /* Restore replaced DDE character */\r
-                       if (i == 9) *p++ = '.';                 /* Insert a . if extension is exist */\r
-#if _USE_LFN\r
-                       if (IsUpper(c) && (dir[DIR_NTres] & (i >= 9 ? NS_EXT : NS_BODY)))\r
-                               c += 0x20;                      /* To lower */\r
-#if _LFN_UNICODE\r
-                       if (IsDBCS1(c) && i != 8 && i != 11 && IsDBCS2(dir[i]))\r
-                               c = c << 8 | dir[i++];\r
-                       c = ff_convert(c, 1);   /* OEM -> Unicode */\r
-                       if (!c) c = '?';\r
+#if _USE_LFN != 0      /* LFN configuration */\r
+#if _FS_EXFAT\r
+       if (fs->fs_type == FS_EXFAT) {  /* On the exFAT volume */\r
+               get_xdir_info(fs->dirbuf, fno);\r
+               return;\r
+       } else\r
 #endif\r
+       {       /* On the FAT12/16/32 volume */\r
+               if (dp->blk_ofs != 0xFFFFFFFF) {        /* Get LFN if available */\r
+                       i = j = 0;\r
+                       while ((w = fs->lfnbuf[j++]) != 0) {    /* Get an LFN character */\r
+#if !_LFN_UNICODE\r
+                               w = ff_convert(w, 0);           /* Unicode -> OEM */\r
+                               if (w == 0) { i = 0; break; }   /* No LFN if it could not be converted */\r
+                               if (_DF1S && w >= 0x100) {      /* Put 1st byte if it is a DBC (always false at SBCS cfg) */\r
+                                       fno->fname[i++] = (char)(w >> 8);\r
+                               }\r
 #endif\r
-                       *p++ = c;\r
+                               if (i >= _MAX_LFN) { i = 0; break; }    /* No LFN if buffer overflow */\r
+                               fno->fname[i++] = (TCHAR)w;\r
+                       }\r
+                       fno->fname[i] = 0;      /* Terminate the LFN */\r
                }\r
-               fno->fattrib = dir[DIR_Attr];                           /* Attribute */\r
-               fno->fsize = LD_DWORD(dir+DIR_FileSize);        /* Size */\r
-               fno->fdate = LD_WORD(dir+DIR_WrtDate);          /* Date */\r
-               fno->ftime = LD_WORD(dir+DIR_WrtTime);          /* Time */\r
        }\r
-       *p = 0;         /* Terminate SFN string by a \0 */\r
 \r
-#if _USE_LFN\r
-       if (fno->lfname) {\r
-               WCHAR w, *lfn;\r
-\r
-               i = 0; p = fno->lfname;\r
-               if (dp->sect && fno->lfsize && dp->lfn_idx != 0xFFFF) { /* Get LFN if available */\r
-                       lfn = dp->lfn;\r
-                       while ((w = *lfn++) != 0) {             /* Get an LFN character */\r
-#if !_LFN_UNICODE\r
-                               w = ff_convert(w, 0);           /* Unicode -> OEM */\r
-                               if (!w) { i = 0; break; }       /* No LFN if it could not be converted */\r
-                               if (_DF1S && w >= 0x100)        /* Put 1st byte if it is a DBC (always false on SBCS cfg) */\r
-                                       p[i++] = (TCHAR)(w >> 8);\r
+       i = j = 0;\r
+       lfv = fno->fname[i];    /* LFN is exist if non-zero */\r
+       while (i < 11) {                /* Copy name body and extension */\r
+               c = (TCHAR)dp->dir[i++];\r
+               if (c == ' ') continue;                         /* Skip padding spaces */\r
+               if (c == RDDEM) c = (TCHAR)DDEM;        /* Restore replaced DDEM character */\r
+               if (i == 9) {                                           /* Insert a . if extension is exist */\r
+                       if (!lfv) fno->fname[j] = '.';\r
+                       fno->altname[j++] = '.';\r
+               }\r
+#if _LFN_UNICODE\r
+               if (IsDBCS1(c) && i != 8 && i != 11 && IsDBCS2(dp->dir[i])) {\r
+                       c = c << 8 | dp->dir[i++];\r
+               }\r
+               c = ff_convert(c, 1);   /* OEM -> Unicode */\r
+               if (!c) c = '?';\r
 #endif\r
-                               if (i >= fno->lfsize - 1) { i = 0; break; }     /* No LFN if buffer overflow */\r
-                               p[i++] = (TCHAR)w;\r
+               fno->altname[j] = c;\r
+               if (!lfv) {\r
+                       if (IsUpper(c) && (dp->dir[DIR_NTres] & (i >= 9 ? NS_EXT : NS_BODY))) {\r
+                               c += 0x20;                      /* To lower */\r
                        }\r
+                       fno->fname[j] = c;\r
                }\r
-               p[i] = 0;       /* Terminate LFN string by a \0 */\r
+               j++;\r
        }\r
+       if (!lfv) {\r
+               fno->fname[j] = 0;\r
+               if (!dp->dir[DIR_NTres]) j = 0; /* Altname is no longer needed if neither LFN nor case info is exist. */\r
+       }\r
+       fno->altname[j] = 0;    /* Terminate the SFN */\r
+\r
+#else  /* Non-LFN configuration */\r
+       i = j = 0;\r
+       while (i < 11) {                /* Copy name body and extension */\r
+               c = (TCHAR)dp->dir[i++];\r
+               if (c == ' ') continue;                         /* Skip padding spaces */\r
+               if (c == RDDEM) c = (TCHAR)DDEM;        /* Restore replaced DDEM character */\r
+               if (i == 9) fno->fname[j++] = '.';      /* Insert a . if extension is exist */\r
+               fno->fname[j++] = c;\r
+       }\r
+       fno->fname[j] = 0;\r
 #endif\r
+\r
+       fno->fattrib = dp->dir[DIR_Attr];                               /* Attribute */\r
+       fno->fsize = ld_dword(dp->dir + DIR_FileSize);  /* Size */\r
+       tm = ld_dword(dp->dir + DIR_ModTime);                   /* Timestamp */\r
+       fno->ftime = (WORD)tm; fno->fdate = (WORD)(tm >> 16);\r
 }\r
-#endif /* _FS_MINIMIZE <= 1 || _FS_RPATH >= 2*/\r
 \r
+#endif /* _FS_MINIMIZE <= 1 || _FS_RPATH >= 2 */\r
 \r
 \r
 \r
+#if _USE_FIND && _FS_MINIMIZE <= 1\r
 /*-----------------------------------------------------------------------*/\r
-/* Pick a segment and create the object name in directory form           */\r
+/* Pattern matching                                                      */\r
 /*-----------------------------------------------------------------------*/\r
 \r
 static\r
-FRESULT create_name (\r
+WCHAR get_achar (              /* Get a character and advances ptr 1 or 2 */\r
+       const TCHAR** ptr       /* Pointer to pointer to the SBCS/DBCS/Unicode string */\r
+)\r
+{\r
+#if !_LFN_UNICODE\r
+       WCHAR chr;\r
+\r
+       chr = (BYTE)*(*ptr)++;                                  /* Get a byte */\r
+       if (IsLower(chr)) chr -= 0x20;                  /* To upper ASCII char */\r
+#ifdef _EXCVT\r
+       if (chr >= 0x80) chr = ExCvt[chr - 0x80];       /* To upper SBCS extended char */\r
+#else\r
+       if (IsDBCS1(chr) && IsDBCS2(**ptr)) {           /* Get DBC 2nd byte if needed */\r
+               chr = chr << 8 | (BYTE)*(*ptr)++;\r
+       }\r
+#endif\r
+       return chr;\r
+#else\r
+       return ff_wtoupper(*(*ptr)++);                  /* Get a word and to upper */\r
+#endif\r
+}\r
+\r
+\r
+static\r
+int pattern_matching ( /* 0:not matched, 1:matched */\r
+       const TCHAR* pat,       /* Matching pattern */\r
+       const TCHAR* nam,       /* String to be tested */\r
+       int skip,                       /* Number of pre-skip chars (number of ?s) */\r
+       int inf                         /* Infinite search (* specified) */\r
+)\r
+{\r
+       const TCHAR *pp, *np;\r
+       WCHAR pc, nc;\r
+       int nm, nx;\r
+\r
+\r
+       while (skip--) {                                /* Pre-skip name chars */\r
+               if (!get_achar(&nam)) return 0; /* Branch mismatched if less name chars */\r
+       }\r
+       if (!*pat && inf) return 1;             /* (short circuit) */\r
+\r
+       do {\r
+               pp = pat; np = nam;                     /* Top of pattern and name to match */\r
+               for (;;) {\r
+                       if (*pp == '?' || *pp == '*') { /* Wildcard? */\r
+                               nm = nx = 0;\r
+                               do {                            /* Analyze the wildcard chars */\r
+                                       if (*pp++ == '?') nm++; else nx = 1;\r
+                               } while (*pp == '?' || *pp == '*');\r
+                               if (pattern_matching(pp, np, nm, nx)) return 1; /* Test new branch (recurs upto number of wildcard blocks in the pattern) */\r
+                               nc = *np; break;        /* Branch mismatched */\r
+                       }\r
+                       pc = get_achar(&pp);    /* Get a pattern char */\r
+                       nc = get_achar(&np);    /* Get a name char */\r
+                       if (pc != nc) break;    /* Branch mismatched? */\r
+                       if (pc == 0) return 1;  /* Branch matched? (matched at end of both strings) */\r
+               }\r
+               get_achar(&nam);                        /* nam++ */\r
+       } while (inf && nc);                    /* Retry until end of name if infinite search is specified */\r
+\r
+       return 0;\r
+}\r
+\r
+#endif /* _USE_FIND && _FS_MINIMIZE <= 1 */\r
+\r
+\r
+\r
+/*-----------------------------------------------------------------------*/\r
+/* Pick a top segment and create the object name in directory form       */\r
+/*-----------------------------------------------------------------------*/\r
+\r
+static\r
+FRESULT create_name (  /* FR_OK: successful, FR_INVALID_NAME: could not create */\r
        DIR* dp,                        /* Pointer to the directory object */\r
        const TCHAR** path      /* Pointer to pointer to the segment in the path string */\r
 )\r
 {\r
-#if _USE_LFN   /* LFN configuration */\r
+#if _USE_LFN != 0      /* LFN configuration */\r
        BYTE b, cf;\r
        WCHAR w, *lfn;\r
        UINT i, ni, si, di;\r
        const TCHAR *p;\r
 \r
        /* Create LFN in Unicode */\r
-       for (p = *path; *p == '/' || *p == '\\'; p++) ; /* Strip duplicated separator */\r
-       lfn = dp->lfn;\r
-       si = di = 0;\r
+       p = *path; lfn = dp->obj.fs->lfnbuf; si = di = 0;\r
        for (;;) {\r
                w = p[si++];                                    /* Get a character */\r
-               if (w < ' ' || w == '/' || w == '\\') break;    /* Break on end of segment */\r
-               if (di >= _MAX_LFN)                             /* Reject too long name */\r
-                       return FR_INVALID_NAME;\r
+               if (w < ' ') break;                             /* Break if end of the path name */\r
+               if (w == '/' || w == '\\') {    /* Break if a separator is found */\r
+                       while (p[si] == '/' || p[si] == '\\') si++;     /* Skip duplicated separator if exist */\r
+                       break;\r
+               }\r
+               if (di >= _MAX_LFN) return FR_INVALID_NAME;     /* Reject too long name */\r
 #if !_LFN_UNICODE\r
                w &= 0xFF;\r
                if (IsDBCS1(w)) {                               /* Check if it is a DBC 1st byte (always false on SBCS cfg) */\r
                        b = (BYTE)p[si++];                      /* Get 2nd byte */\r
-                       if (!IsDBCS2(b))\r
-                               return FR_INVALID_NAME; /* Reject invalid sequence */\r
                        w = (w << 8) + b;                       /* Create a DBC */\r
+                       if (!IsDBCS2(b)) return FR_INVALID_NAME;        /* Reject invalid sequence */\r
                }\r
                w = ff_convert(w, 1);                   /* Convert ANSI/OEM to Unicode */\r
                if (!w) return FR_INVALID_NAME; /* Reject invalid code */\r
 #endif\r
-               if (w < 0x80 && chk_chr("\"*:<>\?|\x7F", w)) /* Reject illegal characters for LFN */\r
-                       return FR_INVALID_NAME;\r
+               if (w < 0x80 && chk_chr("\"*:<>\?|\x7F", w)) return FR_INVALID_NAME;    /* Reject illegal characters for LFN */\r
                lfn[di++] = w;                                  /* Store the Unicode character */\r
        }\r
        *path = &p[si];                                         /* Return pointer to the next segment */\r
-       cf = (w < ' ') ? NS_LAST : 0;           /* Set last segment flag if end of path */\r
-#if _FS_RPATH\r
-       if ((di == 1 && lfn[di-1] == '.') || /* Is this a dot entry? */\r
-               (di == 2 && lfn[di-1] == '.' && lfn[di-2] == '.')) {\r
+       cf = (w < ' ') ? NS_LAST : 0;           /* Set last segment flag if end of the path */\r
+#if _FS_RPATH != 0\r
+       if ((di == 1 && lfn[di - 1] == '.') ||\r
+               (di == 2 && lfn[di - 1] == '.' && lfn[di - 2] == '.')) {        /* Is this segment a dot name? */\r
                lfn[di] = 0;\r
-               for (i = 0; i < 11; i++)\r
+               for (i = 0; i < 11; i++)                /* Create dot name for SFN entry */\r
                        dp->fn[i] = (i < di) ? '.' : ' ';\r
                dp->fn[i] = cf | NS_DOT;                /* This is a dot entry */\r
                return FR_OK;\r
        }\r
 #endif\r
-       while (di) {                                            /* Strip trailing spaces and dots */\r
-               w = lfn[di-1];\r
+       while (di) {                                            /* Snip off trailing spaces and dots if exist */\r
+               w = lfn[di - 1];\r
                if (w != ' ' && w != '.') break;\r
                di--;\r
        }\r
-       if (!di) return FR_INVALID_NAME;        /* Reject nul string */\r
-\r
        lfn[di] = 0;                                            /* LFN is created */\r
+       if (di == 0) return FR_INVALID_NAME;    /* Reject nul name */\r
 \r
        /* Create SFN in directory form */\r
        mem_set(dp->fn, ' ', 11);\r
@@ -1884,7 +2627,7 @@ FRESULT create_name (
        if (si) cf |= NS_LOSS | NS_LFN;\r
        while (di && lfn[di - 1] != '.') di--;  /* Find extension (di<=si: no extension) */\r
 \r
-       b = i = 0; ni = 8;\r
+       i = b = 0; ni = 8;\r
        for (;;) {\r
                w = lfn[si++];                                  /* Get an LFN character */\r
                if (!w) break;                                  /* Break on end of the LFN */\r
@@ -1912,12 +2655,12 @@ FRESULT create_name (
                        cf |= NS_LFN;                           /* Force create LFN entry */\r
                }\r
 \r
-               if (_DF1S && w >= 0x100) {              /* Double byte character (always false on SBCS cfg) */\r
+               if (_DF1S && w >= 0x100) {              /* Is this DBC? (always false at SBCS cfg) */\r
                        if (i >= ni - 1) {\r
                                cf |= NS_LOSS | NS_LFN; i = ni; continue;\r
                        }\r
                        dp->fn[i++] = (BYTE)(w >> 8);\r
-               } else {                                                /* Single byte character */\r
+               } else {                                                /* SBC */\r
                        if (!w || chk_chr("+,;=[]", w)) {       /* Replace illegal characters for SFN */\r
                                w = '_'; cf |= NS_LOSS | NS_LFN;/* Lossy conversion */\r
                        } else {\r
@@ -1933,11 +2676,10 @@ FRESULT create_name (
                dp->fn[i++] = (BYTE)w;\r
        }\r
 \r
-       if (dp->fn[0] == DDE) dp->fn[0] = NDDE; /* If the first character collides with deleted mark, replace it with 0x05 */\r
+       if (dp->fn[0] == DDEM) dp->fn[0] = RDDEM;       /* If the first character collides with DDEM, replace it with RDDEM */\r
 \r
        if (ni == 8) b <<= 2;\r
-       if ((b & 0x0C) == 0x0C || (b & 0x03) == 0x03)   /* Create LFN entry when there are composite capitals */\r
-               cf |= NS_LFN;\r
+       if ((b & 0x0C) == 0x0C || (b & 0x03) == 0x03) cf |= NS_LFN;     /* Create LFN entry when there are composite capitals */\r
        if (!(cf & NS_LFN)) {                                           /* When LFN is in 8.3 format without extended character, NT flags are created */\r
                if ((b & 0x03) == 0x01) cf |= NS_EXT;   /* NT flag (Extension has only small capital) */\r
                if ((b & 0x0C) == 0x04) cf |= NS_BODY;  /* NT flag (Filename has only small capital) */\r
@@ -1948,17 +2690,16 @@ FRESULT create_name (
        return FR_OK;\r
 \r
 \r
-#else  /* Non-LFN configuration */\r
-       BYTE b, c, d, *sfn;\r
+#else  /* _USE_LFN != 0 : Non-LFN configuration */\r
+       BYTE c, d, *sfn;\r
        UINT ni, si, i;\r
        const char *p;\r
 \r
        /* Create file name in directory form */\r
-       for (p = *path; *p == '/' || *p == '\\'; p++) ; /* Strip duplicated separator */\r
-       sfn = dp->fn;\r
+       p = *path; sfn = dp->fn;\r
        mem_set(sfn, ' ', 11);\r
-       si = i = b = 0; ni = 8;\r
-#if _FS_RPATH\r
+       si = i = 0; ni = 8;\r
+#if _FS_RPATH != 0\r
        if (p[si] == '.') { /* Is this a dot entry? */\r
                for (;;) {\r
                        c = (BYTE)p[si++];\r
@@ -1966,62 +2707,51 @@ FRESULT create_name (
                        sfn[i++] = c;\r
                }\r
                if (c != '/' && c != '\\' && c > ' ') return FR_INVALID_NAME;\r
-               *path = &p[si];                                                                 /* Return pointer to the next segment */\r
-               sfn[NSFLAG] = (c <= ' ') ? NS_LAST | NS_DOT : NS_DOT;   /* Set last segment flag if end of path */\r
+               *path = p + si;                                                         /* Return pointer to the next segment */\r
+               sfn[NSFLAG] = (c <= ' ') ? NS_LAST | NS_DOT : NS_DOT;   /* Set last segment flag if end of the path */\r
                return FR_OK;\r
        }\r
 #endif\r
        for (;;) {\r
                c = (BYTE)p[si++];\r
-               if (c <= ' ' || c == '/' || c == '\\') break;   /* Break on end of segment */\r
-               if (c == '.' || i >= ni) {\r
-                       if (ni != 8 || c != '.') return FR_INVALID_NAME;\r
-                       i = 8; ni = 11;\r
-                       b <<= 2; continue;\r
+               if (c <= ' ') break;                    /* Break if end of the path name */\r
+               if (c == '/' || c == '\\') {    /* Break if a separator is found */\r
+                       while (p[si] == '/' || p[si] == '\\') si++;     /* Skip duplicated separator if exist */\r
+                       break;\r
+               }\r
+               if (c == '.' || i >= ni) {              /* End of body or over size? */\r
+                       if (ni == 11 || c != '.') return FR_INVALID_NAME;       /* Over size or invalid dot */\r
+                       i = 8; ni = 11;                         /* Goto extension */\r
+                       continue;\r
                }\r
                if (c >= 0x80) {                                /* Extended character? */\r
-                       b |= 3;                                         /* Eliminate NT flag */\r
 #ifdef _EXCVT\r
                        c = ExCvt[c - 0x80];            /* To upper extended characters (SBCS cfg) */\r
 #else\r
 #if !_DF1S\r
-                       return FR_INVALID_NAME;         /* Reject extended characters (ASCII cfg) */\r
+                       return FR_INVALID_NAME;         /* Reject extended characters (ASCII only cfg) */\r
 #endif\r
 #endif\r
                }\r
-               if (IsDBCS1(c)) {                               /* Check if it is a DBC 1st byte (always false on SBCS cfg) */\r
+               if (IsDBCS1(c)) {                               /* Check if it is a DBC 1st byte (always false at SBCS cfg.) */\r
                        d = (BYTE)p[si++];                      /* Get 2nd byte */\r
-                       if (!IsDBCS2(d) || i >= ni - 1) /* Reject invalid DBC */\r
-                               return FR_INVALID_NAME;\r
+                       if (!IsDBCS2(d) || i >= ni - 1) return FR_INVALID_NAME; /* Reject invalid DBC */\r
                        sfn[i++] = c;\r
                        sfn[i++] = d;\r
-               } else {                                                /* Single byte code */\r
-                       if (chk_chr("\"*+,:;<=>\?[]|\x7F", c))  /* Reject illegal chrs for SFN */\r
-                               return FR_INVALID_NAME;\r
-                       if (IsUpper(c)) {                       /* ASCII large capital? */\r
-                               b |= 2;\r
-                       } else {\r
-                               if (IsLower(c)) {               /* ASCII small capital? */\r
-                                       b |= 1; c -= 0x20;\r
-                               }\r
-                       }\r
+               } else {                                                /* SBC */\r
+                       if (chk_chr("\"*+,:;<=>\?[]|\x7F", c)) return FR_INVALID_NAME;  /* Reject illegal chrs for SFN */\r
+                       if (IsLower(c)) c -= 0x20;      /* To upper */\r
                        sfn[i++] = c;\r
                }\r
        }\r
-       *path = &p[si];                                         /* Return pointer to the next segment */\r
-       c = (c <= ' ') ? NS_LAST : 0;           /* Set last segment flag if end of path */\r
+       *path = p + si;                                         /* Return pointer to the next segment */\r
+       if (i == 0) return FR_INVALID_NAME;     /* Reject nul string */\r
 \r
-       if (!i) return FR_INVALID_NAME;         /* Reject nul string */\r
-       if (sfn[0] == DDE) sfn[0] = NDDE;       /* When first character collides with DDE, replace it with 0x05 */\r
-\r
-       if (ni == 8) b <<= 2;\r
-       if ((b & 0x03) == 0x01) c |= NS_EXT;    /* NT flag (Name extension has only small capital) */\r
-       if ((b & 0x0C) == 0x04) c |= NS_BODY;   /* NT flag (Name body has only small capital) */\r
-\r
-       sfn[NSFLAG] = c;                /* Store NT flag, File name is created */\r
+       if (sfn[0] == DDEM) sfn[0] = RDDEM;     /* If the first character collides with DDEM, replace it with RDDEM */\r
+       sfn[NSFLAG] = (c <= ' ') ? NS_LAST : 0;         /* Set last segment flag if end of the path */\r
 \r
        return FR_OK;\r
-#endif\r
+#endif /* _USE_LFN != 0 */\r
 }\r
 \r
 \r
@@ -2038,36 +2768,50 @@ FRESULT follow_path (   /* FR_OK(0): successful, !=0: error code */
 )\r
 {\r
        FRESULT res;\r
-       BYTE *dir, ns;\r
+       BYTE ns;\r
+       _FDID *obj = &dp->obj;\r
+       FATFS *fs = obj->fs;\r
 \r
 \r
-#if _FS_RPATH\r
-       if (*path == '/' || *path == '\\') {    /* There is a heading separator */\r
-               path++; dp->sclust = 0;                         /* Strip it and start from the root directory */\r
-       } else {                                                                /* No heading separator */\r
-               dp->sclust = dp->fs->cdir;                      /* Start from the current directory */\r
+#if _FS_RPATH != 0\r
+       if (*path != '/' && *path != '\\') {    /* Without heading separator */\r
+               obj->sclust = fs->cdir;                         /* Start from the current directory */\r
+       } else\r
+#endif\r
+       {                                                                               /* With heading separator */\r
+               while (*path == '/' || *path == '\\') path++;   /* Strip heading separator */\r
+               obj->sclust = 0;                                        /* Start from the root directory */\r
+       }\r
+#if _FS_EXFAT && _FS_RPATH != 0\r
+       if (fs->fs_type == FS_EXFAT && obj->sclust) {   /* Retrieve the sub-directory status if needed */\r
+               DIR dj;\r
+\r
+               obj->c_scl = fs->cdc_scl;\r
+               obj->c_size = fs->cdc_size;\r
+               obj->c_ofs = fs->cdc_ofs;\r
+               res = load_obj_dir(&dj, obj);\r
+               if (res != FR_OK) return res;\r
+               obj->objsize = ld_dword(fs->dirbuf + XDIR_FileSize);\r
+               obj->stat = fs->dirbuf[XDIR_GenFlags] & 2;\r
        }\r
-#else\r
-       if (*path == '/' || *path == '\\')              /* Strip heading separator if exist */\r
-               path++;\r
-       dp->sclust = 0;                                                 /* Always start from the root directory */\r
 #endif\r
 \r
        if ((UINT)*path < ' ') {                                /* Null path name is the origin directory itself */\r
+               dp->fn[NSFLAG] = NS_NONAME;\r
                res = dir_sdi(dp, 0);\r
-               dp->dir = 0;\r
+\r
        } else {                                                                /* Follow path */\r
                for (;;) {\r
                        res = create_name(dp, &path);   /* Get a segment name of the path */\r
                        if (res != FR_OK) break;\r
-                       res = dir_find(dp);                             /* Find an object with the sagment name */\r
+                       res = dir_find(dp);                             /* Find an object with the segment name */\r
                        ns = dp->fn[NSFLAG];\r
                        if (res != FR_OK) {                             /* Failed to find the object */\r
                                if (res == FR_NO_FILE) {        /* Object is not found */\r
-                                       if (_FS_RPATH && (ns & NS_DOT)) {       /* If dot entry is not exist, */\r
-                                               dp->sclust = 0; dp->dir = 0;    /* it is the root directory and stay there */\r
+                                       if (_FS_RPATH && (ns & NS_DOT)) {       /* If dot entry is not exist, stay there */\r
                                                if (!(ns & NS_LAST)) continue;  /* Continue to follow if not last segment */\r
-                                               res = FR_OK;                                    /* Ended at the root directroy. Function completed. */\r
+                                               dp->fn[NSFLAG] = NS_NONAME;\r
+                                               res = FR_OK;\r
                                        } else {                                                        /* Could not find the object */\r
                                                if (!(ns & NS_LAST)) res = FR_NO_PATH;  /* Adjust error code if not last segment */\r
                                        }\r
@@ -2075,11 +2819,23 @@ FRESULT follow_path (   /* FR_OK(0): successful, !=0: error code */
                                break;\r
                        }\r
                        if (ns & NS_LAST) break;                        /* Last segment matched. Function completed. */\r
-                       dir = dp->dir;                                          /* Follow the sub-directory */\r
-                       if (!(dir[DIR_Attr] & AM_DIR)) {        /* It is not a sub-directory and cannot follow */\r
+                       /* Get into the sub-directory */\r
+                       if (!(obj->attr & AM_DIR)) {            /* It is not a sub-directory and cannot follow */\r
                                res = FR_NO_PATH; break;\r
                        }\r
-                       dp->sclust = ld_clust(dp->fs, dir);\r
+#if _FS_EXFAT\r
+                       if (fs->fs_type == FS_EXFAT) {\r
+                               obj->c_scl = obj->sclust;               /* Save containing directory information for next dir */\r
+                               obj->c_size = ((DWORD)obj->objsize & 0xFFFFFF00) | obj->stat;\r
+                               obj->c_ofs = dp->blk_ofs;\r
+                               obj->sclust = ld_dword(fs->dirbuf + XDIR_FstClus);      /* Open next directory */\r
+                               obj->stat = fs->dirbuf[XDIR_GenFlags] & 2;\r
+                               obj->objsize = ld_qword(fs->dirbuf + XDIR_FileSize);\r
+                       } else\r
+#endif\r
+                       {\r
+                               obj->sclust = ld_clust(fs, fs->win + dp->dptr % SS(fs));        /* Open next directory */\r
+                       }\r
                }\r
        }\r
 \r
@@ -2101,6 +2857,12 @@ int get_ldnumber (               /* Returns logical drive number (-1:invalid drive) */
        const TCHAR *tp, *tt;\r
        UINT i;\r
        int vol = -1;\r
+#if _STR_VOLUME_ID             /* Find string drive id */\r
+       static const char* const str[] = {_VOLUME_STRS};\r
+       const char *sp;\r
+       char c;\r
+       TCHAR tc;\r
+#endif\r
 \r
 \r
        if (*path) {    /* If the pointer is not a null */\r
@@ -2113,13 +2875,9 @@ int get_ldnumber (               /* Returns logical drive number (-1:invalid drive) */
                                        vol = (int)i;\r
                                        *path = ++tt;\r
                                }\r
-                       } else {        /* No numeric drive number */\r
-#if _STR_VOLUME_ID             /* Find string drive id */\r
-                               static const char* const str[] = {_VOLUME_STRS};\r
-                               const char *sp;\r
-                               char c;\r
-                               TCHAR tc;\r
-\r
+                       }\r
+#if _STR_VOLUME_ID\r
+                        else { /* No numeric drive number, find string drive id */\r
                                i = 0; tt++;\r
                                do {\r
                                        sp = str[i]; tp = *path;\r
@@ -2132,11 +2890,11 @@ int get_ldnumber (              /* Returns logical drive number (-1:invalid drive) */
                                        vol = (int)i;\r
                                        *path = tt;\r
                                }\r
-#endif\r
                        }\r
+#endif\r
                        return vol;\r
                }\r
-#if _FS_RPATH && _VOLUMES >= 2\r
+#if _FS_RPATH != 0 && _VOLUMES >= 2\r
                vol = CurrVol;  /* Current drive */\r
 #else\r
                vol = 0;                /* Drive 0 */\r
@@ -2153,24 +2911,24 @@ int get_ldnumber (              /* Returns logical drive number (-1:invalid drive) */
 /*-----------------------------------------------------------------------*/\r
 \r
 static\r
-BYTE check_fs (        /* 0:FAT boor sector, 1:Valid boor sector but not FAT, 2:Not a boot sector, 3:Disk error */\r
+BYTE check_fs (        /* 0:FAT, 1:exFAT, 2:Valid BS but not FAT, 3:Not a BS, 4:Disk error */\r
        FATFS* fs,      /* File system object */\r
-       DWORD sect      /* Sector# (lba) to check if it is an FAT boot record or not */\r
+       DWORD sect      /* Sector# (lba) to check if it is an FAT-VBR or not */\r
 )\r
 {\r
-       fs->wflag = 0; fs->winsect = 0xFFFFFFFF;        /* Invaidate window */\r
-       if (move_window(fs, sect) != FR_OK)                     /* Load boot record */\r
-               return 3;\r
-\r
-       if (LD_WORD(&fs->win[BS_55AA]) != 0xAA55)       /* Check boot record signature (always placed at offset 510 even if the sector size is >512) */\r
-               return 2;\r
+       fs->wflag = 0; fs->winsect = 0xFFFFFFFF;                /* Invaidate window */\r
+       if (move_window(fs, sect) != FR_OK) return 4;   /* Load boot record */\r
 \r
-       if ((LD_DWORD(&fs->win[BS_FilSysType]) & 0xFFFFFF) == 0x544146)         /* Check "FAT" string */\r
-               return 0;\r
-       if ((LD_DWORD(&fs->win[BS_FilSysType32]) & 0xFFFFFF) == 0x544146)       /* Check "FAT" string */\r
-               return 0;\r
+       if (ld_word(fs->win + BS_55AA) != 0xAA55) return 3;     /* Check boot record signature (always placed at offset 510 even if the sector size is >512) */\r
 \r
-       return 1;\r
+       if (fs->win[BS_JmpBoot] == 0xE9 || (fs->win[BS_JmpBoot] == 0xEB && fs->win[BS_JmpBoot + 2] == 0x90)) {\r
+               if ((ld_dword(fs->win + BS_FilSysType) & 0xFFFFFF) == 0x544146) return 0;       /* Check "FAT" string */\r
+               if (ld_dword(fs->win + BS_FilSysType32) == 0x33544146) return 0;                        /* Check "FAT3" string */\r
+       }\r
+#if _FS_EXFAT\r
+       if (!mem_cmp(fs->win + BS_JmpBoot, "\xEB\x76\x90" "EXFAT   ", 11)) return 1;\r
+#endif\r
+       return 2;\r
 }\r
 \r
 \r
@@ -2182,20 +2940,21 @@ BYTE check_fs ( /* 0:FAT boor sector, 1:Valid boor sector but not FAT, 2:Not a b
 \r
 static\r
 FRESULT find_volume (  /* FR_OK(0): successful, !=0: any error occurred */\r
-       FATFS** rfs,            /* Pointer to pointer to the found file system object */\r
        const TCHAR** path,     /* Pointer to pointer to the path name (drive number) */\r
-       BYTE wmode                      /* !=0: Check write protection for write access */\r
+       FATFS** rfs,            /* Pointer to pointer to the found file system object */\r
+       BYTE mode                       /* !=0: Check write protection for write access */\r
 )\r
 {\r
-       BYTE fmt;\r
+       BYTE fmt, *pt;\r
        int vol;\r
        DSTATUS stat;\r
-       DWORD bsect, fasize, tsect, sysect, nclst, szbfat;\r
+       DWORD bsect, fasize, tsect, sysect, nclst, szbfat, br[4];\r
        WORD nrsv;\r
        FATFS *fs;\r
+       UINT i;\r
 \r
 \r
-       /* Get logical drive number from the path name */\r
+       /* Get logical drive number */\r
        *rfs = 0;\r
        vol = get_ldnumber(path);\r
        if (vol < 0) return FR_INVALID_DRIVE;\r
@@ -2207,11 +2966,13 @@ FRESULT find_volume (   /* FR_OK(0): successful, !=0: any error occurred */
        ENTER_FF(fs);                                           /* Lock the volume */\r
        *rfs = fs;                                                      /* Return pointer to the file system object */\r
 \r
+       mode &= (BYTE)~FA_READ;                         /* Desired access mode, write access or not */\r
        if (fs->fs_type) {                                      /* If the volume has been mounted */\r
                stat = disk_status(fs->drv);\r
                if (!(stat & STA_NOINIT)) {             /* and the physical drive is kept initialized */\r
-                       if (!_FS_READONLY && wmode && (stat & STA_PROTECT))     /* Check write protection if needed */\r
+                       if (!_FS_READONLY && mode && (stat & STA_PROTECT)) {    /* Check write protection if needed */\r
                                return FR_WRITE_PROTECTED;\r
+                       }\r
                        return FR_OK;                           /* The file system object is valid */\r
                }\r
        }\r
@@ -2222,125 +2983,172 @@ FRESULT find_volume ( /* FR_OK(0): successful, !=0: any error occurred */
        fs->fs_type = 0;                                        /* Clear the file system object */\r
        fs->drv = LD2PD(vol);                           /* Bind the logical drive and a physical drive */\r
        stat = disk_initialize(fs->drv);        /* Initialize the physical drive */\r
-       if (stat & STA_NOINIT)                          /* Check if the initialization succeeded */\r
+       if (stat & STA_NOINIT) {                        /* Check if the initialization succeeded */\r
                return FR_NOT_READY;                    /* Failed to initialize due to no medium or hard error */\r
-       if (!_FS_READONLY && wmode && (stat & STA_PROTECT))     /* Check disk write protection if needed */\r
+       }\r
+       if (!_FS_READONLY && mode && (stat & STA_PROTECT)) { /* Check disk write protection if needed */\r
                return FR_WRITE_PROTECTED;\r
+       }\r
 #if _MAX_SS != _MIN_SS                                         /* Get sector size (multiple sector size cfg only) */\r
-       if (disk_ioctl(fs->drv, GET_SECTOR_SIZE, &SS(fs)) != RES_OK\r
-               || SS(fs) < _MIN_SS || SS(fs) > _MAX_SS) return FR_DISK_ERR;\r
+       if (disk_ioctl(fs->drv, GET_SECTOR_SIZE, &SS(fs)) != RES_OK) return FR_DISK_ERR;\r
+       if (SS(fs) > _MAX_SS || SS(fs) < _MIN_SS || (SS(fs) & (SS(fs) - 1))) return FR_DISK_ERR;\r
 #endif\r
        /* Find an FAT partition on the drive. Supports only generic partitioning, FDISK and SFD. */\r
        bsect = 0;\r
-       fmt = check_fs(fs, bsect);                                      /* Load sector 0 and check if it is an FAT boot sector as SFD */\r
-       if (fmt == 1 || (!fmt && (LD2PT(vol)))) {       /* Not an FAT boot sector or forced partition number */\r
-               UINT i;\r
-               DWORD br[4];\r
-\r
+       fmt = check_fs(fs, bsect);                      /* Load sector 0 and check if it is an FAT-VBR as SFD */\r
+       if (fmt == 2 || (fmt < 2 && LD2PT(vol) != 0)) { /* Not an FAT-VBR or forced partition number */\r
                for (i = 0; i < 4; i++) {                       /* Get partition offset */\r
-                       BYTE *pt = fs->win+MBR_Table + i * SZ_PTE;\r
-                       br[i] = pt[4] ? LD_DWORD(&pt[8]) : 0;\r
+                       pt = fs->win + (MBR_Table + i * SZ_PTE);\r
+                       br[i] = pt[PTE_System] ? ld_dword(pt + PTE_StLba) : 0;\r
                }\r
                i = LD2PT(vol);                                         /* Partition number: 0:auto, 1-4:forced */\r
                if (i) i--;\r
                do {                                                            /* Find an FAT volume */\r
                        bsect = br[i];\r
-                       fmt = bsect ? check_fs(fs, bsect) : 2;  /* Check the partition */\r
-               } while (!LD2PT(vol) && fmt && ++i < 4);\r
+                       fmt = bsect ? check_fs(fs, bsect) : 3;  /* Check the partition */\r
+               } while (!LD2PT(vol) && fmt >= 2 && ++i < 4);\r
        }\r
-       if (fmt == 3) return FR_DISK_ERR;               /* An error occured in the disk I/O layer */\r
-       if (fmt) return FR_NO_FILESYSTEM;               /* No FAT volume is found */\r
+       if (fmt == 4) return FR_DISK_ERR;               /* An error occured in the disk I/O layer */\r
+       if (fmt >= 2) return FR_NO_FILESYSTEM;  /* No FAT volume is found */\r
 \r
        /* An FAT volume is found. Following code initializes the file system object */\r
 \r
-       if (LD_WORD(fs->win+BPB_BytsPerSec) != SS(fs))          /* (BPB_BytsPerSec must be equal to the physical sector size) */\r
-               return FR_NO_FILESYSTEM;\r
-\r
-       fasize = LD_WORD(fs->win+BPB_FATSz16);                          /* Number of sectors per FAT */\r
-       if (!fasize) fasize = LD_DWORD(fs->win+BPB_FATSz32);\r
-       fs->fsize = fasize;\r
-\r
-       fs->n_fats = fs->win[BPB_NumFATs];                                      /* Number of FAT copies */\r
-       if (fs->n_fats != 1 && fs->n_fats != 2)                         /* (Must be 1 or 2) */\r
-               return FR_NO_FILESYSTEM;\r
-       fasize *= fs->n_fats;                                                           /* Number of sectors for FAT area */\r
-\r
-       fs->csize = fs->win[BPB_SecPerClus];                            /* Number of sectors per cluster */\r
-       if (!fs->csize || (fs->csize & (fs->csize - 1)))        /* (Must be power of 2) */\r
-               return FR_NO_FILESYSTEM;\r
-\r
-       fs->n_rootdir = LD_WORD(fs->win+BPB_RootEntCnt);        /* Number of root directory entries */\r
-       if (fs->n_rootdir % (SS(fs) / SZ_DIR))                          /* (Must be sector aligned) */\r
-               return FR_NO_FILESYSTEM;\r
-\r
-       tsect = LD_WORD(fs->win+BPB_TotSec16);                          /* Number of sectors on the volume */\r
-       if (!tsect) tsect = LD_DWORD(fs->win+BPB_TotSec32);\r
-\r
-       nrsv = LD_WORD(fs->win+BPB_RsvdSecCnt);                         /* Number of reserved sectors */\r
-       if (!nrsv) return FR_NO_FILESYSTEM;                                     /* (Must not be 0) */\r
-\r
-       /* Determine the FAT sub type */\r
-       sysect = nrsv + fasize + fs->n_rootdir / (SS(fs) / SZ_DIR);     /* RSV+FAT+DIR */\r
-       if (tsect < sysect) return FR_NO_FILESYSTEM;            /* (Invalid volume size) */\r
-       nclst = (tsect - sysect) / fs->csize;                           /* Number of clusters */\r
-       if (!nclst) return FR_NO_FILESYSTEM;                            /* (Invalid volume size) */\r
-       fmt = FS_FAT12;\r
-       if (nclst >= MIN_FAT16) fmt = FS_FAT16;\r
-       if (nclst >= MIN_FAT32) fmt = FS_FAT32;\r
-\r
-       /* Boundaries and Limits */\r
-       fs->n_fatent = nclst + 2;                                                       /* Number of FAT entries */\r
-       fs->volbase = bsect;                                                            /* Volume start sector */\r
-       fs->fatbase = bsect + nrsv;                                             /* FAT start sector */\r
-       fs->database = bsect + sysect;                                          /* Data start sector */\r
-       if (fmt == FS_FAT32) {\r
-               if (fs->n_rootdir) return FR_NO_FILESYSTEM;             /* (BPB_RootEntCnt must be 0) */\r
-               fs->dirbase = LD_DWORD(fs->win+BPB_RootClus);   /* Root directory start cluster */\r
-               szbfat = fs->n_fatent * 4;                                              /* (Needed FAT size) */\r
-       } else {\r
-               if (!fs->n_rootdir)     return FR_NO_FILESYSTEM;        /* (BPB_RootEntCnt must not be 0) */\r
-               fs->dirbase = fs->fatbase + fasize;                             /* Root directory start sector */\r
-               szbfat = (fmt == FS_FAT16) ?                                    /* (Needed FAT size) */\r
-                       fs->n_fatent * 2 : fs->n_fatent * 3 / 2 + (fs->n_fatent & 1);\r
-       }\r
-       if (fs->fsize < (szbfat + (SS(fs) - 1)) / SS(fs))       /* (BPB_FATSz must not be less than the size needed) */\r
-               return FR_NO_FILESYSTEM;\r
+#if _FS_EXFAT\r
+       if (fmt == 1) {\r
+               QWORD maxlba;\r
+\r
+               for (i = BPB_ZeroedEx; i < BPB_ZeroedEx + 53 && fs->win[i] == 0; i++) ; /* Check zero filler */\r
+               if (i < BPB_ZeroedEx + 53) return FR_NO_FILESYSTEM;\r
+\r
+               if (ld_word(fs->win + BPB_FSVerEx) != 0x100) return FR_NO_FILESYSTEM;   /* Check exFAT revision (Must be 1.0) */\r
+\r
+               if (1 << fs->win[BPB_BytsPerSecEx] != SS(fs))   /* (BPB_BytsPerSecEx must be equal to the physical sector size) */\r
+                       return FR_NO_FILESYSTEM;\r
+\r
+               maxlba = ld_qword(fs->win + BPB_TotSecEx) + bsect;      /* Last LBA + 1 of the volume */\r
+               if (maxlba >= 0x100000000) return FR_NO_FILESYSTEM;     /* (It cannot be handled in 32-bit LBA) */\r
+\r
+               fs->fsize = ld_dword(fs->win + BPB_FatSzEx);    /* Number of sectors per FAT */\r
+\r
+               fs->n_fats = fs->win[BPB_NumFATsEx];                    /* Number of FATs */\r
+               if (fs->n_fats != 1) return FR_NO_FILESYSTEM;   /* (Supports only 1 FAT) */\r
+\r
+               fs->csize = 1 << fs->win[BPB_SecPerClusEx];             /* Cluster size */\r
+               if (fs->csize == 0)     return FR_NO_FILESYSTEM;        /* (Must be 1..32768) */\r
+\r
+               nclst = ld_dword(fs->win + BPB_NumClusEx);              /* Number of clusters */\r
+               if (nclst > MAX_EXFAT) return FR_NO_FILESYSTEM; /* (Too many clusters) */\r
+               fs->n_fatent = nclst + 2;\r
 \r
+               /* Boundaries and Limits */\r
+               fs->volbase = bsect;\r
+               fs->database = bsect + ld_dword(fs->win + BPB_DataOfsEx);\r
+               fs->fatbase = bsect + ld_dword(fs->win + BPB_FatOfsEx);\r
+               if (maxlba < (QWORD)fs->database + nclst * fs->csize) return FR_NO_FILESYSTEM;  /* (Volume size must not be smaller than the size requiered) */\r
+               fs->dirbase = ld_dword(fs->win + BPB_RootClusEx);\r
+\r
+               /* Check if bitmap location is in assumption (at the first cluster) */\r
+               if (move_window(fs, clust2sect(fs, fs->dirbase)) != FR_OK) return FR_DISK_ERR;\r
+               for (i = 0; i < SS(fs); i += SZDIRE) {\r
+                       if (fs->win[i] == 0x81 && ld_dword(fs->win + i + 20) == 2) break;       /* 81 entry with cluster #2? */\r
+               }\r
+               if (i == SS(fs)) return FR_NO_FILESYSTEM;\r
 #if !_FS_READONLY\r
-       /* Initialize cluster allocation information */\r
-       fs->last_clust = fs->free_clust = 0xFFFFFFFF;\r
+               fs->last_clst = fs->free_clst = 0xFFFFFFFF;             /* Initialize cluster allocation information */\r
+#endif\r
+               fmt = FS_EXFAT;                 /* FAT sub-type */\r
+       } else\r
+#endif /* _FS_EXFAT */\r
+       {\r
+               if (ld_word(fs->win + BPB_BytsPerSec) != SS(fs)) return FR_NO_FILESYSTEM;       /* (BPB_BytsPerSec must be equal to the physical sector size) */\r
+\r
+               fasize = ld_word(fs->win + BPB_FATSz16);                        /* Number of sectors per FAT */\r
+               if (fasize == 0) fasize = ld_dword(fs->win + BPB_FATSz32);\r
+               fs->fsize = fasize;\r
+\r
+               fs->n_fats = fs->win[BPB_NumFATs];                                      /* Number of FATs */\r
+               if (fs->n_fats != 1 && fs->n_fats != 2) return FR_NO_FILESYSTEM;        /* (Must be 1 or 2) */\r
+               fasize *= fs->n_fats;                                                           /* Number of sectors for FAT area */\r
+\r
+               fs->csize = fs->win[BPB_SecPerClus];                            /* Cluster size */\r
+               if (fs->csize == 0 || (fs->csize & (fs->csize - 1))) return FR_NO_FILESYSTEM;   /* (Must be power of 2) */\r
+\r
+               fs->n_rootdir = ld_word(fs->win + BPB_RootEntCnt);      /* Number of root directory entries */\r
+               if (fs->n_rootdir % (SS(fs) / SZDIRE)) return FR_NO_FILESYSTEM; /* (Must be sector aligned) */\r
+\r
+               tsect = ld_word(fs->win + BPB_TotSec16);                        /* Number of sectors on the volume */\r
+               if (tsect == 0) tsect = ld_dword(fs->win + BPB_TotSec32);\r
+\r
+               nrsv = ld_word(fs->win + BPB_RsvdSecCnt);                       /* Number of reserved sectors */\r
+               if (nrsv == 0) return FR_NO_FILESYSTEM;                         /* (Must not be 0) */\r
+\r
+               /* Determine the FAT sub type */\r
+               sysect = nrsv + fasize + fs->n_rootdir / (SS(fs) / SZDIRE);     /* RSV + FAT + DIR */\r
+               if (tsect < sysect) return FR_NO_FILESYSTEM;            /* (Invalid volume size) */\r
+               nclst = (tsect - sysect) / fs->csize;                           /* Number of clusters */\r
+               if (nclst == 0) return FR_NO_FILESYSTEM;                        /* (Invalid volume size) */\r
+               fmt = FS_FAT32;\r
+               if (nclst <= MAX_FAT16) fmt = FS_FAT16;\r
+               if (nclst <= MAX_FAT12) fmt = FS_FAT12;\r
+\r
+               /* Boundaries and Limits */\r
+               fs->n_fatent = nclst + 2;                                                       /* Number of FAT entries */\r
+               fs->volbase = bsect;                                                            /* Volume start sector */\r
+               fs->fatbase = bsect + nrsv;                                             /* FAT start sector */\r
+               fs->database = bsect + sysect;                                          /* Data start sector */\r
+               if (fmt == FS_FAT32) {\r
+                       if (ld_word(fs->win + BPB_FSVer32) != 0) return FR_NO_FILESYSTEM;       /* (Must be FAT32 revision 0.0) */\r
+                       if (fs->n_rootdir) return FR_NO_FILESYSTEM;             /* (BPB_RootEntCnt must be 0) */\r
+                       fs->dirbase = ld_dword(fs->win + BPB_RootClus32);       /* Root directory start cluster */\r
+                       szbfat = fs->n_fatent * 4;                                              /* (Needed FAT size) */\r
+               } else {\r
+                       if (fs->n_rootdir == 0) return FR_NO_FILESYSTEM;/* (BPB_RootEntCnt must not be 0) */\r
+                       fs->dirbase = fs->fatbase + fasize;                             /* Root directory start sector */\r
+                       szbfat = (fmt == FS_FAT16) ?                                    /* (Needed FAT size) */\r
+                               fs->n_fatent * 2 : fs->n_fatent * 3 / 2 + (fs->n_fatent & 1);\r
+               }\r
+               if (fs->fsize < (szbfat + (SS(fs) - 1)) / SS(fs)) return FR_NO_FILESYSTEM;      /* (BPB_FATSz must not be less than the size needed) */\r
 \r
-       /* Get fsinfo if available */\r
-       fs->fsi_flag = 0x80;\r
+#if !_FS_READONLY\r
+               /* Get FSINFO if available */\r
+               fs->last_clst = fs->free_clst = 0xFFFFFFFF;             /* Initialize cluster allocation information */\r
+               fs->fsi_flag = 0x80;\r
 #if (_FS_NOFSINFO & 3) != 3\r
-       if (fmt == FS_FAT32                             /* Enable FSINFO only if FAT32 and BPB_FSInfo is 1 */\r
-               && LD_WORD(fs->win+BPB_FSInfo) == 1\r
-               && move_window(fs, bsect + 1) == FR_OK)\r
-       {\r
-               fs->fsi_flag = 0;\r
-               if (LD_WORD(fs->win+BS_55AA) == 0xAA55  /* Load FSINFO data if available */\r
-                       && LD_DWORD(fs->win+FSI_LeadSig) == 0x41615252\r
-                       && LD_DWORD(fs->win+FSI_StrucSig) == 0x61417272)\r
+               if (fmt == FS_FAT32                             /* Enable FSINFO only if FAT32 and BPB_FSInfo32 == 1 */\r
+                       && ld_word(fs->win + BPB_FSInfo32) == 1\r
+                       && move_window(fs, bsect + 1) == FR_OK)\r
                {\r
+                       fs->fsi_flag = 0;\r
+                       if (ld_word(fs->win + BS_55AA) == 0xAA55        /* Load FSINFO data if available */\r
+                               && ld_dword(fs->win + FSI_LeadSig) == 0x41615252\r
+                               && ld_dword(fs->win + FSI_StrucSig) == 0x61417272)\r
+                       {\r
 #if (_FS_NOFSINFO & 1) == 0\r
-                       fs->free_clust = LD_DWORD(fs->win+FSI_Free_Count);\r
+                               fs->free_clst = ld_dword(fs->win + FSI_Free_Count);\r
 #endif\r
 #if (_FS_NOFSINFO & 2) == 0\r
-                       fs->last_clust = LD_DWORD(fs->win+FSI_Nxt_Free);\r
+                               fs->last_clst = ld_dword(fs->win + FSI_Nxt_Free);\r
 #endif\r
+                       }\r
                }\r
+#endif /* (_FS_NOFSINFO & 3) != 3 */\r
+#endif /* !_FS_READONLY */\r
        }\r
-#endif\r
-#endif\r
+\r
        fs->fs_type = fmt;      /* FAT sub-type */\r
        fs->id = ++Fsid;        /* File system mount ID */\r
-#if _FS_RPATH\r
-       fs->cdir = 0;           /* Set current directory to root */\r
+#if _USE_LFN == 1\r
+       fs->lfnbuf = LfnBuf;    /* Static LFN working buffer */\r
+#if _FS_EXFAT\r
+       fs->dirbuf = DirBuf;    /* Static directory block working buuffer */\r
+#endif\r
 #endif\r
-#if _FS_LOCK                   /* Clear file lock semaphores */\r
+#if _FS_RPATH != 0\r
+       fs->cdir = 0;           /* Initialize current directory */\r
+#endif\r
+#if _FS_LOCK != 0              /* Clear file lock semaphores */\r
        clear_lock(fs);\r
 #endif\r
-\r
        return FR_OK;\r
 }\r
 \r
@@ -2352,32 +3160,33 @@ FRESULT find_volume (   /* FR_OK(0): successful, !=0: any error occurred */
 /*-----------------------------------------------------------------------*/\r
 \r
 static\r
-FRESULT validate (     /* FR_OK(0): The object is valid, !=0: Invalid */\r
-       void* obj               /* Pointer to the object FIL/DIR to check validity */\r
+FRESULT validate (     /* Returns FR_OK or FR_INVALID_OBJECT */\r
+       _FDID* obj,             /* Pointer to the _OBJ, the 1st member in the FIL/DIR object, to check validity */\r
+       FATFS** fs              /* Pointer to pointer to the owner file system object to return */\r
 )\r
 {\r
-       FIL *fil = (FIL*)obj;   /* Assuming offset of .fs and .id in the FIL/DIR structure is identical */\r
-\r
-\r
-       if (!fil || !fil->fs || !fil->fs->fs_type || fil->fs->id != fil->id)\r
-               return FR_INVALID_OBJECT;\r
-\r
-       ENTER_FF(fil->fs);              /* Lock file system */\r
+       FRESULT res;\r
 \r
-       if (disk_status(fil->fs->drv) & STA_NOINIT)\r
-               return FR_NOT_READY;\r
 \r
-       return FR_OK;\r
+       if (!obj || !obj->fs || !obj->fs->fs_type || obj->fs->id != obj->id || (disk_status(obj->fs->drv) & STA_NOINIT)) {\r
+               *fs = 0;                                /* The object is invalid */\r
+               res = FR_INVALID_OBJECT;\r
+       } else {\r
+               *fs = obj->fs;                  /* Owner file sytem object */\r
+               ENTER_FF(obj->fs);              /* Lock file system */\r
+               res = FR_OK;\r
+       }\r
+       return res;\r
 }\r
 \r
 \r
 \r
 \r
-/*--------------------------------------------------------------------------\r
+/*---------------------------------------------------------------------------\r
 \r
-   Public Functions\r
+   Public Functions (FatFs API)\r
 \r
---------------------------------------------------------------------------*/\r
+----------------------------------------------------------------------------*/\r
 \r
 \r
 \r
@@ -2388,7 +3197,7 @@ FRESULT validate (        /* FR_OK(0): The object is valid, !=0: Invalid */
 FRESULT f_mount (\r
        FATFS* fs,                      /* Pointer to the file system object (NULL:unmount)*/\r
        const TCHAR* path,      /* Logical drive number to be mounted/unmounted */\r
-       BYTE opt                        /* 0:Do not mount (delayed mount), 1:Mount immediately */\r
+       BYTE opt                        /* Mode option 0:Do not mount (delayed mount), 1:Mount immediately */\r
 )\r
 {\r
        FATFS *cfs;\r
@@ -2397,12 +3206,13 @@ FRESULT f_mount (
        const TCHAR *rp = path;\r
 \r
 \r
+       /* Get logical drive number */\r
        vol = get_ldnumber(&rp);\r
        if (vol < 0) return FR_INVALID_DRIVE;\r
        cfs = FatFs[vol];                                       /* Pointer to fs object */\r
 \r
        if (cfs) {\r
-#if _FS_LOCK\r
+#if _FS_LOCK != 0\r
                clear_lock(cfs);\r
 #endif\r
 #if _FS_REENTRANT                                              /* Discard sync object of the current volume */\r
@@ -2421,7 +3231,7 @@ FRESULT f_mount (
 \r
        if (!fs || opt != 1) return FR_OK;      /* Do not mount now, it will be mounted later */\r
 \r
-       res = find_volume(&fs, &path, 0);       /* Force mounted the volume */\r
+       res = find_volume(&path, &fs, 0);       /* Force mounted the volume */\r
        LEAVE_FF(fs, res);\r
 }\r
 \r
@@ -2440,124 +3250,190 @@ FRESULT f_open (
 {\r
        FRESULT res;\r
        DIR dj;\r
-       BYTE *dir;\r
-       DEF_NAMEBUF;\r
+       FATFS *fs;\r
+#if !_FS_READONLY\r
+       DWORD dw, cl, bcs, clst, sc;\r
+       FSIZE_t ofs;\r
+#endif\r
+       DEF_NAMBUF\r
 \r
 \r
        if (!fp) return FR_INVALID_OBJECT;\r
-       fp->fs = 0;                     /* Clear file object */\r
 \r
-       /* Get logical drive number */\r
-#if !_FS_READONLY\r
-       mode &= FA_READ | FA_WRITE | FA_CREATE_ALWAYS | FA_OPEN_ALWAYS | FA_CREATE_NEW;\r
-       res = find_volume(&dj.fs, &path, (BYTE)(mode & ~FA_READ));\r
-#else\r
-       mode &= FA_READ;\r
-       res = find_volume(&dj.fs, &path, 0);\r
-#endif\r
+       /* Get logical drive */\r
+       mode &= _FS_READONLY ? FA_READ : FA_READ | FA_WRITE | FA_CREATE_ALWAYS | FA_CREATE_NEW | FA_OPEN_ALWAYS | FA_OPEN_APPEND | FA_SEEKEND;\r
+       res = find_volume(&path, &fs, mode);\r
        if (res == FR_OK) {\r
-               INIT_BUF(dj);\r
+               dj.obj.fs = fs;\r
+               INIT_NAMBUF(fs);\r
                res = follow_path(&dj, path);   /* Follow the file path */\r
-               dir = dj.dir;\r
 #if !_FS_READONLY      /* R/W configuration */\r
                if (res == FR_OK) {\r
-                       if (!dir)       /* Default directory itself */\r
+                       if (dj.fn[NSFLAG] & NS_NONAME) {        /* Origin directory itself? */\r
                                res = FR_INVALID_NAME;\r
-#if _FS_LOCK\r
-                       else\r
+                       }\r
+#if _FS_LOCK != 0\r
+                       else {\r
                                res = chk_lock(&dj, (mode & ~FA_READ) ? 1 : 0);\r
+                       }\r
 #endif\r
                }\r
                /* Create or Open a file */\r
                if (mode & (FA_CREATE_ALWAYS | FA_OPEN_ALWAYS | FA_CREATE_NEW)) {\r
-                       DWORD dw, cl;\r
-\r
                        if (res != FR_OK) {                                     /* No file, create new */\r
                                if (res == FR_NO_FILE)                  /* There is no file to open, create a new entry */\r
-#if _FS_LOCK\r
+#if _FS_LOCK != 0\r
                                        res = enq_lock() ? dir_register(&dj) : FR_TOO_MANY_OPEN_FILES;\r
 #else\r
                                        res = dir_register(&dj);\r
 #endif\r
                                mode |= FA_CREATE_ALWAYS;               /* File is created */\r
-                               dir = dj.dir;                                   /* New entry */\r
                        }\r
                        else {                                                          /* Any object is already existing */\r
-                               if (dir[DIR_Attr] & (AM_RDO | AM_DIR)) {        /* Cannot overwrite it (R/O or DIR) */\r
+                               if (dj.obj.attr & (AM_RDO | AM_DIR)) {  /* Cannot overwrite it (R/O or DIR) */\r
                                        res = FR_DENIED;\r
                                } else {\r
-                                       if (mode & FA_CREATE_NEW)       /* Cannot create as new file */\r
-                                               res = FR_EXIST;\r
+                                       if (mode & FA_CREATE_NEW) res = FR_EXIST;       /* Cannot create as new file */\r
                                }\r
                        }\r
                        if (res == FR_OK && (mode & FA_CREATE_ALWAYS)) {        /* Truncate it if overwrite mode */\r
-                               dw = GET_FATTIME();                             /* Created time */\r
-                               ST_DWORD(dir+DIR_CrtTime, dw);\r
-                               dir[DIR_Attr] = 0;                              /* Reset attribute */\r
-                               ST_DWORD(dir+DIR_FileSize, 0);  /* size = 0 */\r
-                               cl = ld_clust(dj.fs, dir);              /* Get start cluster */\r
-                               st_clust(dir, 0);                               /* cluster = 0 */\r
-                               dj.fs->wflag = 1;\r
-                               if (cl) {                                               /* Remove the cluster chain if exist */\r
-                                       dw = dj.fs->winsect;\r
-                                       res = remove_chain(dj.fs, cl);\r
-                                       if (res == FR_OK) {\r
-                                               dj.fs->last_clust = cl - 1;     /* Reuse the cluster hole */\r
-                                               res = move_window(dj.fs, dw);\r
+                               dw = GET_FATTIME();\r
+#if _FS_EXFAT\r
+                               if (fs->fs_type == FS_EXFAT) {\r
+                                       /* Get current allocation info */\r
+                                       fp->obj.fs = fs;\r
+                                       fp->obj.sclust = ld_dword(fs->dirbuf + XDIR_FstClus);\r
+                                       fp->obj.objsize = ld_qword(fs->dirbuf + XDIR_FileSize);\r
+                                       fp->obj.stat = fs->dirbuf[XDIR_GenFlags] & 2;\r
+                                       /* Initialize directory entry block */\r
+                                       st_dword(fs->dirbuf + XDIR_CrtTime, dw);        /* Set created time */\r
+                                       fs->dirbuf[XDIR_CrtTime10] = 0;\r
+                                       st_dword(fs->dirbuf + XDIR_ModTime, dw);        /* Set modified time */\r
+                                       fs->dirbuf[XDIR_ModTime10] = 0;\r
+                                       fs->dirbuf[XDIR_Attr] = AM_ARC;                         /* Reset attribute */\r
+                                       st_dword(fs->dirbuf + XDIR_FstClus, 0);         /* Reset file allocation info */\r
+                                       st_qword(fs->dirbuf + XDIR_FileSize, 0);\r
+                                       st_qword(fs->dirbuf + XDIR_ValidFileSize, 0);\r
+                                       fs->dirbuf[XDIR_GenFlags] = 1;\r
+                                       res = store_xdir(&dj);\r
+                                       if (res == FR_OK && fp->obj.sclust) {           /* Remove the cluster chain if exist */\r
+                                               res = remove_chain(&fp->obj, fp->obj.sclust, 0);\r
+                                               fs->last_clst = fp->obj.sclust - 1;             /* Reuse the cluster hole */\r
+                                       }\r
+                               } else\r
+#endif\r
+                               {\r
+                                       /* Clean directory info */\r
+                                       st_dword(dj.dir + DIR_CrtTime, dw);     /* Set created time */\r
+                                       st_dword(dj.dir + DIR_ModTime, dw);     /* Set modified time */\r
+                                       dj.dir[DIR_Attr] = AM_ARC;                      /* Reset attribute */\r
+                                       cl = ld_clust(fs, dj.dir);                      /* Get cluster chain */\r
+                                       st_clust(fs, dj.dir, 0);                        /* Reset file allocation info */\r
+                                       st_dword(dj.dir + DIR_FileSize, 0);\r
+                                       fs->wflag = 1;\r
+\r
+                                       if (cl) {                                                       /* Remove the cluster chain if exist */\r
+                                               dw = fs->winsect;\r
+                                               res = remove_chain(&dj.obj, cl, 0);\r
+                                               if (res == FR_OK) {\r
+                                                       res = move_window(fs, dw);\r
+                                                       fs->last_clst = cl - 1;         /* Reuse the cluster hole */\r
+                                               }\r
                                        }\r
                                }\r
                        }\r
                }\r
                else {  /* Open an existing file */\r
-                       if (res == FR_OK) {                                     /* Follow succeeded */\r
-                               if (dir[DIR_Attr] & AM_DIR) {   /* It is a directory */\r
+                       if (res == FR_OK) {                                     /* Following succeeded */\r
+                               if (dj.obj.attr & AM_DIR) {             /* It is a directory */\r
                                        res = FR_NO_FILE;\r
                                } else {\r
-                                       if ((mode & FA_WRITE) && (dir[DIR_Attr] & AM_RDO)) /* R/O violation */\r
+                                       if ((mode & FA_WRITE) && (dj.obj.attr & AM_RDO)) { /* R/O violation */\r
                                                res = FR_DENIED;\r
+                                       }\r
                                }\r
                        }\r
                }\r
                if (res == FR_OK) {\r
                        if (mode & FA_CREATE_ALWAYS)            /* Set file change flag if created or overwritten */\r
-                               mode |= FA__WRITTEN;\r
-                       fp->dir_sect = dj.fs->winsect;          /* Pointer to the directory entry */\r
-                       fp->dir_ptr = dir;\r
-#if _FS_LOCK\r
-                       fp->lockid = inc_lock(&dj, (mode & ~FA_READ) ? 1 : 0);\r
-                       if (!fp->lockid) res = FR_INT_ERR;\r
+                               mode |= FA_MODIFIED;\r
+                       fp->dir_sect = fs->winsect;                     /* Pointer to the directory entry */\r
+                       fp->dir_ptr = dj.dir;\r
+#if _FS_LOCK != 0\r
+                       fp->obj.lockid = inc_lock(&dj, (mode & ~FA_READ) ? 1 : 0);\r
+                       if (!fp->obj.lockid) res = FR_INT_ERR;\r
 #endif\r
                }\r
-\r
-#else                          /* R/O configuration */\r
-               if (res == FR_OK) {                                     /* Follow succeeded */\r
-                       dir = dj.dir;\r
-                       if (!dir) {                                             /* Current directory itself */\r
+#else          /* R/O configuration */\r
+               if (res == FR_OK) {\r
+                       if (dj.fn[NSFLAG] & NS_NONAME) {        /* Origin directory itself? */\r
                                res = FR_INVALID_NAME;\r
                        } else {\r
-                               if (dir[DIR_Attr] & AM_DIR)     /* It is a directory */\r
+                               if (dj.obj.attr & AM_DIR) {             /* It is a directory */\r
                                        res = FR_NO_FILE;\r
+                               }\r
                        }\r
                }\r
 #endif\r
-               FREE_BUF();\r
-\r
-               if (res == FR_OK) {\r
-                       fp->flag = mode;                                        /* File access mode */\r
-                       fp->err = 0;                                            /* Clear error flag */\r
-                       fp->sclust = ld_clust(dj.fs, dir);      /* File start cluster */\r
-                       fp->fsize = LD_DWORD(dir+DIR_FileSize); /* File size */\r
-                       fp->fptr = 0;                                           /* File pointer */\r
-                       fp->dsect = 0;\r
-#if _USE_FASTSEEK\r
-                       fp->cltbl = 0;                                          /* Normal seek mode */\r
+\r
+               if (res == FR_OK) {\r
+#if _FS_EXFAT\r
+                       if (fs->fs_type == FS_EXFAT) {\r
+                               fp->obj.sclust = ld_dword(fs->dirbuf + XDIR_FstClus);           /* Get allocation info */\r
+                               fp->obj.objsize = ld_qword(fs->dirbuf + XDIR_FileSize);\r
+                               fp->obj.stat = fs->dirbuf[XDIR_GenFlags] & 2;\r
+                               fp->obj.c_scl = dj.obj.sclust;\r
+                               fp->obj.c_size = ((DWORD)dj.obj.objsize & 0xFFFFFF00) | dj.obj.stat;\r
+                               fp->obj.c_ofs = dj.blk_ofs;\r
+                       } else\r
+#endif\r
+                       {\r
+                               fp->obj.sclust = ld_clust(fs, dj.dir);                          /* Get allocation info */\r
+                               fp->obj.objsize = ld_dword(dj.dir + DIR_FileSize);\r
+                       }\r
+#if _USE_FASTSEEK\r
+                       fp->cltbl = 0;                  /* Disable fast seek mode */\r
+#endif\r
+                       fp->obj.fs = fs;                /* Validate the file object */\r
+                       fp->obj.id = fs->id;\r
+                       fp->flag = mode;                /* Set file access mode */\r
+                       fp->err = 0;                    /* Clear error flag */\r
+                       fp->sect = 0;                   /* Invalidate current data sector */\r
+                       fp->fptr = 0;                   /* Set file pointer top of the file */\r
+#if !_FS_READONLY\r
+#if !_FS_TINY\r
+                       mem_set(fp->buf, 0, _MAX_SS);   /* Clear sector buffer */\r
+#endif\r
+                       if ((mode & FA_SEEKEND) && fp->obj.objsize > 0) {       /* Seek to end of file if FA_OPEN_APPEND is specified */\r
+                               fp->fptr = fp->obj.objsize;                     /* Offset to seek */\r
+                               bcs = (DWORD)fs->csize * SS(fs);        /* Cluster size in byte */\r
+                               clst = fp->obj.sclust;                          /* Follow the cluster chain */\r
+                               for (ofs = fp->obj.objsize; res == FR_OK && ofs > bcs; ofs -= bcs) {\r
+                                       clst = get_fat(&fp->obj, clst);\r
+                                       if (clst <= 1) res = FR_INT_ERR;\r
+                                       if (clst == 0xFFFFFFFF) res = FR_DISK_ERR;\r
+                               }\r
+                               fp->clust = clst;\r
+                               if (res == FR_OK && ofs % SS(fs)) {     /* Fill sector buffer if not on the sector boundary */\r
+                                       if ((sc = clust2sect(fs, clst)) == 0) {\r
+                                               res = FR_INT_ERR;\r
+                                       } else {\r
+                                               fp->sect = sc + (DWORD)(ofs / SS(fs));\r
+#if !_FS_TINY\r
+                                               if (disk_read(fs->drv, fp->buf, fp->sect, 1) != RES_OK) res = FR_DISK_ERR;\r
+#endif\r
+                                       }\r
+                               }\r
+                       }\r
 #endif\r
-                       fp->fs = dj.fs;                                         /* Validate file object */\r
-                       fp->id = fp->fs->id;\r
                }\r
+\r
+               FREE_NAMBUF();\r
        }\r
 \r
-       LEAVE_FF(dj.fs, res);\r
+       if (res != FR_OK) fp->obj.fs = 0;       /* Invalidate file object on error */\r
+\r
+       LEAVE_FF(fs, res);\r
 }\r
 \r
 \r
@@ -2568,96 +3444,95 @@ FRESULT f_open (
 /*-----------------------------------------------------------------------*/\r
 \r
 FRESULT f_read (\r
-       FIL* fp,                /* Pointer to the file object */\r
-       void* buff,             /* Pointer to data buffer */\r
-       UINT btr,               /* Number of bytes to read */\r
-       UINT* br                /* Pointer to number of bytes read */\r
+       FIL* fp,        /* Pointer to the file object */\r
+       void* buff,     /* Pointer to data buffer */\r
+       UINT btr,       /* Number of bytes to read */\r
+       UINT* br        /* Pointer to number of bytes read */\r
 )\r
 {\r
        FRESULT res;\r
-       DWORD clst, sect, remain;\r
-       UINT rcnt, cc;\r
-       BYTE csect, *rbuff = (BYTE*)buff;\r
+       FATFS *fs;\r
+       DWORD clst, sect;\r
+       FSIZE_t remain;\r
+       UINT rcnt, cc, csect;\r
+       BYTE *rbuff = (BYTE*)buff;\r
 \r
 \r
        *br = 0;        /* Clear read byte counter */\r
-\r
-       res = validate(fp);                                                     /* Check validity */\r
-       if (res != FR_OK) LEAVE_FF(fp->fs, res);\r
-       if (fp->err)                                                            /* Check error */\r
-               LEAVE_FF(fp->fs, (FRESULT)fp->err);\r
-       if (!(fp->flag & FA_READ))                                      /* Check access mode */\r
-               LEAVE_FF(fp->fs, FR_DENIED);\r
-       remain = fp->fsize - fp->fptr;\r
+       res = validate(&fp->obj, &fs);                          /* Check validity of the file object */\r
+       if (res != FR_OK || (res = (FRESULT)fp->err) != FR_OK) LEAVE_FF(fs, res);       /* Check validity */\r
+       if (!(fp->flag & FA_READ)) LEAVE_FF(fs, FR_DENIED); /* Check access mode */\r
+       remain = fp->obj.objsize - fp->fptr;\r
        if (btr > remain) btr = (UINT)remain;           /* Truncate btr by remaining bytes */\r
 \r
        for ( ;  btr;                                                           /* Repeat until all data read */\r
                rbuff += rcnt, fp->fptr += rcnt, *br += rcnt, btr -= rcnt) {\r
-               if ((fp->fptr % SS(fp->fs)) == 0) {             /* On the sector boundary? */\r
-                       csect = (BYTE)(fp->fptr / SS(fp->fs) & (fp->fs->csize - 1));    /* Sector offset in the cluster */\r
-                       if (!csect) {                                           /* On the cluster boundary? */\r
+               if (fp->fptr % SS(fs) == 0) {                   /* On the sector boundary? */\r
+                       csect = (UINT)(fp->fptr / SS(fs) & (fs->csize - 1));    /* Sector offset in the cluster */\r
+                       if (csect == 0) {                                       /* On the cluster boundary? */\r
                                if (fp->fptr == 0) {                    /* On the top of the file? */\r
-                                       clst = fp->sclust;                      /* Follow from the origin */\r
+                                       clst = fp->obj.sclust;          /* Follow cluster chain from the origin */\r
                                } else {                                                /* Middle or end of the file */\r
 #if _USE_FASTSEEK\r
-                                       if (fp->cltbl)\r
+                                       if (fp->cltbl) {\r
                                                clst = clmt_clust(fp, fp->fptr);        /* Get cluster# from the CLMT */\r
-                                       else\r
+                                       else\r
 #endif\r
-                                               clst = get_fat(fp->fs, fp->clust);      /* Follow cluster chain on the FAT */\r
+                                       {\r
+                                               clst = get_fat(&fp->obj, fp->clust);    /* Follow cluster chain on the FAT */\r
+                                       }\r
                                }\r
-                               if (clst < 2) ABORT(fp->fs, FR_INT_ERR);\r
-                               if (clst == 0xFFFFFFFF) ABORT(fp->fs, FR_DISK_ERR);\r
+                               if (clst < 2) ABORT(fs, FR_INT_ERR);\r
+                               if (clst == 0xFFFFFFFF) ABORT(fs, FR_DISK_ERR);\r
                                fp->clust = clst;                               /* Update current cluster */\r
                        }\r
-                       sect = clust2sect(fp->fs, fp->clust);   /* Get current sector */\r
-                       if (!sect) ABORT(fp->fs, FR_INT_ERR);\r
+                       sect = clust2sect(fs, fp->clust);       /* Get current sector */\r
+                       if (!sect) ABORT(fs, FR_INT_ERR);\r
                        sect += csect;\r
-                       cc = btr / SS(fp->fs);                          /* When remaining bytes >= sector size, */\r
+                       cc = btr / SS(fs);                                      /* When remaining bytes >= sector size, */\r
                        if (cc) {                                                       /* Read maximum contiguous sectors directly */\r
-                               if (csect + cc > fp->fs->csize) /* Clip at cluster boundary */\r
-                                       cc = fp->fs->csize - csect;\r
-                               if (disk_read(fp->fs->drv, rbuff, sect, cc) != RES_OK)\r
-                                       ABORT(fp->fs, FR_DISK_ERR);\r
+                               if (csect + cc > fs->csize) {   /* Clip at cluster boundary */\r
+                                       cc = fs->csize - csect;\r
+                               }\r
+                               if (disk_read(fs->drv, rbuff, sect, cc) != RES_OK) ABORT(fs, FR_DISK_ERR);\r
 #if !_FS_READONLY && _FS_MINIMIZE <= 2                 /* Replace one of the read sectors with cached data if it contains a dirty sector */\r
 #if _FS_TINY\r
-                               if (fp->fs->wflag && fp->fs->winsect - sect < cc)\r
-                                       mem_cpy(rbuff + ((fp->fs->winsect - sect) * SS(fp->fs)), fp->fs->win, SS(fp->fs));\r
+                               if (fs->wflag && fs->winsect - sect < cc) {\r
+                                       mem_cpy(rbuff + ((fs->winsect - sect) * SS(fs)), fs->win, SS(fs));\r
+                               }\r
 #else\r
-                               if ((fp->flag & FA__DIRTY) && fp->dsect - sect < cc)\r
-                                       mem_cpy(rbuff + ((fp->dsect - sect) * SS(fp->fs)), fp->buf, SS(fp->fs));\r
+                               if ((fp->flag & FA_DIRTY) && fp->sect - sect < cc) {\r
+                                       mem_cpy(rbuff + ((fp->sect - sect) * SS(fs)), fp->buf, SS(fs));\r
+                               }\r
 #endif\r
 #endif\r
-                               rcnt = SS(fp->fs) * cc;                 /* Number of bytes transferred */\r
+                               rcnt = SS(fs) * cc;                             /* Number of bytes transferred */\r
                                continue;\r
                        }\r
 #if !_FS_TINY\r
-                       if (fp->dsect != sect) {                        /* Load data sector if not in cache */\r
+                       if (fp->sect != sect) {                 /* Load data sector if not in cache */\r
 #if !_FS_READONLY\r
-                               if (fp->flag & FA__DIRTY) {             /* Write-back dirty sector cache */\r
-                                       if (disk_write(fp->fs->drv, fp->buf, fp->dsect, 1) != RES_OK)\r
-                                               ABORT(fp->fs, FR_DISK_ERR);\r
-                                       fp->flag &= ~FA__DIRTY;\r
+                               if (fp->flag & FA_DIRTY) {              /* Write-back dirty sector cache */\r
+                                       if (disk_write(fs->drv, fp->buf, fp->sect, 1) != RES_OK) ABORT(fs, FR_DISK_ERR);\r
+                                       fp->flag &= (BYTE)~FA_DIRTY;\r
                                }\r
 #endif\r
-                               if (disk_read(fp->fs->drv, fp->buf, sect, 1) != RES_OK) /* Fill sector cache */\r
-                                       ABORT(fp->fs, FR_DISK_ERR);\r
+                               if (disk_read(fs->drv, fp->buf, sect, 1) != RES_OK)     ABORT(fs, FR_DISK_ERR); /* Fill sector cache */\r
                        }\r
 #endif\r
-                       fp->dsect = sect;\r
+                       fp->sect = sect;\r
                }\r
-               rcnt = SS(fp->fs) - ((UINT)fp->fptr % SS(fp->fs));      /* Get partial sector data from sector buffer */\r
-               if (rcnt > btr) rcnt = btr;\r
+               rcnt = SS(fs) - (UINT)fp->fptr % SS(fs);        /* Number of bytes left in the sector */\r
+               if (rcnt > btr) rcnt = btr;                                     /* Clip it by btr if needed */\r
 #if _FS_TINY\r
-               if (move_window(fp->fs, fp->dsect) != FR_OK)            /* Move sector window */\r
-                       ABORT(fp->fs, FR_DISK_ERR);\r
-               mem_cpy(rbuff, &fp->fs->win[fp->fptr % SS(fp->fs)], rcnt);      /* Pick partial sector */\r
+               if (move_window(fs, fp->sect) != FR_OK) ABORT(fs, FR_DISK_ERR); /* Move sector window */\r
+               mem_cpy(rbuff, fs->win + fp->fptr % SS(fs), rcnt);      /* Extract partial sector */\r
 #else\r
-               mem_cpy(rbuff, &fp->buf[fp->fptr % SS(fp->fs)], rcnt);  /* Pick partial sector */\r
+               mem_cpy(rbuff, fp->buf + fp->fptr % SS(fs), rcnt);      /* Extract partial sector */\r
 #endif\r
        }\r
 \r
-       LEAVE_FF(fp->fs, FR_OK);\r
+       LEAVE_FF(fs, FR_OK);\r
 }\r
 \r
 \r
@@ -2670,117 +3545,116 @@ FRESULT f_read (
 \r
 FRESULT f_write (\r
        FIL* fp,                        /* Pointer to the file object */\r
-       const void *buff,       /* Pointer to the data to be written */\r
+       const voidbuff,       /* Pointer to the data to be written */\r
        UINT btw,                       /* Number of bytes to write */\r
        UINT* bw                        /* Pointer to number of bytes written */\r
 )\r
 {\r
        FRESULT res;\r
+       FATFS *fs;\r
        DWORD clst, sect;\r
-       UINT wcnt, cc;\r
+       UINT wcnt, cc, csect;\r
        const BYTE *wbuff = (const BYTE*)buff;\r
-       BYTE csect;\r
 \r
 \r
        *bw = 0;        /* Clear write byte counter */\r
+       res = validate(&fp->obj, &fs);                  /* Check validity of the file object */\r
+       if (res != FR_OK || (res = (FRESULT)fp->err) != FR_OK) LEAVE_FF(fs, res);       /* Check validity */\r
+       if (!(fp->flag & FA_WRITE)) LEAVE_FF(fs, FR_DENIED);    /* Check access mode */\r
 \r
-       res = validate(fp);                                             /* Check validity */\r
-       if (res != FR_OK) LEAVE_FF(fp->fs, res);\r
-       if (fp->err)                                                    /* Check error */\r
-               LEAVE_FF(fp->fs, (FRESULT)fp->err);\r
-       if (!(fp->flag & FA_WRITE))                             /* Check access mode */\r
-               LEAVE_FF(fp->fs, FR_DENIED);\r
-       if (fp->fptr + btw < fp->fptr) btw = 0; /* File size cannot reach 4GB */\r
+       /* Check fptr wrap-around (file size cannot reach 4GiB on FATxx) */\r
+       if ((!_FS_EXFAT || fs->fs_type != FS_EXFAT) && (DWORD)(fp->fptr + btw) < (DWORD)fp->fptr) {\r
+               btw = (UINT)(0xFFFFFFFF - (DWORD)fp->fptr);\r
+       }\r
 \r
        for ( ;  btw;                                                   /* Repeat until all data written */\r
-               wbuff += wcnt, fp->fptr += wcnt, *bw += wcnt, btw -= wcnt) {\r
-               if ((fp->fptr % SS(fp->fs)) == 0) {     /* On the sector boundary? */\r
-                       csect = (BYTE)(fp->fptr / SS(fp->fs) & (fp->fs->csize - 1));    /* Sector offset in the cluster */\r
-                       if (!csect) {                                   /* On the cluster boundary? */\r
+               wbuff += wcnt, fp->fptr += wcnt, fp->obj.objsize = (fp->fptr > fp->obj.objsize) ? fp->fptr : fp->obj.objsize, *bw += wcnt, btw -= wcnt) {\r
+               if (fp->fptr % SS(fs) == 0) {           /* On the sector boundary? */\r
+                       csect = (UINT)(fp->fptr / SS(fs)) & (fs->csize - 1);    /* Sector offset in the cluster */\r
+                       if (csect == 0) {                               /* On the cluster boundary? */\r
                                if (fp->fptr == 0) {            /* On the top of the file? */\r
-                                       clst = fp->sclust;              /* Follow from the origin */\r
-                                       if (clst == 0)                  /* When no cluster is allocated, */\r
-                                               clst = create_chain(fp->fs, 0); /* Create a new cluster chain */\r
-                               } else {                                        /* Middle or end of the file */\r
+                                       clst = fp->obj.sclust;  /* Follow from the origin */\r
+                                       if (clst == 0) {                /* If no cluster is allocated, */\r
+                                               clst = create_chain(&fp->obj, 0);       /* create a new cluster chain */\r
+                                       }\r
+                               } else {                                        /* On the middle or end of the file */\r
 #if _USE_FASTSEEK\r
-                                       if (fp->cltbl)\r
+                                       if (fp->cltbl) {\r
                                                clst = clmt_clust(fp, fp->fptr);        /* Get cluster# from the CLMT */\r
-                                       else\r
+                                       else\r
 #endif\r
-                                               clst = create_chain(fp->fs, fp->clust); /* Follow or stretch cluster chain on the FAT */\r
+                                       {\r
+                                               clst = create_chain(&fp->obj, fp->clust);       /* Follow or stretch cluster chain on the FAT */\r
+                                       }\r
                                }\r
                                if (clst == 0) break;           /* Could not allocate a new cluster (disk full) */\r
-                               if (clst == 1) ABORT(fp->fs, FR_INT_ERR);\r
-                               if (clst == 0xFFFFFFFF) ABORT(fp->fs, FR_DISK_ERR);\r
+                               if (clst == 1) ABORT(fs, FR_INT_ERR);\r
+                               if (clst == 0xFFFFFFFF) ABORT(fs, FR_DISK_ERR);\r
                                fp->clust = clst;                       /* Update current cluster */\r
-                               if (fp->sclust == 0) fp->sclust = clst; /* Set start cluster if the first write */\r
+                               if (fp->obj.sclust == 0) fp->obj.sclust = clst; /* Set start cluster if the first write */\r
                        }\r
 #if _FS_TINY\r
-                       if (fp->fs->winsect == fp->dsect && sync_window(fp->fs))        /* Write-back sector cache */\r
-                               ABORT(fp->fs, FR_DISK_ERR);\r
+                       if (fs->winsect == fp->sect && sync_window(fs) != FR_OK) ABORT(fs, FR_DISK_ERR);        /* Write-back sector cache */\r
 #else\r
-                       if (fp->flag & FA__DIRTY) {             /* Write-back sector cache */\r
-                               if (disk_write(fp->fs->drv, fp->buf, fp->dsect, 1) != RES_OK)\r
-                                       ABORT(fp->fs, FR_DISK_ERR);\r
-                               fp->flag &= ~FA__DIRTY;\r
+                       if (fp->flag & FA_DIRTY) {              /* Write-back sector cache */\r
+                               if (disk_write(fs->drv, fp->buf, fp->sect, 1) != RES_OK) ABORT(fs, FR_DISK_ERR);\r
+                               fp->flag &= (BYTE)~FA_DIRTY;\r
                        }\r
 #endif\r
-                       sect = clust2sect(fp->fs, fp->clust);   /* Get current sector */\r
-                       if (!sect) ABORT(fp->fs, FR_INT_ERR);\r
+                       sect = clust2sect(fs, fp->clust);       /* Get current sector */\r
+                       if (!sect) ABORT(fs, FR_INT_ERR);\r
                        sect += csect;\r
-                       cc = btw / SS(fp->fs);                  /* When remaining bytes >= sector size, */\r
+                       cc = btw / SS(fs);                              /* When remaining bytes >= sector size, */\r
                        if (cc) {                                               /* Write maximum contiguous sectors directly */\r
-                               if (csect + cc > fp->fs->csize) /* Clip at cluster boundary */\r
-                                       cc = fp->fs->csize - csect;\r
-                               if (disk_write(fp->fs->drv, wbuff, sect, cc) != RES_OK)\r
-                                       ABORT(fp->fs, FR_DISK_ERR);\r
+                               if (csect + cc > fs->csize) {   /* Clip at cluster boundary */\r
+                                       cc = fs->csize - csect;\r
+                               }\r
+                               if (disk_write(fs->drv, wbuff, sect, cc) != RES_OK) ABORT(fs, FR_DISK_ERR);\r
 #if _FS_MINIMIZE <= 2\r
 #if _FS_TINY\r
-                               if (fp->fs->winsect - sect < cc) {      /* Refill sector cache if it gets invalidated by the direct write */\r
-                                       mem_cpy(fp->fs->win, wbuff + ((fp->fs->winsect - sect) * SS(fp->fs)), SS(fp->fs));\r
-                                       fp->fs->wflag = 0;\r
+                               if (fs->winsect - sect < cc) {  /* Refill sector cache if it gets invalidated by the direct write */\r
+                                       mem_cpy(fs->win, wbuff + ((fs->winsect - sect) * SS(fs)), SS(fs));\r
+                                       fs->wflag = 0;\r
                                }\r
 #else\r
-                               if (fp->dsect - sect < cc) { /* Refill sector cache if it gets invalidated by the direct write */\r
-                                       mem_cpy(fp->buf, wbuff + ((fp->dsect - sect) * SS(fp->fs)), SS(fp->fs));\r
-                                       fp->flag &= ~FA__DIRTY;\r
+                               if (fp->sect - sect < cc) { /* Refill sector cache if it gets invalidated by the direct write */\r
+                                       mem_cpy(fp->buf, wbuff + ((fp->sect - sect) * SS(fs)), SS(fs));\r
+                                       fp->flag &= (BYTE)~FA_DIRTY;\r
                                }\r
 #endif\r
 #endif\r
-                               wcnt = SS(fp->fs) * cc;         /* Number of bytes transferred */\r
+                               wcnt = SS(fs) * cc;             /* Number of bytes transferred */\r
                                continue;\r
                        }\r
 #if _FS_TINY\r
-                       if (fp->fptr >= fp->fsize) {    /* Avoid silly cache filling at growing edge */\r
-                               if (sync_window(fp->fs)) ABORT(fp->fs, FR_DISK_ERR);\r
-                               fp->fs->winsect = sect;\r
+                       if (fp->fptr >= fp->obj.objsize) {      /* Avoid silly cache filling on the growing edge */\r
+                               if (sync_window(fs) != FR_OK) ABORT(fs, FR_DISK_ERR);\r
+                               fs->winsect = sect;\r
                        }\r
 #else\r
-                       if (fp->dsect != sect) {                /* Fill sector cache with file data */\r
-                               if (fp->fptr < fp->fsize &&\r
-                                       disk_read(fp->fs->drv, fp->buf, sect, 1) != RES_OK)\r
-                                               ABORT(fp->fs, FR_DISK_ERR);\r
+                       if (fp->sect != sect &&                 /* Fill sector cache with file data */\r
+                               fp->fptr < fp->obj.objsize &&\r
+                               disk_read(fs->drv, fp->buf, sect, 1) != RES_OK) {\r
+                                       ABORT(fs, FR_DISK_ERR);\r
                        }\r
 #endif\r
-                       fp->dsect = sect;\r
+                       fp->sect = sect;\r
                }\r
-               wcnt = SS(fp->fs) - ((UINT)fp->fptr % SS(fp->fs));/* Put partial sector into file I/O buffer */\r
-               if (wcnt > btw) wcnt = btw;\r
+               wcnt = SS(fs) - (UINT)fp->fptr % SS(fs);        /* Number of bytes left in the sector */\r
+               if (wcnt > btw) wcnt = btw;                                     /* Clip it by btw if needed */\r
 #if _FS_TINY\r
-               if (move_window(fp->fs, fp->dsect) != FR_OK)    /* Move sector window */\r
-                       ABORT(fp->fs, FR_DISK_ERR);\r
-               mem_cpy(&fp->fs->win[fp->fptr % SS(fp->fs)], wbuff, wcnt);      /* Fit partial sector */\r
-               fp->fs->wflag = 1;\r
+               if (move_window(fs, fp->sect) != FR_OK) ABORT(fs, FR_DISK_ERR); /* Move sector window */\r
+               mem_cpy(fs->win + fp->fptr % SS(fs), wbuff, wcnt);      /* Fit data to the sector */\r
+               fs->wflag = 1;\r
 #else\r
-               mem_cpy(&fp->buf[fp->fptr % SS(fp->fs)], wbuff, wcnt);  /* Fit partial sector */\r
-               fp->flag |= FA__DIRTY;\r
+               mem_cpy(fp->buf + fp->fptr % SS(fs), wbuff, wcnt);      /* Fit data to the sector */\r
+               fp->flag |= FA_DIRTY;\r
 #endif\r
        }\r
 \r
-       if (fp->fptr > fp->fsize) fp->fsize = fp->fptr; /* Update file size if needed */\r
-       fp->flag |= FA__WRITTEN;                                                /* Set file change flag */\r
+       fp->flag |= FA_MODIFIED;                                /* Set file change flag */\r
 \r
-       LEAVE_FF(fp->fs, FR_OK);\r
+       LEAVE_FF(fs, FR_OK);\r
 }\r
 \r
 \r
@@ -2795,39 +3669,68 @@ FRESULT f_sync (
 )\r
 {\r
        FRESULT res;\r
+       FATFS *fs;\r
        DWORD tm;\r
        BYTE *dir;\r
+       DEF_NAMBUF\r
 \r
 \r
-       res = validate(fp);                                     /* Check validity of the object */\r
+       res = validate(&fp->obj, &fs);  /* Check validity of the file object */\r
        if (res == FR_OK) {\r
-               if (fp->flag & FA__WRITTEN) {   /* Has the file been written? */\r
-                       /* Write-back dirty buffer */\r
+               if (fp->flag & FA_MODIFIED) {   /* Is there any change to the file? */\r
 #if !_FS_TINY\r
-                       if (fp->flag & FA__DIRTY) {\r
-                               if (disk_write(fp->fs->drv, fp->buf, fp->dsect, 1) != RES_OK)\r
-                                       LEAVE_FF(fp->fs, FR_DISK_ERR);\r
-                               fp->flag &= ~FA__DIRTY;\r
+                       if (fp->flag & FA_DIRTY) {      /* Write-back cached data if needed */\r
+                               if (disk_write(fs->drv, fp->buf, fp->sect, 1) != RES_OK) LEAVE_FF(fs, FR_DISK_ERR);\r
+                               fp->flag &= (BYTE)~FA_DIRTY;\r
                        }\r
 #endif\r
                        /* Update the directory entry */\r
-                       res = move_window(fp->fs, fp->dir_sect);\r
-                       if (res == FR_OK) {\r
-                               dir = fp->dir_ptr;\r
-                               dir[DIR_Attr] |= AM_ARC;                                        /* Set archive bit */\r
-                               ST_DWORD(dir+DIR_FileSize, fp->fsize);          /* Update file size */\r
-                               st_clust(dir, fp->sclust);                                      /* Update start cluster */\r
-                               tm = GET_FATTIME();                                                     /* Update updated time */\r
-                               ST_DWORD(dir+DIR_WrtTime, tm);\r
-                               ST_WORD(dir+DIR_LstAccDate, 0);\r
-                               fp->flag &= ~FA__WRITTEN;\r
-                               fp->fs->wflag = 1;\r
-                               res = sync_fs(fp->fs);\r
+                       tm = GET_FATTIME();                             /* Modified time */\r
+#if _FS_EXFAT\r
+                       if (fs->fs_type == FS_EXFAT) {\r
+                               res = fill_fat_chain(&fp->obj); /* Create FAT chain if needed */\r
+                               if (res == FR_OK) {\r
+                                       DIR dj;\r
+\r
+                                       INIT_NAMBUF(fs);\r
+                                       res = load_obj_dir(&dj, &fp->obj);      /* Load directory entry block */\r
+                                       if (res == FR_OK) {\r
+                                               fs->dirbuf[XDIR_Attr] |= AM_ARC;                                /* Set archive bit */\r
+                                               fs->dirbuf[XDIR_GenFlags] = fp->obj.stat | 1;   /* Update file allocation info */\r
+                                               st_dword(fs->dirbuf + XDIR_FstClus, fp->obj.sclust);\r
+                                               st_qword(fs->dirbuf + XDIR_FileSize, fp->obj.objsize);\r
+                                               st_qword(fs->dirbuf + XDIR_ValidFileSize, fp->obj.objsize);\r
+                                               st_dword(fs->dirbuf + XDIR_ModTime, tm);                /* Update modified time */\r
+                                               fs->dirbuf[XDIR_ModTime10] = 0;\r
+                                               st_dword(fs->dirbuf + XDIR_AccTime, 0);\r
+                                               res = store_xdir(&dj);  /* Restore it to the directory */\r
+                                               if (res == FR_OK) {\r
+                                                       res = sync_fs(fs);\r
+                                                       fp->flag &= (BYTE)~FA_MODIFIED;\r
+                                               }\r
+                                       }\r
+                                       FREE_NAMBUF();\r
+                               }\r
+                       } else\r
+#endif\r
+                       {\r
+                               res = move_window(fs, fp->dir_sect);\r
+                               if (res == FR_OK) {\r
+                                       dir = fp->dir_ptr;\r
+                                       dir[DIR_Attr] |= AM_ARC;                                                /* Set archive bit */\r
+                                       st_clust(fp->obj.fs, dir, fp->obj.sclust);              /* Update file allocation info  */\r
+                                       st_dword(dir + DIR_FileSize, (DWORD)fp->obj.objsize);   /* Update file size */\r
+                                       st_dword(dir + DIR_ModTime, tm);                                /* Update modified time */\r
+                                       st_word(dir + DIR_LstAccDate, 0);\r
+                                       fs->wflag = 1;\r
+                                       res = sync_fs(fs);                                      /* Restore it to the directory */\r
+                                       fp->flag &= (BYTE)~FA_MODIFIED;\r
+                               }\r
                        }\r
                }\r
        }\r
 \r
-       LEAVE_FF(fp->fs, res);\r
+       LEAVE_FF(fs, res);\r
 }\r
 \r
 #endif /* !_FS_READONLY */\r
@@ -2840,27 +3743,26 @@ FRESULT f_sync (
 /*-----------------------------------------------------------------------*/\r
 \r
 FRESULT f_close (\r
-       FIL *fp         /* Pointer to the file object to be closed */\r
+       FILfp         /* Pointer to the file object to be closed */\r
 )\r
 {\r
        FRESULT res;\r
-\r
+       FATFS *fs;\r
 \r
 #if !_FS_READONLY\r
        res = f_sync(fp);                                       /* Flush cached data */\r
        if (res == FR_OK)\r
 #endif\r
        {\r
-               res = validate(fp);                             /* Lock volume */\r
+               res = validate(&fp->obj, &fs);  /* Lock volume */\r
                if (res == FR_OK) {\r
-#if _FS_REENTRANT\r
-                       FATFS *fs = fp->fs;\r
-#endif\r
-#if _FS_LOCK\r
-                       res = dec_lock(fp->lockid);     /* Decrement file open counter */\r
+#if _FS_LOCK != 0\r
+                       res = dec_lock(fp->obj.lockid); /* Decrement file open counter */\r
                        if (res == FR_OK)\r
 #endif\r
-                               fp->fs = 0;                             /* Invalidate file object */\r
+                       {\r
+                               fp->obj.fs = 0;                 /* Invalidate file object */\r
+                       }\r
 #if _FS_REENTRANT\r
                        unlock_fs(fs, FR_OK);           /* Unlock volume */\r
 #endif\r
@@ -2872,11 +3774,11 @@ FRESULT f_close (
 \r
 \r
 \r
+#if _FS_RPATH >= 1\r
 /*-----------------------------------------------------------------------*/\r
 /* Change Current Directory or Current Drive, Get Current Directory      */\r
 /*-----------------------------------------------------------------------*/\r
 \r
-#if _FS_RPATH >= 1\r
 #if _VOLUMES >= 2\r
 FRESULT f_chdrive (\r
        const TCHAR* path               /* Drive number */\r
@@ -2885,10 +3787,11 @@ FRESULT f_chdrive (
        int vol;\r
 \r
 \r
+       /* Get logical drive number */\r
        vol = get_ldnumber(&path);\r
        if (vol < 0) return FR_INVALID_DRIVE;\r
 \r
-       CurrVol = (BYTE)vol;\r
+       CurrVol = (BYTE)vol;    /* Set it as current volume */\r
 \r
        return FR_OK;\r
 }\r
@@ -2901,29 +3804,48 @@ FRESULT f_chdir (
 {\r
        FRESULT res;\r
        DIR dj;\r
-       DEF_NAMEBUF;\r
-\r
+       FATFS *fs;\r
+       DEF_NAMBUF\r
 \r
-       /* Get logical drive number */\r
-       res = find_volume(&dj.fs, &path, 0);\r
+       /* Get logical drive */\r
+       res = find_volume(&path, &fs, 0);\r
        if (res == FR_OK) {\r
-               INIT_BUF(dj);\r
+               dj.obj.fs = fs;\r
+               INIT_NAMBUF(fs);\r
                res = follow_path(&dj, path);           /* Follow the path */\r
-               FREE_BUF();\r
                if (res == FR_OK) {                                     /* Follow completed */\r
-                       if (!dj.dir) {\r
-                               dj.fs->cdir = dj.sclust;        /* Start directory itself */\r
+                       if (dj.fn[NSFLAG] & NS_NONAME) {\r
+                               fs->cdir = dj.obj.sclust;       /* It is the start directory itself */\r
+#if _FS_EXFAT\r
+                               if (fs->fs_type == FS_EXFAT) {\r
+                                       fs->cdc_scl = dj.obj.c_scl;\r
+                                       fs->cdc_size = dj.obj.c_size;\r
+                                       fs->cdc_ofs = dj.obj.c_ofs;\r
+                               }\r
+#endif\r
                        } else {\r
-                               if (dj.dir[DIR_Attr] & AM_DIR)  /* Reached to the directory */\r
-                                       dj.fs->cdir = ld_clust(dj.fs, dj.dir);\r
-                               else\r
+                               if (dj.obj.attr & AM_DIR) {     /* It is a sub-directory */\r
+#if _FS_EXFAT\r
+                                       if (fs->fs_type == FS_EXFAT) {\r
+                                               fs->cdir = ld_dword(fs->dirbuf + XDIR_FstClus);         /* Sub-directory cluster */\r
+                                               fs->cdc_scl = dj.obj.sclust;                                            /* Save containing directory information */\r
+                                               fs->cdc_size = ((DWORD)dj.obj.objsize & 0xFFFFFF00) | dj.obj.stat;\r
+                                               fs->cdc_ofs = dj.blk_ofs;\r
+                                       } else\r
+#endif\r
+                                       {\r
+                                               fs->cdir = ld_clust(fs, dj.dir);                                        /* Sub-directory cluster */\r
+                                       }\r
+                               } else {\r
                                        res = FR_NO_PATH;               /* Reached but a file */\r
+                               }\r
                        }\r
                }\r
+               FREE_NAMBUF();\r
                if (res == FR_NO_FILE) res = FR_NO_PATH;\r
        }\r
 \r
-       LEAVE_FF(dj.fs, res);\r
+       LEAVE_FF(fs, res);\r
 }\r
 \r
 \r
@@ -2935,51 +3857,47 @@ FRESULT f_getcwd (
 {\r
        FRESULT res;\r
        DIR dj;\r
+       FATFS *fs;\r
        UINT i, n;\r
        DWORD ccl;\r
        TCHAR *tp;\r
        FILINFO fno;\r
-       DEF_NAMEBUF;\r
+       DEF_NAMBUF\r
 \r
 \r
        *buff = 0;\r
-       /* Get logical drive number */\r
-       res = find_volume(&dj.fs, (const TCHAR**)&buff, 0);     /* Get current volume */\r
+       /* Get logical drive */\r
+       res = find_volume((const TCHAR**)&buff, &fs, 0);        /* Get current volume */\r
        if (res == FR_OK) {\r
-               INIT_BUF(dj);\r
+               dj.obj.fs = fs;\r
+               INIT_NAMBUF(fs);\r
                i = len;                        /* Bottom of buffer (directory stack base) */\r
-               dj.sclust = dj.fs->cdir;                        /* Start to follow upper directory from current directory */\r
-               while ((ccl = dj.sclust) != 0) {        /* Repeat while current directory is a sub-directory */\r
-                       res = dir_sdi(&dj, 1);                  /* Get parent directory */\r
-                       if (res != FR_OK) break;\r
-                       res = dir_read(&dj, 0);\r
-                       if (res != FR_OK) break;\r
-                       dj.sclust = ld_clust(dj.fs, dj.dir);    /* Goto parent directory */\r
-                       res = dir_sdi(&dj, 0);\r
-                       if (res != FR_OK) break;\r
-                       do {                                                    /* Find the entry links to the child directory */\r
-                               res = dir_read(&dj, 0);\r
+               if (!_FS_EXFAT || fs->fs_type != FS_EXFAT) {    /* (Cannot do getcwd on exFAT and returns root path) */\r
+                       dj.obj.sclust = fs->cdir;                               /* Start to follow upper directory from current directory */\r
+                       while ((ccl = dj.obj.sclust) != 0) {    /* Repeat while current directory is a sub-directory */\r
+                               res = dir_sdi(&dj, 1 * SZDIRE); /* Get parent directory */\r
                                if (res != FR_OK) break;\r
-                               if (ccl == ld_clust(dj.fs, dj.dir)) break;      /* Found the entry */\r
-                               res = dir_next(&dj, 0); \r
-                       } while (res == FR_OK);\r
-                       if (res == FR_NO_FILE) res = FR_INT_ERR;/* It cannot be 'not found'. */\r
-                       if (res != FR_OK) break;\r
-#if _USE_LFN\r
-                       fno.lfname = buff;\r
-                       fno.lfsize = i;\r
-#endif\r
-                       get_fileinfo(&dj, &fno);                /* Get the directory name and push it to the buffer */\r
-                       tp = fno.fname;\r
-#if _USE_LFN\r
-                       if (*buff) tp = buff;\r
-#endif\r
-                       for (n = 0; tp[n]; n++) ;\r
-                       if (i < n + 3) {\r
-                               res = FR_NOT_ENOUGH_CORE; break;\r
+                               res = move_window(fs, dj.sect);\r
+                               if (res != FR_OK) break;\r
+                               dj.obj.sclust = ld_clust(fs, dj.dir);   /* Goto parent directory */\r
+                               res = dir_sdi(&dj, 0);\r
+                               if (res != FR_OK) break;\r
+                               do {                                                    /* Find the entry links to the child directory */\r
+                                       res = dir_read(&dj, 0);\r
+                                       if (res != FR_OK) break;\r
+                                       if (ccl == ld_clust(fs, dj.dir)) break; /* Found the entry */\r
+                                       res = dir_next(&dj, 0);\r
+                               } while (res == FR_OK);\r
+                               if (res == FR_NO_FILE) res = FR_INT_ERR;/* It cannot be 'not found'. */\r
+                               if (res != FR_OK) break;\r
+                               get_fileinfo(&dj, &fno);                /* Get the directory name and push it to the buffer */\r
+                               for (n = 0; fno.fname[n]; n++) ;\r
+                               if (i < n + 3) {\r
+                                       res = FR_NOT_ENOUGH_CORE; break;\r
+                               }\r
+                               while (n) buff[--i] = fno.fname[--n];\r
+                               buff[--i] = '/';\r
                        }\r
-                       while (n) buff[--i] = tp[--n];\r
-                       buff[--i] = '/';\r
                }\r
                tp = buff;\r
                if (res == FR_OK) {\r
@@ -2996,11 +3914,12 @@ FRESULT f_getcwd (
                        }\r
                }\r
                *tp = 0;\r
-               FREE_BUF();\r
+               FREE_NAMBUF();\r
        }\r
 \r
-       LEAVE_FF(dj.fs, res);\r
+       LEAVE_FF(fs, res);\r
 }\r
+\r
 #endif /* _FS_RPATH >= 2 */\r
 #endif /* _FS_RPATH >= 1 */\r
 \r
@@ -3013,68 +3932,65 @@ FRESULT f_getcwd (
 \r
 FRESULT f_lseek (\r
        FIL* fp,                /* Pointer to the file object */\r
-       DWORD ofs               /* File pointer from top of file */\r
+       FSIZE_t ofs             /* File pointer from top of file */\r
 )\r
 {\r
        FRESULT res;\r
+       FATFS *fs;\r
+       DWORD clst, bcs, nsect;\r
+       FSIZE_t ifptr;\r
+#if _USE_FASTSEEK\r
+       DWORD cl, pcl, ncl, tcl, dsc, tlen, ulen, *tbl;\r
+#endif\r
 \r
-\r
-       res = validate(fp);                                     /* Check validity of the object */\r
-       if (res != FR_OK) LEAVE_FF(fp->fs, res);\r
-       if (fp->err)                                            /* Check error */\r
-               LEAVE_FF(fp->fs, (FRESULT)fp->err);\r
-\r
+       res = validate(&fp->obj, &fs);          /* Check validity of the file object */\r
+       if (res != FR_OK || (res = (FRESULT)fp->err) != FR_OK) LEAVE_FF(fs, res);       /* Check validity */\r
 #if _USE_FASTSEEK\r
        if (fp->cltbl) {        /* Fast seek */\r
-               DWORD cl, pcl, ncl, tcl, dsc, tlen, ulen, *tbl;\r
-\r
                if (ofs == CREATE_LINKMAP) {    /* Create CLMT */\r
                        tbl = fp->cltbl;\r
                        tlen = *tbl++; ulen = 2;        /* Given table size and required table size */\r
-                       cl = fp->sclust;                        /* Top of the chain */\r
+                       cl = fp->obj.sclust;            /* Origin of the chain */\r
                        if (cl) {\r
                                do {\r
                                        /* Get a fragment */\r
                                        tcl = cl; ncl = 0; ulen += 2;   /* Top, length and used items */\r
                                        do {\r
                                                pcl = cl; ncl++;\r
-                                               cl = get_fat(fp->fs, cl);\r
-                                               if (cl <= 1) ABORT(fp->fs, FR_INT_ERR);\r
-                                               if (cl == 0xFFFFFFFF) ABORT(fp->fs, FR_DISK_ERR);\r
+                                               cl = get_fat(&fp->obj, cl);\r
+                                               if (cl <= 1) ABORT(fs, FR_INT_ERR);\r
+                                               if (cl == 0xFFFFFFFF) ABORT(fs, FR_DISK_ERR);\r
                                        } while (cl == pcl + 1);\r
                                        if (ulen <= tlen) {             /* Store the length and top of the fragment */\r
                                                *tbl++ = ncl; *tbl++ = tcl;\r
                                        }\r
-                               } while (cl < fp->fs->n_fatent);        /* Repeat until end of chain */\r
+                               } while (cl < fs->n_fatent);    /* Repeat until end of chain */\r
                        }\r
                        *fp->cltbl = ulen;      /* Number of items used */\r
-                       if (ulen <= tlen)\r
+                       if (ulen <= tlen) {\r
                                *tbl = 0;               /* Terminate table */\r
-                       else\r
+                       } else {\r
                                res = FR_NOT_ENOUGH_CORE;       /* Given table size is smaller than required */\r
-\r
+                       }\r
                } else {                                                /* Fast seek */\r
-                       if (ofs > fp->fsize)            /* Clip offset at the file size */\r
-                               ofs = fp->fsize;\r
+                       if (ofs > fp->obj.objsize) ofs = fp->obj.objsize;       /* Clip offset at the file size */\r
                        fp->fptr = ofs;                         /* Set file pointer */\r
                        if (ofs) {\r
                                fp->clust = clmt_clust(fp, ofs - 1);\r
-                               dsc = clust2sect(fp->fs, fp->clust);\r
-                               if (!dsc) ABORT(fp->fs, FR_INT_ERR);\r
-                               dsc += (ofs - 1) / SS(fp->fs) & (fp->fs->csize - 1);\r
-                               if (fp->fptr % SS(fp->fs) && dsc != fp->dsect) {        /* Refill sector cache if needed */\r
+                               dsc = clust2sect(fs, fp->clust);\r
+                               if (!dsc) ABORT(fs, FR_INT_ERR);\r
+                               dsc += (DWORD)((ofs - 1) / SS(fs)) & (fs->csize - 1);\r
+                               if (fp->fptr % SS(fs) && dsc != fp->sect) {     /* Refill sector cache if needed */\r
 #if !_FS_TINY\r
 #if !_FS_READONLY\r
-                                       if (fp->flag & FA__DIRTY) {             /* Write-back dirty sector cache */\r
-                                               if (disk_write(fp->fs->drv, fp->buf, fp->dsect, 1) != RES_OK)\r
-                                                       ABORT(fp->fs, FR_DISK_ERR);\r
-                                               fp->flag &= ~FA__DIRTY;\r
+                                       if (fp->flag & FA_DIRTY) {              /* Write-back dirty sector cache */\r
+                                               if (disk_write(fs->drv, fp->buf, fp->sect, 1) != RES_OK) ABORT(fs, FR_DISK_ERR);\r
+                                               fp->flag &= (BYTE)~FA_DIRTY;\r
                                        }\r
 #endif\r
-                                       if (disk_read(fp->fs->drv, fp->buf, dsc, 1) != RES_OK)  /* Load current sector */\r
-                                               ABORT(fp->fs, FR_DISK_ERR);\r
+                                       if (disk_read(fs->drv, fp->buf, dsc, 1) != RES_OK) ABORT(fs, FR_DISK_ERR);      /* Load current sector */\r
 #endif\r
-                                       fp->dsect = dsc;\r
+                                       fp->sect = dsc;\r
                                }\r
                        }\r
                }\r
@@ -3083,83 +3999,82 @@ FRESULT f_lseek (
 \r
        /* Normal Seek */\r
        {\r
-               DWORD clst, bcs, nsect, ifptr;\r
-\r
-               if (ofs > fp->fsize                                     /* In read-only mode, clip offset with the file size */\r
-#if !_FS_READONLY\r
-                        && !(fp->flag & FA_WRITE)\r
+#if _FS_EXFAT\r
+               if (fs->fs_type != FS_EXFAT && ofs >= 0x100000000) ofs = 0xFFFFFFFF;    /* Clip at 4GiB-1 if at FATxx */\r
 #endif\r
-                       ) ofs = fp->fsize;\r
-\r
+               if (ofs > fp->obj.objsize && (_FS_READONLY || !(fp->flag & FA_WRITE))) {        /* In read-only mode, clip offset with the file size */\r
+                       ofs = fp->obj.objsize;\r
+               }\r
                ifptr = fp->fptr;\r
                fp->fptr = nsect = 0;\r
                if (ofs) {\r
-                       bcs = (DWORD)fp->fs->csize * SS(fp->fs);        /* Cluster size (byte) */\r
+                       bcs = (DWORD)fs->csize * SS(fs);        /* Cluster size (byte) */\r
                        if (ifptr > 0 &&\r
                                (ofs - 1) / bcs >= (ifptr - 1) / bcs) { /* When seek to same or following cluster, */\r
-                               fp->fptr = (ifptr - 1) & ~(bcs - 1);    /* start from the current cluster */\r
+                               fp->fptr = (ifptr - 1) & ~(FSIZE_t)(bcs - 1);   /* start from the current cluster */\r
                                ofs -= fp->fptr;\r
                                clst = fp->clust;\r
                        } else {                                                                        /* When seek to back cluster, */\r
-                               clst = fp->sclust;                                              /* start from the first cluster */\r
+                               clst = fp->obj.sclust;                                  /* start from the first cluster */\r
 #if !_FS_READONLY\r
                                if (clst == 0) {                                                /* If no cluster chain, create a new chain */\r
-                                       clst = create_chain(fp->fs, 0);\r
-                                       if (clst == 1) ABORT(fp->fs, FR_INT_ERR);\r
-                                       if (clst == 0xFFFFFFFF) ABORT(fp->fs, FR_DISK_ERR);\r
-                                       fp->sclust = clst;\r
+                                       clst = create_chain(&fp->obj, 0);\r
+                                       if (clst == 1) ABORT(fs, FR_INT_ERR);\r
+                                       if (clst == 0xFFFFFFFF) ABORT(fs, FR_DISK_ERR);\r
+                                       fp->obj.sclust = clst;\r
                                }\r
 #endif\r
                                fp->clust = clst;\r
                        }\r
                        if (clst != 0) {\r
                                while (ofs > bcs) {                                             /* Cluster following loop */\r
+                                       ofs -= bcs; fp->fptr += bcs;\r
 #if !_FS_READONLY\r
                                        if (fp->flag & FA_WRITE) {                      /* Check if in write mode or not */\r
-                                               clst = create_chain(fp->fs, clst);      /* Force stretch if in write mode */\r
-                                               if (clst == 0) {                                /* When disk gets full, clip file size */\r
-                                                       ofs = bcs; break;\r
+                                               if (_FS_EXFAT && fp->fptr > fp->obj.objsize) {  /* No FAT chain object needs correct objsize to generate FAT value */\r
+                                                       fp->obj.objsize = fp->fptr;\r
+                                                       fp->flag |= FA_MODIFIED;\r
+                                               }\r
+                                               clst = create_chain(&fp->obj, clst);    /* Follow chain with forceed stretch */\r
+                                               if (clst == 0) {                                /* Clip file size in case of disk full */\r
+                                                       ofs = 0; break;\r
                                                }\r
                                        } else\r
 #endif\r
-                                               clst = get_fat(fp->fs, clst);   /* Follow cluster chain if not in write mode */\r
-                                       if (clst == 0xFFFFFFFF) ABORT(fp->fs, FR_DISK_ERR);\r
-                                       if (clst <= 1 || clst >= fp->fs->n_fatent) ABORT(fp->fs, FR_INT_ERR);\r
+                                       {\r
+                                               clst = get_fat(&fp->obj, clst); /* Follow cluster chain if not in write mode */\r
+                                       }\r
+                                       if (clst == 0xFFFFFFFF) ABORT(fs, FR_DISK_ERR);\r
+                                       if (clst <= 1 || clst >= fs->n_fatent) ABORT(fs, FR_INT_ERR);\r
                                        fp->clust = clst;\r
-                                       fp->fptr += bcs;\r
-                                       ofs -= bcs;\r
                                }\r
                                fp->fptr += ofs;\r
-                               if (ofs % SS(fp->fs)) {\r
-                                       nsect = clust2sect(fp->fs, clst);       /* Current sector */\r
-                                       if (!nsect) ABORT(fp->fs, FR_INT_ERR);\r
-                                       nsect += ofs / SS(fp->fs);\r
+                               if (ofs % SS(fs)) {\r
+                                       nsect = clust2sect(fs, clst);   /* Current sector */\r
+                                       if (!nsect) ABORT(fs, FR_INT_ERR);\r
+                                       nsect += (DWORD)(ofs / SS(fs));\r
                                }\r
                        }\r
                }\r
-               if (fp->fptr % SS(fp->fs) && nsect != fp->dsect) {      /* Fill sector cache if needed */\r
+               if (!_FS_READONLY && fp->fptr > fp->obj.objsize) {              /* Set file change flag if the file size is extended */\r
+                       fp->obj.objsize = fp->fptr;\r
+                       fp->flag |= FA_MODIFIED;\r
+               }\r
+               if (fp->fptr % SS(fs) && nsect != fp->sect) {   /* Fill sector cache if needed */\r
 #if !_FS_TINY\r
 #if !_FS_READONLY\r
-                       if (fp->flag & FA__DIRTY) {                     /* Write-back dirty sector cache */\r
-                               if (disk_write(fp->fs->drv, fp->buf, fp->dsect, 1) != RES_OK)\r
-                                       ABORT(fp->fs, FR_DISK_ERR);\r
-                               fp->flag &= ~FA__DIRTY;\r
+                       if (fp->flag & FA_DIRTY) {                      /* Write-back dirty sector cache */\r
+                               if (disk_write(fs->drv, fp->buf, fp->sect, 1) != RES_OK) ABORT(fs, FR_DISK_ERR);\r
+                               fp->flag &= (BYTE)~FA_DIRTY;\r
                        }\r
 #endif\r
-                       if (disk_read(fp->fs->drv, fp->buf, nsect, 1) != RES_OK)        /* Fill sector cache */\r
-                               ABORT(fp->fs, FR_DISK_ERR);\r
+                       if (disk_read(fs->drv, fp->buf, nsect, 1) != RES_OK) ABORT(fs, FR_DISK_ERR);    /* Fill sector cache */\r
 #endif\r
-                       fp->dsect = nsect;\r
-               }\r
-#if !_FS_READONLY\r
-               if (fp->fptr > fp->fsize) {                     /* Set file change flag if the file size is extended */\r
-                       fp->fsize = fp->fptr;\r
-                       fp->flag |= FA__WRITTEN;\r
+                       fp->sect = nsect;\r
                }\r
-#endif\r
        }\r
 \r
-       LEAVE_FF(fp->fs, res);\r
+       LEAVE_FF(fs, res);\r
 }\r
 \r
 \r
@@ -3175,45 +4090,59 @@ FRESULT f_opendir (
 )\r
 {\r
        FRESULT res;\r
-       FATFS* fs;\r
-       DEF_NAMEBUF;\r
+       FATFS *fs;\r
+       _FDID *obj;\r
+       DEF_NAMBUF\r
 \r
 \r
        if (!dp) return FR_INVALID_OBJECT;\r
 \r
-       /* Get logical drive number */\r
-       res = find_volume(&fs, &path, 0);\r
+       /* Get logical drive */\r
+       obj = &dp->obj;\r
+       res = find_volume(&path, &fs, 0);\r
        if (res == FR_OK) {\r
-               dp->fs = fs;\r
-               INIT_BUF(*dp);\r
+               obj->fs = fs;\r
+               INIT_NAMBUF(fs);\r
                res = follow_path(dp, path);                    /* Follow the path to the directory */\r
-               FREE_BUF();\r
                if (res == FR_OK) {                                             /* Follow completed */\r
-                       if (dp->dir) {                                          /* It is not the origin directory itself */\r
-                               if (dp->dir[DIR_Attr] & AM_DIR) /* The object is a sub directory */\r
-                                       dp->sclust = ld_clust(fs, dp->dir);\r
-                               else                                                    /* The object is a file */\r
+                       if (!(dp->fn[NSFLAG] & NS_NONAME)) {    /* It is not the origin directory itself */\r
+                               if (obj->attr & AM_DIR) {               /* This object is a sub-directory */\r
+#if _FS_EXFAT\r
+                                       if (fs->fs_type == FS_EXFAT) {\r
+                                               obj->c_scl = obj->sclust;       /* Save containing directory inforamation */\r
+                                               obj->c_size = ((DWORD)obj->objsize & 0xFFFFFF00) | obj->stat;\r
+                                               obj->c_ofs = dp->blk_ofs;\r
+                                               obj->sclust = ld_dword(fs->dirbuf + XDIR_FstClus);      /* Get object location and status */\r
+                                               obj->objsize = ld_qword(fs->dirbuf + XDIR_FileSize);\r
+                                               obj->stat = fs->dirbuf[XDIR_GenFlags] & 2;\r
+                                       } else\r
+#endif\r
+                                       {\r
+                                               obj->sclust = ld_clust(fs, dp->dir);    /* Get object location */\r
+                                       }\r
+                               } else {                                                /* This object is a file */\r
                                        res = FR_NO_PATH;\r
+                               }\r
                        }\r
                        if (res == FR_OK) {\r
-                               dp->id = fs->id;\r
+                               obj->id = fs->id;\r
                                res = dir_sdi(dp, 0);                   /* Rewind directory */\r
-#if _FS_LOCK\r
+#if _FS_LOCK != 0\r
                                if (res == FR_OK) {\r
-                                       if (dp->sclust) {\r
-                                               dp->lockid = inc_lock(dp, 0);   /* Lock the sub directory */\r
-                                               if (!dp->lockid)\r
-                                                       res = FR_TOO_MANY_OPEN_FILES;\r
+                                       if (obj->sclust) {\r
+                                               obj->lockid = inc_lock(dp, 0);  /* Lock the sub directory */\r
+                                               if (!obj->lockid) res = FR_TOO_MANY_OPEN_FILES;\r
                                        } else {\r
-                                               dp->lockid = 0; /* Root directory need not to be locked */\r
+                                               obj->lockid = 0;        /* Root directory need not to be locked */\r
                                        }\r
                                }\r
 #endif\r
                        }\r
                }\r
+               FREE_NAMBUF();\r
                if (res == FR_NO_FILE) res = FR_NO_PATH;\r
        }\r
-       if (res != FR_OK) dp->fs = 0;           /* Invalidate the directory object if function faild */\r
+       if (res != FR_OK) obj->fs = 0;          /* Invalidate the directory object if function faild */\r
 \r
        LEAVE_FF(fs, res);\r
 }\r
@@ -3230,19 +4159,20 @@ FRESULT f_closedir (
 )\r
 {\r
        FRESULT res;\r
+       FATFS *fs;\r
 \r
 \r
-       res = validate(dp);\r
+       res = validate(&dp->obj, &fs);                  /* Check validity of the file object */\r
        if (res == FR_OK) {\r
-#if _FS_REENTRANT\r
-               FATFS *fs = dp->fs;\r
-#endif\r
-#if _FS_LOCK\r
-               if (dp->lockid)                         /* Decrement sub-directory open counter */\r
-                       res = dec_lock(dp->lockid);\r
+#if _FS_LOCK != 0\r
+               if (dp->obj.lockid) {                           /* Decrement sub-directory open counter */\r
+                       res = dec_lock(dp->obj.lockid);\r
+               }\r
                if (res == FR_OK)\r
 #endif\r
-                       dp->fs = 0;                             /* Invalidate directory object */\r
+               {\r
+                       dp->obj.fs = 0;                 /* Invalidate directory object */\r
+               }\r
 #if _FS_REENTRANT\r
                unlock_fs(fs, FR_OK);           /* Unlock volume */\r
 #endif\r
@@ -3263,35 +4193,81 @@ FRESULT f_readdir (
 )\r
 {\r
        FRESULT res;\r
-       DEF_NAMEBUF;\r
+       FATFS *fs;\r
+       DEF_NAMBUF\r
 \r
 \r
-       res = validate(dp);                                             /* Check validity of the object */\r
+       res = validate(&dp->obj, &fs);  /* Check validity of the directory object */\r
        if (res == FR_OK) {\r
                if (!fno) {\r
                        res = dir_sdi(dp, 0);                   /* Rewind the directory object */\r
                } else {\r
-                       INIT_BUF(*dp);\r
+                       INIT_NAMBUF(fs);\r
                        res = dir_read(dp, 0);                  /* Read an item */\r
-                       if (res == FR_NO_FILE) {                /* Reached end of directory */\r
-                               dp->sect = 0;\r
-                               res = FR_OK;\r
-                       }\r
+                       if (res == FR_NO_FILE) res = FR_OK;     /* Ignore end of directory */\r
                        if (res == FR_OK) {                             /* A valid entry is found */\r
                                get_fileinfo(dp, fno);          /* Get the object information */\r
                                res = dir_next(dp, 0);          /* Increment index for next */\r
-                               if (res == FR_NO_FILE) {\r
-                                       dp->sect = 0;\r
-                                       res = FR_OK;\r
-                               }\r
+                               if (res == FR_NO_FILE) res = FR_OK;     /* Ignore end of directory now */\r
                        }\r
-                       FREE_BUF();\r
+                       FREE_NAMBUF();\r
                }\r
        }\r
+       LEAVE_FF(fs, res);\r
+}\r
+\r
+\r
+\r
+#if _USE_FIND\r
+/*-----------------------------------------------------------------------*/\r
+/* Find Next File                                                        */\r
+/*-----------------------------------------------------------------------*/\r
+\r
+FRESULT f_findnext (\r
+       DIR* dp,                /* Pointer to the open directory object */\r
+       FILINFO* fno    /* Pointer to the file information structure */\r
+)\r
+{\r
+       FRESULT res;\r
+\r
+\r
+       for (;;) {\r
+               res = f_readdir(dp, fno);               /* Get a directory item */\r
+               if (res != FR_OK || !fno || !fno->fname[0]) break;      /* Terminate if any error or end of directory */\r
+               if (pattern_matching(dp->pat, fno->fname, 0, 0)) break;         /* Test for the file name */\r
+#if _USE_LFN != 0 && _USE_FIND == 2\r
+               if (pattern_matching(dp->pat, fno->altname, 0, 0)) break;       /* Test for alternative name if exist */\r
+#endif\r
+       }\r
+       return res;\r
+}\r
+\r
+\r
+\r
+/*-----------------------------------------------------------------------*/\r
+/* Find First File                                                       */\r
+/*-----------------------------------------------------------------------*/\r
 \r
-       LEAVE_FF(dp->fs, res);\r
+FRESULT f_findfirst (\r
+       DIR* dp,                                /* Pointer to the blank directory object */\r
+       FILINFO* fno,                   /* Pointer to the file information structure */\r
+       const TCHAR* path,              /* Pointer to the directory to open */\r
+       const TCHAR* pattern    /* Pointer to the matching pattern */\r
+)\r
+{\r
+       FRESULT res;\r
+\r
+\r
+       dp->pat = pattern;              /* Save pointer to pattern string */\r
+       res = f_opendir(dp, path);              /* Open the target directory */\r
+       if (res == FR_OK) {\r
+               res = f_findnext(dp, fno);      /* Find the first item */\r
+       }\r
+       return res;\r
 }\r
 \r
+#endif /* _USE_FIND */\r
+\r
 \r
 \r
 #if _FS_MINIMIZE == 0\r
@@ -3306,25 +4282,25 @@ FRESULT f_stat (
 {\r
        FRESULT res;\r
        DIR dj;\r
-       DEF_NAMEBUF;\r
+       DEF_NAMBUF\r
 \r
 \r
-       /* Get logical drive number */\r
-       res = find_volume(&dj.fs, &path, 0);\r
+       /* Get logical drive */\r
+       res = find_volume(&path, &dj.obj.fs, 0);\r
        if (res == FR_OK) {\r
-               INIT_BUF(dj);\r
+               INIT_NAMBUF(dj.obj.fs);\r
                res = follow_path(&dj, path);   /* Follow the file path */\r
                if (res == FR_OK) {                             /* Follow completed */\r
-                       if (dj.dir) {           /* Found an object */\r
-                               if (fno) get_fileinfo(&dj, fno);\r
-                       } else {                        /* It is root directory */\r
+                       if (dj.fn[NSFLAG] & NS_NONAME) {        /* It is origin directory */\r
                                res = FR_INVALID_NAME;\r
+                       } else {                                                        /* Found an object */\r
+                               if (fno) get_fileinfo(&dj, fno);\r
                        }\r
                }\r
-               FREE_BUF();\r
+               FREE_NAMBUF();\r
        }\r
 \r
-       LEAVE_FF(dj.fs, res);\r
+       LEAVE_FF(dj.obj.fs, res);\r
 }\r
 \r
 \r
@@ -3342,55 +4318,75 @@ FRESULT f_getfree (
 {\r
        FRESULT res;\r
        FATFS *fs;\r
-       DWORD n, clst, sect, stat;\r
+       DWORD nfree, clst, sect, stat;\r
        UINT i;\r
-       BYTE fat, *p;\r
+       BYTE *p;\r
+       _FDID obj;\r
 \r
 \r
-       /* Get logical drive number */\r
-       res = find_volume(fatfs, &path, 0);\r
-       fs = *fatfs;\r
+       /* Get logical drive */\r
+       res = find_volume(&path, &fs, 0);\r
        if (res == FR_OK) {\r
-               /* If free_clust is valid, return it without full cluster scan */\r
-               if (fs->free_clust <= fs->n_fatent - 2) {\r
-                       *nclst = fs->free_clust;\r
+               *fatfs = fs;                            /* Return ptr to the fs object */\r
+               /* If free_clst is valid, return it without full cluster scan */\r
+               if (fs->free_clst <= fs->n_fatent - 2) {\r
+                       *nclst = fs->free_clst;\r
                } else {\r
                        /* Get number of free clusters */\r
-                       fat = fs->fs_type;\r
-                       n = 0;\r
-                       if (fat == FS_FAT12) {\r
-                               clst = 2;\r
+                       nfree = 0;\r
+                       if (fs->fs_type == FS_FAT12) {  /* FAT12: Sector unalighed FAT entries */\r
+                               clst = 2; obj.fs = fs;\r
                                do {\r
-                                       stat = get_fat(fs, clst);\r
+                                       stat = get_fat(&obj, clst);\r
                                        if (stat == 0xFFFFFFFF) { res = FR_DISK_ERR; break; }\r
                                        if (stat == 1) { res = FR_INT_ERR; break; }\r
-                                       if (stat == 0) n++;\r
+                                       if (stat == 0) nfree++;\r
                                } while (++clst < fs->n_fatent);\r
                        } else {\r
-                               clst = fs->n_fatent;\r
-                               sect = fs->fatbase;\r
-                               i = 0; p = 0;\r
-                               do {\r
-                                       if (!i) {\r
-                                               res = move_window(fs, sect++);\r
-                                               if (res != FR_OK) break;\r
-                                               p = fs->win;\r
-                                               i = SS(fs);\r
-                                       }\r
-                                       if (fat == FS_FAT16) {\r
-                                               if (LD_WORD(p) == 0) n++;\r
-                                               p += 2; i -= 2;\r
-                                       } else {\r
-                                               if ((LD_DWORD(p) & 0x0FFFFFFF) == 0) n++;\r
-                                               p += 4; i -= 4;\r
-                                       }\r
-                               } while (--clst);\r
+#if _FS_EXFAT\r
+                               if (fs->fs_type == FS_EXFAT) {  /* exFAT: Scan bitmap table */\r
+                                       BYTE bm;\r
+                                       UINT b;\r
+\r
+                                       clst = fs->n_fatent - 2;\r
+                                       sect = fs->database;\r
+                                       i = 0;\r
+                                       do {\r
+                                               if (i == 0 && (res = move_window(fs, sect++)) != FR_OK) break;\r
+                                               for (b = 8, bm = fs->win[i]; b && clst; b--, clst--) {\r
+                                                       if (!(bm & 1)) nfree++;\r
+                                                       bm >>= 1;\r
+                                               }\r
+                                               i = (i + 1) % SS(fs);\r
+                                       } while (clst);\r
+                               } else\r
+#endif\r
+                               {       /* FAT16/32: Sector alighed FAT entries */\r
+                                       clst = fs->n_fatent; sect = fs->fatbase;\r
+                                       i = 0; p = 0;\r
+                                       do {\r
+                                               if (i == 0) {\r
+                                                       res = move_window(fs, sect++);\r
+                                                       if (res != FR_OK) break;\r
+                                                       p = fs->win;\r
+                                                       i = SS(fs);\r
+                                               }\r
+                                               if (fs->fs_type == FS_FAT16) {\r
+                                                       if (ld_word(p) == 0) nfree++;\r
+                                                       p += 2; i -= 2;\r
+                                               } else {\r
+                                                       if ((ld_dword(p) & 0x0FFFFFFF) == 0) nfree++;\r
+                                                       p += 4; i -= 4;\r
+                                               }\r
+                                       } while (--clst);\r
+                               }\r
                        }\r
-                       fs->free_clust = n;\r
-                       fs->fsi_flag |= 1;\r
-                       *nclst = n;\r
+                       *nclst = nfree;                 /* Return the free clusters */\r
+                       fs->free_clst = nfree;  /* Now free_clst is valid */\r
+                       fs->fsi_flag |= 1;              /* FSInfo is to be updated */\r
                }\r
        }\r
+\r
        LEAVE_FF(fs, res);\r
 }\r
 \r
@@ -3406,55 +4402,49 @@ FRESULT f_truncate (
 )\r
 {\r
        FRESULT res;\r
+       FATFS *fs;\r
        DWORD ncl;\r
 \r
 \r
-       res = validate(fp);                                             /* Check validity of the object */\r
-       if (res == FR_OK) {\r
-               if (fp->err) {                                          /* Check error */\r
-                       res = (FRESULT)fp->err;\r
-               } else {\r
-                       if (!(fp->flag & FA_WRITE))             /* Check access mode */\r
-                               res = FR_DENIED;\r
-               }\r
-       }\r
-       if (res == FR_OK) {\r
-               if (fp->fsize > fp->fptr) {\r
-                       fp->fsize = fp->fptr;   /* Set file size to current R/W point */\r
-                       fp->flag |= FA__WRITTEN;\r
-                       if (fp->fptr == 0) {    /* When set file size to zero, remove entire cluster chain */\r
-                               res = remove_chain(fp->fs, fp->sclust);\r
-                               fp->sclust = 0;\r
-                       } else {                                /* When truncate a part of the file, remove remaining clusters */\r
-                               ncl = get_fat(fp->fs, fp->clust);\r
-                               res = FR_OK;\r
-                               if (ncl == 0xFFFFFFFF) res = FR_DISK_ERR;\r
-                               if (ncl == 1) res = FR_INT_ERR;\r
-                               if (res == FR_OK && ncl < fp->fs->n_fatent) {\r
-                                       res = put_fat(fp->fs, fp->clust, 0x0FFFFFFF);\r
-                                       if (res == FR_OK) res = remove_chain(fp->fs, ncl);\r
-                               }\r
+       res = validate(&fp->obj, &fs);  /* Check validity of the file object */\r
+       if (res != FR_OK || (res = (FRESULT)fp->err) != FR_OK) LEAVE_FF(fs, res);\r
+       if (!(fp->flag & FA_WRITE)) LEAVE_FF(fs, FR_DENIED);    /* Check access mode */\r
+\r
+       if (fp->obj.objsize > fp->fptr) {\r
+               if (fp->fptr == 0) {    /* When set file size to zero, remove entire cluster chain */\r
+                       res = remove_chain(&fp->obj, fp->obj.sclust, 0);\r
+                       fp->obj.sclust = 0;\r
+               } else {                                /* When truncate a part of the file, remove remaining clusters */\r
+                       ncl = get_fat(&fp->obj, fp->clust);\r
+                       res = FR_OK;\r
+                       if (ncl == 0xFFFFFFFF) res = FR_DISK_ERR;\r
+                       if (ncl == 1) res = FR_INT_ERR;\r
+                       if (res == FR_OK && ncl < fs->n_fatent) {\r
+                               res = remove_chain(&fp->obj, ncl, fp->clust);\r
                        }\r
+               }\r
+               fp->obj.objsize = fp->fptr;     /* Set file size to current R/W point */\r
+               fp->flag |= FA_MODIFIED;\r
 #if !_FS_TINY\r
-                       if (res == FR_OK && (fp->flag & FA__DIRTY)) {\r
-                               if (disk_write(fp->fs->drv, fp->buf, fp->dsect, 1) != RES_OK)\r
-                                       res = FR_DISK_ERR;\r
-                               else\r
-                                       fp->flag &= ~FA__DIRTY;\r
+               if (res == FR_OK && (fp->flag & FA_DIRTY)) {\r
+                       if (disk_write(fs->drv, fp->buf, fp->sect, 1) != RES_OK) {\r
+                               res = FR_DISK_ERR;\r
+                       } else {\r
+                               fp->flag &= (BYTE)~FA_DIRTY;\r
                        }\r
-#endif\r
                }\r
-               if (res != FR_OK) fp->err = (FRESULT)res;\r
+#endif\r
+               if (res != FR_OK) ABORT(fs, res);\r
        }\r
 \r
-       LEAVE_FF(fp->fs, res);\r
+       LEAVE_FF(fs, res);\r
 }\r
 \r
 \r
 \r
 \r
 /*-----------------------------------------------------------------------*/\r
-/* Delete a File or Directory                                            */\r
+/* Delete a File/Directory                                               */\r
 /*-----------------------------------------------------------------------*/\r
 \r
 FRESULT f_unlink (\r
@@ -3463,59 +4453,86 @@ FRESULT f_unlink (
 {\r
        FRESULT res;\r
        DIR dj, sdj;\r
-       BYTE *dir;\r
        DWORD dclst = 0;\r
-       DEF_NAMEBUF;\r
+       FATFS *fs;\r
+#if _FS_EXFAT\r
+       _FDID obj;\r
+#endif\r
+       DEF_NAMBUF\r
 \r
 \r
-       /* Get logical drive number */\r
-       res = find_volume(&dj.fs, &path, 1);\r
+       /* Get logical drive */\r
+       res = find_volume(&path, &fs, FA_WRITE);\r
+       dj.obj.fs = fs;\r
        if (res == FR_OK) {\r
-               INIT_BUF(dj);\r
+               INIT_NAMBUF(fs);\r
                res = follow_path(&dj, path);           /* Follow the file path */\r
-               if (_FS_RPATH && res == FR_OK && (dj.fn[NSFLAG] & NS_DOT))\r
+               if (_FS_RPATH && res == FR_OK && (dj.fn[NSFLAG] & NS_DOT)) {\r
                        res = FR_INVALID_NAME;                  /* Cannot remove dot entry */\r
-#if _FS_LOCK\r
-               if (res == FR_OK) res = chk_lock(&dj, 2);       /* Cannot remove open object */\r
+               }\r
+#if _FS_LOCK != 0\r
+               if (res == FR_OK) res = chk_lock(&dj, 2);       /* Check if it is an open object */\r
 #endif\r
                if (res == FR_OK) {                                     /* The object is accessible */\r
-                       dir = dj.dir;\r
-                       if (!dir) {\r
+                       if (dj.fn[NSFLAG] & NS_NONAME) {\r
                                res = FR_INVALID_NAME;          /* Cannot remove the origin directory */\r
                        } else {\r
-                               if (dir[DIR_Attr] & AM_RDO)\r
+                               if (dj.obj.attr & AM_RDO) {\r
                                        res = FR_DENIED;                /* Cannot remove R/O object */\r
+                               }\r
                        }\r
-                       if (res == FR_OK && (dir[DIR_Attr] & AM_DIR)) { /* Is it a sub-dir? */\r
-                               dclst = ld_clust(dj.fs, dir);\r
-                               if (!dclst) {\r
-                                       res = FR_INT_ERR;\r
-                               } else {                                        /* Make sure the sub-directory is empty */\r
-                                       mem_cpy(&sdj, &dj, sizeof (DIR));\r
-                                       sdj.sclust = dclst;\r
-                                       res = dir_sdi(&sdj, 2);         /* Exclude dot entries */\r
-                                       if (res == FR_OK) {\r
-                                               res = dir_read(&sdj, 0);        /* Read an item */\r
-                                               if (res == FR_OK                /* Not empty directory */\r
-#if _FS_RPATH\r
-                                               || dclst == dj.fs->cdir /* or current directory */\r
+                       if (res == FR_OK) {\r
+#if _FS_EXFAT\r
+                               obj.fs = fs;\r
+                               if (fs->fs_type == FS_EXFAT) {\r
+                                       obj.sclust = dclst = ld_dword(fs->dirbuf + XDIR_FstClus);\r
+                                       obj.objsize = ld_qword(fs->dirbuf + XDIR_FileSize);\r
+                                       obj.stat = fs->dirbuf[XDIR_GenFlags] & 2;\r
+                               } else\r
+#endif\r
+                               {\r
+                                       dclst = ld_clust(fs, dj.dir);\r
+                               }\r
+                               if (dj.obj.attr & AM_DIR) {                     /* Is it a sub-directory ? */\r
+#if _FS_RPATH != 0\r
+                                       if (dclst == fs->cdir) {                                /* Is it the current directory? */\r
+                                               res = FR_DENIED;\r
+                                       } else\r
+#endif\r
+                                       {\r
+                                               sdj.obj.fs = fs;                                                /* Open the sub-directory */\r
+                                               sdj.obj.sclust = dclst;\r
+#if _FS_EXFAT\r
+                                               if (fs->fs_type == FS_EXFAT) {\r
+                                                       sdj.obj.objsize = obj.objsize;\r
+                                                       sdj.obj.stat = obj.stat;\r
+                                               }\r
 #endif\r
-                                               ) res = FR_DENIED;\r
-                                               if (res == FR_NO_FILE) res = FR_OK;     /* It is empty */\r
+                                               res = dir_sdi(&sdj, 0);\r
+                                               if (res == FR_OK) {\r
+                                                       res = dir_read(&sdj, 0);                        /* Read an item */\r
+                                                       if (res == FR_OK) res = FR_DENIED;      /* Not empty? */\r
+                                                       if (res == FR_NO_FILE) res = FR_OK;     /* Empty? */\r
+                                               }\r
                                        }\r
                                }\r
                        }\r
                        if (res == FR_OK) {\r
-                               res = dir_remove(&dj);          /* Remove the directory entry */\r
-                               if (res == FR_OK && dclst)      /* Remove the cluster chain if exist */\r
-                                       res = remove_chain(dj.fs, dclst);\r
-                               if (res == FR_OK) res = sync_fs(dj.fs);\r
+                               res = dir_remove(&dj);                  /* Remove the directory entry */\r
+                               if (res == FR_OK && dclst) {    /* Remove the cluster chain if exist */\r
+#if _FS_EXFAT\r
+                                       res = remove_chain(&obj, dclst, 0);\r
+#else\r
+                                       res = remove_chain(&dj.obj, dclst, 0);\r
+#endif\r
+                               }\r
+                               if (res == FR_OK) res = sync_fs(fs);\r
                        }\r
                }\r
-               FREE_BUF();\r
+               FREE_NAMBUF();\r
        }\r
 \r
-       LEAVE_FF(dj.fs, res);\r
+       LEAVE_FF(fs, res);\r
 }\r
 \r
 \r
@@ -3531,186 +4548,235 @@ FRESULT f_mkdir (
 {\r
        FRESULT res;\r
        DIR dj;\r
-       BYTE *dir, n;\r
-       DWORD dsc, dcl, pcl, tm = GET_FATTIME();\r
-       DEF_NAMEBUF;\r
+       FATFS *fs;\r
+       BYTE *dir;\r
+       UINT n;\r
+       DWORD dsc, dcl, pcl, tm;\r
+       DEF_NAMBUF\r
 \r
 \r
-       /* Get logical drive number */\r
-       res = find_volume(&dj.fs, &path, 1);\r
+       /* Get logical drive */\r
+       res = find_volume(&path, &fs, FA_WRITE);\r
+       dj.obj.fs = fs;\r
        if (res == FR_OK) {\r
-               INIT_BUF(dj);\r
+               INIT_NAMBUF(fs);\r
                res = follow_path(&dj, path);                   /* Follow the file path */\r
                if (res == FR_OK) res = FR_EXIST;               /* Any object with same name is already existing */\r
-               if (_FS_RPATH && res == FR_NO_FILE && (dj.fn[NSFLAG] & NS_DOT))\r
+               if (_FS_RPATH && res == FR_NO_FILE && (dj.fn[NSFLAG] & NS_DOT)) {\r
                        res = FR_INVALID_NAME;\r
+               }\r
                if (res == FR_NO_FILE) {                                /* Can create a new directory */\r
-                       dcl = create_chain(dj.fs, 0);           /* Allocate a cluster for the new directory table */\r
+                       dcl = create_chain(&dj.obj, 0);         /* Allocate a cluster for the new directory table */\r
+                       dj.obj.objsize = (DWORD)fs->csize * SS(fs);\r
                        res = FR_OK;\r
                        if (dcl == 0) res = FR_DENIED;          /* No space to allocate a new cluster */\r
                        if (dcl == 1) res = FR_INT_ERR;\r
                        if (dcl == 0xFFFFFFFF) res = FR_DISK_ERR;\r
-                       if (res == FR_OK)                                       /* Flush FAT */\r
-                               res = sync_window(dj.fs);\r
+                       if (res == FR_OK) res = sync_window(fs);        /* Flush FAT */\r
+                       tm = GET_FATTIME();\r
                        if (res == FR_OK) {                                     /* Initialize the new directory table */\r
-                               dsc = clust2sect(dj.fs, dcl);\r
-                               dir = dj.fs->win;\r
-                               mem_set(dir, 0, SS(dj.fs));\r
-                               mem_set(dir+DIR_Name, ' ', 11); /* Create "." entry */\r
-                               dir[DIR_Name] = '.';\r
-                               dir[DIR_Attr] = AM_DIR;\r
-                               ST_DWORD(dir+DIR_WrtTime, tm);\r
-                               st_clust(dir, dcl);\r
-                               mem_cpy(dir+SZ_DIR, dir, SZ_DIR);       /* Create ".." entry */\r
-                               dir[SZ_DIR+1] = '.'; pcl = dj.sclust;\r
-                               if (dj.fs->fs_type == FS_FAT32 && pcl == dj.fs->dirbase)\r
-                                       pcl = 0;\r
-                               st_clust(dir+SZ_DIR, pcl);\r
-                               for (n = dj.fs->csize; n; n--) {        /* Write dot entries and clear following sectors */\r
-                                       dj.fs->winsect = dsc++;\r
-                                       dj.fs->wflag = 1;\r
-                                       res = sync_window(dj.fs);\r
+                               dsc = clust2sect(fs, dcl);\r
+                               dir = fs->win;\r
+                               mem_set(dir, 0, SS(fs));\r
+                               if (!_FS_EXFAT || fs->fs_type != FS_EXFAT) {\r
+                                       mem_set(dir + DIR_Name, ' ', 11);       /* Create "." entry */\r
+                                       dir[DIR_Name] = '.';\r
+                                       dir[DIR_Attr] = AM_DIR;\r
+                                       st_dword(dir + DIR_ModTime, tm);\r
+                                       st_clust(fs, dir, dcl);\r
+                                       mem_cpy(dir + SZDIRE, dir, SZDIRE);     /* Create ".." entry */\r
+                                       dir[SZDIRE + 1] = '.'; pcl = dj.obj.sclust;\r
+                                       if (fs->fs_type == FS_FAT32 && pcl == fs->dirbase) pcl = 0;\r
+                                       st_clust(fs, dir + SZDIRE, pcl);\r
+                               }\r
+                               for (n = fs->csize; n; n--) {   /* Write dot entries and clear following sectors */\r
+                                       fs->winsect = dsc++;\r
+                                       fs->wflag = 1;\r
+                                       res = sync_window(fs);\r
                                        if (res != FR_OK) break;\r
-                                       mem_set(dir, 0, SS(dj.fs));\r
+                                       mem_set(dir, 0, SS(fs));\r
                                }\r
                        }\r
                        if (res == FR_OK) res = dir_register(&dj);      /* Register the object to the directoy */\r
-                       if (res != FR_OK) {\r
-                               remove_chain(dj.fs, dcl);                       /* Could not register, remove cluster chain */\r
+                       if (res == FR_OK) {\r
+#if _FS_EXFAT\r
+                               if (fs->fs_type == FS_EXFAT) {  /* Initialize directory entry block */\r
+                                       st_dword(fs->dirbuf + XDIR_ModTime, tm);        /* Created time */\r
+                                       st_dword(fs->dirbuf + XDIR_FstClus, dcl);       /* Table start cluster */\r
+                                       st_dword(fs->dirbuf + XDIR_FileSize, (DWORD)dj.obj.objsize);    /* File size needs to be valid */\r
+                                       st_dword(fs->dirbuf + XDIR_ValidFileSize, (DWORD)dj.obj.objsize);\r
+                                       fs->dirbuf[XDIR_GenFlags] = 3;                          /* Initialize the object flag (contiguous) */\r
+                                       fs->dirbuf[XDIR_Attr] = AM_DIR;                         /* Attribute */\r
+                                       res = store_xdir(&dj);\r
+                               } else\r
+#endif\r
+                               {\r
+                                       dir = dj.dir;\r
+                                       st_dword(dir + DIR_ModTime, tm);        /* Created time */\r
+                                       st_clust(fs, dir, dcl);                         /* Table start cluster */\r
+                                       dir[DIR_Attr] = AM_DIR;                         /* Attribute */\r
+                                       fs->wflag = 1;\r
+                               }\r
+                               if (res == FR_OK) res = sync_fs(fs);\r
                        } else {\r
-                               dir = dj.dir;\r
-                               dir[DIR_Attr] = AM_DIR;                         /* Attribute */\r
-                               ST_DWORD(dir+DIR_WrtTime, tm);          /* Created time */\r
-                               st_clust(dir, dcl);                                     /* Table start cluster */\r
-                               dj.fs->wflag = 1;\r
-                               res = sync_fs(dj.fs);\r
+                               remove_chain(&dj.obj, dcl, 0);          /* Could not register, remove cluster chain */\r
                        }\r
                }\r
-               FREE_BUF();\r
+               FREE_NAMBUF();\r
        }\r
 \r
-       LEAVE_FF(dj.fs, res);\r
+       LEAVE_FF(fs, res);\r
 }\r
 \r
 \r
 \r
 \r
 /*-----------------------------------------------------------------------*/\r
-/* Change Attribute                                                      */\r
+/* Rename a File/Directory                                               */\r
 /*-----------------------------------------------------------------------*/\r
 \r
-FRESULT f_chmod (\r
-       const TCHAR* path,      /* Pointer to the file path */\r
-       BYTE value,                     /* Attribute bits */\r
-       BYTE mask                       /* Attribute mask to change */\r
+FRESULT f_rename (\r
+       const TCHAR* path_old,  /* Pointer to the object name to be renamed */\r
+       const TCHAR* path_new   /* Pointer to the new name */\r
 )\r
 {\r
        FRESULT res;\r
-       DIR dj;\r
-       BYTE *dir;\r
-       DEF_NAMEBUF;\r
+       DIR djo, djn;\r
+       FATFS *fs;\r
+       BYTE buf[_FS_EXFAT ? SZDIRE * 2 : 24], *dir;\r
+       DWORD dw;\r
+       DEF_NAMBUF\r
 \r
 \r
-       /* Get logical drive number */\r
-       res = find_volume(&dj.fs, &path, 1);\r
+       get_ldnumber(&path_new);                                                /* Ignore drive number of new name */\r
+       res = find_volume(&path_old, &fs, FA_WRITE);    /* Get logical drive of the old object */\r
        if (res == FR_OK) {\r
-               INIT_BUF(dj);\r
-               res = follow_path(&dj, path);           /* Follow the file path */\r
-               FREE_BUF();\r
-               if (_FS_RPATH && res == FR_OK && (dj.fn[NSFLAG] & NS_DOT))\r
-                       res = FR_INVALID_NAME;\r
-               if (res == FR_OK) {\r
-                       dir = dj.dir;\r
-                       if (!dir) {                                             /* Is it a root directory? */\r
-                               res = FR_INVALID_NAME;\r
-                       } else {                                                /* File or sub directory */\r
-                               mask &= AM_RDO|AM_HID|AM_SYS|AM_ARC;    /* Valid attribute mask */\r
-                               dir[DIR_Attr] = (value & mask) | (dir[DIR_Attr] & (BYTE)~mask); /* Apply attribute change */\r
-                               dj.fs->wflag = 1;\r
-                               res = sync_fs(dj.fs);\r
+               djo.obj.fs = fs;\r
+               INIT_NAMBUF(fs);\r
+               res = follow_path(&djo, path_old);              /* Check old object */\r
+               if (res == FR_OK && (djo.fn[NSFLAG] & (NS_DOT | NS_NONAME))) res = FR_INVALID_NAME;     /* Check validity of name */\r
+#if _FS_LOCK != 0\r
+               if (res == FR_OK) res = chk_lock(&djo, 2);\r
+#endif\r
+               if (res == FR_OK) {                                             /* Object to be renamed is found */\r
+#if _FS_EXFAT\r
+                       if (fs->fs_type == FS_EXFAT) {  /* At exFAT */\r
+                               BYTE nf, nn;\r
+                               WORD nh;\r
+\r
+                               mem_cpy(buf, fs->dirbuf, SZDIRE * 2);   /* Save 85+C0 entry of old object */\r
+                               mem_cpy(&djn, &djo, sizeof djo);\r
+                               res = follow_path(&djn, path_new);              /* Make sure if new object name is not in use */\r
+                               if (res == FR_OK) {                                             /* Is new name already in use by any other object? */\r
+                                       res = (djn.obj.sclust == djo.obj.sclust && djn.dptr == djo.dptr) ? FR_NO_FILE : FR_EXIST;\r
+                               }\r
+                               if (res == FR_NO_FILE) {                                /* It is a valid path and no name collision */\r
+                                       res = dir_register(&djn);                       /* Register the new entry */\r
+                                       if (res == FR_OK) {\r
+                                               nf = fs->dirbuf[XDIR_NumSec]; nn = fs->dirbuf[XDIR_NumName];\r
+                                               nh = ld_word(fs->dirbuf + XDIR_NameHash);\r
+                                               mem_cpy(fs->dirbuf, buf, SZDIRE * 2);\r
+                                               fs->dirbuf[XDIR_NumSec] = nf; fs->dirbuf[XDIR_NumName] = nn;\r
+                                               st_word(fs->dirbuf + XDIR_NameHash, nh);\r
+/* Start of critical section where any interruption can cause a cross-link */\r
+                                               res = store_xdir(&djn);\r
+                                       }\r
+                               }\r
+                       } else\r
+#endif\r
+                       {       /* At FAT12/FAT16/FAT32 */\r
+                               mem_cpy(buf, djo.dir + DIR_Attr, 21);   /* Save information about the object except name */\r
+                               mem_cpy(&djn, &djo, sizeof (DIR));              /* Duplicate the directory object */\r
+                               res = follow_path(&djn, path_new);              /* Make sure if new object name is not in use */\r
+                               if (res == FR_OK) {                                             /* Is new name already in use by any other object? */\r
+                                       res = (djn.obj.sclust == djo.obj.sclust && djn.dptr == djo.dptr) ? FR_NO_FILE : FR_EXIST;\r
+                               }\r
+                               if (res == FR_NO_FILE) {                                /* It is a valid path and no name collision */\r
+                                       res = dir_register(&djn);                       /* Register the new entry */\r
+                                       if (res == FR_OK) {\r
+                                               dir = djn.dir;                                  /* Copy information about object except name */\r
+                                               mem_cpy(dir + 13, buf + 2, 19);\r
+                                               dir[DIR_Attr] = buf[0] | AM_ARC;\r
+                                               fs->wflag = 1;\r
+                                               if ((dir[DIR_Attr] & AM_DIR) && djo.obj.sclust != djn.obj.sclust) {     /* Update .. entry in the sub-directory if needed */\r
+                                                       dw = clust2sect(fs, ld_clust(fs, dir));\r
+                                                       if (!dw) {\r
+                                                               res = FR_INT_ERR;\r
+                                                       } else {\r
+/* Start of critical section where any interruption can cause a cross-link */\r
+                                                               res = move_window(fs, dw);\r
+                                                               dir = fs->win + SZDIRE * 1;     /* Ptr to .. entry */\r
+                                                               if (res == FR_OK && dir[1] == '.') {\r
+                                                                       st_clust(fs, dir, djn.obj.sclust);\r
+                                                                       fs->wflag = 1;\r
+                                                               }\r
+                                                       }\r
+                                               }\r
+                                       }\r
+                               }\r
+                       }\r
+                       if (res == FR_OK) {\r
+                               res = dir_remove(&djo);         /* Remove old entry */\r
+                               if (res == FR_OK) {\r
+                                       res = sync_fs(fs);\r
+                               }\r
                        }\r
+/* End of critical section */\r
                }\r
+               FREE_NAMBUF();\r
        }\r
 \r
-       LEAVE_FF(dj.fs, res);\r
+       LEAVE_FF(fs, res);\r
 }\r
 \r
+#endif /* !_FS_READONLY */\r
+#endif /* _FS_MINIMIZE == 0 */\r
+#endif /* _FS_MINIMIZE <= 1 */\r
+#endif /* _FS_MINIMIZE <= 2 */\r
 \r
 \r
 \r
+#if _USE_CHMOD && !_FS_READONLY\r
 /*-----------------------------------------------------------------------*/\r
-/* Rename File/Directory                                                 */\r
+/* Change Attribute                                                      */\r
 /*-----------------------------------------------------------------------*/\r
 \r
-FRESULT f_rename (\r
-       const TCHAR* path_old,  /* Pointer to the object to be renamed */\r
-       const TCHAR* path_new   /* Pointer to the new name */\r
+FRESULT f_chmod (\r
+       const TCHAR* path,      /* Pointer to the file path */\r
+       BYTE attr,                      /* Attribute bits */\r
+       BYTE mask                       /* Attribute mask to change */\r
 )\r
 {\r
        FRESULT res;\r
-       DIR djo, djn;\r
-       BYTE buf[21], *dir;\r
-       DWORD dw;\r
-       DEF_NAMEBUF;\r
+       DIR dj;\r
+       FATFS *fs;\r
+       DEF_NAMBUF\r
 \r
 \r
-       /* Get logical drive number of the source object */\r
-       res = find_volume(&djo.fs, &path_old, 1);\r
+       res = find_volume(&path, &fs, FA_WRITE);        /* Get logical drive */\r
+       dj.obj.fs = fs;\r
        if (res == FR_OK) {\r
-               djn.fs = djo.fs;\r
-               INIT_BUF(djo);\r
-               res = follow_path(&djo, path_old);              /* Check old object */\r
-               if (_FS_RPATH && res == FR_OK && (djo.fn[NSFLAG] & NS_DOT))\r
-                       res = FR_INVALID_NAME;\r
-#if _FS_LOCK\r
-               if (res == FR_OK) res = chk_lock(&djo, 2);\r
+               INIT_NAMBUF(fs);\r
+               res = follow_path(&dj, path);   /* Follow the file path */\r
+               if (res == FR_OK && (dj.fn[NSFLAG] & (NS_DOT | NS_NONAME))) res = FR_INVALID_NAME;      /* Check object validity */\r
+               if (res == FR_OK) {\r
+                       mask &= AM_RDO|AM_HID|AM_SYS|AM_ARC;    /* Valid attribute mask */\r
+#if _FS_EXFAT\r
+                       if (fs->fs_type == FS_EXFAT) {\r
+                               fs->dirbuf[XDIR_Attr] = (attr & mask) | (fs->dirbuf[XDIR_Attr] & (BYTE)~mask);  /* Apply attribute change */\r
+                               res = store_xdir(&dj);\r
+                       } else\r
 #endif\r
-               if (res == FR_OK) {                                             /* Old object is found */\r
-                       if (!djo.dir) {                                         /* Is root dir? */\r
-                               res = FR_NO_FILE;\r
-                       } else {\r
-                               mem_cpy(buf, djo.dir+DIR_Attr, 21);             /* Save the object information except name */\r
-                               mem_cpy(&djn, &djo, sizeof (DIR));              /* Duplicate the directory object */\r
-                               if (get_ldnumber(&path_new) >= 0)               /* Snip drive number off and ignore it */\r
-                                       res = follow_path(&djn, path_new);      /* and make sure if new object name is not conflicting */\r
-                               else\r
-                                       res = FR_INVALID_DRIVE;\r
-                               if (res == FR_OK) res = FR_EXIST;               /* The new object name is already existing */\r
-                               if (res == FR_NO_FILE) {                                /* It is a valid path and no name collision */\r
-/* Start of critical section that any interruption can cause a cross-link */\r
-                                       res = dir_register(&djn);                       /* Register the new entry */\r
-                                       if (res == FR_OK) {\r
-                                               dir = djn.dir;                                  /* Copy object information except name */\r
-                                               mem_cpy(dir+13, buf+2, 19);\r
-                                               dir[DIR_Attr] = buf[0] | AM_ARC;\r
-                                               djo.fs->wflag = 1;\r
-                                               if ((dir[DIR_Attr] & AM_DIR) && djo.sclust != djn.sclust) {     /* Update .. entry in the directory if needed */\r
-                                                       dw = clust2sect(djo.fs, ld_clust(djo.fs, dir));\r
-                                                       if (!dw) {\r
-                                                               res = FR_INT_ERR;\r
-                                                       } else {\r
-                                                               res = move_window(djo.fs, dw);\r
-                                                               dir = djo.fs->win+SZ_DIR;       /* .. entry */\r
-                                                               if (res == FR_OK && dir[1] == '.') {\r
-                                                                       st_clust(dir, djn.sclust);\r
-                                                                       djo.fs->wflag = 1;\r
-                                                               }\r
-                                                       }\r
-                                               }\r
-                                               if (res == FR_OK) {\r
-                                                       res = dir_remove(&djo);         /* Remove old entry */\r
-                                                       if (res == FR_OK)\r
-                                                               res = sync_fs(djo.fs);\r
-                                               }\r
-                                       }\r
-/* End of critical section */\r
-                               }\r
+                       {\r
+                               dj.dir[DIR_Attr] = (attr & mask) | (dj.dir[DIR_Attr] & (BYTE)~mask);    /* Apply attribute change */\r
+                               fs->wflag = 1;\r
                        }\r
+                       if (res == FR_OK) res = sync_fs(fs);\r
                }\r
-               FREE_BUF();\r
+               FREE_NAMBUF();\r
        }\r
 \r
-       LEAVE_FF(djo.fs, res);\r
+       LEAVE_FF(fs, res);\r
 }\r
 \r
 \r
@@ -3727,44 +4793,42 @@ FRESULT f_utime (
 {\r
        FRESULT res;\r
        DIR dj;\r
-       BYTE *dir;\r
-       DEF_NAMEBUF;\r
+       FATFS *fs;\r
+       DEF_NAMBUF\r
 \r
 \r
-       /* Get logical drive number */\r
-       res = find_volume(&dj.fs, &path, 1);\r
+       res = find_volume(&path, &fs, FA_WRITE);        /* Get logical drive */\r
+       dj.obj.fs = fs;\r
        if (res == FR_OK) {\r
-               INIT_BUF(dj);\r
+               INIT_NAMBUF(fs);\r
                res = follow_path(&dj, path);   /* Follow the file path */\r
-               FREE_BUF();\r
-               if (_FS_RPATH && res == FR_OK && (dj.fn[NSFLAG] & NS_DOT))\r
-                       res = FR_INVALID_NAME;\r
+               if (res == FR_OK && (dj.fn[NSFLAG] & (NS_DOT | NS_NONAME))) res = FR_INVALID_NAME;      /* Check object validity */\r
                if (res == FR_OK) {\r
-                       dir = dj.dir;\r
-                       if (!dir) {                                     /* Root directory */\r
-                               res = FR_INVALID_NAME;\r
-                       } else {                                        /* File or sub-directory */\r
-                               ST_WORD(dir+DIR_WrtTime, fno->ftime);\r
-                               ST_WORD(dir+DIR_WrtDate, fno->fdate);\r
-                               dj.fs->wflag = 1;\r
-                               res = sync_fs(dj.fs);\r
+#if _FS_EXFAT\r
+                       if (fs->fs_type == FS_EXFAT) {\r
+                               st_dword(fs->dirbuf + XDIR_ModTime, (DWORD)fno->fdate << 16 | fno->ftime);\r
+                               res = store_xdir(&dj);\r
+                       } else\r
+#endif\r
+                       {\r
+                               st_dword(dj.dir + DIR_ModTime, (DWORD)fno->fdate << 16 | fno->ftime);\r
+                               fs->wflag = 1;\r
                        }\r
+                       if (res == FR_OK) res = sync_fs(fs);\r
                }\r
+               FREE_NAMBUF();\r
        }\r
 \r
-       LEAVE_FF(dj.fs, res);\r
+       LEAVE_FF(fs, res);\r
 }\r
 \r
-#endif /* !_FS_READONLY */\r
-#endif /* _FS_MINIMIZE == 0 */\r
-#endif /* _FS_MINIMIZE <= 1 */\r
-#endif /* _FS_MINIMIZE <= 2 */\r
+#endif /* _USE_CHMOD && !_FS_READONLY */\r
 \r
 \r
 \r
 #if _USE_LABEL\r
 /*-----------------------------------------------------------------------*/\r
-/* Get volume label                                                      */\r
+/* Get Volume Label                                                      */\r
 /*-----------------------------------------------------------------------*/\r
 \r
 FRESULT f_getlabel (\r
@@ -3775,61 +4839,85 @@ FRESULT f_getlabel (
 {\r
        FRESULT res;\r
        DIR dj;\r
-       UINT i, j;\r
-\r
+       FATFS *fs;\r
+       UINT si, di;\r
+#if _LFN_UNICODE || _FS_EXFAT\r
+       WCHAR w;\r
+#endif\r
 \r
-       /* Get logical drive number */\r
-       res = find_volume(&dj.fs, &path, 0);\r
+       /* Get logical drive */\r
+       res = find_volume(&path, &fs, 0);\r
 \r
        /* Get volume label */\r
        if (res == FR_OK && label) {\r
-               dj.sclust = 0;                                  /* Open root directory */\r
+               dj.obj.fs = fs; dj.obj.sclust = 0;      /* Open root directory */\r
                res = dir_sdi(&dj, 0);\r
                if (res == FR_OK) {\r
-                       res = dir_read(&dj, 1);         /* Get an entry with AM_VOL */\r
-                       if (res == FR_OK) {                     /* A volume label is exist */\r
-#if _USE_LFN && _LFN_UNICODE\r
-                               WCHAR w;\r
-                               i = j = 0;\r
-                               do {\r
-                                       w = (i < 11) ? dj.dir[i++] : ' ';\r
-                                       if (IsDBCS1(w) && i < 11 && IsDBCS2(dj.dir[i]))\r
-                                               w = w << 8 | dj.dir[i++];\r
-                                       label[j++] = ff_convert(w, 1);  /* OEM -> Unicode */\r
-                               } while (j < 11);\r
+                       res = dir_read(&dj, 1);                 /* Find a volume label entry */\r
+                       if (res == FR_OK) {\r
+#if _FS_EXFAT\r
+                               if (fs->fs_type == FS_EXFAT) {\r
+                                       for (si = di = 0; si < dj.dir[XDIR_NumLabel]; si++) {   /* Extract volume label from 83 entry */\r
+                                               w = ld_word(dj.dir + XDIR_Label + si * 2);\r
+#if _LFN_UNICODE\r
+                                               label[di++] = w;\r
 #else\r
-                               mem_cpy(label, dj.dir, 11);\r
+                                               w = ff_convert(w, 0);   /* Unicode -> OEM */\r
+                                               if (w == 0) w = '?';    /* Replace wrong character */\r
+                                               if (_DF1S && w >= 0x100) label[di++] = (char)(w >> 8);\r
+                                               label[di++] = (char)w;\r
 #endif\r
-                               j = 11;\r
-                               do {\r
-                                       label[j] = 0;\r
-                                       if (!j) break;\r
-                               } while (label[--j] == ' ');\r
-                       }\r
-                       if (res == FR_NO_FILE) {        /* No label, return nul string */\r
-                               label[0] = 0;\r
-                               res = FR_OK;\r
+                                       }\r
+                                       label[di] = 0;\r
+                               } else\r
+#endif\r
+                               {\r
+                                       si = di = 0;            /* Extract volume label from AM_VOL entry with code comversion */\r
+                                       do {\r
+#if _LFN_UNICODE\r
+                                               w = (si < 11) ? dj.dir[si++] : ' ';\r
+                                               if (IsDBCS1(w) && si < 11 && IsDBCS2(dj.dir[si])) {\r
+                                                       w = w << 8 | dj.dir[si++];\r
+                                               }\r
+                                               label[di++] = ff_convert(w, 1); /* OEM -> Unicode */\r
+#else\r
+                                               label[di++] = dj.dir[si++];\r
+#endif\r
+                                       } while (di < 11);\r
+                                       do {                            /* Truncate trailing spaces */\r
+                                               label[di] = 0;\r
+                                               if (di == 0) break;\r
+                                       } while (label[--di] == ' ');\r
+                               }\r
                        }\r
                }\r
+               if (res == FR_NO_FILE) {        /* No label entry and return nul string */\r
+                       label[0] = 0;\r
+                       res = FR_OK;\r
+               }\r
        }\r
 \r
        /* Get volume serial number */\r
        if (res == FR_OK && vsn) {\r
-               res = move_window(dj.fs, dj.fs->volbase);\r
+               res = move_window(fs, fs->volbase);\r
                if (res == FR_OK) {\r
-                       i = dj.fs->fs_type == FS_FAT32 ? BS_VolID32 : BS_VolID;\r
-                       *vsn = LD_DWORD(&dj.fs->win[i]);\r
+                       switch (fs->fs_type) {\r
+                       case FS_EXFAT: di = BPB_VolIDEx; break;\r
+                       case FS_FAT32: di = BS_VolID32; break;\r
+                       default:       di = BS_VolID;\r
+                       }\r
+                       *vsn = ld_dword(fs->win + di);\r
                }\r
        }\r
 \r
-       LEAVE_FF(dj.fs, res);\r
+       LEAVE_FF(fs, res);\r
 }\r
 \r
 \r
 \r
 #if !_FS_READONLY\r
 /*-----------------------------------------------------------------------*/\r
-/* Set volume label                                                      */\r
+/* Set Volume Label                                                      */\r
 /*-----------------------------------------------------------------------*/\r
 \r
 FRESULT f_setlabel (\r
@@ -3838,83 +4926,115 @@ FRESULT f_setlabel (
 {\r
        FRESULT res;\r
        DIR dj;\r
-       BYTE vn[11];\r
-       UINT i, j, sl;\r
+       FATFS *fs;\r
+       BYTE dirvn[22];\r
+       UINT i, j, slen;\r
        WCHAR w;\r
-       DWORD tm;\r
+       static const char badchr[] = "\"*+,.:;<=>\?[]|\x7F";\r
 \r
 \r
-       /* Get logical drive number */\r
-       res = find_volume(&dj.fs, &label, 1);\r
-       if (res) LEAVE_FF(dj.fs, res);\r
-\r
-       /* Create a volume label in directory form */\r
-       vn[0] = 0;\r
-       for (sl = 0; label[sl]; sl++) ;                         /* Get name length */\r
-       for ( ; sl && label[sl-1] == ' '; sl--) ;       /* Remove trailing spaces */\r
-       if (sl) {       /* Create volume label in directory form */\r
-               i = j = 0;\r
-               do {\r
-#if _USE_LFN && _LFN_UNICODE\r
-                       w = ff_convert(ff_wtoupper(label[i++]), 0);\r
+       /* Get logical drive */\r
+       res = find_volume(&label, &fs, FA_WRITE);\r
+       if (res != FR_OK) LEAVE_FF(fs, res);\r
+       dj.obj.fs = fs;\r
+\r
+       /* Get length of given volume label */\r
+       for (slen = 0; (UINT)label[slen] >= ' '; slen++) ;      /* Get name length */\r
+\r
+#if _FS_EXFAT\r
+       if (fs->fs_type == FS_EXFAT) {  /* On the exFAT volume */\r
+               for (i = j = 0; i < slen; ) {   /* Create volume label in directory form */\r
+                       w = label[i++];\r
+#if !_LFN_UNICODE\r
+                       if (IsDBCS1(w)) {\r
+                               w = (i < slen && IsDBCS2(label[i])) ? w << 8 | (BYTE)label[i++] : 0;\r
+                       }\r
+                       w = ff_convert(w, 1);\r
+#endif\r
+                       if (w == 0 || chk_chr(badchr, w) || j == 22) {  /* Check validity check validity of the volume label */\r
+                               LEAVE_FF(fs, FR_INVALID_NAME);\r
+                       }\r
+                       st_word(dirvn + j, w); j += 2;\r
+               }\r
+               slen = j;\r
+       } else\r
+#endif\r
+       {       /* On the FAT12/16/32 volume */\r
+               for ( ; slen && label[slen - 1] == ' '; slen--) ;       /* Remove trailing spaces */\r
+               if (slen) {             /* Is there a volume label to be set? */\r
+                       dirvn[0] = 0; i = j = 0;        /* Create volume label in directory form */\r
+                       do {\r
+#if _LFN_UNICODE\r
+                               w = ff_convert(ff_wtoupper(label[i++]), 0);\r
 #else\r
-                       w = (BYTE)label[i++];\r
-                       if (IsDBCS1(w))\r
-                               w = (j < 10 && i < sl && IsDBCS2(label[i])) ? w << 8 | (BYTE)label[i++] : 0;\r
-#if _USE_LFN\r
-                       w = ff_convert(ff_wtoupper(ff_convert(w, 1)), 0);\r
+                               w = (BYTE)label[i++];\r
+                               if (IsDBCS1(w)) {\r
+                                       w = (j < 10 && i < slen && IsDBCS2(label[i])) ? w << 8 | (BYTE)label[i++] : 0;\r
+                               }\r
+#if _USE_LFN != 0\r
+                               w = ff_convert(ff_wtoupper(ff_convert(w, 1)), 0);\r
 #else\r
-                       if (IsLower(w)) w -= 0x20;                      /* To upper ASCII characters */\r
+                               if (IsLower(w)) w -= 0x20;                      /* To upper ASCII characters */\r
 #ifdef _EXCVT\r
-                       if (w >= 0x80) w = ExCvt[w - 0x80];     /* To upper extended characters (SBCS cfg) */\r
+                               if (w >= 0x80) w = ExCvt[w - 0x80];     /* To upper extended characters (SBCS cfg) */\r
 #else\r
-                       if (!_DF1S && w >= 0x80) w = 0;         /* Reject extended characters (ASCII cfg) */\r
+                               if (!_DF1S && w >= 0x80) w = 0;         /* Reject extended characters (ASCII cfg) */\r
 #endif\r
 #endif\r
 #endif\r
-                       if (!w || chk_chr("\"*+,.:;<=>\?[]|\x7F", w) || j >= (UINT)((w >= 0x100) ? 10 : 11)) /* Reject invalid characters for volume label */\r
-                               LEAVE_FF(dj.fs, FR_INVALID_NAME);\r
-                       if (w >= 0x100) vn[j++] = (BYTE)(w >> 8);\r
-                       vn[j++] = (BYTE)w;\r
-               } while (i < sl);\r
-               while (j < 11) vn[j++] = ' ';\r
+                               if (w == 0 || chk_chr(badchr, w) || j >= (UINT)((w >= 0x100) ? 10 : 11)) {      /* Reject invalid characters for volume label */\r
+                                       LEAVE_FF(fs, FR_INVALID_NAME);\r
+                               }\r
+                               if (w >= 0x100) dirvn[j++] = (BYTE)(w >> 8);\r
+                               dirvn[j++] = (BYTE)w;\r
+                       } while (i < slen);\r
+                       while (j < 11) dirvn[j++] = ' ';        /* Fill remaining name field */\r
+                       if (dirvn[0] == DDEM) LEAVE_FF(fs, FR_INVALID_NAME);    /* Reject illegal name (heading DDEM) */\r
+               }\r
        }\r
 \r
        /* Set volume label */\r
-       dj.sclust = 0;                                  /* Open root directory */\r
+       dj.obj.sclust = 0;              /* Open root directory */\r
        res = dir_sdi(&dj, 0);\r
        if (res == FR_OK) {\r
-               res = dir_read(&dj, 1);         /* Get an entry with AM_VOL */\r
-               if (res == FR_OK) {                     /* A volume label is found */\r
-                       if (vn[0]) {\r
-                               mem_cpy(dj.dir, vn, 11);        /* Change the volume label name */\r
-                               tm = GET_FATTIME();\r
-                               ST_DWORD(dj.dir+DIR_WrtTime, tm);\r
+               res = dir_read(&dj, 1); /* Get volume label entry */\r
+               if (res == FR_OK) {\r
+                       if (_FS_EXFAT && fs->fs_type == FS_EXFAT) {\r
+                               dj.dir[XDIR_NumLabel] = (BYTE)(slen / 2);       /* Change the volume label */\r
+                               mem_cpy(dj.dir + XDIR_Label, dirvn, slen);\r
                        } else {\r
-                               dj.dir[0] = DDE;                        /* Remove the volume label */\r
+                               if (slen) {\r
+                                       mem_cpy(dj.dir, dirvn, 11);     /* Change the volume label */\r
+                               } else {\r
+                                       dj.dir[DIR_Name] = DDEM;        /* Remove the volume label */\r
+                               }\r
                        }\r
-                       dj.fs->wflag = 1;\r
-                       res = sync_fs(dj.fs);\r
-               } else {                                        /* No volume label is found or error */\r
+                       fs->wflag = 1;\r
+                       res = sync_fs(fs);\r
+               } else {                        /* No volume label entry is found or error */\r
                        if (res == FR_NO_FILE) {\r
                                res = FR_OK;\r
-                               if (vn[0]) {                            /* Create volume label as new */\r
-                                       res = dir_alloc(&dj, 1);        /* Allocate an entry for volume label */\r
+                               if (slen) {     /* Create a volume label entry */\r
+                                       res = dir_alloc(&dj, 1);        /* Allocate an entry */\r
                                        if (res == FR_OK) {\r
-                                               mem_set(dj.dir, 0, SZ_DIR);     /* Set volume label */\r
-                                               mem_cpy(dj.dir, vn, 11);\r
-                                               dj.dir[DIR_Attr] = AM_VOL;\r
-                                               tm = GET_FATTIME();\r
-                                               ST_DWORD(dj.dir+DIR_WrtTime, tm);\r
-                                               dj.fs->wflag = 1;\r
-                                               res = sync_fs(dj.fs);\r
+                                               mem_set(dj.dir, 0, SZDIRE);     /* Clear the entry */\r
+                                               if (_FS_EXFAT && fs->fs_type == FS_EXFAT) {\r
+                                                       dj.dir[XDIR_Type] = 0x83;               /* Create 83 entry */\r
+                                                       dj.dir[XDIR_NumLabel] = (BYTE)(slen / 2);\r
+                                                       mem_cpy(dj.dir + XDIR_Label, dirvn, slen);\r
+                                               } else {\r
+                                                       dj.dir[DIR_Attr] = AM_VOL;              /* Create volume label entry */\r
+                                                       mem_cpy(dj.dir, dirvn, 11);\r
+                                               }\r
+                                               fs->wflag = 1;\r
+                                               res = sync_fs(fs);\r
                                        }\r
                                }\r
                        }\r
                }\r
        }\r
 \r
-       LEAVE_FF(dj.fs, res);\r
+       LEAVE_FF(fs, res);\r
 }\r
 \r
 #endif /* !_FS_READONLY */\r
@@ -3922,10 +5042,100 @@ FRESULT f_setlabel (
 \r
 \r
 \r
+#if _USE_EXPAND && !_FS_READONLY\r
+/*-----------------------------------------------------------------------*/\r
+/* Allocate a Contiguous Blocks to the File                              */\r
+/*-----------------------------------------------------------------------*/\r
+\r
+FRESULT f_expand (\r
+       FIL* fp,                /* Pointer to the file object */\r
+       FSIZE_t fsz,    /* File size to be expanded to */\r
+       BYTE opt                /* Operation mode 0:Find and prepare or 1:Find and allocate */\r
+)\r
+{\r
+       FRESULT res;\r
+       FATFS *fs;\r
+       DWORD n, clst, stcl, scl, ncl, tcl, lclst;\r
+\r
+\r
+       res = validate(&fp->obj, &fs);          /* Check validity of the file object */\r
+       if (res != FR_OK || (res = (FRESULT)fp->err) != FR_OK) LEAVE_FF(fs, res);\r
+       if (fsz == 0 || fp->obj.objsize != 0 || !(fp->flag & FA_WRITE)) LEAVE_FF(fs, FR_DENIED);\r
+#if _FS_EXFAT\r
+       if (fs->fs_type != FS_EXFAT && fsz >= 0x100000000) LEAVE_FF(fs, FR_DENIED);     /* Check if in size limit */\r
+#endif\r
+       n = (DWORD)fs->csize * SS(fs);  /* Cluster size */\r
+       tcl = (DWORD)(fsz / n) + ((fsz & (n - 1)) ? 1 : 0);     /* Number of clusters required */\r
+       stcl = fs->last_clst; lclst = 0;\r
+       if (stcl < 2 || stcl >= fs->n_fatent) stcl = 2;\r
+\r
+#if _FS_EXFAT\r
+       if (fs->fs_type == FS_EXFAT) {\r
+               scl = find_bitmap(fs, stcl, tcl);                       /* Find a contiguous cluster block */\r
+               if (scl == 0) res = FR_DENIED;                          /* No contiguous cluster block was found */\r
+               if (scl == 0xFFFFFFFF) res = FR_DISK_ERR;\r
+               if (res == FR_OK) {\r
+                       if (opt) {\r
+                               res = change_bitmap(fs, scl, tcl, 1);   /* Mark the cluster block 'in use' */\r
+                               lclst = scl + tcl - 1;\r
+                       } else {\r
+                               lclst = scl - 1;\r
+                       }\r
+               }\r
+       } else\r
+#endif\r
+       {\r
+               scl = clst = stcl; ncl = 0;\r
+               for (;;) {      /* Find a contiguous cluster block */\r
+                       n = get_fat(&fp->obj, clst);\r
+                       if (++clst >= fs->n_fatent) clst = 2;\r
+                       if (n == 1) { res = FR_INT_ERR; break; }\r
+                       if (n == 0xFFFFFFFF) { res = FR_DISK_ERR; break; }\r
+                       if (n == 0) {   /* Is it a free cluster? */\r
+                               if (++ncl == tcl) break;        /* Break if a contiguous cluster block is found */\r
+                       } else {\r
+                               scl = clst; ncl = 0;            /* Not a free cluster */\r
+                       }\r
+                       if (clst == stcl) { res = FR_DENIED; break; }   /* No contiguous cluster? */\r
+               }\r
+               if (res == FR_OK) {\r
+                       if (opt) {\r
+                               for (clst = scl, n = tcl; n; clst++, n--) {     /* Create a cluster chain on the FAT */\r
+                                       res = put_fat(fs, clst, (n == 1) ? 0xFFFFFFFF : clst + 1);\r
+                                       if (res != FR_OK) break;\r
+                                       lclst = clst;\r
+                               }\r
+                       } else {\r
+                               lclst = scl - 1;\r
+                       }\r
+               }\r
+       }\r
+\r
+       if (res == FR_OK) {\r
+               fs->last_clst = lclst;          /* Set suggested start cluster to start next */\r
+               if (opt) {\r
+                       fp->obj.sclust = scl;           /* Update object allocation information */\r
+                       fp->obj.objsize = fsz;\r
+                       if (_FS_EXFAT) fp->obj.stat = 2;        /* Set status 'contiguous chain' */\r
+                       fp->flag |= FA_MODIFIED;\r
+                       if (fs->free_clst  < fs->n_fatent - 2) {        /* Update FSINFO */\r
+                               fs->free_clst -= tcl;\r
+                               fs->fsi_flag |= 1;\r
+                       }\r
+               }\r
+       }\r
+\r
+       LEAVE_FF(fs, res);\r
+}\r
+\r
+#endif /* _USE_EXPAND && !_FS_READONLY */\r
+\r
+\r
+\r
+#if _USE_FORWARD\r
 /*-----------------------------------------------------------------------*/\r
-/* Forward data to the stream directly (available on only tiny cfg)      */\r
+/* Forward data to the stream directly                                   */\r
 /*-----------------------------------------------------------------------*/\r
-#if _USE_FORWARD && _FS_TINY\r
 \r
 FRESULT f_forward (\r
        FIL* fp,                                                /* Pointer to the file object */\r
@@ -3935,48 +5145,59 @@ FRESULT f_forward (
 )\r
 {\r
        FRESULT res;\r
-       DWORD remain, clst, sect;\r
-       UINT rcnt;\r
-       BYTE csect;\r
+       FATFS *fs;\r
+       DWORD clst, sect;\r
+       FSIZE_t remain;\r
+       UINT rcnt, csect;\r
+       BYTE *dbuf;\r
 \r
 \r
        *bf = 0;        /* Clear transfer byte counter */\r
+       res = validate(&fp->obj, &fs);          /* Check validity of the file object */\r
+       if (res != FR_OK || (res = (FRESULT)fp->err) != FR_OK) LEAVE_FF(fs, res);\r
+       if (!(fp->flag & FA_READ)) LEAVE_FF(fs, FR_DENIED);     /* Check access mode */\r
 \r
-       res = validate(fp);                                                             /* Check validity of the object */\r
-       if (res != FR_OK) LEAVE_FF(fp->fs, res);\r
-       if (fp->err)                                                                    /* Check error */\r
-               LEAVE_FF(fp->fs, (FRESULT)fp->err);\r
-       if (!(fp->flag & FA_READ))                                              /* Check access mode */\r
-               LEAVE_FF(fp->fs, FR_DENIED);\r
-\r
-       remain = fp->fsize - fp->fptr;\r
+       remain = fp->obj.objsize - fp->fptr;\r
        if (btf > remain) btf = (UINT)remain;                   /* Truncate btf by remaining bytes */\r
 \r
-       for ( ;  btf && (*func)(0, 0);                                  /* Repeat until all data transferred or stream becomes busy */\r
+       for ( ;  btf && (*func)(0, 0);                                  /* Repeat until all data transferred or stream goes busy */\r
                fp->fptr += rcnt, *bf += rcnt, btf -= rcnt) {\r
-               csect = (BYTE)(fp->fptr / SS(fp->fs) & (fp->fs->csize - 1));    /* Sector offset in the cluster */\r
-               if ((fp->fptr % SS(fp->fs)) == 0) {                     /* On the sector boundary? */\r
-                       if (!csect) {                                                   /* On the cluster boundary? */\r
+               csect = (UINT)(fp->fptr / SS(fs) & (fs->csize - 1));    /* Sector offset in the cluster */\r
+               if (fp->fptr % SS(fs) == 0) {                           /* On the sector boundary? */\r
+                       if (csect == 0) {                                               /* On the cluster boundary? */\r
                                clst = (fp->fptr == 0) ?                        /* On the top of the file? */\r
-                                       fp->sclust : get_fat(fp->fs, fp->clust);\r
-                               if (clst <= 1) ABORT(fp->fs, FR_INT_ERR);\r
-                               if (clst == 0xFFFFFFFF) ABORT(fp->fs, FR_DISK_ERR);\r
+                                       fp->obj.sclust : get_fat(&fp->obj, fp->clust);\r
+                               if (clst <= 1) ABORT(fs, FR_INT_ERR);\r
+                               if (clst == 0xFFFFFFFF) ABORT(fs, FR_DISK_ERR);\r
                                fp->clust = clst;                                       /* Update current cluster */\r
                        }\r
                }\r
-               sect = clust2sect(fp->fs, fp->clust);           /* Get current data sector */\r
-               if (!sect) ABORT(fp->fs, FR_INT_ERR);\r
+               sect = clust2sect(fs, fp->clust);                       /* Get current data sector */\r
+               if (!sect) ABORT(fs, FR_INT_ERR);\r
                sect += csect;\r
-               if (move_window(fp->fs, sect) != FR_OK)         /* Move sector window */\r
-                       ABORT(fp->fs, FR_DISK_ERR);\r
-               fp->dsect = sect;\r
-               rcnt = SS(fp->fs) - (WORD)(fp->fptr % SS(fp->fs));      /* Forward data from sector window */\r
-               if (rcnt > btf) rcnt = btf;\r
-               rcnt = (*func)(&fp->fs->win[(WORD)fp->fptr % SS(fp->fs)], rcnt);\r
-               if (!rcnt) ABORT(fp->fs, FR_INT_ERR);\r
+#if _FS_TINY\r
+               if (move_window(fs, sect) != FR_OK) ABORT(fs, FR_DISK_ERR);     /* Move sector window to the file data */\r
+               dbuf = fs->win;\r
+#else\r
+               if (fp->sect != sect) {         /* Fill sector cache with file data */\r
+#if !_FS_READONLY\r
+                       if (fp->flag & FA_DIRTY) {              /* Write-back dirty sector cache */\r
+                               if (disk_write(fs->drv, fp->buf, fp->sect, 1) != RES_OK) ABORT(fs, FR_DISK_ERR);\r
+                               fp->flag &= (BYTE)~FA_DIRTY;\r
+                       }\r
+#endif\r
+                       if (disk_read(fs->drv, fp->buf, sect, 1) != RES_OK) ABORT(fs, FR_DISK_ERR);\r
+               }\r
+               dbuf = fp->buf;\r
+#endif\r
+               fp->sect = sect;\r
+               rcnt = SS(fs) - (UINT)fp->fptr % SS(fs);        /* Number of bytes left in the sector */\r
+               if (rcnt > btf) rcnt = btf;                                     /* Clip it by btr if needed */\r
+               rcnt = (*func)(dbuf + ((UINT)fp->fptr % SS(fs)), rcnt); /* Forward the file data */\r
+               if (!rcnt) ABORT(fs, FR_INT_ERR);\r
        }\r
 \r
-       LEAVE_FF(fp->fs, FR_OK);\r
+       LEAVE_FF(fs, FR_OK);\r
 }\r
 #endif /* _USE_FORWARD */\r
 \r
@@ -3984,260 +5205,468 @@ FRESULT f_forward (
 \r
 #if _USE_MKFS && !_FS_READONLY\r
 /*-----------------------------------------------------------------------*/\r
-/* Create File System on the Drive                                       */\r
+/* Create FAT file system on the logical drive                           */\r
 /*-----------------------------------------------------------------------*/\r
-#define N_ROOTDIR      512             /* Number of root directory entries for FAT12/16 */\r
-#define N_FATS         1               /* Number of FATs (1 or 2) */\r
-\r
 \r
 FRESULT f_mkfs (\r
        const TCHAR* path,      /* Logical drive number */\r
-       BYTE sfd,                       /* Partitioning rule 0:FDISK, 1:SFD */\r
-       UINT au                         /* Size of allocation unit in unit of byte or sector */\r
+       BYTE opt,                       /* Format option */\r
+       DWORD au,                       /* Size of allocation unit [byte] */\r
+       void* work,                     /* Pointer to working buffer */\r
+       UINT len                        /* Size of working buffer */\r
 )\r
 {\r
-       static const WORD vst[] = { 1024,   512,  256,  128,   64,    32,   16,    8,    4,    2,   0};\r
-       static const WORD cst[] = {32768, 16384, 8192, 4096, 2048, 16384, 8192, 4096, 2048, 1024, 512};\r
-       int vol;\r
-       BYTE fmt, md, sys, *tbl, pdrv, part;\r
-       DWORD n_clst, vs, n, wsect;\r
+       const UINT n_fats = 1;          /* Number of FATs for FAT12/16/32 volume (1 or 2) */\r
+       const UINT n_rootdir = 512;     /* Number of root directory entries for FAT12/16 volume */\r
+       static const WORD cst[] = {1, 4, 16, 64, 256, 512, 0};  /* Cluster size boundary for FAT12/16 volume (4Ks unit) */\r
+       static const WORD cst32[] = {1, 2, 4, 8, 16, 32, 0};    /* Cluster size boundary for FAT32 volume (128Ks unit) */\r
+       BYTE fmt, sys, *buf, *pte, pdrv, part;\r
+       WORD ss;\r
+       DWORD szb_buf, sz_buf, sz_blk, n_clst, pau, sect, nsect, n;\r
+       DWORD b_vol, b_fat, b_data;                             /* Base LBA for volume, fat, data */\r
+       DWORD sz_vol, sz_rsv, sz_fat, sz_dir;   /* Size for volume, fat, dir, data */\r
        UINT i;\r
-       DWORD b_vol, b_fat, b_dir, b_data;      /* LBA */\r
-       DWORD n_vol, n_rsv, n_fat, n_dir;       /* Size */\r
-       FATFS *fs;\r
+       int vol;\r
        DSTATUS stat;\r
+#if _USE_TRIM || _FS_EXFAT\r
+       DWORD tbl[3];\r
+#endif\r
 \r
 \r
        /* Check mounted drive and clear work area */\r
-       if (sfd > 1) return FR_INVALID_PARAMETER;\r
-       vol = get_ldnumber(&path);\r
+       vol = get_ldnumber(&path);                                      /* Get target logical drive */\r
        if (vol < 0) return FR_INVALID_DRIVE;\r
-       fs = FatFs[vol];\r
-       if (!fs) return FR_NOT_ENABLED;\r
-       fs->fs_type = 0;\r
+       if (FatFs[vol]) FatFs[vol]->fs_type = 0;        /* Clear mounted volume */\r
        pdrv = LD2PD(vol);      /* Physical drive */\r
-       part = LD2PT(vol);      /* Partition (0:auto detect, 1-4:get from partition table)*/\r
+       part = LD2PT(vol);      /* Partition (0:create as new, 1-4:get from partition table) */\r
 \r
-       /* Get disk statics */\r
+       /* Check physical drive status */\r
        stat = disk_initialize(pdrv);\r
        if (stat & STA_NOINIT) return FR_NOT_READY;\r
        if (stat & STA_PROTECT) return FR_WRITE_PROTECTED;\r
-#if _MAX_SS != _MIN_SS         /* Get disk sector size */\r
-       if (disk_ioctl(pdrv, GET_SECTOR_SIZE, &SS(fs)) != RES_OK || SS(fs) > _MAX_SS || SS(fs) < _MIN_SS)\r
-               return FR_DISK_ERR;\r
+       if (disk_ioctl(pdrv, GET_BLOCK_SIZE, &sz_blk) != RES_OK || !sz_blk || sz_blk > 32768 || (sz_blk & (sz_blk - 1))) sz_blk = 1;    /* Erase block to align data area */\r
+#if _MAX_SS != _MIN_SS         /* Get sector size of the medium */\r
+       if (disk_ioctl(pdrv, GET_SECTOR_SIZE, &ss) != RES_OK) return FR_DISK_ERR;\r
+       if (ss > _MAX_SS || ss < _MIN_SS || (ss & (ss - 1))) return FR_DISK_ERR;\r
+#else\r
+       ss = _MAX_SS;\r
 #endif\r
-       if (_MULTI_PARTITION && part) {\r
+       if ((au != 0 && au < ss) || au > 0x1000000 || (au & (au - 1))) return FR_INVALID_PARAMETER;     /* Check if au is valid */\r
+       au /= ss;       /* Cluster size in unit of sector */\r
+\r
+       /* Get working buffer */\r
+       buf = (BYTE*)work;              /* Working buffer */\r
+       sz_buf = len / ss;              /* Size of working buffer (sector) */\r
+       szb_buf = sz_buf * ss;  /* Size of working buffer (byte) */\r
+       if (!szb_buf) return FR_MKFS_ABORTED;\r
+\r
+       /* Determine where the volume to be located (b_vol, sz_vol) */\r
+       if (_MULTI_PARTITION && part != 0) {\r
                /* Get partition information from partition table in the MBR */\r
-               if (disk_read(pdrv, fs->win, 0, 1) != RES_OK) return FR_DISK_ERR;\r
-               if (LD_WORD(fs->win+BS_55AA) != 0xAA55) return FR_MKFS_ABORTED;\r
-               tbl = &fs->win[MBR_Table + (part - 1) * SZ_PTE];\r
-               if (!tbl[4]) return FR_MKFS_ABORTED;    /* No partition? */\r
-               b_vol = LD_DWORD(tbl+8);        /* Volume start sector */\r
-               n_vol = LD_DWORD(tbl+12);       /* Volume size */\r
+               if (disk_read(pdrv, buf, 0, 1) != RES_OK) return FR_DISK_ERR;   /* Load MBR */\r
+               if (ld_word(buf + BS_55AA) != 0xAA55) return FR_MKFS_ABORTED;   /* Check if MBR is valid */\r
+               pte = buf + (MBR_Table + (part - 1) * SZ_PTE);\r
+               if (!pte[PTE_System]) return FR_MKFS_ABORTED;   /* No partition? */\r
+               b_vol = ld_dword(pte + PTE_StLba);              /* Get volume start sector */\r
+               sz_vol = ld_dword(pte + PTE_SizLba);    /* Get volume size */\r
        } else {\r
-               /* Create a partition in this function */\r
-               if (disk_ioctl(pdrv, GET_SECTOR_COUNT, &n_vol) != RES_OK || n_vol < 128)\r
-                       return FR_DISK_ERR;\r
-               b_vol = (sfd) ? 0 : 63;         /* Volume start sector */\r
-               n_vol -= b_vol;                         /* Volume size */\r
+               /* Create a single-partition in this function */\r
+               if (disk_ioctl(pdrv, GET_SECTOR_COUNT, &sz_vol) != RES_OK) return FR_DISK_ERR;\r
+               b_vol = (opt & FM_SFD) ? 0 : 63;                /* Volume start sector */\r
+               if (sz_vol < b_vol) return FR_MKFS_ABORTED;\r
+               sz_vol -= b_vol;                                                /* Volume size */\r
        }\r
+       if (sz_vol < 128) return FR_MKFS_ABORTED;       /* Check if volume size is >=128s */\r
 \r
-       if (au & (au - 1)) au = 0;\r
-       if (!au) {                                              /* AU auto selection */\r
-               vs = n_vol / (2000 / (SS(fs) / 512));\r
-               for (i = 0; vs < vst[i]; i++) ;\r
-               au = cst[i];\r
-       }\r
-       if (au >= _MIN_SS) au /= SS(fs);        /* Number of sectors per cluster */\r
-       if (!au) au = 1;\r
-       if (au > 128) au = 128;\r
-\r
-       /* Pre-compute number of clusters and FAT sub-type */\r
-       n_clst = n_vol / au;\r
-       fmt = FS_FAT12;\r
-       if (n_clst >= MIN_FAT16) fmt = FS_FAT16;\r
-       if (n_clst >= MIN_FAT32) fmt = FS_FAT32;\r
-\r
-       /* Determine offset and size of FAT structure */\r
-       if (fmt == FS_FAT32) {\r
-               n_fat = ((n_clst * 4) + 8 + SS(fs) - 1) / SS(fs);\r
-               n_rsv = 32;\r
-               n_dir = 0;\r
-       } else {\r
-               n_fat = (fmt == FS_FAT12) ? (n_clst * 3 + 1) / 2 + 3 : (n_clst * 2) + 4;\r
-               n_fat = (n_fat + SS(fs) - 1) / SS(fs);\r
-               n_rsv = 1;\r
-               n_dir = (DWORD)N_ROOTDIR * SZ_DIR / SS(fs);\r
-       }\r
-       b_fat = b_vol + n_rsv;                          /* FAT area start sector */\r
-       b_dir = b_fat + n_fat * N_FATS;         /* Directory area start sector */\r
-       b_data = b_dir + n_dir;                         /* Data area start sector */\r
-       if (n_vol < b_data + au - b_vol) return FR_MKFS_ABORTED;        /* Too small volume */\r
-\r
-       /* Align data start sector to erase block boundary (for flash memory media) */\r
-       if (disk_ioctl(pdrv, GET_BLOCK_SIZE, &n) != RES_OK || !n || n > 32768) n = 1;\r
-       n = (b_data + n - 1) & ~(n - 1);        /* Next nearest erase block from current data start */\r
-       n = (n - b_data) / N_FATS;\r
-       if (fmt == FS_FAT32) {          /* FAT32: Move FAT offset */\r
-               n_rsv += n;\r
-               b_fat += n;\r
-       } else {                                        /* FAT12/16: Expand FAT size */\r
-               n_fat += n;\r
-       }\r
+       /* Pre-determine the FAT type */\r
+       do {\r
+               if (_FS_EXFAT && (opt & FM_EXFAT)) {    /* exFAT possible? */\r
+                       if ((opt & FM_ANY) == FM_EXFAT || sz_vol >= 0x4000000 || au > 128) {    /* exFAT only, vol >= 64Ms or au > 128s ? */\r
+                               fmt = FS_EXFAT; break;\r
+                       }\r
+               }\r
+               if (au > 128) return FR_INVALID_PARAMETER;      /* Too large au for FAT/FAT32 */\r
+               if (opt & FM_FAT32) {   /* FAT32 possible? */\r
+                       if ((opt & FM_ANY) == FM_FAT32 || !(opt & FM_FAT)) {    /* FAT32 only or no-FAT? */\r
+                               fmt = FS_FAT32; break;\r
+                       }\r
+               }\r
+               if (!(opt & FM_FAT)) return FR_INVALID_PARAMETER;       /* no-FAT? */\r
+               fmt = FS_FAT16;\r
+       } while (0);\r
+\r
+#if _FS_EXFAT\r
+       if (fmt == FS_EXFAT) {  /* Create an exFAT volume */\r
+               DWORD szb_bit, szb_case, sum, nb, cl;\r
+               WCHAR ch, si;\r
+               UINT j, st;\r
+               BYTE b;\r
+\r
+               if (sz_vol < 0x1000) return FR_MKFS_ABORTED;    /* Too small volume? */\r
+#if _USE_TRIM\r
+               tbl[0] = b_vol; tbl[1] = b_vol + sz_vol - 1;    /* Inform the device the volume area can be erased */\r
+               disk_ioctl(pdrv, CTRL_TRIM, tbl);\r
+#endif\r
+               /* Determine FAT location, data location and number of clusters */\r
+               if (!au) {      /* au auto-selection */\r
+                       au = 8;\r
+                       if (sz_vol >= 0x80000) au = 64;         /* >= 512Ks */\r
+                       if (sz_vol >= 0x4000000) au = 256;      /* >= 64Ms */\r
+               }\r
+               b_fat = b_vol + 32;                                                                             /* FAT start at offset 32 */\r
+               sz_fat = ((sz_vol / au + 2) * 4 + ss - 1) / ss;                 /* Number of FAT sectors */\r
+               b_data = (b_fat + sz_fat + sz_blk - 1) & ~(sz_blk - 1); /* Align data area to the erase block boundary */\r
+               if (b_data >= sz_vol / 2) return FR_MKFS_ABORTED;               /* Too small volume? */\r
+               n_clst = (sz_vol - (b_data - b_vol)) / au;                              /* Number of clusters */\r
+               if (n_clst <16) return FR_MKFS_ABORTED;                                 /* Too few clusters? */\r
+               if (n_clst > MAX_EXFAT) return FR_MKFS_ABORTED;                 /* Too many clusters? */\r
+\r
+               szb_bit = (n_clst + 7) / 8;                                             /* Size of allocation bitmap */\r
+               tbl[0] = (szb_bit + au * ss - 1) / (au * ss);   /* Number of allocation bitmap clusters */\r
+\r
+               /* Create a compressed up-case table */\r
+               sect = b_data + au * tbl[0];    /* Table start sector */\r
+               sum = 0;                                                /* Table checksum to be stored in the 82 entry */\r
+               st = si = i = j = szb_case = 0;\r
+               do {\r
+                       switch (st) {\r
+                       case 0:\r
+                               ch = ff_wtoupper(si);   /* Get an up-case char */\r
+                               if (ch != si) {\r
+                                       si++; break;            /* Store the up-case char if exist */\r
+                               }\r
+                               for (j = 1; (WCHAR)(si + j) && (WCHAR)(si + j) == ff_wtoupper((WCHAR)(si + j)); j++) ;  /* Get run length of no-case block */\r
+                               if (j >= 128) {\r
+                                       ch = 0xFFFF; st = 2; break;     /* Compress the no-case block if run is >= 128 */\r
+                               }\r
+                               st = 1;                 /* Do not compress short run */\r
+                               /* continue */\r
+                       case 1:\r
+                               ch = si++;              /* Fill the short run */\r
+                               if (--j == 0) st = 0;\r
+                               break;\r
+                       default:\r
+                               ch = (WCHAR)j; si += j; /* Number of chars to skip */\r
+                               st = 0;\r
+                       }\r
+                       sum = xsum32(buf[i + 0] = (BYTE)ch, sum);               /* Put it into the write buffer */\r
+                       sum = xsum32(buf[i + 1] = (BYTE)(ch >> 8), sum);\r
+                       i += 2; szb_case += 2;\r
+                       if (!si || i == szb_buf) {              /* Write buffered data when buffer full or end of process */\r
+                               n = (i + ss - 1) / ss;\r
+                               if (disk_write(pdrv, buf, sect, n) != RES_OK) return FR_DISK_ERR;\r
+                               sect += n; i = 0;\r
+                       }\r
+               } while (si);\r
+               tbl[1] = (szb_case + au * ss - 1) / (au * ss);  /* Number of up-case table clusters */\r
+               tbl[2] = 1;                                                                             /* Number of root dir clusters */\r
 \r
-       /* Determine number of clusters and final check of validity of the FAT sub-type */\r
-       n_clst = (n_vol - n_rsv - n_fat * N_FATS - n_dir) / au;\r
-       if (   (fmt == FS_FAT16 && n_clst < MIN_FAT16)\r
-               || (fmt == FS_FAT32 && n_clst < MIN_FAT32))\r
-               return FR_MKFS_ABORTED;\r
+               /* Initialize the allocation bitmap */\r
+               sect = b_data; nsect = (szb_bit + ss - 1) / ss; /* Start of bitmap and number of sectors */\r
+               nb = tbl[0] + tbl[1] + tbl[2];                                  /* Number of clusters in-use by system */\r
+               do {\r
+                       mem_set(buf, 0, szb_buf);\r
+                       for (i = 0; nb >= 8 && i < szb_buf; buf[i++] = 0xFF, nb -= 8) ;\r
+                       for (b = 1; nb && i < szb_buf; buf[i] |= b, b <<= 1, nb--) ;\r
+                       n = (nsect > sz_buf) ? sz_buf : nsect;          /* Write the buffered data */\r
+                       if (disk_write(pdrv, buf, sect, n) != RES_OK) return FR_DISK_ERR;\r
+                       sect += n; nsect -= n;\r
+               } while (nsect);\r
+\r
+               /* Initialize the FAT */\r
+               sect = b_fat; nsect = sz_fat;   /* Start of FAT and number of FAT sectors */\r
+               j = nb = cl = 0;\r
+               do {\r
+                       mem_set(buf, 0, szb_buf); i = 0;        /* Clear work area and reset write index */\r
+                       if (cl == 0) {  /* Set entry 0 and 1 */\r
+                               st_dword(buf + i, 0xFFFFFFF8); i += 4; cl++;\r
+                               st_dword(buf + i, 0xFFFFFFFF); i += 4; cl++;\r
+                       }\r
+                       do {                    /* Create chains of bitmap, up-case and root dir */\r
+                               while (nb && i < szb_buf) {                     /* Create a chain */\r
+                                       st_dword(buf + i, (nb > 1) ? cl + 1 : 0xFFFFFFFF);\r
+                                       i += 4; cl++; nb--;\r
+                               }\r
+                               if (!nb && j < 3) nb = tbl[j++];        /* Next chain */\r
+                       } while (nb && i < szb_buf);\r
+                       n = (nsect > sz_buf) ? sz_buf : nsect;  /* Write the buffered data */\r
+                       if (disk_write(pdrv, buf, sect, n) != RES_OK) return FR_DISK_ERR;\r
+                       sect += n; nsect -= n;\r
+               } while (nsect);\r
+\r
+               /* Initialize the root directory */\r
+               mem_set(buf, 0, szb_buf);\r
+               buf[SZDIRE * 0 + 0] = 0x83;             /* 83 entry (volume label) */\r
+               buf[SZDIRE * 1 + 0] = 0x81;             /* 81 entry (allocation bitmap) */\r
+               st_dword(buf + SZDIRE * 1 + 20, 2);\r
+               st_dword(buf + SZDIRE * 1 + 24, szb_bit);\r
+               buf[SZDIRE * 2 + 0] = 0x82;             /* 82 entry (up-case table) */\r
+               st_dword(buf + SZDIRE * 2 + 4, sum);\r
+               st_dword(buf + SZDIRE * 2 + 20, 2 + tbl[0]);\r
+               st_dword(buf + SZDIRE * 2 + 24, szb_case);\r
+               sect = b_data + au * (tbl[0] + tbl[1]); nsect = au;     /* Start of the root directory and number of sectors */\r
+               do {    /* Fill root directory sectors */\r
+                       n = (nsect > sz_buf) ? sz_buf : nsect;\r
+                       if (disk_write(pdrv, buf, sect, n) != RES_OK) return FR_DISK_ERR;\r
+                       mem_set(buf, 0, ss);\r
+                       sect += n; nsect -= n;\r
+               } while (nsect);\r
+\r
+               /* Create two set of the exFAT VBR blocks */\r
+               sect = b_vol;\r
+               for (n = 0; n < 2; n++) {\r
+                       /* Main record (+0) */\r
+                       mem_set(buf, 0, ss);\r
+                       mem_cpy(buf + BS_JmpBoot, "\xEB\x76\x90" "EXFAT   ", 11);       /* Boot jump code (x86), OEM name */\r
+                       st_dword(buf + BPB_VolOfsEx, b_vol);                                    /* Volume offset in the physical drive [sector] */\r
+                       st_dword(buf + BPB_TotSecEx, sz_vol);                                   /* Volume size [sector] */\r
+                       st_dword(buf + BPB_FatOfsEx, b_fat - b_vol);                    /* FAT offset [sector] */\r
+                       st_dword(buf + BPB_FatSzEx, sz_fat);                                    /* FAT size [sector] */\r
+                       st_dword(buf + BPB_DataOfsEx, b_data - b_vol);                  /* Data offset [sector] */\r
+                       st_dword(buf + BPB_NumClusEx, n_clst);                                  /* Number of clusters */\r
+                       st_dword(buf + BPB_RootClusEx, 2 + tbl[0] + tbl[1]);    /* Root dir cluster # */\r
+                       st_dword(buf + BPB_VolIDEx, GET_FATTIME());                             /* VSN */\r
+                       st_word(buf + BPB_FSVerEx, 0x100);                                              /* File system version (1.00) */\r
+                       for (buf[BPB_BytsPerSecEx] = 0, i = ss; i >>= 1; buf[BPB_BytsPerSecEx]++) ;     /* Log2 of sector size [byte] */\r
+                       for (buf[BPB_SecPerClusEx] = 0, i = au; i >>= 1; buf[BPB_SecPerClusEx]++) ;     /* Log2 of cluster size [sector] */\r
+                       buf[BPB_NumFATsEx] = 1;                                 /* Number of FATs */\r
+                       buf[BPB_DrvNumEx] = 0x80;                               /* Drive number (for int13) */\r
+                       st_word(buf + BS_BootCodeEx, 0xFEEB);   /* Boot code (x86) */\r
+                       st_word(buf + BS_55AA, 0xAA55);                 /* Signature (placed here regardless of sector size) */\r
+                       for (i = sum = 0; i < ss; i++) {                /* VBR checksum */\r
+                               if (i != BPB_VolFlagEx && i != BPB_VolFlagEx + 1 && i != BPB_PercInUseEx) sum = xsum32(buf[i], sum);\r
+                       }\r
+                       if (disk_write(pdrv, buf, sect++, 1) != RES_OK) return FR_DISK_ERR;\r
+                       /* Extended bootstrap record (+1..+8) */\r
+                       mem_set(buf, 0, ss);\r
+                       st_word(buf + ss - 2, 0xAA55);  /* Signature (placed at end of sector) */\r
+                       for (j = 1; j < 9; j++) {\r
+                               for (i = 0; i < ss; sum = xsum32(buf[i++], sum)) ;      /* VBR checksum */\r
+                               if (disk_write(pdrv, buf, sect++, 1) != RES_OK) return FR_DISK_ERR;\r
+                       }\r
+                       /* OEM/Reserved record (+9..+10) */\r
+                       mem_set(buf, 0, ss);\r
+                       for ( ; j < 11; j++) {\r
+                               for (i = 0; i < ss; sum = xsum32(buf[i++], sum)) ;      /* VBR checksum */\r
+                               if (disk_write(pdrv, buf, sect++, 1) != RES_OK) return FR_DISK_ERR;\r
+                       }\r
+                       /* Sum record (+11) */\r
+                       for (i = 0; i < ss; i += 4) st_dword(buf + i, sum);             /* Fill with checksum value */\r
+                       if (disk_write(pdrv, buf, sect++, 1) != RES_OK) return FR_DISK_ERR;\r
+               }\r
 \r
-       /* Determine system ID in the partition table */\r
-       if (fmt == FS_FAT32) {\r
-               sys = 0x0C;             /* FAT32X */\r
-       } else {\r
-               if (fmt == FS_FAT12 && n_vol < 0x10000) {\r
-                       sys = 0x01;     /* FAT12(<65536) */\r
+       } else\r
+#endif /* _FS_EXFAT */\r
+       {       /* Create an FAT12/16/32 volume */\r
+               do {\r
+                       pau = au;\r
+                       /* Pre-determine number of clusters and FAT sub-type */\r
+                       if (fmt == FS_FAT32) {  /* FAT32 volume */\r
+                               if (!pau) {     /* au auto-selection */\r
+                                       n = sz_vol / 0x20000;   /* Volume size in unit of 128KS */\r
+                                       for (i = 0, pau = 1; cst32[i] && cst32[i] <= n; i++, pau <<= 1) ;       /* Get from table */\r
+                               }\r
+                               n_clst = sz_vol / pau;  /* Number of clusters */\r
+                               sz_fat = (n_clst * 4 + 8 + ss - 1) / ss;        /* FAT size [sector] */\r
+                               sz_rsv = 32;    /* Number of reserved sectors */\r
+                               sz_dir = 0;             /* No static directory */\r
+                               if (n_clst <= MAX_FAT16 || n_clst > MAX_FAT32) return FR_MKFS_ABORTED;\r
+                       } else {                                /* FAT12/16 volume */\r
+                               if (!pau) {     /* au auto-selection */\r
+                                       n = sz_vol / 0x1000;    /* Volume size in unit of 4KS */\r
+                                       for (i = 0, pau = 1; cst[i] && cst[i] <= n; i++, pau <<= 1) ;   /* Get from table */\r
+                               }\r
+                               n_clst = sz_vol / pau;\r
+                               if (n_clst > MAX_FAT12) {\r
+                                       n = n_clst * 2 + 4;             /* FAT size [byte] */\r
+                               } else {\r
+                                       fmt = FS_FAT12;\r
+                                       n = (n_clst * 3 + 1) / 2 + 3;   /* FAT size [byte] */\r
+                               }\r
+                               sz_fat = (n + ss - 1) / ss;             /* FAT size [sector] */\r
+                               sz_rsv = 1;                                             /* Number of reserved sectors */\r
+                               sz_dir = (DWORD)n_rootdir * SZDIRE / ss;        /* Rootdir size [sector] */\r
+                       }\r
+                       b_fat = b_vol + sz_rsv;                                         /* FAT base */\r
+                       b_data = b_fat + sz_fat * n_fats + sz_dir;      /* Data base */\r
+\r
+                       /* Align data base to erase block boundary (for flash memory media) */\r
+                       n = ((b_data + sz_blk - 1) & ~(sz_blk - 1)) - b_data;   /* Next nearest erase block from current data base */\r
+                       if (fmt == FS_FAT32) {          /* FAT32: Move FAT base */\r
+                               sz_rsv += n; b_fat += n;\r
+                       } else {                                        /* FAT12/16: Expand FAT size */\r
+                               sz_fat += n / n_fats;\r
+                       }\r
+\r
+                       /* Determine number of clusters and final check of validity of the FAT sub-type */\r
+                       if (sz_vol < b_data + pau * 16 - b_vol) return FR_MKFS_ABORTED; /* Too small volume */\r
+                       n_clst = (sz_vol - sz_rsv - sz_fat * n_fats - sz_dir) / pau;\r
+                       if (fmt == FS_FAT32) {\r
+                               if (n_clst <= MAX_FAT16) {      /* Too few clusters for FAT32 */\r
+                                       if (!au && (au = pau / 2) != 0) continue;       /* Adjust cluster size and retry */\r
+                                       return FR_MKFS_ABORTED;\r
+                               }\r
+                       }\r
+                       if (fmt == FS_FAT16) {\r
+                               if (n_clst > MAX_FAT16) {       /* Too many clusters for FAT16 */\r
+                                       if (!au && (pau * 2) <= 64) {\r
+                                               au = pau * 2; continue;         /* Adjust cluster size and retry */\r
+                                       }\r
+                                       if ((opt & FM_FAT32)) {\r
+                                               fmt = FS_FAT32; continue;       /* Switch type to FAT32 and retry */\r
+                                       }\r
+                                       if (!au && (au = pau * 2) <= 128) continue;     /* Adjust cluster size and retry */\r
+                                       return FR_MKFS_ABORTED;\r
+                               }\r
+                               if  (n_clst <= MAX_FAT12) {     /* Too few clusters for FAT16 */\r
+                                       if (!au && (au = pau * 2) <= 128) continue;     /* Adjust cluster size and retry */\r
+                                       return FR_MKFS_ABORTED;\r
+                               }\r
+                       }\r
+                       if (fmt == FS_FAT12 && n_clst > MAX_FAT12) return FR_MKFS_ABORTED;      /* Too many clusters for FAT12 */\r
+\r
+                       /* Ok, it is the valid cluster configuration */\r
+                       break;\r
+               } while (1);\r
+\r
+#if _USE_TRIM\r
+               tbl[0] = b_vol; tbl[1] = b_vol + sz_vol - 1;    /* Inform the device the volume area can be erased */\r
+               disk_ioctl(pdrv, CTRL_TRIM, tbl);\r
+#endif\r
+               /* Create FAT VBR */\r
+               mem_set(buf, 0, ss);\r
+               mem_cpy(buf + BS_JmpBoot, "\xEB\xFE\x90" "MSDOS5.0", 11);/* Boot jump code (x86), OEM name */\r
+               st_word(buf + BPB_BytsPerSec, ss);                              /* Sector size [byte] */\r
+               buf[BPB_SecPerClus] = (BYTE)pau;                                /* Cluster size [sector] */\r
+               st_word(buf + BPB_RsvdSecCnt, (WORD)sz_rsv);    /* Size of reserved area */\r
+               buf[BPB_NumFATs] = (BYTE)n_fats;                                /* Number of FATs */\r
+               st_word(buf + BPB_RootEntCnt, (WORD)((fmt == FS_FAT32) ? 0 : n_rootdir));       /* Number of root directory entries */\r
+               if (sz_vol < 0x10000) {\r
+                       st_word(buf + BPB_TotSec16, (WORD)sz_vol);      /* Volume size in 16-bit LBA */\r
                } else {\r
-                       sys = (n_vol < 0x10000) ? 0x04 : 0x06;  /* FAT16(<65536) : FAT12/16(>=65536) */\r
+                       st_dword(buf + BPB_TotSec32, sz_vol);           /* Volume size in 32-bit LBA */\r
+               }\r
+               buf[BPB_Media] = 0xF8;                                                  /* Media descriptor byte */\r
+               st_word(buf + BPB_SecPerTrk, 63);                               /* Number of sectors per track (for int13) */\r
+               st_word(buf + BPB_NumHeads, 255);                               /* Number of heads (for int13) */\r
+               st_dword(buf + BPB_HiddSec, b_vol);                             /* Volume offset in the physical drive [sector] */\r
+               if (fmt == FS_FAT32) {\r
+                       st_dword(buf + BS_VolID32, GET_FATTIME());      /* VSN */\r
+                       st_dword(buf + BPB_FATSz32, sz_fat);            /* FAT size [sector] */\r
+                       st_dword(buf + BPB_RootClus32, 2);                      /* Root directory cluster # (2) */\r
+                       st_word(buf + BPB_FSInfo32, 1);                         /* Offset of FSINFO sector (VBR + 1) */\r
+                       st_word(buf + BPB_BkBootSec32, 6);                      /* Offset of backup VBR (VBR + 6) */\r
+                       buf[BS_DrvNum32] = 0x80;                                        /* Drive number (for int13) */\r
+                       buf[BS_BootSig32] = 0x29;                                       /* Extended boot signature */\r
+                       mem_cpy(buf + BS_VolLab32, "NO NAME    " "FAT32   ", 19);       /* Volume label, FAT signature */\r
+               } else {\r
+                       st_dword(buf + BS_VolID, GET_FATTIME());        /* VSN */\r
+                       st_word(buf + BPB_FATSz16, (WORD)sz_fat);       /* FAT size [sector] */\r
+                       buf[BS_DrvNum] = 0x80;                                          /* Drive number (for int13) */\r
+                       buf[BS_BootSig] = 0x29;                                         /* Extended boot signature */\r
+                       mem_cpy(buf + BS_VolLab, "NO NAME    " "FAT     ", 19); /* Volume label, FAT signature */\r
+               }\r
+               st_word(buf + BS_55AA, 0xAA55);                                 /* Signature (offset is fixed here regardless of sector size) */\r
+               if (disk_write(pdrv, buf, b_vol, 1) != RES_OK) return FR_DISK_ERR;      /* Write it to the VBR sector */\r
+\r
+               /* Create FSINFO record if needed */\r
+               if (fmt == FS_FAT32) {\r
+                       disk_write(pdrv, buf, b_vol + 6, 1);            /* Write backup VBR (VBR + 6) */\r
+                       mem_set(buf, 0, ss);\r
+                       st_dword(buf + FSI_LeadSig, 0x41615252);\r
+                       st_dword(buf + FSI_StrucSig, 0x61417272);\r
+                       st_dword(buf + FSI_Free_Count, n_clst - 1);     /* Number of free clusters */\r
+                       st_dword(buf + FSI_Nxt_Free, 2);                        /* Last allocated cluster# */\r
+                       st_word(buf + BS_55AA, 0xAA55);\r
+                       disk_write(pdrv, buf, b_vol + 7, 1);            /* Write backup FSINFO (VBR + 7) */\r
+                       disk_write(pdrv, buf, b_vol + 1, 1);            /* Write original FSINFO (VBR + 1) */\r
                }\r
-       }\r
 \r
-       if (_MULTI_PARTITION && part) {\r
-               /* Update system ID in the partition table */\r
-               tbl = &fs->win[MBR_Table + (part - 1) * SZ_PTE];\r
-               tbl[4] = sys;\r
-               if (disk_write(pdrv, fs->win, 0, 1) != RES_OK)  /* Write it to teh MBR */\r
-                       return FR_DISK_ERR;\r
-               md = 0xF8;\r
-       } else {\r
-               if (sfd) {      /* No partition table (SFD) */\r
-                       md = 0xF0;\r
-               } else {        /* Create partition table (FDISK) */\r
-                       mem_set(fs->win, 0, SS(fs));\r
-                       tbl = fs->win+MBR_Table;        /* Create partition table for single partition in the drive */\r
-                       tbl[1] = 1;                                             /* Partition start head */\r
-                       tbl[2] = 1;                                             /* Partition start sector */\r
-                       tbl[3] = 0;                                             /* Partition start cylinder */\r
-                       tbl[4] = sys;                                   /* System type */\r
-                       tbl[5] = 254;                                   /* Partition end head */\r
-                       n = (b_vol + n_vol) / 63 / 255;\r
-                       tbl[6] = (BYTE)(n >> 2 | 63);   /* Partition end sector */\r
-                       tbl[7] = (BYTE)n;                               /* End cylinder */\r
-                       ST_DWORD(tbl+8, 63);                    /* Partition start in LBA */\r
-                       ST_DWORD(tbl+12, n_vol);                /* Partition size in LBA */\r
-                       ST_WORD(fs->win+BS_55AA, 0xAA55);       /* MBR signature */\r
-                       if (disk_write(pdrv, fs->win, 0, 1) != RES_OK)  /* Write it to the MBR */\r
-                               return FR_DISK_ERR;\r
-                       md = 0xF8;\r
+               /* Initialize FAT area */\r
+               mem_set(buf, 0, (UINT)szb_buf);\r
+               sect = b_fat;           /* FAT start sector */\r
+               for (i = 0; i < n_fats; i++) {                  /* Initialize FATs each */\r
+                       if (fmt == FS_FAT32) {\r
+                               st_dword(buf + 0, 0xFFFFFFF8);  /* Entry 0 */\r
+                               st_dword(buf + 4, 0xFFFFFFFF);  /* Entry 1 */\r
+                               st_dword(buf + 8, 0x0FFFFFFF);  /* Entry 2 (root directory) */\r
+                       } else {\r
+                               st_dword(buf + 0, (fmt == FS_FAT12) ? 0xFFFFF8 : 0xFFFFFFF8);   /* Entry 0 and 1 */\r
+                       }\r
+                       nsect = sz_fat;         /* Number of FAT sectors */\r
+                       do {    /* Fill FAT sectors */\r
+                               n = (nsect > sz_buf) ? sz_buf : nsect;\r
+                               if (disk_write(pdrv, buf, sect, (UINT)n) != RES_OK) return FR_DISK_ERR;\r
+                               mem_set(buf, 0, ss);\r
+                               sect += n; nsect -= n;\r
+                       } while (nsect);\r
                }\r
-       }\r
 \r
-       /* Create BPB in the VBR */\r
-       tbl = fs->win;                                                  /* Clear sector */\r
-       mem_set(tbl, 0, SS(fs));\r
-       mem_cpy(tbl, "\xEB\xFE\x90" "MSDOS5.0", 11);/* Boot jump code, OEM name */\r
-       i = SS(fs);                                                             /* Sector size */\r
-       ST_WORD(tbl+BPB_BytsPerSec, i);\r
-       tbl[BPB_SecPerClus] = (BYTE)au;                 /* Sectors per cluster */\r
-       ST_WORD(tbl+BPB_RsvdSecCnt, n_rsv);             /* Reserved sectors */\r
-       tbl[BPB_NumFATs] = N_FATS;                              /* Number of FATs */\r
-       i = (fmt == FS_FAT32) ? 0 : N_ROOTDIR;  /* Number of root directory entries */\r
-       ST_WORD(tbl+BPB_RootEntCnt, i);\r
-       if (n_vol < 0x10000) {                                  /* Number of total sectors */\r
-               ST_WORD(tbl+BPB_TotSec16, n_vol);\r
-       } else {\r
-               ST_DWORD(tbl+BPB_TotSec32, n_vol);\r
+               /* Initialize root directory (fill with zero) */\r
+               nsect = (fmt == FS_FAT32) ? pau : sz_dir;       /* Number of root directory sectors */\r
+               do {\r
+                       n = (nsect > sz_buf) ? sz_buf : nsect;\r
+                       if (disk_write(pdrv, buf, sect, (UINT)n) != RES_OK) return FR_DISK_ERR;\r
+                       sect += n; nsect -= n;\r
+               } while (nsect);\r
        }\r
-       tbl[BPB_Media] = md;                                    /* Media descriptor */\r
-       ST_WORD(tbl+BPB_SecPerTrk, 63);                 /* Number of sectors per track */\r
-       ST_WORD(tbl+BPB_NumHeads, 255);                 /* Number of heads */\r
-       ST_DWORD(tbl+BPB_HiddSec, b_vol);               /* Hidden sectors */\r
-       n = GET_FATTIME();                                              /* Use current time as VSN */\r
-       if (fmt == FS_FAT32) {\r
-               ST_DWORD(tbl+BS_VolID32, n);            /* VSN */\r
-               ST_DWORD(tbl+BPB_FATSz32, n_fat);       /* Number of sectors per FAT */\r
-               ST_DWORD(tbl+BPB_RootClus, 2);          /* Root directory start cluster (2) */\r
-               ST_WORD(tbl+BPB_FSInfo, 1);                     /* FSINFO record offset (VBR+1) */\r
-               ST_WORD(tbl+BPB_BkBootSec, 6);          /* Backup boot record offset (VBR+6) */\r
-               tbl[BS_DrvNum32] = 0x80;                        /* Drive number */\r
-               tbl[BS_BootSig32] = 0x29;                       /* Extended boot signature */\r
-               mem_cpy(tbl+BS_VolLab32, "NO NAME    " "FAT32   ", 19); /* Volume label, FAT signature */\r
+\r
+       /* Determine system ID in the partition table */\r
+       if (_FS_EXFAT && fmt == FS_EXFAT) {\r
+               sys = 0x07;                     /* HPFS/NTFS/exFAT */\r
        } else {\r
-               ST_DWORD(tbl+BS_VolID, n);                      /* VSN */\r
-               ST_WORD(tbl+BPB_FATSz16, n_fat);        /* Number of sectors per FAT */\r
-               tbl[BS_DrvNum] = 0x80;                          /* Drive number */\r
-               tbl[BS_BootSig] = 0x29;                         /* Extended boot signature */\r
-               mem_cpy(tbl+BS_VolLab, "NO NAME    " "FAT     ", 19);   /* Volume label, FAT signature */\r
-       }\r
-       ST_WORD(tbl+BS_55AA, 0xAA55);                   /* Signature (Offset is fixed here regardless of sector size) */\r
-       if (disk_write(pdrv, tbl, b_vol, 1) != RES_OK)  /* Write it to the VBR sector */\r
-               return FR_DISK_ERR;\r
-       if (fmt == FS_FAT32)                                    /* Write backup VBR if needed (VBR+6) */\r
-               disk_write(pdrv, tbl, b_vol + 6, 1);\r
-\r
-       /* Initialize FAT area */\r
-       wsect = b_fat;\r
-       for (i = 0; i < N_FATS; i++) {          /* Initialize each FAT copy */\r
-               mem_set(tbl, 0, SS(fs));                        /* 1st sector of the FAT  */\r
-               n = md;                                                         /* Media descriptor byte */\r
-               if (fmt != FS_FAT32) {\r
-                       n |= (fmt == FS_FAT12) ? 0x00FFFF00 : 0xFFFFFF00;\r
-                       ST_DWORD(tbl+0, n);                             /* Reserve cluster #0-1 (FAT12/16) */\r
+               if (fmt == FS_FAT32) {\r
+                       sys = 0x0C;             /* FAT32X */\r
                } else {\r
-                       n |= 0xFFFFFF00;\r
-                       ST_DWORD(tbl+0, n);                             /* Reserve cluster #0-1 (FAT32) */\r
-                       ST_DWORD(tbl+4, 0xFFFFFFFF);\r
-                       ST_DWORD(tbl+8, 0x0FFFFFFF);    /* Reserve cluster #2 for root directory */\r
-               }\r
-               if (disk_write(pdrv, tbl, wsect++, 1) != RES_OK)\r
-                       return FR_DISK_ERR;\r
-               mem_set(tbl, 0, SS(fs));                        /* Fill following FAT entries with zero */\r
-               for (n = 1; n < n_fat; n++) {           /* This loop may take a time on FAT32 volume due to many single sector writes */\r
-                       if (disk_write(pdrv, tbl, wsect++, 1) != RES_OK)\r
-                               return FR_DISK_ERR;\r
+                       if (sz_vol >= 0x10000) {\r
+                               sys = 0x06;     /* FAT12/16 (>=64KS) */\r
+                       } else {\r
+                               sys = (fmt == FS_FAT16) ? 0x04 : 0x01;  /* FAT16 (<64KS) : FAT12 (<64KS) */\r
+                       }\r
                }\r
        }\r
 \r
-       /* Initialize root directory */\r
-       i = (fmt == FS_FAT32) ? au : (UINT)n_dir;\r
-       do {\r
-               if (disk_write(pdrv, tbl, wsect++, 1) != RES_OK)\r
-                       return FR_DISK_ERR;\r
-       } while (--i);\r
-\r
-#if _USE_TRIM  /* Erase data area if needed */\r
-       {\r
-               DWORD eb[2];\r
-\r
-               eb[0] = wsect; eb[1] = wsect + (n_clst - ((fmt == FS_FAT32) ? 1 : 0)) * au - 1;\r
-               disk_ioctl(pdrv, CTRL_TRIM, eb);\r
+       if (_MULTI_PARTITION && part != 0) {\r
+               /* Update system ID in the partition table */\r
+               if (disk_read(pdrv, buf, 0, 1) != RES_OK) return FR_DISK_ERR;   /* Read the MBR */\r
+               buf[MBR_Table + (part - 1) * SZ_PTE + PTE_System] = sys;                /* Set system type */\r
+               if (disk_write(pdrv, buf, 0, 1) != RES_OK) return FR_DISK_ERR;  /* Write it back to the MBR */\r
+       } else {\r
+               if (!(opt & FM_SFD)) {\r
+                       /* Create partition table in FDISK format */\r
+                       mem_set(buf, 0, ss);\r
+                       st_word(buf + BS_55AA, 0xAA55);         /* MBR signature */\r
+                       pte = buf + MBR_Table;                          /* Create partition table for single partition in the drive */\r
+                       pte[PTE_Boot] = 0;                                      /* Boot indicator */\r
+                       pte[PTE_StHead] = 1;                            /* Start head */\r
+                       pte[PTE_StSec] = 1;                                     /* Start sector */\r
+                       pte[PTE_StCyl] = 0;                                     /* Start cylinder */\r
+                       pte[PTE_System] = sys;                          /* System type */\r
+                       n = (b_vol + sz_vol) / (63 * 255);      /* (End CHS is incorrect) */\r
+                       pte[PTE_EdHead] = 254;                          /* End head */\r
+                       pte[PTE_EdSec] = (BYTE)(n >> 2 | 63);   /* End sector */\r
+                       pte[PTE_EdCyl] = (BYTE)n;                       /* End cylinder */\r
+                       st_dword(pte + PTE_StLba, b_vol);       /* Start offset in LBA */\r
+                       st_dword(pte + PTE_SizLba, sz_vol);     /* Size in sectors */\r
+                       if (disk_write(pdrv, buf, 0, 1) != RES_OK) return FR_DISK_ERR;  /* Write it to the MBR */\r
+               }\r
        }\r
-#endif\r
 \r
-       /* Create FSINFO if needed */\r
-       if (fmt == FS_FAT32) {\r
-               ST_DWORD(tbl+FSI_LeadSig, 0x41615252);\r
-               ST_DWORD(tbl+FSI_StrucSig, 0x61417272);\r
-               ST_DWORD(tbl+FSI_Free_Count, n_clst - 1);       /* Number of free clusters */\r
-               ST_DWORD(tbl+FSI_Nxt_Free, 2);                          /* Last allocated cluster# */\r
-               ST_WORD(tbl+BS_55AA, 0xAA55);\r
-               disk_write(pdrv, tbl, b_vol + 1, 1);    /* Write original (VBR+1) */\r
-               disk_write(pdrv, tbl, b_vol + 7, 1);    /* Write backup (VBR+7) */\r
-       }\r
+       if (disk_ioctl(pdrv, CTRL_SYNC, 0) != RES_OK) return FR_DISK_ERR;\r
 \r
-       return (disk_ioctl(pdrv, CTRL_SYNC, 0) == RES_OK) ? FR_OK : FR_DISK_ERR;\r
+       return FR_OK;\r
 }\r
 \r
 \r
 \r
 #if _MULTI_PARTITION\r
 /*-----------------------------------------------------------------------*/\r
-/* Divide Physical Drive                                                 */\r
+/* Create partition table on the physical drive                          */\r
 /*-----------------------------------------------------------------------*/\r
 \r
 FRESULT f_fdisk (\r
        BYTE pdrv,                      /* Physical drive number */\r
-       const DWORD szt[],      /* Pointer to the size table for each partitions */\r
+       const DWORD* szt,       /* Pointer to the size table for each partitions */\r
        void* work                      /* Pointer to the working buffer */\r
 )\r
 {\r
@@ -4252,7 +5681,7 @@ FRESULT f_fdisk (
        if (stat & STA_PROTECT) return FR_WRITE_PROTECTED;\r
        if (disk_ioctl(pdrv, GET_SECTOR_COUNT, &sz_disk)) return FR_DISK_ERR;\r
 \r
-       /* Determine CHS in the table regardless of the drive geometry */\r
+       /* Determine the CHS without any care of the drive geometry */\r
        for (n = 16; n < 256 && sz_disk / n / 63 > 1024; n *= 2) ;\r
        if (n == 256) n--;\r
        e_hd = n - 1;\r
@@ -4284,19 +5713,18 @@ FRESULT f_fdisk (
                p[5] = e_hd;                                            /* End head */\r
                p[6] = (BYTE)((e_cyl >> 2) + 63);       /* End sector */\r
                p[7] = (BYTE)e_cyl;                                     /* End cylinder */\r
-               ST_DWORD(p + 8, s_part);                        /* Start sector in LBA */\r
-               ST_DWORD(p + 12, sz_part);                      /* Partition size */\r
+               st_dword(p + 8, s_part);                        /* Start sector in LBA */\r
+               st_dword(p + 12, sz_part);                      /* Partition size */\r
 \r
                /* Next partition */\r
                b_cyl += p_cyl;\r
        }\r
-       ST_WORD(p, 0xAA55);\r
+       st_word(p, 0xAA55);\r
 \r
        /* Write it to the MBR */\r
        return (disk_write(pdrv, buf, 0, 1) != RES_OK || disk_ioctl(pdrv, CTRL_SYNC, 0) != RES_OK) ? FR_DISK_ERR : FR_OK;\r
 }\r
 \r
-\r
 #endif /* _MULTI_PARTITION */\r
 #endif /* _USE_MKFS && !_FS_READONLY */\r
 \r
@@ -4321,7 +5749,7 @@ TCHAR* f_gets (
 \r
 \r
        while (n < len - 1) {   /* Read characters until buffer gets filled */\r
-#if _USE_LFN && _LFN_UNICODE\r
+#if _LFN_UNICODE\r
 #if _STRF_ENCODE == 3          /* Read a character in UTF-8 */\r
                f_read(fp, s, 1, &rc);\r
                if (rc != 1) break;\r
@@ -4380,6 +5808,7 @@ TCHAR* f_gets (
 \r
 \r
 \r
+\r
 #if !_FS_READONLY\r
 #include <stdarg.h>\r
 /*-----------------------------------------------------------------------*/\r
@@ -4387,14 +5816,14 @@ TCHAR* f_gets (
 /*-----------------------------------------------------------------------*/\r
 \r
 typedef struct {\r
-       FIL* fp;\r
-       int idx, nchr;\r
-       BYTE buf[64];\r
+       FIL *fp;                /* Ptr to the writing file */\r
+       int idx, nchr;  /* Write index of buf[] (-1:error), number of chars written */\r
+       BYTE buf[64];   /* Write buffer */\r
 } putbuff;\r
 \r
 \r
 static\r
-void putc_bfd (\r
+void putc_bfd (                /* Buffered write with code conversion */\r
        putbuff* pb,\r
        TCHAR c\r
 )\r
@@ -4403,13 +5832,14 @@ void putc_bfd (
        int i;\r
 \r
 \r
-       if (_USE_STRFUNC == 2 && c == '\n')      /* LF -> CRLF conversion */\r
+       if (_USE_STRFUNC == 2 && c == '\n') {    /* LF -> CRLF conversion */\r
                putc_bfd(pb, '\r');\r
+       }\r
 \r
-       i = pb->idx;    /* Buffer write index (-1:error) */\r
+       i = pb->idx;            /* Write index of pb->buf[] */\r
        if (i < 0) return;\r
 \r
-#if _USE_LFN && _LFN_UNICODE\r
+#if _LFN_UNICODE\r
 #if _STRF_ENCODE == 3                  /* Write a character in UTF-8 */\r
        if (c < 0x80) {                         /* 7-bit */\r
                pb->buf[i++] = (BYTE)c;\r
@@ -4448,6 +5878,31 @@ void putc_bfd (
 }\r
 \r
 \r
+static\r
+int putc_flush (               /* Flush left characters in the buffer */\r
+       putbuff* pb\r
+)\r
+{\r
+       UINT nw;\r
+\r
+       if (   pb->idx >= 0     /* Flush buffered characters to the file */\r
+               && f_write(pb->fp, pb->buf, (UINT)pb->idx, &nw) == FR_OK\r
+               && (UINT)pb->idx == nw) return pb->nchr;\r
+       return EOF;\r
+}\r
+\r
+\r
+static\r
+void putc_init (               /* Initialize write buffer */\r
+       putbuff* pb,\r
+       FIL* fp\r
+)\r
+{\r
+       pb->fp = fp;\r
+       pb->nchr = pb->idx = 0;\r
+}\r
+\r
+\r
 \r
 int f_putc (\r
        TCHAR c,        /* A character to be output */\r
@@ -4455,18 +5910,11 @@ int f_putc (
 )\r
 {\r
        putbuff pb;\r
-       UINT nw;\r
-\r
-\r
-       pb.fp = fp;                     /* Initialize output buffer */\r
-       pb.nchr = pb.idx = 0;\r
 \r
-       putc_bfd(&pb, c);       /* Put a character */\r
 \r
-       if (   pb.idx >= 0      /* Flush buffered characters to the file */\r
-               && f_write(pb.fp, pb.buf, (UINT)pb.idx, &nw) == FR_OK\r
-               && (UINT)pb.idx == nw) return pb.nchr;\r
-       return EOF;\r
+       putc_init(&pb, fp);\r
+       putc_bfd(&pb, c);       /* Put the character */\r
+       return putc_flush(&pb);\r
 }\r
 \r
 \r
@@ -4482,19 +5930,11 @@ int f_puts (
 )\r
 {\r
        putbuff pb;\r
-       UINT nw;\r
-\r
-\r
-       pb.fp = fp;                             /* Initialize output buffer */\r
-       pb.nchr = pb.idx = 0;\r
 \r
-       while (*str)                    /* Put the string */\r
-               putc_bfd(&pb, *str++);\r
 \r
-       if (   pb.idx >= 0              /* Flush buffered characters to the file */\r
-               && f_write(pb.fp, pb.buf, (UINT)pb.idx, &nw) == FR_OK\r
-               && (UINT)pb.idx == nw) return pb.nchr;\r
-       return EOF;\r
+       putc_init(&pb, fp);\r
+       while (*str) putc_bfd(&pb, *str++);             /* Put the string */\r
+       return putc_flush(&pb);\r
 }\r
 \r
 \r
@@ -4511,15 +5951,14 @@ int f_printf (
 )\r
 {\r
        va_list arp;\r
+       putbuff pb;\r
        BYTE f, r;\r
-       UINT nw, i, j, w;\r
+       UINT i, j, w;\r
        DWORD v;\r
-       TCHAR c, d, s[16], *p;\r
-       putbuff pb;\r
+       TCHAR c, d, str[32], *p;\r
 \r
 \r
-       pb.fp = fp;                             /* Initialize output buffer */\r
-       pb.nchr = pb.idx = 0;\r
+       putc_init(&pb, fp);\r
 \r
        va_start(arp, fmt);\r
 \r
@@ -4584,21 +6023,18 @@ int f_printf (
                do {\r
                        d = (TCHAR)(v % r); v /= r;\r
                        if (d > 9) d += (c == 'x') ? 0x27 : 0x07;\r
-                       s[i++] = d + '0';\r
-               } while (v && i < sizeof s / sizeof s[0]);\r
-               if (f & 8) s[i++] = '-';\r
+                       str[i++] = d + '0';\r
+               } while (v && i < sizeof str / sizeof str[0]);\r
+               if (f & 8) str[i++] = '-';\r
                j = i; d = (f & 1) ? '0' : ' ';\r
                while (!(f & 2) && j++ < w) putc_bfd(&pb, d);\r
-               do putc_bfd(&pb, s[--i]); while (i);\r
+               do putc_bfd(&pb, str[--i]); while (i);\r
                while (j++ < w) putc_bfd(&pb, d);\r
        }\r
 \r
        va_end(arp);\r
 \r
-       if (   pb.idx >= 0              /* Flush buffered characters to the file */\r
-               && f_write(pb.fp, pb.buf, (UINT)pb.idx, &nw) == FR_OK\r
-               && (UINT)pb.idx == nw) return pb.nchr;\r
-       return EOF;\r
+       return putc_flush(&pb);\r
 }\r
 \r
 #endif /* !_FS_READONLY */\r