tests: Update fatfs1 test.

Author: dpgeorge

tests/fatfs1.c

@@ -119,10 +119,6 @@ int main() {
     printf("== STAT ==\n");
     {
         FILINFO fno;
-        #if _USE_LFN
-        fno.lfname = NULL;
-        fno.lfsize = 0;
-        #endif
         FRESULT res = f_stat(&fatfs, "/test.txt", &fno);
         printf("stat res=%d size=%u date=%u time=%u attrib=%u\n", res, fno.fsize, fno.fdate, fno.ftime, fno.fattrib);
     }
@@ -170,19 +166,14 @@ int main() {
         FRESULT res = f_opendir(&fatfs, &dp, "/");
         printf("opendir res=%d\n", res);
         FILINFO fno;
-        #if _USE_LFN
-        char lfn[_MAX_LFN + 1];
-        fno.lfname = lfn;
-        fno.lfsize = sizeof(lfn);
-        #endif
         for (;;){
             res = f_readdir(&dp, &fno);
             if (res != FR_OK || fno.fname[0] == 0) {
                 break;
             }
             #if _USE_LFN
             // note: lfname is empty string if it fits in 12 chars in fname
-            printf("readdir res=%d size=%u name=/%s/ lname=/%s/\n", res, fno.fsize, fno.fname, fno.lfname);
+            printf("readdir res=%d size=%u name=/%s/ lname=/%s/\n", res, fno.fsize, fno.altname, fno.fname);
             #else
             printf("readdir res=%d size=%u name=/%s/\n", res, fno.fsize, fno.fname);
             #endif

tests/fatfs1.exp

@@ -46,7 +46,6 @@ mount res=0
 == SET LABEL ==
 disk_ioctl(0, 6)
 disk_read(0, 2, 1)
-get_fattime()
 disk_write(0, 2, 1, 0x0d96b58b)
 disk_ioctl(0, 0)
 setlabel res=0
@@ -60,14 +59,14 @@ disk_read(0, 2, 1)
 get_fattime()
 open res=0
 disk_ioctl(0, 6)
-disk_write(0, 2, 1, 0x236a437d)
+disk_write(0, 2, 1, 0xa8b3f35d)
 disk_read(0, 1, 1)
 write res=0 n=10
 disk_ioctl(0, 6)
 disk_write(0, 34, 1, <hash not shown>)
+get_fattime()
 disk_write(0, 1, 1, 0x5343a9c5)
 disk_read(0, 2, 1)
-get_fattime()
 disk_write(0, 2, 1, 0x6ae708d5)
 disk_ioctl(0, 0)
 disk_ioctl(0, 6)
@@ -90,7 +89,7 @@ disk_ioctl(0, 6)
 get_fattime()
 open res=0
 disk_ioctl(0, 6)
-disk_write(0, 2, 1, 0xf3dd04eb)
+disk_write(0, 2, 1, 0xb1d034cb)
 disk_read(0, 1, 1)
 write res=0 n=100
 disk_ioctl(0, 6)
@@ -114,9 +113,9 @@ disk_ioctl(0, 6)
 write res=0 n=100
 disk_ioctl(0, 6)
 disk_write(0, 36, 1, 0x37a6ca6c)
+get_fattime()
 disk_write(0, 1, 1, 0x7f57e755)
 disk_read(0, 2, 1)
-get_fattime()
 disk_write(0, 2, 1, 0xdd0a2fc3)
 disk_ioctl(0, 0)
 disk_ioctl(0, 6)
@@ -142,11 +141,11 @@ disk_ioctl(0, 6)
 disk_ioctl(0, 6)
 close res=0
 == MKDIR ==
-get_fattime()
 disk_ioctl(0, 6)
 disk_read(0, 2, 1)
 disk_read(0, 1, 1)
 disk_write(0, 1, 1, 0xa5c7187a)
+get_fattime()
 disk_write(0, 37, 1, 0x2953772e)
 disk_read(0, 2, 1)
 disk_write(0, 2, 1, 0x55944b21)
@@ -156,37 +155,37 @@ mkdir res=0
 disk_ioctl(0, 6)
 opendir res=0
 disk_ioctl(0, 6)
-readdir res=0 size=10 name=/test.txt/ lname=//
+readdir res=0 size=10 name=/TEST.TXT/ lname=/test.txt/
 disk_ioctl(0, 6)
 readdir res=0 size=1000 name=/FILENA~1.TXT/ lname=/filename-that-is-long.txt/
 disk_ioctl(0, 6)
-readdir res=0 size=0 name=/dir/ lname=//
+readdir res=0 size=0 name=/DIR/ lname=/dir/
 disk_ioctl(0, 6)
 disk_ioctl(0, 6)
 closedir res=0
 == RENAME FILE ==
 disk_ioctl(0, 6)
-disk_write(0, 2, 1, 0xccafbc76)
+disk_write(0, 2, 1, 0xcdb1e73c)
 disk_ioctl(0, 0)
 unlink res=0
 == UNLINK FILE ==
 disk_ioctl(0, 6)
-disk_write(0, 2, 1, 0x76e9bdff)
+disk_write(0, 2, 1, 0x12c8992d)
 disk_read(0, 1, 1)
 disk_write(0, 1, 1, 0xd19f436a)
 disk_ioctl(0, 0)
 unlink res=0
 == RENAME DIR ==
 disk_ioctl(0, 6)
 disk_read(0, 2, 1)
-disk_write(0, 2, 1, 0x1ff9ac0d)
+disk_write(0, 2, 1, 0x2b759c33)
 disk_ioctl(0, 0)
 unlink res=0
 == UNLINK DIR ==
 disk_ioctl(0, 6)
 disk_read(0, 37, 1)
 disk_read(0, 2, 1)
-disk_write(0, 2, 1, 0x6ae11ad8)
+disk_write(0, 2, 1, 0x09922d72)
 disk_read(0, 1, 1)
 disk_write(0, 1, 1, 0x61648e45)
 disk_ioctl(0, 0)

tests/fatfs1_conf.h

@@ -1,10 +1,12 @@
-#define _FFCONF         64180
+#define _FFCONF         88100
 #define _FS_READONLY    0
 #define _FS_MINIMIZE    0
 #define _USE_STRFUNC    0
 #define _USE_FIND       0
 #define _USE_MKFS       1
 #define _USE_FASTSEEK   0
+#define _USE_EXPAND     0
+#define _USE_CHMOD      1
 #define _USE_LABEL      1
 #define _USE_FORWARD    0
 #define _CODE_PAGE      437
@@ -22,6 +24,7 @@
 #define _USE_TRIM       0
 #define _FS_NOFSINFO    0
 #define _FS_TINY        0
+#define _FS_EXFAT       1
 #define _FS_NORTC       0
 #define _NORTC_MON      1
 #define _NORTC_MDAY     1
@@ -30,4 +33,3 @@
 #define _FS_REENTRANT   0
 #define _FS_TIMEOUT     1000
 #define _SYNC_t         HANDLE
-#define _WORD_ACCESS    0