StackRduino
diff --git a/‎atmel-samd/access_vfs.c‎
Lines changed: 6 additions & 4 deletions b/‎atmel-samd/access_vfs.c‎
Lines changed: 6 additions & 4 deletions
diff --git a/‎atmel-samd/main.c‎
Lines changed: 12 additions & 3 deletions b/‎atmel-samd/main.c‎
Lines changed: 12 additions & 3 deletions
@@ -55,18 +55,20 @@ Ctrl_status vfs_test_unit_ready(void)
 }
 
 //! This function returns the address of the last valid sector
-//! @param uint32_t_nb_sector  Pointer to number of sectors (sector=512 bytes)
+//! @param uint32_t_nb_sector  Pointer to the last valid sector (sector=512 bytes)
 //! @return                            Ctrl_status
 //!   It is ready                ->    CTRL_GOOD
 //!   Memory unplug              ->    CTRL_NO_PRESENT
 //!   Not initialized or changed ->    CTRL_BUSY
 //!   An error occurred          ->    CTRL_FAIL
-Ctrl_status vfs_read_capacity(uint32_t *uint32_t_nb_sector)
+Ctrl_status vfs_read_capacity(uint32_t *last_valid_sector)
 {
-    if (disk_ioctl(VFS_INDEX, GET_SECTOR_COUNT, uint32_t_nb_sector) != RES_OK) {
+    if (disk_ioctl(VFS_INDEX, GET_SECTOR_COUNT, last_valid_sector) != RES_OK) {
         return CTRL_FAIL;
     }
-	return CTRL_GOOD;
+    // Subtract one from the sector count to get the last valid sector.
+    (*last_valid_sector)--;
+    return CTRL_GOOD;
 }
 
 //! This function returns the write-protected mode
 
@@ -10,6 +10,7 @@
 #include "py/gc.h"
 
 #include "lib/fatfs/ff.h"
+#include "lib/fatfs/diskio.h"
 #include "lib/utils/pyexec.h"
 #include "extmod/fsusermount.h"
 
@@ -160,6 +161,12 @@ static char *stack_top;
 static char heap[16384];
 
 void reset_mp() {
+    // Sync the file systems in case any used RAM from the GC to cache. As soon
+    // as we re-init the GC all bets are off on the cache.
+    disk_ioctl(0, CTRL_SYNC, NULL);
+    disk_ioctl(1, CTRL_SYNC, NULL);
+    disk_ioctl(2, CTRL_SYNC, NULL);
+
     #if MICROPY_ENABLE_GC
     gc_init(heap, heap + sizeof(heap));
     #endif
@@ -185,9 +192,6 @@ int main(int argc, char **argv) {
     samd21_init();
     #endif
 
-    // Initialise the local flash filesystem.
-    // Create it if needed, mount in on /flash, and set it as current dir.
-    init_flash_fs();
 
     int stack_dummy;
     // Store the location of stack_dummy as an approximation for the top of the
@@ -196,6 +200,11 @@ int main(int argc, char **argv) {
     stack_top = (char*)&stack_dummy;
     reset_mp();
 
+    // Initialise the local flash filesystem after the gc in case we need to
+    // grab memory from it. Create it if needed, mount in on /flash, and set it
+    // as current dir.
+    init_flash_fs();
+
     // Start USB after getting everything going.
     #ifdef USB_REPL
         udc_start();
Original file line number	Diff line number	Diff line change
`@@ -55,18 +55,20 @@ Ctrl_status vfs_test_unit_ready(void)`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`//! This function returns the address of the last valid sector`
`58`		`-//! @param uint32_t_nb_sector Pointer to number of sectors (sector=512 bytes)`
	`58`	`+//! @param uint32_t_nb_sector Pointer to the last valid sector (sector=512 bytes)`
`59`	`59`	`//! @return Ctrl_status`
`60`	`60`	`//! It is ready -> CTRL_GOOD`
`61`	`61`	`//! Memory unplug -> CTRL_NO_PRESENT`
`62`	`62`	`//! Not initialized or changed -> CTRL_BUSY`
`63`	`63`	`//! An error occurred -> CTRL_FAIL`
`64`		`-Ctrl_status vfs_read_capacity(uint32_t *uint32_t_nb_sector)`
	`64`	`+Ctrl_status vfs_read_capacity(uint32_t *last_valid_sector)`
`65`	`65`	`{`
`66`		`- if (disk_ioctl(VFS_INDEX, GET_SECTOR_COUNT, uint32_t_nb_sector) != RES_OK) {`
	`66`	`+ if (disk_ioctl(VFS_INDEX, GET_SECTOR_COUNT, last_valid_sector) != RES_OK) {`
`67`	`67`	`return CTRL_FAIL;`
`68`	`68`	`}`
`69`		`- return CTRL_GOOD;`
	`69`	`+ // Subtract one from the sector count to get the last valid sector.`
	`70`	`+ (*last_valid_sector)--;`
	`71`	`+ return CTRL_GOOD;`
`70`	`72`	`}`
`71`	`73`
`72`	`74`	`//! This function returns the write-protected mode`