/*----------------------------------------------------------------------------/\r
-/ FatFs - Generic FAT file system module R0.12b /\r
+/ FatFs - Generic FAT Filesystem Module R0.13b /\r
/-----------------------------------------------------------------------------/\r
/\r
-/ Copyright (C) 2016, ChaN, all right reserved.\r
+/ Copyright (C) 2018, ChaN, all right reserved.\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
+/\r
/ 1. Redistributions of source code must retain the above copyright notice,\r
/ this condition and the following disclaimer.\r
/\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
\r
\r
---------------------------------------------------------------------------*/\r
\r
-#if _FATFS != 68020 /* Revision ID */\r
+#if FF_DEFINED != 63463 /* 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
-#error Static LFN work area cannot be used at thread-safe configuration\r
-#endif\r
-#define ENTER_FF(fs) { if (!lock_fs(fs)) return FR_TIMEOUT; }\r
-#define LEAVE_FF(fs, res) { unlock_fs(fs, res); return res; }\r
-#else\r
-#define ENTER_FF(fs)\r
-#define LEAVE_FF(fs, res) return res\r
-#endif\r
-\r
-\r
-\r
-/* Definitions of sector size */\r
-#if (_MAX_SS < _MIN_SS) || (_MAX_SS != 512 && _MAX_SS != 1024 && _MAX_SS != 2048 && _MAX_SS != 4096) || (_MIN_SS != 512 && _MIN_SS != 1024 && _MIN_SS != 2048 && _MIN_SS != 4096)\r
-#error Wrong sector size configuration\r
-#endif\r
-#if _MAX_SS == _MIN_SS\r
-#define SS(fs) ((UINT)_MAX_SS) /* Fixed sector size */\r
-#else\r
-#define SS(fs) ((fs)->ssize) /* Variable sector size */\r
-#endif\r
-\r
-\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 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
- 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 upper conversion tables */\r
-\r
-#if _CODE_PAGE == 932 /* Japanese Shift-JIS */\r
-#define _DF1S 0x81 /* DBC 1st byte range 1 start */\r
-#define _DF1E 0x9F /* DBC 1st byte range 1 end */\r
-#define _DF2S 0xE0 /* DBC 1st byte range 2 start */\r
-#define _DF2E 0xFC /* DBC 1st byte range 2 end */\r
-#define _DS1S 0x40 /* DBC 2nd byte range 1 start */\r
-#define _DS1E 0x7E /* DBC 2nd byte range 1 end */\r
-#define _DS2S 0x80 /* DBC 2nd byte range 2 start */\r
-#define _DS2E 0xFC /* DBC 2nd byte range 2 end */\r
-\r
-#elif _CODE_PAGE == 936 /* Simplified Chinese GBK */\r
-#define _DF1S 0x81\r
-#define _DF1E 0xFE\r
-#define _DS1S 0x40\r
-#define _DS1E 0x7E\r
-#define _DS2S 0x80\r
-#define _DS2E 0xFE\r
-\r
-#elif _CODE_PAGE == 949 /* Korean */\r
-#define _DF1S 0x81\r
-#define _DF1E 0xFE\r
-#define _DS1S 0x41\r
-#define _DS1E 0x5A\r
-#define _DS2S 0x61\r
-#define _DS2E 0x7A\r
-#define _DS3S 0x81\r
-#define _DS3E 0xFE\r
-\r
-#elif _CODE_PAGE == 950 /* Traditional Chinese Big5 */\r
-#define _DF1S 0x81\r
-#define _DF1E 0xFE\r
-#define _DS1S 0x40\r
-#define _DS1E 0x7E\r
-#define _DS2S 0xA1\r
-#define _DS2E 0xFE\r
-\r
-#elif _CODE_PAGE == 437 /* U.S. */\r
-#define _DF1S 0\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,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 {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,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,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 {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,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 {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,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,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,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, \\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 {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,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,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, \\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, \\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 != 0\r
-#error Cannot enable LFN without valid code page.\r
-#endif\r
-#define _DF1S 0\r
-\r
-#else\r
-#error Unknown code page\r
-\r
-#endif\r
-\r
-\r
/* Character code support macros */\r
-#define IsUpper(c) (((c)>='A')&&((c)<='Z'))\r
-#define IsLower(c) (((c)>='a')&&((c)<='z'))\r
-#define IsDigit(c) (((c)>='0')&&((c)<='9'))\r
-\r
-#if _DF1S != 0 /* Code page is DBCS */\r
+#define IsUpper(c) ((c) >= 'A' && (c) <= 'Z')\r
+#define IsLower(c) ((c) >= 'a' && (c) <= 'z')\r
+#define IsDigit(c) ((c) >= '0' && (c) <= '9')\r
+#define IsSurrogate(c) ((c) >= 0xD800 && (c) <= 0xDFFF)\r
+#define IsSurrogateH(c) ((c) >= 0xD800 && (c) <= 0xDBFF)\r
+#define IsSurrogateL(c) ((c) >= 0xDC00 && (c) <= 0xDFFF)\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
-#else /* One 1st byte area */\r
-#define IsDBCS1(c) ((BYTE)(c) >= _DF1S && (BYTE)(c) <= _DF1E)\r
-#endif\r
-\r
-#ifdef _DS3S /* Three 2nd byte areas */\r
-#define IsDBCS2(c) (((BYTE)(c) >= _DS1S && (BYTE)(c) <= _DS1E) || ((BYTE)(c) >= _DS2S && (BYTE)(c) <= _DS2E) || ((BYTE)(c) >= _DS3S && (BYTE)(c) <= _DS3E))\r
-#else /* Two 2nd byte areas */\r
-#define IsDBCS2(c) (((BYTE)(c) >= _DS1S && (BYTE)(c) <= _DS1E) || ((BYTE)(c) >= _DS2S && (BYTE)(c) <= _DS2E))\r
-#endif\r
\r
-#else /* Code page is SBCS */\r
-\r
-#define IsDBCS1(c) 0\r
-#define IsDBCS2(c) 0\r
-\r
-#endif /* _DF1S */\r
-\r
-\r
-/* File attribute bits (internal use) */\r
-#define AM_VOL 0x08 /* Volume label */\r
+/* Additional file attribute bits for 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
+/* Additional file access control and file status flags for 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
+/* Name status flags in fn[11] */\r
+#define NSFLAG 11 /* Index of the name status byte */\r
#define NS_LOSS 0x01 /* Out of 8.3 format */\r
#define NS_LFN 0x02 /* Force to create LFN entry */\r
#define NS_LAST 0x04 /* Last segment */\r
#define NS_NONAME 0x80 /* Not followed */\r
\r
\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
+/* Limits and boundaries */\r
+#define MAX_DIR 0x200000 /* Max size of FAT directory */\r
+#define MAX_DIR_EX 0x10000000 /* Max size of exFAT directory */\r
+#define MAX_FAT12 0xFF5 /* Max FAT12 clusters (differs from specs, but right for real DOS/Windows behavior) */\r
+#define MAX_FAT16 0xFFF5 /* Max FAT16 clusters (differs from specs, but right for real DOS/Windows behavior) */\r
+#define MAX_FAT32 0x0FFFFFF5 /* Max FAT32 clusters (not specified, practical limit) */\r
+#define MAX_EXFAT 0x7FFFFFFD /* Max exFAT clusters (differs from specs, implementation limit) */\r
\r
\r
-/* FatFs refers the members in the FAT structures as byte array instead of\r
-/ structure members because the structure is not binary compatible between\r
-/ different platforms */\r
+/* FatFs refers the FAT structure as simple byte array instead of structure member\r
+/ because the C structure is not binary compatible between different platforms */\r
\r
#define BS_JmpBoot 0 /* x86 jump instruction (3-byte) */\r
#define BS_OEMName 3 /* OEM name (8-byte) */\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_RootEntCnt 17 /* Size of root directory area for FAT [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_SecPerTrk 24 /* Number of sectors per track 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_NTres 37 /* WindowsNT 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_FilSysType 54 /* Filesystem 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_FSVer32 42 /* FAT32: Filesystem 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_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_FilSysType32 82 /* FAT32: Filesystem 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_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_RootClusEx 96 /* exFAT: Root directory start 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_FSVerEx 104 /* exFAT: Filesystem version (WORD) */\r
+#define BPB_VolFlagEx 106 /* exFAT: Volume flags (WORD) */\r
+#define BPB_BytsPerSecEx 108 /* exFAT: Log2 of sector size in unit of byte (BYTE) */\r
+#define BPB_SecPerClusEx 109 /* exFAT: Log2 of cluster size in unit of 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 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
+#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: LFN order and LLE flag (BYTE) */\r
+#define LDIR_Attr 11 /* LFN: LFN attribute (BYTE) */\r
+#define LDIR_Type 12 /* LFN: Entry type (BYTE) */\r
+#define LDIR_Chksum 13 /* LFN: Checksum of the SFN (BYTE) */\r
+#define LDIR_FstClusLO 26 /* LFN: MBZ field (WORD) */\r
+#define XDIR_Type 0 /* exFAT: Type of exFAT directory entry (BYTE) */\r
+#define XDIR_NumLabel 1 /* exFAT: Number of volume label characters (BYTE) */\r
+#define XDIR_Label 2 /* exFAT: Volume label (11-WORD) */\r
+#define XDIR_CaseSum 4 /* exFAT: Sum of case conversion table (DWORD) */\r
+#define XDIR_NumSec 1 /* exFAT: Number of secondary entries (BYTE) */\r
+#define XDIR_SetSum 2 /* exFAT: Sum of the set of directory entries (WORD) */\r
+#define XDIR_Attr 4 /* exFAT: File attribute (WORD) */\r
+#define XDIR_CrtTime 8 /* exFAT: Created time (DWORD) */\r
+#define XDIR_ModTime 12 /* exFAT: Modified time (DWORD) */\r
+#define XDIR_AccTime 16 /* exFAT: Last accessed time (DWORD) */\r
+#define XDIR_CrtTime10 20 /* exFAT: Created time subsecond (BYTE) */\r
+#define XDIR_ModTime10 21 /* exFAT: Modified time subsecond (BYTE) */\r
+#define XDIR_CrtTZ 22 /* exFAT: Created timezone (BYTE) */\r
+#define XDIR_ModTZ 23 /* exFAT: Modified timezone (BYTE) */\r
+#define XDIR_AccTZ 24 /* exFAT: Last accessed timezone (BYTE) */\r
+#define XDIR_GenFlags 33 /* exFAT: General secondary flags (BYTE) */\r
+#define XDIR_NumName 35 /* exFAT: Number of file name characters (BYTE) */\r
+#define XDIR_NameHash 36 /* exFAT: Hash of file name (WORD) */\r
+#define XDIR_ValidFileSize 40 /* exFAT: Valid file size (QWORD) */\r
+#define XDIR_FstClus 52 /* exFAT: First cluster of the file data (DWORD) */\r
+#define XDIR_FileSize 56 /* exFAT: File/Directory size (QWORD) */\r
+\r
+#define SZDIRE 32 /* Size of a directory entry */\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
+#define LLEF 0x40 /* Last long entry flag in LDIR_Ord */\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 SZ_PTE 16 /* MBR: Size of a partition table entry */\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_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
+/* Post process on fatal error in the file operations */\r
+#define ABORT(fs, res) { fp->err = (BYTE)(res); LEAVE_FF(fs, res); }\r
+\r
+\r
+/* Re-entrancy related */\r
+#if FF_FS_REENTRANT\r
+#if FF_USE_LFN == 1\r
+#error Static LFN work area cannot be used at thread-safe configuration\r
+#endif\r
+#define LEAVE_FF(fs, res) { unlock_fs(fs, res); return res; }\r
+#else\r
+#define LEAVE_FF(fs, res) return res\r
+#endif\r
+\r
+\r
+/* Definitions of volume - physical location conversion */\r
+#if FF_MULTI_PARTITION\r
+#define LD2PD(vol) VolToPart[vol].pd /* Get physical drive number */\r
+#define LD2PT(vol) VolToPart[vol].pt /* Get partition index */\r
+#else\r
+#define LD2PD(vol) (BYTE)(vol) /* Each logical drive is bound to the same physical drive number */\r
+#define LD2PT(vol) 0 /* Find first valid partition or in SFD */\r
+#endif\r
+\r
+\r
+/* Definitions of sector size */\r
+#if (FF_MAX_SS < FF_MIN_SS) || (FF_MAX_SS != 512 && FF_MAX_SS != 1024 && FF_MAX_SS != 2048 && FF_MAX_SS != 4096) || (FF_MIN_SS != 512 && FF_MIN_SS != 1024 && FF_MIN_SS != 2048 && FF_MIN_SS != 4096)\r
+#error Wrong sector size configuration\r
+#endif\r
+#if FF_MAX_SS == FF_MIN_SS\r
+#define SS(fs) ((UINT)FF_MAX_SS) /* Fixed sector size */\r
+#else\r
+#define SS(fs) ((fs)->ssize) /* Variable sector size */\r
+#endif\r
\r
\r
+/* Timestamp */\r
+#if FF_FS_NORTC == 1\r
+#if FF_NORTC_YEAR < 1980 || FF_NORTC_YEAR > 2107 || FF_NORTC_MON < 1 || FF_NORTC_MON > 12 || FF_NORTC_MDAY < 1 || FF_NORTC_MDAY > 31\r
+#error Invalid FF_FS_NORTC settings\r
+#endif\r
+#define GET_FATTIME() ((DWORD)(FF_NORTC_YEAR - 1980) << 25 | (DWORD)FF_NORTC_MON << 21 | (DWORD)FF_NORTC_MDAY << 16)\r
+#else\r
+#define GET_FATTIME() get_fattime()\r
+#endif\r
+\r
+\r
+/* File lock controls */\r
+#if FF_FS_LOCK != 0\r
+#if FF_FS_READONLY\r
+#error FF_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, containing directory (0:root) */\r
+ DWORD ofs; /* Object ID 3, offset in the directory */\r
+ WORD ctr; /* Object open counter, 0:none, 0x01..0xFF:read mode open count, 0x100:write mode */\r
+} FILESEM;\r
+#endif\r
+\r
+\r
+/* SBCS up-case tables (\x80-\xFF) */\r
+#define TBL_CT437 {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
+#define TBL_CT720 {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
+#define TBL_CT737 {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
+#define TBL_CT771 {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
+#define TBL_CT775 {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
+#define TBL_CT850 {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
+#define TBL_CT852 {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
+#define TBL_CT855 {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
+#define TBL_CT857 {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
+#define TBL_CT860 {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
+#define TBL_CT861 {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
+#define TBL_CT862 {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
+#define TBL_CT863 {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
+#define TBL_CT864 {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
+#define TBL_CT865 {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
+#define TBL_CT866 {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
+#define TBL_CT869 {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
+\r
+/* DBCS code range |----- 1st byte -----| |----------- 2nd byte -----------| */\r
+#define TBL_DC932 {0x81, 0x9F, 0xE0, 0xFC, 0x40, 0x7E, 0x80, 0xFC, 0x00, 0x00}\r
+#define TBL_DC936 {0x81, 0xFE, 0x00, 0x00, 0x40, 0x7E, 0x80, 0xFE, 0x00, 0x00}\r
+#define TBL_DC949 {0x81, 0xFE, 0x00, 0x00, 0x41, 0x5A, 0x61, 0x7A, 0x81, 0xFE}\r
+#define TBL_DC950 {0x81, 0xFE, 0x00, 0x00, 0x40, 0x7E, 0xA1, 0xFE, 0x00, 0x00}\r
+\r
+\r
+/* Macros for table definitions */\r
+#define MERGE_2STR(a, b) a ## b\r
+#define MKCVTBL(hd, cp) MERGE_2STR(hd, cp)\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
+/* Remark: Variables defined here without initial value shall be guaranteed\r
+/ zero/null at start-up. If not, the linker option or start-up routine is\r
/ not compliance with C standard. */\r
\r
-#if _VOLUMES < 1 || _VOLUMES > 9\r
-#error Wrong _VOLUMES setting\r
+/*--------------------------------*/\r
+/* File/Volume controls */\r
+/*--------------------------------*/\r
+\r
+#if FF_VOLUMES < 1 || FF_VOLUMES > 10\r
+#error Wrong FF_VOLUMES setting\r
#endif\r
-static FATFS *FatFs[_VOLUMES]; /* Pointer to the file system objects (logical drives) */\r
-static WORD Fsid; /* File system mount ID */\r
+static FATFS* FatFs[FF_VOLUMES]; /* Pointer to the filesystem objects (logical drives) */\r
+static WORD Fsid; /* Filesystem mount ID */\r
\r
-#if _FS_RPATH != 0 && _VOLUMES >= 2\r
-static BYTE CurrVol; /* Current drive */\r
+#if FF_FS_RPATH != 0\r
+static BYTE CurrVol; /* Current drive */\r
#endif\r
\r
-#if _FS_LOCK != 0\r
-static FILESEM Files[_FS_LOCK]; /* Open object lock semaphores */\r
+#if FF_FS_LOCK != 0\r
+static FILESEM Files[FF_FS_LOCK]; /* Open object lock semaphores */\r
#endif\r
\r
-#if _USE_LFN == 0 /* Non-LFN configuration */\r
-#define DEF_NAMBUF\r
+#if FF_STR_VOLUME_ID\r
+#ifdef FF_VOLUME_STRS\r
+static const char* const VolumeStr[FF_VOLUMES] = {FF_VOLUME_STRS}; /* Pre-defined volume ID */\r
+#endif\r
+#endif\r
+\r
+\r
+/*--------------------------------*/\r
+/* LFN/Directory working buffer */\r
+/*--------------------------------*/\r
+\r
+#if FF_USE_LFN == 0 /* Non-LFN configuration */\r
+#if FF_FS_EXFAT\r
+#error LFN must be enabled when enable exFAT\r
+#endif\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
+#define FREE_NAMBUF()\r
+#define LEAVE_MKFS(res) return res\r
+\r
+#else /* LFN configurations */\r
+#if FF_MAX_LFN < 12 || FF_MAX_LFN > 255\r
+#error Wrong setting of FF_MAX_LFN\r
+#endif\r
+#if FF_LFN_BUF < FF_SFN_BUF || FF_SFN_BUF < 12\r
+#error Wrong setting of FF_LFN_BUF or FF_SFN_BUF\r
#endif\r
+#if FF_LFN_UNICODE < 0 || FF_LFN_UNICODE > 3\r
+#error Wrong setting of FF_LFN_UNICODE\r
+#endif\r
+static const BYTE LfnOfs[] = {1,3,5,7,9,14,16,18,20,22,24,28,30}; /* FAT: Offset of LFN characters in the directory entry */\r
+#define MAXDIRB(nc) ((nc + 44U) / 15 * SZDIRE) /* exFAT: Size of directory entry block scratchpad buffer needed for the name length */\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
+#if FF_USE_LFN == 1 /* LFN enabled with static working buffer */\r
+#if FF_FS_EXFAT\r
+static BYTE DirBuf[MAXDIRB(FF_MAX_LFN)]; /* Directory entry block scratchpad buffer */\r
#endif\r
-static WCHAR LfnBuf[_MAX_LFN+1]; /* LFN enabled with static working buffer */\r
-#define DEF_NAMBUF\r
+static WCHAR LfnBuf[FF_MAX_LFN + 1]; /* LFN working buffer */\r
+#define DEF_NAMBUF\r
#define INIT_NAMBUF(fs)\r
-#define FREE_NAMBUF()\r
+#define FREE_NAMBUF()\r
+#define LEAVE_MKFS(res) return res\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
+#elif FF_USE_LFN == 2 /* LFN enabled with dynamic working buffer on the stack */\r
+#if FF_FS_EXFAT\r
+#define DEF_NAMBUF WCHAR lbuf[FF_MAX_LFN+1]; BYTE dbuf[MAXDIRB(FF_MAX_LFN)]; /* LFN working buffer and directory entry block scratchpad buffer */\r
#define INIT_NAMBUF(fs) { (fs)->lfnbuf = lbuf; (fs)->dirbuf = dbuf; }\r
-#define FREE_NAMBUF()\r
+#define FREE_NAMBUF()\r
#else\r
-#define DEF_NAMBUF WCHAR lbuf[_MAX_LFN+1];\r
+#define DEF_NAMBUF WCHAR lbuf[FF_MAX_LFN+1]; /* LFN working buffer */\r
#define INIT_NAMBUF(fs) { (fs)->lfnbuf = lbuf; }\r
-#define FREE_NAMBUF()\r
+#define FREE_NAMBUF()\r
#endif\r
+#define LEAVE_MKFS(res) return res\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
+#elif FF_USE_LFN == 3 /* LFN enabled with dynamic working buffer on the heap */\r
+#if FF_FS_EXFAT\r
+#define DEF_NAMBUF WCHAR *lfn; /* Pointer to LFN working buffer and directory entry block scratchpad buffer */\r
+#define INIT_NAMBUF(fs) { lfn = ff_memalloc((FF_MAX_LFN+1)*2 + MAXDIRB(FF_MAX_LFN)); if (!lfn) LEAVE_FF(fs, FR_NOT_ENOUGH_CORE); (fs)->lfnbuf = lfn; (fs)->dirbuf = (BYTE*)(lfn+FF_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
+#define DEF_NAMBUF WCHAR *lfn; /* Pointer to LFN working buffer */\r
+#define INIT_NAMBUF(fs) { lfn = ff_memalloc((FF_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
+#define LEAVE_MKFS(res) { if (!work) ff_memfree(buf); return res; }\r
+#define MAX_MALLOC 0x8000 /* Must be >=FF_MAX_SS */\r
\r
#else\r
-#error Wrong _USE_LFN setting\r
-#endif\r
-#endif\r
+#error Wrong setting of FF_USE_LFN\r
\r
-#ifdef _EXCVT\r
-static const BYTE ExCvt[] = _EXCVT; /* Upper conversion table for SBCS extended characters */\r
-#endif\r
+#endif /* FF_USE_LFN == 1 */\r
+#endif /* FF_USE_LFN == 0 */\r
+\r
+\r
+\r
+/*--------------------------------*/\r
+/* Code conversion tables */\r
+/*--------------------------------*/\r
+\r
+#if FF_CODE_PAGE == 0 /* Run-time code page configuration */\r
+#define CODEPAGE CodePage\r
+static WORD CodePage; /* Current code page */\r
+static const BYTE *ExCvt, *DbcTbl; /* Pointer to current SBCS up-case table and DBCS code range table below */\r
+static const BYTE Ct437[] = TBL_CT437;\r
+static const BYTE Ct720[] = TBL_CT720;\r
+static const BYTE Ct737[] = TBL_CT737;\r
+static const BYTE Ct771[] = TBL_CT771;\r
+static const BYTE Ct775[] = TBL_CT775;\r
+static const BYTE Ct850[] = TBL_CT850;\r
+static const BYTE Ct852[] = TBL_CT852;\r
+static const BYTE Ct855[] = TBL_CT855;\r
+static const BYTE Ct857[] = TBL_CT857;\r
+static const BYTE Ct860[] = TBL_CT860;\r
+static const BYTE Ct861[] = TBL_CT861;\r
+static const BYTE Ct862[] = TBL_CT862;\r
+static const BYTE Ct863[] = TBL_CT863;\r
+static const BYTE Ct864[] = TBL_CT864;\r
+static const BYTE Ct865[] = TBL_CT865;\r
+static const BYTE Ct866[] = TBL_CT866;\r
+static const BYTE Ct869[] = TBL_CT869;\r
+static const BYTE Dc932[] = TBL_DC932;\r
+static const BYTE Dc936[] = TBL_DC936;\r
+static const BYTE Dc949[] = TBL_DC949;\r
+static const BYTE Dc950[] = TBL_DC950;\r
+\r
+#elif FF_CODE_PAGE < 900 /* Static code page configuration (SBCS) */\r
+#define CODEPAGE FF_CODE_PAGE\r
+static const BYTE ExCvt[] = MKCVTBL(TBL_CT, FF_CODE_PAGE);\r
\r
+#else /* Static code page configuration (DBCS) */\r
+#define CODEPAGE FF_CODE_PAGE\r
+static const BYTE DbcTbl[] = MKCVTBL(TBL_DC, FF_CODE_PAGE);\r
\r
+#endif\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
+static WORD ld_word (const BYTE* ptr) /* Load a 2-byte little-endian word */\r
{\r
WORD rv;\r
\r
return rv;\r
}\r
\r
-static\r
-DWORD ld_dword (const BYTE* ptr) /* Load a 4-byte little-endian word */\r
+static DWORD ld_dword (const BYTE* ptr) /* Load a 4-byte little-endian word */\r
{\r
DWORD rv;\r
\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
+#if FF_FS_EXFAT\r
+static QWORD ld_qword (const BYTE* ptr) /* Load an 8-byte little-endian word */\r
{\r
QWORD rv;\r
\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
+#if !FF_FS_READONLY\r
+static 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
+static 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;\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
+#if FF_FS_EXFAT\r
+static 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;\r
}\r
#endif\r
-#endif /* !_FS_READONLY */\r
+#endif /* !FF_FS_READONLY */\r
\r
\r
\r
/*-----------------------------------------------------------------------*/\r
\r
/* Copy memory to memory */\r
-static\r
-void mem_cpy (void* dst, const void* src, UINT cnt) {\r
+static void mem_cpy (void* dst, const void* src, UINT cnt)\r
+{\r
BYTE *d = (BYTE*)dst;\r
const BYTE *s = (const BYTE*)src;\r
\r
- if (cnt) {\r
- do *d++ = *s++; while (--cnt);\r
+ if (cnt != 0) {\r
+ do {\r
+ *d++ = *s++;\r
+ } while (--cnt);\r
}\r
}\r
\r
+\r
/* Fill memory block */\r
-static\r
-void mem_set (void* dst, int val, UINT cnt) {\r
+static void mem_set (void* dst, int val, UINT cnt)\r
+{\r
BYTE *d = (BYTE*)dst;\r
\r
- do *d++ = (BYTE)val; while (--cnt);\r
+ do {\r
+ *d++ = (BYTE)val;\r
+ } while (--cnt);\r
}\r
\r
+\r
/* Compare memory block */\r
-static\r
-int mem_cmp (const void* dst, const void* src, UINT cnt) { /* ZR:same, NZ:different */\r
+static int mem_cmp (const void* dst, const void* src, UINT cnt) /* ZR:same, NZ:different */\r
+{\r
const BYTE *d = (const BYTE *)dst, *s = (const BYTE *)src;\r
int r = 0;\r
\r
return r;\r
}\r
\r
+\r
/* Check if chr is contained in the string */\r
-static\r
-int chk_chr (const char* str, int chr) { /* NZ:contained, ZR:not contained */\r
+static int chk_chr (const char* str, int chr) /* NZ:contained, ZR:not contained */\r
+{\r
while (*str && *str != chr) str++;\r
return *str;\r
}\r
\r
\r
+/* Test if the character is DBC 1st byte */\r
+static int dbc_1st (BYTE c)\r
+{\r
+#if FF_CODE_PAGE == 0 /* Variable code page */\r
+ if (DbcTbl && c >= DbcTbl[0]) {\r
+ if (c <= DbcTbl[1]) return 1; /* 1st byte range 1 */\r
+ if (c >= DbcTbl[2] && c <= DbcTbl[3]) return 1; /* 1st byte range 2 */\r
+ }\r
+#elif FF_CODE_PAGE >= 900 /* DBCS fixed code page */\r
+ if (c >= DbcTbl[0]) {\r
+ if (c <= DbcTbl[1]) return 1;\r
+ if (c >= DbcTbl[2] && c <= DbcTbl[3]) return 1;\r
+ }\r
+#else /* SBCS fixed code page */\r
+ if (c != 0) return 0; /* Always false */\r
+#endif\r
+ return 0;\r
+}\r
\r
\r
-#if _FS_REENTRANT\r
+/* Test if the character is DBC 2nd byte */\r
+static int dbc_2nd (BYTE c)\r
+{\r
+#if FF_CODE_PAGE == 0 /* Variable code page */\r
+ if (DbcTbl && c >= DbcTbl[4]) {\r
+ if (c <= DbcTbl[5]) return 1; /* 2nd byte range 1 */\r
+ if (c >= DbcTbl[6] && c <= DbcTbl[7]) return 1; /* 2nd byte range 2 */\r
+ if (c >= DbcTbl[8] && c <= DbcTbl[9]) return 1; /* 2nd byte range 3 */\r
+ }\r
+#elif FF_CODE_PAGE >= 900 /* DBCS fixed code page */\r
+ if (c >= DbcTbl[4]) {\r
+ if (c <= DbcTbl[5]) return 1;\r
+ if (c >= DbcTbl[6] && c <= DbcTbl[7]) return 1;\r
+ if (c >= DbcTbl[8] && c <= DbcTbl[9]) return 1;\r
+ }\r
+#else /* SBCS fixed code page */\r
+ if (c != 0) return 0; /* Always false */\r
+#endif\r
+ return 0;\r
+}\r
+\r
+\r
+#if FF_USE_LFN\r
+\r
+/* Get a character from TCHAR string in defined API encodeing */\r
+static DWORD tchar2uni ( /* Returns character in UTF-16 encoding (>=0x10000 on double encoding unit, 0xFFFFFFFF on decode error) */\r
+ const TCHAR** str /* Pointer to pointer to TCHAR string in configured encoding */\r
+)\r
+{\r
+ DWORD uc;\r
+ const TCHAR *p = *str;\r
+\r
+#if FF_LFN_UNICODE == 1 /* UTF-16 input */\r
+ WCHAR wc;\r
+\r
+ uc = *p++; /* Get a unit */\r
+ if (IsSurrogate(uc)) { /* Surrogate? */\r
+ wc = *p++; /* Get low surrogate */\r
+ if (!IsSurrogateH(uc) || !IsSurrogateL(wc)) return 0xFFFFFFFF; /* Wrong surrogate? */\r
+ uc = uc << 16 | wc;\r
+ }\r
+\r
+#elif FF_LFN_UNICODE == 2 /* UTF-8 input */\r
+ BYTE b;\r
+ int nf;\r
+\r
+ uc = (BYTE)*p++; /* Get a unit */\r
+ if (uc & 0x80) { /* Multiple byte code? */\r
+ if ((uc & 0xE0) == 0xC0) { /* 2-byte sequence? */\r
+ uc &= 0x1F; nf = 1;\r
+ } else {\r
+ if ((uc & 0xF0) == 0xE0) { /* 3-byte sequence? */\r
+ uc &= 0x0F; nf = 2;\r
+ } else {\r
+ if ((uc & 0xF8) == 0xF0) { /* 4-byte sequence? */\r
+ uc &= 0x07; nf = 3;\r
+ } else { /* Wrong sequence */\r
+ return 0xFFFFFFFF;\r
+ }\r
+ }\r
+ }\r
+ do { /* Get trailing bytes */\r
+ b = (BYTE)*p++;\r
+ if ((b & 0xC0) != 0x80) return 0xFFFFFFFF; /* Wrong sequence? */\r
+ uc = uc << 6 | (b & 0x3F);\r
+ } while (--nf != 0);\r
+ if (uc < 0x80 || IsSurrogate(uc) || uc >= 0x110000) return 0xFFFFFFFF; /* Wrong code? */\r
+ if (uc >= 0x010000) uc = 0xD800DC00 | ((uc - 0x10000) << 6 & 0x3FF0000) | (uc & 0x3FF); /* Make a surrogate pair if needed */\r
+ }\r
+\r
+#elif FF_LFN_UNICODE == 3 /* UTF-32 input */\r
+ uc = (TCHAR)*p++; /* Get a unit */\r
+ if (uc >= 0x110000) return 0xFFFFFFFF; /* Wrong code? */\r
+ if (uc >= 0x010000) uc = 0xD800DC00 | ((uc - 0x10000) << 6 & 0x3FF0000) | (uc & 0x3FF); /* Make a surrogate pair if needed */\r
+\r
+#else /* ANSI/OEM input */\r
+ BYTE b;\r
+ WCHAR wc;\r
+\r
+ wc = (BYTE)*p++; /* Get a byte */\r
+ if (dbc_1st((BYTE)wc)) { /* Is it a DBC 1st byte? */\r
+ b = (BYTE)*p++; /* Get 2nd byte */\r
+ if (!dbc_2nd(b)) return 0xFFFFFFFF; /* Invalid code? */\r
+ wc = (wc << 8) + b; /* Make a DBC */\r
+ }\r
+ if (wc != 0) {\r
+ wc = ff_oem2uni(wc, CODEPAGE); /* ANSI/OEM ==> Unicode */\r
+ if (wc == 0) return 0xFFFFFFFF; /* Invalid code? */\r
+ }\r
+ uc = wc;\r
+\r
+#endif\r
+ *str = p; /* Next read pointer */\r
+ return uc;\r
+}\r
+\r
+\r
+/* Output a TCHAR string in defined API encoding */\r
+static BYTE put_utf ( /* Returns number of encoding units written (0:buffer overflow or wrong encoding) */\r
+ DWORD chr, /* UTF-16 encoded character (Double encoding unit char if >=0x10000) */\r
+ TCHAR* buf, /* Output buffer */\r
+ UINT szb /* Size of the buffer */\r
+)\r
+{\r
+#if FF_LFN_UNICODE == 1 /* UTF-16 output */\r
+ WCHAR hs, wc;\r
+\r
+ hs = (WCHAR)(chr >> 16);\r
+ wc = (WCHAR)chr;\r
+ if (hs == 0) { /* Single encoding unit? */\r
+ if (szb < 1 || IsSurrogate(wc)) return 0; /* Buffer overflow or wrong code? */\r
+ *buf = wc;\r
+ return 1;\r
+ }\r
+ if (szb < 2 || !IsSurrogateH(hs) || !IsSurrogateL(wc)) return 0; /* Buffer overflow or wrong surrogate? */\r
+ *buf++ = hs;\r
+ *buf++ = wc;\r
+ return 2;\r
+\r
+#elif FF_LFN_UNICODE == 2 /* UTF-8 output */\r
+ DWORD hc;\r
+\r
+ if (chr < 0x80) { /* Single byte code? */\r
+ if (szb < 1) return 0; /* Buffer overflow? */\r
+ *buf = (TCHAR)chr;\r
+ return 1;\r
+ }\r
+ if (chr < 0x800) { /* 2-byte sequence? */\r
+ if (szb < 2) return 0; /* Buffer overflow? */\r
+ *buf++ = (TCHAR)(0xC0 | (chr >> 6 & 0x1F));\r
+ *buf++ = (TCHAR)(0x80 | (chr >> 0 & 0x3F));\r
+ return 2;\r
+ }\r
+ if (chr < 0x10000) { /* 3-byte sequence? */\r
+ if (szb < 3 || IsSurrogate(chr)) return 0; /* Buffer overflow or wrong code? */\r
+ *buf++ = (TCHAR)(0xE0 | (chr >> 12 & 0x0F));\r
+ *buf++ = (TCHAR)(0x80 | (chr >> 6 & 0x3F));\r
+ *buf++ = (TCHAR)(0x80 | (chr >> 0 & 0x3F));\r
+ return 3;\r
+ }\r
+ /* 4-byte sequence */\r
+ if (szb < 4) return 0; /* Buffer overflow? */\r
+ hc = ((chr & 0xFFFF0000) - 0xD8000000) >> 6; /* Get high 10 bits */\r
+ chr = (chr & 0xFFFF) - 0xDC00; /* Get low 10 bits */\r
+ if (hc >= 0x100000 || chr >= 0x400) return 0; /* Wrong surrogate? */\r
+ chr = (hc | chr) + 0x10000;\r
+ *buf++ = (TCHAR)(0xF0 | (chr >> 18 & 0x07));\r
+ *buf++ = (TCHAR)(0x80 | (chr >> 12 & 0x3F));\r
+ *buf++ = (TCHAR)(0x80 | (chr >> 6 & 0x3F));\r
+ *buf++ = (TCHAR)(0x80 | (chr >> 0 & 0x3F));\r
+ return 4;\r
+\r
+#elif FF_LFN_UNICODE == 3 /* UTF-32 output */\r
+ DWORD hc;\r
+\r
+ if (szb < 1) return 0; /* Buffer overflow? */\r
+ if (chr >= 0x10000) { /* Out of BMP? */\r
+ hc = ((chr & 0xFFFF0000) - 0xD8000000) >> 6; /* Get high 10 bits */\r
+ chr = (chr & 0xFFFF) - 0xDC00; /* Get low 10 bits */\r
+ if (hc >= 0x100000 || chr >= 0x400) return 0; /* Wrong surrogate? */\r
+ chr = (hc | chr) + 0x10000;\r
+ }\r
+ *buf++ = (TCHAR)chr;\r
+ return 1;\r
+\r
+#else /* ANSI/OEM output */\r
+ WCHAR wc;\r
+\r
+ wc = ff_uni2oem(chr, CODEPAGE);\r
+ if (wc >= 0x100) { /* Is this a DBC? */\r
+ if (szb < 2) return 0;\r
+ *buf++ = (char)(wc >> 8); /* Store DBC 1st byte */\r
+ *buf++ = (TCHAR)wc; /* Store DBC 2nd byte */\r
+ return 2;\r
+ }\r
+ if (wc == 0 || szb < 1) return 0; /* Invalid char or buffer overflow? */\r
+ *buf++ = (TCHAR)wc; /* Store the character */\r
+ return 1;\r
+#endif\r
+}\r
+#endif /* FF_USE_LFN */\r
+\r
+\r
+#if FF_FS_REENTRANT\r
/*-----------------------------------------------------------------------*/\r
/* Request/Release grant to access the volume */\r
/*-----------------------------------------------------------------------*/\r
-static\r
-int lock_fs (\r
- FATFS* fs /* File system object */\r
+static int lock_fs ( /* 1:Ok, 0:timeout */\r
+ FATFS* fs /* Filesystem object */\r
)\r
{\r
return ff_req_grant(fs->sobj);\r
}\r
\r
\r
-static\r
-void unlock_fs (\r
- FATFS* fs, /* File system object */\r
+static void unlock_fs (\r
+ FATFS* fs, /* Filesystem object */\r
FRESULT res /* Result code to be returned */\r
)\r
{\r
\r
\r
\r
-#if _FS_LOCK != 0\r
+#if FF_FS_LOCK != 0\r
/*-----------------------------------------------------------------------*/\r
/* File lock control functions */\r
/*-----------------------------------------------------------------------*/\r
\r
-static\r
-FRESULT chk_lock ( /* Check if the file can be accessed */\r
+static FRESULT chk_lock ( /* Check if the file can be accessed */\r
DIR* dp, /* Directory object pointing the file to be checked */\r
- int acc /* Desired access type (0:Read, 1:Write, 2:Delete/Rename) */\r
+ int acc /* Desired access type (0:Read mode open, 1:Write mode open, 2:Delete or rename) */\r
)\r
{\r
UINT i, be;\r
\r
- /* Search file semaphore table */\r
- for (i = be = 0; i < _FS_LOCK; i++) {\r
+ /* Search open object table for the object */\r
+ be = 0;\r
+ for (i = 0; i < FF_FS_LOCK; i++) {\r
if (Files[i].fs) { /* Existing entry */\r
- if (Files[i].fs == dp->obj.fs && /* Check if the object matched with an open object */\r
+ if (Files[i].fs == dp->obj.fs && /* Check if the object matches 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
- return (be || acc == 2) ? FR_OK : FR_TOO_MANY_OPEN_FILES; /* Is there a blank entry for new object? */\r
+ if (i == FF_FS_LOCK) { /* The object has not been opened */\r
+ return (!be && acc != 2) ? FR_TOO_MANY_OPEN_FILES : FR_OK; /* 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
+ /* The object was opened. Reject any open against writing file and all write mode open */\r
+ return (acc != 0 || Files[i].ctr == 0x100) ? FR_LOCKED : FR_OK;\r
}\r
\r
\r
-static\r
-int enq_lock (void) /* Check if an entry is available for a new object */\r
+static int enq_lock (void) /* Check if an entry is available for a new object */\r
{\r
UINT i;\r
\r
- for (i = 0; i < _FS_LOCK && Files[i].fs; i++) ;\r
- return (i == _FS_LOCK) ? 0 : 1;\r
+ for (i = 0; i < FF_FS_LOCK && Files[i].fs; i++) ;\r
+ return (i == FF_FS_LOCK) ? 0 : 1;\r
}\r
\r
\r
-static\r
-UINT inc_lock ( /* Increment object open counter and returns its index (0:Internal error) */\r
+static UINT inc_lock ( /* Increment object open counter and returns its index (0:Internal error) */\r
DIR* dp, /* Directory object pointing the file to register or increment */\r
int acc /* Desired access (0:Read, 1:Write, 2:Delete/Rename) */\r
)\r
UINT i;\r
\r
\r
- for (i = 0; i < _FS_LOCK; i++) { /* Find the object */\r
+ for (i = 0; i < FF_FS_LOCK; i++) { /* Find the object */\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
+ if (i == FF_FS_LOCK) { /* Not opened. Register it as new. */\r
+ for (i = 0; i < FF_FS_LOCK && Files[i].fs; i++) ;\r
+ if (i == FF_FS_LOCK) return 0; /* No free entry to register (int err) */\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
- if (acc && Files[i].ctr) return 0; /* Access violation (int err) */\r
+ if (acc >= 1 && Files[i].ctr) return 0; /* Access violation (int err) */\r
\r
Files[i].ctr = acc ? 0x100 : Files[i].ctr + 1; /* Set semaphore value */\r
\r
- return i + 1;\r
+ return i + 1; /* Index number origin from 1 */\r
}\r
\r
\r
-static\r
-FRESULT dec_lock ( /* Decrement object open counter */\r
+static FRESULT dec_lock ( /* Decrement object open counter */\r
UINT i /* Semaphore index (1..) */\r
)\r
{\r
FRESULT res;\r
\r
\r
- if (--i < _FS_LOCK) { /* Shift index number origin from 0 */\r
+ if (--i < FF_FS_LOCK) { /* 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 > 0) n--; /* Decrement read mode open count */\r
}\r
\r
\r
-static\r
-void clear_lock ( /* Clear lock entries of the volume */\r
+static void clear_lock ( /* Clear lock entries of the volume */\r
FATFS *fs\r
)\r
{\r
UINT i;\r
\r
- for (i = 0; i < _FS_LOCK; i++) {\r
+ for (i = 0; i < FF_FS_LOCK; i++) {\r
if (Files[i].fs == fs) Files[i].fs = 0;\r
}\r
}\r
\r
-#endif /* _FS_LOCK != 0 */\r
+#endif /* FF_FS_LOCK != 0 */\r
\r
\r
\r
/*-----------------------------------------------------------------------*/\r
-/* Move/Flush disk access window in the file system object */\r
+/* Move/Flush disk access window in the filesystem object */\r
/*-----------------------------------------------------------------------*/\r
-#if !_FS_READONLY\r
-static\r
-FRESULT sync_window ( /* Returns FR_OK or FR_DISK_ERROR */\r
- FATFS* fs /* File system object */\r
+#if !FF_FS_READONLY\r
+static FRESULT sync_window ( /* Returns FR_OK or FR_DISK_ERR */\r
+ FATFS* fs /* Filesystem object */\r
)\r
{\r
- DWORD wsect;\r
- UINT nf;\r
FRESULT res = FR_OK;\r
\r
\r
- if (fs->wflag) { /* Write back the sector if it is dirty */\r
- wsect = fs->winsect; /* Current sector number */\r
- if (disk_write(fs->drv, fs->win, wsect, 1) != RES_OK) {\r
- res = FR_DISK_ERR;\r
- } else {\r
- fs->wflag = 0;\r
- if (wsect - fs->fatbase < fs->fsize) { /* Is it in the FAT area? */\r
- for (nf = fs->n_fats; nf >= 2; nf--) { /* Reflect the change to all FAT copies */\r
- wsect += fs->fsize;\r
- disk_write(fs->drv, fs->win, wsect, 1);\r
- }\r
+ if (fs->wflag) { /* Is the disk access window dirty */\r
+ if (disk_write(fs->pdrv, fs->win, fs->winsect, 1) == RES_OK) { /* Write back the window */\r
+ fs->wflag = 0; /* Clear window dirty flag */\r
+ if (fs->winsect - fs->fatbase < fs->fsize) { /* Is it in the 1st FAT? */\r
+ if (fs->n_fats == 2) disk_write(fs->pdrv, fs->win, fs->winsect + fs->fsize, 1); /* Reflect it to 2nd FAT if needed */\r
}\r
+ } else {\r
+ res = FR_DISK_ERR;\r
}\r
}\r
return res;\r
#endif\r
\r
\r
-static\r
-FRESULT move_window ( /* Returns FR_OK or FR_DISK_ERROR */\r
- FATFS* fs, /* File system object */\r
+static FRESULT move_window ( /* Returns FR_OK or FR_DISK_ERR */\r
+ FATFS* fs, /* Filesystem object */\r
DWORD sector /* Sector number to make appearance in the fs->win[] */\r
)\r
{\r
\r
\r
if (sector != fs->winsect) { /* Window offset changed? */\r
-#if !_FS_READONLY\r
+#if !FF_FS_READONLY\r
res = sync_window(fs); /* Write-back changes */\r
#endif\r
if (res == FR_OK) { /* Fill sector window with new data */\r
- if (disk_read(fs->drv, fs->win, sector, 1) != RES_OK) {\r
- sector = 0xFFFFFFFF; /* Invalidate window if data is not reliable */\r
+ if (disk_read(fs->pdrv, fs->win, sector, 1) != RES_OK) {\r
+ sector = 0xFFFFFFFF; /* Invalidate window if read data is not valid */\r
res = FR_DISK_ERR;\r
}\r
fs->winsect = sector;\r
\r
\r
\r
-#if !_FS_READONLY\r
+#if !FF_FS_READONLY\r
/*-----------------------------------------------------------------------*/\r
-/* Synchronize file system and strage device */\r
+/* Synchronize filesystem and data on the storage */\r
/*-----------------------------------------------------------------------*/\r
\r
-static\r
-FRESULT sync_fs ( /* FR_OK:succeeded, !=0:error */\r
- FATFS* fs /* File system object */\r
+static FRESULT sync_fs ( /* Returns FR_OK or FR_DISK_ERR */\r
+ FATFS* fs /* Filesystem object */\r
)\r
{\r
FRESULT res;\r
\r
res = sync_window(fs);\r
if (res == FR_OK) {\r
- /* Update FSInfo sector if needed */\r
- if (fs->fs_type == FS_FAT32 && fs->fsi_flag == 1) {\r
+ if (fs->fs_type == FS_FAT32 && fs->fsi_flag == 1) { /* FAT32: Update FSInfo sector if needed */\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_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
+ disk_write(fs->pdrv, 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) res = FR_DISK_ERR;\r
+ /* Make sure that no pending write process in the lower layer */\r
+ if (disk_ioctl(fs->pdrv, CTRL_SYNC, 0) != RES_OK) res = FR_DISK_ERR;\r
}\r
\r
return res;\r
\r
\r
/*-----------------------------------------------------------------------*/\r
-/* Get sector# from cluster# */\r
+/* Get physical sector number from cluster number */\r
/*-----------------------------------------------------------------------*/\r
\r
-static\r
-DWORD clust2sect ( /* !=0:Sector number, 0:Failed (invalid cluster#) */\r
- FATFS* fs, /* File system object */\r
+static DWORD clst2sect ( /* !=0:Sector number, 0:Failed (invalid cluster#) */\r
+ FATFS* fs, /* Filesystem object */\r
DWORD clst /* Cluster# to be converted */\r
)\r
{\r
- clst -= 2;\r
- if (clst >= fs->n_fatent - 2) return 0; /* Invalid cluster# */\r
- return clst * fs->csize + fs->database;\r
+ clst -= 2; /* Cluster number is origin from 2 */\r
+ if (clst >= fs->n_fatent - 2) return 0; /* Is it invalid cluster number? */\r
+ return fs->database + fs->csize * clst; /* Start sector number of the cluster */\r
}\r
\r
\r
/* FAT access - Read value of a FAT entry */\r
/*-----------------------------------------------------------------------*/\r
\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
+static DWORD get_fat ( /* 0xFFFFFFFF:Disk error, 1:Internal error, 2..0x7FFFFFFF:Cluster status */\r
+ FFOBJID* obj, /* Corresponding object */\r
+ DWORD clst /* Cluster number to get the value */\r
)\r
{\r
UINT wc, bc;\r
case FS_FAT12 :\r
bc = (UINT)clst; bc += bc / 2;\r
if (move_window(fs, fs->fatbase + (bc / SS(fs))) != FR_OK) break;\r
- wc = fs->win[bc++ % SS(fs)];\r
+ wc = fs->win[bc++ % SS(fs)]; /* Get 1st byte of the entry */\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
+ wc |= fs->win[bc % SS(fs)] << 8; /* Merge 2nd byte of the entry */\r
+ val = (clst & 1) ? (wc >> 4) : (wc & 0xFFF); /* Adjust bit position */\r
break;\r
\r
case FS_FAT16 :\r
if (move_window(fs, fs->fatbase + (clst / (SS(fs) / 2))) != FR_OK) break;\r
- val = ld_word(fs->win + clst * 2 % SS(fs));\r
+ val = ld_word(fs->win + clst * 2 % SS(fs)); /* Simple WORD array */\r
break;\r
\r
case FS_FAT32 :\r
if (move_window(fs, fs->fatbase + (clst / (SS(fs) / 4))) != FR_OK) break;\r
- val = ld_dword(fs->win + clst * 4 % SS(fs)) & 0x0FFFFFFF;\r
+ val = ld_dword(fs->win + clst * 4 % SS(fs)) & 0x0FFFFFFF; /* Simple DWORD array but mask out upper 4 bits */\r
break;\r
-#if _FS_EXFAT\r
+#if FF_FS_EXFAT\r
case FS_EXFAT :\r
- if (obj->objsize) {\r
+ if ((obj->objsize != 0 && obj->sclust != 0) || obj->stat == 0) { /* Object except root dir must have valid data length */\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
+ if (obj->stat == 2 && cofs <= clen) { /* Is it a contiguous chain? */\r
+ val = (cofs == clen) ? 0x7FFFFFFF : clst + 1; /* No data on the FAT, generate the value */\r
+ break;\r
}\r
- if (obj->stat == 3 && cofs < obj->n_cont) { /* Is it in the contiguous part? */\r
+ if (obj->stat == 3 && cofs < obj->n_cont) { /* Is it in the 1st fragment? */\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
+ if (obj->n_frag != 0) { /* Is it on the growing edge? */\r
+ val = 0x7FFFFFFF; /* Generate EOC */\r
+ } else {\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
+ }\r
break;\r
}\r
}\r
- /* go next */\r
+ /* go to default */\r
#endif\r
default:\r
val = 1; /* Internal error */\r
\r
\r
\r
-#if !_FS_READONLY\r
+#if !FF_FS_READONLY\r
/*-----------------------------------------------------------------------*/\r
/* FAT access - Change value of a FAT entry */\r
/*-----------------------------------------------------------------------*/\r
\r
-static\r
-FRESULT put_fat ( /* FR_OK(0):succeeded, !=0:error */\r
- FATFS* fs, /* Corresponding file system object */\r
+static FRESULT put_fat ( /* FR_OK(0):succeeded, !=0:error */\r
+ FATFS* fs, /* Corresponding filesystem 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
if (clst >= 2 && clst < fs->n_fatent) { /* Check if in valid range */\r
switch (fs->fs_type) {\r
- case FS_FAT12 : /* Bitfield items */\r
- bc = (UINT)clst; bc += bc / 2;\r
+ case FS_FAT12 :\r
+ bc = (UINT)clst; bc += bc / 2; /* bc: byte offset of the entry */\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 = (clst & 1) ? ((*p & 0x0F) | ((BYTE)val << 4)) : (BYTE)val;\r
+ *p = (clst & 1) ? ((*p & 0x0F) | ((BYTE)val << 4)) : (BYTE)val; /* Put 1st byte */\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 = (clst & 1) ? (BYTE)(val >> 4) : ((*p & 0xF0) | ((BYTE)(val >> 8) & 0x0F));\r
+ *p = (clst & 1) ? (BYTE)(val >> 4) : ((*p & 0xF0) | ((BYTE)(val >> 8) & 0x0F)); /* Put 2nd byte */\r
fs->wflag = 1;\r
break;\r
\r
- case FS_FAT16 : /* WORD aligned items */\r
+ case FS_FAT16 :\r
res = move_window(fs, fs->fatbase + (clst / (SS(fs) / 2)));\r
if (res != FR_OK) break;\r
- st_word(fs->win + clst * 2 % SS(fs), (WORD)val);\r
+ st_word(fs->win + clst * 2 % SS(fs), (WORD)val); /* Simple WORD array */\r
fs->wflag = 1;\r
break;\r
\r
- case FS_FAT32 : /* DWORD aligned items */\r
-#if _FS_EXFAT\r
+ case FS_FAT32 :\r
+#if FF_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
- if (!_FS_EXFAT || fs->fs_type != FS_EXFAT) {\r
+ if (!FF_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
return res;\r
}\r
\r
-#endif /* !_FS_READONLY */\r
+#endif /* !FF_FS_READONLY */\r
\r
\r
\r
\r
-#if _FS_EXFAT && !_FS_READONLY\r
+#if FF_FS_EXFAT && !FF_FS_READONLY\r
/*-----------------------------------------------------------------------*/\r
/* exFAT: Accessing FAT and Allocation Bitmap */\r
/*-----------------------------------------------------------------------*/\r
\r
-/*---------------------------------------------*/\r
-/* exFAT: Find a contiguous free cluster block */\r
-/*---------------------------------------------*/\r
+/*--------------------------------------*/\r
+/* Find a contiguous free cluster block */\r
+/*--------------------------------------*/\r
\r
-static\r
-DWORD find_bitmap ( /* 0:No free cluster, 2..:Free cluster found, 0xFFFFFFFF:Disk error */\r
- FATFS* fs, /* File system object */\r
+static DWORD find_bitmap ( /* 0:Not found, 2..:Cluster block found, 0xFFFFFFFF:Disk error */\r
+ FATFS* fs, /* Filesystem object */\r
DWORD clst, /* Cluster number to scan from */\r
DWORD ncl /* Number of contiguous clusters to find (1..) */\r
)\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
+ val = 0; bm = 0; i = SS(fs);\r
}\r
- if (!bv) { /* Is it a free cluster? */\r
- if (++ctr == ncl) return scl + 2; /* Check run length */\r
+ if (bv == 0) { /* Is it a free cluster? */\r
+ if (++ctr == ncl) return scl + 2; /* Check if run length is sufficient for required */\r
} else {\r
- scl = val; ctr = 0; /* Encountered a live cluster, restart to scan */\r
+ scl = val; ctr = 0; /* Encountered a cluster in-use, restart to scan */\r
}\r
if (val == clst) return 0; /* All cluster scanned? */\r
- } while (bm);\r
+ } while (bm != 0);\r
bm = 1;\r
} while (++i < SS(fs));\r
}\r
}\r
\r
\r
-/*------------------------------------*/\r
-/* exFAT: Set/Clear a block of bitmap */\r
-/*------------------------------------*/\r
+/*----------------------------------------*/\r
+/* Set/Clear a block of allocation bitmap */\r
+/*----------------------------------------*/\r
\r
-static\r
-FRESULT change_bitmap (\r
- FATFS* fs, /* File system object */\r
+static FRESULT change_bitmap (\r
+ FATFS* fs, /* Filesystem 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
/*---------------------------------------------*/\r
-/* Complement contiguous part of the FAT chain */\r
+/* Fill the first fragment of the FAT chain */\r
/*---------------------------------------------*/\r
\r
-static\r
-FRESULT fill_fat_chain (\r
- _FDID* obj /* Pointer to the corresponding object */\r
+static FRESULT fill_first_frag (\r
+ FFOBJID* 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
+\r
+ if (obj->stat == 3) { /* Has the object been changed 'fragmented' in this session? */\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
return FR_OK;\r
}\r
\r
-#endif /* _FS_EXFAT && !_FS_READONLY */\r
\r
+/*---------------------------------------------*/\r
+/* Fill the last fragment of the FAT chain */\r
+/*---------------------------------------------*/\r
+\r
+static FRESULT fill_last_frag (\r
+ FFOBJID* obj, /* Pointer to the corresponding object */\r
+ DWORD lcl, /* Last cluster of the fragment */\r
+ DWORD term /* Value to set the last FAT entry */\r
+)\r
+{\r
+ FRESULT res;\r
+\r
+\r
+ while (obj->n_frag > 0) { /* Create the chain of last fragment */\r
+ res = put_fat(obj->fs, lcl - obj->n_frag + 1, (obj->n_frag > 1) ? lcl - obj->n_frag + 2 : term);\r
+ if (res != FR_OK) return res;\r
+ obj->n_frag--;\r
+ }\r
+ return FR_OK;\r
+}\r
\r
+#endif /* FF_FS_EXFAT && !FF_FS_READONLY */\r
\r
-#if !_FS_READONLY\r
+\r
+\r
+#if !FF_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
+\r
+static FRESULT remove_chain ( /* FR_OK(0):succeeded, !=0:error */\r
+ FFOBJID* obj, /* Corresponding object */\r
DWORD clst, /* Cluster to remove a chain from */\r
- DWORD pclst /* Previous cluster of clst (0:an entire chain) */\r
+ DWORD pclst /* Previous cluster of clst (0:entire chain) */\r
)\r
{\r
FRESULT res = FR_OK;\r
DWORD nxt;\r
FATFS *fs = obj->fs;\r
-#if _FS_EXFAT || _USE_TRIM\r
+#if FF_FS_EXFAT || FF_USE_TRIM\r
DWORD scl = clst, ecl = clst;\r
#endif\r
-#if _USE_TRIM\r
+#if FF_USE_TRIM\r
DWORD rt[2];\r
#endif\r
\r
if (clst < 2 || clst >= fs->n_fatent) return FR_INT_ERR; /* Check if in valid range */\r
\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
+ if (pclst != 0 && (!FF_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
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
+ if (!FF_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
fs->free_clst++;\r
fs->fsi_flag |= 1;\r
}\r
-#if _FS_EXFAT || _USE_TRIM\r
+#if FF_FS_EXFAT || FF_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
+ } else { /* End of contiguous cluster block */\r
+#if FF_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
- 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
+#if FF_USE_TRIM\r
+ rt[0] = clst2sect(fs, scl); /* Start of data area freed */\r
+ rt[1] = clst2sect(fs, ecl) + fs->csize - 1; /* End of data area freed */\r
+ disk_ioctl(fs->pdrv, CTRL_TRIM, rt); /* Inform device the data in the block is no longer needed */\r
#endif\r
scl = ecl = nxt;\r
}\r
clst = nxt; /* Next cluster */\r
} while (clst < fs->n_fatent); /* Repeat while not the last link */\r
\r
-#if _FS_EXFAT\r
+#if FF_FS_EXFAT\r
+ /* Some post processes for chain status */\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
+ if (pclst == 0) { /* Has the entire chain been removed? */\r
+ obj->stat = 0; /* Change the chain 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
+ if (obj->stat == 0) { /* Is it a fragmented chain from the beginning of this session? */\r
+ clst = obj->sclust; /* Follow the chain to check if it gets contiguous */\r
+ while (clst != pclst) {\r
+ nxt = get_fat(obj, clst);\r
+ if (nxt < 2) return FR_INT_ERR;\r
+ if (nxt == 0xFFFFFFFF) return FR_DISK_ERR;\r
+ if (nxt != clst + 1) break; /* Not contiguous? */\r
+ clst++;\r
+ }\r
+ if (clst == pclst) { /* Has the chain got contiguous again? */\r
+ obj->stat = 2; /* Change the chain status 'contiguous' */\r
+ }\r
+ } else {\r
+ if (obj->stat == 3 && pclst >= obj->sclust && pclst <= obj->sclust + obj->n_cont) { /* Was the chain fragmented in this session and got contiguous again? */\r
+ obj->stat = 2; /* Change the chain status 'contiguous' */\r
+ }\r
}\r
}\r
}\r
/*-----------------------------------------------------------------------*/\r
/* FAT handling - Stretch a chain or Create a new chain */\r
/*-----------------------------------------------------------------------*/\r
-static\r
-DWORD create_chain ( /* 0:No free cluster, 1:Internal error, 0xFFFFFFFF:Disk error, >=2:New cluster# */\r
- _FDID* obj, /* Corresponding object */\r
+\r
+static DWORD create_chain ( /* 0:No free cluster, 1:Internal error, 0xFFFFFFFF:Disk error, >=2:New cluster# */\r
+ FFOBJID* obj, /* Corresponding object */\r
DWORD clst /* Cluster# to stretch, 0:Create a new chain */\r
)\r
{\r
\r
\r
if (clst == 0) { /* Create a new chain */\r
- scl = fs->last_clst; /* Get suggested cluster to start from */\r
+ scl = fs->last_clst; /* Suggested cluster to start to find */\r
if (scl == 0 || scl >= fs->n_fatent) scl = 1;\r
}\r
- else { /* Stretch current chain */\r
+ else { /* Stretch a 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 < 2) return 1; /* Test for insanity */\r
+ if (cs == 0xFFFFFFFF) return cs; /* Test for disk error */\r
if (cs < fs->n_fatent) return cs; /* It is already followed by next cluster */\r
- scl = clst;\r
+ scl = clst; /* Cluster to start to find */\r
}\r
+ if (fs->free_clst == 0) return 0; /* No free cluster */\r
\r
-#if _FS_EXFAT\r
+#if FF_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
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
+ obj->stat = 2; /* Set status 'contiguous' */\r
+ } else { /* It 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
+ if (obj->stat != 2) { /* Is the file non-contiguous? */\r
+ if (ncl == clst + 1) { /* Is the cluster next to previous one? */\r
+ obj->n_frag = obj->n_frag ? obj->n_frag + 1 : 2; /* Increment size of last framgent */\r
+ } else { /* New fragment */\r
+ if (obj->n_frag == 0) obj->n_frag = 1;\r
+ res = fill_last_frag(obj, clst, ncl); /* Fill last fragment on the FAT and link it to new one */\r
+ if (res == FR_OK) obj->n_frag = 1;\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
+ { /* On the FAT/FAT32 volume */\r
+ ncl = 0;\r
+ if (scl == clst) { /* Stretching an existing chain? */\r
+ ncl = scl + 1; /* Test if next cluster is free */\r
+ if (ncl >= fs->n_fatent) ncl = 2;\r
+ cs = get_fat(obj, ncl); /* Get next cluster status */\r
+ if (cs == 1 || cs == 0xFFFFFFFF) return cs; /* Test for error */\r
+ if (cs != 0) { /* Not free? */\r
+ cs = fs->last_clst; /* Start at suggested cluster if it is valid */\r
+ if (cs >= 2 && cs < fs->n_fatent) scl = cs;\r
+ ncl = 0;\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
- }\r
-\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
+ if (ncl == 0) { /* The new cluster cannot be contiguous and find another fragment */\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 found? */\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; /* Test for error */\r
+ if (ncl == scl) return 0; /* No free cluster found? */\r
+ }\r
+ }\r
+ res = put_fat(fs, ncl, 0xFFFFFFFF); /* Mark the new cluster 'EOC' */\r
+ if (res == FR_OK && clst != 0) {\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
+ 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; /* Failed. Create error status */\r
+ ncl = (res == FR_DISK_ERR) ? 0xFFFFFFFF : 1; /* Failed. Generate error status */\r
}\r
\r
return ncl; /* Return new cluster number or error status */\r
}\r
\r
-#endif /* !_FS_READONLY */\r
+#endif /* !FF_FS_READONLY */\r
\r
\r
\r
\r
-#if _USE_FASTSEEK\r
+#if FF_USE_FASTSEEK\r
/*-----------------------------------------------------------------------*/\r
/* FAT handling - Convert offset into cluster with link map table */\r
/*-----------------------------------------------------------------------*/\r
\r
-static\r
-DWORD clmt_clust ( /* <2:Error, >=2:Cluster number */\r
+static DWORD clmt_clust ( /* <2:Error, >=2:Cluster number */\r
FIL* fp, /* Pointer to the file object */\r
FSIZE_t ofs /* File offset to be converted to cluster# */\r
)\r
return cl + *tbl; /* Return the cluster number */\r
}\r
\r
-#endif /* _USE_FASTSEEK */\r
+#endif /* FF_USE_FASTSEEK */\r
+\r
+\r
+\r
+\r
+/*-----------------------------------------------------------------------*/\r
+/* Directory handling - Fill a cluster with zeros */\r
+/*-----------------------------------------------------------------------*/\r
+\r
+#if !FF_FS_READONLY\r
+static FRESULT dir_clear ( /* Returns FR_OK or FR_DISK_ERR */\r
+ FATFS *fs, /* Filesystem object */\r
+ DWORD clst /* Directory table to clear */\r
+)\r
+{\r
+ DWORD sect;\r
+ UINT n, szb;\r
+ BYTE *ibuf;\r
+\r
+\r
+ if (sync_window(fs) != FR_OK) return FR_DISK_ERR; /* Flush disk access window */\r
+ sect = clst2sect(fs, clst); /* Top of the cluster */\r
+ fs->winsect = sect; /* Set window to top of the cluster */\r
+ mem_set(fs->win, 0, SS(fs)); /* Clear window buffer */\r
+#if FF_USE_LFN == 3 /* Quick table clear by using multi-secter write */\r
+ /* Allocate a temporary buffer */\r
+ for (szb = ((DWORD)fs->csize * SS(fs) >= MAX_MALLOC) ? MAX_MALLOC : fs->csize * SS(fs), ibuf = 0; szb > SS(fs) && (ibuf = ff_memalloc(szb)) == 0; szb /= 2) ;\r
+ if (szb > SS(fs)) { /* Buffer allocated? */\r
+ mem_set(ibuf, 0, szb);\r
+ szb /= SS(fs); /* Bytes -> Sectors */\r
+ for (n = 0; n < fs->csize && disk_write(fs->pdrv, ibuf, sect + n, szb) == RES_OK; n += szb) ; /* Fill the cluster with 0 */\r
+ ff_memfree(ibuf);\r
+ } else\r
+#endif\r
+ {\r
+ ibuf = fs->win; szb = 1; /* Use window buffer (many single-sector writes may take a time) */\r
+ for (n = 0; n < fs->csize && disk_write(fs->pdrv, ibuf, sect + n, szb) == RES_OK; n += szb) ; /* Fill the cluster with 0 */\r
+ }\r
+ return (n == fs->csize) ? FR_OK : FR_DISK_ERR;\r
+}\r
+#endif /* !FF_FS_READONLY */\r
\r
\r
\r
/* Directory handling - Set directory index */\r
/*-----------------------------------------------------------------------*/\r
\r
-static\r
-FRESULT dir_sdi ( /* FR_OK(0):succeeded, !=0:error */\r
+static FRESULT dir_sdi ( /* FR_OK(0):succeeded, !=0:error */\r
DIR* dp, /* Pointer to directory object */\r
DWORD ofs /* Offset of directory table */\r
)\r
FATFS *fs = dp->obj.fs;\r
\r
\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
+ if (ofs >= (DWORD)((FF_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
}\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
+ if (FF_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 (ofs / SZDIRE >= fs->n_rootdir) return FR_INT_ERR; /* Is index out of range? */\r
+ if (clst == 0) { /* Static table (root-directory on the FAT volume) */\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
+ } else { /* Dynamic table (sub-directory or root-directory on the FAT32/exFAT volume) */\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 < 2 || clst >= fs->n_fatent) return FR_INT_ERR; /* Reached to end of table or internal error */\r
ofs -= csz;\r
}\r
- dp->sect = clust2sect(fs, clst);\r
+ dp->sect = clst2sect(fs, clst);\r
}\r
dp->clust = clst; /* Current cluster# */\r
- if (!dp->sect) return FR_INT_ERR;\r
+ if (dp->sect == 0) 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
/* Directory handling - Move directory table index next */\r
/*-----------------------------------------------------------------------*/\r
\r
-static\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
+static 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 ofs, clst;\r
FATFS *fs = dp->obj.fs;\r
-#if !_FS_READONLY\r
- UINT n;\r
-#endif\r
+\r
\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
+ if (dp->sect == 0 || ofs >= (DWORD)((FF_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 (ofs % SS(fs) == 0) { /* Sector changed? */\r
dp->sect++; /* Next sector */\r
\r
- if (!dp->clust) { /* Static table */\r
+ if (dp->clust == 0) { /* Static table */\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 ((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
+ 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) { /* It reached end of dynamic table */\r
+#if !FF_FS_READONLY\r
if (!stretch) { /* If no stretch, report EOT */\r
dp->sect = 0; return FR_NO_FILE;\r
}\r
if (clst == 0) return FR_DENIED; /* No free cluster */\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
- fs->winsect -= n; /* Restore window offset */\r
+ if (dir_clear(fs, clst) != FR_OK) return FR_DISK_ERR; /* Clean up the stretched table */\r
+ if (FF_FS_EXFAT) dp->obj.stat |= 4; /* exFAT: The directory has been stretched */\r
#else\r
- if (!stretch) dp->sect = 0; /* If no stretch, report EOT (this is to suppress warning) */\r
+ if (!stretch) dp->sect = 0; /* (this line is to suppress compiler 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(fs, clst);\r
+ dp->sect = clst2sect(fs, clst);\r
}\r
}\r
}\r
\r
\r
\r
-#if !_FS_READONLY\r
+#if !FF_FS_READONLY\r
/*-----------------------------------------------------------------------*/\r
/* Directory handling - Reserve a block of directory entries */\r
/*-----------------------------------------------------------------------*/\r
\r
-static\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
+static 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
do {\r
res = move_window(fs, dp->sect);\r
if (res != FR_OK) break;\r
-#if _FS_EXFAT\r
+#if FF_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
return res;\r
}\r
\r
-#endif /* !_FS_READONLY */\r
+#endif /* !FF_FS_READONLY */\r
\r
\r
\r
/* FAT: Directory handling - Load/Store start cluster number */\r
/*-----------------------------------------------------------------------*/\r
\r
-static\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
+static 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
\r
\r
-#if !_FS_READONLY\r
-static\r
-void st_clust (\r
+#if !FF_FS_READONLY\r
+static void st_clust (\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
\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
+#if FF_USE_LFN\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
+\r
+static 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
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
+ if (wc != 0) {\r
+ if (i >= FF_MAX_LFN || ff_wtoupper(uc) != ff_wtoupper(lfnbuf[i++])) { /* Compare it */\r
return 0; /* Not matched */\r
}\r
wc = uc;\r
}\r
\r
\r
-#if _FS_MINIMIZE <= 1 || _FS_RPATH >= 2 || _USE_LABEL || _FS_EXFAT\r
+#if FF_FS_MINIMIZE <= 1 || FF_FS_RPATH >= 2 || FF_USE_LABEL || FF_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 or invalid LFN entry */\r
+\r
+static 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
WCHAR wc, uc;\r
\r
\r
- if (ld_word(dir + LDIR_FstClusLO) != 0) return 0; /* Check LDIR_FstClusLO */\r
+ if (ld_word(dir + LDIR_FstClusLO) != 0) return 0; /* Check LDIR_FstClusLO is 0 */\r
\r
- i = ((dir[LDIR_Ord] & 0x3F) - 1) * 13; /* Offset in the LFN buffer */\r
+ i = ((dir[LDIR_Ord] & ~LLEF) - 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) return 0; /* Buffer overflow? */\r
+ if (wc != 0) {\r
+ if (i >= FF_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
\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
+ if (i >= FF_MAX_LFN) return 0; /* Buffer overflow? */\r
lfnbuf[i] = 0;\r
}\r
\r
#endif\r
\r
\r
-#if !_FS_READONLY\r
+#if !FF_FS_READONLY\r
/*-----------------------------------------*/\r
/* FAT-LFN: Create an entry of LFN entries */\r
/*-----------------------------------------*/\r
-static\r
-void put_lfn (\r
+\r
+static 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
dir[LDIR_Ord] = ord; /* Set the LFN order */\r
}\r
\r
-#endif /* !_FS_READONLY */\r
-#endif /* _USE_LFN != 0 */\r
+#endif /* !FF_FS_READONLY */\r
+#endif /* FF_USE_LFN */\r
\r
\r
\r
-#if _USE_LFN != 0 && !_FS_READONLY\r
+#if FF_USE_LFN && !FF_FS_READONLY\r
/*-----------------------------------------------------------------------*/\r
/* FAT-LFN: Create a Numbered SFN */\r
/*-----------------------------------------------------------------------*/\r
\r
-static\r
-void gen_numname (\r
+static void gen_numname (\r
BYTE* dst, /* Pointer to the buffer to store numbered SFN */\r
const BYTE* src, /* Pointer to SFN */\r
const WCHAR* lfn, /* Pointer to LFN */\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
+ while (*lfn) { /* Create a CRC as hash value */\r
wc = *lfn++;\r
for (i = 0; i < 16; i++) {\r
sr = (sr << 1) + (wc & 1);\r
} while (seq);\r
ns[i] = '~';\r
\r
- /* Append the number */\r
+ /* Append the number to the SFN body */\r
for (j = 0; j < i && dst[j] != ' '; j++) {\r
- if (IsDBCS1(dst[j])) {\r
+ if (dbc_1st(dst[j])) {\r
if (j == i - 1) break;\r
j++;\r
}\r
dst[j++] = (i < 8) ? ns[i++] : ' ';\r
} while (j < 8);\r
}\r
-#endif /* _USE_LFN != 0 && !_FS_READONLY */\r
+#endif /* FF_USE_LFN && !FF_FS_READONLY */\r
\r
\r
\r
-#if _USE_LFN != 0\r
+#if FF_USE_LFN\r
/*-----------------------------------------------------------------------*/\r
/* FAT-LFN: Calculate checksum of an SFN entry */\r
/*-----------------------------------------------------------------------*/\r
\r
-static\r
-BYTE sum_sfn (\r
+static BYTE sum_sfn (\r
const BYTE* dir /* Pointer to the SFN entry */\r
)\r
{\r
BYTE sum = 0;\r
UINT n = 11;\r
\r
- do sum = (sum >> 1) + (sum << 7) + *dir++; while (--n);\r
+ do {\r
+ sum = (sum >> 1) + (sum << 7) + *dir++;\r
+ } while (--n);\r
return sum;\r
}\r
\r
-#endif /* _USE_LFN != 0 */\r
+#endif /* FF_USE_LFN */\r
\r
\r
\r
-#if _FS_EXFAT\r
+#if FF_FS_EXFAT\r
/*-----------------------------------------------------------------------*/\r
/* exFAT: Checksum */\r
/*-----------------------------------------------------------------------*/\r
\r
-static\r
-WORD xdir_sum ( /* Get checksum of the directoly block */\r
+static WORD xdir_sum ( /* Get checksum of the directoly entry block */\r
const BYTE* dir /* Directory entry block to be calculated */\r
)\r
{\r
WORD sum;\r
\r
\r
- szblk = (dir[XDIR_NumSec] + 1) * SZDIRE;\r
+ szblk = (dir[XDIR_NumSec] + 1) * SZDIRE; /* Number of bytes of the entry block */\r
for (i = sum = 0; i < szblk; i++) {\r
- if (i == XDIR_SetSum) { /* Skip sum field */\r
+ if (i == XDIR_SetSum) { /* Skip 2-byte sum field */\r
i++;\r
} else {\r
sum = ((sum & 1) ? 0x8000 : 0) + (sum >> 1) + dir[i];\r
\r
\r
\r
-static\r
-WORD xname_sum ( /* Get check sum (to be used as hash) of the name */\r
+static WORD xname_sum ( /* Get check sum (to be used as hash) of the file name */\r
const WCHAR* name /* File name to be calculated */\r
)\r
{\r
\r
\r
while ((chr = *name++) != 0) {\r
- chr = ff_wtoupper(chr); /* File name needs to be ignored case */\r
+ chr = (WCHAR)ff_wtoupper(chr); /* File name needs to be up-case converted */\r
sum = ((sum & 1) ? 0x8000 : 0) + (sum >> 1) + (chr & 0xFF);\r
sum = ((sum & 1) ? 0x8000 : 0) + (sum >> 1) + (chr >> 8);\r
}\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
+#if !FF_FS_READONLY && FF_USE_MKFS\r
+static DWORD xsum32 ( /* Returns 32-bit checksum */\r
+ BYTE dat, /* Byte to be calculated (byte-by-byte processing) */\r
+ DWORD sum /* Previous sum value */\r
)\r
{\r
sum = ((sum & 1) ? 0x80000000 : 0) + (sum >> 1) + dat;\r
#endif\r
\r
\r
-#if _FS_MINIMIZE <= 1 || _FS_RPATH >= 2\r
+#if FF_FS_MINIMIZE <= 1 || FF_FS_RPATH >= 2\r
/*------------------------------------------------------*/\r
/* exFAT: Get object information from a directory block */\r
/*------------------------------------------------------*/\r
\r
-static\r
-void get_xdir_info (\r
+static void get_xfileinfo (\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
+ WCHAR wc, hs;\r
+ UINT di, si, nc;\r
+\r
+ /* Get file name from the entry block */\r
+ si = SZDIRE * 2; /* 1st C1 entry */\r
+ nc = 0; hs = 0; di = 0;\r
+ while (nc < dirb[XDIR_NumName]) {\r
+ if (si >= MAXDIRB(FF_MAX_LFN)) { di = 0; break; } /* Truncated directory block? */\r
+ if ((si % SZDIRE) == 0) si += 2; /* Skip entry type field */\r
+ wc = ld_word(dirb + si); si += 2; nc++; /* Get a character */\r
+ if (hs == 0 && IsSurrogate(wc)) { /* Is it a surrogate? */\r
+ hs = wc; continue; /* Get low surrogate */\r
}\r
- if (di >= _MAX_LFN) { di = 0; break; } /* Buffer overflow and inaccessible object */\r
- fno->fname[di++] = (char)w;\r
+ wc = put_utf((DWORD)hs << 16 | wc, &fno->fname[di], FF_LFN_BUF - di); /* Store it in API encoding */\r
+ if (wc == 0) { di = 0; break; } /* Buffer overflow or wrong encoding? */\r
+ di += wc;\r
+ hs = 0;\r
}\r
-#endif\r
- if (di == 0) fno->fname[di++] = '?'; /* Inaccessible object? */\r
- fno->fname[di] = 0; /* Terminate file name */\r
+ if (hs != 0) di = 0; /* Broken surrogate pair? */\r
+ if (di == 0) fno->fname[di++] = '?'; /* Inaccessible object name? */\r
+ fno->fname[di] = 0; /* Terminate the name */\r
+ fno->altname[0] = 0; /* exFAT does not support SFN */\r
\r
- fno->altname[0] = 0; /* No SFN */\r
- fno->fattrib = dirb[XDIR_Attr]; /* Attribute */\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
+#endif /* FF_FS_MINIMIZE <= 1 || FF_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
+static FRESULT load_xdir ( /* FR_INT_ERR: invalid entry block */\r
+ DIR* dp /* Reading direcotry object pointing top of the entry block to load */\r
)\r
{\r
FRESULT res;\r
- UINT i, nent;\r
+ UINT i, sz_ent;\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
+ if (dp->dir[XDIR_Type] != 0x85) return FR_INT_ERR; /* Invalid order */\r
+ mem_cpy(dirb + 0 * SZDIRE, dp->dir, SZDIRE);\r
+ sz_ent = (dirb[XDIR_NumSec] + 1) * SZDIRE;\r
+ if (sz_ent < 3 * SZDIRE || sz_ent > 19 * SZDIRE) return FR_INT_ERR;\r
\r
/* Load C0 entry */\r
res = dir_next(dp, 0);\r
+ if (res == FR_NO_FILE) res = FR_INT_ERR; /* It cannot be */\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
+ if (dp->dir[XDIR_Type] != 0xC0) return FR_INT_ERR; /* Invalid order */\r
+ mem_cpy(dirb + 1 * SZDIRE, dp->dir, SZDIRE);\r
+ if (MAXDIRB(dirb[XDIR_NumName]) > sz_ent) return FR_INT_ERR;\r
\r
/* Load C1 entries */\r
- if (nent < 3 || nent > 19) return FR_NO_FILE;\r
- i = SZDIRE * 2; nent *= SZDIRE;\r
+ i = 2 * SZDIRE; /* C1 offset to load */\r
do {\r
res = dir_next(dp, 0);\r
+ if (res == FR_NO_FILE) res = FR_INT_ERR; /* It cannot be */\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
+ if (dp->dir[XDIR_Type] != 0xC1) return FR_INT_ERR; /* Invalid order */\r
+ if (i < MAXDIRB(FF_MAX_LFN)) mem_cpy(dirb + i, dp->dir, SZDIRE);\r
+ } while ((i += SZDIRE) < sz_ent);\r
\r
+ /* Sanity check (do it for only accessible object) */\r
+ if (i <= MAXDIRB(FF_MAX_LFN)) {\r
+ if (xdir_sum(dirb) != ld_word(dirb + XDIR_SetSum)) return FR_INT_ERR;\r
+ }\r
return FR_OK;\r
}\r
\r
\r
-#if !_FS_READONLY || _FS_RPATH != 0 \r
+/*------------------------------------------------------------------*/\r
+/* exFAT: Initialize object allocation info with loaded entry block */\r
+/*------------------------------------------------------------------*/\r
+\r
+static void init_alloc_info (\r
+ FATFS* fs, /* Filesystem object */\r
+ FFOBJID* obj /* Object allocation information to be initialized */\r
+)\r
+{\r
+ obj->sclust = ld_dword(fs->dirbuf + XDIR_FstClus); /* Start cluster */\r
+ obj->objsize = ld_qword(fs->dirbuf + XDIR_FileSize); /* Size */\r
+ obj->stat = fs->dirbuf[XDIR_GenFlags] & 2; /* Allocation status */\r
+ obj->n_frag = 0; /* No last fragment info */\r
+}\r
+\r
+\r
+\r
+#if !FF_FS_READONLY || FF_FS_RPATH != 0\r
/*------------------------------------------------*/\r
/* exFAT: Load the object's directory entry block */\r
/*------------------------------------------------*/\r
-static\r
-FRESULT load_obj_dir ( \r
+\r
+static FRESULT load_obj_xdir (\r
DIR* dp, /* Blank directory object to be used to access containing direcotry */\r
- const _FDID* obj /* Object with containing directory information */\r
+ const FFOBJID* obj /* Object with its 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->obj.n_frag = 0;\r
dp->blk_ofs = obj->c_ofs;\r
\r
- res = dir_sdi(dp, dp->blk_ofs); /* Goto the block location */\r
+ res = dir_sdi(dp, dp->blk_ofs); /* Goto object's entry block */\r
if (res == FR_OK) {\r
res = load_xdir(dp); /* Load the object's entry block */\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
+#if !FF_FS_READONLY\r
+/*----------------------------------------*/\r
+/* exFAT: Store the directory entry block */\r
+/*----------------------------------------*/\r
+\r
+static FRESULT store_xdir (\r
DIR* dp /* Pointer to the direcotry object */\r
)\r
{\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
+ /* Store the direcotry entry block to the directory */\r
res = dir_sdi(dp, dp->blk_ofs);\r
while (res == FR_OK) {\r
res = move_window(dp->obj.fs, dp->sect);\r
/* exFAT: Create a new directory enrty block */\r
/*-------------------------------------------*/\r
\r
-static\r
-void create_xdir (\r
+static 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
+ const WCHAR* lfn /* Pointer to the object name */\r
)\r
{\r
UINT i;\r
- BYTE nb, nc;\r
- WCHAR chr;\r
+ BYTE nc1, nlen;\r
+ WCHAR wc;\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
+ /* Create 85,C0 entry */\r
+ mem_set(dirb, 0, 2 * SZDIRE);\r
+ dirb[0 * SZDIRE + XDIR_Type] = 0x85; /* 85 entry */\r
+ dirb[1 * SZDIRE + XDIR_Type] = 0xC0; /* C0 entry */\r
\r
- i = SZDIRE * 2; /* C1 offset */\r
- nc = 0; nb = 1; chr = 1;\r
+ /* Create C1 entries */\r
+ i = SZDIRE * 2; /* Top of C1 entries */\r
+ nlen = nc1 = 0; wc = 1;\r
do {\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
+ if (wc != 0 && (wc = lfn[nlen]) != 0) nlen++; /* Get a character if exist */\r
+ st_word(dirb + i, wc); /* Store it */\r
+ i += 2;\r
+ } while (i % SZDIRE != 0);\r
+ nc1++;\r
+ } while (lfn[nlen]); /* Fill next entry if any char follows */\r
+\r
+ dirb[XDIR_NumName] = nlen; /* Set name length */\r
+ dirb[XDIR_NumSec] = 1 + nc1; /* Set secondary count (C0 + C1s) */\r
+ st_word(dirb + XDIR_NameHash, xname_sum(lfn)); /* Set name hash */\r
}\r
\r
-#endif /* !_FS_READONLY */\r
-#endif /* _FS_EXFAT */\r
+#endif /* !FF_FS_READONLY */\r
+#endif /* FF_FS_EXFAT */\r
\r
\r
\r
-#if _FS_MINIMIZE <= 1 || _FS_RPATH >= 2 || _USE_LABEL || _FS_EXFAT\r
+#if FF_FS_MINIMIZE <= 1 || FF_FS_RPATH >= 2 || FF_USE_LABEL || FF_FS_EXFAT\r
/*-----------------------------------------------------------------------*/\r
/* Read an object from the directory */\r
/*-----------------------------------------------------------------------*/\r
\r
-static\r
-FRESULT dir_read (\r
+#define dir_read_file(dp) dir_read(dp, 0)\r
+#define dir_read_label(dp) dir_read(dp, 1)\r
+\r
+static 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
FRESULT res = FR_NO_FILE;\r
FATFS *fs = dp->obj.fs;\r
BYTE a, c;\r
-#if _USE_LFN != 0\r
+#if FF_USE_LFN\r
BYTE ord = 0xFF, sum = 0xFF;\r
#endif\r
\r
res = move_window(fs, dp->sect);\r
if (res != FR_OK) break;\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 (c == 0) {\r
+ res = FR_NO_FILE; break; /* Reached to end of the directory */\r
+ }\r
+#if FF_FS_EXFAT\r
if (fs->fs_type == FS_EXFAT) { /* On the exFAT volume */\r
- if (_USE_LABEL && vol) {\r
+ if (FF_USE_LABEL && vol) {\r
if (c == 0x83) break; /* Volume label entry? */\r
} else {\r
if (c == 0x85) { /* Start of the file entry block? */\r
}\r
} else\r
#endif\r
- { /* On the FAT12/16/32 volume */\r
+ { /* On the FAT/FAT32 volume */\r
dp->obj.attr = a = dp->dir[DIR_Attr] & AM_MASK; /* Get attribute */\r
-#if _USE_LFN != 0 /* LFN configuration */\r
+#if FF_USE_LFN /* 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
/* 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
+ if (ord != 0 || sum != sum_sfn(dp->dir)) { /* Is there a valid LFN? */\r
dp->blk_ofs = 0xFFFFFFFF; /* It has no LFN. */\r
}\r
break;\r
return res;\r
}\r
\r
-#endif /* _FS_MINIMIZE <= 1 || _USE_LABEL || _FS_RPATH >= 2 */\r
+#endif /* FF_FS_MINIMIZE <= 1 || FF_USE_LABEL || FF_FS_RPATH >= 2 */\r
\r
\r
\r
/* Directory handling - Find an object in the directory */\r
/*-----------------------------------------------------------------------*/\r
\r
-static\r
-FRESULT dir_find ( /* FR_OK(0):succeeded, !=0:error */\r
- DIR* dp /* Pointer to the directory object with the file name */\r
+static 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
FATFS *fs = dp->obj.fs;\r
BYTE c;\r
-#if _USE_LFN != 0\r
+#if FF_USE_LFN\r
BYTE a, ord, sum;\r
#endif\r
\r
res = dir_sdi(dp, 0); /* Rewind directory object */\r
if (res != FR_OK) return res;\r
-#if _FS_EXFAT\r
+#if FF_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
+ while ((res = dir_read_file(dp)) == FR_OK) { /* Read an item */\r
+#if FF_MAX_LFN < 255\r
+ if (fs->dirbuf[XDIR_NumName] > FF_MAX_LFN) continue; /* Skip comparison if inaccessible object name */\r
+#endif\r
+ if (ld_word(fs->dirbuf + XDIR_NameHash) != hash) continue; /* Skip comparison if hash 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
return res;\r
}\r
#endif\r
- /* On the FAT12/16/32 volume */\r
-#if _USE_LFN != 0\r
+ /* On the FAT/FAT32 volume */\r
+#if FF_USE_LFN\r
ord = sum = 0xFF; dp->blk_ofs = 0xFFFFFFFF; /* Reset LFN sequence */\r
#endif\r
do {\r
if (res != FR_OK) break;\r
c = dp->dir[DIR_Name];\r
if (c == 0) { res = FR_NO_FILE; break; } /* Reached to end of table */\r
-#if _USE_LFN != 0 /* LFN configuration */\r
+#if FF_USE_LFN /* 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
ord = (c == ord && sum == dp->dir[LDIR_Chksum] && cmp_lfn(fs->lfnbuf, dp->dir)) ? ord - 1 : 0xFF;\r
}\r
} else { /* An SFN entry is found */\r
- if (!ord && sum == sum_sfn(dp->dir)) break; /* LFN matched? */\r
+ if (ord == 0 && 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
\r
\r
-#if !_FS_READONLY\r
+#if !FF_FS_READONLY\r
/*-----------------------------------------------------------------------*/\r
/* Register an object to the directory */\r
/*-----------------------------------------------------------------------*/\r
\r
-static\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
+static 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
FATFS *fs = dp->obj.fs;\r
-#if _USE_LFN != 0 /* LFN configuration */\r
+#if FF_USE_LFN /* LFN configuration */\r
UINT n, nlen, nent;\r
BYTE sn[12], sum;\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 FF_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
+ dp->blk_ofs = dp->dptr - SZDIRE * (nent - 1); /* Set the allocated entry block offset */\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 (dp->obj.stat & 4) { /* Has the directory been stretched? */\r
+ dp->obj.stat &= ~4;\r
+ res = fill_first_frag(&dp->obj); /* Fill the first fragment on the FAT 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
+ res = fill_last_frag(&dp->obj, dp->clust, 0xFFFFFFFF); /* Fill the last fragment on the FAT if needed */\r
if (res != FR_OK) return res;\r
+ if (dp->obj.sclust != 0) { /* Is it a sub directory? */\r
+ DIR dj;\r
+\r
+ res = load_obj_xdir(&dj, &dp->obj); /* Load the object status */\r
+ if (res != FR_OK) return res;\r
+ dp->obj.objsize += (DWORD)fs->csize * SS(fs); /* Increase the directory size by cluster size */\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
\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
+ /* On the FAT/FAT32 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
dp->fn[NSFLAG] = NS_NOLFN; /* Find only SFN */\r
if (res == FR_OK) {\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
+#if FF_USE_LFN\r
dp->dir[DIR_NTres] = dp->fn[NSFLAG] & (NS_BODY | NS_EXT); /* Put NT flag */\r
#endif\r
fs->wflag = 1;\r
return res;\r
}\r
\r
-#endif /* !_FS_READONLY */\r
+#endif /* !FF_FS_READONLY */\r
\r
\r
\r
-#if !_FS_READONLY && _FS_MINIMIZE == 0\r
+#if !FF_FS_READONLY && FF_FS_MINIMIZE == 0\r
/*-----------------------------------------------------------------------*/\r
/* Remove an object from the directory */\r
/*-----------------------------------------------------------------------*/\r
\r
-static\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
+static 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
FATFS *fs = dp->obj.fs;\r
-#if _USE_LFN != 0 /* LFN configuration */\r
+#if FF_USE_LFN /* LFN configuration */\r
DWORD last = dp->dptr;\r
\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
do {\r
res = move_window(fs, dp->sect);\r
if (res != FR_OK) break;\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
+ if (FF_FS_EXFAT && fs->fs_type == FS_EXFAT) { /* On the exFAT volume */\r
+ dp->dir[XDIR_Type] &= 0x7F; /* Clear the entry InUse flag. */\r
+ } else { /* On the FAT/FAT32 volume */\r
+ dp->dir[DIR_Name] = DDEM; /* Mark the entry 'deleted'. */\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
\r
res = move_window(fs, dp->sect);\r
if (res == FR_OK) {\r
- dp->dir[DIR_Name] = DDEM;\r
+ dp->dir[DIR_Name] = DDEM; /* Mark the entry 'deleted'.*/\r
fs->wflag = 1;\r
}\r
#endif\r
return res;\r
}\r
\r
-#endif /* !_FS_READONLY && _FS_MINIMIZE == 0 */\r
+#endif /* !FF_FS_READONLY && FF_FS_MINIMIZE == 0 */\r
\r
\r
\r
-#if _FS_MINIMIZE <= 1 || _FS_RPATH >= 2\r
+#if FF_FS_MINIMIZE <= 1 || FF_FS_RPATH >= 2\r
/*-----------------------------------------------------------------------*/\r
/* Get file information from directory entry */\r
/*-----------------------------------------------------------------------*/\r
\r
-static\r
-void get_fileinfo ( /* No return code */\r
+static void get_fileinfo (\r
DIR* dp, /* Pointer to the directory object */\r
- FILINFO* fno /* Pointer to the file information to be filled */\r
+ FILINFO* fno /* Pointer to the file information to be filled */\r
)\r
{\r
- UINT i, j;\r
- TCHAR c;\r
- DWORD tm;\r
-#if _USE_LFN != 0\r
- WCHAR w, lfv;\r
+ UINT si, di;\r
+#if FF_USE_LFN\r
+ WCHAR wc, hs;\r
FATFS *fs = dp->obj.fs;\r
+#else\r
+ TCHAR c;\r
#endif\r
\r
\r
- fno->fname[0] = 0; /* Invaidate file info */\r
- if (!dp->sect) return; /* Exit if read pointer has reached end of directory */\r
+ fno->fname[0] = 0; /* Invaidate file info */\r
+ if (dp->sect == 0) return; /* Exit if read pointer has reached end of directory */\r
\r
-#if _USE_LFN != 0 /* LFN configuration */\r
-#if _FS_EXFAT\r
+#if FF_USE_LFN /* LFN configuration */\r
+#if FF_FS_EXFAT\r
if (fs->fs_type == FS_EXFAT) { /* On the exFAT volume */\r
- get_xdir_info(fs->dirbuf, fno);\r
+ get_xfileinfo(fs->dirbuf, fno);\r
return;\r
} else\r
#endif\r
- { /* On the FAT12/16/32 volume */\r
+ { /* On the FAT/FAT32 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
+ si = di = hs = 0;\r
+ while (fs->lfnbuf[si] != 0) {\r
+ wc = fs->lfnbuf[si++]; /* Get an LFN character (UTF-16) */\r
+ if (hs == 0 && IsSurrogate(wc)) { /* Is it a surrogate? */\r
+ hs = wc; continue; /* Get low surrogate */\r
}\r
-#endif\r
- if (i >= _MAX_LFN) { i = 0; break; } /* No LFN if buffer overflow */\r
- fno->fname[i++] = (TCHAR)w;\r
+ wc = put_utf((DWORD)hs << 16 | wc, &fno->fname[di], FF_LFN_BUF - di); /* Store it in UTF-16 or UTF-8 encoding */\r
+ if (wc == 0) { di = 0; break; } /* Invalid char or buffer overflow? */\r
+ di += wc;\r
+ hs = 0;\r
}\r
- fno->fname[i] = 0; /* Terminate the LFN */\r
+ if (hs != 0) di = 0; /* Broken surrogate pair? */\r
+ fno->fname[di] = 0; /* Terminate the LFN (null string means LFN is invalid) */\r
}\r
}\r
\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
+ si = di = 0;\r
+ while (si < 11) { /* Get SFN from SFN entry */\r
+ wc = dp->dir[si++]; /* Get a char */\r
+ if (wc == ' ') continue; /* Skip padding spaces */\r
+ if (wc == RDDEM) wc = DDEM; /* Restore replaced DDEM character */\r
+ if (si == 9 && di < FF_SFN_BUF) fno->altname[di++] = '.'; /* Insert a . if extension is exist */\r
+#if FF_LFN_UNICODE >= 1 /* Unicode output */\r
+ if (dbc_1st((BYTE)wc) && si != 8 && si != 11 && dbc_2nd(dp->dir[si])) { /* Make a DBC if needed */\r
+ wc = wc << 8 | dp->dir[si++];\r
}\r
- c = ff_convert(c, 1); /* OEM -> Unicode */\r
- if (!c) c = '?';\r
+ wc = ff_oem2uni(wc, CODEPAGE); /* ANSI/OEM -> Unicode */\r
+ if (wc == 0) { di = 0; break; } /* Wrong char in the current code page? */\r
+ wc = put_utf(wc, &fno->altname[di], FF_SFN_BUF - di); /* Store it in Unicode */\r
+ if (wc == 0) { di = 0; break; } /* Buffer overflow? */\r
+ di += wc;\r
+#else /* ANSI/OEM output */\r
+ fno->altname[di++] = (TCHAR)wc; /* Store it without any conversion */\r
#endif\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->altname[di] = 0; /* Terminate the SFN (null string means SFN is invalid) */\r
+\r
+ if (fno->fname[0] == 0) { /* If LFN is invalid, altname[] needs to be copied to fname[] */\r
+ if (di == 0) { /* If LFN and SFN both are invalid, this object is inaccesible */\r
+ fno->fname[di++] = '?';\r
+ } else {\r
+ for (si = di = 0; fno->altname[si]; si++, di++) { /* Copy altname[] to fname[] with case information */\r
+ wc = (WCHAR)fno->altname[si];\r
+ if (IsUpper(wc) && (dp->dir[DIR_NTres] & ((si >= 9) ? NS_EXT : NS_BODY))) wc += 0x20;\r
+ fno->fname[di] = (TCHAR)wc;\r
}\r
- fno->fname[j] = c;\r
}\r
- j++;\r
+ fno->fname[di] = 0; /* Terminate the LFN */\r
+ if (!dp->dir[DIR_NTres]) fno->altname[0] = 0; /* Altname is not needed if neither LFN nor case info is exist. */\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
+ si = di = 0;\r
+ while (si < 11) { /* Copy name body and extension */\r
+ c = (TCHAR)dp->dir[si++];\r
+ if (c == ' ') continue; /* Skip padding spaces */\r
+ if (c == RDDEM) c = DDEM; /* Restore replaced DDEM character */\r
+ if (si == 9) fno->fname[di++] = '.';/* Insert a . if extension is exist */\r
+ fno->fname[di++] = c;\r
}\r
- fno->fname[j] = 0;\r
+ fno->fname[di] = 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
+ fno->fattrib = dp->dir[DIR_Attr]; /* Attribute */\r
+ fno->fsize = ld_dword(dp->dir + DIR_FileSize); /* Size */\r
+ fno->ftime = ld_word(dp->dir + DIR_ModTime + 0); /* Time */\r
+ fno->fdate = ld_word(dp->dir + DIR_ModTime + 2); /* Date */\r
}\r
\r
-#endif /* _FS_MINIMIZE <= 1 || _FS_RPATH >= 2 */\r
+#endif /* FF_FS_MINIMIZE <= 1 || FF_FS_RPATH >= 2 */\r
\r
\r
\r
-#if _USE_FIND && _FS_MINIMIZE <= 1\r
+#if FF_USE_FIND && FF_FS_MINIMIZE <= 1\r
/*-----------------------------------------------------------------------*/\r
/* Pattern matching */\r
/*-----------------------------------------------------------------------*/\r
\r
-static\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
+static DWORD get_achar ( /* Get a character and advances ptr */\r
+ const TCHAR** ptr /* Pointer to pointer to the ANSI/OEM or Unicode string */\r
)\r
{\r
-#if !_LFN_UNICODE\r
- WCHAR chr;\r
+ DWORD chr;\r
\r
- chr = (BYTE)*(*ptr)++; /* Get a byte */\r
- if (IsLower(chr)) chr -= 0x20; /* To upper ASCII char */\r
-#ifdef _EXCVT\r
+\r
+#if FF_USE_LFN && FF_LFN_UNICODE >= 1 /* Unicode input */\r
+ chr = tchar2uni(ptr);\r
+ if (chr == 0xFFFFFFFF) chr = 0; /* Wrong UTF encoding is recognized as end of the string */\r
+ chr = ff_wtoupper(chr);\r
+\r
+#else /* ANSI/OEM input */\r
+ chr = (BYTE)*(*ptr)++; /* Get a byte */\r
+ if (IsLower(chr)) chr -= 0x20; /* To upper ASCII char */\r
+#if FF_CODE_PAGE == 0\r
+ if (ExCvt && chr >= 0x80) chr = ExCvt[chr - 0x80]; /* To upper SBCS extended char */\r
+#elif FF_CODE_PAGE < 900\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
+#endif\r
+#if FF_CODE_PAGE == 0 || FF_CODE_PAGE >= 900\r
+ if (dbc_1st((BYTE)chr)) { /* Get DBC 2nd byte if needed */\r
+ chr = dbc_2nd((BYTE)**ptr) ? chr << 8 | (BYTE)*(*ptr)++ : 0;\r
}\r
#endif\r
- return chr;\r
-#else\r
- return ff_wtoupper(*(*ptr)++); /* Get a word and to upper */\r
+\r
#endif\r
+ return chr;\r
}\r
\r
\r
-static\r
-int pattern_matching ( /* 0:not matched, 1:matched */\r
+static 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
)\r
{\r
const TCHAR *pp, *np;\r
- WCHAR pc, nc;\r
+ DWORD 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
+ if (*pat == 0 && 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
+ do { /* Analyze the wildcard block */\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
return 0;\r
}\r
\r
-#endif /* _USE_FIND && _FS_MINIMIZE <= 1 */\r
+#endif /* FF_USE_FIND && FF_FS_MINIMIZE <= 1 */\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
+static 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 != 0 /* LFN configuration */\r
+#if FF_USE_LFN /* LFN configuration */\r
BYTE b, cf;\r
- WCHAR w, *lfn;\r
+ WCHAR wc, *lfn;\r
+ DWORD uc;\r
UINT i, ni, si, di;\r
const TCHAR *p;\r
\r
- /* Create LFN in Unicode */\r
- p = *path; lfn = dp->obj.fs->lfnbuf; si = di = 0;\r
- for (;;) {\r
- w = p[si++]; /* Get a character */\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
- 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)) return FR_INVALID_NAME; /* Reject illegal characters for LFN */\r
- lfn[di++] = w; /* Store the Unicode character */\r
+\r
+ /* Create LFN into LFN working buffer */\r
+ p = *path; lfn = dp->obj.fs->lfnbuf; di = 0;\r
+ for (;;) {\r
+ uc = tchar2uni(&p); /* Get a character */\r
+ if (uc == 0xFFFFFFFF) return FR_INVALID_NAME; /* Invalid code or UTF decode error */\r
+ if (uc >= 0x10000) lfn[di++] = (WCHAR)(uc >> 16); /* Store high surrogate if needed */\r
+ wc = (WCHAR)uc;\r
+ if (wc < ' ' || wc == '/' || wc == '\\') break; /* Break if end of the path or a separator is found */\r
+ if (wc < 0x80 && chk_chr("\"*:<>\?|\x7F", wc)) return FR_INVALID_NAME; /* Reject illegal characters for LFN */\r
+ if (di >= FF_MAX_LFN) return FR_INVALID_NAME; /* Reject too long name */\r
+ lfn[di++] = wc; /* 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 the path */\r
-#if _FS_RPATH != 0\r
+ while (*p == '/' || *p == '\\') p++; /* Skip duplicated separators if exist */\r
+ *path = p; /* Return pointer to the next segment */\r
+ cf = (wc < ' ') ? NS_LAST : 0; /* Set last segment flag if end of the path */\r
+\r
+#if FF_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++) /* Create dot name for SFN entry */\r
+ for (i = 0; i < 11; i++) { /* Create dot name for SFN entry */\r
dp->fn[i] = (i < di) ? '.' : ' ';\r
+ }\r
dp->fn[i] = cf | NS_DOT; /* This is a dot entry */\r
return FR_OK;\r
}\r
#endif\r
while (di) { /* Snip off trailing spaces and dots if exist */\r
- w = lfn[di - 1];\r
- if (w != ' ' && w != '.') break;\r
+ wc = lfn[di - 1];\r
+ if (wc != ' ' && wc != '.') break;\r
di--;\r
}\r
- lfn[di] = 0; /* LFN is created */\r
- if (di == 0) return FR_INVALID_NAME; /* Reject nul name */\r
+ lfn[di] = 0; /* LFN is created into the working buffer */\r
+ if (di == 0) return FR_INVALID_NAME; /* Reject null name */\r
\r
/* Create SFN in directory form */\r
- mem_set(dp->fn, ' ', 11);\r
- for (si = 0; lfn[si] == ' ' || lfn[si] == '.'; si++) ; /* Strip leading spaces and dots */\r
- if (si) cf |= NS_LOSS | NS_LFN;\r
- while (di && lfn[di - 1] != '.') di--; /* Find extension (di<=si: no extension) */\r
+ for (si = 0; lfn[si] == ' '; si++) ; /* Remove leading spaces */\r
+ if (si > 0 || lfn[si] == '.') cf |= NS_LOSS | NS_LFN; /* Is there any leading space or dot? */\r
+ while (di > 0 && lfn[di - 1] != '.') di--; /* Find last dot (di<=si: no extension) */\r
\r
+ mem_set(dp->fn, ' ', 11);\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
- if (w == ' ' || (w == '.' && si != di)) { /* Remove spaces and dots */\r
- cf |= NS_LOSS | NS_LFN; continue;\r
+ wc = lfn[si++]; /* Get an LFN character */\r
+ if (wc == 0) break; /* Break on end of the LFN */\r
+ if (wc == ' ' || (wc == '.' && si != di)) { /* Remove embedded spaces and dots */\r
+ cf |= NS_LOSS | NS_LFN;\r
+ continue;\r
}\r
\r
- if (i >= ni || si == di) { /* Extension or end of SFN */\r
- if (ni == 11) { /* Long extension */\r
- cf |= NS_LOSS | NS_LFN; break;\r
+ if (i >= ni || si == di) { /* End of field? */\r
+ if (ni == 11) { /* Name extension overflow? */\r
+ cf |= NS_LOSS | NS_LFN;\r
+ break;\r
}\r
- if (si != di) cf |= NS_LOSS | NS_LFN; /* Out of 8.3 format */\r
- if (si > di) break; /* No extension */\r
- si = di; i = 8; ni = 11; /* Enter extension section */\r
- b <<= 2; continue;\r
+ if (si != di) cf |= NS_LOSS | NS_LFN; /* Name body overflow? */\r
+ if (si > di) break; /* No name extension? */\r
+ si = di; i = 8; ni = 11; b <<= 2; /* Enter name extension */\r
+ continue;\r
}\r
\r
- if (w >= 0x80) { /* Non ASCII character */\r
-#ifdef _EXCVT\r
- w = ff_convert(w, 0); /* Unicode -> OEM code */\r
- if (w) w = ExCvt[w - 0x80]; /* Convert extended character to upper (SBCS) */\r
-#else\r
- w = ff_convert(ff_wtoupper(w), 0); /* Upper converted Unicode -> OEM code */\r
+ if (wc >= 0x80) { /* Is this a non-ASCII character? */\r
+ cf |= NS_LFN; /* LFN entry needs to be created */\r
+#if FF_CODE_PAGE == 0\r
+ if (ExCvt) { /* At SBCS */\r
+ wc = ff_uni2oem(wc, CODEPAGE); /* Unicode ==> ANSI/OEM code */\r
+ if (wc & 0x80) wc = ExCvt[wc & 0x7F]; /* Convert extended character to upper (SBCS) */\r
+ } else { /* At DBCS */\r
+ wc = ff_uni2oem(ff_wtoupper(wc), CODEPAGE); /* Unicode ==> Upper convert ==> ANSI/OEM code */\r
+ }\r
+#elif FF_CODE_PAGE < 900 /* SBCS cfg */\r
+ wc = ff_uni2oem(wc, CODEPAGE); /* Unicode ==> ANSI/OEM code */\r
+ if (wc & 0x80) wc = ExCvt[wc & 0x7F]; /* Convert extended character to upper (SBCS) */\r
+#else /* DBCS cfg */\r
+ wc = ff_uni2oem(ff_wtoupper(wc), CODEPAGE); /* Unicode ==> Upper convert ==> ANSI/OEM code */\r
#endif\r
- cf |= NS_LFN; /* Force create LFN entry */\r
}\r
\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
+ if (wc >= 0x100) { /* Is this a DBC? */\r
+ if (i >= ni - 1) { /* Field overflow? */\r
+ cf |= NS_LOSS | NS_LFN;\r
+ i = ni; continue; /* Next field */\r
}\r
- dp->fn[i++] = (BYTE)(w >> 8);\r
+ dp->fn[i++] = (BYTE)(wc >> 8); /* Put 1st byte */\r
} else { /* SBC */\r
- if (!w || chk_chr("+,;=[]", w)) { /* Replace illegal characters for SFN */\r
- w = '_'; cf |= NS_LOSS | NS_LFN;/* Lossy conversion */\r
+ if (wc == 0 || chk_chr("+,;=[]", wc)) { /* Replace illegal characters for SFN if needed */\r
+ wc = '_'; cf |= NS_LOSS | NS_LFN;/* Lossy conversion */\r
} else {\r
- if (IsUpper(w)) { /* ASCII large capital */\r
+ if (IsUpper(wc)) { /* ASCII upper case? */\r
b |= 2;\r
- } else {\r
- if (IsLower(w)) { /* ASCII small capital */\r
- b |= 1; w -= 0x20;\r
- }\r
+ }\r
+ if (IsLower(wc)) { /* ASCII lower case? */\r
+ b |= 1; wc -= 0x20;\r
}\r
}\r
}\r
- dp->fn[i++] = (BYTE)w;\r
+ dp->fn[i++] = (BYTE)wc;\r
}\r
\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) 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
+ if (ni == 8) b <<= 2; /* Shift capital flags if no extension */\r
+ if ((b & 0x0C) == 0x0C || (b & 0x03) == 0x03) cf |= NS_LFN; /* LFN entry needs to be created if composite capitals */\r
+ if (!(cf & NS_LFN)) { /* When LFN is in 8.3 format without extended character, NT flags are created */\r
+ if (b & 0x01) cf |= NS_EXT; /* NT flag (Extension has small capital letters only) */\r
+ if (b & 0x04) cf |= NS_BODY; /* NT flag (Body has small capital letters only) */\r
}\r
\r
- dp->fn[NSFLAG] = cf; /* SFN is created */\r
+ dp->fn[NSFLAG] = cf; /* SFN is created into dp->fn[] */\r
\r
return FR_OK;\r
\r
\r
-#else /* _USE_LFN != 0 : Non-LFN configuration */\r
+#else /* FF_USE_LFN : Non-LFN configuration */\r
BYTE c, d, *sfn;\r
UINT ni, si, i;\r
const char *p;\r
p = *path; sfn = dp->fn;\r
mem_set(sfn, ' ', 11);\r
si = i = 0; ni = 8;\r
-#if _FS_RPATH != 0\r
+#if FF_FS_RPATH != 0\r
if (p[si] == '.') { /* Is this a dot entry? */\r
for (;;) {\r
c = (BYTE)p[si++];\r
}\r
#endif\r
for (;;) {\r
- c = (BYTE)p[si++];\r
+ c = (BYTE)p[si++]; /* Get a byte */\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
+ if (c == '.' || i >= ni) { /* End of body or field overflow? */\r
+ if (ni == 11 || c != '.') return FR_INVALID_NAME; /* Field overflow or invalid dot? */\r
+ i = 8; ni = 11; /* Enter file extension field */\r
continue;\r
}\r
- if (c >= 0x80) { /* Extended character? */\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 only cfg) */\r
-#endif\r
-#endif\r
+#if FF_CODE_PAGE == 0\r
+ if (ExCvt && c >= 0x80) { /* Is SBC extended character? */\r
+ c = ExCvt[c & 0x7F]; /* To upper SBC extended character */\r
+ }\r
+#elif FF_CODE_PAGE < 900\r
+ if (c >= 0x80) { /* Is SBC extended character? */\r
+ c = ExCvt[c & 0x7F]; /* To upper SBC extended character */\r
}\r
- if (IsDBCS1(c)) { /* Check if it is a DBC 1st byte (always false at SBCS cfg.) */\r
+#endif\r
+ if (dbc_1st(c)) { /* Check if it is a DBC 1st byte */\r
d = (BYTE)p[si++]; /* Get 2nd byte */\r
- if (!IsDBCS2(d) || i >= ni - 1) return FR_INVALID_NAME; /* Reject invalid DBC */\r
+ if (!dbc_2nd(d) || i >= ni - 1) return FR_INVALID_NAME; /* Reject invalid DBC */\r
sfn[i++] = c;\r
sfn[i++] = d;\r
} else { /* SBC */\r
sfn[NSFLAG] = (c <= ' ') ? NS_LAST : 0; /* Set last segment flag if end of the path */\r
\r
return FR_OK;\r
-#endif /* _USE_LFN != 0 */\r
+#endif /* FF_USE_LFN */\r
}\r
\r
\r
/* Follow a file path */\r
/*-----------------------------------------------------------------------*/\r
\r
-static\r
-FRESULT follow_path ( /* FR_OK(0): successful, !=0: error code */\r
- DIR* dp, /* Directory object to return last directory and found object */\r
- const TCHAR* path /* Full-path string to find a file or directory */\r
+static FRESULT follow_path ( /* FR_OK(0): successful, !=0: error code */\r
+ DIR* dp, /* Directory object to return last directory and found object */\r
+ const TCHAR* path /* Full-path string to find a file or directory */\r
)\r
{\r
FRESULT res;\r
BYTE ns;\r
- _FDID *obj = &dp->obj;\r
- FATFS *fs = obj->fs;\r
+ FATFS *fs = dp->obj.fs;\r
\r
\r
-#if _FS_RPATH != 0\r
+#if FF_FS_RPATH != 0\r
if (*path != '/' && *path != '\\') { /* Without heading separator */\r
- obj->sclust = fs->cdir; /* Start from the current directory */\r
+ dp->obj.sclust = fs->cdir; /* Start from 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
+ dp->obj.sclust = 0; /* Start from 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
+#if FF_FS_EXFAT\r
+ dp->obj.n_frag = 0; /* Invalidate last fragment counter of the object */\r
+#if FF_FS_RPATH != 0\r
+ if (fs->fs_type == FS_EXFAT && dp->obj.sclust) { /* exFAT: Retrieve the sub-directory's status */\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
+ dp->obj.c_scl = fs->cdc_scl;\r
+ dp->obj.c_size = fs->cdc_size;\r
+ dp->obj.c_ofs = fs->cdc_ofs;\r
+ res = load_obj_xdir(&dj, &dp->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
+ dp->obj.objsize = ld_dword(fs->dirbuf + XDIR_FileSize);\r
+ dp->obj.stat = fs->dirbuf[XDIR_GenFlags] & 2;\r
}\r
+#endif\r
#endif\r
\r
if ((UINT)*path < ' ') { /* Null path name is the origin directory itself */\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, stay there */\r
+ if (FF_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
dp->fn[NSFLAG] = NS_NONAME;\r
res = FR_OK;\r
}\r
if (ns & NS_LAST) break; /* Last segment matched. Function completed. */\r
/* Get into the sub-directory */\r
- if (!(obj->attr & AM_DIR)) { /* It is not a sub-directory and cannot follow */\r
+ if (!(dp->obj.attr & AM_DIR)) { /* It is not a sub-directory and cannot follow */\r
res = FR_NO_PATH; break;\r
}\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
+#if FF_FS_EXFAT\r
+ if (fs->fs_type == FS_EXFAT) { /* Save containing directory information for next dir */\r
+ dp->obj.c_scl = dp->obj.sclust;\r
+ dp->obj.c_size = ((DWORD)dp->obj.objsize & 0xFFFFFF00) | dp->obj.stat;\r
+ dp->obj.c_ofs = dp->blk_ofs;\r
+ init_alloc_info(fs, &dp->obj); /* Open next directory */\r
} else\r
#endif\r
{\r
- obj->sclust = ld_clust(fs, fs->win + dp->dptr % SS(fs)); /* Open next directory */\r
+ dp->obj.sclust = ld_clust(fs, fs->win + dp->dptr % SS(fs)); /* Open next directory */\r
}\r
}\r
}\r
/* Get logical drive number from path name */\r
/*-----------------------------------------------------------------------*/\r
\r
-static\r
-int get_ldnumber ( /* Returns logical drive number (-1:invalid drive) */\r
- const TCHAR** path /* Pointer to pointer to the path name */\r
+static int get_ldnumber ( /* Returns logical drive number (-1:invalid drive number or null pointer) */\r
+ const TCHAR** path /* Pointer to pointer to the path name */\r
)\r
{\r
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
+ TCHAR tc;\r
+ int i, vol = -1;\r
+#if FF_STR_VOLUME_ID /* Find string volume ID */\r
const char *sp;\r
char c;\r
- TCHAR tc;\r
#endif\r
\r
+ tt = tp = *path;\r
+ if (!tp) return vol; /* Invalid path name? */\r
+ do tc = *tt++; while ((UINT)tc >= (FF_USE_LFN ? ' ' : '!') && tc != ':'); /* Find a colon in the path */\r
\r
- if (*path) { /* If the pointer is not a null */\r
- for (tt = *path; (UINT)*tt >= (_USE_LFN ? ' ' : '!') && *tt != ':'; tt++) ; /* Find ':' in the path */\r
- if (*tt == ':') { /* If a ':' is exist in the path name */\r
- tp = *path;\r
- i = *tp++ - '0'; \r
- if (i < 10 && tp == tt) { /* Is there a numeric drive id? */\r
- if (i < _VOLUMES) { /* If a drive id is found, get the value and strip it */\r
- vol = (int)i;\r
- *path = ++tt;\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
- do { /* Compare a string drive id with path name */\r
- c = *sp++; tc = *tp++;\r
- if (IsLower(tc)) tc -= 0x20;\r
- } while (c && (TCHAR)c == tc);\r
- } while ((c || tp != tt) && ++i < _VOLUMES); /* Repeat for each id until pattern match */\r
- if (i < _VOLUMES) { /* If a drive id is found, get the value and strip it */\r
- vol = (int)i;\r
- *path = tt;\r
- }\r
- }\r
+ if (tc == ':') { /* DOS/Windows style volume ID? */\r
+ i = FF_VOLUMES;\r
+ if (IsDigit(*tp) && tp + 2 == tt) { /* Is there a numeric volume ID + colon? */\r
+ i = (int)*tp - '0'; /* Get the LD number */\r
+ }\r
+#if FF_STR_VOLUME_ID == 1 /* Arbitrary string is enabled */\r
+ else {\r
+ i = 0;\r
+ do {\r
+ sp = VolumeStr[i]; tp = *path; /* This string volume ID and path name */\r
+ do { /* Compare the volume ID with path name */\r
+ c = *sp++; tc = *tp++;\r
+ if (IsLower(c)) c -= 0x20;\r
+ if (IsLower(tc)) tc -= 0x20;\r
+ } while (c && (TCHAR)c == tc);\r
+ } while ((c || tp != tt) && ++i < FF_VOLUMES); /* Repeat for each id until pattern match */\r
+ }\r
#endif\r
+ if (i < FF_VOLUMES) { /* If a volume ID is found, get the drive number and strip it */\r
+ vol = i; /* Drive number */\r
+ *path = tt; /* Snip the drive prefix off */\r
+ }\r
+ return vol;\r
+ }\r
+#if FF_STR_VOLUME_ID == 2 /* Unix style volume ID is enabled */\r
+ if (*tp == '/') {\r
+ i = 0;\r
+ do {\r
+ sp = VolumeStr[i]; tp = *path; /* This string volume ID and path name */\r
+ do { /* Compare the volume ID with path name */\r
+ c = *sp++; tc = *(++tp);\r
+ if (IsLower(c)) c -= 0x20;\r
+ if (IsLower(tc)) tc -= 0x20;\r
+ } while (c && (TCHAR)c == tc);\r
+ } while ((c || (tc != '/' && (UINT)tc >= (FF_USE_LFN ? ' ' : '!'))) && ++i < FF_VOLUMES); /* Repeat for each ID until pattern match */\r
+ if (i < FF_VOLUMES) { /* If a volume ID is found, get the drive number and strip it */\r
+ vol = i; /* Drive number */\r
+ *path = tp; /* Snip the drive prefix off */\r
return vol;\r
}\r
-#if _FS_RPATH != 0 && _VOLUMES >= 2\r
- vol = CurrVol; /* Current drive */\r
+ }\r
+#endif\r
+ /* No drive prefix is found */\r
+#if FF_FS_RPATH != 0\r
+ vol = CurrVol; /* Default drive is current drive */\r
#else\r
- vol = 0; /* Drive 0 */\r
+ vol = 0; /* Default drive is 0 */\r
#endif\r
- }\r
- return vol;\r
+ return vol; /* Return the default drive */\r
}\r
\r
\r
\r
\r
/*-----------------------------------------------------------------------*/\r
-/* Load a sector and check if it is an FAT boot sector */\r
+/* Load a sector and check if it is an FAT VBR */\r
/*-----------------------------------------------------------------------*/\r
\r
-static\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-VBR or not */\r
+static BYTE check_fs ( /* 0:FAT, 1:exFAT, 2:Valid BS but not FAT, 3:Not a BS, 4:Disk error */\r
+ FATFS* fs, /* Filesystem object */\r
+ DWORD sect /* Sector# (lba) to load and 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) return 4; /* Load boot record */\r
\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
+ if (ld_word(fs->win + BS_55AA) != 0xAA55) return 3; /* Check boot record signature (always here regardless of the sector size) */\r
\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
+#if FF_FS_EXFAT\r
+ if (!mem_cmp(fs->win + BS_JmpBoot, "\xEB\x76\x90" "EXFAT ", 11)) return 1; /* Check if exFAT VBR */\r
#endif\r
- return 2;\r
+ if (fs->win[BS_JmpBoot] == 0xE9 || fs->win[BS_JmpBoot] == 0xEB || fs->win[BS_JmpBoot] == 0xE8) { /* Valid JumpBoot code? */\r
+ if (!mem_cmp(fs->win + BS_FilSysType, "FAT", 3)) return 0; /* Is it an FAT VBR? */\r
+ if (!mem_cmp(fs->win + BS_FilSysType32, "FAT32", 5)) return 0; /* Is it an FAT32 VBR? */\r
+ }\r
+ return 2; /* Valid BS but not FAT */\r
}\r
\r
\r
\r
\r
/*-----------------------------------------------------------------------*/\r
-/* Find logical drive and check if the volume is mounted */\r
+/* Determine logical drive number and mount the volume if needed */\r
/*-----------------------------------------------------------------------*/\r
\r
-static\r
-FRESULT find_volume ( /* FR_OK(0): successful, !=0: any error occurred */\r
- const TCHAR** path, /* Pointer to pointer to the path name (drive number) */\r
- FATFS** rfs, /* Pointer to pointer to the found file system object */\r
- BYTE mode /* !=0: Check write protection for write access */\r
+static FRESULT find_volume ( /* FR_OK(0): successful, !=0: an error occurred */\r
+ const TCHAR** path, /* Pointer to pointer to the path name (drive number) */\r
+ FATFS** rfs, /* Pointer to pointer to the found filesystem object */\r
+ BYTE mode /* !=0: Check write protection for write access */\r
)\r
{\r
BYTE fmt, *pt;\r
vol = get_ldnumber(path);\r
if (vol < 0) return FR_INVALID_DRIVE;\r
\r
- /* Check if the file system object is valid or not */\r
- fs = FatFs[vol]; /* Get pointer to the file system object */\r
- if (!fs) return FR_NOT_ENABLED; /* Is the file system object available? */\r
-\r
- ENTER_FF(fs); /* Lock the volume */\r
- *rfs = fs; /* Return pointer to the file system object */\r
+ /* Check if the filesystem object is valid or not */\r
+ fs = FatFs[vol]; /* Get pointer to the filesystem object */\r
+ if (!fs) return FR_NOT_ENABLED; /* Is the filesystem object available? */\r
+#if FF_FS_REENTRANT\r
+ if (!lock_fs(fs)) return FR_TIMEOUT; /* Lock the volume */\r
+#endif\r
+ *rfs = fs; /* Return pointer to the filesystem 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 (fs->fs_type != 0) { /* If the volume has been mounted */\r
+ stat = disk_status(fs->pdrv);\r
if (!(stat & STA_NOINIT)) { /* and the physical drive is kept initialized */\r
- if (!_FS_READONLY && mode && (stat & STA_PROTECT)) { /* Check write protection if needed */\r
+ if (!FF_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
+ return FR_OK; /* The filesystem object is valid */\r
}\r
}\r
\r
- /* The file system object is not valid. */\r
- /* Following code attempts to mount the volume. (analyze BPB and initialize the fs object) */\r
+ /* The filesystem object is not valid. */\r
+ /* Following code attempts to mount the volume. (analyze BPB and initialize the filesystem object) */\r
\r
- 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
+ fs->fs_type = 0; /* Clear the filesystem object */\r
+ fs->pdrv = LD2PD(vol); /* Bind the logical drive and a physical drive */\r
+ stat = disk_initialize(fs->pdrv); /* Initialize the physical drive */\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
}\r
- if (!_FS_READONLY && mode && (stat & STA_PROTECT)) { /* Check disk write protection if needed */\r
+ if (!FF_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) return FR_DISK_ERR;\r
- if (SS(fs) > _MAX_SS || SS(fs) < _MIN_SS || (SS(fs) & (SS(fs) - 1))) return FR_DISK_ERR;\r
+#if FF_MAX_SS != FF_MIN_SS /* Get sector size (multiple sector size cfg only) */\r
+ if (disk_ioctl(fs->pdrv, GET_SECTOR_SIZE, &SS(fs)) != RES_OK) return FR_DISK_ERR;\r
+ if (SS(fs) > FF_MAX_SS || SS(fs) < FF_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
+\r
+ /* Find an FAT partition on the drive. Supports only generic partitioning rules, FDISK and SFD. */\r
bsect = 0;\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
+ for (i = 0; i < 4; i++) { /* Get partition offset */\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
+ i = LD2PT(vol); /* Partition number: 0:auto, 1-4:forced */\r
+ if (i != 0) i--;\r
+ do { /* Find an FAT volume */\r
bsect = br[i];\r
fmt = bsect ? check_fs(fs, bsect) : 3; /* Check the partition */\r
- } while (!LD2PT(vol) && fmt >= 2 && ++i < 4);\r
+ } while (LD2PT(vol) == 0 && fmt >= 2 && ++i < 4);\r
}\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
+ /* An FAT volume is found (bsect). Following code initializes the filesystem object */\r
\r
-#if _FS_EXFAT\r
+#if FF_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
+ if (ld_word(fs->win + BPB_FSVerEx) != 0x100) return FR_NO_FILESYSTEM; /* Check exFAT version (must be version 1.0) */\r
\r
- if (1 << fs->win[BPB_BytsPerSecEx] != SS(fs)) /* (BPB_BytsPerSecEx must be equal to the physical sector size) */\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
\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
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
+ if (move_window(fs, clst2sect(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
+#if !FF_FS_READONLY\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
+#endif /* FF_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
+ 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
+ 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
+ fasize *= fs->n_fats; /* Number of sectors for FAT area */\r
\r
- fs->csize = fs->win[BPB_SecPerClus]; /* Cluster size */\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
+ 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
+ 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 (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 = 0;\r
+ if (nclst <= MAX_FAT32) fmt = FS_FAT32;\r
if (nclst <= MAX_FAT16) fmt = FS_FAT16;\r
if (nclst <= MAX_FAT12) fmt = FS_FAT12;\r
+ if (fmt == 0) return FR_NO_FILESYSTEM;\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
+ 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
+ if (fs->n_rootdir != 0) 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
+ 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
+ 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
-#if !_FS_READONLY\r
- /* Get FSINFO if available */\r
+#if !FF_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_FSInfo32 == 1 */\r
+#if (FF_FS_NOFSINFO & 3) != 3\r
+ if (fmt == FS_FAT32 /* Allow to update FSInfo only if 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
+ 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
+#if (FF_FS_NOFSINFO & 1) == 0\r
fs->free_clst = ld_dword(fs->win + FSI_Free_Count);\r
#endif\r
-#if (_FS_NOFSINFO & 2) == 0\r
+#if (FF_FS_NOFSINFO & 2) == 0\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
+#endif /* (FF_FS_NOFSINFO & 3) != 3 */\r
+#endif /* !FF_FS_READONLY */\r
}\r
\r
- fs->fs_type = fmt; /* FAT sub-type */\r
- fs->id = ++Fsid; /* File system mount ID */\r
-#if _USE_LFN == 1\r
+ fs->fs_type = fmt; /* FAT sub-type */\r
+ fs->id = ++Fsid; /* Volume mount ID */\r
+#if FF_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
+#if FF_FS_EXFAT\r
+ fs->dirbuf = DirBuf; /* Static directory block scratchpad buuffer */\r
#endif\r
#endif\r
-#if _FS_RPATH != 0\r
- fs->cdir = 0; /* Initialize current directory */\r
+#if FF_FS_RPATH != 0\r
+ fs->cdir = 0; /* Initialize current directory */\r
#endif\r
-#if _FS_LOCK != 0 /* Clear file lock semaphores */\r
+#if FF_FS_LOCK != 0 /* Clear file lock semaphores */\r
clear_lock(fs);\r
#endif\r
return FR_OK;\r
/* Check if the file/directory object is valid or not */\r
/*-----------------------------------------------------------------------*/\r
\r
-static\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
+static FRESULT validate ( /* Returns FR_OK or FR_INVALID_OBJECT */\r
+ FFOBJID* obj, /* Pointer to the FFOBJID, the 1st member in the FIL/DIR object, to check validity */\r
+ FATFS** rfs /* Pointer to pointer to the owner filesystem object to return */\r
)\r
{\r
- FRESULT res;\r
+ FRESULT res = FR_INVALID_OBJECT;\r
\r
\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
+ if (obj && obj->fs && obj->fs->fs_type && obj->id == obj->fs->id) { /* Test if the object is valid */\r
+#if FF_FS_REENTRANT\r
+ if (lock_fs(obj->fs)) { /* Obtain the filesystem object */\r
+ if (!(disk_status(obj->fs->pdrv) & STA_NOINIT)) { /* Test if the phsical drive is kept initialized */\r
+ res = FR_OK;\r
+ } else {\r
+ unlock_fs(obj->fs, FR_OK);\r
+ }\r
+ } else {\r
+ res = FR_TIMEOUT;\r
+ }\r
+#else\r
+ if (!(disk_status(obj->fs->pdrv) & STA_NOINIT)) { /* Test if the phsical drive is kept initialized */\r
+ res = FR_OK;\r
+ }\r
+#endif\r
}\r
+ *rfs = (res == FR_OK) ? obj->fs : 0; /* Corresponding filesystem object */\r
return res;\r
}\r
\r
/*-----------------------------------------------------------------------*/\r
\r
FRESULT f_mount (\r
- FATFS* fs, /* Pointer to the file system object (NULL:unmount)*/\r
+ FATFS* fs, /* Pointer to the filesystem object (NULL:unmount)*/\r
const TCHAR* path, /* Logical drive number to be mounted/unmounted */\r
BYTE opt /* Mode option 0:Do not mount (delayed mount), 1:Mount immediately */\r
)\r
cfs = FatFs[vol]; /* Pointer to fs object */\r
\r
if (cfs) {\r
-#if _FS_LOCK != 0\r
+#if FF_FS_LOCK != 0\r
clear_lock(cfs);\r
#endif\r
-#if _FS_REENTRANT /* Discard sync object of the current volume */\r
+#if FF_FS_REENTRANT /* Discard sync object of the current volume */\r
if (!ff_del_syncobj(cfs->sobj)) return FR_INT_ERR;\r
#endif\r
cfs->fs_type = 0; /* Clear old fs object */\r
\r
if (fs) {\r
fs->fs_type = 0; /* Clear new fs object */\r
-#if _FS_REENTRANT /* Create sync object for the new volume */\r
+#if FF_FS_REENTRANT /* Create sync object for the new volume */\r
if (!ff_cre_syncobj((BYTE)vol, &fs->sobj)) return FR_INT_ERR;\r
#endif\r
}\r
FatFs[vol] = fs; /* Register new fs object */\r
\r
- if (!fs || opt != 1) return FR_OK; /* Do not mount now, it will be mounted later */\r
+ if (opt == 0) return FR_OK; /* Do not mount now, it will be mounted later */\r
\r
res = find_volume(&path, &fs, 0); /* Force mounted the volume */\r
LEAVE_FF(fs, res);\r
FRESULT res;\r
DIR dj;\r
FATFS *fs;\r
-#if !_FS_READONLY\r
+#if !FF_FS_READONLY\r
DWORD dw, cl, bcs, clst, sc;\r
FSIZE_t ofs;\r
#endif\r
\r
if (!fp) return FR_INVALID_OBJECT;\r
\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
+ /* Get logical drive number */\r
+ mode &= FF_FS_READONLY ? FA_READ : FA_READ | FA_WRITE | FA_CREATE_ALWAYS | FA_CREATE_NEW | FA_OPEN_ALWAYS | FA_OPEN_APPEND;\r
res = find_volume(&path, &fs, mode);\r
if (res == FR_OK) {\r
dj.obj.fs = fs;\r
INIT_NAMBUF(fs);\r
res = follow_path(&dj, path); /* Follow the file path */\r
-#if !_FS_READONLY /* R/W configuration */\r
+#if !FF_FS_READONLY /* Read/Write configuration */\r
if (res == FR_OK) {\r
if (dj.fn[NSFLAG] & NS_NONAME) { /* Origin directory itself? */\r
res = FR_INVALID_NAME;\r
}\r
-#if _FS_LOCK != 0\r
+#if FF_FS_LOCK != 0\r
else {\r
- res = chk_lock(&dj, (mode & ~FA_READ) ? 1 : 0);\r
+ res = chk_lock(&dj, (mode & ~FA_READ) ? 1 : 0); /* Check if the file can be used */\r
}\r
#endif\r
}\r
/* Create or Open a file */\r
if (mode & (FA_CREATE_ALWAYS | FA_OPEN_ALWAYS | FA_CREATE_NEW)) {\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 != 0\r
+ if (res == FR_NO_FILE) { /* There is no file to open, create a new entry */\r
+#if FF_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
+ }\r
mode |= FA_CREATE_ALWAYS; /* File is created */\r
}\r
- else { /* Any object is already existing */\r
+ else { /* Any object with the same name is already existing */\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) 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();\r
-#if _FS_EXFAT\r
+ if (res == FR_OK && (mode & FA_CREATE_ALWAYS)) { /* Truncate the file if overwrite mode */\r
+#if FF_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
+ init_alloc_info(fs, &fp->obj);\r
+ /* Set directory entry block initial state */\r
+ mem_set(fs->dirbuf + 2, 0, 30); /* Clear 85 entry except for NumSec */\r
+ mem_set(fs->dirbuf + 38, 0, 26); /* Clear C0 entry except for NumName and NameHash */\r
+ fs->dirbuf[XDIR_Attr] = AM_ARC;\r
+ st_dword(fs->dirbuf + XDIR_CrtTime, GET_FATTIME());\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
+ if (res == FR_OK && fp->obj.sclust != 0) { /* 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
+ /* Set directory entry initial state */\r
+ cl = ld_clust(fs, dj.dir); /* Get current cluster chain */\r
+ st_dword(dj.dir + DIR_CrtTime, GET_FATTIME()); /* Set created 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
+ if (cl != 0) { /* Remove the cluster chain if exist */\r
dw = fs->winsect;\r
res = remove_chain(&dj.obj, cl, 0);\r
if (res == FR_OK) {\r
}\r
}\r
else { /* Open an existing file */\r
- if (res == FR_OK) { /* Following succeeded */\r
- if (dj.obj.attr & AM_DIR) { /* It is a directory */\r
+ if (res == FR_OK) { /* Is the object exsiting? */\r
+ if (dj.obj.attr & AM_DIR) { /* File open against a directory */\r
res = FR_NO_FILE;\r
} else {\r
- if ((mode & FA_WRITE) && (dj.obj.attr & AM_RDO)) { /* R/O violation */\r
+ if ((mode & FA_WRITE) && (dj.obj.attr & AM_RDO)) { /* Write mode open against R/O file */\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_MODIFIED;\r
+ if (mode & FA_CREATE_ALWAYS) mode |= FA_MODIFIED; /* Set file change flag if created or overwritten */\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
+#if FF_FS_LOCK != 0\r
+ fp->obj.lockid = inc_lock(&dj, (mode & ~FA_READ) ? 1 : 0); /* Lock the file for this session */\r
+ if (fp->obj.lockid == 0) res = FR_INT_ERR;\r
#endif\r
}\r
#else /* R/O configuration */\r
if (res == FR_OK) {\r
- if (dj.fn[NSFLAG] & NS_NONAME) { /* Origin directory itself? */\r
+ if (dj.fn[NSFLAG] & NS_NONAME) { /* Is it origin directory itself? */\r
res = FR_INVALID_NAME;\r
} else {\r
- if (dj.obj.attr & AM_DIR) { /* It is a directory */\r
+ if (dj.obj.attr & AM_DIR) { /* Is it a directory? */\r
res = FR_NO_FILE;\r
}\r
}\r
#endif\r
\r
if (res == FR_OK) {\r
-#if _FS_EXFAT\r
+#if FF_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_scl = dj.obj.sclust; /* Get containing directory info */\r
fp->obj.c_size = ((DWORD)dj.obj.objsize & 0xFFFFFF00) | dj.obj.stat;\r
fp->obj.c_ofs = dj.blk_ofs;\r
+ init_alloc_info(fs, &fp->obj);\r
} else\r
#endif\r
{\r
- fp->obj.sclust = ld_clust(fs, dj.dir); /* Get allocation info */\r
+ fp->obj.sclust = ld_clust(fs, dj.dir); /* Get object allocation info */\r
fp->obj.objsize = ld_dword(dj.dir + DIR_FileSize);\r
}\r
-#if _USE_FASTSEEK\r
+#if FF_USE_FASTSEEK\r
fp->cltbl = 0; /* Disable fast seek mode */\r
#endif\r
fp->obj.fs = fs; /* Validate the file object */\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
+#if !FF_FS_READONLY\r
+#if !FF_FS_TINY\r
+ mem_set(fp->buf, 0, FF_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
}\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
+ if ((sc = clst2sect(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
+#if !FF_FS_TINY\r
+ if (disk_read(fs->pdrv, fp->buf, fp->sect, 1) != RES_OK) res = FR_DISK_ERR;\r
#endif\r
}\r
}\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
+ for ( ; btr; /* Repeat until btr bytes read */\r
+ btr -= rcnt, *br += rcnt, rbuff += rcnt, fp->fptr += rcnt) {\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->obj.sclust; /* Follow cluster chain from the origin */\r
} else { /* Middle or end of the file */\r
-#if _USE_FASTSEEK\r
+#if FF_USE_FASTSEEK\r
if (fp->cltbl) {\r
clst = clmt_clust(fp, fp->fptr); /* Get cluster# from the CLMT */\r
} else\r
if (clst == 0xFFFFFFFF) ABORT(fs, FR_DISK_ERR);\r
fp->clust = clst; /* Update current cluster */\r
}\r
- sect = clust2sect(fs, fp->clust); /* Get current sector */\r
- if (!sect) ABORT(fs, FR_INT_ERR);\r
+ sect = clst2sect(fs, fp->clust); /* Get current sector */\r
+ if (sect == 0) ABORT(fs, FR_INT_ERR);\r
sect += csect;\r
cc = btr / SS(fs); /* When remaining bytes >= sector size, */\r
- if (cc) { /* Read maximum contiguous sectors directly */\r
+ if (cc > 0) { /* Read maximum contiguous sectors directly */\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 (disk_read(fs->pdrv, rbuff, sect, cc) != RES_OK) ABORT(fs, FR_DISK_ERR);\r
+#if !FF_FS_READONLY && FF_FS_MINIMIZE <= 2 /* Replace one of the read sectors with cached data if it contains a dirty sector */\r
+#if FF_FS_TINY\r
if (fs->wflag && fs->winsect - sect < cc) {\r
mem_cpy(rbuff + ((fs->winsect - sect) * SS(fs)), fs->win, SS(fs));\r
}\r
rcnt = SS(fs) * cc; /* Number of bytes transferred */\r
continue;\r
}\r
-#if !_FS_TINY\r
+#if !FF_FS_TINY\r
if (fp->sect != sect) { /* Load data sector if not in cache */\r
-#if !_FS_READONLY\r
+#if !FF_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
+ if (disk_write(fs->pdrv, 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); /* Fill sector cache */\r
+ if (disk_read(fs->pdrv, fp->buf, sect, 1) != RES_OK) ABORT(fs, FR_DISK_ERR); /* Fill sector cache */\r
}\r
#endif\r
fp->sect = sect;\r
}\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 FF_FS_TINY\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
\r
\r
\r
-#if !_FS_READONLY\r
+#if !FF_FS_READONLY\r
/*-----------------------------------------------------------------------*/\r
/* Write File */\r
/*-----------------------------------------------------------------------*/\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
- /* 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
+ /* Check fptr wrap-around (file size cannot reach 4 GiB at FAT volume) */\r
+ if ((!FF_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, fp->obj.objsize = (fp->fptr > fp->obj.objsize) ? fp->fptr : fp->obj.objsize, *bw += wcnt, btw -= wcnt) {\r
+ btw -= wcnt, *bw += wcnt, wbuff += wcnt, fp->fptr += wcnt, fp->obj.objsize = (fp->fptr > fp->obj.objsize) ? fp->fptr : fp->obj.objsize) {\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
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 FF_USE_FASTSEEK\r
if (fp->cltbl) {\r
clst = clmt_clust(fp, fp->fptr); /* Get cluster# from the CLMT */\r
} else\r
fp->clust = clst; /* Update current cluster */\r
if (fp->obj.sclust == 0) fp->obj.sclust = clst; /* Set start cluster if the first write */\r
}\r
-#if _FS_TINY\r
+#if FF_FS_TINY\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(fs->drv, fp->buf, fp->sect, 1) != RES_OK) ABORT(fs, FR_DISK_ERR);\r
+ if (disk_write(fs->pdrv, fp->buf, fp->sect, 1) != RES_OK) ABORT(fs, FR_DISK_ERR);\r
fp->flag &= (BYTE)~FA_DIRTY;\r
}\r
#endif\r
- sect = clust2sect(fs, fp->clust); /* Get current sector */\r
- if (!sect) ABORT(fs, FR_INT_ERR);\r
+ sect = clst2sect(fs, fp->clust); /* Get current sector */\r
+ if (sect == 0) ABORT(fs, FR_INT_ERR);\r
sect += csect;\r
cc = btw / SS(fs); /* When remaining bytes >= sector size, */\r
- if (cc) { /* Write maximum contiguous sectors directly */\r
+ if (cc > 0) { /* Write maximum contiguous sectors directly */\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 (disk_write(fs->pdrv, wbuff, sect, cc) != RES_OK) ABORT(fs, FR_DISK_ERR);\r
+#if FF_FS_MINIMIZE <= 2\r
+#if FF_FS_TINY\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
wcnt = SS(fs) * cc; /* Number of bytes transferred */\r
continue;\r
}\r
-#if _FS_TINY\r
+#if FF_FS_TINY\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
#else\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
+ disk_read(fs->pdrv, fp->buf, sect, 1) != RES_OK) {\r
ABORT(fs, FR_DISK_ERR);\r
}\r
#endif\r
}\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 FF_FS_TINY\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
FATFS *fs;\r
DWORD tm;\r
BYTE *dir;\r
- DEF_NAMBUF\r
\r
\r
res = validate(&fp->obj, &fs); /* Check validity of the file object */\r
if (res == FR_OK) {\r
if (fp->flag & FA_MODIFIED) { /* Is there any change to the file? */\r
-#if !_FS_TINY\r
+#if !FF_FS_TINY\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
+ if (disk_write(fs->pdrv, 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
tm = GET_FATTIME(); /* Modified time */\r
-#if _FS_EXFAT\r
+#if FF_FS_EXFAT\r
if (fs->fs_type == FS_EXFAT) {\r
- res = fill_fat_chain(&fp->obj); /* Create FAT chain if needed */\r
+ res = fill_first_frag(&fp->obj); /* Fill first fragment on the FAT if needed */\r
+ if (res == FR_OK) {\r
+ res = fill_last_frag(&fp->obj, fp->clust, 0xFFFFFFFF); /* Fill last fragment on the FAT if needed */\r
+ }\r
if (res == FR_OK) {\r
DIR dj;\r
+ DEF_NAMBUF\r
\r
INIT_NAMBUF(fs);\r
- res = load_obj_dir(&dj, &fp->obj); /* Load directory entry block */\r
+ res = load_obj_xdir(&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
+ fs->dirbuf[XDIR_Attr] |= AM_ARC; /* Set archive attribute to indicate that the file has been changed */\r
+ fs->dirbuf[XDIR_GenFlags] = fp->obj.stat | 1; /* Update file allocation information */\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
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
+ dir[DIR_Attr] |= AM_ARC; /* Set archive attribute to indicate that the file has been changed */\r
+ st_clust(fp->obj.fs, dir, fp->obj.sclust); /* Update file allocation information */\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
LEAVE_FF(fs, res);\r
}\r
\r
-#endif /* !_FS_READONLY */\r
+#endif /* !FF_FS_READONLY */\r
\r
\r
\r
FRESULT res;\r
FATFS *fs;\r
\r
-#if !_FS_READONLY\r
+#if !FF_FS_READONLY\r
res = f_sync(fp); /* Flush cached data */\r
if (res == FR_OK)\r
#endif\r
{\r
res = validate(&fp->obj, &fs); /* Lock volume */\r
if (res == FR_OK) {\r
-#if _FS_LOCK != 0\r
- res = dec_lock(fp->obj.lockid); /* Decrement file open counter */\r
- if (res == FR_OK)\r
+#if FF_FS_LOCK != 0\r
+ res = dec_lock(fp->obj.lockid); /* Decrement file open counter */\r
+ if (res == FR_OK) fp->obj.fs = 0; /* Invalidate file object */\r
+#else\r
+ fp->obj.fs = 0; /* Invalidate file object */\r
#endif\r
- {\r
- fp->obj.fs = 0; /* Invalidate file object */\r
- }\r
-#if _FS_REENTRANT\r
+#if FF_FS_REENTRANT\r
unlock_fs(fs, FR_OK); /* Unlock volume */\r
#endif\r
}\r
\r
\r
\r
-#if _FS_RPATH >= 1\r
+#if FF_FS_RPATH >= 1\r
/*-----------------------------------------------------------------------*/\r
/* Change Current Directory or Current Drive, Get Current Directory */\r
/*-----------------------------------------------------------------------*/\r
\r
-#if _VOLUMES >= 2\r
FRESULT f_chdrive (\r
- const TCHAR* path /* Drive number */\r
+ const TCHAR* path /* Drive number to set */\r
)\r
{\r
int vol;\r
/* Get logical drive number */\r
vol = get_ldnumber(&path);\r
if (vol < 0) return FR_INVALID_DRIVE;\r
-\r
CurrVol = (BYTE)vol; /* Set it as current volume */\r
\r
return FR_OK;\r
}\r
-#endif\r
+\r
\r
\r
FRESULT f_chdir (\r
const TCHAR* path /* Pointer to the directory path */\r
)\r
{\r
+#if FF_STR_VOLUME_ID == 2\r
+ UINT i;\r
+#endif\r
FRESULT res;\r
DIR dj;\r
FATFS *fs;\r
DEF_NAMBUF\r
\r
+\r
/* Get logical drive */\r
res = find_volume(&path, &fs, 0);\r
if (res == FR_OK) {\r
INIT_NAMBUF(fs);\r
res = follow_path(&dj, path); /* Follow the path */\r
if (res == FR_OK) { /* Follow completed */\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 (dj.fn[NSFLAG] & NS_NONAME) { /* Is it the start directory itself? */\r
+ fs->cdir = dj.obj.sclust;\r
+#if FF_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
#endif\r
} else {\r
if (dj.obj.attr & AM_DIR) { /* It is a sub-directory */\r
-#if _FS_EXFAT\r
+#if FF_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
}\r
FREE_NAMBUF();\r
if (res == FR_NO_FILE) res = FR_NO_PATH;\r
+#if FF_STR_VOLUME_ID == 2 /* Also current drive is changed at Unix style volume ID */\r
+ if (res == FR_OK) {\r
+ for (i = FF_VOLUMES - 1; i && fs != FatFs[i]; i--) ; /* Set current drive */\r
+ CurrVol = (BYTE)i;\r
+ }\r
+#endif\r
}\r
\r
LEAVE_FF(fs, res);\r
}\r
\r
\r
-#if _FS_RPATH >= 2\r
+#if FF_FS_RPATH >= 2\r
FRESULT f_getcwd (\r
TCHAR* buff, /* Pointer to the directory path */\r
- UINT len /* Size of path */\r
+ UINT len /* Size of buff in unit of TCHAR */\r
)\r
{\r
FRESULT res;\r
FATFS *fs;\r
UINT i, n;\r
DWORD ccl;\r
- TCHAR *tp;\r
+ TCHAR *tp = buff;\r
+#if FF_VOLUMES >= 2\r
+ UINT vl;\r
+#endif\r
+#if FF_STR_VOLUME_ID\r
+ const char *vp;\r
+#endif\r
FILINFO fno;\r
DEF_NAMBUF\r
\r
\r
- *buff = 0;\r
/* Get logical drive */\r
res = find_volume((const TCHAR**)&buff, &fs, 0); /* Get current volume */\r
if (res == FR_OK) {\r
dj.obj.fs = fs;\r
INIT_NAMBUF(fs);\r
+\r
+ /* Follow parent directories and create the path */\r
i = len; /* Bottom of buffer (directory stack base) */\r
- if (!_FS_EXFAT || fs->fs_type != FS_EXFAT) { /* (Cannot do getcwd on exFAT and returns root path) */\r
+ if (!FF_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
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
+ res = dir_read_file(&dj);\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
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
+ for (n = 0; fno.fname[n]; n++) ; /* Name length */\r
+ if (i < n + 1) { /* Insufficient space to store the path name? */\r
res = FR_NOT_ENOUGH_CORE; break;\r
}\r
- while (n) buff[--i] = fno.fname[--n];\r
+ while (n) buff[--i] = fno.fname[--n]; /* Stack the name */\r
buff[--i] = '/';\r
}\r
}\r
- tp = buff;\r
if (res == FR_OK) {\r
-#if _VOLUMES >= 2\r
- *tp++ = '0' + CurrVol; /* Put drive number */\r
- *tp++ = ':';\r
-#endif\r
- if (i == len) { /* Root-directory */\r
- *tp++ = '/';\r
- } else { /* Sub-directroy */\r
- do /* Add stacked path str */\r
- *tp++ = buff[i++];\r
- while (i < len);\r
+ if (i == len) buff[--i] = '/'; /* Is it the root-directory? */\r
+#if FF_VOLUMES >= 2 /* Put drive prefix */\r
+ vl = 0;\r
+#if FF_STR_VOLUME_ID >= 1 /* String volume ID */\r
+ for (n = 0, vp = (const char*)VolumeStr[CurrVol]; vp[n]; n++) ;\r
+ if (i >= n + 2) {\r
+ if (FF_STR_VOLUME_ID == 2) *tp++ = (TCHAR)'/';\r
+ for (vl = 0; vl < n; *tp++ = (TCHAR)vp[vl], vl++) ;\r
+ if (FF_STR_VOLUME_ID == 1) *tp++ = (TCHAR)':';\r
+ vl++;\r
+ }\r
+#else /* Numeric volume ID */\r
+ if (i >= 3) {\r
+ *tp++ = (TCHAR)'0' + CurrVol;\r
+ *tp++ = (TCHAR)':';\r
+ vl = 2;\r
+ }\r
+#endif\r
+ if (vl == 0) res = FR_NOT_ENOUGH_CORE;\r
+#endif\r
+ /* Add current directory path */\r
+ if (res == FR_OK) {\r
+ do *tp++ = buff[i++]; while (i < len); /* Copy stacked path string */\r
}\r
}\r
- *tp = 0;\r
FREE_NAMBUF();\r
}\r
\r
+ *tp = 0;\r
LEAVE_FF(fs, res);\r
}\r
\r
-#endif /* _FS_RPATH >= 2 */\r
-#endif /* _FS_RPATH >= 1 */\r
+#endif /* FF_FS_RPATH >= 2 */\r
+#endif /* FF_FS_RPATH >= 1 */\r
\r
\r
\r
-#if _FS_MINIMIZE <= 2\r
+#if FF_FS_MINIMIZE <= 2\r
/*-----------------------------------------------------------------------*/\r
-/* Seek File R/W Pointer */\r
+/* Seek File Read/Write Pointer */\r
/*-----------------------------------------------------------------------*/\r
\r
FRESULT f_lseek (\r
FATFS *fs;\r
DWORD clst, bcs, nsect;\r
FSIZE_t ifptr;\r
-#if _USE_FASTSEEK\r
+#if FF_USE_FASTSEEK\r
DWORD cl, pcl, ncl, tcl, dsc, tlen, ulen, *tbl;\r
#endif\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 (res == FR_OK) res = (FRESULT)fp->err;\r
+#if FF_FS_EXFAT && !FF_FS_READONLY\r
+ if (res == FR_OK && fs->fs_type == FS_EXFAT) {\r
+ res = fill_last_frag(&fp->obj, fp->clust, 0xFFFFFFFF); /* Fill last fragment on the FAT if needed */\r
+ }\r
+#endif\r
+ if (res != FR_OK) LEAVE_FF(fs, res);\r
+\r
+#if FF_USE_FASTSEEK\r
if (fp->cltbl) { /* Fast seek */\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->obj.sclust; /* Origin of the chain */\r
- if (cl) {\r
+ if (cl != 0) {\r
do {\r
/* Get a fragment */\r
tcl = cl; ncl = 0; ulen += 2; /* Top, length and used items */\r
} else { /* Fast seek */\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
+ if (ofs > 0) {\r
fp->clust = clmt_clust(fp, ofs - 1);\r
- dsc = clust2sect(fs, fp->clust);\r
- if (!dsc) ABORT(fs, FR_INT_ERR);\r
+ dsc = clst2sect(fs, fp->clust);\r
+ if (dsc == 0) 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 !FF_FS_TINY\r
+#if !FF_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
+ if (disk_write(fs->pdrv, 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, dsc, 1) != RES_OK) ABORT(fs, FR_DISK_ERR); /* Load current sector */\r
+ if (disk_read(fs->pdrv, fp->buf, dsc, 1) != RES_OK) ABORT(fs, FR_DISK_ERR); /* Load current sector */\r
#endif\r
fp->sect = dsc;\r
}\r
\r
/* Normal Seek */\r
{\r
-#if _FS_EXFAT\r
- if (fs->fs_type != FS_EXFAT && ofs >= 0x100000000) ofs = 0xFFFFFFFF; /* Clip at 4GiB-1 if at FATxx */\r
+#if FF_FS_EXFAT\r
+ if (fs->fs_type != FS_EXFAT && ofs >= 0x100000000) ofs = 0xFFFFFFFF; /* Clip at 4 GiB - 1 if at FATxx */\r
#endif\r
- if (ofs > fp->obj.objsize && (_FS_READONLY || !(fp->flag & FA_WRITE))) { /* In read-only mode, clip offset with the file size */\r
+ if (ofs > fp->obj.objsize && (FF_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
+ if (ofs > 0) {\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
clst = fp->clust;\r
} else { /* When seek to back cluster, */\r
clst = fp->obj.sclust; /* start from the first cluster */\r
-#if !_FS_READONLY\r
+#if !FF_FS_READONLY\r
if (clst == 0) { /* If no cluster chain, create a new chain */\r
clst = create_chain(&fp->obj, 0);\r
if (clst == 1) ABORT(fs, FR_INT_ERR);\r
if (clst != 0) {\r
while (ofs > bcs) { /* Cluster following loop */\r
ofs -= bcs; fp->fptr += bcs;\r
-#if !_FS_READONLY\r
+#if !FF_FS_READONLY\r
if (fp->flag & FA_WRITE) { /* Check if in write mode or not */\r
- if (_FS_EXFAT && fp->fptr > fp->obj.objsize) { /* No FAT chain object needs correct objsize to generate FAT value */\r
+ if (FF_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
}\r
fp->fptr += ofs;\r
if (ofs % SS(fs)) {\r
- nsect = clust2sect(fs, clst); /* Current sector */\r
- if (!nsect) ABORT(fs, FR_INT_ERR);\r
+ nsect = clst2sect(fs, clst); /* Current sector */\r
+ if (nsect == 0) ABORT(fs, FR_INT_ERR);\r
nsect += (DWORD)(ofs / SS(fs));\r
}\r
}\r
}\r
- if (!_FS_READONLY && fp->fptr > fp->obj.objsize) { /* Set file change flag if the file size is extended */\r
+ if (!FF_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 !FF_FS_TINY\r
+#if !FF_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
+ if (disk_write(fs->pdrv, 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, nsect, 1) != RES_OK) ABORT(fs, FR_DISK_ERR); /* Fill sector cache */\r
+ if (disk_read(fs->pdrv, fp->buf, nsect, 1) != RES_OK) ABORT(fs, FR_DISK_ERR); /* Fill sector cache */\r
#endif\r
fp->sect = nsect;\r
}\r
\r
\r
\r
-#if _FS_MINIMIZE <= 1\r
+#if FF_FS_MINIMIZE <= 1\r
/*-----------------------------------------------------------------------*/\r
/* Create a Directory Object */\r
/*-----------------------------------------------------------------------*/\r
{\r
FRESULT res;\r
FATFS *fs;\r
- _FDID *obj;\r
DEF_NAMBUF\r
\r
\r
if (!dp) return FR_INVALID_OBJECT;\r
\r
/* Get logical drive */\r
- obj = &dp->obj;\r
res = find_volume(&path, &fs, 0);\r
if (res == FR_OK) {\r
- obj->fs = fs;\r
+ dp->obj.fs = fs;\r
INIT_NAMBUF(fs);\r
res = follow_path(dp, path); /* Follow the path to the directory */\r
if (res == FR_OK) { /* Follow completed */\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 (dp->obj.attr & AM_DIR) { /* This object is a sub-directory */\r
+#if FF_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
+ dp->obj.c_scl = dp->obj.sclust; /* Get containing directory inforamation */\r
+ dp->obj.c_size = ((DWORD)dp->obj.objsize & 0xFFFFFF00) | dp->obj.stat;\r
+ dp->obj.c_ofs = dp->blk_ofs;\r
+ init_alloc_info(fs, &dp->obj); /* Get object allocation info */\r
} else\r
#endif\r
{\r
- obj->sclust = ld_clust(fs, dp->dir); /* Get object location */\r
+ dp->obj.sclust = ld_clust(fs, dp->dir); /* Get object allocation info */\r
}\r
} else { /* This object is a file */\r
res = FR_NO_PATH;\r
}\r
}\r
if (res == FR_OK) {\r
- obj->id = fs->id;\r
+ dp->obj.id = fs->id;\r
res = dir_sdi(dp, 0); /* Rewind directory */\r
-#if _FS_LOCK != 0\r
+#if FF_FS_LOCK != 0\r
if (res == FR_OK) {\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
+ if (dp->obj.sclust != 0) {\r
+ dp->obj.lockid = inc_lock(dp, 0); /* Lock the sub directory */\r
+ if (!dp->obj.lockid) res = FR_TOO_MANY_OPEN_FILES;\r
} else {\r
- obj->lockid = 0; /* Root directory need not to be locked */\r
+ dp->obj.lockid = 0; /* Root directory need not to be locked */\r
}\r
}\r
#endif\r
FREE_NAMBUF();\r
if (res == FR_NO_FILE) res = FR_NO_PATH;\r
}\r
- if (res != FR_OK) obj->fs = 0; /* Invalidate the directory object if function faild */\r
+ if (res != FR_OK) dp->obj.fs = 0; /* Invalidate the directory object if function faild */\r
\r
LEAVE_FF(fs, res);\r
}\r
FATFS *fs;\r
\r
\r
- res = validate(&dp->obj, &fs); /* Check validity of the file object */\r
+ res = validate(&dp->obj, &fs); /* Check validity of the file object */\r
if (res == FR_OK) {\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
+#if FF_FS_LOCK != 0\r
+ if (dp->obj.lockid) res = dec_lock(dp->obj.lockid); /* Decrement sub-directory open counter */\r
+ if (res == FR_OK) dp->obj.fs = 0; /* Invalidate directory object */\r
+#else\r
+ dp->obj.fs = 0; /* Invalidate directory object */\r
#endif\r
- {\r
- dp->obj.fs = 0; /* Invalidate directory object */\r
- }\r
-#if _FS_REENTRANT\r
+#if FF_FS_REENTRANT\r
unlock_fs(fs, FR_OK); /* Unlock volume */\r
#endif\r
}\r
res = dir_sdi(dp, 0); /* Rewind the directory object */\r
} else {\r
INIT_NAMBUF(fs);\r
- res = dir_read(dp, 0); /* Read an item */\r
+ res = dir_read_file(dp); /* Read an item */\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
\r
\r
\r
-#if _USE_FIND\r
+#if FF_USE_FIND\r
/*-----------------------------------------------------------------------*/\r
/* Find Next File */\r
/*-----------------------------------------------------------------------*/\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 FF_USE_LFN && FF_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
-#endif /* _USE_FIND */\r
+#endif /* FF_USE_FIND */\r
\r
\r
\r
-#if _FS_MINIMIZE == 0\r
+#if FF_FS_MINIMIZE == 0\r
/*-----------------------------------------------------------------------*/\r
/* Get File Status */\r
/*-----------------------------------------------------------------------*/\r
\r
\r
\r
-#if !_FS_READONLY\r
+#if !FF_FS_READONLY\r
/*-----------------------------------------------------------------------*/\r
/* Get Number of Free Clusters */\r
/*-----------------------------------------------------------------------*/\r
\r
FRESULT f_getfree (\r
- const TCHAR* path, /* Path name of the logical drive number */\r
+ const TCHAR* path, /* Logical drive number */\r
DWORD* nclst, /* Pointer to a variable to return number of free clusters */\r
- FATFS** fatfs /* Pointer to return pointer to corresponding file system object */\r
+ FATFS** fatfs /* Pointer to return pointer to corresponding filesystem object */\r
)\r
{\r
FRESULT res;\r
FATFS *fs;\r
DWORD nfree, clst, sect, stat;\r
UINT i;\r
- BYTE *p;\r
- _FDID obj;\r
+ FFOBJID obj;\r
\r
\r
/* Get logical drive */\r
res = find_volume(&path, &fs, 0);\r
if (res == FR_OK) {\r
*fatfs = fs; /* Return ptr to the fs object */\r
- /* If free_clst is valid, return it without full cluster scan */\r
+ /* If free_clst is valid, return it without full FAT scan */\r
if (fs->free_clst <= fs->n_fatent - 2) {\r
*nclst = fs->free_clst;\r
} else {\r
- /* Get number of free clusters */\r
+ /* Scan FAT to obtain number of free clusters */\r
nfree = 0;\r
- if (fs->fs_type == FS_FAT12) { /* FAT12: Sector unalighed FAT entries */\r
+ if (fs->fs_type == FS_FAT12) { /* FAT12: Scan bit field FAT entries */\r
clst = 2; obj.fs = fs;\r
do {\r
stat = get_fat(&obj, clst);\r
if (stat == 0) nfree++;\r
} while (++clst < fs->n_fatent);\r
} else {\r
-#if _FS_EXFAT\r
- if (fs->fs_type == FS_EXFAT) { /* exFAT: Scan bitmap table */\r
+#if FF_FS_EXFAT\r
+ if (fs->fs_type == FS_EXFAT) { /* exFAT: Scan allocation bitmap */\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
+ clst = fs->n_fatent - 2; /* Number of clusters */\r
+ sect = fs->database; /* Assuming bitmap starts at cluster 2 */\r
+ i = 0; /* Offset in the sector */\r
+ do { /* Counts numbuer of bits with zero in the bitmap */\r
+ if (i == 0) {\r
+ res = move_window(fs, sect++);\r
+ if (res != FR_OK) break;\r
+ }\r
for (b = 8, bm = fs->win[i]; b && clst; b--, clst--) {\r
if (!(bm & 1)) nfree++;\r
bm >>= 1;\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
+ { /* FAT16/32: Scan WORD/DWORD FAT entries */\r
+ clst = fs->n_fatent; /* Number of entries */\r
+ sect = fs->fatbase; /* Top of the FAT */\r
+ i = 0; /* Offset in the sector */\r
+ do { /* Counts numbuer of entries with zero in the FAT */\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
+ if (ld_word(fs->win + i) == 0) nfree++;\r
+ i += 2;\r
} else {\r
- if ((ld_dword(p) & 0x0FFFFFFF) == 0) nfree++;\r
- p += 4; i -= 4;\r
+ if ((ld_dword(fs->win + i) & 0x0FFFFFFF) == 0) nfree++;\r
+ i += 4;\r
}\r
+ i %= SS(fs);\r
} while (--clst);\r
}\r
}\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
+ fs->fsi_flag |= 1; /* FAT32: FSInfo is to be updated */\r
}\r
}\r
\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 < fp->obj.objsize) { /* Process when fptr is not on the eof */\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
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->obj.objsize = fp->fptr; /* Set file size to current read/write point */\r
fp->flag |= FA_MODIFIED;\r
-#if !_FS_TINY\r
+#if !FF_FS_TINY\r
if (res == FR_OK && (fp->flag & FA_DIRTY)) {\r
- if (disk_write(fs->drv, fp->buf, fp->sect, 1) != RES_OK) {\r
+ if (disk_write(fs->pdrv, fp->buf, fp->sect, 1) != RES_OK) {\r
res = FR_DISK_ERR;\r
} else {\r
fp->flag &= (BYTE)~FA_DIRTY;\r
DIR dj, sdj;\r
DWORD dclst = 0;\r
FATFS *fs;\r
-#if _FS_EXFAT\r
- _FDID obj;\r
+#if FF_FS_EXFAT\r
+ FFOBJID obj;\r
#endif\r
DEF_NAMBUF\r
\r
\r
/* Get logical drive */\r
res = find_volume(&path, &fs, FA_WRITE);\r
- dj.obj.fs = fs;\r
if (res == FR_OK) {\r
+ dj.obj.fs = fs;\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 (FF_FS_RPATH && res == FR_OK && (dj.fn[NSFLAG] & NS_DOT)) {\r
res = FR_INVALID_NAME; /* Cannot remove dot entry */\r
}\r
-#if _FS_LOCK != 0\r
+#if FF_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
}\r
}\r
if (res == FR_OK) {\r
-#if _FS_EXFAT\r
+#if FF_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
+ init_alloc_info(fs, &obj);\r
+ dclst = obj.sclust;\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
+ if (dj.obj.attr & AM_DIR) { /* Is it a sub-directory? */\r
+#if FF_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.fs = fs; /* Open the sub-directory */\r
sdj.obj.sclust = dclst;\r
-#if _FS_EXFAT\r
+#if FF_FS_EXFAT\r
if (fs->fs_type == FS_EXFAT) {\r
sdj.obj.objsize = obj.objsize;\r
sdj.obj.stat = obj.stat;\r
#endif\r
res = dir_sdi(&sdj, 0);\r
if (res == FR_OK) {\r
- res = dir_read(&sdj, 0); /* Read an item */\r
+ res = dir_read_file(&sdj); /* Test if the directory is empty */\r
if (res == FR_OK) res = FR_DENIED; /* Not empty? */\r
if (res == FR_NO_FILE) res = FR_OK; /* Empty? */\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
-#if _FS_EXFAT\r
+ if (res == FR_OK && dclst != 0) { /* Remove the cluster chain if exist */\r
+#if FF_FS_EXFAT\r
res = remove_chain(&obj, dclst, 0);\r
#else\r
res = remove_chain(&dj.obj, dclst, 0);\r
DIR dj;\r
FATFS *fs;\r
BYTE *dir;\r
- UINT n;\r
- DWORD dsc, dcl, pcl, tm;\r
+ DWORD dcl, pcl, tm;\r
DEF_NAMBUF\r
\r
\r
/* Get logical drive */\r
res = find_volume(&path, &fs, FA_WRITE);\r
- dj.obj.fs = fs;\r
if (res == FR_OK) {\r
+ dj.obj.fs = fs;\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 (FF_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
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(fs, dcl);\r
- dir = fs->win;\r
- mem_set(dir, 0, SS(fs));\r
- if (!_FS_EXFAT || fs->fs_type != FS_EXFAT) {\r
+ res = dir_clear(fs, dcl); /* Clean up the new table */\r
+ if (res == FR_OK && (!FF_FS_EXFAT || fs->fs_type != FS_EXFAT)) { /* Create dot entries (FAT only) */\r
+ dir = fs->win;\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
+ 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(fs));\r
}\r
}\r
- if (res == FR_OK) res = dir_register(&dj); /* Register the object to the directoy */\r
if (res == FR_OK) {\r
-#if _FS_EXFAT\r
+ res = dir_register(&dj); /* Register the object to the directoy */\r
+ }\r
+ if (res == FR_OK) {\r
+#if FF_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_GenFlags] = 3; /* Initialize the object flag */\r
fs->dirbuf[XDIR_Attr] = AM_DIR; /* Attribute */\r
res = store_xdir(&dj);\r
} else\r
dir[DIR_Attr] = AM_DIR; /* Attribute */\r
fs->wflag = 1;\r
}\r
- if (res == FR_OK) res = sync_fs(fs);\r
+ if (res == FR_OK) {\r
+ res = sync_fs(fs);\r
+ }\r
} else {\r
remove_chain(&dj.obj, dcl, 0); /* Could not register, remove cluster chain */\r
}\r
FRESULT res;\r
DIR djo, djn;\r
FATFS *fs;\r
- BYTE buf[_FS_EXFAT ? SZDIRE * 2 : 24], *dir;\r
+ BYTE buf[FF_FS_EXFAT ? SZDIRE * 2 : SZDIRE], *dir;\r
DWORD dw;\r
DEF_NAMBUF\r
\r
\r
- get_ldnumber(&path_new); /* Ignore drive number of new name */\r
+ get_ldnumber(&path_new); /* Snip the drive number of new name off */\r
res = find_volume(&path_old, &fs, FA_WRITE); /* Get logical drive of the old object */\r
if (res == FR_OK) {\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
+#if FF_FS_LOCK != 0\r
+ if (res == FR_OK) {\r
+ res = chk_lock(&djo, 2);\r
+ }\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
+#if FF_FS_EXFAT\r
+ if (fs->fs_type == FS_EXFAT) { /* At exFAT volume */\r
BYTE nf, nn;\r
WORD nh;\r
\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
+ mem_cpy(fs->dirbuf, buf, SZDIRE * 2); /* Restore 85+C0 entry */\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
+ if (!(fs->dirbuf[XDIR_Attr] & AM_DIR)) fs->dirbuf[XDIR_Attr] |= AM_ARC; /* Set archive attribute if it is a file */\r
+/* Start of critical section where an 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
+ { /* At FAT/FAT32 volume */\r
+ mem_cpy(buf, djo.dir, SZDIRE); /* Save directory entry of the object */\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
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
+ dir = djn.dir; /* Copy directory entry of the object except name */\r
+ mem_cpy(dir + 13, buf + 13, SZDIRE - 13);\r
+ dir[DIR_Attr] = buf[DIR_Attr];\r
+ if (!(dir[DIR_Attr] & AM_DIR)) dir[DIR_Attr] |= AM_ARC; /* Set archive attribute if it is a file */\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
+ dw = clst2sect(fs, ld_clust(fs, dir));\r
+ if (dw == 0) {\r
res = FR_INT_ERR;\r
} else {\r
-/* Start of critical section where any interruption can cause a cross-link */\r
+/* Start of critical section where an 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
res = sync_fs(fs);\r
}\r
}\r
-/* End of critical section */\r
+/* End of the critical section */\r
}\r
FREE_NAMBUF();\r
}\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 /* !FF_FS_READONLY */\r
+#endif /* FF_FS_MINIMIZE == 0 */\r
+#endif /* FF_FS_MINIMIZE <= 1 */\r
+#endif /* FF_FS_MINIMIZE <= 2 */\r
\r
\r
\r
-#if _USE_CHMOD && !_FS_READONLY\r
+#if FF_USE_CHMOD && !FF_FS_READONLY\r
/*-----------------------------------------------------------------------*/\r
/* Change Attribute */\r
/*-----------------------------------------------------------------------*/\r
\r
\r
res = find_volume(&path, &fs, FA_WRITE); /* Get logical drive */\r
- dj.obj.fs = fs;\r
if (res == FR_OK) {\r
+ dj.obj.fs = fs;\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 FF_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
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
+ if (res == FR_OK) {\r
+ res = sync_fs(fs);\r
+ }\r
}\r
FREE_NAMBUF();\r
}\r
\r
FRESULT f_utime (\r
const TCHAR* path, /* Pointer to the file/directory name */\r
- const FILINFO* fno /* Pointer to the time stamp to be set */\r
+ const FILINFO* fno /* Pointer to the timestamp to be set */\r
)\r
{\r
FRESULT res;\r
\r
\r
res = find_volume(&path, &fs, FA_WRITE); /* Get logical drive */\r
- dj.obj.fs = fs;\r
if (res == FR_OK) {\r
+ dj.obj.fs = fs;\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
-#if _FS_EXFAT\r
+#if FF_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
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
+ if (res == FR_OK) {\r
+ res = sync_fs(fs);\r
+ }\r
}\r
FREE_NAMBUF();\r
}\r
LEAVE_FF(fs, res);\r
}\r
\r
-#endif /* _USE_CHMOD && !_FS_READONLY */\r
+#endif /* FF_USE_CHMOD && !FF_FS_READONLY */\r
\r
\r
\r
-#if _USE_LABEL\r
+#if FF_USE_LABEL\r
/*-----------------------------------------------------------------------*/\r
/* Get Volume Label */\r
/*-----------------------------------------------------------------------*/\r
\r
FRESULT f_getlabel (\r
- const TCHAR* path, /* Path name of the logical drive number */\r
- TCHAR* label, /* Pointer to a buffer to return the volume label */\r
- DWORD* vsn /* Pointer to a variable to return the volume serial number */\r
+ const TCHAR* path, /* Logical drive number */\r
+ TCHAR* label, /* Buffer to store the volume label */\r
+ DWORD* vsn /* Variable to store the volume serial number */\r
)\r
{\r
FRESULT res;\r
DIR dj;\r
FATFS *fs;\r
UINT si, di;\r
-#if _LFN_UNICODE || _FS_EXFAT\r
- WCHAR w;\r
-#endif\r
+ WCHAR wc;\r
\r
/* Get logical drive */\r
res = find_volume(&path, &fs, 0);\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); /* Find a volume label entry */\r
+ res = dir_read_label(&dj); /* Find a volume label entry */\r
if (res == FR_OK) {\r
-#if _FS_EXFAT\r
+#if FF_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
- 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
+ WCHAR hs;\r
+\r
+ for (si = di = hs = 0; si < dj.dir[XDIR_NumLabel]; si++) { /* Extract volume label from 83 entry */\r
+ wc = ld_word(dj.dir + XDIR_Label + si * 2);\r
+ if (hs == 0 && IsSurrogate(wc)) { /* Is the code a surrogate? */\r
+ hs = wc; continue;\r
+ }\r
+ wc = put_utf((DWORD)hs << 16 | wc, &label[di], 4);\r
+ if (wc == 0) { di = 0; break; }\r
+ di += wc;\r
+ hs = 0;\r
}\r
+ if (hs != 0) di = 0; /* Broken surrogate pair? */\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
+ si = di = 0; /* Extract volume label from AM_VOL entry */\r
+ while (si < 11) {\r
+ wc = dj.dir[si++];\r
+#if FF_USE_LFN && FF_LFN_UNICODE >= 1 /* Unicode output */\r
+ if (dbc_1st((BYTE)wc) && si < 11) wc = wc << 8 | dj.dir[si++]; /* Is it a DBC? */\r
+ wc = ff_oem2uni(wc, CODEPAGE); /* Convert it into Unicode */\r
+ if (wc != 0) wc = put_utf(wc, &label[di], 4); /* Put it in Unicode */\r
+ if (wc == 0) { di = 0; break; }\r
+ di += wc;\r
+#else /* ANSI/OEM output */\r
+ label[di++] = (TCHAR)wc;\r
#endif\r
- } while (di < 11);\r
+ }\r
do { /* Truncate trailing spaces */\r
label[di] = 0;\r
if (di == 0) break;\r
res = move_window(fs, fs->volbase);\r
if (res == FR_OK) {\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
+ case FS_EXFAT:\r
+ di = BPB_VolIDEx; break;\r
+\r
+ case FS_FAT32:\r
+ di = BS_VolID32; break;\r
+\r
+ default:\r
+ di = BS_VolID;\r
}\r
*vsn = ld_dword(fs->win + di);\r
}\r
\r
\r
\r
-#if !_FS_READONLY\r
+#if !FF_FS_READONLY\r
/*-----------------------------------------------------------------------*/\r
/* Set Volume Label */\r
/*-----------------------------------------------------------------------*/\r
\r
FRESULT f_setlabel (\r
- const TCHAR* label /* Pointer to the volume label to set */\r
+ const TCHAR* label /* Volume label to set with heading logical drive number */\r
)\r
{\r
FRESULT res;\r
DIR dj;\r
FATFS *fs;\r
BYTE dirvn[22];\r
- UINT i, j, slen;\r
- WCHAR w;\r
- static const char badchr[] = "\"*+,.:;<=>\?[]|\x7F";\r
-\r
+ UINT di;\r
+ WCHAR wc;\r
+ static const char badchr[] = "+.,;=[]/\\\"*:<>\?|\x7F"; /* [0..] for FAT, [7..] for exFAT */\r
+#if FF_USE_LFN\r
+ DWORD dc;\r
+#endif\r
\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 FF_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
+ mem_set(dirvn, 0, 22);\r
+ di = 0;\r
+ while ((UINT)*label >= ' ') { /* Create volume label */\r
+ dc = tchar2uni(&label); /* Get a Unicode character */\r
+ if (dc >= 0x10000) {\r
+ if (dc == 0xFFFFFFFF || di >= 10) { /* Wrong surrogate or buffer overflow */\r
+ dc = 0;\r
+ } else {\r
+ st_word(dirvn + di * 2, (WCHAR)(dc >> 16)); di++;\r
+ }\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
+ if (dc == 0 || chk_chr(badchr + 7, (int)dc) || di >= 11) { /* Check validity of the volume label */\r
LEAVE_FF(fs, FR_INVALID_NAME);\r
}\r
- st_word(dirvn + j, w); j += 2;\r
+ st_word(dirvn + di * 2, (WCHAR)dc); di++;\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 < 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
-#ifdef _EXCVT\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
-#endif\r
-#endif\r
-#endif\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
+ { /* On the FAT/FAT32 volume */\r
+ mem_set(dirvn, ' ', 11);\r
+ di = 0;\r
+ while ((UINT)*label >= ' ') { /* Create volume label */\r
+#if FF_USE_LFN\r
+ dc = tchar2uni(&label);\r
+ wc = (dc < 0x10000) ? ff_uni2oem(ff_wtoupper(dc), CODEPAGE) : 0;\r
+#else /* ANSI/OEM input */\r
+ wc = (BYTE)*label++;\r
+ if (dbc_1st((BYTE)wc)) wc = dbc_2nd((BYTE)*label) ? wc << 8 | (BYTE)*label++ : 0;\r
+ if (IsLower(wc)) wc -= 0x20; /* To upper ASCII characters */\r
+#if FF_CODE_PAGE == 0\r
+ if (ExCvt && wc >= 0x80) wc = ExCvt[wc - 0x80]; /* To upper extended characters (SBCS cfg) */\r
+#elif FF_CODE_PAGE < 900\r
+ if (wc >= 0x80) wc = ExCvt[wc - 0x80]; /* To upper extended characters (SBCS cfg) */\r
+#endif\r
+#endif\r
+ if (wc == 0 || chk_chr(badchr + 0, (int)wc) || di >= (UINT)((wc >= 0x100) ? 10 : 11)) { /* Reject invalid characters for volume label */\r
+ LEAVE_FF(fs, FR_INVALID_NAME);\r
+ }\r
+ if (wc >= 0x100) dirvn[di++] = (BYTE)(wc >> 8);\r
+ dirvn[di++] = (BYTE)wc;\r
}\r
+ if (dirvn[0] == DDEM) LEAVE_FF(fs, FR_INVALID_NAME); /* Reject illegal name (heading DDEM) */\r
+ while (di && dirvn[di - 1] == ' ') di--; /* Snip trailing spaces */\r
}\r
\r
/* Set volume label */\r
- dj.obj.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 volume label entry */\r
+ res = dir_read_label(&dj); /* 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
+ if (FF_FS_EXFAT && fs->fs_type == FS_EXFAT) {\r
+ dj.dir[XDIR_NumLabel] = (BYTE)di; /* Change the volume label */\r
+ mem_cpy(dj.dir + XDIR_Label, dirvn, 22);\r
} else {\r
- if (slen) {\r
+ if (di != 0) {\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
fs->wflag = 1;\r
res = sync_fs(fs);\r
- } else { /* No volume label entry is found or error */\r
+ } else { /* No volume label entry or an error */\r
if (res == FR_NO_FILE) {\r
res = FR_OK;\r
- if (slen) { /* Create a volume label entry */\r
+ if (di != 0) { /* 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, SZDIRE); /* Clear the entry */\r
- if (_FS_EXFAT && fs->fs_type == FS_EXFAT) {\r
+ mem_set(dj.dir, 0, SZDIRE); /* Clean the entry */\r
+ if (FF_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
+ dj.dir[XDIR_NumLabel] = (BYTE)di;\r
+ mem_cpy(dj.dir + XDIR_Label, dirvn, 22);\r
} else {\r
dj.dir[DIR_Attr] = AM_VOL; /* Create volume label entry */\r
mem_cpy(dj.dir, dirvn, 11);\r
LEAVE_FF(fs, res);\r
}\r
\r
-#endif /* !_FS_READONLY */\r
-#endif /* _USE_LABEL */\r
+#endif /* !FF_FS_READONLY */\r
+#endif /* FF_USE_LABEL */\r
\r
\r
\r
-#if _USE_EXPAND && !_FS_READONLY\r
+#if FF_USE_EXPAND && !FF_FS_READONLY\r
/*-----------------------------------------------------------------------*/\r
/* Allocate a Contiguous Blocks to the File */\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 FF_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
stcl = fs->last_clst; lclst = 0;\r
if (stcl < 2 || stcl >= fs->n_fatent) stcl = 2;\r
\r
-#if _FS_EXFAT\r
+#if FF_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
+ if (res == FR_OK) { /* A contiguous free area is found */\r
+ if (opt) { /* Allocate it now */\r
res = change_bitmap(fs, scl, tcl, 1); /* Mark the cluster block 'in use' */\r
lclst = scl + tcl - 1;\r
- } else {\r
+ } else { /* Set it as suggested point for next allocation */\r
lclst = scl - 1;\r
}\r
}\r
}\r
if (clst == stcl) { res = FR_DENIED; break; } /* No contiguous cluster? */\r
}\r
- if (res == FR_OK) {\r
- if (opt) {\r
+ if (res == FR_OK) { /* A contiguous free area is found */\r
+ if (opt) { /* Allocate it now */\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
+ } else { /* Set it as suggested point for next allocation */\r
lclst = scl - 1;\r
}\r
}\r
\r
if (res == FR_OK) {\r
fs->last_clst = lclst; /* Set suggested start cluster to start next */\r
- if (opt) {\r
+ if (opt) { /* Is it allocated now? */\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
+ if (FF_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
+ if (fs->free_clst <= fs->n_fatent - 2) { /* Update FSINFO */\r
fs->free_clst -= tcl;\r
fs->fsi_flag |= 1;\r
}\r
LEAVE_FF(fs, res);\r
}\r
\r
-#endif /* _USE_EXPAND && !_FS_READONLY */\r
+#endif /* FF_USE_EXPAND && !FF_FS_READONLY */\r
\r
\r
\r
-#if _USE_FORWARD\r
+#if FF_USE_FORWARD\r
/*-----------------------------------------------------------------------*/\r
-/* Forward data to the stream directly */\r
+/* Forward Data to the Stream Directly */\r
/*-----------------------------------------------------------------------*/\r
\r
FRESULT f_forward (\r
fp->clust = clst; /* Update current cluster */\r
}\r
}\r
- sect = clust2sect(fs, fp->clust); /* Get current data sector */\r
- if (!sect) ABORT(fs, FR_INT_ERR);\r
+ sect = clst2sect(fs, fp->clust); /* Get current data sector */\r
+ if (sect == 0) ABORT(fs, FR_INT_ERR);\r
sect += csect;\r
-#if _FS_TINY\r
+#if FF_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 !FF_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
+ if (disk_write(fs->pdrv, 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
+ if (disk_read(fs->pdrv, fp->buf, sect, 1) != RES_OK) ABORT(fs, FR_DISK_ERR);\r
}\r
dbuf = fp->buf;\r
#endif\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
+ if (rcnt == 0) ABORT(fs, FR_INT_ERR);\r
}\r
\r
LEAVE_FF(fs, FR_OK);\r
}\r
-#endif /* _USE_FORWARD */\r
+#endif /* FF_USE_FORWARD */\r
\r
\r
\r
-#if _USE_MKFS && !_FS_READONLY\r
+#if FF_USE_MKFS && !FF_FS_READONLY\r
/*-----------------------------------------------------------------------*/\r
-/* Create FAT file system on the logical drive */\r
+/* Create an FAT/exFAT volume */\r
/*-----------------------------------------------------------------------*/\r
\r
FRESULT f_mkfs (\r
const TCHAR* path, /* Logical drive number */\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
+ DWORD au, /* Size of allocation unit (cluster) [byte] */\r
+ void* work, /* Pointer to working buffer (null: use heap memory) */\r
+ UINT len /* Size of working buffer [byte] */\r
)\r
{\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
+ const UINT n_fats = 1; /* Number of FATs for FAT/FAT32 volume (1 or 2) */\r
+ const UINT n_rootdir = 512; /* Number of root directory entries for FAT volume */\r
+ static const WORD cst[] = {1, 4, 16, 64, 256, 512, 0}; /* Cluster size boundary for FAT 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
+ WORD ss; /* Sector size */\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
int vol;\r
DSTATUS stat;\r
-#if _USE_TRIM || _FS_EXFAT\r
+#if FF_USE_TRIM || FF_FS_EXFAT\r
DWORD tbl[3];\r
#endif\r
\r
/* Check mounted drive and clear work area */\r
vol = get_ldnumber(&path); /* Get target logical drive */\r
if (vol < 0) return FR_INVALID_DRIVE;\r
- if (FatFs[vol]) FatFs[vol]->fs_type = 0; /* Clear mounted volume */\r
+ if (FatFs[vol]) FatFs[vol]->fs_type = 0; /* Clear the volume if mounted */\r
pdrv = LD2PD(vol); /* Physical drive */\r
part = LD2PT(vol); /* Partition (0:create as new, 1-4:get from partition table) */\r
\r
if (stat & STA_NOINIT) return FR_NOT_READY;\r
if (stat & STA_PROTECT) return FR_WRITE_PROTECTED;\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 FF_MAX_SS != FF_MIN_SS /* Get sector size of the medium if variable sector size cfg. */\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
+ if (ss > FF_MAX_SS || ss < FF_MIN_SS || (ss & (ss - 1))) return FR_DISK_ERR;\r
#else\r
- ss = _MAX_SS;\r
+ ss = FF_MAX_SS;\r
#endif\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
+#if FF_USE_LFN == 3\r
+ if (!work) { /* Use heap memory for working buffer */\r
+ for (szb_buf = MAX_MALLOC, buf = 0; szb_buf >= ss && (buf = ff_memalloc(szb_buf)) == 0; szb_buf /= 2) ;\r
+ sz_buf = szb_buf / ss; /* Size of working buffer (sector) */\r
+ } else\r
+#endif\r
+ {\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
+ }\r
+ if (!buf || sz_buf == 0) return FR_NOT_ENOUGH_CORE;\r
\r
/* Determine where the volume to be located (b_vol, sz_vol) */\r
- if (_MULTI_PARTITION && part != 0) {\r
+ if (FF_MULTI_PARTITION && part != 0) {\r
/* Get partition information from partition table in the MBR */\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
+ if (disk_read(pdrv, buf, 0, 1) != RES_OK) LEAVE_MKFS(FR_DISK_ERR); /* Load MBR */\r
+ if (ld_word(buf + BS_55AA) != 0xAA55) LEAVE_MKFS(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
+ if (pte[PTE_System] == 0) LEAVE_MKFS(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 single-partition in this function */\r
- if (disk_ioctl(pdrv, GET_SECTOR_COUNT, &sz_vol) != RES_OK) return FR_DISK_ERR;\r
+ if (disk_ioctl(pdrv, GET_SECTOR_COUNT, &sz_vol) != RES_OK) LEAVE_MKFS(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
+ if (sz_vol < b_vol) LEAVE_MKFS(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
+ if (sz_vol < 128) LEAVE_MKFS(FR_MKFS_ABORTED); /* Check if volume size is >=128s */\r
\r
/* Pre-determine the FAT type */\r
do {\r
- if (_FS_EXFAT && (opt & FM_EXFAT)) { /* exFAT possible? */\r
+ if (FF_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 (au > 128) LEAVE_MKFS(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
+ if (!(opt & FM_FAT)) LEAVE_MKFS(FR_INVALID_PARAMETER); /* no-FAT? */\r
fmt = FS_FAT16;\r
} while (0);\r
\r
-#if _FS_EXFAT\r
+#if FF_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
+ if (sz_vol < 0x1000) LEAVE_MKFS(FR_MKFS_ABORTED); /* Too small volume? */\r
+#if FF_USE_TRIM\r
+ tbl[0] = b_vol; tbl[1] = b_vol + sz_vol - 1; /* Inform the device the volume area may 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
+ if (au == 0) { /* au auto-selection */\r
au = 8;\r
if (sz_vol >= 0x80000) au = 64; /* >= 512Ks */\r
if (sz_vol >= 0x4000000) au = 256; /* >= 64Ms */\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
+ if (b_data >= sz_vol / 2) LEAVE_MKFS(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
+ if (n_clst <16) LEAVE_MKFS(FR_MKFS_ABORTED); /* Too few clusters? */\r
+ if (n_clst > MAX_EXFAT) LEAVE_MKFS(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
/* 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
+ st = 0; si = 0; i = 0; j = 0; szb_case = 0;\r
do {\r
switch (st) {\r
case 0:\r
- ch = ff_wtoupper(si); /* Get an up-case char */\r
+ ch = (WCHAR)ff_wtoupper(si); /* Get an up-case char */\r
if (ch != si) {\r
si++; break; /* Store the up-case char if exist */\r
}\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
+ /* go to next case */\r
case 1:\r
ch = si++; /* Fill the short run */\r
if (--j == 0) st = 0;\r
break;\r
+\r
default:\r
- ch = (WCHAR)j; si += j; /* Number of chars to skip */\r
+ ch = (WCHAR)j; si += (WCHAR)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
+ if (si == 0 || 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
+ if (disk_write(pdrv, buf, sect, n) != RES_OK) LEAVE_MKFS(FR_DISK_ERR);\r
sect += n; i = 0;\r
}\r
} while (si);\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
+ for (b = 1; nb != 0 && 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
+ if (disk_write(pdrv, buf, sect, n) != RES_OK) LEAVE_MKFS(FR_DISK_ERR);\r
sect += n; nsect -= n;\r
} while (nsect);\r
\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
+ while (nb != 0 && 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
+ if (nb == 0 && j < 3) nb = tbl[j++]; /* Next chain */\r
+ } while (nb != 0 && 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
+ if (disk_write(pdrv, buf, sect, n) != RES_OK) LEAVE_MKFS(FR_DISK_ERR);\r
sect += n; nsect -= n;\r
} while (nsect);\r
\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
+ st_dword(buf + SZDIRE * 1 + 20, 2); /* cluster */\r
+ st_dword(buf + SZDIRE * 1 + 24, szb_bit); /* size */\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
+ st_dword(buf + SZDIRE * 2 + 4, sum); /* sum */\r
+ st_dword(buf + SZDIRE * 2 + 20, 2 + tbl[0]); /* cluster */\r
+ st_dword(buf + SZDIRE * 2 + 24, szb_case); /* size */\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
+ if (disk_write(pdrv, buf, sect, n) != RES_OK) LEAVE_MKFS(FR_DISK_ERR);\r
mem_set(buf, 0, ss);\r
sect += n; nsect -= n;\r
} while (nsect);\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
+ st_word(buf + BPB_FSVerEx, 0x100); /* Filesystem 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
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
+ if (disk_write(pdrv, buf, sect++, 1) != RES_OK) LEAVE_MKFS(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
+ if (disk_write(pdrv, buf, sect++, 1) != RES_OK) LEAVE_MKFS(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
+ if (disk_write(pdrv, buf, sect++, 1) != RES_OK) LEAVE_MKFS(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
+ if (disk_write(pdrv, buf, sect++, 1) != RES_OK) LEAVE_MKFS(FR_DISK_ERR);\r
}\r
\r
} else\r
-#endif /* _FS_EXFAT */\r
- { /* Create an FAT12/16/32 volume */\r
+#endif /* FF_FS_EXFAT */\r
+ { /* Create an FAT/FAT32 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
+ if (pau == 0) { /* 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
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
+ if (n_clst <= MAX_FAT16 || n_clst > MAX_FAT32) LEAVE_MKFS(FR_MKFS_ABORTED);\r
+ } else { /* FAT volume */\r
+ if (pau == 0) { /* 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 = ((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
+ } else { /* FAT: 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
+ if (sz_vol < b_data + pau * 16 - b_vol) LEAVE_MKFS(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
+ if (au == 0 && (au = pau / 2) != 0) continue; /* Adjust cluster size and retry */\r
+ LEAVE_MKFS(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
+ if (au == 0 && (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
+ if (au == 0 && (au = pau * 2) <= 128) continue; /* Adjust cluster size and retry */\r
+ LEAVE_MKFS(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
+ if (au == 0 && (au = pau * 2) <= 128) continue; /* Adjust cluster size and retry */\r
+ LEAVE_MKFS(FR_MKFS_ABORTED);\r
}\r
}\r
- if (fmt == FS_FAT12 && n_clst > MAX_FAT12) return FR_MKFS_ABORTED; /* Too many clusters for FAT12 */\r
+ if (fmt == FS_FAT12 && n_clst > MAX_FAT12) LEAVE_MKFS(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
+#if FF_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
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
+ if (disk_write(pdrv, buf, b_vol, 1) != RES_OK) LEAVE_MKFS(FR_DISK_ERR); /* Write it to the VBR sector */\r
\r
/* Create FSINFO record if needed */\r
if (fmt == FS_FAT32) {\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
+ if (disk_write(pdrv, buf, sect, (UINT)n) != RES_OK) LEAVE_MKFS(FR_DISK_ERR);\r
mem_set(buf, 0, ss);\r
sect += n; nsect -= n;\r
} while (nsect);\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
+ if (disk_write(pdrv, buf, sect, (UINT)n) != RES_OK) LEAVE_MKFS(FR_DISK_ERR);\r
sect += n; nsect -= n;\r
} while (nsect);\r
}\r
\r
/* Determine system ID in the partition table */\r
- if (_FS_EXFAT && fmt == FS_EXFAT) {\r
+ if (FF_FS_EXFAT && fmt == FS_EXFAT) {\r
sys = 0x07; /* HPFS/NTFS/exFAT */\r
} else {\r
if (fmt == FS_FAT32) {\r
sys = 0x0C; /* FAT32X */\r
} else {\r
if (sz_vol >= 0x10000) {\r
- sys = 0x06; /* FAT12/16 (>=64KS) */\r
+ sys = 0x06; /* FAT12/16 (large) */\r
} else {\r
- sys = (fmt == FS_FAT16) ? 0x04 : 0x01; /* FAT16 (<64KS) : FAT12 (<64KS) */\r
+ sys = (fmt == FS_FAT16) ? 0x04 : 0x01; /* FAT16 : FAT12 */\r
}\r
}\r
}\r
\r
- if (_MULTI_PARTITION && part != 0) {\r
+ /* Update partition information */\r
+ if (FF_MULTI_PARTITION && part != 0) { /* Created in the existing partition */\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
+ if (disk_read(pdrv, buf, 0, 1) != RES_OK) LEAVE_MKFS(FR_DISK_ERR); /* Read the MBR */\r
+ buf[MBR_Table + (part - 1) * SZ_PTE + PTE_System] = sys; /* Set system ID */\r
+ if (disk_write(pdrv, buf, 0, 1) != RES_OK) LEAVE_MKFS(FR_DISK_ERR); /* Write it back to the MBR */\r
+ } else { /* Created as a new single partition */\r
+ if (!(opt & FM_SFD)) { /* Create partition table if 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_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
+ n = (b_vol + sz_vol) / (63 * 255); /* (End CHS may be invalid) */\r
pte[PTE_EdHead] = 254; /* End head */\r
- pte[PTE_EdSec] = (BYTE)(n >> 2 | 63); /* End sector */\r
+ pte[PTE_EdSec] = (BYTE)(((n >> 2) & 0xC0) | 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
+ if (disk_write(pdrv, buf, 0, 1) != RES_OK) LEAVE_MKFS(FR_DISK_ERR); /* Write it to the MBR */\r
}\r
}\r
\r
- if (disk_ioctl(pdrv, CTRL_SYNC, 0) != RES_OK) return FR_DISK_ERR;\r
+ if (disk_ioctl(pdrv, CTRL_SYNC, 0) != RES_OK) LEAVE_MKFS(FR_DISK_ERR);\r
\r
- return FR_OK;\r
+ LEAVE_MKFS(FR_OK);\r
}\r
\r
\r
\r
-#if _MULTI_PARTITION\r
+#if FF_MULTI_PARTITION\r
/*-----------------------------------------------------------------------*/\r
-/* Create partition table on the 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
- void* work /* Pointer to the working buffer */\r
+ void* work /* Pointer to the working buffer (null: use heap memory) */\r
)\r
{\r
UINT i, n, sz_cyl, tot_cyl, b_cyl, e_cyl, p_cyl;\r
BYTE s_hd, e_hd, *p, *buf = (BYTE*)work;\r
DSTATUS stat;\r
DWORD sz_disk, sz_part, s_part;\r
+ FRESULT res;\r
\r
\r
stat = disk_initialize(pdrv);\r
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 the CHS without any care of the drive geometry */\r
+ buf = (BYTE*)work;\r
+#if FF_USE_LFN == 3\r
+ if (!buf) buf = ff_memalloc(FF_MAX_SS); /* Use heap memory for working buffer */\r
+#endif\r
+ if (!buf) return FR_NOT_ENOUGH_CORE;\r
+\r
+ /* Determine the CHS without any consideration 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
+ e_hd = (BYTE)(n - 1);\r
sz_cyl = 63 * n;\r
tot_cyl = sz_disk / sz_cyl;\r
\r
/* Create partition table */\r
- mem_set(buf, 0, _MAX_SS);\r
+ mem_set(buf, 0, FF_MAX_SS);\r
p = buf + MBR_Table; b_cyl = 0;\r
for (i = 0; i < 4; i++, p += SZ_PTE) {\r
- p_cyl = (szt[i] <= 100U) ? (DWORD)tot_cyl * szt[i] / 100 : szt[i] / sz_cyl;\r
- if (!p_cyl) continue;\r
+ p_cyl = (szt[i] <= 100U) ? (DWORD)tot_cyl * szt[i] / 100 : szt[i] / sz_cyl; /* Number of cylinders */\r
+ if (p_cyl == 0) continue;\r
s_part = (DWORD)sz_cyl * b_cyl;\r
sz_part = (DWORD)sz_cyl * p_cyl;\r
if (i == 0) { /* Exclude first track of cylinder 0 */\r
} else {\r
s_hd = 0;\r
}\r
- e_cyl = b_cyl + p_cyl - 1;\r
- if (e_cyl >= tot_cyl) return FR_INVALID_PARAMETER;\r
+ e_cyl = b_cyl + p_cyl - 1; /* End cylinder */\r
+ if (e_cyl >= tot_cyl) LEAVE_MKFS(FR_INVALID_PARAMETER);\r
\r
/* Set partition table */\r
p[1] = s_hd; /* Start head */\r
- p[2] = (BYTE)((b_cyl >> 2) + 1); /* Start sector */\r
+ p[2] = (BYTE)(((b_cyl >> 2) & 0xC0) | 1); /* Start sector */\r
p[3] = (BYTE)b_cyl; /* Start cylinder */\r
- p[4] = 0x06; /* System type (temporary setting) */\r
+ p[4] = 0x07; /* System type (temporary setting) */\r
p[5] = e_hd; /* End head */\r
- p[6] = (BYTE)((e_cyl >> 2) + 63); /* End sector */\r
+ p[6] = (BYTE)(((e_cyl >> 2) & 0xC0) | 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 + 12, sz_part); /* Number of sectors */\r
\r
/* Next partition */\r
b_cyl += p_cyl;\r
}\r
- st_word(p, 0xAA55);\r
+ st_word(p, 0xAA55); /* MBR signature (always at offset 510) */\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
+ res = (disk_write(pdrv, buf, 0, 1) == RES_OK && disk_ioctl(pdrv, CTRL_SYNC, 0) == RES_OK) ? FR_OK : FR_DISK_ERR;\r
+ LEAVE_MKFS(res);\r
}\r
\r
-#endif /* _MULTI_PARTITION */\r
-#endif /* _USE_MKFS && !_FS_READONLY */\r
+#endif /* FF_MULTI_PARTITION */\r
+#endif /* FF_USE_MKFS && !FF_FS_READONLY */\r
\r
\r
\r
\r
-#if _USE_STRFUNC\r
+#if FF_USE_STRFUNC\r
+#if FF_USE_LFN && FF_LFN_UNICODE && (FF_STRF_ENCODE < 0 || FF_STRF_ENCODE > 3)\r
+#error Wrong FF_STRF_ENCODE setting\r
+#endif\r
/*-----------------------------------------------------------------------*/\r
-/* Get a string from the file */\r
+/* Get a String from the File */\r
/*-----------------------------------------------------------------------*/\r
\r
TCHAR* f_gets (\r
TCHAR* buff, /* Pointer to the string buffer to read */\r
- int len, /* Size of string buffer (characters) */\r
+ int len, /* Size of string buffer (items) */\r
FIL* fp /* Pointer to the file object */\r
)\r
{\r
- int n = 0;\r
- TCHAR c, *p = buff;\r
- BYTE s[2];\r
+ int nc = 0;\r
+ TCHAR *p = buff;\r
+ BYTE s[4];\r
UINT rc;\r
+ DWORD dc;\r
+#if FF_USE_LFN && FF_LFN_UNICODE && FF_STRF_ENCODE <= 2\r
+ WCHAR wc;\r
+#endif\r
+#if FF_USE_LFN && FF_LFN_UNICODE && FF_STRF_ENCODE == 3\r
+ UINT ct;\r
+#endif\r
\r
-\r
- while (n < len - 1) { /* Read characters until buffer gets filled */\r
-#if _LFN_UNICODE\r
-#if _STRF_ENCODE == 3 /* Read a character in UTF-8 */\r
+#if FF_USE_LFN && FF_LFN_UNICODE /* With code conversion (Unicode API) */\r
+ /* Make a room for the character and terminator */\r
+ if (FF_LFN_UNICODE == 1) len -= (FF_STRF_ENCODE == 0) ? 1 : 2;\r
+ if (FF_LFN_UNICODE == 2) len -= (FF_STRF_ENCODE == 0) ? 3 : 4;\r
+ if (FF_LFN_UNICODE == 3) len -= 1;\r
+ while (nc < len) {\r
+#if FF_STRF_ENCODE == 0 /* Read a character in ANSI/OEM */\r
f_read(fp, s, 1, &rc);\r
if (rc != 1) break;\r
- c = s[0];\r
- if (c >= 0x80) {\r
- if (c < 0xC0) continue; /* Skip stray trailer */\r
- if (c < 0xE0) { /* Two-byte sequence */\r
- f_read(fp, s, 1, &rc);\r
- if (rc != 1) break;\r
- c = (c & 0x1F) << 6 | (s[0] & 0x3F);\r
- if (c < 0x80) c = '?';\r
- } else {\r
- if (c < 0xF0) { /* Three-byte sequence */\r
- f_read(fp, s, 2, &rc);\r
- if (rc != 2) break;\r
- c = c << 12 | (s[0] & 0x3F) << 6 | (s[1] & 0x3F);\r
- if (c < 0x800) c = '?';\r
- } else { /* Reject four-byte sequence */\r
- c = '?';\r
- }\r
- }\r
+ wc = s[0];\r
+ if (dbc_1st((BYTE)wc)) {\r
+ f_read(fp, s, 1, &rc);\r
+ if (rc != 1 || !dbc_2nd(s[0])) continue;\r
+ wc = wc << 8 | s[0];\r
}\r
-#elif _STRF_ENCODE == 2 /* Read a character in UTF-16BE */\r
- f_read(fp, s, 2, &rc);\r
- if (rc != 2) break;\r
- c = s[1] + (s[0] << 8);\r
-#elif _STRF_ENCODE == 1 /* Read a character in UTF-16LE */\r
+ dc = ff_oem2uni(wc, CODEPAGE);\r
+ if (dc == 0) continue;\r
+#elif FF_STRF_ENCODE == 1 || FF_STRF_ENCODE == 2 /* Read a character in UTF-16LE/BE */\r
f_read(fp, s, 2, &rc);\r
if (rc != 2) break;\r
- c = s[0] + (s[1] << 8);\r
-#else /* Read a character in ANSI/OEM */\r
+ dc = (FF_STRF_ENCODE == 1) ? ld_word(s) : s[0] << 8 | s[1];\r
+ if (IsSurrogateL(dc)) continue;\r
+ if (IsSurrogateH(dc)) {\r
+ f_read(fp, s, 2, &rc);\r
+ if (rc != 2) break;\r
+ wc = (FF_STRF_ENCODE == 1) ? ld_word(s) : s[0] << 8 | s[1];\r
+ if (!IsSurrogateL(wc)) continue;\r
+ dc = ((dc & 0x3FF) + 0x40) << 10 | (wc & 0x3FF);\r
+ }\r
+#else /* Read a character in UTF-8 */\r
f_read(fp, s, 1, &rc);\r
if (rc != 1) break;\r
- c = s[0];\r
- if (IsDBCS1(c)) {\r
- f_read(fp, s, 1, &rc);\r
- if (rc != 1) break;\r
- c = (c << 8) + s[0];\r
+ dc = s[0];\r
+ if (dc >= 0x80) { /* Multi-byte character? */\r
+ ct = 0;\r
+ if ((dc & 0xE0) == 0xC0) { dc &= 0x1F; ct = 1; } /* 2-byte? */\r
+ if ((dc & 0xF0) == 0xE0) { dc &= 0x0F; ct = 2; } /* 3-byte? */\r
+ if ((dc & 0xF8) == 0xF0) { dc &= 0x07; ct = 3; } /* 4-byte? */\r
+ if (ct == 0) continue;\r
+ f_read(fp, s, ct, &rc); /* Get trailing bytes */\r
+ if (rc != ct) break;\r
+ rc = 0;\r
+ do { /* Merge trailing bytes */\r
+ if ((s[rc] & 0xC0) != 0x80) break;\r
+ dc = dc << 6 | (s[rc] & 0x3F);\r
+ } while (++rc < ct);\r
+ if (rc != ct || dc < 0x80 || IsSurrogate(dc) || dc >= 0x110000) continue; /* Wrong encoding? */\r
+ }\r
+#endif\r
+ if (FF_USE_STRFUNC == 2 && dc == '\r') continue; /* Strip \r off if needed */\r
+#if FF_LFN_UNICODE == 1 || FF_LFN_UNICODE == 3 /* Output it in UTF-16/32 encoding */\r
+ if (FF_LFN_UNICODE == 1 && dc >= 0x10000) { /* Out of BMP at UTF-16? */\r
+ *p++ = (TCHAR)(0xD800 | ((dc >> 10) - 0x40)); nc++; /* Make and output high surrogate */\r
+ dc = 0xDC00 | (dc & 0x3FF); /* Make low surrogate */\r
+ }\r
+ *p++ = (TCHAR)dc; nc++;\r
+ if (dc == '\n') break; /* End of line? */\r
+#elif FF_LFN_UNICODE == 2 /* Output it in UTF-8 encoding */\r
+ if (dc < 0x80) { /* 1-byte */\r
+ *p++ = (TCHAR)dc;\r
+ nc++;\r
+ if (dc == '\n') break; /* End of line? */\r
+ } else {\r
+ if (dc < 0x800) { /* 2-byte */\r
+ *p++ = (TCHAR)(0xC0 | (dc >> 6 & 0x1F));\r
+ *p++ = (TCHAR)(0x80 | (dc >> 0 & 0x3F));\r
+ nc += 2;\r
+ } else {\r
+ if (dc < 0x10000) { /* 3-byte */\r
+ *p++ = (TCHAR)(0xE0 | (dc >> 12 & 0x0F));\r
+ *p++ = (TCHAR)(0x80 | (dc >> 6 & 0x3F));\r
+ *p++ = (TCHAR)(0x80 | (dc >> 0 & 0x3F));\r
+ nc += 3;\r
+ } else { /* 4-byte */\r
+ *p++ = (TCHAR)(0xF0 | (dc >> 18 & 0x07));\r
+ *p++ = (TCHAR)(0x80 | (dc >> 12 & 0x3F));\r
+ *p++ = (TCHAR)(0x80 | (dc >> 6 & 0x3F));\r
+ *p++ = (TCHAR)(0x80 | (dc >> 0 & 0x3F));\r
+ nc += 4;\r
+ }\r
+ }\r
}\r
- c = ff_convert(c, 1); /* OEM -> Unicode */\r
- if (!c) c = '?';\r
#endif\r
-#else /* Read a character without conversion */\r
+ }\r
+\r
+#else /* Byte-by-byte without any conversion (ANSI/OEM API) */\r
+ len -= 1; /* Make a room for the terminator */\r
+ while (nc < len) {\r
f_read(fp, s, 1, &rc);\r
if (rc != 1) break;\r
- c = s[0];\r
-#endif\r
- if (_USE_STRFUNC == 2 && c == '\r') continue; /* Strip '\r' */\r
- *p++ = c;\r
- n++;\r
- if (c == '\n') break; /* Break on EOL */\r
+ dc = s[0];\r
+ if (FF_USE_STRFUNC == 2 && dc == '\r') continue;\r
+ *p++ = (TCHAR)dc; nc++;\r
+ if (dc == '\n') break;\r
}\r
- *p = 0;\r
- return n ? buff : 0; /* When no data read (eof or error), return with error. */\r
+#endif\r
+\r
+ *p = 0; /* Terminate the string */\r
+ return nc ? buff : 0; /* When no data read due to EOF or error, return with error. */\r
}\r
\r
\r
\r
\r
-#if !_FS_READONLY\r
+#if !FF_FS_READONLY\r
#include <stdarg.h>\r
/*-----------------------------------------------------------------------*/\r
-/* Put a character to the file */\r
+/* Put a Character to the File */\r
/*-----------------------------------------------------------------------*/\r
\r
-typedef struct {\r
+typedef struct { /* Putchar output buffer and work area */\r
FIL *fp; /* Ptr to the writing file */\r
- int idx, nchr; /* Write index of buf[] (-1:error), number of chars written */\r
+ int idx, nchr; /* Write index of buf[] (-1:error), number of encoding units written */\r
+#if FF_USE_LFN && FF_LFN_UNICODE == 1\r
+ WCHAR hs;\r
+#elif FF_USE_LFN && FF_LFN_UNICODE == 2\r
+ BYTE bs[4];\r
+ UINT wi, ct;\r
+#endif\r
BYTE buf[64]; /* Write buffer */\r
} putbuff;\r
\r
TCHAR c\r
)\r
{\r
- UINT bw;\r
- int i;\r
-\r
+ UINT n;\r
+ int i, nc;\r
+#if FF_USE_LFN && FF_LFN_UNICODE\r
+ WCHAR hs, wc;\r
+#if FF_LFN_UNICODE == 2\r
+ DWORD dc;\r
+ TCHAR *tp;\r
+#endif\r
+#endif\r
\r
- if (_USE_STRFUNC == 2 && c == '\n') { /* LF -> CRLF conversion */\r
+ if (FF_USE_STRFUNC == 2 && c == '\n') { /* LF -> CRLF conversion */\r
putc_bfd(pb, '\r');\r
}\r
\r
- i = pb->idx; /* Write index of pb->buf[] */\r
+ i = pb->idx; /* Write index of pb->buf[] */\r
if (i < 0) return;\r
+ nc = pb->nchr; /* Write unit counter */\r
\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
+#if FF_USE_LFN && FF_LFN_UNICODE\r
+#if FF_LFN_UNICODE == 1 /* UTF-16 input */\r
+ if (IsSurrogateH(c)) {\r
+ pb->hs = c; return;\r
+ }\r
+ hs = pb->hs; pb->hs = 0;\r
+ if (hs != 0) {\r
+ if (!IsSurrogateL(c)) hs = 0;\r
} else {\r
- if (c < 0x800) { /* 11-bit */\r
- pb->buf[i++] = (BYTE)(0xC0 | c >> 6);\r
- } else { /* 16-bit */\r
- pb->buf[i++] = (BYTE)(0xE0 | c >> 12);\r
- pb->buf[i++] = (BYTE)(0x80 | (c >> 6 & 0x3F));\r
+ if (IsSurrogateL(c)) return;\r
+ }\r
+ wc = c;\r
+#elif FF_LFN_UNICODE == 2 /* UTF-8 input */\r
+ for (;;) {\r
+ if (pb->ct == 0) { /* Out of multi-byte sequence? */\r
+ pb->bs[pb->wi = 0] = (BYTE)c; /* Save 1st byte */\r
+ if ((BYTE)c < 0x80) break; /* 1-byte? */\r
+ if (((BYTE)c & 0xE0) == 0xC0) pb->ct = 1; /* 2-byte? */\r
+ if (((BYTE)c & 0xF0) == 0xE0) pb->ct = 2; /* 3-byte? */\r
+ if (((BYTE)c & 0xF1) == 0xF0) pb->ct = 3; /* 4-byte? */\r
+ return;\r
+ } else { /* In the multi-byte sequence */\r
+ if (((BYTE)c & 0xC0) != 0x80) { /* Broken sequence? */\r
+ pb->ct = 0; continue;\r
+ }\r
+ pb->bs[++pb->wi] = (BYTE)c; /* Save the trailing byte */\r
+ if (--pb->ct == 0) break; /* End of multi-byte sequence? */\r
+ return;\r
}\r
- pb->buf[i++] = (BYTE)(0x80 | (c & 0x3F));\r
}\r
-#elif _STRF_ENCODE == 2 /* Write a character in UTF-16BE */\r
- pb->buf[i++] = (BYTE)(c >> 8);\r
- pb->buf[i++] = (BYTE)c;\r
-#elif _STRF_ENCODE == 1 /* Write a character in UTF-16LE */\r
- pb->buf[i++] = (BYTE)c;\r
- pb->buf[i++] = (BYTE)(c >> 8);\r
-#else /* Write a character in ANSI/OEM */\r
- c = ff_convert(c, 0); /* Unicode -> OEM */\r
- if (!c) c = '?';\r
- if (c >= 0x100)\r
- pb->buf[i++] = (BYTE)(c >> 8);\r
- pb->buf[i++] = (BYTE)c;\r
+ tp = (TCHAR*)pb->bs;\r
+ dc = tchar2uni(&tp); /* UTF-8 ==> UTF-16 */\r
+ if (dc == 0xFFFFFFFF) return;\r
+ wc = (WCHAR)dc;\r
+ hs = (WCHAR)(dc >> 16);\r
+#elif FF_LFN_UNICODE == 3 /* UTF-32 input */\r
+ if (IsSurrogate(c) || c >= 0x110000) return;\r
+ if (c >= 0x10000) {\r
+ hs = (WCHAR)(0xD800 | ((c >> 10) - 0x40)); /* Make high surrogate */\r
+ wc = 0xDC00 | (c & 0x3FF); /* Make low surrogate */\r
+ } else {\r
+ hs = 0;\r
+ wc = (WCHAR)c;\r
+ }\r
+#endif\r
+\r
+#if FF_STRF_ENCODE == 1 /* Write a character in UTF-16LE */\r
+ if (hs != 0) {\r
+ st_word(&pb->buf[i], hs);\r
+ i += 2;\r
+ nc++;\r
+ }\r
+ st_word(&pb->buf[i], wc);\r
+ i += 2;\r
+#elif FF_STRF_ENCODE == 2 /* Write a character in UTF-16BE */\r
+ if (hs != 0) {\r
+ pb->buf[i++] = (BYTE)(hs >> 8);\r
+ pb->buf[i++] = (BYTE)hs;\r
+ nc++;\r
+ }\r
+ pb->buf[i++] = (BYTE)(wc >> 8);\r
+ pb->buf[i++] = (BYTE)wc;\r
+#elif FF_STRF_ENCODE == 3 /* Write it in UTF-8 */\r
+ if (hs != 0) { /* 4-byte */\r
+ nc += 3;\r
+ hs = (hs & 0x3FF) + 0x40;\r
+ pb->buf[i++] = (BYTE)(0xF0 | hs >> 8);\r
+ pb->buf[i++] = (BYTE)(0x80 | (hs >> 2 & 0x3F));\r
+ pb->buf[i++] = (BYTE)(0x80 | (hs & 3) << 4 | (wc >> 6 & 0x0F));\r
+ pb->buf[i++] = (BYTE)(0x80 | (wc & 0x3F));\r
+ } else {\r
+ if (wc < 0x80) { /* 1-byte */\r
+ pb->buf[i++] = (BYTE)wc;\r
+ } else {\r
+ if (wc < 0x800) { /* 2-byte */\r
+ nc += 1;\r
+ pb->buf[i++] = (BYTE)(0xC0 | wc >> 6);\r
+ } else { /* 3-byte */\r
+ nc += 2;\r
+ pb->buf[i++] = (BYTE)(0xE0 | wc >> 12);\r
+ pb->buf[i++] = (BYTE)(0x80 | (wc >> 6 & 0x3F));\r
+ }\r
+ pb->buf[i++] = (BYTE)(0x80 | (wc & 0x3F));\r
+ }\r
+ }\r
+#else /* Write it in ANSI/OEM */\r
+ if (hs != 0) return;\r
+ wc = ff_uni2oem(wc, CODEPAGE); /* UTF-16 ==> ANSI/OEM */\r
+ if (wc == 0) return;;\r
+ if (wc >= 0x100) {\r
+ pb->buf[i++] = (BYTE)(wc >> 8); nc++;\r
+ }\r
+ pb->buf[i++] = (BYTE)wc;\r
#endif\r
-#else /* Write a character without conversion */\r
+\r
+#else /* ANSI/OEM input (without re-encode) */\r
pb->buf[i++] = (BYTE)c;\r
#endif\r
\r
- if (i >= (int)(sizeof pb->buf) - 3) { /* Write buffered characters to the file */\r
- f_write(pb->fp, pb->buf, (UINT)i, &bw);\r
- i = (bw == (UINT)i) ? 0 : -1;\r
+ if (i >= (int)(sizeof pb->buf) - 4) { /* Write buffered characters to the file */\r
+ f_write(pb->fp, pb->buf, (UINT)i, &n);\r
+ i = (n == (UINT)i) ? 0 : -1;\r
}\r
pb->idx = i;\r
- pb->nchr++;\r
+ pb->nchr = nc + 1;\r
}\r
\r
\r
FIL* fp\r
)\r
{\r
+ mem_set(pb, 0, sizeof (putbuff));\r
pb->fp = fp;\r
- pb->nchr = pb->idx = 0;\r
}\r
\r
\r
\r
\r
/*-----------------------------------------------------------------------*/\r
-/* Put a string to the file */\r
+/* Put a String to the File */\r
/*-----------------------------------------------------------------------*/\r
\r
int f_puts (\r
\r
\r
/*-----------------------------------------------------------------------*/\r
-/* Put a formatted string to the file */\r
+/* Put a Formatted String to the File */\r
/*-----------------------------------------------------------------------*/\r
\r
int f_printf (\r
f = 2; c = *fmt++;\r
}\r
}\r
- while (IsDigit(c)) { /* Precision */\r
- w = w * 10 + c - '0';\r
+ if (c == '*') { /* Minimum width by argument */\r
+ w = va_arg(arp, int);\r
c = *fmt++;\r
+ } else {\r
+ while (IsDigit(c)) { /* Minimum width */\r
+ w = w * 10 + c - '0';\r
+ c = *fmt++;\r
+ }\r
}\r
- if (c == 'l' || c == 'L') { /* Prefix: Size is long int */\r
+ if (c == 'l' || c == 'L') { /* Type prefix: Size is long int */\r
f |= 4; c = *fmt++;\r
}\r
- if (!c) break;\r
+ if (c == 0) break;\r
d = c;\r
if (IsLower(d)) d -= 0x20;\r
- switch (d) { /* Type is... */\r
+ switch (d) { /* Atgument type is... */\r
case 'S' : /* String */\r
p = va_arg(arp, TCHAR*);\r
for (j = 0; p[j]; j++) ;\r
- if (!(f & 2)) {\r
- while (j++ < w) putc_bfd(&pb, ' ');\r
+ if (!(f & 2)) { /* Right padded */\r
+ while (j++ < w) putc_bfd(&pb, ' ') ;\r
}\r
- while (*p) putc_bfd(&pb, *p++);\r
- while (j++ < w) putc_bfd(&pb, ' ');\r
+ while (*p) putc_bfd(&pb, *p++) ; /* String body */\r
+ while (j++ < w) putc_bfd(&pb, ' ') ; /* Left padded */\r
continue;\r
+\r
case 'C' : /* Character */\r
putc_bfd(&pb, (TCHAR)va_arg(arp, int)); continue;\r
- case 'B' : /* Binary */\r
+\r
+ case 'B' : /* Unsigned binary */\r
r = 2; break;\r
- case 'O' : /* Octal */\r
+\r
+ case 'O' : /* Unsigned octal */\r
r = 8; break;\r
+\r
case 'D' : /* Signed decimal */\r
case 'U' : /* Unsigned decimal */\r
r = 10; break;\r
- case 'X' : /* Hexdecimal */\r
+\r
+ case 'X' : /* Unsigned hexdecimal */\r
r = 16; break;\r
+\r
default: /* Unknown type (pass-through) */\r
putc_bfd(&pb, c); continue;\r
}\r
d = (TCHAR)(v % r); v /= r;\r
if (d > 9) d += (c == 'x') ? 0x27 : 0x07;\r
str[i++] = d + '0';\r
- } while (v && i < sizeof str / sizeof str[0]);\r
+ } while (v && i < sizeof str / sizeof *str);\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, str[--i]); while (i);\r
- while (j++ < w) putc_bfd(&pb, d);\r
+ if (!(f & 2)) {\r
+ while (j++ < w) putc_bfd(&pb, d); /* Right pad */\r
+ }\r
+ do {\r
+ putc_bfd(&pb, str[--i]); /* Number body */\r
+ } while (i);\r
+ while (j++ < w) putc_bfd(&pb, d); /* Left pad */\r
}\r
\r
va_end(arp);\r
return putc_flush(&pb);\r
}\r
\r
-#endif /* !_FS_READONLY */\r
-#endif /* _USE_STRFUNC */\r
+#endif /* !FF_FS_READONLY */\r
+#endif /* FF_USE_STRFUNC */\r
+\r
+\r
+\r
+#if FF_CODE_PAGE == 0\r
+/*-----------------------------------------------------------------------*/\r
+/* Set Active Codepage for the Path Name */\r
+/*-----------------------------------------------------------------------*/\r
+\r
+FRESULT f_setcp (\r
+ WORD cp /* Value to be set as active code page */\r
+)\r
+{\r
+ static const WORD validcp[] = { 437, 720, 737, 771, 775, 850, 852, 857, 860, 861, 862, 863, 864, 865, 866, 869, 932, 936, 949, 950, 0};\r
+ static const BYTE* const tables[] = {Ct437, Ct720, Ct737, Ct771, Ct775, Ct850, Ct852, Ct857, Ct860, Ct861, Ct862, Ct863, Ct864, Ct865, Ct866, Ct869, Dc932, Dc936, Dc949, Dc950, 0};\r
+ UINT i;\r
+\r
+\r
+ for (i = 0; validcp[i] != 0 && validcp[i] != cp; i++) ; /* Find the code page */\r
+ if (validcp[i] != cp) return FR_INVALID_PARAMETER; /* Not found? */\r
+\r
+ CodePage = cp;\r
+ if (cp >= 900) { /* DBCS */\r
+ ExCvt = 0;\r
+ DbcTbl = tables[i];\r
+ } else { /* SBCS */\r
+ ExCvt = tables[i];\r
+ DbcTbl = 0;\r
+ }\r
+ return FR_OK;\r
+}\r
+#endif /* FF_CODE_PAGE == 0 */\r
+\r
projects / z180-stamp.git / blobdiff