diff options
Diffstat (limited to 'fs/fat')
| -rw-r--r-- | fs/fat/Kconfig | 11 | ||||
| -rw-r--r-- | fs/fat/Makefile | 6 | ||||
| -rw-r--r-- | fs/fat/diskio.h | 9 | ||||
| -rw-r--r-- | fs/fat/fat-diskio.c | 43 | ||||
| -rw-r--r-- | fs/fat/fat-pbl.c | 53 | ||||
| -rw-r--r-- | fs/fat/fat.c | 76 | ||||
| -rw-r--r-- | fs/fat/ff.c | 89 | ||||
| -rw-r--r-- | fs/fat/ff.h | 22 | ||||
| -rw-r--r-- | fs/fat/ffconf.h | 2 | ||||
| -rw-r--r-- | fs/fat/integer.h | 2 |
10 files changed, 209 insertions, 104 deletions
diff --git a/fs/fat/Kconfig b/fs/fat/Kconfig index b1def851cf..53f784ee54 100644 --- a/fs/fat/Kconfig +++ b/fs/fat/Kconfig @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-only + menuconfig FS_FAT bool select FS_LEGACY @@ -8,9 +10,16 @@ if FS_FAT config FS_FAT_WRITE bool prompt "FAT write support" + help + Enable support for writing in FAT partitions. + Note: This doesn't apply to FAT usage in barebox PBL. + config FS_FAT_LFN - bool + def_bool y prompt "Support long filenames" + help + Enable support for file names other than 8.3. + Note: This doesn't apply to FAT usage in barebox PBL. endif diff --git a/fs/fat/Makefile b/fs/fat/Makefile index efc89ec67d..7a7a5ccdc6 100644 --- a/fs/fat/Makefile +++ b/fs/fat/Makefile @@ -1 +1,5 @@ -obj-y += ff.o fat.o +# SPDX-License-Identifier: GPL-2.0-only + +obj-y += fat.o +pbl-y += fat-pbl.o +obj-pbl-y += ff.o fat-diskio.o diff --git a/fs/fat/diskio.h b/fs/fat/diskio.h index f0d29dc390..57626d2fbd 100644 --- a/fs/fat/diskio.h +++ b/fs/fat/diskio.h @@ -1,10 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + /*----------------------------------------------------------------------- / Low level disk interface modlue include file /-----------------------------------------------------------------------*/ #ifndef _DISKIO -#define _READONLY 0 /* 1: Remove write functions */ +#ifdef __PBL__ +#define _READONLY 1 /* 1: Remove write functions */ +#else +#define _READONLY 0 +#endif + #define _USE_IOCTL 1 /* 1: Use disk_ioctl fucntion */ #include "integer.h" diff --git a/fs/fat/fat-diskio.c b/fs/fat/fat-diskio.c new file mode 100644 index 0000000000..aa16d3bdc4 --- /dev/null +++ b/fs/fat/fat-diskio.c @@ -0,0 +1,43 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * fat.c - FAT filesystem barebox driver + * + * Copyright (c) 2011 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix + */ + +#include <common.h> +#include <linux/ctype.h> +#include "integer.h" +#include "ff.h" +#include "diskio.h" + +DSTATUS disk_status(FATFS *fat) +{ + return 0; +} + +DWORD get_fattime(void) +{ + return 0; +} + +DRESULT disk_ioctl (FATFS *fat, BYTE command, void *buf) +{ + return 0; +} + +WCHAR ff_convert(WCHAR src, UINT dir) +{ + if (src <= 0x80) + return src; + else + return '?'; +} + +WCHAR ff_wtoupper(WCHAR chr) +{ + if (chr <= 0x80) + return toupper(chr); + else + return '?'; +} diff --git a/fs/fat/fat-pbl.c b/fs/fat/fat-pbl.c new file mode 100644 index 0000000000..6b8a807657 --- /dev/null +++ b/fs/fat/fat-pbl.c @@ -0,0 +1,53 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * fat-pbl.c - PBL FAT filesystem barebox driver + * + * Copyright (c) 2019 Ahmad Fatoum, Pengutronix + */ + +#define pr_fmt(fmt) "fat-pbl: " fmt + +#include <common.h> +#include <pbl/bio.h> +#include "integer.h" +#include "ff.h" +#include "diskio.h" + +DRESULT disk_read(FATFS *fat, BYTE *buf, DWORD sector, BYTE count) +{ + int ret = pbl_bio_read(fat->userdata, sector, buf, count); + return ret != count ? ret : 0; +} + +ssize_t pbl_fat_load(struct pbl_bio *bio, const char *filename, void *dest, size_t len) +{ + FATFS fs = {}; + FIL file = {}; + UINT nread; + int ret; + + fs.userdata = bio; + + /* mount fs */ + ret = f_mount(&fs); + if (ret) { + pr_debug("f_mount(%s) failed: %d\n", filename, ret); + return ret; + } + + ret = f_open(&fs, &file, filename, FA_OPEN_EXISTING | FA_READ); + if (ret) { + pr_debug("f_open(%s) failed: %d\n", filename, ret); + return ret; + } + + pr_debug("Reading file %s to 0x%p\n", filename, dest); + + ret = f_read(&file, dest, len, &nread); + if (ret) { + pr_debug("f_read failed: %d\n", ret); + return ret; + } + + return f_size(&file) <= len ? nread : -ENOSPC; +} diff --git a/fs/fat/fat.c b/fs/fat/fat.c index 394c75ffc4..f3c7f9b863 100644 --- a/fs/fat/fat.c +++ b/fs/fat/fat.c @@ -3,9 +3,6 @@ * * Copyright (c) 2011 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix * - * See file CREDITS for list of people who contributed to this - * project. - * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 * as published by the Free Software Foundation. @@ -68,41 +65,10 @@ DRESULT disk_write(FATFS *fat, const BYTE *buf, DWORD sector, BYTE count) return 0; } -DSTATUS disk_status(FATFS *fat) -{ - return 0; -} - -DWORD get_fattime(void) -{ - return 0; -} - -DRESULT disk_ioctl (FATFS *fat, BYTE command, void *buf) -{ - return 0; -} - -WCHAR ff_convert(WCHAR src, UINT dir) -{ - if (src <= 0x80) - return src; - else - return '?'; -} - -WCHAR ff_wtoupper(WCHAR chr) -{ - if (chr <= 0x80) - return toupper(chr); - else - return '?'; -} - /* ---------------------------------------------------------------*/ #ifdef CONFIG_FS_FAT_WRITE -static int fat_create(struct device_d *dev, const char *pathname, mode_t mode) +static int fat_create(struct device *dev, const char *pathname, mode_t mode) { struct fat_priv *priv = dev->priv; FIL f_file; @@ -117,7 +83,7 @@ static int fat_create(struct device_d *dev, const char *pathname, mode_t mode) return 0; } -static int fat_unlink(struct device_d *dev, const char *pathname) +static int fat_unlink(struct device *dev, const char *pathname) { struct fat_priv *priv = dev->priv; int ret; @@ -131,7 +97,7 @@ static int fat_unlink(struct device_d *dev, const char *pathname) return 0; } -static int fat_mkdir(struct device_d *dev, const char *pathname) +static int fat_mkdir(struct device *dev, const char *pathname) { struct fat_priv *priv = dev->priv; int ret; @@ -145,7 +111,7 @@ static int fat_mkdir(struct device_d *dev, const char *pathname) return 0; } -static int fat_rmdir(struct device_d *dev, const char *pathname) +static int fat_rmdir(struct device *dev, const char *pathname) { struct fat_priv *priv = dev->priv; int ret; @@ -159,7 +125,8 @@ static int fat_rmdir(struct device_d *dev, const char *pathname) return 0; } -static int fat_write(struct device_d *_dev, FILE *f, const void *buf, size_t insize) +static int fat_write(struct device *_dev, FILE *f, const void *buf, + size_t insize) { FIL *f_file = f->priv; int outsize; @@ -177,7 +144,7 @@ static int fat_write(struct device_d *_dev, FILE *f, const void *buf, size_t ins return outsize; } -static int fat_truncate(struct device_d *dev, FILE *f, loff_t size) +static int fat_truncate(struct device *dev, FILE *f, loff_t size) { FIL *f_file = f->priv; unsigned long lastofs; @@ -201,7 +168,7 @@ static int fat_truncate(struct device_d *dev, FILE *f, loff_t size) } #endif /* CONFIG_FS_FAT_WRITE */ -static int fat_open(struct device_d *dev, FILE *file, const char *filename) +static int fat_open(struct device *dev, FILE *file, const char *filename) { struct fat_priv *priv = dev->priv; FIL *f_file; @@ -230,6 +197,11 @@ static int fat_open(struct device_d *dev, FILE *file, const char *filename) if (file->flags & O_APPEND) { ret = f_lseek(f_file, f_file->fsize); + if (ret) { + f_close(f_file); + free(f_file); + return -EINVAL; + } } file->priv = f_file; @@ -238,7 +210,7 @@ static int fat_open(struct device_d *dev, FILE *file, const char *filename) return 0; } -static int fat_close(struct device_d *dev, FILE *f) +static int fat_close(struct device *dev, FILE *f) { struct fat_priv *priv = dev->priv; FIL *f_file = f->priv; @@ -252,7 +224,7 @@ static int fat_close(struct device_d *dev, FILE *f) return 0; } -static int fat_read(struct device_d *_dev, FILE *f, void *buf, size_t insize) +static int fat_read(struct device *_dev, FILE *f, void *buf, size_t insize) { int ret; FIL *f_file = f->priv; @@ -268,7 +240,7 @@ static int fat_read(struct device_d *_dev, FILE *f, void *buf, size_t insize) return outsize; } -static int fat_lseek(struct device_d *dev, FILE *f, loff_t pos) +static int fat_lseek(struct device *dev, FILE *f, loff_t pos) { FIL *f_file = f->priv; int ret; @@ -280,7 +252,7 @@ static int fat_lseek(struct device_d *dev, FILE *f, loff_t pos) return 0; } -static DIR* fat_opendir(struct device_d *dev, const char *pathname) +static DIR* fat_opendir(struct device *dev, const char *pathname) { struct fat_priv *priv = dev->priv; DIR *dir; @@ -305,7 +277,7 @@ static DIR* fat_opendir(struct device_d *dev, const char *pathname) return dir; } -static struct dirent* fat_readdir(struct device_d *dev, DIR *dir) +static struct dirent* fat_readdir(struct device *dev, DIR *dir) { FF_DIR *ff_dir = dir->priv; FILINFO finfo; @@ -335,7 +307,7 @@ static struct dirent* fat_readdir(struct device_d *dev, DIR *dir) return &dir->d; } -static int fat_closedir(struct device_d *dev, DIR *dir) +static int fat_closedir(struct device *dev, DIR *dir) { FF_DIR *ff_dir = dir->priv; @@ -345,7 +317,7 @@ static int fat_closedir(struct device_d *dev, DIR *dir) return 0; } -static int fat_stat(struct device_d *dev, const char *filename, struct stat *s) +static int fat_stat(struct device *dev, const char *filename, struct stat *s) { struct fat_priv *priv = dev->priv; FILINFO finfo; @@ -368,9 +340,9 @@ static int fat_stat(struct device_d *dev, const char *filename, struct stat *s) return 0; } -static int fat_probe(struct device_d *dev) +static int fat_probe(struct device *dev) { - struct fs_device_d *fsdev = dev_to_fs_device(dev); + struct fs_device *fsdev = dev_to_fs_device(dev); struct fat_priv *priv = xzalloc(sizeof(struct fat_priv)); int ret; @@ -396,12 +368,12 @@ err_open: return ret; } -static void fat_remove(struct device_d *dev) +static void fat_remove(struct device *dev) { free(dev->priv); } -static struct fs_driver_d fat_driver = { +static struct fs_driver fat_driver = { .open = fat_open, .close = fat_close, .read = fat_read, diff --git a/fs/fat/ff.c b/fs/fat/ff.c index 4d30433e5f..c8d57ce500 100644 --- a/fs/fat/ff.c +++ b/fs/fat/ff.c @@ -96,6 +96,7 @@ #include <filetype.h> #include "ff.h" /* FatFs configurations and declarations */ #include "diskio.h" /* Declarations of low level disk I/O functions */ +#include <pbl.h> #if _FATFS != 8237 #error Wrong include file (ff.h). @@ -214,7 +215,7 @@ #define DDE 0xE5 /* Deleted directory enrty mark in DIR_Name[0] */ #define NDDE 0x05 /* Replacement of a character collides with DDE */ -#ifndef CONFIG_FS_FAT_LFN +#ifndef FS_FAT_LFN #define DEF_NAMEBUF BYTE sfn[12] #define INIT_BUF(dobj) (dobj).fn = sfn #define FREE_BUF() @@ -250,7 +251,7 @@ int move_window ( wsect = fs->winsect; if (wsect != sector) { /* Changed current window */ -#ifdef CONFIG_FS_FAT_WRITE +#ifdef FS_FAT_WRITE if (fs->wflag) { /* Write back dirty window if needed */ if (disk_write(fs, fs->win, wsect, 1) != RES_OK) return -EIO; @@ -277,7 +278,7 @@ int move_window ( /* * Clean-up cached data */ -#ifdef CONFIG_FS_FAT_WRITE +#ifdef FS_FAT_WRITE static int sync ( /* 0: successful, -EIO: failed */ FATFS *fs /* File system object */ @@ -372,7 +373,7 @@ static DWORD get_fat ( /* 0xFFFFFFFF:Disk error, 1:Internal error, Else:Cluster /* * FAT access - Change value of a FAT entry */ -#ifdef CONFIG_FS_FAT_WRITE +#ifdef FS_FAT_WRITE static int put_fat ( FATFS *fs, /* File system object */ @@ -431,7 +432,7 @@ static int put_fat ( return res; } -#endif /* CONFIG_FS_FAT_WRITE */ +#endif /* FS_FAT_WRITE */ @@ -439,7 +440,7 @@ static int put_fat ( /* * FAT handling - Remove a cluster chain */ -#ifdef CONFIG_FS_FAT_WRITE +#ifdef FS_FAT_WRITE static int remove_chain ( FATFS *fs, /* File system object */ @@ -506,7 +507,7 @@ int remove_chain ( /* * FAT handling - Stretch or Create a cluster chain */ -#ifdef CONFIG_FS_FAT_WRITE +#ifdef FS_FAT_WRITE static DWORD create_chain ( /* 0:No free cluster, 1:Internal error, 0xFFFFFFFF:Disk error, >=2:New cluster# */ FATFS *fs, /* File system object */ @@ -566,7 +567,7 @@ DWORD create_chain ( /* 0:No free cluster, 1:Internal error, 0xFFFFFFFF:Disk err return ncl; /* Return new cluster number or error code */ } -#endif /* CONFIG_FS_FAT_WRITE */ +#endif /* FS_FAT_WRITE */ /* * Directory handling - Set directory index @@ -657,7 +658,7 @@ static int dir_next ( /* 0:Succeeded, FR_NO_FILE:End of table, FR_DENIED:EOT and return -EIO; if (clst >= dj->fs->n_fatent) { /* When it reached end of dynamic table */ -#ifdef CONFIG_FS_FAT_WRITE +#ifdef FS_FAT_WRITE BYTE c; if (!stretch) @@ -708,7 +709,7 @@ static int dir_next ( /* 0:Succeeded, FR_NO_FILE:End of table, FR_DENIED:EOT and /* * LFN handling - Test/Pick/Fit an LFN segment from/to directory entry */ -#ifdef CONFIG_FS_FAT_LFN +#ifdef FS_FAT_LFN /* Offset of LFN chars in the directory entry */ static const BYTE LfnOfs[] = {1,3,5,7,9,14,16,18,20,22,24,28,30}; @@ -784,7 +785,7 @@ int pick_lfn ( /* 1:Succeeded, 0:Buffer overflow */ } -#ifdef CONFIG_FS_FAT_WRITE +#ifdef FS_FAT_WRITE static void fit_lfn ( const WCHAR *lfnbuf, /* Pointer to the LFN buffer */ @@ -824,7 +825,7 @@ void fit_lfn ( /* * Create numbered name */ -#if defined(CONFIG_FS_FAT_LFN) && defined(CONFIG_FS_FAT_WRITE) +#if defined(FS_FAT_LFN) && defined(FS_FAT_WRITE) static void gen_numname ( BYTE *dst, /* Pointer to generated SFN */ const BYTE *src, /* Pointer to source SFN to be modified */ @@ -874,7 +875,7 @@ static void gen_numname ( /* * Calculate sum of an SFN */ -#ifdef CONFIG_FS_FAT_LFN +#ifdef FS_FAT_LFN static BYTE sum_sfn ( const BYTE *dir /* Ptr to directory entry */ ) @@ -897,7 +898,7 @@ static int dir_find ( { int res; BYTE c, *dir; -#ifdef CONFIG_FS_FAT_LFN +#ifdef FS_FAT_LFN BYTE a, ord, sum; #endif @@ -905,7 +906,7 @@ static int dir_find ( if (res != 0) return res; -#ifdef CONFIG_FS_FAT_LFN +#ifdef FS_FAT_LFN ord = sum = 0xFF; #endif do { @@ -919,7 +920,7 @@ static int dir_find ( res = -ENOENT; break; } -#ifdef CONFIG_FS_FAT_LFN /* LFN configuration */ +#ifdef FS_FAT_LFN /* LFN configuration */ a = dir[DIR_Attr] & AM_MASK; if (c == DDE || ((a & AM_VOL) && a != AM_LFN)) { /* An entry without valid data */ @@ -970,7 +971,7 @@ static int dir_read ( { int res; BYTE c, *dir; -#ifdef CONFIG_FS_FAT_LFN +#ifdef FS_FAT_LFN BYTE a, ord = 0xFF, sum = 0xFF; #endif @@ -986,7 +987,7 @@ static int dir_read ( res = -ENOENT; break; } -#ifdef CONFIG_FS_FAT_LFN /* LFN configuration */ +#ifdef FS_FAT_LFN /* LFN configuration */ a = dir[DIR_Attr] & AM_MASK; if (c == DDE || c == '.' || ((a & AM_VOL) && a != AM_LFN)) { /* An entry without valid data */ ord = 0xFF; @@ -1025,7 +1026,7 @@ static int dir_read ( /* * Register an object to the directory */ -#ifdef CONFIG_FS_FAT_WRITE +#ifdef FS_FAT_WRITE static int dir_register ( /* 0:Successful, FR_DENIED:No free entry or too many SFN collision, -EIO:Disk error */ FF_DIR *dj /* Target directory with object name to be created */ @@ -1033,7 +1034,7 @@ int dir_register ( /* 0:Successful, FR_DENIED:No free entry or too many SFN coll { int res; BYTE c, *dir; -#ifdef CONFIG_FS_FAT_LFN /* LFN configuration */ +#ifdef FS_FAT_LFN /* LFN configuration */ WORD n, ne, is; BYTE sn[12], *fn, sum; WCHAR *lfn; @@ -1127,7 +1128,7 @@ int dir_register ( /* 0:Successful, FR_DENIED:No free entry or too many SFN coll dir = dj->dir; memset(dir, 0, SZ_DIR); /* Clean the entry */ memcpy(dir, dj->fn, 11); /* Put SFN */ -#ifdef CONFIG_FS_FAT_LFN +#ifdef FS_FAT_LFN dir[DIR_NTres] = *(dj->fn+NS) & (NS_BODY | NS_EXT); /* Put NT flag */ #endif dj->fs->wflag = 1; @@ -1136,18 +1137,18 @@ int dir_register ( /* 0:Successful, FR_DENIED:No free entry or too many SFN coll return res; } -#endif /* CONFIG_FS_FAT_WRITE */ +#endif /* FS_FAT_WRITE */ /* * Remove an object from the directory */ -#if defined CONFIG_FS_FAT_WRITE +#if defined FS_FAT_WRITE static int dir_remove ( /* 0: Successful, -EIO: A disk error */ FF_DIR *dj /* Directory object pointing the entry to be removed */ ) { int res; -#ifdef CONFIG_FS_FAT_LFN /* LFN configuration */ +#ifdef FS_FAT_LFN /* LFN configuration */ WORD i; i = dj->index; /* SFN index */ @@ -1181,7 +1182,7 @@ static int dir_remove ( /* 0: Successful, -EIO: A disk error */ return res; } -#endif /* CONFIG_FS_FAT_WRITE */ +#endif /* FS_FAT_WRITE */ /* * Pick a segment and create the object name in directory form @@ -1195,7 +1196,7 @@ static int create_name ( static const BYTE excvt[] = _EXCVT; /* Upper conversion table for extended chars */ #endif -#ifdef CONFIG_FS_FAT_LFN /* LFN configuration */ +#ifdef FS_FAT_LFN /* LFN configuration */ BYTE b, cf; WCHAR w, *lfn; UINT i, ni, si, di; @@ -1410,7 +1411,7 @@ static void get_fileinfo ( /* No return code */ break; if (c == NDDE) c = (TCHAR)DDE; -#ifdef CONFIG_FS_FAT_LFN +#ifdef FS_FAT_LFN if ((nt & NS_BODY) && isupper(c)) c += 0x20; #endif @@ -1428,7 +1429,7 @@ static void get_fileinfo ( /* No return code */ c = dir[i]; if (c == ' ') break; -#ifdef CONFIG_FS_FAT_LFN +#ifdef FS_FAT_LFN if ((nt & NS_EXT) && isupper(c)) c += 0x20; #endif @@ -1449,7 +1450,7 @@ static void get_fileinfo ( /* No return code */ } *p = 0; /* Terminate SFN str by a \0 */ -#ifdef CONFIG_FS_FAT_LFN +#ifdef FS_FAT_LFN if (fno->lfname && fno->lfsize) { TCHAR *tp = fno->lfname; WCHAR w, *lfn; @@ -1668,7 +1669,7 @@ static int chk_mounted ( /* 0(0): successful, !=0: any error occurred */ if (fs->fsize < (szbfat + (SS(fs) - 1)) / SS(fs)) return -EINVAL; -#ifdef CONFIG_FS_FAT_WRITE +#ifdef FS_FAT_WRITE /* Initialize cluster allocation information */ fs->free_clust = 0xFFFFFFFF; fs->last_clust = 0; @@ -1723,7 +1724,7 @@ int f_open ( fp->fs = NULL; /* Clear file object */ -#ifdef CONFIG_FS_FAT_WRITE +#ifdef FS_FAT_WRITE mode &= FA_READ | FA_WRITE | FA_CREATE_ALWAYS | FA_OPEN_ALWAYS | FA_CREATE_NEW; dj.fs = fatfs; #else @@ -1735,7 +1736,7 @@ int f_open ( res = follow_path(&dj, path); /* Follow the file path */ dir = dj.dir; -#ifdef CONFIG_FS_FAT_WRITE /* R/W configuration */ +#ifdef FS_FAT_WRITE /* R/W configuration */ if (res == 0) { if (!dir) /* Current dir itself */ res = -EISDIR; @@ -1870,7 +1871,7 @@ int f_read ( cc = fp->fs->csize - csect; if (disk_read(fp->fs, rbuff, sect, (BYTE)cc) != RES_OK) ABORT(fp->fs, -EIO); -#if defined CONFIG_FS_FAT_WRITE +#if defined FS_FAT_WRITE /* Replace one of the read sectors with cached data if it contains a dirty sector */ if ((fp->flag & FA__DIRTY) && fp->dsect - sect < cc) memcpy(rbuff + ((fp->dsect - sect) * SS(fp->fs)), fp->buf, SS(fp->fs)); @@ -1879,7 +1880,7 @@ int f_read ( continue; } if (fp->dsect != sect) { /* Load data sector if not in cache */ -#ifdef CONFIG_FS_FAT_WRITE +#ifdef FS_FAT_WRITE if (fp->flag & FA__DIRTY) { /* Write-back dirty sector cache */ if (disk_write(fp->fs, fp->buf, fp->dsect, 1) != RES_OK) ABORT(fp->fs, -EIO); @@ -1903,7 +1904,7 @@ int f_read ( -#ifdef CONFIG_FS_FAT_WRITE +#ifdef FS_FAT_WRITE /* * Write File */ @@ -2044,7 +2045,7 @@ int f_sync ( return res; } -#endif /* CONFIG_FS_FAT_WRITE */ +#endif /* FS_FAT_WRITE */ /* * Close File @@ -2053,7 +2054,7 @@ int f_close ( FIL *fp /* Pointer to the file object to be closed */ ) { -#ifndef CONFIG_FS_FAT_WRITE +#ifndef FS_FAT_WRITE fp->fs = 0; /* Discard file object */ return 0; #else @@ -2082,7 +2083,7 @@ int f_lseek ( return -ERESTARTSYS; if (ofs > fp->fsize /* In read-only mode, clip offset with the file size */ -#ifdef CONFIG_FS_FAT_WRITE +#ifdef FS_FAT_WRITE && !(fp->flag & FA_WRITE) #endif ) ofs = fp->fsize; @@ -2098,7 +2099,7 @@ int f_lseek ( clst = fp->clust; } else { /* When seek to back cluster, */ clst = fp->sclust; /* start from the first cluster */ -#ifdef CONFIG_FS_FAT_WRITE +#ifdef FS_FAT_WRITE if (clst == 0) { /* If no cluster chain, create a new chain */ clst = create_chain(fp->fs, 0); if (clst == 1) @@ -2112,7 +2113,7 @@ int f_lseek ( } if (clst != 0) { while (ofs > bcs) { /* Cluster following loop */ -#ifdef CONFIG_FS_FAT_WRITE +#ifdef FS_FAT_WRITE if (fp->flag & FA_WRITE) { /* Check if in write mode or not */ /* Force stretch if in write mode */ clst = create_chain(fp->fs, clst); @@ -2143,7 +2144,7 @@ int f_lseek ( } } if (fp->fptr % SS(fp->fs) && nsect != fp->dsect) { /* Fill sector cache if needed */ -#ifdef CONFIG_FS_FAT_WRITE +#ifdef FS_FAT_WRITE if (fp->flag & FA__DIRTY) { /* Write-back dirty sector cache */ if (disk_write(fp->fs, fp->buf, fp->dsect, 1) != RES_OK) ABORT(fp->fs, -EIO); @@ -2154,7 +2155,7 @@ int f_lseek ( ABORT(fp->fs, -EIO); fp->dsect = nsect; } -#ifdef CONFIG_FS_FAT_WRITE +#ifdef FS_FAT_WRITE if (fp->fptr > fp->fsize) { /* Set file change flag if the file size is extended */ fp->fsize = fp->fptr; fp->flag |= FA__WRITTEN; @@ -2269,7 +2270,7 @@ int f_stat ( return res; } -#ifdef CONFIG_FS_FAT_WRITE +#ifdef FS_FAT_WRITE /* * Get Number of Free Clusters */ @@ -2706,4 +2707,4 @@ out: return res; } -#endif /* CONFIG_FS_FAT_WRITE */ +#endif /* FS_FAT_WRITE */ diff --git a/fs/fat/ff.h b/fs/fat/ff.h index e86ca3aae0..c961de46e1 100644 --- a/fs/fat/ff.h +++ b/fs/fat/ff.h @@ -17,6 +17,18 @@ #ifndef _FATFS #define _FATFS 8237 /* Revision ID */ +#ifndef __PBL__ + +#ifdef CONFIG_FS_FAT_LFN +#define FS_FAT_LFN 1 +#endif + +#ifdef CONFIG_FS_FAT_WRITE +#define FS_FAT_WRITE 1 +#endif + +#endif + #include <asm/unaligned.h> #include <linux/list.h> @@ -30,7 +42,7 @@ /* Type of path name strings on FatFs API */ #if _LFN_UNICODE /* Unicode string */ -#ifndef CONFIG_FS_FAT_LFN +#ifndef FS_FAT_LFN #error _LFN_UNICODE must be 0 in non-LFN cfg. #endif #ifndef _INC_TCHAR @@ -63,7 +75,7 @@ typedef struct { #if _MAX_SS != 512 WORD ssize; /* Bytes per sector (512,1024,2048,4096) */ #endif -#ifdef CONFIG_FS_FAT_WRITE +#ifdef FS_FAT_WRITE DWORD last_clust; /* Last allocated cluster */ DWORD free_clust; /* Number of free clusters */ DWORD fsi_sector; /* fsinfo sector (FAT32) */ @@ -92,7 +104,7 @@ typedef struct { DWORD sclust; /* File start cluster (0 when fsize==0) */ DWORD clust; /* Current cluster */ DWORD dsect; /* Current data sector */ -#ifdef CONFIG_FS_FAT_WRITE +#ifdef FS_FAT_WRITE DWORD dir_sect; /* Sector containing the directory entry */ BYTE* dir_ptr; /* Ponter to the directory entry in the window */ #endif @@ -119,7 +131,7 @@ typedef struct { 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]} */ -#ifdef CONFIG_FS_FAT_LFN +#ifdef FS_FAT_LFN WCHAR* lfn; /* Pointer to the LFN working buffer */ WORD lfn_idx; /* Last matched LFN index number (0xFFFF:No LFN) */ #endif @@ -135,7 +147,7 @@ typedef struct { WORD ftime; /* Last modified time */ BYTE fattrib; /* Attribute */ TCHAR fname[13]; /* Short file name (8.3 format) */ -#ifdef CONFIG_FS_FAT_LFN +#ifdef FS_FAT_LFN TCHAR* lfname; /* Pointer to the LFN buffer */ UINT lfsize; /* Size of LFN buffer in TCHAR */ #endif diff --git a/fs/fat/ffconf.h b/fs/fat/ffconf.h index 2f6a6c1544..abf7d1e92e 100644 --- a/fs/fat/ffconf.h +++ b/fs/fat/ffconf.h @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + /*---------------------------------------------------------------------------/ / FatFs - FAT file system module configuration file R0.08b (C)ChaN, 2011 /----------------------------------------------------------------------------/ diff --git a/fs/fat/integer.h b/fs/fat/integer.h index 04956aa775..fe94e374f3 100644 --- a/fs/fat/integer.h +++ b/fs/fat/integer.h @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + /*-------------------------------------------*/ /* Integer type definitions for FatFs module */ /*-------------------------------------------*/ |