extmod/vfs: Use MP_REGISTER_ROOT_POINTER().

dlech · dpgeorge · commit 32e32bd761e9 · 2022-07-18T13:52:01.000+10:00
This uses MP_REGISTER_ROOT_POINTER() to register vfs_cur and
vfs_mount_table instead of using a conditional inside of mp_state_vm_t.

Signed-off-by: David Lechner &lt;david@pybricks.com&gt;
diff --git a/extmod/vfs.c b/extmod/vfs.c
@@ -547,4 +547,7 @@ int mp_vfs_mount_and_chdir_protected(mp_obj_t bdev, mp_obj_t mount_point) {
     return ret;
 }
 
+MP_REGISTER_ROOT_POINTER(struct _mp_vfs_mount_t *vfs_cur);
+MP_REGISTER_ROOT_POINTER(struct _mp_vfs_mount_t *vfs_mount_table);
+
 #endif // MICROPY_VFS
diff --git a/py/mpstate.h b/py/mpstate.h
@@ -198,11 +198,6 @@ typedef struct _mp_state_vm_t {
 
     // root pointers for extmod
 
-    #if MICROPY_VFS
-    struct _mp_vfs_mount_t *vfs_cur;
-    struct _mp_vfs_mount_t *vfs_mount_table;
-    #endif
-
     #if MICROPY_PY_BLUETOOTH
     mp_obj_t bluetooth;
     #endif

Original file line number	Diff line number	Diff line change
`@@ -547,4 +547,7 @@ int mp_vfs_mount_and_chdir_protected(mp_obj_t bdev, mp_obj_t mount_point) {`
`547`	`547`	`return ret;`
`548`	`548`	`}`
`549`	`549`
	`550`	`+MP_REGISTER_ROOT_POINTER(struct _mp_vfs_mount_t *vfs_cur);`
	`551`	`+MP_REGISTER_ROOT_POINTER(struct _mp_vfs_mount_t *vfs_mount_table);`
	`552`	`+`
`550`	`553`	`#endif // MICROPY_VFS`