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="‘g‚Ýž‚ÝƒVƒXƒeƒ€Œü‚¯FATƒtƒ@ƒCƒ‹EƒVƒXƒeƒ€">
+<link rel="start" title="Site Top" href="../../index_j.html">
+<link rel="up" title="Freewares" href="../../fsw.html">
 <link rel="alternate" hreflang="en" title="‰p•¶" href="00index_e.html">
 <link rel="stylesheet" href="css_j.css" type="text/css" media="screen" title="ELM Default">
 <title>ELM - FatFs ”Ä—pFATƒtƒ@ƒCƒ‹ƒVƒXƒeƒ€Eƒ‚ƒWƒ…[ƒ‹</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> - Œ»Ý‚ÌƒŠ[ƒh/ƒ‰ƒCƒgEƒ|ƒCƒ“ƒ^‚ÌŽæ“¾</li>
+<li><a href="ja/eof.html">f_eof</a> - ƒtƒ@ƒCƒ‹I’[‚Ì—L–³‚ÌŽæ“¾</li>
+<li><a href="ja/size.html">f_size</a> - ƒtƒ@ƒCƒ‹EƒTƒCƒY‚ÌŽæ“¾</li>
+<li><a href="ja/error.html">f_error</a> - ƒtƒ@ƒCƒ‹‚ÌƒGƒ‰[‚Ì—L–³‚ÌŽæ“¾</li>
 </ul>
 </div>
 
@@ -89,7 +95,6 @@
 <ul>
 <li><a href="http://elm-chan.org/fsw/ff/bd/"><em>FatFsƒ†[ƒUEƒtƒH[ƒ‰ƒ€</em></a></li>
 <li>Å‰‚É“Ç‚ß: <a href="ja/appnote.html">FatFsƒ‚ƒWƒ…[ƒ‹EƒAƒvƒŠƒP[ƒVƒ‡ƒ“Eƒm[ƒg</a></li>
-<li>ƒ_ƒEƒ“ƒ[ƒh: <a href="ffsample.zip">ƒTƒ“ƒvƒ‹EƒvƒƒWƒFƒNƒg</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ƒtƒ@ƒCƒ‹EƒVƒXƒeƒ€Žd—l‘ by Microsoft</a> (FAT‚Ì—‰ðEŽÀ‘•‚É•K—v‚È—Bˆê‚ÌƒŠƒtƒ@ƒŒƒ“ƒX)</li>
 <li><a href="http://elm-chan.org/docs/fat.html">FATƒtƒ@ƒCƒ‹EƒVƒXƒeƒ€ŠT—v</a> (ª‚ð“Ç‚Þ‚½‚ß‚ÌƒKƒCƒh)</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: "‚l‚r ‚oƒSƒVƒbƒN",sans-serif;}
 div.para {clear: both; font-family: "‚l‚r ‚o–¾’©",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: "‚l‚r ‚oƒSƒVƒbƒN",sans-serif; margin: 0 0 0.5em;}
+h2 {font-size: 1.6em; font-family: "‚l‚r ‚oƒSƒVƒbƒN",sans-serif; background-color: #d8d8FF; padding: 0.2em 0.5em; margin: 0 0 0.5em;}
 h3 {font-size: 1.5em; font-family: "‚l‚r ‚oƒSƒVƒbƒN",sans-serif; margin: 1.5em 0 0.5em;}
 h4 {font-size: 1.2em; font-family: "‚l‚r ‚oƒSƒVƒbƒN",sans-serif; margin: 1em 0 0.2em;}
 h5 {font-size: 1em; font-family: "‚l‚r ‚oƒSƒVƒbƒN",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 0000000..a7b0d71
Binary files /dev/null and b/doc/img/f6.png differ
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)æº–æ‹ ã§è¨˜è¿°ã•ã‚Œã¦ã„ã‚‹ã®ã§ã€ANSI 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>ãã®ä»–webä¸Šã«å¤šæ•°</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>ãã®ä»–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;= 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)æº–æ‹ ã§è¨˜è¿°ã•ã‚Œã¦ã„ã‚‹ã®ã§ã€ANSI 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ã¤ã®ç•°ãªã‚‹åå‰(çŸ­ã„ãƒ•ã‚¡ãƒ«åã¨é•·ã„ãƒ•ã‚¡ã‚¤ãƒ«å)ã¯ã€f_readdiré–¢æ•°ã‚’é™¤ããƒ•ã‚¡ã‚¤ãƒ«æ“ä½œé–¢æ•°ã«ãŠã„ã¦é€éŽã§ã™ã€‚LFNæ©Ÿèƒ½ã‚’æœ‰åŠ¹ã«ã™ã‚‹ã«ã¯ã€<tt>_USE_LFN</tt>ã‚’1,2ã¾ãŸã¯3ã«è¨­å®šã—ã€Unicodeå¤‰æ›é–¢æ•°<tt>ff_convert(), ff_wtoupper()</tt>ã‚’ãƒ—ãƒ­ã‚¸ã‚§ã‚¯ãƒˆã«è¿½åŠ ã—ã¾ã™ã€‚ã“ã‚Œã‚‰ã®é–¢æ•°ã¯ã€<tt>option/cc*.c</tt>ã«å«ã¾ã‚Œã¦ã„ã¾ã™ã€‚LFNæ©Ÿèƒ½ã¯ã€åŠ ãˆã¦ã‚ã‚‹ç¨‹åº¦ã®ãƒ¯ãƒ¼ã‚¯ãƒ»ã‚¨ãƒªã‚¢(LFNæ“ä½œãƒãƒƒãƒ•ã‚¡)ã‚’å¿…è¦ã¨ã—ã¾ã™ã€‚ãƒãƒƒãƒ•ã‚¡é•·ã¯ä½¿ç”¨ã§ãã‚‹ãƒ¡ãƒ¢ãƒªã«å¿œã˜ã¦<tt>_MAX_LFN</tt>ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã§æ§‹æˆã•ã‚Œã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚LFNã®é•·ã•ã¯æœ€å¤§255æ–‡å­—ã«é”ã™ã‚‹ã®ã§ã€LFNå®Œå…¨å¯¾å¿œã®ãŸã‚ã«ã¯<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ã‚’æœ‰åŠ¹ã«ã™ã‚‹ã¨ã€é¸æŠžã•ã‚ŒãŸã‚³ãƒ¼ãƒ‰ãƒ»ãƒšãƒ¼ã‚¸ã«å¿œã˜ã¦ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ãƒ»ã‚µã‚¤ã‚ºãŒå¢—å¤§ã•ã‚Œã¾ã™ã€‚å³ã®è¡¨ã«å„ã‚³ãƒ¼ãƒ‰ãƒ»ãƒšãƒ¼ã‚¸ã«ãŠã‘ã‚‹LFNã‚’æœ‰åŠ¹ã«ã—ãŸã¨ãã®ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ãƒ»ã‚µã‚¤ã‚ºã®é•ã„ã‚’ç¤ºã—ã¾ã™ã€‚ç§ãŸã¡æ—¥æœ¬äººã€ä¸­å›½äººãŠã‚ˆã³éŸ“å›½äººã¯æ•°ä¸‡ã®æ–‡å­—ã‚’æŒã¡ã¾ã™ã€‚ä¸å¹¸ãªã“ã¨ã«ã€ãã‚Œã¯å·¨å¤§ãªOEMï¼Unicodeç›¸äº’å¤‰æ›ãƒ†ãƒ¼ãƒ–ãƒ«ã‚’è¦æ±‚ã—ã€ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ãƒ»ã‚µã‚¤ã‚ºã¯åŠ‡çš„ã«å¢—å¤§ã•ã‚Œã¾ã™ã€‚ãã®çµæžœã€LFNã‚’æœ‰åŠ¹ã«ã—ãŸFatFsãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ã¯ã€AVRã‚’å«ã‚€æ®†ã©ã®8ãƒ“ãƒƒãƒˆãƒ»ãƒžã‚¤ã‚³ãƒ³ã«ã‚¤ãƒ³ãƒ—ãƒªãƒ¡ãƒ³ãƒˆã•ã‚Œã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ã€‚<small>ã“ã‚Œã¯é•·ã„é–“ç§ãŒLFNã‚’ã‚¤ãƒ³ãƒ—ãƒªãƒ¡ãƒ³ãƒˆã™ã‚‹ã“ã¨ã«èˆˆå‘³ã‚’æŒã£ã¦ã“ãªã‹ã£ãŸç†ç”±ã§ã™ã€‚</small></p>
-<p>æ³¨: ãƒžã‚¤ã‚¯ãƒ­ã‚½ãƒ•ãƒˆç¤¾ã¯FATãƒ•ã‚¡ã‚¤ãƒ«ãƒ»ã‚·ã‚¹ãƒ†ãƒ ã«ã¤ã„ã¦ã„ãã¤ã‹ã®ç‰¹è¨±ã‚’ä¿æœ‰ã—ã¦ã„ã¾ã™ã€‚ã„ãšã‚Œã‚‚LFNã®å®Ÿè£…ã«é–¢ã™ã‚‹ã‚‚ã®ã§ã€LFNæ©Ÿèƒ½ã«å¯¾ã—ã¦$0.25/unitã®ãƒ©ã‚¤ã‚»ãƒ³ã‚¹æ–™ã‚’è¦æ±‚ã—ã¦ã„ã¾ã™ã€‚ã“ã®ãŸã‚ã€å•†ç”¨è£½å“ã§LFNæ©Ÿèƒ½æœ‰åŠ¹ã«ã™ã‚‹ã¨ãã¯ã€æœ€çµ‚ä»•å‘åœ°ã«ã‚ˆã£ã¦ã¯ãƒ©ã‚¤ã‚»ãƒ³ã‚¹ãŒå¿…è¦ã‹ã‚‚çŸ¥ã‚Œã¾ã›ã‚“ã€‚</p>
+<p>æ³¨: ãƒžã‚¤ã‚¯ãƒ­ã‚½ãƒ•ãƒˆç¤¾ã¯FATãƒ•ã‚¡ã‚¤ãƒ«ãƒ»ã‚·ã‚¹ãƒ†ãƒ ã«ã¤ã„ã¦ã„ãã¤ã‹ã®ç‰¹è¨±ã‚’ä¿æœ‰ã—ã¦ã„ã¾ã™ã€‚ã„ãšã‚Œã‚‚LFNã®å®Ÿè£…ã«é–¢ã™ã‚‹ã‚‚ã®ã§ã€LFNæ©Ÿèƒ½ã«å¯¾ã—ã¦$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>ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã§ãƒªã‚¨ãƒ³ãƒˆãƒ©ãƒ³ãƒˆ(ã‚¹ãƒ¬ãƒƒãƒ‰ãƒ»ã‚»ãƒ¼ãƒ•)ã«ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã™ã€‚ã“ã®å ´åˆã€OSä¾å­˜ã®åŒæœŸã‚ªãƒ–ã‚¸ã‚§ã‚¯ãƒˆæ“ä½œé–¢æ•°<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>ƒJƒŒƒ“ƒgEƒfƒBƒŒƒNƒgƒŠ‚ð•ÏX‚µ‚Ü‚·B</p>
 <pre>
 FRESULT f_chdir (
-  const XCHAR* <em>Path</em> <span>/* ƒfƒBƒŒƒNƒgƒŠ–¼‚Ö‚Ìƒ|ƒCƒ“ƒ^ */</span>
+  const XCHAR* <em>Path</em> <span class="c">/* ƒfƒBƒŒƒNƒgƒŠ–¼‚Ö‚Ìƒ|ƒ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>–ß‚è’l</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>³íI—¹B</dd>
-<dt>FR_NO_FILE</dt>
-<dd>ƒtƒ@ƒCƒ‹‚ªŒ©‚Â‚©‚ç‚È‚¢B</dd>
-<dt>FR_NO_PATH</dt>
-<dd>ƒpƒX‚ªŒ©‚Â‚©‚ç‚È‚¢B</dd>
-<dt>FR_INVALID_NAME</dt>
-<dd>ƒpƒX–¼‚ª•s³B</dd>
-<dt>FR_INVALID_DRIVE</dt>
-<dd>ƒhƒ‰ƒCƒu”Ô†‚ª•s³B</dd>
-<dt>FR_NOT_READY</dt>
-<dd>ƒƒfƒBƒA‚ªƒZƒbƒg‚³‚ê‚Ä‚¢‚È‚¢‚È‚ÇA•¨—ƒhƒ‰ƒCƒu‚ª“®ì•s”\ó‘ÔB</dd>
-<dt>FR_WRITE_PROTECTED</dt>
-<dd>ƒƒfƒBƒA‚ª‘‚«ž‚Ý‹ÖŽ~ó‘ÔB</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>ƒfƒBƒXƒNEƒGƒ‰[‚É‚æ‚éŽ¸”sB</dd>
-<dt>FR_INT_ERR</dt>
-<dd>•s³‚ÈFAT\‘¢‚Ü‚½‚Í“à•”ƒGƒ‰[‚É‚æ‚éŽ¸”sB</dd>
-<dt>FR_NOT_ENABLED</dt>
-<dd>‚»‚Ì˜_—ƒhƒ‰ƒCƒu‚Éƒ[ƒNEƒGƒŠƒA‚ª—^‚¦‚ç‚ê‚Ä‚¢‚È‚¢B</dd>
-<dt>FR_NO_FILESYSTEM</dt>
-<dd>—LŒø‚ÈFATƒ{ƒŠƒ…[ƒ€‚ªŒ©‚Â‚©‚ç‚È‚¢B</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ŠÖ”‚ÍŠeƒ{ƒŠƒ…[ƒ€‚ÌƒJƒŒƒ“ƒgEƒfƒBƒŒƒNƒgƒŠ‚ð•ÏX‚µ‚Ü‚·BƒJƒŒƒ“ƒgEƒfƒBƒŒƒNƒgƒŠ‚Íƒtƒ@ƒCƒ‹EƒVƒXƒeƒ€EƒIƒuƒWƒFƒNƒg‚Ì‰Šú‰»‚ªs‚í‚ê‚½‚Æ‚«Aƒ‹[ƒgEƒfƒBƒŒƒNƒgƒŠ‚ÉÝ’è‚³‚ê‚Ü‚·BƒJƒŒƒ“ƒgEƒfƒBƒŒƒNƒgƒŠ‚ÍAƒtƒ@ƒCƒ‹EƒVƒXƒeƒ€EƒIƒuƒWƒFƒNƒg‚É‹L˜^‚³‚ê‚é‚½‚ßA‚»‚Ìƒ{ƒŠƒ…[ƒ€‚ðŽg—p‚·‚é‘S‚Ä‚Ìƒ^ƒXƒN‚É‘Î‚µ‚Ä‰e‹¿‚ð—^‚¦‚Ü‚·B</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>‘Î‰žî•ñ</h4>
 <p><tt>_FS_RPATH == 1</tt>‚Ì‚Æ‚«‚ÉŽg—p‰Â”\‚Æ‚È‚è‚Ü‚·B</p>
 </div>
 
 
-<div class="para">
+<div class="para exa">
 <h4>Žg—p—á</h4>
 <pre>
     // ƒJƒŒƒ“ƒgEƒhƒ‰ƒCƒu‚ÌƒJƒŒƒ“ƒgEƒfƒBƒŒƒNƒgƒŠ‚ð•ÏX (ƒ‹[ƒg‰º‚Ìdir1‚Ö)
@@ -82,7 +71,7 @@ FRESULT f_chdir (
 </pre>
 </div>
 
-<div class="para">
+<div class="para ref">
 <h4>ŽQÆ</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>ƒJƒŒƒ“ƒgEƒhƒ‰ƒCƒu‚ð•ÏX‚µ‚Ü‚·B</p>
 <pre>
 FRESULT f_chdrive (
-  BYTE <em>Drive</em> <span>/* ˜_—ƒhƒ‰ƒCƒu”Ô† */</span>
+  BYTE <em>Drive</em> <span class="c">/* ˜_—ƒhƒ‰ƒCƒu”Ô† */</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>–ß‚è’l</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>³íI—¹B</dd>
-<dt>FR_INVALID_DRIVE</dt>
-<dd>ƒhƒ‰ƒCƒu”Ô†‚ª•s³B</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ŠÖ”‚ÍƒJƒŒƒ“ƒgEƒhƒ‰ƒCƒu‚ð•ÏX‚µ‚Ü‚·BƒVƒXƒeƒ€‹N“®Žž‚Ì‰Šú’l‚Í0‚Å‚·B‚±‚ÌÝ’è‚ÍFatFsƒ‚ƒWƒ…[ƒ‹‚ÌÃ“I•Ï”‚É‹L˜^‚³‚ê‚é‚½‚ßA‘S‚Ä‚Ìƒ^ƒXƒN‚É‘Î‚µ‚Ä‰e‹¿‚ð—^‚¦‚Ü‚·B</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>‘Î‰žî•ñ</h4>
 <p><tt>_FS_RPATH == 1</tt>‚Ì‚Æ‚«‚ÉŽg—p‰Â”\‚Æ‚È‚è‚Ü‚·B</p>
 </div>
 
 
-<div class="para">
+<div class="para ref">
 <h4>ŽQÆ</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>ƒtƒ@ƒCƒ‹‚Ü‚½‚ÍƒfƒBƒŒƒNƒgƒŠ‚Ì‘®«‚ð•ÏX‚µ‚Ü‚·B</p>
 <pre>
 FRESULT f_chmod (
-  const TCHAR* <em>FileName</em>, <span>/* ƒtƒ@ƒCƒ‹‚Ü‚½‚ÍƒfƒBƒŒƒNƒgƒŠ–¼‚Ö‚Ìƒ|ƒCƒ“ƒ^ */</span>
-  BYTE <em>Attribute</em>,        <span>/* Ý’è’l */</span>
-  BYTE <em>AttributeMask</em>     <span>/* •ÏXƒ}ƒXƒN */</span>
+  const TCHAR* <em>FileName</em>, <span class="c">/* ƒtƒ@ƒCƒ‹‚Ü‚½‚ÍƒfƒBƒŒƒNƒgƒŠ–¼‚Ö‚Ìƒ|ƒCƒ“ƒ^ */</span>
+  BYTE <em>Attribute</em>,        <span class="c">/* Ý’è’l */</span>
+  BYTE <em>AttributeMask</em>     <span class="c">/* •ÏXƒ}ƒXƒN */</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>–ß‚è’l</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>³íI—¹B</dd>
-<dt>FR_NO_FILE</dt>
-<dd>ƒtƒ@ƒCƒ‹‚ªŒ©‚Â‚©‚ç‚È‚¢B</dd>
-<dt>FR_NO_PATH</dt>
-<dd>ƒpƒX‚ªŒ©‚Â‚©‚ç‚È‚¢B</dd>
-<dt>FR_INVALID_NAME</dt>
-<dd>ƒpƒX–¼‚ª•s³B</dd>
-<dt>FR_INVALID_DRIVE</dt>
-<dd>ƒhƒ‰ƒCƒu”Ô†‚ª•s³B</dd>
-<dt>FR_NOT_READY</dt>
-<dd>ƒƒfƒBƒA‚ªƒZƒbƒg‚³‚ê‚Ä‚¢‚È‚¢‚È‚ÇA•¨—ƒhƒ‰ƒCƒu‚ª“®ì•s”\ó‘ÔB</dd>
-<dt>FR_WRITE_PROTECTED</dt>
-<dd>ƒƒfƒBƒA‚ª‘‚«ž‚Ý‹ÖŽ~ó‘ÔB</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>ƒfƒBƒXƒNEƒGƒ‰[‚É‚æ‚éŽ¸”sB</dd>
-<dt>FR_INT_ERR</dt>
-<dd>•s³‚ÈFAT\‘¢‚Ü‚½‚Í“à•”ƒGƒ‰[‚É‚æ‚éŽ¸”sB</dd>
-<dt>FR_NOT_ENABLED</dt>
-<dd>‚»‚Ì˜_—ƒhƒ‰ƒCƒu‚Éƒ[ƒNEƒGƒŠƒA‚ª—^‚¦‚ç‚ê‚Ä‚¢‚È‚¢B</dd>
-<dt>FR_NO_FILESYSTEM</dt>
-<dd>—LŒø‚ÈFATƒ{ƒŠƒ…[ƒ€‚ªŒ©‚Â‚©‚ç‚È‚¢B</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>ƒtƒ@ƒCƒ‹‚Ü‚½‚ÍƒfƒBƒŒƒNƒgƒŠ‚Ì‘®«‚ð•ÏX‚µ‚Ü‚·B</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>‘Î‰žî•ñ</h4>
 <p><tt>_FS_READONLY == 0</tt>‚ÅAŠŽ‚Â<tt>_FS_MINIMIZE == 0</tt>‚Ì‚Æ‚«Žg—p‰Â”\‚Å‚·B</p>
 </div>
 
 
-<div class="para">
+<div class="para use">
 <h4>Žg—p—á</h4>
 <pre>
-    <span>/* ƒŠ[ƒhƒIƒ“ƒŠ[‚ðƒZƒbƒgAƒA[ƒJƒCƒu‚ðƒNƒŠƒAA‚»‚Ì‘¼‚Í•ÏX‚µ‚È‚¢ */</span>
+    <span class="c">/* ƒŠ[ƒhƒIƒ“ƒŠ[‚ðƒZƒbƒgAƒA[ƒJƒCƒu‚ðƒNƒŠƒAA‚»‚Ì‘¼‚Í•ÏX‚µ‚È‚¢ */</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>ƒtƒ@ƒCƒ‹‚ð•Â‚¶‚Ü‚·B</p>
 <pre>
 FRESULT f_close (
-  FIL* <em>FileObject</em>     <span>/* ƒtƒ@ƒCƒ‹EƒIƒuƒWƒFƒNƒg‚Ö‚Ìƒ|ƒCƒ“ƒ^ */</span>
+  FIL* <em>FileObject</em>     <span class="c">/* ƒtƒ@ƒCƒ‹EƒIƒuƒWƒFƒNƒg‚Ö‚Ìƒ|ƒ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>–ß‚è’l</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>³íI—¹B</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>ƒfƒBƒXƒNEƒGƒ‰[‚É‚æ‚éŽ¸”sB</dd>
-<dt>FR_INT_ERR</dt>
-<dd>•s³‚ÈFAT\‘¢‚Ü‚½‚Í“à•”ƒGƒ‰[‚É‚æ‚éŽ¸”sB</dd>
-<dt>FR_NOT_READY</dt>
-<dd>ƒƒfƒBƒA‚ªƒZƒbƒg‚³‚ê‚Ä‚¢‚È‚¢‚È‚ÇA•¨—ƒhƒ‰ƒCƒu‚ª“®ì•s”\ó‘ÔB</dd>
-<dt>FR_INVALID_OBJECT</dt>
-<dd>–³Œø‚Èƒtƒ@ƒCƒ‹EƒIƒuƒWƒFƒNƒgB</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>ƒtƒ@ƒCƒ‹‚ð•Â‚¶‚Ü‚·B‰½‚ç‚©‚Ì‘‚«ž‚Ý‚Ìs‚í‚ê‚½ƒtƒ@ƒCƒ‹‚Ìê‡AƒLƒƒƒbƒVƒ…‚³‚ê‚½ó‘Ô(ƒŠ[ƒh/ƒ‰ƒCƒgEƒoƒbƒtƒ@ã‚Ìƒf[ƒ^A•ÏX‚³‚ê‚½FAT‚âƒfƒBƒŒƒNƒgƒŠ€–Ú)‚ÍƒfƒBƒXƒN‚É‘‚«–ß‚³‚ê‚Ü‚·BŠÖ”‚ª³íI—¹‚·‚é‚ÆA‚»‚Ìƒtƒ@ƒCƒ‹EƒIƒuƒWƒFƒNƒg‚Í–³Œø‚É‚È‚èA‚»‚Ìƒƒ‚ƒŠ‚à‰ð•ú‚Å‚«‚Ü‚·B</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>‘Î‰žî•ñ</h4>
 <p>‘S‚Ä‚Ì\¬‚ÅŽg—p‰Â”\‚Å‚·B</p>
 </div>
 
 
-<div class="para">
+<div class="para ref">
 <h4>ŽQÆ</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>ƒfƒBƒXƒNEƒhƒ‰ƒCƒu‚ð‰Šú‰»‚µ‚Ü‚·B</p>
 <pre>
 DSTATUS disk_initialize (
-  BYTE <em>Drive</em>      <span>/* •¨—ƒhƒ‰ƒCƒu”Ô† */</span>
+  BYTE <em>Drive</em>      <span class="c">/* •¨—ƒhƒ‰ƒCƒu”Ô† */</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>–ß‚è’l</h4>
 <p>‚±‚ÌŠÖ”‚Í–ß‚è’l‚Æ‚µ‚ÄƒfƒBƒXƒNEƒXƒe[ƒ^ƒX‚ð•Ô‚µ‚Ü‚·BƒfƒBƒXƒNEƒXƒe[ƒ^ƒX‚ÌÚ×‚ÉŠÖ‚µ‚Ä‚Í<tt><a href="dstat.html">disk_status()</a></tt>‚ðŽQÆ‚µ‚Ä‚­‚¾‚³‚¢B</p>
 </div>
 
-<div class="para">
+<div class="para desc">
 <h4>‰ðà</h4>
 <p>ƒfƒBƒXƒNEƒhƒ‰ƒCƒu‚ð‰Šú‰»‚µ‚Ü‚·BŠÖ”‚ª¬Œ÷‚·‚é‚ÆA–ß‚è’l‚Ì<tt>STA_NOINIT</tt>ƒtƒ‰ƒO‚ªƒNƒŠƒA‚³‚ê‚Ü‚·B</p>
 <p><em>ƒAƒvƒŠƒP[ƒVƒ‡ƒ“‚©‚ç‚±‚ÌŠÖ”‚ðŒÄ‚Ño‚·‚ÆAFATƒ{ƒŠƒ…[ƒ€‚ª”j‰ó‚³‚ê‚é‰Â”\«‚ª‚ ‚è‚Ü‚·BƒGƒ‰[“™‚É‚æ‚èÄ‰Šú‰»‚ª•K—v‚È‚Æ‚«‚ÍA<tt>f_mount()</tt>‚ðŽg—p‚µ‚Ü‚·B</em>FatFsƒ‚ƒWƒ…[ƒ‹‚ÍAŽ©“®ƒ}ƒEƒ“ƒg“®ì‚É‚æ‚èA•K—v‚É‰ž‚¶‚Ä‚±‚ÌŠÖ”‚ðŒÄ‚Ño‚µ‚Ü‚·B</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>ƒZƒNƒ^‚Ì“Ç‚Ý‘‚«ˆÈŠO‚ÌƒfƒBƒXƒNEƒhƒ‰ƒCƒuŽ©‘Ì‚É‘Î‚·‚é—lX‚È§Œä‚ð‚µ‚Ü‚·B</p>
 <pre>
 DRESULT disk_ioctl (
-  BYTE <em>Drive</em>,      <span>/* •¨—ƒhƒ‰ƒCƒu”Ô† */</span>
-  BYTE <em>Command</em>,    <span>/* §ŒäƒRƒ}ƒ“ƒh */</span>
-  void* <em>Buffer</em>     <span>/* ƒf[ƒ^Žó‚¯“n‚µƒoƒbƒtƒ@ */</span>
+  BYTE <em>Drive</em>,      <span class="c">/* •¨—ƒhƒ‰ƒCƒu”Ô† */</span>
+  BYTE <em>Command</em>,    <span class="c">/* §ŒäƒRƒ}ƒ“ƒh */</span>
+  void* <em>Buffer</em>     <span class="c">/* ƒf[ƒ^Žó‚¯“n‚µƒoƒbƒtƒ@ */</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>–ß‚è’l</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>•¨—ƒhƒ‰ƒCƒu‚ÌŽí—Þ‚É‚æ‚èƒTƒ|[ƒg‚³‚ê‚éƒRƒ}ƒ“ƒh‚ÍˆÙ‚È‚è‚Ü‚·‚ªAFatFsƒ‚ƒWƒ…[ƒ‹‚Å‚ÍAŽŸ‚Ì”Ä—pƒRƒ}ƒ“ƒh‚Ì‚ÝŽg—p‚µA“Á’è‚Ìƒn[ƒhƒEƒFƒA‚ÉˆË‘¶‚µ‚½§Œä‚Ís‚¢‚Ü‚¹‚ñB</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>ƒfƒBƒXƒN‚©‚çƒZƒNƒ^‚ð“Ç‚Ýo‚µ‚Ü‚·B</p>
 <pre>
 DRESULT disk_read (
-  BYTE <em>Drive</em>,          <span>/* •¨—ƒhƒ‰ƒCƒu”Ô† */</span>
-  BYTE* <em>Buffer</em>,        <span>/* “Ç‚Ýo‚µƒoƒbƒtƒ@‚Ö‚Ìƒ|ƒCƒ“ƒ^ */</span>
-  DWORD <em>SectorNumber</em>,  <span>/* “Ç‚Ýo‚µŠJŽnƒZƒNƒ^”Ô† */</span>
-  BYTE <em>SectorCount</em>     <span>/* “Ç‚Ýo‚µƒZƒNƒ^” */</span>
+  BYTE <em>Drive</em>,          <span class="c">/* •¨—ƒhƒ‰ƒCƒu”Ô† */</span>
+  BYTE* <em>Buffer</em>,        <span class="c">/* “Ç‚Ýo‚µƒoƒbƒtƒ@‚Ö‚Ìƒ|ƒCƒ“ƒ^ */</span>
+  DWORD <em>SectorNumber</em>,  <span class="c">/* “Ç‚Ýo‚µŠJŽnƒZƒNƒ^”Ô† */</span>
+  BYTE <em>SectorCount</em>     <span class="c">/* “Ç‚Ýo‚µƒZƒNƒ^” */</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>“Ç‚Ýo‚µ‚ðŠJŽn‚·‚éƒZƒNƒ^”Ô†BLBA‚ÅŽw’è‚µ‚Ü‚·B</dd>
 <dt>SectorCount</dt>
-<dd>“Ç‚Ýo‚·ƒZƒNƒ^”B 1`128‚Ì”ÍˆÍ‚ÅŽw’è‚µ‚Ü‚·Bˆê”Ê“I‚ÉA•¡”ƒZƒNƒ^‚Ì“]‘——v‹‚ÍƒfƒoƒCƒX‚É‘Î‚µ‚Äƒ}ƒ‹ƒ`EƒZƒNƒ^“]‘—‚µ‚È‚¯‚ê‚Î‚È‚è‚Ü‚¹‚ñB•¡”‚ÌƒVƒ“ƒOƒ‹EƒZƒNƒ^“]‘—‚É•ª‰ð‚µ‚½ê‡A“Ç‚Ýo‚µ‘¬“x‚ª’á‰º‚µ‚Ü‚·B</dd>
+<dd>“Ç‚Ýo‚·ƒZƒNƒ^”B 1`128‚Ì”ÍˆÍ‚ÅŽw’è‚µ‚Ü‚·Bˆê”Ê“I‚ÉA•¡”ƒZƒNƒ^‚Ì“]‘——v‹‚ÍƒfƒoƒCƒX‚É‘Î‚µ‚Ä‰Â”\‚ÈŒÀ‚èƒ}ƒ‹ƒ`EƒZƒNƒ^“]‘—‚µ‚È‚¯‚ê‚Î‚È‚è‚Ü‚¹‚ñB•¡”‚ÌƒVƒ“ƒOƒ‹EƒZƒNƒ^“]‘—‚É•ª‰ð‚µ‚½ê‡A“Ç‚Ýo‚µ‘¬“x‚ª’á‰º‚µ‚Ü‚·B</dd>
 </dl>
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>–ß‚è’l</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>ƒfƒBƒXƒNEƒhƒ‰ƒCƒu‚Ìó‘Ô‚ðŽæ“¾‚µ‚Ü‚·B</p>
 <pre>
 DSTATUS disk_status (
-  BYTE <em>Drive</em>           <span>/* •¨—ƒhƒ‰ƒCƒu”Ô† */</span>
+  BYTE <em>Drive</em>           <span class="c">/* •¨—ƒhƒ‰ƒCƒu”Ô† */</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>–ß‚è’l</h4>
 <p>•¨—ƒhƒ‰ƒCƒu‚Ìó‘Ô‚ªŽŸ‚Ìƒtƒ‰ƒO‚Ì‘g‚Ý‡‚í‚¹‚Ì’l‚Å•Ô‚³‚ê‚Ü‚·B</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>ƒfƒBƒXƒN‚Éƒf[ƒ^‚ð‘‚«ž‚Ý‚Ü‚·B</p>
 <pre>
 DRESULT disk_write (
-  BYTE <em>Drive</em>,          /* •¨—ƒhƒ‰ƒCƒu”Ô† */
-  const BYTE* <em>Buffer</em>,  /* ‘‚«ž‚Þƒf[ƒ^‚Ö‚Ìƒ|ƒCƒ“ƒ^ */
-  DWORD <em>SectorNumber</em>,  /* ‘‚«ž‚ÝŠJŽnƒZƒNƒ^”Ô† */
-  BYTE <em>SectorCount</em>     /* ‘‚«ž‚ÝƒZƒNƒ^” */
+  BYTE <em>Drive</em>,          <span class="c">/* •¨—ƒhƒ‰ƒCƒu”Ô† */</span>
+  const BYTE* <em>Buffer</em>,  <span class="c">/* ‘‚«ž‚Þƒf[ƒ^‚Ö‚Ìƒ|ƒCƒ“ƒ^ */</span>
+  DWORD <em>SectorNumber</em>,  <span class="c">/* ‘‚«ž‚ÝŠJŽnƒZƒNƒ^”Ô† */</span>
+  BYTE <em>SectorCount</em>     <span class="c">/* ‘‚«ž‚ÝƒZƒNƒ^” */</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>‘‚«ž‚Ý‚ðŠJŽn‚·‚éƒZƒNƒ^”Ô†BLBA‚ÅŽw’è‚µ‚Ü‚·B</dd>
 <dt>SectorCount</dt>
-<dd>‘‚«ž‚ÞƒZƒNƒ^”B 1`128‚ÅŽw’è‚µ‚Ü‚·Bˆê”Ê“I‚ÉA•¡”ƒZƒNƒ^‚Ì“]‘——v‹‚ÍƒfƒoƒCƒX‚É‘Î‚µ‚Äƒ}ƒ‹ƒ`EƒZƒNƒ^“]‘—‚µ‚È‚¯‚ê‚Î‚È‚è‚Ü‚¹‚ñB•¡”‚ÌƒVƒ“ƒOƒ‹EƒZƒNƒ^“]‘—‚É•ª‰ð‚µ‚½ê‡A‘‚«ž‚Ý‘¬“x‚Í‹É’[‚É’á‰º‚µ‚Ü‚·B</dd>
+<dd>‘‚«ž‚ÞƒZƒNƒ^”B 1`128‚ÅŽw’è‚µ‚Ü‚·Bˆê”Ê“I‚ÉA•¡”ƒZƒNƒ^‚Ì“]‘——v‹‚ÍƒfƒoƒCƒX‚É‘Î‚µ‚Ä‰Â”\‚ÈŒÀ‚èƒ}ƒ‹ƒ`EƒZƒNƒ^“]‘—‚µ‚È‚¯‚ê‚Î‚È‚è‚Ü‚¹‚ñB•¡”‚ÌƒVƒ“ƒOƒ‹EƒZƒNƒ^“]‘—‚É•ª‰ð‚µ‚½ê‡A‘‚«ž‚Ý‘¬“x‚Í‹É’[‚É’á‰º‚µ‚Ü‚·B</dd>
 </dl>
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>–ß‚è’l</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>ƒŠ[ƒhEƒIƒ“ƒŠ[\¬‚Å‚Í‚±‚ÌŠÖ”‚Í•K—v‚Æ‚³‚ê‚Ü‚¹‚ñB</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>ƒŠ[ƒh/ƒ‰ƒCƒgEƒ|ƒCƒ“ƒ^‚ªƒtƒ@ƒCƒ‹I’[‚É’B‚µ‚Ä‚¢‚é‚©‚Ç‚¤‚©’²‚×‚Ü‚·B.</p>
+<pre>
+int f_eof (
+  FIL* <em>FileObject</em>   <span class="c">/* ƒtƒ@ƒCƒ‹EƒIƒuƒWƒFƒNƒg */</span>
+);
+</pre>
+</div>
+
+
+<div class="para arg">
+<h4>ˆø”</h4>
+<dl class="par">
+<dt>FileObject</dt>
+<dd>ƒtƒ@ƒCƒ‹EƒIƒuƒWƒFƒNƒg\‘¢‘Ì‚Ö‚Ìƒ|ƒCƒ“ƒ^‚ðŽw’è‚µ‚Ü‚·B</dd>
+</dl>
+</div>
+
+
+<div class="para ret">
+<h4>–ß‚è’l</h4>
+<p>ƒŠ[ƒh/ƒ‰ƒCƒgEƒ|ƒCƒ“ƒ^‚ªƒtƒ@ƒCƒ‹I’[‚É‚ ‚è“Ç‚Ýo‚·ƒf[ƒ^‚ª‚È‚¢ê‡‚ÍA0ˆÈŠO‚Ì’l‚ð•Ô‚µ‚Ü‚·B‚»‚êˆÈŠO‚ÌŽž‚Í0‚ð•Ô‚µ‚Ü‚·B</p>
+</div>
+
+
+<div class="para desc">
+<h4>‰ðà</h4>
+<p>f_eofŠÖ”‚ÍAŒ»ƒŠƒrƒWƒ‡ƒ“‚Å‚Íƒ}ƒNƒ‚Æ‚µ‚ÄŽÀ‘•‚³‚ê‚Ä‚¢‚Ü‚·B</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>í‚ÉŽg—p‰Â”\B</p>
+</div>
+
+
+<div class="para ref">
+<h4>ŽQÆ</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>ƒGƒ‰[”­¶‚Ì—L–³‚ð’²‚×‚Ü‚·B</p>
+<pre>
+int f_error (
+  FIL* <em>FileObject</em>   <span class="c">/* ƒtƒ@ƒCƒ‹EƒIƒuƒWƒFƒNƒg */</span>
+);
+</pre>
+</div>
+
+
+<div class="para arg">
+<h4>ˆø”</h4>
+<dl class="par">
+<dt>FileObject</dt>
+<dd>ƒtƒ@ƒCƒ‹EƒIƒuƒWƒFƒNƒg\‘¢‘Ì‚Ö‚Ìƒ|ƒCƒ“ƒ^‚ðŽw’è‚µ‚Ü‚·B</dd>
+</dl>
+</div>
+
+
+<div class="para ret">
+<h4>–ß‚è’l</h4>
+<p>ƒtƒ@ƒCƒ‹‘€ì’†‚ÌƒGƒ‰[‚Åˆ—‚ª’†’f‚³‚ê‚Ä‚¢‚éê‡‚ÍA0ˆÈŠO‚Ì’l‚ð•Ô‚µ‚Ü‚·B‚»‚êˆÈŠO‚ÌŽž‚Í0‚ð•Ô‚µ‚Ü‚·B</p>
+</div>
+
+
+<div class="para desc">
+<h4>‰ðà</h4>
+<p>f_errorŠÖ”‚ÍAŒ»ƒŠƒrƒWƒ‡ƒ“‚Å‚Íƒ}ƒNƒ‚Æ‚µ‚ÄŽÀ‘•‚³‚ê‚Ä‚¢‚Ü‚·B</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>í‚ÉŽg—p‰Â”\B</p>
+</div>
+
+
+<div class="para ref">
+<h4>ŽQÆ</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>Œ»ÝŽž‚ðŽæ“¾‚µ‚Ü‚·B</p>
 <pre>
@@ -20,7 +20,7 @@ DWORD get_fattime (void);
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>–ß‚è’l</h4>
 <p>Œ»Ý‚Ìƒ[ƒJƒ‹Eƒ^ƒCƒ€‚ª<tt>DWORD</tt>’l‚ÉƒpƒbƒN‚³‚ê‚Ä•Ô‚³‚ê‚Ü‚·BƒrƒbƒgEƒtƒB[ƒ‹ƒh‚ÍŽŸ‚ÉŽ¦‚·‚æ‚¤‚É‚È‚è‚Ü‚·B</p>
 <dl>
@@ -40,7 +40,7 @@ DWORD get_fattime (void);
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>‰ðà</h4>
 <p>RTC‚ðƒTƒ|[ƒg‚µ‚È‚¢ƒVƒXƒeƒ€‚Å‚àA‰½‚ç‚©‚Ì“ú•t‚Æ‚µ‚Ä—LŒø‚È’l‚ð•Ô‚³‚È‚¯‚ê‚Î‚È‚è‚Ü‚¹‚ñB0‚ð•Ô‚µ‚½ê‡A‚»‚Ìƒtƒ@ƒCƒ‹‚Í“ú•t‚ðŽ‚¿‚Ü‚¹‚ñBƒŠ[ƒhEƒIƒ“ƒŠ[\¬‚Å‚Í‚±‚ÌŠÖ”‚Í•K—v‚Æ‚³‚ê‚Ü‚¹‚ñB</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)ã¯ã€ãƒ‘ã‚¹åã®çµ‚ç«¯ã¨ã—ã¦èªè­˜ã•ã‚Œã¾ã™ã€‚ãƒ‘ã‚¹åã«å…ˆè¡Œã‚ã‚‹ã„ã¯ä¸­ã«å«ã¾ã‚Œã‚‹ã‚¹ãƒšãƒ¼ã‚¹ã¯ã€LFNæ§‹æˆã§ã¯åå‰ã®ä¸€éƒ¨ã¨ã—ã¦æœ‰åŠ¹ã§ã™ãŒã€éžLFNæ§‹æˆã§ã¯ãƒ‘ã‚¹åã®çµ‚ç«¯ã¨ã—ã¦èªè­˜ã•ã‚Œã¾ã™ã€‚</p>
 <p>æ¨™æº–æ§‹æˆ<tt>(_FS_RPATH == 0)</tt>ã®ã¨ãã¯ã€å…¨ã¦ã®ã‚ªãƒ–ã‚¸ã‚§ã‚¯ãƒˆãŒãƒ«ãƒ¼ãƒˆãƒ»ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‹ã‚‰è¾¿ã‚‹çµ¶å¯¾ãƒ‘ã‚¹ã§æŒ‡å®šã•ã‚Œã¾ã™ã€‚OSæŒ‡å‘ãªã‚«ãƒ¬ãƒ³ãƒˆãƒ»ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã¨ã„ã†æ¦‚å¿µã¯ç„¡ãã€ã¾ãŸãƒ‰ãƒƒãƒˆãƒ»ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª(&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ãƒ•ãƒ«å¯¾å¿œã¨ãªã‚Šã€ANSI/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>ƒtƒ@ƒCƒ‹‚©‚çƒf[ƒ^‚ð“Ç‚Ýo‚µA‘—MƒXƒgƒŠ[ƒ€‚É’¼Ú“]‘—‚µ‚Ü‚·B</p>
 <pre>
 FRESULT f_forward (
-  FIL* <em>FileObject</em>,                 <span>/* ƒtƒ@ƒCƒ‹EƒIƒuƒWƒFƒNƒg\‘¢‘Ì */</span>
-  UINT (*<em>Func</em>)(const BYTE*,UINT),  <span>/* ƒf[ƒ^“]‘—ŠÖ” */</span>
-  UINT <em>ByteToFwd</em>,                  <span>/* “]‘—‚·‚éƒoƒCƒg” */</span>
-  UINT* <em>ByteFwd</em>                    <span>/* “]‘—‚³‚ê‚½ƒoƒCƒg” */</span>
+  FIL* <em>FileObject</em>,                 <span class="c">/* ƒtƒ@ƒCƒ‹EƒIƒuƒWƒFƒNƒg\‘¢‘Ì */</span>
+  UINT (*<em>Func</em>)(const BYTE*,UINT),  <span class="c">/* ƒf[ƒ^“]‘—ŠÖ” */</span>
+  UINT <em>ByteToFwd</em>,                  <span class="c">/* “]‘—‚·‚éƒoƒCƒg” */</span>
+  UINT* <em>ByteFwd</em>                    <span class="c">/* “]‘—‚³‚ê‚½ƒoƒCƒg” */</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>–ß‚è’l</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>³íI—¹B</dd>
-<dt>FR_DENIED</dt>
-<dd>”ñ“Ç‚Ýž‚Ýƒ‚[ƒh‚ÅŠJ‚¢‚½ƒtƒ@ƒCƒ‹‚©‚ç“Ç‚Ýž‚à‚¤‚Æ‚µ‚½B</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>ƒfƒBƒXƒNEƒGƒ‰[‚É‚æ‚éŽ¸”sB</dd>
-<dt>FR_INT_ERR</dt>
-<dd>•s³‚ÈFAT\‘¢‚Ü‚½‚Í“à•”ƒGƒ‰[‚É‚æ‚éŽ¸”sB</dd>
-<dt>FR_NOT_READY</dt>
-<dd>ƒƒfƒBƒA‚ªƒZƒbƒg‚³‚ê‚Ä‚¢‚È‚¢‚È‚ÇA•¨—ƒhƒ‰ƒCƒu‚ª“®ì•s”\ó‘ÔB</dd>
-<dt>FR_INVALID_OBJECT</dt>
-<dd>–³Œø‚Èƒtƒ@ƒCƒ‹EƒIƒuƒWƒFƒNƒgB</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>ƒtƒ@ƒCƒ‹‚Ìƒf[ƒ^‚ðƒoƒbƒtƒ@‚É“Ç‚Ýo‚³‚¸‚É‘—MƒXƒgƒŠ[ƒ€‚É’¼Ú“]‘—‚µ‚Ü‚·BƒAƒvƒŠƒP[ƒVƒ‡ƒ“‘¤‚Åƒf[ƒ^Eƒoƒbƒtƒ@‚ð•K—v‚Æ‚µ‚È‚¢‚Ì‚ÅAƒƒ‚ƒŠ‚ÌŒÀ‚ç‚ê‚½ŠÂ‹«‚Å—LŒø‚Å‚·BƒŠ[ƒh/ƒ‰ƒCƒgEƒ|ƒCƒ“ƒ^‚Í“]‘—‚³‚ê‚½ƒoƒCƒg”‚¾‚¯i‚Ý‚Ü‚·BŽw’è‚³‚ê‚½ƒoƒCƒg”‚Ì“]‘—’†‚Éƒtƒ@ƒCƒ‹‚ÌI’[‚É’B‚µ‚½ê‡‚â‘—MƒXƒgƒŠ[ƒ€‚ªƒrƒW[‚É‚È‚Á‚½ê‡A<tt>*ByteFwd</tt>‚Í<tt>ByteToFwd</tt>‚æ‚è‚à¬‚³‚­‚È‚è‚Ü‚·B</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>‘Î‰žî•ñ</h4>
 <p><tt>_USE_FORWARD == 1</tt>‚ÅAŠŽ‚Â<tt>_FS_TINY == 1</tt>‚Ì‚Æ‚«‚ÉŽg—p‰Â”\‚Å‚·B</p>
 </div>
 
 
-<div class="para">
+<div class="para use">
 <h4>Žg—p—áiƒI[ƒfƒBƒIÄ¶j</h4>
 <pre>
-<span>/*-----------------------------------------------------------------------*/</span>
-<span>/* f_forwardŠÖ”‚©‚çŒÄ‚Î‚ê‚éƒf[ƒ^‘—MŠÖ”‚Ì—á                           */</span>
-<span>/*-----------------------------------------------------------------------*/</span>
+<span class="c">/*-----------------------------------------------------------------------*/</span>
+<span class="c">/* f_forwardŠÖ”‚©‚çŒÄ‚Î‚ê‚éƒf[ƒ^‘—MŠÖ”‚Ì—á                           */</span>
+<span class="c">/*-----------------------------------------------------------------------*/</span>
 
-UINT out_stream (   <span>/* –ß‚è’l: “]‘—‚³‚ê‚½ƒoƒCƒg”‚Ü‚½‚ÍƒXƒgƒŠ[ƒ€‚Ìó‘Ô */</span>
-    const BYTE *p,  <span>/* “]‘—‚·‚éƒf[ƒ^‚ðŽw‚·ƒ|ƒCƒ“ƒ^ */</span>
-    UINT btf        <span>/* &gt;0: “]‘—‚ðs‚¤(ƒoƒCƒg”). 0: ƒXƒgƒŠ[ƒ€‚Ìó‘Ô‚ð’²‚×‚é */</span>
+UINT out_stream (   <span class="c">/* –ß‚è’l: “]‘—‚³‚ê‚½ƒoƒCƒg”‚Ü‚½‚ÍƒXƒgƒŠ[ƒ€‚Ìó‘Ô */</span>
+    const BYTE *p,  <span class="c">/* “]‘—‚·‚éƒf[ƒ^‚ðŽw‚·ƒ|ƒCƒ“ƒ^ */</span>
+    UINT btf        <span class="c">/* &gt;0: “]‘—‚ðs‚¤(ƒoƒCƒg”). 0: ƒXƒgƒŠ[ƒ€‚Ìó‘Ô‚ð’²‚×‚é */</span>
 )
 {
     UINT cnt = 0;
 
 
-    if (btf == 0) {     <span>/* ƒZƒ“ƒX—v‹ */</span>
-        <span>/* ƒXƒgƒŠ[ƒ€‚Ìó‘Ô‚ð•Ô‚· (0: ƒrƒW[, 1: ƒŒƒfƒB) */</span>
-        <span>/* ˆê’UAƒŒƒfƒB‚ð•Ô‚µ‚½‚çA‘±‚­“]‘——v‹‚Å­‚È‚­‚Æ‚à1ƒoƒCƒg‚Í */</span>
-        <span>/* “]‘—‚³‚ê‚È‚¢‚Æ f_forwardŠÖ”‚Í FR_RW_ERROR ‚Æ‚È‚éB */</span>
+    if (btf == 0) {     <span class="c">/* ƒZƒ“ƒX—v‹ */</span>
+        <span class="c">/* ƒXƒgƒŠ[ƒ€‚Ìó‘Ô‚ð•Ô‚· (0: ƒrƒW[, 1: ƒŒƒfƒB) */</span>
+        <span class="c">/* ˆê’UAƒŒƒfƒB‚ð•Ô‚µ‚½‚çA‘±‚­“]‘——v‹‚Å­‚È‚­‚Æ‚à1ƒoƒCƒg‚Í */</span>
+        <span class="c">/* “]‘—‚³‚ê‚È‚¢‚Æ f_forwardŠÖ”‚Í FR_INT_ERR ‚Æ‚È‚éB */</span>
         if (FIFO_READY) cnt = 1;
     }
-    else {              <span>/* “]‘——v‹ */</span>
-        do {    <span>/* ‘S‚Ä‚ÌƒoƒCƒg‚ð“]‘—‚·‚é‚©AƒXƒgƒŠ[ƒ€‚ªƒrƒW[‚É‚È‚é‚Ü‚ÅŒJ‚è•Ô‚· */</span>
+    else {              <span class="c">/* “]‘——v‹ */</span>
+        do {    <span class="c">/* ‘S‚Ä‚ÌƒoƒCƒg‚ð“]‘—‚·‚é‚©AƒXƒgƒŠ[ƒ€‚ªƒrƒW[‚É‚È‚é‚Ü‚ÅŒJ‚è•Ô‚· */</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ŠÖ”‚ÌŽg—p—á                                                 */</span>
-<span>/*-----------------------------------------------------------------------*/</span>
+<span class="c">/*-----------------------------------------------------------------------*/</span>
+<span class="c">/* f_forwardŠÖ”‚ÌŽg—p—á                                                 */</span>
+<span class="c">/*-----------------------------------------------------------------------*/</span>
 
 FRESULT play_file (
-    char *fn        <span>/* Ä¶‚·‚éƒI[ƒfƒBƒIEƒtƒ@ƒCƒ‹–¼‚ðŽw‚·ƒ|ƒCƒ“ƒ^ */</span>
+    char *fn        <span class="c">/* Ä¶‚·‚éƒI[ƒfƒBƒIEƒtƒ@ƒCƒ‹–¼‚ðŽw‚·ƒ|ƒCƒ“ƒ^ */</span>
 )
 {
     FRESULT rc;
     FIL fil;
     UINT dmy;
 
-    <span>/* ƒtƒ@ƒCƒ‹‚ð“Ç‚Ýo‚µƒ‚[ƒh‚ÅŠJ‚­ */</span>
+    <span class="c">/* ƒtƒ@ƒCƒ‹‚ð“Ç‚Ýo‚µƒ‚[ƒh‚ÅŠJ‚­ */</span>
     rc = f_open(&amp;fil, fn, FA_READ);
     if (rc) return rc;
 
-    <span>/* ‘S‚Ä‚Ìƒf[ƒ^‚ª“]‘—‚³‚ê‚é‚©ƒGƒ‰[‚ª”­¶‚·‚é‚Ü‚Å‘±‚¯‚é */</span>
+    <span class="c">/* ‘S‚Ä‚Ìƒf[ƒ^‚ª“]‘—‚³‚ê‚é‚©ƒGƒ‰[‚ª”­¶‚·‚é‚Ü‚Å‘±‚¯‚é */</span>
     while (rc == FR_OK &amp;&amp; fil.fptr &lt; fil.fsize) {
 
-        <span>/* ‚Ù‚©‚Ìˆ—... */</span>
+        <span class="c">/* ‚Ù‚©‚Ìˆ—... */</span>
 
-        <span>/* ’èŠú“I‚Ü‚½‚Í—v‹‚É‰ž‚¶‚Äƒf[ƒ^‚ðƒXƒgƒŠ[ƒ€‚É‘—o‚·‚é */</span>
+        <span class="c">/* ’èŠú“I‚Ü‚½‚Í—v‹‚É‰ž‚¶‚Äƒf[ƒ^‚ðƒXƒgƒŠ[ƒ€‚É‘—o‚·‚é */</span>
         rc = f_forward(&amp;fil, out_stream, 1000, &amp;dmy);
     }
 
-    <span>/* ƒtƒ@ƒCƒ‹‚ð•Â‚¶‚Ä–ß‚é */</span>
+    <span class="c">/* ƒtƒ@ƒCƒ‹‚ð•Â‚¶‚Ä–ß‚é */</span>
     f_close(&amp;fil);
     return rc;
 }
@@ -135,7 +130,7 @@ FRESULT play_file (
 </div>
 
 
-<div class="para">
+<div class="para ref">
 <h4>ŽQÆ</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>ƒJƒŒƒ“ƒgEƒfƒBƒŒƒNƒgƒŠ‚ð“¾‚Ü‚·</p>
+<pre>
+FRESULT f_getcwd (
+  TCHAR* <em>Buffer</em>,  <span class="c">/* ƒoƒbƒtƒ@ */</span>
+  UINT <em>BufferLen</em>  <span class="c">/* ƒoƒbƒtƒ@EƒTƒCƒY */</span>
+);
+</pre>
+</div>
+
+<div class="para arg">
+<h4>ˆø”</h4>
+<dl class="par">
+<dt>Buffer</dt>
+<dd>ƒJƒŒƒ“ƒgEƒfƒBƒŒƒNƒgƒŠ‚Ì•¶Žš—ñ‚ðŠi”[‚·‚éƒoƒbƒtƒ@</dd>
+<dt>BufferLen</dt>
+<dd>TCHAR’PˆÊ‚Ìƒoƒbƒtƒ@EƒTƒCƒY</dd>
+</dl>
+</div>
+
+
+<div class="para ret">
+<h4>–ß‚è’l</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ŠÖ”‚ÍAƒJƒŒƒ“ƒgEƒhƒ‰ƒCƒu‚ÌƒJƒŒƒ“ƒgEƒfƒBƒŒƒNƒgƒŠ‚ÌƒpƒX•¶Žš—ñ‚ðŽæ“¾‚µ‚Ü‚·BƒpƒX•¶Žš—ñ‚ÍAƒhƒ‰ƒCƒu”Ô†‚ðŠÜ‚ñ‚¾ƒtƒ‹EƒpƒX–¼‚Å‚·B</p>
+</div>
+
+
+<div class="para comp">
+<h4>‘Î‰žî•ñ</h4>
+<p><tt>_FS_RPATH == 2</tt>‚Ì‚Æ‚«Žg—p‰Â”\‚Å‚·B</p>
+</div>
+
+
+<div class="para ref">
+<h4>ŽQÆ</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>˜_—ƒhƒ‰ƒCƒuã‚Ì–¢Žg—pƒNƒ‰ƒXƒ^”‚ð“¾‚Ü‚·B</p>
 <pre>
 FRESULT f_getfree (
-  const TCHAR* <em>Path</em>,       <span>/* ‘ÎÛƒhƒ‰ƒCƒu‚ðŽw’è‚µ‚Ü‚· */</span>
-  DWORD* <em>Clusters</em>,         <span>/* ‹ó‚«ƒNƒ‰ƒXƒ^”‚ðŠi”[‚·‚é•Ï”‚Ö‚Ìƒ|ƒCƒ“ƒ^ */</span>
-  FATFS** <em>FileSystemObject</em> <span>/* ƒtƒ@ƒCƒ‹EƒVƒXƒeƒ€EƒIƒuƒWƒFƒNƒg‚ðŽw‚·ƒ|ƒCƒ“ƒ^‚Ö‚Ìƒ|ƒCƒ“ƒ^ */</span>
+  const TCHAR* <em>Path</em>,       <span class="c">/* ‘ÎÛƒhƒ‰ƒCƒu‚ðŽw’è‚µ‚Ü‚· */</span>
+  DWORD* <em>Clusters</em>,         <span class="c">/* ‹ó‚«ƒNƒ‰ƒXƒ^”‚ðŠi”[‚·‚é•Ï”‚Ö‚Ìƒ|ƒCƒ“ƒ^ */</span>
+  FATFS** <em>FileSystemObject</em> <span class="c">/* ƒtƒ@ƒCƒ‹EƒVƒXƒeƒ€EƒIƒuƒWƒFƒNƒg‚ðŽw‚·ƒ|ƒCƒ“ƒ^‚Ö‚Ìƒ|ƒ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>–ß‚è’l</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>³íI—¹B<tt>*Clusters</tt>‚É‹ó‚«ƒNƒ‰ƒXƒ^”‚ª•Ô‚³‚ê‚Ü‚·B</dd>
-<dt>FR_INVALID_DRIVE</dt>
-<dd>ƒhƒ‰ƒCƒu”Ô†‚ª•s³B</dd>
-<dt>FR_NOT_READY</dt>
-<dd>ƒƒfƒBƒA‚ªƒZƒbƒg‚³‚ê‚Ä‚¢‚È‚¢‚È‚ÇA•¨—ƒhƒ‰ƒCƒu‚ª“®ì•s”\ó‘ÔB</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>ƒfƒBƒXƒNEƒGƒ‰[‚É‚æ‚éŽ¸”sB</dd>
-<dt>FR_INT_ERR</dt>
-<dd>•s³‚ÈFAT\‘¢‚Ü‚½‚Í“à•”ƒGƒ‰[‚É‚æ‚éŽ¸”sB</dd>
-<dt>FR_NOT_ENABLED</dt>
-<dd>‚»‚Ì˜_—ƒhƒ‰ƒCƒu‚Éƒ[ƒNEƒGƒŠƒA‚ª—^‚¦‚ç‚ê‚Ä‚¢‚È‚¢B</dd>
-<dt>FR_NO_FILESYSTEM</dt>
-<dd>—LŒø‚ÈFATƒ{ƒŠƒ…[ƒ€‚ªŒ©‚Â‚©‚ç‚È‚¢B</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>˜_—ƒhƒ‰ƒCƒuã‚Ì‹ó‚«ƒNƒ‰ƒXƒ^”‚ðŽæ“¾‚µ‚Ü‚·B•Ô‚³‚ê‚½ƒtƒ@ƒCƒ‹EƒVƒXƒeƒ€EƒIƒuƒWƒFƒNƒg‚Ì<tt>csize</tt>ƒƒ“ƒo‚ªƒNƒ‰ƒXƒ^‚ ‚½‚è‚ÌƒZƒNƒ^”‚ðŽ¦‚µ‚Ä‚¢‚é‚Ì‚ÅA‚±‚ê‚ðŒ³‚ÉŽÀÛ‚Ì‹ó‚«ƒTƒCƒY‚ªŒvŽZ‚Å‚«‚Ü‚·BFAT32ƒ{ƒŠƒ…[ƒ€‚É‚¨‚¢‚Ä‚ÍAFSINFOƒZƒNƒ^‚Ìó‘Ô‚É‚æ‚Á‚Ä‚Í•s³Šm‚È’l‚ð•Ô‚µ‚½‚èAˆ—‚ÉŽžŠÔ‚ª‚©‚©‚Á‚½‚è‚·‚é‰Â”\«‚ª‚ ‚è‚Ü‚·B</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>‘Î‰žî•ñ</h4>
 <p><tt>_FS_READONLY == 0</tt>‚ÅAŠŽ‚Â<tt>_FS_MINIMIZE == 0</tt>‚Ì‚Æ‚«Žg—p‰Â”\‚Å‚·B</p>
 </div>
 
 
-<div class="para">
+<div class="para use">
 <h4>Žg—p—á</h4>
 <pre>
     FATFS *fs;
     DWORD fre_clust, fre_sect, tot_sect;
 
 
-    <span>/* ƒhƒ‰ƒCƒu1‚Ìƒ{ƒŠƒ…[ƒ€î•ñ‚Æ‹ó‚«ƒNƒ‰ƒXƒ^”‚ð“¾‚é */</span>
+    <span class="c">/* ƒhƒ‰ƒCƒu1‚Ìƒ{ƒŠƒ…[ƒ€î•ñ‚Æ‹ó‚«ƒNƒ‰ƒXƒ^”‚ð“¾‚é */</span>
     res = f_getfree("1:", &amp;fre_clust, &amp;fs);
     if (res) die(res);
 
-    <span>/* ‘SƒZƒNƒ^”‚Æ‹ó‚«ƒZƒNƒ^”‚ðŒvŽZ */</span>
+    <span class="c">/* ‘SƒZƒNƒ^”‚Æ‹ó‚«ƒZƒNƒ^”‚ðŒvŽZ */</span>
     tot_sect = (fs->n_fatent - 2) * fs->csize;
     fre_sect = fre_clust * fs->csize;
 
-    <span>/* ƒhƒ‰ƒCƒuƒTƒCƒY‚Æ‹ó‚«ƒTƒCƒY‚Ì•\Ž¦ (512ƒoƒCƒg/ƒZƒNƒ^‚Æ‰¼’è) */</span>
+    <span class="c">/* ƒhƒ‰ƒCƒuƒTƒCƒY‚Æ‹ó‚«ƒTƒCƒY‚Ì•\Ž¦ (512ƒoƒCƒg/ƒZƒNƒ^‚Æ‰¼’è) */</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>ŽQÆ</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>ƒtƒ@ƒCƒ‹‚©‚ç•¶Žš—ñ‚ð“Ç‚Ýo‚µ‚Ü‚·B</p>
 <pre>
 TCHAR* f_gets (
-  TCHAR* <em>Str</em>,       <span>/* ƒoƒbƒtƒ@ */</span>
-  int <em>Size</em>,         <span>/* ƒoƒbƒtƒ@‚ÌƒTƒCƒY */</span>
-  FIL* <em>FileObject</em>   <span>/* ƒtƒ@ƒCƒ‹EƒIƒuƒWƒFƒNƒg */</span>
+  TCHAR* <em>Str</em>,       <span class="c">/* ƒoƒbƒtƒ@ */</span>
+  int <em>Size</em>,         <span class="c">/* ƒoƒbƒtƒ@‚ÌƒTƒCƒY */</span>
+  FIL* <em>FileObject</em>   <span class="c">/* ƒtƒ@ƒCƒ‹EƒIƒuƒWƒFƒNƒg */</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>–ß‚è’l</h4>
 <p>ŠÖ”‚ª¬Œ÷‚·‚é‚Æ<tt>Str</tt>‚ª•Ô‚³‚ê‚Ü‚·B</p>
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>‰ðà</h4>
 <p>‚±‚ÌŠÖ”‚Í<a href="read.html">f_read()</a>‚Ìƒ‰ƒbƒp[ŠÖ”‚Å‚·B“Ç‚Ýo‚µ“®ì‚ÍAÅ‰‚Ì<tt>'\n'</tt>‚ð“Ç‚Ýž‚Þ‚©Aƒtƒ@ƒCƒ‹I’[‚É’B‚·‚é‚©A<tt>Size - 1</tt>•¶Žš‚ð“Ç‚Ýo‚·‚Ü‚Å‘±‚«‚Ü‚·B“Ç‚Ýž‚Ü‚ê‚½•¶Žš—ñ‚ÌI’[‚É‚Í<tt>'\0'</tt>‚ª•t‰Á‚³‚ê‚Ü‚·BŠù‚Éƒtƒ@ƒCƒ‹I’[‚Å1•¶Žš‚à“Ç‚Ýž‚Ü‚ê‚È‚©‚Á‚½‚Æ‚«A‚Ü‚½‚Í‰½‚ç‚©‚ÌƒGƒ‰[‚ª”­¶‚µ‚½‚Æ‚«‚ÍŠÖ”‚ÍŽ¸”s‚µƒkƒ‹Eƒ|ƒCƒ“ƒ^‚ð•Ô‚µ‚Ü‚·Bƒtƒ@ƒCƒ‹I’[‚©ƒGƒ‰[‚©‚Í<tt>f_eof()</tt>,<tt>f_error()</tt>ƒ}ƒNƒ‚Å’²‚×‚ç‚ê‚Ü‚·B</p>
 <p>API‚ÉUnicode‚ª‘I‘ð‚³‚ê‚Ä‚¢‚é(<tt>_LFN_UNICODE</tt>‚ª1)‚Æ‚«‚ÍAUTF-8ƒGƒ“ƒR[ƒh‚ÌƒeƒLƒXƒgEƒtƒ@ƒCƒ‹‚Æ‚µ‚ÄUCS-2‚É•ÏŠ·‚µ‚Äƒoƒbƒtƒ@‚É“Ç‚Ýž‚Ý‚Ü‚·B‚»‚êˆÈŠO‚ÌŽž‚Í–³•ÏŠ·(1•¶Žš1ƒoƒCƒg)‚Å“Ç‚Ýž‚Ý‚Ü‚·B</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>‘Î‰žî•ñ</h4>
 <p><tt>_USE_STRFUNC</tt>‚ª 1‚Ü‚½‚Í 2‚Ì‚Æ‚«Žg—p‰Â”\‚Å‚·B2‚Ì‚Æ‚«‚ÍAƒtƒ@ƒCƒ‹‚ÉŠÜ‚Ü‚ê‚é<tt>'\r'</tt>‚ªŽæ‚èœ‚©‚ê‚Äƒoƒbƒtƒ@‚É“Ç‚Ýž‚Ü‚ê‚Ü‚·B</p>
 </div>
 
 
-<div class="para">
+<div class="para ref">
 <h4>ŽQÆ</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>ƒtƒ@ƒCƒ‹‚ÌƒŠ[ƒh/ƒ‰ƒCƒgEƒ|ƒCƒ“ƒ^‚ðˆÚ“®‚µ‚Ü‚·B</p>
+<p>ƒtƒ@ƒCƒ‹‚ÌƒŠ[ƒh/ƒ‰ƒCƒgEƒ|ƒCƒ“ƒ^‚ðˆÚ“®‚µ‚Ü‚·B‚Ü‚½A‚‘¬ƒV[ƒN‹@”\Žg—pŽž‚É‚ÍCLMT(Œãq)‚Ìì¬‚É‚àŽg—p‚µ‚Ü‚·B</p>
 <pre>
 FRESULT f_lseek (
-  FIL* <em>FileObject</em>,    <span>/* ƒtƒ@ƒCƒ‹EƒIƒuƒWƒFƒNƒg\‘¢‘Ì‚Ö‚Ìƒ|ƒCƒ“ƒ^ */</span>
-  DWORD <em>Offset</em>        <span>/* ˆÚ“®æƒIƒtƒZƒbƒg */</span>
+  FIL* <em>FileObject</em>,    <span class="c">/* ƒtƒ@ƒCƒ‹EƒIƒuƒWƒFƒNƒg\‘¢‘Ì‚Ö‚Ìƒ|ƒCƒ“ƒ^ */</span>
+  DWORD <em>Offset</em>        <span class="c">/* ˆÚ“®æƒIƒtƒZƒbƒg */</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>–ß‚è’l</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>³íI—¹B</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>ƒfƒBƒXƒNEƒGƒ‰[‚É‚æ‚éŽ¸”sB</dd>
-<dt>FR_INT_ERR</dt>
-<dd>•s³‚ÈFAT\‘¢‚Ü‚½‚Í“à•”ƒGƒ‰[‚É‚æ‚éŽ¸”sB</dd>
-<dt>FR_NOT_READY</dt>
-<dd>ƒƒfƒBƒA‚ªƒZƒbƒg‚³‚ê‚Ä‚¢‚È‚¢‚È‚ÇA•¨—ƒhƒ‰ƒCƒu‚ª“®ì•s”\ó‘ÔB</dd>
-<dt>FR_INVALID_OBJECT</dt>
-<dd>–³Œø‚Èƒtƒ@ƒCƒ‹EƒIƒuƒWƒFƒNƒgB</dd>
-<dt>FR_NOT_ENOUGH_CORE</dt>
-<dd>ƒŠƒ“ƒNEƒ}ƒbƒvEƒe[ƒuƒ‹‚ÌƒTƒCƒY‚ª•s‘«B</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>ƒtƒ@ƒCƒ‹‚ÌƒŠ[ƒh/ƒ‰ƒCƒgEƒ|ƒCƒ“ƒ^(ƒtƒ@ƒCƒ‹EƒIƒuƒWƒFƒNƒg“à‚Ìfptrƒƒ“ƒo‚ÅAŽŸ‚É“Ç‚Ýo‚µE‘‚«ž‚Ý‚³‚ê‚éƒoƒCƒg‚ÌƒIƒtƒZƒbƒg‚ðŽ¦‚·)‚ðˆÚ“®‚µ‚Ü‚·BƒIƒtƒZƒbƒg‚ÌŒ´“_‚Íƒtƒ@ƒCƒ‹æ“ª‚Å‚·B‘‚«ž‚Ýƒ‚[ƒh‚Åƒtƒ@ƒCƒ‹EƒTƒCƒY‚æ‚è‘å‚«‚È’l‚ðŽw’è‚·‚é‚ÆA‚»‚±‚Ü‚Åƒtƒ@ƒCƒ‹EƒTƒCƒY‚ªŠg’£‚³‚êAŠg’£‚³‚ê‚½•”•ª‚Ìƒf[ƒ^‚Í–¢’è‹`‚Æ‚È‚è‚Ü‚·Bƒf[ƒ^‚ð’x‰„–³‚­‚‘¬‚É‘‚«ž‚Ý‚½‚¢‚Æ‚«‚ÍA—\‚ß‚±‚ÌŠÖ”‚Å•K—v‚ÈƒTƒCƒY‚Ü‚Åƒtƒ@ƒCƒ‹EƒTƒCƒY‚ðŠg’£‚µ‚Ä‚¨‚­‚Æ—Ç‚¢‚Å‚µ‚å‚¤Bf_lseekŠÖ”‚ª³íI—¹‚µ‚½‚ ‚Æ‚ÍAƒŠ[ƒh/ƒ‰ƒCƒgEƒ|ƒCƒ“ƒ^‚ª³‚µ‚­ˆÚ“®‚µ‚½‚©fptr‚ðƒ`ƒFƒbƒN‚·‚é‚×‚«‚Å‚·BƒŠ[ƒh/ƒ‰ƒCƒgEƒ|ƒCƒ“ƒ^‚ªŽw’è‚æ‚è¬‚³‚¢‚Æ‚«‚ÍAŽŸ‚ÌŒ´ˆö‚ªl‚¦‚ç‚ê‚Ü‚·B</p>
+<p>ƒtƒ@ƒCƒ‹‚ÌƒŠ[ƒh/ƒ‰ƒCƒgEƒ|ƒCƒ“ƒ^(ŽŸ‚É“Ç‚Ýo‚µE‘‚«ž‚Ý‚³‚ê‚éƒoƒCƒg‚ÌƒIƒtƒZƒbƒg)‚ðˆÚ“®‚µ‚Ü‚·BƒIƒtƒZƒbƒg‚ÌŒ´“_‚Íƒtƒ@ƒCƒ‹æ“ª‚Å‚·B‘‚«ž‚Ýƒ‚[ƒh‚Åƒtƒ@ƒCƒ‹EƒTƒCƒY‚æ‚è‘å‚«‚È’l‚ðŽw’è‚·‚é‚ÆA‚»‚±‚Ü‚Åƒtƒ@ƒCƒ‹EƒTƒCƒY‚ªŠg’£‚³‚êAŠg’£‚³‚ê‚½•”•ª‚Ìƒf[ƒ^‚Í–¢’è‹`‚Æ‚È‚è‚Ü‚·Bƒf[ƒ^‚ð’x‰„–³‚­‚‘¬‚É‘‚«ž‚Ý‚½‚¢‚Æ‚«‚ÍA—\‚ß‚±‚ÌŠÖ”‚Å•K—v‚ÈƒTƒCƒY‚Ü‚Åƒtƒ@ƒCƒ‹EƒTƒCƒY‚ðŠg’£‚µ‚Ä‚¨‚­‚Æ—Ç‚¢‚Å‚µ‚å‚¤Bf_lseekŠÖ”‚ª³íI—¹‚µ‚½‚ ‚Æ‚ÍAƒŠ[ƒh/ƒ‰ƒCƒgEƒ|ƒCƒ“ƒ^‚ª³‚µ‚­ˆÚ“®‚µ‚½‚©ƒ`ƒFƒbƒN‚·‚é‚×‚«‚Å‚·BƒŠ[ƒh/ƒ‰ƒCƒgEƒ|ƒCƒ“ƒ^‚ªŽw’è‚æ‚è¬‚³‚¢‚Æ‚«‚ÍAŽŸ‚ÌŒ´ˆö‚ªl‚¦‚ç‚ê‚Ü‚·B</p>
 <ul>
 <li>”ñ‘‚«ž‚Ýƒ‚[ƒh‚Ü‚½‚Í‚‘¬ƒV[ƒNEƒ‚[ƒh‚Ì‚½‚ßAƒtƒ@ƒCƒ‹EƒTƒCƒY‚ÅƒNƒŠƒbƒv‚³‚ê‚½B</li>
 <li>ƒtƒ@ƒCƒ‹Šg’£’†‚ÉƒfƒBƒXƒN‚ª–ž”t‚É‚È‚Á‚½B</li>
 </ul>
-<p><tt>_USE_FASTSEEK</tt>‚É1‚ªŽw’è‚³‚ê‚Ä‚¢‚ÄAŠŽ‚Âƒtƒ@ƒCƒ‹EƒIƒuƒWƒFƒNƒg‚Ì<tt>cltbl</tt>ƒƒ“ƒo‚ªNULLˆÈŠO‚Ì‚Æ‚«A‚‘¬ƒV[ƒNEƒ‚[ƒh‚É‚È‚è‚Ü‚·B‚±‚ê‚Íƒtƒ@ƒCƒ‹‚ÌƒNƒ‰ƒXƒ^î•ñ‚ðƒAƒvƒŠƒP[ƒVƒ‡ƒ“‚ÌŽw’è‚µ‚½”z—ñ‚É•ÛŽ‚µ‚Ä‚¨‚­‚±‚Æ‚É‚æ‚èAFAT‚ÉƒAƒNƒZƒX‚·‚é‚±‚Æ‚È‚­Œã•ûƒV[ƒN‚âƒƒ“ƒOEƒV[ƒN‚ð‚‘¬‚És‚¤‹@”\‚Å‚·B‚‘¬ƒV[ƒN“®ì‚ðs‚¤‘O‚É‚ÍA”z—ñ‚ð‰Šú‰»‚µ‚Ä‚¨‚­•K—v‚ª‚ ‚è‚Ü‚·B•K—v‚È”z—ñƒTƒCƒY(—v‘f”)‚ÍA(ƒtƒ@ƒCƒ‹‚Ì•ªŠ„” + 1) * 2 ‚Å‚·B‚½‚Æ‚¦‚ÎAƒtƒ@ƒCƒ‹‚ª5‚Â‚É•ª’f‚³‚ê‚Ä‚¢‚é‚Æ‚«‚É•K—v‚È”z—ñƒTƒCƒY‚ÍA12—v‘f‚Æ‚È‚è‚Ü‚·B‚‘¬ƒV[ƒNŽg—pŽž‚Íƒtƒ@ƒCƒ‹EƒTƒCƒY‚ÌŠg’£‚Í‚Å‚«‚Ü‚¹‚ñB</p>
+<p><tt>_USE_FASTSEEK</tt>‚É1‚ªŽw’è‚³‚ê‚Ä‚¢‚ÄAŠŽ‚Âƒtƒ@ƒCƒ‹EƒIƒuƒWƒFƒNƒg‚Ì<tt>cltbl</tt>ƒƒ“ƒo‚ªNULLˆÈŠO(ƒtƒ@ƒCƒ‹‚ðŠJ‚¢‚½‚Æ‚«‚ÍNULL)‚Ì‚Æ‚«A‚‘¬ƒV[ƒNEƒ‚[ƒh‚É‚È‚è‚Ü‚·B‚±‚ê‚Íƒtƒ@ƒCƒ‹‚ÌƒNƒ‰ƒXƒ^”z’uî•ñ(CLMT)‚ðƒƒ‚ƒŠã‚É•ÛŽ‚µ‚Ä‚¨‚­‚±‚Æ‚É‚æ‚èAFAT‚ÉƒAƒNƒZƒX‚·‚é‚±‚Æ‚È‚­Œã•ûƒV[ƒN‚âƒƒ“ƒOEƒV[ƒN‚ð‚‘¬‚És‚¤‹@”\‚Å‚·B‚‘¬ƒV[ƒNEƒ‚[ƒh‚ÍAf_read/f_wtiteŠÖ”‚É‚à“K—p‚³‚ê‚Ü‚·B‚‘¬ƒV[ƒNEƒ‚[ƒh‚Å‚Íf_wtite/f_lseekŠÖ”‚É‚æ‚éƒtƒ@ƒCƒ‹EƒTƒCƒY‚ÌŠg’£‚Í‚Å‚«‚Ü‚¹‚ñB</p>
+<p>‚‘¬ƒV[ƒN“®ì‚ðs‚¤‘O‚ÉACLMT‚ðì¬‚µ‚Ä‚¨‚­•K—v‚ª‚ ‚è‚Ü‚·B‚±‚ê‚ðì¬‚·‚é‚É‚ÍA‚Ü‚¸<tt>cltbl</tt>ƒƒ“ƒo‚ÉCLMTŠi”[ƒoƒbƒtƒ@(DWORD”z—ñ)‚Ö‚Ìƒ|ƒCƒ“ƒ^‚ðƒZƒbƒg‚µ‚Ü‚·B‚»‚µ‚ÄA”z—ñ‚Ìæ“ª—v‘f‚É‚»‚Ì”z—ñ‚Ì—v‘f”‚ð“ü‚êAf_lseekŠÖ”‚ð<tt>Offset</tt>‚É<tt>CREATE_LINKMAP</tt>‚ðŽw’è‚µ‚ÄŽÀs‚µ‚Ü‚·BŠÖ”‚ª¬Œ÷‚·‚é‚ÆCLMT‚ªì¬‚³‚êAˆÈ~‚Ìf_read/f_write/f_lseekŠÖ”‚Å‚ÍFAT‚Ö‚ÌƒAƒNƒZƒX‚Í”­¶‚µ‚Ü‚¹‚ñB<tt>FR_NOT_ENOUGH_CORE</tt>‚ÅŽ¸”s‚µ‚½‚Æ‚«‚Í”z—ñƒTƒCƒY‚ª•s‘«‚ÅAæ“ª—v‘f‚É‚ÍŽÀÛ‚É•K—v‚Æ‚È‚é—v‘f”‚ª•Ô‚³‚ê‚Ü‚·B•K—v‚È—v‘f”‚ÍA(ƒtƒ@ƒCƒ‹‚Ì•ªŠ„” + 1) * 2 ‚Å‚·B‚½‚Æ‚¦‚ÎAƒtƒ@ƒCƒ‹‚ª5‚Â‚É•ª’f‚³‚ê‚Ä‚¢‚é‚Æ‚«‚É•K—v‚È—v‘f”‚ÍA12‚Æ‚È‚è‚Ü‚·B</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>‘Î‰žî•ñ</h4>
 <p><tt>_FS_MINIMIZE &lt; 3</tt>‚Ì‚Æ‚«Žg—p‰Â”\‚Å‚·B</p>
 </div>
 
 
-<div class="para">
+<div class="para use">
 <h4>Žg—p—á</h4>
 <pre>
-    <span>/* ƒtƒ@ƒCƒ‹EƒIƒtƒZƒbƒg5000‚ÖˆÚ“® */</span>
-    res = f_lseek(&amp;file, 5000, 0);
+    <span class="c">/* ƒtƒ@ƒCƒ‹‚ðŠJ‚­ */</span>
+    file = malloc(sizeof(FIL));
+    if (!file) ...
+    res = f_open(file, "file.dat", FA_READ|FA_WRITE);
+    if (res) ...
 
-    <span>/* ƒtƒ@ƒCƒ‹’Ç‹L‚Ì€”õ (ƒtƒ@ƒCƒ‹I’[‚ÖˆÚ“®) */</span>
-    res = f_lseek(&amp;file, file.fsize, 0);
+    <span class="c">/* ƒtƒ@ƒCƒ‹EƒIƒtƒZƒbƒg5000‚ÖˆÚ“® */</span>
+    res = f_lseek(file, 5000, 0);
 
-    <span>/* 3000ƒoƒCƒgi‚ß‚é */</span>
-    res = f_lseek(&amp;file, file.fptr + 3000, 0);
+    <span class="c">/* ƒtƒ@ƒCƒ‹I’[‚ÖˆÚ“®(ƒtƒ@ƒCƒ‹’Ç‹L‚Ì€”õ) */</span>
+    res = f_lseek(file, f_size(file), 0);
 
-    <span>/* 2000ƒoƒCƒg–ß‚· (ƒI[ƒo[ƒtƒ[‚É’ˆÓ) */</span>
-    res = f_lseek(&amp;file, file.fptr - 2000, 0);
+    <span class="c">/* 3000ƒoƒCƒgi‚ß‚é */</span>
+    res = f_lseek(file, f_tell(file) + 3000, 0);
+
+    <span class="c">/* 2000ƒoƒCƒg–ß‚· (ƒI[ƒo[ƒtƒ[‚É’ˆÓ) */</span>
+    res = f_lseek(file, f_tell(file) - 2000, 0);
 </pre>
 <pre>
-    <span>/* ƒNƒ‰ƒXƒ^æsŠ„‚è“–‚Ä (ƒXƒgƒŠ[ƒ~ƒ“ƒOEƒ‰ƒCƒgŽž‚Ìƒoƒbƒtƒ@EƒI[ƒo[ƒ‰ƒ“–hŽ~) */</span>
+    <span class="c">/* ƒNƒ‰ƒXƒ^æsŠ„‚è“–‚Ä (ƒXƒgƒŠ[ƒ~ƒ“ƒOEƒ‰ƒCƒgŽž‚Ìƒoƒbƒtƒ@EƒI[ƒo[ƒ‰ƒ“–hŽ~) */</span>
 
-    res = f_open(&amp;file, "record.wav", FA_CREATE_NEW | FA_WRITE); <span>/* ƒtƒ@ƒCƒ‹ì¬ */</span>
+    res = f_open(file, "record.wav", FA_CREATE_NEW | FA_WRITE);  <span class="c">/* ƒtƒ@ƒCƒ‹ì¬ */</span>
 
-    res = f_lseek(&amp;file, MAX_SIZE, 0);     <span>/* \•ª‚ÈƒNƒ‰ƒXƒ^‚ÌæsŠ„‚è“–‚Ä */</span>
-    if (res || file.fptr != PRE_SIZE) .... <span>/* ³‚µ‚­ƒtƒ@ƒCƒ‹‚ªŠg’£‚³‚ê‚½‚©ƒ`ƒFƒbƒN */</span>
+    res = f_lseek(file, MAX_SIZE, 0);        <span class="c">/* \•ª‚ÈƒNƒ‰ƒXƒ^‚ÌæsŠ„‚è“–‚Ä */</span>
+    if (res || f_tell(file) != PRE_SIZE) ... <span class="c">/* ³‚µ‚­ƒtƒ@ƒCƒ‹‚ªŠg’£‚³‚ê‚½‚©ƒ`ƒFƒbƒN */</span>
 
-    res = f_lseek(&amp;file, DATA_START, 0);   <span>/* ƒf[ƒ^EƒXƒgƒŠ[ƒ€‚Ì‹L˜^(ƒAƒƒP[ƒVƒ‡ƒ“ƒfƒBƒŒƒC–³‚µ) */</span>
+    res = f_lseek(file, DATA_START, 0);      <span class="c">/* ƒf[ƒ^EƒXƒgƒŠ[ƒ€‚Ì‹L˜^(ƒAƒƒP[ƒVƒ‡ƒ“ƒfƒBƒŒƒC–³‚µ) */</span>
     ...
 
-    res = f_truncate(&amp;file);               <span>/* •s—v—Ìˆæ‚ÌØ‚èŽÌ‚Ä */</span>
-    res = f_lseek(&amp;file, 0, 0);            <span>/* ƒwƒbƒ_‚Ì‹L˜^ */</span>
+    res = f_truncate(file);                  <span class="c">/* •s—v—Ìˆæ‚ÌØ‚èŽÌ‚Ä */</span>
+    res = f_lseek(file, 0, 0);               <span class="c">/* ƒwƒbƒ_‚Ì‹L˜^ */</span>
     ...
 
-    res = f_close(&amp;file);
+    res = f_close(file);
 </pre>
 <pre>
-    <span>/* ‚‘¬ƒV[ƒN‹@”\‚ðŽg‚¤ */</span>
+    <span class="c">/* ‚‘¬ƒV[ƒN‹@”\‚ðŽg‚¤ */</span>
 
-    DWORD lktbl[SZ_TBL];                   <span>/* ƒŠƒ“ƒNEƒ}ƒbƒvEƒe[ƒuƒ‹Ši”[ƒoƒbƒtƒ@ */</span>
+    DWORD lktbl[SZ_TBL];                   <span class="c">/* ƒŠƒ“ƒNEƒ}ƒbƒvEƒe[ƒuƒ‹Ši”[ƒoƒbƒtƒ@ */</span>
 
-    res = f_lseek(&amp;file, ofs1);            <span>/* ’ÊíƒV[ƒN (ƒI[ƒvƒ“ŽžAfile.cltbl == NULL) */</span>
+    res = f_lseek(file, ofs1);             <span class="c">/* ’ÊíƒV[ƒN (ƒI[ƒvƒ“ŽžAfile.cltbl == NULL) */</span>
 
-    file.cltbl = lktbl;                    <span>/* ‚‘¬ƒV[ƒN‹@”\‚Ì—LŒø‰» */</span>
-    lktbl[0] = SZ_TBL;                     <span>/* æ“ª—v‘f‚É”z—ñ—v‘f”‚ðƒZƒbƒg */</span>
-    res = f_lseek(&amp;file, CREATE_LINKMAP);  <span>/* ƒŠƒ“ƒNEƒ}ƒbƒvEƒe[ƒuƒ‹‚Ìì¬ */</span>
+    file.cltbl = lktbl;                    <span class="c">/* ‚‘¬ƒV[ƒN‹@”\‚Ì—LŒø‰» */</span>
+    lktbl[0] = SZ_TBL;                     <span class="c">/* æ“ª—v‘f‚É”z—ñ—v‘f”‚ðƒZƒbƒg */</span>
+    res = f_lseek(file, CREATE_LINKMAP);   <span class="c">/* CLMT‚Ìì¬ */</span>
+    ...
 
-    res = f_lseek(&amp;file, ofs2);            <span>/* ‚‘¬ƒV[ƒN (file.cltbl != NULL) */</span>
+    res = f_lseek(file, ofs2);             <span class="c">/* ˆÈ~Af_read/f_write/f_lseek‚ÅFATƒAƒNƒZƒX‚ª”­¶‚µ‚È‚¢ */</span>
 </pre>
 </div>
 
 
-<div class="para">
+<div class="para ref">
 <h4>ŽQÆ</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>ƒfƒBƒŒƒNƒgƒŠ‚ðì¬‚µ‚Ü‚·B</p>
 <pre>
 FRESULT f_mkdir (
-  const TCHAR* <em>DirName</em> <span>/* ì¬‚·‚éƒfƒBƒŒƒNƒgƒŠ–¼‚Ö‚Ìƒ|ƒCƒ“ƒ^ */</span>
+  const TCHAR* <em>DirName</em> <span class="c">/* ì¬‚·‚éƒfƒBƒŒƒNƒgƒŠ–¼‚Ö‚Ìƒ|ƒ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>–ß‚è’l</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>³íI—¹B</dd>
-<dt>FR_NO_PATH</dt>
-<dd>ƒpƒX‚ªŒ©‚Â‚©‚ç‚È‚¢B</dd>
-<dt>FR_INVALID_NAME</dt>
-<dd>ƒpƒX–¼‚ª•s³B</dd>
-<dt>FR_INVALID_DRIVE</dt>
-<dd>ƒhƒ‰ƒCƒu”Ô†‚ª•s³B</dd>
-<dt>FR_DENIED</dt>
-<dd>ƒfƒBƒXƒN‚âƒfƒBƒŒƒNƒgƒŠEƒGƒ“ƒgƒŠ‚ª–ž”t‚Ìê‡‚È‚ÇB</dd>
-<dt>FR_EXIST</dt>
-<dd>“¯–¼‚ÌƒIƒuƒWƒFƒNƒg‚ª‘¶Ý‚·‚éB</dd>
-<dt>FR_NOT_READY</dt>
-<dd>ƒƒfƒBƒA‚ªƒZƒbƒg‚³‚ê‚Ä‚¢‚È‚¢‚È‚ÇA•¨—ƒhƒ‰ƒCƒu‚ª“®ì•s”\ó‘ÔB</dd>
-<dt>FR_WRITE_PROTECTED</dt>
-<dd>ƒƒfƒBƒA‚ª‘‚«ž‚Ý‹ÖŽ~ó‘ÔB</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>ƒfƒBƒXƒNEƒGƒ‰[‚É‚æ‚éŽ¸”sB</dd>
-<dt>FR_INT_ERR</dt>
-<dd>•s³‚ÈFAT\‘¢‚Ü‚½‚Í“à•”ƒGƒ‰[‚É‚æ‚éŽ¸”sB</dd>
-<dt>FR_NOT_ENABLED</dt>
-<dd>‚»‚Ì˜_—ƒhƒ‰ƒCƒu‚Éƒ[ƒNEƒGƒŠƒA‚ª—^‚¦‚ç‚ê‚Ä‚¢‚È‚¢B</dd>
-<dt>FR_NO_FILESYSTEM</dt>
-<dd>—LŒø‚ÈFATƒ{ƒŠƒ…[ƒ€‚ªŒ©‚Â‚©‚ç‚È‚¢B</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>‹ó‚ÌƒfƒBƒŒƒNƒgƒŠ‚ðì¬‚µ‚Ü‚·B</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>‘Î‰žî•ñ</h4>
 <p><tt>_FS_READONLY == 0</tt>‚ÅAŠŽ‚Â<tt>_FS_MINIMIZE == 0</tt>‚Ì‚Æ‚«Žg—p‰Â”\‚Å‚·B</p>
 </div>
 
 
-<div class="para">
+<div class="para use">
 <h4>Žg—p—á</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>•¨—ƒhƒ‰ƒCƒuã‚ÉFATƒ{ƒŠƒ…[ƒ€‚ðì¬(ƒtƒH[ƒ}ƒbƒg)‚µ‚Ü‚·B</p>
 <pre>
 FRESULT f_mkfs (
-  BYTE  <em>Drive</em>,              <span>/* ˜_—ƒhƒ‰ƒCƒu”Ô† */</span>
-  BYTE  <em>PartitioningRule</em>,   <span>/* ‹æ‰æì¬•û–@ */</span>
-  UINT  <em>AllocSize</em>           <span>/* ƒNƒ‰ƒXEƒ^ƒTƒCƒY */</span>
+  BYTE  <em>Drive</em>,              <span class="c">/* ˜_—ƒhƒ‰ƒCƒu”Ô† */</span>
+  BYTE  <em>PartitioningRule</em>,   <span class="c">/* ‹æ‰æì¬•û–@ */</span>
+  UINT  <em>AllocSize</em>           <span class="c">/* ƒNƒ‰ƒXEƒ^ƒTƒCƒY */</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>–ß‚è’l</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>³íI—¹B</dd>
-<dt>FR_INVALID_DRIVE</dt>
-<dd>ƒhƒ‰ƒCƒu”Ô†‚ª–³ŒøB</dd>
-<dt>FR_NOT_READY</dt>
-<dd>ƒƒfƒBƒA‚ªƒZƒbƒg‚³‚ê‚Ä‚¢‚È‚¢‚È‚ÇA•¨—ƒhƒ‰ƒCƒu‚ª“®ì•s”\ó‘ÔB</dd>
-<dt>FR_WRITE_PROTECTED</dt>
-<dd>ƒƒfƒBƒA‚ª‘‚«ž‚Ý‹ÖŽ~ó‘ÔB</dd>
-<dt>FR_NOT_ENABLED</dt>
-<dd>‚»‚Ì˜_—ƒhƒ‰ƒCƒu‚Éƒ[ƒNEƒGƒŠƒA‚ªŠ„‚è“–‚Ä‚ç‚ê‚Ä‚¢‚È‚¢B</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>ƒfƒBƒXƒNEƒGƒ‰[‚É‚æ‚éŽ¸”sB</dd>
-<dt>FR_MKFS_ABORTED</dt>
-<dd>ŽŸ‚Ì——R‚ÅŠJŽn‘O‚Éˆ—‚ª’†’f‚³‚ê‚½B
-<ul>
-<li>ƒfƒBƒXƒNEƒTƒCƒY‚ª¬‚³‚·‚¬‚éB</li>
-<li>‰½‚ç‚©‚Ìˆø”‚ª•s³B</li>
-<li>‚»‚ÌƒNƒ‰ƒXƒ^EƒTƒCƒY‚ªŽg‚¦‚È‚¢BƒNƒ‰ƒXƒ^”‚ªFATƒ^ƒCƒv‚Ì‹«ŠE‚É‹ß‚­‚È‚é‚Æ‚«”­¶‚·‚é‰Â”\«‚ª‚ ‚éB</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ŠÖ”‚Í•¨—ƒhƒ‰ƒCƒuã‚ÉFATƒ{ƒŠƒ…[ƒ€‚ðì¬‚µ‚Ü‚·BƒŠƒ€[ƒoƒuƒ‹EƒƒfƒBƒA‚Ìƒp[ƒe[ƒVƒ‡ƒjƒ“ƒOEƒ‹[ƒ‹‚Æ‚µ‚Ä‚ÍFDISKŒ`Ž®‚ÆSFDŒ`Ž®‚ª‚ ‚èAƒƒ‚ƒŠEƒJ[ƒh‚Å‚ÍFDISKŒ`Ž®‚ª•’Ê‚Å‚·B‚±‚ÌŠÖ”‚Í<em>•¡”‹æ‰æ‚É‚Í‘Î‰ž‚µ‚Ä‚¢‚È‚¢</em>‚Ì‚ÅA‚»‚Ì•¨—ƒhƒ‰ƒCƒu‚ÌŠù‘¶‚Ì‹æ‰æ‚Í‘S‚Äíœ‚³‚êA‘S‘Ì‚ªˆê‚Â‚Ì‹æ‰æ‚É‚È‚è‚Ü‚·B</p>
 <p>FATƒ^ƒCƒv(FAT12/FAT16/FAT32)‚ÍA‚»‚Ì˜_—ƒhƒ‰ƒCƒuã‚Ì<em>ƒNƒ‰ƒXƒ^”‚É‚æ‚Á‚Ä‚Ì‚ÝŒˆ’è</em>‚³‚ê‚éŒˆ‚Ü‚è[FATŽd—l‘‚æ‚è]‚É‚È‚Á‚Ä‚¢‚ÄA‚»‚êˆÈŠO‚Ì—vˆö‚Í‚ ‚è‚Ü‚¹‚ñB‚µ‚½‚ª‚Á‚ÄA‚Ç‚ÌFATƒ^ƒCƒv‚É‚È‚é‚©‚Íƒhƒ‰ƒCƒuEƒTƒCƒY‚ÆƒNƒ‰ƒXƒ^EƒTƒCƒY‚ÉˆË‘¶‚µ‚Ü‚·BƒNƒ‰ƒXƒ^EƒTƒCƒY‚Í‘å‚«‚­‚·‚é‚Ù‚Ç«”\‚ªã‚ª‚èA‹t‚ÉƒfƒBƒXƒN—˜—pŒø—¦‚Í—Ž‚¿‚Ü‚·B</p>
@@ -69,7 +54,7 @@ FRESULT f_mkfs (
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>‘Î‰žî•ñ</h4>
 <p><tt>_FS_READONLY == 0</tt>‚ÅAŠŽ‚Â<tt>_USE_MKFS == 1</tt>‚Ì‚Æ‚«Žg—p‰Â”\‚Å‚·B</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>˜_—ƒhƒ‰ƒCƒu‚Ìƒ[ƒNEƒGƒŠƒA‚ð“o˜^E–•Á‚µ‚Ü‚·B</p>
 <pre>
 FRESULT f_mount (
-  BYTE  <em>Drive</em>,               <span>/* ˜_—ƒhƒ‰ƒCƒu”Ô† */</span>
-  FATFS*  <em>FileSystemObject</em>   <span>/* ƒ[ƒNEƒGƒŠƒA‚Ö‚Ìƒ|ƒCƒ“ƒ^ */</span>
+  BYTE  <em>Drive</em>,               <span class="c">/* ˜_—ƒhƒ‰ƒCƒu”Ô† */</span>
+  FATFS*  <em>FileSystemObject</em>   <span class="c">/* ƒ[ƒNEƒGƒŠƒA‚Ö‚Ìƒ|ƒ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>–ß‚è’l</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>³íI—¹B</dd>
-<dt>FR_INVALID_DRIVE</dt>
-<dd>˜_—ƒhƒ‰ƒCƒu”Ô†‚ª–³ŒøB</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ƒ‚ƒWƒ…[ƒ‹‚Å‚Í‚»‚ê‚¼‚ê‚Ì˜_—ƒhƒ‰ƒCƒu‚Éƒtƒ@ƒCƒ‹EƒVƒXƒeƒ€EƒIƒuƒWƒFƒNƒg‚Æ‚¢‚¤ƒ[ƒNEƒGƒŠƒA‚ª•K—v‚Å‚·B‚±‚ÌŠÖ”‚Í˜_—ƒhƒ‰ƒCƒu‚É‚»‚Ìƒ[ƒNEƒGƒŠƒA‚ð“o˜^‚µ‚½‚è–•Á‚µ‚½‚è‚µ‚Ü‚·B‰½‚ç‚©‚Ìƒtƒ@ƒCƒ‹ŠÖ”‚ðŽg—p‚·‚é‘O‚É‚±‚ÌŠÖ”‚Å‚»‚Ì˜_—ƒhƒ‰ƒCƒu‚Ìƒ[ƒNEƒGƒŠƒA‚ð—^‚¦‚Ä‚¨‚©‚È‚¯‚ê‚Î‚È‚è‚Ü‚¹‚ñB<tt>FileSystemObject</tt>‚Éƒkƒ‹Eƒ|ƒCƒ“ƒ^‚ðŽw’è‚·‚é‚Æ‚»‚Ì˜_—ƒhƒ‰ƒCƒu‚Ìƒ[ƒNEƒGƒŠƒA‚Ì“o˜^‚Í–•Á‚³‚êA“o˜^‚³‚ê‚Ä‚¢‚½ƒ[ƒNEƒGƒŠƒA‚Í”jŠü‚Å‚«‚Ü‚·B‘€ì‘ÎÛ‚Ìƒhƒ‰ƒCƒu‚É‘Î‚µ‚ÄŠJ‚©‚ê‚Ä‚¢‚éƒtƒ@ƒCƒ‹‚âƒfƒBƒŒƒNƒgƒŠ‚ª‚ ‚Á‚½ê‡A‚»‚ê‚ç‚Í‘S‚Ä–³Œø‚É‚È‚è‚Ü‚·B</p>
 <p>‚±‚ÌŠÖ”‚ÍAƒhƒ‰ƒCƒu‚Ìó‘Ô‚ÉŠÖ‚í‚ç‚¸í‚É¬Œ÷‚µ‚Ü‚·BŠÖ”“à‚Å‚Í‰ºˆÊƒŒƒCƒ„(•¨—ƒhƒ‰ƒCƒu)‚Ö‚ÌƒAƒNƒZƒX‚Í”­¶‚¹‚¸Aƒ[ƒNEƒGƒŠƒA‚ð‰Šú‰»‚µ‚Ä“à•””z—ñ‚É‚»‚ÌƒAƒhƒŒƒX‚ð“o˜^‚·‚é‚¾‚¯‚Å‚·BŽÀÛ‚Ìƒ}ƒEƒ“ƒg“®ì‚ÍA‚±‚ÌŠÖ”‚ÌŽÀs‚Ü‚½‚ÍƒƒfƒBƒAŒðŠ·”­¶‚ÌŒãAÅ‰‚Ìƒtƒ@ƒCƒ‹EƒAƒNƒZƒX‚Ì‚Æ‚«‚És‚í‚ê‚Ü‚·B</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>‘Î‰žî•ñ</h4>
 <p>‘S‚Ä‚Ì\¬‚ÅŽg—p‰Â”\‚Å‚·B</p>
 </div>
 
 
-<div class="para">
+<div class="para ref">
 <h4>ŽQÆ</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>ƒtƒ@ƒCƒ‹‚ðƒI[ƒvƒ“‚Ü‚½‚Íì¬‚µ‚Ü‚·B</p>
 <pre>
 FRESULT f_open (
-  FIL* <em>FileObject</em>,       <span>/* ‹ó‚Ìƒtƒ@ƒCƒ‹EƒIƒuƒWƒFƒNƒg\‘¢‘Ì‚Ö‚Ìƒ|ƒCƒ“ƒ^ */</span>
-  const TCHAR* <em>FileName</em>, <span>/* ƒtƒ@ƒCƒ‹‚Ìƒtƒ‹ƒpƒX–¼‚Ö‚Ìƒ|ƒCƒ“ƒ^ */</span>
-  BYTE <em>ModeFlags</em>         <span>/* ƒ‚[ƒhƒtƒ‰ƒO */</span>
+  FIL* <em>FileObject</em>,       <span class="c">/* ‹ó‚Ìƒtƒ@ƒCƒ‹EƒIƒuƒWƒFƒNƒg\‘¢‘Ì‚Ö‚Ìƒ|ƒCƒ“ƒ^ */</span>
+  const TCHAR* <em>FileName</em>, <span class="c">/* ƒtƒ@ƒCƒ‹‚Ìƒtƒ‹ƒpƒX–¼‚Ö‚Ìƒ|ƒCƒ“ƒ^ */</span>
+  BYTE <em>ModeFlags</em>         <span class="c">/* ƒ‚[ƒhƒtƒ‰ƒO */</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>“Ç‚Ýo‚µƒ‚[ƒh‚ÅŠJ‚«‚Ü‚·B“Ç‚Ý‘‚«‚·‚éê‡‚Í<tt>FA_WRITE</tt>‚Æ‹¤‚ÉŽw’è‚µ‚Ü‚·B</td></tr>
 <tr><td>FA_WRITE</td><td>‘‚«ž‚Ýƒ‚[ƒh‚ÅŠJ‚«‚Ü‚·B“Ç‚Ý‘‚«‚·‚éê‡‚Í<tt>FA_READ</tt>‚Æ‹¤‚ÉŽw’è‚µ‚Ü‚·B</td></tr>
 <tr><td>FA_OPEN_EXISTING</td><td>Šù‘¶‚Ìƒtƒ@ƒCƒ‹‚ðŠJ‚«‚Ü‚·Bƒtƒ@ƒCƒ‹‚ª–³‚¢‚Æ‚«‚ÍƒGƒ‰[‚É‚È‚è‚Ü‚·B(ƒfƒtƒHƒ‹ƒg)</td></tr>
-<tr><td>FA_OPEN_ALWAYS</td><td>Šù‘¶‚Ìƒtƒ@ƒCƒ‹‚ðŠJ‚«‚Ü‚·Bƒtƒ@ƒCƒ‹‚ª–³‚¢‚Æ‚«‚Íƒtƒ@ƒCƒ‹‚ðì¬‚µ‚Ü‚·B’Ç‹L‘€ì‚·‚éê‡‚ÍA‚±‚Ì•û–@‚ÅƒI[ƒvƒ“‚µ‚½ŒãA<tt>f_lseek()</tt>‚Åƒtƒ@ƒCƒ‹‚ÌÅŒã”ö‚ÉˆÚ“®‚µ‚Ä‚­‚¾‚³‚¢B</td></tr>
-<tr><td>FA_CREATE_NEW</td><td>ƒtƒ@ƒCƒ‹‚ðì¬‚µ‚Ü‚·B“¯–¼‚Ìƒtƒ@ƒCƒ‹‚ª‚ ‚éê‡‚ÍAƒGƒ‰[(FR_EXIST)‚É‚È‚è‚Ü‚·B</td></tr>
+<tr><td>FA_OPEN_ALWAYS</td><td>Šù‘¶‚Ìƒtƒ@ƒCƒ‹‚ðŠJ‚«‚Ü‚·Bƒtƒ@ƒCƒ‹‚ª–³‚¢‚Æ‚«‚Íƒtƒ@ƒCƒ‹‚ðì¬‚µ‚Ü‚·B’Ç‹L‚Ìê‡‚ÍA‚±‚Ì•û–@‚ÅƒI[ƒvƒ“‚µ‚½ŒãA<a href="lseek.html">f_lseek()</a>‚Åƒtƒ@ƒCƒ‹‚ÌÅŒã”ö‚ÉˆÚ“®‚µ‚Ä‚­‚¾‚³‚¢B</td></tr>
+<tr><td>FA_CREATE_NEW</td><td>ƒtƒ@ƒCƒ‹‚ðì¬‚µ‚Ü‚·B“¯–¼‚Ìƒtƒ@ƒCƒ‹‚ª‚ ‚éê‡‚ÍA<tt>FR_EXIST</tt>‚ÅŽ¸”s‚µ‚Ü‚·B</td></tr>
 <tr><td>FA_CREATE_ALWAYS</td><td>ƒtƒ@ƒCƒ‹‚ðì¬‚µ‚Ü‚·B“¯–¼‚Ìƒtƒ@ƒCƒ‹‚ª‚ ‚éê‡‚ÍAƒTƒCƒY‚ð0‚É‚µ‚Ä‚©‚çŠJ‚«‚Ü‚·B</td></tr>
 </table>
 </dd>
@@ -46,96 +46,80 @@ FRESULT f_open (
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>–ß‚è’l</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>³íI—¹BˆÈ~A<tt>FileObject</tt>\‘¢‘Ì‚ðŽg‚Á‚Ä‚±‚Ìƒtƒ@ƒCƒ‹‚ð‘€ì‚Å‚«‚Ü‚·B</dd>
-<dt>FR_NO_FILE</dt>
-<dd>ƒtƒ@ƒCƒ‹‚ªŒ©‚Â‚©‚ç‚È‚¢B</dd>
-<dt>FR_NO_PATH</dt>
-<dd>ƒpƒX‚ªŒ©‚Â‚©‚ç‚È‚¢B</dd>
-<dt>FR_INVALID_NAME</dt>
-<dd>ƒtƒ@ƒCƒ‹–¼‚ª•s³B</dd>
-<dt>FR_INVALID_DRIVE</dt>
-<dd>ƒhƒ‰ƒCƒu”Ô†‚ª•s³B</dd>
-<dt>FR_EXIST</dt>
-<dd>“¯–¼‚Ìƒtƒ@ƒCƒ‹‚ªŠù‚É‘¶Ý‚·‚éB</dd>
-<dt>FR_DENIED</dt>
-<dd>ƒAƒNƒZƒX‚ª‹‘”Û‚³‚ê‚½B
-<ul>
-<li>ƒŠ[ƒhEƒIƒ“ƒŠ[Eƒtƒ@ƒCƒ‹‚Ì‘‚«ž‚Ýƒ‚[ƒhEƒI[ƒvƒ“B</li>
-<li>“¯–¼‚ÌƒfƒBƒŒƒNƒgƒŠ‚Ü‚½‚ÍƒŠ[ƒhEƒIƒ“ƒŠ[Eƒtƒ@ƒCƒ‹‚ª‚ ‚éó‘Ô‚Å‚Ìƒtƒ@ƒCƒ‹ì¬B</li>
-<li>ƒfƒBƒŒƒNƒgƒŠEƒe[ƒuƒ‹‚ª–ž”t‚Åƒtƒ@ƒCƒ‹‚ðì¬‚Å‚«‚È‚¢B</li>
-</ul>
-</dd>
-<dt>FR_NOT_READY</dt>
-<dd>ƒƒfƒBƒA‚ªƒZƒbƒg‚³‚ê‚Ä‚¢‚È‚¢‚È‚ÇA•¨—ƒhƒ‰ƒCƒu‚ª“®ì•s”\ó‘ÔB</dd>
-<dt>FR_WRITE_PROTECTED</dt>
-<dd>ƒƒfƒBƒA‚ª‘‚«ž‚Ý‹ÖŽ~ó‘Ô‚Å‘‚«ž‚ÝŒnƒI[ƒvƒ“‚ð‚µ‚½B</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>ƒfƒBƒXƒNEƒGƒ‰[‚É‚æ‚éŽ¸”sB</dd>
-<dt>FR_INT_ERR</dt>
-<dd>•s³‚ÈFAT\‘¢‚Ü‚½‚Í“à•”ƒGƒ‰[‚É‚æ‚éŽ¸”sB</dd>
-<dt>FR_NOT_ENABLED</dt>
-<dd>‚»‚Ì˜_—ƒhƒ‰ƒCƒu‚Éƒ[ƒNEƒGƒŠƒA‚ªŠ„‚è“–‚Ä‚ç‚ê‚Ä‚¢‚È‚¢B</dd>
-<dt>FR_NO_FILESYSTEM</dt>
-<dd>—LŒø‚ÈFATƒ{ƒŠƒ…[ƒ€‚ªŒ©‚Â‚©‚ç‚È‚¢B</dd>
-<dt>FR_LOCKED</dt>
-<dd>ƒtƒ@ƒCƒ‹‹¤—L‹@”\(_FS_SHARE)‚É‚æ‚éƒAƒNƒZƒX‹‘”ÛB</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>Šù‘¶‚Ìƒtƒ@ƒCƒ‹‚ðŠJ‚¢‚½‚èAV‚µ‚¢ƒtƒ@ƒCƒ‹‚ðì¬‚µ‚Ü‚·BŠÖ”‚ª¬Œ÷‚·‚é‚Æƒtƒ@ƒCƒ‹EƒIƒuƒWƒFƒNƒg‚ªì¬‚³‚êAˆÈ~‚»‚Ìƒtƒ@ƒCƒ‹‚É‘Î‚·‚éƒAƒNƒZƒX‚ÉŽg—p‚µ‚Ü‚·Bƒtƒ@ƒCƒ‹‚ð•Â‚¶‚é‚Æ‚«‚ÍA<a href="close.html">f_close()</a>‚ðŽg—p‚µ‚Ü‚·B‰½‚ç‚©‚Ì•ÏX‚ªs‚í‚ê‚½ƒtƒ@ƒCƒ‹‚ª‚»‚ÌŒã³‚µ‚­•Â‚¶‚ç‚ê‚È‚©‚Á‚½ê‡A‚»‚Ìƒtƒ@ƒCƒ‹‚ª”j‘¹‚·‚éê‡‚ª‚ ‚è‚Ü‚·B</p>
+<p>‚à‚µ‚àŠù‚ÉŠJ‚©‚ê‚Ä‚¢‚éƒtƒ@ƒCƒ‹‚ðŠJ‚­•K—v‚ª‚ ‚éê‡‚ÍA<a href="appnote.html#dup">‘½dƒAƒNƒZƒX§Œä</a>‚ðŽQÆ‚µ‚Ä‚­‚¾‚³‚¢B</p>
 <p>ƒtƒ@ƒCƒ‹EƒAƒNƒZƒX‚ðŠJŽn‚·‚é‘O‚ÉA<a href="mount.html">f_mount()</a>‚ðŽg‚Á‚Ä‚»‚ê‚¼‚ê‚Ì˜_—ƒhƒ‰ƒCƒu‚Éƒ[ƒNEƒGƒŠƒA(ƒtƒ@ƒCƒ‹EƒVƒXƒeƒ€EƒIƒuƒWƒFƒNƒg)‚ð—^‚¦‚é•K—v‚ª‚ ‚è‚Ü‚·B‚±‚Ì‰Šú‰»‚ÌŒãA‚»‚Ì˜_—ƒhƒ‰ƒCƒu‚É‘Î‚µ‚Ä‘S‚Ä‚Ìƒtƒ@ƒCƒ‹ŠÖ”‚ªŽg‚¦‚é‚æ‚¤‚É‚È‚è‚Ü‚·B</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>‘Î‰žî•ñ</h4>
 <p>‘S‚Ä‚Ì\¬‚ÅŽg—p‰Â”\‚Å‚·B<tt>_FS_READONLY == 1</tt>‚Ì‚Æ‚«‚ÍA<tt>FA_WRITE, FA_CREATE_ALWAYS, FA_CREATE_NEW, FA_OPEN_ALWAYS</tt>‚ÌŠeƒtƒ‰ƒO‚ÍƒTƒ|[ƒg‚³‚ê‚Ü‚¹‚ñB</p>
 </div>
 
 
-<div class="para">
+<div class="para use">
 <h4>Žg—p—áiƒtƒ@ƒCƒ‹EƒRƒs[j</h4>
 <pre>
 void main (void)
 {
-    FATFS fs[2];         <span>/* ˜_—ƒhƒ‰ƒCƒu‚Ìƒ[ƒNEƒGƒŠƒA(ƒtƒ@ƒCƒ‹EƒVƒXƒeƒ€EƒIƒuƒWƒFƒNƒg) */</span>
-    FIL fsrc, fdst;      <span>/* ƒtƒ@ƒCƒ‹EƒIƒuƒWƒFƒNƒg */</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">/* ˜_—ƒhƒ‰ƒCƒu‚Ìƒ[ƒNEƒGƒŠƒA(ƒtƒ@ƒCƒ‹EƒVƒXƒeƒ€EƒIƒuƒWƒFƒNƒg) */</span>
+    FIL fsrc, fdst;      <span class="c">/* ƒtƒ@ƒCƒ‹EƒIƒuƒWƒFƒNƒg */</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>/* ƒhƒ‰ƒCƒu0,1‚Éƒ[ƒNEƒGƒŠƒA‚ð—^‚¦‚é (í‚É¬Œ÷‚·‚é) */</span>
+    <span class="c">/* ƒhƒ‰ƒCƒu0,1‚Éƒ[ƒNEƒGƒŠƒA‚ð—^‚¦‚é (í‚É¬Œ÷‚·‚é) */</span>
     f_mount(0, &amp;fs[0]);
     f_mount(1, &amp;fs[1]);
 
-    <span>/* ƒhƒ‰ƒCƒu1‚Ìƒ\[ƒXEƒtƒ@ƒCƒ‹‚ðŠJ‚­ */</span>
+    <span class="c">/* ƒhƒ‰ƒCƒu1‚Ìƒ\[ƒXEƒtƒ@ƒCƒ‹‚ðŠJ‚­ */</span>
     res = f_open(&amp;fsrc, "1:srcfile.dat", FA_OPEN_EXISTING | FA_READ);
     if (res) die(res);
 
-    <span>/* ƒhƒ‰ƒCƒu0‚ÉƒfƒXƒeƒBƒl[ƒVƒ‡ƒ“Eƒtƒ@ƒCƒ‹‚ðì¬‚·‚é */</span>
+    <span class="c">/* ƒhƒ‰ƒCƒu0‚ÉƒfƒXƒeƒBƒl[ƒVƒ‡ƒ“Eƒtƒ@ƒCƒ‹‚ðì¬‚·‚é */</span>
     res = f_open(&amp;fdst, "0:dstfile.dat", FA_CREATE_ALWAYS | FA_WRITE);
     if (res) die(res);
 
-    <span>/* ƒ\[ƒX‚©‚çƒfƒXƒeƒBƒl[ƒVƒ‡ƒ“‚ÉƒRƒs[‚·‚é */</span>
+    <span class="c">/* ƒ\[ƒX‚©‚çƒfƒXƒeƒBƒl[ƒVƒ‡ƒ“‚ÉƒRƒs[‚·‚é */</span>
     for (;;) {
         res = f_read(&amp;fsrc, buffer, sizeof(buffer), &amp;br);
-        if (res || br == 0) break;   <span>/* ƒGƒ‰[‚©ƒtƒ@ƒCƒ‹I’[ */</span>
+        if (res || br == 0) break;   <span class="c">/* ƒGƒ‰[‚©ƒtƒ@ƒCƒ‹I’[ */</span>
         res = f_write(&amp;fdst, buffer, br, &amp;bw);
-        if (res || bw &lt; br) break;   <span>/* ƒGƒ‰[‚©ƒfƒBƒXƒN–ž”t */</span>
+        if (res || bw &lt; br) break;   <span class="c">/* ƒGƒ‰[‚©ƒfƒBƒXƒN–ž”t */</span>
     }
 
-    <span>/* ‘S‚Ä‚Ìƒtƒ@ƒCƒ‹‚ð•Â‚¶‚é */</span>
+    <span class="c">/* ‘S‚Ä‚Ìƒtƒ@ƒCƒ‹‚ð•Â‚¶‚é */</span>
     f_close(&amp;fsrc);
     f_close(&amp;fdst);
 
-    <span>/* ƒ[ƒNEƒGƒŠƒA‚ðŠJ•ú‚·‚é */</span>
+    <span class="c">/* ƒ[ƒNEƒGƒŠƒA‚ðŠJ•ú‚·‚é */</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>ŽQÆ</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>ƒfƒBƒŒƒNƒgƒŠ‚ðŠJ‚«‚Ü‚·B</p>
 <pre>
 FRESULT f_opendir (
-  DIR* <em>DirObject</em>,       <span>/* ƒfƒBƒŒƒNƒgƒŠEƒuƒWƒFƒNƒg\‘¢‘Ì‚Ö‚Ìƒ|ƒCƒ“ƒ^ */</span>
-  const TCHAR* <em>DirName</em>  <span>/* ƒfƒBƒŒƒNƒgƒŠ–¼‚Ö‚Ìƒ|ƒCƒ“ƒ^ */</span>
+  DIR* <em>DirObject</em>,       <span class="c">/* ƒfƒBƒŒƒNƒgƒŠEƒuƒWƒFƒNƒg\‘¢‘Ì‚Ö‚Ìƒ|ƒCƒ“ƒ^ */</span>
+  const TCHAR* <em>DirName</em>  <span class="c">/* ƒfƒBƒŒƒNƒgƒŠ–¼‚Ö‚Ìƒ|ƒ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>–ß‚è’l</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>³íI—¹B</dd>
-<dt>FR_NO_PATH</dt>
-<dd>ƒpƒX‚ªŒ©‚Â‚©‚ç‚È‚¢B</dd>
-<dt>FR_INVALID_NAME</dt>
-<dd>ƒpƒX–¼‚ª•s³B</dd>
-<dt>FR_INVALID_DRIVE</dt>
-<dd>˜_—ƒhƒ‰ƒCƒu”Ô†‚ª•s³B</dd>
-<dt>FR_NOT_READY</dt>
-<dd>ƒƒfƒBƒA‚ªƒZƒbƒg‚³‚ê‚Ä‚¢‚È‚¢‚È‚ÇA•¨—ƒhƒ‰ƒCƒu‚ª“®ì•s”\ó‘ÔB</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>ƒfƒBƒXƒNEƒGƒ‰[‚É‚æ‚éŽ¸”sB</dd>
-<dt>FR_INT_ERR</dt>
-<dd>•s³‚ÈFAT\‘¢‚Ü‚½‚Í“à•”ƒGƒ‰[‚É‚æ‚éŽ¸”sB</dd>
-<dt>FR_NOT_ENABLED</dt>
-<dd>˜_—ƒhƒ‰ƒCƒu‚Éƒ[ƒNEƒGƒŠƒA‚ª—^‚¦‚ç‚ê‚Ä‚¢‚È‚¢B</dd>
-<dt>FR_NO_FILESYSTEM</dt>
-<dd>—LŒø‚ÈFATƒ{ƒŠƒ…[ƒ€‚ªŒ©‚Â‚©‚ç‚È‚¢B</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>ƒfƒBƒŒƒNƒgƒŠ‚ðŠJ‚«‚Ü‚·B³íI—¹‚µ‚½‚çA<tt>DirObject</tt>\‘¢‘Ì‚ðŽg‚Á‚Ä‚±‚ÌƒfƒBƒŒƒNƒgƒŠ‚Ì€–Ú‚ð‡ŽŸ“Ç‚Ýo‚¹‚Ü‚·B<tt>DirObject</tt>\‘¢‘Ì‚ÍŽg—pŒã‚Í”CˆÓ‚ÌŽž“_‚Å”jŠü‚Å‚«‚Ü‚·B</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>‘Î‰žî•ñ</h4>
 <p><tt>_FS_MINIMIZE &lt;= 1</tt>‚Ì‚Æ‚«Žg—p‰Â”\‚É‚È‚è‚Ü‚·B</p>
 </div>
 
 
-<div class="para">
+<div class="para ref">
 <h4>ŽQÆ</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>ƒtƒ@ƒCƒ‹‚É‘Ž®‰»•¶Žš—ñ‚ð‘‚«ž‚Ý‚Ü‚·B</p>
 <pre>
 int f_printf (
-  FIL* <em>FileObject</em>,      <span>/* ƒtƒ@ƒCƒ‹EƒIƒuƒWƒFƒNƒg */</span>
-  const TCHAR* <em>Foramt</em>,  <span>/* ‘Ž®§Œä•¶Žš—ñ */</span>
+  FIL* <em>FileObject</em>,      <span class="c">/* ƒtƒ@ƒCƒ‹EƒIƒuƒWƒFƒNƒg */</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>–ß‚è’l</h4>
 <p>•¶Žš—ñ‚ª³í‚É‘‚«ž‚Ü‚ê‚é‚Æ‘‚«ž‚Ü‚ê‚½•¶Žš”‚ª•Ô‚³‚ê‚Ü‚·BƒfƒBƒXƒN‚ª–ž”t‚Ü‚½‚Í‚»‚Ì‘¼ƒGƒ‰[‚É‚æ‚è³í‚É‘‚«ž‚Ü‚ê‚È‚©‚Á‚½‚Æ‚«‚ÍŠÖ”‚ÍŽ¸”s‚µ<tt>EOF (-1)</tt>‚ª•Ô‚³‚ê‚Ü‚·B</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>‚Ìƒ‰ƒbƒp[ŠÖ”‚Å‚·B‘Ž®§Œä‹@”\‚ÍƒTƒuƒZƒbƒg‚Æ‚È‚Á‚Ä‚¢‚ÄA‘Ž®§Œä•¶Žš‚ÍŽŸ‚ÉŽ¦‚·‚à‚Ì‚ªŽg—p‰Â”\‚Å‚·B</p>
 <ul>
 <li>ƒ^ƒCƒv: <tt>c C s S d D u U x X b B</tt></li>
 <li>¸“xŽw’è: <tt>l L</tt></li>
-<li>ƒtƒ‰ƒO: <tt>0</tt></li>
+<li>ƒtƒ‰ƒO: <tt>0 -</tt></li>
 </ul>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>‘Î‰žî•ñ</h4>
 <p><tt>_FS_READONLY == 0</tt>‚ÅAŠŽ‚Â<tt>_USE_STRFUNC</tt>‚ª 1‚Ü‚½‚Í 2‚Ì‚Æ‚«Žg—p‰Â”\‚É‚È‚è‚Ü‚·B2‚ÌŽž‚ÍAo—Í‚ÉŠÜ‚Ü‚ê‚é<tt>'\n'</tt>‚ª<tt>"\r\n"</tt>‚É“WŠJ‚³‚ê‚Äƒtƒ@ƒCƒ‹‚É‘‚«ž‚Ü‚ê‚Ü‚·B</p>
 <p>API‚ÉUnicode‚ª‘I‘ð‚³‚ê‚Ä‚¢‚é(<tt>_LFN_UNICODE</tt>‚ª1)‚Æ‚«‚ÍAUTF-8ƒGƒ“ƒR[ƒh‚Åƒtƒ@ƒCƒ‹‚É‘‚«ž‚Ý‚Ü‚·B‚»‚êˆÈŠO‚ÌŽž‚Í–³•ÏŠ·(1•¶Žš1ƒoƒCƒg)‚Å‘‚«ž‚Ý‚Ü‚·B</p>
 </div>
 
 
-<div class="para">
+<div class="para use">
 <h4>Žg—p—á</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">/* •‚“®¬”“_‚Í–¢ƒTƒ|[ƒg */</span>
 </pre>
 </div>
 
 
-<div class="para">
+<div class="para ref">
 <h4>ŽQÆ</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>ƒtƒ@ƒCƒ‹‚É•¶Žš‚ð‘‚«ž‚Ý‚Ü‚·B</p>
 <pre>
 int f_putc (
-  TCHAR <em>Chr</em>,        <span>/* ‘‚«ž‚Þ•¶Žš */</span>
-  FIL* <em>FileObject</em>   <span>/* ƒtƒ@ƒCƒ‹EƒIƒuƒWƒFƒNƒg */</span>
+  TCHAR <em>Chr</em>,        <span class="c">/* ‘‚«ž‚Þ•¶Žš */</span>
+  FIL* <em>FileObject</em>   <span class="c">/* ƒtƒ@ƒCƒ‹EƒIƒuƒWƒFƒNƒg */</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>–ß‚è’l</h4>
 <p>•¶Žš‚ª³í‚É‘‚«ž‚Ü‚ê‚é‚Æ‘‚«ž‚ñ‚¾•¶Žš‚ª•Ô‚³‚ê‚Ü‚·BƒfƒBƒXƒN‚ª–ž”t‚Ü‚½‚ÍƒGƒ‰[‚É‚æ‚è‘‚«ž‚Ü‚ê‚È‚©‚Á‚½‚Æ‚«‚Í<tt>EOF (-1)</tt>‚ª•Ô‚³‚ê‚Ü‚·B</p>
 <p>API‚ÉUnicode‚ª‘I‘ð‚³‚ê‚Ä‚¢‚é(<tt>_LFN_UNICODE</tt>‚ª1)‚Æ‚«‚ÍAUTF-8ƒGƒ“ƒR[ƒh‚Åƒtƒ@ƒCƒ‹‚É‘‚«ž‚Ý‚Ü‚·B‚»‚êˆÈŠO‚ÌŽž‚Í–³•ÏŠ·(1•¶Žš1ƒoƒCƒg)‚Å‘‚«ž‚Ý‚Ü‚·B</p>
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>‰ðà</h4>
 <p>1•¶Žš‚ðƒtƒ@ƒCƒ‹‚É‘‚«ž‚Ý‚Ü‚·B‚±‚ÌŠÖ”‚Í<a href="write.html">f_write()</a>‚Ìƒ‰ƒbƒp[ŠÖ”‚Å‚·B</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>‘Î‰žî•ñ</h4>
 <p><tt>_FS_READONLY == 0</tt>‚ÅAŠŽ‚Â<tt>_USE_STRFUNC</tt>‚ª 1‚Ü‚½‚Í 2‚Ì‚Æ‚«Žg—p‰Â”\‚Å‚·B2‚ðŽw’è‚·‚é‚ÆA<tt>'\n'</tt>‚Í<tt>"\r\n"</tt>‚É“WŠJ‚³‚ê‚Äƒtƒ@ƒCƒ‹‚É‘‚«ž‚Ü‚ê‚Ü‚·B</p>
 </div>
 
 
-<div class="para">
+<div class="para ref">
 <h4>ŽQÆ</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>ƒtƒ@ƒCƒ‹‚É•¶Žš—ñ‚ð‘‚«ž‚Ý‚Ü‚·B</p>
 <pre>
 int f_puts (
-  const TCHAR* <em>Str</em>,  <span>/* •¶Žš—ñ */</span>
-  FIL* <em>FileObject</em>    <span>/* ƒtƒ@ƒCƒ‹EƒIƒuƒWƒFƒNƒg */</span>
+  const TCHAR* <em>Str</em>,  <span class="c">/* •¶Žš—ñ */</span>
+  FIL* <em>FileObject</em>    <span class="c">/* ƒtƒ@ƒCƒ‹EƒIƒuƒWƒFƒNƒg */</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>–ß‚è’l</h4>
 <p>•¶Žš—ñ‚ª³í‚É‘‚«ž‚Ü‚ê‚é‚ÆA‘‚«ž‚Ü‚ê‚½•¶Žš”‚ª•Ô‚³‚ê‚Ü‚·BƒfƒBƒXƒN‚ª–ž”t‚Ü‚½‚ÍƒGƒ‰[‚É‚æ‚è³í‚É‘‚«ž‚Ü‚ê‚È‚©‚Á‚½‚Æ‚«‚Í<tt>EOF (-1)</tt>‚ª•Ô‚³‚ê‚Ü‚·B</p>
 <p>API‚ÉUnicode‚ª‘I‘ð‚³‚ê‚Ä‚¢‚é(<tt>_LFN_UNICODE</tt>‚ª1)‚Æ‚«‚ÍAUTF-8ƒGƒ“ƒR[ƒh‚Åƒtƒ@ƒCƒ‹‚É‘‚«ž‚Ý‚Ü‚·B‚»‚êˆÈŠO‚ÌŽž‚Í–³•ÏŠ·(1•¶Žš1ƒoƒCƒg)‚Å‘‚«ž‚Ý‚Ü‚·B</p>
 </div>
 
 
-<div class="para">
+<div class="para desc">
 <h4>‰ðà</h4>
 <p>•¶Žš—ñ‚ðƒtƒ@ƒCƒ‹‚É‘‚«ž‚Ý‚Ü‚·B‚±‚ÌŠÖ”‚Í<a href="putc.html">f_putc()</a>‚Ìƒ‰ƒbƒp[ŠÖ”‚Å‚·B</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>‘Î‰žî•ñ</h4>
 <p><tt>_FS_READONLY == 0</tt>‚ÅAŠŽ‚Â<tt>_USE_STRFUNC</tt>‚ª 1‚Ü‚½‚Í 2‚Ì‚Æ‚«Žg—p‰Â”\‚Å‚·B2‚ðŽw’è‚·‚é‚ÆA•¶Žš—ñ‚ÉŠÜ‚Ü‚ê‚é<tt>'\n'</tt>‚Í<tt>"\r\n"</tt>‚É“WŠJ‚³‚ê‚Äƒtƒ@ƒCƒ‹‚É‘‚«ž‚Ü‚ê‚Ü‚·B</p>
 </div>
 
 
-<div class="para">
+<div class="para ref">
 <h4>ŽQÆ</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ã‚¿ã‚¤ãƒ—ã®è¨ˆç®—ã«çŸ›ç›¾ãŒè¦‹ã¤ã‹ã£ãŸã€‚ã‚¯ãƒ©ã‚¹ã‚¿æ•°ãŒFATã‚¿ã‚¤ãƒ—ã®å¢ƒç•Œä»˜è¿‘ã«ãªã‚‹ã¨ãã«ç™ºç”Ÿã™ã‚‹å ´åˆãŒã‚ã‚Šã¾ã™ã€‚</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>ƒtƒ@ƒCƒ‹‚©‚çƒf[ƒ^‚ð“Ç‚Ýo‚µ‚Ü‚·B</p>
 <pre>
 FRESULT f_read (
-  FIL* <em>FileObject</em>,    <span>/* ƒtƒ@ƒCƒ‹EƒIƒuƒWƒFƒNƒg\‘¢‘Ì */</span>
-  void* <em>Buffer</em>,       <span>/* “Ç‚Ýo‚µ‚½ƒf[ƒ^‚ðŠi”[‚·‚éƒoƒbƒtƒ@ */</span>
-  UINT <em>ByteToRead</em>,    <span>/* “Ç‚Ýo‚·ƒoƒCƒg” */</span>
-  UINT* <em>ByteRead</em>      <span>/* “Ç‚Ýo‚³‚ê‚½ƒoƒCƒg” */</span>
+  FIL* <em>FileObject</em>,    <span class="c">/* ƒtƒ@ƒCƒ‹EƒIƒuƒWƒFƒNƒg\‘¢‘Ì */</span>
+  void* <em>Buffer</em>,       <span class="c">/* “Ç‚Ýo‚µ‚½ƒf[ƒ^‚ðŠi”[‚·‚éƒoƒbƒtƒ@ */</span>
+  UINT <em>ByteToRead</em>,    <span class="c">/* “Ç‚Ýo‚·ƒoƒCƒg” */</span>
+  UINT* <em>ByteRead</em>      <span class="c">/* “Ç‚Ýo‚³‚ê‚½ƒoƒCƒg” */</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>–ß‚è’l</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>³íI—¹B</dd>
-<dt>FR_DENIED</dt>
-<dd>”ñ“Ç‚Ýž‚Ýƒ‚[ƒh‚ÅŠJ‚¢‚½ƒtƒ@ƒCƒ‹‚©‚ç“Ç‚Ýž‚à‚¤‚Æ‚µ‚½B</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>ƒfƒBƒXƒNEƒGƒ‰[‚É‚æ‚éŽ¸”sB</dd>
-<dt>FR_INT_ERR</dt>
-<dd>•s³‚ÈFAT\‘¢‚Ü‚½‚Í“à•”ƒGƒ‰[‚É‚æ‚éŽ¸”sB</dd>
-<dt>FR_NOT_READY</dt>
-<dd>ƒƒfƒBƒA‚ªƒZƒbƒg‚³‚ê‚Ä‚¢‚È‚¢‚È‚ÇA•¨—ƒhƒ‰ƒCƒu‚ª“®ì•s”\ó‘ÔB</dd>
-<dt>FR_INVALID_OBJECT</dt>
-<dd>–³Œø‚Èƒtƒ@ƒCƒ‹EƒIƒuƒWƒFƒNƒgB</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>“Ç‚Ýž‚ÝŠJŽnˆÊ’u‚ÍAŒ»Ý‚ÌƒŠ[ƒh/ƒ‰ƒCƒgEƒ|ƒCƒ“ƒ^‚©‚ç‚É‚È‚è‚Ü‚·BƒŠ[ƒh/ƒ‰ƒCƒgEƒ|ƒCƒ“ƒ^‚Í“Ç‚Ýž‚Ü‚ê‚½ƒoƒCƒg”‚¾‚¯i‚Ý‚Ü‚·BŠÖ”‚ª³íI—¹‚µ‚½Œã‚ÍA<tt>*ByteRead</tt>‚Ì’l‚ðƒ`ƒFƒbƒN‚·‚×‚«‚Å‚·B<tt>*ByteRead</tt>‚ª<tt>ByteToRead</tt>‚æ‚è‚à¬‚³‚¢‚Æ‚«‚ÍA“Ç‚Ýž‚Ý’†‚Éƒtƒ@ƒCƒ‹‚ÌI’[‚É’B‚µ‚½‚±‚Æ‚ðŽ¦‚µ‚Ä‚¢‚Ü‚·B</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>‘Î‰žî•ñ</h4>
 <p>‘S‚Ä‚Ì\¬‚ÅŽg—p‰Â”\‚Å‚·B</p>
 </div>
 
 
-<div class="para">
+<div class="para ref">
 <h4>ŽQÆ</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>ƒfƒBƒŒƒNƒgƒŠ€–Ú‚ð“Ç‚Ýo‚µ‚Ü‚·</p>
 <pre>
 FRESULT f_readdir (
-  DIR* <em>DirObject</em>,    <span>/* ƒfƒBƒŒƒNƒgƒŠEƒuƒWƒFƒNƒg\‘¢‘Ì‚Ö‚Ìƒ|ƒCƒ“ƒ^ */</span>
-  FILINFO* <em>FileInfo</em>  <span>/* ƒtƒ@ƒCƒ‹î•ñ\‘¢‘Ì‚Ö‚Ìƒ|ƒCƒ“ƒ^ */</span>
+  DIR* <em>DirObject</em>,    <span class="c">/* ƒfƒBƒŒƒNƒgƒŠEƒuƒWƒFƒNƒg\‘¢‘Ì‚Ö‚Ìƒ|ƒCƒ“ƒ^ */</span>
+  FILINFO* <em>FileInfo</em>  <span class="c">/* ƒtƒ@ƒCƒ‹î•ñ\‘¢‘Ì‚Ö‚Ìƒ|ƒ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>–ß‚è’l</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>³íI—¹B</dd>
-<dt>FR_NOT_READY</dt>
-<dd>ƒƒfƒBƒA‚ªƒZƒbƒg‚³‚ê‚Ä‚¢‚È‚¢‚È‚ÇA•¨—ƒhƒ‰ƒCƒu‚ª“®ì•s”\ó‘ÔB</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>ƒfƒBƒXƒNEƒGƒ‰[‚É‚æ‚éŽ¸”sB</dd>
-<dt>FR_INT_ERR</dt>
-<dd>•s³‚ÈFAT\‘¢‚Ü‚½‚Í“à•”ƒGƒ‰[‚É‚æ‚éŽ¸”sB</dd>
-<dt>FR_INVALID_OBJECT</dt>
-<dd>–³Œø‚ÈƒfƒBƒŒƒNƒgƒŠEƒIƒuƒWƒFƒNƒgB</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>ƒfƒBƒŒƒNƒgƒŠ€–Ú‚ð‡ŽŸ“Ç‚Ýo‚µ‚Ü‚·B‚±‚ÌŠÖ”‚ðŒJ‚è•Ô‚µŽÀs‚·‚é‚±‚Æ‚É‚æ‚èƒfƒBƒŒƒNƒgƒŠ‚Ì‘S‚Ä‚Ì€–Ú‚ð“Ç‚Ýo‚·‚±‚Æ‚ª‚Å‚«‚Ü‚·B‘S‚Ä‚Ì€–Ú‚ð“Ç‚Ýo‚µA“Ç‚Ýo‚·€–Ú‚ª‚à‚¤–³‚¢‚Æ‚«‚ÍA<tt>f_name[]</tt>ƒƒ“ƒo‚Éƒkƒ‹•¶Žš—ñ‚ª•Ô‚³‚ê‚Ü‚·Bƒ{ƒŠƒ…[ƒ€Eƒ‰ƒxƒ‹‚Í“Ç‚Ýo‚·‚Æ‚«‚ÉŠü‚Ä‚ç‚êAŒ»‚ê‚é‚±‚Æ‚Í‚ ‚è‚Ü‚¹‚ñB"."A".."‚ÍA‘Š‘ÎƒpƒX‚ª—LŒø‚È‚Æ‚«(<tt>_FS_RPATH == 1</tt>)‚É‚Ì‚ÝŒ»‚ê‚Ü‚·B“¾‚ç‚ê‚éƒtƒ@ƒCƒ‹î•ñ‚ÌÚ×‚É‚Â‚¢‚Ä‚Í <tt>FILINFO</tt>\‘¢‘Ì‚ðŽQÆ‚µ‚Ä‚­‚¾‚³‚¢BFileInfo‚Éƒkƒ‹Eƒ|ƒCƒ“ƒ^‚ðŽw’è‚·‚é‚ÆA‚»‚ÌƒfƒBƒŒƒNƒgƒŠ‚ÌƒŠ[ƒhEƒCƒ“ƒfƒbƒNƒX‚ðŠª‚«–ß‚µ‚Ü‚·B</p>
-<p>LFN‹@”\‚ª—LŒø‚ÈŽž‚ÍAf_readdirŠÖ”‚ÌŒÄ‚Ño‚µ‚Éæ—§‚Á‚ÄFILINFO\‘¢‘Ì‚Ì<tt>lfname</tt>‚Æ<tt>lfsize</tt>‚ª—LŒø‚È’l‚Å‰Šú‰»‚³‚ê‚Ä‚¢‚È‚¯‚ê‚Î‚È‚è‚Ü‚¹‚ñB<tt>lfname</tt>‚ÍLFN‚ðŠi”[‚·‚éƒoƒbƒtƒ@‚ÅA<tt>lfsize</tt>‚Í‚»‚Ìƒoƒbƒtƒ@EƒTƒCƒY(•¶Žš”)‚Å‚·BŽŸ‚ÌðŒ‚Éˆê‚Â‚Å‚àŠY“–‚·‚éê‡‚ÍALFNŠi”[ƒoƒbƒtƒ@‚Éƒkƒ‹•¶Žš—ñ‚ª•Ô‚³‚ê‚Ü‚·B</p>
+<p>LFN‹@”\‚ª—LŒø‚ÈŽž‚ÍAf_readdirŠÖ”‚ÌŒÄ‚Ño‚µ‚Éæ—§‚Á‚ÄFILINFO\‘¢‘Ì‚Ì<tt>lfname</tt>‚Æ<tt>lfsize</tt>‚ª—LŒø‚È’l‚Å‰Šú‰»‚³‚ê‚Ä‚¢‚È‚¯‚ê‚Î‚È‚è‚Ü‚¹‚ñB<tt>lfname</tt>‚ÍLFN‚ðŠi”[‚·‚éƒoƒbƒtƒ@‚ÅA<tt>lfsize</tt>‚Í‚»‚Ìƒoƒbƒtƒ@EƒTƒCƒY(TCHAR)‚Å‚·BŽŸ‚ÌðŒ‚Éˆê‚Â‚Å‚àŠY“–‚·‚éê‡‚ÍALFNŠi”[ƒoƒbƒtƒ@‚Éƒkƒ‹•¶Žš—ñ‚ª•Ô‚³‚ê‚Ü‚·B</p>
 <ul>
 <li>‚»‚ÌƒfƒBƒŒƒNƒgƒŠ€–Ú‚ÉLFN‚ª‘¶Ý‚µ‚È‚¢B</li>
 <li>LFN‚Ì’·‚³‚É‘Î‚µ‚ÄLFNŠi”[ƒoƒbƒtƒ@‚Ü‚½‚ÍLFN‘€ìƒoƒbƒtƒ@‚ÌƒTƒCƒY‚ª•s\•ªB</li>
-<li>LFN‚ÉOEMƒR[ƒh‚É‘¶Ý‚µ‚È‚¢•¶Žš‚ªŠÜ‚Ü‚ê‚Ä‚¢‚éB(Unicode API‚Å‚Í‚È‚¢‚Æ‚«)</li>
+<li>LFN‚ÉŒ»Ý‚ÌOEMƒR[ƒh‚É‘¶Ý‚µ‚È‚¢•¶Žš‚ªŠÜ‚Ü‚ê‚Ä‚¢‚éB(Unicode API‚Å‚Í‚È‚¢‚Æ‚«)</li>
 </ul>
 <p>‚Ü‚½A<tt>lfname</tt>‚Éƒkƒ‹Eƒ|ƒCƒ“ƒ^‚ðŽw’è‚µ‚½ê‡‚ÍALFN‚ÉŠÖ‚µ‚Ä‰½‚à•Ô‚³‚ê‚Ü‚¹‚ñBLFN‚ª‘¶Ý‚µ‚È‚¢‚Æ‚«‚ÍA<tt>f_name[]</tt>ƒƒ“ƒo‚ÌSFN‚ÉASCII‰p¬•¶Žš‚ªŠÜ‚Ü‚ê‚éê‡‚ª‚ ‚è‚Ü‚·B</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>‘Î‰žî•ñ</h4>
 <p><tt>_FS_MINIMIZE &lt;= 1</tt>‚Ì‚Æ‚«‚ÉŽg—p‰Â”\‚Å‚·B</p>
 </div>
 
 
-<div class="para">
+<div class="para use">
 <h4>Žg—p—á</h4>
 <pre>
-FRESULT scan_files (char* path)
+FRESULT scan_files (
+    char* path        <span class="c">/* ŠJŽnƒm[ƒh (ƒ[ƒNƒGƒŠƒA‚Æ‚µ‚Ä‚àŽg—p) */</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\¬‚ð‘z’è */</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">/* ƒfƒBƒŒƒNƒgƒŠ‚ðŠJ‚­ */</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">/* ƒfƒBƒŒƒNƒgƒŠ€–Ú‚ð1ŒÂ“Ç‚Ýo‚· */</span>
+            if (res != FR_OK || fno.fname[0] == 0) break;  <span class="c">/* ƒGƒ‰[‚Ü‚½‚Í€–Ú–³‚µ‚Ì‚Æ‚«‚Í”²‚¯‚é */</span>
+            if (fno.fname[0] == '.') continue;             <span class="c">/* ƒhƒbƒgƒGƒ“ƒgƒŠ‚Í–³Ž‹ */</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">/* ƒfƒBƒŒƒNƒgƒŠ */</span>
                 sprintf(&amp;path[i], "/%s", fn);
                 res = scan_files(path);
                 if (res != FR_OK) break;
                 path[i] = 0;
-            } else {
+            } else {                                       <span class="c">/* ƒtƒ@ƒ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>ŽQÆ</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>ƒIƒuƒWƒFƒNƒg‚Ì–¼‘O‚Ì•ÏX‚Ü‚½‚ÍˆÚ“®B</p>
 <pre>
 FRESULT f_rename (
-  const TCHAR* <em>OldName</em>, <span>/* ŒÃ‚¢ƒIƒuƒWƒFƒNƒg–¼ */</span>
-  const TCHAR* <em>NewName</em>  <span>/* V‚µ‚¢ƒIƒuƒWƒFƒNƒg–¼ */</span>
+  const TCHAR* <em>OldName</em>, <span class="c">/* ŒÃ‚¢ƒIƒuƒWƒFƒNƒg–¼ */</span>
+  const TCHAR* <em>NewName</em>  <span class="c">/* V‚µ‚¢ƒIƒuƒWƒFƒNƒg–¼ */</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>–ß‚è’l</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>³íI—¹B</dd>
-<dt>FR_NO_FILE</dt>
-<dd>OldName‚ÌƒIƒuƒWƒFƒNƒg‚ªŒ©‚Â‚©‚ç‚È‚¢B</dd>
-<dt>FR_NO_PATH</dt>
-<dd>ƒpƒX‚ªŒ©‚Â‚©‚ç‚È‚¢B</dd>
-<dt>FR_INVALID_NAME</dt>
-<dd>ƒpƒX–¼‚ª•s³B</dd>
-<dt>FR_INVALID_DRIVE</dt>
-<dd>ƒhƒ‰ƒCƒu”Ô†‚ª•s³B</dd>
-<dt>FR_DENIED</dt>
-<dd>ƒhƒ‰ƒCƒu—e—Ê‚Ì•s‘«“™‚Ì——R‚ÅV‚µ‚¢–¼‘O‚ÌƒIƒuƒWƒFƒNƒg‚ªì‚ê‚È‚¢B</dd>
-<dt>FR_EXIST</dt>
-<dd>NewName‚Æ“¯‚¶–¼‘O‚ªŠù‚É‘¶Ý‚·‚éB</dd>
-<dt>FR_NOT_READY</dt>
-<dd>ƒƒfƒBƒA‚ªƒZƒbƒg‚³‚ê‚Ä‚¢‚È‚¢‚È‚ÇA•¨—ƒhƒ‰ƒCƒu‚ª“®ì•s”\ó‘ÔB</dd>
-<dt>FR_WRITE_PROTECTED</dt>
-<dd>ƒƒfƒBƒA‚ª‘‚«ž‚Ý‹ÖŽ~ó‘ÔB</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>ƒfƒBƒXƒNEƒGƒ‰[‚É‚æ‚éŽ¸”sB</dd>
-<dt>FR_INT_ERR</dt>
-<dd>•s³‚ÈFAT\‘¢‚Ü‚½‚Í“à•”ƒGƒ‰[‚É‚æ‚éŽ¸”sB</dd>
-<dt>FR_NOT_ENABLED</dt>
-<dd>˜_—ƒhƒ‰ƒCƒu‚Éƒ[ƒNƒGƒŠƒA‚ªŠ„‚è“–‚Ä‚ç‚ê‚Ä‚¢‚È‚¢B</dd>
-<dt>FR_NO_FILESYSTEM</dt>
-<dd>—LŒø‚ÈFATƒ{ƒŠƒ…[ƒ€‚ªŒ©‚Â‚©‚ç‚È‚¢B</dd>
-<dt>FR_LOCKED</dt>
-<dd>ƒtƒ@ƒCƒ‹‹¤—L‹@”\(_FS_SHARE)‚É‚æ‚éƒAƒNƒZƒX‹‘”ÛB</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>ƒIƒuƒWƒFƒNƒg‚Ì–¼‘O‚ð•ÏX‚µ‚Ü‚·B‚Ü‚½A•Ê‚ÌƒfƒBƒŒƒNƒgƒŠ‚Ö‚ÌˆÚ“®‚à‰Â”\‚Å‚·B<em>ŠJ‚©‚ê‚Ä‚¢‚éƒIƒuƒWƒFƒNƒg‚É‘Î‚µ‚ÄŽg—p‚µ‚Ä‚Í‚È‚è‚Ü‚¹‚ñ</em>B</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>‘Î‰žî•ñ</h4>
 <p><tt>_FS_READONLY == 0</tt>‚ÅAŠŽ‚Â<tt>_FS_MINIMIZE == 0</tt>‚Ì‚Æ‚«‚ÉŽg—p‰Â”\‚Å‚·B</p>
 </div>
 
 
-<div class="para">
+<div class="para use">
 <h4>Žg—p—á</h4>
 <pre>
-    <span>/* ƒtƒ@ƒCƒ‹‚Ü‚½‚ÍƒTƒuƒfƒBƒŒƒNƒgƒŠ‚Ì–¼‘O‚ð•ÏX‚·‚é */</span>
+    <span class="c">/* ƒtƒ@ƒCƒ‹‚Ü‚½‚ÍƒTƒuƒfƒBƒŒƒNƒgƒŠ‚Ì–¼‘O‚ð•ÏX‚·‚é */</span>
     f_rename("oldname.txt", "newname.txt");
 
-    <span>/* ƒtƒ@ƒCƒ‹‚Ü‚½‚ÍƒTƒuƒfƒBƒŒƒNƒgƒŠ‚Ì–¼‘O‚Ì•ÏX‚Æ•Ê‚ÌƒfƒBƒŒƒNƒgƒŠ‚Ö‚ÌˆÚ“® */</span>
+    <span class="c">/* ƒtƒ@ƒCƒ‹‚Ü‚½‚ÍƒTƒuƒfƒBƒŒƒNƒgƒŠ‚Ì–¼‘O‚Ì•ÏX‚Æ•Ê‚ÌƒfƒBƒŒƒNƒgƒŠ‚Ö‚ÌˆÚ“® */</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>\‘¢‘Ì‚ÍAf_opendir(), f_readdir()‚Ìƒ[ƒNEƒGƒŠƒA‚Æ‚µ‚ÄŽg—p‚³‚ê‚Ü‚·BƒAƒvƒŠƒP[ƒVƒ‡ƒ“‚©‚ç•ÏX‰Â”\‚Èƒƒ“ƒo‚Í‚ ‚è‚Ü‚¹‚ñB</p>
 <pre>
-typedef struct {
-    FATFS*  fs;        <span>/* eƒtƒ@ƒCƒ‹EƒVƒXƒeƒ€EƒIƒuƒWƒFƒNƒg‚Ö‚Ìƒ|ƒCƒ“ƒ^ */</span>
-    WORD    id;        <span>/* eƒtƒ@ƒCƒ‹EƒVƒXƒeƒ€EƒIƒuƒWƒFƒNƒg‚Ìƒ}ƒEƒ“ƒgID */</span>
-    WORD    index;     <span>/* ŽŸ‚É“Ç‚Ýo‚·ƒfƒBƒŒƒNƒgƒŠEƒCƒ“ƒfƒbƒNƒX”Ô† */</span>
-    DWORD   sclust;    <span>/* ƒfƒBƒŒƒNƒgƒŠŠJŽnƒNƒ‰ƒXƒ^ (0:ƒ‹[ƒg) */</span>
-    DWORD   clust;     <span>/* Œ»Ý‚ÌƒNƒ‰ƒXƒ^”Ô† */</span>
-    DWORD   sect;      <span>/* Œ»Ý‚ÌƒZƒNƒ^”Ô† */</span>
-    BYTE*   dir;       <span>/* Œ»Ý‚ÌSFNƒGƒ“ƒgƒŠ‚Ö‚Ìƒ|ƒCƒ“ƒ^ */</span>
-    BYTE*   fn;        <span>/* SFNƒoƒbƒtƒ@‚Ö‚Ìƒ|ƒCƒ“ƒ^ (in/out) {file[8],ext[3],status[1]} */</span>
-#if _USE_LFN
-    WCHAR*  lfn;       <span>/* LFNƒoƒbƒtƒ@‚Ö‚Ìƒ|ƒCƒ“ƒ^ */</span>
-    WORD    lfn_idx;   <span>/* ÅŒã‚Éƒ}ƒbƒ`‚µ‚½LFNƒGƒ“ƒgƒŠ‚ÌƒCƒ“ƒfƒbƒNƒX (0xFFFF:–³Œø) */</span>
-#endif
+<span class="k">typedef</span> <span class="k">struct</span> {
+    FATFS*  fs;        <span class="c">/* eƒtƒ@ƒCƒ‹EƒVƒXƒeƒ€EƒIƒuƒWƒFƒNƒg‚Ö‚Ìƒ|ƒCƒ“ƒ^ */</span>
+    WORD    id;        <span class="c">/* eƒtƒ@ƒCƒ‹EƒVƒXƒeƒ€EƒIƒuƒWƒFƒNƒg‚Ìƒ}ƒEƒ“ƒgID */</span>
+    WORD    index;     <span class="c">/* ŽŸ‚É“Ç‚Ýo‚·ƒfƒBƒŒƒNƒgƒŠEƒCƒ“ƒfƒbƒNƒX”Ô† */</span>
+    DWORD   sclust;    <span class="c">/* ƒfƒBƒŒƒNƒgƒŠŠJŽnƒNƒ‰ƒXƒ^ (0:ƒ‹[ƒg) */</span>
+    DWORD   clust;     <span class="c">/* Œ»Ý‚ÌƒNƒ‰ƒXƒ^”Ô† */</span>
+    DWORD   sect;      <span class="c">/* Œ»Ý‚ÌƒZƒNƒ^”Ô† */</span>
+    BYTE*   dir;       <span class="c">/* Œ»Ý‚ÌSFNƒGƒ“ƒgƒŠ‚Ö‚Ìƒ|ƒCƒ“ƒ^ */</span>
+    BYTE*   fn;        <span class="c">/* SFNƒoƒbƒtƒ@‚Ö‚Ìƒ|ƒCƒ“ƒ^ (in/out) {file[8],ext[3],status[1]} */</span>
+<span class="k">#if</span> _USE_LFN
+    WCHAR*  lfn;       <span class="c">/* LFNƒoƒbƒtƒ@‚Ö‚Ìƒ|ƒCƒ“ƒ^ */</span>
+    WORD    lfn_idx;   <span class="c">/* ÅŒã‚Éƒ}ƒbƒ`‚µ‚½LFNƒGƒ“ƒgƒŠ‚ÌƒCƒ“ƒfƒbƒNƒX (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>\‘¢‘Ì‚ÍAŒÂX‚Ì˜_—ƒhƒ‰ƒCƒu‚Ìƒ_ƒCƒiƒ~ƒbƒNEƒ[ƒNEƒGƒŠƒA‚ð•ÛŽ‚µAf_mount()‚ÅFatFsƒ‚ƒWƒ…[ƒ‹‚É“o˜^‚³‚ê‚Ü‚·B•W€ó‘Ô‚Å‚ÍŽŸ‚Ì‚æ‚¤‚Èƒƒ“ƒo‚É‚È‚Á‚Ä‚¢‚Ü‚·BƒAƒvƒŠƒP[ƒVƒ‡ƒ“‚©‚ç‘‚«Š·‚¦‰Â”\‚Èƒƒ“ƒo‚Í‚ ‚è‚Ü‚¹‚ñB</p>
+<p><tt>FATFS</tt>\‘¢‘Ì(ƒtƒ@ƒCƒ‹EƒVƒXƒeƒ€EƒIƒuƒWƒFƒNƒg)‚ÍAŒÂX‚Ì˜_—ƒhƒ‰ƒCƒu‚Ìƒ_ƒCƒiƒ~ƒbƒNEƒ[ƒNEƒGƒŠƒA‚ð•ÛŽ‚µAf_mount()‚ÅFatFsƒ‚ƒWƒ…[ƒ‹‚É“o˜^‚³‚ê‚Ü‚·B‰Šú‰»‚ªs‚í‚ê‚éƒ^ƒCƒ~ƒ“ƒO‚ÍAf_mount()‚Ü‚½‚ÍƒƒfƒBƒAŒðŠ·‚ÌŒã‚ÌÅ‰‚Ìƒtƒ@ƒCƒ‹EƒAƒNƒZƒX‚ÌŽž‚Å‚·BƒAƒvƒŠƒP[ƒVƒ‡ƒ“‚©‚ç‘‚«Š·‚¦‰Â”\‚Èƒƒ“ƒo‚Í‚ ‚è‚Ü‚¹‚ñB</p>
 
 <pre>
-typedef struct {
-    BYTE    fs_type;      <span>/* FATƒ^ƒCƒv */</span>
-    BYTE    drv;          <span>/* •¨—ƒhƒ‰ƒCƒu”Ô† */</span>
-    BYTE    csize;        <span>/* ƒNƒ‰ƒXƒ^“–‚½‚è‚ÌƒZƒNƒ^” */</span>
-    BYTE    n_fats;       <span>/* FAT‚Ì‘½d‰»” */</span>
-    BYTE    wflag;        <span>/* win[]ƒ_[ƒeƒBEƒtƒ‰ƒO */</span>
-    BYTE    fsi_flag;     <span>/* fsinfoƒ_[ƒeƒBEƒtƒ‰ƒO */</span>
-    WORD    id;           <span>/* ƒtƒ@ƒCƒ‹EƒVƒXƒeƒ€Eƒ}ƒEƒ“ƒgID */</span>
-    WORD    n_rootdir;    <span>/* ƒ‹[ƒgEƒfƒBƒŒƒNƒgƒŠ‚ÌƒGƒ“ƒgƒŠ” (FAT12/16) */</span>
-#if _MAX_SS != 512
-    WORD    ssize;        <span>/* ƒZƒNƒ^EƒTƒCƒY (‰Â•ÏƒZƒNƒ^’·‚Ì‚Ý) */</span>
-#endif
-#if _FS_REENTRANT
-    HANDLE  h_mutex;      <span>/* “¯ŠúƒIƒuƒWƒFƒNƒgID */</span>
-#endif
-#if !_FS_READONLY
-    DWORD   last_clust;   <span>/* ÅŒã‚ÉŠ„‚è“–‚Ä‚ç‚ê‚½ƒNƒ‰ƒXƒ^”Ô† */</span>
-    DWORD   free_clust;   <span>/* ‹ó‚«ƒNƒ‰ƒXƒ^” */</span>
-    DWORD   fsi_sector;   <span>/* fsinfoƒZƒNƒ^ (FAT32) */</span>
-#endif
-#if _FS_RPATH
-    DWORD   cdir;         <span>/* ƒJƒŒƒ“ƒgEƒfƒBƒŒƒNƒgƒŠ‚ÌƒNƒ‰ƒXƒ^ (0:ƒ‹[ƒg) */</span>
-#endif
-    DWORD   n_fatent;     <span>/* FAT‚ÌƒGƒ“ƒgƒŠ” (= ƒNƒ‰ƒXƒ^” + 2) */</span>
-    DWORD   fsize;        <span>/* FAT 1ŒÂ“–‚½‚è‚ÌƒZƒNƒ^” */</span>
-    DWORD   fatbase;      <span>/* FAT—ÌˆæŠJŽnƒZƒNƒ^ */</span>
-    DWORD   dirbase;      <span>/* ƒ‹[ƒgEƒfƒBƒŒƒNƒgƒŠŠJŽnƒZƒNƒ^ (FAT32: ƒNƒ‰ƒXƒ^”Ô†) */</span>
-    DWORD   database;     <span>/* ƒf[ƒ^—ÌˆæŠJŽn‹æƒZƒNƒ^ */</span>
-    DWORD   winsect;      <span>/* win[]‚ÉŒ»‚ê‚Ä‚¢‚éƒZƒNƒ^”Ô† */</span>
-    BYTE    win[_MAX_SS]; <span>/* ƒfƒBƒXƒNEƒAƒNƒZƒXEƒEƒBƒ“ƒhƒE */</span>
+<span class="k">typedef</span> <span class="k">struct</span> {
+    BYTE    fs_type;      <span class="c">/* FATƒ^ƒCƒv */</span>
+    BYTE    drv;          <span class="c">/* •¨—ƒhƒ‰ƒCƒu”Ô† */</span>
+    BYTE    csize;        <span class="c">/* ƒNƒ‰ƒXƒ^“–‚½‚è‚ÌƒZƒNƒ^” */</span>
+    BYTE    n_fats;       <span class="c">/* FAT‚Ì‘½d‰»” */</span>
+    BYTE    wflag;        <span class="c">/* win[]ƒ_[ƒeƒBEƒtƒ‰ƒO */</span>
+    BYTE    fsi_flag;     <span class="c">/* fsinfoƒ_[ƒeƒBEƒtƒ‰ƒO */</span>
+    WORD    id;           <span class="c">/* ƒtƒ@ƒCƒ‹EƒVƒXƒeƒ€Eƒ}ƒEƒ“ƒgID */</span>
+    WORD    n_rootdir;    <span class="c">/* ƒ‹[ƒgEƒfƒBƒŒƒNƒgƒŠ‚ÌƒGƒ“ƒgƒŠ” (FAT12/16) */</span>
+<span class="k">#if</span> _MAX_SS != 512
+    WORD    ssize;        <span class="c">/* ƒZƒNƒ^EƒTƒCƒY (‰Â•ÏƒZƒNƒ^’·‚Ì‚Ý) */</span>
+<span class="k">#endif</span>
+<span class="k">#if</span> _FS_REENTRANT
+    HANDLE  h_mutex;      <span class="c">/* “¯ŠúƒIƒuƒWƒFƒNƒgID */</span>
+<span class="k">#endif</span>
+<span class="k">#if</span> !_FS_READONLY
+    DWORD   last_clust;   <span class="c">/* ÅŒã‚ÉŠ„‚è“–‚Ä‚ç‚ê‚½ƒNƒ‰ƒXƒ^”Ô† */</span>
+    DWORD   free_clust;   <span class="c">/* ‹ó‚«ƒNƒ‰ƒXƒ^” */</span>
+    DWORD   fsi_sector;   <span class="c">/* fsinfoƒZƒNƒ^ (FAT32) */</span>
+<span class="k">#endif</span>
+<span class="k">#if</span> _FS_RPATH
+    DWORD   cdir;         <span class="c">/* ƒJƒŒƒ“ƒgEƒfƒBƒŒƒNƒgƒŠ‚ÌƒNƒ‰ƒXƒ^ (0:ƒ‹[ƒg) */</span>
+<span class="k">#endif</span>
+    DWORD   n_fatent;     <span class="c">/* FAT‚ÌƒGƒ“ƒgƒŠ” (= ƒNƒ‰ƒXƒ^” + 2) */</span>
+    DWORD   fsize;        <span class="c">/* FAT 1ŒÂ“–‚½‚è‚ÌƒZƒNƒ^” */</span>
+    DWORD   fatbase;      <span class="c">/* FAT—ÌˆæŠJŽnƒZƒNƒ^ */</span>
+    DWORD   dirbase;      <span class="c">/* ƒ‹[ƒgEƒfƒBƒŒƒNƒgƒŠŠJŽnƒZƒNƒ^ (FAT32: ƒNƒ‰ƒXƒ^”Ô†) */</span>
+    DWORD   database;     <span class="c">/* ƒf[ƒ^—ÌˆæŠJŽn‹æƒZƒNƒ^ */</span>
+    DWORD   winsect;      <span class="c">/* win[]‚ÉŒ»‚ê‚Ä‚¢‚éƒZƒNƒ^”Ô† */</span>
+    BYTE    win[_MAX_SS]; <span class="c">/* ƒfƒBƒXƒNEƒAƒNƒZƒXEƒEƒBƒ“ƒhƒE */</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>\‘¢‘Ì‚ÍAf_openŠÖ”‚Åì¬‚³‚êA‚»‚Ìƒtƒ@ƒCƒ‹‚Ìó‘Ô‚ð•ÛŽ‚µ‚Ü‚·B‚Ü‚½Af_closeŠÖ”‚Åƒtƒ@ƒCƒ‹‚ª•Â‚¶‚ç‚ê‚é‚Æ–³Œø‰»‚³‚ê‚Ü‚·BƒAƒvƒŠƒP[ƒVƒ‡ƒ“‚©‚ç‚Ì‘‚«Š·‚¦‚ª‰Â”\‚Èƒƒ“ƒo‚Í<tt>cltbl</tt>‚Ì‚Ý‚Å‚·B”ñƒ^ƒCƒj[\¬‚Å‚Í“à•”‚ÉƒZƒNƒ^Eƒoƒbƒtƒ@‚ªŠm•Û‚³‚ê‚é‚Ì‚ÅAƒTƒCƒY‚É’ˆÓ‚ª•K—v‚Å‚·B</p>
+<p><tt>FIL</tt>\‘¢‘Ì(ƒtƒ@ƒCƒ‹EƒIƒuƒWƒFƒNƒg)‚ÍAf_openŠÖ”‚Å‰Šú‰»‚³‚êAˆÈŒã‚»‚Ìƒtƒ@ƒCƒ‹‚Ìó‘Ô‚ð•ÛŽ‚µ‚Ü‚·B‚Ü‚½Af_closeŠÖ”‚Åƒtƒ@ƒCƒ‹‚ª•Â‚¶‚ç‚ê‚é‚Æ–³Œø‰»‚³‚ê‚Ü‚·BƒAƒvƒŠƒP[ƒVƒ‡ƒ“‚©‚ç‚Ì‘‚«Š·‚¦‚ª‰Â”\‚Èƒƒ“ƒo‚Í<tt>cltbl</tt>‚Ì‚Ý‚Å‚·B”ñƒ^ƒCƒj[\¬‚Å‚Í“à•”‚ÉƒZƒNƒ^Eƒoƒbƒtƒ@‚ªŠm•Û‚³‚ê‚é‚Ì‚ÅAƒTƒCƒY‚É’ˆÓ‚ª•K—v‚Å‚·B</p>
 
 <pre>
-typedef struct {
-    FATFS*  fs;           <span>/* eƒtƒ@ƒCƒ‹EƒVƒXƒeƒ€EƒIƒuƒWƒFƒNƒg‚Ö‚Ìƒ|ƒCƒ“ƒ^ */</span>
-    WORD    id;           <span>/* eƒtƒ@ƒCƒ‹EƒVƒXƒeƒ€EƒIƒuƒWƒFƒNƒg‚Ìƒ}ƒEƒ“ƒgID */</span>
-    BYTE    flag;         <span>/* ƒtƒ@ƒCƒ‹EƒXƒe[ƒ^ƒXEƒtƒ‰ƒO */</span>
+<span class="k">typedef</span> <span class="k">struct</span> {
+    FATFS*  fs;           <span class="c">/* eƒtƒ@ƒCƒ‹EƒVƒXƒeƒ€EƒIƒuƒWƒFƒNƒg‚Ö‚Ìƒ|ƒCƒ“ƒ^ */</span>
+    WORD    id;           <span class="c">/* eƒtƒ@ƒCƒ‹EƒVƒXƒeƒ€EƒIƒuƒWƒFƒNƒg‚Ìƒ}ƒEƒ“ƒgID */</span>
+    BYTE    flag;         <span class="c">/* ƒtƒ@ƒCƒ‹EƒXƒe[ƒ^ƒXEƒtƒ‰ƒO */</span>
     BYTE    pad1;
-    DWORD   fptr;         <span>/* ƒtƒ@ƒCƒ‹“Ç‚Ý‘‚«ƒ|ƒCƒ“ƒ^ (ƒtƒ@ƒCƒ‹æ“ª‚©‚ç‚ÌƒoƒCƒgEƒIƒtƒZƒbƒg) */</span>
-    DWORD   fsize;        <span>/* ƒtƒ@ƒCƒ‹EƒTƒCƒY(ƒoƒCƒg’PˆÊ) */</span>
-    DWORD   org_clust;    <span>/* ƒtƒ@ƒCƒ‹ŠJŽnƒNƒ‰ƒXƒ^”Ô† (0 on fsize==0) */</span>
-    DWORD   curr_clust;   <span>/* Œ»Ý‚ÌƒNƒ‰ƒXƒ^ */</span>
-    DWORD   dsect;        <span>/* Œ»Ý‚Ìƒf[ƒ^EƒZƒNƒ^ */</span>
-#if _FS_READONLY == 0
-    DWORD   dir_sect;     <span>/* ‚±‚Ìƒtƒ@ƒCƒ‹‚ÌƒfƒBƒŒƒNƒgƒŠEƒGƒ“ƒgƒŠ‚Ì‚ ‚éƒZƒNƒ^ */</span>
-    BYTE*   dir_ptr;      <span>/* ‚±‚Ìƒtƒ@ƒCƒ‹‚ÌƒfƒBƒŒƒNƒgƒŠ‚Ö‚Ìƒ|ƒCƒ“ƒ^ */</span>
-#endif
-#if _USE_FASTSEEK
-    DWORD*  cltbl;        <span>/* ƒtƒ@ƒCƒ‹‚ÌƒNƒ‰ƒXƒ^EƒŠƒ“ƒNî•ñ‚Ö‚Ìƒ|ƒCƒ“ƒ^ (Nulled on file open) */</span>
-#endif
-#if _FS_SHARE
-    UINT    lockid;       <span>/* ƒtƒ@ƒCƒ‹EƒƒbƒNID */</span>
-#endif
-#if !_FS_TINY
-    BYTE    buf[_MAX_SS]; <span>/* ƒf[ƒ^“]‘—ƒoƒbƒtƒ@ */</span>
-#endif
+    DWORD   fptr;         <span class="c">/* ƒtƒ@ƒCƒ‹“Ç‚Ý‘‚«ƒ|ƒCƒ“ƒ^ (ƒtƒ@ƒCƒ‹æ“ª‚©‚ç‚ÌƒoƒCƒgEƒIƒtƒZƒbƒg) */</span>
+    DWORD   fsize;        <span class="c">/* ƒtƒ@ƒCƒ‹EƒTƒCƒY(ƒoƒCƒg’PˆÊ) */</span>
+    DWORD   sclust;       <span class="c">/* ƒtƒ@ƒCƒ‹ŠJŽnƒNƒ‰ƒXƒ^”Ô† (0 on fsize==0) */</span>
+    DWORD   clust;        <span class="c">/* Œ»Ý‚ÌƒNƒ‰ƒXƒ^ */</span>
+    DWORD   dsect;        <span class="c">/* Œ»Ý‚Ìƒf[ƒ^EƒZƒNƒ^ */</span>
+<span class="k">#if</span> _FS_READONLY == 0
+    DWORD   dir_sect;     <span class="c">/* ‚±‚Ìƒtƒ@ƒCƒ‹‚ÌƒfƒBƒŒƒNƒgƒŠEƒGƒ“ƒgƒŠ‚Ì‚ ‚éƒZƒNƒ^ */</span>
+    BYTE*   dir_ptr;      <span class="c">/* ‚±‚Ìƒtƒ@ƒCƒ‹‚ÌƒfƒBƒŒƒNƒgƒŠ‚Ö‚Ìƒ|ƒCƒ“ƒ^ */</span>
+<span class="k">#endif</span>
+<span class="k">#if</span> _USE_FASTSEEK
+    DWORD*  cltbl;        <span class="c">/* ƒtƒ@ƒCƒ‹‚ÌƒNƒ‰ƒXƒ^EƒŠƒ“ƒNî•ñ‚Ö‚Ìƒ|ƒCƒ“ƒ^ (Nulled on file open) */</span>
+<span class="k">#endif</span>
+<span class="k">#if</span> _FS_SHARE
+    UINT    lockid;       <span class="c">/* ƒtƒ@ƒCƒ‹EƒƒbƒNID */</span>
+<span class="k">#endif</span>
+<span class="k">#if</span> !_FS_TINY
+    BYTE    buf[_MAX_SS]; <span class="c">/* ƒf[ƒ^“]‘—ƒoƒbƒtƒ@ */</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>\‘¢‘Ì‚ÍA<tt>f_stat(), f_readdir()</tt>‚Å•Ô‚³‚ê‚éƒtƒ@ƒCƒ‹î•ñ‚ð•ÛŽ‚µ‚Ü‚·B</p>
 <pre>
-typedef struct {
-    DWORD fsize;     <span>/* ƒtƒ@ƒCƒ‹EƒTƒCƒY */</span>
-    WORD fdate;      <span>/* ÅŒã‚ÉXV‚³‚ê‚½“ú•t */</span>
-    WORD ftime;      <span>/* ÅŒã‚ÉXV‚³‚ê‚½Žž  */</span>
-    BYTE fattrib;    <span>/* ƒAƒgƒŠƒrƒ…[ƒg */</span>
-    TCHAR fname[13]; <span>/* ’Z‚¢ƒtƒ@ƒCƒ‹–¼ (8.3ƒtƒH[ƒ}ƒbƒg) */</span>
-#if _USE_LFN
-    TCHAR* lfname;   <span>/* ’·‚¢ƒtƒ@ƒCƒ‹–¼‚Ìƒoƒbƒtƒ@‚Ö‚Ìƒ|ƒCƒ“ƒ^ */</span>
-    int lfsize;      <span>/* ’·‚¢ƒtƒ@ƒCƒ‹–¼‚Ìƒoƒbƒtƒ@‚ÌƒTƒCƒY [•¶Žš”] */</span>
-#endif
+<span class="k">typedef</span> <span class="k">struct</span> {
+    DWORD fsize;     <span class="c">/* ƒtƒ@ƒCƒ‹EƒTƒCƒY */</span>
+    WORD fdate;      <span class="c">/* ÅŒã‚ÉXV‚³‚ê‚½“ú•t */</span>
+    WORD ftime;      <span class="c">/* ÅŒã‚ÉXV‚³‚ê‚½Žž  */</span>
+    BYTE fattrib;    <span class="c">/* ƒAƒgƒŠƒrƒ…[ƒg */</span>
+    TCHAR fname[13]; <span class="c">/* ’Z‚¢ƒtƒ@ƒCƒ‹–¼ (8.3ƒtƒH[ƒ}ƒbƒg) */</span>
+<span class="k">#if</span> _USE_LFN
+    TCHAR* lfname;   <span class="c">/* ’·‚¢ƒtƒ@ƒCƒ‹–¼‚Ìƒoƒbƒtƒ@‚Ö‚Ìƒ|ƒCƒ“ƒ^ */</span>
+    int lfsize;      <span class="c">/* ’·‚¢ƒtƒ@ƒCƒ‹–¼‚Ìƒoƒbƒtƒ@‚ÌƒTƒCƒY [•¶Žš”] */</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>ƒtƒ@ƒCƒ‹‚ÌƒTƒCƒY‚ðŽæ“¾‚µ‚Ü‚·B</p>
+<pre>
+DWORD f_size (
+  FIL* <em>FileObject</em>   <span class="c">/* ƒtƒ@ƒCƒ‹EƒIƒuƒWƒFƒNƒg */</span>
+);
+</pre>
+</div>
+
+
+<div class="para arg">
+<h4>ˆø”</h4>
+<dl class="par">
+<dt>FileObject</dt>
+<dd>ƒtƒ@ƒCƒ‹EƒIƒuƒWƒFƒNƒg\‘¢‘Ì‚Ö‚Ìƒ|ƒCƒ“ƒ^‚ðŽw’è‚µ‚Ü‚·B</dd>
+</dl>
+</div>
+
+
+<div class="para ret">
+<h4>–ß‚è’l</h4>
+<p>ƒoƒCƒg’PˆÊ‚Ìƒtƒ@ƒCƒ‹EƒTƒCƒY‚ª•Ô‚è‚Ü‚·B</p>
+</div>
+
+
+<div class="para desc">
+<h4>‰ðà</h4>
+<p>f_sizeŠÖ”‚ÍAŒ»ƒŠƒrƒWƒ‡ƒ“‚Å‚Íƒ}ƒNƒ‚Æ‚µ‚ÄŽÀ‘•‚³‚ê‚Ä‚¢‚Ü‚·B</p>
+<pre>
+<span class="k">#define</span> f_size(fp) ((fp)->fsize)
+</pre>
+</div>
+
+
+<div class="para comp">
+<h4>‘Î‰žî•ñ</h4>
+<p>í‚ÉŽg—p‰Â”\B</p>
+</div>
+
+
+<div class="para ref">
+<h4>ŽQÆ</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>/* ƒtƒ@ƒCƒ‹‚Ü‚½‚ÍƒfƒBƒŒƒNƒgƒŠ–¼‚Ö‚Ìƒ|ƒCƒ“ƒ^ */</span>
-  FILINFO* <em>FileInfo</em>       <span>/* ƒtƒ@ƒCƒ‹î•ñ\‘¢‘Ì‚Ö‚Ìƒ|ƒCƒ“ƒ^ */</span>
+  const TCHAR* <em>FileName</em>,  <span class="c">/* ƒtƒ@ƒCƒ‹‚Ü‚½‚ÍƒfƒBƒŒƒNƒgƒŠ–¼‚Ö‚Ìƒ|ƒCƒ“ƒ^ */</span>
+  FILINFO* <em>FileInfo</em>       <span class="c">/* ƒtƒ@ƒCƒ‹î•ñ\‘¢‘Ì‚Ö‚Ìƒ|ƒ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>–ß‚è’l</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>³íI—¹B</dd>
-<dt>FR_NO_FILE</dt>
-<dd>ƒtƒ@ƒCƒ‹‚Ü‚½‚ÍƒfƒBƒŒƒNƒgƒŠ‚ªŒ©‚Â‚©‚ç‚È‚¢B</dd>
-<dt>FR_NO_PATH</dt>
-<dd>ƒpƒX‚ªŒ©‚Â‚©‚ç‚È‚¢B</dd>
-<dt>FR_INVALID_NAME</dt>
-<dd>ƒpƒX–¼‚ª•s³B</dd>
-<dt>FR_INVALID_DRIVE</dt>
-<dd>˜_—ƒhƒ‰ƒCƒu”Ô†‚ª•s³B</dd>
-<dt>FR_NOT_READY</dt>
-<dd>ƒƒfƒBƒA‚ªƒZƒbƒg‚³‚ê‚Ä‚¢‚È‚¢‚È‚ÇA•¨—ƒhƒ‰ƒCƒu‚ª“®ì•s”\ó‘ÔB</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>ƒfƒBƒXƒNEƒGƒ‰[‚É‚æ‚éŽ¸”sB</dd>
-<dt>FR_INT_ERR</dt>
-<dd>•s³‚ÈFAT\‘¢‚Ü‚½‚Í“à•”ƒGƒ‰[‚É‚æ‚éŽ¸”sB</dd>
-<dt>FR_NOT_ENABLED</dt>
-<dd>˜_—ƒhƒ‰ƒCƒu‚Éƒ[ƒNƒGƒŠƒA‚ªŠ„‚è“–‚Ä‚ç‚ê‚Ä‚¢‚È‚¢B</dd>
-<dt>FR_NO_FILESYSTEM</dt>
-<dd>—LŒø‚ÈFATƒ{ƒŠƒ…[ƒ€‚ªŒ©‚Â‚©‚ç‚È‚¢B</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>ƒtƒ@ƒCƒ‹‚Ü‚½‚ÍƒfƒBƒŒƒNƒgƒŠ‚ÉŠÖ‚·‚éî•ñ‚ð“¾‚Ü‚·B“¾‚ç‚ê‚éƒtƒ@ƒCƒ‹î•ñ‚ÌÚ×‚É‚Â‚¢‚Ä‚Í <tt>FILINFO</tt>\‘¢‘Ì‚ðŽQÆ‚µ‚Ä‚­‚¾‚³‚¢B</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>‘Î‰žî•ñ</h4>
 <p><tt>_FS_MINIMIZE == 0</tt>‚Ì‚Æ‚«‚ÉŽg—p‰Â”\‚Å‚·B</p>
 </div>
 
 
-<div class="para">
+<div class="para ref">
 <h4>ŽQÆ</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>‘‚«ž‚Ý’†‚Ìƒtƒ@ƒCƒ‹‚ÌƒLƒƒƒbƒVƒ…‚³‚ê‚½î•ñ‚ðƒtƒ‰ƒbƒVƒ…‚µ‚Ü‚·B</p>
 <pre>
 FRESULT f_sync (
-  FIL* <em>FileObject</em>     <span>/* ƒtƒ@ƒCƒ‹EƒIƒuƒWƒFƒNƒg\‘¢‘Ì‚Ö‚Ìƒ|ƒCƒ“ƒ^ */</span>
+  FIL* <em>FileObject</em>     <span class="c">/* ƒtƒ@ƒCƒ‹EƒIƒuƒWƒFƒNƒg\‘¢‘Ì‚Ö‚Ìƒ|ƒ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>–ß‚è’l</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>³íI—¹B</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>ƒfƒBƒXƒNEƒGƒ‰[‚É‚æ‚éŽ¸”sB</dd>
-<dt>FR_INT_ERR</dt>
-<dd>•s³‚ÈFAT\‘¢‚Ü‚½‚Í“à•”ƒGƒ‰[‚É‚æ‚éŽ¸”sB</dd>
-<dt>FR_NOT_READY</dt>
-<dd>ƒƒfƒBƒA‚ªƒZƒbƒg‚³‚ê‚Ä‚¢‚È‚¢‚È‚ÇA•¨—ƒhƒ‰ƒCƒu‚ª“®ì•s”\ó‘ÔB</dd>
-<dt>FR_INVALID_OBJECT</dt>
-<dd>ƒtƒ@ƒCƒ‹EƒIƒuƒWƒFƒNƒg‚ª–³ŒøB</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>‚Æ“¯‚¶ˆ—‚ðŽÀs‚µ‚Ü‚·‚ªAƒtƒ@ƒCƒ‹‚Íˆø‚«‘±‚«ŠJ‚©‚ê‚½‚Ü‚Ü‚É‚È‚èA“Ç‚Ý‘‚«‚ð‘±s‚Å‚«‚Ü‚·BƒƒMƒ“ƒO‚È‚ÇA‘‚«ž‚Ýƒ‚[ƒh‚Å’·ŽžŠÔƒtƒ@ƒCƒ‹‚ªŠJ‚©‚ê‚Ä‚¢‚éƒAƒvƒŠƒP[ƒVƒ‡ƒ“‚É‚¨‚¢‚ÄA’èŠú“I‚Ü‚½‚Í‹æØ‚è‚Ì—Ç‚¢‚Æ‚±‚ë‚Å‚±‚ÌŠÖ”‚ðŽg—p‚·‚é‚±‚Æ‚É‚æ‚èA•sˆÓ‚Ì“dŒ¹’f‚âƒƒfƒBƒA‚ÌŽæ‚èŠO‚µ‚É‚æ‚èŽ¸‚í‚ê‚éƒf[ƒ^‚ðÅ¬‚É‚·‚é‚±‚Æ‚ª‚Å‚«‚Ü‚·BŽÀÛ‚Ì‚Æ‚±‚ëA<tt>f_close()</tt>“à‚Å‚Í‚±‚ÌŠÖ”‚ðŒÄ‚Ño‚µ‚½Œãƒtƒ@ƒCƒ‹EƒIƒuƒWƒFƒNƒg‚ð–³Œø‰»‚µ‚Ä‚¢‚é‚¾‚¯‚È‚Ì‚ÅA<tt>f_close()</tt>’¼‘O‚Ì<tt>f_sync()</tt>‚ÍˆÓ–¡‚ª‚ ‚è‚Ü‚¹‚ñB</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>‘Î‰žî•ñ</h4>
 <p><tt>_FS_READONLY == 0</tt>‚Ì‚Æ‚«‚ÉŽg—p‰Â”\‚Å‚·B</p>
 </div>
 
 
-<div class="para">
+<div class="para ref">
 <h4>ŽQÆ</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>Œ»Ý‚ÌƒŠ[ƒh/ƒ‰ƒCƒgEƒ|ƒCƒ“ƒ^‚ðŽæ“¾‚µ‚Ü‚·B</p>
+<pre>
+DWORD f_tell (
+  FIL* <em>FileObject</em>   <span class="c">/* ƒtƒ@ƒCƒ‹EƒIƒuƒWƒFƒNƒg */</span>
+);
+</pre>
+</div>
+
+
+<div class="para arg">
+<h4>ˆø”</h4>
+<dl class="par">
+<dt>FileObject</dt>
+<dd>ƒtƒ@ƒCƒ‹EƒIƒuƒWƒFƒNƒg\‘¢‘Ì‚Ö‚Ìƒ|ƒCƒ“ƒ^‚ðŽw’è‚µ‚Ü‚·B</dd>
+</dl>
+</div>
+
+
+<div class="para ret">
+<h4>–ß‚è’l</h4>
+<p>Œ»Ý‚ÌƒŠ[ƒh/ƒ‰ƒCƒgEƒ|ƒCƒ“ƒ^(ƒtƒ@ƒCƒ‹æ“ª‚©‚ç‚ÌƒoƒCƒg’PˆÊ‚ÌƒIƒtƒZƒbƒg)‚ª•Ô‚è‚Ü‚·B</p>
+</div>
+
+
+<div class="para desc">
+<h4>‰ðà</h4>
+<p>f_tellŠÖ”‚ÍAŒ»ƒŠƒrƒWƒ‡ƒ“‚Å‚Íƒ}ƒNƒ‚Æ‚µ‚ÄŽÀ‘•‚³‚ê‚Ä‚¢‚Ü‚·B</p>
+<pre>
+<span class="k">#define</span> f_tell(fp) ((fp)->fptr)
+</pre>
+</div>
+
+
+<div class="para comp">
+<h4>‘Î‰žî•ñ</h4>
+<p>í‚ÉŽg—p‰Â”\B</p>
+</div>
+
+
+<div class="para ref">
+<h4>ŽQÆ</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>ƒtƒ@ƒCƒ‹’·‚ðØ‚è‹l‚ß‚Ü‚·B</p>
 <pre>
 FRESULT f_truncate (
-  FIL* <em>FileObject</em>     <span>/* ƒtƒ@ƒCƒ‹EƒIƒuƒWƒFƒNƒg‚Ö‚Ìƒ|ƒCƒ“ƒ^ */</span>
+  FIL* <em>FileObject</em>     <span class="c">/* ƒtƒ@ƒCƒ‹EƒIƒuƒWƒFƒNƒg‚Ö‚Ìƒ|ƒ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>–ß‚è’l</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>³íI—¹B</dd>
-<dt>FR_DENIED</dt>
-<dd>ƒtƒ@ƒCƒ‹‚ª”ñ‘‚«ž‚Ýƒ‚[ƒh‚ÅŠJ‚©‚ê‚Ä‚¢‚éB</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>ƒfƒBƒXƒNEƒGƒ‰[‚É‚æ‚éŽ¸”sB</dd>
-<dt>FR_INT_ERR</dt>
-<dd>•s³‚ÈFAT\‘¢‚Ü‚½‚Í“à•”ƒGƒ‰[‚É‚æ‚éŽ¸”sB</dd>
-<dt>FR_NOT_READY</dt>
-<dd>ƒƒfƒBƒA‚ªƒZƒbƒg‚³‚ê‚Ä‚¢‚È‚¢‚È‚ÇA•¨—ƒhƒ‰ƒCƒu‚ª“®ì•s”\ó‘ÔB</dd>
-<dt>FR_INVALID_OBJECT</dt>
-<dd>–³Œø‚Èƒtƒ@ƒCƒ‹EƒIƒuƒWƒFƒNƒgB</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>ƒtƒ@ƒCƒ‹‚Ì’·‚³‚ªŒ»Ý‚ÌƒŠ[ƒh/ƒ‰ƒCƒgEƒ|ƒCƒ“ƒ^‚ÉØ‚è‹l‚ß‚ç‚ê‚Ü‚·BƒŠ[ƒh/ƒ‰ƒCƒgEƒ|ƒCƒ“ƒ^‚ªŠù‚Éƒtƒ@ƒCƒ‹‚ÌI’[‚ðŽw‚µ‚Ä‚¢‚é‚Æ‚«‚ÍA‚±‚ÌŠÖ”‚Í‰½‚ÌŒø‰Ê‚àŽ‚¿‚Ü‚¹‚ñB</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>‘Î‰žî•ñ</h4>
 <p><tt>_FS_READONLY == 0</tt>‚ÅAŠŽ‚Â<tt>_FS_MINIMIZE == 0</tt>‚Ì‚Æ‚«‚ÉŽg—p‰Â”\‚Å‚·B</p>
 </div>
 
 
-<div class="para">
+<div class="para ref">
 <h4>ŽQÆ</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>ƒIƒuƒWƒFƒNƒg‚ðíœ‚µ‚Ü‚·B</p>
+<p>ƒtƒ@ƒCƒ‹‚Ü‚½‚ÍƒfƒBƒŒƒNƒgƒŠ‚ðíœ‚µ‚Ü‚·B</p>
 <pre>
 FRESULT f_unlink (
-  const TCHAR* <em>FileName</em>  <span>/* ƒIƒuƒWƒFƒNƒg–¼‚Ö‚Ìƒ|ƒCƒ“ƒ^ */</span>
+  const TCHAR* <em>FileName</em>  <span class="c">/* ƒIƒuƒWƒFƒNƒg–¼‚Ö‚Ìƒ|ƒCƒ“ƒ^ */</span>
 );
 </pre>
 </div>
 
-<div class="para">
+<div class="para arg">
 <h4>ˆø”</h4>
 <dl class="par">
 <dt>FileName</dt>
-<dd>íœ‘ÎÛ‚Ì<a href="filename.html">ƒtƒ@ƒCƒ‹‚Ü‚½‚ÍƒfƒBƒŒƒNƒgƒŠ–¼</a>‚Ì“ü‚Á‚½<tt>'\0'</tt>‚ÅI‚í‚é•¶Žš—ñ‚Ö‚Ìƒ|ƒCƒ“ƒ^‚ðŽw’è‚µ‚Ü‚·B</dd>
+<dd>íœ‘ÎÛ‚Ì<a href="filename.html">ƒpƒX–¼</a>‚Ì“ü‚Á‚½<tt>'\0'</tt>‚ÅI‚í‚é•¶Žš—ñ‚Ö‚Ìƒ|ƒCƒ“ƒ^‚ðŽw’è‚µ‚Ü‚·B</dd>
 </dl>
 </div>
 
 
-<div class="para">
+<div class="para ret">
 <h4>–ß‚è’l</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>³íI—¹B</dd>
-<dt>FR_NO_FILE</dt>
-<dd>ƒtƒ@ƒCƒ‹‚ªŒ©‚Â‚©‚ç‚È‚¢B</dd>
-<dt>FR_NO_PATH</dt>
-<dd>ƒpƒX‚ªŒ©‚Â‚©‚ç‚È‚¢B</dd>
-<dt>FR_INVALID_NAME</dt>
-<dd>ƒpƒX–¼‚ª•s³B</dd>
-<dt>FR_INVALID_DRIVE</dt>
-<dd>ƒhƒ‰ƒCƒu”Ô†‚ª•s³B</dd>
-<dt>FR_DENIED</dt>
-<dd>‘ÎÛƒIƒuƒWƒFƒNƒg‚ªƒŠ[ƒhEƒIƒ“ƒŠ[‘®«A‹ó‚Å‚È‚¢ƒfƒBƒŒƒNƒgƒŠ‚âƒJƒŒƒ“ƒgEƒfƒBƒŒƒNƒgƒŠB</dd>
-<dt>FR_NOT_READY</dt>
-<dd>ƒƒfƒBƒA‚ªƒZƒbƒg‚³‚ê‚Ä‚¢‚È‚¢‚È‚ÇA•¨—ƒhƒ‰ƒCƒu‚ª“®ì•s”\ó‘ÔB</dd>
-<dt>FR_WRITE_PROTECTED</dt>
-<dd>ƒƒfƒBƒA‚ª‘‚«ž‚Ý‹ÖŽ~ó‘ÔB</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>ƒfƒBƒXƒNEƒGƒ‰[‚É‚æ‚éŽ¸”sB</dd>
-<dt>FR_INT_ERR</dt>
-<dd>•s³‚ÈFAT\‘¢‚Ü‚½‚Í“à•”ƒGƒ‰[‚É‚æ‚éŽ¸”sB</dd>
-<dt>FR_NOT_ENABLED</dt>
-<dd>˜_—ƒhƒ‰ƒCƒu‚Éƒ[ƒNEƒGƒŠƒA‚ªŠ„‚è“–‚Ä‚ç‚ê‚Ä‚¢‚È‚¢B</dd>
-<dt>FR_NO_FILESYSTEM</dt>
-<dd>—LŒø‚ÈFATƒ{ƒŠƒ…[ƒ€‚ªŒ©‚Â‚©‚ç‚È‚¢B</dd>
-<dt>FR_LOCKED</dt>
-<dd>ƒtƒ@ƒCƒ‹‹¤—L‹@”\(_FS_SHARE)‚É‚æ‚éƒAƒNƒZƒX‹‘”ÛB</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>ƒIƒuƒWƒFƒNƒg‚ðíœ‚µ‚Ü‚·B<em>ŠJ‚©‚ê‚Ä‚¢‚éƒIƒuƒWƒFƒNƒg‚Ííœ‚µ‚Ä‚Í‚È‚è‚Ü‚¹‚ñ</em>B</p>
+<p>íœ‘ÎÛ‚ÌƒIƒuƒWƒFƒN‚ªŽŸ‚ÌðŒ‚É“–‚Ä‚Í‚Ü‚éê‡A‚»‚ÌƒAƒNƒZƒX‚Í‹‘”Û‚³‚êŠÖ”‚ÍŽ¸”s‚µ‚Ü‚·B
+<ul>
+<li>ƒŠ[ƒhEƒIƒ“ƒŠ[‘®« (AM_RDO)‚ðŽ‚Á‚Ä‚¢‚éB</li>
+<li>‹ó‚Å‚È‚¢ƒfƒBƒŒƒNƒgƒŠ‚Ü‚½‚ÍƒJƒŒƒ“ƒgEƒfƒBƒŒƒNƒgƒŠB</li>
+<li>ŠJ‚©‚ê‚Ä‚¢‚éƒtƒ@ƒCƒ‹B‚±‚Ìê‡A<em>FAT\‘¢‚ª”j‰ó‚³‚ê‚é‰Â”\«</em>‚ª‚ ‚è‚Ü‚·B<a href="appnote.html#dup">‘½dƒAƒNƒZƒX§Œä</a>‚ª—LŒø‚È‚Æ‚«‚ÍAˆÀ‘S‚É‹‘”Û‚³‚ê‚Ü‚·B</li>
+</ul>
+</p>
 </div>
 
-<div class="para">
+<div class="para comp">
 <h4>‘Î‰žî•ñ</h4>
 <p><tt>_FS_READONLY == 0</tt>‚ÅAŠŽ‚Â<tt>_FS_MINIMIZE == 0</tt>‚Ì‚Æ‚«‚ÉŽg—p‰Â”\‚Å‚·B</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>ƒIƒuƒWƒFƒNƒg‚Ìƒ^ƒCƒ€ƒXƒ^ƒ“ƒv‚ð•ÏX‚µ‚Ü‚·B</p>
 <pre>
 FRESULT f_utime (
-  const TCHAR* <em>FileName</em>,   <span>/* ƒIƒuƒWƒFƒNƒg–¼‚Ö‚Ìƒ|ƒCƒ“ƒ^ */</span>
-  const FILINFO* <em>TimeDate</em>  <span>/* Ý’è‚·‚é“ú•t */</span>
+  const TCHAR* <em>FileName</em>,   <span class="c">/* ƒIƒuƒWƒFƒNƒg–¼‚Ö‚Ìƒ|ƒCƒ“ƒ^ */</span>
+  const FILINFO* <em>TimeDate</em>  <span class="c">/* Ý’è‚·‚é“ú•t */</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>–ß‚è’l</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>³íI—¹B</dd>
-<dt>FR_NO_FILE</dt>
-<dd>ƒtƒ@ƒCƒ‹‚ªŒ©‚Â‚©‚ç‚È‚¢B</dd>
-<dt>FR_NO_PATH</dt>
-<dd>ƒpƒX‚ªŒ©‚Â‚©‚ç‚È‚¢B</dd>
-<dt>FR_INVALID_NAME</dt>
-<dd>ƒpƒX–¼‚ª•s³B</dd>
-<dt>FR_INVALID_NAME</dt>
-<dd>˜_—ƒhƒ‰ƒCƒu”Ô†‚ª•s³B</dd>
-<dt>FR_NOT_READY</dt>
-<dd>ƒƒfƒBƒA‚ªƒZƒbƒg‚³‚ê‚Ä‚¢‚È‚¢‚È‚ÇA•¨—ƒhƒ‰ƒCƒu‚ª“®ì•s”\ó‘ÔB</dd>
-<dt>FR_WRITE_PROTECTED</dt>
-<dd>ƒƒfƒBƒA‚ª‘‚«ž‚Ý‹ÖŽ~ó‘ÔB</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>ƒfƒBƒXƒNEƒGƒ‰[‚É‚æ‚éŽ¸”sB</dd>
-<dt>FR_INT_ERR</dt>
-<dd>•s³‚ÈFAT\‘¢‚Ü‚½‚Í“à•”ƒGƒ‰[‚É‚æ‚éŽ¸”sB</dd>
-<dt>FR_NOT_ENABLED</dt>
-<dd>‚»‚Ì˜_—ƒhƒ‰ƒCƒu‚Éƒ[ƒNEƒGƒŠƒA‚ª—^‚¦‚ç‚ê‚Ä‚¢‚È‚¢B</dd>
-<dt>FR_NO_FILESYSTEM</dt>
-<dd>—LŒø‚ÈFATƒ{ƒŠƒ…[ƒ€‚ªŒ©‚Â‚©‚ç‚È‚¢B</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>ƒIƒuƒWƒFƒNƒg‚Ìƒ^ƒCƒ€ƒXƒ^ƒ“ƒv‚ð•ÏX‚µ‚Ü‚·B</p>
 </div>
 
 
-<div class="para">
+<div class="para use">
 <h4>Žg—p—á</h4>
 <pre>
 FRESULT set_timestamp (
-    char *obj,     <span>/* ƒtƒ@ƒCƒ‹–¼‚Ö‚Ìƒ|ƒCƒ“ƒ^ */</span>
+    char *obj,     <span class="c">/* ƒtƒ@ƒCƒ‹–¼‚Ö‚Ìƒ|ƒ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>‚ÅAŠŽ‚Â<tt>_FS_MINIMIZE == 0</tt>‚Ì‚Æ‚«‚ÉŽg—p‰Â”\‚Å‚·B</p>
 </div>
 
 
-<div class="para">
+<div class="para ref">
 <h4>ŽQÆ</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>ƒtƒ@ƒCƒ‹‚Éƒf[ƒ^‚ð‘‚«ž‚Ý‚Ü‚·B</p>
 <pre>
 FRESULT f_write (
-  FIL* <em>FileObject</em>,     <span>/* ƒtƒ@ƒCƒ‹EƒIƒuƒWƒFƒNƒg */</span>
-  const void* <em>Buffer</em>,  <span>/* ‘‚«ž‚Ýƒf[ƒ^ */</span>
-  UINT <em>ByteToWrite</em>,    <span>/* ‘‚«ž‚ÞƒoƒCƒg” */</span>
-  UINT* <em>ByteWritten</em>    <span>/* ‘‚«ž‚Ü‚ê‚½ƒoƒCƒg” */</span>
+  FIL* <em>FileObject</em>,     <span class="c">/* ƒtƒ@ƒCƒ‹EƒIƒuƒWƒFƒNƒg */</span>
+  const void* <em>Buffer</em>,  <span class="c">/* ‘‚«ž‚Ýƒf[ƒ^ */</span>
+  UINT <em>ByteToWrite</em>,    <span class="c">/* ‘‚«ž‚ÞƒoƒCƒg” */</span>
+  UINT* <em>ByteWritten</em>    <span class="c">/* ‘‚«ž‚Ü‚ê‚½ƒoƒCƒg” */</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>–ß‚è’l</h4>
-<dl class="ret">
-<dt>FR_OK (0)</dt>
-<dd>³íI—¹B</dd>
-<dt>FR_DISK_ERR</dt>
-<dd>ƒfƒBƒXƒNEƒGƒ‰[‚É‚æ‚éŽ¸”sB</dd>
-<dt>FR_INT_ERR</dt>
-<dd>•s³‚ÈFAT\‘¢‚Ü‚½‚Í“à•”ƒGƒ‰[‚É‚æ‚éŽ¸”sB</dd>
-<dt>FR_NOT_READY</dt>
-<dd>ƒƒfƒBƒA‚ªƒZƒbƒg‚³‚ê‚Ä‚¢‚È‚¢‚È‚ÇA•¨—ƒhƒ‰ƒCƒu‚ª“®ì•s”\ó‘ÔB</dd>
-<dt>FR_DENIED</dt>
-<dd>”ñ‘‚«ž‚Ýƒ‚[ƒh‚ÅŠJ‚©‚ê‚½ƒtƒ@ƒCƒ‹‚É‘‚«ž‚à‚¤‚Æ‚µ‚½B</dd>
-<dt>FR_INVALID_OBJECT</dt>
-<dd>–³Œø‚Èƒtƒ@ƒCƒ‹ƒIƒuƒWƒFƒNƒgB</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>‘‚«ž‚ÝŠJŽnˆÊ’u‚ÍAƒŠ[ƒh/ƒ‰ƒCƒgEƒ|ƒCƒ“ƒ^‚ÌˆÊ’u‚©‚ç‚É‚È‚è‚Ü‚·BƒŠ[ƒh/ƒ‰ƒCƒgEƒ|ƒCƒ“ƒ^‚ÍŽÀÛ‚É‘‚«ž‚Ü‚ê‚½ƒoƒCƒg”‚¾‚¯i‚Ý‚Ü‚·BŠÖ”‚ª³íI—¹‚µ‚½ŒãA—v‹‚µ‚½ƒoƒCƒg”‚ª‘‚«ž‚Ü‚ê‚½‚©‚Ç‚¤‚©<tt>*ByteWritten</tt>‚ðƒ`ƒFƒbƒN‚·‚×‚«‚Å‚·B<tt>*ByteWritten &lt; ByteToWrite</tt>‚Ì‚Æ‚«‚ÍAƒfƒBƒXƒNEƒtƒ‹‚ðˆÓ–¡‚µ‚Ü‚·BƒfƒBƒXƒNEƒtƒ‹‚ª”­¶‚µ‚Ä‚¢‚é‚Æ‚«‚Ü‚½‚Í‚»‚ê‚É‹ß‚¢‚Æ‚«‚ÍA§Œä‚ª‹A‚é‚Ü‚ÅŽžŠÔ‚ª‚©‚©‚éê‡‚ª‚ ‚è‚Ü‚·B</p>
 </div>
 
 
-<div class="para">
+<div class="para comp">
 <h4>‘Î‰žî•ñ</h4>
 <p><tt>_FS_READONLY == 0</tt>‚Ì‚Æ‚«‚ÉŽg—p‰Â”\‚Å‚·B</p>
 </div>
 
 
-<div class="para">
+<div class="para ref">
 <h4>ŽQÆ</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;
 }

Function	Required when:	Note
disk_initialize	Always	Disk I/O functions. Samples available in ffsample.zip. There are many implementations on the web.
disk_status	Always
disk_read	Always
disk_write	_FS_READONLY == 0
disk_ioctl (CTRL_SYNC)	_FS_READONLY == 0
disk_ioctl (GET_SECTOR_COUNT)	_USE_MKFS == 1
disk_ioctl (GET_SECTOR_SIZE)	_MAX_SS >= 1024
disk_ioctl (GET_BLOCK_SIZE)	_USE_MKFS == 1
disk_initialize disk_status disk_read	Always		Disk I/O functions. Samples available in ffsample.zip. There are many implementations on the web.
disk_write get_fattime disk_ioctl (CTRL_SYNC)	_FS_READONLY == 0
disk_ioctl (GET_SECTOR_COUNT) disk_ioctl (GET_BLOCK_SIZE)	_USE_MKFS == 1
disk_ioctl (GET_SECTOR_SIZE)	_MAX_SS > 512
disk_ioctl (CTRL_ERASE_SECTOR)	_USE_ERASE == 1
get_fattime	_FS_READONLY == 0
ff_convert	_USE_LFN >= 1	Unicode support functions. Available in option/cc*.c.
ff_wtoupper	_USE_LFN >= 1	Unicode support functions. Available in option/cc*.c.
ff_cre_syncobj	_FS_REENTRANT == 1	O/S dependent functions. Samples available in option/syscall.c.
ff_del_syncobj	_FS_REENTRANT == 1
ff_req_grant	_FS_REENTRANT == 1
ff_rel_grant	_FS_REENTRANT == 1
ff_mem_alloc	_USE_LFN == 3
ff_mem_free	_USE_LFN == 3
ff_convert ff_wtoupper	_USE_LFN >= 1	Unicode support functions. Available in option/cc*.c.
ff_cre_syncobj ff_del_syncobj ff_req_grant ff_rel_grant	_FS_REENTRANT == 1	O/S dependent functions. Samples available in option/syscall.c.
ff_mem_alloc ff_mem_free	_USE_LFN == 3
	AVR	H8/300H	PIC24	V850ES	SH-2A	ARM7	x86
Compiler	WinAVR(gcc)	CH38	C30(gcc)	CA850	SHC	WinARM(gcc)	VC6
_WORD_ACCESS	1	0	0	1	0	0	1
text (Full, R/W)	12646	10686	11430	7732	8752	10560	7545
text (Min, R/W)	8306	6986	7413	4938	5576	6680	4923
text (Full, R/O)	5960	4876	5250	3554	3804	4688	3450
text (Min, R/O)	4366	3770	3939	2684	2940	3452	2664
bss	D*2 + 2	D*4 + 2	D*2 + 2	D*4 + 2	D*4 + 2	D*4 + 2	D*4 + 2
Work area (_FS_TINY == 0)	D560 + F544	D560 + F550	D560 + F544	D560 + F550	D560 + F550	D560 + F550	D560 + F550
Work area (_FS_TINY == 1)	D560 + F32	D560 + F36	D560 + F32	D560 + F36	D560 + F36	D560 + F36	D560 + F36
	ARM7 32bit	ARM7 Thumb	Cortex-M3 Thumb-2	AVR	H8/300H	PIC24	RL78	V850ES	SH-2A	RX62N	IA-32
Compiler	GCC	GCC	GCC	GCC	CH38	C30	CC78K0R	CA850	SHC	RXC	VC6
_WORD_ACCESS	0	0	0	1	0	0	0	1	0	1	1
text (Full, R/W)	10495	7205	6661	12646	10686	11430	12967	7732	8752	5747	7545
text (Min, R/W)	6523	4749	4335	8306	6986	7413	8745	4938	5576	3746	4923
text (Full, R/O)	4539	3183	2893	5960	4876	5250	6060	3554	3804	2659	3450
text (Min, R/O)	3307	2495	2191	4366	3770	3939	4604	2684	2940	2025	2664
bss	D*4 + 2	D*4 + 2	D*4 + 2	D*2 + 2	D*4 + 2	D*2 + 2	D*2 + 2	D*4 + 2	D*4 + 2	D*4 + 2	D*4 + 2
Work area (_FS_TINY == 0)	V560 + F550	V560 + F550	V560 + F550	V560 + F544	V560 + F550	V560 + F544	V560 + F544	V560 + F544	V560 + F550	V560 + F550	V560 + F550
Work area (_FS_TINY == 1)	V560 + F36	V560 + F36	V560 + F36	V560 + F32	V560 + F36	V560 + F32	V560 + F32	V560 + F36	V560 + F36	V560 + F36	V560 + F36
Function	_FS_MINIMIZE				_FS_READONLY		_USE_STRFUNC		_FS_RPATH			_USE_MKFS		_USE_FORWARD
Function	0	1	2	3	0	1	0	1	0	1	2	0	1	0	1
0	1	2	3	0	1	0	1/2	0	1	2	0	1	0	1
f_mount
f_open
f_close
949(Korean)	+139K
950(Big5)	+111K
Value	Description
FA_READ	Specifies read access to the object. Data can be read from the file. Combine with FA_WRITE for read-write access.
FA_WRITE	Specifies write access to the object. Data can be written to the file. Combine with FA_READ for read-write access.
FA_READ	Specifies read access to the object. Data can be read from the file. Combine with `FA_WRITE` for read-write access.
FA_WRITE	Specifies write access to the object. Data can be written to the file. Combine with `FA_READ` for read-write access.
FA_OPEN_EXISTING	Opens the file. The function fails if the file is not existing. (Default)
FA_OPEN_ALWAYS	Opens the file if it is existing. If not, a new file is created. -To append data to the file, use f_lseek function after file open in this method.
FA_CREATE_NEW	Creates a new file. The function fails with FR_EXIST if the file is existing.
FA_CREATE_NEW	Creates a new file. The function fails with `FR_EXIST` if the file is existing.
FA_CREATE_ALWAYS	Creates a new file. If the file is existing, it is truncated and overwritten.
ãƒ¦ãƒ¼ã‚¶ä½œæˆé–¢æ•°	å¿…è¦ã¨ãªã‚‹æ¡ä»¶	å‚™è€ƒ
disk_initialize	å¸¸æ™‚	ffsample.zip (ã‚µãƒ³ãƒ—ãƒ«) ãã®ä»–webä¸Šã«å¤šæ•°
disk_status	å¸¸æ™‚
disk_read	å¸¸æ™‚
disk_write	_FS_READONLY == 0
disk_ioctl (CTRL_SYNC)	_FS_READONLY == 0
disk_ioctl (GET_SECTOR_COUNT)	_USE_MKFS == 1
disk_initialize disk_status disk_read	å¸¸æ™‚		ffsample.zip (ã‚µãƒ³ãƒ—ãƒ«) ãã®ä»–webä¸Šã«å¤šæ•°
disk_write get_fattime disk_ioctl (CTRL_SYNC)	_FS_READONLY == 0
disk_ioctl (GET_SECTOR_COUNT) disk_ioctl (GET_BLOCK_SIZE)	_USE_MKFS == 1
disk_ioctl (GET_SECTOR_SIZE)	_MAX_SS >= 1024
disk_ioctl (GET_BLOCK_SIZE)	_USE_MKFS == 1
disk_ioctl (CTRL_ERASE_SECTOR)	_USE_ERASE == 1
get_fattime	_FS_READONLY == 0
ff_convert	_USE_LFN >= 1	option/cc*.c
ff_wtoupper	_USE_LFN >= 1	option/cc*.c
ff_cre_syncobj	_FS_REENTRANT == 1	option/syscall.c (ã‚µãƒ³ãƒ—ãƒ«)
ff_del_syncobj	_FS_REENTRANT == 1
ff_req_grant	_FS_REENTRANT == 1
ff_rel_grant	_FS_REENTRANT == 1
ff_mem_alloc	_USE_LFN == 3
ff_mem_free	_USE_LFN == 3
ff_convert ff_wtoupper	_USE_LFN >= 1	option/cc*.c
ff_cre_syncobj ff_rel_grant ff_req_grant ff_del_syncobj	_FS_REENTRANT == 1	option/syscall.c (ã‚µãƒ³ãƒ—ãƒ«)
ff_mem_alloc ff_mem_free	_USE_LFN == 3	option/syscall.c (ã‚µãƒ³ãƒ—ãƒ«)
FA_READ	“Ç‚Ýo‚µƒ‚[ƒh‚ÅŠJ‚«‚Ü‚·B“Ç‚Ý‘‚«‚·‚éê‡‚Í`FA_WRITE`‚Æ‹¤‚ÉŽw’è‚µ‚Ü‚·B
FA_WRITE	‘‚«ž‚Ýƒ‚[ƒh‚ÅŠJ‚«‚Ü‚·B“Ç‚Ý‘‚«‚·‚éê‡‚Í`FA_READ`‚Æ‹¤‚ÉŽw’è‚µ‚Ü‚·B
FA_OPEN_EXISTING	Šù‘¶‚Ìƒtƒ@ƒCƒ‹‚ðŠJ‚«‚Ü‚·Bƒtƒ@ƒCƒ‹‚ª–³‚¢‚Æ‚«‚ÍƒGƒ‰[‚É‚È‚è‚Ü‚·B(ƒfƒtƒHƒ‹ƒg)
FA_OPEN_ALWAYS	Šù‘¶‚Ìƒtƒ@ƒCƒ‹‚ðŠJ‚«‚Ü‚·Bƒtƒ@ƒCƒ‹‚ª–³‚¢‚Æ‚«‚Íƒtƒ@ƒCƒ‹‚ðì¬‚µ‚Ü‚·B’Ç‹L‘€ì‚·‚éê‡‚ÍA‚±‚Ì•û–@‚ÅƒI[ƒvƒ“‚µ‚½ŒãA`f_lseek()`‚Åƒtƒ@ƒCƒ‹‚ÌÅŒã”ö‚ÉˆÚ“®‚µ‚Ä‚‚¾‚³‚¢B
FA_CREATE_NEW	ƒtƒ@ƒCƒ‹‚ðì¬‚µ‚Ü‚·B“¯–¼‚Ìƒtƒ@ƒCƒ‹‚ª‚ ‚éê‡‚ÍAƒGƒ‰[(FR_EXIST)‚É‚È‚è‚Ü‚·B
FA_OPEN_ALWAYS	Šù‘¶‚Ìƒtƒ@ƒCƒ‹‚ðŠJ‚«‚Ü‚·Bƒtƒ@ƒCƒ‹‚ª–³‚¢‚Æ‚«‚Íƒtƒ@ƒCƒ‹‚ðì¬‚µ‚Ü‚·B’Ç‹L‚Ìê‡‚ÍA‚±‚Ì•û–@‚ÅƒI[ƒvƒ“‚µ‚½ŒãAf_lseek()‚Åƒtƒ@ƒCƒ‹‚ÌÅŒã”ö‚ÉˆÚ“®‚µ‚Ä‚‚¾‚³‚¢B
FA_CREATE_NEW	ƒtƒ@ƒCƒ‹‚ðì¬‚µ‚Ü‚·B“¯–¼‚Ìƒtƒ@ƒCƒ‹‚ª‚ ‚éê‡‚ÍA`FR_EXIST`‚ÅŽ¸”s‚µ‚Ü‚·B
FA_CREATE_ALWAYS	ƒtƒ@ƒCƒ‹‚ðì¬‚µ‚Ü‚·B“¯–¼‚Ìƒtƒ@ƒCƒ‹‚ª‚ ‚éê‡‚ÍAƒTƒCƒY‚ð0‚É‚µ‚Ä‚©‚çŠJ‚«‚Ü‚·B