py/mpstate.h: fs_user_mount is now standard, reusable uPy functionality.

pfalcon · pfalcon · commit 72085a669bab · 2016-02-15T00:02:03.000+02:00
diff --git a/py/mpstate.h b/py/mpstate.h
@@ -136,6 +136,11 @@ typedef struct _mp_state_vm_t {
     mp_obj_t lwip_slip_stream;
     #endif
 
+    #if MICROPY_FSUSERMOUNT
+    // for user-mountable block device (max fixed at compile time)
+    struct _fs_user_mount_t *fs_user_mount[MICROPY_FATFS_VOLUMES];
+    #endif
+
     //
     // END ROOT POINTER SECTION
     ////////////////////////////////////////////////////////////
diff --git a/stmhal/mpconfigport.h b/stmhal/mpconfigport.h
@@ -183,9 +183,6 @@ extern const struct _mp_obj_module_t mp_module_network;
     /* pointers to all CAN objects (if they have been created) */ \
     struct _pyb_can_obj_t *pyb_can_obj_all[2]; \
     \
-    /* for user-mountable block device (max fixed at compile time) */ \
-    struct _fs_user_mount_t *fs_user_mount[MICROPY_FATFS_VOLUMES]; \
-    \
     /* list of registered NICs */ \
     mp_obj_list_t mod_network_nic_list; \
 
diff --git a/unix/mpconfigport.h b/unix/mpconfigport.h
@@ -264,8 +264,6 @@ extern const struct _mp_obj_fun_builtin_t mp_builtin_open_obj;
 #define MICROPY_PORT_ROOT_POINTERS \
     const char *readline_hist[50]; \
     mp_obj_t keyboard_interrupt_obj; \
-    /* for user-mountable block device (max fixed at compile time) */ \
-    struct _fs_user_mount_t *fs_user_mount[MICROPY_FATFS_VOLUMES]; \
     void *mmap_region_head; \
 
 // We need to provide a declaration/definition of alloca()

Original file line number	Diff line number	Diff line change
`@@ -183,9 +183,6 @@ extern const struct _mp_obj_module_t mp_module_network;`
`183`	`183`	`/* pointers to all CAN objects (if they have been created) */ \`
`184`	`184`	`struct _pyb_can_obj_t *pyb_can_obj_all[2]; \`
`185`	`185`	`\`
`186`		`- /* for user-mountable block device (max fixed at compile time) */ \`
`187`		`- struct _fs_user_mount_t *fs_user_mount[MICROPY_FATFS_VOLUMES]; \`
`188`		`- \`
`189`	`186`	`/* list of registered NICs */ \`
`190`	`187`	`mp_obj_list_t mod_network_nic_list; \`
`191`	`188`