Fix incorrect #include filenames in the RNDIS demos.

[pub/USBasp.git] / Projects / TempDataLogger / Lib / FATFs / ff.c

diff --git a/Projects/TempDataLogger/Lib/FATFs/ff.c b/Projects/TempDataLogger/Lib/FATFs/ff.c
index 236c86f..ab53ea5 100644 (file)
--- a/Projects/TempDataLogger/Lib/FATFs/ff.c
+++ b/Projects/TempDataLogger/Lib/FATFs/ff.c
@@ -45,7 +45,7 @@
 /                   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 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 btr in f_read() can be mis-truncated.

 /                   Fixed cached sector is not flushed when create and close
 /                   without write.
 /
 /                   Fixed cached sector is not flushed when create and close
 /                   without write.
 /


@@ -114,7 +114,7 @@
 #endif
 
 
 #endif
 
 

-/* Reentrancy related */
+/* Re-entrancy related */

 #if _FS_REENTRANT
 #if _USE_LFN == 1
 #error Static LFN work area must not be used in re-entrant configuration.
 #if _FS_REENTRANT
 #if _USE_LFN == 1
 #error Static LFN work area must not be used in re-entrant configuration.


@@ -304,7 +304,7 @@ void unlock_fs (
 
 
 /*-----------------------------------------------------------------------*/
 
 
 /*-----------------------------------------------------------------------*/

-/* File shareing control functions                                       */
+/* File sharing control functions                                       */

 /*-----------------------------------------------------------------------*/
 #if _FS_SHARE
 
 /*-----------------------------------------------------------------------*/
 #if _FS_SHARE
 


@@ -495,7 +495,7 @@ DWORD get_fat (     /* 0xFFFFFFFF:Disk error, 1:Internal error, Else:Cluster status
        BYTE *p;
 
 
        BYTE *p;
 
 

-       if (clst < 2 || clst >= fs->n_fatent)   /* Chack range */
+       if (clst < 2 || clst >= fs->n_fatent)   /* Check range */

                return 1;
 
        switch (fs->fs_type) {
                return 1;
 
        switch (fs->fs_type) {


@@ -1321,7 +1321,7 @@ FRESULT create_name (
                if (w != ' ' && w != '.') break;
                di--;
        }
                if (w != ' ' && w != '.') break;
                di--;
        }

-       if (!di) return FR_INVALID_NAME;        /* Reject nul string */
+       if (!di) return FR_INVALID_NAME;        /* Reject null string */

 
        lfn[di] = 0;                                            /* LFN is created */
 
 
        lfn[di] = 0;                                            /* LFN is created */
 


@@ -1458,7 +1458,7 @@ FRESULT create_name (
        *path = &p[si];                                         /* Return pointer to the next segment */
        c = (c <= ' ') ? NS_LAST : 0;           /* Set last segment flag if end of path */
 
        *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 (!i) return FR_INVALID_NAME;         /* Reject null string */

        if (sfn[0] == 0xE5) sfn[0] = 0x05;      /* When first char collides with 0xE5, replace it with 0x05 */
 
        if (ni == 8) b <<= 2;
        if (sfn[0] == 0xE5) sfn[0] = 0x05;      /* When first char collides with 0xE5, replace it with 0x05 */
 
        if (ni == 8) b <<= 2;


@@ -1582,7 +1582,7 @@ FRESULT follow_path (     /* FR_OK(0): successful, !=0: error code */
        dj->sclust = 0;                                         /* Start from the root dir */
 #endif
 
        dj->sclust = 0;                                         /* Start from the root dir */
 #endif
 

-       if ((UINT)*path < ' ') {                        /* Nul path means the start directory itself */
+       if ((UINT)*path < ' ') {                        /* Null path means the start directory itself */

                res = dir_sdi(dj, 0);
                dj->dir = 0;
 
                res = dir_sdi(dj, 0);
                dj->dir = 0;
 


@@ -1593,7 +1593,7 @@ FRESULT follow_path (     /* FR_OK(0): successful, !=0: error code */
                        res = dir_find(dj);                             /* Find it */
                        ns = *(dj->fn+NS);
                        if (res != FR_OK) {                             /* Failed to find the object */
                        res = dir_find(dj);                             /* Find it */
                        ns = *(dj->fn+NS);
                        if (res != FR_OK) {                             /* Failed to find the object */

-                               if (res != FR_NO_FILE) break;   /* Abort if any hard error occured */
+                               if (res != FR_NO_FILE) break;   /* Abort if any hard error occurred */

                                /* Object not found */
                                if (_FS_RPATH && (ns & NS_DOT)) {       /* If dot entry is not exit */
                                        dj->sclust = 0; dj->dir = 0;    /* It is the root dir */
                                /* Object not found */
                                if (_FS_RPATH && (ns & NS_DOT)) {       /* If dot entry is not exit */
                                        dj->sclust = 0; dj->dir = 0;    /* It is the root dir */


@@ -1710,7 +1710,7 @@ FRESULT chk_mounted (     /* FR_OK(0): successful, !=0: any error occurred */
        if (chk_wp && (stat & STA_PROTECT))     /* Check disk write protection if needed */
                return FR_WRITE_PROTECTED;
 #endif
        if (chk_wp && (stat & STA_PROTECT))     /* Check disk write protection if needed */
                return FR_WRITE_PROTECTED;
 #endif

-       /* Search FAT partition on the drive (Supports only generic partitionings, FDISK and SFD) */
+       /* Search FAT partition on the drive (Supports only generic partitions, FDISK and SFD) */

        fmt = check_fs(fs, bsect = 0);          /* Check sector 0 if it is a VBR */
        if (fmt == 1) {                                         /* Not an FAT-VBR, the disk may be partitioned */
                /* Check the partition listed in top of the partition table */
        fmt = check_fs(fs, bsect = 0);          /* Check sector 0 if it is a VBR */
        if (fmt == 1) {                                         /* Not an FAT-VBR, the disk may be partitioned */
                /* Check the partition listed in top of the partition table */


@@ -2289,7 +2289,7 @@ FRESULT f_close (
 #if _FS_REENTRANT
                res = validate(fp->fs, fp->id);
                if (res == FR_OK) {
 #if _FS_REENTRANT
                res = validate(fp->fs, fp->id);
                if (res == FR_OK) {

-                       res = dec_lock(fp->fs, fp->lockid);     
+                       res = dec_lock(fp->fs, fp->lockid);

                        unlock_fs(fp->fs, FR_OK);
                }
 #else
                        unlock_fs(fp->fs, FR_OK);
                }
 #else


@@ -2527,7 +2527,7 @@ FRESULT f_lseek (
 
 #if _FS_MINIMIZE <= 1
 /*-----------------------------------------------------------------------*/
 
 #if _FS_MINIMIZE <= 1
 /*-----------------------------------------------------------------------*/

-/* Create a Directroy Object                                             */
+/* Create a Directory Object                                             */

 /*-----------------------------------------------------------------------*/
 
 FRESULT f_opendir (
 /*-----------------------------------------------------------------------*/
 
 FRESULT f_opendir (


@@ -2569,7 +2569,7 @@ FRESULT f_opendir (
 
 
 /*-----------------------------------------------------------------------*/
 
 
 /*-----------------------------------------------------------------------*/

-/* Read Directory Entry in Sequense                                      */
+/* Read Directory Entry in Sequence                                      */

 /*-----------------------------------------------------------------------*/
 
 FRESULT f_readdir (
 /*-----------------------------------------------------------------------*/
 
 FRESULT f_readdir (


@@ -2878,7 +2878,7 @@ FRESULT f_mkdir (
                                        mem_set(dir, 0, SS(dj.fs));
                                }
                        }
                                        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) res = dir_register(&dj);      /* Register the object to the directory */

                        if (res != FR_OK) {
                                remove_chain(dj.fs, dcl);                               /* Could not register, remove cluster chain */
                        } else {
                        if (res != FR_OK) {
                                remove_chain(dj.fs, dcl);                               /* Could not register, remove cluster chain */
                        } else {


@@ -2943,7 +2943,7 @@ FRESULT f_chmod (
 
 
 /*-----------------------------------------------------------------------*/
 
 
 /*-----------------------------------------------------------------------*/

-/* Change Timestamp                                                      */
+/* Change Time-stamp                                                      */

 /*-----------------------------------------------------------------------*/
 
 FRESULT f_utime (
 /*-----------------------------------------------------------------------*/
 
 FRESULT f_utime (


@@ -3177,7 +3177,7 @@ FRESULT f_mkfs (
        if (au == 0) au = 1;
        if (au > 128) au = 128;
 
        if (au == 0) au = 1;
        if (au > 128) au = 128;
 

-       /* Pre-compute number of clusters and FAT syb-type */
+       /* Pre-compute number of clusters and FAT sub-type */

        n_clst = n_vol / au;
        fmt = FS_FAT12;
        if (n_clst >= MIN_FAT16) fmt = FS_FAT16;
        n_clst = n_vol / au;
        fmt = FS_FAT12;
        if (n_clst >= MIN_FAT16) fmt = FS_FAT16;


@@ -3361,18 +3361,18 @@ TCHAR* f_gets (
 #if _LFN_UNICODE                                       /* Read a character in UTF-8 encoding */
                if (c >= 0x80) {
                        if (c < 0xC0) continue; /* Skip stray trailer */
 #if _LFN_UNICODE                                       /* Read a character in UTF-8 encoding */
                if (c >= 0x80) {
                        if (c < 0xC0) continue; /* Skip stray trailer */

-                       if (c < 0xE0) {                 /* Two-byte sequense */
+                       if (c < 0xE0) {                 /* Two-byte sequence */

                                f_read(fil, s, 1, &rc);
                                if (rc != 1) break;
                                c = ((c & 0x1F) << 6) | (s[0] & 0x3F);
                                if (c < 0x80) c = '?';
                        } else {
                                f_read(fil, s, 1, &rc);
                                if (rc != 1) break;
                                c = ((c & 0x1F) << 6) | (s[0] & 0x3F);
                                if (c < 0x80) c = '?';
                        } else {

-                               if (c < 0xF0) {         /* Three-byte sequense */
+                               if (c < 0xF0) {         /* Three-byte sequence */

                                        f_read(fil, s, 2, &rc);
                                        if (rc != 2) break;
                                        c = (c << 12) | ((s[0] & 0x3F) << 6) | (s[1] & 0x3F);
                                        if (c < 0x800) c = '?';
                                        f_read(fil, 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 sequense */
+                               } else {                        /* Reject four-byte sequence */

                                        c = '?';
                                }
                        }
                                        c = '?';
                                }
                        }


@@ -3510,7 +3510,7 @@ int f_printf (
                case 'D' :                                      /* Signed decimal */
                case 'U' :                                      /* Unsigned decimal */
                        r = 10; break;
                case 'D' :                                      /* Signed decimal */
                case 'U' :                                      /* Unsigned decimal */
                        r = 10; break;

-               case 'X' :                                      /* Hexdecimal */
+               case 'X' :                                      /* Hexadecimal */

                        r = 16; break;
                default:                                        /* Unknown */
                        cc = f_putc(c, fil); continue;
                        r = 16; break;
                default:                                        /* Unknown */
                        cc = f_putc(c, fil); continue;


@@ -3539,7 +3539,7 @@ int f_printf (
                        res++;
                }
                do {
                        res++;
                }
                do {

-                       cc = f_putc(s[--i], fil); 
+                       cc = f_putc(s[--i], fil);

                        res++;
                } while (i && cc != EOF);
                if (cc != EOF) cc = 0;
                        res++;
                } while (i && cc != EOF);
                if (cc != EOF) cc = 0;


@@ -3551,3 +3551,4 @@ int f_printf (
 
 #endif /* !_FS_READONLY */
 #endif /* _USE_STRFUNC */
 
 #endif /* !_FS_READONLY */
 #endif /* _USE_STRFUNC */

+