--- uae/src/include/autoconf.h	2018/04/24 16:42:30	1.1.1.4
+++ uae/src/include/autoconf.h	2018/04/24 17:02:27	1.1.1.7
@@ -45,18 +45,21 @@ extern int nr_units (struct uaedev_mount
 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 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 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 *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, FILE *f);
+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 *);
@@ -66,15 +69,13 @@ extern void filesys_reset (void);
 extern void filesys_prepare_reset (void);
 extern void filesys_start_threads (void);
 
-extern void reset_uaedevices (void);
-extern int get_new_device (char **devname, uaecptr *devname_amiga);
-
 extern void filesys_install (void);
 extern void filesys_install_code (void);
 extern void filesys_store_devinfo (uae_u8 *);
 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