From 5fa1073a5a6a24fa5d27a4f0dc11874c48adef2e Mon Sep 17 00:00:00 2001
From: savelij13 <homychina@yandex.ru>
Date: Thu, 11 Sep 2025 09:45:45 +0300
Subject: [PATCH] fatfs v0.08b Jan 15,2011: - Fast seek feature is also applied
 to f_read() and f_write(). - f_lseek() reports required table size on
 creating CLMP. - Extended format syntax of f_printf function. - Ignores
 duplicated directory separators in given path names.

---
 doc/00index_e.html    |  14 +-
 doc/00index_j.html    |   8 +-
 doc/css_e.css         |  10 +-
 doc/css_j.css         |  10 +-
 doc/en/appnote.html   |  67 ++--
 doc/en/chdir.html     |  53 ++-
 doc/en/chdrive.html   |  24 +-
 doc/en/chmod.html     |  59 ++--
 doc/en/close.html     |  34 +-
 doc/en/dinit.html     |  10 +-
 doc/en/dioctl.html    |  14 +-
 doc/en/dread.html     |  14 +-
 doc/en/dstat.html     |   8 +-
 doc/en/dwrite.html    |  16 +-
 doc/en/eof.html       |  62 ++++
 doc/en/error.html     |  62 ++++
 doc/en/fattime.html   |   6 +-
 doc/en/filename.html  |  17 +-
 doc/en/forward.html   |  86 +++--
 doc/en/getcwd.html    |  70 ++++
 doc/en/getfree.html   |  52 ++-
 doc/en/gets.html      |  18 +-
 doc/en/lseek.html     |  97 +++---
 doc/en/mkdir.html     |  56 ++--
 doc/en/mkfs.html      |  47 +--
 doc/en/mount.html     |  28 +-
 doc/en/open.html      | 113 +++----
 doc/en/opendir.html   |  49 ++-
 doc/en/printf.html    |  39 ++-
 doc/en/putc.html      |  16 +-
 doc/en/puts.html      |  16 +-
 doc/en/rc.html        |  83 +++++
 doc/en/read.html      |  42 +--
 doc/en/readdir.html   |  71 ++--
 doc/en/rename.html    |  68 ++--
 doc/en/sdir.html      |  26 +-
 doc/en/sfatfs.html    |  62 ++--
 doc/en/sfile.html     |  44 +--
 doc/en/sfileinfo.html |  24 +-
 doc/en/size.html      |  62 ++++
 doc/en/stat.html      |  50 ++-
 doc/en/sync.html      |  34 +-
 doc/en/tell.html      |  62 ++++
 doc/en/truncate.html  |  36 +-
 doc/en/unlink.html    |  69 ++--
 doc/en/utime.html     |  59 ++--
 doc/en/write.html     |  42 +--
 doc/img/f6.png        | Bin 0 -> 1436 bytes
 doc/ja/appnote.html   |  63 ++--
 doc/ja/chdir.html     |  53 ++-
 doc/ja/chdrive.html   |  24 +-
 doc/ja/chmod.html     |  59 ++--
 doc/ja/close.html     |  34 +-
 doc/ja/dinit.html     |  10 +-
 doc/ja/dioctl.html    |  14 +-
 doc/ja/dread.html     |  16 +-
 doc/ja/dstat.html     |   8 +-
 doc/ja/dwrite.html    |  18 +-
 doc/ja/eof.html       |  62 ++++
 doc/ja/error.html     |  62 ++++
 doc/ja/fattime.html   |   6 +-
 doc/ja/filename.html  |  24 +-
 doc/ja/forward.html   |  87 +++--
 doc/ja/getcwd.html    |  70 ++++
 doc/ja/getfree.html   |  52 ++-
 doc/ja/gets.html      |  18 +-
 doc/ja/lseek.html     | 101 +++---
 doc/ja/mkdir.html     |  56 ++--
 doc/ja/mkfs.html      |  45 +--
 doc/ja/mount.html     |  26 +-
 doc/ja/open.html      | 106 +++---
 doc/ja/opendir.html   |  49 ++-
 doc/ja/printf.html    |  38 ++-
 doc/ja/putc.html      |  16 +-
 doc/ja/puts.html      |  16 +-
 doc/ja/rc.html        |  83 +++++
 doc/ja/read.html      |  43 ++-
 doc/ja/readdir.html   |  73 ++---
 doc/ja/rename.html    |  66 ++--
 doc/ja/sdir.html      |  26 +-
 doc/ja/sfatfs.html    |  62 ++--
 doc/ja/sfile.html     |  46 +--
 doc/ja/sfileinfo.html |  20 +-
 doc/ja/size.html      |  62 ++++
 doc/ja/stat.html      |  52 ++-
 doc/ja/sync.html      |  34 +-
 doc/ja/tell.html      |  62 ++++
 doc/ja/truncate.html  |  37 +--
 doc/ja/unlink.html    |  69 ++--
 doc/ja/utime.html     |  59 ++--
 doc/ja/write.html     |  43 ++-
 doc/updates.txt       |   6 +
 src/00readme.txt      |   8 +-
 src/diskio.h          |   2 +-
 src/ff.c              | 748 ++++++++++++++++++++++++++++--------------
 src/ff.h              | 232 +------------
 src/ffconf.h          |  25 +-
 src/option/syscall.c  |  54 +--
 98 files changed, 2819 insertions(+), 2235 deletions(-)
 create mode 100644 doc/en/eof.html
 create mode 100644 doc/en/error.html
 create mode 100644 doc/en/getcwd.html
 create mode 100644 doc/en/rc.html
 create mode 100644 doc/en/size.html
 create mode 100644 doc/en/tell.html
 create mode 100644 doc/img/f6.png
 create mode 100644 doc/ja/eof.html
 create mode 100644 doc/ja/error.html
 create mode 100644 doc/ja/getcwd.html
 create mode 100644 doc/ja/rc.html
 create mode 100644 doc/ja/size.html
 create mode 100644 doc/ja/tell.html

diff --git a/doc/00index_e.html b/doc/00index_e.html
index 1927f46..335f5ff 100644
--- a/doc/00index_e.html
+++ b/doc/00index_e.html
@@ -4,13 +4,15 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <meta http-equiv="Content-Style-Type" content="text/css">
 <meta name="description" content="Open souece FAT file system module for embedded projects">
+<link rel="start" title="Site Top" href="../../">
+<link rel="up" title="Freewares" href="../../fsw_e.html">
 <link rel="alternate" hreflang="ja" title="Japanese version" href="00index_j.html">
 <link rel="stylesheet" href="css_e.css" type="text/css" media="screen" title="ELM Default">
-<title>ELM - FatFs Generic File System Module</title>
+<title>ELM - FatFs Generic FAT File System Module</title>
 </head>
 
 <body>
-<h1>FatFs Generic File System Module</h1>
+<h1>FatFs Generic FAT File System Module</h1>
 <hr>
 
 <div class="abst">
@@ -45,7 +47,7 @@
 <li><a href="en/close.html">f_close</a> - Close a file</li>
 <li><a href="en/read.html">f_read</a> - Read file</li>
 <li><a href="en/write.html">f_write</a> - Write file</li>
-<li><a href="en/lseek.html">f_lseek</a> - Move read/write pointer, Expand file zize</li>
+<li><a href="en/lseek.html">f_lseek</a> - Move read/write pointer, Expand file size</li>
 <li><a href="en/truncate.html">f_truncate</a> - Truncate file size</li>
 <li><a href="en/sync.html">f_sync</a> - Flush cached data</li>
 <li><a href="en/opendir.html">f_opendir</a> - Open a directory</li>
@@ -66,6 +68,10 @@
 <li><a href="en/putc.html">f_putc</a> - Write a character</li>
 <li><a href="en/puts.html">f_puts</a> - Write a string</li>
 <li><a href="en/printf.html">f_printf</a> - Write a formatted string</li>
+<li><a href="en/tell.html">f_tell</a> - Get the current read/write pointer</li>
+<li><a href="en/eof.html">f_eof</a> - Test for end-of-file on a file</li>
+<li><a href="en/size.html">f_size</a> - Get size of a file</li>
+<li><a href="en/error.html">f_error</a> - Test for an error on a file</li>
 </ul>
 </div>
 
@@ -90,7 +96,6 @@
 <ul>
 <li><a href="http://elm-chan.org/fsw/ff/bd/"><em>FatFs User Forum</em></a></li>
 <li>Read first: <a href="en/appnote.html">FatFs module application note</a></li>
-<li>Download: <a href="ffsample.zip">FatFs sample projects</a> (AVR, PIC24, LPC2000, H8/300H, SH-2A, V850ES and Win32)</li>
 <li><a href="http://www.siwawi.arubi.uni-kl.de/avr_projects/arm_projects/arm_memcards/index.html">ARM-Projects by Martin THOMAS</a> (examples for LPC2000, AT91SAM and STM32)</li>
 <li><a href="http://www.microsoft.com/whdc/system/platform/firmware/fatgen.mspx">FAT32 Specification by Microsoft</a> (The reference document on FAT file system)</li>
 <li><a href="http://elm-chan.org/docs/mmc/mmc_e.html">How to Use MMC/SDC</a></li>
@@ -101,5 +106,6 @@
 
 
 <hr>
+<p class="foot"><a href="http://elm-chan.org/fsw/ff/00index_e.html">FatFs Home Page</a></p>
 </body>
 </html>
diff --git a/doc/00index_j.html b/doc/00index_j.html
index 92294dd..a6919db 100644
--- a/doc/00index_j.html
+++ b/doc/00index_j.html
@@ -4,6 +4,8 @@
 <meta http-equiv="Content-Type" content="text/html; charset=Shift_JIS">
 <meta http-equiv="Content-Style-Type" content="text/css">
 <meta name="description" content="組み込みシステム向けFATファイル・システム">
+<link rel="start" title="Site Top" href="../../index_j.html">
+<link rel="up" title="Freewares" href="../../fsw.html">
 <link rel="alternate" hreflang="en" title="英文" href="00index_e.html">
 <link rel="stylesheet" href="css_j.css" type="text/css" media="screen" title="ELM Default">
 <title>ELM - FatFs 汎用FATファイルシステム・モジュール</title>
@@ -65,6 +67,10 @@
 <li><a href="ja/putc.html">f_putc</a> - 文字の書き込み</li>
 <li><a href="ja/puts.html">f_puts</a> - 文字列の書き込み</li>
 <li><a href="ja/printf.html">f_printf</a> - 書式化文字列の書き込み</li>
+<li><a href="ja/tell.html">f_tell</a> - 現在のリード/ライト・ポインタの取得</li>
+<li><a href="ja/eof.html">f_eof</a> - ファイル終端の有無の取得</li>
+<li><a href="ja/size.html">f_size</a> - ファイル・サイズの取得</li>
+<li><a href="ja/error.html">f_error</a> - ファイルのエラーの有無の取得</li>
 </ul>
 </div>
 
@@ -89,7 +95,6 @@
 <ul>
 <li><a href="http://elm-chan.org/fsw/ff/bd/"><em>FatFsユーザ・フォーラム</em></a></li>
 <li>最初に読め: <a href="ja/appnote.html">FatFsモジュール・アプリケーション・ノート</a></li>
-<li>ダウンロード: <a href="ffsample.zip">サンプル・プロジェクト</a> (AVR, PIC24, LPC2000, H8/300H, SH-2A, V850ES and Win32)</li>
 <li><a href="http://www.siwawi.arubi.uni-kl.de/avr_projects/arm_projects/arm_memcards/index.html">ARM-Projects by Martin THOMAS</a> (examples for LPC2000, AT91SAM and STM32)</li>
 <li><a href="http://www.microsoft.com/whdc/system/platform/firmware/fatgen.mspx">FATファイル・システム仕様書 by Microsoft</a> (FATの理解・実装に必要な唯一のリファレンス)</li>
 <li><a href="http://elm-chan.org/docs/fat.html">FATファイル・システム概要</a> (↑を読むためのガイド)</li>
@@ -101,5 +106,6 @@
 
 
 <hr>
+<p class="foot"><a href="http://elm-chan.org/fsw/ff/00index_j.html">FatFs Home Page</a></p>
 </body>
 </html>
diff --git a/doc/css_e.css b/doc/css_e.css
index 2cd3a97..674d4e5 100644
--- a/doc/css_e.css
+++ b/doc/css_e.css
@@ -10,9 +10,10 @@ p {margin: 0 0 0.3em 1em;}
 em {font-style: normal; font-weight: bold; margin: 0 0.1em;}
 pre em {font-style: italic; font-weight: normal;}
 strong {}
-pre {border: 1px dashed gray; margin: 0.5em 1em; padding: 0.5em; line-height: 1.2em; background-color: white;}
-pre span {color: green;}
-tt {margin: 0 0.2em;}
+pre {border: 1px dashed gray; margin: 0.5em 1em; padding: 0.5em; line-height: 1.2em; font-family: monospace; background-color: white;}
+pre span.c {color: green;}
+pre span.k {color: blue;}
+tt {margin: 0 0.2em; font-family: monospace; }
 ol {margin: 0 2.5em;}
 ul {margin: 0 2em;}
 dl {margin: 0 1em;}
@@ -23,6 +24,7 @@ dd {margin: 0 2em;}
 hr {border-width: 1px; margin: 1em;}
 div.abst {font-family: sans-serif;}
 div.para {clear: both; font-family: serif;}
+div.ret a {font-family: monospace; }
 .equ {text-indent: 0; margin: 1em 2em 1em;}
 .indent {margin-left: 2em;}
 .rset {float: right; margin: 0 0 0.5em 0.5em;}
@@ -38,7 +40,7 @@ h1 {line-height: 1em; font-size: 2em; font-family: sans-serif; padding: 0.3em 0
 p.hdd {float: right; text-align: right; margin-top: 0.5em;}
 hr.hds {clear: both; margin-bottom: 1em;}
 
-h2 {font-size: 1.5em; color: blueviolet; font-family: sans-serif; margin: 0 0 0.5em;}
+h2 {font-size: 1.6em; font-family: sans-serif; background-color: #d8d8FF; padding: 0.2em 0.5em; margin: 0 0 0.5em;}
 h3 {font-size: 1.5em; font-family: sans-serif; margin: 1.5em 0 0.5em;}
 h4 {font-size: 1.2em; font-family: sans-serif; margin: 1em 0 0.2em;}
 h5 {font-size: 1em; font-family: sans-serif; margin: 0.5em 0 0em;}
diff --git a/doc/css_j.css b/doc/css_j.css
index 48dd245..93f56a0 100644
--- a/doc/css_j.css
+++ b/doc/css_j.css
@@ -13,9 +13,10 @@ p {text-indent: 1em; margin: 0 0 0.3em 0.5em;}
 em {font-style: normal; font-weight: bold; margin: 0 0.1em;}
 pre em {font-style: italic; font-weight: normal;}
 strong {}
-pre {border: 1px dashed gray; margin: 0.5em 1em; padding: 0.5em; line-height: 1.2em; letter-spacing: 0; background-color: white;}
-pre span {color: green;}
-tt {margin: 0 0.2em; letter-spacing: 0;}
+pre {border: 1px dashed gray; margin: 0.5em 1em; padding: 0.5em; line-height: 1.2em; letter-spacing: 0; font-family: monospace; background-color: white;}
+pre span.c {color: green;}
+pre span.k {color: blue;}
+tt {margin: 0 0.2em; letter-spacing: 0; font-family: monospace; }
 ol {margin: 0 2.5em;}
 ul {margin: 0 2em;}
 dl {margin: 0 1em;}
@@ -26,6 +27,7 @@ dd {margin: 0 2em;}
 hr {border-width: 1px; margin: 1em;}
 div.abst {font-family: "ＭＳ Ｐゴシック",sans-serif;}
 div.para {clear: both; font-family: "ＭＳ Ｐ明朝",serif;}
+div.ret a {font-family: monospace; }
 .equ {text-indent: 0; margin: 1em 2em 1em;}
 .indent {margin-left: 2em;}
 .rset {float: right; margin: 0 0 0.5em 0.5em;}
@@ -41,7 +43,7 @@ h1 {line-height: 1em; font-size: 2em; font-family: sans-serif; padding: 0.3em 0
 p.hdd {float: right; text-align: right; margin-top: 0.5em;}
 hr.hds {clear: both; margin-bottom: 1em;}
 
-h2 {font-size: 1.5em; color: blueviolet; font-family: "ＭＳ Ｐゴシック",sans-serif; margin: 0 0 0.5em;}
+h2 {font-size: 1.6em; font-family: "ＭＳ Ｐゴシック",sans-serif; background-color: #d8d8FF; padding: 0.2em 0.5em; margin: 0 0 0.5em;}
 h3 {font-size: 1.5em; font-family: "ＭＳ Ｐゴシック",sans-serif; margin: 1.5em 0 0.5em;}
 h4 {font-size: 1.2em; font-family: "ＭＳ Ｐゴシック",sans-serif; margin: 1em 0 0.2em;}
 h5 {font-size: 1em; font-family: "ＭＳ Ｐゴシック",sans-serif; margin: 0.5em 0 0em;}
diff --git a/doc/en/appnote.html b/doc/en/appnote.html
index e7492e1..f686936 100644
--- a/doc/en/appnote.html
+++ b/doc/en/appnote.html
@@ -43,24 +43,14 @@ The FatFs module assumes that size of char/short/long are 8/16/32 bit and int is
 <p>You need to provide only low level disk I/O functions that required by FatFs module and nothing else. If a working disk module for the target is already existing, you need to write only glue functions to attach it to the FatFs module. If not, you need to port any other disk module or write it from scratch. All defined functions are not that always required. For example, disk write function is not required in read-only configuration. Following table shows which function is required depends on configuration options.</p>
 <table class="lst2">
 <tr><th>Function</th><th>Required when:</th><th>Note</th></tr>
-<tr><td>disk_initialize</td><td>Always</td><td rowspan="10">Disk I/O functions.<br>Samples available in ffsample.zip.<br>There are many implementations on the web.</td></tr>
-<tr><td>disk_status</td><td>Always</td></tr>
-<tr><td>disk_read</td><td>Always</td></tr>
-<tr><td>disk_write</td><td>_FS_READONLY == 0</td></tr>
-<tr><td>disk_ioctl (CTRL_SYNC)</td><td>_FS_READONLY == 0</td></tr>
-<tr><td>disk_ioctl (GET_SECTOR_COUNT)</td><td>_USE_MKFS == 1</td></tr>
-<tr><td>disk_ioctl (GET_SECTOR_SIZE)</td><td>_MAX_SS &gt;= 1024</td></tr>
-<tr><td>disk_ioctl (GET_BLOCK_SIZE)</td><td>_USE_MKFS == 1</td></tr>
+<tr><td>disk_initialize<br>disk_status<br>disk_read</td><td>Always</td><td rowspan="5">Disk I/O functions.<br>Samples available in ffsample.zip.<br>There are many implementations on the web.</td></tr>
+<tr><td>disk_write<br>get_fattime<br>disk_ioctl (CTRL_SYNC)</td><td>_FS_READONLY == 0</td></tr>
+<tr><td>disk_ioctl (GET_SECTOR_COUNT)<br>disk_ioctl (GET_BLOCK_SIZE)</td><td>_USE_MKFS == 1</td></tr>
+<tr><td>disk_ioctl (GET_SECTOR_SIZE)</td><td>_MAX_SS &gt; 512</td></tr>
 <tr><td>disk_ioctl (CTRL_ERASE_SECTOR)</td><td>_USE_ERASE == 1</td></tr>
-<tr><td>get_fattime</td><td>_FS_READONLY == 0</td></tr>
-<tr><td>ff_convert</td><td>_USE_LFN &gt;= 1</td><td rowspan="2">Unicode support functions.<br>Available in option/cc*.c.</td></tr>
-<tr><td>ff_wtoupper</td><td>_USE_LFN &gt;= 1</td></tr>
-<tr><td>ff_cre_syncobj</td><td>_FS_REENTRANT == 1</td><td rowspan="6">O/S dependent functions.<br>Samples available in option/syscall.c.</td></tr>
-<tr><td>ff_del_syncobj</td><td>_FS_REENTRANT == 1</td></tr>
-<tr><td>ff_req_grant</td><td>_FS_REENTRANT == 1</td></tr>
-<tr><td>ff_rel_grant</td><td>_FS_REENTRANT == 1</td></tr>
-<tr><td>ff_mem_alloc</td><td>_USE_LFN == 3</td></tr>
-<tr><td>ff_mem_free</td><td>_USE_LFN == 3</td></tr>
+<tr><td>ff_convert<br>ff_wtoupper</td><td>_USE_LFN &gt;= 1</td><td>Unicode support functions.<br>Available in option/cc*.c.</td></tr>
+<tr><td>ff_cre_syncobj<br>ff_del_syncobj<br>ff_req_grant<br>ff_rel_grant</td><td>_FS_REENTRANT == 1</td><td rowspan="2">O/S dependent functions.<br>Samples available in option/syscall.c.</td></tr>
+<tr><td>ff_mem_alloc<br>ff_mem_free</td><td>_USE_LFN == 3</td></tr>
 </table>
 </div>
 
@@ -78,20 +68,20 @@ The FatFs module assumes that size of char/short/long are 8/16/32 bit and int is
 </div>
 
 <div class="para" id="memory">
-<h3>Memory Usage (R0.08a)</h3>
+<h3>Memory Usage (R0.08b)</h3>
 <table class="lst2">
-<tr><th></th><th>AVR</th><th>H8/300H</th><th>PIC24</th><th>V850ES</th><th>SH-2A</th><th>ARM7</th><th>x86</th></tr>
-<tr><td>Compiler</td><td>WinAVR(gcc)</td><td>CH38</td><td>C30(gcc)</td><td>CA850</td><td>SHC</td><td>WinARM(gcc)</td><td>VC6</td></tr>
-<tr><td>_WORD_ACCESS</td><td>1</td><td>0</td><td>0</td><td>1</td><td>0</td><td>0</td><td>1</td></tr>
-<tr class="lst3"><td>text (Full, R/W)</td><td>12646</td><td>10686</td><td>11430</td><td>7732</td><td>8752</td><td>10560</td><td>7545</td></tr>
-<tr> <td>text (Min, R/W)</td><td>8306</td><td>6986</td><td>7413</td><td>4938</td><td>5576</td><td>6680</td><td>4923</td></tr>
-<tr><td>text (Full, R/O)</td><td>5960</td><td>4876</td><td>5250</td><td>3554</td><td>3804</td><td>4688</td><td>3450</td></tr>
-<tr> <td>text (Min, R/O)</td><td>4366</td><td>3770</td><td>3939</td><td>2684</td><td>2940</td><td>3452</td><td>2664</td></tr>
-<tr><td>bss</td><td>D*2 + 2</td><td>D*4 + 2</td><td>D*2 + 2</td><td>D*4 + 2</td><td>D*4 + 2</td><td>D*4 + 2</td><td>D*4 + 2</td></tr>
-<tr><td>Work area<br>(_FS_TINY == 0)</td><td>D*560 +<br>F*544</td><td>D*560 +<br>F*550</td><td>D*560 +<br>F*544</td><td>D*560 +<br>F*550</td><td>D*560 +<br>F*550</td><td>D*560 +<br>F*550</td><td>D*560 +<br>F*550</td></tr>
-<tr><td>Work area<br>(_FS_TINY == 1)</td><td>D*560 +<br>F*32</td><td>D*560 +<br>F*36</td><td>D*560 +<br>F*32</td><td>D*560 +<br>F*36</td><td>D*560 +<br>F*36</td><td>D*560 +<br>F*36</td><td>D*560 +<br>F*36</td></tr>
+<tr><th></th><th>ARM7<small><br>32bit</small></th><th>ARM7<small><br>Thumb</small></th><th>Cortex-M3<small><br>Thumb-2</small></th><th>AVR</th><th>H8/300H</th><th>PIC24</th><th>RL78</th><th>V850ES</th><th>SH-2A</th><th>RX62N</th><th>IA-32</th></tr>
+<tr><td>Compiler</td><td>GCC</td><td>GCC</td><td>GCC</td><td>GCC</td><td>CH38</td><td>C30</td><td>CC78K0R</td><td>CA850</td><td>SHC</td><td>RXC</td><td>VC6</td></tr>
+<tr><td>_WORD_ACCESS</td><td>0</td><td>0</td><td>0</td><td>1</td><td>0</td><td>0</td><td>0</td><td>1</td><td>0</td><td>1</td><td>1</td></tr>
+<tr class="lst3"><td>text (Full, R/W)</td><td>10495</td><td>7205</td><td>6661</td><td>12646</td><td>10686</td><td>11430</td><td>12967</td><td>7732</td><td>8752</td><td>5747</td><td>7545</td></tr>
+<tr> <td>text (Min, R/W)</td><td>6523</td><td>4749</td><td>4335</td><td>8306</td><td>6986</td><td>7413</td><td>8745</td><td>4938</td><td>5576</td><td>3746</td><td>4923</td></tr>
+<tr><td>text (Full, R/O)</td><td>4539</td><td>3183</td><td>2893</td><td>5960</td><td>4876</td><td>5250</td><td>6060</td><td>3554</td><td>3804</td><td>2659</td><td>3450</td></tr>
+<tr> <td>text (Min, R/O)</td><td>3307</td><td>2495</td><td>2191</td><td>4366</td><td>3770</td><td>3939</td><td>4604</td><td>2684</td><td>2940</td><td>2025</td><td>2664</td></tr>
+<tr><td>bss</td><td>D*4 + 2</td><td>D*4 + 2</td><td>D*4 + 2</td><td>D*2 + 2</td><td>D*4 + 2</td><td>D*2 + 2</td><td>D*2 + 2</td><td>D*4 + 2</td><td>D*4 + 2</td><td>D*4 + 2</td><td>D*4 + 2</td></tr>
+<tr><td>Work area<br>(_FS_TINY == 0)</td><td>V*560 +<br>F*550</td><td>V*560 +<br>F*550</td><td>V*560 +<br>F*550</td><td>V*560 +<br>F*544</td><td>V*560 +<br>F*550</td><td>V*560 +<br>F*544</td><td>V*560 +<br>F*544</td><td>V*560 +<br>F*544</td><td>V*560 +<br>F*550</td><td>V*560 +<br>F*550</td><td>V*560 +<br>F*550</td></tr>
+<tr><td>Work area<br>(_FS_TINY == 1)</td><td>V*560 +<br>F*36</td><td>V*560 +<br>F*36</td><td>V*560 +<br>F*36</td><td>V*560 +<br>F*32</td><td>V*560 +<br>F*36</td><td>V*560 +<br>F*32</td><td>V*560 +<br>F*32</td><td>V*560 +<br>F*36</td><td>V*560 +<br>F*36</td><td>V*560 +<br>F*36</td><td>V*560 +<br>F*36</td></tr>
 </table>
-<p>These are the memory usage on some target systems with following condition. The memory sizes are in unit of byte, D means number of volumes and F means number of open files. All samples are optimezed in code size.</p>
+<p>These are the memory usage on some target systems with following condition. The memory sizes are in unit of byte, <em>V</em> means number of mounted volumes and <em>F</em> means number of open files. All samples are optimezed in code size.</p>
 <pre>
 _FS_READONLY     0 (R/W), 1 (R/O)
 _FS_MINIMIZE     0 (Full function), 3 (Minimized function)
@@ -103,6 +93,7 @@ _CODE_PAGE       932 (Japanese Shift-JIS)
 _USE_LFN         0 (Disable LFN)
 _MAX_SS          512 (Fixed sector size)
 _FS_RPATH        0 (Disable relative path)
+_VOLUMES         D (Number of logical drives to be used)
 _MULTI_PARTITION 0 (Single partition per drive)
 _FS_REENTRANT    0 (Disable reentrancy)
 _FS_SHARE        0 (Disable shareing control)
@@ -114,7 +105,7 @@ _FS_SHARE        0 (Disable shareing control)
 <p>Follwing table shows which API function is removed by configuration options for the module size reduction.</p>
 <table class="lst2">
 <tr><td rowspan="2">Function</td><td colspan="4">_FS_MINIMIZE</td><td colspan="2">_FS_READONLY</td><td colspan="2">_USE_STRFUNC</td><td colspan="3">_FS_RPATH</td><td colspan="2">_USE_MKFS</td><td colspan="2">_USE_FORWARD</td></tr>
-<tr><td>0</td><td>1</td><td>2</td><td>3</td><td>0</td><td>1</td><td>0</td><td>1</td><td>0</td><td>1</td><td>2</td><td>0</td><td>1</td><td>0</td><td>1</td></tr>
+<tr><td>0</td><td>1</td><td>2</td><td>3</td><td>0</td><td>1</td><td>0&nbsp;&nbsp;</td><td>1/2</td><td>0</td><td>1</td><td>2</td><td>0</td><td>1</td><td>0</td><td>1</td></tr>
 <tr class="lst3"><td>f_mount</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
 <tr><td>f_open</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
 <tr><td>f_close</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
@@ -156,8 +147,8 @@ _FS_SHARE        0 (Disable shareing control)
 <tr><td>949(Korean)</td><td>+139K</td></tr>
 <tr><td>950(Big5)</td><td>+111K</td></tr>
 </table>
-<p>When the LFN feature is enabled, the module size will be increased depends on the selected code page. Right table shows how many bytes increased when LFN feature is enabled with some code pages. We are the Japanese, Chinese and Korean have tens of thousands of characters. Unfortunately, it requires a huge OEM-Unicode bidirectional conversion table and the module size will be drastically increased that shown in the table. As the result, the FatFs with LFN feature with DBCS will not able to be implemented to most 8-bit microcontrollers. <small>This is the reason why I had not been interested in implementing the LFN feature for a long time :-)</small></p>
-<p>Note that the LFN feature on the FAT file system is a patent of Microsoft Corporation. When enable it on the commercial products, a license from Microsoft may be required depends on the final destination.</p>
+<p>When the LFN feature is enabled, the module size will be increased depends on the selected code page. Right table shows how many bytes increased when LFN feature is enabled with some code pages. We are the East-Asians have tens of thousands of characters. Unfortunately, it requires a huge OEM-Unicode bidirectional conversion table and the module size will be drastically increased that shown in the table. As the result, the FatFs with LFN feature with DBCS will not able to be implemented to most 8-bit microcontrollers. <small>This is the reason why I had not been interested in implementing the LFN feature for a long time :-)</small></p>
+<p>Note that the LFN feature on the FAT file system is a patent of Microsoft Corporation. This is not the case on FAT32. When enable LFN feature on the commercial products, a license from Microsoft may be required depends on the final destination.</p>
 </div>
 
 <div class="para" id="unicode">
@@ -168,15 +159,15 @@ _FS_SHARE        0 (Disable shareing control)
 <div class="para" id="reentrant">
 <h3>Re-entrancy</h3>
 <p>The file operations to the different volume is always re-entrant ant can work simultaneously. The file operations to the same volume is not re-entrant but it can also be configured to thread-safe with <tt>_FS_REENTRANT</tt> option. In this case, also the OS dependent synchronization object control functions, ff_cre_syncobj, ff_del_syncobj, ff_req_grant and ff_rel_grant must be added to the project.</p>
-<p>When a file function is called while the volume is in use by any other task, the access is blocked until the task leaves file function. If wait time exceeded a period defined by <tt>_TIMEOUT</tt>, the file function will abort with <tt>FR_TIMEOUT</tt>. The timeout feature might not be supported on some RTOS.</p>
+<p>When a file function is called while the volume is in use by any other task, the file function is suspended until that task leaves file function. If wait time exceeded a period defined by <tt>_TIMEOUT</tt>, the file function will abort with <tt>FR_TIMEOUT</tt>. The timeout feature might not be supported on some RTOS.</p>
 <p>There is an exception on f_mount and f_mkfs function. These functions are not re-entrant to the same volume. When use these functions, all other task must close the corresponding file on the volume and avoid to access the volume.</p>
-<p>Note that this section describes on the re-entrancy of the FatFs module itself. There is no assumtion on the re-entrancy of low level disk I/O module.</p>
+<p>Note that this section describes on the re-entrancy of the FatFs module itself but also the low level disk I/O layer must be re-entrant.</p>
 </div>
 
 <div class="para" id="dup">
 <h3>Duplicated File Access</h3>
-<p>FatFs module does not support the shareing controls of duplicated file access in default. It is permitted when open method to a file is only read mode. The duplicated open in write mode to a file is always prohibited and open file must not be renamed, deleted, otherwise the FAT structure on the volume can be collapted. Also current directory must not be deleted.</p>
-<p>The file shareing control can also be available when <tt>_FS_SHARE</tt> is set to 1 or grater. In this case, if any open, rename or remove that violating the file shareing rule that described above is attempted, the file function will fail with <tt>FR_LOCKED</tt>.</p>
+<p>FatFs module does not support the shareing controls of duplicated file access in default. It is permitted when open method to a file is only read mode. The duplicated open in write mode to a file is always prohibited and open file must not be renamed, deleted, or the FAT structure on the volume can be collapted.</p>
+<p>The file shareing control can also be available when <tt>_FS_SHARE</tt> is set to 1 or grater. The value specifies the number of files to manage simultaneously. In this case, if any open, rename or remove that violating the file shareing rule that described above is attempted, the file function will fail with <tt>FR_LOCKED</tt>. If number of open files gets larger than <tt>_FS_SHARE</tt>, the f_open function will fail with <tt>FR_TOO_MANY_OPEN_FILES</tt>.</p>
 </div>
 
 <div class="para" id="fs1">
@@ -236,13 +227,13 @@ Figure 5. Minimized critical section<br>
 <h3>About FatFs License</h3>
 <p>This is a copy of the FatFs license document that included in the source codes.</p>
 <pre>/*----------------------------------------------------------------------------/
-/  FatFs - FAT file system module  R0.08a                    (C)ChaN, 2010
+/  FatFs - FAT file system module  R0.08b                    (C)ChaN, 2011
 /-----------------------------------------------------------------------------/
 / FatFs module is a generic FAT file system module for small embedded systems.
 / This is a free software that opened for education, research and commercial
 / developments under license policy of following trems.
 /
-/  Copyright (C) 2010, ChaN, all right reserved.
+/  Copyright (C) 2011, ChaN, all right reserved.
 /
 / * The FatFs module is a free software and there is NO WARRANTY.
 / * No restriction on use. You can use, modify and redistribute it for
diff --git a/doc/en/chdir.html b/doc/en/chdir.html
index 9704e51..f94199e 100644
--- a/doc/en/chdir.html
+++ b/doc/en/chdir.html
@@ -11,17 +11,17 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>f_chdir</h2>
 <p>The f_chdir function changes the current directory of a drive.</p>
 <pre>
 FRESULT f_chdir (
-  const TCHAR* <em>Path</em> <span>/* Pointer to the path name */</span>
+  const TCHAR* <em>Path</em> <span class="c">/* Pointer to the path name */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>Parameters</h4>
 <dl class="par">
 <dt>Path</dt>
@@ -30,55 +30,48 @@ FRESULT f_chdir (
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>Return Values</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>The function succeeded.</dd>
-<dt>FR_NO_PATH</dt>
-<dd>Could not find the path.</dd>
-<dt>FR_INVALID_NAME</dt>
-<dd>The path name is invalid.</dd>
-<dt>FR_INVALID_DRIVE</dt>
-<dd>The drive number is invalid.</dd>
-<dt>FR_NOT_READY</dt>
-<dd>The disk drive cannot work due to no medium in the drive or any other reason.</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>The function failed due to an error in the disk function.</dd>
-<dt>FR_INT_ERR</dt>
-<dd>The function failed due to a wrong FAT structure or an internal error.</dd>
-<dt>FR_NOT_ENABLED</dt>
-<dd>The logical drive has no work area.</dd>
-<dt>FR_NO_FILESYSTEM</dt>
-<dd>There is no valid FAT volume on the drive.</dd>
-</dl>
+<p>
+<a href="rc.html#ok">FR_OK</a>,
+<a href="rc.html#de">FR_DISK_ERR</a>,
+<a href="rc.html#ie">FR_INT_ERR</a>,
+<a href="rc.html#nr">FR_NOT_READY</a>,
+<a href="rc.html#np">FR_NO_PATH</a>,
+<a href="rc.html#in">FR_INVALID_NAME</a>,
+<a href="rc.html#id">FR_INVALID_DRIVE</a>,
+<a href="rc.html#ne">FR_NOT_ENABLED</a>,
+<a href="rc.html#ns">FR_NO_FILESYSTEM</a>,
+<a href="rc.html#tm">FR_TIMEOUT</a>,
+<a href="rc.html#nc">FR_NOT_ENOUGH_CORE</a>
+</p>
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>Description</h4>
 <p>The f_chdir function changes the current directory of the logical drive. The current directory of a drive is initialized to the root directory when the drive is auto-mounted. Note that the current directory is retained in the each file system object so that it also affects other tasks that using the drive.</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>QuickInfo</h4>
 <p>Available when <tt>_FS_RPATH >= 1</tt>.</p>
 </div>
 
 
-<div class="para">
+<div class="para use">
 <h4>Example</h4>
 <pre>
-    <span>/* Change current direcoty of the current drive (dir1 under root dir) */</span>
+    <span class="c">/* Change current direcoty of the current drive (dir1 under root dir) */</span>
     f_chdir("/dir1");
 
-    <span>/* Change current direcoty of drive 2 (parent dir) */</span>
+    <span class="c">/* Change current direcoty of drive 2 (parent dir) */</span>
     f_chdir("2:..");
 </pre>
 </div>
 
-<div class="para">
+<div class="para ref">
 <h4>See Also</h4>
 <p><tt><a href="chdrive.html">f_chdrive</a>, <a href="getcwd.html">f_getcwd</a></tt></p>
 </div>
diff --git a/doc/en/chdrive.html b/doc/en/chdrive.html
index 77ad46f..c5d81b2 100644
--- a/doc/en/chdrive.html
+++ b/doc/en/chdrive.html
@@ -11,17 +11,17 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>f_chdrive</h2>
 <p>The f_chdrive function changes the current drive.</p>
 <pre>
 FRESULT f_chdrive (
-  BYTE <em>Drive</em> <span>/* Logical drive number */</span>
+  BYTE <em>Drive</em> <span class="c">/* Logical drive number */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>Parameters</h4>
 <dl class="par">
 <dt>Drive</dt>
@@ -30,29 +30,27 @@ FRESULT f_chdrive (
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>Return Values</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>The function succeeded.</dd>
-<dt>FR_INVALID_DRIVE</dt>
-<dd>The drive number is invalid.</dd>
-</dl>
+<p>
+<a href="rc.html#ok">FR_OK</a>,
+<a href="rc.html#id">FR_INVALID_DRIVE</a>
+</p>
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>Description</h4>
 <p>The f_chdrive function changes the current drive. The initial value of the current drive number is 0. Note that the current drive is retained in a static variable so that it also affects other tasks that using the file functions.</p>
 </div>
 
-<div class="para">
+<div class="para comp">
 <h4>QuickInfo</h4>
 <p>Available when <tt>_FS_RPATH >= 1</tt>.</p>
 </div>
 
 
-<div class="para">
+<div class="para ref">
 <h4>See Also</h4>
 <p><tt><a href="chdir.html">f_chdir</a>, <a href="getcwd.html">f_getcwd</a></tt></p>
 </div>
diff --git a/doc/en/chmod.html b/doc/en/chmod.html
index 38861c5..8c05044 100644
--- a/doc/en/chmod.html
+++ b/doc/en/chmod.html
@@ -11,19 +11,19 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>f_chmod</h2>
 <p>The f_chmod function changes the attribute of a file or directory.</p>
 <pre>
 FRESULT f_chmod (
-  const TCHAR* <em>FileName</em>, <span>/* Pointer to the file or directory */</span>
-  BYTE <em>Attribute</em>,        <span>/* Attribute flags */</span>
-  BYTE <em>AttributeMask</em>     <span>/* Attribute masks */</span>
+  const TCHAR* <em>FileName</em>, <span class="c">/* Pointer to the file or directory */</span>
+  BYTE <em>Attribute</em>,        <span class="c">/* Attribute flags */</span>
+  BYTE <em>AttributeMask</em>     <span class="c">/* Attribute masks */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>Parameters</h4>
 <dl class="par">
 <dt>FileName</dt>
@@ -44,51 +44,42 @@ FRESULT f_chmod (
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>Return Values</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>The function succeeded.</dd>
-<dt>FR_NO_FILE</dt>
-<dd>Could not find the file.</dd>
-<dt>FR_NO_PATH</dt>
-<dd>Could not find the path.</dd>
-<dt>FR_INVALID_NAME</dt>
-<dd>The file name is invalid.</dd>
-<dt>FR_INVALID_DRIVE</dt>
-<dd>The drive number is invalid.</dd>
-<dt>FR_NOT_READY</dt>
-<dd>The disk drive cannot work due to no medium in the drive or any other reason.</dd>
-<dt>FR_WRITE_PROTECTED</dt>
-<dd>The medium is write protected.</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>The function failed due to an error in the disk function.</dd>
-<dt>FR_INT_ERR</dt>
-<dd>The function failed due to a wrong FAT structure or an internal error.</dd>
-<dt>FR_NOT_ENABLED</dt>
-<dd>The logical drive has no work area.</dd>
-<dt>FR_NO_FILESYSTEM</dt>
-<dd>There is no valid FAT volume on the drive.</dd>
-</dl>
+<p>
+<a href="rc.html#ok">FR_OK</a>,
+<a href="rc.html#de">FR_DISK_ERR</a>,
+<a href="rc.html#ie">FR_INT_ERR</a>,
+<a href="rc.html#nr">FR_NOT_READY</a>,
+<a href="rc.html#ok">FR_NO_FILE</a>,
+<a href="rc.html#np">FR_NO_PATH</a>,
+<a href="rc.html#in">FR_INVALID_NAME</a>,
+<a href="rc.html#wp">FR_WRITE_PROTECTED</a>,
+<a href="rc.html#id">FR_INVALID_DRIVE</a>,
+<a href="rc.html#ne">FR_NOT_ENABLED</a>,
+<a href="rc.html#ns">FR_NO_FILESYSTEM</a>,
+<a href="rc.html#tm">FR_TIMEOUT</a>,
+<a href="rc.html#nc">FR_NOT_ENOUGH_CORE</a>
+</p>
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>Description</h4>
 <p>The f_chmod function changes the attribute of a file or directory.</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>QuickInfo</h4>
 <p>Available when <tt>_FS_READONLY == 0</tt> and <tt>_FS_MINIMIZE == 0</tt>.</p>
 </div>
 
 
-<div class="para">
+<div class="para use">
 <h4>Example</h4>
 <pre>
-    <span>/* Set read-only flag, clear archive flag and others are retained. */</span>
+    <span class="c">/* Set read-only flag, clear archive flag and others are retained. */</span>
     f_chmod("file.txt", AR_RDO, AR_RDO | AR_ARC);
 </pre>
 </div>
diff --git a/doc/en/close.html b/doc/en/close.html
index a8e1255..49c62b5 100644
--- a/doc/en/close.html
+++ b/doc/en/close.html
@@ -11,17 +11,17 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>f_close</h2>
 <p>The f_close function closes an open file.</p>
 <pre>
 FRESULT f_close (
-  FIL* <em>FileObject</em>     <span>/* Pointer to the file object structure */</span>
+  FIL* <em>FileObject</em>     <span class="c">/* Pointer to the file object structure */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>Parameter</h4>
 <dl class="par">
 <dt>FileObject</dt>
@@ -30,36 +30,32 @@ FRESULT f_close (
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>Return Values</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>The file object has been closed successfuly.</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>The function failed due to an error in the disk function.</dd>
-<dt>FR_INT_ERR</dt>
-<dd>The function failed due to a wrong FAT structure or an internal error.</dd>
-<dt>FR_NOT_READY</dt>
-<dd>The disk drive cannot work due to no medium in the drive or any other reason.</dd>
-<dt>FR_INVALID_OBJECT</dt>
-<dd>The file object is invalid.</dd>
-</dl>
+<p>
+<a href="rc.html#ok">FR_OK</a>,
+<a href="rc.html#de">FR_DISK_ERR</a>,
+<a href="rc.html#ie">FR_INT_ERR</a>,
+<a href="rc.html#nr">FR_NOT_READY</a>,
+<a href="rc.html#io">FR_INVALID_OBJECT</a>,
+<a href="rc.html#tm">FR_TIMEOUT</a>
+</p>
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>Description</h4>
 <p>The f_close function closes an open file object. If any data has been written to the file, the cached information of the file is written back to the disk. After the function succeeded, the file object is no longer valid and it can be discarded.</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>QuickInfo</h4>
 <p>Always available.</p>
 </div>
 
 
-<div class="para">
+<div class="para ref">
 <h4>See Also</h4>
 <p><tt><a href="open.html">f_open</a>, <a href="read.html">f_read</a>, <a href="write.html">f_write</a>,  <a href="sync.html">f_sync</a>, <a href="sfile.html">FIL</a>, <a href="sfatfs.html">FATFS</a></tt></p>
 </div>
diff --git a/doc/en/dinit.html b/doc/en/dinit.html
index 3b39c6a..4f8a3f8 100644
--- a/doc/en/dinit.html
+++ b/doc/en/dinit.html
@@ -11,17 +11,17 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>disk_initialize</h2>
 <p>The disk_initialize function initializes the disk drive.</p>
 <pre>
 DSTATUS disk_initialize (
-  BYTE <em>Drive</em>           <span>/* Physical drive number */</span>
+  BYTE <em>Drive</em>           <span class="c">/* Physical drive number */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>Parameter</h4>
 <dl class="par">
 <dt>Drive</dt>
@@ -30,12 +30,12 @@ DSTATUS disk_initialize (
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>Return Values</h4>
 <p>This function returns a disk status as the result. For details of the disk status, refer to the <a href="dstat.html">disk_status</a> function.</p>
 </div>
 
-<div class="para">
+<div class="para desc">
 <h4>Description</h4>
 <p>The disk_initialize function initializes a physical drive and put it ready to read/write. When the function succeeded, <tt>STA_NOINIT</tt> flag in the return value is cleard.</p>
 <p><em>Application program should not call this function, or FAT structure on the volume can be collapted. To re-initialize the file system, use f_mount function.</em>This function is called on volume mount process in the FatFs module to manage the media change.</p>
diff --git a/doc/en/dioctl.html b/doc/en/dioctl.html
index 7998c9e..4365166 100644
--- a/doc/en/dioctl.html
+++ b/doc/en/dioctl.html
@@ -11,19 +11,19 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>disk_ioctl</h2>
 <p>The disk_ioctl function cntrols device specified features and miscellaneous functions other than disk read/write.</p>
 <pre>
 DRESULT disk_ioctl (
-  BYTE <em>Drive</em>,      <span>/* Drive number */</span>
-  BYTE <em>Command</em>,    <span>/* Control command code */</span>
-  void* <em>Buffer</em>     <span>/* Parameter and data buffer */</span>
+  BYTE <em>Drive</em>,      <span class="c">/* Drive number */</span>
+  BYTE <em>Command</em>,    <span class="c">/* Control command code */</span>
+  void* <em>Buffer</em>     <span class="c">/* Parameter and data buffer */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>Parameters</h4>
 <dl class="par">
 <dt>Drive</dt>
@@ -36,7 +36,7 @@ DRESULT disk_ioctl (
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>Return Value</h4>
 <dl class="ret">
 <dt>RES_OK (0)</dt>
@@ -51,7 +51,7 @@ DRESULT disk_ioctl (
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>Description</h4>
 <p>The FatFs module uses only device independent commands described below. Any device dependent function is not used.</p>
 <table class="lst">
diff --git a/doc/en/dread.html b/doc/en/dread.html
index c9b51e3..833a042 100644
--- a/doc/en/dread.html
+++ b/doc/en/dread.html
@@ -11,20 +11,20 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>disk_read</h2>
 <p>The disk_read function reads sector(s) from the disk drive.</p>
 <pre>
 DRESULT disk_read (
-  BYTE <em>Drive</em>,          <span>/* Physical drive number */</span>
-  BYTE* <em>Buffer</em>,        <span>/* Pointer to the read data buffer */</span>
-  DWORD <em>SectorNumber</em>,  <span>/* Start sector number */</span>
-  BYTE <em>SectorCount</em>     <span>/* Number of sectros to read */</span>
+  BYTE <em>Drive</em>,          <span class="c">/* Physical drive number */</span>
+  BYTE* <em>Buffer</em>,        <span class="c">/* Pointer to the read data buffer */</span>
+  DWORD <em>SectorNumber</em>,  <span class="c">/* Start sector number */</span>
+  BYTE <em>SectorCount</em>     <span class="c">/* Number of sectros to read */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>Parameters</h4>
 <dl class="par">
 <dt>Drive</dt>
@@ -39,7 +39,7 @@ DRESULT disk_read (
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>Return Value</h4>
 <dl class="ret">
 <dt>RES_OK (0)</dt>
diff --git a/doc/en/dstat.html b/doc/en/dstat.html
index 9c9c6e3..fa68f4a 100644
--- a/doc/en/dstat.html
+++ b/doc/en/dstat.html
@@ -11,17 +11,17 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>disk_status</h2>
 <p>The disk_status function returns the current disk status.</p>
 <pre>
 DSTATUS disk_status (
-  BYTE <em>Drive</em>     <span>/* Physical drive number */</span>
+  BYTE <em>Drive</em>     <span class="c">/* Physical drive number */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>Parameter</h4>
 <dl class="par">
 <dt>Drive</dt>
@@ -30,7 +30,7 @@ DSTATUS disk_status (
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>Return Values</h4>
 <p>The disk status is returned in combination of following flags. FatFs refers only <tt>STA_NOINIT</tt> and <tt>STA_PROTECTED</tt>.</p>
 <dl class="ret">
diff --git a/doc/en/dwrite.html b/doc/en/dwrite.html
index 8f3d710..c808cff 100644
--- a/doc/en/dwrite.html
+++ b/doc/en/dwrite.html
@@ -11,20 +11,20 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>disk_write</h2>
 <p>The disk_write writes sector(s) to the disk.</p>
 <pre>
 DRESULT disk_write (
-  BYTE <em>Drive</em>,          <span>/* Physical drive number */</span>
-  const BYTE* <em>Buffer</em>,  <span>/* Pointer to the write data (may be non aligned) */</span>
-  DWORD <em>SectorNumber</em>,  <span>/* Sector number to write */</span>
-  BYTE <em>SectorCount</em>     <span>/* Number of sectors to write */</span>
+  BYTE <em>Drive</em>,          <span class="c">/* Physical drive number */</span>
+  const BYTE* <em>Buffer</em>,  <span class="c">/* Pointer to the write data (may be non aligned) */</span>
+  DWORD <em>SectorNumber</em>,  <span class="c">/* Sector number to write */</span>
+  BYTE <em>SectorCount</em>     <span class="c">/* Number of sectors to write */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>Parameters</h4>
 <dl class="par">
 <dt>Drive</dt>
@@ -39,7 +39,7 @@ DRESULT disk_write (
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>Return Values</h4>
 <dl class="ret">
 <dt>RES_OK (0)</dt>
@@ -56,7 +56,7 @@ DRESULT disk_write (
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>Description</h4>
 <p>This function is not required in read only configuration.</p>
 </div>
diff --git a/doc/en/eof.html b/doc/en/eof.html
new file mode 100644
index 0000000..8560757
--- /dev/null
+++ b/doc/en/eof.html
@@ -0,0 +1,62 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<link rel="up" title="FatFs" href="../00index_e.html">
+<link rel="alternate" hreflang="ja" title="Japanese" href="../ja/eof.html">
+<link rel="stylesheet" href="../css_e.css" type="text/css" media="screen" title="ELM Default">
+<title>FatFs - f_eof</title>
+</head>
+
+<body>
+
+<div class="para func">
+<h2>f_eof</h2>
+<p>The f_eof function tests for end-of-file on a file.</p>
+<pre>
+int f_eof (
+  FIL* <em>FileObject</em>   <span class="c">/* File object */</span>
+);
+</pre>
+</div>
+
+
+<div class="para arg">
+<h4>Parameters</h4>
+<dl class="par">
+<dt>FileObject</dt>
+<dd>Pointer to the open file object structure.</dd>
+</dl>
+</div>
+
+
+<div class="para ret">
+<h4>Return Values</h4>
+<p>The f_eof function returns a non-zero value if the read/write pointer has reached end of the file; otherwise it returns a zero.</p>
+</div>
+
+
+<div class="para desc">
+<h4>Description</h4>
+<p>In this revision, the f_eof function is implemented as a macro.</p>
+<pre>
+<span class="k">#define</span> f_eof(fp) (((fp)->fptr) == ((fp)->fsize) ? 1 : 0)
+</pre>
+</div>
+
+
+<div class="para comp">
+<h4>QuickInfo</h4>
+<p>Always available.</p>
+</div>
+
+
+<div class="para ref">
+<h4>See Also</h4>
+<p><tt><a href="open.html">f_open</a>, <a href="lseek.html">f_lseek</a>, <a href="sfile.html">FIL</a></tt></p>
+</div>
+
+<p class="foot"><a href="../00index_e.html">Return</a></p>
+</body>
+</html>
diff --git a/doc/en/error.html b/doc/en/error.html
new file mode 100644
index 0000000..e7d25a7
--- /dev/null
+++ b/doc/en/error.html
@@ -0,0 +1,62 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<link rel="up" title="FatFs" href="../00index_e.html">
+<link rel="alternate" hreflang="ja" title="Japanese" href="../ja/error.html">
+<link rel="stylesheet" href="../css_e.css" type="text/css" media="screen" title="ELM Default">
+<title>FatFs - f_error</title>
+</head>
+
+<body>
+
+<div class="para func">
+<h2>f_error</h2>
+<p>The f_error tests for an error on a file.</p>
+<pre>
+int f_error (
+  FIL* <em>FileObject</em>   <span class="c">/* File object */</span>
+);
+</pre>
+</div>
+
+
+<div class="para arg">
+<h4>Parameters</h4>
+<dl class="par">
+<dt>FileObject</dt>
+<dd>Pointer to the open file object structure.</dd>
+</dl>
+</div>
+
+
+<div class="para ret">
+<h4>Return Values</h4>
+<p>Returns a non-zero value if an error has occured; otherwise it returns a zero.</p>
+</div>
+
+
+<div class="para desc">
+<h4>Description</h4>
+<p>In this revision, the f_error function is implemented as a macro.</p>
+<pre>
+<span class="k">#define</span> f_error(fp) (((fp)->flag & FA__ERROR) ? 1 : 0)
+</pre>
+</div>
+
+
+<div class="para comp">
+<h4>QuickInfo</h4>
+<p>Always available.</p>
+</div>
+
+
+<div class="para ref">
+<h4>See Also</h4>
+<p><tt><a href="open.html">f_open</a>, <a href="sfile.html">FIL</a></tt></p>
+</div>
+
+<p class="foot"><a href="../00index_e.html">Return</a></p>
+</body>
+</html>
diff --git a/doc/en/fattime.html b/doc/en/fattime.html
index 26ce9fc..0a996c9 100644
--- a/doc/en/fattime.html
+++ b/doc/en/fattime.html
@@ -11,7 +11,7 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>get_fattime</h2>
 <p>The get_fattime function gets current time.</p>
 <pre>
@@ -20,7 +20,7 @@ DWORD get_fattime (void);
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>Return Value</h4>
 <p>Currnet time is returned with packed into a DWORD value. The bit field is as follows:</p>
 <dl class="ret">
@@ -40,7 +40,7 @@ DWORD get_fattime (void);
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>Description</h4>
 <p>The get_fattime function must return any valid time even if the system does not support a real time clock. If a zero is returned, the file will not have a valid time. This fucntion is not required in read only configuration.</p>
 </div>
diff --git a/doc/en/filename.html b/doc/en/filename.html
index 7becae5..44acf54 100644
--- a/doc/en/filename.html
+++ b/doc/en/filename.html
@@ -10,12 +10,13 @@
 </head>
 
 <body>
+<h1>Path Names</h1>
 
 <div class="para">
 <h3>Format of the path names</h3>
 <p>The path name format on the FatFs module is similer to the filename specs of DOS/Windos as follows:</p>
 <p><tt>"[drive#:][/]directory/file"</tt></p>
-<p>The FatFs module supports long file name (LFN) and 8.3 format file name (SFN). The LFN can be used when LFN feature is enabled <tt>(_USE_LFN &gt; 0)</tt>. The sub directories are separated with a \ or / in the same way as DOS/Windows API. Only a difference is that the logical drive is specified in a numeral with a colon. When the drive number is omitted, it is assumed as default drive (0 or current drive).</p>
+<p>The FatFs module supports long file name (LFN) and 8.3 format file name (SFN). The LFN can be used when LFN feature is enabled <tt>(_USE_LFN &gt; 0)</tt>. The sub directories are separated with a \ or / in the same way as DOS/Windows API. Duplicated separators are skipped and ignored. Only a difference is that the logical drive is specified in a numeral with a colon. When the drive number is omitted, it is assumed as default drive (0 or current drive).</p>
 <p>Control characters (\0 to \x1F) are recognized as end of the path name. Leading/embedded spaces in the path name are valid as a part of the name on LFN configuration but they are recognized as end of the path name on non-LFN configuration. Trailing spaces and dots are ignored.</p>
 <p>In default configuration <tt>(_FS_RPATH == 0)</tt>, it does not have a concept of current directory like OS oriented file system. All objects on the volume are always specified in full path name that follows from the root directory. Dot directory names are not allowed. Heading separator is ignored and it can be exist or omitted. The default drive number is fixed to 0.</p>
 <p>When relative path feature is enabled <tt>(_FS_RPATH == 1)</tt>, specified path is followed from the root directory if a heading separator is exist. If not, it is followed from the current directory set with <a href="chdir.html">f_chdir</a> function. Dot names are also allowed for the path name. The default drive is the current drive set with <a href="chdrive.html">f_chdrive</a> function.</p>
@@ -41,9 +42,9 @@
 <h3>Unicode API</h3>
 <p>The path names are input/output in either ANSI/OEM code (SBCS/DBCS) or Unicode depends on the configuration options. The type of arguments that specifies the file names are defined as <tt>TCHAR</tt> which is an alias of <tt>char</tt> in default. The code set of the file name string is the ANSI/OEM code set specifid by <tt>_CODE_PAGE</tt>. When <tt>_LFN_UNICODE</tt> is set to 1 under LFN configuration, the type of the <tt>TCHAR</tt> is switched to <tt>unsigned short</tt> (UCS-2 character) to support Unicode. In this case, the LFN feature is fully supported and the Unicode specific characters, such as 笨昶亂笨｡笘ｸ笘ｭ, can also be used for the path name. It also affects data types and encoding of the string I/O functions. To define literal strings, <tt>_T(s)</tt> and <tt>_TEXT(s)</tt> macro are available to select either ANSI/OEM or Unicode automatically. The code shown below is an example to define the literal strings.</p>
 <pre>
- f_open(fp, "filename.txt", FA_READ);      <span>/* ANSI/OEM only */</span>
- f_open(fp, L"filename.txt", FA_READ);     <span>/* Unicode only */</span>
- f_open(fp, _T("filename.txt"), FA_READ);  <span>/* Changed automatically */</span>
+ f_open(fp, "filename.txt", FA_READ);      <span class="c">/* ANSI/OEM only */</span>
+ f_open(fp, L"filename.txt", FA_READ);     <span class="c">/* Unicode only */</span>
+ f_open(fp, _T("filename.txt"), FA_READ);  <span class="c">/* Changed automatically */</span>
 </pre>
 </div>
 
@@ -56,10 +57,10 @@ Example: Logical drive 0-2 are assigned to three pri-partitions on the physical
          Logical drive 3 is assigned to physical drive 1 (removable disk)
 
 const PARTITION Drives[] = {
-    {0, 0},     <span>/* Logical drive 0 ==> Physical drive 0, 1st partition */</span>
-    {0, 1},     <span>/* Logical drive 1 ==> Physical drive 0, 2nd partition */</span>
-    {0, 2},     <span>/* Logical drive 2 ==> Physical drive 0, 3rd partition */</span>
-    {1, 0}      <span>/* Logical drive 3 ==> Physical drive 1 */</span>
+    {0, 0},     <span class="c">/* Logical drive 0 ==> Physical drive 0, 1st partition */</span>
+    {0, 1},     <span class="c">/* Logical drive 1 ==> Physical drive 0, 2nd partition */</span>
+    {0, 2},     <span class="c">/* Logical drive 2 ==> Physical drive 0, 3rd partition */</span>
+    {1, 0}      <span class="c">/* Logical drive 3 ==> Physical drive 1 */</span>
 };
 </pre>
 <p>There are some considerations when use <tt>_MULTI_PARTITION</tt> configuration.</p>
diff --git a/doc/en/forward.html b/doc/en/forward.html
index a66034a..01fb0e9 100644
--- a/doc/en/forward.html
+++ b/doc/en/forward.html
@@ -11,20 +11,20 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>f_forward</h2>
 <p>The f_forward function reads the file data and forward it to the data streaming device.</p>
 <pre>
 FRESULT f_forward (
-  FIL* <em>FileObject</em>,                 <span>/* File object */</span>
-  UINT (*<em>Func</em>)(const BYTE*,UINT),  <span>/* Data streaming function */</span>
-  UINT <em>ByteToFwd</em>,                  <span>/* Number of bytes to forward */</span>
-  UINT* <em>ByteFwd</em>                    <span>/* Number of bytes forwarded */</span>
+  FIL* <em>FileObject</em>,                 <span class="c">/* File object */</span>
+  UINT (*<em>Func</em>)(const BYTE*,UINT),  <span class="c">/* Data streaming function */</span>
+  UINT <em>ByteToFwd</em>,                  <span class="c">/* Number of bytes to forward */</span>
+  UINT* <em>ByteFwd</em>                    <span class="c">/* Number of bytes forwarded */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>Parameters</h4>
 <dl class="par">
 <dt>FileObject</dt>
@@ -39,60 +39,54 @@ FRESULT f_forward (
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>Return Values</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>The function succeeded.</dd>
-<dt>FR_DENIED</dt>
-<dd>The function denied due to the file has been opened in non-read mode.</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>The function failed due to an error in the disk function.</dd>
-<dt>FR_INT_ERR</dt>
-<dd>The function failed due to a wrong FAT structure or an internal error.</dd>
-<dt>FR_NOT_READY</dt>
-<dd>The disk drive cannot work due to no medium in the drive or any other reason.</dd>
-<dt>FR_INVALID_OBJECT</dt>
-<dd>The file object is invalid.</dd>
-</dl>
+<p>
+<a href="rc.html#ok">FR_OK</a>,
+<a href="rc.html#de">FR_DISK_ERR</a>,
+<a href="rc.html#ie">FR_INT_ERR</a>,
+<a href="rc.html#nr">FR_NOT_READY</a>,
+<a href="rc.html#io">FR_INVALID_OBJECT</a>,
+<a href="rc.html#tm">FR_TIMEOUT</a>
+</p>
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>Description</h4>
 <p>The f_forward function reads the data from the file and forward it to the outgoing stream without data buffer. This is suitable for small memory system because it does not require any data buffer at application module. The file pointer of the file object increases in number of bytes forwarded. In case of <tt>*ByteFwd &lt; ByteToFwd</tt> without error, it means the requested bytes could not be transferred due to end of file or stream goes busy during data transfer.</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>QuickInfo</h4>
 <p>Available when <tt>_USE_FORWARD == 1</tt> and <tt>_FS_TINY == 1</tt>.</p>
 </div>
 
 
-<div class="para">
+<div class="para use">
 <h4>Example (Audio playback)</h4>
 <pre>
-<span>/*------------------------------------------------------------------------*/</span>
-<span>/* Sample code of data transfer function to be called back from f_forward */</span>
-<span>/*------------------------------------------------------------------------*/</span>
+<span class="c">/*------------------------------------------------------------------------*/</span>
+<span class="c">/* Sample code of data transfer function to be called back from f_forward */</span>
+<span class="c">/*------------------------------------------------------------------------*/</span>
 
-UINT out_stream (   <span>/* Returns number of bytes sent or stream status */</span>
-    const BYTE *p,  <span>/* Pointer to the data block to be sent */</span>
-    UINT btf        <span>/* &gt;0: Transfer call (Number of bytes to be sent). 0: Sense call */</span>
+UINT out_stream (   <span class="c">/* Returns number of bytes sent or stream status */</span>
+    const BYTE *p,  <span class="c">/* Pointer to the data block to be sent */</span>
+    UINT btf        <span class="c">/* &gt;0: Transfer call (Number of bytes to be sent). 0: Sense call */</span>
 )
 {
     UINT cnt = 0;
 
 
-    if (btf == 0) {     <span>/* Sense call */</span>
-        <span>/* Return stream status (0: Busy, 1: Ready) */</span>
-        <span>/* When once it returned ready to sense call, it must accept a byte at least */</span>
-        <span>/* at subsequent transfer call, or f_forward will fail with FR_INT_ERROR. */</span>
+    if (btf == 0) {     <span class="c">/* Sense call */</span>
+        <span class="c">/* Return stream status (0: Busy, 1: Ready) */</span>
+        <span class="c">/* When once it returned ready to sense call, it must accept a byte at least */</span>
+        <span class="c">/* at subsequent transfer call, or f_forward will fail with FR_INT_ERR. */</span>
         if (FIFO_READY) cnt = 1;
     }
-    else {              <span>/* Transfer call */</span>
-        do {    <span>/* Repeat while there is any data to be sent and the stream is ready */</span>
+    else {              <span class="c">/* Transfer call */</span>
+        do {    <span class="c">/* Repeat while there is any data to be sent and the stream is ready */</span>
             FIFO_PORT = *p++;
             cnt++;
         } while (cnt &lt; btf &amp;&amp; FIFO_READY);
@@ -102,32 +96,32 @@ UINT out_stream (   <span>/* Returns number of bytes sent or stream status */</s
 }
 
 
-<span>/*------------------------------------------------------------------------*/</span>
-<span>/* Sample code using f_forward function                                   */</span>
-<span>/*------------------------------------------------------------------------*/</span>
+<span class="c">/*------------------------------------------------------------------------*/</span>
+<span class="c">/* Sample code using f_forward function                                   */</span>
+<span class="c">/*------------------------------------------------------------------------*/</span>
 
 FRESULT play_file (
-    char *fn        <span>/* Pointer to the audio file name to be played */</span>
+    char *fn        <span class="c">/* Pointer to the audio file name to be played */</span>
 )
 {
     FRESULT rc;
     FIL fil;
     UINT dmy;
 
-    <span>/* Open the audio file in read only mode */</span>
+    <span class="c">/* Open the audio file in read only mode */</span>
     rc = f_open(&amp;fil, fn, FA_READ);
     if (rc) return rc;
 
-    <span>/* Repeat until the file pointer reaches end of the file */</span>
+    <span class="c">/* Repeat until the file pointer reaches end of the file */</span>
     while (rc == FR_OK &amp;&amp; fil.fptr &lt; fil.fsize) {
 
-        <span>/* any other processes... */</span>
+        <span class="c">/* any other processes... */</span>
 
-        <span>/* Fill output stream periodicaly or on-demand */</span>
+        <span class="c">/* Fill output stream periodicaly or on-demand */</span>
         rc = f_forward(&amp;fil, out_stream, 1000, &amp;dmy);
     }
 
-    <span>/* Close the file and return */</span>
+    <span class="c">/* Close the file and return */</span>
     f_close(&amp;fil);
     return rc;
 }
@@ -135,7 +129,7 @@ FRESULT play_file (
 </div>
 
 
-<div class="para">
+<div class="para ref">
 <h4>See Also</h4>
 <p><tt><a href="open.html">f_open</a>, <a href="gets.html">fgets</a>, <a href="write.html">f_write</a>, <a href="close.html">f_close</a>, <a href="sfile.html">FIL</a></tt></p>
 </div>
diff --git a/doc/en/getcwd.html b/doc/en/getcwd.html
new file mode 100644
index 0000000..eaec9b9
--- /dev/null
+++ b/doc/en/getcwd.html
@@ -0,0 +1,70 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<link rel="up" title="FatFs" href="../00index_e.html">
+<link rel="alternate" hreflang="ja" title="Japanese" href="../ja/getcwd.html">
+<link rel="stylesheet" href="../css_e.css" type="text/css" media="screen" title="ELM Default">
+<title>FatFs - f_getcwd</title>
+</head>
+
+<body>
+
+<div class="para func">
+<h2>f_getcwd</h2>
+<p>The f_getcwd function retrieves the current directory.</p>
+<pre>
+FRESULT f_getcwd (
+  TCHAR* <em>Buffer</em>,  <span class="c">/* Pointer to the buffer */</span>
+  UINT <em>BufferLen</em>  <span class="c">/* The length of the buffer */</span>
+);
+</pre>
+</div>
+
+<div class="para arg">
+<h4>Parameters</h4>
+<dl class="par">
+<dt>Buffer</dt>
+<dd>Pointer to the buffer to receive the current directory string.</dd>
+<dt>BufferLen</dt>
+<dd>Size of the buffer in unit of TCHAR.</dd>
+</dl>
+</div>
+
+
+<div class="para ret">
+<h4>Return Values</h4>
+<p>
+<a href="rc.html#ok">FR_OK</a>,
+<a href="rc.html#de">FR_DISK_ERR</a>,
+<a href="rc.html#ie">FR_INT_ERR</a>,
+<a href="rc.html#nr">FR_NOT_READY</a>,
+<a href="rc.html#ne">FR_NOT_ENABLED</a>,
+<a href="rc.html#ns">FR_NO_FILESYSTEM</a>,
+<a href="rc.html#tm">FR_TIMEOUT</a>,
+<a href="rc.html#nc">FR_NOT_ENOUGH_CORE</a>
+</p>
+</div>
+
+
+<div class="para desc">
+<h4>Description</h4>
+<p>The f_getcwd function retrieves the current directory of the current drive in full path string including drive number.</p>
+</div>
+
+
+<div class="para comp">
+<h4>QuickInfo</h4>
+<p>Available when <tt>_FS_RPATH == 2</tt>.</p>
+</div>
+
+
+<div class="para ref">
+<h4>See Also</h4>
+<p><tt><a href="chdrive.html">f_chdrive</a>, <a href="chdir.html">f_chdir</a></tt></p>
+</div>
+
+<p class="foot"><a href="../00index_e.html">Return</a></p>
+</body>
+</html>
diff --git a/doc/en/getfree.html b/doc/en/getfree.html
index 3c681e8..8876ec1 100644
--- a/doc/en/getfree.html
+++ b/doc/en/getfree.html
@@ -11,19 +11,19 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>f_getfree</h2>
 <p>The f_getfree function gets number of the free clusters.</p>
 <pre>
 FRESULT f_getfree (
-  const TCHAR* <em>Path</em>,        <span>/* Logical drive number */</span>
-  DWORD* <em>Clusters</em>,          <span>/* Pointer to the variable to store number of free clusters */</span>
-  FATFS** <em>FileSystemObject</em>  <span>/* Pointer to pointer to file system object */</span>
+  const TCHAR* <em>Path</em>,        <span class="c">/* Logical drive number */</span>
+  DWORD* <em>Clusters</em>,          <span class="c">/* Pointer to the variable to store number of free clusters */</span>
+  FATFS** <em>FileSystemObject</em>  <span class="c">/* Pointer to pointer to file system object */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>Parameters</h4>
 <dl class="par">
 <dt>Path</dt>
@@ -36,55 +36,49 @@ FRESULT f_getfree (
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>Return Values</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>The function succeeded. The <tt><em>*Clusters</em></tt> has number of free clusters and <tt><em>*FileSystemObject</em></tt> points the file system object.</dd>
-<dt>FR_INVALID_DRIVE</dt>
-<dd>The drive number is invalid.</dd>
-<dt>FR_NOT_READY</dt>
-<dd>The disk drive cannot work due to no medium in the drive or any other reason.</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>The function failed due to an error in the disk function.</dd>
-<dt>FR_INT_ERR</dt>
-<dd>The function failed due to a wrong FAT structure or an internal error.</dd>
-<dt>FR_NOT_ENABLED</dt>
-<dd>The logical drive has no work area.</dd>
-<dt>FR_NO_FILESYSTEM</dt>
-<dd>There is no valid FAT partition on the drive.</dd>
-</dl>
+<p>
+<a href="rc.html#ok">FR_OK</a>,
+<a href="rc.html#de">FR_DISK_ERR</a>,
+<a href="rc.html#ie">FR_INT_ERR</a>,
+<a href="rc.html#nr">FR_NOT_READY</a>,
+<a href="rc.html#id">FR_INVALID_DRIVE</a>,
+<a href="rc.html#ne">FR_NOT_ENABLED</a>,
+<a href="rc.html#ns">FR_NO_FILESYSTEM</a>,
+<a href="rc.html#tm">FR_TIMEOUT</a>
+</p>
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>Descriptions</h4>
 <p>The f_getfree function gets number of free clusters on the drive. The member <tt>csize</tt> in the file system object is refrecting number of sectors per cluster, so that the free space in unit of sector can be calcurated with this. When FSInfo structure on FAT32 volume is not in sync, this function can return an incorrect free cluster count.</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>QuickInfo</h4>
 <p>Available when <tt>_FS_READONLY == 0</tt> and <tt>_FS_MINIMIZE == 0</tt>.</p>
 </div>
 
 
-<div class="para">
+<div class="para use">
 <h4>Example</h4>
 <pre>
     FATFS *fs;
     DWORD fre_clust, fre_sect, tot_sect;
 
 
-    <span>/* Get volume information and free clusters of drive 1 */</span>
+    <span class="c">/* Get volume information and free clusters of drive 1 */</span>
     res = f_getfree("1:", &amp;fre_clust, &amp;fs);
     if (res) die(res);
 
-    <span>/* Get total sectors and free sectors */</span>
+    <span class="c">/* Get total sectors and free sectors */</span>
     tot_sect = (fs->n_fatent - 2) * fs->csize;
     fre_sect = fre_clust * fs->csize;
 
-    <span>/* Print free space in unit of KB (assuming 512 bytes/sector) */</span>
+    <span class="c">/* Print free space in unit of KB (assuming 512 bytes/sector) */</span>
     printf("%lu KB total drive space.\n"
            "%lu KB available.\n",
            fre_sect / 2, tot_sect / 2);
@@ -92,7 +86,7 @@ FRESULT f_getfree (
 </div>
 
 
-<div class="para">
+<div class="para ref">
 <h4>See Also</h4>
 <p><tt><a href="sfatfs.html">FATFS</a></tt></p>
 </div>
diff --git a/doc/en/gets.html b/doc/en/gets.html
index 7c89095..f0864a5 100644
--- a/doc/en/gets.html
+++ b/doc/en/gets.html
@@ -11,19 +11,19 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>f_gets</h2>
 <p>The f_gets reads a string from the file.</p>
 <pre>
 TCHAR* f_gets (
-  TCHAR* <em>Str</em>,       <span>/* Read buffer */</span>
-  int <em>Size</em>,         <span>/* Size of the read buffer */</span>
-  FIL* <em>FileObject</em>   <span>/* File object */</span>
+  TCHAR* <em>Str</em>,       <span class="c">/* Read buffer */</span>
+  int <em>Size</em>,         <span class="c">/* Size of the read buffer */</span>
+  FIL* <em>FileObject</em>   <span class="c">/* File object */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>Parameters</h4>
 <dl class="par">
 <dt>Str</dt>
@@ -36,26 +36,26 @@ TCHAR* f_gets (
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>Return Values</h4>
 <p>When the function succeeded, <tt>Str</tt> will be returuned.</p>
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>Description</h4>
 <p>The f_gets() is a wrapper function of <a href="read.html">f_read()</a>. The read operation continues until a <tt>'\n'</tt> is stored, reached end of the file or the buffer is filled with <tt>Size - 1</tt> characters. The read string is terminated with a <tt>'\0'</tt>. When no character to read or any error occured during read operation, f_gets() returns a null pointer. The end of file and error status can be examined with <tt>f_eof()</tt> and <tt>f_error()</tt> macros.</p>
 <p>When the FatFs is configured to Unicode API (<tt>_LFN_UNICODE == 1</tt>), the file is read in UTF-8 encoding and stored it to the buffer in UCS-2. If not the case, the file will be read in one byte per character without any code conversion.</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>QuickInfo</h4>
 <p>Available when <tt>_USE_STRFUNC</tt> is 1 or 2. When it is set to 2, <tt>'\r'</tt>s contained in the file are stripped out.</p>
 </div>
 
 
-<div class="para">
+<div class="para ref">
 <h4>See Also</h4>
 <p><tt><a href="open.html">f_open</a>, <a href="read.html">f_read</a>, <a href="putc.html">f_putc</a>, <a href="puts.html">f_puts</a>, <a href="printf.html">f_printf</a>, <a href="close.html">f_close</a>, <a href="sfile.html">FIL</a></tt></p>
 </div>
diff --git a/doc/en/lseek.html b/doc/en/lseek.html
index cfe4039..8d5d110 100644
--- a/doc/en/lseek.html
+++ b/doc/en/lseek.html
@@ -11,19 +11,19 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>f_lseek</h2>
-<p>The f_lseek function moves the file read/write pointer of an open file object. It can also be used to increase the file size (cluster pre-allocation).</p>
+<p>The f_lseek function moves the file read/write pointer of an open file object. It can also be used to increase the file size (cluster pre-allocation). </p>
 
 <pre>
 FRESULT f_lseek (
-  FIL* <em>FileObject</em>,   <span>/* Pointer to the file object structure */</span>
-  DWORD <em>Offset</em>       <span>/* File offset in unit of byte */</span>
+  FIL* <em>FileObject</em>,   <span class="c">/* Pointer to the file object structure */</span>
+  DWORD <em>Offset</em>       <span class="c">/* File offset in unit of byte */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>Parameters</h4>
 <dl class="par">
 <dt>FileObject</dt>
@@ -34,92 +34,91 @@ FRESULT f_lseek (
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>Return Values</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>The function succeeded.</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>The function failed due to an error in the disk function.</dd>
-<dt>FR_INT_ERR</dt>
-<dd>The function failed due to a wrong FAT structure or an internal error.</dd>
-<dt>FR_NOT_READY</dt>
-<dd>The disk drive cannot work due to no medium in the drive or any other reason.</dd>
-<dt>FR_INVALID_OBJECT</dt>
-<dd>The file object is invalid.</dd>
-<dt>FR_NOT_ENOUGH_CORE</dt>
-<dd>Insufficient size of link map table for the file.</dd>
-</dl>
+<p>
+<a href="rc.html#ok">FR_OK</a>,
+<a href="rc.html#de">FR_DISK_ERR</a>,
+<a href="rc.html#ie">FR_INT_ERR</a>,
+<a href="rc.html#nr">FR_NOT_READY</a>,
+<a href="rc.html#io">FR_INVALID_OBJECT</a>,
+<a href="rc.html#tm">FR_TIMEOUT</a>
+</p>
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>Description</h4>
-<p>The f_lseek function moves the file read/write pointer of an open file. The offset can be specified in only origin from top of the file. When an offset above the file size is specified in write mode, the file size is increased and the data in the expanded area is undefined. This is suitable to create a large file quickly, for fast write operation. After the f_lseek function succeeded, member fptr in the file object should be checked in order to make sure the read/write pointer has been moved correctry. In case of fptr is not the expected value, either of followings has been occured.</p>
+<p>The f_lseek function moves the file read/write pointer of an open file. The offset can be specified in only origin from top of the file. When an offset above the file size is specified in write mode, the file size is increased to the offset and the data in the expanded area is undefined. This is suitable to create a large file quickly, for fast write operation. After the f_lseek function succeeded, member fptr in the file object should be checked in order to make sure the read/write pointer has been moved correctry. In case of fptr is not the expected value, either of followings has been occured.</p>
 <ul>
 <li>End of file. The specified Offset was clipped at the file size because the file has been opened in read-only mode.</li>
 <li>Disk full. There is insufficient free space on the volume to expand the file size.</li>
 </ul>
-<p>When <tt>_USE_FASTSEEK</tt> is set to 1 and <tt>cltbl</tt> member in the file object is not NULL, the fast seek feature is enabled. This feature enables fast backward/long seek operations without FAT access by cluster link information stored on the user defined table. The cluster link information must be created prior to do the fast seek. The required size of the table is (number of fragments + 1) * 2 items. For example, when the file is fragmented in 5, 12 items will be required to store the cluster link information. The file size cannot be expanded when the fast seek feature is enabled.</p>
+<p>Fast seek mode is enabled when <tt>_USE_FASTSEEK</tt> is set to 1 and <tt>cltbl</tt> member in the file object is not NULL. This feature enables fast backward/long seek operations without FAT access by cluster link map table (CLMT) stored in the user defined table. It is also applied to f_read/f_write functions. In this mode, the file size cannot be increased by f_write/f_lseek functions.</p>
+<p>The CLMT must be created in the user defined DWORD array prior to use fast seek feature. To create the CLMT, set pointer to the DWORD array to <tt>cltbl</tt> member in the file object, set the array size in unit of items into the first item and call the f_lseek function with <tt>Offset = CREATE_LINKMAP</tt>. After the function succeeded and CLMT is created, no FAT access is occured in subsequent f_read/f_write/f_lseek functions to the file. If the function failed with <tt>FR_NOT_ENOUGH_CORE</tt>, the given array size is insufficient for the file and the required items is returned into the first item of the array. The required array size is (number of fragments + 1) * 2 items. For example, when the file is fragmented in 5, 12 items will be required for the CLMT. </p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>QuickInfo</h4>
 <p>Available when <tt>_FS_MINIMIZE &lt;= 2</tt>.</p>
 </div>
 
 
-<div class="para">
+<div class="para use">
 <h4>Example</h4>
 <pre>
-    <span>/* Move to offset of 5000 from top of the file */</span>
+    <span class="c">/* Open file */</span>
+    file = malloc(sizeof(FIL));
+    if (!file) ...
+    res = f_open(file, "file.dat", FA_READ|FA_WRITE);
+    if (res) ...
+
+    <span class="c">/* Move to offset of 5000 from top of the file */</span>
     res = f_lseek(file, 5000);
 
-    <span>/* Move to end of the file to append data */</span>
-    res = f_lseek(file, file-&gt;fsize);
+    <span class="c">/* Move to end of the file to append data */</span>
+    res = f_lseek(file, f_size(file));
 
-    <span>/* Forward 3000 bytes */</span>
-    res = f_lseek(file, file-&gt;fptr + 3000);
+    <span class="c">/* Forward 3000 bytes */</span>
+    res = f_lseek(file, f_tell(file) + 3000);
 
-    <span>/* Rewind 2000 bytes (take care on overflow) */</span>
-    res = f_lseek(file, file-&gt;fptr - 2000);
+    <span class="c">/* Rewind 2000 bytes (take care on overflow) */</span>
+    res = f_lseek(file, f_tell(file) - 2000);
 </pre>
-<pre>
-    <span>/* Cluster pre-allocation (to prevent buffer overrun on streaming write) */</span>
+<pre>    <span class="c">/* Cluster pre-allocation (to prevent buffer overrun on streaming write) */</span>
 
-    res = f_open(file, recfile, FA_CREATE_NEW | FA_WRITE); <span>/* Create a file */</span>
+    res = f_open(file, recfile, FA_CREATE_NEW | FA_WRITE); <span class="c">/* Create a file */</span>
 
-    res = f_lseek(file, PRE_SIZE);         <span>/* Pre-allocate clusters */</span>
-    if (res || file-&gt;fptr != PRE_SIZE) ... <span>/* Check if the file size has been increased correctly */</span>
+    res = f_lseek(file, PRE_SIZE);           <span class="c">/* Pre-allocate clusters */</span>
+    if (res || f_tell(file) != PRE_SIZE) ... <span class="c">/* Check if the file size has been increased correctly */</span>
 
-    res = f_lseek(file, DATA_START);       <span>/* Record data stream without cluster allocation delay */</span>
+    res = f_lseek(file, DATA_START);         <span class="c">/* Record data stream without cluster allocation delay */</span>
     ...
 
-    res = f_truncate(file);                <span>/* Truncate unused area */</span>
-    res = f_lseek(file, 0);                <span>/* Put file header */</span>
+    res = f_truncate(file);                  <span class="c">/* Truncate unused area */</span>
+    res = f_lseek(file, 0);                  <span class="c">/* Put file header */</span>
     ...
 
     res = f_close(file);
 </pre>
-<pre>
-    <span>/* Using fast seek feature */</span>
+<pre>    <span class="c">/* Using fast seek feature */</span>
 
-    DWORD lktbl[SZ_TBL];                   <span>/* Link map table buffer */</span>
+    DWORD lktbl[SZ_TBL];                   <span class="c">/* Link map table buffer */</span>
 
-    res = f_lseek(&amp;file, ofs1);            <span>/* This is normal seek (file.cltbl == NULL on file open) */</span>
+    res = f_lseek(file, ofs1);             <span class="c">/* This is normal seek (file.cltbl is nulled on file open) */</span>
 
-    file.cltbl = lktbl;                    <span>/* Enable fast seek feature */</span>
-    lktbl[0] = SZ_TBL;                     <span>/* Set table size to the first item */</span>
-    res = f_lseek(&amp;file, CREATE_LINKMAP);  <span>/* Create cluster link map table */</span>
+    file.cltbl = lktbl;                    <span class="c">/* Enable fast seek feature */</span>
+    lktbl[0] = SZ_TBL;                     <span class="c">/* Set table size to the first item */</span>
+    res = f_lseek(file, CREATE_LINKMAP);   <span class="c">/* Create CLMT */</span>
     ...
 
-    res = f_lseek(&amp;file, ofs2);            <span>/* This is fast seek (file.cltbl != NULL) */</span>
+    res = f_lseek(file, ofs2);             <span class="c">/* This is fast seek (file.cltbl != NULL) */</span>
 </pre>
 </div>
 
 
-<div class="para">
+<div class="para ref">
 <h4>See Also</h4>
 <p><tt><a href="open.html">f_open</a>, <a href="truncate.html">f_truncate</a>, <a href="sfile.html">FIL</a></tt></p>
 </div>
diff --git a/doc/en/mkdir.html b/doc/en/mkdir.html
index a06d0b8..bd9d435 100644
--- a/doc/en/mkdir.html
+++ b/doc/en/mkdir.html
@@ -11,17 +11,17 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>f_mkdir</h2>
 <p>The f_mkdir function creates a new directory.</p>
 <pre>
 FRESULT f_mkdir (
-  const TCHAR* <em>DirName</em> <span>/* Pointer to the directory name */</span>
+  const TCHAR* <em>DirName</em> <span class="c">/* Pointer to the directory name */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>Parameter</h4>
 <dl class="par">
 <dt>DirName</dt>
@@ -30,50 +30,40 @@ FRESULT f_mkdir (
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>Return Value</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>The function succeeded.</dd>
-<dt>FR_NO_PATH</dt>
-<dd>Could not find the path.</dd>
-<dt>FR_INVALID_NAME</dt>
-<dd>The path name is invalid.</dd>
-<dt>FR_INVALID_DRIVE</dt>
-<dd>The drive number is invalid.</dd>
-<dt>FR_DENIED</dt>
-<dd>The directory cannot be created due to directory table or disk is full.</dd>
-<dt>FR_EXIST</dt>
-<dd>An object that has same name is already existing.</dd>
-<dt>FR_NOT_READY</dt>
-<dd>The disk drive cannot work due to no medium in the drive or any other reason.</dd>
-<dt>FR_WRITE_PROTECTED</dt>
-<dd>The medium is write protected.</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>The function failed due to an error in the disk function.</dd>
-<dt>FR_INT_ERR</dt>
-<dd>The function failed due to a wrong FAT structure or an internal error.</dd>
-<dt>FR_NOT_ENABLED</dt>
-<dd>The logical drive has no work area.</dd>
-<dt>FR_NO_FILESYSTEM</dt>
-<dd>There is no valid FAT volume on the drive.</dd>
-</dl>
+<p>
+<a href="rc.html#ok">FR_OK</a>,
+<a href="rc.html#de">FR_DISK_ERR</a>,
+<a href="rc.html#ie">FR_INT_ERR</a>,
+<a href="rc.html#nr">FR_NOT_READY</a>,
+<a href="rc.html#np">FR_NO_PATH</a>,
+<a href="rc.html#in">FR_INVALID_NAME</a>,
+<a href="rc.html#de">FR_DENIED</a>,
+<a href="rc.html#ex">FR_EXIST</a>,
+<a href="rc.html#wp">FR_WRITE_PROTECTED</a>,
+<a href="rc.html#id">FR_INVALID_DRIVE</a>,
+<a href="rc.html#ne">FR_NOT_ENABLED</a>,
+<a href="rc.html#ns">FR_NO_FILESYSTEM</a>,
+<a href="rc.html#tm">FR_TIMEOUT</a>,
+<a href="rc.html#nc">FR_NOT_ENOUGH_CORE</a>
+</p>
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>Description</h4>
 <p>The f_mkdir function creates a new directory.</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>QuickInfo</h4>
 <p>Available when <tt>_FS_READONLY == 0</tt> and <tt>_FS_MINIMIZE == 0</tt>.</p>
 </div>
 
 
-<div class="para">
+<div class="para use">
 <h4>Example</h4>
 <pre>
     res = f_mkdir("sub1");
diff --git a/doc/en/mkfs.html b/doc/en/mkfs.html
index 0b6bac8..16f4725 100644
--- a/doc/en/mkfs.html
+++ b/doc/en/mkfs.html
@@ -11,19 +11,19 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>f_mkfs</h2>
 <p>The f_mkfs fucntion creates a file system on the drive.</p>
 <pre>
 FRESULT f_mkfs (
-  BYTE  <em>Drive</em>,            <span>/* Logical drive number */</span>
-  BYTE  <em>PartitioningRule</em>, <span>/* Partitioning rule */</span>
-  UINT  <em>AllocSize</em>         <span>/* Size of the allocation unit */</span>
+  BYTE  <em>Drive</em>,            <span class="c">/* Logical drive number */</span>
+  BYTE  <em>PartitioningRule</em>, <span class="c">/* Partitioning rule */</span>
+  UINT  <em>AllocSize</em>         <span class="c">/* Size of the allocation unit */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>Parameters</h4>
 <dl class="par">
 <dt>Drive</dt>
@@ -35,33 +35,20 @@ FRESULT f_mkfs (
 </dl>
 </div>
 
-<div class="para">
+<div class="para ret">
 <h4>Return Values</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>The function succeeded.</dd>
-<dt>FR_INVALID_DRIVE</dt>
-<dd>The drive number is invalid.</dd>
-<dt>FR_NOT_READY</dt>
-<dd>The drive cannot work due to any reason.</dd>
-<dt>FR_WRITE_PROTECTED</dt>
-<dd>The drive is write protected.</dd>
-<dt>FR_NOT_ENABLED</dt>
-<dd>The logical drive has no work area.</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>The function failed due to an error in the disk function.</dd>
-<dt>FR_MKFS_ABORTED</dt>
-<dd>The function aborted before start in format due to a reason as follows.
-<ul>
-<li>The disk size is too small.</li>
-<li>Invalid parameter was given to any parameter.</li>
-<li>Not allowable cluster size for this drive. This can occure when number of clusters gets near the 0xFF7 and 0xFFF7.</li>
-</ul>
-</dd>
-</dl>
+<p>
+<a href="rc.html#ok">FR_OK</a>,
+<a href="rc.html#de">FR_DISK_ERR</a>,
+<a href="rc.html#nr">FR_NOT_READY</a>,
+<a href="rc.html#wp">FR_WRITE_PROTECTED</a>,
+<a href="rc.html#id">FR_INVALID_DRIVE</a>,
+<a href="rc.html#ne">FR_NOT_ENABLED</a>,
+<a href="rc.html#ma">FR_MKFS_ABORTED</a>
+</p>
 </div>
 
-<div class="para">
+<div class="para desc">
 <h4>Description</h4>
 <p>The f_mkfs function creates an FAT volume on the drive. There are two partitioning rules, FDISK and SFD, for removable media. The FDISK format is recommended for the most case. This function currently <em>does not support multiple partition</em>, so that existing partitions on the physical dirve will be deleted and re-created a new partition occupies entire disk space.</p>
 <p>The FAT sub-type, FAT12/FAT16/FAT32, is determined by number of clusters on the volume and nothing else, according to the FAT specification issued by Microsoft. Thus which FAT sub-type is selected, is depends on the volume size and the specified cluster size. The cluster size affects performance of the file system and large cluster increases the performance.</p>
@@ -69,7 +56,7 @@ FRESULT f_mkfs (
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>QuickInfo</h4>
 <p>Available when <tt>_FS_READOLNY == 0</tt> and <tt>_USE_MKFS == 1</tt>.</p>
 </div>
diff --git a/doc/en/mount.html b/doc/en/mount.html
index fcc6352..ea3c3a8 100644
--- a/doc/en/mount.html
+++ b/doc/en/mount.html
@@ -11,18 +11,18 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>f_mount</h2>
 <p>The f_mount fucntion registers/unregisters a work area to the FatFs module.</p>
 <pre>
 FRESULT f_mount (
-  BYTE  <em>Drive</em>,              <span>/* Logical drive number */</span>
-  FATFS*  <em>FileSystemObject</em>  <span>/* Pointer to the work area */</span>
+  BYTE  <em>Drive</em>,              <span class="c">/* Logical drive number */</span>
+  FATFS*  <em>FileSystemObject</em>  <span class="c">/* Pointer to the work area */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>Parameters</h4>
 <dl class="par">
 <dt>Drive</dt>
@@ -32,31 +32,29 @@ FRESULT f_mount (
 </dl>
 </div>
 
-<div class="para">
+<div class="para ret">
 <h4>Return Values</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>The function succeeded.</dd>
-<dt>FR_INVALID_DRIVE</dt>
-<dd>The drive number is invalid.</dd>
-</dl>
+<p>
+<a href="rc.html#ok">FR_OK</a>,
+<a href="rc.html#id">FR_INVALID_DRIVE</a>
+</p>
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>Description</h4>
 <p>The f_mount function registers/unregisters a work area to the FatFs module. The work area must be given to the each volume with this function prior to use any other file function. To unregister a work area, specify a NULL to the <em>FileSystemObject</em>, and then the work area can be discarded.</p>
-<p>This function always succeeds regardless of the drive status. No media access is occured in this function and it only initializes the given work area and registers its address to the internal table. The volume mount process is performed on first file access after f_mount function or media change.</p>
+<p>This function always succeeds regardless of the drive status. No media access is occured in this function. It only initializes the given work area and registers its address to the internal table. The volume mount process is performed on first file access after f_mount function or media change.</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>QuickInfo</h4>
 <p>Always available.</p>
 </div>
 
 
-<div class="para">
+<div class="para ref">
 <h4>See Also</h4>
 <p><tt><a href="sfatfs.html">FATFS</a></tt></p>
 </div>
diff --git a/doc/en/open.html b/doc/en/open.html
index 8c47216..a632cff 100644
--- a/doc/en/open.html
+++ b/doc/en/open.html
@@ -11,19 +11,19 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>f_open</h2>
 <p>The f_open function creates a <em>file object</em> to be used to access the file.</p>
 <pre>
 FRESULT f_open (
-  FIL* <em>FileObject</em>,       <span>/* Pointer to the blank file object structure */</span>
-  const TCHAR* <em>FileName</em>, <span>/* Pointer to the file neme */</span>
-  BYTE <em>ModeFlags</em>         <span>/* Mode flags */</span>
+  FIL* <em>FileObject</em>,       <span class="c">/* Pointer to the blank file object structure */</span>
+  const TCHAR* <em>FileName</em>, <span class="c">/* Pointer to the file neme */</span>
+  BYTE <em>ModeFlags</em>         <span class="c">/* Mode flags */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>Parameters</h4>
 <dl class="par">
 <dt>FileObject</dt>
@@ -34,12 +34,12 @@ FRESULT f_open (
 <dd>Specifies the type of access and open method for the file. It is specified by a combination of following flags.<br>
 <table class="lst">
 <tr><th>Value</th><th>Description</th></tr>
-<tr><td>FA_READ</td><td>Specifies read access to the object. Data can be read from the file.<br>Combine with FA_WRITE for read-write access.</td></tr>
-<tr><td>FA_WRITE</td><td>Specifies write access to the object. Data can be written to the file.<br>Combine with FA_READ for read-write access.</td></tr>
+<tr><td>FA_READ</td><td>Specifies read access to the object. Data can be read from the file.<br>Combine with <tt>FA_WRITE</tt> for read-write access.</td></tr>
+<tr><td>FA_WRITE</td><td>Specifies write access to the object. Data can be written to the file.<br>Combine with <tt>FA_READ</tt> for read-write access.</td></tr>
 <tr><td>FA_OPEN_EXISTING</td><td>Opens the file. The function fails if the file is not existing. (Default)</td></tr>
 <tr><td>FA_OPEN_ALWAYS</td><td>Opens the file if it is existing. If not, a new file is created.<br>
-To append data to the file, use f_lseek function after file open in this method.</td></tr>
-<tr><td>FA_CREATE_NEW</td><td>Creates a new file. The function fails with FR_EXIST if the file is existing.</td></tr>
+To append data to the file, use <a href="lseek.html">f_lseek</a> function after file open in this method.</td></tr>
+<tr><td>FA_CREATE_NEW</td><td>Creates a new file. The function fails with <tt>FR_EXIST</tt> if the file is existing.</td></tr>
 <tr><td>FA_CREATE_ALWAYS</td><td>Creates a new file. If the file is existing, it is truncated and overwritten.</td></tr>
 </table>
 </dd>
@@ -47,94 +47,81 @@ To append data to the file, use f_lseek function after file open in this method.
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>Return Values</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>The function succeeded and the file object is valid.</dd>
-<dt>FR_NO_FILE</dt>
-<dd>Could not find the file.</dd>
-<dt>FR_NO_PATH</dt>
-<dd>Could not find the path.</dd>
-<dt>FR_INVALID_NAME</dt>
-<dd>The file name is invalid.</dd>
-<dt>FR_INVALID_DRIVE</dt>
-<dd>The drive number is invalid.</dd>
-<dt>FR_EXIST</dt>
-<dd>The file is already existing.</dd>
-<dt>FR_DENIED</dt>
-<dd>The required access was denied due to one of the following reasons:
-<ul><li>Write mode open against a read-only file.</li>
-<li>File cannot be created due to a directory or read-only file is existing.</li>
-<li>File cannot be created due to the directory table is full.</li></ul></dd>
-<dt>FR_NOT_READY</dt>
-<dd>The disk drive cannot work due to no medium in the drive or any other reason.</dd>
-<dt>FR_WRITE_PROTECTED</dt>
-<dd>Write mode open or creation under the medium is write protected.</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>The function failed due to an error in the disk function.</dd>
-<dt>FR_INT_ERR</dt>
-<dd>The function failed due to a wrong FAT structure or an internal error.</dd>
-<dt>FR_NOT_ENABLED</dt>
-<dd>The logical drive has no work area.</dd>
-<dt>FR_NO_FILESYSTEM</dt>
-<dd>There is no valid FAT volume on the drive.</dd>
-<dt>FR_LOCKED</dt>
-<dd>The function was rejected due to file shareing policy (_FS_SHARE).</dd>
-</dl>
+<p>
+<a href="rc.html#ok">FR_OK</a>,
+<a href="rc.html#de">FR_DISK_ERR</a>,
+<a href="rc.html#ie">FR_INT_ERR</a>,
+<a href="rc.html#nr">FR_NOT_READY</a>,
+<a href="rc.html#ok">FR_NO_FILE</a>,
+<a href="rc.html#np">FR_NO_PATH</a>,
+<a href="rc.html#in">FR_INVALID_NAME</a>,
+<a href="rc.html#de">FR_DENIED</a>,
+<a href="rc.html#ex">FR_EXIST</a>,
+<a href="rc.html#wp">FR_WRITE_PROTECTED</a>,
+<a href="rc.html#id">FR_INVALID_DRIVE</a>,
+<a href="rc.html#ne">FR_NOT_ENABLED</a>,
+<a href="rc.html#ns">FR_NO_FILESYSTEM</a>,
+<a href="rc.html#tm">FR_TIMEOUT</a>,
+<a href="rc.html#lo">FR_LOCKED</a>,
+<a href="rc.html#nc">FR_NOT_ENOUGH_CORE</a>,
+<a href="rc.html#tf">FR_TOO_MANY_OPEN_FILES</a>
+</p>
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>Description</h4>
 <p>A file object is created when the function succeeded. The file object is used for subsequent read/write functions to refer to the file. When close an open file object, use <a href="close.html">f_close</a> function. If the modified file is not closed, the file data can be collapsed.</p>
-<p>Before using any file function, a work area (file system object) must be given to the logical drive with <a href="mount.html">f_mount</a> function. All file functions can work after this procedure.</p>
+<p>If duplicated file open is needed, read <a href="appnote.html#dup">here</a> carefully.</p>
+<p>Before using any file function, a work area (file system object) must be registered to the logical drive with <a href="mount.html">f_mount</a> function. All file functions can work after this procedure.</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>QuickInfo</h4>
 <p>Always available. The mode flags, <tt>FA_WRITE, FA_CREATE_ALWAYS, FA_CREATE_NEW and FA_OPEN_ALWAYS</tt>, are not available when <tt>_FS_READONLY == 1</tt>.</p>
 </div>
 
 
-<div class="para">
+<div class="para use">
 <h4>Example (File Copy)</h4>
 <pre>
 void main (void)
 {
-    FATFS fs[2];         <span>/* Work area (file system object) for logical drives */</span>
-    FIL fsrc, fdst;      <span>/* file objects */</span>
-    BYTE buffer[4096];   <span>/* file copy buffer */</span>
-    FRESULT res;         <span>/* FatFs function common result code */</span>
-    UINT br, bw;         <span>/* File read/write count */</span>
+    FATFS fs[2];         <span class="c">/* Work area (file system object) for logical drives */</span>
+    FIL fsrc, fdst;      <span class="c">/* file objects */</span>
+    BYTE buffer[4096];   <span class="c">/* file copy buffer */</span>
+    FRESULT res;         <span class="c">/* FatFs function common result code */</span>
+    UINT br, bw;         <span class="c">/* File read/write count */</span>
 
 
-    <span>/* Register work area for each volume (Always succeeds regardless of disk status) */</span>
+    <span class="c">/* Register work area for each volume (Always succeeds regardless of disk status) */</span>
     f_mount(0, &amp;fs[0]);
     f_mount(1, &amp;fs[1]);
 
-    <span>/* Open source file on the drive 1 */</span>
+    <span class="c">/* Open source file on the drive 1 */</span>
     res = f_open(&amp;fsrc, "1:srcfile.dat", FA_OPEN_EXISTING | FA_READ);
     if (res) die(res);
 
-    <span>/* Create destination file on the drive 0 */</span>
+    <span class="c">/* Create destination file on the drive 0 */</span>
     res = f_open(&amp;fdst, "0:dstfile.dat", FA_CREATE_ALWAYS | FA_WRITE);
     if (res) die(res);
 
-    <span>/* Copy source to destination */</span>
+    <span class="c">/* Copy source to destination */</span>
     for (;;) {
-        res = f_read(&amp;fsrc, buffer, sizeof(buffer), &amp;br);    <span>/* Read a chunk of src file */</span>
-        if (res || br == 0) break; <span>/* error or eof */</span>
-        res = f_write(&amp;fdst, buffer, br, &amp;bw);               <span>/* Write it to the dst file */</span>
-        if (res || bw &lt; br) break; <span>/* error or disk full */</span>
+        res = f_read(&amp;fsrc, buffer, sizeof(buffer), &amp;br);    <span class="c">/* Read a chunk of src file */</span>
+        if (res || br == 0) break; <span class="c">/* error or eof */</span>
+        res = f_write(&amp;fdst, buffer, br, &amp;bw);               <span class="c">/* Write it to the dst file */</span>
+        if (res || bw &lt; br) break; <span class="c">/* error or disk full */</span>
     }
 
-    <span>/* Close open files */</span>
+    <span class="c">/* Close open files */</span>
     f_close(&amp;fsrc);
     f_close(&amp;fdst);
 
-    <span>/* Unregister work area prior to discard it */</span>
+    <span class="c">/* Unregister work area prior to discard it */</span>
     f_mount(0, NULL);
     f_mount(1, NULL);
 }
@@ -142,7 +129,7 @@ void main (void)
 </div>
 
 
-<div class="para">
+<div class="para ref">
 <h4>See Also</h4>
 <p><tt><a href="read.html">f_read</a>, <a href="write.html">f_write</a>, <a href="close.html">f_close</a>, <a href="sfile.html">FIL</a>, <a href="sfatfs.html">FATFS</a></tt></p>
 </div>
diff --git a/doc/en/opendir.html b/doc/en/opendir.html
index 8c1d095..ed68cfc 100644
--- a/doc/en/opendir.html
+++ b/doc/en/opendir.html
@@ -11,18 +11,18 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>f_opendir</h2>
 <p>The f_opendir function opens a directory.</p>
 <pre>
 FRESULT f_opendir (
-  DIR* <em>DirObject</em>,       <span>/* Pointer to the blank directory object structure */</span>
-  const TCHAR* <em>DirName</em>  <span>/* Pointer to the directory name */</span>
+  DIR* <em>DirObject</em>,       <span class="c">/* Pointer to the blank directory object structure */</span>
+  const TCHAR* <em>DirName</em>  <span class="c">/* Pointer to the directory name */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>Parameters</h4>
 <dl class="par">
 <dt>DirObject</dt>
@@ -33,44 +33,37 @@ FRESULT f_opendir (
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>Return Values</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>The function succeeded and the directory object is created. It is used for subsequent calls to read the directory entries.</dd>
-<dt>FR_NO_PATH</dt>
-<dd>Could not find the path.</dd>
-<dt>FR_INVALID_NAME</dt>
-<dd>The path name is invalid.</dd>
-<dt>FR_INVALID_DRIVE</dt>
-<dd>The drive number is invalid.</dd>
-<dt>FR_NOT_READY</dt>
-<dd>The disk drive cannot work due to no medium in the drive or any other reason.</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>The function failed due to an error in the disk function.</dd>
-<dt>FR_INT_ERR</dt>
-<dd>The function failed due to a wrong FAT structure or an internal error.</dd>
-<dt>FR_NOT_ENABLED</dt>
-<dd>The logical drive has no work area.</dd>
-<dt>FR_NO_FILESYSTEM</dt>
-<dd>There is no valid FAT volume on the drive.</dd>
-</dl>
+<p>
+<a href="rc.html#ok">FR_OK</a>,
+<a href="rc.html#de">FR_DISK_ERR</a>,
+<a href="rc.html#ie">FR_INT_ERR</a>,
+<a href="rc.html#nr">FR_NOT_READY</a>,
+<a href="rc.html#np">FR_NO_PATH</a>,
+<a href="rc.html#in">FR_INVALID_NAME</a>,
+<a href="rc.html#id">FR_INVALID_DRIVE</a>,
+<a href="rc.html#ne">FR_NOT_ENABLED</a>,
+<a href="rc.html#ns">FR_NO_FILESYSTEM</a>,
+<a href="rc.html#tm">FR_TIMEOUT</a>,
+<a href="rc.html#nc">FR_NOT_ENOUGH_CORE</a>
+</p>
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>Description</h4>
 <p>The f_opendir function opens an exsisting directory and creates the directory object for subsequent calls. The directory object structure can be discarded at any time without any procedure.</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>QuickInfo</h4>
 <p>Available when <tt>_FS_MINIMIZE &lt;= 1</tt>.</p>
 </div>
 
 
-<div class="para">
+<div class="para ref">
 <h4>See Also</h4>
 <p><tt><a href="readdir.html">f_readdir</a>, <a href="sdir.html">DIR</a></tt></p>
 </div>
diff --git a/doc/en/printf.html b/doc/en/printf.html
index 5f5322c..5d15326 100644
--- a/doc/en/printf.html
+++ b/doc/en/printf.html
@@ -11,19 +11,19 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>f_printf</h2>
 <p>The f_printf function writes formatted string to the file.</p>
 <pre>
 int f_printf (
-  FIL* <em>FileObject</em>,      <span>/* File object */</span>
-  const TCHAR* <em>Foramt</em>,  <span>/* Format stirng */</span>
+  FIL* <em>FileObject</em>,      <span class="c">/* File object */</span>
+  const TCHAR* <em>Foramt</em>,  <span class="c">/* Format stirng */</span>
   ...
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>Parameters</h4>
 <dl class="par">
 <dt>FileObject</dt>
@@ -37,45 +37,50 @@ int f_printf (
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>Return Values</h4>
 <p>When the function succeeded, number of characters written is returned. When the function failed due to disk full or any error, an <tt>EOF (-1)</tt> will be returned.</p>
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>Description</h4>
 <p>The f_printf() is a wrapper function of <a href="putc.html">f_putc()</a> and <a href="puts.html">f_puts()</a>. The format control directive is a sub-set of standard library shown as follos:</p>
 <ul>
 <li>Type: <tt>c C s S d D u U x X b B</tt></li>
 <li>Size: <tt>l L</tt></li>
-<li>Flag: <tt>0</tt></li>
+<li>Flag: <tt>0 -</tt></li>
 </ul>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>QuickInfo</h4>
 <p>Available when <tt>_FS_READONLY == 0</tt> and <tt>_USE_STRFUNC</tt> is 1 or 2. When it is set to 2, <tt>'\n'</tt>s contained in the output are converted to <tt>"\r\n"</tt>.</p>
 <p>When the FatFs is configured to Unicode API (<tt>_LFN_UNICODE == 1</tt>), the generated UCS-2 characters are written to the file in UTF-8 encoding. If not the case, the byte characters will be written directly.</p>
 </div>
 
 
-<div class="para">
+<div class="para use">
 <h4>Example</h4>
 <pre>
-    f_printf(&amp;fil, "%6d", -200);         <span>/* "  -200" */</span>
-    f_printf(&amp;fil, "%02u", 5);           <span>/* "05" */</span>
-    f_printf(&amp;fil, "%ld", 12345678L);    <span>/* "12345678" */</span>
-    f_printf(&amp;fil, "%08lX", 1194684UL);  <span>/* "00123ABC" */</span>
-    f_printf(&amp;fil, "%08b", 0x55);        <span>/* "01010101" */</span>
-    f_printf(&amp;fil, "%s", "String");      <span>/* "String" */</span>
-    f_printf(&amp;fil, "%c", 'a');           <span>/* "a" */</span>
+    f_printf(&amp;fil, "%d", 1234);            <span class="c">/* "1234" */</span>
+    f_printf(&amp;fil, "%6d,%3d%%", -200, 5);  <span class="c">/* "  -200,  5%" */</span>
+    f_printf(&amp;fil, "%-6u", 100);           <span class="c">/* "100   " */</span>
+    f_printf(&amp;fil, "%ld", 12345678L);      <span class="c">/* "12345678" */</span>
+    f_printf(&amp;fil, "%04x", 0xA3);          <span class="c">/* "00a3" */</span>
+    f_printf(&amp;fil, "%08LX", 0x123ABC);     <span class="c">/* "00123ABC" */</span>
+    f_printf(&amp;fil, "%016b", 0x550F);       <span class="c">/* "0101010100001111" */</span>
+    f_printf(&amp;fil, "%s", "String");        <span class="c">/* "String" */</span>
+    f_printf(&amp;fil, "%-4s", "abc");         <span class="c">/* "abc " */</span>
+    f_printf(&amp;fil, "%4s", "abc");          <span class="c">/* " abc" */</span>
+    f_printf(&amp;fil, "%c", 'a');             <span class="c">/* "a" */</span>
+    f_printf(&amp;fil, "%f", 10.0);            <span class="c">/* f_printf lacks floating point support */</span>
 </pre>
 </div>
 
 
-<div class="para">
+<div class="para ref">
 <h4>See Also</h4>
 <p><tt><a href="open.html">f_open</a>, <a href="putc.html">f_putc</a>, <a href="puts.html">f_puts</a>, <a href="gets.html">f_gets</a>, <a href="close.html">f_close</a>, <a href="sfile.html">FIL</a></tt></p>
 </div>
diff --git a/doc/en/putc.html b/doc/en/putc.html
index 00e89a0..c5de092 100644
--- a/doc/en/putc.html
+++ b/doc/en/putc.html
@@ -11,18 +11,18 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>f_putc</h2>
 <p>The f_putc funciton puts a character to the file.</p>
 <pre>
 int f_putc (
-  TCHAR <em>Chr</em>,        <span>/* A character to put */</span>
-  FIL* <em>FileObject</em>   <span>/* File object */</span>
+  TCHAR <em>Chr</em>,        <span class="c">/* A character to put */</span>
+  FIL* <em>FileObject</em>   <span class="c">/* File object */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>Parameters</h4>
 <dl class="par">
 <dt>Chr</dt>
@@ -33,26 +33,26 @@ int f_putc (
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>Return Values</h4>
 <p>When the character was written successfuly, the function returns the character. When the function failed due to disk full or any error, an <tt>EOF (-1)</tt> will be returned.</p>
 <p>When the FatFs is configured to Unicode API (<tt>_LFN_UNICODE == 1</tt>), the UCS-2 character is written to the file in UTF-8 encoding. If not the case, the byte will be written directly.</p>
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>Description</h4>
 <p>The f_putc() is a wrapper function of <a href="write.html">f_write()</a>.</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>QuickInfo</h4>
 <p>Available when <tt>_FS_READONLY == 0</tt> and <tt>_USE_STRFUNC</tt> is 1 or 2. When it is set to 2, a <tt>'\n'</tt> is converted to <tt>"\r\n"</tt>.</p>
 </div>
 
 
-<div class="para">
+<div class="para ref">
 <h4>See Also</h4>
 <p><tt><a href="open.html">f_open</a>, <a href="puts.html">f_puts</a>, <a href="printf.html">f_printf</a>, <a href="gets.html">f_gets</a>, <a href="close.html">f_close</a>, <a href="sfile.html">FIL</a></tt></p>
 </div>
diff --git a/doc/en/puts.html b/doc/en/puts.html
index 633024a..be76e05 100644
--- a/doc/en/puts.html
+++ b/doc/en/puts.html
@@ -11,18 +11,18 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>f_puts</h2>
 <p>The f_puts function writes a string to the file.</p>
 <pre>
 int f_puts (
-  const TCHAR* <em>Str</em>,  <span>/* String */</span>
-  FIL* <em>FileObject</em>    <span>/* File object */</span>
+  const TCHAR* <em>Str</em>,  <span class="c">/* String */</span>
+  FIL* <em>FileObject</em>    <span class="c">/* File object */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>Parameters</h4>
 <dl class="par">
 <dt>Str</dt>
@@ -33,26 +33,26 @@ int f_puts (
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>Return Value</h4>
 <p>When the function succeeded, number of characters written that is not minus value is returned. When the function failed due to disk full or any error, an <tt>EOF (-1)</tt> will be returned.</p>
 <p>When the FatFs is configured to Unicode API (<tt>_LFN_UNICODE == 1</tt>), the UCS-2 string is written to the file in UTF-8 encoding. If not the case, the byte stream will be written directly.</p>
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>Description</h4>
 <p>The f_puts() is a wrapper function of <a href="putc.html">f_putc()</a>.</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>QuickInfo</h4>
 <p>Available when <tt>_FS_READONLY == 0</tt> and <tt>_USE_STRFUNC</tt> is 1 or 2. When it is set to 2, <tt>'\n'</tt>s contained in the string are converted to <tt>"\r\n"</tt>.</p>
 </div>
 
 
-<div class="para">
+<div class="para ref">
 <h4>See Also</h4>
 <p><tt><a href="open.html">f_open</a>, <a href="putc.html">f_putc</a>, <a href="printf.html">f_printf</a>, <a href="gets.html">f_gets</a>, <a href="close.html">f_close</a>, <a href="sfile.html">FIL</a></tt></p>
 </div>
diff --git a/doc/en/rc.html b/doc/en/rc.html
new file mode 100644
index 0000000..cce22ad
--- /dev/null
+++ b/doc/en/rc.html
@@ -0,0 +1,83 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<link rel="up" title="FatFs" href="../00index_e.html">
+<link rel="alternate" hreflang="ja" title="Japanese" href="../ja/rc.html">
+<link rel="stylesheet" href="../css_e.css" type="text/css" media="screen" title="ELM Default">
+<title>FatFs - Return Codes</title>
+</head>
+
+<body>
+<h1>Return Code of the File Functions</h1>
+<p>On the FatFs API, most of file functions return common result code as enum type. When a function succeeded, it returns zero, otherwise returns non-zero value that indicates type of error.</p>
+
+<dl class="ret">
+<dt id="ok">FR_OK (0)</dt>
+<dd>The function succeeded.</dd>
+<dt id="de">FR_DISK_ERR</dt>
+<dd>An unrecoverable error occured in the lower layer (disk I/O functions).</dd>
+<dt id="ie">FR_INT_ERR</dt>
+<dd>Assertion failed. An insanity is detected in the internal process. One of the following possibilities are suspected.
+<ul>
+<li>There is any error of the FAT structure on the volume.</li>
+<li>Work area (file system object, file object or etc...) is broken by stack overflow or any other application. This is the reason in most case.</li>
+</ul>
+</dd>
+<dt id="nr">FR_NOT_READY</dt>
+<dd>The disk drive cannot work due to incorrect medium removal or disk_initialize function failed.</dd>
+<dt id="nf">FR_NO_FILE</dt>
+<dd>Could not find the file.</dd>
+<dt id="np">FR_NO_PATH</dt>
+<dd>Could not find the path.</dd>
+<dt id="in">FR_INVALID_NAME</dt>
+<dd>The given string is invalid as the <a href="filename.html">path name</a>.</dd>
+<dt id="dn">FR_DENIED</dt>
+<dd>The required access was denied due to one of the following reasons:
+<ul>
+<li>Write mode open against the file with read-only attribute.</li>
+<li>Deleting the file or directory with read-only attribute.</li>
+<li>Deleting the non-empty directory or current directory.</li>
+<li>Reading the file opened without FA_READ flag.</li>
+<li>Any modification to the file opened without FA_WRITE flag.</li>
+<li>Could not create the file or directory due to the directory table is full.</li>
+<li>Could not create the directory due to the volume is full.</li>
+</ul>
+</dd>
+<dt id="ex">FR_EXIST</dt>
+<dd>Any object that has the same name is already existing.</dd>
+<dt id="io">FR_INVALID_OBJECT</dt>
+<dd>The given file/directory object structure is invalid.</dd>
+<dt id="wp">FR_WRITE_PROTECTED</dt>
+<dd>Any write mode action against write-protected media.</dd>
+<dt id="id">FR_INVALID_DRIVE</dt>
+<dd>Invalid drive number is specified. (Related option: _VOLUMES)</dd>
+<dt id="ne">FR_NOT_ENABLED</dt>
+<dd>Work area for the logical drive has not been registered by f_mount function.</dd>
+<dt id="ns">FR_NO_FILESYSTEM</dt>
+<dd>There is no valid FAT volume on the drive.</dd>
+<dt id="ma">FR_MKFS_ABORTED</dt>
+<dd>The f_mkfs function aborted before start in format due to a reason as follows:
+<ul>
+<li>The disk size is too small.</li>
+<li>Not allowable cluster size for this disk. This can occure when number of clusters gets near the 0xFF7 and 0xFFF7.</li>
+</ul>
+</dd>
+<dt id="tm">FR_TIMEOUT</dt>
+<dd>The function canceled due to a timeout of <a href="appnote.html#reentrant">thread-safe control</a>. (Related option: _TIMEOUT)</dd>
+<dt id="lo">FR_LOCKED</dt>
+<dd>The file access is rejected by <a href="appnote.html#dup">file sharing control</a>. (Related option: _FS_SHARE)</dd>
+<dt id="nc">FR_NOT_ENOUGH_CORE</dt>
+<dd>Not enough memory for the operation. There is one of the following reasons:
+<ul>
+<li>Could not allocate a memory for LFN working buffer. (Related option: _USE_LFN)</li>
+<li>Given table size is insufficient for the required size.</li>
+</ul>
+</dd>
+<dt id="tf">FR_TOO_MANY_OPEN_FILES</dt>
+<dd>Number of open files has been reached maximum value and no more file can be opened. (Related option: _FS_SHARE)</dd>
+</dl>
+
+</body>
+</html>
diff --git a/doc/en/read.html b/doc/en/read.html
index ee4f7ef..52f824d 100644
--- a/doc/en/read.html
+++ b/doc/en/read.html
@@ -11,20 +11,20 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>f_read</h2>
 <p>The f_read function reads data from a file.</p>
 <pre>
 FRESULT f_read (
-  FIL* <em>FileObject</em>,    <span>/* Pointer to the file object structure */</span>
-  void* <em>Buffer</em>,       <span>/* Pointer to the buffer to store read data */</span>
-  UINT <em>ByteToRead</em>,    <span>/* Number of bytes to read */</span>
-  UINT* <em>ByteRead</em>      <span>/* Pointer to the variable to return number of bytes read */</span>
+  FIL* <em>FileObject</em>,    <span class="c">/* Pointer to the file object structure */</span>
+  void* <em>Buffer</em>,       <span class="c">/* Pointer to the buffer to store read data */</span>
+  UINT <em>ByteToRead</em>,    <span class="c">/* Number of bytes to read */</span>
+  UINT* <em>ByteRead</em>      <span class="c">/* Pointer to the variable to return number of bytes read */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>Parameters</h4>
 <dl class="par">
 <dt>FileObject</dt>
@@ -39,38 +39,32 @@ FRESULT f_read (
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>Return Values</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>The function succeeded.</dd>
-<dt>FR_DENIED</dt>
-<dd>The function denied due to the file has been opened in non-read mode.</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>The function failed due to an error in the disk function.</dd>
-<dt>FR_INT_ERR</dt>
-<dd>The function failed due to a wrong FAT structure or an internal error.</dd>
-<dt>FR_NOT_READY</dt>
-<dd>The disk drive cannot work due to no medium in the drive or any other reason.</dd>
-<dt>FR_INVALID_OBJECT</dt>
-<dd>The file object is invalid.</dd>
-</dl>
+<p>
+<a href="rc.html#ok">FR_OK</a>,
+<a href="rc.html#de">FR_DISK_ERR</a>,
+<a href="rc.html#ie">FR_INT_ERR</a>,
+<a href="rc.html#nr">FR_NOT_READY</a>,
+<a href="rc.html#io">FR_INVALID_OBJECT</a>,
+<a href="rc.html#tm">FR_TIMEOUT</a>
+</p>
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>Description</h4>
 <p>The file pointer of the file object increases in number of bytes read. After the function succeeded, <tt>*ByteRead</tt> should be checked to detect the end of file. In case of <tt>*ByteRead &lt; ByteToRead</tt>, it means the read/write pointer reached end of the file during read operation.</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>QuickInfo</h4>
 <p>Always available.</p>
 </div>
 
 
-<div class="para">
+<div class="para ref">
 <h4>See Also</h4>
 <p><tt><a href="open.html">f_open</a>, <a href="gets.html">fgets</a>, <a href="write.html">f_write</a>, <a href="close.html">f_close</a>, <a href="sfile.html">FIL</a></tt></p>
 </div>
diff --git a/doc/en/readdir.html b/doc/en/readdir.html
index 957ed34..267facf 100644
--- a/doc/en/readdir.html
+++ b/doc/en/readdir.html
@@ -11,18 +11,18 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>f_readdir</h2>
 <p>The f_readdir function reads directory entries.</p>
 <pre>
 FRESULT f_readdir (
-  DIR* <em>DirObject</em>,    <span>/* Pointer to the open directory object */</span>
-  FILINFO* <em>FileInfo</em>  <span>/* Pointer to the file information structure */</span>
+  DIR* <em>DirObject</em>,    <span class="c">/* Pointer to the open directory object */</span>
+  FILINFO* <em>FileInfo</em>  <span class="c">/* Pointer to the file information structure */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>Parameters</h4>
 <dl class="par">
 <dt>DirObject</dt>
@@ -33,72 +33,71 @@ FRESULT f_readdir (
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>Return Values</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>The function succeeded.</dd>
-<dt>FR_NOT_READY</dt>
-<dd>The disk drive cannot work due to no medium in the drive or any other reason.</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>The function failed due to an error in the disk function.</dd>
-<dt>FR_INT_ERR</dt>
-<dd>The function failed due to a wrong FAT structure or an internal error.</dd>
-<dt>FR_INVALID_OBJECT</dt>
-<dd>The directory object is invalid.</dd>
-</dl>
+<p>
+<a href="rc.html#ok">FR_OK</a>,
+<a href="rc.html#de">FR_DISK_ERR</a>,
+<a href="rc.html#ie">FR_INT_ERR</a>,
+<a href="rc.html#nr">FR_NOT_READY</a>,
+<a href="rc.html#io">FR_INVALID_OBJECT</a>,
+<a href="rc.html#tm">FR_TIMEOUT</a>,
+<a href="rc.html#nc">FR_NOT_ENOUGH_CORE</a>
+</p>
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>Description</h4>
 <p>The f_readdir function reads directory entries in sequence. All items in the directory can be read by calling f_readdir function repeatedly. When all directory entries have been read and no item to read, the function returns a null string into <tt>f_name[]</tt> member without any error. When a null pointer is given to the <tt>FileInfo</tt>, the read index of the directory object will be rewinded.</p>
-<p>When LFN feature is enabled, <tt>lfname</tt> and <tt>lfsize</tt> in the file information structure must be initialized with valid value prior to use the f_readdir function. The <tt>lfname</tt> is a pointer to the string buffer to return the long file name. The <tt>lfsize</tt> is the size of the string buffer in unit of character. If either the size of read buffer or LFN working buffer is insufficient for the LFN or the object has no LFN, a null string will be returned to the LFN read buffer. If the LFN contains any charactrer that cannot be converted to OEM code, a null string will be returned but this is not the case on Unicode API configuration. When <tt>lfname</tt> is a NULL, nothing of the LFN is returned. When the object has no LFN, any small capitals can be contained in the SFN.</p>
+<p>When LFN feature is enabled, <tt>lfname</tt> and <tt>lfsize</tt> in the file information structure must be initialized with valid value prior to use the f_readdir function. The <tt>lfname</tt> is a pointer to the string buffer to return the long file name. The <tt>lfsize</tt> is the size of the string buffer in unit of TCHAR. If either the size of read buffer or LFN working buffer is insufficient for the LFN or the object has no LFN, a null string will be returned to the LFN read buffer. If the LFN contains any charactrer that cannot be converted to OEM code, a null string will be returned but this is not the case on Unicode API configuration. When <tt>lfname</tt> is a NULL, nothing of the LFN is returned. When the object has no LFN, some small capitals can be contained in the SFN.</p>
 <p>When relative path feature is enabled <tt>(_FS_RPATH == 1)</tt>, "." and ".." entries are not filtered out and it will appear in the read entries.</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>QuickInfo</h4>
 <p>Available when <tt>_FS_MINIMIZE &lt;= 1</tt>.</p>
 </div>
 
 
-<div class="para">
+<div class="para use">
 <h4>Sample Code</h4>
 <pre>
-FRESULT scan_files (char* path)
+FRESULT scan_files (
+    char* path        <span class="c">/* Start node to be scanned (also used as work area) */</span>
+)
 {
     FRESULT res;
     FILINFO fno;
     DIR dir;
     int i;
-    char *fn;
-#if _USE_LFN
-    static char lfn[_MAX_LFN * (_DF1S ? 2 : 1) + 1];
+    char *fn;   <span class="c">/* This function is assuming non-Unicode cfg. */</span>
+<span class="k">#if</span> _USE_LFN
+    static char lfn[_MAX_LFN + 1];
     fno.lfname = lfn;
     fno.lfsize = sizeof(lfn);
-#endif
+<span class="k">#endif</span>
 
 
-    res = f_opendir(&amp;dir, path);
+    res = f_opendir(&amp;dir, path);                       <span class="c">/* Open the directory */</span>
     if (res == FR_OK) {
         i = strlen(path);
         for (;;) {
-            res = f_readdir(&amp;dir, &amp;fno);
-            if (res != FR_OK || fno.fname[0] == 0) break;
-            if (fno.fname[0] == '.') continue;
-#if _USE_LFN
+            res = f_readdir(&amp;dir, &amp;fno);                   <span class="c">/* Read a directory item */</span>
+            if (res != FR_OK || fno.fname[0] == 0) break;  <span class="c">/* Break on error or end of dir */</span>
+            if (fno.fname[0] == '.') continue;             <span class="c">/* Ignore dot entry */</span>
+<span class="k">#if</span> _USE_LFN
             fn = *fno.lfname ? fno.lfname : fno.fname;
-#else
+<span class="k">#else</span>
             fn = fno.fname;
-#endif
-            if (fno.fattrib &amp; AM_DIR) {
+<span class="k">#endif</span>
+            if (fno.fattrib &amp; AM_DIR) {                    <span class="c">/* It is a directory */</span>
                 sprintf(&amp;path[i], "/%s", fn);
                 res = scan_files(path);
                 if (res != FR_OK) break;
                 path[i] = 0;
-            } else {
+            } else {                                       <span class="c">/* It is a file. */</span>
                 printf("%s/%s\n", path, fn);
             }
         }
@@ -110,7 +109,7 @@ FRESULT scan_files (char* path)
 </div>
 
 
-<div class="para">
+<div class="para ref">
 <h4>See Also</h4>
 <p><tt><a href="opendir.html">f_opendir</a>, <a href="stat.html">f_stat</a>, <a href="sfileinfo.html">FILINFO</a>, <a href="sdir.html">DIR</a></tt></p>
 </div>
diff --git a/doc/en/rename.html b/doc/en/rename.html
index 5e9dfc1..cc07ef9 100644
--- a/doc/en/rename.html
+++ b/doc/en/rename.html
@@ -11,18 +11,18 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>f_rename</h2>
 <p>Renames an object.</p>
 <pre>
 FRESULT f_rename (
-  const TCHAR* <em>OldName</em>, <span>/* Pointer to old object name */</span>
-  const TCHAR* <em>NewName</em>  <span>/* Pointer to new object name */</span>
+  const TCHAR* <em>OldName</em>, <span class="c">/* Pointer to old object name */</span>
+  const TCHAR* <em>NewName</em>  <span class="c">/* Pointer to new object name */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>Parameters</h4>
 <dl class="par">
 <dt>OldName</dt>
@@ -33,60 +33,48 @@ FRESULT f_rename (
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>Return Values</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>The function succeeded.</dd>
-<dt>FR_NO_FILE</dt>
-<dd>Could not find the old name.</dd>
-<dt>FR_NO_PATH</dt>
-<dd>Could not find the path.</dd>
-<dt>FR_INVALID_NAME</dt>
-<dd>The file name is invalid.</dd>
-<dt>FR_INVALID_DRIVE</dt>
-<dd>The drive number is invalid.</dd>
-<dt>FR_NOT_READY</dt>
-<dd>The disk drive cannot work due to no medium in the drive or any other reason.</dd>
-<dt>FR_EXIST</dt>
-<dd>The new name is colliding with an existing name.</dd>
-<dt>FR_DENIED</dt>
-<dd>The new name could not be created due to any reason.</dd>
-<dt>FR_WRITE_PROTECTED</dt>
-<dd>The medium is write protected.</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>The function failed due to an error in the disk function.</dd>
-<dt>FR_INT_ERR</dt>
-<dd>The function failed due to a wrong FAT structure or an internal error.</dd>
-<dt>FR_NOT_ENABLED</dt>
-<dd>The logical drive has no work area.</dd>
-<dt>FR_NO_FILESYSTEM</dt>
-<dd>There is no valid FAT volume on the drive.</dd>
-<dt>FR_LOCKED</dt>
-<dd>The function was rejected due to file shareing policy (_FS_SHARE).</dd>
-</dl>
+<p>
+<a href="rc.html#ok">FR_OK</a>,
+<a href="rc.html#de">FR_DISK_ERR</a>,
+<a href="rc.html#ie">FR_INT_ERR</a>,
+<a href="rc.html#nr">FR_NOT_READY</a>,
+<a href="rc.html#ok">FR_NO_FILE</a>,
+<a href="rc.html#np">FR_NO_PATH</a>,
+<a href="rc.html#in">FR_INVALID_NAME</a>,
+<a href="rc.html#de">FR_DENIED</a>,
+<a href="rc.html#ex">FR_EXIST</a>,
+<a href="rc.html#wp">FR_WRITE_PROTECTED</a>,
+<a href="rc.html#id">FR_INVALID_DRIVE</a>,
+<a href="rc.html#ne">FR_NOT_ENABLED</a>,
+<a href="rc.html#ns">FR_NO_FILESYSTEM</a>,
+<a href="rc.html#tm">FR_TIMEOUT</a>,
+<a href="rc.html#lo">FR_LOCKED</a>,
+<a href="rc.html#nc">FR_NOT_ENOUGH_CORE</a>
+</p>
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>Description</h4>
 <p>Renames an object (file or directory) and can also move it to other directory. The logical drive number is determined by old name, new name must not contain a logical drive number. <em>Do not rename open objects</em>.</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>QuickInfo</h4>
 <p>Available when <tt>_FS_READONLY == 0</tt> and <tt>_FS_MINIMIZE == 0</tt>.</p>
 </div>
 
 
-<div class="para">
+<div class="para use">
 <h4>Example</h4>
 <pre>
-    <span>/* Rename an object */</span>
+    <span class="c">/* Rename an object */</span>
     f_rename("oldname.txt", "newname.txt");
 
-    <span>/* Rename and move an object to other directory */</span>
+    <span class="c">/* Rename and move an object to other directory */</span>
     f_rename("oldname.txt", "dir1/newname.txt");
 </pre>
 </div>
diff --git a/doc/en/sdir.html b/doc/en/sdir.html
index c5d78f8..a127270 100644
--- a/doc/en/sdir.html
+++ b/doc/en/sdir.html
@@ -15,19 +15,19 @@
 <h2>DIR</h2>
 <p>The <tt>DIR</tt> structure is used for the work area to read a directory by f_oepndir, f_readdir function. There is no member that can be changed by application.</p>
 <pre>
-typedef struct {
-    FATFS*  fs;         <span>/* Pointer to the owner file system object */</span>
-    WORD    id;         <span>/* Owner file system mount ID */</span>
-    WORD    index;      <span>/* Directory index number to be read/write next */</span>
-    DWORD   sclust;     <span>/* Table start cluster (0:Root dir) */</span>
-    DWORD   clust;      <span>/* Current cluster */</span>
-    DWORD   sect;       <span>/* Current sector */</span>
-    BYTE*   dir;        <span>/* Pointer to the current SFN entry in the win[] */</span>
-    BYTE*   fn;         <span>/* Pointer to the SFN (in/out) {file[8],ext[3],status[1]} */</span>
-#if _USE_LFN
-    WCHAR*  lfn;        <span>/* Pointer to the LFN working buffer */</span>
-    WORD    lfn_idx;    <span>/* Last matched LFN index (0xFFFF:No LFN) */</span>
-#endif
+<span class="k">typedef</span> <span class="k">struct</span> {
+    FATFS*  fs;         <span class="c">/* Pointer to the owner file system object */</span>
+    WORD    id;         <span class="c">/* Owner file system mount ID */</span>
+    WORD    index;      <span class="c">/* Directory index number to be read/write next */</span>
+    DWORD   sclust;     <span class="c">/* Table start cluster (0:Root dir) */</span>
+    DWORD   clust;      <span class="c">/* Current cluster */</span>
+    DWORD   sect;       <span class="c">/* Current sector */</span>
+    BYTE*   dir;        <span class="c">/* Pointer to the current SFN entry in the win[] */</span>
+    BYTE*   fn;         <span class="c">/* Pointer to the SFN (in/out) {file[8],ext[3],status[1]} */</span>
+<span class="k">#if</span> _USE_LFN
+    WCHAR*  lfn;        <span class="c">/* Pointer to the LFN working buffer */</span>
+    WORD    lfn_idx;    <span class="c">/* Last matched LFN index (0xFFFF:No LFN) */</span>
+<span class="k">#endif</span>
 } DIR;
 </pre>
 </div>
diff --git a/doc/en/sfatfs.html b/doc/en/sfatfs.html
index 32aaa53..81659ae 100644
--- a/doc/en/sfatfs.html
+++ b/doc/en/sfatfs.html
@@ -13,38 +13,38 @@
 
 <div class="para">
 <h2>FATFS</h2>
-<p>The <tt>FATFS</tt> structure holds dynamic work area of individual logical drives. It is given by application program and registerd/unregisterd to the FatFs module with f_mount function. Following members are in standard configuration. There is no member that can be changed from the application program.</p>
+<p>The <tt>FATFS</tt> structure (file system object) holds dynamic work area of individual logical drives. It is given by application program and registerd/unregisterd to the FatFs module with f_mount function. Initialization is done on first file access after f_mount or media change. There is no member that can be changed from the application program.</p>
 <pre>
-typedef struct {
-    BYTE    fs_type;      <span>/* FAT sub-type (0:Not mounted) */</span>
-    BYTE    drv;          <span>/* Physical drive number */</span>
-    BYTE    csize;        <span>/* Sectors per cluster (1,2,4...128) */</span>
-    BYTE    n_fats;       <span>/* Number of FAT copies (1,2) */</span>
-    BYTE    wflag;        <span>/* win[] dirty flag */</span>
-    BYTE    fsi_flag;     <span>/* fsinfo dirty flag */</span>
-    WORD    id;           <span>/* File system mount ID */</span>
-    WORD    n_rootdir;    <span>/* Number of root directory entries (FAT12/16) */</span>
-#if _MAX_SS != 512
-    WORD    ssize;        <span>/* Sector size (512,1024,2048,4096) */</span>
-#endif
-#if _FS_REENTRANT
-    _SYNC_t sobj;         <span>/* Identifier of sync object */</span>
-#endif
-#if !_FS_READONLY
-    DWORD   last_clust;   <span>/* Last allocated cluster */</span>
-    DWORD   free_clust;   <span>/* Number of free clusters */</span>
-    DWORD   fsi_sector;   <span>/* fsinfo sector (FAT32) */</span>
-#endif
-#if _FS_RPATH
-    DWORD   cdir;         <span>/* Current directory cluster (0:root) */</span>
-#endif
-    DWORD   n_fatent;     <span>/* Number of FAT entries (= number of clusters + 2) */</span>
-    DWORD   fsize;        <span>/* Sectors per FAT */</span>
-    DWORD   fatbase;      <span>/* FAT area start sector */</span>
-    DWORD   dirbase;      <span>/* Root directory area start sector (FAT32: cluster#) */</span>
-    DWORD   database;     <span>/* Data area start sector */</span>
-    DWORD   winsect;      <span>/* Current sector appearing in the win[] */</span>
-    BYTE    win[_MAX_SS]; <span>/* Disk access window for Directory, FAT (and Data on tiny cfg) */</span>
+<span class="k">typedef</span> <span class="k">struct</span> {
+    BYTE    fs_type;      <span class="c">/* FAT sub-type (0:Not mounted) */</span>
+    BYTE    drv;          <span class="c">/* Physical drive number */</span>
+    BYTE    csize;        <span class="c">/* Sectors per cluster (1,2,4...128) */</span>
+    BYTE    n_fats;       <span class="c">/* Number of FAT copies (1,2) */</span>
+    BYTE    wflag;        <span class="c">/* win[] dirty flag */</span>
+    BYTE    fsi_flag;     <span class="c">/* fsinfo dirty flag */</span>
+    WORD    id;           <span class="c">/* File system mount ID */</span>
+    WORD    n_rootdir;    <span class="c">/* Number of root directory entries (FAT12/16) */</span>
+<span class="k">#if</span> _MAX_SS != 512
+    WORD    ssize;        <span class="c">/* Sector size (512,1024,2048,4096) */</span>
+<span class="k">#endif</span>
+<span class="k">#if</span> _FS_REENTRANT
+    _SYNC_t sobj;         <span class="c">/* Identifier of sync object */</span>
+<span class="k">#endif</span>
+<span class="k">#if</span> !_FS_READONLY
+    DWORD   last_clust;   <span class="c">/* Last allocated cluster */</span>
+    DWORD   free_clust;   <span class="c">/* Number of free clusters */</span>
+    DWORD   fsi_sector;   <span class="c">/* fsinfo sector (FAT32) */</span>
+<span class="k">#endif</span>
+<span class="k">#if</span> _FS_RPATH
+    DWORD   cdir;         <span class="c">/* Current directory cluster (0:root) */</span>
+<span class="k">#endif</span>
+    DWORD   n_fatent;     <span class="c">/* Number of FAT entries (= number of clusters + 2) */</span>
+    DWORD   fsize;        <span class="c">/* Sectors per FAT */</span>
+    DWORD   fatbase;      <span class="c">/* FAT area start sector */</span>
+    DWORD   dirbase;      <span class="c">/* Root directory area start sector (FAT32: cluster#) */</span>
+    DWORD   database;     <span class="c">/* Data area start sector */</span>
+    DWORD   winsect;      <span class="c">/* Current sector appearing in the win[] */</span>
+    BYTE    win[_MAX_SS]; <span class="c">/* Disk access window for Directory, FAT (and Data on tiny cfg) */</span>
 } FATFS;
 </pre>
 </div>
diff --git a/doc/en/sfile.html b/doc/en/sfile.html
index 3df25d2..0a29ddc 100644
--- a/doc/en/sfile.html
+++ b/doc/en/sfile.html
@@ -16,29 +16,29 @@
 <p>The FIL structure (file object) holds state of an open file. It is created by f_open function and discarded by f_close function. There is no member that can be changed by the application program except for <tt>cltbl</tt>. Note that a sector buffer is defined in this structure under non-tiny configuration so that the FIL structures should not be defined as auto variable.</p>
 
 <pre>
-typedef struct {
-    FATFS*  fs;           <span>/* Pointer to the owner file system object */</span>
-    WORD    id;           <span>/* Owner file system mount ID */</span>
-    BYTE    flag;         <span>/* File status flags */</span>
+<span class="k">typedef</span> <span class="k">struct</span> {
+    FATFS*  fs;           <span class="c">/* Pointer to the owner file system object */</span>
+    WORD    id;           <span class="c">/* Owner file system mount ID */</span>
+    BYTE    flag;         <span class="c">/* File status flags */</span>
     BYTE    pad1;
-    DWORD   fptr;         <span>/* File read/write pointer (Byte offset origin from top of the file) */</span>
-    DWORD   fsize;        <span>/* File size */</span>
-    DWORD   org_clust;    <span>/* File start cluster */</span>
-    DWORD   curr_clust;   <span>/* Current cluster */</span>
-    DWORD   dsect;        <span>/* Current data sector */</span>
-#if !_FS_READONLY
-    DWORD   dir_sect;     <span>/* Sector containing the directory entry */</span>
-    BYTE*   dir_ptr;      <span>/* Ponter to the directory entry in the window */</span>
-#endif
-#if _USE_FASTSEEK
-    DWORD*  cltbl;        <span>/* Pointer to the cluster link map table (Nulled on file open) */</span>
-#endif
-#if _FS_SHARE
-    UINT    lockid;       <span>/* File lock ID */</span>
-#endif
-#if !_FS_TINY
-    BYTE    buf[_MAX_SS]; <span>/* Data read/write buffer */</span>
-#endif
+    DWORD   fptr;         <span class="c">/* File read/write pointer (Byte offset origin from top of the file) */</span>
+    DWORD   fsize;        <span class="c">/* File size */</span>
+    DWORD   sclust;       <span class="c">/* File start cluster */</span>
+    DWORD   clust;        <span class="c">/* Current cluster */</span>
+    DWORD   dsect;        <span class="c">/* Current data sector */</span>
+<span class="k">#if</span> !_FS_READONLY
+    DWORD   dir_sect;     <span class="c">/* Sector containing the directory entry */</span>
+    BYTE*   dir_ptr;      <span class="c">/* Ponter to the directory entry in the window */</span>
+<span class="k">#endif</span>
+<span class="k">#if</span> _USE_FASTSEEK
+    DWORD*  cltbl;        <span class="c">/* Pointer to the cluster link map table (Nulled on file open) */</span>
+<span class="k">#endif</span>
+<span class="k">#if</span> _FS_SHARE
+    UINT    lockid;       <span class="c">/* File lock ID */</span>
+<span class="k">#endif</span>
+<span class="k">#if</span> !_FS_TINY
+    BYTE    buf[_MAX_SS]; <span class="c">/* Data read/write buffer */</span>
+<span class="k">#endif</span>
 } FIL;
 </pre>
 
diff --git a/doc/en/sfileinfo.html b/doc/en/sfileinfo.html
index 26153c4..ef1752d 100644
--- a/doc/en/sfileinfo.html
+++ b/doc/en/sfileinfo.html
@@ -15,16 +15,16 @@
 <h2>FILINFO</h2>
 <p>The <tt>FILINFO</tt> structure holds a file information returned by f_stat and f_readdir function.</p>
 <pre>
-typedef struct {
-    DWORD fsize;      <span>/* File size */</span>
-    WORD  fdate;      <span>/* Last modified date */</span>
-    WORD  ftime;      <span>/* Last modified time */</span>
-    BYTE  fattrib;    <span>/* Attribute */</span>
-    TCHAR fname[13];  <span>/* Short file name (8.3 format) */</span>
-#if _USE_LFN
-    TCHAR* lfname;    <span>/* Pointer to the LFN buffer */</span>
-    int   lfsize;     <span>/* Size of the LFN buffer in unit of TCHAR */</span>
-#endif
+<span class="k">typedef struct</span> {
+    DWORD fsize;      <span class="c">/* File size */</span>
+    WORD  fdate;      <span class="c">/* Last modified date */</span>
+    WORD  ftime;      <span class="c">/* Last modified time */</span>
+    BYTE  fattrib;    <span class="c">/* Attribute */</span>
+    TCHAR fname[13];  <span class="c">/* Short file name (8.3 format) */</span>
+<span class="k">#if</span> _USE_LFN
+    TCHAR* lfname;    <span class="c">/* Pointer to the LFN buffer */</span>
+    int   lfsize;     <span class="c">/* Size of the LFN buffer in unit of TCHAR */</span>
+<span class="k">#endif</span>
 } FILINFO;
 </pre>
 </div>
@@ -32,7 +32,7 @@ typedef struct {
 <h4>Members</h4>
 <dl>
 <dt>fsize</dt>
-<dd>Indicates size of the file in unit of byte. This is always zero when it is a directory.</dd>
+<dd>Indicates size of the file in unit of byte. Always zero for directories.</dd>
 <dt>fdate</dt>
 <dd>Indicates the date that the file was modified or the directory was created.<br>
 <dl>
@@ -62,7 +62,7 @@ typedef struct {
 <dt>lfname</dt>
 <dd>Pointer to the LFN buffer to store the read LFN. This member must be initialized by application prior to use this structure. Not available on non-LFN configuration.</dd>
 <dt>lfsize</dt>
-<dd>Size of the LFN buffer in unit of chars. This member must be initialized by application prior to use this structure. Not available on non-LFN configuration.</dd>
+<dd>Size of the LFN buffer in unit of TCHAR. This member must be initialized by application prior to use this structure. Not available on non-LFN configuration.</dd>
 </dl>
 
 <p class="foot"><a href="../00index_e.html">Return</a></p>
diff --git a/doc/en/size.html b/doc/en/size.html
new file mode 100644
index 0000000..9325c9b
--- /dev/null
+++ b/doc/en/size.html
@@ -0,0 +1,62 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<link rel="up" title="FatFs" href="../00index_e.html">
+<link rel="alternate" hreflang="ja" title="Japanese" href="../ja/size.html">
+<link rel="stylesheet" href="../css_e.css" type="text/css" media="screen" title="ELM Default">
+<title>FatFs - f_size</title>
+</head>
+
+<body>
+
+<div class="para func">
+<h2>f_size</h2>
+<p>The f_size function gets the size of a file.</p>
+<pre>
+DWORD f_size (
+  FIL* <em>FileObject</em>   <span class="c">/* File object */</span>
+);
+</pre>
+</div>
+
+
+<div class="para arg">
+<h4>Parameters</h4>
+<dl class="par">
+<dt>FileObject</dt>
+<dd>Pointer to the open file object structure.</dd>
+</dl>
+</div>
+
+
+<div class="para ret">
+<h4>Return Values</h4>
+<p>Returns the size of the file in unit of byte.</p>
+</div>
+
+
+<div class="para desc">
+<h4>Description</h4>
+<p>In this revision, the f_size function is implemented as a macro.</p>
+<pre>
+<span class="k">#define</span> f_size(fp) ((fp)->fsize)
+</pre>
+</div>
+
+
+<div class="para comp">
+<h4>QuickInfo</h4>
+<p>Always available.</p>
+</div>
+
+
+<div class="para ref">
+<h4>See Also</h4>
+<p><tt><a href="open.html">f_open</a>, <a href="lseek.html">f_lseek</a>, <a href="sfile.html">FIL</a></tt></p>
+</div>
+
+<p class="foot"><a href="../00index_e.html">Return</a></p>
+</body>
+</html>
diff --git a/doc/en/stat.html b/doc/en/stat.html
index 0249fa2..5b51190 100644
--- a/doc/en/stat.html
+++ b/doc/en/stat.html
@@ -11,18 +11,18 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>f_stat</h2>
 <p>The f_stat gets the file status.</p>
 <pre>
 FRESULT f_stat (
-  const TCHAR* <em>FileName</em>,  <span>/* Pointer to the file or directory name */</span>
-  FILINFO* <em>FileInfo</em>       <span>/* Pointer to the FILINFO structure */</span>
+  const TCHAR* <em>FileName</em>,  <span class="c">/* Pointer to the file or directory name */</span>
+  FILINFO* <em>FileInfo</em>       <span class="c">/* Pointer to the FILINFO structure */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>Parameters</h4>
 <dl class="par">
 <dt>FileName</dt>
@@ -33,40 +33,32 @@ FRESULT f_stat (
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>Return Values</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>The function succeeded.</dd>
-<dt>FR_NO_FILE</dt>
-<dd>Could not find the file or directory.</dd>
-<dt>FR_NO_PATH</dt>
-<dd>Could not find the path.</dd>
-<dt>FR_INVALID_NAME</dt>
-<dd>The file name is invalid.</dd>
-<dt>FR_INVALID_DRIVE</dt>
-<dd>The drive number is invalid.</dd>
-<dt>FR_NOT_READY</dt>
-<dd>The disk drive cannot work due to no medium in the drive or any other reason.</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>The function failed due to an error in the disk function.</dd>
-<dt>FR_INT_ERR</dt>
-<dd>The function failed due to a wrong FAT structure or an internal error.</dd>
-<dt>FR_NOT_ENABLED</dt>
-<dd>The logical drive has no work area.</dd>
-<dt>FR_NO_FILESYSTEM</dt>
-<dd>There is no valid FAT volume on the drive.</dd>
-</dl>
+<p>
+<a href="rc.html#ok">FR_OK</a>,
+<a href="rc.html#de">FR_DISK_ERR</a>,
+<a href="rc.html#ie">FR_INT_ERR</a>,
+<a href="rc.html#nr">FR_NOT_READY</a>,
+<a href="rc.html#ok">FR_NO_FILE</a>,
+<a href="rc.html#np">FR_NO_PATH</a>,
+<a href="rc.html#in">FR_INVALID_NAME</a>,
+<a href="rc.html#id">FR_INVALID_DRIVE</a>,
+<a href="rc.html#ne">FR_NOT_ENABLED</a>,
+<a href="rc.html#ns">FR_NO_FILESYSTEM</a>,
+<a href="rc.html#tm">FR_TIMEOUT</a>,
+<a href="rc.html#nc">FR_NOT_ENOUGH_CORE</a>
+</p>
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>Description</h4>
 <p>The f_stat gets the information of a file or directory. For details of the infomation, refer to the <tt>FILINFO</tt> structure and <a href="readdir.html">f_readdir</a> function. This function is not supported in minimization level of &gt;= 1.</p>
 </div>
 
 
-<div class="para">
+<div class="para ref">
 <h4>References</h4>
 <p><tt><a href="opendir.html">f_opendir</a>, <a href="readdir.html">f_readdir</a>, <a href="sfileinfo.html">FILINFO</a></tt></p>
 </div>
diff --git a/doc/en/sync.html b/doc/en/sync.html
index 8de747d..6af2850 100644
--- a/doc/en/sync.html
+++ b/doc/en/sync.html
@@ -11,17 +11,17 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>f_sync</h2>
 <p>The f_sync function flushes the cached information of a writing file.</p>
 <pre>
 FRESULT f_sync (
-  FIL* <em>FileObject</em>     <span>/* Pointer to the file object */</span>
+  FIL* <em>FileObject</em>     <span class="c">/* Pointer to the file object */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>Parameter</h4>
 <dl class="par">
 <dt>FileObject</dt>
@@ -30,36 +30,32 @@ FRESULT f_sync (
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>Return Values</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>The function succeeded.</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>The function failed due to an error in the disk function.</dd>
-<dt>FR_INT_ERR</dt>
-<dd>The function failed due to a wrong FAT structure or an internal error.</dd>
-<dt>FR_NOT_READY</dt>
-<dd>The disk drive cannot work due to no medium in the drive or any other reason.</dd>
-<dt>FR_INVALID_OBJECT</dt>
-<dd>The file object is invalid.</dd>
-</dl>
+<p>
+<a href="rc.html#ok">FR_OK</a>,
+<a href="rc.html#de">FR_DISK_ERR</a>,
+<a href="rc.html#ie">FR_INT_ERR</a>,
+<a href="rc.html#nr">FR_NOT_READY</a>,
+<a href="rc.html#io">FR_INVALID_OBJECT</a>,
+<a href="rc.html#tm">FR_TIMEOUT</a>
+</p>
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>Description</h4>
 <p>The f_sync function performs the same process as f_close function but the file is left opened and can continue read/write/seek operations to the file. This is suitable for the applications that open files for a long time in write mode, such as data logger. Performing f_sync of periodic or immediataly after f_write can minimize the risk of data loss due to a sudden blackout or an unintentional disk removal. However f_sync immediataly before f_close has no advantage because f_close performs f_sync in it. In other words, the differnce between those functions is that the file object is invalidated or not. </p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>QuickInfo</h4>
 <p>Available when <tt>_FS_READONLY == 0</tt>.</p>
 </div>
 
 
-<div class="para">
+<div class="para ref">
 <h4>See Also</h4>
 <p><tt><a href="close.html">f_close</a></tt></p>
 </div>
diff --git a/doc/en/tell.html b/doc/en/tell.html
new file mode 100644
index 0000000..acf4fce
--- /dev/null
+++ b/doc/en/tell.html
@@ -0,0 +1,62 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<link rel="up" title="FatFs" href="../00index_e.html">
+<link rel="alternate" hreflang="ja" title="Japanese" href="../ja/tell.html">
+<link rel="stylesheet" href="../css_e.css" type="text/css" media="screen" title="ELM Default">
+<title>FatFs - f_tell</title>
+</head>
+
+<body>
+
+<div class="para func">
+<h2>f_tell</h2>
+<p>The f_tell function gets the current read/write pointer of a file.</p>
+<pre>
+DWORD f_tell (
+  FIL* <em>FileObject</em>   <span class="c">/* File object */</span>
+);
+</pre>
+</div>
+
+
+<div class="para arg">
+<h4>Parameters</h4>
+<dl class="par">
+<dt>FileObject</dt>
+<dd>Pointer to the open file object structure.</dd>
+</dl>
+</div>
+
+
+<div class="para ret">
+<h4>Return Values</h4>
+<p>Returns current read/write pointer of the file.</p>
+</div>
+
+
+<div class="para desc">
+<h4>Description</h4>
+<p>In this revision, the f_tell function is implemented as a macro.</p>
+<pre>
+<span class="k">#define</span> f_tell(fp) ((fp)->fptr)
+</pre>
+</div>
+
+
+<div class="para comp">
+<h4>QuickInfo</h4>
+<p>Always available.</p>
+</div>
+
+
+<div class="para ref">
+<h4>See Also</h4>
+<p><tt><a href="open.html">f_open</a>, <a href="lseek.html">f_lseek</a>, <a href="sfile.html">FIL</a></tt></p>
+</div>
+
+<p class="foot"><a href="../00index_e.html">Return</a></p>
+</body>
+</html>
diff --git a/doc/en/truncate.html b/doc/en/truncate.html
index d0cef9e..65fc524 100644
--- a/doc/en/truncate.html
+++ b/doc/en/truncate.html
@@ -11,17 +11,17 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>f_truncate</h2>
 <p>The f_truncate function truncates the file size.</p>
 <pre>
 FRESULT f_truncate (
-  FIL* <em>FileObject</em>     <span>/* Pointer to the file object */</span>
+  FIL* <em>FileObject</em>     <span class="c">/* Pointer to the file object */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>Parameter</h4>
 <dl class="par">
 <dt>FileObject</dt>
@@ -30,38 +30,32 @@ FRESULT f_truncate (
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>Return Values</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>The function succeeded.</dd>
-<dt>FR_DENIED</dt>
-<dd>The file has been opened in read-only mode.</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>The function failed due to an error in the disk function.</dd>
-<dt>FR_INT_ERR</dt>
-<dd>The function failed due to a wrong FAT structure or an internal error.</dd>
-<dt>FR_NOT_READY</dt>
-<dd>The disk drive cannot work due to no medium in the drive or any other reason.</dd>
-<dt>FR_INVALID_OBJECT</dt>
-<dd>The file object is invalid.</dd>
-</dl>
+<p>
+<a href="rc.html#ok">FR_OK</a>,
+<a href="rc.html#de">FR_DISK_ERR</a>,
+<a href="rc.html#ie">FR_INT_ERR</a>,
+<a href="rc.html#nr">FR_NOT_READY</a>,
+<a href="rc.html#io">FR_INVALID_OBJECT</a>,
+<a href="rc.html#tm">FR_TIMEOUT</a>
+</p>
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>Description</h4>
 <p>The f_truncate function truncates the file size to the current file read/write point. This function has no effect if the file read/write pointer is already pointing end of the file.</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>QuickInfo</h4>
 <p>Available when <tt>_FS_READONLY == 0</tt> and <tt>_FS_MINIMIZE == 0</tt>.</p>
 </div>
 
 
-<div class="para">
+<div class="para ref">
 <h4>See Also</h4>
 <p><tt><a href="open.html">f_open</a>, <a href="lseek.html">f_lseek</a>, <a href="sfile.html">FIL</a></tt></p>
 </div>
diff --git a/doc/en/unlink.html b/doc/en/unlink.html
index c5eaea7..a4e058f 100644
--- a/doc/en/unlink.html
+++ b/doc/en/unlink.html
@@ -11,17 +11,17 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>f_unlink</h2>
-<p>The f_unlink function removes an object.</p>
+<p>The f_unlink function removes a file or directory.</p>
 <pre>
 FRESULT f_unlink (
-  const TCHAR* <em>FileName</em>  <span>/* Pointer to the object name */</span>
+  const TCHAR* <em>FileName</em>  <span class="c">/* Pointer to the object name */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>Parameter</h4>
 <dl class="par">
 <dt>FileName</dt>
@@ -30,47 +30,42 @@ FRESULT f_unlink (
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>Return Values</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>The function succeeded.</dd>
-<dt>FR_NO_FILE</dt>
-<dd>Could not find the file or directory.</dd>
-<dt>FR_NO_PATH</dt>
-<dd>Could not find the path.</dd>
-<dt>FR_INVALID_NAME</dt>
-<dd>The path name is invalid.</dd>
-<dt>FR_INVALID_DRIVE</dt>
-<dd>The drive number is invalid.</dd>
-<dt>FR_DENIED</dt>
-<dd>The function was denied due to either of following reasons:
-<ul><li>The object has read-only attribute</li><li>Not empty directory</li><li>Current directory</li></ul></dd>
-<dt>FR_NOT_READY</dt>
-<dd>The disk drive cannot work due to no medium in the drive or any other reason.</dd>
-<dt>FR_WRITE_PROTECTED</dt>
-<dd>The medium is write protected.</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>The function failed due to an error in the disk function.</dd>
-<dt>FR_INT_ERR</dt>
-<dd>The function failed due to a wrong FAT structure or an internal error.</dd>
-<dt>FR_NOT_ENABLED</dt>
-<dd>The logical drive has no work area.</dd>
-<dt>FR_NO_FILESYSTEM</dt>
-<dd>There is no valid FAT volume on the drive.</dd>
-<dt>FR_LOCKED</dt>
-<dd>The function was rejected due to file shareing policy (_FS_SHARE).</dd>
-</dl>
+<p>
+<a href="rc.html#ok">FR_OK</a>,
+<a href="rc.html#de">FR_DISK_ERR</a>,
+<a href="rc.html#ie">FR_INT_ERR</a>,
+<a href="rc.html#nr">FR_NOT_READY</a>,
+<a href="rc.html#ok">FR_NO_FILE</a>,
+<a href="rc.html#np">FR_NO_PATH</a>,
+<a href="rc.html#in">FR_INVALID_NAME</a>,
+<a href="rc.html#de">FR_DENIED</a>,
+<a href="rc.html#ex">FR_EXIST</a>,
+<a href="rc.html#wp">FR_WRITE_PROTECTED</a>,
+<a href="rc.html#id">FR_INVALID_DRIVE</a>,
+<a href="rc.html#ne">FR_NOT_ENABLED</a>,
+<a href="rc.html#ns">FR_NO_FILESYSTEM</a>,
+<a href="rc.html#tm">FR_TIMEOUT</a>,
+<a href="rc.html#lo">FR_LOCKED</a>,
+<a href="rc.html#nc">FR_NOT_ENOUGH_CORE</a>
+</p>
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>Description</h4>
-<p>The f_unlink function removes an object. <em>Do not remove open objects</em>.</p>
+<p>
+If condition of the object to be removed is applicable to the following terms, the function will fail with error.
+<ul>
+<li>The object must not have read-only attribute (AM_RDO) or the function will be rejected with FR_DENIED.</li>
+<li>The directory must be empty and must not be current directory or the function will be rejected with FR_DENIED.</li>
+<li>The file must not being opened or the <em>FAT volume can be collapted</em>. It will able to be rejected with FR_LOCKED when <a href="appnote.html#dup">file shareing control</a> is enabled.</li>
+</ul>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>QuickInfo</h4>
 <p>Available when <tt>_FS_READONLY == 0</tt> and <tt>_FS_MINIMIZE == 0</tt>.</p>
 </div>
diff --git a/doc/en/utime.html b/doc/en/utime.html
index 45bc306..83e582f 100644
--- a/doc/en/utime.html
+++ b/doc/en/utime.html
@@ -11,18 +11,18 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>f_utime</h2>
 <p>The f_utime function changes the timestamp of a file or directory.</p>
 <pre>
 FRESULT f_utime (
-  const TCHAR* <em>FileName</em>,   <span>/* Pointer to the file or directory path */</span>
-  const FILINFO* <em>TimeDate</em>  <span>/* Time and data to be set */</span>
+  const TCHAR* <em>FileName</em>,   <span class="c">/* Pointer to the file or directory path */</span>
+  const FILINFO* <em>TimeDate</em>  <span class="c">/* Time and data to be set */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>Parameters</h4>
 <dl class="par">
 <dt>FileName</dt>
@@ -33,46 +33,37 @@ FRESULT f_utime (
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>Return Values</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>The function succeeded.</dd>
-<dt>FR_NO_FILE</dt>
-<dd>Could not find the file.</dd>
-<dt>FR_NO_PATH</dt>
-<dd>Could not find the path.</dd>
-<dt>FR_INVALID_NAME</dt>
-<dd>The file name is invalid.</dd>
-<dt>FR_INVALID_DRIVE</dt>
-<dd>The drive number is invalid.</dd>
-<dt>FR_NOT_READY</dt>
-<dd>The disk drive cannot work due to no medium in the drive or any other reason.</dd>
-<dt>FR_WRITE_PROTECTED</dt>
-<dd>The medium is write protected.</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>The function failed due to an error in the disk function.</dd>
-<dt>FR_INT_ERR</dt>
-<dd>The function failed due to a wrong FAT structure or an internal error.</dd>
-<dt>FR_NOT_ENABLED</dt>
-<dd>The logical drive has no work area.</dd>
-<dt>FR_NO_FILESYSTEM</dt>
-<dd>There is no valid FAT volume on the drive.</dd>
-</dl>
+<p>
+<a href="rc.html#ok">FR_OK</a>,
+<a href="rc.html#de">FR_DISK_ERR</a>,
+<a href="rc.html#ie">FR_INT_ERR</a>,
+<a href="rc.html#nr">FR_NOT_READY</a>,
+<a href="rc.html#ok">FR_NO_FILE</a>,
+<a href="rc.html#np">FR_NO_PATH</a>,
+<a href="rc.html#in">FR_INVALID_NAME</a>,
+<a href="rc.html#wp">FR_WRITE_PROTECTED</a>,
+<a href="rc.html#id">FR_INVALID_DRIVE</a>,
+<a href="rc.html#ne">FR_NOT_ENABLED</a>,
+<a href="rc.html#ns">FR_NO_FILESYSTEM</a>,
+<a href="rc.html#tm">FR_TIMEOUT</a>,
+<a href="rc.html#nc">FR_NOT_ENOUGH_CORE</a>
+</p>
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>Description</h4>
 <p>The f_utime function changes the timestamp of a file or directory</p>
 </div>
 
 
-<div class="para">
+<div class="para use">
 <h4>Example</h4>
 <pre>
 FRESULT set_timestamp (
-    char *obj,     <span>/* Pointer to the file name */</span>
+    char *obj,     <span class="c">/* Pointer to the file name */</span>
     int year,
     int month,
     int mday,
@@ -92,13 +83,13 @@ FRESULT set_timestamp (
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>QuickInfo</h4>
 <p>Available when <tt>_FS_READONLY == 0</tt> and <tt>_FS_MINIMIZE == 0</tt>.</p>
 </div>
 
 
-<div class="para">
+<div class="para ref">
 <h4>See Also</h4>
 <p><tt><a href="stat.html">f_stat</a>, <a href="sfileinfo.html">FILINFO</a></tt></p>
 </div>
diff --git a/doc/en/write.html b/doc/en/write.html
index c90200e..42ae73b 100644
--- a/doc/en/write.html
+++ b/doc/en/write.html
@@ -11,20 +11,20 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>f_write</h2>
 <p>The f_write writes data to a file.</p>
 <pre>
 FRESULT f_write (
-  FIL* <em>FileObject</em>,     <span>/* Pointer to the file object structure */</span>
-  const void* <em>Buffer</em>,  <span>/* Pointer to the data to be written */</span>
-  UINT <em>ByteToWrite</em>,    <span>/* Number of bytes to write */</span>
-  UINT* <em>ByteWritten</em>    <span>/* Pointer to the variable to return number of bytes written */</span>
+  FIL* <em>FileObject</em>,     <span class="c">/* Pointer to the file object structure */</span>
+  const void* <em>Buffer</em>,  <span class="c">/* Pointer to the data to be written */</span>
+  UINT <em>ByteToWrite</em>,    <span class="c">/* Number of bytes to write */</span>
+  UINT* <em>ByteWritten</em>    <span class="c">/* Pointer to the variable to return number of bytes written */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>Parameters</h4>
 <dl class="par">
 <dt>FileObject</dt>
@@ -39,38 +39,32 @@ FRESULT f_write (
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>Return Values</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>The function succeeded.</dd>
-<dt>FR_DENIED</dt>
-<dd>The function denied due to the file has been opened in non-write mode.</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>The function failed due to an error in the disk function.</dd>
-<dt>FR_INT_ERR</dt>
-<dd>The function failed due to a wrong FAT structure or an internal error.</dd>
-<dt>FR_NOT_READY</dt>
-<dd>The disk drive cannot work due to no medium in the drive or any other reason.</dd>
-<dt>FR_INVALID_OBJECT</dt>
-<dd>The file object is invalid.</dd>
-</dl>
+<p>
+<a href="rc.html#ok">FR_OK</a>,
+<a href="rc.html#de">FR_DISK_ERR</a>,
+<a href="rc.html#ie">FR_INT_ERR</a>,
+<a href="rc.html#nr">FR_NOT_READY</a>,
+<a href="rc.html#io">FR_INVALID_OBJECT</a>,
+<a href="rc.html#tm">FR_TIMEOUT</a>
+</p>
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>Description</h4>
 <p>The read/write pointer in the file object is increased in number of bytes written. After the function succeeded, <tt>*ByteWritten</tt> should be checked to detect the disk full. In case of <tt>*ByteWritten &lt; ByteToWrite</tt>, it means the volume got full during the write operation. The function can take a time when the volume is full or close to full.</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>QuickInfo</h4>
 <p>Available when <tt>_FS_READONLY == 0</tt>.</p>
 </div>
 
 
-<div class="para">
+<div class="para ref">
 <h4>See Also</h4>
 <p><tt><a href="open.html">f_open</a>, <a href="read.html">f_read</a>, <a href="putc.html">fputc</a>, <a href="puts.html">fputs</a>, <a href="printf.html">fprintf</a>, <a href="close.html">f_close</a>, <a href="sfile.html">FIL</a></tt></p>
 </div>
diff --git a/doc/img/f6.png b/doc/img/f6.png
new file mode 100644
index 0000000000000000000000000000000000000000..a7b0d71ed4709b57a7b633694eeb3e4d7080e92f
GIT binary patch
literal 1436
zcma)+c}&v>6vyj@iUM8(@di4SzyJ}DT0v2+2HILqQHna)EJI3x(x1d43=iz6MTe6^
zeyt)>lu)omIervyh>b8>O6lbKwIEUyXc?DI3v|`}u`Qd)l9$i>CNJN-y!VpFID+#v
zGTdZ{Kp>1TeqMnH#A2FW-&ndt&+(X)@AS#>NI<Z+J|hr1EEY>5k?3?flgUKr5CsJV
zy7Y7|m&@n#g+if7B<kwwQmIrro$jGYqe|~sN%0F$`sCGP(daj(#R$Z*br>(t;IoD5
zLM*w@XXE7qerp$tZgLyGzebdrN|$Y#HPBeXp{NY}HEPd2Y4WP&!t|?=O+BWh^_K4G
z7hOHgh@=7QU1ts!h)uj1Hv^n1b`dTrd|ka`O7YF2JsWJADmG?Vh5)ypb!;_;2mb|D
z61QbOV0-(oTV8<LyDeeKzF|gt#(Q!fV5y1zD>Vkvu5ReK2IotNuTw*>LUvxb!z>yR
z!^MsHEV6}yI5d@ee|P@5^9vrr^9c)qk&QLfGW7nbdMH%4c~aq(#c$gyqRk&bRmZ_1
zTEbLQ9_RRB!d@`R3ePlui??T|x&OHH7~^*p@hQ|7rhN!ev<VV>e44U4?m9h|XHwL5
z>%yrMzqG__eGJHz$um~a;6dB+h@?ko!deA<O6xc*b{>xxImh+AvNeyefuTThA1_rb
ze3=T(Hl#{;`v6{TFIc)_0_PIa3pO$iG+^tptFCmmBENbotA0OF^2iKIYL{!gyq5y7
zf}dbUS<;p_Q?uFsoZa&0HD#5$kahhaJKRBs)SRCZL1APuZMn2(_DSXGY(O+QDfU1=
zw89!k{n_QpfMz&$cl<VV{B;*3LCGWb;a5g2+{CLfk+IQ{RX)<m_U36yNhivcI1FE%
zc&{Qx_qdo>$bRqy+^Cs{@gMO?eT3jCh-0@k9FY&FF1vk?mDc=aYA8dn1$e8P2=yHi
zz6j;N#!0BJYNt1Mz^f+?F~ndFIa57ndM}Jk;oX>$2VX@h260t^DbQMjti-;Gx<<`e
zZhb>9Boq5t0JJkIlMZ^xkeK&V!iw%Swsq6!`VU7L{<RKEW7XoaT`JryCpbpOn$70}
zpb}+O%lYClJg*|>Wuq10$qQhZ-6PM(>cT3YAlg{JoYWl$Li_Yn_=^eA?(`D|%JTb3
z+oeJ~z;hrdl}eq#<Yy)JhbZ0a?xH^v&?wB%8CH$Aj0P)(5kN8G@4NVGEB~d2;Q1XA
z71C)`u*2iJn$jQfl11R4F4~n};;JTOW6Tc$l)!~J7Ts}xb0W`#Q|svDlWJ;-T=dvS
z43}L-&C6?}x=vfnMbmB7ZmyN<9n5FL(<wW&Wlu^a*}f&fn*_6yU8k)V1V!$OEVxC4
z*1MmKxy2N=XgugP%nx?0Kf9PabQ&i4%SUpw@|nA={=|2gobuu|g+>3kXbvqmq6Z?~
zDa_-73!9p961h2U*6!!1VTW=agwSOB{Az<R+kz;$`6C#h8a7vd{d(>lfJ$Mv4$s95
zT`=1#m8qko;JWgWXE2z;ep!BrgPoyjkLC&Nohd4NE6JX1K&uF=L83HHPBu}%F)4UB
zbG76t@mn?**x5TieuKEbaoSukD6m9JWT28^?9hX4t>JY`ZH`}th+Ap(Y~rH2=I76~
zb|aiQna(+Kx*%MW(Zn5F<yV@5t!s|$+!~pq`K^GO`JxzIZw(K+yfLo80B1i}%AX*&
qTYxUS{4v&sbPeUTapwQTNScu?_r6WXfd2m?5EyTq7w^!?j6VP#8tNVZ

literal 0
HcmV?d00001

diff --git a/doc/ja/appnote.html b/doc/ja/appnote.html
index f401b48..18c0848 100644
--- a/doc/ja/appnote.html
+++ b/doc/ja/appnote.html
@@ -42,24 +42,14 @@ FatFs繝｢繧ｸ繝･繝ｼ繝ｫ縺ｯANSI C(C89)貅匁侠縺ｧ險倩ｿｰ縺輔ｌ縺ｦ縺�繧九�ｮ縺ｧ縲、NSI C
 <p>蠢�隕√↑縺ｮ縺ｯ FatFs繝｢繧ｸ繝･繝ｼ繝ｫ縺ｮ隕∵ｱゅ☆繧九ョ繧｣繧ｹ繧ｯ髢｢謨ｰ繧堤畑諢上☆繧九％縺ｨ縺�縺代〒縲√◎繧御ｻ･螟悶↓縺吶ｋ縺薙→縺ｯ縺ゅｊ縺ｾ縺帙ｓ縲よ里縺ｫ蜍穂ｽ懊＠縺ｦ縺�繧九ョ繧｣繧ｹ繧ｯ髢｢謨ｰ縺後≠繧九↑繧峨◎縺ｮ API繧� FatFs縺ｫ蜷医ｏ縺帙ｋ縺�縺代〒貂医∩縺ｾ縺吶′縲∫┌縺�蝣ｴ蜷医�ｯ縺ｻ縺九°繧臥ｧｻ讀阪☆繧九°縲∵怙蛻昴°繧画嶌縺上°縺吶ｋ蠢�隕√′縺ゅｊ縺ｾ縺吶�ょｮ夂ｾｩ縺輔ｌ縺ｦ縺�繧句�ｨ縺ｦ縺ｮ髢｢謨ｰ縺悟ｸｸ縺ｫ蠢�隕√↑繧上¢縺ｧ縺ｯ縺ゅｊ縺ｾ縺帙ｓ縲ゆｾ九∴縺ｰ縲√Μ繝ｼ繝峨�ｻ繧ｪ繝ｳ繝ｪ繝ｼ讒区�舌〒縺ｯ譖ｸ縺崎ｾｼ縺ｿ邉ｻ髢｢謨ｰ縺ｯ蠢�隕√≠繧翫∪縺帙ｓ縲よｬ｡縺ｮ陦ｨ縺ｫ讒区�舌が繝励す繝ｧ繝ｳ縺ｨ隕∵ｱゅ＆繧後ｋ髢｢謨ｰ縺ｮ蟇ｾ蠢懊ｒ遉ｺ縺励∪縺吶��</p>
 <table class="lst2">
 <tr><th>繝ｦ繝ｼ繧ｶ菴懈�宣未謨ｰ</th><th>蠢�隕√→縺ｪ繧区擅莉ｶ</th><th>蛯呵��</th></tr>
-<tr><td>disk_initialize</td><td>蟶ｸ譎�</td><td rowspan="10">ffsample.zip (繧ｵ繝ｳ繝励Ν)<br>縺昴�ｮ莉殆eb荳翫↓螟壽焚</td></tr>
-<tr><td>disk_status</td><td>蟶ｸ譎�</td></tr>
-<tr><td>disk_read</td><td>蟶ｸ譎�</td></tr>
-<tr><td>disk_write</td><td>_FS_READONLY == 0</td></tr>
-<tr><td>disk_ioctl (CTRL_SYNC)</td><td>_FS_READONLY == 0</td></tr>
-<tr><td>disk_ioctl (GET_SECTOR_COUNT)</td><td>_USE_MKFS == 1</td></tr>
+<tr><td>disk_initialize<br>disk_status<br>disk_read</td><td>蟶ｸ譎�</td><td rowspan="5">ffsample.zip (繧ｵ繝ｳ繝励Ν)<br>縺昴�ｮ莉殆eb荳翫↓螟壽焚</td></tr>
+<tr><td>disk_write<br>get_fattime<br>disk_ioctl (CTRL_SYNC)</td><td>_FS_READONLY == 0</td></tr>
+<tr><td>disk_ioctl (GET_SECTOR_COUNT)<br>disk_ioctl (GET_BLOCK_SIZE)</td><td>_USE_MKFS == 1</td></tr>
 <tr><td>disk_ioctl (GET_SECTOR_SIZE)</td><td>_MAX_SS &gt;= 1024</td></tr>
-<tr><td>disk_ioctl (GET_BLOCK_SIZE)</td><td>_USE_MKFS == 1</td></tr>
 <tr><td>disk_ioctl (CTRL_ERASE_SECTOR)</td><td>_USE_ERASE == 1</td></tr>
-<tr><td>get_fattime</td><td>_FS_READONLY == 0</td></tr>
-<tr><td>ff_convert</td><td>_USE_LFN &gt;= 1</td><td rowspan="2">option/cc*.c</td></tr>
-<tr><td>ff_wtoupper</td><td>_USE_LFN &gt;= 1</td></tr>
-<tr><td>ff_cre_syncobj</td><td>_FS_REENTRANT == 1</td><td rowspan="6">option/syscall.c (繧ｵ繝ｳ繝励Ν)</td></tr>
-<tr><td>ff_del_syncobj</td><td>_FS_REENTRANT == 1</td></tr>
-<tr><td>ff_req_grant</td><td>_FS_REENTRANT == 1</td></tr>
-<tr><td>ff_rel_grant</td><td>_FS_REENTRANT == 1</td></tr>
-<tr><td>ff_mem_alloc</td><td>_USE_LFN == 3</td></tr>
-<tr><td>ff_mem_free</td><td>_USE_LFN == 3</td></tr>
+<tr><td>ff_convert<br>ff_wtoupper</td><td>_USE_LFN &gt;= 1</td><td>option/cc*.c</td></tr>
+<tr><td>ff_cre_syncobj<br>ff_rel_grant<br>ff_req_grant<br>ff_del_syncobj</td><td>_FS_REENTRANT == 1</td><td rowspan="2">option/syscall.c (繧ｵ繝ｳ繝励Ν)</td></tr>
+<tr><td>ff_mem_alloc<br>ff_mem_free</td><td>_USE_LFN == 3</td></tr>
 </table>
 </div>
 
@@ -77,19 +67,19 @@ FatFs繝｢繧ｸ繝･繝ｼ繝ｫ縺ｯANSI C(C89)貅匁侠縺ｧ險倩ｿｰ縺輔ｌ縺ｦ縺�繧九�ｮ縺ｧ縲、NSI C
 </div>
 
 <div class="para" id="memory">
-<h3>繝｡繝｢繝ｪ菴ｿ逕ｨ驥� (R0.08a)</h3>
-<p>谺｡縺ｮ陦ｨ縺ｫ縺�縺上▽縺九�ｮ繧ｿ繝ｼ繧ｲ繝�繝医↓縺翫¢繧九Γ繝｢繝ｪ菴ｿ逕ｨ驥上�ｮ萓九ｒ遉ｺ縺励∪縺吶�ゅユ繧ｹ繝域凾縺ｮ讒区�舌が繝励す繝ｧ繝ｳ縺ｯ縺昴�ｮ荳九�ｮ騾壹ｊ縺ｧ縺吶�よ焚蛟､縺ｮ蜊倅ｽ阪�ｯ繝舌う繝医〒縲�<em>D</em>縺ｯ隲也炊繝懊Μ繝･繝ｼ繝�謨ｰ縲�<em>F</em>縺ｯ蜷梧凾繧ｪ繝ｼ繝励Φ繝ｻ繝輔ぃ繧､繝ｫ謨ｰ繧堤､ｺ縺励∪縺吶�ゅさ繝ｳ繝代う繝ｩ縺ｮ譛�驕ｩ蛹悶が繝励す繝ｧ繝ｳ縺ｯ繧ｳ繝ｼ繝峨�ｻ繧ｵ繧､繧ｺ縺ｨ縺励※縺�縺ｾ縺吶��</p>
+<h3>繝｡繝｢繝ｪ菴ｿ逕ｨ驥� (R0.08b)</h3>
+<p>谺｡縺ｮ陦ｨ縺ｫ縺�縺上▽縺九�ｮ繧ｿ繝ｼ繧ｲ繝�繝医↓縺翫¢繧九Γ繝｢繝ｪ菴ｿ逕ｨ驥上�ｮ萓九ｒ遉ｺ縺励∪縺吶�ゅユ繧ｹ繝域凾縺ｮ讒区�舌が繝励す繝ｧ繝ｳ縺ｯ縺昴�ｮ荳九�ｮ騾壹ｊ縺ｧ縺吶�よ焚蛟､縺ｮ蜊倅ｽ阪�ｯ繝舌う繝医〒縲�<em>V</em>縺ｯ蜷梧凾繝槭え繝ｳ繝医�ｻ繝懊Μ繝･繝ｼ繝�謨ｰ縲�<em>F</em>縺ｯ蜷梧凾繧ｪ繝ｼ繝励Φ繝ｻ繝輔ぃ繧､繝ｫ謨ｰ繧堤､ｺ縺励∪縺吶�ゅさ繝ｳ繝代う繝ｩ縺ｮ譛�驕ｩ蛹悶が繝励す繝ｧ繝ｳ縺ｯ繧ｳ繝ｼ繝峨�ｻ繧ｵ繧､繧ｺ縺ｨ縺励※縺�縺ｾ縺吶��</p>
 <table class="lst2">
-<tr><th></th><th>AVR</th><th>H8/300H</th><th>PIC24</th><th>V850ES</th><th>SH-2A</th><th>ARM7</th><th>x86</th></tr>
-<tr><td>Compiler</td><td>WinAVR(gcc)</td><td>CH38</td><td>C30(gcc)</td><td>CA850</td><td>SHC</td><td>WinARM(gcc)</td><td>VC6</td></tr>
-<tr><td>_WORD_ACCESS</td><td>1</td><td>0</td><td>0</td><td>1</td><td>0</td><td>0</td><td>1</td></tr>
-<tr class="lst3"><td>text (Full, R/W)</td><td>12646</td><td>10686</td><td>11430</td><td>7732</td><td>8752</td><td>10560</td><td>7545</td></tr>
-<tr> <td>text (Min, R/W)</td><td>8306</td><td>6986</td><td>7413</td><td>4938</td><td>5576</td><td>6680</td><td>4923</td></tr>
-<tr><td>text (Full, R/O)</td><td>5960</td><td>4876</td><td>5250</td><td>3554</td><td>3804</td><td>4688</td><td>3450</td></tr>
-<tr> <td>text (Min, R/O)</td><td>4366</td><td>3770</td><td>3939</td><td>2684</td><td>2940</td><td>3452</td><td>2664</td></tr>
-<tr><td>bss</td><td>D*2 + 2</td><td>D*4 + 2</td><td>D*2 + 2</td><td>D*4 + 2</td><td>D*4 + 2</td><td>D*4 + 2</td><td>D*4 + 2</td></tr>
-<tr><td>Work area<br>(_FS_TINY == 0)</td><td>D*560 +<br>F*544</td><td>D*560 +<br>F*550</td><td>D*560 +<br>F*544</td><td>D*560 +<br>F*550</td><td>D*560 +<br>F*550</td><td>D*560 +<br>F*550</td><td>D*560 +<br>F*550</td></tr>
-<tr><td>Work area<br>(_FS_TINY == 1)</td><td>D*560 +<br>F*32</td><td>D*560 +<br>F*36</td><td>D*560 +<br>F*32</td><td>D*560 +<br>F*36</td><td>D*560 +<br>F*36</td><td>D*560 +<br>F*36</td><td>D*560 +<br>F*36</td></tr>
+<tr><th></th><th>ARM7<small><br>32bit</small></th><th>ARM7<small><br>Thumb</small></th><th>Cortex-M3<small><br>Thumb-2</small></th><th>AVR</th><th>H8/300H</th><th>PIC24</th><th>RL78</th><th>V850ES</th><th>SH-2A</th><th>RX62N</th><th>IA-32</th></tr>
+<tr><td>Compiler</td><td>GCC</td><td>GCC</td><td>GCC</td><td>GCC</td><td>CH38</td><td>C30</td><td>CC78K0R</td><td>CA850</td><td>SHC</td><td>RXC</td><td>VC6</td></tr>
+<tr><td>_WORD_ACCESS</td><td>0</td><td>0</td><td>0</td><td>1</td><td>0</td><td>0</td><td>0</td><td>1</td><td>0</td><td>1</td><td>1</td></tr>
+<tr class="lst3"><td>text (Full, R/W)</td><td>10495</td><td>7205</td><td>6661</td><td>12646</td><td>10686</td><td>11430</td><td>12967</td><td>7732</td><td>8752</td><td>5747</td><td>7545</td></tr>
+<tr> <td>text (Min, R/W)</td><td>6523</td><td>4749</td><td>4335</td><td>8306</td><td>6986</td><td>7413</td><td>8745</td><td>4938</td><td>5576</td><td>3746</td><td>4923</td></tr>
+<tr><td>text (Full, R/O)</td><td>4539</td><td>3183</td><td>2893</td><td>5960</td><td>4876</td><td>5250</td><td>6060</td><td>3554</td><td>3804</td><td>2659</td><td>3450</td></tr>
+<tr> <td>text (Min, R/O)</td><td>3307</td><td>2495</td><td>2191</td><td>4366</td><td>3770</td><td>3939</td><td>4604</td><td>2684</td><td>2940</td><td>2025</td><td>2664</td></tr>
+<tr><td>bss</td><td>D*4 + 2</td><td>D*4 + 2</td><td>D*4 + 2</td><td>D*2 + 2</td><td>D*4 + 2</td><td>D*2 + 2</td><td>D*2 + 2</td><td>D*4 + 2</td><td>D*4 + 2</td><td>D*4 + 2</td><td>D*4 + 2</td></tr>
+<tr><td>Work area<br>(_FS_TINY == 0)</td><td>V*560 +<br>F*550</td><td>V*560 +<br>F*550</td><td>V*560 +<br>F*550</td><td>V*560 +<br>F*544</td><td>V*560 +<br>F*550</td><td>V*560 +<br>F*544</td><td>V*560 +<br>F*544</td><td>V*560 +<br>F*544</td><td>V*560 +<br>F*550</td><td>V*560 +<br>F*550</td><td>V*560 +<br>F*550</td></tr>
+<tr><td>Work area<br>(_FS_TINY == 1)</td><td>V*560 +<br>F*36</td><td>V*560 +<br>F*36</td><td>V*560 +<br>F*36</td><td>V*560 +<br>F*32</td><td>V*560 +<br>F*36</td><td>V*560 +<br>F*32</td><td>V*560 +<br>F*32</td><td>V*560 +<br>F*36</td><td>V*560 +<br>F*36</td><td>V*560 +<br>F*36</td><td>V*560 +<br>F*36</td></tr>
 </table>
 <pre>
 _FS_READONLY     0 (R/W), 1 (R/O)
@@ -102,6 +92,7 @@ _CODE_PAGE       932 (Japanese Shift-JIS)
 _USE_LFN         0 (Disable LFN)
 _MAX_SS          512 (Fixed sector size)
 _FS_RPATH        0 (Disable relative path)
+_VOLUMES         D (Number of logical drives to be used)
 _MULTI_PARTITION 0 (Single partition per drive)
 _FS_REENTRANT    0 (Disable reentrancy)
 _FS_SHARE        0 (Disable shareing control)
@@ -113,7 +104,7 @@ _FS_SHARE        0 (Disable shareing control)
 <p>谺｡縺ｮ陦ｨ縺ｯ讒区�舌が繝励す繝ｧ繝ｳ縺ｮ險ｭ螳壼�､縺ｫ繧医ｊ縺ｩ縺ｮ讖溯�ｽ縺悟炎髯､縺輔ｌ繧九°繧堤､ｺ縺励∪縺吶��</p>
 <table class="lst2">
 <tr><td rowspan="2">Function</td><td colspan="4">_FS_MINIMIZE</td><td colspan="2">_FS_READONLY</td><td colspan="2">_USE_STRFUNC</td><td colspan="3">_FS_RPATH</td><td colspan="2">_USE_MKFS</td><td colspan="2">_USE_FORWARD</td></tr>
-<tr><td>0</td><td>1</td><td>2</td><td>3</td><td>0</td><td>1</td><td>0</td><td>1</td><td>0</td><td>1</td><td>2</td><td>0</td><td>1</td><td>0</td><td>1</td></tr>
+<tr><td>0</td><td>1</td><td>2</td><td>3</td><td>0</td><td>1</td><td>0&nbsp;&nbsp;</td><td>1/2</td><td>0</td><td>1</td><td>2</td><td>0</td><td>1</td><td>0</td><td>1</td></tr>
 <tr class="lst3"><td>f_mount</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
 <tr><td>f_open</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
 <tr><td>f_close</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
@@ -146,7 +137,7 @@ _FS_SHARE        0 (Disable shareing control)
 <div class="para" id="lfn">
 <h3>髟ｷ縺�繝輔ぃ繧､繝ｫ蜷�</h3>
 <p>FatFs繝｢繧ｸ繝･繝ｼ繝ｫ縺ｯR0.07縺九ｉ髟ｷ縺�繝輔ぃ繧､繝ｫ蜷�(LFN)繧偵し繝昴�ｼ繝医＠縺ｾ縺励◆縲ゅヵ繧｡繧､繝ｫ縺ｫ莉倥¢繧峨ｌ縺�2縺､縺ｮ逡ｰ縺ｪ繧句錐蜑�(遏ｭ縺�繝輔ぃ繝ｫ蜷阪→髟ｷ縺�繝輔ぃ繧､繝ｫ蜷�)縺ｯ縲’_readdir髢｢謨ｰ繧帝勁縺上ヵ繧｡繧､繝ｫ謫堺ｽ憺未謨ｰ縺ｫ縺翫＞縺ｦ騾城℃縺ｧ縺吶��LFN讖溯�ｽ繧呈怏蜉ｹ縺ｫ縺吶ｋ縺ｫ縺ｯ縲�<tt>_USE_LFN</tt>繧�1,2縺ｾ縺溘�ｯ3縺ｫ險ｭ螳壹＠縲ゞnicode螟画鋤髢｢謨ｰ<tt>ff_convert(), ff_wtoupper()</tt>繧偵�励Ο繧ｸ繧ｧ繧ｯ繝医↓霑ｽ蜉�縺励∪縺吶�ゅ％繧後ｉ縺ｮ髢｢謨ｰ縺ｯ縲�<tt>option/cc*.c</tt>縺ｫ蜷ｫ縺ｾ繧後※縺�縺ｾ縺吶��LFN讖溯�ｽ縺ｯ縲∝刈縺医※縺ゅｋ遞句ｺｦ縺ｮ繝ｯ繝ｼ繧ｯ繝ｻ繧ｨ繝ｪ繧｢(LFN謫堺ｽ懊ヰ繝�繝輔ぃ)繧貞ｿ�隕√→縺励∪縺吶�ゅヰ繝�繝輔ぃ髟ｷ縺ｯ菴ｿ逕ｨ縺ｧ縺阪ｋ繝｡繝｢繝ｪ縺ｫ蠢懊§縺ｦ<tt>_MAX_LFN</tt>繧ｪ繝励す繝ｧ繝ｳ縺ｧ讒区�舌＆繧後ｋ縺薙→縺後〒縺阪∪縺吶��LFN縺ｮ髟ｷ縺輔�ｯ譛�螟ｧ255譁�蟄励↓驕斐☆繧九�ｮ縺ｧ縲´FN螳悟�ｨ蟇ｾ蠢懊�ｮ縺溘ａ縺ｫ縺ｯ<tt>_MAX_LFN</tt>縺ｯ255縺ｫ險ｭ螳壹＆繧後ｋ縺ｹ縺阪〒縺吶�ゆｸ弱∴繧峨ｌ縺溘ヵ繧｡繧､繝ｫ蜷阪↓蟇ｾ縺励※繝舌ャ繝輔ぃ髟ｷ縺御ｸ崎ｶｳ縺励◆蝣ｴ蜷医�√ヵ繧｡繧､繝ｫ髢｢謨ｰ縺ｯ<tt>FR_INVALID_NAME</tt>縺ｧ螟ｱ謨励＠縺ｾ縺吶��</p>
-<p>LFN讖溯�ｽ繧偵Μ繧ｨ繝ｳ繝医Λ繝ｳ繝域ｧ区�舌〒菴ｿ逕ｨ縺吶ｋ蝣ｴ蜷医�ｯ縲�<tt>_USE_LFN</tt>縺ｯ2縺ｾ縺溘�ｯ3縺ｫ險ｭ螳壹＆繧後↑縺代ｌ縺ｰ縺ｪ繧翫∪縺帙ｓ縲ゅ％縺ｮ蝣ｴ蜷医�√ヵ繧｡繧､繝ｫ髢｢謨ｰ縺ｯ繝舌ャ繝輔ぃ繧偵せ繧ｿ繝�繧ｯ繧�繝偵�ｼ繝励↓遒ｺ菫昴＠縺ｾ縺吶�ゅヰ繝�繝輔ぃ繝ｻ繧ｵ繧､繧ｺ縺ｯ縲�<tt>(_MAX_LFN + 1) * 2</tt>繝舌う繝医↓縺ｪ繧九�ｮ縺ｧ縲√せ繧ｿ繝�繧ｯ遲峨�ｮ繧ｵ繧､繧ｺ縺ｯ縺昴ｌ繧定��諷ｮ縺励◆蜊∝��縺ｪ繧ｵ繧､繧ｺ縺ｧ縺ｪ縺代ｌ縺ｰ縺ｪ繧翫∪縺帙ｓ縲�</p>
+<p>菴輔ｉ縺九�ｮ繝ｪ繧ｨ繝ｳ繝医Λ繝ｳ繝育憾諷九�ｮ荳九〒LFN讖溯�ｽ繧剃ｽｿ逕ｨ縺吶ｋ蝣ｴ蜷医�ｯ縲�<tt>_USE_LFN</tt>縺ｯ2縺ｾ縺溘�ｯ3縺ｫ險ｭ螳壹＆繧後↑縺代ｌ縺ｰ縺ｪ繧翫∪縺帙ｓ縲ゅ％縺ｮ蝣ｴ蜷医�√ヵ繧｡繧､繝ｫ髢｢謨ｰ縺ｯ繝舌ャ繝輔ぃ繧偵せ繧ｿ繝�繧ｯ繧�繝偵�ｼ繝励↓遒ｺ菫昴＠縺ｾ縺吶�ゅヰ繝�繝輔ぃ繝ｻ繧ｵ繧､繧ｺ縺ｯ縲�<tt>(_MAX_LFN + 1) * 2</tt>繝舌う繝医↓縺ｪ繧九�ｮ縺ｧ縲√せ繧ｿ繝�繧ｯ遲峨�ｮ繧ｵ繧､繧ｺ縺ｯ縺昴ｌ繧定��諷ｮ縺励◆蜊∝��縺ｪ繧ｵ繧､繧ｺ縺ｧ縺ｪ縺代ｌ縺ｰ縺ｪ繧翫∪縺帙ｓ縲�</p>
 <table class="lst2 rset">
 <caption>LFN cfg on ARM7</caption>
 <tr><th>繧ｳ繝ｼ繝峨�壹�ｼ繧ｸ</th><th>繧ｳ繝ｼ繝峨し繧､繧ｺ[bytes]</th></tr>
@@ -157,7 +148,7 @@ _FS_SHARE        0 (Disable shareing control)
 <tr><td>950(Big5)</td><td>+111497</td></tr>
 </table>
 <p>LFN讖溯�ｽ縺ｮ荳頑焔縺ｪ菴ｿ縺�譁ｹ縺ｯ縲√◎繧後ｒ菴ｿ繧上↑縺�縺ｨ縺�縺�縺薙→縺ｧ縺吶�ょｮ滄圀縲∫ｵ�縺ｿ霎ｼ縺ｿ逕ｨ騾斐〒縺ｯLFN讖溯�ｽ縺後←縺�縺励※繧ょｿ�隕√↓縺ｪ繧九→縺�縺�縺薙→縺ｯ縺ｻ縺ｨ繧薙←辟｡縺�縺ｯ縺壹〒縺吶��LFN繧呈怏蜉ｹ縺ｫ縺吶ｋ縺ｨ縲�驕ｸ謚槭＆繧後◆繧ｳ繝ｼ繝峨�ｻ繝壹�ｼ繧ｸ縺ｫ蠢懊§縺ｦ繝｢繧ｸ繝･繝ｼ繝ｫ繝ｻ繧ｵ繧､繧ｺ縺悟｢怜､ｧ縺輔ｌ縺ｾ縺吶�ょ承縺ｮ陦ｨ縺ｫ蜷�繧ｳ繝ｼ繝峨�ｻ繝壹�ｼ繧ｸ縺ｫ縺翫¢繧記FN繧呈怏蜉ｹ縺ｫ縺励◆縺ｨ縺阪�ｮ繝｢繧ｸ繝･繝ｼ繝ｫ繝ｻ繧ｵ繧､繧ｺ縺ｮ驕輔＞繧堤､ｺ縺励∪縺吶�らｧ√◆縺｡譌･譛ｬ莠ｺ縲∽ｸｭ蝗ｽ莠ｺ縺翫ｈ縺ｳ髻灘嵜莠ｺ縺ｯ謨ｰ荳�縺ｮ譁�蟄励ｒ謖√■縺ｾ縺吶�ゆｸ榊ｹｸ縺ｪ縺薙→縺ｫ縲√◎繧後�ｯ蟾ｨ螟ｧ縺ｪOEM�ｼ攻nicode逶ｸ莠貞､画鋤繝�繝ｼ繝悶Ν繧定ｦ∵ｱゅ＠縲√Δ繧ｸ繝･繝ｼ繝ｫ繝ｻ繧ｵ繧､繧ｺ縺ｯ蜉�逧�縺ｫ蠅怜､ｧ縺輔ｌ縺ｾ縺吶�ゅ◎縺ｮ邨先棡縲´FN繧呈怏蜉ｹ縺ｫ縺励◆FatFs繝｢繧ｸ繝･繝ｼ繝ｫ縺ｯ縲、VR繧貞性繧�谿�縺ｩ縺ｮ8繝薙ャ繝医�ｻ繝槭う繧ｳ繝ｳ縺ｫ繧､繝ｳ繝励Μ繝｡繝ｳ繝医＆繧後ｋ縺薙→縺後〒縺阪∪縺帙ｓ縲�<small>縺薙ｌ縺ｯ髟ｷ縺�髢鍋ｧ√′LFN繧偵う繝ｳ繝励Μ繝｡繝ｳ繝医☆繧九％縺ｨ縺ｫ闊亥袖繧呈戟縺｣縺ｦ縺薙↑縺九▲縺溽炊逕ｱ縺ｧ縺吶��</small></p>
-<p>豕ｨ: 繝槭う繧ｯ繝ｭ繧ｽ繝輔ヨ遉ｾ縺ｯFAT繝輔ぃ繧､繝ｫ繝ｻ繧ｷ繧ｹ繝�繝�縺ｫ縺､縺�縺ｦ縺�縺上▽縺九�ｮ迚ｹ險ｱ繧剃ｿ晄怏縺励※縺�縺ｾ縺吶�ゅ＞縺壹ｌ繧�LFN縺ｮ螳溯｣�縺ｫ髢｢縺吶ｋ繧ゅ�ｮ縺ｧ縲´FN讖溯�ｽ縺ｫ蟇ｾ縺励※$0.25/unit縺ｮ繝ｩ繧､繧ｻ繝ｳ繧ｹ譁吶ｒ隕∵ｱゅ＠縺ｦ縺�縺ｾ縺吶�ゅ％縺ｮ縺溘ａ縲∝膚逕ｨ陬ｽ蜩√〒LFN讖溯�ｽ譛牙柑縺ｫ縺吶ｋ縺ｨ縺阪�ｯ縲∵怙邨ゆｻ募髄蝨ｰ縺ｫ繧医▲縺ｦ縺ｯ繝ｩ繧､繧ｻ繝ｳ繧ｹ縺悟ｿ�隕√°繧ら衍繧後∪縺帙ｓ縲�</p>
+<p>豕ｨ: 繝槭う繧ｯ繝ｭ繧ｽ繝輔ヨ遉ｾ縺ｯFAT繝輔ぃ繧､繝ｫ繝ｻ繧ｷ繧ｹ繝�繝�縺ｫ縺､縺�縺ｦ縺�縺上▽縺九�ｮ迚ｹ險ｱ繧剃ｿ晄怏縺励※縺�縺ｾ縺吶�ゅ＞縺壹ｌ繧�LFN縺ｮ螳溯｣�縺ｫ髢｢縺吶ｋ繧ゅ�ｮ縺ｧ縲´FN讖溯�ｽ縺ｫ蟇ｾ縺励※$0.25/unit縺ｮ繝ｩ繧､繧ｻ繝ｳ繧ｹ譁吶ｒ隕∵ｱゅ＠縺ｦ縺�縺ｾ縺吶��FAT32縺ｯ辟｡髢｢菫ゅ〒縺吶�ゅ％縺ｮ縺溘ａ縲∝膚逕ｨ陬ｽ蜩√〒LFN讖溯�ｽ譛牙柑縺ｫ縺吶ｋ縺ｨ縺阪�ｯ縲∵怙邨ゆｻ募髄蝨ｰ縺ｫ繧医▲縺ｦ縺ｯ繝ｩ繧､繧ｻ繝ｳ繧ｹ縺悟ｿ�隕√°繧ら衍繧後∪縺帙ｓ縲�</p>
 </div>
 
 <div class="para" id="jap">
@@ -173,15 +164,15 @@ _FS_SHARE        0 (Disable shareing control)
 <div class="para" id="reentrant">
 <h3>繝ｪ繧ｨ繝ｳ繝医Λ繝ｳ繧ｷ繝ｼ</h3>
 <p>莠偵＞縺ｫ逡ｰ縺ｪ繧九�懊Μ繝･繝ｼ繝�縺ｫ蟇ｾ縺吶ｋ繝輔ぃ繧､繝ｫ謫堺ｽ懊�ｯ繝ｪ繧ｨ繝ｳ繝医Λ繝ｳ繝医〒縲∝ｸｸ縺ｫ蜷梧凾蟷ｳ陦後↓蜍穂ｽ懊〒縺阪∪縺吶�ょ酔縺倥�懊Μ繝･繝ｼ繝�縺ｫ蟇ｾ縺励※縺ｯ繝�繝輔か繝ｫ繝医〒縺ｯ繝ｪ繧ｨ繝ｳ繝医Λ繝ｳ繝医〒縺ｯ縺ゅｊ縺ｾ縺帙ｓ縺後��<tt>_FS_REENTRANT</tt>繧ｪ繝励す繝ｧ繝ｳ縺ｧ繝ｪ繧ｨ繝ｳ繝医Λ繝ｳ繝�(繧ｹ繝ｬ繝�繝峨�ｻ繧ｻ繝ｼ繝�)縺ｫ縺吶ｋ縺薙→縺ｯ縺ｧ縺阪∪縺吶�ゅ％縺ｮ蝣ｴ蜷医�＾S萓晏ｭ倥�ｮ蜷梧悄繧ｪ繝悶ず繧ｧ繧ｯ繝域桃菴憺未謨ｰ<tt>ff_cre_syncobj, ff_del_syncobj, ff_req_grant</tt> 縺ｨ <tt>ff_rel_grant</tt>繧ゅ∪縺溘�励Ο繧ｸ繧ｧ繧ｯ繝医↓霑ｽ蜉�縺輔ｌ縺ｪ縺代ｌ縺ｰ縺ｪ繧翫∪縺帙ｓ縲ゅし繝ｳ繝励Ν繝ｻ繧ｳ繝ｼ繝峨→隗｣隱ｬ縺ｯ<tt>option/syncobj.c</tt>縺ｫ縺ゅｊ縺ｾ縺吶��</p>
-<p>縺ゅｋ繧ｿ繧ｹ繧ｯ縺後�懊Μ繝･繝ｼ繝�繧剃ｽｿ逕ｨ荳ｭ縺ｫ莉悶�ｮ繧ｿ繧ｹ繧ｯ縺九ｉ縺昴�ｮ繝懊Μ繝･繝ｼ繝�縺ｫ蟇ｾ縺吶ｋ繝輔ぃ繧､繝ｫ髢｢謨ｰ縺悟他縺ｳ蜃ｺ縺輔ｌ繧九→縲√◎縺ｮ繧｢繧ｯ繧ｻ繧ｹ縺ｯ蜈医�ｮ繧ｿ繧ｹ繧ｯ縺後ヵ繧｡繧､繝ｫ髢｢謨ｰ繧呈栢縺代ｋ縺ｾ縺ｧ繝悶Ο繝�繧ｯ縺輔ｌ縺ｾ縺吶�ゅｂ縺励�∝ｾ�縺｡譎る俣縺�<tt>_TIMEOUT</tt>縺ｧ謖�螳壹＆繧後◆譛滄俣繧定ｶ翫☆縺ｨ縲√◎縺ｮ髢｢謨ｰ縺ｯ<tt>FR_TIMEOUT</tt>縺ｧ繧｢繝懊�ｼ繝医＠縺ｾ縺吶�ゅ＞縺上▽縺九�ｮRTOS縺ｧ縺ｯ繧ｿ繧､繝�繧｢繧ｦ繝域ｩ溯�ｽ縺ｯ繧ｵ繝昴�ｼ繝医＆繧後↑縺�縺九ｂ遏･繧後∪縺帙ｓ縲�</p>
+<p>縺薙�ｮ蝣ｴ蜷医�√≠繧九ち繧ｹ繧ｯ縺後�懊Μ繝･繝ｼ繝�繧剃ｽｿ逕ｨ荳ｭ縺ｫ莉悶�ｮ繧ｿ繧ｹ繧ｯ縺九ｉ縺昴�ｮ繝懊Μ繝･繝ｼ繝�縺ｫ蟇ｾ縺吶ｋ繝輔ぃ繧､繝ｫ髢｢謨ｰ縺悟他縺ｳ蜃ｺ縺輔ｌ繧九→縲√◎縺ｮ繧｢繧ｯ繧ｻ繧ｹ縺ｯ蜈医�ｮ繧ｿ繧ｹ繧ｯ縺後ヵ繧｡繧､繝ｫ髢｢謨ｰ繧呈栢縺代ｋ縺ｾ縺ｧ繝悶Ο繝�繧ｯ縺輔ｌ縺ｾ縺吶�ゅｂ縺励�∝ｾ�縺｡譎る俣縺�<tt>_TIMEOUT</tt>縺ｧ謖�螳壹＆繧後◆譛滄俣繧定ｶ翫☆縺ｨ縲√◎縺ｮ髢｢謨ｰ縺ｯ<tt>FR_TIMEOUT</tt>縺ｧ繧｢繝懊�ｼ繝医＠縺ｾ縺吶�ゅ＞縺上▽縺九�ｮRTOS縺ｧ縺ｯ繧ｿ繧､繝�繧｢繧ｦ繝域ｩ溯�ｽ縺ｯ繧ｵ繝昴�ｼ繝医＆繧後↑縺�縺九ｂ遏･繧後∪縺帙ｓ縲�</p>
 <p>縺ｲ縺ｨ縺､縺ｮ萓句､悶′<tt>f_mount()</tt>縺ｨ<tt>f_mkfs()</tt>縺ｫ縺ゅｊ縺ｾ縺吶�ゅ％繧後ｉ縺ｮ髢｢謨ｰ縺ｯ蜷後§繝懊Μ繝･繝ｼ繝�縺ｫ蟇ｾ縺励※繝ｪ繧ｨ繝ｳ繝医Λ繝ｳ繝医〒縺ｯ縺ゅｊ縺ｾ縺帙ｓ縲ゅ％繧後ｉ縺ｮ髢｢謨ｰ繧剃ｽｿ逕ｨ縺吶ｋ縺ｨ縺阪�ｯ縲√い繝励Μ繧ｱ繝ｼ繧ｷ繝ｧ繝ｳ繝ｻ繝ｬ繝吶Ν縺ｧ謗剃ｻ門宛蠕｡縺励↑縺代ｌ縺ｰ縺ｪ繧翫∪縺帙ｓ縲�</p>
 <p>豕ｨ: 縺薙�ｮ繧ｻ繧ｯ繧ｷ繝ｧ繝ｳ縺ｯFatFs繝｢繧ｸ繝･繝ｼ繝ｫ縺昴ｌ閾ｪ菴薙�ｮ繝ｪ繧ｨ繝ｳ繝医Λ繝ｳ繧ｷ繝ｼ縺ｫ縺､縺�縺ｦ隱ｬ譏弱＠縺ｦ縺�縺ｾ縺吶�ゅョ繧｣繧ｹ繧ｯI/O繝｢繧ｸ繝･繝ｼ繝ｫ縺ｮ繝ｪ繧ｨ繝ｳ繝医Λ繝ｳ繧ｷ繝ｼ縺ｫ髢｢縺励※縺ｯ菴輔�ｮ蜑肴署繧ゅ≠繧翫∪縺帙ｓ縲�</p>
 </div>
 
 <div class="para" id="dup">
 <h3>螟夐�阪ヵ繧｡繧､繝ｫ繝ｻ繧｢繧ｯ繧ｻ繧ｹ</h3>
-<p>FatFs繝｢繧ｸ繝･繝ｼ繝ｫ縺ｧ縺ｯ繝�繝輔か繝ｫ繝医〒縺ｯ螟夐�阪い繧ｯ繧ｻ繧ｹ蛻ｶ蠕｡讖溯�ｽ繧偵し繝昴�ｼ繝医＠縺ｦ縺�縺ｾ縺帙ｓ縲ゅヵ繧｡繧､繝ｫ縺ｫ蟇ｾ縺吶ｋ螟夐�阪い繧ｯ繧ｻ繧ｹ縺ｯ縲√◎縺ｮ繧｢繧ｯ繧ｻ繧ｹ繝ｻ繝｢繝ｼ繝峨↓繧医▲縺ｦ蛻ｶ髯舌＆繧後∪縺吶�ゆｸ�縺､縺ｮ繝輔ぃ繧､繝ｫ縺ｫ蟇ｾ縺吶ｋ螟夐�阪が繝ｼ繝励Φ縺ｯ縲√◎繧後ｉ縺悟�ｨ縺ｦ繝ｪ繝ｼ繝峨�ｻ繝｢繝ｼ繝峨�ｮ縺ｨ縺阪↓髯舌▲縺ｦ險ｱ蜿ｯ縺輔ｌ縺ｾ縺吶�よ嶌縺崎ｾｼ縺ｿ繝｢繝ｼ繝峨ｒ蜷ｫ繧�螟夐�阪が繝ｼ繝励Φ縲√∪縺滄幕縺九ｌ縺ｦ縺�繧九ヵ繧｡繧､繝ｫ縺ｫ蟇ｾ縺吶ｋ繝ｪ繝阪�ｼ繝�繧�蜑企勁縲√き繝ｬ繝ｳ繝医�ｻ繝�繧｣繝ｬ繧ｯ繝医Μ縺ｮ蜑企勁繧定｡後▲縺ｦ縺ｯ縺ｪ繧翫∪縺帙ｓ縲ゅ＆繧ゅ↑縺�縺ｨ縲√◎縺ｮ繝懊Μ繝･繝ｼ繝�縺ｮFAT讒矩��縺檎�ｴ螢翫＆繧後ｋ蜿ｯ閭ｽ諤ｧ縺後≠繧翫∪縺吶��</p>
-<p><tt>_FS_SHARE</tt>縺ｫ1莉･荳翫�ｮ蛟､繧偵そ繝�繝医☆繧九％縺ｨ縺ｫ繧医ｊ縲√ヵ繧｡繧､繝ｫ蜊倅ｽ阪�ｮ謗剃ｻ門宛蠕｡繧定�ｪ蜍輔〒陦後≧縺薙→繧ゅ〒縺阪∪縺吶�ゅ％縺ｮ蝣ｴ蜷医�∽ｸ願ｨ倥�ｮ繝ｫ繝ｼ繝ｫ繧堤�ｴ縺｣縺溘が繝ｼ繝励Φ繝ｻ繝ｪ繝阪�ｼ繝�繝ｻ蜑企勁繧定ｩｦ縺ｿ繧九→縲√◎縺ｮ髢｢謨ｰ縺ｯ<tt>FR_LOCKED</tt>縺ｧ螟ｱ謨励＠縺ｾ縺吶��</p>
+<p>FatFs繝｢繧ｸ繝･繝ｼ繝ｫ縺ｧ縺ｯ繝�繝輔か繝ｫ繝医〒縺ｯ螟夐�阪い繧ｯ繧ｻ繧ｹ蛻ｶ蠕｡讖溯�ｽ繧偵し繝昴�ｼ繝医＠縺ｦ縺�縺ｾ縺帙ｓ縲ゅヵ繧｡繧､繝ｫ縺ｫ蟇ｾ縺吶ｋ螟夐�阪い繧ｯ繧ｻ繧ｹ縺ｯ縲√◎縺ｮ繧｢繧ｯ繧ｻ繧ｹ繝ｻ繝｢繝ｼ繝峨↓繧医▲縺ｦ蛻ｶ髯舌＆繧後∪縺吶�ゆｸ�縺､縺ｮ繝輔ぃ繧､繝ｫ縺ｫ蟇ｾ縺吶ｋ螟夐�阪が繝ｼ繝励Φ縺ｯ縲√◎繧後ｉ縺悟�ｨ縺ｦ繝ｪ繝ｼ繝峨�ｻ繝｢繝ｼ繝峨�ｮ縺ｨ縺阪↓髯舌▲縺ｦ險ｱ蜿ｯ縺輔ｌ縺ｾ縺吶�よ嶌縺崎ｾｼ縺ｿ繝｢繝ｼ繝峨ｒ蜷ｫ繧�螟夐�阪が繝ｼ繝励Φ縲√∪縺滄幕縺九ｌ縺ｦ縺�繧九ヵ繧｡繧､繝ｫ縺ｫ蟇ｾ縺吶ｋ繝ｪ繝阪�ｼ繝�繧�蜑企勁繧定｡後▲縺ｦ縺ｯ縺ｪ繧翫∪縺帙ｓ縲ゅ＆繧ゅ↑縺�縺ｨ縲√◎縺ｮ繝懊Μ繝･繝ｼ繝�縺ｮFAT讒矩��縺檎�ｴ螢翫＆繧後ｋ蜿ｯ閭ｽ諤ｧ縺後≠繧翫∪縺吶��</p>
+<p><tt>_FS_SHARE</tt>縺ｫ1莉･荳翫�ｮ蛟､(蛟､縺ｯ蜷梧凾縺ｫ邂｡逅�縺ｧ縺阪ｋ繝輔ぃ繧､繝ｫ謨ｰ)繧偵そ繝�繝医☆繧九％縺ｨ縺ｧ螟夐�阪い繧ｯ繧ｻ繧ｹ蛻ｶ蠕｡讖溯�ｽ縺梧怏蜉ｹ縺ｫ縺ｪ繧翫�√ヵ繧｡繧､繝ｫ蜊倅ｽ阪�ｮ謗剃ｻ門宛蠕｡繧定�ｪ蜍輔〒陦後≧縺薙→繧ゅ〒縺阪∪縺吶�ゅ％縺ｮ蝣ｴ蜷医�∽ｸ願ｨ倥�ｮ繝ｫ繝ｼ繝ｫ繧堤�ｴ縺｣縺溘が繝ｼ繝励Φ繝ｻ繝ｪ繝阪�ｼ繝�繝ｻ蜑企勁繧定ｩｦ縺ｿ繧九→縲√◎縺ｮ髢｢謨ｰ縺ｯ<tt>FR_LOCKED</tt>縺ｧ螟ｱ謨励＠縺ｾ縺吶��<tt>_FS_SHARE</tt>繧定ｶ翫∴縺滓焚縺ｮ繝輔ぃ繧､繝ｫ繧偵が繝ｼ繝励Φ縺励ｈ縺�縺ｨ縺吶ｋ縺ｨ縲�<tt>FR_TOO_MANY_OPEN_FILES</tt>縺ｧ螟ｱ謨励＠縺ｾ縺吶��</p>
 </div>
 
 <div class="para" id="fs1">
@@ -241,13 +232,13 @@ _FS_SHARE        0 (Disable shareing control)
 <h3>FatFs縺ｮ繝ｩ繧､繧ｻ繝ｳ繧ｹ縺ｫ縺､縺�縺ｦ</h3>
 <p>繧ｽ繝ｼ繧ｹ繝ｻ繝輔ぃ繧､繝ｫ縺ｮ繝倥ャ繝�縺ｫ繝ｩ繧､繧ｻ繝ｳ繧ｹ譚｡莉ｶ縺瑚ｨ倩ｿｰ縺輔ｌ縺ｦ縺�繧九�ｮ縺ｧ縲∝茜逕ｨ縺ｮ髫帙�ｯ縺昴ｌ縺ｫ蠕薙≧縺薙→縲り恭隱槭ｒ隱ｭ繧√↑縺�譁ｹ縺ｮ縺溘ａ縺ｫ莉･荳九↓譌･譛ｬ隱櫁ｨｳ繧堤､ｺ縺励※縺翫″縺ｾ縺吶��</p>
 <pre>/*----------------------------------------------------------------------------/
-/  FatFs - FAT file system module  R0.08a                   (C)ChaN, 2010
+/  FatFs - FAT file system module  R0.08b                   (C)ChaN, 2011
 /-----------------------------------------------------------------------------/
 / FatFs繝｢繧ｸ繝･繝ｼ繝ｫ縺ｯ縲∝ｰ剰ｦ乗ｨ｡縺ｪ邨�縺ｿ霎ｼ縺ｿ繧ｷ繧ｹ繝�繝�蜷代¢縺ｮ豎守畑FAT繝輔ぃ繧､繝ｫ繧ｷ繧ｹ繝�繝�繝ｻ
 / 繝｢繧ｸ繝･繝ｼ繝ｫ縺ｧ縺吶�ゅ％繧後�ｯ繝輔Μ繝ｼ繝ｻ繧ｽ繝輔ヨ繧ｦ繧ｧ繧｢縺ｨ縺励※縲∵蕗閧ｲ繝ｻ遐皮ｩｶ繝ｻ髢狗匱縺ｮ縺溘ａ縺ｫ
 / 莉･荳九�ｮ繝ｩ繧､繧ｻ繝ｳ繧ｹ繝ｻ繝昴Μ繧ｷ繝ｼ縺ｮ荳九〒蜈ｬ髢九＆繧後※縺�縺ｾ縺吶��
 /
-/  Copyright (C) 2010, ChaN, all right reserved.
+/  Copyright (C) 2011, ChaN, all right reserved.
 /
 / * FatFs繝｢繧ｸ繝･繝ｼ繝ｫ縺ｯ繝輔Μ繝ｼ繝ｻ繧ｽ繝輔ヨ繧ｦ繧ｧ繧｢縺ｧ縺ゅｊ縲√∪縺�<em>辟｡菫晁ｨｼ縺ｧ縺�</em>縲�
 / * 逕ｨ騾斐↓蛻ｶ髯舌�ｯ縺ゅｊ縺ｾ縺帙ｓ縲�<em>縺ゅ↑縺溘�ｮ雋ｬ莉ｻ縺ｮ荳九↓縺翫＞縺ｦ</em>縲∝�倶ｺｺ逧�繝ｻ髱槫霧蛻ｩ逧�縺ｪ
diff --git a/doc/ja/chdir.html b/doc/ja/chdir.html
index 90f8804..09ff901 100644
--- a/doc/ja/chdir.html
+++ b/doc/ja/chdir.html
@@ -11,17 +11,17 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>f_chdir</h2>
 <p>カレント・ディレクトリを変更します。</p>
 <pre>
 FRESULT f_chdir (
-  const XCHAR* <em>Path</em> <span>/* ディレクトリ名へのポインタ */</span>
+  const XCHAR* <em>Path</em> <span class="c">/* ディレクトリ名へのポインタ */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>引数</h4>
 <dl class="par">
 <dt>Path</dt>
@@ -30,48 +30,37 @@ FRESULT f_chdir (
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>戻り値</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>正常終了。</dd>
-<dt>FR_NO_FILE</dt>
-<dd>ファイルが見つからない。</dd>
-<dt>FR_NO_PATH</dt>
-<dd>パスが見つからない。</dd>
-<dt>FR_INVALID_NAME</dt>
-<dd>パス名が不正。</dd>
-<dt>FR_INVALID_DRIVE</dt>
-<dd>ドライブ番号が不正。</dd>
-<dt>FR_NOT_READY</dt>
-<dd>メディアがセットされていないなど、物理ドライブが動作不能状態。</dd>
-<dt>FR_WRITE_PROTECTED</dt>
-<dd>メディアが書き込み禁止状態。</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>ディスク・エラーによる失敗。</dd>
-<dt>FR_INT_ERR</dt>
-<dd>不正なFAT構造または内部エラーによる失敗。</dd>
-<dt>FR_NOT_ENABLED</dt>
-<dd>その論理ドライブにワーク・エリアが与えられていない。</dd>
-<dt>FR_NO_FILESYSTEM</dt>
-<dd>有効なFATボリュームが見つからない。</dd>
-</dl>
+<p>
+<a href="rc.html#ok">FR_OK</a>,
+<a href="rc.html#de">FR_DISK_ERR</a>,
+<a href="rc.html#ie">FR_INT_ERR</a>,
+<a href="rc.html#nr">FR_NOT_READY</a>,
+<a href="rc.html#ok">FR_NO_FILE</a>,
+<a href="rc.html#np">FR_NO_PATH</a>,
+<a href="rc.html#in">FR_INVALID_NAME</a>,
+<a href="rc.html#id">FR_INVALID_DRIVE</a>,
+<a href="rc.html#ne">FR_NOT_ENABLED</a>,
+<a href="rc.html#ns">FR_NO_FILESYSTEM</a>,
+<a href="rc.html#nc">FR_NOT_ENOUGH_CORE</a>
+</p>
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>解説</h4>
 <p>f_chdir関数は各ボリュームのカレント・ディレクトリを変更します。カレント・ディレクトリはファイル・システム・オブジェクトの初期化が行われたとき、ルート・ディレクトリに設定されます。カレント・ディレクトリは、ファイル・システム・オブジェクトに記録されるため、そのボリュームを使用する全てのタスクに対して影響を与えます。</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>対応情報</h4>
 <p><tt>_FS_RPATH == 1</tt>のときに使用可能となります。</p>
 </div>
 
 
-<div class="para">
+<div class="para exa">
 <h4>使用例</h4>
 <pre>
     // カレント・ドライブのカレント・ディレクトリを変更 (ルート下のdir1へ)
@@ -82,7 +71,7 @@ FRESULT f_chdir (
 </pre>
 </div>
 
-<div class="para">
+<div class="para ref">
 <h4>参照</h4>
 <p><tt><a href="chdrive.html">f_chdrive</a></tt></p>
 </div>
diff --git a/doc/ja/chdrive.html b/doc/ja/chdrive.html
index 187f9ed..9c8fccf 100644
--- a/doc/ja/chdrive.html
+++ b/doc/ja/chdrive.html
@@ -11,17 +11,17 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>f_chdrive</h2>
 <p>カレント・ドライブを変更します。</p>
 <pre>
 FRESULT f_chdrive (
-  BYTE <em>Drive</em> <span>/* 論理ドライブ番号 */</span>
+  BYTE <em>Drive</em> <span class="c">/* 論理ドライブ番号 */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>引数</h4>
 <dl class="par">
 <dt>Drive</dt>
@@ -30,30 +30,28 @@ FRESULT f_chdrive (
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>戻り値</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>正常終了。</dd>
-<dt>FR_INVALID_DRIVE</dt>
-<dd>ドライブ番号が不正。</dd>
-</dl>
+<p>
+<a href="rc.html#ok">FR_OK</a>,
+<a href="rc.html#id">FR_INVALID_DRIVE</a>
+</p>
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>解説</h4>
 <p>f_chdrive関数はカレント・ドライブを変更します。システム起動時の初期値は0です。この設定はFatFsモジュールの静的変数に記録されるため、全てのタスクに対して影響を与えます。</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>対応情報</h4>
 <p><tt>_FS_RPATH == 1</tt>のときに使用可能となります。</p>
 </div>
 
 
-<div class="para">
+<div class="para ref">
 <h4>参照</h4>
 <p><tt><a href="chdir.html">f_chdir</a></tt></p>
 </div>
diff --git a/doc/ja/chmod.html b/doc/ja/chmod.html
index 000b5a3..fe489e5 100644
--- a/doc/ja/chmod.html
+++ b/doc/ja/chmod.html
@@ -11,19 +11,19 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>f_chmod</h2>
 <p>ファイルまたはディレクトリの属性を変更します。</p>
 <pre>
 FRESULT f_chmod (
-  const TCHAR* <em>FileName</em>, <span>/* ファイルまたはディレクトリ名へのポインタ */</span>
-  BYTE <em>Attribute</em>,        <span>/* 設定値 */</span>
-  BYTE <em>AttributeMask</em>     <span>/* 変更マスク */</span>
+  const TCHAR* <em>FileName</em>, <span class="c">/* ファイルまたはディレクトリ名へのポインタ */</span>
+  BYTE <em>Attribute</em>,        <span class="c">/* 設定値 */</span>
+  BYTE <em>AttributeMask</em>     <span class="c">/* 変更マスク */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>引数</h4>
 <dl class="par">
 <dt>FileName</dt>
@@ -44,51 +44,42 @@ FRESULT f_chmod (
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>戻り値</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>正常終了。</dd>
-<dt>FR_NO_FILE</dt>
-<dd>ファイルが見つからない。</dd>
-<dt>FR_NO_PATH</dt>
-<dd>パスが見つからない。</dd>
-<dt>FR_INVALID_NAME</dt>
-<dd>パス名が不正。</dd>
-<dt>FR_INVALID_DRIVE</dt>
-<dd>ドライブ番号が不正。</dd>
-<dt>FR_NOT_READY</dt>
-<dd>メディアがセットされていないなど、物理ドライブが動作不能状態。</dd>
-<dt>FR_WRITE_PROTECTED</dt>
-<dd>メディアが書き込み禁止状態。</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>ディスク・エラーによる失敗。</dd>
-<dt>FR_INT_ERR</dt>
-<dd>不正なFAT構造または内部エラーによる失敗。</dd>
-<dt>FR_NOT_ENABLED</dt>
-<dd>その論理ドライブにワーク・エリアが与えられていない。</dd>
-<dt>FR_NO_FILESYSTEM</dt>
-<dd>有効なFATボリュームが見つからない。</dd>
-</dl>
+<p>
+<a href="rc.html#ok">FR_OK</a>,
+<a href="rc.html#de">FR_DISK_ERR</a>,
+<a href="rc.html#ie">FR_INT_ERR</a>,
+<a href="rc.html#nr">FR_NOT_READY</a>,
+<a href="rc.html#ok">FR_NO_FILE</a>,
+<a href="rc.html#np">FR_NO_PATH</a>,
+<a href="rc.html#in">FR_INVALID_NAME</a>,
+<a href="rc.html#wp">FR_WRITE_PROTECTED</a>,
+<a href="rc.html#ne">FR_NOT_ENABLED</a>,
+<a href="rc.html#ns">FR_NO_FILESYSTEM</a>,
+<a href="rc.html#tm">FR_TIMEOUT</a>,
+<a href="rc.html#lo">FR_LOCKED</a>,
+<a href="rc.html#nc">FR_NOT_ENOUGH_CORE</a>
+</p>
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>解説</h4>
 <p>ファイルまたはディレクトリの属性を変更します。</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>対応情報</h4>
 <p><tt>_FS_READONLY == 0</tt>で、且つ<tt>_FS_MINIMIZE == 0</tt>のとき使用可能です。</p>
 </div>
 
 
-<div class="para">
+<div class="para use">
 <h4>使用例</h4>
 <pre>
-    <span>/* リードオンリーをセット、アーカイブをクリア、その他は変更しない */</span>
+    <span class="c">/* リードオンリーをセット、アーカイブをクリア、その他は変更しない */</span>
     f_chmod("file.txt", AM_RDO, AM_RDO | AM_ARC);
 </pre>
 </div>
diff --git a/doc/ja/close.html b/doc/ja/close.html
index a22c8aa..1e9c19d 100644
--- a/doc/ja/close.html
+++ b/doc/ja/close.html
@@ -11,17 +11,17 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>f_close</h2>
 <p>ファイルを閉じます。</p>
 <pre>
 FRESULT f_close (
-  FIL* <em>FileObject</em>     <span>/* ファイル・オブジェクトへのポインタ */</span>
+  FIL* <em>FileObject</em>     <span class="c">/* ファイル・オブジェクトへのポインタ */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>引数</h4>
 <dl class="par">
 <dt>FileObject</dt>
@@ -30,36 +30,32 @@ FRESULT f_close (
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>戻り値</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>正常終了。</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>ディスク・エラーによる失敗。</dd>
-<dt>FR_INT_ERR</dt>
-<dd>不正なFAT構造または内部エラーによる失敗。</dd>
-<dt>FR_NOT_READY</dt>
-<dd>メディアがセットされていないなど、物理ドライブが動作不能状態。</dd>
-<dt>FR_INVALID_OBJECT</dt>
-<dd>無効なファイル・オブジェクト。</dd>
-</dl>
+<p>
+<a href="rc.html#ok">FR_OK</a>,
+<a href="rc.html#de">FR_DISK_ERR</a>,
+<a href="rc.html#ie">FR_INT_ERR</a>,
+<a href="rc.html#nr">FR_NOT_READY</a>,
+<a href="rc.html#io">FR_INVALID_OBJECT</a>,
+<a href="rc.html#tm">FR_TIMEOUT</a>
+</p>
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>解説</h4>
 <p>ファイルを閉じます。何らかの書き込みの行われたファイルの場合、キャッシュされた状態(リード/ライト・バッファ上のデータ、変更されたFATやディレクトリ項目)はディスクに書き戻されます。関数が正常終了すると、そのファイル・オブジェクトは無効になり、そのメモリも解放できます。</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>対応情報</h4>
 <p>全ての構成で使用可能です。</p>
 </div>
 
 
-<div class="para">
+<div class="para ref">
 <h4>参照</h4>
 <tt><a href="open.html">f_open</a>, <a href="read.html">f_read</a>, <a href="write.html">f_write</a>,  <a href="sync.html">f_sync</a>, <a href="sfile.html">FIL</a>, <a href="sfatfs.html">FATFS</a></tt>
 </div>
diff --git a/doc/ja/dinit.html b/doc/ja/dinit.html
index 5a8a111..4f05dd8 100644
--- a/doc/ja/dinit.html
+++ b/doc/ja/dinit.html
@@ -11,17 +11,17 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>disk_initialize</h2>
 <p>ディスク・ドライブを初期化します。</p>
 <pre>
 DSTATUS disk_initialize (
-  BYTE <em>Drive</em>      <span>/* 物理ドライブ番号 */</span>
+  BYTE <em>Drive</em>      <span class="c">/* 物理ドライブ番号 */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>引数</h4>
 <dl class="par">
 <dt>Drive</dt>
@@ -30,12 +30,12 @@ DSTATUS disk_initialize (
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>戻り値</h4>
 <p>この関数は戻り値としてディスク・ステータスを返します。ディスク・ステータスの詳細に関しては<tt><a href="dstat.html">disk_status()</a></tt>を参照してください。</p>
 </div>
 
-<div class="para">
+<div class="para desc">
 <h4>解説</h4>
 <p>ディスク・ドライブを初期化します。関数が成功すると、戻り値の<tt>STA_NOINIT</tt>フラグがクリアされます。</p>
 <p><em>アプリケーションからこの関数を呼び出すと、FATボリュームが破壊される可能性があります。エラー等により再初期化が必要なときは、<tt>f_mount()</tt>を使用します。</em>FatFsモジュールは、自動マウント動作により、必要に応じてこの関数を呼び出します。</p>
diff --git a/doc/ja/dioctl.html b/doc/ja/dioctl.html
index e272ead..52a3a15 100644
--- a/doc/ja/dioctl.html
+++ b/doc/ja/dioctl.html
@@ -11,19 +11,19 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>disk_ioctl</h2>
 <p>セクタの読み書き以外のディスク・ドライブ自体に対する様々な制御をします。</p>
 <pre>
 DRESULT disk_ioctl (
-  BYTE <em>Drive</em>,      <span>/* 物理ドライブ番号 */</span>
-  BYTE <em>Command</em>,    <span>/* 制御コマンド */</span>
-  void* <em>Buffer</em>     <span>/* データ受け渡しバッファ */</span>
+  BYTE <em>Drive</em>,      <span class="c">/* 物理ドライブ番号 */</span>
+  BYTE <em>Command</em>,    <span class="c">/* 制御コマンド */</span>
+  void* <em>Buffer</em>     <span class="c">/* データ受け渡しバッファ */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>引数</h4>
 <dl class="par">
 <dt>Drive</dt>
@@ -35,7 +35,7 @@ DRESULT disk_ioctl (
 </dl>
 </div>
 
-<div class="para">
+<div class="para ret">
 <h4>戻り値</h4>
 <dl class="ret">
 <dt>RES_OK (0)</dt>
@@ -49,7 +49,7 @@ DRESULT disk_ioctl (
 </dl>
 </div>
 
-<div class="para">
+<div class="para desc">
 <h4>解説</h4>
 <p>物理ドライブの種類によりサポートされるコマンドは異なりますが、FatFsモジュールでは、次の汎用コマンドのみ使用し、特定のハードウェアに依存した制御は行いません。</p>
 <table class="lst">
diff --git a/doc/ja/dread.html b/doc/ja/dread.html
index b5dca8d..9271649 100644
--- a/doc/ja/dread.html
+++ b/doc/ja/dread.html
@@ -11,20 +11,20 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>disk_read</h2>
 <p>ディスクからセクタを読み出します。</p>
 <pre>
 DRESULT disk_read (
-  BYTE <em>Drive</em>,          <span>/* 物理ドライブ番号 */</span>
-  BYTE* <em>Buffer</em>,        <span>/* 読み出しバッファへのポインタ */</span>
-  DWORD <em>SectorNumber</em>,  <span>/* 読み出し開始セクタ番号 */</span>
-  BYTE <em>SectorCount</em>     <span>/* 読み出しセクタ数 */</span>
+  BYTE <em>Drive</em>,          <span class="c">/* 物理ドライブ番号 */</span>
+  BYTE* <em>Buffer</em>,        <span class="c">/* 読み出しバッファへのポインタ */</span>
+  DWORD <em>SectorNumber</em>,  <span class="c">/* 読み出し開始セクタ番号 */</span>
+  BYTE <em>SectorCount</em>     <span class="c">/* 読み出しセクタ数 */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>引数</h4>
 <dl class="par">
 <dt>Drive</dt>
@@ -34,12 +34,12 @@ DRESULT disk_read (
 <dt>SectorNumber</dt>
 <dd>読み出しを開始するセクタ番号。LBAで指定します。</dd>
 <dt>SectorCount</dt>
-<dd>読み出すセクタ数。 1〜128の範囲で指定します。一般的に、複数セクタの転送要求はデバイスに対してマルチ・セクタ転送しなければなりません。複数のシングル・セクタ転送に分解した場合、読み出し速度が低下します。</dd>
+<dd>読み出すセクタ数。 1〜128の範囲で指定します。一般的に、複数セクタの転送要求はデバイスに対して可能な限りマルチ・セクタ転送しなければなりません。複数のシングル・セクタ転送に分解した場合、読み出し速度が低下します。</dd>
 </dl>
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>戻り値</h4>
 <dl class="ret">
 <dt>RES_OK (0)</dt>
diff --git a/doc/ja/dstat.html b/doc/ja/dstat.html
index a2ad745..0641478 100644
--- a/doc/ja/dstat.html
+++ b/doc/ja/dstat.html
@@ -11,17 +11,17 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>disk_status</h2>
 <p>ディスク・ドライブの状態を取得します。</p>
 <pre>
 DSTATUS disk_status (
-  BYTE <em>Drive</em>           <span>/* 物理ドライブ番号 */</span>
+  BYTE <em>Drive</em>           <span class="c">/* 物理ドライブ番号 */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>引数</h4>
 <dl class="par">
 <dt>Drive</dt>
@@ -30,7 +30,7 @@ DSTATUS disk_status (
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>戻り値</h4>
 <p>物理ドライブの状態が次のフラグの組み合わせの値で返されます。</p>
 <dl class="ret">
diff --git a/doc/ja/dwrite.html b/doc/ja/dwrite.html
index 556108c..1192f47 100644
--- a/doc/ja/dwrite.html
+++ b/doc/ja/dwrite.html
@@ -11,20 +11,20 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>disk_write</h2>
 <p>ディスクにデータを書き込みます。</p>
 <pre>
 DRESULT disk_write (
-  BYTE <em>Drive</em>,          /* 物理ドライブ番号 */
-  const BYTE* <em>Buffer</em>,  /* 書き込むデータへのポインタ */
-  DWORD <em>SectorNumber</em>,  /* 書き込み開始セクタ番号 */
-  BYTE <em>SectorCount</em>     /* 書き込みセクタ数 */
+  BYTE <em>Drive</em>,          <span class="c">/* 物理ドライブ番号 */</span>
+  const BYTE* <em>Buffer</em>,  <span class="c">/* 書き込むデータへのポインタ */</span>
+  DWORD <em>SectorNumber</em>,  <span class="c">/* 書き込み開始セクタ番号 */</span>
+  BYTE <em>SectorCount</em>     <span class="c">/* 書き込みセクタ数 */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>引数</h4>
 <dl class="par">
 <dt>Drive</dt>
@@ -34,12 +34,12 @@ DRESULT disk_write (
 <dt>SectorNumber</dt>
 <dd>書き込みを開始するセクタ番号。LBAで指定します。</dd>
 <dt>SectorCount</dt>
-<dd>書き込むセクタ数。 1〜128で指定します。一般的に、複数セクタの転送要求はデバイスに対してマルチ・セクタ転送しなければなりません。複数のシングル・セクタ転送に分解した場合、書き込み速度は極端に低下します。</dd>
+<dd>書き込むセクタ数。 1〜128で指定します。一般的に、複数セクタの転送要求はデバイスに対して可能な限りマルチ・セクタ転送しなければなりません。複数のシングル・セクタ転送に分解した場合、書き込み速度は極端に低下します。</dd>
 </dl>
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>戻り値</h4>
 <dl class="ret">
 <dt>RES_OK (0)</dt>
@@ -56,7 +56,7 @@ DRESULT disk_write (
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>解説</h4>
 <p>リード・オンリー構成ではこの関数は必要とされません。</p>
 </div>
diff --git a/doc/ja/eof.html b/doc/ja/eof.html
new file mode 100644
index 0000000..44e130c
--- /dev/null
+++ b/doc/ja/eof.html
@@ -0,0 +1,62 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="ja">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=Shift_JIS">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<link rel="up" title="FatFs" href="../00index_j.html">
+<link rel="alternate" hreflang="en" title="English" href="../en/eof.html">
+<link rel="stylesheet" href="../css_j.css" type="text/css" media="screen" title="ELM Default">
+<title>FatFs - f_eof</title>
+</head>
+
+<body>
+
+<div class="para func">
+<h2>f_eof</h2>
+<p>リード/ライト・ポインタがファイル終端に達しているかどうか調べます。.</p>
+<pre>
+int f_eof (
+  FIL* <em>FileObject</em>   <span class="c">/* ファイル・オブジェクト */</span>
+);
+</pre>
+</div>
+
+
+<div class="para arg">
+<h4>引数</h4>
+<dl class="par">
+<dt>FileObject</dt>
+<dd>ファイル・オブジェクト構造体へのポインタを指定します。</dd>
+</dl>
+</div>
+
+
+<div class="para ret">
+<h4>戻り値</h4>
+<p>リード/ライト・ポインタがファイル終端にあり読み出すデータがない場合は、0以外の値を返します。それ以外の時は0を返します。</p>
+</div>
+
+
+<div class="para desc">
+<h4>解説</h4>
+<p>f_eof関数は、現リビジョンではマクロとして実装されています。</p>
+<pre>
+<span class="k">#define</span> f_eof(fp) (((fp)->fptr) == ((fp)->fsize) ? 1 : 0)
+</pre>
+</div>
+
+
+<div class="para comp">
+<h4>対応情報</h4>
+<p>常に使用可能。</p>
+</div>
+
+
+<div class="para ref">
+<h4>参照</h4>
+<p><tt><a href="open.html">f_open</a>, <a href="lseek.html">f_lseek</a>, <a href="sfile.html">FIL</a></tt></p>
+</div>
+
+<p class="foot"><a href="../00index_j.html">戻る</a></p>
+</body>
+</html>
diff --git a/doc/ja/error.html b/doc/ja/error.html
new file mode 100644
index 0000000..e902ce1
--- /dev/null
+++ b/doc/ja/error.html
@@ -0,0 +1,62 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="ja">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=Shift_JIS">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<link rel="up" title="FatFs" href="../00index_j.html">
+<link rel="alternate" hreflang="en" title="English" href="../en/error.html">
+<link rel="stylesheet" href="../css_j.css" type="text/css" media="screen" title="ELM Default">
+<title>FatFs - f_error</title>
+</head>
+
+<body>
+
+<div class="para func">
+<h2>f_error</h2>
+<p>エラー発生の有無を調べます。</p>
+<pre>
+int f_error (
+  FIL* <em>FileObject</em>   <span class="c">/* ファイル・オブジェクト */</span>
+);
+</pre>
+</div>
+
+
+<div class="para arg">
+<h4>引数</h4>
+<dl class="par">
+<dt>FileObject</dt>
+<dd>ファイル・オブジェクト構造体へのポインタを指定します。</dd>
+</dl>
+</div>
+
+
+<div class="para ret">
+<h4>戻り値</h4>
+<p>ファイル操作中のエラーで処理が中断されている場合は、0以外の値を返します。それ以外の時は0を返します。</p>
+</div>
+
+
+<div class="para desc">
+<h4>解説</h4>
+<p>f_error関数は、現リビジョンではマクロとして実装されています。</p>
+<pre>
+<span class="k">#define</span> f_error(fp) (((fp)->flag & FA__ERROR) ? 1 : 0)
+</pre>
+</div>
+
+
+<div class="para comp">
+<h4>対応情報</h4>
+<p>常に使用可能。</p>
+</div>
+
+
+<div class="para ref">
+<h4>参照</h4>
+<p><tt><a href="open.html">f_open</a>, <a href="sfile.html">FIL</a></tt></p>
+</div>
+
+<p class="foot"><a href="../00index_j.html">戻る</a></p>
+</body>
+</html>
diff --git a/doc/ja/fattime.html b/doc/ja/fattime.html
index b4c2121..bf28294 100644
--- a/doc/ja/fattime.html
+++ b/doc/ja/fattime.html
@@ -11,7 +11,7 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>get_fattime</h2>
 <p>現在時刻を取得します。</p>
 <pre>
@@ -20,7 +20,7 @@ DWORD get_fattime (void);
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>戻り値</h4>
 <p>現在のローカル・タイムが<tt>DWORD</tt>値にパックされて返されます。ビット・フィールドは次に示すようになります。</p>
 <dl>
@@ -40,7 +40,7 @@ DWORD get_fattime (void);
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>解説</h4>
 <p>RTCをサポートしないシステムでも、何らかの日付として有効な値を返さなければなりません。0を返した場合、そのファイルは日付を持ちません。リード・オンリー構成ではこの関数は必要とされません。</p>
 </div>
diff --git a/doc/ja/filename.html b/doc/ja/filename.html
index 3f93f2f..f82ed4b 100644
--- a/doc/ja/filename.html
+++ b/doc/ja/filename.html
@@ -6,15 +6,16 @@
 <link rel="up" title="FatFs" href="../00index_j.html">
 <link rel="alternate" hreflang="en" title="English" href="../en/filename.html">
 <link rel="stylesheet" href="../css_j.css" type="text/css" media="screen" title="ELM Default">
-<title>FatFs - 繝輔ぃ繧､繝ｫ繝ｻ繝�繧｣繝ｬ繧ｯ繝医Μ縺ｮ謖�螳壽婿豕�</title>
+<title>FatFs - 繝代せ蜷阪�ｮ繝輔か繝ｼ繝槭ャ繝�</title>
 </head>
 
 <body>
+<h1>繝代せ蜷阪�ｮ繝輔か繝ｼ繝槭ャ繝�</h1>
 <div class="para">
-<h3>繝輔ぃ繧､繝ｫ繝ｻ繝�繧｣繝ｬ繧ｯ繝医Μ縺ｮ謖�螳壽婿豕�</h3>
-<p>FatFs繝｢繧ｸ繝･繝ｼ繝ｫ縺ｧ縺ｮ繝輔ぃ繧､繝ｫ縲√ョ繧｣繝ｬ繧ｯ繝医Μ縲√ラ繝ｩ繧､繝悶�ｮ謖�螳壽婿豕輔�ｯDOS/Windows縺ｨ縺ｻ縺ｼ蜷後§縺ｧ縺吶�ゅヱ繧ｹ蜷阪�ｮ繝輔か繝ｼ繝槭ャ繝医�ｯ谺｡縺ｮ騾壹ｊ縺ｧ縺吶��</p>
+<h3>繝輔ぃ繧､繝ｫ繝ｻ繝�繧｣繝ｬ繧ｯ繝医Μ蜷�</h3>
+<p>FatFs繝｢繧ｸ繝･繝ｼ繝ｫ縺ｧ縺ｮ繝輔ぃ繧､繝ｫ縲√ョ繧｣繝ｬ繧ｯ繝医Μ縲√ラ繝ｩ繧､繝悶�ｮ謖�螳壽婿豕輔�ｯDOS/Windows API縺ｨ縺ｻ縺ｼ蜷後§縺ｧ縺吶�ゅヱ繧ｹ蜷阪�ｮ繝輔か繝ｼ繝槭ャ繝医�ｯ谺｡縺ｮ騾壹ｊ縺ｧ縺吶��</p>
 <p><tt>"[隲也炊繝峨Λ繧､繝也分蜿ｷ:][/]繝�繧｣繝ｬ繧ｯ繝医Μ蜷�/繝輔ぃ繧､繝ｫ蜷�"</tt></p>
-<p>FatFs繝｢繧ｸ繝･繝ｼ繝ｫ縺ｯ髟ｷ縺�繝輔ぃ繧､繝ｫ蜷�(LFN)縺翫ｈ縺ｳ8.3蠖｢蠑上ヵ繧｡繧､繝ｫ蜷�(SFN)縺ｫ蟇ｾ蠢懊＠縺ｦ縺�縺ｾ縺吶��LFN縺ｯ縲�<tt>(_USE_LFN &gt; 0)</tt>縺ｮ縺ｨ縺堺ｽｿ逕ｨ蜿ｯ閭ｽ縺ｫ縺ｪ繧翫∪縺吶��DOS/Windows縺ｨ縺ｮ驕輔＞縺ｯ縲√ョ繧｣繝ｬ繧ｯ繝医Μ繝ｻ繧ｻ繝代Ξ繝ｼ繧ｿ縺ｨ隲也炊繝峨Λ繧､繝也分蜿ｷ縺ｮ謖�螳壹〒縺吶�ゅョ繧｣繝ｬ繧ｯ繝医Μ繝ｻ繧ｻ繝代Ξ繝ｼ繧ｿ縺ｫ縺ｯ / 縺ｾ縺溘�ｯ \ 繧剃ｽｿ逕ｨ縺励∪縺吶�りｫ也炊繝峨Λ繧､繝也分蜿ｷ縺ｯ縲�'0'�ｽ�'9'縺ｮ荳�譁�蟄励�ｮ謨ｰ蟄励→繧ｳ繝ｭ繝ｳ縺ｧ謖�螳壹＠縲∫怐逡･縺励◆蝣ｴ蜷医�ｯ繝�繝輔か繝ｫ繝医�ｻ繝峨Λ繧､繝�(0縺ｾ縺溘�ｯ繧ｫ繝ｬ繝ｳ繝医�ｻ繝峨Λ繧､繝�)縺碁∈謚槭＆繧後∪縺吶��</p>
+<p>FatFs繝｢繧ｸ繝･繝ｼ繝ｫ縺ｯ髟ｷ縺�繝輔ぃ繧､繝ｫ蜷�(LFN)縺翫ｈ縺ｳ8.3蠖｢蠑上ヵ繧｡繧､繝ｫ蜷�(SFN)縺ｫ蟇ｾ蠢懊＠縺ｦ縺�縺ｾ縺吶��LFN縺ｯ縲�<tt>(_USE_LFN &gt; 0)</tt>縺ｮ縺ｨ縺堺ｽｿ逕ｨ蜿ｯ閭ｽ縺ｫ縺ｪ繧翫∪縺吶�ゅョ繧｣繝ｬ繧ｯ繝医Μ繝ｻ繧ｻ繝代Ξ繝ｼ繧ｿ縺ｫ縺ｯDOS/Windows API縺ｨ蜷後§縺� / 縺ｨ \ 繧剃ｽｿ逕ｨ縺励∪縺吶�る�｣邯壹＠縺溘そ繝代Ξ繝ｼ繧ｿ縺ｯ辟｡隕悶＆繧�1蛟九→縺励※謇ｱ繧上ｌ縺ｾ縺吶�ょ髪荳�縺ｮ驕輔＞縺ｯ縲∬ｫ也炊繝峨Λ繧､繝悶�ｮ謖�螳壹□縺代〒縺吶�りｫ也炊繝峨Λ繧､繝也分蜿ｷ縺ｯ縲�'0'�ｽ�'9'縺ｮ荳�譁�蟄励�ｮ謨ｰ蟄励→繧ｳ繝ｭ繝ｳ縺ｧ謖�螳壹＠縲∫怐逡･縺励◆蝣ｴ蜷医�ｯ繝�繝輔か繝ｫ繝医�ｻ繝峨Λ繧､繝�(0縺ｾ縺溘�ｯ繧ｫ繝ｬ繝ｳ繝医�ｻ繝峨Λ繧､繝�)縺碁∈謚槭＆繧後∪縺吶��</p>
 <p>Nul譁�蟄励→蛻ｶ蠕｡譁�蟄�(\0�ｽ杤x1F)縺ｯ縲√ヱ繧ｹ蜷阪�ｮ邨らｫｯ縺ｨ縺励※隱崎ｭ倥＆繧後∪縺吶�ゅヱ繧ｹ蜷阪↓蜈郁｡後≠繧九＞縺ｯ荳ｭ縺ｫ蜷ｫ縺ｾ繧後ｋ繧ｹ繝壹�ｼ繧ｹ縺ｯ縲´FN讒区�舌〒縺ｯ蜷榊燕縺ｮ荳�驛ｨ縺ｨ縺励※譛牙柑縺ｧ縺吶′縲�髱朖FN讒区�舌〒縺ｯ繝代せ蜷阪�ｮ邨らｫｯ縺ｨ縺励※隱崎ｭ倥＆繧後∪縺吶��</p>
 <p>讓呎ｺ匁ｧ区��<tt>(_FS_RPATH == 0)</tt>縺ｮ縺ｨ縺阪�ｯ縲∝�ｨ縺ｦ縺ｮ繧ｪ繝悶ず繧ｧ繧ｯ繝医′繝ｫ繝ｼ繝医�ｻ繝�繧｣繝ｬ繧ｯ繝医Μ縺九ｉ霎ｿ繧狗ｵｶ蟇ｾ繝代せ縺ｧ謖�螳壹＆繧後∪縺吶�０S謖�蜷代↑繧ｫ繝ｬ繝ｳ繝医�ｻ繝�繧｣繝ｬ繧ｯ繝医Μ縺ｨ縺�縺�讎ょｿｵ縺ｯ辟｡縺上�√∪縺溘ラ繝�繝医�ｻ繝�繧｣繝ｬ繧ｯ繝医Μ(&quot;.&quot;繧�&quot;..&quot;)縺ｯ菴ｿ逕ｨ縺ｧ縺阪∪縺帙ｓ縲ゅヱ繧ｹ蜷榊�磯�ｭ縺ｮ繧ｻ繝代Ξ繝ｼ繧ｿ縺ｯ辟｡隕悶＆繧後∪縺吶�ゅョ繝輔か繝ｫ繝医�ｻ繝峨Λ繧､繝也分蜿ｷ縺ｯ蟶ｸ縺ｫ0縺ｫ縺ｪ繧翫∪縺吶��</p>
 <p>逶ｸ蟇ｾ繝代せ繧呈怏蜉ｹ<tt>(_FS_RPATH == 1)</tt>縺ｫ縺励◆縺ｨ縺阪�ｯ縲∝�郁｡後☆繧九そ繝代Ξ繝ｼ繧ｿ縺ｮ譛臥┌縺ｫ繧医▲縺ｦ讀懃ｴ｢髢句ｧ九ョ繧｣繝ｬ繧ｯ繝医Μ縺悟､峨ｏ繧翫�√そ繝代Ξ繝ｼ繧ｿ縺後≠繧句�ｴ蜷医�ｯ繝ｫ繝ｼ繝医�ｻ繝�繧｣繝ｬ繧ｯ繝医Μ縺九ｉ縲∫┌縺�蝣ｴ蜷医�ｯ<a href="chdir.html">f_chdir髢｢謨ｰ</a>縺ｧ險ｭ螳壹＆繧後ｋ繧ｫ繝ｬ繝ｳ繝医�ｻ繝�繧｣繝ｬ繧ｯ繝医Μ縺九ｉ縺ｫ縺ｪ繧翫∪縺吶�ゅ∪縺溘ヱ繧ｹ蜷阪↓繝峨ャ繝医�ｻ繝�繧｣繝ｬ繧ｯ繝医Μ縺御ｽｿ逕ｨ縺ｧ縺阪∪縺吶�ゅョ繝輔か繝ｫ繝医�ｻ繝峨Λ繧､繝也分蜿ｷ縺ｯ<a href="chdrive.html">f_chdrive髢｢謨ｰ</a>縺ｧ險ｭ螳壹＆繧後◆蛟､縺ｨ縺ｪ繧翫∪縺吶��</p>
@@ -39,9 +40,9 @@
 <h3>Unicode API</h3>
 <p>繝輔ぃ繧､繝ｫ髢｢謨ｰ縺ｮ蜈･蜃ｺ蜉帙�ｮ縺�縺｡繝輔ぃ繧､繝ｫ蜷阪ｄ繝代せ蜷阪ｒ謖�螳壹☆繧句ｼ墓焚縺ｮ蝙九�ｯ縲�<tt>TCHAR</tt>縺ｧ螳夂ｾｩ縺輔ｌ縺ｦ縺�縺ｾ縺吶′縲√％繧後�ｯ<tt>char</tt>縺ｮ繧ｨ繝ｪ繧｢繧ｹ縺ｫ縺ｪ縺｣縺ｦ縺�縺ｾ縺吶�ゅ◎縺励※縲�<tt>_CODE_PAGE</tt>縺ｧ謖�螳壹＆繧後ｋ ANSI/OEM繧ｳ繝ｼ繝�(SBCS縺ｾ縺溘�ｯDBCS)縺ｮ譁�蟄怜�励→縺励※謇ｱ繧上ｌ縺ｾ縺吶�ゅヵ繧｡繧､繝ｫ蜷榊�･蜃ｺ蜉帙ｒUnicode縺ｨ縺吶ｋ讒区��(LFN讒区�舌〒縲√°縺､<tt>_LFN_UNICODE</tt>繧� 1)縺ｫ縺励◆縺ｨ縺阪�ｯ縲�<tt>TCHAR</tt>縺ｯ繝ｯ繧､繝画枚蟄�(<tt>unsigned short</tt>)縺ｫ蛻�繧頑崛繧上ｊ縲√ヱ繧ｹ蜷阪↓Unicode繧剃ｽｿ逕ｨ縺吶ｋ繧医≧縺ｫ縺ｪ繧翫∪縺吶�ゅ％繧後↓繧医ｊ LFN繝輔Ν蟇ｾ蠢懊→縺ｪ繧翫�、NSI/OEM繧ｳ繝ｼ繝峨↓縺ｪ縺�譁�蟄�(縺溘→縺医�ｰ 笨昶亂笨｡笘ｸ笘ｭ縺ｪ縺ｩ)繧ゆｽｿ逕ｨ縺ｧ縺阪∪縺吶�ゅ％縺ｮ險ｭ螳壹�ｯ譁�蟄怜�怜�･蜃ｺ蜉幃未謨ｰ縺ｮ繝�繝ｼ繧ｿ蝙九→繧ｨ繝ｳ繧ｳ繝ｼ繝�繧｣繝ｳ繧ｰ縺ｫ繧ょｽｱ髻ｿ繧剃ｸ弱∴縺ｾ縺吶�ゅΜ繝�繝ｩ繝ｫ譁�蟄怜�励ｒ螳夂ｾｩ縺吶ｋ縺ｨ縺阪�∵ｬ｡縺ｫ遉ｺ縺吶ｈ縺�縺ｫ<tt>_T(s)</tt>縺翫ｈ縺ｳ<tt>_TEXT(s)</tt>繝槭け繝ｭ繧剃ｽｿ縺｣縺ｦANSI/OEM縺ｨUnicode繧定�ｪ蜍募��繧頑崛縺医☆繧九％縺ｨ縺後〒縺阪∪縺吶��</p>
 <pre>
- f_open(fp, "filename.txt", FA_READ);      <span>/* ANSI/OEM蟆ら畑繧ｳ繝ｼ繝� */</span>
- f_open(fp, L"filename.txt", FA_READ);     <span>/* Unicode蟆ら畑繧ｳ繝ｼ繝� */</span>
- f_open(fp, _T("filename.txt"), FA_READ);  <span>/* 荳｡逕ｨ繧ｳ繝ｼ繝� */</span>
+ f_open(fp, "filename.txt", FA_READ);      <span class="c">/* ANSI/OEM蟆ら畑繧ｳ繝ｼ繝� */</span>
+ f_open(fp, L"filename.txt", FA_READ);     <span class="c">/* Unicode蟆ら畑繧ｳ繝ｼ繝� */</span>
+ f_open(fp, _T("filename.txt"), FA_READ);  <span class="c">/* 荳｡逕ｨ繧ｳ繝ｼ繝� */</span>
 </pre>
 </div>
 
@@ -54,10 +55,10 @@
    隲也炊繝峨Λ繧､繝�3繧堤黄逅�繝峨Λ繧､繝�1(繝ｪ繝�繝ｼ繝舌ヶ繝ｫ繝ｻ繝�繧｣繧ｹ繧ｯ)縺ｫ蜑ｲ繧雁ｽ薙※繧句�ｴ蜷医��
 
 const PARTITION Drives[] = {
-    {0, 0},     <span>/* Logical drive 0 ==> Physical drive 0, 1st partition */</span>
-    {0, 1},     <span>/* Logical drive 1 ==> Physical drive 0, 2nd partition */</span>
-    {0, 2},     <span>/* Logical drive 2 ==> Physical drive 0, 3rd partition */</span>
-    {1, 0}      <span>/* Logical drive 3 ==> Physical drive 1 */</span>
+    {0, 0},     <span class="c">/* Logical drive 0 ==> Physical drive 0, 1st partition */</span>
+    {0, 1},     <span class="c">/* Logical drive 1 ==> Physical drive 0, 2nd partition */</span>
+    {0, 2},     <span class="c">/* Logical drive 2 ==> Physical drive 0, 3rd partition */</span>
+    {1, 0}      <span class="c">/* Logical drive 3 ==> Physical drive 1 */</span>
 };
 </pre>
 <p>隍�謨ｰ蛹ｺ逕ｻ謖�螳壹ｒ菴ｿ逕ｨ縺吶ｋ蝣ｴ蜷医�∵ｬ｡縺ｮ轤ｹ縺ｫ豕ｨ諢上＠縺ｪ縺代ｌ縺ｰ縺ｪ繧翫∪縺帙ｓ縲�
@@ -66,7 +67,6 @@ const PARTITION Drives[] = {
 <li>迚ｩ逅�繝峨Λ繧､繝悶′SFD蠖｢蠑�(蛹ｺ逕ｻ繝�繝ｼ繝悶Ν辟｡縺�)縺ｮ蝣ｴ蜷医�∝玄逕ｻ謖�螳壹�ｯ辟｡隕悶＆繧後ｋ縲�</li>
 <li>隍�謨ｰ縺ｮ隲也炊繝峨Λ繧､繝悶ｒ謖√▽迚ｩ逅�繝峨Λ繧､繝悶�ｯ縲∝崋螳壹ョ繧｣繧ｹ繧ｯ縺ｧ縺ｪ縺代ｌ縺ｰ縺ｪ繧峨↑縺�縲�</li>
 </ul>
-</div>
 
 </body>
 </html>
diff --git a/doc/ja/forward.html b/doc/ja/forward.html
index fed6bdf..fd40730 100644
--- a/doc/ja/forward.html
+++ b/doc/ja/forward.html
@@ -11,20 +11,20 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>f_forward</h2>
 <p>ファイルからデータを読み出し、送信ストリームに直接転送します。</p>
 <pre>
 FRESULT f_forward (
-  FIL* <em>FileObject</em>,                 <span>/* ファイル・オブジェクト構造体 */</span>
-  UINT (*<em>Func</em>)(const BYTE*,UINT),  <span>/* データ転送関数 */</span>
-  UINT <em>ByteToFwd</em>,                  <span>/* 転送するバイト数 */</span>
-  UINT* <em>ByteFwd</em>                    <span>/* 転送されたバイト数 */</span>
+  FIL* <em>FileObject</em>,                 <span class="c">/* ファイル・オブジェクト構造体 */</span>
+  UINT (*<em>Func</em>)(const BYTE*,UINT),  <span class="c">/* データ転送関数 */</span>
+  UINT <em>ByteToFwd</em>,                  <span class="c">/* 転送するバイト数 */</span>
+  UINT* <em>ByteFwd</em>                    <span class="c">/* 転送されたバイト数 */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>引数</h4>
 <dl class="par">
 <dt>FileObject</dt>
@@ -39,60 +39,55 @@ FRESULT f_forward (
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>戻り値</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>正常終了。</dd>
-<dt>FR_DENIED</dt>
-<dd>非読み込みモードで開いたファイルから読み込もうとした。</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>ディスク・エラーによる失敗。</dd>
-<dt>FR_INT_ERR</dt>
-<dd>不正なFAT構造または内部エラーによる失敗。</dd>
-<dt>FR_NOT_READY</dt>
-<dd>メディアがセットされていないなど、物理ドライブが動作不能状態。</dd>
-<dt>FR_INVALID_OBJECT</dt>
-<dd>無効なファイル・オブジェクト。</dd>
-</dl>
+<p>
+<a href="rc.html#ok">FR_OK</a>,
+<a href="rc.html#de">FR_DISK_ERR</a>,
+<a href="rc.html#ie">FR_INT_ERR</a>,
+<a href="rc.html#nr">FR_NOT_READY</a>,
+<a href="rc.html#de">FR_DENIED</a>,
+<a href="rc.html#io">FR_INVALID_OBJECT</a>,
+<a href="rc.html#tm">FR_TIMEOUT</a>
+</p>
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>解説</h4>
 <p>ファイルのデータをバッファに読み出さずに送信ストリームに直接転送します。アプリケーション側でデータ・バッファを必要としないので、メモリの限られた環境で有効です。リード/ライト・ポインタは転送されたバイト数だけ進みます。指定されたバイト数の転送中にファイルの終端に達した場合や送信ストリームがビジーになった場合、<tt>*ByteFwd</tt>は<tt>ByteToFwd</tt>よりも小さくなります。</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>対応情報</h4>
 <p><tt>_USE_FORWARD == 1</tt>で、且つ<tt>_FS_TINY == 1</tt>のときに使用可能です。</p>
 </div>
 
 
-<div class="para">
+<div class="para use">
 <h4>使用例（オーディオ再生）</h4>
 <pre>
-<span>/*-----------------------------------------------------------------------*/</span>
-<span>/* f_forward関数から呼ばれるデータ送信関数の例                           */</span>
-<span>/*-----------------------------------------------------------------------*/</span>
+<span class="c">/*-----------------------------------------------------------------------*/</span>
+<span class="c">/* f_forward関数から呼ばれるデータ送信関数の例                           */</span>
+<span class="c">/*-----------------------------------------------------------------------*/</span>
 
-UINT out_stream (   <span>/* 戻り値: 転送されたバイト数またはストリームの状態 */</span>
-    const BYTE *p,  <span>/* 転送するデータを指すポインタ */</span>
-    UINT btf        <span>/* &gt;0: 転送を行う(バイト数). 0: ストリームの状態を調べる */</span>
+UINT out_stream (   <span class="c">/* 戻り値: 転送されたバイト数またはストリームの状態 */</span>
+    const BYTE *p,  <span class="c">/* 転送するデータを指すポインタ */</span>
+    UINT btf        <span class="c">/* &gt;0: 転送を行う(バイト数). 0: ストリームの状態を調べる */</span>
 )
 {
     UINT cnt = 0;
 
 
-    if (btf == 0) {     <span>/* センス要求 */</span>
-        <span>/* ストリームの状態を返す (0: ビジー, 1: レディ) */</span>
-        <span>/* 一旦、レディを返したら、続く転送要求で少なくとも1バイトは */</span>
-        <span>/* 転送されないと f_forward関数は FR_RW_ERROR となる。 */</span>
+    if (btf == 0) {     <span class="c">/* センス要求 */</span>
+        <span class="c">/* ストリームの状態を返す (0: ビジー, 1: レディ) */</span>
+        <span class="c">/* 一旦、レディを返したら、続く転送要求で少なくとも1バイトは */</span>
+        <span class="c">/* 転送されないと f_forward関数は FR_INT_ERR となる。 */</span>
         if (FIFO_READY) cnt = 1;
     }
-    else {              <span>/* 転送要求 */</span>
-        do {    <span>/* 全てのバイトを転送するか、ストリームがビジーになるまで繰り返す */</span>
+    else {              <span class="c">/* 転送要求 */</span>
+        do {    <span class="c">/* 全てのバイトを転送するか、ストリームがビジーになるまで繰り返す */</span>
             FIFO_PORT = *p++;
             cnt++;
         } while (cnt &lt; btf &amp;&amp; FIFO_READY);
@@ -102,32 +97,32 @@ UINT out_stream (   <span>/* 
 }
 
 
-<span>/*-----------------------------------------------------------------------*/</span>
-<span>/* f_forward関数の使用例                                                 */</span>
-<span>/*-----------------------------------------------------------------------*/</span>
+<span class="c">/*-----------------------------------------------------------------------*/</span>
+<span class="c">/* f_forward関数の使用例                                                 */</span>
+<span class="c">/*-----------------------------------------------------------------------*/</span>
 
 FRESULT play_file (
-    char *fn        <span>/* 再生するオーディオ・ファイル名を指すポインタ */</span>
+    char *fn        <span class="c">/* 再生するオーディオ・ファイル名を指すポインタ */</span>
 )
 {
     FRESULT rc;
     FIL fil;
     UINT dmy;
 
-    <span>/* ファイルを読み出しモードで開く */</span>
+    <span class="c">/* ファイルを読み出しモードで開く */</span>
     rc = f_open(&amp;fil, fn, FA_READ);
     if (rc) return rc;
 
-    <span>/* 全てのデータが転送されるかエラーが発生するまで続ける */</span>
+    <span class="c">/* 全てのデータが転送されるかエラーが発生するまで続ける */</span>
     while (rc == FR_OK &amp;&amp; fil.fptr &lt; fil.fsize) {
 
-        <span>/* ほかの処理... */</span>
+        <span class="c">/* ほかの処理... */</span>
 
-        <span>/* 定期的または要求に応じてデータをストリームに送出する */</span>
+        <span class="c">/* 定期的または要求に応じてデータをストリームに送出する */</span>
         rc = f_forward(&amp;fil, out_stream, 1000, &amp;dmy);
     }
 
-    <span>/* ファイルを閉じて戻る */</span>
+    <span class="c">/* ファイルを閉じて戻る */</span>
     f_close(&amp;fil);
     return rc;
 }
@@ -135,7 +130,7 @@ FRESULT play_file (
 </div>
 
 
-<div class="para">
+<div class="para ref">
 <h4>参照</h4>
 <p><tt><a href="open.html">f_open</a>, <a href="gets.html">fgets</a>, <a href="write.html">f_write</a>, <a href="close.html">f_close</a>, <a href="sfile.html">FIL</a></tt></p>
 </div>
diff --git a/doc/ja/getcwd.html b/doc/ja/getcwd.html
new file mode 100644
index 0000000..1f42df3
--- /dev/null
+++ b/doc/ja/getcwd.html
@@ -0,0 +1,70 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="ja">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=Shift_JIS">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<link rel="up" title="FatFs" href="../00index_j.html">
+<link rel="alternate" hreflang="en" title="English" href="../en/getcwd.html">
+<link rel="stylesheet" href="../css_j.css" type="text/css" media="screen" title="ELM Default">
+<title>FatFs - f_getcwd</title>
+</head>
+
+<body>
+
+<div class="para func">
+<h2>f_getcwd</h2>
+<p>カレント・ディレクトリを得ます</p>
+<pre>
+FRESULT f_getcwd (
+  TCHAR* <em>Buffer</em>,  <span class="c">/* バッファ */</span>
+  UINT <em>BufferLen</em>  <span class="c">/* バッファ・サイズ */</span>
+);
+</pre>
+</div>
+
+<div class="para arg">
+<h4>引数</h4>
+<dl class="par">
+<dt>Buffer</dt>
+<dd>カレント・ディレクトリの文字列を格納するバッファ</dd>
+<dt>BufferLen</dt>
+<dd>TCHAR単位のバッファ・サイズ</dd>
+</dl>
+</div>
+
+
+<div class="para ret">
+<h4>戻り値</h4>
+<p>
+<a href="rc.html#ok">FR_OK</a>,
+<a href="rc.html#de">FR_DISK_ERR</a>,
+<a href="rc.html#ie">FR_INT_ERR</a>,
+<a href="rc.html#nr">FR_NOT_READY</a>,
+<a href="rc.html#ne">FR_NOT_ENABLED</a>,
+<a href="rc.html#ns">FR_NO_FILESYSTEM</a>,
+<a href="rc.html#tm">FR_TIMEOUT</a>,
+<a href="rc.html#nc">FR_NOT_ENOUGH_CORE</a>
+</p>
+</div>
+
+
+<div class="para desc">
+<h4>解説</h4>
+<p>f_getcwd関数は、カレント・ドライブのカレント・ディレクトリのパス文字列を取得します。パス文字列は、ドライブ番号を含んだフル・パス名です。</p>
+</div>
+
+
+<div class="para comp">
+<h4>対応情報</h4>
+<p><tt>_FS_RPATH == 2</tt>のとき使用可能です。</p>
+</div>
+
+
+<div class="para ref">
+<h4>参照</h4>
+<p><tt><a href="chdrive.html">f_chdrive</a>, <a href="chdir.html">f_chdir</a></tt></p>
+</div>
+
+<p class="foot"><a href="../00index_j.html">戻る</a></p>
+</body>
+</html>
diff --git a/doc/ja/getfree.html b/doc/ja/getfree.html
index d408263..53c6339 100644
--- a/doc/ja/getfree.html
+++ b/doc/ja/getfree.html
@@ -11,19 +11,19 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>f_getfree</h2>
 <p>論理ドライブ上の未使用クラスタ数を得ます。</p>
 <pre>
 FRESULT f_getfree (
-  const TCHAR* <em>Path</em>,       <span>/* 対象ドライブを指定します */</span>
-  DWORD* <em>Clusters</em>,         <span>/* 空きクラスタ数を格納する変数へのポインタ */</span>
-  FATFS** <em>FileSystemObject</em> <span>/* ファイル・システム・オブジェクトを指すポインタへのポインタ */</span>
+  const TCHAR* <em>Path</em>,       <span class="c">/* 対象ドライブを指定します */</span>
+  DWORD* <em>Clusters</em>,         <span class="c">/* 空きクラスタ数を格納する変数へのポインタ */</span>
+  FATFS** <em>FileSystemObject</em> <span class="c">/* ファイル・システム・オブジェクトを指すポインタへのポインタ */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>引数</h4>
 <dl class="par">
 <dt>Path</dt>
@@ -36,55 +36,49 @@ FRESULT f_getfree (
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>戻り値</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>正常終了。<tt>*Clusters</tt>に空きクラスタ数が返されます。</dd>
-<dt>FR_INVALID_DRIVE</dt>
-<dd>ドライブ番号が不正。</dd>
-<dt>FR_NOT_READY</dt>
-<dd>メディアがセットされていないなど、物理ドライブが動作不能状態。</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>ディスク・エラーによる失敗。</dd>
-<dt>FR_INT_ERR</dt>
-<dd>不正なFAT構造または内部エラーによる失敗。</dd>
-<dt>FR_NOT_ENABLED</dt>
-<dd>その論理ドライブにワーク・エリアが与えられていない。</dd>
-<dt>FR_NO_FILESYSTEM</dt>
-<dd>有効なFATボリュームが見つからない。</dd>
-</dl>
+<p>
+<a href="rc.html#ok">FR_OK</a>,
+<a href="rc.html#de">FR_DISK_ERR</a>,
+<a href="rc.html#ie">FR_INT_ERR</a>,
+<a href="rc.html#nr">FR_NOT_READY</a>,
+<a href="rc.html#id">FR_INVALID_DRIVE</a>,
+<a href="rc.html#ne">FR_NOT_ENABLED</a>,
+<a href="rc.html#ns">FR_NO_FILESYSTEM</a>,
+<a href="rc.html#tm">FR_TIMEOUT</a>
+</p>
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>解説</h4>
 <p>論理ドライブ上の空きクラスタ数を取得します。返されたファイル・システム・オブジェクトの<tt>csize</tt>メンバがクラスタあたりのセクタ数を示しているので、これを元に実際の空きサイズが計算できます。FAT32ボリュームにおいては、FSINFOセクタの状態によっては不正確な値を返したり、処理に時間がかかったりする可能性があります。</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>対応情報</h4>
 <p><tt>_FS_READONLY == 0</tt>で、且つ<tt>_FS_MINIMIZE == 0</tt>のとき使用可能です。</p>
 </div>
 
 
-<div class="para">
+<div class="para use">
 <h4>使用例</h4>
 <pre>
     FATFS *fs;
     DWORD fre_clust, fre_sect, tot_sect;
 
 
-    <span>/* ドライブ1のボリューム情報と空きクラスタ数を得る */</span>
+    <span class="c">/* ドライブ1のボリューム情報と空きクラスタ数を得る */</span>
     res = f_getfree("1:", &amp;fre_clust, &amp;fs);
     if (res) die(res);
 
-    <span>/* 全セクタ数と空きセクタ数を計算 */</span>
+    <span class="c">/* 全セクタ数と空きセクタ数を計算 */</span>
     tot_sect = (fs->n_fatent - 2) * fs->csize;
     fre_sect = fre_clust * fs->csize;
 
-    <span>/* ドライブサイズと空きサイズの表示 (512バイト/セクタと仮定) */</span>
+    <span class="c">/* ドライブサイズと空きサイズの表示 (512バイト/セクタと仮定) */</span>
     printf("%lu KB total drive space.\n"
            "%lu KB available.\n",
            fre_sect / 2, tot_sect / 2);
@@ -92,7 +86,7 @@ FRESULT f_getfree (
 </div>
 
 
-<div class="para">
+<div class="para ref">
 <h4>参照</h4>
 <tt><a href="sfatfs.html">FATFS</a></tt>
 </div>
diff --git a/doc/ja/gets.html b/doc/ja/gets.html
index 3cb309e..7a603dd 100644
--- a/doc/ja/gets.html
+++ b/doc/ja/gets.html
@@ -11,19 +11,19 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>f_gets</h2>
 <p>ファイルから文字列を読み出します。</p>
 <pre>
 TCHAR* f_gets (
-  TCHAR* <em>Str</em>,       <span>/* バッファ */</span>
-  int <em>Size</em>,         <span>/* バッファのサイズ */</span>
-  FIL* <em>FileObject</em>   <span>/* ファイル・オブジェクト */</span>
+  TCHAR* <em>Str</em>,       <span class="c">/* バッファ */</span>
+  int <em>Size</em>,         <span class="c">/* バッファのサイズ */</span>
+  FIL* <em>FileObject</em>   <span class="c">/* ファイル・オブジェクト */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>引数</h4>
 <dl class="par">
 <dt>Str</dt>
@@ -36,26 +36,26 @@ TCHAR* f_gets (
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>戻り値</h4>
 <p>関数が成功すると<tt>Str</tt>が返されます。</p>
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>解説</h4>
 <p>この関数は<a href="read.html">f_read()</a>のラッパー関数です。読み出し動作は、最初の<tt>'\n'</tt>を読み込むか、ファイル終端に達するか、<tt>Size - 1</tt>文字を読み出すまで続きます。読み込まれた文字列の終端には<tt>'\0'</tt>が付加されます。既にファイル終端で1文字も読み込まれなかったとき、または何らかのエラーが発生したときは関数は失敗しヌル・ポインタを返します。ファイル終端かエラーかは<tt>f_eof()</tt>,<tt>f_error()</tt>マクロで調べられます。</p>
 <p>APIにUnicodeが選択されている(<tt>_LFN_UNICODE</tt>が1)ときは、UTF-8エンコードのテキスト・ファイルとしてUCS-2に変換してバッファに読み込みます。それ以外の時は無変換(1文字1バイト)で読み込みます。</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>対応情報</h4>
 <p><tt>_USE_STRFUNC</tt>が 1または 2のとき使用可能です。2のときは、ファイルに含まれる<tt>'\r'</tt>が取り除かれてバッファに読み込まれます。</p>
 </div>
 
 
-<div class="para">
+<div class="para ref">
 <h4>参照</h4>
 <p><tt><a href="open.html">f_open</a>, <a href="read.html">f_read</a>, <a href="putc.html">f_putc</a>, <a href="puts.html">f_puts</a>, <a href="printf.html">f_printf</a>, <a href="close.html">f_close</a>, <a href="sfile.html">FIL</a></tt></p>
 </div>
diff --git a/doc/ja/lseek.html b/doc/ja/lseek.html
index 3f7e2b7..291397a 100644
--- a/doc/ja/lseek.html
+++ b/doc/ja/lseek.html
@@ -11,18 +11,18 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>f_lseek</h2>
-<p>ファイルのリード/ライト・ポインタを移動します。</p>
+<p>ファイルのリード/ライト・ポインタを移動します。また、高速シーク機能使用時にはCLMT(後述)の作成にも使用します。</p>
 <pre>
 FRESULT f_lseek (
-  FIL* <em>FileObject</em>,    <span>/* ファイル・オブジェクト構造体へのポインタ */</span>
-  DWORD <em>Offset</em>        <span>/* 移動先オフセット */</span>
+  FIL* <em>FileObject</em>,    <span class="c">/* ファイル・オブジェクト構造体へのポインタ */</span>
+  DWORD <em>Offset</em>        <span class="c">/* 移動先オフセット */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>引数</h4>
 <dl class="par">
 <dt>FileObject</dt>
@@ -33,91 +33,94 @@ FRESULT f_lseek (
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>戻り値</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>正常終了。</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>ディスク・エラーによる失敗。</dd>
-<dt>FR_INT_ERR</dt>
-<dd>不正なFAT構造または内部エラーによる失敗。</dd>
-<dt>FR_NOT_READY</dt>
-<dd>メディアがセットされていないなど、物理ドライブが動作不能状態。</dd>
-<dt>FR_INVALID_OBJECT</dt>
-<dd>無効なファイル・オブジェクト。</dd>
-<dt>FR_NOT_ENOUGH_CORE</dt>
-<dd>リンク・マップ・テーブルのサイズが不足。</dd>
-</dl>
+<p>
+<a href="rc.html#ok">FR_OK</a>,
+<a href="rc.html#de">FR_DISK_ERR</a>,
+<a href="rc.html#ie">FR_INT_ERR</a>,
+<a href="rc.html#nr">FR_NOT_READY</a>,
+<a href="rc.html#io">FR_INVALID_OBJECT</a>,
+<a href="rc.html#tm">FR_TIMEOUT</a>,
+<a href="rc.html#nc">FR_NOT_ENOUGH_CORE</a>
+</p>
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>解説</h4>
-<p>ファイルのリード/ライト・ポインタ(ファイル・オブジェクト内のfptrメンバで、次に読み出し・書き込みされるバイトのオフセットを示す)を移動します。オフセットの原点はファイル先頭です。書き込みモードでファイル・サイズより大きな値を指定すると、そこまでファイル・サイズが拡張され、拡張された部分のデータは未定義となります。データを遅延無く高速に書き込みたいときは、予めこの関数で必要なサイズまでファイル・サイズを拡張しておくと良いでしょう。f_lseek関数が正常終了したあとは、リード/ライト・ポインタが正しく移動したかfptrをチェックするべきです。リード/ライト・ポインタが指定より小さいときは、次の原因が考えられます。</p>
+<p>ファイルのリード/ライト・ポインタ(次に読み出し・書き込みされるバイトのオフセット)を移動します。オフセットの原点はファイル先頭です。書き込みモードでファイル・サイズより大きな値を指定すると、そこまでファイル・サイズが拡張され、拡張された部分のデータは未定義となります。データを遅延無く高速に書き込みたいときは、予めこの関数で必要なサイズまでファイル・サイズを拡張しておくと良いでしょう。f_lseek関数が正常終了したあとは、リード/ライト・ポインタが正しく移動したかチェックするべきです。リード/ライト・ポインタが指定より小さいときは、次の原因が考えられます。</p>
 <ul>
 <li>非書き込みモードまたは高速シーク・モードのため、ファイル・サイズでクリップされた。</li>
 <li>ファイル拡張中にディスクが満杯になった。</li>
 </ul>
-<p><tt>_USE_FASTSEEK</tt>に1が指定されていて、且つファイル・オブジェクトの<tt>cltbl</tt>メンバがNULL以外のとき、高速シーク・モードになります。これはファイルのクラスタ情報をアプリケーションの指定した配列に保持しておくことにより、FATにアクセスすることなく後方シークやロング・シークを高速に行う機能です。高速シーク動作を行う前には、配列を初期化しておく必要があります。必要な配列サイズ(要素数)は、(ファイルの分割数 + 1) * 2 です。たとえば、ファイルが5つに分断されているときに必要な配列サイズは、12要素となります。高速シーク使用時はファイル・サイズの拡張はできません。</p>
+<p><tt>_USE_FASTSEEK</tt>に1が指定されていて、且つファイル・オブジェクトの<tt>cltbl</tt>メンバがNULL以外(ファイルを開いたときはNULL)のとき、高速シーク・モードになります。これはファイルのクラスタ配置情報(CLMT)をメモリ上に保持しておくことにより、FATにアクセスすることなく後方シークやロング・シークを高速に行う機能です。高速シーク・モードは、f_read/f_wtite関数にも適用されます。高速シーク・モードではf_wtite/f_lseek関数によるファイル・サイズの拡張はできません。</p>
+<p>高速シーク動作を行う前に、CLMTを作成しておく必要があります。これを作成するには、まず<tt>cltbl</tt>メンバにCLMT格納バッファ(DWORD配列)へのポインタをセットします。そして、配列の先頭要素にその配列の要素数を入れ、f_lseek関数を<tt>Offset</tt>に<tt>CREATE_LINKMAP</tt>を指定して実行します。関数が成功するとCLMTが作成され、以降のf_read/f_write/f_lseek関数ではFATへのアクセスは発生しません。<tt>FR_NOT_ENOUGH_CORE</tt>で失敗したときは配列サイズが不足で、先頭要素には実際に必要となる要素数が返されます。必要な要素数は、(ファイルの分割数 + 1) * 2 です。たとえば、ファイルが5つに分断されているときに必要な要素数は、12となります。</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>対応情報</h4>
 <p><tt>_FS_MINIMIZE &lt; 3</tt>のとき使用可能です。</p>
 </div>
 
 
-<div class="para">
+<div class="para use">
 <h4>使用例</h4>
 <pre>
-    <span>/* ファイル・オフセット5000へ移動 */</span>
-    res = f_lseek(&amp;file, 5000, 0);
+    <span class="c">/* ファイルを開く */</span>
+    file = malloc(sizeof(FIL));
+    if (!file) ...
+    res = f_open(file, "file.dat", FA_READ|FA_WRITE);
+    if (res) ...
 
-    <span>/* ファイル追記の準備 (ファイル終端へ移動) */</span>
-    res = f_lseek(&amp;file, file.fsize, 0);
+    <span class="c">/* ファイル・オフセット5000へ移動 */</span>
+    res = f_lseek(file, 5000, 0);
 
-    <span>/* 3000バイト進める */</span>
-    res = f_lseek(&amp;file, file.fptr + 3000, 0);
+    <span class="c">/* ファイル終端へ移動(ファイル追記の準備) */</span>
+    res = f_lseek(file, f_size(file), 0);
 
-    <span>/* 2000バイト戻す (オーバーフローに注意) */</span>
-    res = f_lseek(&amp;file, file.fptr - 2000, 0);
+    <span class="c">/* 3000バイト進める */</span>
+    res = f_lseek(file, f_tell(file) + 3000, 0);
+
+    <span class="c">/* 2000バイト戻す (オーバーフローに注意) */</span>
+    res = f_lseek(file, f_tell(file) - 2000, 0);
 </pre>
 <pre>
-    <span>/* クラスタ先行割り当て (ストリーミング・ライト時のバッファ・オーバーラン防止) */</span>
+    <span class="c">/* クラスタ先行割り当て (ストリーミング・ライト時のバッファ・オーバーラン防止) */</span>
 
-    res = f_open(&amp;file, "record.wav", FA_CREATE_NEW | FA_WRITE); <span>/* ファイル作成 */</span>
+    res = f_open(file, "record.wav", FA_CREATE_NEW | FA_WRITE);  <span class="c">/* ファイル作成 */</span>
 
-    res = f_lseek(&amp;file, MAX_SIZE, 0);     <span>/* 十分なクラスタの先行割り当て */</span>
-    if (res || file.fptr != PRE_SIZE) .... <span>/* 正しくファイルが拡張されたかチェック */</span>
+    res = f_lseek(file, MAX_SIZE, 0);        <span class="c">/* 十分なクラスタの先行割り当て */</span>
+    if (res || f_tell(file) != PRE_SIZE) ... <span class="c">/* 正しくファイルが拡張されたかチェック */</span>
 
-    res = f_lseek(&amp;file, DATA_START, 0);   <span>/* データ・ストリームの記録(アロケーションディレイ無し) */</span>
+    res = f_lseek(file, DATA_START, 0);      <span class="c">/* データ・ストリームの記録(アロケーションディレイ無し) */</span>
     ...
 
-    res = f_truncate(&amp;file);               <span>/* 不要領域の切り捨て */</span>
-    res = f_lseek(&amp;file, 0, 0);            <span>/* ヘッダの記録 */</span>
+    res = f_truncate(file);                  <span class="c">/* 不要領域の切り捨て */</span>
+    res = f_lseek(file, 0, 0);               <span class="c">/* ヘッダの記録 */</span>
     ...
 
-    res = f_close(&amp;file);
+    res = f_close(file);
 </pre>
 <pre>
-    <span>/* 高速シーク機能を使う */</span>
+    <span class="c">/* 高速シーク機能を使う */</span>
 
-    DWORD lktbl[SZ_TBL];                   <span>/* リンク・マップ・テーブル格納バッファ */</span>
+    DWORD lktbl[SZ_TBL];                   <span class="c">/* リンク・マップ・テーブル格納バッファ */</span>
 
-    res = f_lseek(&amp;file, ofs1);            <span>/* 通常シーク (オープン時、file.cltbl == NULL) */</span>
+    res = f_lseek(file, ofs1);             <span class="c">/* 通常シーク (オープン時、file.cltbl == NULL) */</span>
 
-    file.cltbl = lktbl;                    <span>/* 高速シーク機能の有効化 */</span>
-    lktbl[0] = SZ_TBL;                     <span>/* 先頭要素に配列要素数をセット */</span>
-    res = f_lseek(&amp;file, CREATE_LINKMAP);  <span>/* リンク・マップ・テーブルの作成 */</span>
+    file.cltbl = lktbl;                    <span class="c">/* 高速シーク機能の有効化 */</span>
+    lktbl[0] = SZ_TBL;                     <span class="c">/* 先頭要素に配列要素数をセット */</span>
+    res = f_lseek(file, CREATE_LINKMAP);   <span class="c">/* CLMTの作成 */</span>
+    ...
 
-    res = f_lseek(&amp;file, ofs2);            <span>/* 高速シーク (file.cltbl != NULL) */</span>
+    res = f_lseek(file, ofs2);             <span class="c">/* 以降、f_read/f_write/f_lseekでFATアクセスが発生しない */</span>
 </pre>
 </div>
 
 
-<div class="para">
+<div class="para ref">
 <h4>参照</h4>
 <p><tt><a href="open.html">f_open</a>, <a href="sfile.html">FIL</a></tt></p>
 </div>
diff --git a/doc/ja/mkdir.html b/doc/ja/mkdir.html
index 9fe4fcf..c08f212 100644
--- a/doc/ja/mkdir.html
+++ b/doc/ja/mkdir.html
@@ -11,17 +11,17 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>f_mkdir</h2>
 <p>ディレクトリを作成します。</p>
 <pre>
 FRESULT f_mkdir (
-  const TCHAR* <em>DirName</em> <span>/* 作成するディレクトリ名へのポインタ */</span>
+  const TCHAR* <em>DirName</em> <span class="c">/* 作成するディレクトリ名へのポインタ */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>引数</h4>
 <dl class="par">
 <dt>DirName</dt>
@@ -30,50 +30,40 @@ FRESULT f_mkdir (
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>戻り値</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>正常終了。</dd>
-<dt>FR_NO_PATH</dt>
-<dd>パスが見つからない。</dd>
-<dt>FR_INVALID_NAME</dt>
-<dd>パス名が不正。</dd>
-<dt>FR_INVALID_DRIVE</dt>
-<dd>ドライブ番号が不正。</dd>
-<dt>FR_DENIED</dt>
-<dd>ディスクやディレクトリ・エントリが満杯の場合など。</dd>
-<dt>FR_EXIST</dt>
-<dd>同名のオブジェクトが存在する。</dd>
-<dt>FR_NOT_READY</dt>
-<dd>メディアがセットされていないなど、物理ドライブが動作不能状態。</dd>
-<dt>FR_WRITE_PROTECTED</dt>
-<dd>メディアが書き込み禁止状態。</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>ディスク・エラーによる失敗。</dd>
-<dt>FR_INT_ERR</dt>
-<dd>不正なFAT構造または内部エラーによる失敗。</dd>
-<dt>FR_NOT_ENABLED</dt>
-<dd>その論理ドライブにワーク・エリアが与えられていない。</dd>
-<dt>FR_NO_FILESYSTEM</dt>
-<dd>有効なFATボリュームが見つからない。</dd>
-</dl>
+<p>
+<a href="rc.html#ok">FR_OK</a>,
+<a href="rc.html#de">FR_DISK_ERR</a>,
+<a href="rc.html#ie">FR_INT_ERR</a>,
+<a href="rc.html#nr">FR_NOT_READY</a>,
+<a href="rc.html#np">FR_NO_PATH</a>,
+<a href="rc.html#in">FR_INVALID_NAME</a>,
+<a href="rc.html#de">FR_DENIED</a>,
+<a href="rc.html#ex">FR_EXIST</a>,
+<a href="rc.html#wp">FR_WRITE_PROTECTED</a>,
+<a href="rc.html#id">FR_INVALID_DRIVE</a>,
+<a href="rc.html#ne">FR_NOT_ENABLED</a>,
+<a href="rc.html#ns">FR_NO_FILESYSTEM</a>,
+<a href="rc.html#tm">FR_TIMEOUT</a>,
+<a href="rc.html#nc">FR_NOT_ENOUGH_CORE</a>
+</p>
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>解説</h4>
 <p>空のディレクトリを作成します。</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>対応情報</h4>
 <p><tt>_FS_READONLY == 0</tt>で、且つ<tt>_FS_MINIMIZE == 0</tt>のとき使用可能です。</p>
 </div>
 
 
-<div class="para">
+<div class="para use">
 <h4>使用例</h4>
 <pre>
     res = f_mkdir("sub1");
diff --git a/doc/ja/mkfs.html b/doc/ja/mkfs.html
index 5e9d25d..f1e437e 100644
--- a/doc/ja/mkfs.html
+++ b/doc/ja/mkfs.html
@@ -11,19 +11,19 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>f_mkfs</h2>
 <p>物理ドライブ上にFATボリュームを作成(フォーマット)します。</p>
 <pre>
 FRESULT f_mkfs (
-  BYTE  <em>Drive</em>,              <span>/* 論理ドライブ番号 */</span>
-  BYTE  <em>PartitioningRule</em>,   <span>/* 区画作成方法 */</span>
-  UINT  <em>AllocSize</em>           <span>/* クラス・タサイズ */</span>
+  BYTE  <em>Drive</em>,              <span class="c">/* 論理ドライブ番号 */</span>
+  BYTE  <em>PartitioningRule</em>,   <span class="c">/* 区画作成方法 */</span>
+  UINT  <em>AllocSize</em>           <span class="c">/* クラス・タサイズ */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>引数</h4>
 <dl class="par">
 <dt>Drive</dt>
@@ -35,33 +35,18 @@ FRESULT f_mkfs (
 </dl>
 </div>
 
-<div class="para">
+<div class="para ret">
 <h4>戻り値</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>正常終了。</dd>
-<dt>FR_INVALID_DRIVE</dt>
-<dd>ドライブ番号が無効。</dd>
-<dt>FR_NOT_READY</dt>
-<dd>メディアがセットされていないなど、物理ドライブが動作不能状態。</dd>
-<dt>FR_WRITE_PROTECTED</dt>
-<dd>メディアが書き込み禁止状態。</dd>
-<dt>FR_NOT_ENABLED</dt>
-<dd>その論理ドライブにワーク・エリアが割り当てられていない。</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>ディスク・エラーによる失敗。</dd>
-<dt>FR_MKFS_ABORTED</dt>
-<dd>次の理由で開始前に処理が中断された。
-<ul>
-<li>ディスク・サイズが小さすぎる。</li>
-<li>何らかの引数が不正。</li>
-<li>そのクラスタ・サイズが使えない。クラスタ数がFATタイプの境界に近くなるとき発生する可能性がある。</li>
-</ul>
-</dd>
-</dl>
+<p>
+<a href="rc.html#ok">FR_OK</a>,
+<a href="rc.html#de">FR_DISK_ERR</a>,
+<a href="rc.html#nr">FR_NOT_READY</a>,
+<a href="rc.html#ne">FR_NOT_ENABLED</a>,
+<a href="rc.html#ma">FR_MKFS_ABORTED</a>
+</p>
 </div>
 
-<div class="para">
+<div class="para desc">
 <h4>説明</h4>
 <p>f_mkfs関数は物理ドライブ上にFATボリュームを作成します。リムーバブル・メディアのパーテーショニング・ルールとしてはFDISK形式とSFD形式があり、メモリ・カードではFDISK形式が普通です。この関数は<em>複数区画には対応していない</em>ので、その物理ドライブの既存の区画は全て削除され、全体が一つの区画になります。</p>
 <p>FATタイプ(FAT12/FAT16/FAT32)は、その論理ドライブ上の<em>クラスタ数によってのみ決定</em>される決まり[FAT仕様書より]になっていて、それ以外の要因はありません。したがって、どのFATタイプになるかはドライブ・サイズとクラスタ・サイズに依存します。クラスタ・サイズは大きくするほど性能が上がり、逆にディスク利用効率は落ちます。</p>
@@ -69,7 +54,7 @@ FRESULT f_mkfs (
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>対応情報</h4>
 <p><tt>_FS_READONLY == 0</tt>で、且つ<tt>_USE_MKFS == 1</tt>のとき使用可能です。</p>
 </div>
diff --git a/doc/ja/mount.html b/doc/ja/mount.html
index 76989f6..5a14820 100644
--- a/doc/ja/mount.html
+++ b/doc/ja/mount.html
@@ -11,18 +11,18 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>f_mount</h2>
 <p>論理ドライブのワーク・エリアを登録・抹消します。</p>
 <pre>
 FRESULT f_mount (
-  BYTE  <em>Drive</em>,               <span>/* 論理ドライブ番号 */</span>
-  FATFS*  <em>FileSystemObject</em>   <span>/* ワーク・エリアへのポインタ */</span>
+  BYTE  <em>Drive</em>,               <span class="c">/* 論理ドライブ番号 */</span>
+  FATFS*  <em>FileSystemObject</em>   <span class="c">/* ワーク・エリアへのポインタ */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>引数</h4>
 <dl class="par">
 <dt>Drive</dt>
@@ -32,31 +32,29 @@ FRESULT f_mount (
 </dl>
 </div>
 
-<div class="para">
+<div class="para ret">
 <h4>戻り値</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>正常終了。</dd>
-<dt>FR_INVALID_DRIVE</dt>
-<dd>論理ドライブ番号が無効。</dd>
-</dl>
+<p>
+<a href="rc.html#ok">FR_OK</a>,
+<a href="rc.html#id">FR_INVALID_DRIVE</a>
+</p>
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>解説</h4>
 <p>FatFsモジュールではそれぞれの論理ドライブにファイル・システム・オブジェクトというワーク・エリアが必要です。この関数は論理ドライブにそのワーク・エリアを登録したり抹消したりします。何らかのファイル関数を使用する前にこの関数でその論理ドライブのワーク・エリアを与えておかなければなりません。<tt>FileSystemObject</tt>にヌル・ポインタを指定するとその論理ドライブのワーク・エリアの登録は抹消され、登録されていたワーク・エリアは破棄できます。操作対象のドライブに対して開かれているファイルやディレクトリがあった場合、それらは全て無効になります。</p>
 <p>この関数は、ドライブの状態に関わらず常に成功します。関数内では下位レイヤ(物理ドライブ)へのアクセスは発生せず、ワーク・エリアを初期化して内部配列にそのアドレスを登録するだけです。実際のマウント動作は、この関数の実行またはメディア交換発生の後、最初のファイル・アクセスのときに行われます。</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>対応情報</h4>
 <p>全ての構成で使用可能です。</p>
 </div>
 
 
-<div class="para">
+<div class="para ref">
 <h4>参照</h4>
 <p><tt><a href="sfatfs.html">FATFS</a></tt></p>
 </div>
diff --git a/doc/ja/open.html b/doc/ja/open.html
index c81913c..6fc30bd 100644
--- a/doc/ja/open.html
+++ b/doc/ja/open.html
@@ -11,19 +11,19 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>f_open</h2>
 <p>ファイルをオープンまたは作成します。</p>
 <pre>
 FRESULT f_open (
-  FIL* <em>FileObject</em>,       <span>/* 空のファイル・オブジェクト構造体へのポインタ */</span>
-  const TCHAR* <em>FileName</em>, <span>/* ファイルのフルパス名へのポインタ */</span>
-  BYTE <em>ModeFlags</em>         <span>/* モードフラグ */</span>
+  FIL* <em>FileObject</em>,       <span class="c">/* 空のファイル・オブジェクト構造体へのポインタ */</span>
+  const TCHAR* <em>FileName</em>, <span class="c">/* ファイルのフルパス名へのポインタ */</span>
+  BYTE <em>ModeFlags</em>         <span class="c">/* モードフラグ */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>引数</h4>
 <dl class="par">
 <dt>FileObject</dt>
@@ -37,8 +37,8 @@ FRESULT f_open (
 <tr><td>FA_READ</td><td>読み出しモードで開きます。読み書きする場合は<tt>FA_WRITE</tt>と共に指定します。</td></tr>
 <tr><td>FA_WRITE</td><td>書き込みモードで開きます。読み書きする場合は<tt>FA_READ</tt>と共に指定します。</td></tr>
 <tr><td>FA_OPEN_EXISTING</td><td>既存のファイルを開きます。ファイルが無いときはエラーになります。(デフォルト)</td></tr>
-<tr><td>FA_OPEN_ALWAYS</td><td>既存のファイルを開きます。ファイルが無いときはファイルを作成します。追記操作する場合は、この方法でオープンした後、<tt>f_lseek()</tt>でファイルの最後尾に移動してください。</td></tr>
-<tr><td>FA_CREATE_NEW</td><td>ファイルを作成します。同名のファイルがある場合は、エラー(FR_EXIST)になります。</td></tr>
+<tr><td>FA_OPEN_ALWAYS</td><td>既存のファイルを開きます。ファイルが無いときはファイルを作成します。追記の場合は、この方法でオープンした後、<a href="lseek.html">f_lseek()</a>でファイルの最後尾に移動してください。</td></tr>
+<tr><td>FA_CREATE_NEW</td><td>ファイルを作成します。同名のファイルがある場合は、<tt>FR_EXIST</tt>で失敗します。</td></tr>
 <tr><td>FA_CREATE_ALWAYS</td><td>ファイルを作成します。同名のファイルがある場合は、サイズを0にしてから開きます。</td></tr>
 </table>
 </dd>
@@ -46,96 +46,80 @@ FRESULT f_open (
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>戻り値</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>正常終了。以降、<tt>FileObject</tt>構造体を使ってこのファイルを操作できます。</dd>
-<dt>FR_NO_FILE</dt>
-<dd>ファイルが見つからない。</dd>
-<dt>FR_NO_PATH</dt>
-<dd>パスが見つからない。</dd>
-<dt>FR_INVALID_NAME</dt>
-<dd>ファイル名が不正。</dd>
-<dt>FR_INVALID_DRIVE</dt>
-<dd>ドライブ番号が不正。</dd>
-<dt>FR_EXIST</dt>
-<dd>同名のファイルが既に存在する。</dd>
-<dt>FR_DENIED</dt>
-<dd>アクセスが拒否された。
-<ul>
-<li>リード・オンリー・ファイルの書き込みモード・オープン。</li>
-<li>同名のディレクトリまたはリード・オンリー・ファイルがある状態でのファイル作成。</li>
-<li>ディレクトリ・テーブルが満杯でファイルを作成できない。</li>
-</ul>
-</dd>
-<dt>FR_NOT_READY</dt>
-<dd>メディアがセットされていないなど、物理ドライブが動作不能状態。</dd>
-<dt>FR_WRITE_PROTECTED</dt>
-<dd>メディアが書き込み禁止状態で書き込み系オープンをした。</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>ディスク・エラーによる失敗。</dd>
-<dt>FR_INT_ERR</dt>
-<dd>不正なFAT構造または内部エラーによる失敗。</dd>
-<dt>FR_NOT_ENABLED</dt>
-<dd>その論理ドライブにワーク・エリアが割り当てられていない。</dd>
-<dt>FR_NO_FILESYSTEM</dt>
-<dd>有効なFATボリュームが見つからない。</dd>
-<dt>FR_LOCKED</dt>
-<dd>ファイル共有機能(_FS_SHARE)によるアクセス拒否。</dd>
-</dl>
+<p>
+<a href="rc.html#ok">FR_OK</a>,
+<a href="rc.html#de">FR_DISK_ERR</a>,
+<a href="rc.html#ie">FR_INT_ERR</a>,
+<a href="rc.html#nr">FR_NOT_READY</a>,
+<a href="rc.html#ok">FR_NO_FILE</a>,
+<a href="rc.html#np">FR_NO_PATH</a>,
+<a href="rc.html#in">FR_INVALID_NAME</a>,
+<a href="rc.html#de">FR_DENIED</a>,
+<a href="rc.html#ex">FR_EXIST</a>,
+<a href="rc.html#wp">FR_WRITE_PROTECTED</a>,
+<a href="rc.html#id">FR_INVALID_DRIVE</a>,
+<a href="rc.html#ne">FR_NOT_ENABLED</a>,
+<a href="rc.html#ns">FR_NO_FILESYSTEM</a>,
+<a href="rc.html#tm">FR_TIMEOUT</a>,
+<a href="rc.html#lo">FR_LOCKED</a>,
+<a href="rc.html#nc">FR_NOT_ENOUGH_CORE</a>,
+<a href="rc.html#tf">FR_TOO_MANY_OPEN_FILES</a>
+</p>
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>解説</h4>
 <p>既存のファイルを開いたり、新しいファイルを作成します。関数が成功するとファイル・オブジェクトが作成され、以降そのファイルに対するアクセスに使用します。ファイルを閉じるときは、<a href="close.html">f_close()</a>を使用します。何らかの変更が行われたファイルがその後正しく閉じられなかった場合、そのファイルが破損する場合があります。</p>
+<p>もしも既に開かれているファイルを開く必要がある場合は、<a href="appnote.html#dup">多重アクセス制御</a>を参照してください。</p>
 <p>ファイル・アクセスを開始する前に、<a href="mount.html">f_mount()</a>を使ってそれぞれの論理ドライブにワーク・エリア(ファイル・システム・オブジェクト)を与える必要があります。この初期化の後、その論理ドライブに対して全てのファイル関数が使えるようになります。</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>対応情報</h4>
 <p>全ての構成で使用可能です。<tt>_FS_READONLY == 1</tt>のときは、<tt>FA_WRITE, FA_CREATE_ALWAYS, FA_CREATE_NEW, FA_OPEN_ALWAYS</tt>の各フラグはサポートされません。</p>
 </div>
 
 
-<div class="para">
+<div class="para use">
 <h4>使用例（ファイル・コピー）</h4>
 <pre>
 void main (void)
 {
-    FATFS fs[2];         <span>/* 論理ドライブのワーク・エリア(ファイル・システム・オブジェクト) */</span>
-    FIL fsrc, fdst;      <span>/* ファイル・オブジェクト */</span>
-    BYTE buffer[4096];   <span>/* file copy buffer */</span>
-    FRESULT res;         <span>/* FatFs function common result code */</span>
-    UINT br, bw;         <span>/* File R/W count */</span>
+    FATFS fs[2];         <span class="c">/* 論理ドライブのワーク・エリア(ファイル・システム・オブジェクト) */</span>
+    FIL fsrc, fdst;      <span class="c">/* ファイル・オブジェクト */</span>
+    BYTE buffer[4096];   <span class="c">/* file copy buffer */</span>
+    FRESULT res;         <span class="c">/* FatFs function common result code */</span>
+    UINT br, bw;         <span class="c">/* File R/W count */</span>
 
-    <span>/* ドライブ0,1にワーク・エリアを与える (常に成功する) */</span>
+    <span class="c">/* ドライブ0,1にワーク・エリアを与える (常に成功する) */</span>
     f_mount(0, &amp;fs[0]);
     f_mount(1, &amp;fs[1]);
 
-    <span>/* ドライブ1のソース・ファイルを開く */</span>
+    <span class="c">/* ドライブ1のソース・ファイルを開く */</span>
     res = f_open(&amp;fsrc, "1:srcfile.dat", FA_OPEN_EXISTING | FA_READ);
     if (res) die(res);
 
-    <span>/* ドライブ0にデスティネーション・ファイルを作成する */</span>
+    <span class="c">/* ドライブ0にデスティネーション・ファイルを作成する */</span>
     res = f_open(&amp;fdst, "0:dstfile.dat", FA_CREATE_ALWAYS | FA_WRITE);
     if (res) die(res);
 
-    <span>/* ソースからデスティネーションにコピーする */</span>
+    <span class="c">/* ソースからデスティネーションにコピーする */</span>
     for (;;) {
         res = f_read(&amp;fsrc, buffer, sizeof(buffer), &amp;br);
-        if (res || br == 0) break;   <span>/* エラーかファイル終端 */</span>
+        if (res || br == 0) break;   <span class="c">/* エラーかファイル終端 */</span>
         res = f_write(&amp;fdst, buffer, br, &amp;bw);
-        if (res || bw &lt; br) break;   <span>/* エラーかディスク満杯 */</span>
+        if (res || bw &lt; br) break;   <span class="c">/* エラーかディスク満杯 */</span>
     }
 
-    <span>/* 全てのファイルを閉じる */</span>
+    <span class="c">/* 全てのファイルを閉じる */</span>
     f_close(&amp;fsrc);
     f_close(&amp;fdst);
 
-    <span>/* ワーク・エリアを開放する */</span>
+    <span class="c">/* ワーク・エリアを開放する */</span>
     f_mount(0, NULL);
     f_mount(1, NULL);
 }
@@ -143,7 +127,7 @@ void main (void)
 </div>
 
 
-<div class="para">
+<div class="para ref">
 <h4>参照</h4>
 <p><tt><a href="read.html">f_read</a>, <a href="write.html">f_write</a>, <a href="close.html">f_close</a>, <a href="sfile.html">FIL</a>, <a href="sfatfs.html">FATFS</a></tt></p>
 </div>
diff --git a/doc/ja/opendir.html b/doc/ja/opendir.html
index e2bf377..91f591f 100644
--- a/doc/ja/opendir.html
+++ b/doc/ja/opendir.html
@@ -11,18 +11,18 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>f_opendir</h2>
 <p>ディレクトリを開きます。</p>
 <pre>
 FRESULT f_opendir (
-  DIR* <em>DirObject</em>,       <span>/* ディレクトリ・ブジェクト構造体へのポインタ */</span>
-  const TCHAR* <em>DirName</em>  <span>/* ディレクトリ名へのポインタ */</span>
+  DIR* <em>DirObject</em>,       <span class="c">/* ディレクトリ・ブジェクト構造体へのポインタ */</span>
+  const TCHAR* <em>DirName</em>  <span class="c">/* ディレクトリ名へのポインタ */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>引数</h4>
 <dl class="par">
 <dt>DirObject</dt>
@@ -33,44 +33,37 @@ FRESULT f_opendir (
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>戻り値</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>正常終了。</dd>
-<dt>FR_NO_PATH</dt>
-<dd>パスが見つからない。</dd>
-<dt>FR_INVALID_NAME</dt>
-<dd>パス名が不正。</dd>
-<dt>FR_INVALID_DRIVE</dt>
-<dd>論理ドライブ番号が不正。</dd>
-<dt>FR_NOT_READY</dt>
-<dd>メディアがセットされていないなど、物理ドライブが動作不能状態。</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>ディスク・エラーによる失敗。</dd>
-<dt>FR_INT_ERR</dt>
-<dd>不正なFAT構造または内部エラーによる失敗。</dd>
-<dt>FR_NOT_ENABLED</dt>
-<dd>論理ドライブにワーク・エリアが与えられていない。</dd>
-<dt>FR_NO_FILESYSTEM</dt>
-<dd>有効なFATボリュームが見つからない。</dd>
-</dl>
+<p>
+<a href="rc.html#ok">FR_OK</a>,
+<a href="rc.html#de">FR_DISK_ERR</a>,
+<a href="rc.html#ie">FR_INT_ERR</a>,
+<a href="rc.html#nr">FR_NOT_READY</a>,
+<a href="rc.html#np">FR_NO_PATH</a>,
+<a href="rc.html#in">FR_INVALID_NAME</a>,
+<a href="rc.html#id">FR_INVALID_DRIVE</a>,
+<a href="rc.html#ne">FR_NOT_ENABLED</a>,
+<a href="rc.html#ns">FR_NO_FILESYSTEM</a>,
+<a href="rc.html#tm">FR_TIMEOUT</a>,
+<a href="rc.html#nc">FR_NOT_ENOUGH_CORE</a>
+</p>
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>解説</h4>
 <p>ディレクトリを開きます。正常終了したら、<tt>DirObject</tt>構造体を使ってこのディレクトリの項目を順次読み出せます。<tt>DirObject</tt>構造体は使用後は任意の時点で破棄できます。</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>対応情報</h4>
 <p><tt>_FS_MINIMIZE &lt;= 1</tt>のとき使用可能になります。</p>
 </div>
 
 
-<div class="para">
+<div class="para ref">
 <h4>参照</h4>
 <p><tt><a href="readdir.html">f_readdir</a>, <a href="sdir.html">DIR</a></tt></p>
 </div>
diff --git a/doc/ja/printf.html b/doc/ja/printf.html
index f7ff1a7..9aecf5c 100644
--- a/doc/ja/printf.html
+++ b/doc/ja/printf.html
@@ -11,19 +11,19 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>f_printf</h2>
 <p>ファイルに書式化文字列を書き込みます。</p>
 <pre>
 int f_printf (
-  FIL* <em>FileObject</em>,      <span>/* ファイル・オブジェクト */</span>
-  const TCHAR* <em>Foramt</em>,  <span>/* 書式制御文字列 */</span>
+  FIL* <em>FileObject</em>,      <span class="c">/* ファイル・オブジェクト */</span>
+  const TCHAR* <em>Foramt</em>,  <span class="c">/* 書式制御文字列 */</span>
   ...
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>引数</h4>
 <dl class="par">
 <dt>FileObject</dt>
@@ -37,44 +37,50 @@ int f_printf (
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>戻り値</h4>
 <p>文字列が正常に書き込まれると書き込まれた文字数が返されます。ディスクが満杯またはその他エラーにより正常に書き込まれなかったときは関数は失敗し<tt>EOF (-1)</tt>が返されます。</p>
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>解説</h4>
 <p>この関数は<a href="putc.html">f_putc()</a>および<a href="puts.html">f_puts()</a>のラッパー関数です。書式制御機能はサブセットとなっていて、書式制御文字は次に示すものが使用可能です。</p>
 <ul>
 <li>タイプ: <tt>c C s S d D u U x X b B</tt></li>
 <li>精度指定: <tt>l L</tt></li>
-<li>フラグ: <tt>0</tt></li>
+<li>フラグ: <tt>0 -</tt></li>
 </ul>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>対応情報</h4>
 <p><tt>_FS_READONLY == 0</tt>で、且つ<tt>_USE_STRFUNC</tt>が 1または 2のとき使用可能になります。2の時は、出力に含まれる<tt>'\n'</tt>が<tt>"\r\n"</tt>に展開されてファイルに書き込まれます。</p>
 <p>APIにUnicodeが選択されている(<tt>_LFN_UNICODE</tt>が1)ときは、UTF-8エンコードでファイルに書き込みます。それ以外の時は無変換(1文字1バイト)で書き込みます。</p>
 </div>
 
 
-<div class="para">
+<div class="para use">
 <h4>使用例</h4>
 <pre>
-    f_printf(&amp;fil, "%6d", -200);         <span>/* "  -200" */</span>
-    f_printf(&amp;fil, "%02u", 5);           <span>/* "05" */</span>
-    f_printf(&amp;fil, "%ld", 12345678L);    <span>/* "12345678" */</span>
-    f_printf(&amp;fil, "%08lX", 1194684UL);  <span>/* "00123ABC" */</span>
-    f_printf(&amp;fil, "%s", "String");      <span>/* "String" */</span>
-    f_printf(&amp;fil, "%c", 'a');           <span>/* "a" */</span>
+    f_printf(&amp;fil, "%d", 1234);            <span class="c">/* "1234" */</span>
+    f_printf(&amp;fil, "%6d,%3d%%", -200, 5);  <span class="c">/* "  -200,  5%" */</span>
+    f_printf(&amp;fil, "%-6u", 100);           <span class="c">/* "100   " */</span>
+    f_printf(&amp;fil, "%ld", 12345678L);      <span class="c">/* "12345678" */</span>
+    f_printf(&amp;fil, "%04x", 0xA3);          <span class="c">/* "00a3" */</span>
+    f_printf(&amp;fil, "%08LX", 0x123ABC);     <span class="c">/* "00123ABC" */</span>
+    f_printf(&amp;fil, "%016b", 0x550F);       <span class="c">/* "0101010100001111" */</span>
+    f_printf(&amp;fil, "%s", "String");        <span class="c">/* "String" */</span>
+    f_printf(&amp;fil, "%-4s", "abc");         <span class="c">/* "abc " */</span>
+    f_printf(&amp;fil, "%4s", "abc");          <span class="c">/* " abc" */</span>
+    f_printf(&amp;fil, "%c", 'a');             <span class="c">/* "a" */</span>
+    f_printf(&amp;fil, "%f", 10.0);            <span class="c">/* 浮動小数点は未サポート */</span>
 </pre>
 </div>
 
 
-<div class="para">
+<div class="para ref">
 <h4>参照</h4>
 <p><tt><a href="open.html">f_open</a>, <a href="putc.html">f_putc</a>, <a href="puts.html">f_puts</a>, <a href="gets.html">f_gets</a>, <a href="close.html">f_close</a>, <a href="sfile.html">FIL</a></tt></p>
 </div>
diff --git a/doc/ja/putc.html b/doc/ja/putc.html
index 8abefb9..005fe0c 100644
--- a/doc/ja/putc.html
+++ b/doc/ja/putc.html
@@ -11,18 +11,18 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>f_putc</h2>
 <p>ファイルに文字を書き込みます。</p>
 <pre>
 int f_putc (
-  TCHAR <em>Chr</em>,        <span>/* 書き込む文字 */</span>
-  FIL* <em>FileObject</em>   <span>/* ファイル・オブジェクト */</span>
+  TCHAR <em>Chr</em>,        <span class="c">/* 書き込む文字 */</span>
+  FIL* <em>FileObject</em>   <span class="c">/* ファイル・オブジェクト */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>引数</h4>
 <dl class="par">
 <dt>Chr</dt>
@@ -33,26 +33,26 @@ int f_putc (
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>戻り値</h4>
 <p>文字が正常に書き込まれると書き込んだ文字が返されます。ディスクが満杯またはエラーにより書き込まれなかったときは<tt>EOF (-1)</tt>が返されます。</p>
 <p>APIにUnicodeが選択されている(<tt>_LFN_UNICODE</tt>が1)ときは、UTF-8エンコードでファイルに書き込みます。それ以外の時は無変換(1文字1バイト)で書き込みます。</p>
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>解説</h4>
 <p>1文字をファイルに書き込みます。この関数は<a href="write.html">f_write()</a>のラッパー関数です。</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>対応情報</h4>
 <p><tt>_FS_READONLY == 0</tt>で、且つ<tt>_USE_STRFUNC</tt>が 1または 2のとき使用可能です。2を指定すると、<tt>'\n'</tt>は<tt>"\r\n"</tt>に展開されてファイルに書き込まれます。</p>
 </div>
 
 
-<div class="para">
+<div class="para ref">
 <h4>参照</h4>
 <p><tt><a href="open.html">f_open</a>, <a href="puts.html">f_puts</a>, <a href="printf.html">f_printf</a>, <a href="gets.html">f_gets</a>, <a href="close.html">f_close</a>, <a href="sfile.html">FIL</a></tt></p>
 </div>
diff --git a/doc/ja/puts.html b/doc/ja/puts.html
index 698c869..226cef4 100644
--- a/doc/ja/puts.html
+++ b/doc/ja/puts.html
@@ -11,18 +11,18 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>f_puts</h2>
 <p>ファイルに文字列を書き込みます。</p>
 <pre>
 int f_puts (
-  const TCHAR* <em>Str</em>,  <span>/* 文字列 */</span>
-  FIL* <em>FileObject</em>    <span>/* ファイル・オブジェクト */</span>
+  const TCHAR* <em>Str</em>,  <span class="c">/* 文字列 */</span>
+  FIL* <em>FileObject</em>    <span class="c">/* ファイル・オブジェクト */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>引数</h4>
 <dl class="par">
 <dt>Str</dt>
@@ -33,26 +33,26 @@ int f_puts (
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>戻り値</h4>
 <p>文字列が正常に書き込まれると、書き込まれた文字数が返されます。ディスクが満杯またはエラーにより正常に書き込まれなかったときは<tt>EOF (-1)</tt>が返されます。</p>
 <p>APIにUnicodeが選択されている(<tt>_LFN_UNICODE</tt>が1)ときは、UTF-8エンコードでファイルに書き込みます。それ以外の時は無変換(1文字1バイト)で書き込みます。</p>
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>解説</h4>
 <p>文字列をファイルに書き込みます。この関数は<a href="putc.html">f_putc()</a>のラッパー関数です。</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>対応情報</h4>
 <p><tt>_FS_READONLY == 0</tt>で、且つ<tt>_USE_STRFUNC</tt>が 1または 2のとき使用可能です。2を指定すると、文字列に含まれる<tt>'\n'</tt>は<tt>"\r\n"</tt>に展開されてファイルに書き込まれます。</p>
 </div>
 
 
-<div class="para">
+<div class="para ref">
 <h4>参照</h4>
 <p><tt><a href="open.html">f_open</a>, <a href="putc.html">f_putc</a>, <a href="printf.html">f_printf</a>, <a href="gets.html">f_gets</a>, <a href="close.html">f_close</a>, <a href="sfile.html">FIL</a></tt></p>
 </div>
diff --git a/doc/ja/rc.html b/doc/ja/rc.html
new file mode 100644
index 0000000..cb27aea
--- /dev/null
+++ b/doc/ja/rc.html
@@ -0,0 +1,83 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="ja">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<link rel="up" title="FatFs" href="../00index_j.html">
+<link rel="alternate" hreflang="en" title="English" href="../en/rc.html">
+<link rel="stylesheet" href="../css_j.css" type="text/css" media="screen" title="ELM Default">
+<title>FatFs - 謌ｻ繧雁�､</title>
+</head>
+
+<body>
+<h1>繝輔ぃ繧､繝ｫ髢｢謨ｰ縺ｮ謌ｻ繧雁�､</h1>
+<p>FatFs縺ｮAPI縺ｧ縺ｯ縲∽ｸ�驛ｨ縺ｮ髢｢謨ｰ繧帝勁縺咲ｵ先棡縺ｫ蠢懊§縺溷�ｱ騾壹�ｮ繝ｪ繧ｶ繝ｫ繝医�ｻ繧ｳ繝ｼ繝�(enum蝙�)繧定ｿ斐＠縺ｾ縺吶�る未謨ｰ縺梧�仙粥縺励◆蝣ｴ蜷医�ｯ0繧定ｿ斐＠縺ｾ縺吶�ょ､ｱ謨励＠縺溷�ｴ蜷医�ｯ0莉･螟悶�ｮ蛟､繧定ｿ斐＠縲∝�､縺ｯ繧ｨ繝ｩ繝ｼ縺ｮ遞ｮ鬘槭ｒ遉ｺ縺励∪縺吶��</p>
+
+<dl class="ret">
+<dt id="ok">FR_OK (0)</dt>
+<dd>髢｢謨ｰ縺ｯ謌仙粥縺励◆縲�</dd>
+<dt id="de">FR_DISK_ERR</dt>
+<dd>荳倶ｽ阪Ξ繧､繝､(繝�繧｣繧ｹ繧ｯI/O髢｢謨ｰ)縺ｧ蝗槫ｾｩ荳崎�ｽ縺ｪ繧ｨ繝ｩ繝ｼ縺檎匱逕溘＠縺溘��</dd>
+<dt id="ie">FR_INT_ERR</dt>
+<dd>蜀�驛ｨ蜃ｦ逅�縺ｮ蛛･蜈ｨ諤ｧ縺ｫ逡ｰ蟶ｸ縺梧､懷�ｺ縺輔ｌ縺溘�ょ次蝗�縺ｨ縺励※縺ｯ谺｡縺ｮ繧医≧縺ｪ縺薙→縺瑚��縺医ｉ繧後∪縺吶��
+<ul>
+<li>繝懊Μ繝･繝ｼ繝�荳翫�ｮFAT讒矩��縺ｫ繧ｨ繝ｩ繝ｼ縺後≠繧九��</li>
+<li>繧ｹ繧ｿ繝�繧ｯ荳崎ｶｳ繧�莉悶�ｮ繧ｿ繧ｹ繧ｯ遲峨↓繧医ｋ繝ｯ繝ｼ繧ｯ繝ｻ繧ｨ繝ｪ繧｢(繝輔ぃ繧､繝ｫ繝ｻ繧ｷ繧ｹ繝�繝�繝ｻ繧ｪ繝悶ず繧ｧ繧ｯ繝医ｄ繝輔ぃ繧､繝ｫ繝ｻ繧ｪ繝悶ず繧ｧ繧ｯ繝�)縺ｮ遐ｴ螢翫�ょ､壹￥縺ｯ縺薙ｌ縺悟次蝗�縲�</li>
+</ul>
+</dd>
+<dt id="nr">FR_NOT_READY</dt>
+<dd>迚ｩ逅�繝峨Λ繧､繝悶′蜍穂ｽ懷庄閭ｽ縺ｪ迥ｶ諷九↓縺ｪ縺�縲ゅ∪縺溘�ｯ縲√ラ繝ｩ繧､繝悶�ｮ蛻晄悄蛹悶↓螟ｱ謨励＠縺溘��</dd>
+<dt id="nf">FR_NO_FILE</dt>
+<dd>謖�螳壹＆繧後◆繝輔ぃ繧､繝ｫ縺瑚ｦ九▽縺九ｉ縺ｪ縺九▲縺溘��</dd>
+<dt id="np">FR_NO_PATH</dt>
+<dd>謖�螳壹＆繧後◆繝代せ縺瑚ｦ九▽縺九ｉ縺ｪ縺九▲縺溘��</dd>
+<dt id="in">FR_INVALID_NAME</dt>
+<dd>謖�螳壹＆繧後◆譁�蟄怜�励′<a href="filename.html">繝代せ蜷阪�ｮ繝輔か繝ｼ繝槭ャ繝�</a>縺ｨ縺励※辟｡蜉ｹ縲�</dd>
+<dt id="dn">FR_DENIED</dt>
+<dd>縺昴�ｮ繧ｪ繝悶ず繧ｧ繧ｯ繝医↓蟇ｾ縺吶ｋ謫堺ｽ懊�ｮ諡貞凄縲ょ次蝗�縺ｨ縺励※縺ｯ谺｡縺ｮ繧医≧縺ｪ縺薙→縺瑚��縺医ｉ繧後∪縺吶��
+<ul>
+<li>譖ｸ縺崎ｾｼ縺ｿ遖∵ｭ｢螻樊�ｧ(AM_RDO)繧呈戟縺､繝輔ぃ繧､繝ｫ繧呈嶌縺崎ｾｼ縺ｿ繝｢繝ｼ繝峨〒髢九％縺�縺ｨ縺励◆縲�</li>
+<li>譖ｸ縺崎ｾｼ縺ｿ遖∵ｭ｢螻樊�ｧ繧呈戟縺､繝輔ぃ繧､繝ｫ繧�繝�繧｣繝ｬ繧ｯ繝医Μ繧貞炎髯､縺励ｈ縺�縺ｨ縺励◆縲�</li>
+<li>遨ｺ縺ｧ縺ｪ縺�繝�繧｣繝ｬ繧ｯ繝医Μ縺ｾ縺溘�ｯ繧ｫ繝ｬ繝ｳ繝医�ｻ繝�繧｣繝ｬ繧ｯ繝医Μ繧貞炎髯､縺励ｈ縺�縺ｨ縺励◆縲�</li>
+<li>FA_READ繧剃ｻ倥¢縺壹↓髢九＞縺溘ヵ繧｡繧､繝ｫ縺ｫ蟇ｾ縺励※隱ｭ縺ｿ蜃ｺ縺励ｒ陦後▲縺溘��</li>
+<li>FA_WRITE繧剃ｻ倥¢縺壹↓髢九＞縺溘ヵ繧｡繧､繝ｫ縺ｫ蟇ｾ縺励※螟画峩謫堺ｽ懊ｒ陦後▲縺溘��</li>
+<li>繝�繧｣繝ｬ繧ｯ繝医Μ繝ｻ繝�繝ｼ繝悶Ν縺梧ｺ�譚ｯ縺ｧ繝輔ぃ繧､繝ｫ繧�繝�繧｣繝ｬ繧ｯ繝医Μ繧剃ｽ懈�舌〒縺阪↑縺九▲縺溘��</li>
+<li>繝懊Μ繝･繝ｼ繝�縺梧ｺ�譚ｯ縺ｧ繝�繧｣繝ｬ繧ｯ繝医Μ繧剃ｽ懈�舌〒縺阪↑縺九▲縺溘��</li>
+</ul>
+</dd>
+<dt id="ex">FR_EXIST</dt>
+<dd>譁ｰ縺励￥菴懈�舌＠繧医≧縺ｨ縺励◆繧ｪ繝悶ず繧ｧ繧ｯ繝医→蜷後§蜷榊燕縺ｮ繧ｪ繝悶ず繧ｧ繧ｯ繝医′譌｢縺ｫ蟄伜惠縺吶ｋ縲�</dd>
+<dt id="io">FR_INVALID_OBJECT</dt>
+<dd>謖�螳壹＆繧後◆繝輔ぃ繧､繝ｫ繝ｻ繧ｪ繝悶ず繧ｧ繧ｯ繝医ｄ繝�繧｣繝ｬ繧ｯ繝医Μ繝ｻ繧ｪ繝悶ず繧ｧ繧ｯ繝医′辟｡蜉ｹ縲�</dd>
+<dt id="wp">FR_WRITE_PROTECTED</dt>
+<dd>迚ｩ逅�繝峨Λ繧､繝悶′譖ｸ縺崎ｾｼ縺ｿ遖∵ｭ｢迥ｶ諷九�ｮ縺ｨ縺阪�∵嶌縺崎ｾｼ縺ｿ繧剃ｼｴ縺�謫堺ｽ懊ｒ陦後♀縺�縺ｨ縺励◆縲�</dd>
+<dt id="id">FR_INVALID_DRIVE</dt>
+<dd>謖�螳壹＆繧後◆繝峨Λ繧､繝也分蜿ｷ縺檎┌蜉ｹ縲�(髢｢騾｣繧ｪ繝励す繝ｧ繝ｳ: _VOLUMES)</dd>
+<dt id="ne">FR_NOT_ENABLED</dt>
+<dd>縺昴�ｮ繝懊Μ繝･繝ｼ繝�縺ｮ謫堺ｽ懊↓蠢�隕√↑繝ｯ繝ｼ繧ｯ繝ｻ繧ｨ繝ｪ繧｢(繝輔ぃ繧､繝ｫ繝ｻ繧ｷ繧ｹ繝�繝�繝ｻ繧ｪ繝悶ず繧ｧ繧ｯ繝域ｧ矩��菴�)縺御ｸ弱∴繧峨ｌ縺ｦ縺�縺ｪ縺�縲�</dd>
+<dt id="ns">FR_NO_FILESYSTEM</dt>
+<dd>迚ｩ逅�繝峨Λ繧､繝紋ｸ翫↓譛牙柑縺ｪFAT繝懊Μ繝･繝ｼ繝�縺瑚ｦ九▽縺九ｉ縺ｪ縺九▲縺溘��</dd>
+<dt id="ma">FR_MKFS_ABORTED</dt>
+<dd>f_mkfs()縺ｮ蜃ｦ逅�縺碁幕蟋句燕縺ｫ荳ｭ譁ｭ縺輔ｌ縺溘�ょ次蝗�縺ｨ縺励※縺ｯ谺｡縺ｮ繧医≧縺ｪ縺薙→縺瑚��縺医ｉ繧後∪縺吶��
+<ul>
+<li>繝懊Μ繝･繝ｼ繝�縺悟ｰ上＆縺吶℃繧九��</li>
+<li>FAT繧ｿ繧､繝励�ｮ險育ｮ励↓遏帷崟縺瑚ｦ九▽縺九▲縺溘�ゅけ繝ｩ繧ｹ繧ｿ謨ｰ縺熊AT繧ｿ繧､繝励�ｮ蠅�逡御ｻ倩ｿ代↓縺ｪ繧九→縺阪↓逋ｺ逕溘☆繧句�ｴ蜷医′縺ゅｊ縺ｾ縺吶��</li>
+</ul>
+</dd>
+<dt id="tm">FR_TIMEOUT</dt>
+<dd><a href="appnote.html#reentrant">蜀榊�･蛻ｶ蠕｡</a>縺ｫ繧医ｋ蠕�縺｡譎る俣縺悟ｮ夂ｾｩ縺輔ｌ縺滓凾髢薙ｒ雜翫∴縺溘◆繧√��髢｢謨ｰ縺ｯ螳溯｡後＆繧後↑縺九▲縺溘��(髢｢騾｣繧ｪ繝励す繝ｧ繝ｳ: _TIMEOUT)</dd>
+<dt id="lo">FR_LOCKED</dt>
+<dd><a href="appnote.html#dup">螟夐�阪い繧ｯ繧ｻ繧ｹ謗剃ｻ匁ｩ溯�ｽ</a>縺ｫ繧医ｊ縲√◎縺ｮ繝輔ぃ繧､繝ｫ縺ｫ蟇ｾ縺励※陦後♀縺�縺ｨ縺励◆繧｢繧ｯ繧ｻ繧ｹ縺梧拠蜷ｦ縺輔ｌ縺溘��(髢｢騾｣繧ｪ繝励す繝ｧ繝ｳ: _FS_SHARE)</dd>
+<dt id="nc">FR_NOT_ENOUGH_CORE</dt>
+<dd>繝｡繝｢繝ｪ荳崎ｶｳ縺ｫ繧医ｋ螟ｱ謨励�ょ次蝗�縺ｨ縺励※縺ｯ谺｡縺ｮ繧医≧縺ｪ縺薙→縺瑚��縺医ｉ繧後∪縺吶��
+<ul>
+<li>LFN謫堺ｽ懊ヰ繝�繝輔ぃ縺ｮ蜍慕噪遒ｺ菫昴↓螟ｱ謨励＠縺溘��(髢｢騾｣繧ｪ繝励す繝ｧ繝ｳ: _USE_LFN)</li>
+<li>荳弱∴繧峨ｌ縺滄�榊�励�ｮ繧ｵ繧､繧ｺ縺悟ｮ滄圀縺ｫ蠢�隕√↑繧ｵ繧､繧ｺ縺ｫ蟇ｾ縺励※荳崎ｶｳ縺励※縺�繧九��</li>
+</ul>
+</dd>
+<dt id="tf">FR_TOO_MANY_OPEN_FILES</dt>
+<dd>蜷梧凾繧ｪ繝ｼ繝励Φ蜿ｯ閭ｽ縺ｪ繝輔ぃ繧､繝ｫ謨ｰ繧定ｶ翫∴縺ｦ繝輔ぃ繧､繝ｫ繧帝幕縺薙≧縺ｨ縺励◆縲�(髢｢騾｣繧ｪ繝励す繝ｧ繝ｳ: _FS_SHARE)</dd>
+</dl>
+
+</body>
+</html>
diff --git a/doc/ja/read.html b/doc/ja/read.html
index 7077b23..2c66f3b 100644
--- a/doc/ja/read.html
+++ b/doc/ja/read.html
@@ -11,20 +11,20 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>f_read</h2>
 <p>ファイルからデータを読み出します。</p>
 <pre>
 FRESULT f_read (
-  FIL* <em>FileObject</em>,    <span>/* ファイル・オブジェクト構造体 */</span>
-  void* <em>Buffer</em>,       <span>/* 読み出したデータを格納するバッファ */</span>
-  UINT <em>ByteToRead</em>,    <span>/* 読み出すバイト数 */</span>
-  UINT* <em>ByteRead</em>      <span>/* 読み出されたバイト数 */</span>
+  FIL* <em>FileObject</em>,    <span class="c">/* ファイル・オブジェクト構造体 */</span>
+  void* <em>Buffer</em>,       <span class="c">/* 読み出したデータを格納するバッファ */</span>
+  UINT <em>ByteToRead</em>,    <span class="c">/* 読み出すバイト数 */</span>
+  UINT* <em>ByteRead</em>      <span class="c">/* 読み出されたバイト数 */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>引数</h4>
 <dl class="par">
 <dt>FileObject</dt>
@@ -39,38 +39,33 @@ FRESULT f_read (
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>戻り値</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>正常終了。</dd>
-<dt>FR_DENIED</dt>
-<dd>非読み込みモードで開いたファイルから読み込もうとした。</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>ディスク・エラーによる失敗。</dd>
-<dt>FR_INT_ERR</dt>
-<dd>不正なFAT構造または内部エラーによる失敗。</dd>
-<dt>FR_NOT_READY</dt>
-<dd>メディアがセットされていないなど、物理ドライブが動作不能状態。</dd>
-<dt>FR_INVALID_OBJECT</dt>
-<dd>無効なファイル・オブジェクト。</dd>
-</dl>
+<p>
+<a href="rc.html#ok">FR_OK</a>,
+<a href="rc.html#de">FR_DISK_ERR</a>,
+<a href="rc.html#ie">FR_INT_ERR</a>,
+<a href="rc.html#nr">FR_NOT_READY</a>,
+<a href="rc.html#de">FR_DENIED</a>,
+<a href="rc.html#io">FR_INVALID_OBJECT</a>,
+<a href="rc.html#tm">FR_TIMEOUT</a>
+</p>
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>解説</h4>
 <p>読み込み開始位置は、現在のリード/ライト・ポインタからになります。リード/ライト・ポインタは読み込まれたバイト数だけ進みます。関数が正常終了した後は、<tt>*ByteRead</tt>の値をチェックすべきです。<tt>*ByteRead</tt>が<tt>ByteToRead</tt>よりも小さいときは、読み込み中にファイルの終端に達したことを示しています。</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>対応情報</h4>
 <p>全ての構成で使用可能です。</p>
 </div>
 
 
-<div class="para">
+<div class="para ref">
 <h4>参照</h4>
 <p><tt><a href="open.html">f_open</a>, <a href="gets.html">fgets</a>, <a href="write.html">f_write</a>, <a href="close.html">f_close</a>, <a href="sfile.html">FIL</a></tt></p>
 </div>
diff --git a/doc/ja/readdir.html b/doc/ja/readdir.html
index 4bda830..95d4e0a 100644
--- a/doc/ja/readdir.html
+++ b/doc/ja/readdir.html
@@ -11,18 +11,18 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>f_readdir</h2>
 <p>ディレクトリ項目を読み出します</p>
 <pre>
 FRESULT f_readdir (
-  DIR* <em>DirObject</em>,    <span>/* ディレクトリ・ブジェクト構造体へのポインタ */</span>
-  FILINFO* <em>FileInfo</em>  <span>/* ファイル情報構造体へのポインタ */</span>
+  DIR* <em>DirObject</em>,    <span class="c">/* ディレクトリ・ブジェクト構造体へのポインタ */</span>
+  FILINFO* <em>FileInfo</em>  <span class="c">/* ファイル情報構造体へのポインタ */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>引数</h4>
 <dl class="par">
 <dt>DirObject</dt>
@@ -33,77 +33,76 @@ FRESULT f_readdir (
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>戻り値</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>正常終了。</dd>
-<dt>FR_NOT_READY</dt>
-<dd>メディアがセットされていないなど、物理ドライブが動作不能状態。</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>ディスク・エラーによる失敗。</dd>
-<dt>FR_INT_ERR</dt>
-<dd>不正なFAT構造または内部エラーによる失敗。</dd>
-<dt>FR_INVALID_OBJECT</dt>
-<dd>無効なディレクトリ・オブジェクト。</dd>
-</dl>
+<p>
+<a href="rc.html#ok">FR_OK</a>,
+<a href="rc.html#de">FR_DISK_ERR</a>,
+<a href="rc.html#ie">FR_INT_ERR</a>,
+<a href="rc.html#nr">FR_NOT_READY</a>,
+<a href="rc.html#io">FR_INVALID_OBJECT</a>,
+<a href="rc.html#tm">FR_TIMEOUT</a>,
+<a href="rc.html#nc">FR_NOT_ENOUGH_CORE</a>
+</p>
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>解説</h4>
 <p>ディレクトリ項目を順次読み出します。この関数を繰り返し実行することによりディレクトリの全ての項目を読み出すことができます。全ての項目を読み出し、読み出す項目がもう無いときは、<tt>f_name[]</tt>メンバにヌル文字列が返されます。ボリューム・ラベルは読み出すときに棄てられ、現れることはありません。"."、".."は、相対パスが有効なとき(<tt>_FS_RPATH == 1</tt>)にのみ現れます。得られるファイル情報の詳細については <tt>FILINFO</tt>構造体を参照してください。FileInfoにヌル・ポインタを指定すると、そのディレクトリのリード・インデックスを巻き戻します。</p>
-<p>LFN機能が有効な時は、f_readdir関数の呼び出しに先立ってFILINFO構造体の<tt>lfname</tt>と<tt>lfsize</tt>が有効な値で初期化されていなければなりません。<tt>lfname</tt>はLFNを格納するバッファで、<tt>lfsize</tt>はそのバッファ・サイズ(文字数)です。次の条件に一つでも該当する場合は、LFN格納バッファにヌル文字列が返されます。</p>
+<p>LFN機能が有効な時は、f_readdir関数の呼び出しに先立ってFILINFO構造体の<tt>lfname</tt>と<tt>lfsize</tt>が有効な値で初期化されていなければなりません。<tt>lfname</tt>はLFNを格納するバッファで、<tt>lfsize</tt>はそのバッファ・サイズ(TCHAR)です。次の条件に一つでも該当する場合は、LFN格納バッファにヌル文字列が返されます。</p>
 <ul>
 <li>そのディレクトリ項目にLFNが存在しない。</li>
 <li>LFNの長さに対してLFN格納バッファまたはLFN操作バッファのサイズが不十分。</li>
-<li>LFNにOEMコードに存在しない文字が含まれている。(Unicode APIではないとき)</li>
+<li>LFNに現在のOEMコードに存在しない文字が含まれている。(Unicode APIではないとき)</li>
 </ul>
 <p>また、<tt>lfname</tt>にヌル・ポインタを指定した場合は、LFNに関して何も返されません。LFNが存在しないときは、<tt>f_name[]</tt>メンバのSFNにASCII英小文字が含まれる場合があります。</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>対応情報</h4>
 <p><tt>_FS_MINIMIZE &lt;= 1</tt>のときに使用可能です。</p>
 </div>
 
 
-<div class="para">
+<div class="para use">
 <h4>使用例</h4>
 <pre>
-FRESULT scan_files (char* path)
+FRESULT scan_files (
+    char* path        <span class="c">/* 開始ノード (ワークエリアとしても使用) */</span>
+)
 {
     FRESULT res;
     FILINFO fno;
     DIR dir;
     int i;
-    char *fn;
-#if _USE_LFN
-    static char lfn[_MAX_LFN * (_DF1S ? 2 : 1) + 1];
+    char *fn;   <span class="c">/* 非Unicode構成を想定 */</span>
+<span class="k">#if</span> _USE_LFN
+    static char lfn[_MAX_LFN + 1];
     fno.lfname = lfn;
     fno.lfsize = sizeof(lfn);
-#endif
+<span class="k">#endif</span>
 
 
-    res = f_opendir(&amp;dir, path);
+    res = f_opendir(&amp;dir, path);                       <span class="c">/* ディレクトリを開く */</span>
     if (res == FR_OK) {
         i = strlen(path);
         for (;;) {
-            res = f_readdir(&amp;dir, &amp;fno);
-            if (res != FR_OK || fno.fname[0] == 0) break;
-            if (fno.fname[0] == '.') continue;
-#if _USE_LFN
+            res = f_readdir(&amp;dir, &amp;fno);                   <span class="c">/* ディレクトリ項目を1個読み出す */</span>
+            if (res != FR_OK || fno.fname[0] == 0) break;  <span class="c">/* エラーまたは項目無しのときは抜ける */</span>
+            if (fno.fname[0] == '.') continue;             <span class="c">/* ドットエントリは無視 */</span>
+<span class="k">#if</span> _USE_LFN
             fn = *fno.lfname ? fno.lfname : fno.fname;
-#else
+<span class="k">#else</span>
             fn = fno.fname;
-#endif
-            if (fno.fattrib &amp; AM_DIR) {
+<span class="k">#endif</span>
+            if (fno.fattrib &amp; AM_DIR) {                    <span class="c">/* ディレクトリ */</span>
                 sprintf(&amp;path[i], "/%s", fn);
                 res = scan_files(path);
                 if (res != FR_OK) break;
                 path[i] = 0;
-            } else {
+            } else {                                       <span class="c">/* ファイル */</span>
                 printf("%s/%s\n", path, fn);
             }
         }
@@ -115,7 +114,7 @@ FRESULT scan_files (char* path)
 </div>
 
 
-<div class="para">
+<div class="para ref">
 <h4>参照</h4>
 <p><tt><a href="opendir.html">f_opendir</a>, <a href="stat.html">f_stat</a>, <a href="sfileinfo.html">FILINFO</a>, <a href="sdir.html">DIR</a></tt></p>
 </div>
diff --git a/doc/ja/rename.html b/doc/ja/rename.html
index 5f54f0c..e0c0950 100644
--- a/doc/ja/rename.html
+++ b/doc/ja/rename.html
@@ -11,18 +11,18 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>f_rename</h2>
 <p>オブジェクトの名前の変更または移動。</p>
 <pre>
 FRESULT f_rename (
-  const TCHAR* <em>OldName</em>, <span>/* 古いオブジェクト名 */</span>
-  const TCHAR* <em>NewName</em>  <span>/* 新しいオブジェクト名 */</span>
+  const TCHAR* <em>OldName</em>, <span class="c">/* 古いオブジェクト名 */</span>
+  const TCHAR* <em>NewName</em>  <span class="c">/* 新しいオブジェクト名 */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>引数</h4>
 <dl class="par">
 <dt>OldName</dt>
@@ -33,60 +33,46 @@ FRESULT f_rename (
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>戻り値</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>正常終了。</dd>
-<dt>FR_NO_FILE</dt>
-<dd>OldNameのオブジェクトが見つからない。</dd>
-<dt>FR_NO_PATH</dt>
-<dd>パスが見つからない。</dd>
-<dt>FR_INVALID_NAME</dt>
-<dd>パス名が不正。</dd>
-<dt>FR_INVALID_DRIVE</dt>
-<dd>ドライブ番号が不正。</dd>
-<dt>FR_DENIED</dt>
-<dd>ドライブ容量の不足等の理由で新しい名前のオブジェクトが作れない。</dd>
-<dt>FR_EXIST</dt>
-<dd>NewNameと同じ名前が既に存在する。</dd>
-<dt>FR_NOT_READY</dt>
-<dd>メディアがセットされていないなど、物理ドライブが動作不能状態。</dd>
-<dt>FR_WRITE_PROTECTED</dt>
-<dd>メディアが書き込み禁止状態。</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>ディスク・エラーによる失敗。</dd>
-<dt>FR_INT_ERR</dt>
-<dd>不正なFAT構造または内部エラーによる失敗。</dd>
-<dt>FR_NOT_ENABLED</dt>
-<dd>論理ドライブにワークエリアが割り当てられていない。</dd>
-<dt>FR_NO_FILESYSTEM</dt>
-<dd>有効なFATボリュームが見つからない。</dd>
-<dt>FR_LOCKED</dt>
-<dd>ファイル共有機能(_FS_SHARE)によるアクセス拒否。</dd>
-</dl>
+<p>
+<a href="rc.html#ok">FR_OK</a>,
+<a href="rc.html#de">FR_DISK_ERR</a>,
+<a href="rc.html#ie">FR_INT_ERR</a>,
+<a href="rc.html#nr">FR_NOT_READY</a>,
+<a href="rc.html#ok">FR_NO_FILE</a>,
+<a href="rc.html#np">FR_NO_PATH</a>,
+<a href="rc.html#in">FR_INVALID_NAME</a>,
+<a href="rc.html#ex">FR_EXIST</a>,
+<a href="rc.html#wp">FR_WRITE_PROTECTED</a>,
+<a href="rc.html#id">FR_INVALID_DRIVE</a>,
+<a href="rc.html#ne">FR_NOT_ENABLED</a>,
+<a href="rc.html#ns">FR_NO_FILESYSTEM</a>,
+<a href="rc.html#tm">FR_TIMEOUT</a>,
+<a href="rc.html#lo">FR_LOCKED</a>
+</p>
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>解説</h4>
 <p>オブジェクトの名前を変更します。また、別のディレクトリへの移動も可能です。<em>開かれているオブジェクトに対して使用してはなりません</em>。</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>対応情報</h4>
 <p><tt>_FS_READONLY == 0</tt>で、且つ<tt>_FS_MINIMIZE == 0</tt>のときに使用可能です。</p>
 </div>
 
 
-<div class="para">
+<div class="para use">
 <h4>使用例</h4>
 <pre>
-    <span>/* ファイルまたはサブディレクトリの名前を変更する */</span>
+    <span class="c">/* ファイルまたはサブディレクトリの名前を変更する */</span>
     f_rename("oldname.txt", "newname.txt");
 
-    <span>/* ファイルまたはサブディレクトリの名前の変更と別のディレクトリへの移動 */</span>
+    <span class="c">/* ファイルまたはサブディレクトリの名前の変更と別のディレクトリへの移動 */</span>
     f_rename("oldname.txt", "dir1/newname.txt");
 </pre>
 </div>
diff --git a/doc/ja/sdir.html b/doc/ja/sdir.html
index f90d521..e6cb3ae 100644
--- a/doc/ja/sdir.html
+++ b/doc/ja/sdir.html
@@ -15,19 +15,19 @@
 <h2>DIR</h2>
 <p><tt>DIR</tt>構造体は、f_opendir(), f_readdir()のワーク・エリアとして使用されます。アプリケーションから変更可能なメンバはありません。</p>
 <pre>
-typedef struct {
-    FATFS*  fs;        <span>/* 親ファイル・システム・オブジェクトへのポインタ */</span>
-    WORD    id;        <span>/* 親ファイル・システム・オブジェクトのマウントID */</span>
-    WORD    index;     <span>/* 次に読み出すディレクトリ・インデックス番号 */</span>
-    DWORD   sclust;    <span>/* ディレクトリ開始クラスタ (0:ルート) */</span>
-    DWORD   clust;     <span>/* 現在のクラスタ番号 */</span>
-    DWORD   sect;      <span>/* 現在のセクタ番号 */</span>
-    BYTE*   dir;       <span>/* 現在のSFNエントリへのポインタ */</span>
-    BYTE*   fn;        <span>/* SFNバッファへのポインタ (in/out) {file[8],ext[3],status[1]} */</span>
-#if _USE_LFN
-    WCHAR*  lfn;       <span>/* LFNバッファへのポインタ */</span>
-    WORD    lfn_idx;   <span>/* 最後にマッチしたLFNエントリのインデックス (0xFFFF:無効) */</span>
-#endif
+<span class="k">typedef</span> <span class="k">struct</span> {
+    FATFS*  fs;        <span class="c">/* 親ファイル・システム・オブジェクトへのポインタ */</span>
+    WORD    id;        <span class="c">/* 親ファイル・システム・オブジェクトのマウントID */</span>
+    WORD    index;     <span class="c">/* 次に読み出すディレクトリ・インデックス番号 */</span>
+    DWORD   sclust;    <span class="c">/* ディレクトリ開始クラスタ (0:ルート) */</span>
+    DWORD   clust;     <span class="c">/* 現在のクラスタ番号 */</span>
+    DWORD   sect;      <span class="c">/* 現在のセクタ番号 */</span>
+    BYTE*   dir;       <span class="c">/* 現在のSFNエントリへのポインタ */</span>
+    BYTE*   fn;        <span class="c">/* SFNバッファへのポインタ (in/out) {file[8],ext[3],status[1]} */</span>
+<span class="k">#if</span> _USE_LFN
+    WCHAR*  lfn;       <span class="c">/* LFNバッファへのポインタ */</span>
+    WORD    lfn_idx;   <span class="c">/* 最後にマッチしたLFNエントリのインデックス (0xFFFF:無効) */</span>
+<span class="k">#endif</span>
 } DIR;
 </pre>
 </div>
diff --git a/doc/ja/sfatfs.html b/doc/ja/sfatfs.html
index dababad..bd3997e 100644
--- a/doc/ja/sfatfs.html
+++ b/doc/ja/sfatfs.html
@@ -13,39 +13,39 @@
 
 <div class="para">
 <h2>FATFS</h2>
-<p><tt>FATFS</tt>構造体は、個々の論理ドライブのダイナミック・ワーク・エリアを保持し、f_mount()でFatFsモジュールに登録されます。標準状態では次のようなメンバになっています。アプリケーションから書き換え可能なメンバはありません。</p>
+<p><tt>FATFS</tt>構造体(ファイル・システム・オブジェクト)は、個々の論理ドライブのダイナミック・ワーク・エリアを保持し、f_mount()でFatFsモジュールに登録されます。初期化が行われるタイミングは、f_mount()またはメディア交換の後の最初のファイル・アクセスの時です。アプリケーションから書き換え可能なメンバはありません。</p>
 
 <pre>
-typedef struct {
-    BYTE    fs_type;      <span>/* FATタイプ */</span>
-    BYTE    drv;          <span>/* 物理ドライブ番号 */</span>
-    BYTE    csize;        <span>/* クラスタ当たりのセクタ数 */</span>
-    BYTE    n_fats;       <span>/* FATの多重化数 */</span>
-    BYTE    wflag;        <span>/* win[]ダーティ・フラグ */</span>
-    BYTE    fsi_flag;     <span>/* fsinfoダーティ・フラグ */</span>
-    WORD    id;           <span>/* ファイル・システム・マウントID */</span>
-    WORD    n_rootdir;    <span>/* ルート・ディレクトリのエントリ数 (FAT12/16) */</span>
-#if _MAX_SS != 512
-    WORD    ssize;        <span>/* セクタ・サイズ (可変セクタ長のみ) */</span>
-#endif
-#if _FS_REENTRANT
-    HANDLE  h_mutex;      <span>/* 同期オブジェクトID */</span>
-#endif
-#if !_FS_READONLY
-    DWORD   last_clust;   <span>/* 最後に割り当てられたクラスタ番号 */</span>
-    DWORD   free_clust;   <span>/* 空きクラスタ数 */</span>
-    DWORD   fsi_sector;   <span>/* fsinfoセクタ (FAT32) */</span>
-#endif
-#if _FS_RPATH
-    DWORD   cdir;         <span>/* カレント・ディレクトリのクラスタ (0:ルート) */</span>
-#endif
-    DWORD   n_fatent;     <span>/* FATのエントリ数 (= クラスタ数 + 2) */</span>
-    DWORD   fsize;        <span>/* FAT 1個当たりのセクタ数 */</span>
-    DWORD   fatbase;      <span>/* FAT領域開始セクタ */</span>
-    DWORD   dirbase;      <span>/* ルート・ディレクトリ開始セクタ (FAT32: クラスタ番号) */</span>
-    DWORD   database;     <span>/* データ領域開始区セクタ */</span>
-    DWORD   winsect;      <span>/* win[]に現れているセクタ番号 */</span>
-    BYTE    win[_MAX_SS]; <span>/* ディスク・アクセス・ウィンドウ */</span>
+<span class="k">typedef</span> <span class="k">struct</span> {
+    BYTE    fs_type;      <span class="c">/* FATタイプ */</span>
+    BYTE    drv;          <span class="c">/* 物理ドライブ番号 */</span>
+    BYTE    csize;        <span class="c">/* クラスタ当たりのセクタ数 */</span>
+    BYTE    n_fats;       <span class="c">/* FATの多重化数 */</span>
+    BYTE    wflag;        <span class="c">/* win[]ダーティ・フラグ */</span>
+    BYTE    fsi_flag;     <span class="c">/* fsinfoダーティ・フラグ */</span>
+    WORD    id;           <span class="c">/* ファイル・システム・マウントID */</span>
+    WORD    n_rootdir;    <span class="c">/* ルート・ディレクトリのエントリ数 (FAT12/16) */</span>
+<span class="k">#if</span> _MAX_SS != 512
+    WORD    ssize;        <span class="c">/* セクタ・サイズ (可変セクタ長のみ) */</span>
+<span class="k">#endif</span>
+<span class="k">#if</span> _FS_REENTRANT
+    HANDLE  h_mutex;      <span class="c">/* 同期オブジェクトID */</span>
+<span class="k">#endif</span>
+<span class="k">#if</span> !_FS_READONLY
+    DWORD   last_clust;   <span class="c">/* 最後に割り当てられたクラスタ番号 */</span>
+    DWORD   free_clust;   <span class="c">/* 空きクラスタ数 */</span>
+    DWORD   fsi_sector;   <span class="c">/* fsinfoセクタ (FAT32) */</span>
+<span class="k">#endif</span>
+<span class="k">#if</span> _FS_RPATH
+    DWORD   cdir;         <span class="c">/* カレント・ディレクトリのクラスタ (0:ルート) */</span>
+<span class="k">#endif</span>
+    DWORD   n_fatent;     <span class="c">/* FATのエントリ数 (= クラスタ数 + 2) */</span>
+    DWORD   fsize;        <span class="c">/* FAT 1個当たりのセクタ数 */</span>
+    DWORD   fatbase;      <span class="c">/* FAT領域開始セクタ */</span>
+    DWORD   dirbase;      <span class="c">/* ルート・ディレクトリ開始セクタ (FAT32: クラスタ番号) */</span>
+    DWORD   database;     <span class="c">/* データ領域開始区セクタ */</span>
+    DWORD   winsect;      <span class="c">/* win[]に現れているセクタ番号 */</span>
+    BYTE    win[_MAX_SS]; <span class="c">/* ディスク・アクセス・ウィンドウ */</span>
 } FATFS;
 </pre>
 </div>
diff --git a/doc/ja/sfile.html b/doc/ja/sfile.html
index 6a1ed88..b31307b 100644
--- a/doc/ja/sfile.html
+++ b/doc/ja/sfile.html
@@ -13,32 +13,32 @@
 
 <div class="para">
 <h2>FIL</h2>
-<p><tt>FIL</tt>構造体は、f_open関数で作成され、そのファイルの状態を保持します。また、f_close関数でファイルが閉じられると無効化されます。アプリケーションからの書き換えが可能なメンバは<tt>cltbl</tt>のみです。非タイニー構成では内部にセクタ・バッファが確保されるので、サイズに注意が必要です。</p>
+<p><tt>FIL</tt>構造体(ファイル・オブジェクト)は、f_open関数で初期化され、以後そのファイルの状態を保持します。また、f_close関数でファイルが閉じられると無効化されます。アプリケーションからの書き換えが可能なメンバは<tt>cltbl</tt>のみです。非タイニー構成では内部にセクタ・バッファが確保されるので、サイズに注意が必要です。</p>
 
 <pre>
-typedef struct {
-    FATFS*  fs;           <span>/* 親ファイル・システム・オブジェクトへのポインタ */</span>
-    WORD    id;           <span>/* 親ファイル・システム・オブジェクトのマウントID */</span>
-    BYTE    flag;         <span>/* ファイル・ステータス・フラグ */</span>
+<span class="k">typedef</span> <span class="k">struct</span> {
+    FATFS*  fs;           <span class="c">/* 親ファイル・システム・オブジェクトへのポインタ */</span>
+    WORD    id;           <span class="c">/* 親ファイル・システム・オブジェクトのマウントID */</span>
+    BYTE    flag;         <span class="c">/* ファイル・ステータス・フラグ */</span>
     BYTE    pad1;
-    DWORD   fptr;         <span>/* ファイル読み書きポインタ (ファイル先頭からのバイト・オフセット) */</span>
-    DWORD   fsize;        <span>/* ファイル・サイズ(バイト単位) */</span>
-    DWORD   org_clust;    <span>/* ファイル開始クラスタ番号 (0 on fsize==0) */</span>
-    DWORD   curr_clust;   <span>/* 現在のクラスタ */</span>
-    DWORD   dsect;        <span>/* 現在のデータ・セクタ */</span>
-#if _FS_READONLY == 0
-    DWORD   dir_sect;     <span>/* このファイルのディレクトリ・エントリのあるセクタ */</span>
-    BYTE*   dir_ptr;      <span>/* このファイルのディレクトリへのポインタ */</span>
-#endif
-#if _USE_FASTSEEK
-    DWORD*  cltbl;        <span>/* ファイルのクラスタ・リンク情報へのポインタ (Nulled on file open) */</span>
-#endif
-#if _FS_SHARE
-    UINT    lockid;       <span>/* ファイル・ロックID */</span>
-#endif
-#if !_FS_TINY
-    BYTE    buf[_MAX_SS]; <span>/* データ転送バッファ */</span>
-#endif
+    DWORD   fptr;         <span class="c">/* ファイル読み書きポインタ (ファイル先頭からのバイト・オフセット) */</span>
+    DWORD   fsize;        <span class="c">/* ファイル・サイズ(バイト単位) */</span>
+    DWORD   sclust;       <span class="c">/* ファイル開始クラスタ番号 (0 on fsize==0) */</span>
+    DWORD   clust;        <span class="c">/* 現在のクラスタ */</span>
+    DWORD   dsect;        <span class="c">/* 現在のデータ・セクタ */</span>
+<span class="k">#if</span> _FS_READONLY == 0
+    DWORD   dir_sect;     <span class="c">/* このファイルのディレクトリ・エントリのあるセクタ */</span>
+    BYTE*   dir_ptr;      <span class="c">/* このファイルのディレクトリへのポインタ */</span>
+<span class="k">#endif</span>
+<span class="k">#if</span> _USE_FASTSEEK
+    DWORD*  cltbl;        <span class="c">/* ファイルのクラスタ・リンク情報へのポインタ (Nulled on file open) */</span>
+<span class="k">#endif</span>
+<span class="k">#if</span> _FS_SHARE
+    UINT    lockid;       <span class="c">/* ファイル・ロックID */</span>
+<span class="k">#endif</span>
+<span class="k">#if</span> !_FS_TINY
+    BYTE    buf[_MAX_SS]; <span class="c">/* データ転送バッファ */</span>
+<span class="k">#endif</span>
 } FIL;
 </pre>
 </div>
diff --git a/doc/ja/sfileinfo.html b/doc/ja/sfileinfo.html
index b103d15..aac7927 100644
--- a/doc/ja/sfileinfo.html
+++ b/doc/ja/sfileinfo.html
@@ -15,16 +15,16 @@
 <h2>FILINFO</h2>
 <p><tt>FILINFO</tt>構造体は、<tt>f_stat(), f_readdir()</tt>で返されるファイル情報を保持します。</p>
 <pre>
-typedef struct {
-    DWORD fsize;     <span>/* ファイル・サイズ */</span>
-    WORD fdate;      <span>/* 最後に更新された日付 */</span>
-    WORD ftime;      <span>/* 最後に更新された時刻  */</span>
-    BYTE fattrib;    <span>/* アトリビュート */</span>
-    TCHAR fname[13]; <span>/* 短いファイル名 (8.3フォーマット) */</span>
-#if _USE_LFN
-    TCHAR* lfname;   <span>/* 長いファイル名のバッファへのポインタ */</span>
-    int lfsize;      <span>/* 長いファイル名のバッファのサイズ [文字数] */</span>
-#endif
+<span class="k">typedef</span> <span class="k">struct</span> {
+    DWORD fsize;     <span class="c">/* ファイル・サイズ */</span>
+    WORD fdate;      <span class="c">/* 最後に更新された日付 */</span>
+    WORD ftime;      <span class="c">/* 最後に更新された時刻  */</span>
+    BYTE fattrib;    <span class="c">/* アトリビュート */</span>
+    TCHAR fname[13]; <span class="c">/* 短いファイル名 (8.3フォーマット) */</span>
+<span class="k">#if</span> _USE_LFN
+    TCHAR* lfname;   <span class="c">/* 長いファイル名のバッファへのポインタ */</span>
+    int lfsize;      <span class="c">/* 長いファイル名のバッファのサイズ [文字数] */</span>
+<span class="k">#endif</span>
 } FILINFO;
 </pre>
 </div>
diff --git a/doc/ja/size.html b/doc/ja/size.html
new file mode 100644
index 0000000..ecd8c39
--- /dev/null
+++ b/doc/ja/size.html
@@ -0,0 +1,62 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="ja">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=Shift_JIS">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<link rel="up" title="FatFs" href="../00index_j.html">
+<link rel="alternate" hreflang="en" title="English" href="../en/size.html">
+<link rel="stylesheet" href="../css_j.css" type="text/css" media="screen" title="ELM Default">
+<title>FatFs - f_size</title>
+</head>
+
+<body>
+
+<div class="para func">
+<h2>f_size</h2>
+<p>ファイルのサイズを取得します。</p>
+<pre>
+DWORD f_size (
+  FIL* <em>FileObject</em>   <span class="c">/* ファイル・オブジェクト */</span>
+);
+</pre>
+</div>
+
+
+<div class="para arg">
+<h4>引数</h4>
+<dl class="par">
+<dt>FileObject</dt>
+<dd>ファイル・オブジェクト構造体へのポインタを指定します。</dd>
+</dl>
+</div>
+
+
+<div class="para ret">
+<h4>戻り値</h4>
+<p>バイト単位のファイル・サイズが返ります。</p>
+</div>
+
+
+<div class="para desc">
+<h4>解説</h4>
+<p>f_size関数は、現リビジョンではマクロとして実装されています。</p>
+<pre>
+<span class="k">#define</span> f_size(fp) ((fp)->fsize)
+</pre>
+</div>
+
+
+<div class="para comp">
+<h4>対応情報</h4>
+<p>常に使用可能。</p>
+</div>
+
+
+<div class="para ref">
+<h4>参照</h4>
+<p><tt><a href="open.html">f_open</a>, <a href="lseek.html">f_lseek</a>, <a href="sfile.html">FIL</a></tt></p>
+</div>
+
+<p class="foot"><a href="../00index_j.html">戻る</a></p>
+</body>
+</html>
diff --git a/doc/ja/stat.html b/doc/ja/stat.html
index a4599f9..22e33ec 100644
--- a/doc/ja/stat.html
+++ b/doc/ja/stat.html
@@ -11,17 +11,17 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>f_stat</h2>
 <pre>
 FRESULT f_stat (
-  const TCHAR* <em>FileName</em>,  <span>/* ファイルまたはディレクトリ名へのポインタ */</span>
-  FILINFO* <em>FileInfo</em>       <span>/* ファイル情報構造体へのポインタ */</span>
+  const TCHAR* <em>FileName</em>,  <span class="c">/* ファイルまたはディレクトリ名へのポインタ */</span>
+  FILINFO* <em>FileInfo</em>       <span class="c">/* ファイル情報構造体へのポインタ */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>引数</h4>
 <dl class="par">
 <dt>FileName</dt>
@@ -32,46 +32,38 @@ FRESULT f_stat (
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>戻り値</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>正常終了。</dd>
-<dt>FR_NO_FILE</dt>
-<dd>ファイルまたはディレクトリが見つからない。</dd>
-<dt>FR_NO_PATH</dt>
-<dd>パスが見つからない。</dd>
-<dt>FR_INVALID_NAME</dt>
-<dd>パス名が不正。</dd>
-<dt>FR_INVALID_DRIVE</dt>
-<dd>論理ドライブ番号が不正。</dd>
-<dt>FR_NOT_READY</dt>
-<dd>メディアがセットされていないなど、物理ドライブが動作不能状態。</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>ディスク・エラーによる失敗。</dd>
-<dt>FR_INT_ERR</dt>
-<dd>不正なFAT構造または内部エラーによる失敗。</dd>
-<dt>FR_NOT_ENABLED</dt>
-<dd>論理ドライブにワークエリアが割り当てられていない。</dd>
-<dt>FR_NO_FILESYSTEM</dt>
-<dd>有効なFATボリュームが見つからない。</dd>
-</dl>
+<p>
+<a href="rc.html#ok">FR_OK</a>,
+<a href="rc.html#de">FR_DISK_ERR</a>,
+<a href="rc.html#ie">FR_INT_ERR</a>,
+<a href="rc.html#nr">FR_NOT_READY</a>,
+<a href="rc.html#ok">FR_NO_FILE</a>,
+<a href="rc.html#np">FR_NO_PATH</a>,
+<a href="rc.html#in">FR_INVALID_NAME</a>,
+<a href="rc.html#id">FR_INVALID_DRIVE</a>,
+<a href="rc.html#ne">FR_NOT_ENABLED</a>,
+<a href="rc.html#ns">FR_NO_FILESYSTEM</a>,
+<a href="rc.html#tm">FR_TIMEOUT</a>,
+<a href="rc.html#nc">FR_NOT_ENOUGH_CORE</a>
+</p>
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>解説</h4>
 <p>ファイルまたはディレクトリに関する情報を得ます。得られるファイル情報の詳細については <tt>FILINFO</tt>構造体を参照してください。</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>対応情報</h4>
 <p><tt>_FS_MINIMIZE == 0</tt>のときに使用可能です。</p>
 </div>
 
 
-<div class="para">
+<div class="para ref">
 <h4>参照</h4>
 <p><tt><a href="opendir.html">f_opendir</a>, <a href="readdir.html">f_readdir</a>, <a href="sfileinfo.html">FILINFO</a>, <a href="sdir.html">DIR</a></tt></p>
 </div>
diff --git a/doc/ja/sync.html b/doc/ja/sync.html
index 62e9de8..242c90a 100644
--- a/doc/ja/sync.html
+++ b/doc/ja/sync.html
@@ -11,17 +11,17 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>f_sync</h2>
 <p>書き込み中のファイルのキャッシュされた情報をフラッシュします。</p>
 <pre>
 FRESULT f_sync (
-  FIL* <em>FileObject</em>     <span>/* ファイル・オブジェクト構造体へのポインタ */</span>
+  FIL* <em>FileObject</em>     <span class="c">/* ファイル・オブジェクト構造体へのポインタ */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>引数</h4>
 <dl class="par">
 <dt>FileObject</dt>
@@ -30,36 +30,32 @@ FRESULT f_sync (
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>戻り値</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>正常終了。</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>ディスク・エラーによる失敗。</dd>
-<dt>FR_INT_ERR</dt>
-<dd>不正なFAT構造または内部エラーによる失敗。</dd>
-<dt>FR_NOT_READY</dt>
-<dd>メディアがセットされていないなど、物理ドライブが動作不能状態。</dd>
-<dt>FR_INVALID_OBJECT</dt>
-<dd>ファイル・オブジェクトが無効。</dd>
-</dl>
+<p>
+<a href="rc.html#ok">FR_OK</a>,
+<a href="rc.html#de">FR_DISK_ERR</a>,
+<a href="rc.html#ie">FR_INT_ERR</a>,
+<a href="rc.html#nr">FR_NOT_READY</a>,
+<a href="rc.html#io">FR_INVALID_OBJECT</a>,
+<a href="rc.html#tm">FR_TIMEOUT</a>
+</p>
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>解説</h4>
 <p>この関数は<tt>f_close()</tt>と同じ処理を実行しますが、ファイルは引き続き開かれたままになり、読み書きを続行できます。ロギングなど、書き込みモードで長時間ファイルが開かれているアプリケーションにおいて、定期的または区切りの良いところでこの関数を使用することにより、不意の電源断やメディアの取り外しにより失われるデータを最小にすることができます。実際のところ、<tt>f_close()</tt>内ではこの関数を呼び出した後ファイル・オブジェクトを無効化しているだけなので、<tt>f_close()</tt>直前の<tt>f_sync()</tt>は意味がありません。</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>対応情報</h4>
 <p><tt>_FS_READONLY == 0</tt>のときに使用可能です。</p>
 </div>
 
 
-<div class="para">
+<div class="para ref">
 <h4>参照</h4>
 <p><tt><a href="close.html">f_close</a></tt></p>
 </div>
diff --git a/doc/ja/tell.html b/doc/ja/tell.html
new file mode 100644
index 0000000..d59e527
--- /dev/null
+++ b/doc/ja/tell.html
@@ -0,0 +1,62 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="ja">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=Shift_JIS">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<link rel="up" title="FatFs" href="../00index_e.html">
+<link rel="alternate" hreflang="en" title="English" href="../en/tell.html">
+<link rel="stylesheet" href="../css_j.css" type="text/css" media="screen" title="ELM Default">
+<title>FatFs - f_tell</title>
+</head>
+
+<body>
+
+<div class="para func">
+<h2>f_tell</h2>
+<p>現在のリード/ライト・ポインタを取得します。</p>
+<pre>
+DWORD f_tell (
+  FIL* <em>FileObject</em>   <span class="c">/* ファイル・オブジェクト */</span>
+);
+</pre>
+</div>
+
+
+<div class="para arg">
+<h4>引数</h4>
+<dl class="par">
+<dt>FileObject</dt>
+<dd>ファイル・オブジェクト構造体へのポインタを指定します。</dd>
+</dl>
+</div>
+
+
+<div class="para ret">
+<h4>戻り値</h4>
+<p>現在のリード/ライト・ポインタ(ファイル先頭からのバイト単位のオフセット)が返ります。</p>
+</div>
+
+
+<div class="para desc">
+<h4>解説</h4>
+<p>f_tell関数は、現リビジョンではマクロとして実装されています。</p>
+<pre>
+<span class="k">#define</span> f_tell(fp) ((fp)->fptr)
+</pre>
+</div>
+
+
+<div class="para comp">
+<h4>対応情報</h4>
+<p>常に使用可能。</p>
+</div>
+
+
+<div class="para ref">
+<h4>参照</h4>
+<p><tt><a href="open.html">f_open</a>, <a href="lseek.html">f_lseek</a>, <a href="sfile.html">FIL</a></tt></p>
+</div>
+
+<p class="foot"><a href="../00index_j.html">戻る</a></p>
+</body>
+</html>
diff --git a/doc/ja/truncate.html b/doc/ja/truncate.html
index da491ba..6aefcb6 100644
--- a/doc/ja/truncate.html
+++ b/doc/ja/truncate.html
@@ -11,17 +11,17 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>f_truncate</h2>
 <p>ファイル長を切り詰めます。</p>
 <pre>
 FRESULT f_truncate (
-  FIL* <em>FileObject</em>     <span>/* ファイル・オブジェクトへのポインタ */</span>
+  FIL* <em>FileObject</em>     <span class="c">/* ファイル・オブジェクトへのポインタ */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>引数</h4>
 <dl class="par">
 <dt>FileObject</dt>
@@ -30,38 +30,33 @@ FRESULT f_truncate (
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>戻り値</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>正常終了。</dd>
-<dt>FR_DENIED</dt>
-<dd>ファイルが非書き込みモードで開かれている。</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>ディスク・エラーによる失敗。</dd>
-<dt>FR_INT_ERR</dt>
-<dd>不正なFAT構造または内部エラーによる失敗。</dd>
-<dt>FR_NOT_READY</dt>
-<dd>メディアがセットされていないなど、物理ドライブが動作不能状態。</dd>
-<dt>FR_INVALID_OBJECT</dt>
-<dd>無効なファイル・オブジェクト。</dd>
-</dl>
+<p>
+<a href="rc.html#ok">FR_OK</a>,
+<a href="rc.html#de">FR_DISK_ERR</a>,
+<a href="rc.html#ie">FR_INT_ERR</a>,
+<a href="rc.html#nr">FR_NOT_READY</a>,
+<a href="rc.html#de">FR_DENIED</a>,
+<a href="rc.html#io">FR_INVALID_OBJECT</a>,
+<a href="rc.html#tm">FR_TIMEOUT</a>
+</p>
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>解説</h4>
 <p>ファイルの長さが現在のリード/ライト・ポインタに切り詰められます。リード/ライト・ポインタが既にファイルの終端を指しているときは、この関数は何の効果も持ちません。</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>対応情報</h4>
 <p><tt>_FS_READONLY == 0</tt>で、且つ<tt>_FS_MINIMIZE == 0</tt>のときに使用可能です。</p>
 </div>
 
 
-<div class="para">
+<div class="para ref">
 <h4>参照</h4>
 <p><tt><a href="open.html">f_open</a>, <a href="lseek.html">f_lseek</a>, <a href="sfile.html">FIL</a></tt></p>
 </div>
diff --git a/doc/ja/unlink.html b/doc/ja/unlink.html
index a357586..421df94 100644
--- a/doc/ja/unlink.html
+++ b/doc/ja/unlink.html
@@ -11,64 +11,59 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>f_unlink</h2>
-<p>オブジェクトを削除します。</p>
+<p>ファイルまたはディレクトリを削除します。</p>
 <pre>
 FRESULT f_unlink (
-  const TCHAR* <em>FileName</em>  <span>/* オブジェクト名へのポインタ */</span>
+  const TCHAR* <em>FileName</em>  <span class="c">/* オブジェクト名へのポインタ */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>引数</h4>
 <dl class="par">
 <dt>FileName</dt>
-<dd>削除対象の<a href="filename.html">ファイルまたはディレクトリ名</a>の入った<tt>'\0'</tt>で終わる文字列へのポインタを指定します。</dd>
+<dd>削除対象の<a href="filename.html">パス名</a>の入った<tt>'\0'</tt>で終わる文字列へのポインタを指定します。</dd>
 </dl>
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>戻り値</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>正常終了。</dd>
-<dt>FR_NO_FILE</dt>
-<dd>ファイルが見つからない。</dd>
-<dt>FR_NO_PATH</dt>
-<dd>パスが見つからない。</dd>
-<dt>FR_INVALID_NAME</dt>
-<dd>パス名が不正。</dd>
-<dt>FR_INVALID_DRIVE</dt>
-<dd>ドライブ番号が不正。</dd>
-<dt>FR_DENIED</dt>
-<dd>対象オブジェクトがリード・オンリー属性、空でないディレクトリやカレント・ディレクトリ。</dd>
-<dt>FR_NOT_READY</dt>
-<dd>メディアがセットされていないなど、物理ドライブが動作不能状態。</dd>
-<dt>FR_WRITE_PROTECTED</dt>
-<dd>メディアが書き込み禁止状態。</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>ディスク・エラーによる失敗。</dd>
-<dt>FR_INT_ERR</dt>
-<dd>不正なFAT構造または内部エラーによる失敗。</dd>
-<dt>FR_NOT_ENABLED</dt>
-<dd>論理ドライブにワーク・エリアが割り当てられていない。</dd>
-<dt>FR_NO_FILESYSTEM</dt>
-<dd>有効なFATボリュームが見つからない。</dd>
-<dt>FR_LOCKED</dt>
-<dd>ファイル共有機能(_FS_SHARE)によるアクセス拒否。</dd>
-</dl>
+<p>
+<a href="rc.html#ok">FR_OK</a>,
+<a href="rc.html#de">FR_DISK_ERR</a>,
+<a href="rc.html#ie">FR_INT_ERR</a>,
+<a href="rc.html#nr">FR_NOT_READY</a>,
+<a href="rc.html#ok">FR_NO_FILE</a>,
+<a href="rc.html#np">FR_NO_PATH</a>,
+<a href="rc.html#in">FR_INVALID_NAME</a>,
+<a href="rc.html#de">FR_DENIED</a>,
+<a href="rc.html#wp">FR_WRITE_PROTECTED</a>,
+<a href="rc.html#id">FR_INVALID_DRIVE</a>,
+<a href="rc.html#ne">FR_NOT_ENABLED</a>,
+<a href="rc.html#ns">FR_NO_FILESYSTEM</a>,
+<a href="rc.html#tm">FR_TIMEOUT</a>,
+<a href="rc.html#lo">FR_LOCKED</a>,
+<a href="rc.html#nc">FR_NOT_ENOUGH_CORE</a>
+</p>
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>解説</h4>
-<p>オブジェクトを削除します。<em>開かれているオブジェクトは削除してはなりません</em>。</p>
+<p>削除対象のオブジェクが次の条件に当てはまる場合、そのアクセスは拒否され関数は失敗します。
+<ul>
+<li>リード・オンリー属性 (AM_RDO)を持っている。</li>
+<li>空でないディレクトリまたはカレント・ディレクトリ。</li>
+<li>開かれているファイル。この場合、<em>FAT構造が破壊される可能性</em>があります。<a href="appnote.html#dup">多重アクセス制御</a>が有効なときは、安全に拒否されます。</li>
+</ul>
+</p>
 </div>
 
-<div class="para">
+<div class="para comp">
 <h4>対応情報</h4>
 <p><tt>_FS_READONLY == 0</tt>で、且つ<tt>_FS_MINIMIZE == 0</tt>のときに使用可能です。</p>
 </div>
diff --git a/doc/ja/utime.html b/doc/ja/utime.html
index 95156b8..7fe2cef 100644
--- a/doc/ja/utime.html
+++ b/doc/ja/utime.html
@@ -11,18 +11,18 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>f_utime</h2>
 <p>オブジェクトのタイムスタンプを変更します。</p>
 <pre>
 FRESULT f_utime (
-  const TCHAR* <em>FileName</em>,   <span>/* オブジェクト名へのポインタ */</span>
-  const FILINFO* <em>TimeDate</em>  <span>/* 設定する日付 */</span>
+  const TCHAR* <em>FileName</em>,   <span class="c">/* オブジェクト名へのポインタ */</span>
+  const FILINFO* <em>TimeDate</em>  <span class="c">/* 設定する日付 */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>引数</h4>
 <dl class="par">
 <dt>FileName</dt>
@@ -33,46 +33,37 @@ FRESULT f_utime (
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>戻り値</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>正常終了。</dd>
-<dt>FR_NO_FILE</dt>
-<dd>ファイルが見つからない。</dd>
-<dt>FR_NO_PATH</dt>
-<dd>パスが見つからない。</dd>
-<dt>FR_INVALID_NAME</dt>
-<dd>パス名が不正。</dd>
-<dt>FR_INVALID_NAME</dt>
-<dd>論理ドライブ番号が不正。</dd>
-<dt>FR_NOT_READY</dt>
-<dd>メディアがセットされていないなど、物理ドライブが動作不能状態。</dd>
-<dt>FR_WRITE_PROTECTED</dt>
-<dd>メディアが書き込み禁止状態。</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>ディスク・エラーによる失敗。</dd>
-<dt>FR_INT_ERR</dt>
-<dd>不正なFAT構造または内部エラーによる失敗。</dd>
-<dt>FR_NOT_ENABLED</dt>
-<dd>その論理ドライブにワーク・エリアが与えられていない。</dd>
-<dt>FR_NO_FILESYSTEM</dt>
-<dd>有効なFATボリュームが見つからない。</dd>
-</dl>
+<p>
+<a href="rc.html#ok">FR_OK</a>,
+<a href="rc.html#de">FR_DISK_ERR</a>,
+<a href="rc.html#ie">FR_INT_ERR</a>,
+<a href="rc.html#nr">FR_NOT_READY</a>,
+<a href="rc.html#ok">FR_NO_FILE</a>,
+<a href="rc.html#np">FR_NO_PATH</a>,
+<a href="rc.html#in">FR_INVALID_NAME</a>,
+<a href="rc.html#wp">FR_WRITE_PROTECTED</a>,
+<a href="rc.html#id">FR_INVALID_DRIVE</a>,
+<a href="rc.html#ne">FR_NOT_ENABLED</a>,
+<a href="rc.html#ns">FR_NO_FILESYSTEM</a>,
+<a href="rc.html#tm">FR_TIMEOUT</a>,
+<a href="rc.html#nc">FR_NOT_ENOUGH_CORE</a>
+</p>
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>解説</h4>
 <p>オブジェクトのタイムスタンプを変更します。</p>
 </div>
 
 
-<div class="para">
+<div class="para use">
 <h4>使用例</h4>
 <pre>
 FRESULT set_timestamp (
-    char *obj,     <span>/* ファイル名へのポインタ */</span>
+    char *obj,     <span class="c">/* ファイル名へのポインタ */</span>
     int year,
     int month,
     int mday,
@@ -92,13 +83,13 @@ FRESULT set_timestamp (
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>対応情報</h4>
 <p><tt>_FS_READONLY == 0</tt>で、且つ<tt>_FS_MINIMIZE == 0</tt>のときに使用可能です。</p>
 </div>
 
 
-<div class="para">
+<div class="para ref">
 <h4>参照</h4>
 <p><tt><a href="stat.html">f_stat</a>, <a href="sfileinfo.html">FILINFO</a></tt></p>
 </div>
diff --git a/doc/ja/write.html b/doc/ja/write.html
index bb69582..13c53ac 100644
--- a/doc/ja/write.html
+++ b/doc/ja/write.html
@@ -11,20 +11,20 @@
 
 <body>
 
-<div class="para">
+<div class="para func">
 <h2>f_write</h2>
 <p>ファイルにデータを書き込みます。</p>
 <pre>
 FRESULT f_write (
-  FIL* <em>FileObject</em>,     <span>/* ファイル・オブジェクト */</span>
-  const void* <em>Buffer</em>,  <span>/* 書き込みデータ */</span>
-  UINT <em>ByteToWrite</em>,    <span>/* 書き込むバイト数 */</span>
-  UINT* <em>ByteWritten</em>    <span>/* 書き込まれたバイト数 */</span>
+  FIL* <em>FileObject</em>,     <span class="c">/* ファイル・オブジェクト */</span>
+  const void* <em>Buffer</em>,  <span class="c">/* 書き込みデータ */</span>
+  UINT <em>ByteToWrite</em>,    <span class="c">/* 書き込むバイト数 */</span>
+  UINT* <em>ByteWritten</em>    <span class="c">/* 書き込まれたバイト数 */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>引数</h4>
 <dl class="par">
 <dt>FileObject</dt>
@@ -39,38 +39,33 @@ FRESULT f_write (
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>戻り値</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>正常終了。</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>ディスク・エラーによる失敗。</dd>
-<dt>FR_INT_ERR</dt>
-<dd>不正なFAT構造または内部エラーによる失敗。</dd>
-<dt>FR_NOT_READY</dt>
-<dd>メディアがセットされていないなど、物理ドライブが動作不能状態。</dd>
-<dt>FR_DENIED</dt>
-<dd>非書き込みモードで開かれたファイルに書き込もうとした。</dd>
-<dt>FR_INVALID_OBJECT</dt>
-<dd>無効なファイルオブジェクト。</dd>
-</dl>
+<p>
+<a href="rc.html#ok">FR_OK</a>,
+<a href="rc.html#de">FR_DISK_ERR</a>,
+<a href="rc.html#ie">FR_INT_ERR</a>,
+<a href="rc.html#nr">FR_NOT_READY</a>,
+<a href="rc.html#de">FR_DENIED</a>,
+<a href="rc.html#io">FR_INVALID_OBJECT</a>,
+<a href="rc.html#tm">FR_TIMEOUT</a>
+</p>
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>解説</h4>
 <p>書き込み開始位置は、リード/ライト・ポインタの位置からになります。リード/ライト・ポインタは実際に書き込まれたバイト数だけ進みます。関数が正常終了した後、要求したバイト数が書き込まれたかどうか<tt>*ByteWritten</tt>をチェックすべきです。<tt>*ByteWritten &lt; ByteToWrite</tt>のときは、ディスク・フルを意味します。ディスク・フルが発生しているときまたはそれに近いときは、制御が帰るまで時間がかかる場合があります。</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>対応情報</h4>
 <p><tt>_FS_READONLY == 0</tt>のときに使用可能です。</p>
 </div>
 
 
-<div class="para">
+<div class="para ref">
 <h4>参照</h4>
 <p><tt><a href="open.html">f_open</a>, <a href="read.html">f_read</a>, <a href="putc.html">fputc</a>, <a href="puts.html">fputs</a>, <a href="printf.html">fprintf</a>, <a href="close.html">f_close</a>, <a href="sfile.html">FIL</a></tt></p>
 </div>
diff --git a/doc/updates.txt b/doc/updates.txt
index d3434bd..af69c5b 100644
--- a/doc/updates.txt
+++ b/doc/updates.txt
@@ -1,3 +1,9 @@
+R0.08b, Jan 15, 2011
+  Fast seek feature is also applied to f_read() and f_write().
+  f_lseek() reports required table size on creating CLMP.
+  Extended format syntax of f_printf function.
+  Ignores duplicated directory separators in given path names.
+
 R0.08a, Aug 16, 2010
   Added f_getcwd(). (_FS_RPATH = 2)
   Added sector erase feature. (_USE_ERASE)
diff --git a/src/00readme.txt b/src/00readme.txt
index 42b7fd7..c78da31 100644
--- a/src/00readme.txt
+++ b/src/00readme.txt
@@ -1,4 +1,4 @@
-FatFs Module Source Files R0.08a                       (C)ChaN, 2010
+FatFs Module Source Files R0.08b                       (C)ChaN, 2011
 
 
 FILES
@@ -23,7 +23,7 @@ AGREEMENTS
  small embedded systems. This is a free software and is opened for education,
  research and commercial developments under license policy of following trems.
 
-  Copyright (C) 2010, ChaN, all right reserved.
+  Copyright (C) 2011, ChaN, all right reserved.
 
  * The FatFs module is a free software and there is NO WARRANTY.
  * No restriction on use. You can use, modify and redistribute it for
@@ -121,3 +121,7 @@ REVISION HISTORY
                        Fixed a wrong directory entry is created on non-LFN cfg when the given name contains ';'.
                        Fixed f_mkfs() creates wrong FAT32 volume.
 
+  Jan 15,'11 R0.08b    Fast seek feature is also applied to f_read() and f_write().
+                       f_lseek() reports required table size on creating CLMP.
+                       Extended format syntax of f_printf function.
+                       Ignores duplicated directory separators in given path names.
diff --git a/src/diskio.h b/src/diskio.h
index 3abc509..9573e6e 100644
--- a/src/diskio.h
+++ b/src/diskio.h
@@ -1,5 +1,5 @@
 /*-----------------------------------------------------------------------
-/  Low level disk interface modlue include file   (C)ChaN, 2010
+/  Low level disk interface modlue include file
 /-----------------------------------------------------------------------*/
 
 #ifndef _DISKIO
diff --git a/src/ff.c b/src/ff.c
index b09f32d..4f76915 100644
--- a/src/ff.c
+++ b/src/ff.c
@@ -1,11 +1,11 @@
 /*----------------------------------------------------------------------------/
-/  FatFs - FAT file system module  R0.08a                 (C)ChaN, 2010
+/  FatFs - FAT file system module  R0.08b                 (C)ChaN, 2011
 /-----------------------------------------------------------------------------/
 / FatFs module is a generic FAT file system module for small embedded systems.
 / This is a free software that opened for education, research and commercial
 / developments under license policy of following terms.
 /
-/  Copyright (C) 2010, ChaN, all right reserved.
+/  Copyright (C) 2011, ChaN, all right reserved.
 /
 / * The FatFs module is a free software and there is NO WARRANTY.
 / * No restriction on use. You can use, modify and redistribute it for
@@ -51,16 +51,16 @@
 / Apr 01,'08 R0.06  Added fputc(), fputs(), fprintf() and fgets().
 /                   Improved performance of f_lseek() on moving to the same or following cluster.
 /
-/ Apr 01,'09 R0.07  Merged Tiny-FatFs as a buffer configuration option. (_FS_TINY)
-/                   Added long file name support.
-/                   Added multiple code page support.
+/ Apr 01,'09 R0.07  Merged Tiny-FatFs as a configuration option. (_FS_TINY)
+/                   Added long file name feature.
+/                   Added multiple code page feature.
 /                   Added re-entrancy for multitask operation.
 /                   Added auto cluster size selection to f_mkfs().
 /                   Added rewind option to f_readdir().
 /                   Changed result code of critical errors.
 /                   Renamed string functions to avoid name collision.
 / Apr 14,'09 R0.07a Separated out OS dependent code on reentrant cfg.
-/                   Added multiple sector size support.
+/                   Added multiple sector size feature.
 / Jun 21,'09 R0.07c Fixed f_unlink() can return FR_OK on error.
 /                   Fixed wrong cache control in f_lseek().
 /                   Added relative path feature.
@@ -83,6 +83,10 @@
 /                   Moved file lock semaphore table from fs object to the bss.
 /                   Fixed a wrong directory entry is created on non-LFN cfg when the given name contains ';'.
 /                   Fixed f_mkfs() creates wrong FAT32 volume.
+/ Jan 15,'11 R0.08b Fast seek feature is also applied to f_read() and f_write().
+/                   f_lseek() reports required table size on creating CLMP.
+/                   Extended format syntax of f_printf function.
+/                   Ignores duplicated directory separators in given path names.
 /---------------------------------------------------------------------------*/
 
 #include "ff.h"			/* FatFs configurations and declarations */
@@ -95,7 +99,7 @@
 
 ---------------------------------------------------------------------------*/
 
-#if _FATFS != 8255
+#if _FATFS != 8237
 #error Wrong include file (ff.h).
 #endif
 
@@ -145,6 +149,203 @@ typedef struct {
 #define ST_CLUST(dir,cl) {ST_WORD(dir+DIR_FstClusLO, cl); ST_WORD(dir+DIR_FstClusHI, (DWORD)cl>>16);}
 
 
+/* DBCS code ranges and SBCS extend char conversion table */
+
+#if _CODE_PAGE == 932	/* Japanese Shift-JIS */
+#define _DF1S	0x81	/* DBC 1st byte range 1 start */
+#define _DF1E	0x9F	/* DBC 1st byte range 1 end */
+#define _DF2S	0xE0	/* DBC 1st byte range 2 start */
+#define _DF2E	0xFC	/* DBC 1st byte range 2 end */
+#define _DS1S	0x40	/* DBC 2nd byte range 1 start */
+#define _DS1E	0x7E	/* DBC 2nd byte range 1 end */
+#define _DS2S	0x80	/* DBC 2nd byte range 2 start */
+#define _DS2E	0xFC	/* DBC 2nd byte range 2 end */
+
+#elif _CODE_PAGE == 936	/* Simplified Chinese GBK */
+#define _DF1S	0x81
+#define _DF1E	0xFE
+#define _DS1S	0x40
+#define _DS1E	0x7E
+#define _DS2S	0x80
+#define _DS2E	0xFE
+
+#elif _CODE_PAGE == 949	/* Korean */
+#define _DF1S	0x81
+#define _DF1E	0xFE
+#define _DS1S	0x41
+#define _DS1E	0x5A
+#define _DS2S	0x61
+#define _DS2E	0x7A
+#define _DS3S	0x81
+#define _DS3E	0xFE
+
+#elif _CODE_PAGE == 950	/* Traditional Chinese Big5 */
+#define _DF1S	0x81
+#define _DF1E	0xFE
+#define _DS1S	0x40
+#define _DS1E	0x7E
+#define _DS2S	0xA1
+#define _DS2E	0xFE
+
+#elif _CODE_PAGE == 437	/* U.S. (OEM) */
+#define _DF1S	0
+#define _EXCVT {0x80,0x9A,0x90,0x41,0x8E,0x41,0x8F,0x80,0x45,0x45,0x45,0x49,0x49,0x49,0x8E,0x8F,0x90,0x92,0x92,0x4F,0x99,0x4F,0x55,0x55,0x59,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \
+				0x41,0x49,0x4F,0x55,0xA5,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0x21,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
+
+#elif _CODE_PAGE == 720	/* Arabic (OEM) */
+#define _DF1S	0
+#define _EXCVT {0x80,0x81,0x45,0x41,0x84,0x41,0x86,0x43,0x45,0x45,0x45,0x49,0x49,0x8D,0x8E,0x8F,0x90,0x92,0x92,0x93,0x94,0x95,0x49,0x49,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \
+				0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
+
+#elif _CODE_PAGE == 737	/* Greek (OEM) */
+#define _DF1S	0
+#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x92,0x92,0x93,0x94,0x95,0x96,0x97,0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87, \
+				0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0xAA,0x92,0x93,0x94,0x95,0x96,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0x97,0xEA,0xEB,0xEC,0xE4,0xED,0xEE,0xE7,0xE8,0xF1,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
+
+#elif _CODE_PAGE == 775	/* Baltic (OEM) */
+#define _DF1S	0
+#define _EXCVT {0x80,0x9A,0x91,0xA0,0x8E,0x95,0x8F,0x80,0xAD,0xED,0x8A,0x8A,0xA1,0x8D,0x8E,0x8F,0x90,0x92,0x92,0xE2,0x99,0x95,0x96,0x97,0x97,0x99,0x9A,0x9D,0x9C,0x9D,0x9E,0x9F, \
+				0xA0,0xA1,0xE0,0xA3,0xA3,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xB5,0xB6,0xB7,0xB8,0xBD,0xBE,0xC6,0xC7,0xA5,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xE0,0xE1,0xE2,0xE3,0xE5,0xE5,0xE6,0xE3,0xE8,0xE8,0xEA,0xEA,0xEE,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
+
+#elif _CODE_PAGE == 850	/* Multilingual Latin 1 (OEM) */
+#define _DF1S	0
+#define _EXCVT {0x80,0x9A,0x90,0xB6,0x8E,0xB7,0x8F,0x80,0xD2,0xD3,0xD4,0xD8,0xD7,0xDE,0x8E,0x8F,0x90,0x92,0x92,0xE2,0x99,0xE3,0xEA,0xEB,0x59,0x99,0x9A,0x9D,0x9C,0x9D,0x9E,0x9F, \
+				0xB5,0xD6,0xE0,0xE9,0xA5,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0x21,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC7,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xE0,0xE1,0xE2,0xE3,0xE5,0xE5,0xE6,0xE7,0xE7,0xE9,0xEA,0xEB,0xED,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
+
+#elif _CODE_PAGE == 852	/* Latin 2 (OEM) */
+#define _DF1S	0
+#define _EXCVT {0x80,0x9A,0x90,0xB6,0x8E,0xDE,0x8F,0x80,0x9D,0xD3,0x8A,0x8A,0xD7,0x8D,0x8E,0x8F,0x90,0x91,0x91,0xE2,0x99,0x95,0x95,0x97,0x97,0x99,0x9A,0x9B,0x9B,0x9D,0x9E,0x9F, \
+				0xB5,0xD6,0xE0,0xE9,0xA4,0xA4,0xA6,0xA6,0xA8,0xA8,0xAA,0x8D,0xAC,0xB8,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBD,0xBF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC6,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD1,0xD1,0xD2,0xD3,0xD2,0xD5,0xD6,0xD7,0xB7,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xE0,0xE1,0xE2,0xE3,0xE3,0xD5,0xE6,0xE6,0xE8,0xE9,0xE8,0xEB,0xED,0xED,0xDD,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xEB,0xFC,0xFC,0xFE,0xFF}
+
+#elif _CODE_PAGE == 855	/* Cyrillic (OEM) */
+#define _DF1S	0
+#define _EXCVT {0x81,0x81,0x83,0x83,0x85,0x85,0x87,0x87,0x89,0x89,0x8B,0x8B,0x8D,0x8D,0x8F,0x8F,0x91,0x91,0x93,0x93,0x95,0x95,0x97,0x97,0x99,0x99,0x9B,0x9B,0x9D,0x9D,0x9F,0x9F, \
+				0xA1,0xA1,0xA3,0xA3,0xA5,0xA5,0xA7,0xA7,0xA9,0xA9,0xAB,0xAB,0xAD,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB6,0xB6,0xB8,0xB8,0xB9,0xBA,0xBB,0xBC,0xBE,0xBE,0xBF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC7,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD1,0xD1,0xD3,0xD3,0xD5,0xD5,0xD7,0xD7,0xDD,0xD9,0xDA,0xDB,0xDC,0xDD,0xE0,0xDF, \
+				0xE0,0xE2,0xE2,0xE4,0xE4,0xE6,0xE6,0xE8,0xE8,0xEA,0xEA,0xEC,0xEC,0xEE,0xEE,0xEF,0xF0,0xF2,0xF2,0xF4,0xF4,0xF6,0xF6,0xF8,0xF8,0xFA,0xFA,0xFC,0xFC,0xFD,0xFE,0xFF}
+
+#elif _CODE_PAGE == 857	/* Turkish (OEM) */
+#define _DF1S	0
+#define _EXCVT {0x80,0x9A,0x90,0xB6,0x8E,0xB7,0x8F,0x80,0xD2,0xD3,0xD4,0xD8,0xD7,0x98,0x8E,0x8F,0x90,0x92,0x92,0xE2,0x99,0xE3,0xEA,0xEB,0x98,0x99,0x9A,0x9D,0x9C,0x9D,0x9E,0x9E, \
+				0xB5,0xD6,0xE0,0xE9,0xA5,0xA5,0xA6,0xA6,0xA8,0xA9,0xAA,0xAB,0xAC,0x21,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC7,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xE0,0xE1,0xE2,0xE3,0xE5,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xDE,0x59,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
+
+#elif _CODE_PAGE == 858	/* Multilingual Latin 1 + Euro (OEM) */
+#define _DF1S	0
+#define _EXCVT {0x80,0x9A,0x90,0xB6,0x8E,0xB7,0x8F,0x80,0xD2,0xD3,0xD4,0xD8,0xD7,0xDE,0x8E,0x8F,0x90,0x92,0x92,0xE2,0x99,0xE3,0xEA,0xEB,0x59,0x99,0x9A,0x9D,0x9C,0x9D,0x9E,0x9F, \
+				0xB5,0xD6,0xE0,0xE9,0xA5,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0x21,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC7,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD1,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xE0,0xE1,0xE2,0xE3,0xE5,0xE5,0xE6,0xE7,0xE7,0xE9,0xEA,0xEB,0xED,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
+
+#elif _CODE_PAGE == 862	/* Hebrew (OEM) */
+#define _DF1S	0
+#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \
+				0x41,0x49,0x4F,0x55,0xA5,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0x21,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
+
+#elif _CODE_PAGE == 866	/* Russian (OEM) */
+#define _DF1S	0
+#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \
+				0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0x90,0x91,0x92,0x93,0x9d,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F,0xF0,0xF0,0xF2,0xF2,0xF4,0xF4,0xF6,0xF6,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
+
+#elif _CODE_PAGE == 874	/* Thai (OEM, Windows) */
+#define _DF1S	0
+#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \
+				0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
+
+#elif _CODE_PAGE == 1250 /* Central Europe (Windows) */
+#define _DF1S	0
+#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x8A,0x9B,0x8C,0x8D,0x8E,0x8F, \
+				0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xA3,0xB4,0xB5,0xB6,0xB7,0xB8,0xA5,0xAA,0xBB,0xBC,0xBD,0xBC,0xAF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF}
+
+#elif _CODE_PAGE == 1251 /* Cyrillic (Windows) */
+#define _DF1S	0
+#define _EXCVT {0x80,0x81,0x82,0x82,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x80,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x8A,0x9B,0x8C,0x8D,0x8E,0x8F, \
+				0xA0,0xA2,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB2,0xA5,0xB5,0xB6,0xB7,0xA8,0xB9,0xAA,0xBB,0xA3,0xBD,0xBD,0xAF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF}
+
+#elif _CODE_PAGE == 1252 /* Latin 1 (Windows) */
+#define _DF1S	0
+#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0xAd,0x9B,0x8C,0x9D,0xAE,0x9F, \
+				0xA0,0x21,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0x9F}
+
+#elif _CODE_PAGE == 1253 /* Greek (Windows) */
+#define _DF1S	0
+#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \
+				0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xA2,0xB8,0xB9,0xBA, \
+				0xE0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xF2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xFB,0xBC,0xFD,0xBF,0xFF}
+
+#elif _CODE_PAGE == 1254 /* Turkish (Windows) */
+#define _DF1S	0
+#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x8A,0x9B,0x8C,0x9D,0x9E,0x9F, \
+				0xA0,0x21,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0x9F}
+
+#elif _CODE_PAGE == 1255 /* Hebrew (Windows) */
+#define _DF1S	0
+#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \
+				0xA0,0x21,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
+
+#elif _CODE_PAGE == 1256 /* Arabic (Windows) */
+#define _DF1S	0
+#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x8C,0x9D,0x9E,0x9F, \
+				0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0x41,0xE1,0x41,0xE3,0xE4,0xE5,0xE6,0x43,0x45,0x45,0x45,0x45,0xEC,0xED,0x49,0x49,0xF0,0xF1,0xF2,0xF3,0x4F,0xF5,0xF6,0xF7,0xF8,0x55,0xFA,0x55,0x55,0xFD,0xFE,0xFF}
+
+#elif _CODE_PAGE == 1257 /* Baltic (Windows) */
+#define _DF1S	0
+#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \
+				0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xA8,0xB9,0xAA,0xBB,0xBC,0xBD,0xBE,0xAF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF}
+
+#elif _CODE_PAGE == 1258 /* Vietnam (OEM, Windows) */
+#define _DF1S	0
+#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0xAC,0x9D,0x9E,0x9F, \
+				0xA0,0x21,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xEC,0xCD,0xCE,0xCF,0xD0,0xD1,0xF2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xFE,0x9F}
+
+#elif _CODE_PAGE == 1	/* ASCII (for only non-LFN cfg) */
+#if _USE_LFN
+#error Cannot use LFN feature without valid code page.
+#endif
+#define _DF1S	0
+
+#else
+#error Unknown code page
+
+#endif
+
+
 /* Character code support macros */
 #define IsUpper(c)	(((c)>='A')&&((c)<='Z'))
 #define IsLower(c)	(((c)>='a')&&((c)<='z'))
@@ -173,7 +374,7 @@ typedef struct {
 
 
 /* Name status flags */
-#define NS			11		/* Offset of name status byte */
+#define NS			11		/* Index of name status byte in fn[] */
 #define NS_LOSS		0x01	/* Out of 8.3 format */
 #define NS_LFN		0x02	/* Force to create LFN entry */
 #define NS_LAST		0x04	/* Last segment */
@@ -189,62 +390,66 @@ typedef struct {
 
 
 /* FatFs refers the members in the FAT structures as byte array instead of
-/ structure member because there are incompatibility of the packing option
-/ between compilers. */
+/ structure member because the structure is not binary compatible between
+/ different platforms */
 
-#define BS_jmpBoot			0
-#define BS_OEMName			3
-#define BPB_BytsPerSec		11
-#define BPB_SecPerClus		13
-#define BPB_RsvdSecCnt		14
-#define BPB_NumFATs			16
-#define BPB_RootEntCnt		17
-#define BPB_TotSec16		19
-#define BPB_Media			21
-#define BPB_FATSz16			22
-#define BPB_SecPerTrk		24
-#define BPB_NumHeads		26
-#define BPB_HiddSec			28
-#define BPB_TotSec32		32
-#define BS_DrvNum			36
-#define BS_BootSig			38
-#define BS_VolID			39
-#define BS_VolLab			43
-#define BS_FilSysType		54
-#define BPB_FATSz32			36
-#define BPB_ExtFlags		40
-#define BPB_FSVer			42
-#define BPB_RootClus		44
-#define BPB_FSInfo			48
-#define BPB_BkBootSec		50
-#define BS_DrvNum32			64
-#define BS_BootSig32		66
-#define BS_VolID32			67
-#define BS_VolLab32			71
-#define BS_FilSysType32		82
-#define	FSI_LeadSig			0
-#define	FSI_StrucSig		484
-#define	FSI_Free_Count		488
-#define	FSI_Nxt_Free		492
-#define MBR_Table			446
-#define BS_55AA				510
-
-#define	DIR_Name			0
-#define	DIR_Attr			11
-#define	DIR_NTres			12
-#define	DIR_CrtTime			14
-#define	DIR_CrtDate			16
-#define	DIR_FstClusHI		20
-#define	DIR_WrtTime			22
-#define	DIR_WrtDate			24
-#define	DIR_FstClusLO		26
-#define	DIR_FileSize		28
-#define	LDIR_Ord			0
-#define	LDIR_Attr			11
-#define	LDIR_Type			12
-#define	LDIR_Chksum			13
-#define	LDIR_FstClusLO		26
+#define BS_jmpBoot			0	/* Jump instruction (3) */
+#define BS_OEMName			3	/* OEM name (8) */
+#define BPB_BytsPerSec		11	/* Sector size [byte] (2) */
+#define BPB_SecPerClus		13	/* Cluster size [sector] (1) */
+#define BPB_RsvdSecCnt		14	/* Size of reserved area [sector] (2) */
+#define BPB_NumFATs			16	/* Number of FAT copies (1) */
+#define BPB_RootEntCnt		17	/* Number of root dir entries for FAT12/16 (2) */
+#define BPB_TotSec16		19	/* Volume size [sector] (2) */
+#define BPB_Media			21	/* Media descriptor (1) */
+#define BPB_FATSz16			22	/* FAT size [sector] (2) */
+#define BPB_SecPerTrk		24	/* Track size [sector] (2) */
+#define BPB_NumHeads		26	/* Number of heads (2) */
+#define BPB_HiddSec			28	/* Number of special hidden sectors (4) */
+#define BPB_TotSec32		32	/* Volume size [sector] (4) */
+#define BS_DrvNum			36	/* Physical drive number (2) */
+#define BS_BootSig			38	/* Extended boot signature (1) */
+#define BS_VolID			39	/* Volume serial number (4) */
+#define BS_VolLab			43	/* Volume label (8) */
+#define BS_FilSysType		54	/* File system type (1) */
+#define BPB_FATSz32			36	/* FAT size [sector] (4) */
+#define BPB_ExtFlags		40	/* Extended flags (2) */
+#define BPB_FSVer			42	/* File system version (2) */
+#define BPB_RootClus		44	/* Root dir first cluster (4) */
+#define BPB_FSInfo			48	/* Offset of FSInfo sector (2) */
+#define BPB_BkBootSec		50	/* Offset of backup boot sectot (2) */
+#define BS_DrvNum32			64	/* Physical drive number (2) */
+#define BS_BootSig32		66	/* Extended boot signature (1) */
+#define BS_VolID32			67	/* Volume serial number (4) */
+#define BS_VolLab32			71	/* Volume label (8) */
+#define BS_FilSysType32		82	/* File system type (1) */
+#define	FSI_LeadSig			0	/* FSI: Leading signature (4) */
+#define	FSI_StrucSig		484	/* FSI: Structure signature (4) */
+#define	FSI_Free_Count		488	/* FSI: Number of free clusters (4) */
+#define	FSI_Nxt_Free		492	/* FSI: Last allocated cluster (4) */
+#define MBR_Table			446	/* MBR: Partition table offset (2) */
+#define	SZ_PTE				16	/* MBR: Size of a partition table entry */
+#define BS_55AA				510	/* Boot sector signature (2) */
 
+#define	DIR_Name			0	/* Short file name (11) */
+#define	DIR_Attr			11	/* Attribute (1) */
+#define	DIR_NTres			12	/* NT flag (1) */
+#define	DIR_CrtTime			14	/* Created time (2) */
+#define	DIR_CrtDate			16	/* Created date (2) */
+#define	DIR_FstClusHI		20	/* Higher 16-bit of first cluster (2) */
+#define	DIR_WrtTime			22	/* Modified time (2) */
+#define	DIR_WrtDate			24	/* Modified date (2) */
+#define	DIR_FstClusLO		26	/* Lower 16-bit of first cluster (2) */
+#define	DIR_FileSize		28	/* File size (4) */
+#define	LDIR_Ord			0	/* LFN entry order and LLE flag (1) */
+#define	LDIR_Attr			11	/* LFN attribute (1) */
+#define	LDIR_Type			12	/* LFN type (1) */
+#define	LDIR_Chksum			13	/* Sum of corresponding SFN entry */
+#define	LDIR_FstClusLO		26	/* Filled by zero (0) */
+#define	SZ_DIR				32		/* Size of a directory entry */
+#define	LLE					0x40	/* Last long entry flag in LDIR_Ord */
+#define	DDE					0xE5	/* Deleted directory enrty mark in DIR_Name[0] */
+#define	NDDE				0x05	/* Replacement of a character collides with DDE */
 
 
 /*------------------------------------------------------------*/
@@ -559,12 +764,14 @@ FRESULT sync (	/* FR_OK: successful, FR_DISK_ERR: failed */
 		/* Update FSInfo sector if needed */
 		if (fs->fs_type == FS_FAT32 && fs->fsi_flag) {
 			fs->winsect = 0;
+			/* Create FSInfo structure */
 			mem_set(fs->win, 0, 512);
 			ST_WORD(fs->win+BS_55AA, 0xAA55);
 			ST_DWORD(fs->win+FSI_LeadSig, 0x41615252);
 			ST_DWORD(fs->win+FSI_StrucSig, 0x61417272);
 			ST_DWORD(fs->win+FSI_Free_Count, fs->free_clust);
 			ST_DWORD(fs->win+FSI_Nxt_Free, fs->last_clust);
+			/* Write it into the FSInfo sector */
 			disk_write(fs->drv, fs->win, fs->fsi_sector, 1);
 			fs->fsi_flag = 0;
 		}
@@ -816,6 +1023,33 @@ DWORD create_chain (	/* 0:No free cluster, 1:Internal error, 0xFFFFFFFF:Disk err
 
 
 
+/*-----------------------------------------------------------------------*/
+/* FAT handling - Convert offset into cluster with link map table        */
+/*-----------------------------------------------------------------------*/
+
+#if _USE_FASTSEEK
+static
+DWORD clmt_clust (	/* <2:Error, >=2:Cluster number */
+	FIL* fp,		/* Pointer to the file object */
+	DWORD ofs		/* File offset to be converted to cluster# */
+)
+{
+	DWORD cl, ncl, *tbl;
+
+
+	tbl = fp->cltbl + 1;	/* Top of CLMT */
+	cl = ofs / SS(fp->fs) / fp->fs->csize;	/* Cluster order from top of the file */
+	for (;;) {
+		ncl = *tbl++;			/* Number of cluters in the fragment */
+		if (!ncl) return 0;		/* End of table? (error) */
+		if (cl < ncl) break;	/* In this fragment? */
+		cl -= ncl; tbl++;		/* Next fragment */
+	}
+	return cl + *tbl;	/* Return the cluster number */
+}
+#endif	/* _USE_FASTSEEK */
+
+
 
 /*-----------------------------------------------------------------------*/
 /* Directory handling - Set directory index                              */
@@ -842,10 +1076,10 @@ FRESULT dir_sdi (
 		dj->clust = clst;
 		if (idx >= dj->fs->n_rootdir)		/* Index is out of range */
 			return FR_INT_ERR;
-		dj->sect = dj->fs->dirbase + idx / (SS(dj->fs) / 32);	/* Sector# */
+		dj->sect = dj->fs->dirbase + idx / (SS(dj->fs) / SZ_DIR);	/* Sector# */
 	}
 	else {				/* Dynamic table (sub-dirs or root-dir in FAT32) */
-		ic = SS(dj->fs) / 32 * dj->fs->csize;	/* Entries per cluster */
+		ic = SS(dj->fs) / SZ_DIR * dj->fs->csize;	/* Entries per cluster */
 		while (idx >= ic) {	/* Follow cluster chain */
 			clst = get_fat(dj->fs, clst);				/* Get next cluster */
 			if (clst == 0xFFFFFFFF) return FR_DISK_ERR;	/* Disk error */
@@ -854,10 +1088,10 @@ FRESULT dir_sdi (
 			idx -= ic;
 		}
 		dj->clust = clst;
-		dj->sect = clust2sect(dj->fs, clst) + idx / (SS(dj->fs) / 32);	/* Sector# */
+		dj->sect = clust2sect(dj->fs, clst) + idx / (SS(dj->fs) / SZ_DIR);	/* Sector# */
 	}
 
-	dj->dir = dj->fs->win + (idx % (SS(dj->fs) / 32)) * 32;	/* Ptr to the entry in the sector */
+	dj->dir = dj->fs->win + (idx % (SS(dj->fs) / SZ_DIR)) * SZ_DIR;	/* Ptr to the entry in the sector */
 
 	return FR_OK;	/* Seek succeeded */
 }
@@ -883,7 +1117,7 @@ FRESULT dir_next (	/* FR_OK:Succeeded, FR_NO_FILE:End of table, FR_DENIED:EOT an
 	if (!i || !dj->sect)	/* Report EOT when index has reached 65535 */
 		return FR_NO_FILE;
 
-	if (!(i % (SS(dj->fs) / 32))) {	/* Sector changed? */
+	if (!(i % (SS(dj->fs) / SZ_DIR))) {	/* Sector changed? */
 		dj->sect++;					/* Next sector */
 
 		if (dj->clust == 0) {	/* Static table */
@@ -891,7 +1125,7 @@ FRESULT dir_next (	/* FR_OK:Succeeded, FR_NO_FILE:End of table, FR_DENIED:EOT an
 				return FR_NO_FILE;
 		}
 		else {					/* Dynamic table */
-			if (((i / (SS(dj->fs) / 32)) & (dj->fs->csize - 1)) == 0) {	/* Cluster changed? */
+			if (((i / (SS(dj->fs) / SZ_DIR)) & (dj->fs->csize - 1)) == 0) {	/* Cluster changed? */
 				clst = get_fat(dj->fs, dj->clust);				/* Get next cluster */
 				if (clst <= 1) return FR_INT_ERR;
 				if (clst == 0xFFFFFFFF) return FR_DISK_ERR;
@@ -924,7 +1158,7 @@ FRESULT dir_next (	/* FR_OK:Succeeded, FR_NO_FILE:End of table, FR_DENIED:EOT an
 	}
 
 	dj->index = i;
-	dj->dir = dj->fs->win + (i % (SS(dj->fs) / 32)) * 32;
+	dj->dir = dj->fs->win + (i % (SS(dj->fs) / SZ_DIR)) * SZ_DIR;
 
 	return FR_OK;
 }
@@ -950,7 +1184,7 @@ int cmp_lfn (			/* 1:Matched, 0:Not matched */
 	WCHAR wc, uc;
 
 
-	i = ((dir[LDIR_Ord] & 0xBF) - 1) * 13;	/* Get offset in the LFN buffer */
+	i = ((dir[LDIR_Ord] & ~LLE) - 1) * 13;	/* Get offset in the LFN buffer */
 	s = 0; wc = 1;
 	do {
 		uc = LD_WORD(dir+LfnOfs[s]);	/* Pick an LFN character from the entry */
@@ -963,7 +1197,7 @@ int cmp_lfn (			/* 1:Matched, 0:Not matched */
 		}
 	} while (++s < 13);				/* Repeat until all chars in the entry are checked */
 
-	if ((dir[LDIR_Ord] & 0x40) && wc && lfnbuf[i])	/* Last segment matched but different length */
+	if ((dir[LDIR_Ord] & LLE) && wc && lfnbuf[i])	/* Last segment matched but different length */
 		return 0;
 
 	return 1;						/* The part of LFN matched */
@@ -994,7 +1228,7 @@ int pick_lfn (			/* 1:Succeeded, 0:Buffer overflow */
 		}
 	} while (++s < 13);						/* Read all character in the entry */
 
-	if (dir[LDIR_Ord] & 0x40) {				/* Put terminator if it is the last LFN part */
+	if (dir[LDIR_Ord] & LLE) {				/* Put terminator if it is the last LFN part */
 		if (i >= _MAX_LFN) return 0;		/* Buffer overflow? */
 		lfnbuf[i] = 0;
 	}
@@ -1028,7 +1262,7 @@ void fit_lfn (
 		ST_WORD(dir+LfnOfs[s], wc);	/* Put it */
 		if (!wc) wc = 0xFFFF;		/* Padding chars following last char */
 	} while (++s < 13);
-	if (wc == 0xFFFF || !lfnbuf[i]) ord |= 0x40;	/* Bottom LFN part is the start of LFN sequence */
+	if (wc == 0xFFFF || !lfnbuf[i]) ord |= LLE;	/* Bottom LFN part is the start of LFN sequence */
 	dir[LDIR_Ord] = ord;			/* Set the LFN order */
 }
 
@@ -1058,7 +1292,7 @@ void gen_numname (
 		do seq = (seq >> 1) + (seq << 15) + (WORD)*lfn++; while (*lfn);
 	}
 
-	/* itoa */
+	/* itoa (hexdecimal) */
 	i = 7;
 	do {
 		c = (seq % 16) + '0';
@@ -1133,14 +1367,14 @@ FRESULT dir_find (
 		if (c == 0) { res = FR_NO_FILE; break; }	/* Reached to end of table */
 #if _USE_LFN	/* LFN configuration */
 		a = dir[DIR_Attr] & AM_MASK;
-		if (c == 0xE5 || ((a & AM_VOL) && a != AM_LFN)) {	/* An entry without valid data */
+		if (c == DDE || ((a & AM_VOL) && a != AM_LFN)) {	/* An entry without valid data */
 			ord = 0xFF;
 		} else {
 			if (a == AM_LFN) {			/* An LFN entry is found */
 				if (dj->lfn) {
-					if (c & 0x40) {		/* Is it start of LFN sequence? */
+					if (c & LLE) {		/* Is it start of LFN sequence? */
 						sum = dir[LDIR_Chksum];
-						c &= 0xBF; ord = c;	/* LFN start order */
+						c &= ~LLE; ord = c;	/* LFN start order */
 						dj->lfn_idx = dj->index;
 					}
 					/* Check validity of the LFN entry and compare it with given name */
@@ -1189,13 +1423,13 @@ FRESULT dir_read (
 		if (c == 0) { res = FR_NO_FILE; break; }	/* Reached to end of table */
 #if _USE_LFN	/* LFN configuration */
 		a = dir[DIR_Attr] & AM_MASK;
-		if (c == 0xE5 || (!_FS_RPATH && c == '.') || ((a & AM_VOL) && a != AM_LFN)) {	/* An entry without valid data */
+		if (c == DDE || (!_FS_RPATH && c == '.') || ((a & AM_VOL) && a != AM_LFN)) {	/* An entry without valid data */
 			ord = 0xFF;
 		} else {
 			if (a == AM_LFN) {			/* An LFN entry is found */
-				if (c & 0x40) {			/* Is it start of LFN sequence? */
+				if (c & LLE) {			/* Is it start of LFN sequence? */
 					sum = dir[LDIR_Chksum];
-					c &= 0xBF; ord = c;
+					c &= ~LLE; ord = c;
 					dj->lfn_idx = dj->index;
 				}
 				/* Check LFN validity and capture it */
@@ -1207,7 +1441,7 @@ FRESULT dir_read (
 			}
 		}
 #else		/* Non LFN configuration */
-		if (c != 0xE5 && (_FS_RPATH || c != '.') && !(dir[DIR_Attr] & AM_VOL))	/* Is it a valid entry? */
+		if (c != DDE && (_FS_RPATH || c != '.') && !(dir[DIR_Attr] & AM_VOL))	/* Is it a valid entry? */
 			break;
 #endif
 		res = dir_next(dj, 0);				/* Next entry */
@@ -1272,7 +1506,7 @@ FRESULT dir_register (	/* FR_OK:Successful, FR_DENIED:No free entry or too many
 		res = move_window(dj->fs, dj->sect);
 		if (res != FR_OK) break;
 		c = *dj->dir;				/* Check the entry status */
-		if (c == 0xE5 || c == 0) {	/* Is it a blank entry? */
+		if (c == DDE || c == 0) {	/* Is it a blank entry? */
 			if (n == 0) is = dj->index;	/* First index of the contiguous entry */
 			if (++n == ne) break;	/* A contiguous entry that required count is found */
 		} else {
@@ -1303,7 +1537,7 @@ FRESULT dir_register (	/* FR_OK:Successful, FR_DENIED:No free entry or too many
 			res = move_window(dj->fs, dj->sect);
 			if (res != FR_OK) break;
 			c = *dj->dir;
-			if (c == 0xE5 || c == 0) break;	/* Is it a blank entry? */
+			if (c == DDE || c == 0) break;	/* Is it a blank entry? */
 			res = dir_next(dj, 1);			/* Next entry with table stretch */
 		} while (res == FR_OK);
 	}
@@ -1313,7 +1547,7 @@ FRESULT dir_register (	/* FR_OK:Successful, FR_DENIED:No free entry or too many
 		res = move_window(dj->fs, dj->sect);
 		if (res == FR_OK) {
 			dir = dj->dir;
-			mem_set(dir, 0, 32);		/* Clean the entry */
+			mem_set(dir, 0, SZ_DIR);	/* Clean the entry */
 			mem_cpy(dir, dj->fn, 11);	/* Put SFN */
 #if _USE_LFN
 			dir[DIR_NTres] = *(dj->fn+NS) & (NS_BODY | NS_EXT);	/* Put NT flag */
@@ -1348,7 +1582,7 @@ FRESULT dir_remove (	/* FR_OK: Successful, FR_DISK_ERR: A disk error */
 		do {
 			res = move_window(dj->fs, dj->sect);
 			if (res != FR_OK) break;
-			*dj->dir = 0xE5;			/* Mark the entry "deleted" */
+			*dj->dir = DDE;			/* Mark the entry "deleted" */
 			dj->fs->wflag = 1;
 			if (dj->index >= i) break;	/* When reached SFN, all entries of the object has been deleted. */
 			res = dir_next(dj, 0);		/* Next entry */
@@ -1361,7 +1595,7 @@ FRESULT dir_remove (	/* FR_OK: Successful, FR_DISK_ERR: A disk error */
 	if (res == FR_OK) {
 		res = move_window(dj->fs, dj->sect);
 		if (res == FR_OK) {
-			*dj->dir = 0xE5;			/* Mark the entry "deleted" */
+			*dj->dir = DDE;			/* Mark the entry "deleted" */
 			dj->fs->wflag = 1;
 		}
 	}
@@ -1395,9 +1629,9 @@ FRESULT create_name (
 	const TCHAR *p;
 
 	/* Create LFN in Unicode */
-	si = di = 0;
-	p = *path;
+	for (p = *path; *p == '/' || *p == '\\'; p++) ;	/* Strip duplicated separator */
 	lfn = dj->lfn;
+	si = di = 0;
 	for (;;) {
 		w = p[si++];					/* Get a character */
 		if (w < ' ' || w == '/' || w == '\\') break;	/* Break on end of segment */
@@ -1494,7 +1728,7 @@ FRESULT create_name (
 		dj->fn[i++] = (BYTE)w;
 	}
 
-	if (dj->fn[0] == 0xE5) dj->fn[0] = 0x05;	/* If the first char collides with deleted mark, replace it with 0x05 */
+	if (dj->fn[0] == DDE) dj->fn[0] = NDDE;	/* If the first char collides with deleted mark, replace it with 0x05 */
 
 	if (ni == 8) b <<= 2;
 	if ((b & 0x0C) == 0x0C || (b & 0x03) == 0x03)	/* Create LFN entry when there are composite capitals */
@@ -1515,10 +1749,10 @@ FRESULT create_name (
 	const char *p;
 
 	/* Create file name in directory form */
+	for (p = *path; *p == '/' || *p == '\\'; p++) ;	/* Strip duplicated separator */
 	sfn = dj->fn;
 	mem_set(sfn, ' ', 11);
 	si = i = b = 0; ni = 8;
-	p = *path;
 #if _FS_RPATH
 	if (p[si] == '.') { /* Is this a dot entry? */
 		for (;;) {
@@ -1573,7 +1807,7 @@ FRESULT create_name (
 	c = (c <= ' ') ? NS_LAST : 0;		/* Set last segment flag if end of path */
 
 	if (!i) return FR_INVALID_NAME;		/* Reject nul string */
-	if (sfn[0] == 0xE5) sfn[0] = 0x05;	/* When first char collides with 0xE5, replace it with 0x05 */
+	if (sfn[0] == DDE) sfn[0] = NDDE;	/* When first char collides with DDE, replace it with 0x05 */
 
 	if (ni == 8) b <<= 2;
 	if ((b & 0x03) == 0x01) c |= NS_EXT;	/* NT flag (Name extension has only small capital) */
@@ -1610,7 +1844,7 @@ void get_fileinfo (		/* No return code */
 		for (i = 0; i < 8; i++) {	/* Copy name body */
 			c = dir[i];
 			if (c == ' ') break;
-			if (c == 0x05) c = (TCHAR)0xE5;
+			if (c == NDDE) c = (TCHAR)DDE;
 			if (_USE_LFN && (nt & NS_BODY) && IsUpper(c)) c += 0x20;
 #if _LFN_UNICODE
 			if (IsDBCS1(c) && i < 7 && IsDBCS2(dir[i+1]))
@@ -1829,7 +2063,7 @@ FRESULT chk_mounted (	/* FR_OK(0): successful, !=0: any error occurred */
 	fmt = check_fs(fs, bsect = 0);		/* Check sector 0 if it is a VBR */
 	if (fmt == 1) {						/* Not an FAT-VBR, the disk may be partitioned */
 		/* Check the partition listed in top of the partition table */
-		tbl = &fs->win[MBR_Table + LD2PT(vol) * 16];	/* Partition table */
+		tbl = &fs->win[MBR_Table + LD2PT(vol) * SZ_PTE];/* Partition table */
 		if (tbl[4]) {									/* Is the partition existing? */
 			bsect = LD_DWORD(&tbl[8]);					/* Partition offset in LBA */
 			fmt = check_fs(fs, bsect);					/* Check the partition */
@@ -1855,7 +2089,7 @@ FRESULT chk_mounted (	/* FR_OK(0): successful, !=0: any error occurred */
 	if (!b || (b & (b - 1))) return FR_NO_FILESYSTEM;	/* (Must be power of 2) */
 
 	fs->n_rootdir = LD_WORD(fs->win+BPB_RootEntCnt);	/* Number of root directory entries */
-	if (fs->n_rootdir % (SS(fs) / 32)) return FR_NO_FILESYSTEM;	/* (BPB_RootEntCnt must be sector aligned) */
+	if (fs->n_rootdir % (SS(fs) / SZ_DIR)) return FR_NO_FILESYSTEM;	/* (BPB_RootEntCnt must be sector aligned) */
 
 	tsect = LD_WORD(fs->win+BPB_TotSec16);				/* Number of sectors on the volume */
 	if (!tsect) tsect = LD_DWORD(fs->win+BPB_TotSec32);
@@ -1864,7 +2098,7 @@ FRESULT chk_mounted (	/* FR_OK(0): successful, !=0: any error occurred */
 	if (!nrsv) return FR_NO_FILESYSTEM;					/* (BPB_RsvdSecCnt must not be 0) */
 
 	/* Determine the FAT sub type */
-	sysect = nrsv + fasize + fs->n_rootdir / (SS(fs) / 32);	/* RSV+FAT+DIR */
+	sysect = nrsv + fasize + fs->n_rootdir / (SS(fs) / SZ_DIR);	/* RSV+FAT+DIR */
 	if (tsect < sysect) return FR_NO_FILESYSTEM;		/* (Invalid volume size) */
 	nclst = (tsect - sysect) / fs->csize;				/* Number of clusters */
 	if (!nclst) return FR_NO_FILESYSTEM;				/* (Invalid volume size) */
@@ -1886,7 +2120,7 @@ FRESULT chk_mounted (	/* FR_OK(0): successful, !=0: any error occurred */
 		szbfat = (fmt == FS_FAT16) ?					/* (Required FAT size) */
 			fs->n_fatent * 2 : fs->n_fatent * 3 / 2 + (fs->n_fatent & 1);
 	}
-	if (fs->fsize < (szbfat + (SS(fs) - 1)) / SS(fs))	/* (FAT size must not be less than FAT sectors */
+	if (fs->fsize < (szbfat + (SS(fs) - 1)) / SS(fs))	/* (BPB_FATSz must not be less than required) */
 		return FR_NO_FILESYSTEM;
 
 #if !_FS_READONLY
@@ -2050,11 +2284,11 @@ FRESULT f_open (
 			dir = dj.dir;					/* New entry */
 		}
 		else {								/* Any object is already existing */
-			if (mode & FA_CREATE_NEW) {		/* Cannot create new */
-				res = FR_EXIST;
+			if (dir[DIR_Attr] & (AM_RDO | AM_DIR)) {	/* Cannot overwrite it (R/O or DIR) */
+				res = FR_DENIED;
 			} else {
-				if (dir[DIR_Attr] & (AM_RDO | AM_DIR))	/* Cannot overwrite it (R/O or DIR) */
-					res = FR_DENIED;
+				if (mode & FA_CREATE_NEW)	/* Cannot create as new file */
+					res = FR_EXIST;
 			}
 		}
 		if (res == FR_OK && (mode & FA_CREATE_ALWAYS)) {	/* Truncate it if overwrite mode */
@@ -2110,12 +2344,12 @@ FRESULT f_open (
 
 	if (res == FR_OK) {
 		fp->flag = mode;					/* File access mode */
-		fp->org_clust =	LD_CLUST(dir);		/* File start cluster */
+		fp->sclust = LD_CLUST(dir);			/* File start cluster */
 		fp->fsize = LD_DWORD(dir+DIR_FileSize);	/* File size */
 		fp->fptr = 0;						/* File pointer */
 		fp->dsect = 0;
 #if _USE_FASTSEEK
-		fp->cltbl = 0;						/* No cluster link map table */
+		fp->cltbl = 0;						/* Normal seek mode */
 #endif
 		fp->fs = dj.fs; fp->id = dj.fs->id;	/* Validate file object */
 	}
@@ -2145,36 +2379,44 @@ FRESULT f_read (
 
 	*br = 0;	/* Initialize byte counter */
 
-	res = validate(fp->fs, fp->id);					/* Check validity of the object */
+	res = validate(fp->fs, fp->id);				/* Check validity */
 	if (res != FR_OK) LEAVE_FF(fp->fs, res);
-	if (fp->flag & FA__ERROR)						/* Check abort flag */
+	if (fp->flag & FA__ERROR)					/* Aborted file? */
 		LEAVE_FF(fp->fs, FR_INT_ERR);
-	if (!(fp->flag & FA_READ)) 						/* Check access mode */
+	if (!(fp->flag & FA_READ)) 					/* Check access mode */
 		LEAVE_FF(fp->fs, FR_DENIED);
 	remain = fp->fsize - fp->fptr;
-	if (btr > remain) btr = (UINT)remain;			/* Truncate btr by remaining bytes */
+	if (btr > remain) btr = (UINT)remain;		/* Truncate btr by remaining bytes */
 
-	for ( ;  btr;									/* Repeat until all data transferred */
+	for ( ;  btr;								/* Repeat until all data read */
 		rbuff += rcnt, fp->fptr += rcnt, *br += rcnt, btr -= rcnt) {
-		if ((fp->fptr % SS(fp->fs)) == 0) {			/* On the sector boundary? */
+		if ((fp->fptr % SS(fp->fs)) == 0) {		/* On the sector boundary? */
 			csect = (BYTE)(fp->fptr / SS(fp->fs) & (fp->fs->csize - 1));	/* Sector offset in the cluster */
-			if (!csect) {							/* On the cluster boundary? */
-				clst = (fp->fptr == 0) ?			/* On the top of the file? */
-					fp->org_clust : get_fat(fp->fs, fp->curr_clust);
-				if (clst <= 1) ABORT(fp->fs, FR_INT_ERR);
+			if (!csect) {						/* On the cluster boundary? */
+				if (fp->fptr == 0) {			/* On the top of the file? */
+					clst = fp->sclust;			/* Follow from the origin */
+				} else {						/* Middle or end of the file */
+#if _USE_FASTSEEK
+					if (fp->cltbl)
+						clst = clmt_clust(fp, fp->fptr);	/* Get cluster# from the CLMT */
+					else
+#endif
+						clst = get_fat(fp->fs, fp->clust);	/* Follow cluster chain on the FAT */
+				}
+				if (clst < 2) ABORT(fp->fs, FR_INT_ERR);
 				if (clst == 0xFFFFFFFF) ABORT(fp->fs, FR_DISK_ERR);
-				fp->curr_clust = clst;				/* Update current cluster */
+				fp->clust = clst;				/* Update current cluster */
 			}
-			sect = clust2sect(fp->fs, fp->curr_clust);	/* Get current sector */
+			sect = clust2sect(fp->fs, fp->clust);	/* Get current sector */
 			if (!sect) ABORT(fp->fs, FR_INT_ERR);
 			sect += csect;
-			cc = btr / SS(fp->fs);					/* When remaining bytes >= sector size, */
-			if (cc) {								/* Read maximum contiguous sectors directly */
-				if (csect + cc > fp->fs->csize)		/* Clip at cluster boundary */
+			cc = btr / SS(fp->fs);				/* When remaining bytes >= sector size, */
+			if (cc) {							/* Read maximum contiguous sectors directly */
+				if (csect + cc > fp->fs->csize)	/* Clip at cluster boundary */
 					cc = fp->fs->csize - csect;
 				if (disk_read(fp->fs->drv, rbuff, sect, (BYTE)cc) != RES_OK)
 					ABORT(fp->fs, FR_DISK_ERR);
-#if !_FS_READONLY && _FS_MINIMIZE <= 2				/* Replace one of the read sectors with cached data if it contains a dirty sector */
+#if !_FS_READONLY && _FS_MINIMIZE <= 2			/* Replace one of the read sectors with cached data if it contains a dirty sector */
 #if _FS_TINY
 				if (fp->fs->wflag && fp->fs->winsect - sect < cc)
 					mem_cpy(rbuff + ((fp->fs->winsect - sect) * SS(fp->fs)), fp->fs->win, SS(fp->fs));
@@ -2183,19 +2425,19 @@ FRESULT f_read (
 					mem_cpy(rbuff + ((fp->dsect - sect) * SS(fp->fs)), fp->buf, SS(fp->fs));
 #endif
 #endif
-				rcnt = SS(fp->fs) * cc;				/* Number of bytes transferred */
+				rcnt = SS(fp->fs) * cc;			/* Number of bytes transferred */
 				continue;
 			}
 #if !_FS_TINY
+			if (fp->dsect != sect) {			/* Load data sector if not in cache */
 #if !_FS_READONLY
-			if (fp->flag & FA__DIRTY) {				/* Write sector I/O buffer if needed */
-				if (disk_write(fp->fs->drv, fp->buf, fp->dsect, 1) != RES_OK)
-					ABORT(fp->fs, FR_DISK_ERR);
-				fp->flag &= ~FA__DIRTY;
-			}
+				if (fp->flag & FA__DIRTY) {		/* Write-back dirty sector cache */
+					if (disk_write(fp->fs->drv, fp->buf, fp->dsect, 1) != RES_OK)
+						ABORT(fp->fs, FR_DISK_ERR);
+					fp->flag &= ~FA__DIRTY;
+				}
 #endif
-			if (fp->dsect != sect) {				/* Fill sector buffer with file data */
-				if (disk_read(fp->fs->drv, fp->buf, sect, 1) != RES_OK)
+				if (disk_read(fp->fs->drv, fp->buf, sect, 1) != RES_OK)	/* Fill sector cache */
 					ABORT(fp->fs, FR_DISK_ERR);
 			}
 #endif
@@ -2204,7 +2446,7 @@ FRESULT f_read (
 		rcnt = SS(fp->fs) - (fp->fptr % SS(fp->fs));	/* Get partial sector data from sector buffer */
 		if (rcnt > btr) rcnt = btr;
 #if _FS_TINY
-		if (move_window(fp->fs, fp->dsect))			/* Move sector window */
+		if (move_window(fp->fs, fp->dsect))		/* Move sector window */
 			ABORT(fp->fs, FR_DISK_ERR);
 		mem_cpy(rbuff, &fp->fs->win[fp->fptr % SS(fp->fs)], rcnt);	/* Pick partial sector */
 #else
@@ -2239,71 +2481,76 @@ FRESULT f_write (
 
 	*bw = 0;	/* Initialize byte counter */
 
-	res = validate(fp->fs, fp->id);					/* Check validity of the object */
+	res = validate(fp->fs, fp->id);			/* Check validity */
 	if (res != FR_OK) LEAVE_FF(fp->fs, res);
-	if (fp->flag & FA__ERROR)						/* Check abort flag */
+	if (fp->flag & FA__ERROR)				/* Aborted file? */
 		LEAVE_FF(fp->fs, FR_INT_ERR);
-	if (!(fp->flag & FA_WRITE))						/* Check access mode */
+	if (!(fp->flag & FA_WRITE))				/* Check access mode */
 		LEAVE_FF(fp->fs, FR_DENIED);
-	if (fp->fsize + btw < fp->fsize) btw = 0;		/* File size cannot reach 4GB */
+	if ((DWORD)(fp->fsize + btw) < fp->fsize) btw = 0;	/* File size cannot reach 4GB */
 
-	for ( ;  btw;									/* Repeat until all data transferred */
+	for ( ;  btw;							/* Repeat until all data written */
 		wbuff += wcnt, fp->fptr += wcnt, *bw += wcnt, btw -= wcnt) {
-		if ((fp->fptr % SS(fp->fs)) == 0) {			/* On the sector boundary? */
+		if ((fp->fptr % SS(fp->fs)) == 0) {	/* On the sector boundary? */
 			csect = (BYTE)(fp->fptr / SS(fp->fs) & (fp->fs->csize - 1));	/* Sector offset in the cluster */
-			if (!csect) {							/* On the cluster boundary? */
-				if (fp->fptr == 0) {				/* On the top of the file? */
-					clst = fp->org_clust;			/* Follow from the origin */
-					if (clst == 0)					/* When there is no cluster chain, */
-						fp->org_clust = clst = create_chain(fp->fs, 0);	/* Create a new cluster chain */
-				} else {							/* Middle or end of the file */
-					clst = create_chain(fp->fs, fp->curr_clust);			/* Follow or stretch cluster chain */
+			if (!csect) {					/* On the cluster boundary? */
+				if (fp->fptr == 0) {		/* On the top of the file? */
+					clst = fp->sclust;		/* Follow from the origin */
+					if (clst == 0)			/* When no cluster is allocated, */
+						fp->sclust = clst = create_chain(fp->fs, 0);	/* Create a new cluster chain */
+				} else {					/* Middle or end of the file */
+#if _USE_FASTSEEK
+					if (fp->cltbl)
+						clst = clmt_clust(fp, fp->fptr);	/* Get cluster# from the CLMT */
+					else
+#endif
+						clst = create_chain(fp->fs, fp->clust);	/* Follow or stretch cluster chain on the FAT */
 				}
-				if (clst == 0) break;				/* Could not allocate a new cluster (disk full) */
+				if (clst == 0) break;		/* Could not allocate a new cluster (disk full) */
 				if (clst == 1) ABORT(fp->fs, FR_INT_ERR);
 				if (clst == 0xFFFFFFFF) ABORT(fp->fs, FR_DISK_ERR);
-				fp->curr_clust = clst;				/* Update current cluster */
+				fp->clust = clst;			/* Update current cluster */
 			}
 #if _FS_TINY
-			if (fp->fs->winsect == fp->dsect && move_window(fp->fs, 0))	/* Write back data buffer prior to following direct transfer */
+			if (fp->fs->winsect == fp->dsect && move_window(fp->fs, 0))	/* Write-back sector cache */
 				ABORT(fp->fs, FR_DISK_ERR);
 #else
-			if (fp->flag & FA__DIRTY) {		/* Write back data buffer prior to following direct transfer */
+			if (fp->flag & FA__DIRTY) {		/* Write-back sector cache */
 				if (disk_write(fp->fs->drv, fp->buf, fp->dsect, 1) != RES_OK)
 					ABORT(fp->fs, FR_DISK_ERR);
 				fp->flag &= ~FA__DIRTY;
 			}
 #endif
-			sect = clust2sect(fp->fs, fp->curr_clust);	/* Get current sector */
+			sect = clust2sect(fp->fs, fp->clust);	/* Get current sector */
 			if (!sect) ABORT(fp->fs, FR_INT_ERR);
 			sect += csect;
-			cc = btw / SS(fp->fs);					/* When remaining bytes >= sector size, */
-			if (cc) {								/* Write maximum contiguous sectors directly */
-				if (csect + cc > fp->fs->csize)		/* Clip at cluster boundary */
+			cc = btw / SS(fp->fs);			/* When remaining bytes >= sector size, */
+			if (cc) {						/* Write maximum contiguous sectors directly */
+				if (csect + cc > fp->fs->csize)	/* Clip at cluster boundary */
 					cc = fp->fs->csize - csect;
 				if (disk_write(fp->fs->drv, wbuff, sect, (BYTE)cc) != RES_OK)
 					ABORT(fp->fs, FR_DISK_ERR);
 #if _FS_TINY
-				if (fp->fs->winsect - sect < cc) {	/* Refill sector cache if it gets dirty by the direct write */
+				if (fp->fs->winsect - sect < cc) {	/* Refill sector cache if it gets invalidated by the direct write */
 					mem_cpy(fp->fs->win, wbuff + ((fp->fs->winsect - sect) * SS(fp->fs)), SS(fp->fs));
 					fp->fs->wflag = 0;
 				}
 #else
-				if (fp->dsect - sect < cc) {		/* Refill sector cache if it gets dirty by the direct write */
+				if (fp->dsect - sect < cc) { /* Refill sector cache if it gets invalidated by the direct write */
 					mem_cpy(fp->buf, wbuff + ((fp->dsect - sect) * SS(fp->fs)), SS(fp->fs));
 					fp->flag &= ~FA__DIRTY;
 				}
 #endif
-				wcnt = SS(fp->fs) * cc;				/* Number of bytes transferred */
+				wcnt = SS(fp->fs) * cc;		/* Number of bytes transferred */
 				continue;
 			}
 #if _FS_TINY
-			if (fp->fptr >= fp->fsize) {			/* Avoid silly buffer filling at growing edge */
+			if (fp->fptr >= fp->fsize) {	/* Avoid silly cache filling at growing edge */
 				if (move_window(fp->fs, 0)) ABORT(fp->fs, FR_DISK_ERR);
 				fp->fs->winsect = sect;
 			}
 #else
-			if (fp->dsect != sect) {				/* Fill sector buffer with file data */
+			if (fp->dsect != sect) {		/* Fill sector cache with file data */
 				if (fp->fptr < fp->fsize &&
 					disk_read(fp->fs->drv, fp->buf, sect, 1) != RES_OK)
 						ABORT(fp->fs, FR_DISK_ERR);
@@ -2314,7 +2561,7 @@ FRESULT f_write (
 		wcnt = SS(fp->fs) - (fp->fptr % SS(fp->fs));/* Put partial sector into file I/O buffer */
 		if (wcnt > btw) wcnt = btw;
 #if _FS_TINY
-		if (move_window(fp->fs, fp->dsect))			/* Move sector window */
+		if (move_window(fp->fs, fp->dsect))	/* Move sector window */
 			ABORT(fp->fs, FR_DISK_ERR);
 		mem_cpy(&fp->fs->win[fp->fptr % SS(fp->fs)], wbuff, wcnt);	/* Fit partial sector */
 		fp->fs->wflag = 1;
@@ -2362,7 +2609,7 @@ FRESULT f_sync (
 				dir = fp->dir_ptr;
 				dir[DIR_Attr] |= AM_ARC;					/* Set archive bit */
 				ST_DWORD(dir+DIR_FileSize, fp->fsize);		/* Update file size */
-				ST_CLUST(dir, fp->org_clust);				/* Update start cluster */
+				ST_CLUST(dir, fp->sclust);					/* Update start cluster */
 				tim = get_fattime();						/* Update updated time */
 				ST_DWORD(dir+DIR_WrtTime, tim);
 				fp->flag &= ~FA__WRITTEN;
@@ -2563,58 +2810,52 @@ FRESULT f_lseek (
 
 #if _USE_FASTSEEK
 	if (fp->cltbl) {	/* Fast seek */
-		DWORD cl, pcl, ncl, tcl, dsc, tlen, *tbl = fp->cltbl;
-		BYTE csc;
+		DWORD cl, pcl, ncl, tcl, dsc, tlen, ulen, *tbl;
 
-		tlen = *tbl++;
-		if (ofs == CREATE_LINKMAP) {	/* Create link map table */
-			cl = fp->org_clust;
+		if (ofs == CREATE_LINKMAP) {	/* Create CLMT */
+			tbl = fp->cltbl;
+			tlen = *tbl++; ulen = 2;	/* Given table size and required table size */
+			cl = fp->sclust;			/* Top of the chain */
 			if (cl) {
 				do {
-					if (tlen < 4) {	/* Not enough table items */
-						res = FR_NOT_ENOUGH_CORE; break;
-					}
-					tcl = cl; ncl = 0;
-					do {		/* Get a fragment and store the top and length */
+					/* Get a fragment */
+					tcl = cl; ncl = 0; ulen += 2;	/* Top, length and used items */
+					do {
 						pcl = cl; ncl++;
 						cl = get_fat(fp->fs, cl);
 						if (cl <= 1) ABORT(fp->fs, FR_INT_ERR);
 						if (cl == 0xFFFFFFFF) ABORT(fp->fs, FR_DISK_ERR);
 					} while (cl == pcl + 1);
-					*tbl++ = ncl; *tbl++ = tcl;
-					tlen -= 2;
-				} while (cl < fp->fs->n_fatent);
+					if (ulen <= tlen) {		/* Store the length and top of the fragment */
+						*tbl++ = ncl; *tbl++ = tcl;
+					}
+				} while (cl < fp->fs->n_fatent);	/* Repeat until end of chain */
 			}
-			*tbl = 0;	/* Terminate table */
+			*fp->cltbl = ulen;	/* Number of items used */
+			if (ulen <= tlen)
+				*tbl = 0;		/* Terminate table */
+			else
+				res = FR_NOT_ENOUGH_CORE;	/* Given table size is smaller than required */
 
 		} else {						/* Fast seek */
 			if (ofs > fp->fsize)		/* Clip offset at the file size */
 				ofs = fp->fsize;
 			fp->fptr = ofs;				/* Set file pointer */
 			if (ofs) {
-				dsc = (ofs - 1) / SS(fp->fs);
-				cl = dsc / fp->fs->csize;
-				for (;;) {
-					ncl = *tbl++;
-					if (!ncl) ABORT(fp->fs, FR_INT_ERR);
-					if (cl < ncl) break;
-					cl -= ncl; tbl++;
-				}
-				fp->curr_clust = cl + *tbl;
-				csc = (BYTE)(dsc & (fp->fs->csize - 1));
-				dsc = clust2sect(fp->fs, fp->curr_clust);
+				fp->clust = clmt_clust(fp, ofs - 1);
+				dsc = clust2sect(fp->fs, fp->clust);
 				if (!dsc) ABORT(fp->fs, FR_INT_ERR);
-				dsc += csc;
-				if (fp->fptr % SS(fp->fs) && dsc != fp->dsect) {
+				dsc += (ofs - 1) / SS(fp->fs) & (fp->fs->csize - 1);
+				if (fp->fptr % SS(fp->fs) && dsc != fp->dsect) {	/* Refill sector cache if needed */
 #if !_FS_TINY
 #if !_FS_READONLY
-					if (fp->flag & FA__DIRTY) {		/* Flush dirty buffer if needed */
+					if (fp->flag & FA__DIRTY) {		/* Write-back dirty sector cache */
 						if (disk_write(fp->fs->drv, fp->buf, fp->dsect, 1) != RES_OK)
 							ABORT(fp->fs, FR_DISK_ERR);
 						fp->flag &= ~FA__DIRTY;
 					}
 #endif
-					if (disk_read(fp->fs->drv, fp->buf, dsc, 1) != RES_OK)
+					if (disk_read(fp->fs->drv, fp->buf, dsc, 1) != RES_OK)	/* Load current sector */
 						ABORT(fp->fs, FR_DISK_ERR);
 #endif
 					fp->dsect = dsc;
@@ -2642,18 +2883,18 @@ FRESULT f_lseek (
 				(ofs - 1) / bcs >= (ifptr - 1) / bcs) {	/* When seek to same or following cluster, */
 				fp->fptr = (ifptr - 1) & ~(bcs - 1);	/* start from the current cluster */
 				ofs -= fp->fptr;
-				clst = fp->curr_clust;
+				clst = fp->clust;
 			} else {									/* When seek to back cluster, */
-				clst = fp->org_clust;					/* start from the first cluster */
+				clst = fp->sclust;						/* start from the first cluster */
 #if !_FS_READONLY
 				if (clst == 0) {						/* If no cluster chain, create a new chain */
 					clst = create_chain(fp->fs, 0);
 					if (clst == 1) ABORT(fp->fs, FR_INT_ERR);
 					if (clst == 0xFFFFFFFF) ABORT(fp->fs, FR_DISK_ERR);
-					fp->org_clust = clst;
+					fp->sclust = clst;
 				}
 #endif
-				fp->curr_clust = clst;
+				fp->clust = clst;
 			}
 			if (clst != 0) {
 				while (ofs > bcs) {						/* Cluster following loop */
@@ -2668,7 +2909,7 @@ FRESULT f_lseek (
 						clst = get_fat(fp->fs, clst);	/* Follow cluster chain if not in write mode */
 					if (clst == 0xFFFFFFFF) ABORT(fp->fs, FR_DISK_ERR);
 					if (clst <= 1 || clst >= fp->fs->n_fatent) ABORT(fp->fs, FR_INT_ERR);
-					fp->curr_clust = clst;
+					fp->clust = clst;
 					fp->fptr += bcs;
 					ofs -= bcs;
 				}
@@ -2680,22 +2921,22 @@ FRESULT f_lseek (
 				}
 			}
 		}
-		if (fp->fptr % SS(fp->fs) && nsect != fp->dsect) {
+		if (fp->fptr % SS(fp->fs) && nsect != fp->dsect) {	/* Fill sector cache if needed */
 #if !_FS_TINY
 #if !_FS_READONLY
-			if (fp->flag & FA__DIRTY) {			/* Flush dirty buffer if needed */
+			if (fp->flag & FA__DIRTY) {			/* Write-back dirty sector cache */
 				if (disk_write(fp->fs->drv, fp->buf, fp->dsect, 1) != RES_OK)
 					ABORT(fp->fs, FR_DISK_ERR);
 				fp->flag &= ~FA__DIRTY;
 			}
 #endif
-			if (disk_read(fp->fs->drv, fp->buf, nsect, 1) != RES_OK)
+			if (disk_read(fp->fs->drv, fp->buf, nsect, 1) != RES_OK)	/* Fill sector cache */
 				ABORT(fp->fs, FR_DISK_ERR);
 #endif
 			fp->dsect = nsect;
 		}
 #if !_FS_READONLY
-		if (fp->fptr > fp->fsize) {			/* Set change flag if the file size is extended */
+		if (fp->fptr > fp->fsize) {			/* Set file change flag if the file size is extended */
 			fp->fsize = fp->fptr;
 			fp->flag |= FA__WRITTEN;
 		}
@@ -2914,15 +3155,15 @@ FRESULT f_truncate (
 			fp->fsize = fp->fptr;	/* Set file size to current R/W point */
 			fp->flag |= FA__WRITTEN;
 			if (fp->fptr == 0) {	/* When set file size to zero, remove entire cluster chain */
-				res = remove_chain(fp->fs, fp->org_clust);
-				fp->org_clust = 0;
+				res = remove_chain(fp->fs, fp->sclust);
+				fp->sclust = 0;
 			} else {				/* When truncate a part of the file, remove remaining clusters */
-				ncl = get_fat(fp->fs, fp->curr_clust);
+				ncl = get_fat(fp->fs, fp->clust);
 				res = FR_OK;
 				if (ncl == 0xFFFFFFFF) res = FR_DISK_ERR;
 				if (ncl == 1) res = FR_INT_ERR;
 				if (res == FR_OK && ncl < fp->fs->n_fatent) {
-					res = put_fat(fp->fs, fp->curr_clust, 0x0FFFFFFF);
+					res = put_fat(fp->fs, fp->clust, 0x0FFFFFFF);
 					if (res == FR_OK) res = remove_chain(fp->fs, ncl);
 				}
 			}
@@ -3043,11 +3284,11 @@ FRESULT f_mkdir (
 				dir[DIR_Attr] = AM_DIR;
 				ST_DWORD(dir+DIR_WrtTime, tim);
 				ST_CLUST(dir, dcl);
-				mem_cpy(dir+32, dir, 32); 			/* Create ".." entry */
+				mem_cpy(dir+SZ_DIR, dir, SZ_DIR); 	/* Create ".." entry */
 				dir[33] = '.'; pcl = dj.sclust;
 				if (dj.fs->fs_type == FS_FAT32 && pcl == dj.fs->dirbase)
 					pcl = 0;
-				ST_CLUST(dir+32, pcl);
+				ST_CLUST(dir+SZ_DIR, pcl);
 				for (n = dj.fs->csize; n; n--) {	/* Write dot entries and clear following sectors */
 					dj.fs->winsect = dsc++;
 					dj.fs->wflag = 1;
@@ -3208,7 +3449,7 @@ FRESULT f_rename (
 								res = FR_INT_ERR;
 							} else {
 								res = move_window(djn.fs, dw);
-								dir = djn.fs->win+32;	/* .. entry */
+								dir = djn.fs->win+SZ_DIR;	/* .. entry */
 								if (res == FR_OK && dir[1] == '.') {
 									dw = (djn.fs->fs_type == FS_FAT32 && djn.sclust == djn.fs->dirbase) ? 0 : djn.sclust;
 									ST_CLUST(dir, dw);
@@ -3274,13 +3515,13 @@ FRESULT f_forward (
 		if ((fp->fptr % SS(fp->fs)) == 0) {			/* On the sector boundary? */
 			if (!csect) {							/* On the cluster boundary? */
 				clst = (fp->fptr == 0) ?			/* On the top of the file? */
-					fp->org_clust : get_fat(fp->fs, fp->curr_clust);
+					fp->sclust : get_fat(fp->fs, fp->clust);
 				if (clst <= 1) ABORT(fp->fs, FR_INT_ERR);
 				if (clst == 0xFFFFFFFF) ABORT(fp->fs, FR_DISK_ERR);
-				fp->curr_clust = clst;				/* Update current cluster */
+				fp->clust = clst;					/* Update current cluster */
 			}
 		}
-		sect = clust2sect(fp->fs, fp->curr_clust);	/* Get current data sector */
+		sect = clust2sect(fp->fs, fp->clust);		/* Get current data sector */
 		if (!sect) ABORT(fp->fs, FR_INT_ERR);
 		sect += csect;
 		if (move_window(fp->fs, sect))				/* Move sector window */
@@ -3302,8 +3543,8 @@ FRESULT f_forward (
 /*-----------------------------------------------------------------------*/
 /* Create File System on the Drive                                       */
 /*-----------------------------------------------------------------------*/
-#define N_ROOTDIR	512		/* Multiple of 32 */
-#define N_FATS		1		/* 1 or 2 */
+#define N_ROOTDIR	512		/* Number of root dir entries for FAT12/16 */
+#define N_FATS		1		/* Number of FAT copies (1 or 2) */
 
 
 FRESULT f_mkfs (
@@ -3342,8 +3583,8 @@ FRESULT f_mkfs (
 		return FR_DISK_ERR;
 	b_vol = (sfd) ? 0 : 63;	/* Volume start sector */
 	n_vol -= b_vol;
-	if (au & (au - 1)) au = 0;		/* Check validity of the allocation unit size */
-	if (!au) {						/* AU auto selection */
+	if (au & (au - 1)) au = 0;	/* Check validity of the AU size */
+	if (!au) {					/* AU auto selection */
 		vs = n_vol / (2000 / (SS(fs) / 512));
 		for (i = 0; vs < vst[i]; i++) ;
 		au = cst[i];
@@ -3367,7 +3608,7 @@ FRESULT f_mkfs (
 		n_fat = (fmt == FS_FAT12) ? (n_clst * 3 + 1) / 2 + 3 : (n_clst * 2) + 4;
 		n_fat = (n_fat + SS(fs) - 1) / SS(fs);
 		n_rsv = 1;
-		n_dir = N_ROOTDIR * 32UL / SS(fs);
+		n_dir = (DWORD)N_ROOTDIR * SZ_DIR / SS(fs);
 	}
 	b_fat = b_vol + n_rsv;				/* FAT area start sector */
 	b_dir = b_fat + n_fat * N_FATS;		/* Directory area start sector */
@@ -3385,16 +3626,16 @@ FRESULT f_mkfs (
 		n_fat += n;
 	}
 
-	/* Determine number of cluster and final check of validity of the FAT sub-type */
+	/* Determine number of clusters and final check of validity of the FAT sub-type */
 	n_clst = (n_vol - n_rsv - n_fat * N_FATS - n_dir) / au;
 	if (   (fmt == FS_FAT16 && n_clst < MIN_FAT16)
 		|| (fmt == FS_FAT32 && n_clst < MIN_FAT32))
 		return FR_MKFS_ABORTED;
 
 	/* Create partition table if required */
-	if (sfd) {
+	if (sfd) {	/* No patition table (SFD) */
 		md = 0xF0;
-	} else {
+	} else {	/* With patition table (FDISK) */
 		DWORD n_disk = b_vol + n_vol;
 
 		mem_set(fs->win, 0, SS(fs));
@@ -3405,7 +3646,7 @@ FRESULT f_mkfs (
 			tbl[7] = (BYTE)n_disk;
 			tbl[6] = (BYTE)((n_disk >> 2) | 63);
 		} else {
-			ST_WORD(&tbl[6], 0xFFFF);
+			ST_WORD(&tbl[6], 0xFFFF);	/* CHS saturated */
 		}
 		tbl[5] = 254;
 		if (fmt != FS_FAT32)				/* System ID */
@@ -3414,8 +3655,8 @@ FRESULT f_mkfs (
 			tbl[4] = 0x0c;
 		ST_DWORD(tbl+8, 63);				/* Partition start in LBA */
 		ST_DWORD(tbl+12, n_vol);			/* Partition size in LBA */
-		ST_WORD(tbl+64, 0xAA55);			/* Signature */
-		if (disk_write(drv, fs->win, 0, 1) != RES_OK)
+		ST_WORD(fs->win+BS_55AA, 0xAA55);	/* MBR signature */
+		if (disk_write(drv, fs->win, 0, 1) != RES_OK)	/* Put the MBR into first physical sector */
 			return FR_DISK_ERR;
 		md = 0xF8;
 	}
@@ -3423,7 +3664,7 @@ FRESULT f_mkfs (
 	/* Create volume boot record */
 	tbl = fs->win;							/* Clear sector */
 	mem_set(tbl, 0, SS(fs));
-	mem_cpy(tbl, "\xEB\xFE\x90" "MSDOS5.0", 11);/* Boot code, OEM name */
+	mem_cpy(tbl, "\xEB\xFE\x90" "MSDOS5.0", 11);/* Boot jump code, OEM name */
 	i = SS(fs);								/* Sector size */
 	ST_WORD(tbl+BPB_BytsPerSec, i);
 	tbl[BPB_SecPerClus] = (BYTE)au;			/* Sectors per cluster */
@@ -3458,14 +3699,14 @@ FRESULT f_mkfs (
 		mem_cpy(tbl+BS_VolLab, "NO NAME    " "FAT     ", 19);	/* Volume label, FAT signature */
 	}
 	ST_WORD(tbl+BS_55AA, 0xAA55);			/* Signature (Offset is fixed here regardless of sector size) */
-	if (disk_write(drv, tbl, b_vol, 1) != RES_OK)/* Write original (VBR) */
+	if (disk_write(drv, tbl, b_vol, 1) != RES_OK)	/* Write VBR */
 		return FR_DISK_ERR;
-	if (fmt == FS_FAT32)					/* Write backup (VBR+6) */
+	if (fmt == FS_FAT32)							/* Write backup VBR if needed (VBR+6) */
 		disk_write(drv, tbl, b_vol + 6, 1);
 
 	/* Initialize FAT area */
 	wsect = b_fat;
-	for (i = 0; i < N_FATS; i++) {
+	for (i = 0; i < N_FATS; i++) {		/* Initialize each FAT copy */
 		mem_set(tbl, 0, SS(fs));			/* 1st sector of the FAT  */
 		n = md;								/* Media descriptor byte */
 		if (fmt != FS_FAT32) {
@@ -3480,7 +3721,7 @@ FRESULT f_mkfs (
 		if (disk_write(drv, tbl, wsect++, 1) != RES_OK)
 			return FR_DISK_ERR;
 		mem_set(tbl, 0, SS(fs));			/* Fill following FAT entries with zero */
-		for (n = 1; n < n_fat; n++) {		/* This loop may take a time on FAT32 volume due to many single sector write */
+		for (n = 1; n < n_fat; n++) {		/* This loop may take a time on FAT32 volume due to many single sector writes */
 			if (disk_write(drv, tbl, wsect++, 1) != RES_OK)
 				return FR_DISK_ERR;
 		}
@@ -3497,18 +3738,18 @@ FRESULT f_mkfs (
 	{
 		DWORD eb[2];
 
-		eb[0] = wsect; eb[1] = wsect + n_clst * au - 1;
+		eb[0] = wsect; eb[1] = wsect + (n_clst - ((fmt == FS_FAT32) ? 1 : 0)) * au - 1;
 		disk_ioctl(drv, CTRL_ERASE_SECTOR, eb);
 	}
 #endif
 
 	/* Create FSInfo if needed */
 	if (fmt == FS_FAT32) {
-		ST_WORD(tbl+BS_55AA, 0xAA55);
 		ST_DWORD(tbl+FSI_LeadSig, 0x41615252);
 		ST_DWORD(tbl+FSI_StrucSig, 0x61417272);
-		ST_DWORD(tbl+FSI_Free_Count, n_clst - 1);
-		ST_DWORD(tbl+FSI_Nxt_Free, 0xFFFFFFFF);
+		ST_DWORD(tbl+FSI_Free_Count, n_clst - 1);	/* Number of free clusters */
+		ST_DWORD(tbl+FSI_Nxt_Free, 2);				/* Last allocated cluster# */
+		ST_WORD(tbl+BS_55AA, 0xAA55);
 		disk_write(drv, tbl, b_vol + 1, 1);	/* Write original (VBR+1) */
 		disk_write(drv, tbl, b_vol + 7, 1);	/* Write backup (VBR+7) */
 	}
@@ -3650,9 +3891,9 @@ int f_printf (
 {
 	va_list arp;
 	BYTE f, r;
-	UINT i, w;
-	ULONG val;
-	TCHAR c, d, s[16];
+	UINT i, j, w;
+	ULONG v;
+	TCHAR c, d, s[16], *p;
 	int res, cc;
 
 
@@ -3670,20 +3911,31 @@ int f_printf (
 		c = *str++;
 		if (c == '0') {				/* Flag: '0' padding */
 			f = 1; c = *str++;
+		} else {
+			if (c == '-') {			/* Flag: left justified */
+				f = 2; c = *str++;
+			}
 		}
 		while (IsDigit(c)) {		/* Precision */
 			w = w * 10 + c - '0';
 			c = *str++;
 		}
 		if (c == 'l' || c == 'L') {	/* Prefix: Size is long int */
-			f |= 2; c = *str++;
+			f |= 4; c = *str++;
 		}
 		if (!c) break;
 		d = c;
 		if (IsLower(d)) d -= 0x20;
 		switch (d) {				/* Type is... */
 		case 'S' :					/* String */
-			cc = f_puts(va_arg(arp, TCHAR*), fil); continue;
+			p = va_arg(arp, TCHAR*);
+			for (j = 0; p[j]; j++) ;
+			res = 0;
+			while (!(f & 2) && j++ < w) res += (cc = f_putc(' ', fil));
+			res += (cc = f_puts(p, fil));
+			while (j++ < w) res += (cc = f_putc(' ', fil));
+			if (cc != EOF) cc = res;
+			continue;
 		case 'C' :					/* Character */
 			cc = f_putc((TCHAR)va_arg(arp, int), fil); continue;
 		case 'B' :					/* Binary */
@@ -3695,37 +3947,29 @@ int f_printf (
 			r = 10; break;
 		case 'X' :					/* Hexdecimal */
 			r = 16; break;
-		default:					/* Unknown */
+		default:					/* Unknown type (passthrough) */
 			cc = f_putc(c, fil); continue;
 		}
 
-		/* Get an argument */
-		val = (f & 2) ? va_arg(arp, long) : ((d == 'D') ? (long)va_arg(arp, int) : va_arg(arp, unsigned int));
-		if (d == 'D' && (val & 0x80000000)) {
-			val = 0 - val;
-			f |= 4;
+		/* Get an argument and put it in numeral */
+		v = (f & 4) ? va_arg(arp, long) : ((d == 'D') ? (long)va_arg(arp, int) : va_arg(arp, unsigned int));
+		if (d == 'D' && (v & 0x80000000)) {
+			v = 0 - v;
+			f |= 8;
 		}
-		/* Put it in numeral string */
 		i = 0;
 		do {
-			d = (TCHAR)(val % r); val /= r;
-			if (d > 9) {
-				d += 7;
-				if (c == 'x') d += 0x20;
-			}
+			d = (TCHAR)(v % r); v /= r;
+			if (d > 9) d += (c == 'x') ? 0x27 : 0x07;
 			s[i++] = d + '0';
-		} while (val && i < sizeof(s) / sizeof(s[0]));
-		if (f & 4) s[i++] = '-';
-		cc = 0;
-		while (i < w-- && cc != EOF) {
-			cc = f_putc((TCHAR)((f & 1) ? '0' : ' '), fil);
-			res++;
-		}
-		do {
-			cc = f_putc(s[--i], fil); 
-			res++;
-		} while (i && cc != EOF);
-		if (cc != EOF) cc = 0;
+		} while (v && i < sizeof(s) / sizeof(s[0]));
+		if (f & 8) s[i++] = '-';
+		j = i; d = (f & 1) ? '0' : ' ';
+		res = 0;
+		while (!(f & 2) && j++ < w) res += (cc = f_putc(d, fil));
+		do res += (cc = f_putc(s[--i], fil)); while(i);
+		while (j++ < w) res += (cc = f_putc(' ', fil));
+		if (cc != EOF) cc = res;
 	}
 
 	va_end(arp);
diff --git a/src/ff.h b/src/ff.h
index 5aa8f14..a3aad84 100644
--- a/src/ff.h
+++ b/src/ff.h
@@ -1,11 +1,11 @@
 /*---------------------------------------------------------------------------/
-/  FatFs - FAT file system module include file  R0.08a    (C)ChaN, 2010
+/  FatFs - FAT file system module include file  R0.08b    (C)ChaN, 2011
 /----------------------------------------------------------------------------/
 / FatFs module is a generic FAT file system module for small embedded systems.
 / This is a free software that opened for education, research and commercial
 / developments under license policy of following trems.
 /
-/  Copyright (C) 2010, ChaN, all right reserved.
+/  Copyright (C) 2011, ChaN, all right reserved.
 /
 / * The FatFs module is a free software and there is NO WARRANTY.
 / * No restriction on use. You can use, modify and redistribute it for
@@ -15,7 +15,7 @@
 /----------------------------------------------------------------------------*/
 
 #ifndef _FATFS
-#define _FATFS	8255	/* Revision ID */
+#define _FATFS	8237	/* Revision ID */
 
 #ifdef __cplusplus
 extern "C" {
@@ -29,200 +29,6 @@ extern "C" {
 #endif
 
 
-/* DBCS code ranges and SBCS extend char conversion table */
-
-#if _CODE_PAGE == 932	/* Japanese Shift-JIS */
-#define _DF1S	0x81	/* DBC 1st byte range 1 start */
-#define _DF1E	0x9F	/* DBC 1st byte range 1 end */
-#define _DF2S	0xE0	/* DBC 1st byte range 2 start */
-#define _DF2E	0xFC	/* DBC 1st byte range 2 end */
-#define _DS1S	0x40	/* DBC 2nd byte range 1 start */
-#define _DS1E	0x7E	/* DBC 2nd byte range 1 end */
-#define _DS2S	0x80	/* DBC 2nd byte range 2 start */
-#define _DS2E	0xFC	/* DBC 2nd byte range 2 end */
-
-#elif _CODE_PAGE == 936	/* Simplified Chinese GBK */
-#define _DF1S	0x81
-#define _DF1E	0xFE
-#define _DS1S	0x40
-#define _DS1E	0x7E
-#define _DS2S	0x80
-#define _DS2E	0xFE
-
-#elif _CODE_PAGE == 949	/* Korean */
-#define _DF1S	0x81
-#define _DF1E	0xFE
-#define _DS1S	0x41
-#define _DS1E	0x5A
-#define _DS2S	0x61
-#define _DS2E	0x7A
-#define _DS3S	0x81
-#define _DS3E	0xFE
-
-#elif _CODE_PAGE == 950	/* Traditional Chinese Big5 */
-#define _DF1S	0x81
-#define _DF1E	0xFE
-#define _DS1S	0x40
-#define _DS1E	0x7E
-#define _DS2S	0xA1
-#define _DS2E	0xFE
-
-#elif _CODE_PAGE == 437	/* U.S. (OEM) */
-#define _DF1S	0
-#define _EXCVT {0x80,0x9A,0x90,0x41,0x8E,0x41,0x8F,0x80,0x45,0x45,0x45,0x49,0x49,0x49,0x8E,0x8F,0x90,0x92,0x92,0x4F,0x99,0x4F,0x55,0x55,0x59,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \
-				0x41,0x49,0x4F,0x55,0xA5,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0x21,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
-				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-				0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
-
-#elif _CODE_PAGE == 720	/* Arabic (OEM) */
-#define _DF1S	0
-#define _EXCVT {0x80,0x81,0x45,0x41,0x84,0x41,0x86,0x43,0x45,0x45,0x45,0x49,0x49,0x8D,0x8E,0x8F,0x90,0x92,0x92,0x93,0x94,0x95,0x49,0x49,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \
-				0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
-				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-				0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
-
-#elif _CODE_PAGE == 737	/* Greek (OEM) */
-#define _DF1S	0
-#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x92,0x92,0x93,0x94,0x95,0x96,0x97,0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87, \
-				0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0xAA,0x92,0x93,0x94,0x95,0x96,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
-				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-				0x97,0xEA,0xEB,0xEC,0xE4,0xED,0xEE,0xE7,0xE8,0xF1,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
-
-#elif _CODE_PAGE == 775	/* Baltic (OEM) */
-#define _DF1S	0
-#define _EXCVT {0x80,0x9A,0x91,0xA0,0x8E,0x95,0x8F,0x80,0xAD,0xED,0x8A,0x8A,0xA1,0x8D,0x8E,0x8F,0x90,0x92,0x92,0xE2,0x99,0x95,0x96,0x97,0x97,0x99,0x9A,0x9D,0x9C,0x9D,0x9E,0x9F, \
-				0xA0,0xA1,0xE0,0xA3,0xA3,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
-				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xB5,0xB6,0xB7,0xB8,0xBD,0xBE,0xC6,0xC7,0xA5,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-				0xE0,0xE1,0xE2,0xE3,0xE5,0xE5,0xE6,0xE3,0xE8,0xE8,0xEA,0xEA,0xEE,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
-
-#elif _CODE_PAGE == 850	/* Multilingual Latin 1 (OEM) */
-#define _DF1S	0
-#define _EXCVT {0x80,0x9A,0x90,0xB6,0x8E,0xB7,0x8F,0x80,0xD2,0xD3,0xD4,0xD8,0xD7,0xDE,0x8E,0x8F,0x90,0x92,0x92,0xE2,0x99,0xE3,0xEA,0xEB,0x59,0x99,0x9A,0x9D,0x9C,0x9D,0x9E,0x9F, \
-				0xB5,0xD6,0xE0,0xE9,0xA5,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0x21,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
-				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC7,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-				0xE0,0xE1,0xE2,0xE3,0xE5,0xE5,0xE6,0xE7,0xE7,0xE9,0xEA,0xEB,0xED,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
-
-#elif _CODE_PAGE == 852	/* Latin 2 (OEM) */
-#define _DF1S	0
-#define _EXCVT {0x80,0x9A,0x90,0xB6,0x8E,0xDE,0x8F,0x80,0x9D,0xD3,0x8A,0x8A,0xD7,0x8D,0x8E,0x8F,0x90,0x91,0x91,0xE2,0x99,0x95,0x95,0x97,0x97,0x99,0x9A,0x9B,0x9B,0x9D,0x9E,0x9F, \
-				0xB5,0xD6,0xE0,0xE9,0xA4,0xA4,0xA6,0xA6,0xA8,0xA8,0xAA,0x8D,0xAC,0xB8,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBD,0xBF, \
-				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC6,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD1,0xD1,0xD2,0xD3,0xD2,0xD5,0xD6,0xD7,0xB7,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-				0xE0,0xE1,0xE2,0xE3,0xE3,0xD5,0xE6,0xE6,0xE8,0xE9,0xE8,0xEB,0xED,0xED,0xDD,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xEB,0xFC,0xFC,0xFE,0xFF}
-
-#elif _CODE_PAGE == 855	/* Cyrillic (OEM) */
-#define _DF1S	0
-#define _EXCVT {0x81,0x81,0x83,0x83,0x85,0x85,0x87,0x87,0x89,0x89,0x8B,0x8B,0x8D,0x8D,0x8F,0x8F,0x91,0x91,0x93,0x93,0x95,0x95,0x97,0x97,0x99,0x99,0x9B,0x9B,0x9D,0x9D,0x9F,0x9F, \
-				0xA1,0xA1,0xA3,0xA3,0xA5,0xA5,0xA7,0xA7,0xA9,0xA9,0xAB,0xAB,0xAD,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB6,0xB6,0xB8,0xB8,0xB9,0xBA,0xBB,0xBC,0xBE,0xBE,0xBF, \
-				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC7,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD1,0xD1,0xD3,0xD3,0xD5,0xD5,0xD7,0xD7,0xDD,0xD9,0xDA,0xDB,0xDC,0xDD,0xE0,0xDF, \
-				0xE0,0xE2,0xE2,0xE4,0xE4,0xE6,0xE6,0xE8,0xE8,0xEA,0xEA,0xEC,0xEC,0xEE,0xEE,0xEF,0xF0,0xF2,0xF2,0xF4,0xF4,0xF6,0xF6,0xF8,0xF8,0xFA,0xFA,0xFC,0xFC,0xFD,0xFE,0xFF}
-
-#elif _CODE_PAGE == 857	/* Turkish (OEM) */
-#define _DF1S	0
-#define _EXCVT {0x80,0x9A,0x90,0xB6,0x8E,0xB7,0x8F,0x80,0xD2,0xD3,0xD4,0xD8,0xD7,0x98,0x8E,0x8F,0x90,0x92,0x92,0xE2,0x99,0xE3,0xEA,0xEB,0x98,0x99,0x9A,0x9D,0x9C,0x9D,0x9E,0x9E, \
-				0xB5,0xD6,0xE0,0xE9,0xA5,0xA5,0xA6,0xA6,0xA8,0xA9,0xAA,0xAB,0xAC,0x21,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
-				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC7,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-				0xE0,0xE1,0xE2,0xE3,0xE5,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xDE,0x59,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
-
-#elif _CODE_PAGE == 858	/* Multilingual Latin 1 + Euro (OEM) */
-#define _DF1S	0
-#define _EXCVT {0x80,0x9A,0x90,0xB6,0x8E,0xB7,0x8F,0x80,0xD2,0xD3,0xD4,0xD8,0xD7,0xDE,0x8E,0x8F,0x90,0x92,0x92,0xE2,0x99,0xE3,0xEA,0xEB,0x59,0x99,0x9A,0x9D,0x9C,0x9D,0x9E,0x9F, \
-				0xB5,0xD6,0xE0,0xE9,0xA5,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0x21,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
-				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC7,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD1,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-				0xE0,0xE1,0xE2,0xE3,0xE5,0xE5,0xE6,0xE7,0xE7,0xE9,0xEA,0xEB,0xED,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
-
-#elif _CODE_PAGE == 862	/* Hebrew (OEM) */
-#define _DF1S	0
-#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \
-				0x41,0x49,0x4F,0x55,0xA5,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0x21,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
-				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-				0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
-
-#elif _CODE_PAGE == 866	/* Russian (OEM) */
-#define _DF1S	0
-#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \
-				0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
-				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-				0x90,0x91,0x92,0x93,0x9d,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F,0xF0,0xF0,0xF2,0xF2,0xF4,0xF4,0xF6,0xF6,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
-
-#elif _CODE_PAGE == 874	/* Thai (OEM, Windows) */
-#define _DF1S	0
-#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \
-				0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
-				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-				0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
-
-#elif _CODE_PAGE == 1250 /* Central Europe (Windows) */
-#define _DF1S	0
-#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x8A,0x9B,0x8C,0x8D,0x8E,0x8F, \
-				0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xA3,0xB4,0xB5,0xB6,0xB7,0xB8,0xA5,0xAA,0xBB,0xBC,0xBD,0xBC,0xAF, \
-				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF}
-
-#elif _CODE_PAGE == 1251 /* Cyrillic (Windows) */
-#define _DF1S	0
-#define _EXCVT {0x80,0x81,0x82,0x82,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x80,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x8A,0x9B,0x8C,0x8D,0x8E,0x8F, \
-				0xA0,0xA2,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB2,0xA5,0xB5,0xB6,0xB7,0xA8,0xB9,0xAA,0xBB,0xA3,0xBD,0xBD,0xAF, \
-				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF}
-
-#elif _CODE_PAGE == 1252 /* Latin 1 (Windows) */
-#define _DF1S	0
-#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0xAd,0x9B,0x8C,0x9D,0xAE,0x9F, \
-				0xA0,0x21,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
-				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0x9F}
-
-#elif _CODE_PAGE == 1253 /* Greek (Windows) */
-#define _DF1S	0
-#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \
-				0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
-				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xA2,0xB8,0xB9,0xBA, \
-				0xE0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xF2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xFB,0xBC,0xFD,0xBF,0xFF}
-
-#elif _CODE_PAGE == 1254 /* Turkish (Windows) */
-#define _DF1S	0
-#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x8A,0x9B,0x8C,0x9D,0x9E,0x9F, \
-				0xA0,0x21,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
-				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0x9F}
-
-#elif _CODE_PAGE == 1255 /* Hebrew (Windows) */
-#define _DF1S	0
-#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \
-				0xA0,0x21,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
-				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-				0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
-
-#elif _CODE_PAGE == 1256 /* Arabic (Windows) */
-#define _DF1S	0
-#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x8C,0x9D,0x9E,0x9F, \
-				0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
-				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-				0x41,0xE1,0x41,0xE3,0xE4,0xE5,0xE6,0x43,0x45,0x45,0x45,0x45,0xEC,0xED,0x49,0x49,0xF0,0xF1,0xF2,0xF3,0x4F,0xF5,0xF6,0xF7,0xF8,0x55,0xFA,0x55,0x55,0xFD,0xFE,0xFF}
-
-#elif _CODE_PAGE == 1257 /* Baltic (Windows) */
-#define _DF1S	0
-#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \
-				0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xA8,0xB9,0xAA,0xBB,0xBC,0xBD,0xBE,0xAF, \
-				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF}
-
-#elif _CODE_PAGE == 1258 /* Vietnam (OEM, Windows) */
-#define _DF1S	0
-#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0xAC,0x9D,0x9E,0x9F, \
-				0xA0,0x21,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
-				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
-				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xEC,0xCD,0xCE,0xCF,0xD0,0xD1,0xF2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xFE,0x9F}
-
-#elif _CODE_PAGE == 1	/* ASCII (for only non-LFN cfg) */
-#define _DF1S	0
-
-#else
-#error Unknown code page
-
-#endif
-
-
 
 /* Definitions of volume management */
 
@@ -311,8 +117,8 @@ typedef struct {
 	BYTE	pad1;
 	DWORD	fptr;			/* File read/write pointer (0 on file open) */
 	DWORD	fsize;			/* File size */
-	DWORD	org_clust;		/* File start cluster (0 when fsize==0) */
-	DWORD	curr_clust;		/* Current cluster */
+	DWORD	sclust;			/* File start cluster (0 when fsize==0) */
+	DWORD	clust;			/* Current cluster */
 	DWORD	dsect;			/* Current data sector */
 #if !_FS_READONLY
 	DWORD	dir_sect;		/* Sector containing the directory entry */
@@ -403,8 +209,6 @@ FRESULT f_close (FIL*);								/* Close an open file object */
 FRESULT f_opendir (DIR*, const TCHAR*);				/* Open an existing directory */
 FRESULT f_readdir (DIR*, FILINFO*);					/* Read a directory item */
 FRESULT f_stat (const TCHAR*, FILINFO*);			/* Get file status */
-
-#if !_FS_READONLY
 FRESULT f_write (FIL*, const void*, UINT, UINT*);	/* Write data to a file */
 FRESULT f_getfree (const TCHAR*, DWORD*, FATFS**);	/* Get number of free clusters on the drive */
 FRESULT f_truncate (FIL*);							/* Truncate file */
@@ -414,31 +218,19 @@ FRESULT	f_mkdir (const TCHAR*);						/* Create a new directory */
 FRESULT f_chmod (const TCHAR*, BYTE, BYTE);			/* Change attriburte of the file/dir */
 FRESULT f_utime (const TCHAR*, const FILINFO*);		/* Change timestamp of the file/dir */
 FRESULT f_rename (const TCHAR*, const TCHAR*);		/* Rename/Move a file or directory */
-#endif
-
-#if _USE_FORWARD
 FRESULT f_forward (FIL*, UINT(*)(const BYTE*,UINT), UINT, UINT*);	/* Forward data to the stream */
-#endif
-
-#if _USE_MKFS
 FRESULT f_mkfs (BYTE, BYTE, UINT);					/* Create a file system on the drive */
-#endif
-
-#if _FS_RPATH
 FRESULT f_chdrive (BYTE);							/* Change current drive */
 FRESULT f_chdir (const TCHAR*);						/* Change current directory */
 FRESULT f_getcwd (TCHAR*, UINT);					/* Get current directory */
-#endif
-
-#if _USE_STRFUNC
 int f_putc (TCHAR, FIL*);							/* Put a character to the file */
 int f_puts (const TCHAR*, FIL*);					/* Put a string to the file */
 int f_printf (FIL*, const TCHAR*, ...);				/* Put a formatted string to the file */
 TCHAR* f_gets (TCHAR*, int, FIL*);					/* Get a string from the file */
+
 #ifndef EOF
 #define EOF (-1)
 #endif
-#endif
 
 #define f_eof(fp) (((fp)->fptr == (fp)->fsize) ? 1 : 0)
 #define f_error(fp) (((fp)->flag & FA__ERROR) ? 1 : 0)
@@ -447,6 +239,7 @@ TCHAR* f_gets (TCHAR*, int, FIL*);					/* Get a string from the file */
 
 
 
+
 /*--------------------------------------------------------------*/
 /* Additional user defined functions                            */
 
@@ -468,9 +261,9 @@ void ff_memfree (void*);			/* Free memory block */
 /* Sync functions */
 #if _FS_REENTRANT
 int ff_cre_syncobj (BYTE, _SYNC_t*);/* Create a sync object */
-int ff_del_syncobj (_SYNC_t);		/* Delete a sync object */
 int ff_req_grant (_SYNC_t);			/* Lock sync object */
 void ff_rel_grant (_SYNC_t);		/* Unlock sync object */
+int ff_del_syncobj (_SYNC_t);		/* Delete a sync object */
 #endif
 
 
@@ -519,6 +312,7 @@ void ff_rel_grant (_SYNC_t);		/* Unlock sync object */
 #define CREATE_LINKMAP	0xFFFFFFFF
 
 
+
 /*--------------------------------*/
 /* Multi-byte word access macros  */
 
@@ -528,10 +322,10 @@ void ff_rel_grant (_SYNC_t);		/* Unlock sync object */
 #define	ST_WORD(ptr,val)	*(WORD*)(BYTE*)(ptr)=(WORD)(val)
 #define	ST_DWORD(ptr,val)	*(DWORD*)(BYTE*)(ptr)=(DWORD)(val)
 #else					/* Use byte-by-byte access to the FAT structure */
-#define	LD_WORD(ptr)		(WORD)(((WORD)*(BYTE*)((ptr)+1)<<8)|(WORD)*(BYTE*)(ptr))
-#define	LD_DWORD(ptr)		(DWORD)(((DWORD)*(BYTE*)((ptr)+3)<<24)|((DWORD)*(BYTE*)((ptr)+2)<<16)|((WORD)*(BYTE*)((ptr)+1)<<8)|*(BYTE*)(ptr))
-#define	ST_WORD(ptr,val)	*(BYTE*)(ptr)=(BYTE)(val); *(BYTE*)((ptr)+1)=(BYTE)((WORD)(val)>>8)
-#define	ST_DWORD(ptr,val)	*(BYTE*)(ptr)=(BYTE)(val); *(BYTE*)((ptr)+1)=(BYTE)((WORD)(val)>>8); *(BYTE*)((ptr)+2)=(BYTE)((DWORD)(val)>>16); *(BYTE*)((ptr)+3)=(BYTE)((DWORD)(val)>>24)
+#define	LD_WORD(ptr)		(WORD)(((WORD)*((BYTE*)(ptr)+1)<<8)|(WORD)*(BYTE*)(ptr))
+#define	LD_DWORD(ptr)		(DWORD)(((DWORD)*((BYTE*)(ptr)+3)<<24)|((DWORD)*((BYTE*)(ptr)+2)<<16)|((WORD)*((BYTE*)(ptr)+1)<<8)|*(BYTE*)(ptr))
+#define	ST_WORD(ptr,val)	*(BYTE*)(ptr)=(BYTE)(val); *((BYTE*)(ptr)+1)=(BYTE)((WORD)(val)>>8)
+#define	ST_DWORD(ptr,val)	*(BYTE*)(ptr)=(BYTE)(val); *((BYTE*)(ptr)+1)=(BYTE)((WORD)(val)>>8); *((BYTE*)(ptr)+2)=(BYTE)((DWORD)(val)>>16); *((BYTE*)(ptr)+3)=(BYTE)((DWORD)(val)>>24)
 #endif
 
 #ifdef __cplusplus
diff --git a/src/ffconf.h b/src/ffconf.h
index 76a659d..9ace5a0 100644
--- a/src/ffconf.h
+++ b/src/ffconf.h
@@ -1,5 +1,5 @@
 /*---------------------------------------------------------------------------/
-/  FatFs - FAT file system module configuration file  R0.08a (C)ChaN, 2010
+/  FatFs - FAT file system module configuration file  R0.08b (C)ChaN, 2011
 /----------------------------------------------------------------------------/
 /
 / CAUTION! Do not forget to make clean the project after any changes to
@@ -7,14 +7,14 @@
 /
 /----------------------------------------------------------------------------*/
 #ifndef _FFCONF
-#define _FFCONF 8255	/* Revision ID */
+#define _FFCONF 8237	/* Revision ID */
 
 
 /*---------------------------------------------------------------------------/
 / Function and Buffer Configurations
 /----------------------------------------------------------------------------*/
 
-#define	_FS_TINY	0		/* 0:Normal or 1:Tiny */
+#define	_FS_TINY		0	/* 0:Normal or 1:Tiny */
 /* When _FS_TINY is set to 1, FatFs uses the sector buffer in the file system
 /  object instead of the sector buffer in the individual file object for file
 /  data transfer. This reduces memory consumption 512 bytes each file object. */
@@ -40,7 +40,7 @@
 /* To enable string functions, set _USE_STRFUNC to 1 or 2. */
 
 
-#define	_USE_MKFS	0		/* 0:Disable or 1:Enable */
+#define	_USE_MKFS		0	/* 0:Disable or 1:Enable */
 /* To enable f_mkfs function, set _USE_MKFS to 1 and set _FS_READONLY to 0 */
 
 
@@ -110,7 +110,7 @@
 /  enable LFN feature and set _LFN_UNICODE to 1. */
 
 
-#define _FS_RPATH	0		/* 0 to 2 */
+#define _FS_RPATH		0	/* 0 to 2 */
 /* The _FS_RPATH option configures relative path feature.
 /
 /   0: Disable relative path feature and remove related functions.
@@ -132,9 +132,9 @@
 #define	_MAX_SS		512		/* 512, 1024, 2048 or 4096 */
 /* Maximum sector size to be handled.
 /  Always set 512 for memory card and hard disk but a larger value may be
-/  required for floppy disk (512/1024) and optical disk (512/2048).
-/  When _MAX_SS is larger than 512, GET_SECTOR_SIZE command must be implememted
-/  to the disk_ioctl function. */
+/  required for on-board flash memory, floppy disk and optical disk.
+/  When _MAX_SS is larger than 512, it configures FatFs to variable sector size
+/  and GET_SECTOR_SIZE command must be implememted to the disk_ioctl function. */
 
 
 #define	_MULTI_PARTITION	0	/* 0:Single partition or 1:Multiple partition */
@@ -144,7 +144,8 @@
 
 
 #define	_USE_ERASE	0	/* 0:Disable or 1:Enable */
-/* To enable sector erase feature, set _USE_ERASE to 1. */
+/* To enable sector erase feature, set _USE_ERASE to 1. CTRL_ERASE_SECTOR command
+/  should be added to the disk_ioctl functio. */
 
 
 
@@ -165,14 +166,14 @@
 /  performance and code size. */
 
 
-/* Include a header file here to define sync object types on the O/S */
-/* #include <windows.h>, <ucos_ii.h>, <semphr.h> or ohters. */
+/* A header file that defines sync object types on the O/S, such as
+/  windows.h, ucos_ii.h and semphr.h, must be included prior to ff.h. */
 
 #define _FS_REENTRANT	0		/* 0:Disable or 1:Enable */
 #define _FS_TIMEOUT		1000	/* Timeout period in unit of time ticks */
 #define	_SYNC_t			HANDLE	/* O/S dependent type of sync object. e.g. HANDLE, OS_EVENT*, ID and etc.. */
 
-/* The _FS_REENTRANT option switches the reentrancy of the FatFs module.
+/* The _FS_REENTRANT option switches the reentrancy (thread safe) of the FatFs module.
 /
 /   0: Disable reentrancy. _SYNC_t and _FS_TIMEOUT have no effect.
 /   1: Enable reentrancy. Also user provided synchronization handlers,
diff --git a/src/option/syscall.c b/src/option/syscall.c
index 7142948..e5bb0e0 100644
--- a/src/option/syscall.c
+++ b/src/option/syscall.c
@@ -1,6 +1,6 @@
 /*------------------------------------------------------------------------*/
-/* Sample code of OS dependent controls for FatFs R0.08                   */
-/* (C)ChaN, 2010                                                          */
+/* Sample code of OS dependent controls for FatFs R0.08b                  */
+/* (C)ChaN, 2011                                                          */
 /*------------------------------------------------------------------------*/
 
 #include <stdlib.h>		/* ANSI memory controls */
@@ -14,28 +14,28 @@
 /* Create a Synchronization Object
 /*------------------------------------------------------------------------*/
 /* This function is called in f_mount function to create a new
-/  synchronization object, such as semaphore and mutex. When a FALSE is
+/  synchronization object, such as semaphore and mutex. When a zero is
 /  returned, the f_mount function fails with FR_INT_ERR.
 */
 
-BOOL ff_cre_syncobj (	/* TRUE:Function succeeded, FALSE:Could not create due to any error */
+int ff_cre_syncobj (	/* TRUE:Function succeeded, FALSE:Could not create due to any error */
 	BYTE vol,			/* Corresponding logical drive being processed */
 	_SYNC_t *sobj		/* Pointer to return the created sync object */
 )
 {
-	BOOL ret;
+	int ret;
 
-	*sobj = CreateMutex(NULL, FALSE, NULL);					/* Win32 */
-	ret = (*sobj != INVALID_HANDLE_VALUE) ? TRUE : FALSE;
+	*sobj = CreateMutex(NULL, FALSE, NULL);	/* Win32 */
+	ret = (*sobj != INVALID_HANDLE_VALUE);
 
-//	*sobj = SyncObjects[vol];	/* uITRON (give a static created sync object) */
-//	ret = TRUE;					/* The initial value of the semaphore must be 1. */
+//	*sobj = SyncObjects[vol];	/* uITRON (give a static sync object) */
+//	ret = 1;					/* The initial value of the semaphore must be 1. */
 
-//	*sobj = OSMutexCreate(0, &err);				/* uC/OS-II */
-//	ret = (err == OS_NO_ERR) ? TRUE : FALSE;
+//	*sobj = OSMutexCreate(0, &err);			/* uC/OS-II */
+//	ret = (err == OS_NO_ERR);
 
-//	*sobj = xSemaphoreCreateMutex();			/* FreeRTOS */
-//	ret = (*sobj != NULL) ? TRUE : FALSE;
+//	*sobj = xSemaphoreCreateMutex();		/* FreeRTOS */
+//	ret = (*sobj != NULL);
 
 	return ret;
 }
@@ -46,24 +46,24 @@ BOOL ff_cre_syncobj (	/* TRUE:Function succeeded, FALSE:Could not create due to
 /* Delete a Synchronization Object                                        */
 /*------------------------------------------------------------------------*/
 /* This function is called in f_mount function to delete a synchronization
-/  object that created with ff_cre_syncobj function. When a FALSE is
+/  object that created with ff_cre_syncobj function. When a zero is
 /  returned, the f_mount function fails with FR_INT_ERR.
 */
 
-BOOL ff_del_syncobj (	/* TRUE:Function succeeded, FALSE:Could not delete due to any error */
+int ff_del_syncobj (	/* TRUE:Function succeeded, FALSE:Could not delete due to any error */
 	_SYNC_t sobj		/* Sync object tied to the logical drive to be deleted */
 )
 {
 	BOOL ret;
 
-	ret = CloseHandle(sobj);	/* Win32 *
+	ret = CloseHandle(sobj);	/* Win32 */
 
-//	ret = TRUE;					/* uITRON (nothing to do) *
+//	ret = 1;					/* uITRON (nothing to do) */
 
-//	OSMutexDel(sobj, OS_DEL_ALWAYS, &err);		/* uC/OS-II */
-//	ret = (err == OS_NO_ERR) ? TRUE : FALSE;
+//	OSMutexDel(sobj, OS_DEL_ALWAYS, &err);	/* uC/OS-II */
+//	ret = (err == OS_NO_ERR);
 
-//	ret = TRUE;					/* FreeRTOS (nothing to do) */
+//	ret = 1;					/* FreeRTOS (nothing to do) */
 
 	return ret;
 }
@@ -74,23 +74,23 @@ BOOL ff_del_syncobj (	/* TRUE:Function succeeded, FALSE:Could not delete due to
 /* Request Grant to Access the Volume                                     */
 /*------------------------------------------------------------------------*/
 /* This function is called on entering file functions to lock the volume.
-/  When a FALSE is returned, the file function fails with FR_TIMEOUT.
+/  When a zero is returned, the file function fails with FR_TIMEOUT.
 */
 
-BOOL ff_req_grant (	/* TRUE:Got a grant to access the volume, FALSE:Could not get a grant */
+int ff_req_grant (	/* TRUE:Got a grant to access the volume, FALSE:Could not get a grant */
 	_SYNC_t sobj	/* Sync object to wait */
 )
 {
-	BOOL ret;
+	int ret;
 
-	ret = (WaitForSingleObject(sobj, _FS_TIMEOUT) == WAIT_OBJECT_0) ? TRUE : FALSE;	/* Win32 */
+	ret = (WaitForSingleObject(sobj, _FS_TIMEOUT) == WAIT_OBJECT_0);	/* Win32 */
 
-//	ret = (wai_sem(sobj) == E_OK) ? TRUE : FALSE;	/* uITRON */
+//	ret = (wai_sem(sobj) == E_OK);	/* uITRON */
 
 //	OSMutexPend(sobj, _FS_TIMEOUT, &err));			/* uC/OS-II */
-//	ret = (err == OS_NO_ERR) ? TRUE : FALSE;
+//	ret = (err == OS_NO_ERR);
 
-//	ret = (xSemaphoreTake(sobj, _FS_TIMEOUT) == pdTRUE) ? TRUE : FALSE;	/* FreeRTOS */
+//	ret = (xSemaphoreTake(sobj, _FS_TIMEOUT) == pdTRUE);	/* FreeRTOS */
 
 	return ret;
 }