--- uae/src/include/autoconf.h	2018/04/24 16:40:18	1.1.1.3
+++ uae/src/include/autoconf.h	2018/04/24 17:06:05	1.1.1.8
@@ -41,15 +41,33 @@ extern uaecptr ROM_hardfile_resname, ROM
 extern uaecptr ROM_hardfile_init;
 extern uaecptr filesys_initcode;
 
-extern char * add_filesys_unit (char *volname, char *rootdir, int readonly,
-				int secs, int surfaces, int reserved);
-extern int kill_filesys_unit (int);
-extern int sprintf_filesys_unit (char *buffer, int num);
-extern void write_filesys_config (FILE *f);
+extern int nr_units (struct uaedev_mount_info *mountinfo);
+extern int is_hardfile (struct uaedev_mount_info *mountinfo, int unit_no);
+extern char *set_filesys_unit (struct uaedev_mount_info *mountinfo, int,
+			       char *volname, char *rootdir, int readonly,
+			       int secs, int surfaces, int reserved,
+			       int blocksize);
+extern char *add_filesys_unit (struct uaedev_mount_info *mountinfo,
+			       char *volname, char *rootdir, int readonly,
+			       int secs, int surfaces, int reserved,
+			       int blocksize);
+extern char *get_filesys_unit (struct uaedev_mount_info *mountinfo, int nr,
+			       char **volname, char **rootdir, int *readonly,
+			       int *secspertrack, int *surfaces, int *reserved,
+			       int *cylinders, int *size, int *blocksize);
+extern int kill_filesys_unit (struct uaedev_mount_info *mountinfo, int);
+extern int move_filesys_unit (struct uaedev_mount_info *mountinfo, int nr, int to);
+extern int sprintf_filesys_unit (struct uaedev_mount_info *mountinfo, char *buffer, int num);
+extern void write_filesys_config (struct uaedev_mount_info *mountinfo, const char *unexpanded,
+				  const char *defaultpath, FILE *f);
+
+extern struct uaedev_mount_info *alloc_mountinfo (void);
+extern struct uaedev_mount_info *dup_mountinfo (struct uaedev_mount_info *);
+extern void free_mountinfo (struct uaedev_mount_info *);
+
 extern void filesys_reset (void);
 extern void filesys_prepare_reset (void);
 extern void filesys_start_threads (void);
-extern int get_new_device (char **devname, uaecptr *devname_amiga);
 
 extern void filesys_install (void);
 extern void filesys_install_code (void);
@@ -57,6 +75,7 @@ extern void filesys_store_devinfo (uae_u
 extern void hardfile_install (void);
 extern void emulib_install (void);
 extern void expansion_init (void);
+extern void expansion_cleanup (void);
 
 #define TRAPFLAG_NO_REGSAVE 1
 #define TRAPFLAG_NO_RETVAL 2
@@ -65,3 +84,5 @@ extern void expansion_init (void);
 
 extern uaecptr libemu_InstallFunction (TrapFunction, uaecptr, int, const char *);
 extern uaecptr libemu_InstallFunctionFlags (TrapFunction, uaecptr, int, int, const char *);
+
+#define RTAREA_BASE 0xF00000