diff --git a/doc/00index_e.html b/doc/00index_e.html index 85473a6..33e84f5 100644 --- a/doc/00index_e.html +++ b/doc/00index_e.html @@ -3,9 +3,11 @@ + + -ELM - Generic FAT File System Module +ELM - FAT File System Module @@ -14,18 +16,18 @@
layer -

FatFs module is an experimental project to implement the FAT file system to small embedded systems. The FatFs module is written in compliance with ANSI C, therefore it is independent of hardware architecture. It can be incorporated into cheap microcontrollers, such as 8051, PIC, AVR, SH, Z80, H8, ARM and etc..., without any change.

+

FatFs is a generic file system module to implement the FAT file system to small embedded systems. The FatFs is written in compliance with ANSI C, therefore it is independent of hardware architecture. It can be incorporated into cheap microcontrollers, such as 8051, PIC, AVR, SH, Z80, H8, ARM and etc..., without any change.

-

Features of FatFs Module

+

Features of FatFs

    -
  1. Separated buffer for FAT structure and each file, suitable for fast multiple file accsess.
    2. -
  2. Supports multiple drives/partitions.
    3. +
  3. Separated buffer for FAT structure and each file, suitable for fast multiple file access.
    4. +
  4. Supports multiple drives and partitions.
  5. Supports FAT12, FAT16 and FAT32.
  6. Supports 8.3 format file name. (LFN is not supported)
  7. Supports two partitioning rules: FDISK and Super-floppy.
  8. Optimized for 8/16-bit microcontrollers.
-

Features of Tiny-FatFs Module (different to FatFs)

+

Features of Tiny-FatFs (different to FatFs)

  1. Very low memory consumption, suitable for small memory system. (1KB RAM)
  2. Supports only single drive.
    3. @@ -37,12 +39,13 @@

    Application Interface

    FatFs/Tiny-FatFs module provides following functions.

    @@ -73,8 +77,9 @@

    Resources

    -

    The FatFs/Tiny-FatFs module is a free software and is opened for education, research and development. You can use, modify and/or republish it for personal, non-profit or profit use without any restriction under your responsibility.

    +

    The FatFs/Tiny-FatFs module is a free software and is opened for education, research and development. You can use, modify and/or republish it for personal, non-profit or commercial use without any restriction under your responsibility.

    + +
    +

    FatFs Home Page

    diff --git a/doc/00index_j.html b/doc/00index_j.html index fcf63da..bd200d3 100644 --- a/doc/00index_j.html +++ b/doc/00index_j.html @@ -3,7 +3,9 @@ - + + + ELM - 汎用FATファイルシステム・モジュール @@ -42,15 +44,17 @@
  3. f_read - ファイルの読み込み
  4. f_write - ファイルの書き込み
  5. f_lseek - ファイルR/Wポインタの移動
    6. +
  6. f_truncate - ファイル・サイズの切り詰め
  7. f_sync - キャッシュされたデータのフラッシュ
  8. f_opendir - ディレクトリのオープン
  9. f_readdir - ディレクトリの読み出し
  10. f_getfree - ディスク空き領域の取得
  11. f_stat - ファイル・ステータスの取得
  12. f_mkdir - ディレクトリの作成
    13. -
  13. f_unlink - ファイルまたはディレクトリの削除
    14. -
  14. f_chmod - ファイルまたはディレクトリ属性の変更
    15. -
  15. f_rename - ファイルまたはディレクトリの名前変更・移動
    16. +
  16. f_unlink - ファイル/ディレクトリの削除
    17. +
  17. f_chmod - ファイル/ディレクトリの属性の変更
    18. +
  18. f_utime - ファイル/ディレクトリのタイムスタンプの変更
    19. +
  19. f_rename - ファイル/ディレクトリの名前変更・移動
  20. f_mkfs - ディスクのフォーマット
@@ -74,6 +78,7 @@

資料

FatFs/Tiny-FatFsモジュールはフリー・ソフトウェアとして教育・研究・開発用に公開しています。どのような利用目的（個人・非商用・商用）でも使用・改変・配布について一切の制限はありませんが、全て利用者の責任の下での利用とします。

Each case does not affect the files that not in write operation. To minimize risk of data loss, the critical section can be minimized like shown in Figure 5 by minimizing the time that file is opened in write mode and using f_sync function properly.

diff --git a/doc/en/dioctl.html b/doc/en/dioctl.html index ca83836..3536040 100644 --- a/doc/en/dioctl.html +++ b/doc/en/dioctl.html @@ -55,7 +55,7 @@ DRESULT disk_ioctl (

The FatFs module uses only device independent commands described below. Any device dependent function is not used.

- +
CommandDescription
CTRL_SYNCMake sure that the disk drive has finished pending write process. When the module has a write back cache, flush the dirty sector immediately. In read-only configuration, this command is not needed.
CTRL_SYNCMake sure that the disk drive has finished pending write process. When the disk I/O module has a write back cache, flush the dirty sector immediately. In read-only configuration, this command is not needed.
GET_SECTOR_COUNTReturns total sectors on the drive into the DWORD variable pointed by Buffer. This command is used in only f_mkfs function.
GET_BLOCK_SIZEReturns erase block size of the memory array in unit of sector into the DWORD variable pointed by Buffer. When the erase block size is unknown or magnetic disk device, return 1. This command is used in only f_mkfs function.
diff --git a/doc/en/dread.html b/doc/en/dread.html index e81b3cb..8766939 100644 --- a/doc/en/dread.html +++ b/doc/en/dread.html @@ -16,7 +16,7 @@ 
 DRESULT disk_read (
   BYTE Drive,          /* Physical drive number */
-  BYTE* Buffer,        /* Pointer to the read buffer */
+  BYTE* Buffer,        /* Pointer to the read data buffer */
   DWORD SectorNumber,  /* Sector number to read from */
   BYTE SectorCount     /* Number of sectros to read */
 );
@@ -31,7 +31,7 @@ DRESULT disk_read (
 
Buffer

 
Pointer to the read buffer to store the read data. The buffer size of number of bytes to be read is required.

 
SectorNumber

-
Specifies the start sector number in logical block address.

+
Specifies the start sector number in logical block address (LBA).

 
SectorCount

 
Specifies number of sectors to read. The value can be 1 to 255.

 
diff --git a/doc/en/dstat.html b/doc/en/dstat.html
index 54e716f..b0cfb58 100644
--- a/doc/en/dstat.html
+++ b/doc/en/dstat.html
@@ -12,7 +12,7 @@
 
 

 
disk_status

-
The disk_status function return the current disk status.

+
The disk_status function returns the current disk status.

 
 DSTATUS disk_status (
   BYTE Drive     /* Physical drive number */
@@ -24,7 +24,7 @@ DSTATUS disk_status (
 
Parameters

 

 
Drive

-
Specifies the physical drive number to be tested.

+
Specifies the physical drive number to be confirmed.

 

 

 
@@ -38,7 +38,7 @@ DSTATUS disk_status (
 
STA_NODISK

 
Indicates that no medium in the drive. This is always cleared on fixed disk drive.

 
STA_PROTECTED

-
Indicates that the medium is write protected. This is always cleared on the drive that does not support write protect notch.

+
Indicates that the medium is write protected. This is always cleared on the drive that does not support write protect notch. Not valid when STA_NODISK is set.

 
 
 
diff --git a/doc/en/dwrite.html b/doc/en/dwrite.html
index ff73522..4d8b87c 100644
--- a/doc/en/dwrite.html
+++ b/doc/en/dwrite.html
@@ -16,7 +16,7 @@
 
 DRESULT disk_write (
   BYTE Drive,          /* Physical drive number */
-  const BYTE* Buffer,  /* Pointer to the read buffer */
+  const BYTE* Buffer,  /* Pointer to the write data */
   DWORD SectorNumber,  /* Sector number to write */
   BYTE SectorCount     /* Number of sectors to write */
 );
@@ -31,7 +31,7 @@ DRESULT disk_write (
 
Buffer

 
Pointer to the data to be written.

 
SectorNumber
-
Specifies the start sector number in logical block address.

+
Specifies the start sector number in logical block address (LBA).

 
SectorCount

 
Specifies the number of sectors to write. The value can be 1 to 255.

 
diff --git a/doc/en/fattime.html b/doc/en/fattime.html
index 39081ab..01bda3d 100644
--- a/doc/en/fattime.html
+++ b/doc/en/fattime.html
@@ -28,13 +28,13 @@ DWORD get_fattime (void);
 
bit24:21

 
Month (1..12)

 
bit20:16

-
Date (1..31)

+
Day in month(1..31)

 
bit15:11

 
Hour (0..23)

 
bit10:5

 
Minute (0..59)

 
bit4:0

-
Second/2 (0..29)

+
Second / 2 (0..29)

 
 
 
diff --git a/doc/en/filename.html b/doc/en/filename.html
index 20127d2..ab54249 100644
--- a/doc/en/filename.html
+++ b/doc/en/filename.html
@@ -34,10 +34,10 @@
 


 

 
Correspondence between logical/physical drive

-
In default, the FatFs module has work areas that called `file system object' for each logical drive. The logical drive is bound simply to the physical drive that has same drive number, and first partition is mounted. When _MULTI_PARTITION is specified in configuration option, each individual logical drive can be bound to any physical drive/partition. In this case, a drive number resolution table must be defined as follows:

+
In default, the FatFs module has work areas that called file system object for each logical drive. The logical drive is bound to the physical drive that has same drive number, and the first partition is mounted. When _MULTI_PARTITION is specified in configuration option, each individual logical drive can be bound to any physical drive/partition. In this case, a drive number resolution table must be defined as follows:

 
 Example: Logical drive 0-2 are assigned to three pri-partitions on the physical drive 0 (fixed disk)
-         Logical drive 3 is assigned to physical drive 0 (removable disk)
+         Logical drive 3 is assigned to physical drive 1 (removable disk)
 
 const PARTITION Drives[] = {
     {0, 0},     /* Logical drive 0 ==> Physical drive 0, 1st partition */
diff --git a/doc/en/getfree.html b/doc/en/getfree.html
index 7d25fe0..ab91028 100644
--- a/doc/en/getfree.html
+++ b/doc/en/getfree.html
@@ -30,7 +30,7 @@ FRESULT f_getfree (
 
Clusters

 
Pointer to the DWORD variable to store number of free clusters.

 
FileSystemObject

-
Pointer to the pointer that to be stored the pointer to corresponding file system object.

+
Pointer to pointer that to store a pointer to the corresponding file system object.

 
 

 
@@ -56,7 +56,7 @@ FRESULT f_getfree (
 
 

 
Descriptions

-
The f_getfree function gets number of free clusters on the drive. The sects_clust member in the file system object refreting number of sectors per cluster, so that the free space in unit of sector can be calcurated with this. When _USE_FSINFO option is enabled, this function can return inaccurate free cluster count on FAT32 volume. When _USE_FSINFO option is disabled, this function will take a time on FAT32 volume.

+
The f_getfree function gets number of free clusters on the drive. The sects_clust member in the file system object is refreting number of sectors per cluster, so that the free space in unit of sector can be calcurated with this. When _USE_FSINFO option is enabled, this function might return an inaccurate free cluster count on FAT32 volume. When it is disabled, this function will take a time on FAT32 volume.

 
This function is not supported in read-only configuration and minimization level of >= 1.

 

 
diff --git a/doc/en/lseek.html b/doc/en/lseek.html
index 1d76eea..0a81d71 100644
--- a/doc/en/lseek.html
+++ b/doc/en/lseek.html
@@ -12,7 +12,8 @@
 
 

 
f_lseek

-
The f_lseek functione moves the file read/write pointer of an open file object.

+
The f_lseek function moves the file read/write pointer of an open file object. It can also be used to extend the file size (cluster pre-allocation).

+
 
 FRESULT f_lseek (
   FIL* FileObject,   /* Pointer to the file object structure *
@@ -78,7 +79,7 @@ FRESULT f_lseek (
 
 

 
References

-
f_open, FIL

+
f_open, f_truncate, FIL

 

 
 
Return

diff --git a/doc/en/mkfs.html b/doc/en/mkfs.html
index 57d9f63..1c98f57 100644
--- a/doc/en/mkfs.html
+++ b/doc/en/mkfs.html
@@ -63,7 +63,7 @@ FRESULT f_mkfs (
 

 
Description

 
The f_mkfs function creates a FAT file system on the drive. There are two partitioning rules, FDISK and SFD, for removable media. It can be selected with an argument. The FDISK format is recommended for most case. This function currently does not support multiple partition, so that existing partitions on the physical dirve will be deleted and re-created a partition occupies entire disk space.

-
The FAT type, FAT12/FAT16/FAT32, is determined by only how many clusters on the drive and nothing else, according to the FAT specification issued by Microsoft. Thus which FAT type is selected, is depends on the drive size and specified cluster size. The cluster size affects performance of file system and large cluster increases the performance, so that 32768 bytes per cluster is recommended for most case except for small drive.

+
The FAT sub-type, FAT12/FAT16/FAT32, is determined by only how many clusters on the drive and nothing else, according to the FAT specification issued by Microsoft. Thus which FAT sub-type is selected, is depends on the drive size and specified cluster size. The cluster size affects performance of file system and large cluster increases the performance, so that 32768 bytes per cluster is recommended for most case except for small drive.

 
This function is supported on only FatFs with _USE_MKFS option.

 

 
diff --git a/doc/en/mount.html b/doc/en/mount.html
index 72ea811..aed5691 100644
--- a/doc/en/mount.html
+++ b/doc/en/mount.html
@@ -44,8 +44,8 @@ FRESULT f_mount (
 
 

 
Description

-
The f_mount function registers/unregisters a work area to the FatFs module. The work area must be given to the logical drive with this function before using any file function. To unregister a work area, specify a NULL to the FileSystemObject, and then the work area can be discarded.

-
This function only initializes the work area and registers its address to the internal table, any access to the disk I/O layer does not occure. Actual mounting process is performed in any other file funcitons with path name when it is needed.

+
The f_mount function registers/unregisters a work area to the FatFs module. The work area must be given to the logical drive with this function before any other file function. To unregister a work area, specify a NULL to the FileSystemObject, and then the work area can be discarded.

+
This function only initializes the work area and registers its address to the internal table, any access to the disk I/O layer does not occure. The actual mounting process is performed depends on requirement in any other file funcitons with path name.

 

 
 
diff --git a/doc/en/open.html b/doc/en/open.html
index 43c0d73..c44488b 100644
--- a/doc/en/open.html
+++ b/doc/en/open.html
@@ -61,7 +61,10 @@ FRESULT f_open (
 
FR_EXIST

 
The file is already existing.

 
FR_DENIED

-
The required access was denied due to any of following reasons: write mode open of a file that has read-only attribute, file creation under existing a same name directory or read-only file, cannot be created due to the directory table or disk full.

+
The required access was denied due to one of the following reasons:
+
  • Write mode open of a read-only file.
    • 
+
  • File cannot be created due to a read-only file or same name directory is existing.
    • 
+
  • File cannot be created due to the directory table or disk is full.

 
FR_NOT_READY

 
The disk drive cannot work due to no medium in the drive or any other reason.

 
FR_WRITE_PROTECTED

@@ -78,8 +81,8 @@ FRESULT f_open (
 
 

 
Description

-
The created file object is used for subsequent calls to refer to the file. When close an open file object, use f_close function.

-
Before using any file function, work area (file system object) must be given to each logical drive with f_mount function. All file functions can work after this procedure.

+
The created file object is used for subsequent calls to refer to the file. When close an open file object, use f_close function. If modified file is not closed correctly, the file will be collapsed.

+
Before using any file function, a work area (file system object) must be given to the logical drive with f_mount function. All file functions can work after this procedure.

 
The mode flags, FA_WRITE, FA_CREATE_ALWAYS, FA_CREATE_NEW, FA_OPEN_ALWAYS, are not supported in read-only configuration.

 

 
diff --git a/doc/en/read.html b/doc/en/read.html
index 21765a9..fa4984e 100644
--- a/doc/en/read.html
+++ b/doc/en/read.html
@@ -44,7 +44,7 @@ FRESULT f_read (
 
FR_OK (0)

 
The function succeeded.

 
FR_DENIED

-
The function denied due to the file has been opened in write only mode.

+
The function denied due to the file has been opened in non-read mode.

 
FR_RW_ERROR

 
The function failed due to a disk error or an internal error.

 
FR_NOT_READY

diff --git a/doc/en/sfileinfo.html b/doc/en/sfileinfo.html
index 0d18636..a0dc8f7 100644
--- a/doc/en/sfileinfo.html
+++ b/doc/en/sfileinfo.html
@@ -15,11 +15,11 @@
 
The FILINFO structure holds a file information returned by f_stat() and f_readdir().

 
 typedef struct _FILINFO {
-    DWORD fsize;            // Size
-    WORD fdate;             // Date
-    WORD ftime;             // Time
-    BYTE fattrib;           // Attribute
-    char fname[8+1+3+1];    // Name
+    DWORD fsize;            /* Size */
+    WORD fdate;             /* Date */
+    WORD ftime;             /* Time */
+    BYTE fattrib;           /* Attribute */
+    char fname[8+1+3+1];    /* Name */
 } FILINFO;
 

 

@@ -29,11 +29,29 @@ typedef struct _FILINFO {
 
fsize

 
Indicates size of the file in unit of byte. This is always zero when it is a directory.

 
fdate

-
Indicates the date that the file was modified or the directory was created.

+
Indicates the date that the file was modified or the directory was created.

+

+
bit15:9

+
Year from 1980 (0..127)

+
bit8:5

+
Month (1..12)

+
bit4:0

+
Day (1..31)

+

+

 
ftime

-
Indicates the time that the file was modified or the directory was created.

+
Indicates the time that the file was modified or the directory was created.

+

+
bit15:11

+
Hour (0..23)

+
bit10:5

+
Minute (0..59)

+
bit4:0

+
Second / 2 (0..29)

+

+

 
fattrib

-
Indicates the file/directory attribute in combination of AM_DIR, AM_RDO, AM_HID, AM_SYS and AM_ARC.

+
Indicates the file/directory attribute in combination of AM_DIR, AM_RDO, AM_HID, AM_SYS and AM_ARC.

 
fname[]

 
Indicates the file/directory name in 8.3 format null-terminated string.

 
diff --git a/doc/en/truncate.html b/doc/en/truncate.html
new file mode 100644
index 0000000..847f3b1
--- /dev/null
+++ b/doc/en/truncate.html
@@ -0,0 +1,63 @@
+
+
+
+
+
+
+
+FatFs - f_truncate
+
+
+
+
+

+
f_truncate

+
The f_truncate function truncates the file size.

+
+FRESULT f_truncate (
+  FIL* FileObject     /* Pointer to the file object */
+);
+

+

+
+

+
Parameters

+

+
FileObject

+
Pointer to the open file object to be truncated.

+

+

+
+
+

+
Return Values

+

+
FR_OK (0)

+
The function succeeded.

+
FR_DENIED

+
The file has been opened in read-only mode.

+
FR_RW_ERROR

+
The function failed due to a disk error or an internal error.

+
FR_NOT_READY

+
The disk drive cannot work due to no medium in the drive or any other reason.

+
FR_INVALID_OBJECT

+
The file object is invalid.

+

+

+
+
+

+
Description

+
The f_truncate function truncates the file size to the current file R/W point. When the file R/W pointer is pointing end of the file, there is no effect. This function is not supported in read-only configuration and minimization level of >=1.

+

+
+
+

+
References

+
f_open, f_lseek, FIL

+

+
+
+
Return

+
+
diff --git a/doc/en/unlink.html b/doc/en/unlink.html
index 9346296..33a0e73 100644
--- a/doc/en/unlink.html
+++ b/doc/en/unlink.html
@@ -43,7 +43,8 @@ FRESULT f_unlink (
 
FR_INVALID_DRIVE

 
The drive number is invalid.

 
FR_DENIED

-
The function was denied due to either of following reasons: the file or directory has read-only attribute, the directory is not empty.

+
The function was denied due to either of following reasons:
+
  • The file or directory has read-only attribute
  • The directory is not empty.

 
FR_NOT_READY

 
The disk drive cannot work due to no medium in the drive or any other reason.

 
FR_WRITE_PROTECTED

diff --git a/doc/en/utime.html b/doc/en/utime.html
new file mode 100644
index 0000000..b203581
--- /dev/null
+++ b/doc/en/utime.html
@@ -0,0 +1,75 @@
+
+
+
+
+
+
+
+FatFs - f_utime
+
+
+
+
+

+
f_utime

+
The f_utime function changes the timestamp of a file or directory.

+
+FRESULT f_utime (
+  const char* FileName,    /* Pointer to the file or directory path */
+  const FILINFO* TimeDate  /* Time and data to be set */
+);
+

+

+
+

+
Parameter

+

+
FileName

+
Pointer to the null-terminated string that specifies a file or directory to be changed.

+
TimeDate

+
Pointer to the file information structure that has a timestamp to be set in member fdate and ftime. Do not care any other members.

+

+

+
+
+

+
Return Values

+

+
FR_OK (0)

+
The function succeeded.

+
FR_NO_FILE

+
Could not find the file.

+
FR_NO_PATH

+
Could not find the path.

+
FR_INVALID_NAME

+
The file name is invalid.

+
FR_INVALID_DRIVE

+
The drive number is invalid.

+
FR_NOT_READY

+
The disk drive cannot work due to no medium in the drive or any other reason.

+
FR_WRITE_PROTECTED

+
The medium is write protected.

+
FR_RW_ERROR

+
The function failed due to a disk error or an internal error.

+
FR_NOT_ENABLED

+
The logical drive has no work area.

+
FR_NO_FILESYSTEM

+
There is no valid FAT partition on the disk.

+

+

+
+
+

+
Description

+
The f_utime function changes the timestamp of a file or directory. This function is not supported in read-only configuration and minimization level of >=1.

+

+
+
+

+
References

+
f_stat, FILINFO

+

+
+
Return

+
+
diff --git a/doc/en/write.html b/doc/en/write.html
index 8fd3d5c..3e14a5b 100644
--- a/doc/en/write.html
+++ b/doc/en/write.html
@@ -44,7 +44,7 @@ FRESULT f_write (
 
FR_OK (0)

 
The function succeeded.

 
FR_DENIED

-
The function denied due to the file has been opened in read only mode.

+
The function denied due to the file has been opened in non-write mode.

 
FR_RW_ERROR

 
The function failed due to a disk error or an internal error.

 
FR_NOT_READY

diff --git a/doc/img/f4.png b/doc/img/f4.png
index 35716ff..f9a6b46 100644
Binary files a/doc/img/f4.png and b/doc/img/f4.png differ
diff --git a/doc/img/f5.png b/doc/img/f5.png
index 855917a..b110b29 100644
Binary files a/doc/img/f5.png and b/doc/img/f5.png differ
diff --git a/doc/img/rwtest.png b/doc/img/rwtest.png
index d2e646f..f3cacfb 100644
Binary files a/doc/img/rwtest.png and b/doc/img/rwtest.png differ
diff --git a/doc/ja/appnote.html b/doc/ja/appnote.html
index e55eb8a..c99a125 100644
--- a/doc/ja/appnote.html
+++ b/doc/ja/appnote.html
@@ -18,30 +18,30 @@
 
 
 
 

-
メモリ使用量 (R0.05)

-
各種環境でのモジュールのメモリ使用量の例を示します。数値の単位はバイトで、Dは論理ドライブ数、Fは同時オープン・ファイル数を示します。最適化オプションは、全てコード・サイズとしています。

+
メモリ使用量 (R0.05a)

+
各種環境でのモジュールのメモリ使用量の例を示します。数値の単位はバイトで、Dは論理ドライブ数、Fは同時オープン・ファイル数を示します。最適化オプションはコード・サイズとしています。

 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
AVRH8/300HMSP430TLCS-870/CV850ESSH2
コンパイラgccCH38CL430CC870CCA850SHC
_MCU_ENDIAN122112
FatFs コード
(標準, R/W構成)		8810888064187830
FatFs コード
(最小, R/W構成)		5832574840725366
FatFs コード
(標準, R/O構成)		4264411029903420
FatFs コード
(最小, R/O構成)		3052312421942634
FatFs 静的ワークD*2 + 2D*4 + 2D*4 + 2D*4 + 2
FatFs 動的ワークD*554 + F*544D*554 + F*550D*554 + F*550D*554 + F*550
Tiny-FatFs コード
(標準, R/W構成)		73767274662288545670
Tiny-FatFs コード
(最小, R/W構成)		48664826435461763726
Tiny-FatFs コード
(標準, R/O構成)		36543554322043582710
Tiny-FatFs コード
(最小, R/O構成)		26202708240233291910
Tiny-FatFs 静的ワーク46446
Tiny-FatFs 動的ワーク544 + F*28544 + F*32544 + F*28544 + F*28544 + F*32
AVRH8/300HPICMSP430TLCS-870/CV850ESSH2
コンパイラgccCH38C30(gcc)CL430CC870CCA850SHC
_MCU_ENDIAN1222112
FatFs Code
(Full, R/W)		91469218915566627430
FatFs Code
(Minimum, R/W)		58245756586140964710
FatFs Code
(Full, R/O)		42684116418729863382
FatFs Code
(Minimum, R/O)		30763134314322002610
FatFs Work (Static)D*2+2D*4+2D*2+2D*4+2D*4+2
FatFs Work (Dynamic)D*554+F*544D*554+F*550D*554+F*544D*554+F*550D*554+F*550
Tiny-FatFs Code
(Full, R/W)		7566762673716894931459266580
Tiny-FatFs Code
(Minimum, R/W)		4730481446834306628536704236
Tiny-FatFs Code
(Full, R/O)		3564353235223226438926783022
Tiny-FatFs Code
(Minimum, R/O)		2554267425952372337618562300
Tiny-FatFs Wrok (Static)4644466
Tiny-FatFs Work (Dynamic)544+F*28544+F*32544+F*28544+F*28544+F*28544+F*32544+F*32

 

 

 
@@ -51,9 +51,9 @@ FatFs
 

 
-
+
-
+

 
メモリ容量FATタイプ
<= 64MBFAT12
64MB以下FAT12

 
128MB〜2GBFAT16
>= 4GBFAT32
4GB以上FAT32

 

 

 
2GBまでのカードに限るなら、FAT32への対応は不要です。右の表にメモリ・カードの容量と規定のFATタイプ(SDメモリの場合)を示します。メモリ・カードの出荷時は、最大のパフォーマンスが出るようにデータ領域の境界が調整されたフォーマットになっています。したがって、PCでフォーマットするなどして規定と違うフォーマットになると、書き込み性能が大幅に低下する場合があるので注意が必要です。

@@ -88,7 +88,7 @@ FatFs
 fig.4
 
 

-図5. 短くしたクリチカル・セクション

+図5. 最小化したクリチカル・セクション

 fig.5
 

 

diff --git a/doc/ja/getfree.html b/doc/ja/getfree.html
index 441345b..0f43c00 100644
--- a/doc/ja/getfree.html
+++ b/doc/ja/getfree.html
@@ -56,7 +56,7 @@ FRESULT f_getfree (
 
 

 
解説

-
論理ドライブ上の空きクラスタ数を取得します。返されたファイル・システム・オブジェクトのsects_clustメンバがクラスタあたりのセクタ数を示しているので、これを元に実際の空きサイズが計算できます。FAT32ボリュームにおいて、_USE_FSINFOが指定されている場合、不正確な値を返す場合があります。指定されていない場合、処理に時間がかかります。

+
論理ドライブ上の空きクラスタ数を取得します。返されたファイル・システム・オブジェクトのsects_clustメンバがクラスタあたりのセクタ数を示しているので、これを元に実際の空きサイズが計算できます。FAT32ボリュームにおいて、_USE_FSINFOが指定されているときは不正確な値を返す可能性があり、指定されていないときは処理に時間がかかります。

 
リードオンリー構成および_FS_MINIMIZE >= 1ではこの関数はサポートされません。

 

 
diff --git a/doc/ja/open.html b/doc/ja/open.html
index 57e13e7..1f29bd4 100644
--- a/doc/ja/open.html
+++ b/doc/ja/open.html
@@ -78,7 +78,7 @@ FRESULT f_open (
 
 

 
解説

-
作成されたファイル・オブジェクトは、以降そのファイルに対するアクセスに使用します。ファイルを閉じるときは、f_close()を使用します。

+
作成されたファイル・オブジェクトは、以降そのファイルに対するアクセスに使用します。ファイルを閉じるときは、f_close()を使用します。書き込みが行われたファイルが閉じられなかった場合、そのファイルは破損します。

 
ファイル操作関数を使用する前にまず、f_mount()を使ってそれぞれの論理ドライブにワーク・エリア(ファイル・システム・オブジェクト)を与えなければなりません。この初期化の後、その論理ドライブに対して全てのファイル関数が使えるようになります。

 
リードオンリー構成では、FA_WRITE, FA_CREATE_ALWAYS, FA_CREATE_NEW, FA_OPEN_ALWAYSの各フラグはサポートされません。

 

diff --git a/doc/ja/sfileinfo.html b/doc/ja/sfileinfo.html
index d9d94f5..689bf6c 100644
--- a/doc/ja/sfileinfo.html
+++ b/doc/ja/sfileinfo.html
@@ -29,9 +29,27 @@ typedef struct _FILINFO {
 
fsize

 
ファイルのバイト単位のサイズが格納されます。ディレクトリの場合は常に0です。

 
fdate

-
ファイルの変更された日付、またはディレクトリの作成された日付が格納されます。

+
ファイルの変更された日付、またはディレクトリの作成された日付が格納されます。

+

+
bit15:9

+
1980年を起点とした年が 0..127 で入ります。

+
bit8:5

+
月が 1..12 の値で入ります。

+
bit4:0

+
日が 1..31 の値で入ります。

+

+

 
ftime

-
ファイルの変更された時刻、またはディレクトリの作成された時刻が格納されます。

+
ファイルの変更された時刻、またはディレクトリの作成された時刻が格納されます。

+

+
bit15:11

+
時が 0..23 の値で入ります。

+
bit10:5

+
分が 0..59 の値で入ります。

+
bit4:0

+
秒/2が 0..29 の値で入ります。

+

+

 
fattrib

 
属性フラグが格納されます。フラグはAM_DIR, AM_RDO, AM_HID, AM_SYS, AM_ARCの組み合わせとなります。

 
fname[]

diff --git a/doc/ja/truncate.html b/doc/ja/truncate.html
new file mode 100644
index 0000000..bf07a5d
--- /dev/null
+++ b/doc/ja/truncate.html
@@ -0,0 +1,63 @@
+
+
+
+
+
+
+
+FatFs - f_truncate
+
+
+
+
+

+
f_truncate

+
ファイル長を切り詰めます。

+
+FRESULT f_truncate (
+  FIL* FileObject     /* ファイル・オブジェクトへのポインタ */
+);
+

+

+
+

+
引数

+

+
FileObject

+
切り詰め対象ファイルのファイル・オブジェクトへのポインタ

+

+

+
+
+

+
戻り値

+

+
FR_OK (0)

+
正常終了。

+
FR_DENIED

+
ファイルが非書き込みモードで開かれている。

+
FR_RW_ERROR

+
ディスク・エラーまたは内部エラーによる失敗。

+
FR_NOT_READY

+
メディアがセットされていないなど、物理ドライブが動作不能状態。

+
FR_INVALID_OBJECT

+
無効なファイル・オブジェクト。

+

+

+
+
+

+
解説

+
ファイルの長さが現在のファイルR/Wポインタに切り詰められます。ファイルR/Wポインタがファイルの終端を指しているときは、この関数は何の効果も持ちません。リード・オンリー構成および_FS_MINIMIZE >= 1ではこの関数はサポートされません。

+

+
+
+

+
参照

+
f_open, f_lseek, FIL

+

+
+
+
Return

+
+
diff --git a/doc/ja/utime.html b/doc/ja/utime.html
new file mode 100644
index 0000000..f46c165
--- /dev/null
+++ b/doc/ja/utime.html
@@ -0,0 +1,75 @@
+
+
+
+
+
+
+
+FatFs - f_utime
+
+
+
+
+

+
f_utime

+
ファイルまたはディレクトリのタイムスタンプを変更します。

+
+FRESULT f_utime (
+  const char* FileName,    /* ファイルまたはディレクトリ名へのポインタ */
+  const FILINFO* TimeDate  /* 設定する日付 */
+);
+

+

+
+

+
引数

+

+
FileName

+
変更対象のファイルまたはディレクトリのフルパス名の入った'\0'で終わる文字列を指定します。

+
TimeDate

+
設定する日付と時間をfdateとftimeメンバに設定されたFILINFO構造体へのポインタ。他のメンバはDon't careです。

+

+

+
+
+

+
戻り値

+

+
FR_OK (0)

+
正常終了。

+
FR_NO_FILE

+
ファイルが見つからない。

+
FR_NO_PATH

+
パスが見つからない。

+
FR_INVALID_NAME

+
パス名が不正。

+
FR_INVALID_NAME

+
ドライブ番号が不正。

+
FR_NOT_READY

+
メディアがセットされていないなど、ディスク・ドライブが動作不能状態。

+
FR_WRITE_PROTECTED

+
メディアが書き込み禁止状態。

+
FR_RW_ERROR

+
ディスク・エラーまたは内部エラーによる失敗。

+
FR_NOT_ENABLED

+
その論理ドライブにワーク・エリアが与えられていない。

+
FR_NO_FILESYSTEM

+
ディスク上に有効なFATパーテーションが見つからない。

+

+

+
+
+

+
解説

+
ファイルまたはディレクトリのタイムスタンプを変更します。リード・オンリー構成および_FS_MINIMIZE >= 1ではこの関数はサポートされません。

+

+
+
+

+
参照

+
f_stat, FILINFO

+

+
+
戻る

+
+
diff --git a/doc/updates.txt b/doc/updates.txt
index 1e1ba1f..49b943d 100644
--- a/doc/updates.txt
+++ b/doc/updates.txt
@@ -1,8 +1,15 @@
+R0.05a, Feb 03, 2008
+  Added f_truncate.
+  Added f_utime.
+  Fixed off by one error at FAT sub-type determination.
+  Fixed btr in f_read can be mistruncated.
+  Fixed cached sector is left not flushed when create and close without write.
+
 R0.05, Aug 26, 2007
   Changed arguments of f_read, f_write.
   Changed arguments of f_mkfs. (FatFs)
   Fixed f_mkfs on FAT32 creates incorrect FSInfo. (FatFs)
-  Fixed f_mkdir on FAT32 creates incorrect directory.  (FatFs)
+  Fixed f_mkdir on FAT32 creates incorrect directory. (FatFs)
 
 R0.04b, May 05, 2007
   Added _USE_NTFLAG option.
diff --git a/src/00readme.txt b/src/00readme.txt
index 8458f29..1934e6a 100644
--- a/src/00readme.txt
+++ b/src/00readme.txt
@@ -1,4 +1,4 @@
-FatFs/Tiny-FatFs Module Source Files R0.05   (C)ChaN, 2007
+FatFs/Tiny-FatFs Module Source Files R0.05a   (C)ChaN, 2008
 
 
 FILES
@@ -67,20 +67,21 @@ CONFIGURATION OPTIONS
 
   _USE_FSINFO
 
-  When _USE_FSINFO is set to 1, FSInfo is used for FAT32 volume.
-
+  When _USE_FSINFO is set to 1, FSInfo is used for FAT32 volume. The initial
+  value is 0. (FSInfo is not used)
 
   _USE_SJIS
 
   When _USE_SJIS is set to 1, Shift_JIS code set can be used as a file name,
-  otherwire second byte of double-byte characters will be collapted.
-  The initial value is 1.
+  otherwire second byte of double-byte characters will be collapted. The
+  initial value is 1.
 
 
   _USE_NTFLAG
 
   When _USE_NTFLAG is set to 1, upper/lower case of the file/dir name is
   preserved. Note that the files are always accessed in case insensitive.
+  The initial value is 1.
 
 
   _USE_MKFS
@@ -90,7 +91,7 @@ CONFIGURATION OPTIONS
   The initial value is 0. (f_mkfs is not available)
 
 
-  Following table shows which function is removed by configuratin options.
+  Following table shows which function is removed by configuration options.
 
                 _FS_MINIMIZE   _FS_READONLY  _USE_MKFS 
                 (1)  (2)  (3)       (1)         (0)    
@@ -105,9 +106,11 @@ CONFIGURATION OPTIONS
    f_readdir          x    x                           
    f_stat        x    x    x                           
    f_getfree     x    x    x         x                 
+   f_truncate    x    x    x         x                 
    f_unlink      x    x    x         x                 
    f_mkdir       x    x    x         x                 
    f_chmod       x    x    x         x                 
+   f_utime       x    x    x         x                 
    f_rename      x    x    x         x                 
    f_mkfs        x    x    x         x          x      
 
@@ -117,8 +120,8 @@ AGREEMENTS
 
   The FatFs/Tiny-FatFs module is a free software and there is no warranty.
   The FatFs/Tiny-FatFs module is opened for education, reserch and development.
-  You can use and/or modify it for personal, non-profit or profit use without
-  any restriction under your responsibility.
+  You can use and/or modify it for personal, non-profit or commercial use
+  without any restriction under your responsibility.
 
 
 
@@ -162,3 +165,9 @@ REVISION HISTORY
                        Changed arguments of f_mkfs. (FatFs)
                        Fixed f_mkfs on FAT32 creates incorrect FSInfo. (FatFs)
                        Fixed f_mkdir on FAT32 creates incorrect directory. (FatFs)
+
+  Feb 03, 2008  R0.05a Added f_truncate().
+                       Added f_utime().
+                       Fixed off by one error at FAT sub-type determination.
+                       Fixed btr in f_read() can be mistruncated.
+                       Fixed cached sector is not flushed when create and close without write.
diff --git a/src/diskio.c b/src/diskio.c
index 3044a41..4635a15 100644
--- a/src/diskio.c
+++ b/src/diskio.c
@@ -8,7 +8,7 @@
 #include "diskio.h"
 
 /*-----------------------------------------------------------------------*/
-/* Correspondence between drive number and physical drive                */
+/* Correspondence between physical drive number and physical drive.      */
 /* Note that Tiny-FatFs supports only single drive and always            */
 /* accesses drive number 0.                                              */
 
@@ -92,8 +92,8 @@ DSTATUS disk_status (
 DRESULT disk_read (
 	BYTE drv,		/* Physical drive nmuber (0..) */
 	BYTE *buff,		/* Data buffer to store read data */
-	DWORD sector,	/* Sector number (LBA) */
-	BYTE count		/* Sector count (1..255) */
+	DWORD sector,	/* Sector address (LBA) */
+	BYTE count		/* Number of sectors to read (1..255) */
 )
 {
 	DRESULT res;
@@ -130,8 +130,8 @@ DRESULT disk_read (
 DRESULT disk_write (
 	BYTE drv,			/* Physical drive nmuber (0..) */
 	const BYTE *buff,	/* Data to be written */
-	DWORD sector,		/* Sector number (LBA) */
-	BYTE count			/* Sector count (1..255) */
+	DWORD sector,		/* Sector address (LBA) */
+	BYTE count			/* Number of sectors to write (1..255) */
 )
 {
 	DRESULT res;
diff --git a/src/diskio.h b/src/diskio.h
index f28c9be..d02178d 100644
--- a/src/diskio.h
+++ b/src/diskio.h
@@ -1,5 +1,5 @@
 /*-----------------------------------------------------------------------
-/  Low level disk interface modlue include file  R0.05   (C)ChaN, 2007
+/  Low level disk interface modlue include file  R0.05x  (C)ChaN, 2007
 /-----------------------------------------------------------------------*/
 
 #ifndef _DISKIO
diff --git a/src/ff.c b/src/ff.c
index 7c1b2c0..2ca7adc 100644
--- a/src/ff.c
+++ b/src/ff.c
@@ -1,11 +1,11 @@
 /*--------------------------------------------------------------------------/
-/  FatFs - FAT file system module  R0.05                     (C)ChaN, 2007
+/  FatFs - FAT file system module  R0.05a                    (C)ChaN, 2008
 /---------------------------------------------------------------------------/
 / The FatFs module is an experimenal project to implement FAT file system to
 / cheap microcontrollers. This is a free software and is opened for education,
 / research and development under license policy of following trems.
 /
-/  Copyright (C) 2007, ChaN, all right reserved.
+/  Copyright (C) 2008, ChaN, all right reserved.
 /
 / * The FatFs module is a free software and there is no warranty.
 / * You can use, modify and/or redistribute it for personal, non-profit or
@@ -14,15 +14,19 @@
 /
 /---------------------------------------------------------------------------/
 /  Feb 26, 2006  R0.00  Prototype.
+/
 /  Apr 29, 2006  R0.01  First stable version.
+/
 /  Jun 01, 2006  R0.02  Added FAT12 support.
 /                       Removed unbuffered mode.
 /                       Fixed a problem on small (<32M) patition.
 /  Jun 10, 2006  R0.02a Added a configuration option (_FS_MINIMUM).
+/
 /  Sep 22, 2006  R0.03  Added f_rename().
 /                       Changed option _FS_MINIMUM to _FS_MINIMIZE.
 /  Dec 11, 2006  R0.03a Improved cluster scan algolithm to write files fast.
 /                       Fixed f_mkdir() creates incorrect directory on FAT32.
+/
 /  Feb 04, 2007  R0.04  Supported multiple drive system.
 /                       Changed some interfaces for multiple drive system.
 /                       Changed f_mountdrv() to f_mount().
@@ -35,9 +39,15 @@
 /                       Added FSInfo support.
 /                       Fixed DBCS name can result FR_INVALID_NAME.
 /                       Fixed short seek (<= csize) collapses the file object.
+/
 /  Aug 25, 2007  R0.05  Changed arguments of f_read(), f_write() and f_mkfs().
 /                       Fixed f_mkfs() on FAT32 creates incorrect FSInfo.
 /                       Fixed f_mkdir() on FAT32 creates incorrect directory.
+/  Feb 03, 2008  R0.05a Added f_truncate().
+/                       Added f_utime().
+/                       Fixed off by one error at FAT sub-type determination.
+/                       Fixed btr in f_read() can be mistruncated.
+/                       Fixed cached sector is not flushed when create and close without write.
 /---------------------------------------------------------------------------*/
 
 #include 
@@ -63,10 +73,10 @@ WORD fsid;				/* File system mount ID */
 /*-----------------------------------------------------------------------*/
 
 static
-BOOL move_window (		/* TRUE: successful, FALSE: failed */
-	FATFS *fs,			/* File system object */
-	DWORD sector		/* Sector number to make apperance in the fs->win[] */
-)						/* Move to zero only writes back dirty window */
+BOOL move_window (	/* TRUE: successful, FALSE: failed */
+	FATFS *fs,		/* File system object */
+	DWORD sector	/* Sector number to make apperance in the fs->win[] */
+)					/* Move to zero only writes back dirty window */
 {
 	DWORD wsect;
 
@@ -105,8 +115,8 @@ BOOL move_window (		/* TRUE: successful, FALSE: failed */
 
 #if !_FS_READONLY
 static
-FRESULT sync (			/* FR_OK: successful, FR_RW_ERROR: failed */
-	FATFS *fs			/* File system object */
+FRESULT sync (	/* FR_OK: successful, FR_RW_ERROR: failed */
+	FATFS *fs	/* File system object */
 )
 {
 	fs->winflag = 1;
@@ -126,7 +136,8 @@ FRESULT sync (			/* FR_OK: successful, FR_RW_ERROR: failed */
 	}
 #endif
 	/* Make sure that no pending write process in the physical drive */
-	if (disk_ioctl(fs->drive, CTRL_SYNC, NULL) != RES_OK) return FR_RW_ERROR;
+	if (disk_ioctl(fs->drive, CTRL_SYNC, NULL) != RES_OK)
+		return FR_RW_ERROR;
 	return FR_OK;
 }
 #endif
@@ -139,37 +150,37 @@ FRESULT sync (			/* FR_OK: successful, FR_RW_ERROR: failed */
 /*-----------------------------------------------------------------------*/
 
 static
-DWORD get_cluster (		/* 0,>=2: successful, 1: failed */
-	FATFS *fs,			/* File system object */
-	DWORD clust			/* Cluster# to get the link information */
+DWORD get_cluster (	/* 0,>=2: successful, 1: failed */
+	FATFS *fs,		/* File system object */
+	DWORD clust		/* Cluster# to get the link information */
 )
 {
 	WORD wc, bc;
 	DWORD fatsect;
 
 
-	if (clust >= 2 && clust < fs->max_clust) {		/* Valid cluster# */
+	if (clust >= 2 && clust < fs->max_clust) {		/* Is it a valid cluster#? */
 		fatsect = fs->fatbase;
 		switch (fs->fs_type) {
 		case FS_FAT12 :
 			bc = (WORD)clust * 3 / 2;
-			if (!move_window(fs, fatsect + (bc / S_SIZ))) break;
-			wc = fs->win[bc & (S_SIZ - 1)]; bc++;
-			if (!move_window(fs, fatsect + (bc / S_SIZ))) break;
-			wc |= (WORD)fs->win[bc & (S_SIZ - 1)] << 8;
+			if (!move_window(fs, fatsect + (bc / SS(fs)))) break;
+			wc = fs->win[bc & (SS(fs) - 1)]; bc++;
+			if (!move_window(fs, fatsect + (bc / SS(fs)))) break;
+			wc |= (WORD)fs->win[bc & (SS(fs) - 1)] << 8;
 			return (clust & 1) ? (wc >> 4) : (wc & 0xFFF);
 
 		case FS_FAT16 :
-			if (!move_window(fs, fatsect + (clust / (S_SIZ / 2)))) break;
-			return LD_WORD(&fs->win[((WORD)clust * 2) & (S_SIZ - 1)]);
+			if (!move_window(fs, fatsect + (clust / (SS(fs) / 2)))) break;
+			return LD_WORD(&fs->win[((WORD)clust * 2) & (SS(fs) - 1)]);
 
 		case FS_FAT32 :
-			if (!move_window(fs, fatsect + (clust / (S_SIZ / 4)))) break;
-			return LD_DWORD(&fs->win[((WORD)clust * 4) & (S_SIZ - 1)]) & 0x0FFFFFFF;
+			if (!move_window(fs, fatsect + (clust / (SS(fs) / 4)))) break;
+			return LD_DWORD(&fs->win[((WORD)clust * 4) & (SS(fs) - 1)]) & 0x0FFFFFFF;
 		}
 	}
 
-	return 1;	/* There is no cluster information, or an error occured */
+	return 1;	/* Out of cluster range, or an error occured */
 }
 
 
@@ -181,10 +192,10 @@ DWORD get_cluster (		/* 0,>=2: successful, 1: failed */
 
 #if !_FS_READONLY
 static
-BOOL put_cluster (		/* TRUE: successful, FALSE: failed */
-	FATFS *fs,			/* File system object */
-	DWORD clust,		/* Cluster# to change */
-	DWORD val			/* New value to mark the cluster */
+BOOL put_cluster (	/* TRUE: successful, FALSE: failed */
+	FATFS *fs,		/* File system object */
+	DWORD clust,	/* Cluster# to change (must be 2 to fs->max_clust-1) */
+	DWORD val		/* New value to mark the cluster */
 )
 {
 	WORD bc;
@@ -196,24 +207,24 @@ BOOL put_cluster (		/* TRUE: successful, FALSE: failed */
 	switch (fs->fs_type) {
 	case FS_FAT12 :
 		bc = (WORD)clust * 3 / 2;
-		if (!move_window(fs, fatsect + (bc / S_SIZ))) return FALSE;
-		p = &fs->win[bc & (S_SIZ - 1)];
+		if (!move_window(fs, fatsect + (bc / SS(fs)))) return FALSE;
+		p = &fs->win[bc & (SS(fs) - 1)];
 		*p = (clust & 1) ? ((*p & 0x0F) | ((BYTE)val << 4)) : (BYTE)val;
 		bc++;
 		fs->winflag = 1; 
-		if (!move_window(fs, fatsect + (bc / S_SIZ))) return FALSE;
-		p = &fs->win[bc & (S_SIZ - 1)];
+		if (!move_window(fs, fatsect + (bc / SS(fs)))) return FALSE;
+		p = &fs->win[bc & (SS(fs) - 1)];
 		*p = (clust & 1) ? (BYTE)(val >> 4) : ((*p & 0xF0) | ((BYTE)(val >> 8) & 0x0F));
 		break;
 
 	case FS_FAT16 :
-		if (!move_window(fs, fatsect + (clust / (S_SIZ / 2)))) return FALSE;
-		ST_WORD(&fs->win[((WORD)clust * 2) & (S_SIZ - 1)], (WORD)val);
+		if (!move_window(fs, fatsect + (clust / (SS(fs) / 2)))) return FALSE;
+		ST_WORD(&fs->win[((WORD)clust * 2) & (SS(fs) - 1)], (WORD)val);
 		break;
 
 	case FS_FAT32 :
-		if (!move_window(fs, fatsect + (clust / (S_SIZ / 4)))) return FALSE;
-		ST_DWORD(&fs->win[((WORD)clust * 4) & (S_SIZ - 1)], val);
+		if (!move_window(fs, fatsect + (clust / (SS(fs) / 4)))) return FALSE;
+		ST_DWORD(&fs->win[((WORD)clust * 4) & (SS(fs) - 1)], val);
 		break;
 
 	default :
@@ -233,9 +244,9 @@ BOOL put_cluster (		/* TRUE: successful, FALSE: failed */
 
 #if !_FS_READONLY
 static
-BOOL remove_chain (		/* TRUE: successful, FALSE: failed */
-	FATFS *fs,			/* File system object */
-	DWORD clust			/* Cluster# to remove chain from */
+BOOL remove_chain (	/* TRUE: successful, FALSE: failed */
+	FATFS *fs,		/* File system object */
+	DWORD clust		/* Cluster# to remove chain from */
 )
 {
 	DWORD nxt;
@@ -266,7 +277,7 @@ BOOL remove_chain (		/* TRUE: successful, FALSE: failed */
 
 #if !_FS_READONLY
 static
-DWORD create_chain (	/* 0: no free cluster, 1: error, >=2: new cluster number */
+DWORD create_chain (	/* 0: No free cluster, 1: Error, >=2: New cluster number */
 	FATFS *fs,			/* File system object */
 	DWORD clust			/* Cluster# to stretch, 0 means create new */
 )
@@ -340,30 +351,29 @@ DWORD clust2sect (	/* !=0: sector number, 0: failed - invalid cluster# */
 
 static
 BOOL next_dir_entry (	/* TRUE: successful, FALSE: could not move next */
-	DIR *dirobj			/* Pointer to directory object */
+	DIR *dj				/* Pointer to directory object */
 )
 {
 	DWORD clust;
 	WORD idx;
-	FATFS *fs = dirobj->fs;
 
 
-	idx = dirobj->index + 1;
-	if ((idx & ((S_SIZ - 1) / 32)) == 0) {		/* Table sector changed? */
-		dirobj->sect++;			/* Next sector */
-		if (!dirobj->clust) {		/* In static table */
-			if (idx >= fs->n_rootdir) return FALSE;	/* Reached to end of table */
+	idx = dj->index + 1;
+	if ((idx & ((SS(dj->fs) - 1) / 32)) == 0) {		/* Table sector changed? */
+		dj->sect++;				/* Next sector */
+		if (!dj->clust) {		/* In static table */
+			if (idx >= dj->fs->n_rootdir) return FALSE;	/* Reached to end of table */
 		} else {					/* In dynamic table */
-			if (((idx / (S_SIZ / 32)) & (fs->sects_clust - 1)) == 0) {	/* Cluster changed? */
-				clust = get_cluster(fs, dirobj->clust);		/* Get next cluster */
-				if (clust < 2 || clust >= fs->max_clust)	/* Reached to end of table */
+			if (((idx / (SS(dj->fs) / 32)) & (dj->fs->sects_clust - 1)) == 0) {	/* Cluster changed? */
+				clust = get_cluster(dj->fs, dj->clust);			/* Get next cluster */
+				if (clust < 2 || clust >= dj->fs->max_clust)	/* Reached to end of table */
 					return FALSE;
-				dirobj->clust = clust;				/* Initialize for new cluster */
-				dirobj->sect = clust2sect(fs, clust);
+				dj->clust = clust;				/* Initialize for new cluster */
+				dj->sect = clust2sect(dj->fs, clust);
 			}
 		}
 	}
-	dirobj->index = idx;	/* Lower 4 bit of dirobj->index indicates offset in dirobj->sect */
+	dj->index = idx;	/* Lower several bits of dj->index indicates offset in dj->sect */
 	return TRUE;
 }
 
@@ -376,9 +386,9 @@ BOOL next_dir_entry (	/* TRUE: successful, FALSE: could not move next */
 
 #if _FS_MINIMIZE <= 1
 static
-void get_fileinfo (		/* No return code */
-	FILINFO *finfo, 	/* Ptr to store the file information */
-	const BYTE *dir		/* Ptr to the directory entry */
+void get_fileinfo (	/* No return code */
+	FILINFO *finfo, /* Ptr to store the file information */
+	const BYTE *dir	/* Ptr to the directory entry */
 )
 {
 	BYTE n, c, a;
@@ -420,9 +430,9 @@ void get_fileinfo (		/* No return code */
 /*-----------------------------------------------------------------------*/
 
 static
-char make_dirfile (			/* 1: error - detected an invalid format, '\0'or'/': next character */
-	const char **path,		/* Pointer to the file path pointer */
-	char *dirname			/* Pointer to directory name buffer {Name(8), Ext(3), NT flag(1)} */
+char make_dirfile (		/* 1: error - detected an invalid format, '\0'or'/': next character */
+	const char **path,	/* Pointer to the file path pointer */
+	char *dirname		/* Pointer to directory name buffer {Name(8), Ext(3), NT flag(1)} */
 )
 {
 	BYTE n, t, c, a, b;
@@ -450,7 +460,7 @@ char make_dirfile (			/* 1: error - detected an invalid format, '\0'or'/': next
 		    (c >= 0xE0 && c <= 0xFC))) {
 			if (n == 0 && c == 0xE5)		/* Change heading \xE5 to \x05 */
 				c = 0x05;
-			a ^= 1; goto md_l2;
+			a ^= 0x01; goto md_l2;
 		}
 		if (c == '"') break;				/* Reject " */
 		if (c <= ')') goto md_l1;			/* Accept ! # $ % & ' ( ) */
@@ -461,14 +471,14 @@ char make_dirfile (			/* 1: error - detected an invalid format, '\0'or'/': next
 			if (c == '|') break;			/* Reject | */
 			if (c >= '[' && c <= ']') break;/* Reject [ \ ] */
 			if (_USE_NTFLAG && c >= 'A' && c <= 'Z')
-				(t == 8) ? (b &= ~0x08) : (b &= ~0x10);
+				(t == 8) ? (b &= 0xF7) : (b &= 0xEF);
 			if (c >= 'a' && c <= 'z') {		/* Convert to upper case */
 				c -= 0x20;
 				if (_USE_NTFLAG) (t == 8) ? (a |= 0x08) : (a |= 0x10);
 			}
 		}
 	md_l1:
-		a &= ~1;
+		a &= 0xFE;
 	md_l2:
 		if (n >= t) break;
 		dirname[n++] = c;
@@ -485,28 +495,28 @@ char make_dirfile (			/* 1: error - detected an invalid format, '\0'or'/': next
 
 static
 FRESULT trace_path (	/* FR_OK(0): successful, !=0: error code */
-	DIR *dirobj,		/* Pointer to directory object to return last directory */
+	DIR *dj,			/* Pointer to directory object to return last directory */
 	char *fn,			/* Pointer to last segment name to return {file(8),ext(3),attr(1)} */
 	const char *path,	/* Full-path string to trace a file or directory */
-	BYTE **dir			/* Directory pointer in Win[] to retutn */
+	BYTE **dir			/* Pointer to pointer to found entry to retutn */
 )
 {
 	DWORD clust;
 	char ds;
 	BYTE *dptr = NULL;
-	FATFS *fs = dirobj->fs;	/* Get logical drive from the given DIR structure */
+	FATFS *fs = dj->fs;
 
 
 	/* Initialize directory object */
 	clust = fs->dirbase;
 	if (fs->fs_type == FS_FAT32) {
-		dirobj->clust = dirobj->sclust = clust;
-		dirobj->sect = clust2sect(fs, clust);
+		dj->clust = dj->sclust = clust;
+		dj->sect = clust2sect(fs, clust);
 	} else {
-		dirobj->clust = dirobj->sclust = 0;
-		dirobj->sect = clust;
+		dj->clust = dj->sclust = 0;
+		dj->sect = clust;
 	}
-	dirobj->index = 0;
+	dj->index = 0;
 
 	if (*path == '\0') {					/* Null path means the root directory */
 		*dir = NULL; return FR_OK;
@@ -516,22 +526,22 @@ FRESULT trace_path (	/* FR_OK(0): successful, !=0: error code */
 		ds = make_dirfile(&path, fn);			/* Get a paragraph into fn[] */
 		if (ds == 1) return FR_INVALID_NAME;
 		for (;;) {
-			if (!move_window(fs, dirobj->sect)) return FR_RW_ERROR;
-			dptr = &fs->win[(dirobj->index & ((S_SIZ - 1) / 32)) * 32];	/* Pointer to the directory entry */
+			if (!move_window(fs, dj->sect)) return FR_RW_ERROR;
+			dptr = &fs->win[(dj->index & ((SS(fs) - 1) / 32)) * 32];	/* Pointer to the directory entry */
 			if (dptr[DIR_Name] == 0)						/* Has it reached to end of dir? */
 				return !ds ? FR_NO_FILE : FR_NO_PATH;
 			if (dptr[DIR_Name] != 0xE5						/* Matched? */
 				&& !(dptr[DIR_Attr] & AM_VOL)
 				&& !memcmp(&dptr[DIR_Name], fn, 8+3) ) break;
-			if (!next_dir_entry(dirobj))					/* Next directory pointer */
+			if (!next_dir_entry(dj))						/* Next directory pointer */
 				return !ds ? FR_NO_FILE : FR_NO_PATH;
 		}
 		if (!ds) { *dir = dptr; return FR_OK; }				/* Matched with end of path */
 		if (!(dptr[DIR_Attr] & AM_DIR)) return FR_NO_PATH;	/* Cannot trace because it is a file */
 		clust = ((DWORD)LD_WORD(&dptr[DIR_FstClusHI]) << 16) | LD_WORD(&dptr[DIR_FstClusLO]); /* Get cluster# of the directory */
-		dirobj->clust = dirobj->sclust = clust;				/* Restart scanning at the new directory */
-		dirobj->sect = clust2sect(fs, clust);
-		dirobj->index = 2;
+		dj->clust = dj->sclust = clust;				/* Restart scanning at the new directory */
+		dj->sect = clust2sect(fs, clust);
+		dj->index = 2;
 	}
 }
 
@@ -545,41 +555,42 @@ FRESULT trace_path (	/* FR_OK(0): successful, !=0: error code */
 #if !_FS_READONLY
 static
 FRESULT reserve_direntry (	/* FR_OK: successful, FR_DENIED: no free entry, FR_RW_ERROR: a disk error occured */
-	DIR *dirobj,			/* Target directory to create new entry */
+	DIR *dj,				/* Target directory to create new entry */
 	BYTE **dir				/* Pointer to pointer to created entry to retutn */
 )
 {
 	DWORD clust, sector;
 	BYTE c, n, *dptr;
-	FATFS *fs = dirobj->fs;
+	FATFS *fs = dj->fs;
 
 
 	/* Re-initialize directory object */
-	clust = dirobj->sclust;
+	clust = dj->sclust;
 	if (clust) {	/* Dyanmic directory table */
-		dirobj->clust = clust;
-		dirobj->sect = clust2sect(fs, clust);
+		dj->clust = clust;
+		dj->sect = clust2sect(fs, clust);
 	} else {		/* Static directory table */
-		dirobj->sect = fs->dirbase;
+		dj->sect = fs->dirbase;
 	}
-	dirobj->index = 0;
+	dj->index = 0;
 
 	do {
-		if (!move_window(fs, dirobj->sect)) return FR_RW_ERROR;
-		dptr = &fs->win[(dirobj->index & ((S_SIZ - 1) / 32)) * 32];	/* Pointer to the directory entry */
+		if (!move_window(fs, dj->sect)) return FR_RW_ERROR;
+		dptr = &fs->win[(dj->index & ((SS(dj->fs) - 1) / 32)) * 32];	/* Pointer to the directory entry */
 		c = dptr[DIR_Name];
-		if (c == 0 || c == 0xE5) {			/* Found an empty entry! */
+		if (c == 0 || c == 0xE5) {		/* Found an empty entry */
 			*dir = dptr; return FR_OK;
 		}
-	} while (next_dir_entry(dirobj));				/* Next directory pointer */
+	} while (next_dir_entry(dj));		/* Next directory pointer */
 	/* Reached to end of the directory table */
 
-	/* Abort when static table or could not stretch dynamic table */
-	if (!clust || !(clust = create_chain(fs, dirobj->clust))) return FR_DENIED;
+	/* Abort when it is a static table or could not stretch dynamic table */
+	if (!clust || !(clust = create_chain(fs, dj->clust))) return FR_DENIED;
 	if (clust == 1 || !move_window(fs, 0)) return FR_RW_ERROR;
 
-	fs->winsect = sector = clust2sect(fs, clust);		/* Cleanup the expanded table */
-	memset(fs->win, 0, S_SIZ);
+	/* Cleanup the expanded table */
+	fs->winsect = sector = clust2sect(fs, clust);
+	memset(fs->win, 0, SS(fs));
 	for (n = fs->sects_clust; n; n--) {
 		if (disk_write(fs->drive, fs->win, sector, 1) != RES_OK)
 			return FR_RW_ERROR;
@@ -587,6 +598,7 @@ FRESULT reserve_direntry (	/* FR_OK: successful, FR_DENIED: no free entry, FR_RW
 	}
 	fs->winflag = 1;
 	*dir = fs->win;
+
 	return FR_OK;
 }
 #endif /* !_FS_READONLY */
@@ -595,13 +607,13 @@ FRESULT reserve_direntry (	/* FR_OK: successful, FR_DENIED: no free entry, FR_RW
 
 
 /*-----------------------------------------------------------------------*/
-/* Load boot record and check if it is a FAT boot record                 */
+/* Load boot record and check if it is an FAT boot record                */
 /*-----------------------------------------------------------------------*/
 
 static
-BYTE check_fs (		/* 0:The FAT boot record, 1:Valid boot record but not an FAT, 2:Not a boot record or error */
-	FATFS *fs,		/* File system object */
-	DWORD sect		/* Sector# (lba) to check if it is a FAT boot record or not */
+BYTE check_fs (	/* 0:The FAT boot record, 1:Valid boot record but not an FAT, 2:Not a boot record or error */
+	FATFS *fs,	/* File system object */
+	DWORD sect	/* Sector# (lba) to check if it is an FAT boot record or not */
 )
 {
 	if (disk_read(fs->drive, fs->win, sect, 1) != RES_OK)	/* Load boot record */
@@ -625,10 +637,10 @@ BYTE check_fs (		/* 0:The FAT boot record, 1:Valid boot record but not an FAT, 2
 /*-----------------------------------------------------------------------*/
 
 static
-FRESULT auto_mount (		/* FR_OK(0): successful, !=0: any error occured */
-	const char **path,		/* Pointer to pointer to the path name (drive number) */
-	FATFS **rfs,			/* Pointer to pointer to the found file system object */
-	BYTE chk_wp				/* !=0: Check media write protection for write access */
+FRESULT auto_mount (	/* FR_OK(0): successful, !=0: any error occured */
+	const char **path,	/* Pointer to pointer to the path name (drive number) */
+	FATFS **rfs,		/* Pointer to pointer to the found file system object */
+	BYTE chk_wp			/* !=0: Check media write protection for write access */
 )
 {
 	BYTE drv, fmt, *tbl;
@@ -642,38 +654,37 @@ FRESULT auto_mount (		/* FR_OK(0): successful, !=0: any error occured */
 	while (*p == ' ') p++;		/* Strip leading spaces */
 	drv = p[0] - '0';			/* Is there a drive number? */
 	if (drv <= 9 && p[1] == ':')
-		p += 2;			/* Found a drive number, get and strip it */
+		p += 2;				/* Found a drive number, get and strip it */
 	else
-		drv = 0;		/* No drive number is given, use drive number 0 as default */
-	if (*p == '/') p++;	/* Strip heading slash */
-	*path = p;			/* Return pointer to the path name */
+		drv = 0;			/* No drive number is given, use drive number 0 as default */
+	if (*p == '/') p++;		/* Strip heading slash */
+	*path = p;				/* Return pointer to the path name */
 
 	/* Check if the drive number is valid or not */
 	if (drv >= _DRIVES) return FR_INVALID_DRIVE;	/* Is the drive number valid? */
-	if (!(fs = FatFs[drv])) return FR_NOT_ENABLED;	/* Is the file system object registered? */
-	*rfs = fs;			/* Returen pointer to the corresponding file system object */
+	*rfs = fs = FatFs[drv];					/* Returen pointer to the corresponding file system object */
+	if (!fs) return FR_NOT_ENABLED;			/* Is the file system object registered? */
 
-	/* Check if the logical drive has been mounted or not */
-	if (fs->fs_type) {
+	if (fs->fs_type) {						/* If the logical drive has been mounted */
 		stat = disk_status(fs->drive);
-		if (!(stat & STA_NOINIT)) {				/* If the physical drive is kept initialized */
+		if (!(stat & STA_NOINIT)) {			/* and physical drive is kept initialized (has not been changed), */
 #if !_FS_READONLY
 			if (chk_wp && (stat & STA_PROTECT))	/* Check write protection if needed */
 				return FR_WRITE_PROTECTED;
 #endif
-			return FR_OK;						/* The file system object is valid */
+			return FR_OK;					/* The file system object is valid */
 		}
 	}
 
-	/* The logical drive has not been mounted, following code attempts to mount the logical drive */
+	/* The logical drive must be re-mounted. Following code attempts to mount the logical drive */
 
 	memset(fs, 0, sizeof(FATFS));		/* Clean-up the file system object */
 	fs->drive = LD2PD(drv);				/* Bind the logical drive and a physical drive */
 	stat = disk_initialize(fs->drive);	/* Initialize low level disk I/O layer */
 	if (stat & STA_NOINIT)				/* Check if the drive is ready */
 		return FR_NOT_READY;
-#if S_MAX_SIZ > 512						/* Check disk sector size */
-	if (disk_ioctl(drv, GET_SECTOR_SIZE, &S_SIZ) != RES_OK || S_SIZ > S_MAX_SIZ)
+#if S_MAX_SIZ > 512						/* Get disk sector size if needed */
+	if (disk_ioctl(drv, GET_SECTOR_SIZE, &SS(fs)) != RES_OK || SS(fs) > S_MAX_SIZ)
 		return FR_NO_FILESYSTEM;
 #endif
 #if !_FS_READONLY
@@ -682,15 +693,15 @@ FRESULT auto_mount (		/* FR_OK(0): successful, !=0: any error occured */
 #endif
 	/* Search FAT partition on the drive */
 	fmt = check_fs(fs, bootsect = 0);	/* Check sector 0 as an SFD format */
-	if (fmt == 1) {						/* Not a FAT boot record, it may be patitioned */
+	if (fmt == 1) {						/* Not an FAT boot record, it may be patitioned */
 		/* Check a partition listed in top of the partition table */
 		tbl = &fs->win[MBR_Table + LD2PT(drv) * 16];	/* Partition table */
-		if (tbl[4]) {								/* Is the partition existing? */
-			bootsect = LD_DWORD(&tbl[8]);			/* Partition offset in LBA */
-			fmt = check_fs(fs, bootsect);			/* Check the partition */
+		if (tbl[4]) {									/* Is the partition existing? */
+			bootsect = LD_DWORD(&tbl[8]);				/* Partition offset in LBA */
+			fmt = check_fs(fs, bootsect);				/* Check the partition */
 		}
 	}
-	if (fmt || LD_WORD(&fs->win[BPB_BytsPerSec]) != S_SIZ)	/* No valid FAT patition is found */
+	if (fmt || LD_WORD(&fs->win[BPB_BytsPerSec]) != SS(fs))	/* No valid FAT patition is found */
 		return FR_NO_FILESYSTEM;
 
 	/* Initialize the file system object */
@@ -704,25 +715,25 @@ FRESULT auto_mount (		/* FR_OK(0): successful, !=0: any error occured */
 	fs->n_rootdir = LD_WORD(&fs->win[BPB_RootEntCnt]);	/* Nmuber of root directory entries */
 	totalsect = LD_WORD(&fs->win[BPB_TotSec16]);		/* Number of sectors on the file system */
 	if (!totalsect) totalsect = LD_DWORD(&fs->win[BPB_TotSec32]);
-	fs->max_clust = maxclust = (totalsect				/* Last cluster# + 1 */
-		- LD_WORD(&fs->win[BPB_RsvdSecCnt]) - fatsize - fs->n_rootdir / (S_SIZ/32)
+	fs->max_clust = maxclust = (totalsect				/* max_clust = Last cluster# + 1 */
+		- LD_WORD(&fs->win[BPB_RsvdSecCnt]) - fatsize - fs->n_rootdir / (SS(fs)/32)
 		) / fs->sects_clust + 2;
 
 	fmt = FS_FAT12;										/* Determine the FAT sub type */
-	if (maxclust > 0xFF7) fmt = FS_FAT16;
-	if (maxclust > 0xFFF7) fmt = FS_FAT32;
-	fs->fs_type = fmt;
+	if (maxclust >= 0xFF7) fmt = FS_FAT16;
+	if (maxclust >= 0xFFF7) fmt = FS_FAT32;
 
 	if (fmt == FS_FAT32)
 		fs->dirbase = LD_DWORD(&fs->win[BPB_RootClus]);	/* Root directory start cluster */
 	else
 		fs->dirbase = fs->fatbase + fatsize;			/* Root directory start sector (lba) */
-	fs->database = fs->fatbase + fatsize + fs->n_rootdir / (S_SIZ/32);	/* Data start sector (lba) */
+	fs->database = fs->fatbase + fatsize + fs->n_rootdir / (SS(fs)/32);	/* Data start sector (lba) */
 
 #if !_FS_READONLY
+	/* Initialize allocation information */
 	fs->free_clust = 0xFFFFFFFF;
 #if _USE_FSINFO
-	/* Load fsinfo sector if needed */
+	/* Get fsinfo if needed */
 	if (fmt == FS_FAT32) {
 		fs->fsi_sector = bootsect + LD_WORD(&fs->win[BPB_FSInfo]);
 		if (disk_read(fs->drive, fs->win, fs->fsi_sector, 1) == RES_OK &&
@@ -735,7 +746,9 @@ FRESULT auto_mount (		/* FR_OK(0): successful, !=0: any error occured */
 	}
 #endif
 #endif
-	fs->id = ++fsid;									/* File system mount ID */
+
+	fs->fs_type = fmt;			/* FAT syb-type */
+	fs->id = ++fsid;			/* File system mount ID */
 	return FR_OK;
 }
 
@@ -747,12 +760,12 @@ FRESULT auto_mount (		/* FR_OK(0): successful, !=0: any error occured */
 /*-----------------------------------------------------------------------*/
 
 static
-FRESULT validate (		/* FR_OK(0): The object is valid, !=0: Not valid */
+FRESULT validate (		/* FR_OK(0): The object is valid, !=0: Invalid */
 	const FATFS *fs,	/* Pointer to the file system object */
-	WORD id				/* id member of the target object to be checked */
+	WORD id				/* Member id of the target object to be checked */
 )
 {
-	if (!fs || fs->id != id)
+	if (!fs || !fs->fs_type || fs->id != id)
 		return FR_INVALID_OBJECT;
 	if (disk_status(fs->drive) & STA_NOINIT)
 		return FR_NOT_READY;
@@ -780,14 +793,12 @@ FRESULT f_mount (
 	FATFS *fs		/* Pointer to new file system object (NULL for unmount)*/
 )
 {
-	FATFS *fsobj;
-
-
 	if (drv >= _DRIVES) return FR_INVALID_DRIVE;
-	fsobj = FatFs[drv];
-	FatFs[drv] = fs;
-	if (fsobj) memset(fsobj, 0, sizeof(FATFS));
-	if (fs) memset(fs, 0, sizeof(FATFS));
+
+	if (FatFs[drv]) FatFs[drv]->fs_type = 0;	/* Clear old object */
+
+	FatFs[drv] = fs;			/* Register and clear new object */
+	if (fs) fs->fs_type = 0;
 
 	return FR_OK;
 }
@@ -806,34 +817,31 @@ FRESULT f_open (
 )
 {
 	FRESULT res;
+	DIR dj;
 	BYTE *dir;
-	DIR dirobj;
 	char fn[8+3+1];
-	FATFS *fs;
 
 
 	fp->fs = NULL;
 #if !_FS_READONLY
 	mode &= (FA_READ|FA_WRITE|FA_CREATE_ALWAYS|FA_OPEN_ALWAYS|FA_CREATE_NEW);
-	res = auto_mount(&path, &fs, (BYTE)(mode & (FA_WRITE|FA_CREATE_ALWAYS|FA_OPEN_ALWAYS|FA_CREATE_NEW)));
+	res = auto_mount(&path, &dj.fs, (BYTE)(mode & (FA_WRITE|FA_CREATE_ALWAYS|FA_OPEN_ALWAYS|FA_CREATE_NEW)));
 #else
 	mode &= FA_READ;
-	res = auto_mount(&path, &fs, 0);
+	res = auto_mount(&path, &dj.fs, 0);
 #endif
 	if (res != FR_OK) return res;
-	dirobj.fs = fs;
+	res = trace_path(&dj, fn, path, &dir);	/* Trace the file path */
 
-	/* Trace the file path */
-	res = trace_path(&dirobj, fn, path, &dir);
 #if !_FS_READONLY
 	/* Create or Open a file */
 	if (mode & (FA_CREATE_ALWAYS|FA_OPEN_ALWAYS|FA_CREATE_NEW)) {
 		DWORD ps, rs;
 		if (res != FR_OK) {		/* No file, create new */
 			if (res != FR_NO_FILE) return res;
-			res = reserve_direntry(&dirobj, &dir);
+			res = reserve_direntry(&dj, &dir);
 			if (res != FR_OK) return res;
-			memset(dir, 0, 32);						/* Initialize the new entry with open name */
+			memset(dir, 0, 32);		/* Initialize the new entry with open name */
 			memcpy(&dir[DIR_Name], fn, 8+3);
 			dir[DIR_NTres] = fn[11];
 			mode |= FA_CREATE_ALWAYS;
@@ -841,49 +849,49 @@ FRESULT f_open (
 		else {					/* Any object is already existing */
 			if (mode & FA_CREATE_NEW)			/* Cannot create new */
 				return FR_EXIST;
-			if (dir == NULL || (dir[DIR_Attr] & (AM_RDO|AM_DIR)))	/* Cannot overwrite it (R/O or DIR) */
+			if (!dir || (dir[DIR_Attr] & (AM_RDO|AM_DIR)))	/* Cannot overwrite it (R/O or DIR) */
 				return FR_DENIED;
 			if (mode & FA_CREATE_ALWAYS) {		/* Resize it to zero if needed */
 				rs = ((DWORD)LD_WORD(&dir[DIR_FstClusHI]) << 16) | LD_WORD(&dir[DIR_FstClusLO]);	/* Get start cluster */
 				ST_WORD(&dir[DIR_FstClusHI], 0);	/* cluster = 0 */
 				ST_WORD(&dir[DIR_FstClusLO], 0);
 				ST_DWORD(&dir[DIR_FileSize], 0);	/* size = 0 */
-				fs->winflag = 1;
-				ps = fs->winsect;				/* Remove the cluster chain */
-				if (!remove_chain(fs, rs) || !move_window(fs, ps))
+				dj.fs->winflag = 1;
+				ps = dj.fs->winsect;			/* Remove the cluster chain */
+				if (!remove_chain(dj.fs, rs) || !move_window(dj.fs, ps))
 					return FR_RW_ERROR;
-				fs->last_clust = rs - 1;		/* Reuse the cluster hole */
+				dj.fs->last_clust = rs - 1;		/* Reuse the cluster hole */
 			}
 		}
 		if (mode & FA_CREATE_ALWAYS) {
-			dir[DIR_Attr] = AM_ARC;				/* New attribute */
+			dir[DIR_Attr] = 0;					/* Reset attribute */
 			ps = get_fattime();
-			ST_DWORD(&dir[DIR_WrtTime], ps);	/* Updated time */
 			ST_DWORD(&dir[DIR_CrtTime], ps);	/* Created time */
-			fs->winflag = 1;
+			dj.fs->winflag = 1;
+			mode |= FA__WRITTEN;				/* Set file changed flag */
 		}
 	}
 	/* Open an existing file */
 	else {
 #endif /* !_FS_READONLY */
-		if (res != FR_OK) return res;		/* Trace failed */
-		if (dir == NULL || (dir[DIR_Attr] & AM_DIR))	/* It is a directory */
+		if (res != FR_OK) return res;			/* Trace failed */
+		if (!dir || (dir[DIR_Attr] & AM_DIR))	/* It is a directory */
 			return FR_NO_FILE;
 #if !_FS_READONLY
 		if ((mode & FA_WRITE) && (dir[DIR_Attr] & AM_RDO)) /* R/O violation */
 			return FR_DENIED;
 	}
 
-	fp->dir_sect = fs->winsect;			/* Pointer to the directory entry */
+	fp->dir_sect = dj.fs->winsect;		/* Pointer to the directory entry */
 	fp->dir_ptr = dir;
 #endif
 	fp->flag = mode;					/* File access mode */
 	fp->org_clust =						/* File start cluster */
 		((DWORD)LD_WORD(&dir[DIR_FstClusHI]) << 16) | LD_WORD(&dir[DIR_FstClusLO]);
 	fp->fsize = LD_DWORD(&dir[DIR_FileSize]);	/* File size */
-	fp->fptr = 0;						/* File ptr */
-	fp->sect_clust = 1;					/* Sector counter */
-	fp->fs = fs; fp->id = fs->id;		/* Owner file system object of the file */
+	fp->fptr = 0;						/* Initialze file pointer */
+	fp->sect_clust = 1;					/* Initialize sector counter */
+	fp->fs = dj.fs; fp->id = dj.fs->id;	/* Owner file system object of the file */
 
 	return FR_OK;
 }
@@ -902,59 +910,58 @@ FRESULT f_read (
 	UINT *br		/* Pointer to number of bytes read */
 )
 {
+	FRESULT res;
 	DWORD clust, sect, remain;
 	UINT rcnt, cc;
 	BYTE *rbuff = buff;
-	FRESULT res;
-	FATFS *fs = fp->fs;
 
 
 	*br = 0;
-	res = validate(fs, fp->id);						/* Check validity of the object */
+	res = validate(fp->fs, fp->id);					/* Check validity of the object */
 	if (res != FR_OK) return res;
 	if (fp->flag & FA__ERROR) return FR_RW_ERROR;	/* Check error flag */
 	if (!(fp->flag & FA_READ)) return FR_DENIED;	/* Check access mode */
 	remain = fp->fsize - fp->fptr;
-	if (btr > remain) btr = (WORD)remain;			/* Truncate read count by number of bytes left */
+	if (btr > remain) btr = (UINT)remain;			/* Truncate read count by number of bytes left */
 
 	for ( ;  btr;									/* Repeat until all data transferred */
 		rbuff += rcnt, fp->fptr += rcnt, *br += rcnt, btr -= rcnt) {
-		if ((fp->fptr & (S_SIZ - 1)) == 0) {		/* On the sector boundary */
+		if ((fp->fptr & (SS(fp->fs) - 1)) == 0) {	/* On the sector boundary */
 			if (--fp->sect_clust) {					/* Decrement left sector counter */
 				sect = fp->curr_sect + 1;			/* Get current sector */
 			} else {								/* On the cluster boundary, get next cluster */
 				clust = (fp->fptr == 0) ?
-					fp->org_clust : get_cluster(fs, fp->curr_clust);
-				if (clust < 2 || clust >= fs->max_clust)
+					fp->org_clust : get_cluster(fp->fs, fp->curr_clust);
+				if (clust < 2 || clust >= fp->fs->max_clust)
 					goto fr_error;
 				fp->curr_clust = clust;				/* Current cluster */
-				sect = clust2sect(fs, clust);		/* Get current sector */
-				fp->sect_clust = fs->sects_clust;	/* Re-initialize the left sector counter */
+				sect = clust2sect(fp->fs, clust);	/* Get current sector */
+				fp->sect_clust = fp->fs->sects_clust;	/* Re-initialize the left sector counter */
 			}
 #if !_FS_READONLY
 			if (fp->flag & FA__DIRTY) {				/* Flush file I/O buffer if needed */
-				if (disk_write(fs->drive, fp->buffer, fp->curr_sect, 1) != RES_OK)
+				if (disk_write(fp->fs->drive, fp->buffer, fp->curr_sect, 1) != RES_OK)
 					goto fr_error;
-				fp->flag &= ~FA__DIRTY;
+				fp->flag &= (BYTE)~FA__DIRTY;
 			}
 #endif
 			fp->curr_sect = sect;					/* Update current sector */
-			cc = btr / S_SIZ;						/* When left bytes >= S_SIZ, */
+			cc = btr / SS(fp->fs);					/* When left bytes >= SS, */
 			if (cc) {								/* Read maximum contiguous sectors directly */
 				if (cc > fp->sect_clust) cc = fp->sect_clust;
-				if (disk_read(fs->drive, rbuff, sect, (BYTE)cc) != RES_OK)
+				if (disk_read(fp->fs->drive, rbuff, sect, (BYTE)cc) != RES_OK)
 					goto fr_error;
 				fp->sect_clust -= (BYTE)(cc - 1);
 				fp->curr_sect += cc - 1;
-				rcnt = cc * S_SIZ;
+				rcnt = cc * SS(fp->fs);
 				continue;
 			}
-			if (disk_read(fs->drive, fp->buffer, sect, 1) != RES_OK)	/* Load the sector into file I/O buffer */
+			if (disk_read(fp->fs->drive, fp->buffer, sect, 1) != RES_OK)	/* Load the sector into file I/O buffer */
 				goto fr_error;
 		}
-		rcnt = S_SIZ - ((WORD)fp->fptr & (S_SIZ - 1));				/* Copy fractional bytes from file I/O buffer */
+		rcnt = SS(fp->fs) - (fp->fptr & (SS(fp->fs) - 1));	/* Copy fractional bytes from file I/O buffer */
 		if (rcnt > btr) rcnt = btr;
-		memcpy(rbuff, &fp->buffer[fp->fptr & (S_SIZ - 1)], rcnt);
+		memcpy(rbuff, &fp->buffer[fp->fptr & (SS(fp->fs) - 1)], rcnt);
 	}
 
 	return FR_OK;
@@ -979,15 +986,14 @@ FRESULT f_write (
 	UINT *bw			/* Pointer to number of bytes written */
 )
 {
+	FRESULT res;
 	DWORD clust, sect;
 	UINT wcnt, cc;
 	const BYTE *wbuff = buff;
-	FRESULT res;
-	FATFS *fs = fp->fs;
 
 
 	*bw = 0;
-	res = validate(fs, fp->id);						/* Check validity of the object */
+	res = validate(fp->fs, fp->id);					/* Check validity of the object */
 	if (res != FR_OK) return res;
 	if (fp->flag & FA__ERROR) return FR_RW_ERROR;	/* Check error flag */
 	if (!(fp->flag & FA_WRITE)) return FR_DENIED;	/* Check access mode */
@@ -995,46 +1001,46 @@ FRESULT f_write (
 
 	for ( ;  btw;									/* Repeat until all data transferred */
 		wbuff += wcnt, fp->fptr += wcnt, *bw += wcnt, btw -= wcnt) {
-		if ((fp->fptr & (S_SIZ - 1)) == 0) {		/* On the sector boundary */
+		if ((fp->fptr & (SS(fp->fs) - 1)) == 0) {	/* On the sector boundary */
 			if (--fp->sect_clust) {					/* Decrement left sector counter */
 				sect = fp->curr_sect + 1;			/* Get current sector */
 			} else {								/* On the cluster boundary, get next cluster */
 				if (fp->fptr == 0) {				/* Is top of the file */
 					clust = fp->org_clust;
 					if (clust == 0)					/* No cluster is created yet */
-						fp->org_clust = clust = create_chain(fs, 0);	/* Create a new cluster chain */
+						fp->org_clust = clust = create_chain(fp->fs, 0);	/* Create a new cluster chain */
 				} else {							/* Middle or end of file */
-					clust = create_chain(fs, fp->curr_clust);			/* Trace or streach cluster chain */
+					clust = create_chain(fp->fs, fp->curr_clust);			/* Trace or streach cluster chain */
 				}
 				if (clust == 0) break;				/* Disk full */
-				if (clust == 1 || clust >= fs->max_clust) goto fw_error;
+				if (clust == 1 || clust >= fp->fs->max_clust) goto fw_error;
 				fp->curr_clust = clust;				/* Current cluster */
-				sect = clust2sect(fs, clust);		/* Get current sector */
-				fp->sect_clust = fs->sects_clust;	/* Re-initialize the left sector counter */
+				sect = clust2sect(fp->fs, clust);	/* Get current sector */
+				fp->sect_clust = fp->fs->sects_clust;	/* Re-initialize the left sector counter */
 			}
 			if (fp->flag & FA__DIRTY) {				/* Flush file I/O buffer if needed */
-				if (disk_write(fs->drive, fp->buffer, fp->curr_sect, 1) != RES_OK)
+				if (disk_write(fp->fs->drive, fp->buffer, fp->curr_sect, 1) != RES_OK)
 					goto fw_error;
-				fp->flag &= ~FA__DIRTY;
+				fp->flag &= (BYTE)~FA__DIRTY;
 			}
 			fp->curr_sect = sect;					/* Update current sector */
-			cc = btw / S_SIZ;						/* When left bytes >= S_SIZ, */
+			cc = btw / SS(fp->fs);					/* When left bytes >= SS, */
 			if (cc) {								/* Write maximum contiguous sectors directly */
 				if (cc > fp->sect_clust) cc = fp->sect_clust;
-				if (disk_write(fs->drive, wbuff, sect, (BYTE)cc) != RES_OK)
+				if (disk_write(fp->fs->drive, wbuff, sect, (BYTE)cc) != RES_OK)
 					goto fw_error;
 				fp->sect_clust -= (BYTE)(cc - 1);
 				fp->curr_sect += cc - 1;
-				wcnt = cc * S_SIZ;
+				wcnt = cc * SS(fp->fs);
 				continue;
 			}
 			if (fp->fptr < fp->fsize &&  			/* Fill sector buffer with file data if needed */
-				disk_read(fs->drive, fp->buffer, sect, 1) != RES_OK)
+				disk_read(fp->fs->drive, fp->buffer, sect, 1) != RES_OK)
 					goto fw_error;
 		}
-		wcnt = S_SIZ - ((WORD)fp->fptr & (S_SIZ - 1));	/* Copy fractional bytes to file I/O buffer */
+		wcnt = SS(fp->fs) - (fp->fptr & (SS(fp->fs) - 1));	/* Copy fractional bytes to file I/O buffer */
 		if (wcnt > btw) wcnt = btw;
-		memcpy(&fp->buffer[fp->fptr & (S_SIZ - 1)], wbuff, wcnt);
+		memcpy(&fp->buffer[fp->fptr & (SS(fp->fs) - 1)], wbuff, wcnt);
 		fp->flag |= FA__DIRTY;
 	}
 
@@ -1058,23 +1064,22 @@ FRESULT f_sync (
 	FIL *fp		/* Pointer to the file object */
 )
 {
+	FRESULT res;
 	DWORD tim;
 	BYTE *dir;
-	FRESULT res;
-	FATFS *fs = fp->fs;
 
 
-	res = validate(fs, fp->id);			/* Check validity of the object */
+	res = validate(fp->fs, fp->id);		/* Check validity of the object */
 	if (res == FR_OK) {
 		if (fp->flag & FA__WRITTEN) {	/* Has the file been written? */
 			/* Write back data buffer if needed */
 			if (fp->flag & FA__DIRTY) {
-				if (disk_write(fs->drive, fp->buffer, fp->curr_sect, 1) != RES_OK)
+				if (disk_write(fp->fs->drive, fp->buffer, fp->curr_sect, 1) != RES_OK)
 					return FR_RW_ERROR;
-				fp->flag &= ~FA__DIRTY;
+				fp->flag &= (BYTE)~FA__DIRTY;
 			}
 			/* Update the directory entry */
-			if (!move_window(fs, fp->dir_sect))
+			if (!move_window(fp->fs, fp->dir_sect))
 				return FR_RW_ERROR;
 			dir = fp->dir_ptr;
 			dir[DIR_Attr] |= AM_ARC;						/* Set archive bit */
@@ -1083,8 +1088,8 @@ FRESULT f_sync (
 			ST_WORD(&dir[DIR_FstClusHI], fp->org_clust >> 16);
 			tim = get_fattime();					/* Updated time */
 			ST_DWORD(&dir[DIR_WrtTime], tim);
-			fp->flag &= ~FA__WRITTEN;
-			res = sync(fs);
+			fp->flag &= (BYTE)~FA__WRITTEN;
+			res = sync(fp->fs);
 		}
 	}
 	return res;
@@ -1111,8 +1116,7 @@ FRESULT f_close (
 #else
 	res = validate(fp->fs, fp->id);
 #endif
-	if (res == FR_OK)
-		fp->fs = NULL;
+	if (res == FR_OK) fp->fs = NULL;
 	return res;
 }
 
@@ -1129,20 +1133,19 @@ FRESULT f_lseek (
 	DWORD ofs		/* File pointer from top of file */
 )
 {
+	FRESULT res;
 	DWORD clust, csize;
 	BYTE csect;
-	FRESULT res;
-	FATFS *fs = fp->fs;
 
 
-	res = validate(fs, fp->id);			/* Check validity of the object */
+	res = validate(fp->fs, fp->id);		/* Check validity of the object */
 	if (res != FR_OK) return res;
 	if (fp->flag & FA__ERROR) return FR_RW_ERROR;
 #if !_FS_READONLY
 	if (fp->flag & FA__DIRTY) {			/* Write-back dirty buffer if needed */
-		if (disk_write(fs->drive, fp->buffer, fp->curr_sect, 1) != RES_OK)
+		if (disk_write(fp->fs->drive, fp->buffer, fp->curr_sect, 1) != RES_OK)
 			goto fk_error;
-		fp->flag &= ~FA__DIRTY;
+		fp->flag &= (BYTE)~FA__DIRTY;
 	}
 	if (ofs > fp->fsize && !(fp->flag & FA_WRITE))
 #else
@@ -1156,36 +1159,36 @@ FRESULT f_lseek (
 		clust = fp->org_clust;	/* Get start cluster */
 #if !_FS_READONLY
 		if (!clust) {			/* If the file does not have a cluster chain, create new cluster chain */
-			clust = create_chain(fs, 0);
+			clust = create_chain(fp->fs, 0);
 			if (clust == 1) goto fk_error;
 			fp->org_clust = clust;
 		}
 #endif
 		if (clust) {			/* If the file has a cluster chain, it can be followed */
-			csize = (DWORD)fs->sects_clust * S_SIZ;		/* Cluster size in unit of byte */
+			csize = (DWORD)fp->fs->sects_clust * SS(fp->fs);	/* Cluster size in unit of byte */
 			for (;;) {									/* Loop to skip leading clusters */
 				fp->curr_clust = clust;					/* Update current cluster */
 				if (ofs <= csize) break;
 #if !_FS_READONLY
 				if (fp->flag & FA_WRITE)				/* Check if in write mode or not */
-					clust = create_chain(fs, clust);	/* Force streached if in write mode */
+					clust = create_chain(fp->fs, clust);	/* Force streached if in write mode */
 				else
 #endif
-					clust = get_cluster(fs, clust);		/* Only follow cluster chain if not in write mode */
+					clust = get_cluster(fp->fs, clust);	/* Only follow cluster chain if not in write mode */
 				if (clust == 0) {						/* Stop if could not follow the cluster chain */
 					ofs = csize; break;
 				}
-				if (clust == 1 || clust >= fs->max_clust) goto fk_error;
+				if (clust == 1 || clust >= fp->fs->max_clust) goto fk_error;
 				fp->fptr += csize;						/* Update R/W pointer */
 				ofs -= csize;
 			}
-			csect = (BYTE)((ofs - 1) / S_SIZ);			/* Sector offset in the cluster */
-			fp->curr_sect = clust2sect(fs, clust) + csect;	/* Current sector */
-			if ((ofs & (S_SIZ - 1)) &&					/* Load current sector if needed */
-				disk_read(fs->drive, fp->buffer, fp->curr_sect, 1) != RES_OK)
+			csect = (BYTE)((ofs - 1) / SS(fp->fs));		/* Sector offset in the cluster */
+			fp->curr_sect = clust2sect(fp->fs, clust) + csect;	/* Current sector */
+			if ((ofs & (SS(fp->fs) - 1)) &&				/* Load current sector if needed */
+				disk_read(fp->fs->drive, fp->buffer, fp->curr_sect, 1) != RES_OK)
 				goto fk_error;
-			fp->sect_clust = fs->sects_clust - csect;	/* Left sector counter in the cluster */
-			fp->fptr += ofs;							/* Update file R/W pointer */
+			fp->sect_clust = fp->fs->sects_clust - csect;	/* Left sector counter in the cluster */
+			fp->fptr += ofs;								/* Update file R/W pointer */
 		}
 	}
 #if !_FS_READONLY
@@ -1211,33 +1214,32 @@ fk_error:	/* Abort this file due to an unrecoverable error */
 /*-----------------------------------------------------------------------*/
 
 FRESULT f_opendir (
-	DIR *dirobj,		/* Pointer to directory object to create */
+	DIR *dj,			/* Pointer to directory object to create */
 	const char *path	/* Pointer to the directory path */
 )
 {
+	FRESULT res;
 	BYTE *dir;
 	char fn[8+3+1];
-	FRESULT res;
-	FATFS *fs;
 
 
-	res = auto_mount(&path, &fs, 0);
-	if (res != FR_OK) return res;
-	dirobj->fs = fs;
-
-	res = trace_path(dirobj, fn, path, &dir);	/* Trace the directory path */
-	if (res == FR_OK) {						/* Trace completed */
-		if (dir != NULL) {					/* It is not the root dir */
-			if (dir[DIR_Attr] & AM_DIR) {		/* The entry is a directory */
-				dirobj->clust = ((DWORD)LD_WORD(&dir[DIR_FstClusHI]) << 16) | LD_WORD(&dir[DIR_FstClusLO]);
-				dirobj->sect = clust2sect(fs, dirobj->clust);
-				dirobj->index = 2;
-			} else {						/* The entry is not a directory */
-				res = FR_NO_FILE;
+	res = auto_mount(&path, &dj->fs, 0);
+	if (res == FR_OK) {
+		res = trace_path(dj, fn, path, &dir);	/* Trace the directory path */
+		if (res == FR_OK) {						/* Trace completed */
+			if (dir) {							/* It is not the root dir */
+				if (dir[DIR_Attr] & AM_DIR) {	/* The entry is a directory */
+					dj->clust = ((DWORD)LD_WORD(&dir[DIR_FstClusHI]) << 16) | LD_WORD(&dir[DIR_FstClusLO]);
+					dj->sect = clust2sect(dj->fs, dj->clust);
+					dj->index = 2;
+				} else {						/* The entry is not a directory */
+					res = FR_NO_FILE;
+				}
 			}
+			dj->id = dj->fs->id;
 		}
-		dirobj->id = fs->id;
 	}
+
 	return res;
 }
 
@@ -1249,28 +1251,27 @@ FRESULT f_opendir (
 /*-----------------------------------------------------------------------*/
 
 FRESULT f_readdir (
-	DIR *dirobj,		/* Pointer to the directory object */
+	DIR *dj,			/* Pointer to the directory object */
 	FILINFO *finfo		/* Pointer to file information to return */
 )
 {
 	BYTE *dir, c, res;
-	FATFS *fs = dirobj->fs;
 
 
-	res = validate(fs, dirobj->id);			/* Check validity of the object */
+	res = validate(dj->fs, dj->id);			/* Check validity of the object */
 	if (res != FR_OK) return res;
 
 	finfo->fname[0] = 0;
-	while (dirobj->sect) {
-		if (!move_window(fs, dirobj->sect))
+	while (dj->sect) {
+		if (!move_window(dj->fs, dj->sect))
 			return FR_RW_ERROR;
-		dir = &fs->win[(dirobj->index & ((S_SIZ - 1) >> 5)) * 32];	/* pointer to the directory entry */
-		c = *dir;
-		if (c == 0) break;								/* Has it reached to end of dir? */
-		if (c != 0xE5 && !(dir[DIR_Attr] & AM_VOL))		/* Is it a valid entry? */
+		dir = &dj->fs->win[(dj->index & ((SS(dj->fs) - 1) >> 5)) * 32];	/* pointer to the directory entry */
+		c = dir[DIR_Name];
+		if (c == 0) break;							/* Has it reached to end of dir? */
+		if (c != 0xE5 && !(dir[DIR_Attr] & AM_VOL))	/* Is it a valid entry? */
 			get_fileinfo(finfo, dir);
-		if (!next_dir_entry(dirobj)) dirobj->sect = 0;	/* Next entry */
-		if (finfo->fname[0]) break;						/* Found valid entry */
+		if (!next_dir_entry(dj)) dj->sect = 0;		/* Next entry */
+		if (finfo->fname[0]) break;					/* Found valid entry */
 	}
 
 	return FR_OK;
@@ -1289,23 +1290,21 @@ FRESULT f_stat (
 	FILINFO *finfo		/* Pointer to file information to return */
 )
 {
+	FRESULT res;
+	DIR dj;
 	BYTE *dir;
 	char fn[8+3+1];
-	FRESULT res;
-	DIR dirobj;
-	FATFS *fs;
 
 
-	res = auto_mount(&path, &fs, 0);
-	if (res != FR_OK) return res;
-	dirobj.fs = fs;
-
-	res = trace_path(&dirobj, fn, path, &dir);	/* Trace the file path */
-	if (res == FR_OK) {							/* Trace completed */
-		if (dir)	/* Found an object */
-			get_fileinfo(finfo, dir);
-		else		/* It is root dir */
-			res = FR_INVALID_NAME;
+	res = auto_mount(&path, &dj.fs, 0);
+	if (res == FR_OK) {
+		res = trace_path(&dj, fn, path, &dir);	/* Trace the file path */
+		if (res == FR_OK) {						/* Trace completed */
+			if (dir)	/* Found an object */
+				get_fileinfo(finfo, dir);
+			else		/* It is root dir */
+				res = FR_INVALID_NAME;
+		}
 	}
 
 	return res;
@@ -1314,49 +1313,90 @@ FRESULT f_stat (
 
 
 #if !_FS_READONLY
+/*-----------------------------------------------------------------------*/
+/* Truncate File                                                         */
+/*-----------------------------------------------------------------------*/
+
+FRESULT f_truncate (
+	FIL *fp		/* Pointer to the file object */
+)
+{
+	FRESULT res;
+	DWORD ncl;
+
+
+	res = validate(fp->fs, fp->id);		/* Check validity of the object */
+	if (res != FR_OK) return res;
+	if (fp->flag & FA__ERROR) return FR_RW_ERROR;	/* Check error flag */
+	if (!(fp->flag & FA_WRITE)) return FR_DENIED;	/* Check access mode */
+
+	if (fp->fsize > fp->fptr) {
+		fp->fsize = fp->fptr;	/* Set file size to current R/W point */
+		fp->flag |= FA__WRITTEN;
+		if (fp->fptr == 0) {	/* When set file size to zero, remove entire cluster chain */
+			if (!remove_chain(fp->fs, fp->org_clust)) goto ft_error;
+			fp->org_clust = 0;
+		} else {				/* When truncate a part of the file, remove remaining clusters */
+			ncl = get_cluster(fp->fs, fp->curr_clust);
+			if (ncl < 2) goto ft_error;
+			if (ncl < fp->fs->max_clust) {
+				if (!put_cluster(fp->fs, fp->curr_clust, 0x0FFFFFFF)) goto ft_error;
+				if (!remove_chain(fp->fs, ncl)) goto ft_error;
+			}
+		}
+	}
+
+	return FR_OK;
+
+ft_error:	/* Abort this file due to an unrecoverable error */
+	fp->flag |= FA__ERROR;
+	return FR_RW_ERROR;
+}
+
+
+
+
 /*-----------------------------------------------------------------------*/
 /* Get Number of Free Clusters                                           */
 /*-----------------------------------------------------------------------*/
 
 FRESULT f_getfree (
-	const char *drv,	/* Logical drive number */
-	DWORD *nclust,		/* Pointer to the double word to return number of free clusters */
-	FATFS **fatfs		/* Pointer to pointer to the file system object to return */
+	const char *drv,	/* Pointer to the logical drive number (root dir) */
+	DWORD *nclust,		/* Pointer to the variable to return number of free clusters */
+	FATFS **fatfs		/* Pointer to pointer to corresponding file system object to return */
 )
 {
+	FRESULT res;
 	DWORD n, clust, sect;
 	BYTE fat, f, *p;
-	FRESULT res;
-	FATFS *fs;
 
 
 	/* Get drive number */
-	res = auto_mount(&drv, &fs, 0);
+	res = auto_mount(&drv, fatfs, 0);
 	if (res != FR_OK) return res;
-	*fatfs = fs;
 
 	/* If number of free cluster is valid, return it without cluster scan. */
-	if (fs->free_clust <= fs->max_clust - 2) {
-		*nclust = fs->free_clust;
+	if ((*fatfs)->free_clust <= (*fatfs)->max_clust - 2) {
+		*nclust = (*fatfs)->free_clust;
 		return FR_OK;
 	}
 
-	/* Count number of free clusters */
-	fat = fs->fs_type;
+	/* Get number of free clusters */
+	fat = (*fatfs)->fs_type;
 	n = 0;
 	if (fat == FS_FAT12) {
 		clust = 2;
 		do {
-			if ((WORD)get_cluster(fs, clust) == 0) n++;
-		} while (++clust < fs->max_clust);
+			if ((WORD)get_cluster(*fatfs, clust) == 0) n++;
+		} while (++clust < (*fatfs)->max_clust);
 	} else {
-		clust = fs->max_clust;
-		sect = fs->fatbase;
+		clust = (*fatfs)->max_clust;
+		sect = (*fatfs)->fatbase;
 		f = 0; p = 0;
 		do {
 			if (!f) {
-				if (!move_window(fs, sect++)) return FR_RW_ERROR;
-				p = fs->win;
+				if (!move_window(*fatfs, sect++)) return FR_RW_ERROR;
+				p = (*fatfs)->win;
 			}
 			if (fat == FS_FAT16) {
 				if (LD_WORD(p) == 0) n++;
@@ -1367,9 +1407,9 @@ FRESULT f_getfree (
 			}
 		} while (--clust);
 	}
-	fs->free_clust = n;
+	(*fatfs)->free_clust = n;
 #if _USE_FSINFO
-	if (fat == FS_FAT32) fs->fsi_flag = 1;
+	if (fat == FS_FAT32) (*fatfs)->fsi_flag = 1;
 #endif
 
 	*nclust = n;
@@ -1380,51 +1420,48 @@ FRESULT f_getfree (
 
 
 /*-----------------------------------------------------------------------*/
-/* Delete a File or a Directory                                          */
+/* Delete a File or Directory                                            */
 /*-----------------------------------------------------------------------*/
 
 FRESULT f_unlink (
-	const char *path			/* Pointer to the file or directory path */
+	const char *path		/* Pointer to the file or directory path */
 )
 {
+	FRESULT res;
+	DIR dj;
 	BYTE *dir, *sdir;
 	DWORD dclust, dsect;
 	char fn[8+3+1];
-	FRESULT res;
-	DIR dirobj;
-	FATFS *fs;
 
 
-	res = auto_mount(&path, &fs, 1);
+	res = auto_mount(&path, &dj.fs, 1);
 	if (res != FR_OK) return res;
-	dirobj.fs = fs;
-
-	res = trace_path(&dirobj, fn, path, &dir);	/* Trace the file path */
-	if (res != FR_OK) return res;				/* Trace failed */
-	if (dir == NULL) return FR_INVALID_NAME;	/* It is the root directory */
+	res = trace_path(&dj, fn, path, &dir);	/* Trace the file path */
+	if (res != FR_OK) return res;			/* Trace failed */
+	if (!dir) return FR_INVALID_NAME;		/* It is the root directory */
 	if (dir[DIR_Attr] & AM_RDO) return FR_DENIED;	/* It is a R/O object */
-	dsect = fs->winsect;
+	dsect = dj.fs->winsect;
 	dclust = ((DWORD)LD_WORD(&dir[DIR_FstClusHI]) << 16) | LD_WORD(&dir[DIR_FstClusLO]);
 
-	if (dir[DIR_Attr] & AM_DIR) {				/* It is a sub-directory */
-		dirobj.clust = dclust;					/* Check if the sub-dir is empty or not */
-		dirobj.sect = clust2sect(fs, dclust);
-		dirobj.index = 2;
+	if (dir[DIR_Attr] & AM_DIR) {			/* It is a sub-directory */
+		dj.clust = dclust;					/* Check if the sub-dir is empty or not */
+		dj.sect = clust2sect(dj.fs, dclust);
+		dj.index = 2;
 		do {
-			if (!move_window(fs, dirobj.sect)) return FR_RW_ERROR;
-			sdir = &fs->win[(dirobj.index & ((S_SIZ - 1) >> 5)) * 32];
+			if (!move_window(dj.fs, dj.sect)) return FR_RW_ERROR;
+			sdir = &dj.fs->win[(dj.index & ((SS(dj.fs) - 1) >> 5)) * 32];
 			if (sdir[DIR_Name] == 0) break;
 			if (sdir[DIR_Name] != 0xE5 && !(sdir[DIR_Attr] & AM_VOL))
 				return FR_DENIED;	/* The directory is not empty */
-		} while (next_dir_entry(&dirobj));
+		} while (next_dir_entry(&dj));
 	}
 
-	if (!move_window(fs, dsect)) return FR_RW_ERROR;	/* Mark the directory entry 'deleted' */
+	if (!move_window(dj.fs, dsect)) return FR_RW_ERROR;	/* Mark the directory entry 'deleted' */
 	dir[DIR_Name] = 0xE5;
-	fs->winflag = 1;
-	if (!remove_chain(fs, dclust)) return FR_RW_ERROR;	/* Remove the cluster chain */
+	dj.fs->winflag = 1;
+	if (!remove_chain(dj.fs, dclust)) return FR_RW_ERROR;	/* Remove the cluster chain */
 
-	return sync(fs);
+	return sync(dj.fs);
 }
 
 
@@ -1438,38 +1475,35 @@ FRESULT f_mkdir (
 	const char *path		/* Pointer to the directory path */
 )
 {
+	FRESULT res;
+	DIR dj;
 	BYTE *dir, *fw, n;
 	char fn[8+3+1];
 	DWORD sect, dsect, dclust, pclust, tim;
-	FRESULT res;
-	DIR dirobj;
-	FATFS *fs;
 
 
-	res = auto_mount(&path, &fs, 1);
+	res = auto_mount(&path, &dj.fs, 1);
 	if (res != FR_OK) return res;
-	dirobj.fs = fs;
-
-	res = trace_path(&dirobj, fn, path, &dir);	/* Trace the file path */
-	if (res == FR_OK) return FR_EXIST;			/* Any file or directory is already existing */
+	res = trace_path(&dj, fn, path, &dir);	/* Trace the file path */
+	if (res == FR_OK) return FR_EXIST;		/* Any file or directory is already existing */
 	if (res != FR_NO_FILE) return res;
 
-	res = reserve_direntry(&dirobj, &dir); 		/* Reserve a directory entry */
+	res = reserve_direntry(&dj, &dir); 		/* Reserve a directory entry */
 	if (res != FR_OK) return res;
-	sect = fs->winsect;
-	dclust = create_chain(fs, 0);				/* Allocate a cluster for new directory table */
+	sect = dj.fs->winsect;
+	dclust = create_chain(dj.fs, 0);		/* Allocate a cluster for new directory table */
 	if (dclust == 1) return FR_RW_ERROR;
-	dsect = clust2sect(fs, dclust);
+	dsect = clust2sect(dj.fs, dclust);
 	if (!dsect) return FR_DENIED;
-	if (!move_window(fs, dsect)) return FR_RW_ERROR;
+	if (!move_window(dj.fs, dsect)) return FR_RW_ERROR;
 
-	fw = fs->win;
-	memset(fw, 0, S_SIZ);						/* Clear the new directory table */
-	for (n = 1; n < fs->sects_clust; n++) {
-		if (disk_write(fs->drive, fw, ++dsect, 1) != RES_OK)
+	fw = dj.fs->win;
+	memset(fw, 0, SS(dj.fs));				/* Clear the new directory table */
+	for (n = 1; n < dj.fs->sects_clust; n++) {
+		if (disk_write(dj.fs->drive, fw, ++dsect, 1) != RES_OK)
 			return FR_RW_ERROR;
 	}
-	memset(&fw[DIR_Name], ' ', 8+3);			/* Create "." entry */
+	memset(&fw[DIR_Name], ' ', 8+3);		/* Create "." entry */
 	fw[DIR_Name] = '.';
 	fw[DIR_Attr] = AM_DIR;
 	tim = get_fattime();
@@ -1477,13 +1511,13 @@ FRESULT f_mkdir (
 	memcpy(&fw[32], &fw[0], 32); fw[33] = '.';	/* Create ".." entry */
 	ST_WORD(&fw[   DIR_FstClusLO], dclust);
 	ST_WORD(&fw[   DIR_FstClusHI], dclust >> 16);
-	pclust = dirobj.sclust;
-	if (fs->fs_type == FS_FAT32 && pclust == fs->dirbase) pclust = 0;
+	pclust = dj.sclust;
+	if (dj.fs->fs_type == FS_FAT32 && pclust == dj.fs->dirbase) pclust = 0;
 	ST_WORD(&fw[32+DIR_FstClusLO], pclust);
 	ST_WORD(&fw[32+DIR_FstClusHI], pclust >> 16);
-	fs->winflag = 1;
+	dj.fs->winflag = 1;
 
-	if (!move_window(fs, sect)) return FR_RW_ERROR;
+	if (!move_window(dj.fs, sect)) return FR_RW_ERROR;
 	memset(&dir[0], 0, 32);						/* Initialize the new entry */
 	memcpy(&dir[DIR_Name], fn, 8+3);			/* Name */
 	dir[DIR_NTres] = fn[11];
@@ -1492,7 +1526,7 @@ FRESULT f_mkdir (
 	ST_WORD(&dir[DIR_FstClusLO], dclust);		/* Table start cluster */
 	ST_WORD(&dir[DIR_FstClusHI], dclust >> 16);
 
-	return sync(fs);
+	return sync(dj.fs);
 }
 
 
@@ -1509,23 +1543,55 @@ FRESULT f_chmod (
 )
 {
 	FRESULT res;
+	DIR dj;
 	BYTE *dir;
-	DIR dirobj;
 	char fn[8+3+1];
-	FATFS *fs;
 
 
-	res = auto_mount(&path, &fs, 1);
+	res = auto_mount(&path, &dj.fs, 1);
 	if (res == FR_OK) {
-		dirobj.fs = fs;
-		res = trace_path(&dirobj, fn, path, &dir);	/* Trace the file path */
-		if (res == FR_OK) {			/* Trace completed */
-			if (dir == NULL) {
-				res = FR_INVALID_NAME;
+		res = trace_path(&dj, fn, path, &dir);	/* Trace the file path */
+		if (res == FR_OK) {				/* Trace completed */
+			if (!dir) {
+				res = FR_INVALID_NAME;	/* Root directory */
 			} else {
 				mask &= AM_RDO|AM_HID|AM_SYS|AM_ARC;	/* Valid attribute mask */
 				dir[DIR_Attr] = (value & mask) | (dir[DIR_Attr] & (BYTE)~mask);	/* Apply attribute change */
-				res = sync(fs);
+				res = sync(dj.fs);
+			}
+		}
+	}
+	return res;
+}
+
+
+
+
+/*-----------------------------------------------------------------------*/
+/* Change Timestamp                                                      */
+/*-----------------------------------------------------------------------*/
+
+FRESULT f_utime (
+	const char *path,		/* Pointer to the file/directory name */
+	const FILINFO *finfo	/* Pointer to the timestamp to be set */
+)
+{
+	FRESULT res;
+	DIR dj;
+	BYTE *dir;
+	char fn[8+3+1];
+
+
+	res = auto_mount(&path, &dj.fs, 1);
+	if (res == FR_OK) {
+		res = trace_path(&dj, fn, path, &dir);	/* Trace the file path */
+		if (res == FR_OK) {				/* Trace completed */
+			if (!dir) {
+				res = FR_INVALID_NAME;	/* Root directory */
+			} else {
+				ST_WORD(&dir[DIR_WrtTime], finfo->ftime);
+				ST_WORD(&dir[DIR_WrtDate], finfo->fdate);
+				res = sync(dj.fs);
 			}
 		}
 	}
@@ -1545,38 +1611,36 @@ FRESULT f_rename (
 )
 {
 	FRESULT res;
+	DIR dj;
 	DWORD sect_old;
 	BYTE *dir_old, *dir_new, direntry[32-11];
-	DIR dirobj;
 	char fn[8+3+1];
-	FATFS *fs;
 
 
-	res = auto_mount(&path_old, &fs, 1);
+	res = auto_mount(&path_old, &dj.fs, 1);
 	if (res != FR_OK) return res;
-	dirobj.fs = fs;
 
-	res = trace_path(&dirobj, fn, path_old, &dir_old);	/* Check old object */
-	if (res != FR_OK) return res;			/* The old object is not found */
+	res = trace_path(&dj, fn, path_old, &dir_old);	/* Check old object */
+	if (res != FR_OK) return res;				/* The old object is not found */
 	if (!dir_old) return FR_NO_FILE;
-	sect_old = fs->winsect;					/* Save the object information */
+	sect_old = dj.fs->winsect;					/* Save the object information */
 	memcpy(direntry, &dir_old[DIR_Attr], 32-11);
 
-	res = trace_path(&dirobj, fn, path_new, &dir_new);	/* Check new object */
+	res = trace_path(&dj, fn, path_new, &dir_new);	/* Check new object */
 	if (res == FR_OK) return FR_EXIST;			/* The new object name is already existing */
 	if (res != FR_NO_FILE) return res;			/* Is there no old name? */
-	res = reserve_direntry(&dirobj, &dir_new); 	/* Reserve a directory entry */
+	res = reserve_direntry(&dj, &dir_new); 		/* Reserve a directory entry */
 	if (res != FR_OK) return res;
 
 	memcpy(&dir_new[DIR_Attr], direntry, 32-11);	/* Create new entry */
 	memcpy(&dir_new[DIR_Name], fn, 8+3);
 	dir_new[DIR_NTres] = fn[11];
-	fs->winflag = 1;
+	dj.fs->winflag = 1;
 
-	if (!move_window(fs, sect_old)) return FR_RW_ERROR;	/* Remove old entry */
+	if (!move_window(dj.fs, sect_old)) return FR_RW_ERROR;	/* Delete old entry */
 	dir_old[DIR_Name] = 0xE5;
 
-	return sync(fs);
+	return sync(dj.fs);
 }
 
 
@@ -1615,7 +1679,7 @@ FRESULT f_mkfs (
 	/* Check mounted drive and clear work area */
 	fs = FatFs[drv];
 	if (!fs) return FR_NOT_ENABLED;
-	memset(fs, 0, sizeof(FATFS));
+	fs->fs_type = 0;
 	drv = LD2PD(drv);
 
 	/* Get disk statics */
@@ -1628,33 +1692,33 @@ FRESULT f_mkfs (
 	b_part = (!partition) ? 63 : 0;		/* Boot sector */
 	n_part -= b_part;
 #if S_MAX_SIZ > 512						/* Check disk sector size */
-	if (disk_ioctl(drv, GET_SECTOR_SIZE, &S_SIZ) != RES_OK
-		|| S_SIZ > S_MAX_SIZ
-		|| S_SIZ > allocsize)
+	if (disk_ioctl(drv, GET_SECTOR_SIZE, &SS(fs)) != RES_OK
+		|| SS(fs) > S_MAX_SIZ
+		|| SS(fs) > allocsize)
 		return FR_MKFS_ABORTED;
 #endif
-	allocsize /= S_SIZ;		/* Number of sectors per cluster */
+	allocsize /= SS(fs);		/* Number of sectors per cluster */
 
 	/* Pre-compute number of clusters and FAT type */
 	n_clust = n_part / allocsize;
 	fmt = FS_FAT12;
-	if (n_clust >= 0xFF7) fmt = FS_FAT16;
-	if (n_clust >= 0xFFF7) fmt = FS_FAT32;
+	if (n_clust >= 0xFF5) fmt = FS_FAT16;
+	if (n_clust >= 0xFFF5) fmt = FS_FAT32;
 
 	/* Determine offset and size of FAT structure */
 	switch (fmt) {
 	case FS_FAT12:
-		n_fat = ((n_clust * 3 + 1) / 2 + 3 + S_SIZ - 1) / S_SIZ;
+		n_fat = ((n_clust * 3 + 1) / 2 + 3 + SS(fs) - 1) / SS(fs);
 		n_rsv = 1 + partition;
-		n_dir = N_ROOTDIR * 32 / S_SIZ;
+		n_dir = N_ROOTDIR * 32 / SS(fs);
 		break;
 	case FS_FAT16:
-		n_fat = ((n_clust * 2) + 4 + S_SIZ - 1) / S_SIZ;
+		n_fat = ((n_clust * 2) + 4 + SS(fs) - 1) / SS(fs);
 		n_rsv = 1 + partition;
-		n_dir = N_ROOTDIR * 32 / S_SIZ;
+		n_dir = N_ROOTDIR * 32 / SS(fs);
 		break;
 	default:
-		n_fat = ((n_clust * 4) + 8 + S_SIZ - 1) / S_SIZ;
+		n_fat = ((n_clust * 4) + 8 + SS(fs) - 1) / SS(fs);
 		n_rsv = 33 - partition;
 		n_dir = 0;
 	}
@@ -1670,8 +1734,8 @@ FRESULT f_mkfs (
 
 	/* Determine number of cluster and final check of validity of the FAT type */
 	n_clust = (n_part - n_rsv - n_fat * N_FATS - n_dir) / allocsize;
-	if (   (fmt == FS_FAT16 && n_clust < 0xFF7)
-		|| (fmt == FS_FAT32 && n_clust < 0xFFF7))
+	if (   (fmt == FS_FAT16 && n_clust < 0xFF5)
+		|| (fmt == FS_FAT32 && n_clust < 0xFFF5))
 		return FR_MKFS_ABORTED;
 
 	/* Create partition table if needed */
@@ -1701,13 +1765,13 @@ FRESULT f_mkfs (
 
 	/* Create boot record */
 	tbl = fs->win;								/* Clear buffer */
-	memset(tbl, 0, S_SIZ);
+	memset(tbl, 0, SS(fs));
 	ST_DWORD(&tbl[BS_jmpBoot], 0x90FEEB);		/* Boot code (jmp $, nop) */
-	ST_WORD(&tbl[BPB_BytsPerSec], S_SIZ);		/* Sector size */
+	ST_WORD(&tbl[BPB_BytsPerSec], SS(fs));		/* Sector size */
 	tbl[BPB_SecPerClus] = (BYTE)allocsize;		/* Sectors per cluster */
 	ST_WORD(&tbl[BPB_RsvdSecCnt], n_rsv);		/* Reserved sectors */
 	tbl[BPB_NumFATs] = N_FATS;					/* Number of FATs */
-	ST_WORD(&tbl[BPB_RootEntCnt], S_SIZ / 32 * n_dir); /* Number of rootdir entries */
+	ST_WORD(&tbl[BPB_RootEntCnt], SS(fs) / 32 * n_dir); /* Number of rootdir entries */
 	if (n_part < 0x10000) {						/* Number of total sectors */
 		ST_WORD(&tbl[BPB_TotSec16], n_part);
 	} else {
@@ -1739,7 +1803,7 @@ FRESULT f_mkfs (
 
 	/* Initialize FAT area */
 	for (m = 0; m < N_FATS; m++) {
-		memset(tbl, 0, S_SIZ);		/* 1st sector of the FAT  */
+		memset(tbl, 0, SS(fs));		/* 1st sector of the FAT  */
 		if (fmt != FS_FAT32) {
 			n = (fmt == FS_FAT12) ? 0x00FFFFF8 : 0xFFFFFFF8;
 			ST_DWORD(&tbl[0], n);			/* Reserve cluster #0-1 (FAT12/16) */
@@ -1750,7 +1814,7 @@ FRESULT f_mkfs (
 		}
 		if (disk_write(drv, tbl, b_fat++, 1) != RES_OK)
 			return FR_RW_ERROR;
-		memset(tbl, 0, S_SIZ);		/* Following FAT entries are filled by zero */
+		memset(tbl, 0, SS(fs));		/* Following FAT entries are filled by zero */
 		for (n = 1; n < n_fat; n++) {
 			if (disk_write(drv, tbl, b_fat++, 1) != RES_OK)
 				return FR_RW_ERROR;
diff --git a/src/ff.h b/src/ff.h
index c3071d3..8cd63d1 100644
--- a/src/ff.h
+++ b/src/ff.h
@@ -1,11 +1,11 @@
 /*--------------------------------------------------------------------------/
-/  FatFs - FAT file system module include file  R0.05        (C)ChaN, 2007
+/  FatFs - FAT file system module include file  R0.05a       (C)ChaN, 2008
 /---------------------------------------------------------------------------/
 / FatFs module is an experimenal project to implement FAT file system to
 / cheap microcontrollers. This is a free software and is opened for education,
 / research and development under license policy of following trems.
 /
-/  Copyright (C) 2007, ChaN, all right reserved.
+/  Copyright (C) 2008, ChaN, all right reserved.
 /
 / * The FatFs module is a free software and there is no warranty.
 / * You can use, modify and/or redistribute it for personal, non-profit or
@@ -21,18 +21,18 @@
 /  1: Enable word access.
 /  2: Disable word access and use byte-by-byte access instead.
 /  When the architectural byte order of the MCU is big-endian and/or address
-/  miss-aligned access results incorrect behavior, the _MCU_ENDIAN must be set
-/  to 2. If it is not the case, it can be set to 1 for good code efficiency. */
+/  miss-aligned access results incorrect behavior, the _MCU_ENDIAN must be set to 2.
+/  If it is not the case, it can also be set to 1 for good code efficiency. */
 
 #define _FS_READONLY	0
 /* Setting _FS_READONLY to 1 defines read only configuration. This removes
-/  writing functions, f_write, f_sync, f_unlink, f_mkdir, f_chmod, f_rename
-/  and useless f_getfree. */
+/  writing functions, f_write, f_sync, f_unlink, f_mkdir, f_chmod, f_rename,
+/  f_truncate and useless f_getfree. */
 
 #define _FS_MINIMIZE	0
 /* The _FS_MINIMIZE option defines minimization level to remove some functions.
 /  0: Full function.
-/  1: f_stat, f_getfree, f_unlink, f_mkdir, f_chmod and f_rename are removed.
+/  1: f_stat, f_getfree, f_unlink, f_mkdir, f_chmod, f_truncate and f_rename are removed.
 /  2: f_opendir and f_readdir are removed in addition to level 1.
 /  3: f_lseek is removed in addition to level 2. */
 
@@ -67,9 +67,9 @@
 /* Definitions corresponds to multiple sector size (not tested) */
 #define	S_MAX_SIZ	512			/* Do not change */
 #if S_MAX_SIZ > 512
-#define	S_SIZ	(fs->s_size)
+#define	SS(fs)	((fs)->s_size)
 #else
-#define	S_SIZ	512
+#define	SS(fs)	512
 #endif
 
 
@@ -201,10 +201,12 @@ FRESULT f_opendir (DIR*, const char*);				/* Open an existing directory */
 FRESULT f_readdir (DIR*, FILINFO*);					/* Read a directory item */
 FRESULT f_stat (const char*, FILINFO*);				/* Get file status */
 FRESULT f_getfree (const char*, DWORD*, FATFS**);	/* Get number of free clusters on the drive */
+FRESULT f_truncate (FIL*);							/* Truncate file */
 FRESULT f_sync (FIL*);								/* Flush cached data of a writing file */
 FRESULT f_unlink (const char*);						/* Delete an existing file or directory */
 FRESULT	f_mkdir (const char*);						/* Create a new directory */
 FRESULT f_chmod (const char*, BYTE, BYTE);			/* Change file/dir attriburte */
+FRESULT f_utime (const char*, const FILINFO*);		/* Change file/dir timestamp */
 FRESULT f_rename (const char*, const char*);		/* Rename/Move a file or directory */
 FRESULT f_mkfs (BYTE, BYTE, WORD);					/* Create a file system on the drive */
 
@@ -313,8 +315,7 @@ DWORD get_fattime (void);	/* 31-25: Year(0-127 org.1980), 24-21: Month(1-12), 20
 #define	LD_DWORD(ptr)		(DWORD)(*(DWORD*)(BYTE*)(ptr))
 #define	ST_WORD(ptr,val)	*(WORD*)(BYTE*)(ptr)=(WORD)(val)
 #define	ST_DWORD(ptr,val)	*(DWORD*)(BYTE*)(ptr)=(DWORD)(val)
-#else
-#if _MCU_ENDIAN == 2	/* Use byte-by-byte access */
+#elif _MCU_ENDIAN == 2	/* Use byte-by-byte access */
 #define	LD_WORD(ptr)		(WORD)(((WORD)*(volatile BYTE*)((ptr)+1)<<8)|(WORD)*(volatile BYTE*)(ptr))
 #define	LD_DWORD(ptr)		(DWORD)(((DWORD)*(volatile BYTE*)((ptr)+3)<<24)|((DWORD)*(volatile BYTE*)((ptr)+2)<<16)|((WORD)*(volatile BYTE*)((ptr)+1)<<8)|*(volatile BYTE*)(ptr))
 #define	ST_WORD(ptr,val)	*(volatile BYTE*)(ptr)=(BYTE)(val); *(volatile BYTE*)((ptr)+1)=(BYTE)((WORD)(val)>>8)
@@ -322,7 +323,6 @@ DWORD get_fattime (void);	/* 31-25: Year(0-127 org.1980), 24-21: Month(1-12), 20
 #else
 #error Do not forget to set _MCU_ENDIAN properly!
 #endif
-#endif
 
 
 #define _FATFS
diff --git a/src/integer.h b/src/integer.h
index 74fd07f..54f74ca 100644
--- a/src/integer.h
+++ b/src/integer.h
@@ -1,20 +1,24 @@
+/*-------------------------------------------*/
+/* Integer type definitions for FatFs module */
+/*-------------------------------------------*/
+
 #ifndef _INTEGER
 
-/* These types are assumed as 16-bit or larger integer */
+/* These types must be 16-bit, 32-bit or larger integer */
 typedef signed int		INT;
 typedef unsigned int	UINT;
 
-/* These types are assumed as 8-bit integer */
+/* These types must be 8-bit integer */
 typedef signed char		CHAR;
 typedef unsigned char	UCHAR;
 typedef unsigned char	BYTE;
 
-/* These types are assumed as 16-bit integer */
+/* These types must be 16-bit integer */
 typedef signed short	SHORT;
 typedef unsigned short	USHORT;
 typedef unsigned short	WORD;
 
-/* These types are assumed as 32-bit integer */
+/* These types must be 32-bit integer */
 typedef signed long		LONG;
 typedef unsigned long	ULONG;
 typedef unsigned long	DWORD;
diff --git a/src/tff.c b/src/tff.c
index 7fbbc20..c76dba8 100644
--- a/src/tff.c
+++ b/src/tff.c
@@ -1,11 +1,11 @@
 /*--------------------------------------------------------------------------/
-/  FatFs - Tiny FAT file system module  R0.05                 (C)ChaN, 2007
+/  FatFs - Tiny FAT file system module  R0.05a                (C)ChaN, 2008
 /---------------------------------------------------------------------------/
 / The FatFs module is an experimenal project to implement FAT file system to
 / cheap microcontrollers. This is a free software and is opened for education,
 / research and development under license policy of following trems.
 /
-/  Copyright (C) 2007, ChaN, all right reserved.
+/  Copyright (C) 2008, ChaN, all right reserved.
 /
 / * The FatFs module is a free software and there is no warranty.
 / * You can use, modify and/or redistribute it for personal, non-profit or
@@ -14,14 +14,18 @@
 /
 /---------------------------------------------------------------------------/
 /  Feb 26, 2006  R0.00  Prototype.
+/
 /  Apr 29, 2006  R0.01  First stable version.
+/
 /  Jun 01, 2006  R0.02  Added FAT12 support.
 /                       Removed unbuffered mode.
 /                       Fixed a problem on small (<32M) patition.
 /  Jun 10, 2006  R0.02a Added a configuration option (_FS_MINIMUM).
+/
 /  Sep 22, 2006  R0.03  Added f_rename().
 /                       Changed option _FS_MINIMUM to _FS_MINIMIZE.
 /  Dec 09, 2006  R0.03a Improved cluster scan algolithm to write files fast.
+/
 /  Feb 04, 2007  R0.04  Added FAT32 supprt.
 /                       Changed some interfaces incidental to FatFs.
 /                       Changed f_mountdrv() to f_mount().
@@ -33,7 +37,13 @@
 /                       Fixed some problems corresponds to FAT32 support.
 /                       Fixed DBCS name can result FR_INVALID_NAME.
 /                       Fixed short seek (<= csize) collapses the file object.
+/
 /  Aug 25, 2007  R0.05  Changed arguments of f_read() and f_write().
+/  Feb 03, 2008  R0.05a Added f_truncate().
+/                       Added f_utime().
+/                       Fixed off by one error at FAT sub-type determination.
+/                       Fixed btr in f_read() can be mistruncated.
+/                       Fixed cached sector is not flushed when create and close without write.
 /---------------------------------------------------------------------------*/
 
 #include 
@@ -59,9 +69,9 @@ WORD fsid;				/* File system mount ID */
 /*-----------------------------------------------------------------------*/
 
 static
-BOOL move_window (		/* TRUE: successful, FALSE: failed */
-	DWORD sector		/* Sector number to make apperance in the FatFs->win */
-)						/* Move to zero only writes back dirty window */
+BOOL move_window (	/* TRUE: successful, FALSE: failed */
+	DWORD sector	/* Sector number to make apperance in the FatFs->win */
+)					/* Move to zero only writes back dirty window */
 {
 	DWORD wsect;
 	FATFS *fs = FatFs;
@@ -123,7 +133,8 @@ FRESULT sync (void)		/* FR_OK: successful, FR_RW_ERROR: failed */
 	}
 #endif
 	/* Make sure that no pending write process in the physical drive */
-	if (disk_ioctl(0, CTRL_SYNC, NULL) != RES_OK) return FR_RW_ERROR;
+	if (disk_ioctl(0, CTRL_SYNC, NULL) != RES_OK)
+		return FR_RW_ERROR;
 	return FR_OK;
 }
 #endif
@@ -136,8 +147,8 @@ FRESULT sync (void)		/* FR_OK: successful, FR_RW_ERROR: failed */
 /*-----------------------------------------------------------------------*/
 
 static
-CLUST get_cluster (		/* 0,>=2: successful, 1: failed */
-	CLUST clust			/* Cluster# to get the link information */
+CLUST get_cluster (	/* 0,>=2: successful, 1: failed */
+	CLUST clust		/* Cluster# to get the link information */
 )
 {
 	WORD wc, bc;
@@ -167,7 +178,7 @@ CLUST get_cluster (		/* 0,>=2: successful, 1: failed */
 		}
 	}
 
-	return 1;	/* There is no cluster information, or an error occured */
+	return 1;	/* Out of cluster range, or an error occured */
 }
 
 
@@ -179,9 +190,9 @@ CLUST get_cluster (		/* 0,>=2: successful, 1: failed */
 
 #if !_FS_READONLY
 static
-BOOL put_cluster (		/* TRUE: successful, FALSE: failed */
-	CLUST clust,		/* Cluster# to change */
-	CLUST val			/* New value to mark the cluster */
+BOOL put_cluster (	/* TRUE: successful, FALSE: failed */
+	CLUST clust,	/* Cluster# to change (must be 2 to fs->max_clust-1) */
+	CLUST val		/* New value to mark the cluster */
 )
 {
 	WORD bc;
@@ -231,8 +242,8 @@ BOOL put_cluster (		/* TRUE: successful, FALSE: failed */
 
 #if !_FS_READONLY
 static
-BOOL remove_chain (		/* TRUE: successful, FALSE: failed */
-	CLUST clust			/* Cluster# to remove chain from */
+BOOL remove_chain (	/* TRUE: successful, FALSE: failed */
+	CLUST clust		/* Cluster# to remove chain from */
 )
 {
 	CLUST nxt;
@@ -264,7 +275,7 @@ BOOL remove_chain (		/* TRUE: successful, FALSE: failed */
 
 #if !_FS_READONLY
 static
-CLUST create_chain (	/* 0: no free cluster, 1: error, >=2: new cluster number */
+CLUST create_chain (	/* 0: No free cluster, 1: Error, >=2: New cluster number */
 	CLUST clust			/* Cluster# to stretch, 0 means create new */
 )
 {
@@ -341,30 +352,29 @@ DWORD clust2sect (	/* !=0: sector number, 0: failed - invalid cluster# */
 
 static
 BOOL next_dir_entry (	/* TRUE: successful, FALSE: could not move next */
-	DIR *dirobj			/* Pointer to directory object */
+	DIR *dj				/* Pointer to directory object */
 )
 {
 	CLUST clust;
 	WORD idx;
-	FATFS *fs = FatFs;
 
 
-	idx = dirobj->index + 1;
+	idx = dj->index + 1;
 	if ((idx & 15) == 0) {		/* Table sector changed? */
-		dirobj->sect++;			/* Next sector */
-		if (!dirobj->clust) {		/* In static table */
-			if (idx >= fs->n_rootdir) return FALSE;	/* Reached to end of table */
-		} else {					/* In dynamic table */
-			if (((idx / 16) & (fs->sects_clust - 1)) == 0) {	/* Cluster changed? */
-				clust = get_cluster(dirobj->clust);			/* Get next cluster */
-				if (clust < 2 || clust >= fs->max_clust)	/* Reached to end of table */
+		dj->sect++;				/* Next sector */
+		if (!dj->clust) {		/* In static table */
+			if (idx >= dj->fs->n_rootdir) return FALSE;	/* Reached to end of table */
+		} else {				/* In dynamic table */
+			if (((idx / 16) & (dj->fs->sects_clust - 1)) == 0) {	/* Cluster changed? */
+				clust = get_cluster(dj->clust);		/* Get next cluster */
+				if (clust < 2 || clust >= dj->fs->max_clust)	/* Reached to end of table */
 					return FALSE;
-				dirobj->clust = clust;				/* Initialize for new cluster */
-				dirobj->sect = clust2sect(clust);
+				dj->clust = clust;				/* Initialize for new cluster */
+				dj->sect = clust2sect(clust);
 			}
 		}
 	}
-	dirobj->index = idx;	/* Lower 4 bit of dirobj->index indicates offset in dirobj->sect */
+	dj->index = idx;	/* Lower 4 bit of dj->index indicates offset in dj->sect */
 	return TRUE;
 }
 
@@ -377,9 +387,9 @@ BOOL next_dir_entry (	/* TRUE: successful, FALSE: could not move next */
 
 #if _FS_MINIMIZE <= 1
 static
-void get_fileinfo (		/* No return code */
-	FILINFO *finfo, 	/* Ptr to store the File Information */
-	const BYTE *dir		/* Ptr to the directory entry */
+void get_fileinfo (	/* No return code */
+	FILINFO *finfo, /* Ptr to store the File Information */
+	const BYTE *dir	/* Ptr to the directory entry */
 )
 {
 	BYTE n, c, a;
@@ -421,9 +431,9 @@ void get_fileinfo (		/* No return code */
 /*-----------------------------------------------------------------------*/
 
 static
-char make_dirfile (			/* 1: error - detected an invalid format, '\0'or'/': next character */
-	const char **path,		/* Pointer to the file path pointer */
-	char *dirname			/* Pointer to directory name buffer {Name(8), Ext(3), NT flag(1)} */
+char make_dirfile (		/* 1: error - detected an invalid format, '\0'or'/': next character */
+	const char **path,	/* Pointer to the file path pointer */
+	char *dirname		/* Pointer to directory name buffer {Name(8), Ext(3), NT flag(1)} */
 )
 {
 	BYTE n, t, c, a, b;
@@ -462,14 +472,14 @@ char make_dirfile (			/* 1: error - detected an invalid format, '\0'or'/': next
 			if (c == '|') break;			/* Reject | */
 			if (c >= '[' && c <= ']') break;/* Reject [ \ ] */
 			if (_USE_NTFLAG && c >= 'A' && c <= 'Z')
-				(t == 8) ? (b &= ~0x08) : (b &= ~0x10);
+				(t == 8) ? (b &= 0xF7) : (b &= 0xEF);
 			if (c >= 'a' && c <= 'z') {		/* Convert to upper case */
 				c -= 0x20;
 				if (_USE_NTFLAG) (t == 8) ? (a |= 0x08) : (a |= 0x10);
 			}
 		}
 	md_l1:
-		a &= ~1;
+		a &= 0xFE;
 	md_l2:
 		if (n >= t) break;
 		dirname[n++] = c;
@@ -485,10 +495,10 @@ char make_dirfile (			/* 1: error - detected an invalid format, '\0'or'/': next
 
 static
 FRESULT trace_path (	/* FR_OK(0): successful, !=0: error code */
-	DIR *dirobj,		/* Pointer to directory object to return last directory */
+	DIR *dj,			/* Pointer to directory object to return last directory */
 	char *fn,			/* Pointer to last segment name to return */
 	const char *path,	/* Full-path string to trace a file or directory */
-	BYTE **dir			/* Directory pointer in Win[] to retutn */
+	BYTE **dir			/* Pointer to pointer to found entry to retutn */
 )
 {
 	CLUST clust;
@@ -497,19 +507,19 @@ FRESULT trace_path (	/* FR_OK(0): successful, !=0: error code */
 	FATFS *fs = FatFs;
 
 	/* Initialize directory object */
+	dj->fs = fs;
 	clust = fs->dirbase;
 #if _FAT32
 	if (fs->fs_type == FS_FAT32) {
-		dirobj->clust = dirobj->sclust = clust;
-		dirobj->sect = clust2sect(clust);
+		dj->clust = dj->sclust = clust;
+		dj->sect = clust2sect(clust);
 	} else
 #endif
 	{
-		dirobj->clust = dirobj->sclust = 0;
-		dirobj->sect = clust;
+		dj->clust = dj->sclust = 0;
+		dj->sect = clust;
 	}
-	dirobj->index = 0;
-	dirobj->fs = fs;
+	dj->index = 0;
 
 	if (*path == '\0') {							/* Null path means the root directory */
 		*dir = NULL; return FR_OK;
@@ -519,26 +529,26 @@ FRESULT trace_path (	/* FR_OK(0): successful, !=0: error code */
 		ds = make_dirfile(&path, fn);					/* Get a paragraph into fn[] */
 		if (ds == 1) return FR_INVALID_NAME;
 		for (;;) {
-			if (!move_window(dirobj->sect)) return FR_RW_ERROR;
-			dptr = &fs->win[(dirobj->index & 15) * 32];		/* Pointer to the directory entry */
-			if (dptr[DIR_Name] == 0)						/* Has it reached to end of dir? */
+			if (!move_window(dj->sect)) return FR_RW_ERROR;
+			dptr = &fs->win[(dj->index & 15) * 32];		/* Pointer to the directory entry */
+			if (dptr[DIR_Name] == 0)					/* Has it reached to end of dir? */
 				return !ds ? FR_NO_FILE : FR_NO_PATH;
-			if (dptr[DIR_Name] != 0xE5						/* Matched? */
+			if (dptr[DIR_Name] != 0xE5					/* Matched? */
 				&& !(dptr[DIR_Attr] & AM_VOL)
 				&& !memcmp(&dptr[DIR_Name], fn, 8+3) ) break;
-			if (!next_dir_entry(dirobj))					/* Next directory pointer */
+			if (!next_dir_entry(dj))					/* Next directory pointer */
 				return !ds ? FR_NO_FILE : FR_NO_PATH;
 		}
-		if (!ds) { *dir = dptr; return FR_OK; }				/* Matched with end of path */
+		if (!ds) { *dir = dptr; return FR_OK; }			/* Matched with end of path */
 		if (!(dptr[DIR_Attr] & AM_DIR)) return FR_NO_PATH;	/* Cannot trace because it is a file */
-		clust =												/* Get cluster# of the directory */
+		clust =											/* Get cluster# of the directory */
 #if _FAT32
 			((DWORD)LD_WORD(&dptr[DIR_FstClusHI]) << 16) |
 #endif
 			LD_WORD(&dptr[DIR_FstClusLO]);
-		dirobj->clust = dirobj->sclust = clust;				/* Restart scannig with the new directory */
-		dirobj->sect = clust2sect(clust);
-		dirobj->index = 2;
+		dj->clust = dj->sclust = clust;				/* Restart scannig with the new directory */
+		dj->sect = clust2sect(clust);
+		dj->index = 2;
 	}
 }
 
@@ -551,41 +561,41 @@ FRESULT trace_path (	/* FR_OK(0): successful, !=0: error code */
 #if !_FS_READONLY
 static
 FRESULT reserve_direntry (	/* FR_OK: successful, FR_DENIED: no free entry, FR_RW_ERROR: a disk error occured */
-	DIR *dirobj,			/* Target directory to create new entry */
+	DIR *dj,				/* Target directory to create new entry */
 	BYTE **dir				/* Pointer to pointer to created entry to retutn */
 )
 {
 	CLUST clust;
 	DWORD sector;
 	BYTE c, n, *dptr;
-	FATFS *fs = FatFs;
+	FATFS *fs = dj->fs;
 
 
 	/* Re-initialize directory object */
-	clust = dirobj->sclust;
+	clust = dj->sclust;
 	if (clust) {	/* Dyanmic directory table */
-		dirobj->clust = clust;
-		dirobj->sect = clust2sect(clust);
+		dj->clust = clust;
+		dj->sect = clust2sect(clust);
 	} else {		/* Static directory table */
-		dirobj->sect = fs->dirbase;
+		dj->sect = fs->dirbase;
 	}
-	dirobj->index = 0;
+	dj->index = 0;
 
 	do {
-		if (!move_window(dirobj->sect)) return FR_RW_ERROR;
-		dptr = &fs->win[(dirobj->index & 15) * 32];	/* Pointer to the directory entry */
+		if (!move_window(dj->sect)) return FR_RW_ERROR;
+		dptr = &fs->win[(dj->index & 15) * 32];	/* Pointer to the directory entry */
 		c = dptr[DIR_Name];
 		if (c == 0 || c == 0xE5) {			/* Found an empty entry! */
 			*dir = dptr; return FR_OK;
 		}
-	} while (next_dir_entry(dirobj));				/* Next directory pointer */
+	} while (next_dir_entry(dj));			/* Next directory pointer */
 	/* Reached to end of the directory table */
 
 	/* Abort when static table or could not stretch dynamic table */
-	if (!clust || !(clust = create_chain(dirobj->clust))) return FR_DENIED;
+	if (!clust || !(clust = create_chain(dj->clust))) return FR_DENIED;
 	if (clust == 1 || !move_window(0)) return FR_RW_ERROR;
 
-	fs->winsect = sector = clust2sect(clust);			/* Cleanup the expanded table */
+	fs->winsect = sector = clust2sect(clust);	/* Cleanup the expanded table */
 	memset(fs->win, 0, 512);
 	for (n = fs->sects_clust; n; n--) {
 		if (disk_write(0, fs->win, sector, 1) != RES_OK)
@@ -602,12 +612,12 @@ FRESULT reserve_direntry (	/* FR_OK: successful, FR_DENIED: no free entry, FR_RW
 
 
 /*-----------------------------------------------------------------------*/
-/* Load boot record and check if it is a FAT boot record                 */
+/* Load boot record and check if it is an FAT boot record                */
 /*-----------------------------------------------------------------------*/
 
 static
-BYTE check_fs (		/* 0:The FAT boot record, 1:Valid boot record but not an FAT, 2:Not a boot record or error */
-	DWORD sect		/* Sector# to check if it is a FAT boot record or not */
+BYTE check_fs (	/* 0:The FAT boot record, 1:Valid boot record but not an FAT, 2:Not a boot record or error */
+	DWORD sect	/* Sector# to check if it is an FAT boot record or not */
 )
 {
 	FATFS *fs = FatFs;
@@ -634,17 +644,16 @@ BYTE check_fs (		/* 0:The FAT boot record, 1:Valid boot record but not an FAT, 2
 /*-----------------------------------------------------------------------*/
 
 static
-FRESULT auto_mount (		/* FR_OK(0): successful, !=0: any error occured */
-	const char **path,		/* Pointer to pointer to the path name (drive number) */
-	BYTE chk_wp				/* !=0: Check media write protection for write access */
+FRESULT auto_mount (	/* FR_OK(0): successful, !=0: any error occured */
+	const char **path,	/* Pointer to pointer to the path name (drive number) */
+	BYTE chk_wp			/* !=0: Check media write protection for write access */
 )
 {
 	BYTE fmt;
 	DSTATUS stat;
 	DWORD bootsect, fatsize, totalsect, maxclust;
 	const char *p = *path;
-	FATFS *fs = FatFs;
-
+	FATFS *fs;
 
 
 	while (*p == ' ') p++;	/* Strip leading spaces */
@@ -652,21 +661,21 @@ FRESULT auto_mount (		/* FR_OK(0): successful, !=0: any error occured */
 	*path = p;				/* Return pointer to the path name */
 
 	/* Is the file system object registered? */
+	fs = FatFs;
 	if (!fs) return FR_NOT_ENABLED;
 
-	/* Chekck if the logical drive has been mounted or not */
-	if (fs->fs_type) {
+	if (fs->fs_type) {						/* If the logical drive has been mounted */
 		stat = disk_status(0);
-		if (!(stat & STA_NOINIT)) {				/* If the physical drive is kept initialized */
+		if (!(stat & STA_NOINIT)) {			/* and physical drive is kept initialized (has not been changed), */
 #if !_FS_READONLY
 			if (chk_wp && (stat & STA_PROTECT))	/* Check write protection if needed */
 				return FR_WRITE_PROTECTED;
 #endif
-			return FR_OK;						/* The file system object is valid */
+			return FR_OK;					/* The file system object is valid */
 		}
 	}
 
-	/* The logical drive has not been mounted, following code attempts to mount the logical drive */
+	/* The logical drive must be re-mounted. Following code attempts to mount the logical drive */
 
 	memset(fs, 0, sizeof(FATFS));		/* Clean-up the file system object */
 	stat = disk_initialize(0);			/* Initialize low level disk I/O layer */
@@ -679,11 +688,11 @@ FRESULT auto_mount (		/* FR_OK(0): successful, !=0: any error occured */
 
 	/* Search FAT partition on the drive */
 	fmt = check_fs(bootsect = 0);		/* Check sector 0 as an SFD format */
-	if (fmt == 1) {						/* Not a FAT boot record, it may be patitioned */
+	if (fmt == 1) {						/* Not an FAT boot record, it may be patitioned */
 		/* Check a partition listed in top of the partition table */
-		if (fs->win[MBR_Table+4]) {					/* Is the 1st partition existing? */
+		if (fs->win[MBR_Table+4]) {						/* Is the 1st partition existing? */
 			bootsect = LD_DWORD(&fs->win[MBR_Table+8]);	/* Partition offset in LBA */
-			fmt = check_fs(bootsect);				/* Check the partition */
+			fmt = check_fs(bootsect);					/* Check the partition */
 		}
 	}
 	if (fmt || LD_WORD(&fs->win[BPB_BytsPerSec]) != 512)	/* No valid FAT patition is found */
@@ -700,13 +709,13 @@ FRESULT auto_mount (		/* FR_OK(0): successful, !=0: any error occured */
 	fs->n_rootdir = LD_WORD(&fs->win[BPB_RootEntCnt]);	/* Nmuber of root directory entries */
 	totalsect = LD_WORD(&fs->win[BPB_TotSec16]);		/* Number of sectors on the file system */
 	if (!totalsect) totalsect = LD_DWORD(&fs->win[BPB_TotSec32]);
-	fs->max_clust = maxclust = (totalsect				/* Last cluster# + 1 */
+	fs->max_clust = maxclust = (totalsect				/* max_clust = Last cluster# + 1 */
 		- LD_WORD(&fs->win[BPB_RsvdSecCnt]) - fatsize - fs->n_rootdir / 16
 		) / fs->sects_clust + 2;
 
 	fmt = FS_FAT12;										/* Determine the FAT sub type */
-	if (maxclust > 0xFF7) fmt = FS_FAT16;
-	if (maxclust > 0xFFF7)
+	if (maxclust >= 0xFF7) fmt = FS_FAT16;
+	if (maxclust >= 0xFFF7)
 #if !_FAT32
 		return FR_NO_FILESYSTEM;
 #else
@@ -717,12 +726,12 @@ FRESULT auto_mount (		/* FR_OK(0): successful, !=0: any error occured */
 #endif
 		fs->dirbase = fs->fatbase + fatsize;			/* Root directory start sector (lba) */
 	fs->database = fs->fatbase + fatsize + fs->n_rootdir / 16;	/* Data start sector (lba) */
-	fs->fs_type = fmt;									/* FAT sub-type */
 
 #if !_FS_READONLY
+	/* Initialize allocation information */
 	fs->free_clust = (CLUST)0xFFFFFFFF;
 #if _USE_FSINFO
-	/* Load fsinfo sector if needed */
+	/* Get fsinfo if needed */
 	if (fmt == FS_FAT32) {
 		fs->fsi_sector = bootsect + LD_WORD(&fs->win[BPB_FSInfo]);
 		if (disk_read(0, fs->win, fs->fsi_sector, 1) == RES_OK &&
@@ -735,7 +744,9 @@ FRESULT auto_mount (		/* FR_OK(0): successful, !=0: any error occured */
 	}
 #endif
 #endif
-	fs->id = ++fsid;									/* File system mount ID */
+
+	fs->fs_type = fmt;			/* FAT syb-type */
+	fs->id = ++fsid;			/* File system mount ID */
 	return FR_OK;
 }
 
@@ -747,12 +758,12 @@ FRESULT auto_mount (		/* FR_OK(0): successful, !=0: any error occured */
 /*-----------------------------------------------------------------------*/
 
 static
-FRESULT validate (		/* FR_OK(0): The id is valid, !=0: Not valid */
+FRESULT validate (		/* FR_OK(0): The object is valid, !=0: Invalid */
 	const FATFS *fs,	/* Pointer to the file system object */
-	WORD id				/* id member of the target object to be checked */
+	WORD id				/* Member id of the target object to be checked */
 )
 {
-	if (!fs || fs->id != id)
+	if (!fs || !fs->fs_type || fs->id != id)
 		return FR_INVALID_OBJECT;
 	if (disk_status(0) & STA_NOINIT)
 		return FR_NOT_READY;
@@ -779,14 +790,12 @@ FRESULT f_mount (
 	FATFS *fs		/* Pointer to new file system object (NULL for unmount)*/
 )
 {
-	FATFS *fsobj;
-
-
 	if (drv) return FR_INVALID_DRIVE;
-	fsobj = FatFs;
-	FatFs = fs;
-	if (fsobj) memset(fsobj, 0, sizeof(FATFS));
-	if (fs) memset(fs, 0, sizeof(FATFS));
+
+	if (FatFs) FatFs->fs_type = 0;	/* Clear old object */
+
+	FatFs = fs;					/* Register and clear new object */
+	if (fs) fs->fs_type = 0;
 
 	return FR_OK;
 }
@@ -805,10 +814,9 @@ FRESULT f_open (
 )
 {
 	FRESULT res;
+	DIR dj;
 	BYTE *dir;
-	DIR dirobj;
 	char fn[8+3+1];
-	FATFS *fs = FatFs;
 
 
 	fp->fs = NULL;
@@ -820,9 +828,7 @@ FRESULT f_open (
 	res = auto_mount(&path, 0);
 #endif
 	if (res != FR_OK) return res;
-
-	/* Trace the file path */
-	res = trace_path(&dirobj, fn, path, &dir);	/* Trace the file path */
+	res = trace_path(&dj, fn, path, &dir);	/* Trace the file path */
 
 #if !_FS_READONLY
 	/* Create or Open a File */
@@ -831,16 +837,17 @@ FRESULT f_open (
 		DWORD dw;
 		if (res != FR_OK) {		/* No file, create new */
 			if (res != FR_NO_FILE) return res;
-			res = reserve_direntry(&dirobj, &dir);
+			res = reserve_direntry(&dj, &dir);
 			if (res != FR_OK) return res;
-			memset(dir, 0, 32);		/* Initialize the new entry */
+			memset(dir, 0, 32);		/* Initialize the new entry with open name */
 			memcpy(&dir[DIR_Name], fn, 8+3);
 			dir[DIR_NTres] = fn[11];
 			mode |= FA_CREATE_ALWAYS;
-		} else {				/* Any object is already existing */
+		}
+		else {					/* Any object is already existing */
 			if (mode & FA_CREATE_NEW)			/* Cannot create new */
 				return FR_EXIST;
-			if (dir == NULL || (dir[DIR_Attr] & (AM_RDO|AM_DIR)))	/* Cannot overwrite (R/O or DIR) */
+			if (!dir || (dir[DIR_Attr] & (AM_RDO|AM_DIR)))	/* Cannot overwrite (R/O or DIR) */
 				return FR_DENIED;
 			if (mode & FA_CREATE_ALWAYS) {		/* Resize it to zero */
 #if _FAT32
@@ -851,45 +858,45 @@ FRESULT f_open (
 #endif
 				ST_WORD(&dir[DIR_FstClusLO], 0);	/* cluster = 0 */
 				ST_DWORD(&dir[DIR_FileSize], 0);	/* size = 0 */
-				fs->winflag = 1;
-				dw = fs->winsect;				/* Remove the cluster chain */
+				dj.fs->winflag = 1;
+				dw = dj.fs->winsect;			/* Remove the cluster chain */
 				if (!remove_chain(rs) || !move_window(dw))
 					return FR_RW_ERROR;
-				fs->last_clust = rs - 1;		/* Reuse the cluster hole */
+				dj.fs->last_clust = rs - 1;		/* Reuse the cluster hole */
 			}
 		}
 		if (mode & FA_CREATE_ALWAYS) {
-			dir[DIR_Attr] = AM_ARC;		/* New attribute */
+			dir[DIR_Attr] = 0;					/* Reset attribute */
 			dw = get_fattime();
-			ST_DWORD(&dir[DIR_WrtTime], dw);	/* Updated time */
 			ST_DWORD(&dir[DIR_CrtTime], dw);	/* Created time */
-			fs->winflag = 1;
+			dj.fs->winflag = 1;
+			mode |= FA__WRITTEN;				/* Set file changed flag */
 		}
 	}
-	/* Open a File */
+	/* Open an existing file */
 	else {
 #endif /* !_FS_READONLY */
-		if (res != FR_OK) return res;		/* Trace failed */
-		if (dir == NULL || (dir[DIR_Attr] & AM_DIR))	/* It is a directory */
+		if (res != FR_OK) return res;			/* Trace failed */
+		if (!dir || (dir[DIR_Attr] & AM_DIR))	/* It is a directory */
 			return FR_NO_FILE;
 #if !_FS_READONLY
 		if ((mode & FA_WRITE) && (dir[DIR_Attr] & AM_RDO)) /* R/O violation */
 			return FR_DENIED;
 	}
 
-	fp->dir_sect = fs->winsect;			/* Pointer to the directory entry */
+	fp->dir_sect = dj.fs->winsect;			/* Pointer to the directory entry */
 	fp->dir_ptr = dir;
 #endif
-	fp->flag = mode;							/* File access mode */
-	fp->org_clust =								/* File start cluster */
+	fp->flag = mode;						/* File access mode */
+	fp->org_clust =							/* File start cluster */
 #if _FAT32
 		((DWORD)LD_WORD(&dir[DIR_FstClusHI]) << 16) |
 #endif
 		LD_WORD(&dir[DIR_FstClusLO]);
 	fp->fsize = LD_DWORD(&dir[DIR_FileSize]);	/* File size */
-	fp->fptr = 0;								/* File ptr */
-	fp->sect_clust = 1;							/* Sector counter */
-	fp->fs = fs; fp->id = fs->id;				/* Owner file system object of the file */
+	fp->fptr = 0;							/* File ptr */
+	fp->sect_clust = 1;						/* Sector counter */
+	fp->fs = dj.fs; fp->id = dj.fs->id;		/* Owner file system object of the file */
 
 	return FR_OK;
 }
@@ -908,21 +915,20 @@ FRESULT f_read (
 	UINT *br		/* Pointer to number of bytes read */
 )
 {
+	FRESULT res;
 	DWORD sect, remain;
 	UINT rcnt, cc;
 	CLUST clust;
 	BYTE *rbuff = buff;
-	FRESULT res;
-	FATFS *fs = fp->fs;
 
 
 	*br = 0;
-	res = validate(fs, fp->id);						/* Check validity of the object */
+	res = validate(fp->fs, fp->id);					/* Check validity of the object */
 	if (res != FR_OK) return res;
 	if (fp->flag & FA__ERROR) return FR_RW_ERROR;	/* Check error flag */
 	if (!(fp->flag & FA_READ)) return FR_DENIED;	/* Check access mode */
 	remain = fp->fsize - fp->fptr;
-	if (btr > remain) btr = (WORD)remain;			/* Truncate read count by number of bytes left */
+	if (btr > remain) btr = (UINT)remain;			/* Truncate read count by number of bytes left */
 
 	for ( ;  btr;									/* Repeat until all data transferred */
 		rbuff += rcnt, fp->fptr += rcnt, *br += rcnt, btr -= rcnt) {
@@ -932,11 +938,11 @@ FRESULT f_read (
 			} else {								/* On the cluster boundary, get next cluster */
 				clust = (fp->fptr == 0) ?
 					fp->org_clust : get_cluster(fp->curr_clust);
-				if (clust < 2 || clust >= fs->max_clust)
+				if (clust < 2 || clust >= fp->fs->max_clust)
 					goto fr_error;
 				fp->curr_clust = clust;				/* Current cluster */
 				sect = clust2sect(clust);			/* Get current sector */
-				fp->sect_clust = fs->sects_clust;	/* Re-initialize the left sector counter */
+				fp->sect_clust = fp->fs->sects_clust;	/* Re-initialize the left sector counter */
 			}
 			fp->curr_sect = sect;					/* Update current sector */
 			cc = btr / 512;							/* When left bytes >= 512, */
@@ -951,14 +957,14 @@ FRESULT f_read (
 			}
 		}
 		if (!move_window(fp->curr_sect)) goto fr_error;	/* Move sector window */
-		rcnt = 512 - (WORD)(fp->fptr % 512);			/* Copy fractional bytes from sector window */
+		rcnt = 512 - (fp->fptr % 512);				/* Copy fractional bytes from sector window */
 		if (rcnt > btr) rcnt = btr;
-		memcpy(rbuff, &fs->win[(WORD)fp->fptr % 512], rcnt);
+		memcpy(rbuff, &fp->fs->win[fp->fptr % 512], rcnt);
 	}
 
 	return FR_OK;
 
-fr_error:	/* Abort this function due to an unrecoverable error */
+fr_error:	/* Abort this file due to an unrecoverable error */
 	fp->flag |= FA__ERROR;
 	return FR_RW_ERROR;
 }
@@ -978,16 +984,15 @@ FRESULT f_write (
 	UINT *bw			/* Pointer to number of bytes written */
 )
 {
+	FRESULT res;
 	DWORD sect;
 	UINT wcnt, cc;
 	CLUST clust;
-	FRESULT res;
 	const BYTE *wbuff = buff;
-	FATFS *fs = fp->fs;
 
 
 	*bw = 0;
-	res = validate(fs, fp->id);						/* Check validity of the object */
+	res = validate(fp->fs, fp->id);					/* Check validity of the object */
 	if (res != FR_OK) return res;
 	if (fp->flag & FA__ERROR) return FR_RW_ERROR;	/* Check error flag */
 	if (!(fp->flag & FA_WRITE)) return FR_DENIED;	/* Check access mode */
@@ -996,7 +1001,7 @@ FRESULT f_write (
 	for ( ;  btw;									/* Repeat until all data transferred */
 		wbuff += wcnt, fp->fptr += wcnt, *bw += wcnt, btw -= wcnt) {
 		if ((fp->fptr % 512) == 0) {				/* On the sector boundary */
-			if (--(fp->sect_clust)) {				/* Decrement left sector counter */
+			if (--fp->sect_clust) {					/* Decrement left sector counter */
 				sect = fp->curr_sect + 1;			/* Get current sector */
 			} else {								/* On the cluster boundary, get next cluster */
 				if (fp->fptr == 0) {				/* Is top of the file */
@@ -1007,10 +1012,10 @@ FRESULT f_write (
 					clust = create_chain(fp->curr_clust);			/* Trace or streach cluster chain */
 				}
 				if (clust == 0) break;				/* Disk full */
-				if (clust == 1 || clust >= fs->max_clust) goto fw_error;
+				if (clust == 1 || clust >= fp->fs->max_clust) goto fw_error;
 				fp->curr_clust = clust;				/* Current cluster */
 				sect = clust2sect(clust);			/* Get current sector */
-				fp->sect_clust = fs->sects_clust;	/* Re-initialize the left sector counter */
+				fp->sect_clust = fp->fs->sects_clust;	/* Re-initialize the left sector counter */
 			}
 			fp->curr_sect = sect;					/* Update current sector */
 			cc = btw / 512;							/* When left bytes >= 512, */
@@ -1025,22 +1030,22 @@ FRESULT f_write (
 			}
 			if (fp->fptr >= fp->fsize) {			/* Flush R/W window if needed */
 				if (!move_window(0)) goto fw_error;
-				fs->winsect = fp->curr_sect;
+				fp->fs->winsect = fp->curr_sect;
 			}
 		}
 		if (!move_window(fp->curr_sect))			/* Move sector window */
 			goto fw_error;
-		wcnt = 512 - (WORD)(fp->fptr % 512);		/* Copy fractional bytes bytes to sector window */
+		wcnt = 512 - (fp->fptr % 512);				/* Copy fractional bytes bytes to sector window */
 		if (wcnt > btw) wcnt = btw;
-		memcpy(&fs->win[(WORD)fp->fptr % 512], wbuff, wcnt);
-		fs->winflag = 1;
+		memcpy(&fp->fs->win[fp->fptr % 512], wbuff, wcnt);
+		fp->fs->winflag = 1;
 	}
 
 	if (fp->fptr > fp->fsize) fp->fsize = fp->fptr;	/* Update file size if needed */
 	fp->flag |= FA__WRITTEN;						/* Set file changed flag */
 	return FR_OK;
 
-fw_error:	/* Abort this function due to an unrecoverable error */
+fw_error:	/* Abort this file due to an unrecoverable error */
 	fp->flag |= FA__ERROR;
 	return FR_RW_ERROR;
 }
@@ -1056,15 +1061,14 @@ FRESULT f_sync (
 	FIL *fp		/* Pointer to the file object */
 )
 {
+	FRESULT res;
 	DWORD tim;
 	BYTE *dir;
-	FRESULT res;
-	FATFS *fs = fp->fs;
 
 
-	res = validate(fs, fp->id);				/* Check validity of the object */
+	res = validate(fp->fs, fp->id);		/* Check validity of the object */
 	if (res == FR_OK) {
-		if (fp->flag & FA__WRITTEN) {		/* Has the file been written? */
+		if (fp->flag & FA__WRITTEN) {	/* Has the file been written? */
 			/* Update the directory entry */
 			if (!move_window(fp->dir_sect))
 				return FR_RW_ERROR;
@@ -1077,7 +1081,7 @@ FRESULT f_sync (
 #endif
 			tim = get_fattime();					/* Updated time */
 			ST_DWORD(&dir[DIR_WrtTime], tim);
-			fp->flag &= ~FA__WRITTEN;
+			fp->flag &= (BYTE)~FA__WRITTEN;
 			res = sync();
 		}
 	}
@@ -1088,7 +1092,6 @@ FRESULT f_sync (
 
 
 
-
 /*-----------------------------------------------------------------------*/
 /* Close File                                                            */
 /*-----------------------------------------------------------------------*/
@@ -1105,9 +1108,7 @@ FRESULT f_close (
 #else
 	res = validate(fp->fs, fp->id);
 #endif
-	if (res == FR_OK)
-		fp->fs = NULL;
-
+	if (res == FR_OK) fp->fs = NULL;
 	return res;
 }
 
@@ -1116,7 +1117,7 @@ FRESULT f_close (
 
 #if _FS_MINIMIZE <= 2
 /*-----------------------------------------------------------------------*/
-/* Seek File Pointer                                                     */
+/* Seek File R/W Pointer                                                 */
 /*-----------------------------------------------------------------------*/
 
 FRESULT f_lseek (
@@ -1124,16 +1125,14 @@ FRESULT f_lseek (
 	DWORD ofs		/* File pointer from top of file */
 )
 {
+	FRESULT res;
 	CLUST clust;
 	DWORD csize;
 	BYTE csect;
-	FRESULT res;
-	FATFS *fs = fp->fs;
 
 
-	res = validate(fs, fp->id);			/* Check validity of the object */
+	res = validate(fp->fs, fp->id);			/* Check validity of the object */
 	if (res != FR_OK) return res;
-
 	if (fp->flag & FA__ERROR) return FR_RW_ERROR;
 #if !_FS_READONLY
 	if (ofs > fp->fsize && !(fp->flag & FA_WRITE))
@@ -1154,7 +1153,7 @@ FRESULT f_lseek (
 		}
 #endif
 		if (clust) {			/* If the file has a cluster chain, it can be followed */
-			csize = (DWORD)fs->sects_clust * 512;		/* Cluster size in unit of byte */
+			csize = (DWORD)fp->fs->sects_clust * 512;	/* Cluster size in unit of byte */
 			for (;;) {									/* Loop to skip leading clusters */
 				fp->curr_clust = clust;					/* Update current cluster */
 				if (ofs <= csize) break;
@@ -1167,13 +1166,13 @@ FRESULT f_lseek (
 				if (clust == 0) {						/* Stop if could not follow the cluster chain */
 					ofs = csize; break;
 				}
-				if (clust == 1 || clust >= fs->max_clust) goto fk_error;
+				if (clust == 1 || clust >= fp->fs->max_clust) goto fk_error;
 				fp->fptr += csize;						/* Update R/W pointer */
 				ofs -= csize;
 			}
 			csect = (BYTE)((ofs - 1) / 512);			/* Sector offset in the cluster */
 			fp->curr_sect = clust2sect(clust) + csect;	/* Current sector */
-			fp->sect_clust = fs->sects_clust - csect;	/* Left sector counter in the cluster */
+			fp->sect_clust = fp->fs->sects_clust - csect;	/* Left sector counter in the cluster */
 			fp->fptr += ofs;							/* Update file R/W pointer */
 		}
 	}
@@ -1186,7 +1185,7 @@ FRESULT f_lseek (
 
 	return FR_OK;
 
-fk_error:	/* Abort this function due to an unrecoverable error */
+fk_error:	/* Abort this file due to an unrecoverable error */
 	fp->flag |= FA__ERROR;
 	return FR_RW_ERROR;
 }
@@ -1196,40 +1195,40 @@ fk_error:	/* Abort this function due to an unrecoverable error */
 
 #if _FS_MINIMIZE <= 1
 /*-----------------------------------------------------------------------*/
-/* Open a directroy                                                      */
+/* Create a directroy object                                             */
 /*-----------------------------------------------------------------------*/
 
 FRESULT f_opendir (
-	DIR *dirobj,		/* Pointer to directory object to create */
+	DIR *dj,			/* Pointer to directory object to create */
 	const char *path	/* Pointer to the directory path */
 )
 {
+	FRESULT res;
 	BYTE *dir;
 	char fn[8+3+1];
-	FRESULT res;
-	FATFS *fs = FatFs;
 
 
 	res = auto_mount(&path, 0);
-	if (res != FR_OK) return res;
-
-	res = trace_path(dirobj, fn, path, &dir);	/* Trace the directory path */
-	if (res == FR_OK) {							/* Trace completed */
-		if (dir != NULL) {						/* It is not the root dir */
-			if (dir[DIR_Attr] & AM_DIR) {		/* The entry is a directory */
-	 			dirobj->clust =
+	if (res == FR_OK) {
+		res = trace_path(dj, fn, path, &dir);	/* Trace the directory path */
+		if (res == FR_OK) {						/* Trace completed */
+			if (dir) {							/* It is not the root dir */
+				if (dir[DIR_Attr] & AM_DIR) {	/* The entry is a directory */
+	 				dj->clust =
 #if _FAT32
-					((DWORD)LD_WORD(&dir[DIR_FstClusHI]) << 16) |
+						((DWORD)LD_WORD(&dir[DIR_FstClusHI]) << 16) |
 #endif
-					LD_WORD(&dir[DIR_FstClusLO]);
-				dirobj->sect = clust2sect(dirobj->clust);
-				dirobj->index = 2;
-			} else {						/* The entry is not a directory */
-				res = FR_NO_FILE;
+							LD_WORD(&dir[DIR_FstClusLO]);
+					dj->sect = clust2sect(dj->clust);
+					dj->index = 2;
+				} else {						/* The entry is not a directory */
+					res = FR_NO_FILE;
+				}
 			}
+			dj->id = dj->fs->id;
 		}
-		dirobj->id = fs->id;
 	}
+
 	return res;
 }
 
@@ -1241,29 +1240,28 @@ FRESULT f_opendir (
 /*-----------------------------------------------------------------------*/
 
 FRESULT f_readdir (
-	DIR *dirobj,		/* Pointer to the directory object */
+	DIR *dj,			/* Pointer to the directory object */
 	FILINFO *finfo		/* Pointer to file information to return */
 )
 {
-	BYTE *dir, c;
 	FRESULT res;
-	FATFS *fs = dirobj->fs;
+	BYTE *dir, c;
 
 
-	res = validate(fs, dirobj->id);			/* Check validity of the object */
+	res = validate(dj->fs, dj->id);			/* Check validity of the object */
 	if (res != FR_OK) return res;
 
 	finfo->fname[0] = 0;
-	while (dirobj->sect) {
-		if (!move_window(dirobj->sect))
+	while (dj->sect) {
+		if (!move_window(dj->sect))
 			return FR_RW_ERROR;
-		dir = &fs->win[(dirobj->index & 15) * 32];		/* pointer to the directory entry */
+		dir = &dj->fs->win[(dj->index & 15) * 32];	/* pointer to the directory entry */
 		c = dir[DIR_Name];
-		if (c == 0) break;								/* Has it reached to end of dir? */
-		if (c != 0xE5 && !(dir[DIR_Attr] & AM_VOL))		/* Is it a valid entry? */
+		if (c == 0) break;							/* Has it reached to end of dir? */
+		if (c != 0xE5 && !(dir[DIR_Attr] & AM_VOL))	/* Is it a valid entry? */
 			get_fileinfo(finfo, dir);
-		if (!next_dir_entry(dirobj)) dirobj->sect = 0;	/* Next entry */
-		if (finfo->fname[0]) break;						/* Found valid entry */
+		if (!next_dir_entry(dj)) dj->sect = 0;		/* Next entry */
+		if (finfo->fname[0]) break;					/* Found valid entry */
 	}
 
 	return FR_OK;
@@ -1282,21 +1280,21 @@ FRESULT f_stat (
 	FILINFO *finfo		/* Pointer to file information to return */
 )
 {
+	FRESULT res;
+	DIR dj;
 	BYTE *dir;
 	char fn[8+3+1];
-	FRESULT res;
-	DIR dirobj;
 
 
 	res = auto_mount(&path, 0);
-	if (res != FR_OK) return res;
-
-	res = trace_path(&dirobj, fn, path, &dir);	/* Trace the file path */
-	if (res == FR_OK) {							/* Trace completed */
-		if (dir)	/* Found an object */
-			get_fileinfo(finfo, dir);
-		else		/* It is root dir */
-			res = FR_INVALID_NAME;
+	if (res == FR_OK) {
+		res = trace_path(&dj, fn, path, &dir);	/* Trace the file path */
+		if (res == FR_OK) {						/* Trace completed */
+			if (dir)	/* Found an object */
+				get_fileinfo(finfo, dir);
+			else		/* It is root dir */
+				res = FR_INVALID_NAME;
+		}
 	}
 
 	return res;
@@ -1306,21 +1304,64 @@ FRESULT f_stat (
 
 
 #if !_FS_READONLY
+/*-----------------------------------------------------------------------*/
+/* Truncate File                                                         */
+/*-----------------------------------------------------------------------*/
+
+FRESULT f_truncate (
+	FIL *fp		/* Pointer to the file object */
+)
+{
+	FRESULT res;
+	CLUST ncl;
+
+
+	res = validate(fp->fs, fp->id);		/* Check validity of the object */
+	if (res != FR_OK) return res;
+	if (fp->flag & FA__ERROR) return FR_RW_ERROR;	/* Check error flag */
+	if (!(fp->flag & FA_WRITE)) return FR_DENIED;	/* Check access mode */
+
+	if (fp->fsize > fp->fptr) {
+		fp->fsize = fp->fptr;	/* Set file size to current R/W point */
+		fp->flag |= FA__WRITTEN;
+		if (fp->fptr == 0) {	/* When set file size to zero, remove entire cluster chain */
+			if (!remove_chain(fp->org_clust)) goto ft_error;
+			fp->org_clust = 0;
+		} else {				/* When truncate a part of the file, remove remaining clusters */
+			ncl = get_cluster(fp->curr_clust);
+			if (ncl < 2) goto ft_error;
+			if (ncl < fp->fs->max_clust) {
+				if (!put_cluster(fp->curr_clust, (CLUST)0x0FFFFFFF)) goto ft_error;
+				if (!remove_chain(ncl)) goto ft_error;
+			}
+		}
+	}
+
+	return FR_OK;
+
+ft_error:	/* Abort this file due to an unrecoverable error */
+	fp->flag |= FA__ERROR;
+	return FR_RW_ERROR;
+}
+
+
+
+
 /*-----------------------------------------------------------------------*/
 /* Get Number of Free Clusters                                           */
 /*-----------------------------------------------------------------------*/
 
 FRESULT f_getfree (
-	const char *drv,	/* Logical drive number */
-	DWORD *nclust,		/* Pointer to the double word to return number of free clusters */
-	FATFS **fatfs		/* Pointer to pointer to the file system object to return */
+	const char *drv,	/* Pointer to the logical drive number (root dir) */
+	DWORD *nclust,		/* Pointer to the variable to return number of free clusters */
+	FATFS **fatfs		/* Pointer to pointer to corresponding file system object to return */
 )
 {
+	FRESULT res;
+	FATFS *fs;
 	DWORD n, sect;
 	CLUST clust;
 	BYTE fat, f, *p;
-	FRESULT res;
-	FATFS *fs;
 
 
 	/* Get drive number */
@@ -1334,7 +1375,7 @@ FRESULT f_getfree (
 		return FR_OK;
 	}
 
-	/* Count number of free clusters */
+	/* Get number of free clusters */
 	fat = fs->fs_type;
 	n = 0;
 	if (fat == FS_FAT12) {
@@ -1373,51 +1414,49 @@ FRESULT f_getfree (
 
 
 /*-----------------------------------------------------------------------*/
-/* Delete a File or a Directory                                          */
+/* Delete a File or Directory                                            */
 /*-----------------------------------------------------------------------*/
 
 FRESULT f_unlink (
-	const char *path			/* Pointer to the file or directory path */
+	const char *path		/* Pointer to the file or directory path */
 )
 {
+	FRESULT res;
+	DIR dj;
 	BYTE *dir, *sdir;
 	DWORD dsect;
 	char fn[8+3+1];
 	CLUST dclust;
-	FRESULT res;
-	DIR dirobj;
-	FATFS *fs = FatFs;
 
 
 	res = auto_mount(&path, 1);
 	if (res != FR_OK) return res;
-
-	res = trace_path(&dirobj, fn, path, &dir);	/* Trace the file path */
-	if (res != FR_OK) return res;				/* Trace failed */
-	if (dir == NULL) return FR_INVALID_NAME;	/* It is the root directory */
+	res = trace_path(&dj, fn, path, &dir);	/* Trace the file path */
+	if (res != FR_OK) return res;			/* Trace failed */
+	if (!dir) return FR_INVALID_NAME;		/* It is the root directory */
 	if (dir[DIR_Attr] & AM_RDO) return FR_DENIED;	/* It is a R/O object */
-	dsect = fs->winsect;
+	dsect = dj.fs->winsect;
 	dclust =
 #if _FAT32
 		((DWORD)LD_WORD(&dir[DIR_FstClusHI]) << 16) |
 #endif
 		LD_WORD(&dir[DIR_FstClusLO]);
-	if (dir[DIR_Attr] & AM_DIR) {				/* It is a sub-directory */
-		dirobj.clust = dclust;					/* Check if the sub-dir is empty or not */
-		dirobj.sect = clust2sect(dclust);
-		dirobj.index = 2;
+	if (dir[DIR_Attr] & AM_DIR) {			/* It is a sub-directory */
+		dj.clust = dclust;					/* Check if the sub-dir is empty or not */
+		dj.sect = clust2sect(dclust);
+		dj.index = 2;
 		do {
-			if (!move_window(dirobj.sect)) return FR_RW_ERROR;
-			sdir = &fs->win[(dirobj.index & 15) * 32];
+			if (!move_window(dj.sect)) return FR_RW_ERROR;
+			sdir = &dj.fs->win[(dj.index & 15) * 32];
 			if (sdir[DIR_Name] == 0) break;
 			if (sdir[DIR_Name] != 0xE5 && !(sdir[DIR_Attr] & AM_VOL))
 				return FR_DENIED;	/* The directory is not empty */
-		} while (next_dir_entry(&dirobj));
+		} while (next_dir_entry(&dj));
 	}
 
 	if (!move_window(dsect)) return FR_RW_ERROR;	/* Mark the directory entry 'deleted' */
 	dir[DIR_Name] = 0xE5;
-	fs->winflag = 1;
+	dj.fs->winflag = 1;
 	if (!remove_chain(dclust)) return FR_RW_ERROR;	/* Remove the cluster chain */
 
 	return sync();
@@ -1434,53 +1473,51 @@ FRESULT f_mkdir (
 	const char *path		/* Pointer to the directory path */
 )
 {
+	FRESULT res;
+	DIR dj;
 	BYTE *dir, *fw, n;
 	char fn[8+3+1];
 	DWORD sect, dsect, tim;
 	CLUST dclust, pclust;
-	FRESULT res;
-	DIR dirobj;
-	FATFS *fs = FatFs;
 
 
 	res = auto_mount(&path, 1);
 	if (res != FR_OK) return res;
-
-	res = trace_path(&dirobj, fn, path, &dir);	/* Trace the file path */
-	if (res == FR_OK) return FR_EXIST;			/* Any file or directory is already existing */
+	res = trace_path(&dj, fn, path, &dir);	/* Trace the file path */
+	if (res == FR_OK) return FR_EXIST;		/* Any file or directory is already existing */
 	if (res != FR_NO_FILE) return res;
 
-	res = reserve_direntry(&dirobj, &dir); 		/* Reserve a directory entry */
+	res = reserve_direntry(&dj, &dir); 		/* Reserve a directory entry */
 	if (res != FR_OK) return res;
-	sect = fs->winsect;
-	dclust = create_chain(0);					/* Allocate a cluster for new directory table */
+	sect = dj.fs->winsect;
+	dclust = create_chain(0);				/* Allocate a cluster for new directory table */
 	if (dclust == 1) return FR_RW_ERROR;
 	dsect = clust2sect(dclust);
 	if (!dsect) return FR_DENIED;
 	if (!move_window(dsect)) return FR_RW_ERROR;
 
-	fw = fs->win;
-	memset(fw, 0, 512);							/* Clear the directory table */
-	for (n = 1; n < fs->sects_clust; n++) {
+	fw = dj.fs->win;
+	memset(fw, 0, 512);						/* Clear the directory table */
+	for (n = 1; n < dj.fs->sects_clust; n++) {
 		if (disk_write(0, fw, ++dsect, 1) != RES_OK)
 			return FR_RW_ERROR;
 	}
 
-	memset(&fw[DIR_Name], ' ', 8+3);			/* Create "." entry */
+	memset(&fw[DIR_Name], ' ', 8+3);		/* Create "." entry */
 	fw[DIR_Name] = '.';
 	fw[DIR_Attr] = AM_DIR;
 	tim = get_fattime();
 	ST_DWORD(&fw[DIR_WrtTime], tim);
 	memcpy(&fw[32], &fw[0], 32); fw[33] = '.';	/* Create ".." entry */
-	pclust = dirobj.sclust;
+	pclust = dj.sclust;
 #if _FAT32
 	ST_WORD(&fw[   DIR_FstClusHI], dclust >> 16);
-	if (fs->fs_type == FS_FAT32 && pclust == fs->dirbase) pclust = 0;
+	if (dj.fs->fs_type == FS_FAT32 && pclust == dj.fs->dirbase) pclust = 0;
 	ST_WORD(&fw[32+DIR_FstClusHI], pclust >> 16);
 #endif
 	ST_WORD(&fw[   DIR_FstClusLO], dclust);
 	ST_WORD(&fw[32+DIR_FstClusLO], pclust);
-	fs->winflag = 1;
+	dj.fs->winflag = 1;
 
 	if (!move_window(sect)) return FR_RW_ERROR;
 	memset(&dir[0], 0, 32);						/* Clean-up the new entry */
@@ -1510,17 +1547,17 @@ FRESULT f_chmod (
 )
 {
 	FRESULT res;
+	DIR dj;
 	BYTE *dir;
-	DIR dirobj;
 	char fn[8+3+1];
 
 
 	res = auto_mount(&path, 1);
 	if (res == FR_OK) {
-		res = trace_path(&dirobj, fn, path, &dir);	/* Trace the file path */
-		if (res == FR_OK) {			/* Trace completed */
-			if (dir == NULL) {
-				res = FR_INVALID_NAME;
+		res = trace_path(&dj, fn, path, &dir);	/* Trace the file path */
+		if (res == FR_OK) {				/* Trace completed */
+			if (!dir) {
+				res = FR_INVALID_NAME;	/* Root directory */
 			} else {
 				mask &= AM_RDO|AM_HID|AM_SYS|AM_ARC;	/* Valid attribute mask */
 				dir[DIR_Attr] = (value & mask) | (dir[DIR_Attr] & (BYTE)~mask);	/* Apply attribute change */
@@ -1534,6 +1571,40 @@ FRESULT f_chmod (
 
 
 
+/*-----------------------------------------------------------------------*/
+/* Change Timestamp                                                      */
+/*-----------------------------------------------------------------------*/
+
+FRESULT f_utime (
+	const char *path,		/* Pointer to the file/directory name */
+	const FILINFO *finfo	/* Pointer to the timestamp to be set */
+)
+{
+	FRESULT res;
+	DIR dj;
+	BYTE *dir;
+	char fn[8+3+1];
+
+
+	res = auto_mount(&path, 1);
+	if (res == FR_OK) {
+		res = trace_path(&dj, fn, path, &dir);	/* Trace the file path */
+		if (res == FR_OK) {				/* Trace completed */
+			if (!dir) {
+				res = FR_INVALID_NAME;	/* Root directory */
+			} else {
+				ST_WORD(&dir[DIR_WrtTime], finfo->ftime);
+				ST_WORD(&dir[DIR_WrtDate], finfo->fdate);
+				res = sync();
+			}
+		}
+	}
+	return res;
+}
+
+
+
+
 /*-----------------------------------------------------------------------*/
 /* Rename File/Directory                                                 */
 /*-----------------------------------------------------------------------*/
@@ -1546,32 +1617,31 @@ FRESULT f_rename (
 	FRESULT res;
 	DWORD sect_old;
 	BYTE *dir_old, *dir_new, direntry[32-11];
-	DIR dirobj;
+	DIR dj;
 	char fn[8+3+1];
-	FATFS *fs = FatFs;
 
 
 	res = auto_mount(&path_old, 1);
 	if (res != FR_OK) return res;
 
-	res = trace_path(&dirobj, fn, path_old, &dir_old);	/* Check old object */
-	if (res != FR_OK) return res;			/* The old object is not found */
+	res = trace_path(&dj, fn, path_old, &dir_old);	/* Check old object */
+	if (res != FR_OK) return res;				/* The old object is not found */
 	if (!dir_old) return FR_NO_FILE;
-	sect_old = fs->winsect;					/* Save the object information */
-	memcpy(direntry, &dir_old[11], 32-11);
+	sect_old = dj.fs->winsect;					/* Save the object information */
+	memcpy(direntry, &dir_old[DIR_Attr], 32-11);
 
-	res = trace_path(&dirobj, fn, path_new, &dir_new);	/* Check new object */
+	res = trace_path(&dj, fn, path_new, &dir_new);	/* Check new object */
 	if (res == FR_OK) return FR_EXIST;			/* The new object name is already existing */
 	if (res != FR_NO_FILE) return res;			/* Is there no old name? */
-	res = reserve_direntry(&dirobj, &dir_new); 	/* Reserve a directory entry */
+	res = reserve_direntry(&dj, &dir_new); 		/* Reserve a directory entry */
 	if (res != FR_OK) return res;
 
 	memcpy(&dir_new[DIR_Attr], direntry, 32-11);	/* Create new entry */
 	memcpy(&dir_new[DIR_Name], fn, 8+3);
 	dir_new[DIR_NTres] = fn[11];
-	fs->winflag = 1;
+	dj.fs->winflag = 1;
 
-	if (!move_window(sect_old)) return FR_RW_ERROR;	/* Remove old entry */
+	if (!move_window(sect_old)) return FR_RW_ERROR;	/* Delete old entry */
 	dir_old[DIR_Name] = 0xE5;
 
 	return sync();
diff --git a/src/tff.h b/src/tff.h
index 73e3c4c..cdccab4 100644
--- a/src/tff.h
+++ b/src/tff.h
@@ -1,11 +1,11 @@
 /*--------------------------------------------------------------------------/
-/  Tiny-FatFs - FAT file system module include file  R0.05    (C)ChaN, 2007
+/  Tiny-FatFs - FAT file system module include file  R0.05a   (C)ChaN, 2008
 /---------------------------------------------------------------------------/
 / FatFs module is an experimenal project to implement FAT file system to
 / cheap microcontrollers. This is a free software and is opened for education,
 / research and development under license policy of following trems.
 /
-/  Copyright (C) 2007, ChaN, all right reserved.
+/  Copyright (C) 2008, ChaN, all right reserved.
 /
 / * The FatFs module is a free software and there is no warranty.
 / * You can use, modify and/or redistribute it for personal, non-profit or
@@ -21,18 +21,18 @@
 /  1: Enable word access.
 /  2: Disable word access and use byte-by-byte access instead.
 /  When the architectural byte order of the MCU is big-endian and/or address
-/  miss-aligned access results incorrect behavior, the _MCU_ENDIAN must be set
-/  to 2. If it is not the case, it can be set to 1 for good code efficiency. */
+/  miss-aligned access results incorrect behavior, the _MCU_ENDIAN must be set to 2.
+/  If it is not the case, it can also be set to 1 for good code efficiency. */
 
 #define _FS_READONLY	0
 /* Setting _FS_READONLY to 1 defines read only configuration. This removes
-/  writing functions, f_write, f_sync, f_unlink, f_mkdir, f_chmod, f_rename
-/  and useless f_getfree. */
+/  writing functions, f_write, f_sync, f_unlink, f_mkdir, f_chmod, f_rename,
+/  f_truncate, f_getfree and internal writing codes. */
 
 #define _FS_MINIMIZE	0
 /* The _FS_MINIMIZE option defines minimization level to remove some functions.
 /  0: Full function.
-/  1: f_stat, f_getfree, f_unlink, f_mkdir, f_chmod and f_rename are removed.
+/  1: f_stat, f_getfree, f_unlink, f_mkdir, f_chmod, f_truncate and f_rename are removed.
 /  2: f_opendir and f_readdir are removed in addition to level 1.
 /  3: f_lseek is removed in addition to level 2. */
 
@@ -163,10 +163,12 @@ FRESULT f_opendir (DIR*, const char*);				/* Open an existing directory */
 FRESULT f_readdir (DIR*, FILINFO*);					/* Read a directory item */
 FRESULT f_stat (const char*, FILINFO*);				/* Get file status */
 FRESULT f_getfree (const char*, DWORD*, FATFS**);	/* Get number of free clusters on the drive */
+FRESULT f_truncate (FIL*);							/* Truncate file */
 FRESULT f_sync (FIL*);								/* Flush cached data of a writing file */
 FRESULT f_unlink (const char*);						/* Delete an existing file or directory */
 FRESULT	f_mkdir (const char*);						/* Create a new directory */
 FRESULT f_chmod (const char*, BYTE, BYTE);			/* Change file/dir attriburte */
+FRESULT f_utime (const char*, const FILINFO*);		/* Change file/dir timestamp */
 FRESULT f_rename (const char*, const char*);		/* Rename/Move a file or directory */
 
 
@@ -273,8 +275,7 @@ DWORD get_fattime (void);	/* 31-25: Year(0-127 +1980), 24-21: Month(1-12), 20-16
 #define	LD_DWORD(ptr)		(DWORD)(*(DWORD*)(BYTE*)(ptr))
 #define	ST_WORD(ptr,val)	*(WORD*)(BYTE*)(ptr)=(WORD)(val)
 #define	ST_DWORD(ptr,val)	*(DWORD*)(BYTE*)(ptr)=(DWORD)(val)
-#else
-#if _MCU_ENDIAN == 2	/* Use byte-by-byte access */
+#elif _MCU_ENDIAN == 2	/* Use byte-by-byte access */
 #define	LD_WORD(ptr)		(WORD)(((WORD)*(volatile BYTE*)((ptr)+1)<<8)|(WORD)*(volatile BYTE*)(ptr))
 #define	LD_DWORD(ptr)		(DWORD)(((DWORD)*(volatile BYTE*)((ptr)+3)<<24)|((DWORD)*(volatile BYTE*)((ptr)+2)<<16)|((WORD)*(volatile BYTE*)((ptr)+1)<<8)|*(volatile BYTE*)(ptr))
 #define	ST_WORD(ptr,val)	*(volatile BYTE*)(ptr)=(BYTE)(val); *(volatile BYTE*)((ptr)+1)=(BYTE)((WORD)(val)>>8)
@@ -282,7 +283,6 @@ DWORD get_fattime (void);	/* 31-25: Year(0-127 +1980), 24-21: Month(1-12), 20-16
 #else
 #error Do not forget to set _MCU_ENDIAN properly!
 #endif
-#endif