diff --git a/miosix/Makefile b/miosix/Makefile index 54e1ecdbf71323e027a92c872efdfc62522ee01f..a86880e135c56cac8844ab04489ae669f3a08157 100644 --- a/miosix/Makefile +++ b/miosix/Makefile @@ -25,6 +25,7 @@ filesystem/console/console_device.cpp \ filesystem/mountpointfs/mountpointfs.cpp \ filesystem/devfs/devfs.cpp \ filesystem/devfs/base_files.cpp \ +filesystem/fat32/fat32.cpp \ filesystem/fat32/ff.c \ filesystem/fat32/diskio.cpp \ stdlib_integration/libc_integration.cpp \ diff --git a/miosix/_doc/doxygen/Doxyfile b/miosix/_doc/doxygen/Doxyfile index 5985689f614515a1b6616f4b8cae76728a8b15a6..92a405a9dd92d460e895e216aa9f7c5a966870c8 100644 --- a/miosix/_doc/doxygen/Doxyfile +++ b/miosix/_doc/doxygen/Doxyfile @@ -31,7 +31,7 @@ PROJECT_NAME = Miosix # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 1.59 +PROJECT_NUMBER = 2.0alpha1 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. @@ -607,10 +607,10 @@ RECURSIVE = YES # excluded from the INPUT source files. This way you can easily exclude a # subdirectory from a directory tree whose root is specified with the INPUT tag. -EXCLUDE = ../../bootloaders \ - ../../temp \ - ../../arch \ - ../../compiler +EXCLUDE = ../../_doc \ + ../../_examples \ + ../../_tools \ + ../../arch # The EXCLUDE_SYMLINKS tag can be used select whether or not files or # directories that are symbolic links (a Unix filesystem feature) are excluded @@ -1356,7 +1356,7 @@ HIDE_UNDOC_RELATIONS = YES # toolkit from AT&T and Lucent Bell Labs. The other options in this section # have no effect if this option is set to NO (the default) -HAVE_DOT = NO +HAVE_DOT = YES # By default doxygen will write a font called FreeSans.ttf to the output # directory and reference it in all dot files that doxygen generates. This diff --git a/miosix/_doc/textdoc/Changelog.txt b/miosix/_doc/textdoc/Changelog.txt index 516d6f63d84c653355efe226e6a09aa7897e69af..d670b9121c52ae10ee491301396eefdb058674af 100644 --- a/miosix/_doc/textdoc/Changelog.txt +++ b/miosix/_doc/textdoc/Changelog.txt @@ -1,5 +1,13 @@ Changelog for Miosix np embedded OS +- Started work on integrating Fat32 in the new file abstraction layer. + Upgraded FatFs from 0.06 to 0.10. Added classes Fat32Fs and Fat32File +- Added an assertion in IntrusiveRefCountedSharedFromThis to help find + bugs. +- File abstraction layer: FilesystemBase now publicly derives from + IntrusiveRefCountedSharedFromThis to allow dynamic_casts +- File abstraction layer: added FilesystemBase::getFsId() +- File abstraction layer: added rmdir() - Implemented the nanosleep() syscall to support sleep() and usleep(). - Removed kernel/unistd.cpp as we're now relying in the implementation of sleep() and usleep() in newlib. diff --git a/miosix/_tools/testsuite/testsuite.cpp b/miosix/_tools/testsuite/testsuite.cpp index cb62ddcaaae76e2ea88038088fcd09227d8e2d61..6ba45b236bedf440e839ac710f854fa9d4fcb658 100644 --- a/miosix/_tools/testsuite/testsuite.cpp +++ b/miosix/_tools/testsuite/testsuite.cpp @@ -3409,7 +3409,7 @@ static volatile bool p1end,p2end,p3end,fs_1_error; static void fs_t1_p1(void *argv) { FILE *f; - if((f=fopen("/testdir/file_1.txt","w"))==NULL) + if((f=fopen("/sd/testdir/file_1.txt","w"))==NULL) { fs_1_error=true; p1end=true; @@ -3445,7 +3445,7 @@ static void fs_t1_p1(void *argv) static void fs_t1_p2(void *argv) { FILE *f; - if((f=fopen("/testdir/file_2.txt","w"))==NULL) + if((f=fopen("/sd/testdir/file_2.txt","w"))==NULL) { fs_1_error=true; p2end=true; @@ -3481,7 +3481,7 @@ static void fs_t1_p2(void *argv) static void fs_t1_p3(void *argv) { FILE *f; - if((f=fopen("/testdir/file_3.txt","w"))==NULL) + if((f=fopen("/sd/testdir/file_3.txt","w"))==NULL) { fs_1_error=true; p3end=true; @@ -3518,20 +3518,23 @@ static void fs_test_1() { test_name("C standard library file functions + mkdir()"); iprintf("Please wait (long test)\n"); - //Test mkdir (if possible) - int result=mkdir("/testdir",0); - switch(result) - { + //Test mkdir (if possible) + int result=mkdir("/sd/testdir",0); + switch(result) + { case 0: break; - case -2: - iprintf("Directory test not made because directory" + case -1: + if(errno==EEXIST) + { + iprintf("Directory test not made because directory" " already exists\n"); - break; + break; + } //else fallthrough default: iprintf("mkdir returned %d\n",result); fail("Directory::mkdir()"); - } - //Test concurrent file write access + } + //Test concurrent file write access p1end=false; p2end=false; p3end=false; @@ -3547,7 +3550,7 @@ static void fs_test_1() int i,j,k; FILE *f; //file_1.txt - if((f=fopen("/testdir/file_1.txt","r"))==NULL) + if((f=fopen("/sd/testdir/file_1.txt","r"))==NULL) fail("can't open file_1.txt"); setbuf(f,NULL); i=0; @@ -3562,7 +3565,7 @@ static void fs_test_1() if(i!=512*512) fail("file_1.txt : size error"); if(fclose(f)!=0) fail("Can't close file file_1.txt"); //file_2.txt - if((f=fopen("/testdir/file_2.txt","r"))==NULL) + if((f=fopen("/sd/testdir/file_2.txt","r"))==NULL) fail("can't open file_2.txt"); setbuf(f,NULL); i=0; @@ -3577,7 +3580,7 @@ static void fs_test_1() if(i!=512*512) fail("file_2.txt : size error"); if(fclose(f)!=0) fail("Can't close file file_2.txt"); //file_3.txt - if((f=fopen("/testdir/file_3.txt","r"))==NULL) + if((f=fopen("/sd/testdir/file_3.txt","r"))==NULL) fail("can't open file_3.txt"); setbuf(f,NULL); i=0; @@ -3592,17 +3595,17 @@ static void fs_test_1() if(fclose(f)!=0) fail("Can't close file file_3.txt"); delete[] buf; //Testing fprintf - if((f=fopen("/testdir/file_4.txt","w"))==NULL) + if((f=fopen("/sd/testdir/file_4.txt","w"))==NULL) fail("can't open w file_4.txt"); fprintf(f,"Hello world line 001\n"); if(fclose(f)!=0) fail("Can't close w file_4.txt"); //Testing append - if((f=fopen("/testdir/file_4.txt","a"))==NULL) + if((f=fopen("/sd/testdir/file_4.txt","a"))==NULL) fail("can't open a file_4.txt"); for(i=2;i<=128;i++) fprintf(f,"Hello world line %03d\n",i); if(fclose(f)!=0) fail("Can't close a file_4.txt"); //Reading to check (only first 2 lines) - if((f=fopen("/testdir/file_4.txt","r"))==NULL) + if((f=fopen("/sd/testdir/file_4.txt","r"))==NULL) fail("can't open r file_4.txt"); char line[80]; fgets(line,sizeof(line),f); @@ -3615,7 +3618,7 @@ static void fs_test_1() //Hello world line 002\n // ... //Hello world line 128\n - if((f=fopen("/testdir/file_4.txt","r"))==NULL) + if((f=fopen("/sd/testdir/file_4.txt","r"))==NULL) fail("can't open r2 file_4.txt"); if(ftell(f)!=0) fail("File opend but cursor not @ address 0"); fseek(f,-4,SEEK_END);//Seek to 128\n @@ -3643,11 +3646,11 @@ static void fs_test_1() } if(fclose(f)!=0) fail("Can't close r2 file_4.txt"); //Testing remove() - if((f=fopen("/testdir/deleteme.txt","w"))==NULL) + if((f=fopen("/sd/testdir/deleteme.txt","w"))==NULL) fail("can't open deleteme.txt"); if(fclose(f)!=0) fail("Can't close deleteme.txt"); - remove("/testdir/deleteme.txt"); - if((f=fopen("/testdir/deleteme.txt","r"))!=NULL) fail("remove() error"); + remove("/sd/testdir/deleteme.txt"); + if((f=fopen("/sd/testdir/deleteme.txt","r"))!=NULL) fail("remove() error"); pass(); } @@ -3693,8 +3696,8 @@ static void checkInDir(const std::string& d, bool createFile) const char dirname2[]="test2"; if(rename((d+dirname1).c_str(),(d+dirname2).c_str())) fail("rename"); if(checkDirContent(d,dirname2,dirname1)==false) fail("rename 2"); - if(remove((d+dirname2).c_str())) fail("remove"); - if(checkDirContent(d,0,dirname2)==false) fail("remove 2"); + if(rmdir((d+dirname2).c_str())) fail("rmdir"); + if(checkDirContent(d,0,dirname2)==false) fail("rmdir 2"); if(createFile==false) return; const char filename1[]="test.txt"; @@ -3712,8 +3715,8 @@ static void checkInDir(const std::string& d, bool createFile) fgets(s,sizeof(s),f); if(strcmp(s,teststr)) fail("file content after rename"); fclose(f); - if(remove((d+filename2).c_str())) fail("remove 3"); - if(checkDirContent(d,0,filename2)==false) fail("remove 4"); + if(unlink((d+filename2).c_str())) fail("unlink 3"); + if(checkDirContent(d,0,filename2)==false) fail("unlink 4"); } static void fs_test_2() @@ -3743,7 +3746,7 @@ static void fs_test_3() test_name("Large file check"); iprintf("Please wait (long test)\n"); - const char name[]="/testdir/file_5.dat"; + const char name[]="/sd/testdir/file_5.dat"; const unsigned int size=1024; const unsigned int numBlocks=2048; @@ -3812,7 +3815,7 @@ static void fs_test_4() if(parentInode!=1) fail(".."); #ifdef WITH_DEVFS if(devFsInode==0) fail("dev"); - curInode=0, parentInode=0, devFsInode=0; + curInode=0, parentInode=0; int nullInode=0, zeroInode=0; d=opendir("/dev"); if(d==NULL) fail("opendir"); @@ -3839,7 +3842,7 @@ static void fs_test_4() } closedir(d); if(curInode!=1) fail("."); - if(parentInode!=2) fail(".."); + if(parentInode!=devFsInode) fail(".."); if(nullInode!=2) fail("null"); if(zeroInode!=3) fail("zero"); #endif //WITH_DEVFS @@ -4011,7 +4014,7 @@ makes a 1MB file and measures time required to read/write it. static void benchmark_3() { //Write benchmark - const char FILENAME[]="/speed.txt"; + const char FILENAME[]="/sd/speed.txt"; const unsigned int BUFSIZE=1024; char *buf=new char[BUFSIZE]; memset ((void*)buf,'0',BUFSIZE); diff --git a/miosix/filesystem/devfs/devfs.cpp b/miosix/filesystem/devfs/devfs.cpp index 76fdd864449d2e878e775edcaa370bda3aa8c76b..cd5ff03958024e54dc7b8736c7b5aea927d78b4b 100644 --- a/miosix/filesystem/devfs/devfs.cpp +++ b/miosix/filesystem/devfs/devfs.cpp @@ -179,6 +179,11 @@ int DevFs::mkdir(StringPart& name, int mode) return -EACCES; // No directories support in DevFs yet } +int DevFs::rmdir(StringPart& name) +{ + return -EACCES; // No directories support in DevFs yet +} + bool DevFs::addDeviceFile(const char *name, DeviceFileWrapper dfw) { if(name==0 || name[0]=='\0') return false; diff --git a/miosix/filesystem/devfs/devfs.h b/miosix/filesystem/devfs/devfs.h index ea52e27a97c419efe6a87bcb3ff27f7995a4783a..228a799cf1b8444b44a3394098b84f95a09325d6 100644 --- a/miosix/filesystem/devfs/devfs.h +++ b/miosix/filesystem/devfs/devfs.h @@ -288,6 +288,13 @@ public: */ virtual int mkdir(StringPart& name, int mode); + /** + * Remove a directory if empty + * \param name directory name + * \return 0 on success, or a negative number on failure + */ + virtual int rmdir(StringPart& name); + private: //Forward decl class DeviceFileWrapper; diff --git a/miosix/filesystem/fat32/diskio.cpp b/miosix/filesystem/fat32/diskio.cpp index 47faee2c9be9ddfadf5172874c00ac27563079db..38bcf504a8d69f7277d2b2ef07f9b8692b16dd74 100644 --- a/miosix/filesystem/fat32/diskio.cpp +++ b/miosix/filesystem/fat32/diskio.cpp @@ -48,7 +48,7 @@ DRESULT disk_read ( BYTE drv, /* Physical drive nmuber (0..) */ BYTE *buff, /* Data buffer to store read data */ DWORD sector, /* Sector address (LBA) */ - BYTE count /* Number of sectors to read (1..255) */ + UINT count /* Number of sectors to read (1..255) */ ) { if(drv!=0 || count==0) return RES_PARERR; @@ -65,7 +65,7 @@ DRESULT disk_write ( BYTE drv, /* Physical drive nmuber (0..) */ const BYTE *buff, /* Data to be written */ DWORD sector, /* Sector address (LBA) */ - BYTE count /* Number of sectors to write (1..255) */ + UINT count /* Number of sectors to write (1..255) */ ) { if(drv!=0 || count==0) return RES_PARERR; @@ -103,10 +103,10 @@ DRESULT disk_ioctl ( * \internal * Return current time, used to save file creation time */ -DWORD get_fattime() -{ - return 0x210000;//TODO: this stub just returns date 01/01/1980 0.00.00 -} + DWORD get_fattime() + { + return 0x210000;//TODO: this stub just returns date 01/01/1980 0.00.00 + } #ifdef __cplusplus } diff --git a/miosix/filesystem/fat32/diskio.h b/miosix/filesystem/fat32/diskio.h index 29904b8863c18eda4d7b2a46cb7180dbb644c87b..97638aa308464eee05bbba280804f90b0f391e21 100644 --- a/miosix/filesystem/fat32/diskio.h +++ b/miosix/filesystem/fat32/diskio.h @@ -1,60 +1,88 @@ /*----------------------------------------------------------------------- -/ Low level disk interface modlue include file R0.06 (C)ChaN, 2007 +/ Low level disk interface modlue include file (C)ChaN, 2013 /-----------------------------------------------------------------------*/ -//Added by TFT, for C++ compatibility +#ifndef _DISKIO_DEFINED +#define _DISKIO_DEFINED + #ifdef __cplusplus extern "C" { #endif -#ifndef _DISKIO -#define _DISKIO +#define _USE_WRITE 1 /* 1: Enable disk_write function */ +#define _USE_IOCTL 1 /* 1: Enable disk_ioctl fucntion */ #include "integer.h" + /* Status of Disk Functions */ typedef BYTE DSTATUS; /* Results of Disk Functions */ typedef enum { - RES_OK = 0, /* 0: Successful */ - RES_ERROR, /* 1: R/W Error */ - RES_WRPRT, /* 2: Write Protected */ - RES_NOTRDY, /* 3: Not Ready */ - RES_PARERR /* 4: Invalid Parameter */ + RES_OK = 0, /* 0: Successful */ + RES_ERROR, /* 1: R/W Error */ + RES_WRPRT, /* 2: Write Protected */ + RES_NOTRDY, /* 3: Not Ready */ + RES_PARERR /* 4: Invalid Parameter */ } DRESULT; + /*---------------------------------------*/ /* Prototypes for disk control functions */ -DSTATUS disk_initialize (BYTE); -DSTATUS disk_status (BYTE); -DRESULT disk_read (BYTE, BYTE*, DWORD, BYTE); -#if _READONLY == 0 -DRESULT disk_write (BYTE, const BYTE*, DWORD, BYTE); -#endif -DRESULT disk_ioctl (BYTE, BYTE, void*); -void disk_timerproc (void); + +DSTATUS disk_initialize (BYTE pdrv); +DSTATUS disk_status (BYTE pdrv); +DRESULT disk_read (BYTE pdrv, BYTE*buff, DWORD sector, UINT count); +DRESULT disk_write (BYTE pdrv, const BYTE* buff, DWORD sector, UINT count); +DRESULT disk_ioctl (BYTE pdrv, BYTE cmd, void* buff); + /* Disk Status Bits (DSTATUS) */ #define STA_NOINIT 0x01 /* Drive not initialized */ #define STA_NODISK 0x02 /* No medium in the drive */ #define STA_PROTECT 0x04 /* Write protected */ -/* Command code for disk_ioctrl() */ -/* Generic command */ -#define CTRL_SYNC 0 /* Mandatory for read/write configuration */ -#define GET_SECTOR_COUNT 1 /* Mandatory for only f_mkfs() */ -//#define GET_SECTOR_SIZE 2 -#define GET_BLOCK_SIZE 3 /* Mandatory for only f_mkfs() */ -//#define CTRL_POWER 4 -//#define CTRL_LOCK 5 -//#define CTRL_EJECT 6 +/* Command code for disk_ioctrl fucntion */ + +/* Generic command (used by FatFs) */ +#define CTRL_SYNC 0 /* Flush disk cache (for write functions) */ +#define GET_SECTOR_COUNT 1 /* Get media size (for only f_mkfs()) */ +#define GET_SECTOR_SIZE 2 /* Get sector size (for multiple sector size (_MAX_SS >= 1024)) */ +#define GET_BLOCK_SIZE 3 /* Get erase block size (for only f_mkfs()) */ +#define CTRL_ERASE_SECTOR 4 /* Force erased a block of sectors (for only _USE_ERASE) */ + +/* Generic command (not used by FatFs) */ +#define CTRL_POWER 5 /* Get/Set power status */ +#define CTRL_LOCK 6 /* Lock/Unlock media removal */ +#define CTRL_EJECT 7 /* Eject media */ +#define CTRL_FORMAT 8 /* Create physical format on the media */ + +/* MMC/SDC specific ioctl command */ +#define MMC_GET_TYPE 10 /* Get card type */ +#define MMC_GET_CSD 11 /* Get CSD */ +#define MMC_GET_CID 12 /* Get CID */ +#define MMC_GET_OCR 13 /* Get OCR */ +#define MMC_GET_SDSTAT 14 /* Get SD status */ + +/* ATA/CF specific ioctl command */ +#define ATA_GET_REV 20 /* Get F/W revision */ +#define ATA_GET_MODEL 21 /* Get model name */ +#define ATA_GET_SN 22 /* Get serial number */ + + +/* MMC card type flags (MMC_GET_TYPE) */ +#define CT_MMC 0x01 /* MMC ver 3 */ +#define CT_SD1 0x02 /* SD ver 1 */ +#define CT_SD2 0x04 /* SD ver 2 */ +#define CT_SDC (CT_SD1|CT_SD2) /* SD */ +#define CT_BLOCK 0x08 /* Block addressing */ -#endif -//Added by TFT, for C++ compatibility #ifdef __cplusplus } #endif + +#endif diff --git a/miosix/filesystem/fat32/fat32.cpp b/miosix/filesystem/fat32/fat32.cpp new file mode 100644 index 0000000000000000000000000000000000000000..ec787aac35c25c779f4b03ff6d2860a888ddfabd --- /dev/null +++ b/miosix/filesystem/fat32/fat32.cpp @@ -0,0 +1,322 @@ +/*************************************************************************** + * Copyright (C) 2013 by Terraneo Federico * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * As a special exception, if other files instantiate templates or use * + * macros or inline functions from this file, or you compile this file * + * and link it with other works to produce a work based on this file, * + * this file does not by itself cause the resulting work to be covered * + * by the GNU General Public License. However the source code for this * + * file must still be made available in accordance with the GNU General * + * Public License. This exception does not invalidate any other reasons * + * why a work based on this file might be covered by the GNU General * + * Public License. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, see <http://www.gnu.org/licenses/> * + ***************************************************************************/ + +#include "fat32.h" +#include <sys/types.h> +#include <sys/stat.h> +#include <sys/fcntl.h> +#include <unistd.h> +#include <errno.h> +#include <cstring> +#include <cstdio> +#include "filesystem/stringpart.h" +#include "interfaces/disk.h" + +namespace miosix { + +/** + * Translate between FATFS error codes and POSIX ones + * \param ec FATS error code + * \return POSIX error code + */ +static int translateError(int ec) +{ + switch(ec) + { + case FR_OK: + return 0; + case FR_NO_FILE: + case FR_NO_PATH: + return -ENOENT; + case FR_DENIED: + return -ENOSPC; + case FR_EXIST: + return -EEXIST; + case FR_WRITE_PROTECTED: + return -EROFS; + case FR_LOCKED: + return -EBUSY; + case FR_NOT_ENOUGH_CORE: + return -ENOMEM; + case FR_TOO_MANY_OPEN_FILES: + return -ENFILE; + default: + return -EACCES; + } +} + +/** + * RAII class for pthread_mutex_t + */ +class PthreadMutexLock +{ +public: + PthreadMutexLock(pthread_mutex_t& mutex) : mutex(mutex) + { + pthread_mutex_lock(&mutex); + } + + ~PthreadMutexLock() + { + pthread_mutex_unlock(&mutex); + } +private: + pthread_mutex_t& mutex; +}; + +/** + * Files of the Fat32Fs filesystem + */ +class Fat32File : public FileBase +{ +public: + /** + * Constructor + * \param parent the filesystem to which this file belongs + */ + Fat32File(intrusive_ref_ptr<FilesystemBase> parent); + + /** + * Write data to the file, if the file supports writing. + * \param data the data to write + * \param len the number of bytes to write + * \return the number of written characters, or a negative number in case + * of errors + */ + virtual ssize_t write(const void *data, size_t len); + + /** + * Read data from the file, if the file supports reading. + * \param data buffer to store read data + * \param len the number of bytes to read + * \return the number of read characters, or a negative number in case + * of errors + */ + virtual ssize_t read(void *data, size_t len); + + /** + * Move file pointer, if the file supports random-access. + * \param pos offset to sum to the beginning of the file, current position + * or end of file, depending on whence + * \param whence SEEK_SET, SEEK_CUR or SEEK_END + * \return the offset from the beginning of the file if the operation + * completed, or a negative number in case of errors + */ + virtual off_t lseek(off_t pos, int whence); + + /** + * Return file information. + * \param pstat pointer to stat struct + * \return 0 on success, or a negative number on failure + */ + virtual int fstat(struct stat *pstat) const; + + /** + * Wait until all I/O operations have completed on this file. + * \return 0 on success, or a negative number in case of errors + */ + virtual int sync(); + + /** + * Destructor + */ + ~Fat32File(); + + FIL file; + int inode; +}; + +// +// class Fat32File +// + +Fat32File::Fat32File(intrusive_ref_ptr<FilesystemBase> parent) + : FileBase(parent), inode(0) {} + +ssize_t Fat32File::write(const void *data, size_t len) +{ + unsigned int bytesWritten; + if(int result=translateError(f_write(&file,data,len,&bytesWritten))) + return result; + #ifdef SYNC_AFTER_WRITE + //Sync for safety in case of power failure or device removal + if(f_sync(&file)!=FR_OK) return -1; + #endif //SYNC_AFTER_WRITE + return static_cast<int>(bytesWritten); +} + +ssize_t Fat32File::read(void *data, size_t len) +{ + unsigned int bytesRead; + if(int result=translateError(f_read(&file,data,len,&bytesRead))) + return result; + return static_cast<int>(bytesRead); +} + +off_t Fat32File::lseek(off_t pos, int whence) +{ + int offset=-1; + switch(whence) + { + case SEEK_CUR: + offset=file.fptr+pos; + break; + case SEEK_SET: + offset=pos; + break; + case SEEK_END: + offset=file.fsize+pos; + break; + default: + return -EINVAL; + } + if(offset<0) return -EOVERFLOW; + if(int result=translateError( + f_lseek(&file,static_cast<unsigned long>(offset)))) return result; + return offset; +} + +int Fat32File::fstat(struct stat *pstat) const +{ + memset(pstat,0,sizeof(struct stat)); + pstat->st_dev=getParent()->getFsId(); + pstat->st_ino=inode; + pstat->st_mode=S_IFREG | 0755; //-rwxr-xr-x + pstat->st_nlink=1; + pstat->st_size=file.fsize; + pstat->st_blksize=512; + pstat->st_blocks=(file.fsize+511)/512; + return 0; +} + +int Fat32File::sync() +{ + return translateError(f_sync(&file)); +} + +Fat32File::~Fat32File() +{ + if(inode) f_close(&file); //TODO: what to do with error code? +} + +// +// class Fat32Fs +// + +Fat32Fs::Fat32Fs() : failed(true) +{ + //Don't lock filesystem.sobj here, as pthread_mutex_init hasn't been called + if(!Disk::isAvailable()) return; + failed=f_mount(&filesystem,"",1)!=FR_OK; +} + +int Fat32Fs::open(intrusive_ref_ptr<FileBase>& file, StringPart& name, + int flags, int mode) +{ + BYTE openflags=0; + flags++; //To convert from O_RDONLY, O_WRONLY, ... to _FREAD, _FWRITE, ... + if(flags & _FREAD) openflags|=FA_READ; + if(flags & _FWRITE) openflags|=FA_WRITE; + if(flags & _FTRUNC) openflags|=FA_CREATE_ALWAYS;//Truncate + else if(flags & _FAPPEND) openflags|=FA_OPEN_ALWAYS;//If not exists create + else openflags|=FA_OPEN_EXISTING;//If not exists fail + + intrusive_ref_ptr<Fat32File> f(new Fat32File(shared_from_this())); + PthreadMutexLock l(filesystem.sobj); + if(int result=translateError(f_open(&f->file,name.c_str(),openflags))) + return result; + f->inode=1; //FIXME: where to get inode? + + #ifdef SYNC_AFTER_WRITE + //Sync for safety in case of power failure or device removal + if(f_sync(&f->file)!=FR_OK) return -EFAULT; + #endif //SYNC_AFTER_WRITE + + //If file opened for appending, seek to end of file + if(flags & _FAPPEND) + if(f_lseek(&f->file,f->file.fsize)!=FR_OK) return -EFAULT; + + file=f; + return 0; +} + +int Fat32Fs::lstat(StringPart& name, struct stat *pstat) +{ + PthreadMutexLock l(filesystem.sobj); + FILINFO info; + if(int result=translateError(f_stat(name.c_str(),&info))) return result; + memset(pstat,0,sizeof(struct stat)); + pstat->st_dev=filesystemId; + pstat->st_ino=1; //FIXME: where to get inode? + pstat->st_mode=(info.fattrib & AM_DIR) ? + S_IFDIR | 0755 //drwxr-xr-x + : S_IFREG | 0755; //-rwxr-xr-x + pstat->st_nlink=1; + pstat->st_size=info.fsize; + pstat->st_blksize=512; + pstat->st_blocks=(info.fsize+511)/512; + return 0; +} + +int Fat32Fs::unlink(StringPart& name) +{ + PthreadMutexLock l(filesystem.sobj); + FILINFO info; + if(int result=translateError(f_stat(name.c_str(),&info))) return result; + if(info.fattrib & AM_DIR) return -EISDIR; + return translateError(f_unlink(name.c_str())); +} + +int Fat32Fs::rename(StringPart& oldName, StringPart& newName) +{ + PthreadMutexLock l(filesystem.sobj); + return translateError(f_rename(oldName.c_str(),newName.c_str())); +} + +int Fat32Fs::mkdir(StringPart& name, int mode) +{ + PthreadMutexLock l(filesystem.sobj); + return translateError(f_mkdir(name.c_str())); +} + +int Fat32Fs::rmdir(StringPart& name) +{ + PthreadMutexLock l(filesystem.sobj); + FILINFO info; + if(int result=translateError(f_stat(name.c_str(),&info))) return result; + if((info.fattrib & AM_DIR)==0) return -ENOTDIR; + return translateError(f_unlink(name.c_str())); +} + +Fat32Fs::~Fat32Fs() +{ + PthreadMutexLock l(filesystem.sobj); + f_mount(0,0,0); //TODO: what to do with error code? + Disk::sync(); +} + +} //namespace miosix diff --git a/miosix/filesystem/fat32/fat32.h b/miosix/filesystem/fat32/fat32.h new file mode 100644 index 0000000000000000000000000000000000000000..a1c241227b5d08102124ba9c5fc4b07fdc6af096 --- /dev/null +++ b/miosix/filesystem/fat32/fat32.h @@ -0,0 +1,116 @@ +/*************************************************************************** + * Copyright (C) 2013 by Terraneo Federico * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * As a special exception, if other files instantiate templates or use * + * macros or inline functions from this file, or you compile this file * + * and link it with other works to produce a work based on this file, * + * this file does not by itself cause the resulting work to be covered * + * by the GNU General Public License. However the source code for this * + * file must still be made available in accordance with the GNU General * + * Public License. This exception does not invalidate any other reasons * + * why a work based on this file might be covered by the GNU General * + * Public License. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, see <http://www.gnu.org/licenses/> * + ***************************************************************************/ + +#ifndef FAT32_H +#define FAT32_H + +#include "filesystem/file.h" +#include "kernel/sync.h" +#include "ff.h" + +namespace miosix { + +/** + * Fat32 Filesystem. + */ +class Fat32Fs : public FilesystemBase +{ +public: + /** + * Constructor + */ + Fat32Fs(); + + /** + * Open a file + * \param file the file object will be stored here, if the call succeeds + * \param name the name of the file to open, relative to the local + * filesystem + * \param flags file flags (open for reading, writing, ...) + * \param mode file permissions + * \return 0 on success, or a negative number on failure + */ + virtual int open(intrusive_ref_ptr<FileBase>& file, StringPart& name, + int flags, int mode); + + /** + * Obtain information on a file, identified by a path name. Does not follow + * symlinks + * \param name path name, relative to the local filesystem + * \param pstat file information is stored here + * \return 0 on success, or a negative number on failure + */ + virtual int lstat(StringPart& name, struct stat *pstat); + + /** + * Remove a file or directory + * \param name path name of file or directory to remove + * \return 0 on success, or a negative number on failure + */ + virtual int unlink(StringPart& name); + + /** + * Rename a file or directory + * \param oldName old file name + * \param newName new file name + * \return 0 on success, or a negative number on failure + */ + virtual int rename(StringPart& oldName, StringPart& newName); + + /** + * Create a directory + * \param name directory name + * \param mode directory permissions + * \return 0 on success, or a negative number on failure + */ + virtual int mkdir(StringPart& name, int mode); + + /** + * Remove a directory if empty + * \param name directory name + * \return 0 on success, or a negative number on failure + */ + virtual int rmdir(StringPart& name); + + /** + * \return true if the filesystem failed to mount + */ + bool mountFailed() const { return failed; } + + /** + * Destructor + */ + ~Fat32Fs(); + +private: + FATFS filesystem; + bool failed; ///< Failed to mount +}; + +} //namespace miosix + +#endif //FAT32_H diff --git a/miosix/filesystem/fat32/ff.c b/miosix/filesystem/fat32/ff.c index c305765440c465cde93df4012429ea22fe4393c9..f299c46d3c1272e044069c9e90747326a3a58751 100644 --- a/miosix/filesystem/fat32/ff.c +++ b/miosix/filesystem/fat32/ff.c @@ -1,15 +1,15 @@ /*----------------------------------------------------------------------------/ -/ FatFs - FAT file system module R0.06 (C)ChaN, 2008 +/ FatFs - FAT file system module R0.10 (C)ChaN, 2013 /-----------------------------------------------------------------------------/ -/ The FatFs module is an experimenal project to implement FAT file system to -/ cheap microcontrollers. This is a free software and is opened for education, -/ research and development under license policy of following trems. +/ 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) 2008, ChaN, all right reserved. +/ Copyright (C) 2013, ChaN, all right reserved. / -/ * The FatFs module is a free software and there is no warranty. -/ * You can use, modify and/or redistribute it for personal, non-profit or -/ commercial use without restriction under your responsibility. +/ * The FatFs module is a free software and there is NO WARRANTY. +/ * No restriction on use. You can use, modify and redistribute it for +/ personal, non-profit or commercial products UNDER YOUR RESPONSIBILITY. / * Redistributions of source code must retain the above copyright notice. / /-----------------------------------------------------------------------------/ @@ -19,44 +19,586 @@ / / Jun 01,'06 R0.02 Added FAT12 support. / Removed unbuffered mode. -/ Fixed a problem on small (<32M) patition. +/ Fixed a problem on small (<32M) partition. / Jun 10,'06 R0.02a Added a configuration option (_FS_MINIMUM). / / Sep 22,'06 R0.03 Added f_rename(). / Changed option _FS_MINIMUM to _FS_MINIMIZE. -/ Dec 11,'06 R0.03a Improved cluster scan algolithm to write files fast. +/ Dec 11,'06 R0.03a Improved cluster scan algorithm to write files fast. / Fixed f_mkdir() creates incorrect directory on FAT32. / / Feb 04,'07 R0.04 Supported multiple drive system. / Changed some interfaces for multiple drive system. / Changed f_mountdrv() to f_mount(). / Added f_mkfs(). -/ Apr 01,'07 R0.04a Supported multiple partitions on a plysical drive. +/ Apr 01,'07 R0.04a Supported multiple partitions on a physical drive. / Added a capability of extending file size to f_lseek(). / Added minimization level 3. / Fixed an endian sensitive code in f_mkfs(). / May 05,'07 R0.04b Added a configuration option _USE_NTFLAG. -/ Added FSInfo support. +/ Added FSINFO support. / Fixed DBCS name can result FR_INVALID_NAME. / Fixed short seek (<= csize) collapses the file object. / / Aug 25,'07 R0.05 Changed arguments of f_read(), f_write() and f_mkfs(). -/ Fixed f_mkfs() on FAT32 creates incorrect FSInfo. +/ Fixed f_mkfs() on FAT32 creates incorrect FSINFO. / Fixed f_mkdir() on FAT32 creates incorrect directory. / Feb 03,'08 R0.05a Added f_truncate() and f_utime(). / Fixed off by one error at FAT sub-type determination. / Fixed btr in f_read() can be mistruncated. -/ Fixed cached sector is not flushed when create and close -/ without write. +/ Fixed cached sector is not flushed when create and close without write. / / Apr 01,'08 R0.06 Added fputc(), fputs(), fprintf() and fgets(). -/ Improved performance of f_lseek() on moving to the same -/ or following cluster. +/ Improved performance of f_lseek() on moving to the same or following cluster. +/ +/ 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 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. +/ Added f_chdir() and f_chdrive(). +/ Added proper case conversion to extended character. +/ Nov 03,'09 R0.07e Separated out configuration options from ff.h to ffconf.h. +/ Fixed f_unlink() fails to remove a sub-directory on _FS_RPATH. +/ Fixed name matching error on the 13 character boundary. +/ Added a configuration option, _LFN_UNICODE. +/ Changed f_readdir() to return the SFN with always upper case on non-LFN cfg. +/ +/ May 15,'10 R0.08 Added a memory configuration option. (_USE_LFN = 3) +/ Added file lock feature. (_FS_SHARE) +/ Added fast seek feature. (_USE_FASTSEEK) +/ Changed some types on the API, XCHAR->TCHAR. +/ Changed .fname in the FILINFO structure on Unicode cfg. +/ String functions support UTF-8 encoding files on Unicode cfg. +/ Aug 16,'10 R0.08a Added f_getcwd(). +/ Added sector erase feature. (_USE_ERASE) +/ 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(). +/ Ignores duplicated directory separators in given path name. +/ +/ Sep 06,'11 R0.09 f_mkfs() supports multiple partition to complete the multiple partition feature. +/ Added f_fdisk(). +/ Aug 27,'12 R0.09a Changed f_open() and f_opendir() reject null object pointer to avoid crash. +/ Changed option name _FS_SHARE to _FS_LOCK. +/ Fixed assertion failure due to OS/2 EA on FAT12/16 volume. +/ Jan 24,'13 R0.09b Added f_setlabel() and f_getlabel(). +/ +/ Oct 02,'13 R0.10 Added selection of character encoding on the file. (_STRF_ENCODE) +/ Added f_closedir(). +/ Added forced full FAT scan for f_getfree(). (_FS_NOFSINFO) +/ Added forced mount feature with changes of f_mount(). +/ Improved behavior of volume auto detection. +/ Improved write throughput of f_puts() and f_printf(). +/ Changed argument of f_chdrive(), f_mkfs(), disk_read() and disk_write(). +/ Fixed f_write() can be truncated when the file size is close to 4GB. +/ Fixed f_open(), f_mkdir() and f_setlabel() can return incorrect error code. /---------------------------------------------------------------------------*/ +#include "ff.h" /* Declarations of FatFs API */ +#include "diskio.h" /* Declarations of disk I/O functions */ + +// Added by TFT -- begin + #include <string.h> -#include "ff.h" /* FatFs declarations */ -#include "diskio.h" /* Include file for user provided disk functions */ +#include <stdlib.h> + +/** + * Create a mutex + * \param vol Corresponding logical drive being processed + * \param sobj Pointer to return the created sync object + * \return 1:Function succeeded, 0:Could not create due to any error + */ +static int ff_cre_syncobj(BYTE vol, _SYNC_t *sobj) +{ + pthread_mutexattr_t ma; + pthread_mutexattr_init(&ma); + pthread_mutexattr_settype(&ma,PTHREAD_MUTEX_RECURSIVE); + int result=pthread_mutex_init(sobj,&ma); + pthread_mutexattr_destroy(&ma); + if(result==0) return 1; + else return 0; +} + +/** + * Delete a mutex. Unfortunately had to change the signature of this function to + * take a pointer to a sync object, as it was meant for windows-like HANDLEs and + * not for posix-like opaque struct pthread_mutex_t (pass by copy a pthread + * mutex is a recipe for disaster) + * \param sobj Sync object tied to the logical drive to be deleted + * \return 1:Function succeeded, 0:Could not delete due to any error + */ +static int ff_del_syncobj(_SYNC_t *sobj) +{ + if(pthread_mutex_destroy(sobj)==0) return 1; + else return 0; +} + +/** + * Delete a mutex. Unfortunately had to change the signature of this function to + * take a pointer to a sync object, as it was meant for windows-like HANDLEs and + * not for posix-like opaque struct pthread_mutex_t (pass by copy a pthread + * mutex is a recipe for disaster) + * \param sobj Sync object to wait + * \return TRUE:Got a grant to access the volume, FALSE:Could not get a grant + */ +static int ff_req_grant(_SYNC_t *sobj) +{ + if(pthread_mutex_lock(sobj)==0) return 1; + else return 0; +} + +/** + * Delete a mutex. Unfortunately had to change the signature of this function to + * take a pointer to a sync object, as it was meant for windows-like HANDLEs and + * not for posix-like opaque struct pthread_mutex_t (pass by copy a pthread + * mutex is a recipe for disaster) + * \param sobj Sync object to be signaled + */ +void ff_rel_grant(_SYNC_t *sobj) +{ + pthread_mutex_unlock(sobj); +} + +static void* ff_memalloc(UINT msize) { return malloc(msize); } +static void ff_memfree(void* mblock) { free(mblock); } + +// Added by TFT -- end + + +/*-------------------------------------------------------------------------- + + Module Private Definitions + +---------------------------------------------------------------------------*/ + +#if _FATFS != 80960 /* Revision ID */ +#error Wrong include file (ff.h). +#endif + + +/* Definitions on sector size */ +#if _MAX_SS != 512 && _MAX_SS != 1024 && _MAX_SS != 2048 && _MAX_SS != 4096 +#error Wrong sector size. +#endif +#if _MAX_SS != 512 +#define SS(fs) ((fs)->ssize) /* Variable sector size */ +#else +#define SS(fs) 512U /* Fixed sector size */ +#endif + + +/* Reentrancy related */ +#if _FS_REENTRANT +#if _USE_LFN == 1 +#error Static LFN work area cannot be used at thread-safe configuration. +#endif +#define ENTER_FF(fs) { if (!lock_fs(fs)) return FR_TIMEOUT; } +#define LEAVE_FF(fs, res) { unlock_fs(fs, res); return res; } +#else +#define ENTER_FF(fs) +#define LEAVE_FF(fs, res) return res +#endif + +#define ABORT(fs, res) { fp->err = (BYTE)(res); LEAVE_FF(fs, res); } + + +/* File access control feature */ +#if _FS_LOCK +#if _FS_READONLY +#error _FS_LOCK must be 0 at read-only cfg. +#endif +typedef struct { + FATFS *fs; /* Object ID 1, volume (NULL:blank entry) */ + DWORD clu; /* Object ID 2, directory */ + WORD idx; /* Object ID 3, directory index */ + WORD ctr; /* Object open counter, 0:none, 0x01..0xFF:read mode open count, 0x100:write mode */ +} FILESEM; +#endif + + + +/* DBCS code ranges and SBCS extend character 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')) +#define IsDigit(c) (((c)>='0')&&((c)<='9')) + +#if _DF1S /* Code page is DBCS */ + +#ifdef _DF2S /* Two 1st byte areas */ +#define IsDBCS1(c) (((BYTE)(c) >= _DF1S && (BYTE)(c) <= _DF1E) || ((BYTE)(c) >= _DF2S && (BYTE)(c) <= _DF2E)) +#else /* One 1st byte area */ +#define IsDBCS1(c) ((BYTE)(c) >= _DF1S && (BYTE)(c) <= _DF1E) +#endif + +#ifdef _DS3S /* Three 2nd byte areas */ +#define IsDBCS2(c) (((BYTE)(c) >= _DS1S && (BYTE)(c) <= _DS1E) || ((BYTE)(c) >= _DS2S && (BYTE)(c) <= _DS2E) || ((BYTE)(c) >= _DS3S && (BYTE)(c) <= _DS3E)) +#else /* Two 2nd byte areas */ +#define IsDBCS2(c) (((BYTE)(c) >= _DS1S && (BYTE)(c) <= _DS1E) || ((BYTE)(c) >= _DS2S && (BYTE)(c) <= _DS2E)) +#endif + +#else /* Code page is SBCS */ + +#define IsDBCS1(c) 0 +#define IsDBCS2(c) 0 + +#endif /* _DF1S */ + + +/* Name status flags */ +#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 */ +#define NS_BODY 0x08 /* Lower case flag (body) */ +#define NS_EXT 0x10 /* Lower case flag (ext) */ +#define NS_DOT 0x20 /* Dot entry */ + + +/* FAT sub-type boundaries */ +#define MIN_FAT16 4086U /* Minimum number of clusters for FAT16 */ +#define MIN_FAT32 65526U /* Minimum number of clusters for FAT32 */ + + +/* FatFs refers the members in the FAT structures as byte array instead of +/ structure member because the structure is not binary compatible between +/ different platforms */ + +#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 directory 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 directory first cluster (4) */ +#define BPB_FSInfo 48 /* Offset of FSINFO sector (2) */ +#define BPB_BkBootSec 50 /* Offset of backup boot sector (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_CrtTimeTenth 13 /* Created time sub-second (1) */ +#define DIR_CrtTime 14 /* Created time (2) */ +#define DIR_CrtDate 16 /* Created date (2) */ +#define DIR_LstAccDate 18 /* Last accessed 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 entry mark in DIR_Name[0] */ +#define NDDE 0x05 /* Replacement of the character collides with DDE */ + + +/*------------------------------------------------------------*/ +/* Module private work area */ +/*------------------------------------------------------------*/ +/* Note that uninitialized variables with static duration are +/ zeroed/nulled at start-up. If not, the compiler or start-up +/ routine is out of ANSI-C standard. +*/ + +#if _VOLUMES +static +FATFS *FatFs[_VOLUMES]; /* Pointer to the file system objects (logical drives) */ +#else +#error Number of volumes must not be 0. +#endif + +static +WORD Fsid; /* File system mount ID */ + +#if _FS_RPATH && _VOLUMES >= 2 +static +BYTE CurrVol; /* Current drive */ +#endif + +#if _FS_LOCK +static +FILESEM Files[_FS_LOCK]; /* Open object lock semaphores */ +#endif + +#if _USE_LFN == 0 /* No LFN feature */ +#define DEF_NAMEBUF BYTE sfn[12] +#define INIT_BUF(dobj) (dobj).fn = sfn +#define FREE_BUF() + +#elif _USE_LFN == 1 /* LFN feature with static working buffer */ +static +WCHAR LfnBuf[_MAX_LFN+1]; +#define DEF_NAMEBUF BYTE sfn[12] +#define INIT_BUF(dobj) { (dobj).fn = sfn; (dobj).lfn = LfnBuf; } +#define FREE_BUF() + +#elif _USE_LFN == 2 /* LFN feature with dynamic working buffer on the stack */ +#define DEF_NAMEBUF BYTE sfn[12]; WCHAR lbuf[_MAX_LFN+1] +#define INIT_BUF(dobj) { (dobj).fn = sfn; (dobj).lfn = lbuf; } +#define FREE_BUF() + +#elif _USE_LFN == 3 /* LFN feature with dynamic working buffer on the heap */ +#define DEF_NAMEBUF BYTE sfn[12]; WCHAR *lfn +#define INIT_BUF(dobj) { lfn = ff_memalloc((_MAX_LFN + 1) * 2); \ + if (!lfn) LEAVE_FF((dobj).fs, FR_NOT_ENOUGH_CORE); \ + (dobj).lfn = lfn; (dobj).fn = sfn; } +#define FREE_BUF() ff_memfree(lfn) + +#else +#error Wrong LFN configuration. +#endif + + +#ifdef _EXCVT +static +const BYTE ExCvt[] = _EXCVT; /* Upper conversion table for extended characters */ +#endif + + + + + /*-------------------------------------------------------------------------- @@ -64,84 +606,717 @@ ---------------------------------------------------------------------------*/ + +/*-----------------------------------------------------------------------*/ +/* String functions */ +/*-----------------------------------------------------------------------*/ + +// Added by TFT -- begin + +//Using newlib's version of memcpy, memset, memcmp and strchr which are +//performance optimized, while these are size optiized ones. +#define mem_cpy memcpy +#define mem_set memset +#define mem_cmp memcmp + +/* Copy memory to memory */ +// static +// void mem_cpy (void* dst, const void* src, UINT cnt) { +// BYTE *d = (BYTE*)dst; +// const BYTE *s = (const BYTE*)src; +// +// #if _WORD_ACCESS == 1 +// while (cnt >= sizeof (int)) { +// *(int*)d = *(int*)s; +// d += sizeof (int); s += sizeof (int); +// cnt -= sizeof (int); +// } +// #endif +// while (cnt--) +// *d++ = *s++; +//} + +/* Fill memory */ +// static +// void mem_set (void* dst, int val, UINT cnt) { +// BYTE *d = (BYTE*)dst; +// +// while (cnt--) +// *d++ = (BYTE)val; +// } + +/* Compare memory to memory */ +// static +// int mem_cmp (const void* dst, const void* src, UINT cnt) { +// const BYTE *d = (const BYTE *)dst, *s = (const BYTE *)src; +// int r = 0; +// +// while (cnt-- && (r = *d++ - *s++) == 0) ; +// return r; +// } + +/* Check if chr is contained in the string */ +static +int chk_chr (const char* str, int chr) { + //while (*str && *str != chr) str++; + //return *str; + char *result=strchr(str,chr); + if(result) return *result; + else return 0; +} + +// Added by TFT -- end + + +/*-----------------------------------------------------------------------*/ +/* Request/Release grant to access the volume */ +/*-----------------------------------------------------------------------*/ +#if _FS_REENTRANT +static +int lock_fs ( + FATFS* fs /* File system object */ +) +{ + return ff_req_grant(&fs->sobj); +} + + +static +void unlock_fs ( + FATFS* fs, /* File system object */ + FRESULT res /* Result code to be returned */ +) +{ + if (fs && + res != FR_NOT_ENABLED && + res != FR_INVALID_DRIVE && + res != FR_INVALID_OBJECT && + res != FR_TIMEOUT) { + ff_rel_grant(&fs->sobj); + } +} +#endif + + + + +/*-----------------------------------------------------------------------*/ +/* File lock control functions */ +/*-----------------------------------------------------------------------*/ +#if _FS_LOCK + +static +FRESULT chk_lock ( /* Check if the file can be accessed */ + DIR* dp, /* Directory object pointing the file to be checked */ + int acc /* Desired access (0:Read, 1:Write, 2:Delete/Rename) */ +) +{ + UINT i, be; + + /* Search file semaphore table */ + for (i = be = 0; i < _FS_LOCK; i++) { + if (Files[i].fs) { /* Existing entry */ + if (Files[i].fs == dp->fs && /* Check if the object matched with an open object */ + Files[i].clu == dp->sclust && + Files[i].idx == dp->index) break; + } else { /* Blank entry */ + be = 1; + } + } + if (i == _FS_LOCK) /* The object is not opened */ + return (be || acc == 2) ? FR_OK : FR_TOO_MANY_OPEN_FILES; /* Is there a blank entry for new object? */ + + /* The object has been opened. Reject any open against writing file and all write mode open */ + return (acc || Files[i].ctr == 0x100) ? FR_LOCKED : FR_OK; +} + + +static +int enq_lock (void) /* Check if an entry is available for a new object */ +{ + UINT i; + + for (i = 0; i < _FS_LOCK && Files[i].fs; i++) ; + return (i == _FS_LOCK) ? 0 : 1; +} + + +static +UINT inc_lock ( /* Increment object open counter and returns its index (0:Internal error) */ + DIR* dp, /* Directory object pointing the file to register or increment */ + int acc /* Desired access (0:Read, 1:Write, 2:Delete/Rename) */ +) +{ + UINT i; + + + for (i = 0; i < _FS_LOCK; i++) { /* Find the object */ + if (Files[i].fs == dp->fs && + Files[i].clu == dp->sclust && + Files[i].idx == dp->index) break; + } + + if (i == _FS_LOCK) { /* Not opened. Register it as new. */ + for (i = 0; i < _FS_LOCK && Files[i].fs; i++) ; + if (i == _FS_LOCK) return 0; /* No free entry to register (int err) */ + Files[i].fs = dp->fs; + Files[i].clu = dp->sclust; + Files[i].idx = dp->index; + Files[i].ctr = 0; + } + + if (acc && Files[i].ctr) return 0; /* Access violation (int err) */ + + Files[i].ctr = acc ? 0x100 : Files[i].ctr + 1; /* Set semaphore value */ + + return i + 1; +} + + +static +FRESULT dec_lock ( /* Decrement object open counter */ + UINT i /* Semaphore index (1..) */ +) +{ + WORD n; + FRESULT res; + + + if (--i < _FS_LOCK) { /* Shift index number origin from 0 */ + n = Files[i].ctr; + if (n == 0x100) n = 0; /* If write mode open, delete the entry */ + if (n) n--; /* Decrement read mode open count */ + Files[i].ctr = n; + if (!n) Files[i].fs = 0; /* Delete the entry if open count gets zero */ + res = FR_OK; + } else { + res = FR_INT_ERR; /* Invalid index nunber */ + } + return res; +} + + +static +void clear_lock ( /* Clear lock entries of the volume */ + FATFS *fs +) +{ + UINT i; + + for (i = 0; i < _FS_LOCK; i++) { + if (Files[i].fs == fs) Files[i].fs = 0; + } +} +#endif + + + + +/*-----------------------------------------------------------------------*/ +/* Move/Flush disk access window in the file system object */ +/*-----------------------------------------------------------------------*/ +#if !_FS_READONLY +static +FRESULT sync_window ( + FATFS* fs /* File system object */ +) +{ + DWORD wsect; + UINT nf; + + + if (fs->wflag) { /* Write back the sector if it is dirty */ + wsect = fs->winsect; /* Current sector number */ + if (disk_write(fs->drv, fs->win, wsect, 1)) + return FR_DISK_ERR; + fs->wflag = 0; + if (wsect - fs->fatbase < fs->fsize) { /* Is it in the FAT area? */ + for (nf = fs->n_fats; nf >= 2; nf--) { /* Reflect the change to all FAT copies */ + wsect += fs->fsize; + disk_write(fs->drv, fs->win, wsect, 1); + } + } + } + return FR_OK; +} +#endif + + +static +FRESULT move_window ( + FATFS* fs, /* File system object */ + DWORD sector /* Sector number to make appearance in the fs->win[] */ +) +{ + if (sector != fs->winsect) { /* Changed current window */ +#if !_FS_READONLY + if (sync_window(fs) != FR_OK) + return FR_DISK_ERR; +#endif + if (disk_read(fs->drv, fs->win, sector, 1)) + return FR_DISK_ERR; + fs->winsect = sector; + } + + return FR_OK; +} + + + + +/*-----------------------------------------------------------------------*/ +/* Synchronize file system and strage device */ +/*-----------------------------------------------------------------------*/ +#if !_FS_READONLY +static +FRESULT sync_fs ( /* FR_OK: successful, FR_DISK_ERR: failed */ + FATFS* fs /* File system object */ +) +{ + FRESULT res; + + + res = sync_window(fs); + if (res == FR_OK) { + /* Update FSINFO sector if needed */ + if (fs->fs_type == FS_FAT32 && fs->fsi_flag == 1) { + /* Create FSINFO structure */ + mem_set(fs->win, 0, SS(fs)); + 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 */ + fs->winsect = fs->volbase + 1; + disk_write(fs->drv, fs->win, fs->winsect, 1); + fs->fsi_flag = 0; + } + /* Make sure that no pending write process in the physical drive */ + if (disk_ioctl(fs->drv, CTRL_SYNC, 0) != RES_OK) + res = FR_DISK_ERR; + } + + return res; +} +#endif + + + + +/*-----------------------------------------------------------------------*/ +/* Get sector# from cluster# */ +/*-----------------------------------------------------------------------*/ + + +DWORD clust2sect ( /* !=0: Sector number, 0: Failed - invalid cluster# */ + FATFS* fs, /* File system object */ + DWORD clst /* Cluster# to be converted */ +) +{ + clst -= 2; + if (clst >= (fs->n_fatent - 2)) return 0; /* Invalid cluster# */ + return clst * fs->csize + fs->database; +} + + + + +/*-----------------------------------------------------------------------*/ +/* FAT access - Read value of a FAT entry */ +/*-----------------------------------------------------------------------*/ + + +DWORD get_fat ( /* 0xFFFFFFFF:Disk error, 1:Internal error, Else:Cluster status */ + FATFS* fs, /* File system object */ + DWORD clst /* Cluster# to get the link information */ +) +{ + UINT wc, bc; + BYTE *p; + + + if (clst < 2 || clst >= fs->n_fatent) /* Check range */ + return 1; + + switch (fs->fs_type) { + case FS_FAT12 : + bc = (UINT)clst; bc += bc / 2; + if (move_window(fs, fs->fatbase + (bc / SS(fs)))) break; + wc = fs->win[bc % SS(fs)]; bc++; + if (move_window(fs, fs->fatbase + (bc / SS(fs)))) break; + wc |= fs->win[bc % SS(fs)] << 8; + return clst & 1 ? wc >> 4 : (wc & 0xFFF); + + case FS_FAT16 : + if (move_window(fs, fs->fatbase + (clst / (SS(fs) / 2)))) break; + p = &fs->win[clst * 2 % SS(fs)]; + return LD_WORD(p); + + case FS_FAT32 : + if (move_window(fs, fs->fatbase + (clst / (SS(fs) / 4)))) break; + p = &fs->win[clst * 4 % SS(fs)]; + return LD_DWORD(p) & 0x0FFFFFFF; + } + + return 0xFFFFFFFF; /* An error occurred at the disk I/O layer */ +} + + + + +/*-----------------------------------------------------------------------*/ +/* FAT access - Change value of a FAT entry */ +/*-----------------------------------------------------------------------*/ +#if !_FS_READONLY + +FRESULT put_fat ( + FATFS* fs, /* File system object */ + DWORD clst, /* Cluster# to be changed in range of 2 to fs->n_fatent - 1 */ + DWORD val /* New value to mark the cluster */ +) +{ + UINT bc; + BYTE *p; + FRESULT res; + + + if (clst < 2 || clst >= fs->n_fatent) { /* Check range */ + res = FR_INT_ERR; + + } else { + switch (fs->fs_type) { + case FS_FAT12 : + bc = (UINT)clst; bc += bc / 2; + res = move_window(fs, fs->fatbase + (bc / SS(fs))); + if (res != FR_OK) break; + p = &fs->win[bc % SS(fs)]; + *p = (clst & 1) ? ((*p & 0x0F) | ((BYTE)val << 4)) : (BYTE)val; + bc++; + fs->wflag = 1; + res = move_window(fs, fs->fatbase + (bc / SS(fs))); + if (res != FR_OK) break; + p = &fs->win[bc % SS(fs)]; + *p = (clst & 1) ? (BYTE)(val >> 4) : ((*p & 0xF0) | ((BYTE)(val >> 8) & 0x0F)); + break; + + case FS_FAT16 : + res = move_window(fs, fs->fatbase + (clst / (SS(fs) / 2))); + if (res != FR_OK) break; + p = &fs->win[clst * 2 % SS(fs)]; + ST_WORD(p, (WORD)val); + break; + + case FS_FAT32 : + res = move_window(fs, fs->fatbase + (clst / (SS(fs) / 4))); + if (res != FR_OK) break; + p = &fs->win[clst * 4 % SS(fs)]; + val |= LD_DWORD(p) & 0xF0000000; + ST_DWORD(p, val); + break; + + default : + res = FR_INT_ERR; + } + fs->wflag = 1; + } + + return res; +} +#endif /* !_FS_READONLY */ + + + + +/*-----------------------------------------------------------------------*/ +/* FAT handling - Remove a cluster chain */ +/*-----------------------------------------------------------------------*/ +#if !_FS_READONLY static -FATFS *FatFs[_DRIVES]; /* Pointer to the file system objects (logical drives) */ +FRESULT remove_chain ( + FATFS* fs, /* File system object */ + DWORD clst /* Cluster# to remove a chain from */ +) +{ + FRESULT res; + DWORD nxt; +#if _USE_ERASE + DWORD scl = clst, ecl = clst, rt[2]; +#endif + + if (clst < 2 || clst >= fs->n_fatent) { /* Check range */ + res = FR_INT_ERR; + + } else { + res = FR_OK; + while (clst < fs->n_fatent) { /* Not a last link? */ + nxt = get_fat(fs, clst); /* Get cluster status */ + if (nxt == 0) break; /* Empty cluster? */ + if (nxt == 1) { res = FR_INT_ERR; break; } /* Internal error? */ + if (nxt == 0xFFFFFFFF) { res = FR_DISK_ERR; break; } /* Disk error? */ + res = put_fat(fs, clst, 0); /* Mark the cluster "empty" */ + if (res != FR_OK) break; + if (fs->free_clust != 0xFFFFFFFF) { /* Update FSINFO */ + fs->free_clust++; + fs->fsi_flag |= 1; + } +#if _USE_ERASE + if (ecl + 1 == nxt) { /* Is next cluster contiguous? */ + ecl = nxt; + } else { /* End of contiguous clusters */ + rt[0] = clust2sect(fs, scl); /* Start sector */ + rt[1] = clust2sect(fs, ecl) + fs->csize - 1; /* End sector */ + disk_ioctl(fs->drv, CTRL_ERASE_SECTOR, rt); /* Erase the block */ + scl = ecl = nxt; + } +#endif + clst = nxt; /* Next cluster */ + } + } + + return res; +} +#endif + + + + +/*-----------------------------------------------------------------------*/ +/* FAT handling - Stretch or Create a cluster chain */ +/*-----------------------------------------------------------------------*/ +#if !_FS_READONLY static -WORD fsid; /* File system mount ID */ +DWORD create_chain ( /* 0:No free cluster, 1:Internal error, 0xFFFFFFFF:Disk error, >=2:New cluster# */ + FATFS* fs, /* File system object */ + DWORD clst /* Cluster# to stretch. 0 means create a new chain. */ +) +{ + DWORD cs, ncl, scl; + FRESULT res; + + + if (clst == 0) { /* Create a new chain */ + scl = fs->last_clust; /* Get suggested start point */ + if (!scl || scl >= fs->n_fatent) scl = 1; + } + else { /* Stretch the current chain */ + cs = get_fat(fs, clst); /* Check the cluster status */ + if (cs < 2) return 1; /* It is an invalid cluster */ + if (cs < fs->n_fatent) return cs; /* It is already followed by next cluster */ + scl = clst; + } + + ncl = scl; /* Start cluster */ + for (;;) { + ncl++; /* Next cluster */ + if (ncl >= fs->n_fatent) { /* Wrap around */ + ncl = 2; + if (ncl > scl) return 0; /* No free cluster */ + } + cs = get_fat(fs, ncl); /* Get the cluster status */ + if (cs == 0) break; /* Found a free cluster */ + if (cs == 0xFFFFFFFF || cs == 1)/* An error occurred */ + return cs; + if (ncl == scl) return 0; /* No free cluster */ + } + + res = put_fat(fs, ncl, 0x0FFFFFFF); /* Mark the new cluster "last link" */ + if (res == FR_OK && clst != 0) { + res = put_fat(fs, clst, ncl); /* Link it to the previous one if needed */ + } + if (res == FR_OK) { + fs->last_clust = ncl; /* Update FSINFO */ + if (fs->free_clust != 0xFFFFFFFF) { + fs->free_clust--; + fs->fsi_flag |= 1; + } + } else { + ncl = (res == FR_DISK_ERR) ? 0xFFFFFFFF : 1; + } + + return ncl; /* Return new cluster number or error code */ +} +#endif /* !_FS_READONLY */ + + + + +/*-----------------------------------------------------------------------*/ +/* 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 */ +/*-----------------------------------------------------------------------*/ + +static +FRESULT dir_sdi ( + DIR* dp, /* Pointer to directory object */ + WORD idx /* Index of directory table */ +) +{ + DWORD clst; + WORD ic; + + + dp->index = idx; + clst = dp->sclust; + if (clst == 1 || clst >= dp->fs->n_fatent) /* Check start cluster range */ + return FR_INT_ERR; + if (!clst && dp->fs->fs_type == FS_FAT32) /* Replace cluster# 0 with root cluster# if in FAT32 */ + clst = dp->fs->dirbase; + + if (clst == 0) { /* Static table (root-directory in FAT12/16) */ + dp->clust = clst; + if (idx >= dp->fs->n_rootdir) /* Index is out of range */ + return FR_INT_ERR; + dp->sect = dp->fs->dirbase + idx / (SS(dp->fs) / SZ_DIR); /* Sector# */ + } + else { /* Dynamic table (sub-dirs or root-directory in FAT32) */ + ic = SS(dp->fs) / SZ_DIR * dp->fs->csize; /* Entries per cluster */ + while (idx >= ic) { /* Follow cluster chain */ + clst = get_fat(dp->fs, clst); /* Get next cluster */ + if (clst == 0xFFFFFFFF) return FR_DISK_ERR; /* Disk error */ + if (clst < 2 || clst >= dp->fs->n_fatent) /* Reached to end of table or int error */ + return FR_INT_ERR; + idx -= ic; + } + dp->clust = clst; + dp->sect = clust2sect(dp->fs, clst) + idx / (SS(dp->fs) / SZ_DIR); /* Sector# */ + } + + dp->dir = dp->fs->win + (idx % (SS(dp->fs) / SZ_DIR)) * SZ_DIR; /* Ptr to the entry in the sector */ + + return FR_OK; /* Seek succeeded */ +} + /*-----------------------------------------------------------------------*/ -/* Change window offset */ +/* Directory handling - Move directory table index next */ /*-----------------------------------------------------------------------*/ static -BOOL move_window ( /* TRUE: successful, FALSE: failed */ - FATFS *fs, /* File system object */ - DWORD sector /* Sector number to make apperance in the fs->win[] */ -) /* Move to zero only writes back dirty window */ +FRESULT dir_next ( /* FR_OK:Succeeded, FR_NO_FILE:End of table, FR_DENIED:Could not stretch */ + DIR* dp, /* Pointer to the directory object */ + int stretch /* 0: Do not stretch table, 1: Stretch table if needed */ +) { - DWORD wsect; + DWORD clst; + WORD i; + + i = dp->index + 1; + if (!i || !dp->sect) /* Report EOT when index has reached 65535 */ + return FR_NO_FILE; - wsect = fs->winsect; - if (wsect != sector) { /* Changed current window */ + if (!(i % (SS(dp->fs) / SZ_DIR))) { /* Sector changed? */ + dp->sect++; /* Next sector */ + + if (!dp->clust) { /* Static table */ + if (i >= dp->fs->n_rootdir) /* Report EOT if it reached end of static table */ + return FR_NO_FILE; + } + else { /* Dynamic table */ + if (((i / (SS(dp->fs) / SZ_DIR)) & (dp->fs->csize - 1)) == 0) { /* Cluster changed? */ + clst = get_fat(dp->fs, dp->clust); /* Get next cluster */ + if (clst <= 1) return FR_INT_ERR; + if (clst == 0xFFFFFFFF) return FR_DISK_ERR; + if (clst >= dp->fs->n_fatent) { /* If it reached end of dynamic table, */ #if !_FS_READONLY - BYTE n; - if (fs->winflag) { /* Write back dirty window if needed */ - if (disk_write(fs->drive, fs->win, wsect, 1) != RES_OK) - return FALSE; - fs->winflag = 0; - if (wsect < (fs->fatbase + fs->sects_fat)) { /* In FAT area */ - for (n = fs->n_fats; n >= 2; n--) { /* Refrect the change to FAT copy */ - wsect += fs->sects_fat; - disk_write(fs->drive, fs->win, wsect, 1); + BYTE c; + if (!stretch) return FR_NO_FILE; /* If do not stretch, report EOT */ + clst = create_chain(dp->fs, dp->clust); /* Stretch cluster chain */ + if (clst == 0) return FR_DENIED; /* No free cluster */ + if (clst == 1) return FR_INT_ERR; + if (clst == 0xFFFFFFFF) return FR_DISK_ERR; + /* Clean-up stretched table */ + if (sync_window(dp->fs)) return FR_DISK_ERR;/* Flush disk access window */ + mem_set(dp->fs->win, 0, SS(dp->fs)); /* Clear window buffer */ + dp->fs->winsect = clust2sect(dp->fs, clst); /* Cluster start sector */ + for (c = 0; c < dp->fs->csize; c++) { /* Fill the new cluster with 0 */ + dp->fs->wflag = 1; + if (sync_window(dp->fs)) return FR_DISK_ERR; + dp->fs->winsect++; + } + dp->fs->winsect -= c; /* Rewind window offset */ +#else + if (!stretch) return FR_NO_FILE; /* If do not stretch, report EOT */ + return FR_NO_FILE; /* Report EOT */ +#endif } + dp->clust = clst; /* Initialize data for new cluster */ + dp->sect = clust2sect(dp->fs, clst); } } -#endif - if (sector) { - if (disk_read(fs->drive, fs->win, sector, 1) != RES_OK) - return FALSE; - fs->winsect = sector; - } } - return TRUE; + + dp->index = i; /* Current index */ + dp->dir = dp->fs->win + (i % (SS(dp->fs) / SZ_DIR)) * SZ_DIR; /* Current entry in the window */ + + return FR_OK; } /*-----------------------------------------------------------------------*/ -/* Clean-up cached data */ +/* Directory handling - Reserve directory entry */ /*-----------------------------------------------------------------------*/ #if !_FS_READONLY static -FRESULT sync ( /* FR_OK: successful, FR_RW_ERROR: failed */ - FATFS *fs /* File system object */ -) -{ - fs->winflag = 1; - if (!move_window(fs, 0)) return FR_RW_ERROR; -#if _USE_FSINFO - /* Update FSInfo sector if needed */ - if (fs->fs_type == FS_FAT32 && fs->fsi_flag) { - fs->winsect = 0; - memset(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); - disk_write(fs->drive, fs->win, fs->fsi_sector, 1); - fs->fsi_flag = 0; +FRESULT dir_alloc ( + DIR* dp, /* Pointer to the directory object */ + UINT nent /* Number of contiguous entries to allocate (1-21) */ +) +{ + FRESULT res; + UINT n; + + + res = dir_sdi(dp, 0); + if (res == FR_OK) { + n = 0; + do { + res = move_window(dp->fs, dp->sect); + if (res != FR_OK) break; + if (dp->dir[0] == DDE || dp->dir[0] == 0) { /* Is it a blank entry? */ + if (++n == nent) break; /* A block of contiguous entries is found */ + } else { + n = 0; /* Not a blank entry. Restart to search */ + } + res = dir_next(dp, 1); /* Next entry with table stretch enabled */ + } while (res == FR_OK); } -#endif - /* Make sure that no pending write process in the physical drive */ - if (disk_ioctl(fs->drive, CTRL_SYNC, NULL) != RES_OK) - return FR_RW_ERROR; - return FR_OK; + if (res == FR_NO_FILE) res = FR_DENIED; /* No directory entry to allocate */ + return res; } #endif @@ -149,484 +1324,850 @@ FRESULT sync ( /* FR_OK: successful, FR_RW_ERROR: failed */ /*-----------------------------------------------------------------------*/ -/* Get a cluster status */ +/* Directory handling - Load/Store start cluster number */ /*-----------------------------------------------------------------------*/ static -DWORD get_cluster ( /* 0,>=2: successful, 1: failed */ - FATFS *fs, /* File system object */ - DWORD clust /* Cluster# to get the link information */ +DWORD ld_clust ( + FATFS* fs, /* Pointer to the fs object */ + BYTE* dir /* Pointer to the directory entry */ ) { - WORD wc, bc; - DWORD fatsect; - + DWORD cl; - if (clust >= 2 && clust < fs->max_clust) { /* Is it a valid cluster#? */ - fatsect = fs->fatbase; - switch (fs->fs_type) { - case FS_FAT12 : - bc = (WORD)clust * 3 / 2; - if (!move_window(fs, fatsect + (bc / SS(fs)))) break; - wc = fs->win[bc & (SS(fs) - 1)]; bc++; - if (!move_window(fs, fatsect + (bc / SS(fs)))) break; - wc |= (WORD)fs->win[bc & (SS(fs) - 1)] << 8; - return (clust & 1) ? (wc >> 4) : (wc & 0xFFF); + cl = LD_WORD(dir+DIR_FstClusLO); + if (fs->fs_type == FS_FAT32) + cl |= (DWORD)LD_WORD(dir+DIR_FstClusHI) << 16; - case FS_FAT16 : - if (!move_window(fs, fatsect + (clust / (SS(fs) / 2)))) break; - return LD_WORD(&fs->win[((WORD)clust * 2) & (SS(fs) - 1)]); + return cl; +} - case FS_FAT32 : - if (!move_window(fs, fatsect + (clust / (SS(fs) / 4)))) break; - return LD_DWORD(&fs->win[((WORD)clust * 4) & (SS(fs) - 1)]) & 0x0FFFFFFF; - } - } - return 1; /* Out of cluster range, or an error occured */ +#if !_FS_READONLY +static +void st_clust ( + BYTE* dir, /* Pointer to the directory entry */ + DWORD cl /* Value to be set */ +) +{ + ST_WORD(dir+DIR_FstClusLO, cl); + ST_WORD(dir+DIR_FstClusHI, cl >> 16); } +#endif /*-----------------------------------------------------------------------*/ -/* Change a cluster status */ +/* LFN handling - Test/Pick/Fit an LFN segment from/to directory entry */ /*-----------------------------------------------------------------------*/ +#if _USE_LFN +static +const BYTE LfnOfs[] = {1,3,5,7,9,14,16,18,20,22,24,28,30}; /* Offset of LFN characters in the directory entry */ + -#if !_FS_READONLY static -BOOL put_cluster ( /* TRUE: successful, FALSE: failed */ - FATFS *fs, /* File system object */ - DWORD clust, /* Cluster# to change (must be 2 to fs->max_clust-1) */ - DWORD val /* New value to mark the cluster */ +int cmp_lfn ( /* 1:Matched, 0:Not matched */ + WCHAR* lfnbuf, /* Pointer to the LFN to be compared */ + BYTE* dir /* Pointer to the directory entry containing a part of LFN */ ) { - WORD bc; - BYTE *p; - DWORD fatsect; + UINT i, s; + WCHAR wc, uc; - fatsect = fs->fatbase; - switch (fs->fs_type) { - case FS_FAT12 : - bc = (WORD)clust * 3 / 2; - if (!move_window(fs, fatsect + (bc / SS(fs)))) return FALSE; - p = &fs->win[bc & (SS(fs) - 1)]; - *p = (clust & 1) ? ((*p & 0x0F) | ((BYTE)val << 4)) : (BYTE)val; - bc++; - fs->winflag = 1; - if (!move_window(fs, fatsect + (bc / SS(fs)))) return FALSE; - p = &fs->win[bc & (SS(fs) - 1)]; - *p = (clust & 1) ? (BYTE)(val >> 4) : ((*p & 0xF0) | ((BYTE)(val >> 8) & 0x0F)); - break; - - case FS_FAT16 : - if (!move_window(fs, fatsect + (clust / (SS(fs) / 2)))) return FALSE; - ST_WORD(&fs->win[((WORD)clust * 2) & (SS(fs) - 1)], (WORD)val); - break; + 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 */ + if (wc) { /* Last character has not been processed */ + wc = ff_wtoupper(uc); /* Convert it to upper case */ + if (i >= _MAX_LFN || wc != ff_wtoupper(lfnbuf[i++])) /* Compare it */ + return 0; /* Not matched */ + } else { + if (uc != 0xFFFF) return 0; /* Check filler */ + } + } while (++s < 13); /* Repeat until all characters in the entry are checked */ - case FS_FAT32 : - if (!move_window(fs, fatsect + (clust / (SS(fs) / 4)))) return FALSE; - ST_DWORD(&fs->win[((WORD)clust * 4) & (SS(fs) - 1)], val); - break; + if ((dir[LDIR_Ord] & LLE) && wc && lfnbuf[i]) /* Last segment matched but different length */ + return 0; - default : - return FALSE; - } - fs->winflag = 1; - return TRUE; + return 1; /* The part of LFN matched */ } -#endif /* !_FS_READONLY */ +static +int pick_lfn ( /* 1:Succeeded, 0:Buffer overflow */ + WCHAR* lfnbuf, /* Pointer to the Unicode-LFN buffer */ + BYTE* dir /* Pointer to the directory entry */ +) +{ + UINT i, s; + WCHAR wc, uc; + + + i = ((dir[LDIR_Ord] & 0x3F) - 1) * 13; /* Offset in the LFN buffer */ + + s = 0; wc = 1; + do { + uc = LD_WORD(dir+LfnOfs[s]); /* Pick an LFN character from the entry */ + if (wc) { /* Last character has not been processed */ + if (i >= _MAX_LFN) return 0; /* Buffer overflow? */ + lfnbuf[i++] = wc = uc; /* Store it */ + } else { + if (uc != 0xFFFF) return 0; /* Check filler */ + } + } while (++s < 13); /* Read all character in the entry */ + + 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; + } + + return 1; +} -/*-----------------------------------------------------------------------*/ -/* Remove a cluster chain */ -/*-----------------------------------------------------------------------*/ #if !_FS_READONLY static -BOOL remove_chain ( /* TRUE: successful, FALSE: failed */ - FATFS *fs, /* File system object */ - DWORD clust /* Cluster# to remove chain from */ +void fit_lfn ( + const WCHAR* lfnbuf, /* Pointer to the LFN buffer */ + BYTE* dir, /* Pointer to the directory entry */ + BYTE ord, /* LFN order (1-20) */ + BYTE sum /* SFN sum */ ) { - DWORD nxt; + UINT i, s; + WCHAR wc; - while (clust >= 2 && clust < fs->max_clust) { - nxt = get_cluster(fs, clust); - if (nxt == 1) return FALSE; - if (!put_cluster(fs, clust, 0)) return FALSE; - if (fs->free_clust != 0xFFFFFFFF) { - fs->free_clust++; -#if _USE_FSINFO - fs->fsi_flag = 1; -#endif - } - clust = nxt; - } - return TRUE; + dir[LDIR_Chksum] = sum; /* Set check sum */ + dir[LDIR_Attr] = AM_LFN; /* Set attribute. LFN entry */ + dir[LDIR_Type] = 0; + ST_WORD(dir+LDIR_FstClusLO, 0); + + i = (ord - 1) * 13; /* Get offset in the LFN buffer */ + s = wc = 0; + do { + if (wc != 0xFFFF) wc = lfnbuf[i++]; /* Get an effective character */ + ST_WORD(dir+LfnOfs[s], wc); /* Put it */ + if (!wc) wc = 0xFFFF; /* Padding characters following last character */ + } while (++s < 13); + if (wc == 0xFFFF || !lfnbuf[i]) ord |= LLE; /* Bottom LFN part is the start of LFN sequence */ + dir[LDIR_Ord] = ord; /* Set the LFN order */ } + +#endif #endif /*-----------------------------------------------------------------------*/ -/* Stretch or create a cluster chain */ +/* Create numbered name */ /*-----------------------------------------------------------------------*/ - -#if !_FS_READONLY -static -DWORD create_chain ( /* 0: No free cluster, 1: Error, >=2: New cluster number */ - FATFS *fs, /* File system object */ - DWORD clust /* Cluster# to stretch, 0 means create new */ +#if _USE_LFN +void gen_numname ( + BYTE* dst, /* Pointer to generated SFN */ + const BYTE* src, /* Pointer to source SFN to be modified */ + const WCHAR* lfn, /* Pointer to LFN */ + WORD seq /* Sequence number */ ) { - DWORD cstat, ncl, scl, mcl = fs->max_clust; + BYTE ns[8], c; + UINT i, j; - if (clust == 0) { /* Create new chain */ - scl = fs->last_clust; /* Get suggested start point */ - if (scl == 0 || scl >= mcl) scl = 1; - } - else { /* Stretch existing chain */ - cstat = get_cluster(fs, clust); /* Check the cluster status */ - if (cstat < 2) return 1; /* It is an invalid cluster */ - if (cstat < mcl) return cstat; /* It is already followed by next cluster */ - scl = clust; + mem_cpy(dst, src, 11); + + if (seq > 5) { /* On many collisions, generate a hash number instead of sequential number */ + do seq = (seq >> 1) + (seq << 15) + (WORD)*lfn++; while (*lfn); } - ncl = scl; /* Start cluster */ - for (;;) { - ncl++; /* Next cluster */ - if (ncl >= mcl) { /* Wrap around */ - ncl = 2; - if (ncl > scl) return 0; /* No free custer */ + /* itoa (hexdecimal) */ + i = 7; + do { + c = (seq % 16) + '0'; + if (c > '9') c += 7; + ns[i--] = c; + seq /= 16; + } while (seq); + ns[i] = '~'; + + /* Append the number */ + for (j = 0; j < i && dst[j] != ' '; j++) { + if (IsDBCS1(dst[j])) { + if (j == i - 1) break; + j++; } - cstat = get_cluster(fs, ncl); /* Get the cluster status */ - if (cstat == 0) break; /* Found a free cluster */ - if (cstat == 1) return 1; /* Any error occured */ - if (ncl == scl) return 0; /* No free custer */ } + do { + dst[j++] = (i < 8) ? ns[i++] : ' '; + } while (j < 8); +} +#endif - if (!put_cluster(fs, ncl, 0x0FFFFFFF)) return 1; /* Mark the new cluster "in use" */ - if (clust != 0 && !put_cluster(fs, clust, ncl)) return 1; /* Link it to previous one if needed */ - fs->last_clust = ncl; /* Update fsinfo */ - if (fs->free_clust != 0xFFFFFFFF) { - fs->free_clust--; -#if _USE_FSINFO - fs->fsi_flag = 1; -#endif - } - return ncl; /* Return new cluster number */ + +/*-----------------------------------------------------------------------*/ +/* Calculate sum of an SFN */ +/*-----------------------------------------------------------------------*/ +#if _USE_LFN +static +BYTE sum_sfn ( + const BYTE* dir /* Pointer to the SFN entry */ +) +{ + BYTE sum = 0; + UINT n = 11; + + do sum = (sum >> 1) + (sum << 7) + *dir++; while (--n); + return sum; } -#endif /* !_FS_READONLY */ +#endif /*-----------------------------------------------------------------------*/ -/* Get sector# from cluster# */ +/* Directory handling - Find an object in the directory */ /*-----------------------------------------------------------------------*/ static -DWORD clust2sect ( /* !=0: sector number, 0: failed - invalid cluster# */ - FATFS *fs, /* File system object */ - DWORD clust /* Cluster# to be converted */ +FRESULT dir_find ( + DIR* dp /* Pointer to the directory object linked to the file name */ ) { - clust -= 2; - if (clust >= (fs->max_clust - 2)) return 0; /* Invalid cluster# */ - return clust * fs->csize + fs->database; + FRESULT res; + BYTE c, *dir; +#if _USE_LFN + BYTE a, ord, sum; +#endif + + res = dir_sdi(dp, 0); /* Rewind directory object */ + if (res != FR_OK) return res; + +#if _USE_LFN + ord = sum = 0xFF; +#endif + do { + res = move_window(dp->fs, dp->sect); + if (res != FR_OK) break; + dir = dp->dir; /* Ptr to the directory entry of current index */ + c = dir[DIR_Name]; + 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 == 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 (dp->lfn) { + if (c & LLE) { /* Is it start of LFN sequence? */ + sum = dir[LDIR_Chksum]; + c &= ~LLE; ord = c; /* LFN start order */ + dp->lfn_idx = dp->index; + } + /* Check validity of the LFN entry and compare it with given name */ + ord = (c == ord && sum == dir[LDIR_Chksum] && cmp_lfn(dp->lfn, dir)) ? ord - 1 : 0xFF; + } + } else { /* An SFN entry is found */ + if (!ord && sum == sum_sfn(dir)) break; /* LFN matched? */ + ord = 0xFF; dp->lfn_idx = 0xFFFF; /* Reset LFN sequence */ + if (!(dp->fn[NS] & NS_LOSS) && !mem_cmp(dir, dp->fn, 11)) break; /* SFN matched? */ + } + } +#else /* Non LFN configuration */ + if (!(dir[DIR_Attr] & AM_VOL) && !mem_cmp(dir, dp->fn, 11)) /* Is it a valid entry? */ + break; +#endif + res = dir_next(dp, 0); /* Next entry */ + } while (res == FR_OK); + + return res; } /*-----------------------------------------------------------------------*/ -/* Move directory pointer to next */ +/* Read an object from the directory */ /*-----------------------------------------------------------------------*/ - +#if _FS_MINIMIZE <= 1 || _USE_LABEL || _FS_RPATH >= 2 static -BOOL next_dir_entry ( /* TRUE: successful, FALSE: could not move next */ - _DIR_ *dj /* Pointer to directory object */ -) -{ - DWORD clust; - WORD idx; - - - idx = dj->index + 1; - if ((idx & ((SS(dj->fs) - 1) / 32)) == 0) { /* Table sector changed? */ - dj->sect++; /* Next sector */ - if (dj->clust == 0) { /* In static table */ - if (idx >= dj->fs->n_rootdir) return FALSE; /* Reached to end of table */ - } else { /* In dynamic table */ - if (((idx / (SS(dj->fs) / 32)) & (dj->fs->csize - 1)) == 0) { /* Cluster changed? */ - clust = get_cluster(dj->fs, dj->clust); /* Get next cluster */ - if (clust < 2 || clust >= dj->fs->max_clust) /* Reached to end of table */ - return FALSE; - dj->clust = clust; /* Initialize for new cluster */ - dj->sect = clust2sect(dj->fs, clust); +FRESULT dir_read ( + DIR* dp, /* Pointer to the directory object */ + int vol /* Filtered by 0:file/directory or 1:volume label */ +) +{ + FRESULT res; + BYTE a, c, *dir; +#if _USE_LFN + BYTE ord = 0xFF, sum = 0xFF; +#endif + + res = FR_NO_FILE; + while (dp->sect) { + res = move_window(dp->fs, dp->sect); + if (res != FR_OK) break; + dir = dp->dir; /* Ptr to the directory entry of current index */ + c = dir[DIR_Name]; + if (c == 0) { res = FR_NO_FILE; break; } /* Reached to end of table */ + a = dir[DIR_Attr] & AM_MASK; +#if _USE_LFN /* LFN configuration */ + if (c == DDE || (!_FS_RPATH && c == '.') || (int)(a == AM_VOL) != vol) { /* An entry without valid data */ + ord = 0xFF; + } else { + if (a == AM_LFN) { /* An LFN entry is found */ + if (c & LLE) { /* Is it start of LFN sequence? */ + sum = dir[LDIR_Chksum]; + c &= ~LLE; ord = c; + dp->lfn_idx = dp->index; + } + /* Check LFN validity and capture it */ + ord = (c == ord && sum == dir[LDIR_Chksum] && pick_lfn(dp->lfn, dir)) ? ord - 1 : 0xFF; + } else { /* An SFN entry is found */ + if (ord || sum != sum_sfn(dir)) /* Is there a valid LFN? */ + dp->lfn_idx = 0xFFFF; /* It has no LFN. */ + break; } } +#else /* Non LFN configuration */ + if (c != DDE && (_FS_RPATH || c != '.') && a != AM_LFN && (int)(a == AM_VOL) == vol) /* Is it a valid entry? */ + break; +#endif + res = dir_next(dp, 0); /* Next entry */ + if (res != FR_OK) break; } - dj->index = idx; /* Lower several bits of dj->index indicates offset in dj->sect */ - return TRUE; + + if (res != FR_OK) dp->sect = 0; + + return res; } +#endif /* _FS_MINIMIZE <= 1 || _USE_LABEL || _FS_RPATH >= 2 */ /*-----------------------------------------------------------------------*/ -/* Get file status from directory entry */ +/* Register an object to the directory */ /*-----------------------------------------------------------------------*/ - -#if _FS_MINIMIZE <= 1 +#if !_FS_READONLY static -void get_fileinfo ( /* No return code */ - FILINFO *finfo, /* Ptr to store the file information */ - const BYTE *dir /* Ptr to the directory entry */ +FRESULT dir_register ( /* FR_OK:Successful, FR_DENIED:No free entry or too many SFN collision, FR_DISK_ERR:Disk error */ + DIR* dp /* Target directory with object name to be created */ ) { - BYTE n, c, a; - char *p; + FRESULT res; +#if _USE_LFN /* LFN configuration */ + WORD n, ne; + BYTE sn[12], *fn, sum; + WCHAR *lfn; - p = &finfo->fname[0]; - a = _USE_NTFLAG ? dir[DIR_NTres] : 0; /* NT flag */ - for (n = 0; n < 8; n++) { /* Convert file name (body) */ - c = dir[n]; - if (c == ' ') break; - if (c == 0x05) c = 0xE5; - if (a & 0x08 && c >= 'A' && c <= 'Z') c += 0x20; - *p++ = c; + fn = dp->fn; lfn = dp->lfn; + mem_cpy(sn, fn, 12); + + if (_FS_RPATH && (sn[NS] & NS_DOT)) /* Cannot create dot entry */ + return FR_INVALID_NAME; + + if (sn[NS] & NS_LOSS) { /* When LFN is out of 8.3 format, generate a numbered name */ + fn[NS] = 0; dp->lfn = 0; /* Find only SFN */ + for (n = 1; n < 100; n++) { + gen_numname(fn, sn, lfn, n); /* Generate a numbered name */ + res = dir_find(dp); /* Check if the name collides with existing SFN */ + if (res != FR_OK) break; + } + if (n == 100) return FR_DENIED; /* Abort if too many collisions */ + if (res != FR_NO_FILE) return res; /* Abort if the result is other than 'not collided' */ + fn[NS] = sn[NS]; dp->lfn = lfn; } - if (dir[8] != ' ') { /* Convert file name (extension) */ - *p++ = '.'; - for (n = 8; n < 11; n++) { - c = dir[n]; - if (c == ' ') break; - if (a & 0x10 && c >= 'A' && c <= 'Z') c += 0x20; - *p++ = c; + + if (sn[NS] & NS_LFN) { /* When LFN is to be created, allocate entries for an SFN + LFNs. */ + for (n = 0; lfn[n]; n++) ; + ne = (n + 25) / 13; + } else { /* Otherwise allocate an entry for an SFN */ + ne = 1; + } + res = dir_alloc(dp, ne); /* Allocate entries */ + + if (res == FR_OK && --ne) { /* Set LFN entry if needed */ + res = dir_sdi(dp, (WORD)(dp->index - ne)); + if (res == FR_OK) { + sum = sum_sfn(dp->fn); /* Sum value of the SFN tied to the LFN */ + do { /* Store LFN entries in bottom first */ + res = move_window(dp->fs, dp->sect); + if (res != FR_OK) break; + fit_lfn(dp->lfn, dp->dir, (BYTE)ne, sum); + dp->fs->wflag = 1; + res = dir_next(dp, 0); /* Next entry */ + } while (res == FR_OK && --ne); + } + } +#else /* Non LFN configuration */ + res = dir_alloc(dp, 1); /* Allocate an entry for SFN */ +#endif + + if (res == FR_OK) { /* Set SFN entry */ + res = move_window(dp->fs, dp->sect); + if (res == FR_OK) { + mem_set(dp->dir, 0, SZ_DIR); /* Clean the entry */ + mem_cpy(dp->dir, dp->fn, 11); /* Put SFN */ +#if _USE_LFN + dp->dir[DIR_NTres] = dp->fn[NS] & (NS_BODY | NS_EXT); /* Put NT flag */ +#endif + dp->fs->wflag = 1; } } - *p = '\0'; - finfo->fattrib = dir[DIR_Attr]; /* Attribute */ - finfo->fsize = LD_DWORD(&dir[DIR_FileSize]); /* Size */ - finfo->fdate = LD_WORD(&dir[DIR_WrtDate]); /* Date */ - finfo->ftime = LD_WORD(&dir[DIR_WrtTime]); /* Time */ + return res; } -#endif /* _FS_MINIMIZE <= 1 */ +#endif /* !_FS_READONLY */ + + + + +/*-----------------------------------------------------------------------*/ +/* Remove an object from the directory */ +/*-----------------------------------------------------------------------*/ +#if !_FS_READONLY && !_FS_MINIMIZE +static +FRESULT dir_remove ( /* FR_OK: Successful, FR_DISK_ERR: A disk error */ + DIR* dp /* Directory object pointing the entry to be removed */ +) +{ + FRESULT res; +#if _USE_LFN /* LFN configuration */ + WORD i; + + i = dp->index; /* SFN index */ + res = dir_sdi(dp, (WORD)((dp->lfn_idx == 0xFFFF) ? i : dp->lfn_idx)); /* Goto the SFN or top of the LFN entries */ + if (res == FR_OK) { + do { + res = move_window(dp->fs, dp->sect); + if (res != FR_OK) break; + *dp->dir = DDE; /* Mark the entry "deleted" */ + dp->fs->wflag = 1; + if (dp->index >= i) break; /* When reached SFN, all entries of the object has been deleted. */ + res = dir_next(dp, 0); /* Next entry */ + } while (res == FR_OK); + if (res == FR_NO_FILE) res = FR_INT_ERR; + } + +#else /* Non LFN configuration */ + res = dir_sdi(dp, dp->index); + if (res == FR_OK) { + res = move_window(dp->fs, dp->sect); + if (res == FR_OK) { + *dp->dir = DDE; /* Mark the entry "deleted" */ + dp->fs->wflag = 1; + } + } +#endif + + return res; +} +#endif /* !_FS_READONLY */ /*-----------------------------------------------------------------------*/ -/* Pick a paragraph and create the name in format of directory entry */ +/* Pick a segment and create the object name in directory form */ /*-----------------------------------------------------------------------*/ static -char make_dirfile ( /* 1: error - detected an invalid format, '\0'or'/': next character */ - const char **path, /* Pointer to the file path pointer */ - char *dirname /* Pointer to directory name buffer {Name(8), Ext(3), NT flag(1)} */ +FRESULT create_name ( + DIR* dp, /* Pointer to the directory object */ + const TCHAR** path /* Pointer to pointer to the segment in the path string */ ) { - BYTE n, t, c, a, b; +#if _USE_LFN /* LFN configuration */ + BYTE b, cf; + WCHAR w, *lfn; + UINT i, ni, si, di; + const TCHAR *p; + + /* Create LFN in Unicode */ + for (p = *path; *p == '/' || *p == '\\'; p++) ; /* Strip duplicated separator */ + lfn = dp->lfn; + si = di = 0; + for (;;) { + w = p[si++]; /* Get a character */ + if (w < ' ' || w == '/' || w == '\\') break; /* Break on end of segment */ + if (di >= _MAX_LFN) /* Reject too long name */ + return FR_INVALID_NAME; +#if !_LFN_UNICODE + w &= 0xFF; + if (IsDBCS1(w)) { /* Check if it is a DBC 1st byte (always false on SBCS cfg) */ + b = (BYTE)p[si++]; /* Get 2nd byte */ + if (!IsDBCS2(b)) + return FR_INVALID_NAME; /* Reject invalid sequence */ + w = (w << 8) + b; /* Create a DBC */ + } + w = ff_convert(w, 1); /* Convert ANSI/OEM to Unicode */ + if (!w) return FR_INVALID_NAME; /* Reject invalid code */ +#endif + if (w < 0x80 && chk_chr("\"*:<>\?|\x7F", w)) /* Reject illegal characters for LFN */ + return FR_INVALID_NAME; + lfn[di++] = w; /* Store the Unicode character */ + } + *path = &p[si]; /* Return pointer to the next segment */ + cf = (w < ' ') ? NS_LAST : 0; /* Set last segment flag if end of path */ +#if _FS_RPATH + if ((di == 1 && lfn[di-1] == '.') || /* Is this a dot entry? */ + (di == 2 && lfn[di-1] == '.' && lfn[di-2] == '.')) { + lfn[di] = 0; + for (i = 0; i < 11; i++) + dp->fn[i] = (i < di) ? '.' : ' '; + dp->fn[i] = cf | NS_DOT; /* This is a dot entry */ + return FR_OK; + } +#endif + while (di) { /* Strip trailing spaces and dots */ + w = lfn[di-1]; + if (w != ' ' && w != '.') break; + di--; + } + if (!di) return FR_INVALID_NAME; /* Reject nul string */ + + lfn[di] = 0; /* LFN is created */ + /* Create SFN in directory form */ + mem_set(dp->fn, ' ', 11); + for (si = 0; lfn[si] == ' ' || lfn[si] == '.'; si++) ; /* Strip leading spaces and dots */ + if (si) cf |= NS_LOSS | NS_LFN; + while (di && lfn[di - 1] != '.') di--; /* Find extension (di<=si: no extension) */ - memset(dirname, ' ', 8+3); /* Fill buffer with spaces */ - a = 0; b = 0x18; /* NT flag */ - n = 0; t = 8; + b = i = 0; ni = 8; for (;;) { - c = *(*path)++; - if (c == '\0' || c == '/') { /* Reached to end of str or directory separator */ - if (n == 0) break; - dirname[11] = _USE_NTFLAG ? (a & b) : 0; - return c; - } - if (c <= ' ' || c == 0x7F) break; /* Reject invisible chars */ - if (c == '.') { - if (!(a & 1) && n >= 1 && n <= 8) { /* Enter extension part */ - n = 8; t = 11; continue; + w = lfn[si++]; /* Get an LFN character */ + if (!w) break; /* Break on end of the LFN */ + if (w == ' ' || (w == '.' && si != di)) { /* Remove spaces and dots */ + cf |= NS_LOSS | NS_LFN; continue; + } + + if (i >= ni || si == di) { /* Extension or end of SFN */ + if (ni == 11) { /* Long extension */ + cf |= NS_LOSS | NS_LFN; break; } - break; + if (si != di) cf |= NS_LOSS | NS_LFN; /* Out of 8.3 format */ + if (si > di) break; /* No extension */ + si = di; i = 8; ni = 11; /* Enter extension section */ + b <<= 2; continue; + } + + if (w >= 0x80) { /* Non ASCII character */ +#ifdef _EXCVT + w = ff_convert(w, 0); /* Unicode -> OEM code */ + if (w) w = ExCvt[w - 0x80]; /* Convert extended character to upper (SBCS) */ +#else + w = ff_convert(ff_wtoupper(w), 0); /* Upper converted Unicode -> OEM code */ +#endif + cf |= NS_LFN; /* Force create LFN entry */ } - if (_USE_SJIS && - ((c >= 0x81 && c <= 0x9F) || /* Accept S-JIS code */ - (c >= 0xE0 && c <= 0xFC))) { - if (n == 0 && c == 0xE5) /* Change heading \xE5 to \x05 */ - c = 0x05; - a ^= 0x01; goto md_l2; - } - if (c == '"') break; /* Reject " */ - if (c <= ')') goto md_l1; /* Accept ! # $ % & ' ( ) */ - if (c <= ',') break; /* Reject * + , */ - if (c <= '9') goto md_l1; /* Accept - 0-9 */ - if (c <= '?') break; /* Reject : ; < = > ? */ - if (!(a & 1)) { /* These checks are not applied to S-JIS 2nd byte */ - if (c == '|') break; /* Reject | */ - if (c >= '[' && c <= ']') break;/* Reject [ \ ] */ - if (_USE_NTFLAG && c >= 'A' && c <= 'Z') - (t == 8) ? (b &= 0xF7) : (b &= 0xEF); - if (c >= 'a' && c <= 'z') { /* Convert to upper case */ - c -= 0x20; - if (_USE_NTFLAG) (t == 8) ? (a |= 0x08) : (a |= 0x10); + + if (_DF1S && w >= 0x100) { /* Double byte character (always false on SBCS cfg) */ + if (i >= ni - 1) { + cf |= NS_LOSS | NS_LFN; i = ni; continue; + } + dp->fn[i++] = (BYTE)(w >> 8); + } else { /* Single byte character */ + if (!w || chk_chr("+,;=[]", w)) { /* Replace illegal characters for SFN */ + w = '_'; cf |= NS_LOSS | NS_LFN;/* Lossy conversion */ + } else { + if (IsUpper(w)) { /* ASCII large capital */ + b |= 2; + } else { + if (IsLower(w)) { /* ASCII small capital */ + b |= 1; w -= 0x20; + } + } } } - md_l1: - a &= 0xFE; - md_l2: - if (n >= t) break; - dirname[n++] = c; + dp->fn[i++] = (BYTE)w; } - return 1; + + if (dp->fn[0] == DDE) dp->fn[0] = NDDE; /* If the first character 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 */ + cf |= NS_LFN; + if (!(cf & NS_LFN)) { /* When LFN is in 8.3 format without extended character, NT flags are created */ + if ((b & 0x03) == 0x01) cf |= NS_EXT; /* NT flag (Extension has only small capital) */ + if ((b & 0x0C) == 0x04) cf |= NS_BODY; /* NT flag (Filename has only small capital) */ + } + + dp->fn[NS] = cf; /* SFN is created */ + + return FR_OK; + + +#else /* Non-LFN configuration */ + BYTE b, c, d, *sfn; + UINT ni, si, i; + const char *p; + + /* Create file name in directory form */ + for (p = *path; *p == '/' || *p == '\\'; p++) ; /* Strip duplicated separator */ + sfn = dp->fn; + mem_set(sfn, ' ', 11); + si = i = b = 0; ni = 8; +#if _FS_RPATH + if (p[si] == '.') { /* Is this a dot entry? */ + for (;;) { + c = (BYTE)p[si++]; + if (c != '.' || si >= 3) break; + sfn[i++] = c; + } + if (c != '/' && c != '\\' && c > ' ') return FR_INVALID_NAME; + *path = &p[si]; /* Return pointer to the next segment */ + sfn[NS] = (c <= ' ') ? NS_LAST | NS_DOT : NS_DOT; /* Set last segment flag if end of path */ + return FR_OK; + } +#endif + for (;;) { + c = (BYTE)p[si++]; + if (c <= ' ' || c == '/' || c == '\\') break; /* Break on end of segment */ + if (c == '.' || i >= ni) { + if (ni != 8 || c != '.') return FR_INVALID_NAME; + i = 8; ni = 11; + b <<= 2; continue; + } + if (c >= 0x80) { /* Extended character? */ + b |= 3; /* Eliminate NT flag */ +#ifdef _EXCVT + c = ExCvt[c - 0x80]; /* To upper extended characters (SBCS cfg) */ +#else +#if !_DF1S + return FR_INVALID_NAME; /* Reject extended characters (ASCII cfg) */ +#endif +#endif + } + if (IsDBCS1(c)) { /* Check if it is a DBC 1st byte (always false on SBCS cfg) */ + d = (BYTE)p[si++]; /* Get 2nd byte */ + if (!IsDBCS2(d) || i >= ni - 1) /* Reject invalid DBC */ + return FR_INVALID_NAME; + sfn[i++] = c; + sfn[i++] = d; + } else { /* Single byte code */ + if (chk_chr("\"*+,:;<=>\?[]|\x7F", c)) /* Reject illegal chrs for SFN */ + return FR_INVALID_NAME; + if (IsUpper(c)) { /* ASCII large capital? */ + b |= 2; + } else { + if (IsLower(c)) { /* ASCII small capital? */ + b |= 1; c -= 0x20; + } + } + sfn[i++] = c; + } + } + *path = &p[si]; /* Return pointer to the next segment */ + 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] == DDE) sfn[0] = NDDE; /* When first character 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) */ + if ((b & 0x0C) == 0x04) c |= NS_BODY; /* NT flag (Name body has only small capital) */ + + sfn[NS] = c; /* Store NT flag, File name is created */ + + return FR_OK; +#endif } /*-----------------------------------------------------------------------*/ -/* Trace a file path */ +/* Get file information from directory entry */ /*-----------------------------------------------------------------------*/ - +#if _FS_MINIMIZE <= 1 || _FS_RPATH >= 2 static -FRESULT trace_path ( /* FR_OK(0): successful, !=0: error code */ - _DIR_ *dj, /* Pointer to directory object to return last directory */ - char *fn, /* Pointer to last segment name to return {file(8),ext(3),attr(1)} */ - const char *path, /* Full-path string to trace a file or directory */ - BYTE **dir /* Pointer to pointer to found entry to retutn */ +void get_fileinfo ( /* No return code */ + DIR* dp, /* Pointer to the directory object */ + FILINFO* fno /* Pointer to the file information to be filled */ ) { - DWORD clust; - char ds; - BYTE *dptr = NULL; - FATFS *fs = dj->fs; + UINT i; + TCHAR *p, c; + + + p = fno->fname; + if (dp->sect) { /* Get SFN */ + BYTE *dir = dp->dir; + + i = 0; + while (i < 11) { /* Copy name body and extension */ + c = (TCHAR)dir[i++]; + if (c == ' ') continue; /* Skip padding spaces */ + if (c == NDDE) c = (TCHAR)DDE; /* Restore replaced DDE character */ + if (i == 9) *p++ = '.'; /* Insert a . if extension is exist */ +#if _USE_LFN + if (IsUpper(c) && (dir[DIR_NTres] & (i >= 9 ? NS_EXT : NS_BODY))) + c += 0x20; /* To lower */ +#if _LFN_UNICODE + if (IsDBCS1(c) && i != 8 && i != 11 && IsDBCS2(dir[i])) + c = c << 8 | dir[i++]; + c = ff_convert(c, 1); /* OEM -> Unicode */ + if (!c) c = '?'; +#endif +#endif + *p++ = c; + } + fno->fattrib = dir[DIR_Attr]; /* Attribute */ + fno->fsize = LD_DWORD(dir+DIR_FileSize); /* Size */ + fno->fdate = LD_WORD(dir+DIR_WrtDate); /* Date */ + fno->ftime = LD_WORD(dir+DIR_WrtTime); /* Time */ + } + *p = 0; /* Terminate SFN string by a \0 */ + +#if _USE_LFN + if (fno->lfname) { + WCHAR w, *lfn; + + i = 0; p = fno->lfname; + if (dp->sect && fno->lfsize && dp->lfn_idx != 0xFFFF) { /* Get LFN if available */ + lfn = dp->lfn; + while ((w = *lfn++) != 0) { /* Get an LFN character */ +#if !_LFN_UNICODE + w = ff_convert(w, 0); /* Unicode -> OEM */ + if (!w) { i = 0; break; } /* No LFN if it could not be converted */ + if (_DF1S && w >= 0x100) /* Put 1st byte if it is a DBC (always false on SBCS cfg) */ + p[i++] = (TCHAR)(w >> 8); +#endif + if (i >= fno->lfsize - 1) { i = 0; break; } /* No LFN if buffer overflow */ + p[i++] = (TCHAR)w; + } + } + p[i] = 0; /* Terminate LFN string by a \0 */ + } +#endif +} +#endif /* _FS_MINIMIZE <= 1 || _FS_RPATH >= 2*/ - /* Initialize directory object */ - clust = fs->dirbase; - if (fs->fs_type == FS_FAT32) { - dj->clust = dj->sclust = clust; - dj->sect = clust2sect(fs, clust); - } else { - dj->clust = dj->sclust = 0; - dj->sect = clust; - } - dj->index = 0; - if (*path == '\0') { /* Null path means the root directory */ - *dir = NULL; return FR_OK; - } - for (;;) { - ds = make_dirfile(&path, fn); /* Get a paragraph into fn[] */ - if (ds == 1) return FR_INVALID_NAME; - for (;;) { - if (!move_window(fs, dj->sect)) return FR_RW_ERROR; - dptr = &fs->win[(dj->index & ((SS(fs) - 1) / 32)) * 32]; /* Pointer to the directory entry */ - if (dptr[DIR_Name] == 0) /* Has it reached to end of dir? */ - return !ds ? FR_NO_FILE : FR_NO_PATH; - if (dptr[DIR_Name] != 0xE5 /* Matched? */ - && !(dptr[DIR_Attr] & AM_VOL) - && !memcmp(&dptr[DIR_Name], fn, 8+3) ) break; - if (!next_dir_entry(dj)) /* Next directory pointer */ - return !ds ? FR_NO_FILE : FR_NO_PATH; +/*-----------------------------------------------------------------------*/ +/* Get logical drive number from path name */ +/*-----------------------------------------------------------------------*/ + +static +int get_ldnumber ( /* Returns logical drive number (-1:invalid drive) */ + const TCHAR** path /* Pointer to pointer to the path name */ +) +{ + int vol = -1; + + + if (*path) { + vol = (*path)[0] - '0'; + if ((UINT)vol < 9 && (*path)[1] == ':') { /* There is a drive number */ + *path += 2; /* Get value and strip it */ + if (vol >= _VOLUMES) vol = -1; /* Check if the drive number is valid */ + } else { /* No drive number use default drive */ +#if _FS_RPATH && _VOLUMES >= 2 + vol = CurrVol; /* Current drive */ +#else + vol = 0; /* Drive 0 */ +#endif } - if (!ds) { *dir = dptr; return FR_OK; } /* Matched with end of path */ - if (!(dptr[DIR_Attr] & AM_DIR)) return FR_NO_PATH; /* Cannot trace because it is a file */ - clust = ((DWORD)LD_WORD(&dptr[DIR_FstClusHI]) << 16) | LD_WORD(&dptr[DIR_FstClusLO]); /* Get cluster# of the directory */ - dj->clust = dj->sclust = clust; /* Restart scanning at the new directory */ - dj->sect = clust2sect(fs, clust); - dj->index = 2; } + + return vol; } /*-----------------------------------------------------------------------*/ -/* Reserve a directory entry */ +/* Follow a file path */ /*-----------------------------------------------------------------------*/ -#if !_FS_READONLY static -FRESULT reserve_direntry ( /* FR_OK: successful, FR_DENIED: no free entry, FR_RW_ERROR: a disk error occured */ - _DIR_ *dj, /* Target directory to create new entry */ - BYTE **dir /* Pointer to pointer to created entry to retutn */ +FRESULT follow_path ( /* FR_OK(0): successful, !=0: error code */ + DIR* dp, /* Directory object to return last directory and found object */ + const TCHAR* path /* Full-path string to find a file or directory */ ) { - DWORD clust, sector; - BYTE c, n, *dptr; - FATFS *fs = dj->fs; + FRESULT res; + BYTE *dir, ns; - /* Re-initialize directory object */ - clust = dj->sclust; - if (clust != 0) { /* Dyanmic directory table */ - dj->clust = clust; - dj->sect = clust2sect(fs, clust); - } else { /* Static directory table */ - dj->sect = fs->dirbase; +#if _FS_RPATH + if (*path == '/' || *path == '\\') { /* There is a heading separator */ + path++; dp->sclust = 0; /* Strip it and start from the root directory */ + } else { /* No heading separator */ + dp->sclust = dp->fs->cdir; /* Start from the current directory */ } - dj->index = 0; +#else + if (*path == '/' || *path == '\\') /* Strip heading separator if exist */ + path++; + dp->sclust = 0; /* Always start from the root directory */ +#endif - do { - if (!move_window(fs, dj->sect)) return FR_RW_ERROR; - dptr = &fs->win[(dj->index & ((SS(dj->fs) - 1) / 32)) * 32]; /* Pointer to the directory entry */ - c = dptr[DIR_Name]; - if (c == 0 || c == 0xE5) { /* Found an empty entry */ - *dir = dptr; return FR_OK; - } - } while (next_dir_entry(dj)); /* Next directory pointer */ - /* Reached to end of the directory table */ - - /* Abort when it is a static table or could not stretch dynamic table */ - if (clust == 0 || !(clust = create_chain(fs, dj->clust))) return FR_DENIED; - if (clust == 1 || !move_window(fs, 0)) return FR_RW_ERROR; - - /* Cleanup the expanded table */ - fs->winsect = sector = clust2sect(fs, clust); - memset(fs->win, 0, SS(fs)); - for (n = fs->csize; n; n--) { - if (disk_write(fs->drive, fs->win, sector, 1) != RES_OK) - return FR_RW_ERROR; - sector++; - } - fs->winflag = 1; - *dir = fs->win; + if ((UINT)*path < ' ') { /* Null path name is the origin directory itself */ + res = dir_sdi(dp, 0); + dp->dir = 0; + } else { /* Follow path */ + for (;;) { + res = create_name(dp, &path); /* Get a segment name of the path */ + if (res != FR_OK) break; + res = dir_find(dp); /* Find an object with the sagment name */ + ns = dp->fn[NS]; + if (res != FR_OK) { /* Failed to find the object */ + if (res == FR_NO_FILE) { /* Object is not found */ + if (_FS_RPATH && (ns & NS_DOT)) { /* If dot entry is not exist, */ + dp->sclust = 0; dp->dir = 0; /* it is the root directory and stay there */ + if (!(ns & NS_LAST)) continue; /* Continue to follow if not last segment */ + res = FR_OK; /* Ended at the root directroy. Function completed. */ + } else { /* Could not find the object */ + if (!(ns & NS_LAST)) res = FR_NO_PATH; /* Adjust error code if not last segment */ + } + } + break; + } + if (ns & NS_LAST) break; /* Last segment matched. Function completed. */ + dir = dp->dir; /* Follow the sub-directory */ + if (!(dir[DIR_Attr] & AM_DIR)) { /* It is not a sub-directory and cannot follow */ + res = FR_NO_PATH; break; + } + dp->sclust = ld_clust(dp->fs, dir); + } + } - return FR_OK; + return res; } -#endif /* !_FS_READONLY */ /*-----------------------------------------------------------------------*/ -/* Load boot record and check if it is an FAT boot record */ +/* Load a sector and check if it is an FAT boot sector */ /*-----------------------------------------------------------------------*/ static -BYTE check_fs ( /* 0:The FAT boot record, 1:Valid boot record but not an FAT, 2:Not a boot record or error */ - FATFS *fs, /* File system object */ +BYTE check_fs ( /* 0:FAT boor sector, 1:Valid boor sector but not FAT, 2:Not a boot sector, 3:Disk error */ + FATFS* fs, /* File system object */ DWORD sect /* Sector# (lba) to check if it is an FAT boot record or not */ ) { - if (disk_read(fs->drive, fs->win, sect, 1) != RES_OK) /* Load boot record */ - return 2; - if (LD_WORD(&fs->win[BS_55AA]) != 0xAA55) /* Check record signature (always placed at offset 510 even if the sector size is >512) */ + fs->wflag = 0; fs->winsect = 0xFFFFFFFF; /* Invaidate window */ + if (move_window(fs, sect) != FR_OK) /* Load boot record */ + return 3; + + if (LD_WORD(&fs->win[BS_55AA]) != 0xAA55) /* Check boot record signature (always placed at offset 510 even if the sector size is >512) */ return 2; - if (!memcmp(&fs->win[BS_FilSysType], "FAT", 3)) /* Check FAT signature */ + if ((LD_DWORD(&fs->win[BS_FilSysType]) & 0xFFFFFF) == 0x544146) /* Check "FAT" string */ return 0; - if (!memcmp(&fs->win[BS_FilSysType32], "FAT32", 5) && !(fs->win[BPB_ExtFlags] & 0x80)) + if ((LD_DWORD(&fs->win[BS_FilSysType32]) & 0xFFFFFF) == 0x544146) /* Check "FAT" string */ return 0; return 1; @@ -636,122 +2177,166 @@ BYTE check_fs ( /* 0:The FAT boot record, 1:Valid boot record but not an FAT, 2: /*-----------------------------------------------------------------------*/ -/* Make sure that the file system is valid */ +/* Find logical drive and check if the volume is mounted */ /*-----------------------------------------------------------------------*/ static -FRESULT auto_mount ( /* FR_OK(0): successful, !=0: any error occured */ - const char **path, /* Pointer to pointer to the path name (drive number) */ - FATFS **rfs, /* Pointer to pointer to the found file system object */ - BYTE chk_wp /* !=0: Check media write protection for write access */ +FRESULT find_volume ( /* FR_OK(0): successful, !=0: any error occurred */ + FATFS** rfs, /* Pointer to pointer to the found file system object */ + const TCHAR** path, /* Pointer to pointer to the path name (drive number) */ + BYTE wmode /* !=0: Check write protection for write access */ ) { - BYTE drv, fmt, *tbl; + BYTE fmt; + int vol; DSTATUS stat; - DWORD bootsect, fatsize, totalsect, maxclust; - const char *p = *path; + DWORD bsect, fasize, tsect, sysect, nclst, szbfat; + WORD nrsv; FATFS *fs; - /* Get drive number from the path name */ - while (*p == ' ') p++; /* Strip leading spaces */ - drv = p[0] - '0'; /* Is there a drive number? */ - if (drv <= 9 && p[1] == ':') - p += 2; /* Found a drive number, get and strip it */ - else - drv = 0; /* No drive number is given, use drive number 0 as default */ - if (*p == '/') p++; /* Strip heading slash */ - *path = p; /* Return pointer to the path name */ - - /* Check if the drive number is valid or not */ - if (drv >= _DRIVES) return FR_INVALID_DRIVE; /* Is the drive number valid? */ - *rfs = fs = FatFs[drv]; /* Returen pointer to the corresponding file system object */ - if (!fs) return FR_NOT_ENABLED; /* Is the file system object registered? */ - - if (fs->fs_type) { /* If the logical drive has been mounted */ - stat = disk_status(fs->drive); - if (!(stat & STA_NOINIT)) { /* and physical drive is kept initialized (has not been changed), */ -#if !_FS_READONLY - if (chk_wp && (stat & STA_PROTECT)) /* Check write protection if needed */ + /* Get logical drive number from the path name */ + *rfs = 0; + vol = get_ldnumber(path); + if (vol < 0) return FR_INVALID_DRIVE; + + /* Check if the file system object is valid or not */ + fs = FatFs[vol]; /* Get pointer to the file system object */ + if (!fs) return FR_NOT_ENABLED; /* Is the file system object available? */ + + ENTER_FF(fs); /* Lock the volume */ + *rfs = fs; /* Return pointer to the file system object */ + + if (fs->fs_type) { /* If the volume has been mounted */ + stat = disk_status(fs->drv); + if (!(stat & STA_NOINIT)) { /* and the physical drive is kept initialized */ + if (!_FS_READONLY && wmode && (stat & STA_PROTECT)) /* Check write protection if needed */ return FR_WRITE_PROTECTED; -#endif - return FR_OK; /* The file system object is valid */ + return FR_OK; /* The file system object is valid */ } } - /* The logical drive must be re-mounted. Following code attempts to mount the logical drive */ + /* The file system object is not valid. */ + /* Following code attempts to mount the volume. (analyze BPB and initialize the fs object) */ - memset(fs, 0, sizeof(FATFS)); /* Clean-up the file system object */ - fs->drive = LD2PD(drv); /* Bind the logical drive and a physical drive */ - stat = disk_initialize(fs->drive); /* Initialize low level disk I/O layer */ - if (stat & STA_NOINIT) /* Check if the drive is ready */ - return FR_NOT_READY; -#if S_MAX_SIZ > 512 /* Get disk sector size if needed */ - if (disk_ioctl(drv, GET_SECTOR_SIZE, &SS(fs)) != RES_OK || SS(fs) > S_MAX_SIZ) - return FR_NO_FILESYSTEM; -#endif -#if !_FS_READONLY - if (chk_wp && (stat & STA_PROTECT)) /* Check write protection if needed */ + fs->fs_type = 0; /* Clear the file system object */ + fs->drv = LD2PD(vol); /* Bind the logical drive and a physical drive */ + stat = disk_initialize(fs->drv); /* Initialize the physical drive */ + if (stat & STA_NOINIT) /* Check if the initialization succeeded */ + return FR_NOT_READY; /* Failed to initialize due to no medium or hard error */ + if (!_FS_READONLY && wmode && (stat & STA_PROTECT)) /* Check disk write protection if needed */ return FR_WRITE_PROTECTED; +#if _MAX_SS != 512 /* Get sector size (variable sector size cfg only) */ + if (disk_ioctl(fs->drv, GET_SECTOR_SIZE, &fs->ssize) != RES_OK) + return FR_DISK_ERR; #endif - /* Search FAT partition on the drive */ - fmt = check_fs(fs, bootsect = 0); /* Check sector 0 as an SFD format */ - if (fmt == 1) { /* Not an FAT boot record, it may be patitioned */ - /* Check a partition listed in top of the partition table */ - tbl = &fs->win[MBR_Table + LD2PT(drv) * 16]; /* Partition table */ - if (tbl[4]) { /* Is the partition existing? */ - bootsect = LD_DWORD(&tbl[8]); /* Partition offset in LBA */ - fmt = check_fs(fs, bootsect); /* Check the partition */ + /* Find an FAT partition on the drive. Supports only generic partitioning, FDISK and SFD. */ + bsect = 0; + fmt = check_fs(fs, bsect); /* Load sector 0 and check if it is an FAT boot sector as SFD */ + if (fmt == 1 || (!fmt && (LD2PT(vol)))) { /* Not an FAT boot sector or forced partition number */ + UINT i; + DWORD br[4]; + + for (i = 0; i < 4; i++) { /* Get partition offset */ + BYTE *pt = fs->win+MBR_Table + i * SZ_PTE; + br[i] = pt[4] ? LD_DWORD(&pt[8]) : 0; } + i = LD2PT(vol); /* Partition number: 0:auto, 1-4:forced */ + if (i) i--; + do { /* Find an FAT volume */ + bsect = br[i]; + fmt = bsect ? check_fs(fs, bsect) : 2; /* Check the partition */ + } while (!LD2PT(vol) && fmt && ++i < 4); } - if (fmt || LD_WORD(&fs->win[BPB_BytsPerSec]) != SS(fs)) /* No valid FAT patition is found */ + if (fmt == 3) return FR_DISK_ERR; /* An error occured in the disk I/O layer */ + if (fmt) return FR_NO_FILESYSTEM; /* No FAT volume is found */ + + /* An FAT volume is found. Following code initializes the file system object */ + + if (LD_WORD(fs->win+BPB_BytsPerSec) != SS(fs)) /* (BPB_BytsPerSec must be equal to the physical sector size) */ return FR_NO_FILESYSTEM; - /* Initialize the file system object */ - fatsize = LD_WORD(&fs->win[BPB_FATSz16]); /* Number of sectors per FAT */ - if (!fatsize) fatsize = LD_DWORD(&fs->win[BPB_FATSz32]); - fs->sects_fat = fatsize; + fasize = LD_WORD(fs->win+BPB_FATSz16); /* Number of sectors per FAT */ + if (!fasize) fasize = LD_DWORD(fs->win+BPB_FATSz32); + fs->fsize = fasize; + fs->n_fats = fs->win[BPB_NumFATs]; /* Number of FAT copies */ - fatsize *= fs->n_fats; /* (Number of sectors in FAT area) */ - fs->fatbase = bootsect + LD_WORD(&fs->win[BPB_RsvdSecCnt]); /* FAT start sector (lba) */ + if (fs->n_fats != 1 && fs->n_fats != 2) /* (Must be 1 or 2) */ + return FR_NO_FILESYSTEM; + fasize *= fs->n_fats; /* Number of sectors for FAT area */ + fs->csize = fs->win[BPB_SecPerClus]; /* Number of sectors per cluster */ - fs->n_rootdir = LD_WORD(&fs->win[BPB_RootEntCnt]); /* Nmuber of root directory entries */ - totalsect = LD_WORD(&fs->win[BPB_TotSec16]); /* Number of sectors on the file system */ - if (!totalsect) totalsect = LD_DWORD(&fs->win[BPB_TotSec32]); - fs->max_clust = maxclust = (totalsect /* max_clust = Last cluster# + 1 */ - - LD_WORD(&fs->win[BPB_RsvdSecCnt]) - fatsize - fs->n_rootdir / (SS(fs)/32) - ) / fs->csize + 2; - - fmt = FS_FAT12; /* Determine the FAT sub type */ - if (maxclust >= 0xFF7) fmt = FS_FAT16; - if (maxclust >= 0xFFF7) fmt = FS_FAT32; - - if (fmt == FS_FAT32) - fs->dirbase = LD_DWORD(&fs->win[BPB_RootClus]); /* Root directory start cluster */ - else - fs->dirbase = fs->fatbase + fatsize; /* Root directory start sector (lba) */ - fs->database = fs->fatbase + fatsize + fs->n_rootdir / (SS(fs)/32); /* Data start sector (lba) */ + if (!fs->csize || (fs->csize & (fs->csize - 1))) /* (Must be power of 2) */ + return FR_NO_FILESYSTEM; -#if !_FS_READONLY - /* Initialize allocation information */ - fs->free_clust = 0xFFFFFFFF; -#if _USE_FSINFO - /* Get fsinfo if needed */ + fs->n_rootdir = LD_WORD(fs->win+BPB_RootEntCnt); /* Number of root directory entries */ + if (fs->n_rootdir % (SS(fs) / SZ_DIR)) /* (Must be sector aligned) */ + return FR_NO_FILESYSTEM; + + tsect = LD_WORD(fs->win+BPB_TotSec16); /* Number of sectors on the volume */ + if (!tsect) tsect = LD_DWORD(fs->win+BPB_TotSec32); + + nrsv = LD_WORD(fs->win+BPB_RsvdSecCnt); /* Number of reserved sectors */ + if (!nrsv) return FR_NO_FILESYSTEM; /* (Must not be 0) */ + + /* Determine the FAT sub type */ + 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) */ + fmt = FS_FAT12; + if (nclst >= MIN_FAT16) fmt = FS_FAT16; + if (nclst >= MIN_FAT32) fmt = FS_FAT32; + + /* Boundaries and Limits */ + fs->n_fatent = nclst + 2; /* Number of FAT entries */ + fs->volbase = bsect; /* Volume start sector */ + fs->fatbase = bsect + nrsv; /* FAT start sector */ + fs->database = bsect + sysect; /* Data start sector */ if (fmt == FS_FAT32) { - fs->fsi_sector = bootsect + LD_WORD(&fs->win[BPB_FSInfo]); - if (disk_read(fs->drive, fs->win, fs->fsi_sector, 1) == RES_OK && - LD_WORD(&fs->win[BS_55AA]) == 0xAA55 && - LD_DWORD(&fs->win[FSI_LeadSig]) == 0x41615252 && - LD_DWORD(&fs->win[FSI_StrucSig]) == 0x61417272) { - fs->last_clust = LD_DWORD(&fs->win[FSI_Nxt_Free]); - fs->free_clust = LD_DWORD(&fs->win[FSI_Free_Count]); + if (fs->n_rootdir) return FR_NO_FILESYSTEM; /* (BPB_RootEntCnt must be 0) */ + fs->dirbase = LD_DWORD(fs->win+BPB_RootClus); /* Root directory start cluster */ + szbfat = fs->n_fatent * 4; /* (Required FAT size) */ + } else { + if (!fs->n_rootdir) return FR_NO_FILESYSTEM; /* (BPB_RootEntCnt must not be 0) */ + fs->dirbase = fs->fatbase + fasize; /* Root directory start sector */ + 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)) /* (BPB_FATSz must not be less than required) */ + return FR_NO_FILESYSTEM; + +#if !_FS_READONLY + /* Initialize cluster allocation information */ + fs->last_clust = fs->free_clust = 0xFFFFFFFF; + + /* Get fsinfo if available */ + fs->fsi_flag = 0x80; + if (fmt == FS_FAT32 /* Enable FSINFO only if FAT32 and BPB_FSInfo is 1 */ + && LD_WORD(fs->win+BPB_FSInfo) == 1 + && move_window(fs, bsect + 1) == FR_OK) + { + fs->fsi_flag = 0; + if (LD_WORD(fs->win+BS_55AA) == 0xAA55 /* Load FSINFO data if available */ + && LD_DWORD(fs->win+FSI_LeadSig) == 0x41615252 + && LD_DWORD(fs->win+FSI_StrucSig) == 0x61417272) + { +#if !_FS_NOFSINFO + fs->free_clust = LD_DWORD(fs->win+FSI_Free_Count); +#endif + fs->last_clust = LD_DWORD(fs->win+FSI_Nxt_Free); } } #endif + fs->fs_type = fmt; /* FAT sub-type */ + fs->id = ++Fsid; /* File system mount ID */ +#if _FS_RPATH + fs->cdir = 0; /* Current directory (root dir) */ +#endif +#if _FS_LOCK /* Clear file lock semaphores */ + clear_lock(fs); #endif - fs->fs_type = fmt; /* FAT syb-type */ - fs->id = ++fsid; /* File system mount ID */ return FR_OK; } @@ -759,18 +2344,23 @@ FRESULT auto_mount ( /* FR_OK(0): successful, !=0: any error occured */ /*-----------------------------------------------------------------------*/ -/* Check if the file/dir object is valid or not */ +/* Check if the file/directory object is valid or not */ /*-----------------------------------------------------------------------*/ static -FRESULT validate ( /* FR_OK(0): The object is valid, !=0: Invalid */ - const FATFS *fs, /* Pointer to the file system object */ - WORD id /* Member id of the target object to be checked */ +FRESULT validate ( /* FR_OK(0): The object is valid, !=0: Invalid */ + void* obj /* Pointer to the object FIL/DIR to check validity */ ) { - if (!fs || !fs->fs_type || fs->id != id) + FIL *fil = (FIL*)obj; /* Assuming offset of .fs and .id in the FIL/DIR structure is identical */ + + + if (!fil || !fil->fs || !fil->fs->fs_type || fil->fs->id != fil->id) return FR_INVALID_OBJECT; - if (disk_status(fs->drive) & STA_NOINIT) + + ENTER_FF(fil->fs); /* Lock file system */ + + if (disk_status(fil->fs->drv) & STA_NOINIT) return FR_NOT_READY; return FR_OK; @@ -788,22 +2378,46 @@ FRESULT validate ( /* FR_OK(0): The object is valid, !=0: Invalid */ /*-----------------------------------------------------------------------*/ -/* Mount/Unmount a Locical Drive */ +/* Mount/Unmount a Logical Drive */ /*-----------------------------------------------------------------------*/ FRESULT f_mount ( - BYTE drv, /* Logical drive number to be mounted/unmounted */ - FATFS *fs /* Pointer to new file system object (NULL for unmount)*/ + FATFS* fs, /* Pointer to the file system object (NULL:unmount)*/ + const TCHAR* path, /* Logical drive number to be mounted/unmounted */ + BYTE opt /* 0:Do not mount (delayed mount), 1:Mount immediately */ ) { - if (drv >= _DRIVES) return FR_INVALID_DRIVE; + FATFS *cfs; + int vol; + FRESULT res; - if (FatFs[drv]) FatFs[drv]->fs_type = 0; /* Clear old object */ - FatFs[drv] = fs; /* Register and clear new object */ - if (fs) fs->fs_type = 0; + vol = get_ldnumber(&path); + if (vol < 0) return FR_INVALID_DRIVE; + cfs = FatFs[vol]; /* Pointer to fs object */ - return FR_OK; + if (cfs) { +#if _FS_LOCK + clear_lock(cfs); +#endif +#if _FS_REENTRANT /* Discard sync object of the current volume */ + if (!ff_del_syncobj(&cfs->sobj)) return FR_INT_ERR; +#endif + cfs->fs_type = 0; /* Clear old fs object */ + } + + if (fs) { + fs->fs_type = 0; /* Clear new fs object */ +#if _FS_REENTRANT /* Create sync object for the new volume */ + if (!ff_cre_syncobj(vol, &fs->sobj)) return FR_INT_ERR; +#endif + } + FatFs[vol] = fs; /* Register new fs object */ + + if (!fs || opt != 1) return FR_OK; /* Do not mount now, it will be mounted later */ + + res = find_volume(&fs, &path, 0); /* Force mounted the volume */ + LEAVE_FF(fs, res); } @@ -814,88 +2428,131 @@ FRESULT f_mount ( /*-----------------------------------------------------------------------*/ FRESULT f_open ( - FIL *fp, /* Pointer to the blank file object */ - const char *path, /* Pointer to the file name */ + FIL* fp, /* Pointer to the blank file object */ + const TCHAR* path, /* Pointer to the file name */ BYTE mode /* Access mode and file open mode flags */ ) { FRESULT res; - _DIR_ dj; + DIR dj; BYTE *dir; - char fn[8+3+1]; + DEF_NAMEBUF; - fp->fs = NULL; /* Clear file object */ + if (!fp) return FR_INVALID_OBJECT; + fp->fs = 0; /* Clear file object */ + + /* Get logical drive number */ #if !_FS_READONLY - mode &= (FA_READ|FA_WRITE|FA_CREATE_ALWAYS|FA_OPEN_ALWAYS|FA_CREATE_NEW); - res = auto_mount(&path, &dj.fs, (BYTE)(mode & (FA_WRITE|FA_CREATE_ALWAYS|FA_OPEN_ALWAYS|FA_CREATE_NEW))); + mode &= FA_READ | FA_WRITE | FA_CREATE_ALWAYS | FA_OPEN_ALWAYS | FA_CREATE_NEW; + res = find_volume(&dj.fs, &path, (BYTE)(mode & ~FA_READ)); #else mode &= FA_READ; - res = auto_mount(&path, &dj.fs, 0); + res = find_volume(&dj.fs, &path, 0); #endif - if (res != FR_OK) return res; - res = trace_path(&dj, fn, path, &dir); /* Trace the file path */ + if (res == FR_OK) { + INIT_BUF(dj); + res = follow_path(&dj, path); /* Follow the file path */ + dir = dj.dir; +#if !_FS_READONLY /* R/W configuration */ + if (res == FR_OK) { + if (!dir) /* Default directory itself */ + res = FR_INVALID_NAME; +#if _FS_LOCK + else + res = chk_lock(&dj, (mode & ~FA_READ) ? 1 : 0); +#endif + } + /* Create or Open a file */ + if (mode & (FA_CREATE_ALWAYS | FA_OPEN_ALWAYS | FA_CREATE_NEW)) { + DWORD dw, cl; + + if (res != FR_OK) { /* No file, create new */ + if (res == FR_NO_FILE) /* There is no file to open, create a new entry */ +#if _FS_LOCK + res = enq_lock() ? dir_register(&dj) : FR_TOO_MANY_OPEN_FILES; +#else + res = dir_register(&dj); +#endif + mode |= FA_CREATE_ALWAYS; /* File is created */ + dir = dj.dir; /* New entry */ + } + else { /* Any object is already existing */ + if (dir[DIR_Attr] & (AM_RDO | AM_DIR)) { /* Cannot overwrite it (R/O or DIR) */ + res = FR_DENIED; + } else { + 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 */ + dw = get_fattime(); /* Created time */ + ST_DWORD(dir+DIR_CrtTime, dw); + dir[DIR_Attr] = 0; /* Reset attribute */ + ST_DWORD(dir+DIR_FileSize, 0); /* size = 0 */ + cl = ld_clust(dj.fs, dir); /* Get start cluster */ + st_clust(dir, 0); /* cluster = 0 */ + dj.fs->wflag = 1; + if (cl) { /* Remove the cluster chain if exist */ + dw = dj.fs->winsect; + res = remove_chain(dj.fs, cl); + if (res == FR_OK) { + dj.fs->last_clust = cl - 1; /* Reuse the cluster hole */ + res = move_window(dj.fs, dw); + } + } + } + } + else { /* Open an existing file */ + if (res == FR_OK) { /* Follow succeeded */ + if (dir[DIR_Attr] & AM_DIR) { /* It is a directory */ + res = FR_NO_FILE; + } else { + if ((mode & FA_WRITE) && (dir[DIR_Attr] & AM_RDO)) /* R/O violation */ + res = FR_DENIED; + } + } + } + if (res == FR_OK) { + if (mode & FA_CREATE_ALWAYS) /* Set file change flag if created or overwritten */ + mode |= FA__WRITTEN; + fp->dir_sect = dj.fs->winsect; /* Pointer to the directory entry */ + fp->dir_ptr = dir; +#if _FS_LOCK + fp->lockid = inc_lock(&dj, (mode & ~FA_READ) ? 1 : 0); + if (!fp->lockid) res = FR_INT_ERR; +#endif + } -#if !_FS_READONLY - /* Create or Open a file */ - if (mode & (FA_CREATE_ALWAYS|FA_OPEN_ALWAYS|FA_CREATE_NEW)) { - DWORD ps, rs; - if (res != FR_OK) { /* No file, create new */ - if (res != FR_NO_FILE) return res; - res = reserve_direntry(&dj, &dir); - if (res != FR_OK) return res; - memset(dir, 0, 32); /* Initialize the new entry with open name */ - memcpy(&dir[DIR_Name], fn, 8+3); - dir[DIR_NTres] = fn[11]; - mode |= FA_CREATE_ALWAYS; - } - else { /* Any object is already existing */ - if (mode & FA_CREATE_NEW) /* Cannot create new */ - return FR_EXIST; - if (!dir || (dir[DIR_Attr] & (AM_RDO|AM_DIR))) /* Cannot overwrite it (R/O or DIR) */ - return FR_DENIED; - if (mode & FA_CREATE_ALWAYS) { /* Resize it to zero if needed */ - rs = ((DWORD)LD_WORD(&dir[DIR_FstClusHI]) << 16) | LD_WORD(&dir[DIR_FstClusLO]); /* Get start cluster */ - ST_WORD(&dir[DIR_FstClusHI], 0); /* cluster = 0 */ - ST_WORD(&dir[DIR_FstClusLO], 0); - ST_DWORD(&dir[DIR_FileSize], 0); /* size = 0 */ - dj.fs->winflag = 1; - ps = dj.fs->winsect; /* Remove the cluster chain */ - if (!remove_chain(dj.fs, rs) || !move_window(dj.fs, ps)) - return FR_RW_ERROR; - dj.fs->last_clust = rs - 1; /* Reuse the cluster hole */ +#else /* R/O configuration */ + if (res == FR_OK) { /* Follow succeeded */ + dir = dj.dir; + if (!dir) { /* Current directory itself */ + res = FR_INVALID_NAME; + } else { + if (dir[DIR_Attr] & AM_DIR) /* It is a directory */ + res = FR_NO_FILE; } } - if (mode & FA_CREATE_ALWAYS) { - dir[DIR_Attr] = 0; /* Reset attribute */ - ps = get_fattime(); - ST_DWORD(&dir[DIR_CrtTime], ps); /* Created time */ - dj.fs->winflag = 1; - mode |= FA__WRITTEN; /* Set file changed flag */ +#endif + FREE_BUF(); + + if (res == FR_OK) { + fp->flag = mode; /* File access mode */ + fp->err = 0; /* Clear error flag */ + fp->sclust = ld_clust(dj.fs, 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; /* Normal seek mode */ +#endif + fp->fs = dj.fs; /* Validate file object */ + fp->id = fp->fs->id; } } - /* Open an existing file */ - else { -#endif /* !_FS_READONLY */ - if (res != FR_OK) return res; /* Trace failed */ - if (!dir || (dir[DIR_Attr] & AM_DIR)) /* It is a directory */ - return FR_NO_FILE; -#if !_FS_READONLY - if ((mode & FA_WRITE) && (dir[DIR_Attr] & AM_RDO)) /* R/O violation */ - return FR_DENIED; - } - fp->dir_sect = dj.fs->winsect; /* Pointer to the directory entry */ - fp->dir_ptr = dir; -#endif - fp->flag = mode; /* File access mode */ - fp->org_clust = /* File start cluster */ - ((DWORD)LD_WORD(&dir[DIR_FstClusHI]) << 16) | LD_WORD(&dir[DIR_FstClusLO]); - fp->fsize = LD_DWORD(&dir[DIR_FileSize]); /* File size */ - fp->fptr = 0; fp->csect = 255; /* File pointer */ - fp->curr_sect = 0; - fp->fs = dj.fs; fp->id = dj.fs->id; /* Owner file system object of the file */ - return FR_OK; + LEAVE_FF(dj.fs, res); } @@ -906,71 +2563,96 @@ FRESULT f_open ( /*-----------------------------------------------------------------------*/ FRESULT f_read ( - FIL *fp, /* Pointer to the file object */ - void *buff, /* Pointer to data buffer */ + FIL* fp, /* Pointer to the file object */ + void* buff, /* Pointer to data buffer */ UINT btr, /* Number of bytes to read */ - UINT *br /* Pointer to number of bytes read */ + UINT* br /* Pointer to number of bytes read */ ) { FRESULT res; - DWORD clust, sect, remain; + DWORD clst, sect, remain; UINT rcnt, cc; - BYTE *rbuff = buff; + BYTE csect, *rbuff = (BYTE*)buff; - *br = 0; - res = validate(fp->fs, fp->id); /* Check validity of the object */ - if (res != FR_OK) return res; - if (fp->flag & FA__ERROR) return FR_RW_ERROR; /* Check error flag */ - if (!(fp->flag & FA_READ)) return FR_DENIED; /* Check access mode */ + *br = 0; /* Clear read byte counter */ + + res = validate(fp); /* Check validity */ + if (res != FR_OK) LEAVE_FF(fp->fs, res); + if (fp->err) /* Check error */ + LEAVE_FF(fp->fs, (FRESULT)fp->err); + 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->csect >= fp->fs->csize) { /* On the cluster boundary? */ - clust = (fp->fptr == 0) ? /* On the top of the file? */ - fp->org_clust : get_cluster(fp->fs, fp->curr_clust); - if (clust < 2 || clust >= fp->fs->max_clust) goto fr_error; - fp->curr_clust = clust; /* Update current cluster */ - fp->csect = 0; /* Reset sector address in the cluster */ + 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->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->clust = clst; /* Update current cluster */ } - sect = clust2sect(fp->fs, fp->curr_clust) + fp->csect; /* Get current sector */ - cc = btr / SS(fp->fs); /* When remaining bytes >= sector size, */ - if (cc) { /* Read maximum contiguous sectors directly */ - if (fp->csect + cc > fp->fs->csize) /* Clip at cluster boundary */ - cc = fp->fs->csize - fp->csect; - if (disk_read(fp->fs->drive, rbuff, sect, (BYTE)cc) != RES_OK) - goto fr_error; - fp->csect += (BYTE)cc; /* Next sector address in the cluster */ - rcnt = SS(fp->fs) * cc; /* Number of bytes transferred */ + 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 = fp->fs->csize - csect; + if (disk_read(fp->fs->drv, rbuff, sect, cc)) + 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_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)); +#else + if ((fp->flag & FA__DIRTY) && fp->dsect - sect < cc) + 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 */ continue; } - if (sect != fp->curr_sect) { /* Is window offset changed? */ +#if !_FS_TINY + if (fp->dsect != sect) { /* Load data sector if not in cache */ #if !_FS_READONLY - if (fp->flag & FA__DIRTY) { /* Write back file I/O buffer if needed */ - if (disk_write(fp->fs->drive, fp->buffer, fp->curr_sect, 1) != RES_OK) - goto fr_error; - fp->flag &= (BYTE)~FA__DIRTY; + if (fp->flag & FA__DIRTY) { /* Write-back dirty sector cache */ + if (disk_write(fp->fs->drv, fp->buf, fp->dsect, 1)) + ABORT(fp->fs, FR_DISK_ERR); + fp->flag &= ~FA__DIRTY; } #endif - if (disk_read(fp->fs->drive, fp->buffer, sect, 1) != RES_OK) /* Fill file I/O buffer with file data */ - goto fr_error; - fp->curr_sect = sect; + if (disk_read(fp->fs->drv, fp->buf, sect, 1)) /* Fill sector cache */ + ABORT(fp->fs, FR_DISK_ERR); } - fp->csect++; /* Next sector address in the cluster */ +#endif + fp->dsect = sect; } - rcnt = SS(fp->fs) - (fp->fptr % SS(fp->fs)); /* Get partial sector from file I/O buffer */ + rcnt = SS(fp->fs) - ((UINT)fp->fptr % SS(fp->fs)); /* Get partial sector data from sector buffer */ if (rcnt > btr) rcnt = btr; - memcpy(rbuff, &fp->buffer[fp->fptr % SS(fp->fs)], rcnt); +#if _FS_TINY + 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 + mem_cpy(rbuff, &fp->buf[fp->fptr % SS(fp->fs)], rcnt); /* Pick partial sector */ +#endif } - return FR_OK; - -fr_error: /* Abort this file due to an unrecoverable error */ - fp->flag |= FA__ERROR; - return FR_RW_ERROR; + LEAVE_FF(fp->fs, FR_OK); } @@ -982,120 +2664,164 @@ fr_error: /* Abort this file due to an unrecoverable error */ /*-----------------------------------------------------------------------*/ FRESULT f_write ( - FIL *fp, /* Pointer to the file object */ + FIL* fp, /* Pointer to the file object */ const void *buff, /* Pointer to the data to be written */ UINT btw, /* Number of bytes to write */ - UINT *bw /* Pointer to number of bytes written */ + UINT* bw /* Pointer to number of bytes written */ ) { FRESULT res; - DWORD clust, sect; + DWORD clst, sect; UINT wcnt, cc; - const BYTE *wbuff = buff; + const BYTE *wbuff = (const BYTE*)buff; + BYTE csect; - *bw = 0; - res = validate(fp->fs, fp->id); /* Check validity of the object */ - if (res != FR_OK) return res; - if (fp->flag & FA__ERROR) return FR_RW_ERROR; /* Check error flag */ - if (!(fp->flag & FA_WRITE)) return FR_DENIED; /* Check access mode */ - if (fp->fsize + btw < fp->fsize) return FR_OK; /* File size cannot reach 4GB */ + *bw = 0; /* Clear write byte counter */ - for ( ; btw; /* Repeat until all data transferred */ + res = validate(fp); /* Check validity */ + if (res != FR_OK) LEAVE_FF(fp->fs, res); + if (fp->err) /* Check error */ + LEAVE_FF(fp->fs, (FRESULT)fp->err); + if (!(fp->flag & FA_WRITE)) /* Check access mode */ + LEAVE_FF(fp->fs, FR_DENIED); + if (fp->fptr + btw < fp->fptr) btw = 0; /* File size cannot reach 4GB */ + + 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->csect >= fp->fs->csize) { /* On the cluster boundary? */ - if (fp->fptr == 0) { /* On the top of the file? */ - clust = fp->org_clust; /* Follow from the origin */ - if (clust == 0) /* When there is no cluster chain, */ - fp->org_clust = clust = create_chain(fp->fs, 0); /* Create a new cluster chain */ - } else { /* Middle or end of the file */ - clust = create_chain(fp->fs, fp->curr_clust); /* Trace or streach cluster chain */ + 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->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 (clust == 0) break; /* Could not allocate a new cluster (disk full) */ - if (clust == 1 || clust >= fp->fs->max_clust) goto fw_error; - fp->curr_clust = clust; /* Update current cluster */ - fp->csect = 0; /* Reset sector address in the cluster */ + 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->clust = clst; /* Update current cluster */ } - sect = clust2sect(fp->fs, fp->curr_clust) + fp->csect; /* Get current sector */ - cc = btw / SS(fp->fs); /* When remaining bytes >= sector size, */ - if (cc) { /* Write maximum contiguous sectors directly */ - if (fp->csect + cc > fp->fs->csize) /* Clip at cluster boundary */ - cc = fp->fs->csize - fp->csect; - if (disk_write(fp->fs->drive, wbuff, sect, (BYTE)cc) != RES_OK) - goto fw_error; - fp->csect += (BYTE)cc; /* Next sector address in the cluster */ - wcnt = SS(fp->fs) * cc; /* Number of bytes transferred */ - continue; +#if _FS_TINY + if (fp->fs->winsect == fp->dsect && sync_window(fp->fs)) /* Write-back sector cache */ + ABORT(fp->fs, FR_DISK_ERR); +#else + if (fp->flag & FA__DIRTY) { /* Write-back sector cache */ + if (disk_write(fp->fs->drv, fp->buf, fp->dsect, 1)) + ABORT(fp->fs, FR_DISK_ERR); + fp->flag &= ~FA__DIRTY; } - if (sect != fp->curr_sect) { /* Is window offset changed? */ - if (fp->flag & FA__DIRTY) { /* Write back file I/O buffer if needed */ - if (disk_write(fp->fs->drive, fp->buffer, fp->curr_sect, 1) != RES_OK) - goto fw_error; - fp->flag &= (BYTE)~FA__DIRTY; +#endif + 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 = fp->fs->csize - csect; + if (disk_write(fp->fs->drv, wbuff, sect, cc)) + ABORT(fp->fs, FR_DISK_ERR); +#if _FS_MINIMIZE <= 2 +#if _FS_TINY + 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 invalidated by the direct write */ + mem_cpy(fp->buf, wbuff + ((fp->dsect - sect) * SS(fp->fs)), SS(fp->fs)); + fp->flag &= ~FA__DIRTY; } - if (fp->fptr < fp->fsize && /* Fill file I/O buffer with file data */ - disk_read(fp->fs->drive, fp->buffer, sect, 1) != RES_OK) - goto fw_error; - fp->curr_sect = sect; +#endif +#endif + wcnt = SS(fp->fs) * cc; /* Number of bytes transferred */ + continue; + } +#if _FS_TINY + if (fp->fptr >= fp->fsize) { /* Avoid silly cache filling at growing edge */ + if (sync_window(fp->fs)) ABORT(fp->fs, FR_DISK_ERR); + fp->fs->winsect = sect; + } +#else + if (fp->dsect != sect) { /* Fill sector cache with file data */ + if (fp->fptr < fp->fsize && + disk_read(fp->fs->drv, fp->buf, sect, 1)) + ABORT(fp->fs, FR_DISK_ERR); } - fp->csect++; /* Next sector address in the cluster */ +#endif + fp->dsect = sect; } - wcnt = SS(fp->fs) - (fp->fptr % SS(fp->fs)); /* Put partial sector into file I/O buffer */ + wcnt = SS(fp->fs) - ((UINT)fp->fptr % SS(fp->fs));/* Put partial sector into file I/O buffer */ if (wcnt > btw) wcnt = btw; - memcpy(&fp->buffer[fp->fptr % SS(fp->fs)], wbuff, wcnt); +#if _FS_TINY + 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; +#else + mem_cpy(&fp->buf[fp->fptr % SS(fp->fs)], wbuff, wcnt); /* Fit partial sector */ fp->flag |= FA__DIRTY; +#endif } if (fp->fptr > fp->fsize) fp->fsize = fp->fptr; /* Update file size if needed */ - fp->flag |= FA__WRITTEN; /* Set file changed flag */ - return FR_OK; + fp->flag |= FA__WRITTEN; /* Set file change flag */ -fw_error: /* Abort this file due to an unrecoverable error */ - fp->flag |= FA__ERROR; - return FR_RW_ERROR; + LEAVE_FF(fp->fs, FR_OK); } /*-----------------------------------------------------------------------*/ -/* Synchronize the file object */ +/* Synchronize the File */ /*-----------------------------------------------------------------------*/ FRESULT f_sync ( - FIL *fp /* Pointer to the file object */ + FIL* fp /* Pointer to the file object */ ) { FRESULT res; - DWORD tim; + DWORD tm; BYTE *dir; - res = validate(fp->fs, fp->id); /* Check validity of the object */ + res = validate(fp); /* Check validity of the object */ if (res == FR_OK) { if (fp->flag & FA__WRITTEN) { /* Has the file been written? */ - /* Write back data buffer if needed */ + /* Write-back dirty buffer */ +#if !_FS_TINY if (fp->flag & FA__DIRTY) { - if (disk_write(fp->fs->drive, fp->buffer, fp->curr_sect, 1) != RES_OK) - return FR_RW_ERROR; - fp->flag &= (BYTE)~FA__DIRTY; + if (disk_write(fp->fs->drv, fp->buf, fp->dsect, 1)) + LEAVE_FF(fp->fs, FR_DISK_ERR); + fp->flag &= ~FA__DIRTY; } +#endif /* Update the directory entry */ - if (!move_window(fp->fs, fp->dir_sect)) - return FR_RW_ERROR; - dir = fp->dir_ptr; - dir[DIR_Attr] |= AM_ARC; /* Set archive bit */ - ST_DWORD(&dir[DIR_FileSize], fp->fsize); /* Update file size */ - ST_WORD(&dir[DIR_FstClusLO], fp->org_clust); /* Update start cluster */ - ST_WORD(&dir[DIR_FstClusHI], fp->org_clust >> 16); - tim = get_fattime(); /* Updated time */ - ST_DWORD(&dir[DIR_WrtTime], tim); - fp->flag &= (BYTE)~FA__WRITTEN; - res = sync(fp->fs); + res = move_window(fp->fs, fp->dir_sect); + if (res == FR_OK) { + 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->sclust); /* Update start cluster */ + tm = get_fattime(); /* Update updated time */ + ST_DWORD(dir+DIR_WrtTime, tm); + ST_WORD(dir+DIR_LstAccDate, 0); + fp->flag &= ~FA__WRITTEN; + fp->fs->wflag = 1; + res = sync_fs(fp->fs); + } } } - return res; + + LEAVE_FF(fp->fs, res); } #endif /* !_FS_READONLY */ @@ -1114,16 +2840,171 @@ FRESULT f_close ( FRESULT res; -#if !_FS_READONLY - res = f_sync(fp); +#if _FS_READONLY + res = validate(fp); + { +#if _FS_REENTRANT + FATFS *fs = 0; + if (res == FR_OK) fs = fp->fs; /* Get corresponding file system object */ +#endif + if (res == FR_OK) fp->fs = 0; /* Invalidate file object */ + LEAVE_FF(fs, res); + } #else - res = validate(fp->fs, fp->id); + res = f_sync(fp); /* Flush cached data */ +#if _FS_LOCK + if (res == FR_OK) { /* Decrement open counter */ +#if _FS_REENTRANT + res = validate(fp); + if (res == FR_OK) { + res = dec_lock(fp->lockid); + unlock_fs(fp->fs, FR_OK); + } +#else + res = dec_lock(fp->lockid); +#endif + } #endif - if (res == FR_OK) fp->fs = NULL; + if (res == FR_OK) fp->fs = 0; /* Invalidate file object */ return res; +#endif +} + + + + +/*-----------------------------------------------------------------------*/ +/* Change Current Directory or Current Drive, Get Current Directory */ +/*-----------------------------------------------------------------------*/ + +#if _FS_RPATH >= 1 +#if _VOLUMES >= 2 +FRESULT f_chdrive ( + const TCHAR* path /* Drive number */ +) +{ + int vol; + + + vol = get_ldnumber(&path); + if (vol < 0) return FR_INVALID_DRIVE; + + CurrVol = (BYTE)vol; + + return FR_OK; +} +#endif + + +FRESULT f_chdir ( + const TCHAR* path /* Pointer to the directory path */ +) +{ + FRESULT res; + DIR dj; + DEF_NAMEBUF; + + + /* Get logical drive number */ + res = find_volume(&dj.fs, &path, 0); + if (res == FR_OK) { + INIT_BUF(dj); + res = follow_path(&dj, path); /* Follow the path */ + FREE_BUF(); + if (res == FR_OK) { /* Follow completed */ + if (!dj.dir) { + dj.fs->cdir = dj.sclust; /* Start directory itself */ + } else { + if (dj.dir[DIR_Attr] & AM_DIR) /* Reached to the directory */ + dj.fs->cdir = ld_clust(dj.fs, dj.dir); + else + res = FR_NO_PATH; /* Reached but a file */ + } + } + if (res == FR_NO_FILE) res = FR_NO_PATH; + } + + LEAVE_FF(dj.fs, res); } +#if _FS_RPATH >= 2 +FRESULT f_getcwd ( + TCHAR* buff, /* Pointer to the directory path */ + UINT len /* Size of path */ +) +{ + FRESULT res; + DIR dj; + UINT i, n; + DWORD ccl; + TCHAR *tp; + FILINFO fno; + DEF_NAMEBUF; + + + *buff = 0; + /* Get logical drive number */ + res = find_volume(&dj.fs, (const TCHAR**)&buff, 0); /* Get current volume */ + if (res == FR_OK) { + INIT_BUF(dj); + i = len; /* Bottom of buffer (directory stack base) */ + dj.sclust = dj.fs->cdir; /* Start to follow upper directory from current directory */ + while ((ccl = dj.sclust) != 0) { /* Repeat while current directory is a sub-directory */ + res = dir_sdi(&dj, 1); /* Get parent directory */ + if (res != FR_OK) break; + res = dir_read(&dj, 0); + if (res != FR_OK) break; + dj.sclust = ld_clust(dj.fs, dj.dir); /* Goto parent directory */ + res = dir_sdi(&dj, 0); + if (res != FR_OK) break; + do { /* Find the entry links to the child directory */ + res = dir_read(&dj, 0); + if (res != FR_OK) break; + if (ccl == ld_clust(dj.fs, dj.dir)) break; /* Found the entry */ + res = dir_next(&dj, 0); + } while (res == FR_OK); + if (res == FR_NO_FILE) res = FR_INT_ERR;/* It cannot be 'not found'. */ + if (res != FR_OK) break; +#if _USE_LFN + fno.lfname = buff; + fno.lfsize = i; +#endif + get_fileinfo(&dj, &fno); /* Get the directory name and push it to the buffer */ + tp = fno.fname; +#if _USE_LFN + if (*buff) tp = buff; +#endif + for (n = 0; tp[n]; n++) ; + if (i < n + 3) { + res = FR_NOT_ENOUGH_CORE; break; + } + while (n) buff[--i] = tp[--n]; + buff[--i] = '/'; + } + tp = buff; + if (res == FR_OK) { +#if _VOLUMES >= 2 + *tp++ = '0' + CurrVol; /* Put drive number */ + *tp++ = ':'; +#endif + if (i == len) { /* Root-directory */ + *tp++ = '/'; + } else { /* Sub-directroy */ + do /* Add stacked path str */ + *tp++ = buff[i++]; + while (i < len); + } + } + *tp = 0; + FREE_BUF(); + } + + LEAVE_FF(dj.fs, res); +} +#endif /* _FS_RPATH >= 2 */ +#endif /* _FS_RPATH >= 1 */ + #if _FS_MINIMIZE <= 2 @@ -1132,130 +3013,237 @@ FRESULT f_close ( /*-----------------------------------------------------------------------*/ FRESULT f_lseek ( - FIL *fp, /* Pointer to the file object */ + FIL* fp, /* Pointer to the file object */ DWORD ofs /* File pointer from top of file */ ) { FRESULT res; - DWORD clust, csize, nsect, ifptr; - res = validate(fp->fs, fp->id); /* Check validity of the object */ - if (res != FR_OK) return res; - if (fp->flag & FA__ERROR) return FR_RW_ERROR; - if (ofs > fp->fsize /* In read-only mode, clip offset with the file size */ -#if !_FS_READONLY - && !(fp->flag & FA_WRITE) -#endif - ) ofs = fp->fsize; - - ifptr = fp->fptr; - fp->fptr = 0; fp->csect = 255; - nsect = 0; - if (ofs > 0) { - csize = (DWORD)fp->fs->csize * SS(fp->fs); /* Cluster size (byte) */ - if (ifptr > 0 && - (ofs - 1) / csize >= (ifptr - 1) / csize) {/* When seek to same or following cluster, */ - fp->fptr = (ifptr - 1) & ~(csize - 1); /* start from the current cluster */ - ofs -= fp->fptr; - clust = fp->curr_clust; - } else { /* When seek to back cluster, */ - clust = fp->org_clust; /* start from the first cluster */ -#if !_FS_READONLY - if (clust == 0) { /* If no cluster chain, create a new chain */ - clust = create_chain(fp->fs, 0); - if (clust == 1) goto fk_error; - fp->org_clust = clust; + res = validate(fp); /* Check validity of the object */ + if (res != FR_OK) LEAVE_FF(fp->fs, res); + if (fp->err) /* Check error */ + LEAVE_FF(fp->fs, (FRESULT)fp->err); + +#if _USE_FASTSEEK + if (fp->cltbl) { /* Fast seek */ + DWORD cl, pcl, ncl, tcl, dsc, tlen, ulen, *tbl; + + 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 { + /* 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); + 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 */ } + *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) { + fp->clust = clmt_clust(fp, ofs - 1); + dsc = clust2sect(fp->fs, fp->clust); + if (!dsc) ABORT(fp->fs, FR_INT_ERR); + 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) { /* Write-back dirty sector cache */ + if (disk_write(fp->fs->drv, fp->buf, fp->dsect, 1)) + ABORT(fp->fs, FR_DISK_ERR); + fp->flag &= ~FA__DIRTY; + } #endif - fp->curr_clust = clust; + if (disk_read(fp->fs->drv, fp->buf, dsc, 1)) /* Load current sector */ + ABORT(fp->fs, FR_DISK_ERR); +#endif + fp->dsect = dsc; + } + } } - if (clust != 0) { - while (ofs > csize) { /* Cluster following loop */ + } else +#endif + + /* Normal Seek */ + { + DWORD clst, bcs, nsect, ifptr; + + if (ofs > fp->fsize /* In read-only mode, clip offset with the file size */ #if !_FS_READONLY - if (fp->flag & FA_WRITE) { /* Check if in write mode or not */ - clust = create_chain(fp->fs, clust); /* Force streached if in write mode */ - if (clust == 0) { /* When disk gets full, clip file size */ - ofs = csize; break; - } - } else + && !(fp->flag & FA_WRITE) +#endif + ) ofs = fp->fsize; + + ifptr = fp->fptr; + fp->fptr = nsect = 0; + if (ofs) { + bcs = (DWORD)fp->fs->csize * SS(fp->fs); /* Cluster size (byte) */ + if (ifptr > 0 && + (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->clust; + } else { /* When seek to back 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->sclust = clst; + } #endif - clust = get_cluster(fp->fs, clust); /* Follow cluster chain if not in write mode */ - if (clust < 2 || clust >= fp->fs->max_clust) goto fk_error; - fp->curr_clust = clust; - fp->fptr += csize; - ofs -= csize; + fp->clust = clst; + } + if (clst != 0) { + while (ofs > bcs) { /* Cluster following loop */ +#if !_FS_READONLY + if (fp->flag & FA_WRITE) { /* Check if in write mode or not */ + clst = create_chain(fp->fs, clst); /* Force stretch if in write mode */ + if (clst == 0) { /* When disk gets full, clip file size */ + ofs = bcs; break; + } + } else +#endif + 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->clust = clst; + fp->fptr += bcs; + ofs -= bcs; + } + fp->fptr += ofs; + if (ofs % SS(fp->fs)) { + nsect = clust2sect(fp->fs, clst); /* Current sector */ + if (!nsect) ABORT(fp->fs, FR_INT_ERR); + nsect += ofs / SS(fp->fs); + } } - fp->fptr += ofs; - fp->csect = (BYTE)(ofs / SS(fp->fs)); /* Sector offset in the cluster */ - if (ofs & (SS(fp->fs) - 1)) { - nsect = clust2sect(fp->fs, clust) + fp->csect; /* Current sector */ - fp->csect++; + } + 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) { /* Write-back dirty sector cache */ + if (disk_write(fp->fs->drv, fp->buf, fp->dsect, 1)) + ABORT(fp->fs, FR_DISK_ERR); + fp->flag &= ~FA__DIRTY; } +#endif + if (disk_read(fp->fs->drv, fp->buf, nsect, 1)) /* Fill sector cache */ + ABORT(fp->fs, FR_DISK_ERR); +#endif + fp->dsect = nsect; } - } - if (nsect && nsect != fp->curr_sect) { #if !_FS_READONLY - if (fp->flag & FA__DIRTY) { /* Write-back dirty buffer if needed */ - if (disk_write(fp->fs->drive, fp->buffer, fp->curr_sect, 1) != RES_OK) - goto fk_error; - fp->flag &= (BYTE)~FA__DIRTY; + if (fp->fptr > fp->fsize) { /* Set file change flag if the file size is extended */ + fp->fsize = fp->fptr; + fp->flag |= FA__WRITTEN; } #endif - if (disk_read(fp->fs->drive, fp->buffer, nsect, 1) != RES_OK) - goto fk_error; - fp->curr_sect = nsect; - } - -#if !_FS_READONLY - if (fp->fptr > fp->fsize) { /* Set changed flag if the file was extended */ - fp->fsize = fp->fptr; - fp->flag |= FA__WRITTEN; } -#endif - - return FR_OK; -fk_error: /* Abort this file due to an unrecoverable error */ - fp->flag |= FA__ERROR; - return FR_RW_ERROR; + LEAVE_FF(fp->fs, res); } - #if _FS_MINIMIZE <= 1 /*-----------------------------------------------------------------------*/ -/* Create a directroy object */ +/* Create a Directory Object */ /*-----------------------------------------------------------------------*/ FRESULT f_opendir ( - _DIR_ *dj, /* Pointer to directory object to create */ - const char *path /* Pointer to the directory path */ + DIR* dp, /* Pointer to directory object to create */ + const TCHAR* path /* Pointer to the directory path */ ) { FRESULT res; - BYTE *dir; - char fn[8+3+1]; + FATFS* fs; + DEF_NAMEBUF; - res = auto_mount(&path, &dj->fs, 0); + if (!dp) return FR_INVALID_OBJECT; + + /* Get logical drive number */ + res = find_volume(&fs, &path, 0); if (res == FR_OK) { - res = trace_path(dj, fn, path, &dir); /* Trace the directory path */ - if (res == FR_OK) { /* Trace completed */ - if (dir) { /* It is not the root dir */ - if (dir[DIR_Attr] & AM_DIR) { /* The entry is a directory */ - dj->clust = ((DWORD)LD_WORD(&dir[DIR_FstClusHI]) << 16) | LD_WORD(&dir[DIR_FstClusLO]); - dj->sect = clust2sect(dj->fs, dj->clust); - dj->index = 2; - } else { /* The entry is not a directory */ - res = FR_NO_FILE; + dp->fs = fs; + INIT_BUF(*dp); + res = follow_path(dp, path); /* Follow the path to the directory */ + FREE_BUF(); + if (res == FR_OK) { /* Follow completed */ + if (dp->dir) { /* It is not the origin directory itself */ + if (dp->dir[DIR_Attr] & AM_DIR) /* The object is a sub directory */ + dp->sclust = ld_clust(fs, dp->dir); + else /* The object is a file */ + res = FR_NO_PATH; + } + if (res == FR_OK) { + dp->id = fs->id; + res = dir_sdi(dp, 0); /* Rewind directory */ +#if _FS_LOCK + if (res == FR_OK) { + if (dp->sclust) { + dp->lockid = inc_lock(dp, 0); /* Lock the sub directory */ + if (!dp->lockid) + res = FR_TOO_MANY_OPEN_FILES; + } else { + dp->lockid = 0; /* Root directory need not to be locked */ + } } +#endif } - dj->id = dj->fs->id; } + if (res == FR_NO_FILE) res = FR_NO_PATH; } + if (res != FR_OK) dp->fs = 0; /* Invalidate the directory object if function faild */ + + LEAVE_FF(fs, res); +} + + + + +/*-----------------------------------------------------------------------*/ +/* Close Directory */ +/*-----------------------------------------------------------------------*/ + +FRESULT f_closedir ( + DIR *dp /* Pointer to the directory object to be closed */ +) +{ + FRESULT res; + + res = validate(dp); +#if _FS_LOCK + if (res == FR_OK) { /* Decrement open counter */ + if (dp->lockid) + res = dec_lock(dp->lockid); +#if _FS_REENTRANT + unlock_fs(dp->fs, FR_OK); +#endif + } +#endif + if (res == FR_OK) dp->fs = 0; /* Invalidate directory object */ return res; } @@ -1263,36 +3251,43 @@ FRESULT f_opendir ( /*-----------------------------------------------------------------------*/ -/* Read Directory Entry in Sequense */ +/* Read Directory Entries in Sequence */ /*-----------------------------------------------------------------------*/ FRESULT f_readdir ( - _DIR_ *dj, /* Pointer to the directory object */ - FILINFO *finfo /* Pointer to file information to return */ + DIR* dp, /* Pointer to the open directory object */ + FILINFO* fno /* Pointer to file information to return */ ) { - BYTE *dir, c, res; - + FRESULT res; + DEF_NAMEBUF; - res = validate(dj->fs, dj->id); /* Check validity of the object */ - if (res != FR_OK) return res; - finfo->fname[0] = 0; - while (dj->sect) { - if (!move_window(dj->fs, dj->sect)) - return FR_RW_ERROR; - dir = &dj->fs->win[(dj->index & ((SS(dj->fs) - 1) >> 5)) * 32]; /* pointer to the directory entry */ - c = dir[DIR_Name]; - if (c == 0) break; /* Has it reached to end of dir? */ - if (c != 0xE5 && !(dir[DIR_Attr] & AM_VOL)) /* Is it a valid entry? */ - get_fileinfo(finfo, dir); - if (!next_dir_entry(dj)) dj->sect = 0; /* Next entry */ - if (finfo->fname[0]) break; /* Found valid entry */ + res = validate(dp); /* Check validity of the object */ + if (res == FR_OK) { + if (!fno) { + res = dir_sdi(dp, 0); /* Rewind the directory object */ + } else { + INIT_BUF(*dp); + res = dir_read(dp, 0); /* Read an item */ + if (res == FR_NO_FILE) { /* Reached end of directory */ + dp->sect = 0; + res = FR_OK; + } + if (res == FR_OK) { /* A valid entry is found */ + get_fileinfo(dp, fno); /* Get the object information */ + res = dir_next(dp, 0); /* Increment index for next */ + if (res == FR_NO_FILE) { + dp->sect = 0; + res = FR_OK; + } + } + FREE_BUF(); + } } - return FR_OK; -} - + LEAVE_FF(dp->fs, res); +} @@ -1302,134 +3297,154 @@ FRESULT f_readdir ( /*-----------------------------------------------------------------------*/ FRESULT f_stat ( - const char *path, /* Pointer to the file path */ - FILINFO *finfo /* Pointer to file information to return */ + const TCHAR* path, /* Pointer to the file path */ + FILINFO* fno /* Pointer to file information to return */ ) { FRESULT res; - _DIR_ dj; - BYTE *dir; - char fn[8+3+1]; + DIR dj; + DEF_NAMEBUF; - res = auto_mount(&path, &dj.fs, 0); + /* Get logical drive number */ + res = find_volume(&dj.fs, &path, 0); if (res == FR_OK) { - res = trace_path(&dj, fn, path, &dir); /* Trace the file path */ - if (res == FR_OK) { /* Trace completed */ - if (dir) /* Found an object */ - get_fileinfo(finfo, dir); - else /* It is root dir */ + INIT_BUF(dj); + res = follow_path(&dj, path); /* Follow the file path */ + if (res == FR_OK) { /* Follow completed */ + if (dj.dir) { /* Found an object */ + if (fno) get_fileinfo(&dj, fno); + } else { /* It is root directory */ res = FR_INVALID_NAME; + } } + FREE_BUF(); } - return res; + LEAVE_FF(dj.fs, res); } #if !_FS_READONLY /*-----------------------------------------------------------------------*/ -/* Truncate File */ +/* Get Number of Free Clusters */ /*-----------------------------------------------------------------------*/ -FRESULT f_truncate ( - FIL *fp /* Pointer to the file object */ +FRESULT f_getfree ( + const TCHAR* path, /* Path name of the logical drive number */ + DWORD* nclst, /* Pointer to a variable to return number of free clusters */ + FATFS** fatfs /* Pointer to return pointer to corresponding file system object */ ) { FRESULT res; - DWORD ncl; + FATFS *fs; + DWORD n, clst, sect, stat; + UINT i; + BYTE fat, *p; - res = validate(fp->fs, fp->id); /* Check validity of the object */ - if (res != FR_OK) return res; - if (fp->flag & FA__ERROR) return FR_RW_ERROR; /* Check error flag */ - if (!(fp->flag & FA_WRITE)) return FR_DENIED; /* Check access mode */ - - if (fp->fsize > fp->fptr) { - fp->fsize = fp->fptr; /* Set file size to current R/W point */ - fp->flag |= FA__WRITTEN; - if (fp->fptr == 0) { /* When set file size to zero, remove entire cluster chain */ - if (!remove_chain(fp->fs, fp->org_clust)) goto ft_error; - fp->org_clust = 0; - } else { /* When truncate a part of the file, remove remaining clusters */ - ncl = get_cluster(fp->fs, fp->curr_clust); - if (ncl < 2) goto ft_error; - if (ncl < fp->fs->max_clust) { - if (!put_cluster(fp->fs, fp->curr_clust, 0x0FFFFFFF)) goto ft_error; - if (!remove_chain(fp->fs, ncl)) goto ft_error; + /* Get logical drive number */ + res = find_volume(fatfs, &path, 0); + fs = *fatfs; + if (res == FR_OK) { + /* If free_clust is valid, return it without full cluster scan */ + if (fs->free_clust <= fs->n_fatent - 2) { + *nclst = fs->free_clust; + } else { + /* Get number of free clusters */ + fat = fs->fs_type; + n = 0; + if (fat == FS_FAT12) { + clst = 2; + do { + stat = get_fat(fs, clst); + if (stat == 0xFFFFFFFF) { res = FR_DISK_ERR; break; } + if (stat == 1) { res = FR_INT_ERR; break; } + if (stat == 0) n++; + } while (++clst < fs->n_fatent); + } else { + clst = fs->n_fatent; + sect = fs->fatbase; + i = 0; p = 0; + do { + if (!i) { + res = move_window(fs, sect++); + if (res != FR_OK) break; + p = fs->win; + i = SS(fs); + } + if (fat == FS_FAT16) { + if (LD_WORD(p) == 0) n++; + p += 2; i -= 2; + } else { + if ((LD_DWORD(p) & 0x0FFFFFFF) == 0) n++; + p += 4; i -= 4; + } + } while (--clst); } + fs->free_clust = n; + fs->fsi_flag |= 1; + *nclst = n; } } - - return FR_OK; - -ft_error: /* Abort this file due to an unrecoverable error */ - fp->flag |= FA__ERROR; - return FR_RW_ERROR; + LEAVE_FF(fs, res); } /*-----------------------------------------------------------------------*/ -/* Get Number of Free Clusters */ +/* Truncate File */ /*-----------------------------------------------------------------------*/ -FRESULT f_getfree ( - const char *drv, /* Pointer to the logical drive number (root dir) */ - DWORD *nclust, /* Pointer to the variable to return number of free clusters */ - FATFS **fatfs /* Pointer to pointer to corresponding file system object to return */ +FRESULT f_truncate ( + FIL* fp /* Pointer to the file object */ ) { FRESULT res; - DWORD n, clust, sect; - BYTE fat, f, *p; - + DWORD ncl; - /* Get drive number */ - res = auto_mount(&drv, fatfs, 0); - if (res != FR_OK) return res; - /* If number of free cluster is valid, return it without cluster scan. */ - if ((*fatfs)->free_clust <= (*fatfs)->max_clust - 2) { - *nclust = (*fatfs)->free_clust; - return FR_OK; + res = validate(fp); /* Check validity of the object */ + if (res == FR_OK) { + if (fp->err) { /* Check error */ + res = (FRESULT)fp->err; + } else { + if (!(fp->flag & FA_WRITE)) /* Check access mode */ + res = FR_DENIED; + } } - - /* Get number of free clusters */ - fat = (*fatfs)->fs_type; - n = 0; - if (fat == FS_FAT12) { - clust = 2; - do { - if ((WORD)get_cluster(*fatfs, clust) == 0) n++; - } while (++clust < (*fatfs)->max_clust); - } else { - clust = (*fatfs)->max_clust; - sect = (*fatfs)->fatbase; - f = 0; p = 0; - do { - if (!f) { - if (!move_window(*fatfs, sect++)) return FR_RW_ERROR; - p = (*fatfs)->win; + if (res == FR_OK) { + if (fp->fsize > fp->fptr) { + fp->fsize = fp->fptr; /* Set file size to current R/W point */ + fp->flag |= FA__WRITTEN; + if (fp->fptr == 0) { /* When set file size to zero, remove entire cluster chain */ + 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->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->clust, 0x0FFFFFFF); + if (res == FR_OK) res = remove_chain(fp->fs, ncl); + } } - if (fat == FS_FAT16) { - if (LD_WORD(p) == 0) n++; - p += 2; f += 1; - } else { - if (LD_DWORD(p) == 0) n++; - p += 4; f += 2; +#if !_FS_TINY + if (res == FR_OK && (fp->flag & FA__DIRTY)) { + if (disk_write(fp->fs->drv, fp->buf, fp->dsect, 1)) + res = FR_DISK_ERR; + else + fp->flag &= ~FA__DIRTY; } - } while (--clust); - } - (*fatfs)->free_clust = n; -#if _USE_FSINFO - if (fat == FS_FAT32) (*fatfs)->fsi_flag = 1; #endif + } + if (res != FR_OK) fp->err = (FRESULT)res; + } - *nclust = n; - return FR_OK; + LEAVE_FF(fp->fs, res); } @@ -1440,44 +3455,66 @@ FRESULT f_getfree ( /*-----------------------------------------------------------------------*/ FRESULT f_unlink ( - const char *path /* Pointer to the file or directory path */ + const TCHAR* path /* Pointer to the file or directory path */ ) { FRESULT res; - _DIR_ dj; - BYTE *dir, *sdir; - DWORD dclust, dsect; - char fn[8+3+1]; + DIR dj, sdj; + BYTE *dir; + DWORD dclst; + DEF_NAMEBUF; - res = auto_mount(&path, &dj.fs, 1); - if (res != FR_OK) return res; - res = trace_path(&dj, fn, path, &dir); /* Trace the file path */ - if (res != FR_OK) return res; /* Trace failed */ - if (!dir) return FR_INVALID_NAME; /* It is the root directory */ - if (dir[DIR_Attr] & AM_RDO) return FR_DENIED; /* It is a R/O object */ - dsect = dj.fs->winsect; - dclust = ((DWORD)LD_WORD(&dir[DIR_FstClusHI]) << 16) | LD_WORD(&dir[DIR_FstClusLO]); - - if (dir[DIR_Attr] & AM_DIR) { /* It is a sub-directory */ - dj.clust = dclust; /* Check if the sub-dir is empty or not */ - dj.sect = clust2sect(dj.fs, dclust); - dj.index = 2; - do { - if (!move_window(dj.fs, dj.sect)) return FR_RW_ERROR; - sdir = &dj.fs->win[(dj.index & ((SS(dj.fs) - 1) >> 5)) * 32]; - if (sdir[DIR_Name] == 0) break; - if (sdir[DIR_Name] != 0xE5 && !(sdir[DIR_Attr] & AM_VOL)) - return FR_DENIED; /* The directory is not empty */ - } while (next_dir_entry(&dj)); + /* Get logical drive number */ + res = find_volume(&dj.fs, &path, 1); + if (res == FR_OK) { + INIT_BUF(dj); + res = follow_path(&dj, path); /* Follow the file path */ + if (_FS_RPATH && res == FR_OK && (dj.fn[NS] & NS_DOT)) + res = FR_INVALID_NAME; /* Cannot remove dot entry */ +#if _FS_LOCK + if (res == FR_OK) res = chk_lock(&dj, 2); /* Cannot remove open file */ +#endif + if (res == FR_OK) { /* The object is accessible */ + dir = dj.dir; + if (!dir) { + res = FR_INVALID_NAME; /* Cannot remove the start directory */ + } else { + if (dir[DIR_Attr] & AM_RDO) + res = FR_DENIED; /* Cannot remove R/O object */ + } + dclst = ld_clust(dj.fs, dir); + if (res == FR_OK && (dir[DIR_Attr] & AM_DIR)) { /* Is it a sub-dir? */ + if (dclst < 2) { + res = FR_INT_ERR; + } else { + mem_cpy(&sdj, &dj, sizeof (DIR)); /* Check if the sub-directory is empty or not */ + sdj.sclust = dclst; + res = dir_sdi(&sdj, 2); /* Exclude dot entries */ + if (res == FR_OK) { + res = dir_read(&sdj, 0); /* Read an item */ + if (res == FR_OK /* Not empty directory */ +#if _FS_RPATH + || dclst == dj.fs->cdir /* Current directory */ +#endif + ) res = FR_DENIED; + if (res == FR_NO_FILE) res = FR_OK; /* Empty */ + } + } + } + if (res == FR_OK) { + res = dir_remove(&dj); /* Remove the directory entry */ + if (res == FR_OK) { + if (dclst) /* Remove the cluster chain if exist */ + res = remove_chain(dj.fs, dclst); + if (res == FR_OK) res = sync_fs(dj.fs); + } + } + } + FREE_BUF(); } - if (!move_window(dj.fs, dsect)) return FR_RW_ERROR; /* Mark the directory entry 'deleted' */ - dir[DIR_Name] = 0xE5; - dj.fs->winflag = 1; - if (!remove_chain(dj.fs, dclust)) return FR_RW_ERROR; /* Remove the cluster chain */ - - return sync(dj.fs); + LEAVE_FF(dj.fs, res); } @@ -1488,96 +3525,113 @@ FRESULT f_unlink ( /*-----------------------------------------------------------------------*/ FRESULT f_mkdir ( - const char *path /* Pointer to the directory path */ + const TCHAR* path /* Pointer to the directory path */ ) { FRESULT res; - _DIR_ dj; - BYTE *dir, *fw, n; - char fn[8+3+1]; - DWORD sect, dsect, dclust, pclust, tim; - - - res = auto_mount(&path, &dj.fs, 1); - if (res != FR_OK) return res; - res = trace_path(&dj, fn, path, &dir); /* Trace the file path */ - if (res == FR_OK) return FR_EXIST; /* Any file or directory is already existing */ - if (res != FR_NO_FILE) return res; + DIR dj; + BYTE *dir, n; + DWORD dsc, dcl, pcl, tm = get_fattime(); + DEF_NAMEBUF; - res = reserve_direntry(&dj, &dir); /* Reserve a directory entry */ - if (res != FR_OK) return res; - sect = dj.fs->winsect; - dclust = create_chain(dj.fs, 0); /* Allocate a cluster for new directory table */ - if (dclust == 1) return FR_RW_ERROR; - dsect = clust2sect(dj.fs, dclust); - if (!dsect) return FR_DENIED; - if (!move_window(dj.fs, dsect)) return FR_RW_ERROR; - fw = dj.fs->win; - memset(fw, 0, SS(dj.fs)); /* Clear the new directory table */ - for (n = 1; n < dj.fs->csize; n++) { - if (disk_write(dj.fs->drive, fw, ++dsect, 1) != RES_OK) - return FR_RW_ERROR; + /* Get logical drive number */ + res = find_volume(&dj.fs, &path, 1); + if (res == FR_OK) { + INIT_BUF(dj); + res = follow_path(&dj, path); /* Follow the file path */ + if (res == FR_OK) res = FR_EXIST; /* Any object with same name is already existing */ + if (_FS_RPATH && res == FR_NO_FILE && (dj.fn[NS] & NS_DOT)) + res = FR_INVALID_NAME; + if (res == FR_NO_FILE) { /* Can create a new directory */ + dcl = create_chain(dj.fs, 0); /* Allocate a cluster for the new directory table */ + res = FR_OK; + if (dcl == 0) res = FR_DENIED; /* No space to allocate a new cluster */ + if (dcl == 1) res = FR_INT_ERR; + if (dcl == 0xFFFFFFFF) res = FR_DISK_ERR; + if (res == FR_OK) /* Flush FAT */ + res = sync_window(dj.fs); + if (res == FR_OK) { /* Initialize the new directory table */ + dsc = clust2sect(dj.fs, dcl); + dir = dj.fs->win; + mem_set(dir, 0, SS(dj.fs)); + mem_set(dir+DIR_Name, ' ', 11); /* Create "." entry */ + dir[DIR_Name] = '.'; + dir[DIR_Attr] = AM_DIR; + ST_DWORD(dir+DIR_WrtTime, tm); + st_clust(dir, dcl); + mem_cpy(dir+SZ_DIR, dir, SZ_DIR); /* Create ".." entry */ + dir[SZ_DIR+1] = '.'; pcl = dj.sclust; + if (dj.fs->fs_type == FS_FAT32 && pcl == dj.fs->dirbase) + pcl = 0; + 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; + res = sync_window(dj.fs); + if (res != FR_OK) break; + mem_set(dir, 0, SS(dj.fs)); + } + } + if (res == FR_OK) res = dir_register(&dj); /* Register the object to the directoy */ + if (res != FR_OK) { + remove_chain(dj.fs, dcl); /* Could not register, remove cluster chain */ + } else { + dir = dj.dir; + dir[DIR_Attr] = AM_DIR; /* Attribute */ + ST_DWORD(dir+DIR_WrtTime, tm); /* Created time */ + st_clust(dir, dcl); /* Table start cluster */ + dj.fs->wflag = 1; + res = sync_fs(dj.fs); + } + } + FREE_BUF(); } - memset(&fw[DIR_Name], ' ', 8+3); /* Create "." entry */ - fw[DIR_Name] = '.'; - fw[DIR_Attr] = AM_DIR; - tim = get_fattime(); - ST_DWORD(&fw[DIR_WrtTime], tim); - memcpy(&fw[32], &fw[0], 32); fw[33] = '.'; /* Create ".." entry */ - ST_WORD(&fw[ DIR_FstClusLO], dclust); - ST_WORD(&fw[ DIR_FstClusHI], dclust >> 16); - pclust = dj.sclust; - if (dj.fs->fs_type == FS_FAT32 && pclust == dj.fs->dirbase) pclust = 0; - ST_WORD(&fw[32+DIR_FstClusLO], pclust); - ST_WORD(&fw[32+DIR_FstClusHI], pclust >> 16); - dj.fs->winflag = 1; - - if (!move_window(dj.fs, sect)) return FR_RW_ERROR; - memset(&dir[0], 0, 32); /* Initialize the new entry */ - memcpy(&dir[DIR_Name], fn, 8+3); /* Name */ - dir[DIR_NTres] = fn[11]; - dir[DIR_Attr] = AM_DIR; /* Attribute */ - ST_DWORD(&dir[DIR_WrtTime], tim); /* Crated time */ - ST_WORD(&dir[DIR_FstClusLO], dclust); /* Table start cluster */ - ST_WORD(&dir[DIR_FstClusHI], dclust >> 16); - return sync(dj.fs); + LEAVE_FF(dj.fs, res); } /*-----------------------------------------------------------------------*/ -/* Change File Attribute */ +/* Change Attribute */ /*-----------------------------------------------------------------------*/ FRESULT f_chmod ( - const char *path, /* Pointer to the file path */ + const TCHAR* path, /* Pointer to the file path */ BYTE value, /* Attribute bits */ BYTE mask /* Attribute mask to change */ ) { FRESULT res; - _DIR_ dj; + DIR dj; BYTE *dir; - char fn[8+3+1]; + DEF_NAMEBUF; - res = auto_mount(&path, &dj.fs, 1); + /* Get logical drive number */ + res = find_volume(&dj.fs, &path, 1); if (res == FR_OK) { - res = trace_path(&dj, fn, path, &dir); /* Trace the file path */ - if (res == FR_OK) { /* Trace completed */ - if (!dir) { - res = FR_INVALID_NAME; /* Root directory */ - } else { + INIT_BUF(dj); + res = follow_path(&dj, path); /* Follow the file path */ + FREE_BUF(); + if (_FS_RPATH && res == FR_OK && (dj.fn[NS] & NS_DOT)) + res = FR_INVALID_NAME; + if (res == FR_OK) { + dir = dj.dir; + if (!dir) { /* Is it a root directory? */ + res = FR_INVALID_NAME; + } else { /* File or sub directory */ mask &= AM_RDO|AM_HID|AM_SYS|AM_ARC; /* Valid attribute mask */ dir[DIR_Attr] = (value & mask) | (dir[DIR_Attr] & (BYTE)~mask); /* Apply attribute change */ - res = sync(dj.fs); + dj.fs->wflag = 1; + res = sync_fs(dj.fs); } } } - return res; + + LEAVE_FF(dj.fs, res); } @@ -1588,30 +3642,38 @@ FRESULT f_chmod ( /*-----------------------------------------------------------------------*/ FRESULT f_utime ( - const char *path, /* Pointer to the file/directory name */ - const FILINFO *finfo /* Pointer to the timestamp to be set */ + const TCHAR* path, /* Pointer to the file/directory name */ + const FILINFO* fno /* Pointer to the time stamp to be set */ ) { FRESULT res; - _DIR_ dj; + DIR dj; BYTE *dir; - char fn[8+3+1]; + DEF_NAMEBUF; - res = auto_mount(&path, &dj.fs, 1); + /* Get logical drive number */ + res = find_volume(&dj.fs, &path, 1); if (res == FR_OK) { - res = trace_path(&dj, fn, path, &dir); /* Trace the file path */ - if (res == FR_OK) { /* Trace completed */ - if (!dir) { - res = FR_INVALID_NAME; /* Root directory */ - } else { - ST_WORD(&dir[DIR_WrtTime], finfo->ftime); - ST_WORD(&dir[DIR_WrtDate], finfo->fdate); - res = sync(dj.fs); + INIT_BUF(dj); + res = follow_path(&dj, path); /* Follow the file path */ + FREE_BUF(); + if (_FS_RPATH && res == FR_OK && (dj.fn[NS] & NS_DOT)) + res = FR_INVALID_NAME; + if (res == FR_OK) { + dir = dj.dir; + if (!dir) { /* Root directory */ + res = FR_INVALID_NAME; + } else { /* File or sub-directory */ + ST_WORD(dir+DIR_WrtTime, fno->ftime); + ST_WORD(dir+DIR_WrtDate, fno->fdate); + dj.fs->wflag = 1; + res = sync_fs(dj.fs); } } } - return res; + + LEAVE_FF(dj.fs, res); } @@ -1622,47 +3684,298 @@ FRESULT f_utime ( /*-----------------------------------------------------------------------*/ FRESULT f_rename ( - const char *path_old, /* Pointer to the old name */ - const char *path_new /* Pointer to the new name */ + const TCHAR* path_old, /* Pointer to the old name */ + const TCHAR* path_new /* Pointer to the new name */ ) { FRESULT res; - _DIR_ dj; - DWORD sect_old; - BYTE *dir_old, *dir_new, direntry[32-11]; - char fn[8+3+1]; + DIR djo, djn; + BYTE buf[21], *dir; + DWORD dw; + DEF_NAMEBUF; - res = auto_mount(&path_old, &dj.fs, 1); - if (res != FR_OK) return res; + /* Get logical drive number of the source object */ + res = find_volume(&djo.fs, &path_old, 1); + if (res == FR_OK) { + djn.fs = djo.fs; + INIT_BUF(djo); + res = follow_path(&djo, path_old); /* Check old object */ + if (_FS_RPATH && res == FR_OK && (djo.fn[NS] & NS_DOT)) + res = FR_INVALID_NAME; +#if _FS_LOCK + if (res == FR_OK) res = chk_lock(&djo, 2); +#endif + if (res == FR_OK) { /* Old object is found */ + if (!djo.dir) { /* Is root dir? */ + res = FR_NO_FILE; + } else { + mem_cpy(buf, djo.dir+DIR_Attr, 21); /* Save the object information except for name */ + mem_cpy(&djn, &djo, sizeof (DIR)); /* Check new object */ + res = follow_path(&djn, path_new); + if (res == FR_OK) res = FR_EXIST; /* The new object name is already existing */ + if (res == FR_NO_FILE) { /* Is it a valid path and no name collision? */ +/* Start critical section that any interruption can cause a cross-link */ + res = dir_register(&djn); /* Register the new entry */ + if (res == FR_OK) { + dir = djn.dir; /* Copy object information except for name */ + mem_cpy(dir+13, buf+2, 19); + dir[DIR_Attr] = buf[0] | AM_ARC; + djo.fs->wflag = 1; + if (djo.sclust != djn.sclust && (dir[DIR_Attr] & AM_DIR)) { /* Update .. entry in the directory if needed */ + dw = clust2sect(djo.fs, ld_clust(djo.fs, dir)); + if (!dw) { + res = FR_INT_ERR; + } else { + res = move_window(djo.fs, dw); + dir = djo.fs->win+SZ_DIR; /* .. entry */ + if (res == FR_OK && dir[1] == '.') { + dw = (djo.fs->fs_type == FS_FAT32 && djn.sclust == djo.fs->dirbase) ? 0 : djn.sclust; + st_clust(dir, dw); + djo.fs->wflag = 1; + } + } + } + if (res == FR_OK) { + res = dir_remove(&djo); /* Remove old entry */ + if (res == FR_OK) + res = sync_fs(djo.fs); + } + } +/* End critical section */ + } + } + } + FREE_BUF(); + } + + LEAVE_FF(djo.fs, res); +} + +#endif /* !_FS_READONLY */ +#endif /* _FS_MINIMIZE == 0 */ +#endif /* _FS_MINIMIZE <= 1 */ +#endif /* _FS_MINIMIZE <= 2 */ - res = trace_path(&dj, fn, path_old, &dir_old); /* Check old object */ - if (res != FR_OK) return res; /* The old object is not found */ - if (!dir_old) return FR_NO_FILE; - sect_old = dj.fs->winsect; /* Save the object information */ - memcpy(direntry, &dir_old[DIR_Attr], 32-11); - res = trace_path(&dj, fn, path_new, &dir_new); /* Check new object */ - if (res == FR_OK) return FR_EXIST; /* The new object name is already existing */ - if (res != FR_NO_FILE) return res; /* Is there no old name? */ - res = reserve_direntry(&dj, &dir_new); /* Reserve a directory entry */ - if (res != FR_OK) return res; - memcpy(&dir_new[DIR_Attr], direntry, 32-11); /* Create new entry */ - memcpy(&dir_new[DIR_Name], fn, 8+3); - dir_new[DIR_NTres] = fn[11]; - dj.fs->winflag = 1; +#if _USE_LABEL +/*-----------------------------------------------------------------------*/ +/* Get volume label */ +/*-----------------------------------------------------------------------*/ + +FRESULT f_getlabel ( + const TCHAR* path, /* Path name of the logical drive number */ + TCHAR* label, /* Pointer to a buffer to return the volume label */ + DWORD* sn /* Pointer to a variable to return the volume serial number */ +) +{ + FRESULT res; + DIR dj; + UINT i, j; + + + /* Get logical drive number */ + res = find_volume(&dj.fs, &path, 0); + + /* Get volume label */ + if (res == FR_OK && label) { + dj.sclust = 0; /* Open root directory */ + res = dir_sdi(&dj, 0); + if (res == FR_OK) { + res = dir_read(&dj, 1); /* Get an entry with AM_VOL */ + if (res == FR_OK) { /* A volume label is exist */ +#if _LFN_UNICODE + WCHAR w; + i = j = 0; + do { + w = (i < 11) ? dj.dir[i++] : ' '; + if (IsDBCS1(w) && i < 11 && IsDBCS2(dj.dir[i])) + w = w << 8 | dj.dir[i++]; + label[j++] = ff_convert(w, 1); /* OEM -> Unicode */ + } while (j < 11); +#else + mem_cpy(label, dj.dir, 11); +#endif + j = 11; + do { + label[j] = 0; + if (!j) break; + } while (label[--j] == ' '); + } + if (res == FR_NO_FILE) { /* No label, return nul string */ + label[0] = 0; + res = FR_OK; + } + } + } + + /* Get volume serial number */ + if (res == FR_OK && sn) { + res = move_window(dj.fs, dj.fs->volbase); + if (res == FR_OK) { + i = dj.fs->fs_type == FS_FAT32 ? BS_VolID32 : BS_VolID; + *sn = LD_DWORD(&dj.fs->win[i]); + } + } + + LEAVE_FF(dj.fs, res); +} + + + +#if !_FS_READONLY +/*-----------------------------------------------------------------------*/ +/* Set volume label */ +/*-----------------------------------------------------------------------*/ + +FRESULT f_setlabel ( + const TCHAR* label /* Pointer to the volume label to set */ +) +{ + FRESULT res; + DIR dj; + BYTE vn[11]; + UINT i, j, sl; + WCHAR w; + DWORD tm; + + + /* Get logical drive number */ + res = find_volume(&dj.fs, &label, 1); + if (res) LEAVE_FF(dj.fs, res); + + /* Create a volume label in directory form */ + vn[0] = 0; + for (sl = 0; label[sl]; sl++) ; /* Get name length */ + for ( ; sl && label[sl-1] == ' '; sl--) ; /* Remove trailing spaces */ + if (sl) { /* Create volume label in directory form */ + i = j = 0; + do { +#if _LFN_UNICODE + w = ff_convert(ff_wtoupper(label[i++]), 0); +#else + w = (BYTE)label[i++]; + if (IsDBCS1(w)) + w = (j < 10 && i < sl && IsDBCS2(label[i])) ? w << 8 | (BYTE)label[i++] : 0; +#if _USE_LFN + w = ff_convert(ff_wtoupper(ff_convert(w, 1)), 0); +#else + if (IsLower(w)) w -= 0x20; /* To upper ASCII characters */ +#ifdef _EXCVT + if (w >= 0x80) w = ExCvt[w - 0x80]; /* To upper extended characters (SBCS cfg) */ +#else + if (!_DF1S && w >= 0x80) w = 0; /* Reject extended characters (ASCII cfg) */ +#endif +#endif +#endif + if (!w || chk_chr("\"*+,.:;<=>\?[]|\x7F", w) || j >= (UINT)((w >= 0x100) ? 10 : 11)) /* Reject invalid characters for volume label */ + LEAVE_FF(dj.fs, FR_INVALID_NAME); + if (w >= 0x100) vn[j++] = (BYTE)(w >> 8); + vn[j++] = (BYTE)w; + } while (i < sl); + while (j < 11) vn[j++] = ' '; + } - if (!move_window(dj.fs, sect_old)) return FR_RW_ERROR; /* Delete old entry */ - dir_old[DIR_Name] = 0xE5; + /* Set volume label */ + dj.sclust = 0; /* Open root directory */ + res = dir_sdi(&dj, 0); + if (res == FR_OK) { + res = dir_read(&dj, 1); /* Get an entry with AM_VOL */ + if (res == FR_OK) { /* A volume label is found */ + if (vn[0]) { + mem_cpy(dj.dir, vn, 11); /* Change the volume label name */ + tm = get_fattime(); + ST_DWORD(dj.dir+DIR_WrtTime, tm); + } else { + dj.dir[0] = DDE; /* Remove the volume label */ + } + dj.fs->wflag = 1; + res = sync_fs(dj.fs); + } else { /* No volume label is found or error */ + if (res == FR_NO_FILE) { + res = FR_OK; + if (vn[0]) { /* Create volume label as new */ + res = dir_alloc(&dj, 1); /* Allocate an entry for volume label */ + if (res == FR_OK) { + mem_set(dj.dir, 0, SZ_DIR); /* Set volume label */ + mem_cpy(dj.dir, vn, 11); + dj.dir[DIR_Attr] = AM_VOL; + tm = get_fattime(); + ST_DWORD(dj.dir+DIR_WrtTime, tm); + dj.fs->wflag = 1; + res = sync_fs(dj.fs); + } + } + } + } + } - return sync(dj.fs); + LEAVE_FF(dj.fs, res); } #endif /* !_FS_READONLY */ -#endif /* _FS_MINIMIZE == 0 */ -#endif /* _FS_MINIMIZE <= 1 */ -#endif /* _FS_MINIMIZE <= 2 */ +#endif /* _USE_LABEL */ + + + +/*-----------------------------------------------------------------------*/ +/* Forward data to the stream directly (available on only tiny cfg) */ +/*-----------------------------------------------------------------------*/ +#if _USE_FORWARD && _FS_TINY + +FRESULT f_forward ( + FIL* fp, /* Pointer to the file object */ + UINT (*func)(const BYTE*,UINT), /* Pointer to the streaming function */ + UINT btf, /* Number of bytes to forward */ + UINT* bf /* Pointer to number of bytes forwarded */ +) +{ + FRESULT res; + DWORD remain, clst, sect; + UINT rcnt; + BYTE csect; + + + *bf = 0; /* Clear transfer byte counter */ + + res = validate(fp); /* Check validity of the object */ + if (res != FR_OK) LEAVE_FF(fp->fs, res); + if (fp->err) /* Check error */ + LEAVE_FF(fp->fs, (FRESULT)fp->err); + if (!(fp->flag & FA_READ)) /* Check access mode */ + LEAVE_FF(fp->fs, FR_DENIED); + + remain = fp->fsize - fp->fptr; + if (btf > remain) btf = (UINT)remain; /* Truncate btf by remaining bytes */ + + for ( ; btf && (*func)(0, 0); /* Repeat until all data transferred or stream becomes busy */ + fp->fptr += rcnt, *bf += rcnt, btf -= rcnt) { + csect = (BYTE)(fp->fptr / SS(fp->fs) & (fp->fs->csize - 1)); /* Sector offset in the cluster */ + 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->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->clust = clst; /* Update current cluster */ + } + } + 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 */ + ABORT(fp->fs, FR_DISK_ERR); + fp->dsect = sect; + rcnt = SS(fp->fs) - (WORD)(fp->fptr % SS(fp->fs)); /* Forward data from sector window */ + if (rcnt > btf) rcnt = btf; + rcnt = (*func)(&fp->fs->win[(WORD)fp->fptr % SS(fp->fs)], rcnt); + if (!rcnt) ABORT(fp->fs, FR_INT_ERR); + } + + LEAVE_FF(fp->fs, FR_OK); +} +#endif /* _USE_FORWARD */ @@ -1670,233 +3983,396 @@ FRESULT f_rename ( /*-----------------------------------------------------------------------*/ /* Create File System on the Drive */ /*-----------------------------------------------------------------------*/ -#define N_ROOTDIR 512 /* Multiple of 32 and <= 2048 */ -#define N_FATS 1 /* 1 or 2 */ -#define MAX_SECTOR 64000000UL /* Maximum partition size */ -#define MIN_SECTOR 2000UL /* Minimum partition size */ - +#define N_ROOTDIR 512 /* Number of root directory entries for FAT12/16 */ +#define N_FATS 1 /* Number of FAT copies (1 or 2) */ FRESULT f_mkfs ( - BYTE drv, /* Logical drive number */ - BYTE partition, /* Partitioning rule 0:FDISK, 1:SFD */ - WORD allocsize /* Allocation unit size [bytes] */ + const TCHAR* path, /* Logical drive number */ + BYTE sfd, /* Partitioning rule 0:FDISK, 1:SFD */ + UINT au /* Allocation unit [bytes] */ ) { - BYTE fmt, m, *tbl; - DWORD b_part, b_fat, b_dir, b_data; /* Area offset (LBA) */ - DWORD n_part, n_rsv, n_fat, n_dir; /* Area size */ - DWORD n_clust, n; + static const WORD vst[] = { 1024, 512, 256, 128, 64, 32, 16, 8, 4, 2, 0}; + static const WORD cst[] = {32768, 16384, 8192, 4096, 2048, 16384, 8192, 4096, 2048, 1024, 512}; + int vol; + BYTE fmt, md, sys, *tbl, pdrv, part; + DWORD n_clst, vs, n, wsect; + UINT i; + DWORD b_vol, b_fat, b_dir, b_data; /* LBA */ + DWORD n_vol, n_rsv, n_fat, n_dir; /* Size */ FATFS *fs; DSTATUS stat; - /* Check validity of the parameters */ - if (drv >= _DRIVES) return FR_INVALID_DRIVE; - if (partition >= 2) return FR_MKFS_ABORTED; - for (n = 512; n <= 32768U && n != allocsize; n <<= 1); - if (n != allocsize) return FR_MKFS_ABORTED; - /* Check mounted drive and clear work area */ - fs = FatFs[drv]; + vol = get_ldnumber(&path); + if (vol < 0) return FR_INVALID_DRIVE; + if (sfd > 1) return FR_INVALID_PARAMETER; + if (au & (au - 1)) return FR_INVALID_PARAMETER; + fs = FatFs[vol]; if (!fs) return FR_NOT_ENABLED; fs->fs_type = 0; - drv = LD2PD(drv); + pdrv = LD2PD(vol); /* Physical drive */ + part = LD2PT(vol); /* Partition (0:auto detect, 1-4:get from partition table)*/ /* Get disk statics */ - stat = disk_initialize(drv); + stat = disk_initialize(pdrv); if (stat & STA_NOINIT) return FR_NOT_READY; if (stat & STA_PROTECT) return FR_WRITE_PROTECTED; - if (disk_ioctl(drv, GET_SECTOR_COUNT, &n_part) != RES_OK || n_part < MIN_SECTOR) - return FR_MKFS_ABORTED; - if (n_part > MAX_SECTOR) n_part = MAX_SECTOR; - b_part = (!partition) ? 63 : 0; /* Boot sector */ - n_part -= b_part; -#if S_MAX_SIZ > 512 /* Check disk sector size */ - if (disk_ioctl(drv, GET_SECTOR_SIZE, &SS(fs)) != RES_OK - || SS(fs) > S_MAX_SIZ - || SS(fs) > allocsize) - return FR_MKFS_ABORTED; +#if _MAX_SS != 512 /* Get disk sector size */ + if (disk_ioctl(pdrv, GET_SECTOR_SIZE, &SS(fs)) != RES_OK || SS(fs) > _MAX_SS) + return FR_DISK_ERR; #endif - allocsize /= SS(fs); /* Number of sectors per cluster */ + if (_MULTI_PARTITION && part) { + /* Get partition information from partition table in the MBR */ + if (disk_read(pdrv, fs->win, 0, 1)) return FR_DISK_ERR; + if (LD_WORD(fs->win+BS_55AA) != 0xAA55) return FR_MKFS_ABORTED; + tbl = &fs->win[MBR_Table + (part - 1) * SZ_PTE]; + if (!tbl[4]) return FR_MKFS_ABORTED; /* No partition? */ + b_vol = LD_DWORD(tbl+8); /* Volume start sector */ + n_vol = LD_DWORD(tbl+12); /* Volume size */ + } else { + /* Create a partition in this function */ + if (disk_ioctl(pdrv, GET_SECTOR_COUNT, &n_vol) != RES_OK || n_vol < 128) + return FR_DISK_ERR; + b_vol = (sfd) ? 0 : 63; /* Volume start sector */ + n_vol -= b_vol; /* Volume size */ + } - /* Pre-compute number of clusters and FAT type */ - n_clust = n_part / allocsize; + if (!au) { /* AU auto selection */ + vs = n_vol / (2000 / (SS(fs) / 512)); + for (i = 0; vs < vst[i]; i++) ; + au = cst[i]; + } + au /= SS(fs); /* Number of sectors per cluster */ + if (au == 0) au = 1; + if (au > 128) au = 128; + + /* Pre-compute number of clusters and FAT sub-type */ + n_clst = n_vol / au; fmt = FS_FAT12; - if (n_clust >= 0xFF5) fmt = FS_FAT16; - if (n_clust >= 0xFFF5) fmt = FS_FAT32; + if (n_clst >= MIN_FAT16) fmt = FS_FAT16; + if (n_clst >= MIN_FAT32) fmt = FS_FAT32; /* Determine offset and size of FAT structure */ - switch (fmt) { - case FS_FAT12: - n_fat = ((n_clust * 3 + 1) / 2 + 3 + SS(fs) - 1) / SS(fs); - n_rsv = 1 + partition; - n_dir = N_ROOTDIR * 32 / SS(fs); - break; - case FS_FAT16: - n_fat = ((n_clust * 2) + 4 + SS(fs) - 1) / SS(fs); - n_rsv = 1 + partition; - n_dir = N_ROOTDIR * 32 / SS(fs); - break; - default: - n_fat = ((n_clust * 4) + 8 + SS(fs) - 1) / SS(fs); - n_rsv = 33 - partition; + if (fmt == FS_FAT32) { + n_fat = ((n_clst * 4) + 8 + SS(fs) - 1) / SS(fs); + n_rsv = 32; n_dir = 0; + } else { + 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 = (DWORD)N_ROOTDIR * SZ_DIR / SS(fs); } - b_fat = b_part + n_rsv; /* FATs start sector */ - b_dir = b_fat + n_fat * N_FATS; /* Directory start sector */ - b_data = b_dir + n_dir; /* Data start sector */ + b_fat = b_vol + n_rsv; /* FAT area start sector */ + b_dir = b_fat + n_fat * N_FATS; /* Directory area start sector */ + b_data = b_dir + n_dir; /* Data area start sector */ + if (n_vol < b_data + au - b_vol) return FR_MKFS_ABORTED; /* Too small volume */ /* Align data start sector to erase block boundary (for flash memory media) */ - if (disk_ioctl(drv, GET_BLOCK_SIZE, &n) != RES_OK) return FR_MKFS_ABORTED; - n = (b_data + n - 1) & ~(n - 1); - n_fat += (n - b_data) / N_FATS; - /* b_dir and b_data are no longer used below */ - - /* Determine number of cluster and final check of validity of the FAT type */ - n_clust = (n_part - n_rsv - n_fat * N_FATS - n_dir) / allocsize; - if ( (fmt == FS_FAT16 && n_clust < 0xFF5) - || (fmt == FS_FAT32 && n_clust < 0xFFF5)) - return FR_MKFS_ABORTED; + if (disk_ioctl(pdrv, GET_BLOCK_SIZE, &n) != RES_OK || !n || n > 32768) n = 1; + n = (b_data + n - 1) & ~(n - 1); /* Next nearest erase block from current data start */ + n = (n - b_data) / N_FATS; + if (fmt == FS_FAT32) { /* FAT32: Move FAT offset */ + n_rsv += n; + b_fat += n; + } else { /* FAT12/16: Expand FAT size */ + n_fat += n; + } - /* Create partition table if needed */ - if (!partition) { - DWORD n_disk = b_part + n_part; + /* 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; - tbl = &fs->win[MBR_Table]; - ST_DWORD(&tbl[0], 0x00010180); /* Partition start in CHS */ - if (n_disk < 63UL * 255 * 1024) { /* Partition end in CHS */ - n_disk = n_disk / 63 / 255; - tbl[7] = (BYTE)n_disk; - tbl[6] = (BYTE)((n_disk >> 2) | 63); + /* Determine system ID in the partition table */ + if (fmt == FS_FAT32) { + sys = 0x0C; /* FAT32X */ + } else { + if (fmt == FS_FAT12 && n_vol < 0x10000) { + sys = 0x01; /* FAT12(<65536) */ } else { - ST_WORD(&tbl[6], 0xFFFF); - } - tbl[5] = 254; - if (fmt != FS_FAT32) /* System ID */ - tbl[4] = (n_part < 0x10000) ? 0x04 : 0x06; - else - tbl[4] = 0x0c; - ST_DWORD(&tbl[8], 63); /* Partition start in LBA */ - ST_DWORD(&tbl[12], n_part); /* Partition size in LBA */ - ST_WORD(&tbl[64], 0xAA55); /* Signature */ - if (disk_write(drv, fs->win, 0, 1) != RES_OK) - return FR_RW_ERROR; - } - - /* Create boot record */ - tbl = fs->win; /* Clear buffer */ - memset(tbl, 0, SS(fs)); - ST_DWORD(&tbl[BS_jmpBoot], 0x90FEEB); /* Boot code (jmp $, nop) */ - ST_WORD(&tbl[BPB_BytsPerSec], SS(fs)); /* Sector size */ - tbl[BPB_SecPerClus] = (BYTE)allocsize; /* Sectors per cluster */ - ST_WORD(&tbl[BPB_RsvdSecCnt], n_rsv); /* Reserved sectors */ - tbl[BPB_NumFATs] = N_FATS; /* Number of FATs */ - ST_WORD(&tbl[BPB_RootEntCnt], SS(fs) / 32 * n_dir); /* Number of rootdir entries */ - if (n_part < 0x10000) { /* Number of total sectors */ - ST_WORD(&tbl[BPB_TotSec16], n_part); + sys = (n_vol < 0x10000) ? 0x04 : 0x06; /* FAT16(<65536) : FAT12/16(>=65536) */ + } + } + + if (_MULTI_PARTITION && part) { + /* Update system ID in the partition table */ + tbl = &fs->win[MBR_Table + (part - 1) * SZ_PTE]; + tbl[4] = sys; + if (disk_write(pdrv, fs->win, 0, 1)) /* Write it to teh MBR */ + return FR_DISK_ERR; + md = 0xF8; + } else { + if (sfd) { /* No partition table (SFD) */ + md = 0xF0; + } else { /* Create partition table (FDISK) */ + mem_set(fs->win, 0, SS(fs)); + tbl = fs->win+MBR_Table; /* Create partition table for single partition in the drive */ + tbl[1] = 1; /* Partition start head */ + tbl[2] = 1; /* Partition start sector */ + tbl[3] = 0; /* Partition start cylinder */ + tbl[4] = sys; /* System type */ + tbl[5] = 254; /* Partition end head */ + n = (b_vol + n_vol) / 63 / 255; + tbl[6] = (BYTE)(n >> 2 | 63); /* Partition end sector */ + tbl[7] = (BYTE)n; /* End cylinder */ + ST_DWORD(tbl+8, 63); /* Partition start in LBA */ + ST_DWORD(tbl+12, n_vol); /* Partition size in LBA */ + ST_WORD(fs->win+BS_55AA, 0xAA55); /* MBR signature */ + if (disk_write(pdrv, fs->win, 0, 1)) /* Write it to the MBR */ + return FR_DISK_ERR; + md = 0xF8; + } + } + + /* Create BPB in the VBR */ + tbl = fs->win; /* Clear sector */ + mem_set(tbl, 0, SS(fs)); + 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 */ + ST_WORD(tbl+BPB_RsvdSecCnt, n_rsv); /* Reserved sectors */ + tbl[BPB_NumFATs] = N_FATS; /* Number of FATs */ + i = (fmt == FS_FAT32) ? 0 : N_ROOTDIR; /* Number of root directory entries */ + ST_WORD(tbl+BPB_RootEntCnt, i); + if (n_vol < 0x10000) { /* Number of total sectors */ + ST_WORD(tbl+BPB_TotSec16, n_vol); } else { - ST_DWORD(&tbl[BPB_TotSec32], n_part); - } - tbl[BPB_Media] = 0xF8; /* Media descripter */ - ST_WORD(&tbl[BPB_SecPerTrk], 63); /* Number of sectors per track */ - ST_WORD(&tbl[BPB_NumHeads], 255); /* Number of heads */ - ST_DWORD(&tbl[BPB_HiddSec], b_part); /* Hidden sectors */ - n = get_fattime(); /* Use current time as a VSN */ - if (fmt != FS_FAT32) { - ST_DWORD(&tbl[BS_VolID], n); /* Volume serial number */ - ST_WORD(&tbl[BPB_FATSz16], n_fat); /* Number of secters per FAT */ - tbl[BS_DrvNum] = 0x80; /* Drive number */ - tbl[BS_BootSig] = 0x29; /* Extended boot signature */ - memcpy(&tbl[BS_VolLab], "NO NAME FAT ", 19); /* Volume lavel, FAT signature */ + ST_DWORD(tbl+BPB_TotSec32, n_vol); + } + tbl[BPB_Media] = md; /* Media descriptor */ + ST_WORD(tbl+BPB_SecPerTrk, 63); /* Number of sectors per track */ + ST_WORD(tbl+BPB_NumHeads, 255); /* Number of heads */ + ST_DWORD(tbl+BPB_HiddSec, b_vol); /* Hidden sectors */ + n = get_fattime(); /* Use current time as VSN */ + if (fmt == FS_FAT32) { + ST_DWORD(tbl+BS_VolID32, n); /* VSN */ + ST_DWORD(tbl+BPB_FATSz32, n_fat); /* Number of sectors per FAT */ + ST_DWORD(tbl+BPB_RootClus, 2); /* Root directory start cluster (2) */ + ST_WORD(tbl+BPB_FSInfo, 1); /* FSINFO record offset (VBR+1) */ + ST_WORD(tbl+BPB_BkBootSec, 6); /* Backup boot record offset (VBR+6) */ + tbl[BS_DrvNum32] = 0x80; /* Drive number */ + tbl[BS_BootSig32] = 0x29; /* Extended boot signature */ + mem_cpy(tbl+BS_VolLab32, "NO NAME " "FAT32 ", 19); /* Volume label, FAT signature */ } else { - ST_DWORD(&tbl[BS_VolID32], n); /* Volume serial number */ - ST_DWORD(&tbl[BPB_FATSz32], n_fat); /* Number of secters per FAT */ - ST_DWORD(&tbl[BPB_RootClus], 2); /* Root directory cluster (2) */ - ST_WORD(&tbl[BPB_FSInfo], 1); /* FSInfo record (bs+1) */ - ST_WORD(&tbl[BPB_BkBootSec], 6); /* Backup boot record (bs+6) */ - tbl[BS_DrvNum32] = 0x80; /* Drive number */ - tbl[BS_BootSig32] = 0x29; /* Extended boot signature */ - memcpy(&tbl[BS_VolLab32], "NO NAME FAT32 ", 19); /* Volume lavel, FAT signature */ - } - ST_WORD(&tbl[BS_55AA], 0xAA55); /* Signature */ - if (disk_write(drv, tbl, b_part+0, 1) != RES_OK) - return FR_RW_ERROR; - if (fmt == FS_FAT32) - disk_write(drv, tbl, b_part+6, 1); + ST_DWORD(tbl+BS_VolID, n); /* VSN */ + ST_WORD(tbl+BPB_FATSz16, n_fat); /* Number of sectors per FAT */ + tbl[BS_DrvNum] = 0x80; /* Drive number */ + tbl[BS_BootSig] = 0x29; /* Extended boot signature */ + 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(pdrv, tbl, b_vol, 1)) /* Write it to the VBR sector */ + return FR_DISK_ERR; + if (fmt == FS_FAT32) /* Write backup VBR if needed (VBR+6) */ + disk_write(pdrv, tbl, b_vol + 6, 1); /* Initialize FAT area */ - for (m = 0; m < N_FATS; m++) { - memset(tbl, 0, SS(fs)); /* 1st sector of the FAT */ + wsect = b_fat; + 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) { - n = (fmt == FS_FAT12) ? 0x00FFFFF8 : 0xFFFFFFF8; - ST_DWORD(&tbl[0], n); /* Reserve cluster #0-1 (FAT12/16) */ + n |= (fmt == FS_FAT12) ? 0x00FFFF00 : 0xFFFFFF00; + ST_DWORD(tbl+0, n); /* Reserve cluster #0-1 (FAT12/16) */ } else { - ST_DWORD(&tbl[0], 0xFFFFFFF8); /* Reserve cluster #0-1 (FAT32) */ - ST_DWORD(&tbl[4], 0xFFFFFFFF); - ST_DWORD(&tbl[8], 0x0FFFFFFF); /* Reserve cluster #2 for root dir */ + n |= 0xFFFFFF00; + ST_DWORD(tbl+0, n); /* Reserve cluster #0-1 (FAT32) */ + ST_DWORD(tbl+4, 0xFFFFFFFF); + ST_DWORD(tbl+8, 0x0FFFFFFF); /* Reserve cluster #2 for root directory */ } - if (disk_write(drv, tbl, b_fat++, 1) != RES_OK) - return FR_RW_ERROR; - memset(tbl, 0, SS(fs)); /* Following FAT entries are filled by zero */ - for (n = 1; n < n_fat; n++) { - if (disk_write(drv, tbl, b_fat++, 1) != RES_OK) - return FR_RW_ERROR; + if (disk_write(pdrv, tbl, wsect++, 1)) + 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 writes */ + if (disk_write(pdrv, tbl, wsect++, 1)) + return FR_DISK_ERR; } } - /* Initialize Root directory */ - m = (BYTE)((fmt == FS_FAT32) ? allocsize : n_dir); + /* Initialize root directory */ + i = (fmt == FS_FAT32) ? au : n_dir; do { - if (disk_write(drv, tbl, b_fat++, 1) != RES_OK) - return FR_RW_ERROR; - } while (--m); + if (disk_write(pdrv, tbl, wsect++, 1)) + return FR_DISK_ERR; + } while (--i); + +#if _USE_ERASE /* Erase data area if needed */ + { + DWORD eb[2]; - /* Create FSInfo record if needed */ + eb[0] = wsect; eb[1] = wsect + (n_clst - ((fmt == FS_FAT32) ? 1 : 0)) * au - 1; + disk_ioctl(pdrv, 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_clust - 1); - ST_DWORD(&tbl[FSI_Nxt_Free], 0xFFFFFFFF); - disk_write(drv, tbl, b_part+1, 1); - disk_write(drv, tbl, b_part+7, 1); + ST_DWORD(tbl+FSI_LeadSig, 0x41615252); + ST_DWORD(tbl+FSI_StrucSig, 0x61417272); + 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(pdrv, tbl, b_vol + 1, 1); /* Write original (VBR+1) */ + disk_write(pdrv, tbl, b_vol + 7, 1); /* Write backup (VBR+7) */ + } + + return (disk_ioctl(pdrv, CTRL_SYNC, 0) == RES_OK) ? FR_OK : FR_DISK_ERR; +} + + + +#if _MULTI_PARTITION +/*-----------------------------------------------------------------------*/ +/* Divide Physical Drive */ +/*-----------------------------------------------------------------------*/ + +FRESULT f_fdisk ( + BYTE pdrv, /* Physical drive number */ + const DWORD szt[], /* Pointer to the size table for each partitions */ + void* work /* Pointer to the working buffer */ +) +{ + UINT i, n, sz_cyl, tot_cyl, b_cyl, e_cyl, p_cyl; + BYTE s_hd, e_hd, *p, *buf = (BYTE*)work; + DSTATUS stat; + DWORD sz_disk, sz_part, s_part; + + + stat = disk_initialize(pdrv); + if (stat & STA_NOINIT) return FR_NOT_READY; + if (stat & STA_PROTECT) return FR_WRITE_PROTECTED; + if (disk_ioctl(pdrv, GET_SECTOR_COUNT, &sz_disk)) return FR_DISK_ERR; + + /* Determine CHS in the table regardless of the drive geometry */ + for (n = 16; n < 256 && sz_disk / n / 63 > 1024; n *= 2) ; + if (n == 256) n--; + e_hd = n - 1; + sz_cyl = 63 * n; + tot_cyl = sz_disk / sz_cyl; + + /* Create partition table */ + mem_set(buf, 0, _MAX_SS); + p = buf + MBR_Table; b_cyl = 0; + for (i = 0; i < 4; i++, p += SZ_PTE) { + p_cyl = (szt[i] <= 100U) ? (DWORD)tot_cyl * szt[i] / 100 : szt[i] / sz_cyl; + if (!p_cyl) continue; + s_part = (DWORD)sz_cyl * b_cyl; + sz_part = (DWORD)sz_cyl * p_cyl; + if (i == 0) { /* Exclude first track of cylinder 0 */ + s_hd = 1; + s_part += 63; sz_part -= 63; + } else { + s_hd = 0; + } + e_cyl = b_cyl + p_cyl - 1; + if (e_cyl >= tot_cyl) return FR_INVALID_PARAMETER; + + /* Set partition table */ + p[1] = s_hd; /* Start head */ + p[2] = (BYTE)((b_cyl >> 2) + 1); /* Start sector */ + p[3] = (BYTE)b_cyl; /* Start cylinder */ + p[4] = 0x06; /* System type (temporary setting) */ + p[5] = e_hd; /* End head */ + p[6] = (BYTE)((e_cyl >> 2) + 63); /* End sector */ + p[7] = (BYTE)e_cyl; /* End cylinder */ + ST_DWORD(p + 8, s_part); /* Start sector in LBA */ + ST_DWORD(p + 12, sz_part); /* Partition size */ + + /* Next partition */ + b_cyl += p_cyl; } + ST_WORD(p, 0xAA55); - return (disk_ioctl(drv, CTRL_SYNC, NULL) == RES_OK) ? FR_OK : FR_RW_ERROR; + /* Write it to the MBR */ + return (disk_write(pdrv, buf, 0, 1) || disk_ioctl(pdrv, CTRL_SYNC, 0)) ? FR_DISK_ERR : FR_OK; } + +#endif /* _MULTI_PARTITION */ #endif /* _USE_MKFS && !_FS_READONLY */ -#if _USE_STRFUNC >= 1 +#if _USE_STRFUNC /*-----------------------------------------------------------------------*/ /* Get a string from the file */ /*-----------------------------------------------------------------------*/ -char* fgets ( - char* buff, /* Pointer to the string buffer to read */ - int len, /* Size of string buffer */ - FIL* fil /* Pointer to the file object */ + +TCHAR* f_gets ( + TCHAR* buff, /* Pointer to the string buffer to read */ + int len, /* Size of string buffer (characters) */ + FIL* fp /* Pointer to the file object */ ) { - int i = 0; - char *p = buff; + int n = 0; + TCHAR c, *p = buff; + BYTE s[2]; UINT rc; - while (i < len - 1) { /* Read bytes until buffer gets filled */ - f_read(fil, p, 1, &rc); - if (rc != 1) break; /* Break when no data to read */ -#if _USE_STRFUNC >= 2 - if (*p == '\r') continue; /* Strip '\r' */ + while (n < len - 1) { /* Read characters until buffer gets filled */ +#if _LFN_UNICODE +#if _STRF_ENCODE == 3 /* Read a character in UTF-8 */ + f_read(fp, s, 1, &rc); + if (rc != 1) break; + c = s[0]; + if (c >= 0x80) { + if (c < 0xC0) continue; /* Skip stray trailer */ + if (c < 0xE0) { /* Two-byte sequence */ + f_read(fp, s, 1, &rc); + if (rc != 1) break; + c = (c & 0x1F) << 6 | (s[0] & 0x3F); + if (c < 0x80) c = '?'; + } else { + if (c < 0xF0) { /* Three-byte sequence */ + f_read(fp, s, 2, &rc); + if (rc != 2) break; + c = c << 12 | (s[0] & 0x3F) << 6 | (s[1] & 0x3F); + if (c < 0x800) c = '?'; + } else { /* Reject four-byte sequence */ + c = '?'; + } + } + } +#elif _STRF_ENCODE == 2 /* Read a character in UTF-16BE */ + f_read(fp, s, 2, &rc); + if (rc != 2) break; + c = s[1] + (s[0] << 8); +#elif _STRF_ENCODE == 1 /* Read a character in UTF-16LE */ + f_read(fp, s, 2, &rc); + if (rc != 2) break; + c = s[0] + (s[1] << 8); +#else /* Read a character in ANSI/OEM */ + f_read(fp, s, 1, &rc); + if (rc != 1) break; + c = s[0]; + if (IsDBCS1(c)) { + f_read(fp, s, 1, &rc); + if (rc != 1) break; + c = (c << 8) + s[0]; + } + c = ff_convert(c, 1); /* OEM -> Unicode */ + if (!c) c = '?'; #endif - i++; - if (*p++ == '\n') break; /* Break when reached end of line */ +#else /* Read a character without conversion */ + f_read(fp, s, 1, &rc); + if (rc != 1) break; + c = s[0]; +#endif + if (_USE_STRFUNC == 2 && c == '\r') continue; /* Strip '\r' */ + *p++ = c; + n++; + if (c == '\n') break; /* Break on EOL */ } *p = 0; - return i ? buff : 0; /* When no data read (eof or error), return with error. */ + return n ? buff : 0; /* When no data read (eof or error), return with error. */ } @@ -1906,25 +4382,88 @@ char* fgets ( /*-----------------------------------------------------------------------*/ /* Put a character to the file */ /*-----------------------------------------------------------------------*/ -int fputc ( - int chr, /* A character to be output */ - FIL* fil /* Ponter to the file object */ + +typedef struct { + FIL* fp; + int idx, nchr; + BYTE buf[64]; +} putbuff; + + +static +void putc_bfd ( + putbuff* pb, + TCHAR c ) { UINT bw; - char c; + int i; + + + if (_USE_STRFUNC == 2 && c == '\n') /* LF -> CRLF conversion */ + putc_bfd(pb, '\r'); + i = pb->idx; /* Buffer write index (-1:error) */ + if (i < 0) return; -#if _USE_STRFUNC >= 2 - if (chr == '\n') fputc ('\r', fil); /* LF -> CRLF conversion */ +#if _LFN_UNICODE +#if _STRF_ENCODE == 3 /* Write a character in UTF-8 */ + if (c < 0x80) { /* 7-bit */ + pb->buf[i++] = (BYTE)c; + } else { + if (c < 0x800) { /* 11-bit */ + pb->buf[i++] = (BYTE)(0xC0 | c >> 6); + } else { /* 16-bit */ + pb->buf[i++] = (BYTE)(0xE0 | c >> 12); + pb->buf[i++] = (BYTE)(0x80 | (c >> 6 & 0x3F)); + } + pb->buf[i++] = (BYTE)(0x80 | (c & 0x3F)); + } +#elif _STRF_ENCODE == 2 /* Write a character in UTF-16BE */ + pb->buf[i++] = (BYTE)(c >> 8); + pb->buf[i++] = (BYTE)c; +#elif _STRF_ENCODE == 1 /* Write a character in UTF-16LE */ + pb->buf[i++] = (BYTE)c; + pb->buf[i++] = (BYTE)(c >> 8); +#else /* Write a character in ANSI/OEM */ + c = ff_convert(c, 0); /* Unicode -> OEM */ + if (!c) c = '?'; + if (c >= 0x100) + pb->buf[i++] = (BYTE)(c >> 8); + pb->buf[i++] = (BYTE)c; +#endif +#else /* Write a character without conversion */ + pb->buf[i++] = (BYTE)c; #endif - if (!fil) { /* Special value may be used to switch the destination to any other device */ - /* put_console(chr); */ - return chr; + + if (i >= (int)(sizeof pb->buf) - 3) { /* Write buffered characters to the file */ + f_write(pb->fp, pb->buf, (UINT)i, &bw); + i = (bw == (UINT)i) ? 0 : -1; } - c = (char)chr; - f_write(fil, &c, 1, &bw); /* Write a byte to the file */ - return bw ? chr : EOF; /* Return the resulut */ + pb->idx = i; + pb->nchr++; +} + + + +int f_putc ( + TCHAR c, /* A character to be output */ + FIL* fp /* Pointer to the file object */ +) +{ + putbuff pb; + UINT nw; + + + pb.fp = fp; /* Initialize output buffer */ + pb.nchr = pb.idx = 0; + + putc_bfd(&pb, c); /* Put a character */ + + if ( pb.idx >= 0 /* Flush buffered characters to the file */ + && f_write(pb.fp, pb.buf, (UINT)pb.idx, &nw) == FR_OK + && (UINT)pb.idx == nw) return pb.nchr; + return EOF; } @@ -1933,18 +4472,26 @@ int fputc ( /*-----------------------------------------------------------------------*/ /* Put a string to the file */ /*-----------------------------------------------------------------------*/ -int fputs ( - const char* str, /* Pointer to the string to be output */ - FIL* fil /* Pointer to the file object */ + +int f_puts ( + const TCHAR* str, /* Pointer to the string to be output */ + FIL* fp /* Pointer to the file object */ ) { - int n; + putbuff pb; + UINT nw; - for (n = 0; *str; str++, n++) { - if (fputc(*str, fil) == EOF) return EOF; - } - return n; + pb.fp = fp; /* Initialize output buffer */ + pb.nchr = pb.idx = 0; + + while (*str) /* Put the string */ + putc_bfd(&pb, *str++); + + if ( pb.idx >= 0 /* Flush buffered characters to the file */ + && f_write(pb.fp, pb.buf, (UINT)pb.idx, &nw) == FR_OK + && (UINT)pb.idx == nw) return pb.nchr; + return EOF; } @@ -1953,83 +4500,103 @@ int fputs ( /*-----------------------------------------------------------------------*/ /* Put a formatted string to the file */ /*-----------------------------------------------------------------------*/ -int fprintf ( - FIL* fil, /* Pointer to the file object */ - const char* str, /* Pointer to the format string */ + +int f_printf ( + FIL* fp, /* Pointer to the file object */ + const TCHAR* fmt, /* Pointer to the format string */ ... /* Optional arguments... */ ) { va_list arp; - UCHAR c, f, r; - ULONG val; - char s[16]; - int i, w, res, cc; + BYTE f, r; + UINT nw, i, j, w; + DWORD v; + TCHAR c, d, s[16], *p; + putbuff pb; - va_start(arp, str); + pb.fp = fp; /* Initialize output buffer */ + pb.nchr = pb.idx = 0; - for (cc = res = 0; cc != EOF; res += cc) { - c = *str++; + va_start(arp, fmt); + + for (;;) { + c = *fmt++; if (c == 0) break; /* End of string */ - if (c != '%') { /* Non escape cahracter */ - cc = fputc(c, fil); - if (cc != EOF) cc = 1; + if (c != '%') { /* Non escape character */ + putc_bfd(&pb, c); continue; } w = f = 0; - c = *str++; + c = *fmt++; if (c == '0') { /* Flag: '0' padding */ - f = 1; c = *str++; - } - while (c >= '0' && c <= '9') { /* Precision */ - w = w * 10 + (c - '0'); - c = *str++; + f = 1; c = *fmt++; + } else { + if (c == '-') { /* Flag: left justified */ + f = 2; c = *fmt++; + } } - if (c == 'l') { /* Prefix: Size is long int */ - f |= 2; c = *str++; + while (IsDigit(c)) { /* Precision */ + w = w * 10 + c - '0'; + c = *fmt++; } - if (c == 's') { /* Type is string */ - cc = fputs(va_arg(arp, char*), fil); - continue; + if (c == 'l' || c == 'L') { /* Prefix: Size is long int */ + f |= 4; c = *fmt++; } - if (c == 'c') { /* Type is character */ - cc = fputc(va_arg(arp, char), fil); - if (cc != EOF) cc = 1; + if (!c) break; + d = c; + if (IsLower(d)) d -= 0x20; + switch (d) { /* Type is... */ + case 'S' : /* String */ + p = va_arg(arp, TCHAR*); + for (j = 0; p[j]; j++) ; + if (!(f & 2)) { + while (j++ < w) putc_bfd(&pb, ' '); + } + while (*p) putc_bfd(&pb, *p++); + while (j++ < w) putc_bfd(&pb, ' '); continue; + case 'C' : /* Character */ + putc_bfd(&pb, (TCHAR)va_arg(arp, int)); continue; + case 'B' : /* Binary */ + r = 2; break; + case 'O' : /* Octal */ + r = 8; break; + case 'D' : /* Signed decimal */ + case 'U' : /* Unsigned decimal */ + r = 10; break; + case 'X' : /* Hexdecimal */ + r = 16; break; + default: /* Unknown type (pass-through) */ + putc_bfd(&pb, c); continue; } - r = 0; - if (c == 'd') r = 10; /* Type is signed decimal */ - if (c == 'u') r = 10; /* Type is unsigned decimal */ - if (c == 'X') r = 16; /* Type is unsigned hexdecimal */ - if (r == 0) break; /* Unknown type */ - if (f & 2) { /* Get the value */ - val = (ULONG)va_arg(arp, long); - } else { - val = (c == 'd') ? (ULONG)(long)va_arg(arp, int) : (ULONG)va_arg(arp, unsigned int); - } - /* Put numeral string */ - if (c == 'd') { - if (val >= 0x80000000) { - val = 0 - val; - f |= 4; - } + + /* Get an argument and put it in numeral */ + v = (f & 4) ? (DWORD)va_arg(arp, long) : ((d == 'D') ? (DWORD)(long)va_arg(arp, int) : (DWORD)va_arg(arp, unsigned int)); + if (d == 'D' && (v & 0x80000000)) { + v = 0 - v; + f |= 8; } - i = sizeof(s) - 1; s[i] = 0; + i = 0; do { - c = (UCHAR)(val % r + '0'); - if (c > '9') c += 7; - s[--i] = c; - val /= r; - } while (i && val); - if (i && (f & 4)) s[--i] = '-'; - w = sizeof(s) - 1 - w; - while (i && i > w) s[--i] = (f & 1) ? '0' : ' '; - cc = fputs(&s[i], fil); + d = (TCHAR)(v % r); v /= r; + if (d > 9) d += (c == 'x') ? 0x27 : 0x07; + s[i++] = d + '0'; + } while (v && i < sizeof s / sizeof s[0]); + if (f & 8) s[i++] = '-'; + j = i; d = (f & 1) ? '0' : ' '; + while (!(f & 2) && j++ < w) putc_bfd(&pb, d); + do putc_bfd(&pb, s[--i]); while (i); + while (j++ < w) putc_bfd(&pb, d); } va_end(arp); - return (cc == EOF) ? cc : res; + + if ( pb.idx >= 0 /* Flush buffered characters to the file */ + && f_write(pb.fp, pb.buf, (UINT)pb.idx, &nw) == FR_OK + && (UINT)pb.idx == nw) return pb.nchr; + return EOF; } #endif /* !_FS_READONLY */ -#endif /* _USE_STRFUNC >= 1*/ +#endif /* _USE_STRFUNC */ diff --git a/miosix/filesystem/fat32/ff.h b/miosix/filesystem/fat32/ff.h index 4fb7d3bfd5efb723fa7e713b18a743189da20c3d..cb2a713579ae70af635e5076b2ca2c353a6b46f7 100644 --- a/miosix/filesystem/fat32/ff.h +++ b/miosix/filesystem/fat32/ff.h @@ -1,243 +1,294 @@ -/*--------------------------------------------------------------------------/ -/ FatFs - FAT file system module include file R0.06 (C)ChaN, 2008 -/---------------------------------------------------------------------------/ -/ FatFs module is an experimenal project to implement FAT file system to -/ cheap microcontrollers. This is a free software and is opened for education, -/ research and development under license policy of following trems. +/*---------------------------------------------------------------------------/ +/ FatFs - FAT file system module include file R0.10 (C)ChaN, 2013 +/----------------------------------------------------------------------------/ +/ 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) 2008, ChaN, all right reserved. +/ Copyright (C) 2013, ChaN, all right reserved. / -/ * The FatFs module is a free software and there is no warranty. -/ * You can use, modify and/or redistribute it for personal, non-profit or -/ commercial use without any restriction under your responsibility. +/ * The FatFs module is a free software and there is NO WARRANTY. +/ * No restriction on use. You can use, modify and redistribute it for +/ personal, non-profit or commercial product UNDER YOUR RESPONSIBILITY. / * Redistributions of source code must retain the above copyright notice. / -/---------------------------------------------------------------------------*/ +/----------------------------------------------------------------------------*/ + +#ifndef _FATFS +#define _FATFS 80960 /* Revision ID */ -//Added by TFT, for C++ compatibility #ifdef __cplusplus extern "C" { #endif -#ifndef _FATFS +#include "integer.h" /* Basic integer types */ +#include "ffconf.h" /* FatFs configuration options */ -#define _MCU_ENDIAN 2 -/* The _MCU_ENDIAN defines which access method is used to the FAT structure. -/ 1: Enable word access. -/ 2: Disable word access and use byte-by-byte access instead. -/ When the architectural byte order of the MCU is big-endian and/or address -/ miss-aligned access results incorrect behavior, the _MCU_ENDIAN must be set to 2. -/ If it is not the case, it can also be set to 1 for good code efficiency. */ +#if _FATFS != _FFCONF +#error Wrong configuration file (ffconf.h). +#endif -#define _FS_READONLY 0 -/* Setting _FS_READONLY to 1 defines read only configuration. This removes -/ writing functions, f_write, f_sync, f_unlink, f_mkdir, f_chmod, f_rename, -/ f_truncate and useless f_getfree. */ -#define _FS_MINIMIZE 0 -/* The _FS_MINIMIZE option defines minimization level to remove some functions. -/ 0: Full function. -/ 1: f_stat, f_getfree, f_unlink, f_mkdir, f_chmod, f_truncate and f_rename are removed. -/ 2: f_opendir and f_readdir are removed in addition to level 1. -/ 3: f_lseek is removed in addition to level 2. */ -#define _USE_STRFUNC 0 -/* To enable string functions, set _USE_STRFUNC to 1 or 2. */ +/* Definitions of volume management */ -#define _USE_MKFS 0 -/* When _USE_MKFS is set to 1 and _FS_READONLY is set to 0, f_mkfs function is -/ enabled. */ +#if _MULTI_PARTITION /* Multiple partition configuration */ +typedef struct { + BYTE pd; /* Physical drive number */ + BYTE pt; /* Partition: 0:Auto detect, 1-4:Forced partition) */ +} PARTITION; +extern PARTITION VolToPart[]; /* Volume - Partition resolution table */ +#define LD2PD(vol) (VolToPart[vol].pd) /* Get physical drive number */ +#define LD2PT(vol) (VolToPart[vol].pt) /* Get partition index */ -#define _DRIVES 1 -/* Number of logical drives to be used. This affects the size of internal table. */ +#else /* Single partition configuration */ +#define LD2PD(vol) (BYTE)(vol) /* Each logical drive is bound to the same physical drive number */ +#define LD2PT(vol) 0 /* Find first valid partition or in SFD */ -#define _MULTI_PARTITION 0 -/* When _MULTI_PARTITION is set to 0, each logical drive is bound to same -/ physical drive number and can mount only 1st primaly partition. When it is -/ set to 1, each logical drive can mount a partition listed in Drives[]. */ +#endif -#define _USE_FSINFO 0 -/* To enable FSInfo support on FAT32 volume, set _USE_FSINFO to 1. */ -#define _USE_SJIS 0 -/* When _USE_SJIS is set to 1, Shift-JIS code transparency is enabled, otherwise -/ only US-ASCII(7bit) code can be accepted as file/directory name. */ -#define _USE_NTFLAG 1 -/* When _USE_NTFLAG is set to 1, upper/lower case of the file name is preserved. -/ Note that the files are always accessed in case insensitive. */ +/* Type of path name strings on FatFs API */ +#if _LFN_UNICODE /* Unicode string */ +#if !_USE_LFN +#error _LFN_UNICODE must be 0 in non-LFN cfg. +#endif +#ifndef _INC_TCHAR +typedef WCHAR TCHAR; +#define _T(x) L ## x +#define _TEXT(x) L ## x +#endif -#include "integer.h" +#else /* ANSI/OEM string */ +#ifndef _INC_TCHAR +typedef char TCHAR; +#define _T(x) x +#define _TEXT(x) x +#endif +#endif -/* Definitions corresponds to multiple sector size (not tested) */ -#define S_MAX_SIZ 512U /* Do not change */ -#if S_MAX_SIZ > 512U -#define SS(fs) ((fs)->s_size) -#else -#define SS(fs) 512U -#endif +/* File system object structure (FATFS) */ -/* File system object structure */ -typedef struct _FATFS { +typedef struct { + BYTE fs_type; /* FAT sub-type (0:Not mounted) */ + BYTE drv; /* Physical drive number */ + BYTE csize; /* Sectors per cluster (1,2,4...128) */ + BYTE n_fats; /* Number of FAT copies (1 or 2) */ + BYTE wflag; /* win[] flag (b0:dirty) */ + BYTE fsi_flag; /* FSINFO flags (b7:disabled, b0:dirty) */ WORD id; /* File system mount ID */ - WORD n_rootdir; /* Number of root directory entries */ - DWORD winsect; /* Current sector appearing in the win[] */ - DWORD sects_fat; /* Sectors per fat */ - DWORD max_clust; /* Maximum cluster# + 1 */ - DWORD fatbase; /* FAT start sector */ - DWORD dirbase; /* Root directory start sector (cluster# for FAT32) */ - DWORD database; /* Data start sector */ + WORD n_rootdir; /* Number of root directory entries (FAT12/16) */ +#if _MAX_SS != 512 + WORD ssize; /* Bytes per sector (512, 1024, 2048 or 4096) */ +#endif +#if _FS_REENTRANT + _SYNC_t sobj; /* Identifier of sync object */ +#endif #if !_FS_READONLY DWORD last_clust; /* Last allocated cluster */ DWORD free_clust; /* Number of free clusters */ -#if _USE_FSINFO - DWORD fsi_sector; /* fsinfo sector */ - BYTE fsi_flag; /* fsinfo dirty flag (1:must be written back) */ - BYTE pad2; #endif +#if _FS_RPATH + DWORD cdir; /* Current directory start cluster (0:root) */ #endif - BYTE fs_type; /* FAT sub type */ - BYTE csize; /* Number of sectors per cluster */ -#if S_MAX_SIZ > 512U - WORD s_size; /* Sector size */ -#endif - BYTE n_fats; /* Number of FAT copies */ - BYTE drive; /* Physical drive number */ - BYTE winflag; /* win[] dirty flag (1:must be written back) */ - BYTE pad1; - BYTE win[S_MAX_SIZ]; /* Disk access window for Directory/FAT */ + DWORD n_fatent; /* Number of FAT entries (= number of clusters + 2) */ + DWORD fsize; /* Sectors per FAT */ + DWORD volbase; /* Volume start sector */ + DWORD fatbase; /* FAT start sector */ + DWORD dirbase; /* Root directory start sector (FAT32:Cluster#) */ + DWORD database; /* Data start sector */ + DWORD winsect; /* Current sector appearing in the win[] */ + BYTE win[_MAX_SS]; /* Disk access window for Directory, FAT (and file data at tiny cfg) */ } FATFS; -/* Directory object structure */ -typedef struct _DIR { - WORD id; /* Owner file system mount ID */ - WORD index; /* Current index */ - FATFS* fs; /* Pointer to the owner file system object */ - DWORD sclust; /* Start cluster */ - DWORD clust; /* Current cluster */ - DWORD sect; /* Current sector */ -} _DIR_; +/* File object structure (FIL) */ -/* File object structure */ -typedef struct _FIL { - WORD id; /* Owner file system mount ID */ +typedef struct { + FATFS* fs; /* Pointer to the related file system object (**do not change order**) */ + WORD id; /* Owner file system mount ID (**do not change order**) */ BYTE flag; /* File status flags */ - BYTE csect; /* Sector address in the cluster */ - FATFS* fs; /* Pointer to the owner file system object */ - DWORD fptr; /* File R/W pointer */ + BYTE err; /* Abort flag (error code) */ + DWORD fptr; /* File read/write pointer (Zeroed on file open) */ DWORD fsize; /* File size */ - DWORD org_clust; /* File start cluster */ - DWORD curr_clust; /* Current cluster */ - DWORD curr_sect; /* Current sector */ -#if _FS_READONLY == 0 + DWORD sclust; /* File data start cluster (0:no data cluster, always 0 when fsize is 0) */ + DWORD clust; /* Current cluster of fpter */ + DWORD dsect; /* Current data sector of fpter */ +#if !_FS_READONLY DWORD dir_sect; /* Sector containing the directory entry */ - BYTE* dir_ptr; /* Ponter to the directory entry in the window */ + BYTE* dir_ptr; /* Pointer to the directory entry in the window */ +#endif +#if _USE_FASTSEEK + DWORD* cltbl; /* Pointer to the cluster link map table (Nulled on file open) */ +#endif +#if _FS_LOCK + UINT lockid; /* File lock ID (index of file semaphore table Files[]) */ +#endif +#if !_FS_TINY + BYTE buf[_MAX_SS]; /* File data read/write buffer */ #endif - BYTE buffer[S_MAX_SIZ]; /* File R/W buffer */ } FIL; -/* File status structure */ -typedef struct _FILINFO { - DWORD fsize; /* Size */ - WORD fdate; /* Date */ - WORD ftime; /* Time */ - BYTE fattrib; /* Attribute */ - char fname[8+1+3+1]; /* Name (8.3 format) */ -} FILINFO; - - -/* Definitions corresponds to multi partition */ +/* Directory object structure (DIR) */ -#if _MULTI_PARTITION != 0 /* Multiple partition cfg */ +typedef struct { + FATFS* fs; /* Pointer to the owner file system object (**do not change order**) */ + WORD id; /* Owner file system mount ID (**do not change order**) */ + WORD index; /* Current read/write index number */ + DWORD sclust; /* Table start cluster (0:Root dir) */ + DWORD clust; /* Current cluster */ + DWORD sect; /* Current sector */ + BYTE* dir; /* Pointer to the current SFN entry in the win[] */ + BYTE* fn; /* Pointer to the SFN (in/out) {file[8],ext[3],status[1]} */ +#if _FS_LOCK + UINT lockid; /* File lock ID (index of file semaphore table Files[]) */ +#endif +#if _USE_LFN + WCHAR* lfn; /* Pointer to the LFN working buffer */ + WORD lfn_idx; /* Last matched LFN index number (0xFFFF:No LFN) */ +#endif +} DIR; -typedef struct _PARTITION { - BYTE pd; /* Physical drive # (0-255) */ - BYTE pt; /* Partition # (0-3) */ -} PARTITION; -extern -const PARTITION Drives[]; /* Logical drive# to physical location conversion table */ -#define LD2PD(drv) (Drives[drv].pd) /* Get physical drive# */ -#define LD2PT(drv) (Drives[drv].pt) /* Get partition# */ -#else /* Single partition cfg */ -#define LD2PD(drv) (drv) /* Physical drive# is equal to logical drive# */ -#define LD2PT(drv) 0 /* Always mounts the 1st partition */ +/* File status structure (FILINFO) */ +typedef struct { + DWORD fsize; /* File size */ + WORD fdate; /* Last modified date */ + WORD ftime; /* Last modified time */ + BYTE fattrib; /* Attribute */ + TCHAR fname[13]; /* Short file name (8.3 format) */ +#if _USE_LFN + TCHAR* lfname; /* Pointer to the LFN buffer */ + UINT lfsize; /* Size of LFN buffer in TCHAR */ #endif +} FILINFO; + /* File function return code (FRESULT) */ typedef enum { - FR_OK = 0, /* 0 */ - FR_NOT_READY, /* 1 */ - FR_NO_FILE, /* 2 */ - FR_NO_PATH, /* 3 */ - FR_INVALID_NAME, /* 4 */ - FR_INVALID_DRIVE, /* 5 */ - FR_DENIED, /* 6 */ - FR_EXIST, /* 7 */ - FR_RW_ERROR, /* 8 */ - FR_WRITE_PROTECTED, /* 9 */ - FR_NOT_ENABLED, /* 10 */ - FR_NO_FILESYSTEM, /* 11 */ - FR_INVALID_OBJECT, /* 12 */ - FR_MKFS_ABORTED /* 13 */ + FR_OK = 0, /* (0) Succeeded */ + FR_DISK_ERR, /* (1) A hard error occurred in the low level disk I/O layer */ + FR_INT_ERR, /* (2) Assertion failed */ + FR_NOT_READY, /* (3) The physical drive cannot work */ + FR_NO_FILE, /* (4) Could not find the file */ + FR_NO_PATH, /* (5) Could not find the path */ + FR_INVALID_NAME, /* (6) The path name format is invalid */ + FR_DENIED, /* (7) Access denied due to prohibited access or directory full */ + FR_EXIST, /* (8) Access denied due to prohibited access */ + FR_INVALID_OBJECT, /* (9) The file/directory object is invalid */ + FR_WRITE_PROTECTED, /* (10) The physical drive is write protected */ + FR_INVALID_DRIVE, /* (11) The logical drive number is invalid */ + FR_NOT_ENABLED, /* (12) The volume has no work area */ + FR_NO_FILESYSTEM, /* (13) There is no valid FAT volume */ + FR_MKFS_ABORTED, /* (14) The f_mkfs() aborted due to any parameter error */ + FR_TIMEOUT, /* (15) Could not get a grant to access the volume within defined period */ + FR_LOCKED, /* (16) The operation is rejected according to the file sharing policy */ + FR_NOT_ENOUGH_CORE, /* (17) LFN working buffer could not be allocated */ + FR_TOO_MANY_OPEN_FILES, /* (18) Number of open files > _FS_SHARE */ + FR_INVALID_PARAMETER /* (19) Given parameter is invalid */ } FRESULT; -/*-----------------------------------------------------*/ -/* FatFs module application interface */ - -FRESULT f_mount (BYTE, FATFS*); /* Mount/Unmount a logical drive */ -FRESULT f_open (FIL*, const char*, BYTE); /* Open or create a file */ -FRESULT f_read (FIL*, void*, UINT, UINT*); /* Read data from a file */ -FRESULT f_write (FIL*, const void*, UINT, UINT*); /* Write data to a file */ -FRESULT f_lseek (FIL*, DWORD); /* Move file pointer of a file object */ -FRESULT f_close (FIL*); /* Close an open file object */ -FRESULT f_opendir (_DIR_*, const char*); /* Open an existing directory */ -FRESULT f_readdir (_DIR_*, FILINFO*); /* Read a directory item */ -FRESULT f_stat (const char*, FILINFO*); /* Get file status */ -FRESULT f_getfree (const char*, DWORD*, FATFS**); /* Get number of free clusters on the drive */ -FRESULT f_truncate (FIL*); /* Truncate file */ -FRESULT f_sync (FIL*); /* Flush cached data of a writing file */ -FRESULT f_unlink (const char*); /* Delete an existing file or directory */ -FRESULT f_mkdir (const char*); /* Create a new directory */ -FRESULT f_chmod (const char*, BYTE, BYTE); /* Change file/dir attriburte */ -FRESULT f_utime (const char*, const FILINFO*); /* Change file/dir timestamp */ -FRESULT f_rename (const char*, const char*); /* Rename/Move a file or directory */ -FRESULT f_mkfs (BYTE, BYTE, WORD); /* Create a file system on the drive */ -#if _USE_STRFUNC -#define feof(fp) ((fp)->fptr == (fp)->fsize) -#define EOF -1 -int fputc (int, FIL*); /* Put a character to the file */ -int fputs (const char*, FIL*); /* Put a string to the file */ -int fprintf (FIL*, const char*, ...); /* Put a formatted string to the file */ -char* fgets (char*, int, FIL*); /* Get a string from the file */ +/*--------------------------------------------------------------*/ +/* FatFs module application interface */ + +FRESULT f_open (FIL* fp, const TCHAR* path, BYTE mode); /* Open or create a file */ +FRESULT f_close (FIL* fp); /* Close an open file object */ +FRESULT f_read (FIL* fp, void* buff, UINT btr, UINT* br); /* Read data from a file */ +FRESULT f_write (FIL* fp, const void* buff, UINT btw, UINT* bw); /* Write data to a file */ +FRESULT f_forward (FIL* fp, UINT(*func)(const BYTE*,UINT), UINT btf, UINT* bf); /* Forward data to the stream */ +FRESULT f_lseek (FIL* fp, DWORD ofs); /* Move file pointer of a file object */ +FRESULT f_truncate (FIL* fp); /* Truncate file */ +FRESULT f_sync (FIL* fp); /* Flush cached data of a writing file */ +FRESULT f_opendir (DIR* dp, const TCHAR* path); /* Open a directory */ +FRESULT f_closedir (DIR* dp); /* Close an open directory */ +FRESULT f_readdir (DIR* dp, FILINFO* fno); /* Read a directory item */ +FRESULT f_mkdir (const TCHAR* path); /* Create a sub directory */ +FRESULT f_unlink (const TCHAR* path); /* Delete an existing file or directory */ +FRESULT f_rename (const TCHAR* path_old, const TCHAR* path_new); /* Rename/Move a file or directory */ +FRESULT f_stat (const TCHAR* path, FILINFO* fno); /* Get file status */ +FRESULT f_chmod (const TCHAR* path, BYTE value, BYTE mask); /* Change attribute of the file/dir */ +FRESULT f_utime (const TCHAR* path, const FILINFO* fno); /* Change times-tamp of the file/dir */ +FRESULT f_chdir (const TCHAR* path); /* Change current directory */ +FRESULT f_chdrive (const TCHAR* path); /* Change current drive */ +FRESULT f_getcwd (TCHAR* buff, UINT len); /* Get current directory */ +FRESULT f_getfree (const TCHAR* path, DWORD* nclst, FATFS** fatfs); /* Get number of free clusters on the drive */ +FRESULT f_getlabel (const TCHAR* path, TCHAR* label, DWORD* sn); /* Get volume label */ +FRESULT f_setlabel (const TCHAR* label); /* Set volume label */ +FRESULT f_mount (FATFS* fs, const TCHAR* path, BYTE opt); /* Mount/Unmount a logical drive */ +FRESULT f_mkfs (const TCHAR* path, BYTE sfd, UINT au); /* Create a file system on the volume */ +FRESULT f_fdisk (BYTE pdrv, const DWORD szt[], void* work); /* Divide a physical drive into some partitions */ +int f_putc (TCHAR c, FIL* fp); /* Put a character to the file */ +int f_puts (const TCHAR* str, FIL* cp); /* Put a string to the file */ +int f_printf (FIL* fp, const TCHAR* str, ...); /* Put a formatted string to the file */ +TCHAR* f_gets (TCHAR* buff, int len, FIL* fp); /* Get a string from the file */ + +#define f_eof(fp) (((fp)->fptr == (fp)->fsize) ? 1 : 0) +#define f_error(fp) ((fp)->err) +#define f_tell(fp) ((fp)->fptr) +#define f_size(fp) ((fp)->fsize) + +#ifndef EOF +#define EOF (-1) #endif -/* User defined function to give a current time to fatfs module */ -DWORD get_fattime (void); /* 31-25: Year(0-127 org.1980), 24-21: Month(1-12), 20-16: Day(1-31) */ - /* 15-11: Hour(0-23), 10-5: Minute(0-59), 4-0: Second(0-29 *2) */ +/*--------------------------------------------------------------*/ +/* Additional user defined functions */ + +/* RTC function */ +#if !_FS_READONLY +DWORD get_fattime (void); +#endif + +/* Unicode support functions */ +#if _USE_LFN /* Unicode - OEM code conversion */ +WCHAR ff_convert (WCHAR chr, UINT dir); /* OEM-Unicode bidirectional conversion */ +WCHAR ff_wtoupper (WCHAR chr); /* Unicode upper-case conversion */ +#if _USE_LFN == 3 /* Memory functions */ +void* ff_memalloc (UINT msize); /* Allocate memory block */ +void ff_memfree (void* mblock); /* Free memory block */ +#endif +#endif + +/* Sync functions */ +#if _FS_REENTRANT +// Added by TFT -- begin +// int ff_cre_syncobj (BYTE vol, _SYNC_t* sobj); /* Create a sync object */ +// int ff_req_grant (_SYNC_t sobj); /* Lock sync object */ +// void ff_rel_grant (_SYNC_t sobj); /* Unlock sync object */ +// int ff_del_syncobj (_SYNC_t sobj); /* Delete a sync object */ +// Added by TFT -- end +#endif + + + + +/*--------------------------------------------------------------*/ +/* Flags and offset address */ + /* File access control and file status flags (FIL.flag) */ #define FA_READ 0x01 #define FA_OPEN_EXISTING 0x00 -#if _FS_READONLY == 0 + +#if !_FS_READONLY #define FA_WRITE 0x02 #define FA_CREATE_NEW 0x04 #define FA_CREATE_ALWAYS 0x08 @@ -245,7 +296,6 @@ DWORD get_fattime (void); /* 31-25: Year(0-127 org.1980), 24-21: Month(1-12), 20 #define FA__WRITTEN 0x20 #define FA__DIRTY 0x40 #endif -#define FA__ERROR 0x80 /* FAT sub type (FATFS.fs_type) */ @@ -264,86 +314,31 @@ DWORD get_fattime (void); /* 31-25: Year(0-127 org.1980), 24-21: Month(1-12), 20 #define AM_LFN 0x0F /* LFN entry */ #define AM_DIR 0x10 /* Directory */ #define AM_ARC 0x20 /* Archive */ +#define AM_MASK 0x3F /* Mask of defined bits */ - -/* Offset of FAT structure members */ - -#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_55AA 510 - -#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 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 +/* Fast seek feature */ +#define CREATE_LINKMAP 0xFFFFFFFF +/*--------------------------------*/ /* Multi-byte word access macros */ -#if _MCU_ENDIAN == 1 /* Use word access */ +#if _WORD_ACCESS == 1 /* Enable word access to the FAT structure */ #define LD_WORD(ptr) (WORD)(*(WORD*)(BYTE*)(ptr)) #define LD_DWORD(ptr) (DWORD)(*(DWORD*)(BYTE*)(ptr)) #define ST_WORD(ptr,val) *(WORD*)(BYTE*)(ptr)=(WORD)(val) #define ST_DWORD(ptr,val) *(DWORD*)(BYTE*)(ptr)=(DWORD)(val) -#elif _MCU_ENDIAN == 2 /* Use byte-by-byte access */ -#define LD_WORD(ptr) (WORD)(((WORD)*(volatile BYTE*)((ptr)+1)<<8)|(WORD)*(volatile BYTE*)(ptr)) -#define LD_DWORD(ptr) (DWORD)(((DWORD)*(volatile BYTE*)((ptr)+3)<<24)|((DWORD)*(volatile BYTE*)((ptr)+2)<<16)|((WORD)*(volatile BYTE*)((ptr)+1)<<8)|*(volatile BYTE*)(ptr)) -#define ST_WORD(ptr,val) *(volatile BYTE*)(ptr)=(BYTE)(val); *(volatile BYTE*)((ptr)+1)=(BYTE)((WORD)(val)>>8) -#define ST_DWORD(ptr,val) *(volatile BYTE*)(ptr)=(BYTE)(val); *(volatile BYTE*)((ptr)+1)=(BYTE)((WORD)(val)>>8); *(volatile BYTE*)((ptr)+2)=(BYTE)((DWORD)(val)>>16); *(volatile BYTE*)((ptr)+3)=(BYTE)((DWORD)(val)>>24) -#else -#error Do not forget to set _MCU_ENDIAN properly! +#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) #endif - -#define _FATFS -#endif /* _FATFS */ - -//Added by TFT, for C++ compatibility #ifdef __cplusplus } #endif + +#endif /* _FATFS */ diff --git a/miosix/filesystem/fat32/ffconf.h b/miosix/filesystem/fat32/ffconf.h new file mode 100644 index 0000000000000000000000000000000000000000..49d8ba051ad59626c55ce9c60ad9d6b82b90f6cc --- /dev/null +++ b/miosix/filesystem/fat32/ffconf.h @@ -0,0 +1,213 @@ +/*---------------------------------------------------------------------------/ +/ FatFs - FAT file system module configuration file R0.10 (C)ChaN, 2013 +/----------------------------------------------------------------------------/ +/ +/ CAUTION! Do not forget to make clean the project after any changes to +/ the configuration options. +/ +/----------------------------------------------------------------------------*/ +#ifndef _FFCONF +#define _FFCONF 80960 /* Revision ID */ + +#include <pthread.h> + +/*---------------------------------------------------------------------------/ +/ Functions and Buffer Configurations +/----------------------------------------------------------------------------*/ + +#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. */ + + +#define _FS_READONLY 0 /* 0:Read/Write or 1:Read only */ +/* Setting _FS_READONLY to 1 defines read only configuration. This removes +/ writing functions, f_write(), f_sync(), f_unlink(), f_mkdir(), f_chmod(), +/ f_rename(), f_truncate() and useless f_getfree(). */ + + +#define _FS_MINIMIZE 0 /* 0 to 3 */ +/* The _FS_MINIMIZE option defines minimization level to remove API functions. +/ +/ 0: All basic functions are enabled. +/ 1: f_stat(), f_getfree(), f_unlink(), f_mkdir(), f_chmod(), f_utime(), +/ f_truncate() and f_rename() function are removed. +/ 2: f_opendir(), f_readdir() and f_closedir() are removed in addition to 1. +/ 3: f_lseek() function is removed in addition to 2. */ + + +#define _USE_STRFUNC 0 /* 0:Disable or 1-2:Enable */ +/* To enable string functions, set _USE_STRFUNC to 1 or 2. */ + + +#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 */ + + +#define _USE_FASTSEEK 0 /* 0:Disable or 1:Enable */ +/* To enable fast seek feature, set _USE_FASTSEEK to 1. */ + + +#define _USE_LABEL 0 /* 0:Disable or 1:Enable */ +/* To enable volume label functions, set _USE_LAVEL to 1 */ + + +#define _USE_FORWARD 0 /* 0:Disable or 1:Enable */ +/* To enable f_forward() function, set _USE_FORWARD to 1 and set _FS_TINY to 1. */ + + +/*---------------------------------------------------------------------------/ +/ Locale and Namespace Configurations +/----------------------------------------------------------------------------*/ + +#define _CODE_PAGE 932 +/* The _CODE_PAGE specifies the OEM code page to be used on the target system. +/ Incorrect setting of the code page can cause a file open failure. +/ +/ 932 - Japanese Shift-JIS (DBCS, OEM, Windows) +/ 936 - Simplified Chinese GBK (DBCS, OEM, Windows) +/ 949 - Korean (DBCS, OEM, Windows) +/ 950 - Traditional Chinese Big5 (DBCS, OEM, Windows) +/ 1250 - Central Europe (Windows) +/ 1251 - Cyrillic (Windows) +/ 1252 - Latin 1 (Windows) +/ 1253 - Greek (Windows) +/ 1254 - Turkish (Windows) +/ 1255 - Hebrew (Windows) +/ 1256 - Arabic (Windows) +/ 1257 - Baltic (Windows) +/ 1258 - Vietnam (OEM, Windows) +/ 437 - U.S. (OEM) +/ 720 - Arabic (OEM) +/ 737 - Greek (OEM) +/ 775 - Baltic (OEM) +/ 850 - Multilingual Latin 1 (OEM) +/ 858 - Multilingual Latin 1 + Euro (OEM) +/ 852 - Latin 2 (OEM) +/ 855 - Cyrillic (OEM) +/ 866 - Russian (OEM) +/ 857 - Turkish (OEM) +/ 862 - Hebrew (OEM) +/ 874 - Thai (OEM, Windows) +/ 1 - ASCII (Valid for only non-LFN cfg.) +*/ + + +#define _USE_LFN 0 /* 0 to 3 */ +#define _MAX_LFN 255 /* Maximum LFN length to handle (12 to 255) */ +/* The _USE_LFN option switches the LFN feature. +/ +/ 0: Disable LFN feature. _MAX_LFN has no effect. +/ 1: Enable LFN with static working buffer on the BSS. Always NOT reentrant. +/ 2: Enable LFN with dynamic working buffer on the STACK. +/ 3: Enable LFN with dynamic working buffer on the HEAP. +/ +/ To enable LFN feature, Unicode handling functions ff_convert() and ff_wtoupper() +/ function must be added to the project. +/ The LFN working buffer occupies (_MAX_LFN + 1) * 2 bytes. When use stack for the +/ working buffer, take care on stack overflow. When use heap memory for the working +/ buffer, memory management functions, ff_memalloc() and ff_memfree(), must be added +/ to the project. */ + + +#define _LFN_UNICODE 0 /* 0:ANSI/OEM or 1:Unicode */ +/* To switch the character encoding on the FatFs API to Unicode, enable LFN feature +/ and set _LFN_UNICODE to 1. */ + + +#define _STRF_ENCODE 3 /* 0:ANSI/OEM, 1:UTF-16LE, 2:UTF-16BE, 3:UTF-8 */ +/* When Unicode API is enabled, character encoding on the all FatFs API is switched +/ to Unicode. This option selects the character encoding on the file to be read/written +/ via string functions, f_gets(), f_putc(), f_puts and f_printf(). +/ This option has no effect when _LFN_UNICODE is 0. */ + + +#define _FS_RPATH 0 /* 0 to 2 */ +/* The _FS_RPATH option configures relative path feature. +/ +/ 0: Disable relative path feature and remove related functions. +/ 1: Enable relative path. f_chdrive() and f_chdir() function are available. +/ 2: f_getcwd() function is available in addition to 1. +/ +/ Note that output of the f_readdir() fnction is affected by this option. */ + + +/*---------------------------------------------------------------------------/ +/ Drive/Volume Configurations +/----------------------------------------------------------------------------*/ + +#define _VOLUMES 1 +/* Number of volumes (logical drives) to be used. */ + + +#define _MULTI_PARTITION 0 /* 0:Single partition, 1:Enable multiple partition */ +/* When set to 0, each volume is bound to the same physical drive number and +/ it can mount only first primaly partition. When it is set to 1, each volume +/ is tied to the partitions listed in VolToPart[]. */ + + +#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 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 implemented to the disk_ioctl() function. */ + + +#define _USE_ERASE 0 /* 0:Disable or 1:Enable */ +/* To enable sector erase feature, set _USE_ERASE to 1. Also CTRL_ERASE_SECTOR command +/ should be added to the disk_ioctl() function. */ + + +#define _FS_NOFSINFO 0 /* 0 or 1 */ +/* If you need to know the correct free space on the FAT32 volume, set this +/ option to 1 and f_getfree() function at first time after volume mount will +/ force a full FAT scan. +/ +/ 0: Load all informations in the FSINFO if available. +/ 1: Do not trust free cluster count in the FSINFO. +*/ + + + +/*---------------------------------------------------------------------------/ +/ System Configurations +/----------------------------------------------------------------------------*/ + +#define _WORD_ACCESS 0 /* 0 or 1 */ +/* The _WORD_ACCESS option is an only platform dependent option. It defines +/ which access method is used to the word data on the FAT volume. +/ +/ 0: Byte-by-byte access. Always compatible with all platforms. +/ 1: Word access. Do not choose this unless under both the following conditions. +/ +/ * Byte order on the memory is little-endian. +/ * Address miss-aligned word access is always allowed for all instructions. +/ +/ If it is the case, _WORD_ACCESS can also be set to 1 to improve performance +/ and reduce code size. +*/ + + +/* 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 1 /* 0:Disable or 1:Enable */ +//#define _FS_TIMEOUT 1000 /* Timeout period in unit of time ticks */ +#define _SYNC_t pthread_mutex_t /* O/S dependent type of sync object. e.g. HANDLE, OS_EVENT*, ID and etc.. */ + +/* The _FS_REENTRANT option switches the re-entrancy (thread safe) of the FatFs module. +/ +/ 0: Disable re-entrancy. _SYNC_t and _FS_TIMEOUT have no effect. +/ 1: Enable re-entrancy. Also user provided synchronization handlers, +/ ff_req_grant(), ff_rel_grant(), ff_del_syncobj() and ff_cre_syncobj() +/ function must be added to the project. */ + + +#define _FS_LOCK 4 /* 0:Disable or >=1:Enable */ +/* To enable file lock control feature, set _FS_LOCK to 1 or greater. + The value defines how many files can be opened simultaneously. */ + + +#endif /* _FFCONFIG */ diff --git a/miosix/filesystem/fat32/integer.h b/miosix/filesystem/fat32/integer.h index c02994a8ae85544496886d940dc336b62573a9cc..074a46bd5bbe54df12d05b2362b8f19db83c4c09 100644 --- a/miosix/filesystem/fat32/integer.h +++ b/miosix/filesystem/fat32/integer.h @@ -2,29 +2,32 @@ /* Integer type definitions for FatFs module */ /*-------------------------------------------*/ -#ifndef _INTEGER +#ifndef _FF_INTEGER +#define _FF_INTEGER -/* These types must be 16-bit, 32-bit or larger integer */ -typedef int INT; -typedef unsigned int UINT; +#ifdef _WIN32 /* FatFs development platform */ -/* These types must be 8-bit integer */ -typedef signed char CHAR; -typedef unsigned char UCHAR; -typedef unsigned char BYTE; +#include <windows.h> +#include <tchar.h> -/* These types must be 16-bit integer */ -typedef short SHORT; -typedef unsigned short USHORT; +#else /* Embedded platform */ + +/* This type MUST be 8 bit */ +typedef unsigned char BYTE; + +/* These types MUST be 16 bit */ +typedef short SHORT; typedef unsigned short WORD; +typedef unsigned short WCHAR; -/* These types must be 32-bit integer */ -typedef long LONG; -typedef unsigned long ULONG; +/* These types MUST be 16 bit or 32 bit */ +typedef int INT; +typedef unsigned int UINT; + +/* These types MUST be 32 bit */ +typedef long LONG; typedef unsigned long DWORD; -/* Boolean type */ -typedef enum { FALSE = 0, TRUE } BOOL; +#endif -#define _INTEGER #endif diff --git a/miosix/filesystem/file.h b/miosix/filesystem/file.h index 8cc82fad495dc17982e33d83d8c56a4f2c1b3ec3..ce77d1cc0c6f8c22b8c13ad50e99b4f9a78121fd 100644 --- a/miosix/filesystem/file.h +++ b/miosix/filesystem/file.h @@ -238,7 +238,7 @@ protected: * intrusive_ref_ptr<FilesystemBase> */ class FilesystemBase : public IntrusiveRefCounted, - protected IntrusiveRefCountedSharedFromThis<FilesystemBase> + public IntrusiveRefCountedSharedFromThis<FilesystemBase> { public: /** @@ -290,6 +290,13 @@ public: */ virtual int mkdir(StringPart& name, int mode)=0; + /** + * Remove a directory if empty + * \param name directory name + * \return 0 on success, or a negative number on failure + */ + virtual int rmdir(StringPart& name)=0; + /** * Follows a symbolic link * \param path path identifying a symlink, relative to the local filesystem @@ -327,6 +334,11 @@ public: * \param inode inode of the directory where the fs is mounted */ void setParentFsMountpointInode(int inode) { parentFsMountpointInode=inode; } + + /** + * \return filesystem id + */ + short int getFsId() const { return filesystemId; } /** * Destructor diff --git a/miosix/filesystem/file_access.cpp b/miosix/filesystem/file_access.cpp index 7cb2be350d2753a4e9cc314fb72fe1943285b98a..48ae17c8b3a5b4b7ee9025d756c29be878b03c6a 100644 --- a/miosix/filesystem/file_access.cpp +++ b/miosix/filesystem/file_access.cpp @@ -4,6 +4,7 @@ #include <climits> #include "console/console_device.h" #include "mountpointfs/mountpointfs.h" +#include "fat32/fat32.h" #include "kernel/logging.h" using namespace std; @@ -178,6 +179,17 @@ int FileDescriptorTable::mkdir(const char *name, int mode) return openData.fs->mkdir(sp,mode); } +int FileDescriptorTable::rmdir(const char *name) +{ + if(name==0 || name[0]=='\0') return -EFAULT; + string path=absolutePath(name); + if(path.empty()) return -ENAMETOOLONG; + ResolvedPath openData=FilesystemManager::instance().resolvePath(path,true); + if(openData.result<0) return openData.result; + StringPart sp(path,string::npos,openData.off); + return openData.fs->rmdir(sp); +} + int FileDescriptorTable::unlink(const char *name) { if(name==0 || name[0]=='\0') return -EFAULT; @@ -681,6 +693,19 @@ basicFilesystemSetup() intrusive_ref_ptr<FilesystemBase> rootFs(new MountpointFs); bootlog(fsm.kmount("/",rootFs)==0 ? "Ok\r\n" : "Failed\r\n"); + //TODO: Move to individual BSPs -- begin + bootlog("Mounting Fat32Fs as /sd ... "); + StringPart sd("sd"); + intrusive_ref_ptr<Fat32Fs> fat32(new Fat32Fs); + bool fat32failed=fat32->mountFailed(); + if(fat32failed==false) + { + fat32failed=rootFs->mkdir(sd,0755)!=0; + fat32failed=fsm.kmount("/sd",fat32)!=0; + } + bootlog(fat32failed==0 ? "Ok\r\n" : "Failed\r\n"); + //TODO: Move to individual BSPs -- end + #ifdef WITH_DEVFS bootlog("Mounting DevFs as /dev ... "); StringPart sp("dev"); diff --git a/miosix/filesystem/file_access.h b/miosix/filesystem/file_access.h index ef99d8d71c12ebe715956ea7bdaacf2d3d90e527..8eb70b0d68e5cc2d74b640df7518736cae6a4f93 100644 --- a/miosix/filesystem/file_access.h +++ b/miosix/filesystem/file_access.h @@ -240,6 +240,13 @@ public: */ int mkdir(const char *name, int mode); + /** + * Remove a directory if empty + * \param name directory to create + * \return 0 on success, or a negative number on failure + */ + int rmdir(const char *name); + /** * Remove a file or directory * \param name file or directory to remove diff --git a/miosix/filesystem/mountpointfs/mountpointfs.cpp b/miosix/filesystem/mountpointfs/mountpointfs.cpp index f2042ea004814d980d652309ece9f1507c741622..11a1616d1b814b5e5c79f9cb69f198f121daa8f7 100644 --- a/miosix/filesystem/mountpointfs/mountpointfs.cpp +++ b/miosix/filesystem/mountpointfs/mountpointfs.cpp @@ -163,8 +163,6 @@ int MountpointFs::lstat(StringPart& name, struct stat *pstat) int MountpointFs::unlink(StringPart& name) { - Lock<FastMutex> l(mutex); - if(dirs.erase(name)==1) return 0; return -ENOENT; } @@ -192,4 +190,11 @@ int MountpointFs::mkdir(StringPart& name, int mode) return 0; } +int MountpointFs::rmdir(StringPart& name) +{ + Lock<FastMutex> l(mutex); + if(dirs.erase(name)==1) return 0; + return -ENOENT; +} + } //namespace miosix diff --git a/miosix/filesystem/mountpointfs/mountpointfs.h b/miosix/filesystem/mountpointfs/mountpointfs.h index 9acbe6be96a7c660e05cb31b0f2d02f17a15176a..40c2592122c7ce529184a0e0a161b29436a2562f 100644 --- a/miosix/filesystem/mountpointfs/mountpointfs.h +++ b/miosix/filesystem/mountpointfs/mountpointfs.h @@ -90,6 +90,13 @@ public: */ virtual int mkdir(StringPart& name, int mode); + /** + * Remove a directory if empty + * \param name directory name + * \return 0 on success, or a negative number on failure + */ + virtual int rmdir(StringPart& name); + private: FastMutex mutex; std::map<StringPart,int> dirs; diff --git a/miosix/kernel/intrusive.h b/miosix/kernel/intrusive.h index d9959363fa236604470390df9475dcc51dc4e56f..75a1b0973f22de3f129093716f2a5ad5212a6180 100644 --- a/miosix/kernel/intrusive.h +++ b/miosix/kernel/intrusive.h @@ -30,6 +30,7 @@ #include <ostream> #include <cstddef> +#include <cassert> #include "interfaces/atomic_ops.h" #if __cplusplus > 199711L @@ -131,7 +132,9 @@ public: { // Simply making an intrusive_ref_ptr from this works as the reference // count is intrusive - return intrusive_ref_ptr<T>(dynamic_cast<T*>(this)); + T* result=dynamic_cast<T*>(this); + assert(result); + return intrusive_ref_ptr<T>(result); } /** @@ -142,7 +145,9 @@ public: { // Simply making an intrusive_ref_ptr from this works as the reference // count is intrusive - return intrusive_ref_ptr<const T>(dynamic_cast<const T*>(this)); + const T* result=dynamic_cast<const T*>(this); + assert(result); + return intrusive_ref_ptr<const T>(result); } /** diff --git a/miosix/stdlib_integration/libc_integration.cpp b/miosix/stdlib_integration/libc_integration.cpp index 63831e0e46b6491a5c83fa726fb88e13e46baa56..5042890e6975515d8e92cce9299d53168e238347 100644 --- a/miosix/stdlib_integration/libc_integration.cpp +++ b/miosix/stdlib_integration/libc_integration.cpp @@ -604,6 +604,39 @@ int mkdir(const char *path, mode_t mode) return _mkdir_r(miosix::CReentrancyAccessor::getReent(),path,mode); } +/** + * \internal + * _rmdir_r, remove a directory if empty + */ +int _rmdir_r(struct _reent *ptr, const char *path) +{ + #ifdef WITH_FILESYSTEM + + #ifndef __NO_EXCEPTIONS + try { + #endif //__NO_EXCEPTIONS + int result=miosix::getFileDescriptorTable().rmdir(path); + if(result>=0) return result; + ptr->_errno=-result; + return -1; + #ifndef __NO_EXCEPTIONS + } catch(exception& e) { + ptr->_errno=ENOMEM; + return -1; + } + #endif //__NO_EXCEPTIONS + + #else //WITH_FILESYSTEM + ptr->_errno=ENOENT; + return -1; + #endif //WITH_FILESYSTEM +} + +int rmdir(const char *path) +{ + return _rmdir_r(miosix::CReentrancyAccessor::getReent(),path); +} + /** * \internal * _link_r: create hardlinks diff --git a/miosix_np_2/nbproject/configurations.xml b/miosix_np_2/nbproject/configurations.xml index 3e35bf8620920b8b5a9b70f72e87855f5a8aeeb6..7cbb00eacb7508fd3db0d1d3ae0e8202626f7c53 100644 --- a/miosix_np_2/nbproject/configurations.xml +++ b/miosix_np_2/nbproject/configurations.xml @@ -317,8 +317,11 @@ <df name="fat32"> <in>diskio.cpp</in> <in>diskio.h</in> + <in>fat32.cpp</in> + <in>fat32.h</in> <in>ff.c</in> <in>ff.h</in> + <in>ffconf.h</in> <in>integer.h</in> </df> <df name="mountpointfs"> @@ -1336,6 +1339,13 @@ tool="3" flavor2="0"> </item> + <item path="../miosix/filesystem/fat32/fat32.cpp" + ex="false" + tool="1" + flavor2="0"> + </item> + <item path="../miosix/filesystem/fat32/fat32.h" ex="false" tool="3" flavor2="0"> + </item> <item path="../miosix/filesystem/fat32/ff.c" ex="false" tool="0" flavor2="0"> </item> <item path="../miosix/filesystem/fat32/ff.h" ex="false" tool="3" flavor2="0"> @@ -2451,6 +2461,13 @@ tool="3" flavor2="0"> </item> + <item path="../miosix/filesystem/fat32/fat32.cpp" + ex="false" + tool="1" + flavor2="0"> + </item> + <item path="../miosix/filesystem/fat32/fat32.h" ex="false" tool="3" flavor2="0"> + </item> <item path="../miosix/filesystem/fat32/ff.c" ex="false" tool="0" flavor2="0"> </item> <item path="../miosix/filesystem/fat32/ff.h" ex="false" tool="3" flavor2="0"> @@ -3568,10 +3585,22 @@ tool="3" flavor2="0"> </item> + <item path="../miosix/filesystem/fat32/fat32.cpp" + ex="false" + tool="1" + flavor2="0"> + </item> + <item path="../miosix/filesystem/fat32/fat32.h" ex="false" tool="3" flavor2="0"> + </item> <item path="../miosix/filesystem/fat32/ff.c" ex="false" tool="0" flavor2="0"> </item> <item path="../miosix/filesystem/fat32/ff.h" ex="false" tool="3" flavor2="0"> </item> + <item path="../miosix/filesystem/fat32/ffconf.h" + ex="false" + tool="3" + flavor2="0"> + </item> <item path="../miosix/filesystem/fat32/integer.h" ex="false" tool="3" @@ -4685,6 +4714,13 @@ tool="3" flavor2="0"> </item> + <item path="../miosix/filesystem/fat32/fat32.cpp" + ex="false" + tool="1" + flavor2="0"> + </item> + <item path="../miosix/filesystem/fat32/fat32.h" ex="false" tool="3" flavor2="0"> + </item> <item path="../miosix/filesystem/fat32/ff.c" ex="false" tool="0" flavor2="0"> </item> <item path="../miosix/filesystem/fat32/ff.h" ex="false" tool="3" flavor2="0"> @@ -5802,6 +5838,13 @@ tool="3" flavor2="0"> </item> + <item path="../miosix/filesystem/fat32/fat32.cpp" + ex="false" + tool="1" + flavor2="0"> + </item> + <item path="../miosix/filesystem/fat32/fat32.h" ex="false" tool="3" flavor2="0"> + </item> <item path="../miosix/filesystem/fat32/ff.c" ex="false" tool="0" flavor2="0"> </item> <item path="../miosix/filesystem/fat32/ff.h" ex="false" tool="3" flavor2="0"> @@ -6919,6 +6962,13 @@ tool="3" flavor2="0"> </item> + <item path="../miosix/filesystem/fat32/fat32.cpp" + ex="false" + tool="1" + flavor2="0"> + </item> + <item path="../miosix/filesystem/fat32/fat32.h" ex="false" tool="3" flavor2="0"> + </item> <item path="../miosix/filesystem/fat32/ff.c" ex="false" tool="0" flavor2="0"> </item> <item path="../miosix/filesystem/fat32/ff.h" ex="false" tool="3" flavor2="0"> @@ -8036,6 +8086,13 @@ tool="3" flavor2="0"> </item> + <item path="../miosix/filesystem/fat32/fat32.cpp" + ex="false" + tool="1" + flavor2="0"> + </item> + <item path="../miosix/filesystem/fat32/fat32.h" ex="false" tool="3" flavor2="0"> + </item> <item path="../miosix/filesystem/fat32/ff.c" ex="false" tool="0" flavor2="0"> </item> <item path="../miosix/filesystem/fat32/ff.h" ex="false" tool="3" flavor2="0"> @@ -9151,6 +9208,13 @@ tool="3" flavor2="0"> </item> + <item path="../miosix/filesystem/fat32/fat32.cpp" + ex="false" + tool="1" + flavor2="0"> + </item> + <item path="../miosix/filesystem/fat32/fat32.h" ex="false" tool="3" flavor2="0"> + </item> <item path="../miosix/filesystem/fat32/ff.c" ex="false" tool="0" flavor2="0"> </item> <item path="../miosix/filesystem/fat32/ff.h" ex="false" tool="3" flavor2="0"> @@ -10266,6 +10330,13 @@ tool="3" flavor2="0"> </item> + <item path="../miosix/filesystem/fat32/fat32.cpp" + ex="false" + tool="1" + flavor2="0"> + </item> + <item path="../miosix/filesystem/fat32/fat32.h" ex="false" tool="3" flavor2="0"> + </item> <item path="../miosix/filesystem/fat32/ff.c" ex="false" tool="0" flavor2="0"> </item> <item path="../miosix/filesystem/fat32/ff.h" ex="false" tool="3" flavor2="0"> @@ -11381,6 +11452,13 @@ tool="3" flavor2="0"> </item> + <item path="../miosix/filesystem/fat32/fat32.cpp" + ex="false" + tool="1" + flavor2="0"> + </item> + <item path="../miosix/filesystem/fat32/fat32.h" ex="false" tool="3" flavor2="0"> + </item> <item path="../miosix/filesystem/fat32/ff.c" ex="false" tool="0" flavor2="0"> </item> <item path="../miosix/filesystem/fat32/ff.h" ex="false" tool="3" flavor2="0"> @@ -12496,6 +12574,13 @@ tool="3" flavor2="0"> </item> + <item path="../miosix/filesystem/fat32/fat32.cpp" + ex="false" + tool="1" + flavor2="0"> + </item> + <item path="../miosix/filesystem/fat32/fat32.h" ex="false" tool="3" flavor2="0"> + </item> <item path="../miosix/filesystem/fat32/ff.c" ex="false" tool="0" flavor2="0"> </item> <item path="../miosix/filesystem/fat32/ff.h" ex="false" tool="3" flavor2="0"> @@ -13611,6 +13696,13 @@ tool="3" flavor2="0"> </item> + <item path="../miosix/filesystem/fat32/fat32.cpp" + ex="false" + tool="1" + flavor2="0"> + </item> + <item path="../miosix/filesystem/fat32/fat32.h" ex="false" tool="3" flavor2="0"> + </item> <item path="../miosix/filesystem/fat32/ff.c" ex="false" tool="0" flavor2="0"> </item> <item path="../miosix/filesystem/fat32/ff.h" ex="false" tool="3" flavor2="0"> @@ -14726,6 +14818,13 @@ tool="3" flavor2="0"> </item> + <item path="../miosix/filesystem/fat32/fat32.cpp" + ex="false" + tool="1" + flavor2="0"> + </item> + <item path="../miosix/filesystem/fat32/fat32.h" ex="false" tool="3" flavor2="0"> + </item> <item path="../miosix/filesystem/fat32/ff.c" ex="false" tool="0" flavor2="0"> </item> <item path="../miosix/filesystem/fat32/ff.h" ex="false" tool="3" flavor2="0"> diff --git a/miosix_np_2/nbproject/private/configurations.xml b/miosix_np_2/nbproject/private/configurations.xml index 78e003920dcbc10902cd63a0930baa9d52ca4330..da862a02ec0a04e2dbdfbb3d69ca52cecbe39baa 100644 --- a/miosix_np_2/nbproject/private/configurations.xml +++ b/miosix_np_2/nbproject/private/configurations.xml @@ -2,6 +2,36 @@ <configurationDescriptor version="89"> <logicalFolder name="root" displayName="root" projectFiles="true" kind="ROOT"> <df root=".." name="miosix_np_2"> + <df name="ff10"> + <df name="doc"> + <df name="en"> + </df> + <df name="img"> + <in>app1.c</in> + <in>app2.c</in> + <in>app3.c</in> + </df> + <df name="ja"> + </df> + </df> + <df name="src"> + <df name="option"> + <in>cc932.c</in> + <in>cc936.c</in> + <in>cc949.c</in> + <in>cc950.c</in> + <in>ccsbcs.c</in> + <in>syscall.c</in> + <in>unicode.c</in> + </df> + <in>diskio.c</in> + <in>diskio.h</in> + <in>ff.c</in> + <in>ff.h</in> + <in>ffconf.h</in> + <in>integer.h</in> + </df> + </df> <df name="miosix"> <df name="arch"> <df name="arm7_lpc2000"> @@ -319,10 +349,22 @@ <in>devfs.h</in> </df> <df name="fat32"> + <df name="option"> + <in>cc932.c</in> + <in>cc936.c</in> + <in>cc949.c</in> + <in>cc950.c</in> + <in>ccsbcs.c</in> + <in>syscall.c</in> + <in>unicode.c</in> + </df> <in>diskio.cpp</in> <in>diskio.h</in> + <in>fat32.cpp</in> + <in>fat32.h</in> <in>ff.c</in> <in>ff.h</in> + <in>ffconf.h</in> <in>integer.h</in> </df> <df name="mountpointfs">