Some minor updates

Fork of FATFileSystem by mbed official

Committer:
mbed_official
Date:
Thu Aug 13 10:15:39 2015 +0100
Revision:
5:b3b3370574cf
Parent:
1:46ce1e16c870
Child:
8:c4baca9a2c3d
Synchronized with git revision ab6a668ec18ad1530649c4cf1067a42816c6a7f8

Full URL: https://github.com/mbedmicro/mbed/commit/ab6a668ec18ad1530649c4cf1067a42816c6a7f8/

FATFileSystem - Updated FatFs to R0.11

Who changed what in which revision?

UserRevisionLine numberNew contents of line
emilmont 1:46ce1e16c870 1 /* mbed Microcontroller Library
emilmont 1:46ce1e16c870 2 * Copyright (c) 2006-2012 ARM Limited
emilmont 1:46ce1e16c870 3 *
emilmont 1:46ce1e16c870 4 * Permission is hereby granted, free of charge, to any person obtaining a copy
emilmont 1:46ce1e16c870 5 * of this software and associated documentation files (the "Software"), to deal
emilmont 1:46ce1e16c870 6 * in the Software without restriction, including without limitation the rights
emilmont 1:46ce1e16c870 7 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
emilmont 1:46ce1e16c870 8 * copies of the Software, and to permit persons to whom the Software is
emilmont 1:46ce1e16c870 9 * furnished to do so, subject to the following conditions:
emilmont 1:46ce1e16c870 10 *
emilmont 1:46ce1e16c870 11 * The above copyright notice and this permission notice shall be included in
emilmont 1:46ce1e16c870 12 * all copies or substantial portions of the Software.
emilmont 1:46ce1e16c870 13 *
emilmont 1:46ce1e16c870 14 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
emilmont 1:46ce1e16c870 15 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
emilmont 1:46ce1e16c870 16 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
emilmont 1:46ce1e16c870 17 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
emilmont 1:46ce1e16c870 18 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
emilmont 1:46ce1e16c870 19 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
emilmont 1:46ce1e16c870 20 * SOFTWARE.
emilmont 1:46ce1e16c870 21 */
emilmont 1:46ce1e16c870 22 #include <string.h>
emilmont 1:46ce1e16c870 23 #include "ff.h"
emilmont 1:46ce1e16c870 24 #include "FATDirHandle.h"
emilmont 1:46ce1e16c870 25
emilmont 1:46ce1e16c870 26 using namespace mbed;
emilmont 1:46ce1e16c870 27
emilmont 1:46ce1e16c870 28 FATDirHandle::FATDirHandle(const FATFS_DIR &the_dir) {
emilmont 1:46ce1e16c870 29 dir = the_dir;
emilmont 1:46ce1e16c870 30 }
emilmont 1:46ce1e16c870 31
emilmont 1:46ce1e16c870 32 int FATDirHandle::closedir() {
mbed_official 5:b3b3370574cf 33 int retval = f_closedir(&dir);
emilmont 1:46ce1e16c870 34 delete this;
mbed_official 5:b3b3370574cf 35 return retval;
emilmont 1:46ce1e16c870 36 }
emilmont 1:46ce1e16c870 37
emilmont 1:46ce1e16c870 38 struct dirent *FATDirHandle::readdir() {
emilmont 1:46ce1e16c870 39 FILINFO finfo;
emilmont 1:46ce1e16c870 40
emilmont 1:46ce1e16c870 41 #if _USE_LFN
emilmont 1:46ce1e16c870 42 finfo.lfname = cur_entry.d_name;
emilmont 1:46ce1e16c870 43 finfo.lfsize = sizeof(cur_entry.d_name);
emilmont 1:46ce1e16c870 44 #endif // _USE_LFN
emilmont 1:46ce1e16c870 45
emilmont 1:46ce1e16c870 46 FRESULT res = f_readdir(&dir, &finfo);
emilmont 1:46ce1e16c870 47
emilmont 1:46ce1e16c870 48 #if _USE_LFN
emilmont 1:46ce1e16c870 49 if(res != 0 || finfo.fname[0]==0) {
emilmont 1:46ce1e16c870 50 return NULL;
emilmont 1:46ce1e16c870 51 } else {
emilmont 1:46ce1e16c870 52 if(cur_entry.d_name[0]==0) {
emilmont 1:46ce1e16c870 53 // No long filename so use short filename.
emilmont 1:46ce1e16c870 54 memcpy(cur_entry.d_name, finfo.fname, sizeof(finfo.fname));
emilmont 1:46ce1e16c870 55 }
emilmont 1:46ce1e16c870 56 return &cur_entry;
emilmont 1:46ce1e16c870 57 }
emilmont 1:46ce1e16c870 58 #else
emilmont 1:46ce1e16c870 59 if(res != 0 || finfo.fname[0]==0) {
emilmont 1:46ce1e16c870 60 return NULL;
emilmont 1:46ce1e16c870 61 } else {
emilmont 1:46ce1e16c870 62 memcpy(cur_entry.d_name, finfo.fname, sizeof(finfo.fname));
emilmont 1:46ce1e16c870 63 return &cur_entry;
emilmont 1:46ce1e16c870 64 }
emilmont 1:46ce1e16c870 65 #endif /* _USE_LFN */
emilmont 1:46ce1e16c870 66 }
emilmont 1:46ce1e16c870 67
emilmont 1:46ce1e16c870 68 void FATDirHandle::rewinddir() {
emilmont 1:46ce1e16c870 69 dir.index = 0;
emilmont 1:46ce1e16c870 70 }
emilmont 1:46ce1e16c870 71
emilmont 1:46ce1e16c870 72 off_t FATDirHandle::telldir() {
emilmont 1:46ce1e16c870 73 return dir.index;
emilmont 1:46ce1e16c870 74 }
emilmont 1:46ce1e16c870 75
emilmont 1:46ce1e16c870 76 void FATDirHandle::seekdir(off_t location) {
emilmont 1:46ce1e16c870 77 dir.index = location;
emilmont 1:46ce1e16c870 78 }
emilmont 1:46ce1e16c870 79