cc3200: Speed up file system checking during start-up.

Daniel Campora · Daniel Campora · commit 651c870d77fd · 2015-08-09T22:09:16.000+02:00
diff --git a/cc3200/fatfs/src/drivers/sflash_diskio.c b/cc3200/fatfs/src/drivers/sflash_diskio.c
@@ -60,7 +60,7 @@ DRESULT sflash_disk_init (void) {
             print_block_name (i);
             sl_LockObjLock (&wlan_LockObj, SL_OS_WAIT_FOREVER);
             // Create the block file if it doesn't exist
-            if (sl_FsGetInfo(sflash_block_name, 0, &FsFileInfo) < 0) {
+            if (sl_FsGetInfo(sflash_block_name, 0, &FsFileInfo) != 0) {
                 if (!sl_FsOpen(sflash_block_name, FS_MODE_OPEN_CREATE(SFLASH_BLOCK_SIZE, 0), NULL, &fileHandle)) {
                     sl_FsClose(fileHandle, NULL, NULL, 0);
                     sl_LockObjUnlock (&wlan_LockObj);
@@ -74,6 +74,10 @@ DRESULT sflash_disk_init (void) {
                     sl_LockObjUnlock (&wlan_LockObj);
                     return RES_ERROR;
                 }
+            } else {
+                // file system exists, break here to speed up booting
+                sl_LockObjUnlock (&wlan_LockObj);
+                break;
             }
             sl_LockObjUnlock (&wlan_LockObj);
         }

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ DRESULT sflash_disk_init (void) {`
`60`	`60`	`print_block_name (i);`
`61`	`61`	`sl_LockObjLock (&wlan_LockObj, SL_OS_WAIT_FOREVER);`
`62`	`62`	`// Create the block file if it doesn't exist`
`63`		`- if (sl_FsGetInfo(sflash_block_name, 0, &FsFileInfo) < 0) {`
	`63`	`+ if (sl_FsGetInfo(sflash_block_name, 0, &FsFileInfo) != 0) {`
`64`	`64`	`if (!sl_FsOpen(sflash_block_name, FS_MODE_OPEN_CREATE(SFLASH_BLOCK_SIZE, 0), NULL, &fileHandle)) {`
`65`	`65`	`sl_FsClose(fileHandle, NULL, NULL, 0);`
`66`	`66`	`sl_LockObjUnlock (&wlan_LockObj);`
`@@ -74,6 +74,10 @@ DRESULT sflash_disk_init (void) {`
`74`	`74`	`sl_LockObjUnlock (&wlan_LockObj);`
`75`	`75`	`return RES_ERROR;`
`76`	`76`	`}`
	`77`	`+ } else {`
	`78`	`+ // file system exists, break here to speed up booting`
	`79`	`+ sl_LockObjUnlock (&wlan_LockObj);`
	`80`	`+ break;`
`77`	`81`	`}`
`78`	`82`	`sl_LockObjUnlock (&wlan_LockObj);`
`79`	`83`	`}`