Get rid of the redundant ATTR_NEVER_INLINE macro which translated to the same as...

[pub/USBasp.git] / Projects / Webserver / Lib / FATFs / ff.h

diff --git a/Projects/Webserver/Lib/FATFs/ff.h b/Projects/Webserver/Lib/FATFs/ff.h
index 6a4107c..627cbaa 100644 (file)
--- a/Projects/Webserver/Lib/FATFs/ff.h
+++ b/Projects/Webserver/Lib/FATFs/ff.h
@@ -1,11 +1,11 @@
 /*---------------------------------------------------------------------------/
 /*---------------------------------------------------------------------------/

-/  FatFs - FAT file system module include file  R0.08b    (C)ChaN, 2011
+/  FatFs - FAT file system module include file  R0.09a    (C)ChaN, 2012

 /----------------------------------------------------------------------------/
 / 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.
 /
 /----------------------------------------------------------------------------/
 / 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) 2011, ChaN, all right reserved.
+/  Copyright (C) 2012, ChaN, all right reserved.

 /
 / * The FatFs module is a free software and there is NO WARRANTY.
 / * No restriction on use. You can use, modify and redistribute it for
 /
 / * The FatFs module is a free software and there is NO WARRANTY.
 / * No restriction on use. You can use, modify and redistribute it for


@@ -15,7 +15,7 @@
 /----------------------------------------------------------------------------*/
 
 #ifndef _FATFS
 /----------------------------------------------------------------------------*/
 
 #ifndef _FATFS

-#define _FATFS 8237    /* Revision ID */
+#define _FATFS 4004    /* Revision ID */

 
 #ifdef __cplusplus
 extern "C" {
 
 #ifdef __cplusplus
 extern "C" {


@@ -33,17 +33,17 @@ extern "C" {
 /* Definitions of volume management */
 
 #if _MULTI_PARTITION           /* Multiple partition configuration */
 /* Definitions of volume management */
 
 #if _MULTI_PARTITION           /* Multiple partition configuration */

-#define LD2PD(vol) (VolToPart[vol].pd) /* Get physical drive# */
-#define LD2PT(vol) (VolToPart[vol].pt) /* Get partition# */

 typedef struct {
 typedef struct {

-       BYTE pd;        /* Physical drive# */
-       BYTE pt;        /* Partition # (0-3) */
+       BYTE pd;        /* Physical drive number */
+       BYTE pt;        /* Partition: 0:Auto detect, 1-4:Forced partition) */

 } PARTITION;
 } PARTITION;

-extern const PARTITION VolToPart[];    /* Volume - Physical location resolution table */
+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 */

 
 

-#else                                          /* Single partition configuration */
-#define LD2PD(vol) (vol)       /* Logical drive# is bound to the same physical drive# */
-#define LD2PT(vol) 0           /* Always mounts the 1st partition */
+#else                                                  /* Single partition configuration */
+#define LD2PD(vol) (BYTE)(vol) /* Each logical drive is bound to the same physical drive number */
+#define LD2PT(vol) 0                   /* Always mounts the 1st partition or in SFD */

 
 #endif
 
 
 #endif
 


@@ -84,7 +84,7 @@ typedef struct {
        WORD    id;                             /* File system mount ID */
        WORD    n_rootdir;              /* Number of root directory entries (FAT12/16) */
 #if _MAX_SS != 512
        WORD    id;                             /* File system mount ID */
        WORD    n_rootdir;              /* Number of root directory entries (FAT12/16) */
 #if _MAX_SS != 512

-       WORD    ssize;                  /* Bytes per sector (512,1024,2048,4096) */
+       WORD    ssize;                  /* Bytes per sector (512, 1024, 2048 or 4096) */

 #endif
 #if _FS_REENTRANT
        _SYNC_t sobj;                   /* Identifier of sync object */
 #endif
 #if _FS_REENTRANT
        _SYNC_t sobj;                   /* Identifier of sync object */


@@ -111,24 +111,24 @@ typedef struct {
 /* File object structure (FIL) */
 
 typedef struct {
 /* File object structure (FIL) */
 
 typedef struct {

-       FATFS*  fs;                             /* Pointer to the owner file system object */
-       WORD    id;                             /* Owner file system mount ID */
+       FATFS*  fs;                             /* Pointer to the related file system object */
+       WORD    id;                             /* File system mount ID of the related file system object */

        BYTE    flag;                   /* File status flags */
        BYTE    pad1;
        BYTE    flag;                   /* File status flags */
        BYTE    pad1;

-       DWORD   fptr;                   /* File read/write pointer (0 on file open) */
+       DWORD   fptr;                   /* File read/write pointer (0ed on file open) */

        DWORD   fsize;                  /* File size */
        DWORD   fsize;                  /* File size */

-       DWORD   sclust;                 /* File start cluster (0 when fsize==0) */
-       DWORD   clust;                  /* Current cluster */
-       DWORD   dsect;                  /* Current data sector */
+       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 */
 #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 (null on file open) */
 #endif
 #endif
 #if _USE_FASTSEEK
        DWORD*  cltbl;                  /* Pointer to the cluster link map table (null on file open) */
 #endif

-#if _FS_SHARE
-       UINT    lockid;                 /* File lock ID (index of file semaphore table) */
+#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
 #if !_FS_TINY
        BYTE    buf[_MAX_SS];   /* File data read/write buffer */


@@ -188,12 +188,13 @@ typedef enum {
        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_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 on the physical drive */
+       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_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_TOO_MANY_OPEN_FILES, /* (18) Number of open files > _FS_SHARE */
+       FR_INVALID_PARAMETER    /* (19) Given parameter is invalid */

 } FRESULT;
 
 
 } FRESULT;
 
 


@@ -216,27 +217,28 @@ FRESULT f_sync (FIL*);                                                            /* Flush cached data of a writing file */
 FRESULT f_unlink (const TCHAR*);                                       /* Delete an existing file or directory */
 FRESULT        f_mkdir (const TCHAR*);                                         /* Create a new directory */
 FRESULT f_chmod (const TCHAR*, BYTE, BYTE);                    /* Change attribute of the file/dir */
 FRESULT f_unlink (const TCHAR*);                                       /* Delete an existing file or directory */
 FRESULT        f_mkdir (const TCHAR*);                                         /* Create a new directory */
 FRESULT f_chmod (const TCHAR*, BYTE, BYTE);                    /* Change attribute of the file/dir */

-FRESULT f_utime (const TCHAR*, const FILINFO*);                /* Change time-stamp of the file/dir */
+FRESULT f_utime (const TCHAR*, const FILINFO*);                /* Change times-tamp of the file/dir */

 FRESULT f_rename (const TCHAR*, const TCHAR*);         /* Rename/Move a file or directory */
 FRESULT f_rename (const TCHAR*, const TCHAR*);         /* Rename/Move a file or directory */

-FRESULT f_forward (FIL*, UINT(*)(const BYTE*,UINT), UINT, UINT*);      /* Forward data to the stream */
-FRESULT f_mkfs (BYTE, BYTE, UINT);                                     /* Create a file system on the drive */

 FRESULT f_chdrive (BYTE);                                                      /* Change current drive */
 FRESULT f_chdir (const TCHAR*);                                                /* Change current directory */
 FRESULT f_getcwd (TCHAR*, UINT);                                       /* Get current directory */
 FRESULT f_chdrive (BYTE);                                                      /* Change current drive */
 FRESULT f_chdir (const TCHAR*);                                                /* Change current directory */
 FRESULT f_getcwd (TCHAR*, UINT);                                       /* Get current directory */

+FRESULT f_forward (FIL*, UINT(*)(const BYTE*,UINT), UINT, UINT*);      /* Forward data to the stream */
+FRESULT f_mkfs (BYTE, BYTE, UINT);                                     /* Create a file system on the drive */
+FRESULT        f_fdisk (BYTE, const DWORD[], void*);           /* Divide a physical drive into some partitions */

 int f_putc (TCHAR, FIL*);                                                      /* Put a character to the file */
 int f_puts (const TCHAR*, FIL*);                                       /* Put a string to the file */
 int f_printf (FIL*, const TCHAR*, ...);                                /* Put a formatted string to the file */
 TCHAR* f_gets (TCHAR*, int, FIL*);                                     /* Get a string from the file */
 
 int f_putc (TCHAR, FIL*);                                                      /* Put a character to the file */
 int f_puts (const TCHAR*, FIL*);                                       /* Put a string to the file */
 int f_printf (FIL*, const TCHAR*, ...);                                /* Put a formatted string to the file */
 TCHAR* f_gets (TCHAR*, int, FIL*);                                     /* Get a string from the file */
 

-#ifndef EOF
-#define EOF (-1)
-#endif
-

 #define f_eof(fp) (((fp)->fptr == (fp)->fsize) ? 1 : 0)
 #define f_error(fp) (((fp)->flag & FA__ERROR) ? 1 : 0)
 #define f_tell(fp) ((fp)->fptr)
 #define f_size(fp) ((fp)->fsize)
 
 #define f_eof(fp) (((fp)->fptr == (fp)->fsize) ? 1 : 0)
 #define f_error(fp) (((fp)->flag & FA__ERROR) ? 1 : 0)
 #define f_tell(fp) ((fp)->fptr)
 #define f_size(fp) ((fp)->fsize)
 

+#ifndef EOF
+#define EOF (-1)
+#endif
+

 
 
 
 
 
 


@@ -308,7 +310,7 @@ int ff_del_syncobj (_SYNC_t);               /* Delete a sync object */
 #define AM_MASK        0x3F    /* Mask of defined bits */
 
 
 #define AM_MASK        0x3F    /* Mask of defined bits */
 
 

-/* Fast seek function */
+/* Fast seek feature */

 #define CREATE_LINKMAP 0xFFFFFFFF
 
 
 #define CREATE_LINKMAP 0xFFFFFFFF
 
 


@@ -333,4 +335,3 @@ int ff_del_syncobj (_SYNC_t);               /* Delete a sync object */
 #endif
 
 #endif /* _FATFS */
 #endif
 
 #endif /* _FATFS */

-