--- uae/src/include/autoconf.h	2018/04/24 16:42:30	1.1.1.4
+++ uae/src/include/autoconf.h	2018/04/24 17:17:03	1.1.1.9
@@ -6,10 +6,6 @@
   * (c) 1996 Ed Hanway
   */
 
-typedef uae_u32 (*TrapFunction) (void);
-
-extern int lasttrap;
-extern void do_emultrap (int nr);
 
 extern uae_u32 addr (int);
 extern void db (uae_u8);
@@ -19,11 +15,8 @@ extern uae_u32 ds (char *);
 extern void calltrap (uae_u32);
 extern void org (uae_u32);
 extern uae_u32 here (void);
-extern int deftrap2 (TrapFunction func, int mode, const char *str);
-extern int deftrap (TrapFunction);
+extern uae_u32 m68k_mode_return (void);
 extern void align (int);
-extern uae_u32 CallLib (uaecptr base, uae_s16 offset);
-extern void call_calltrap (int nr) REGPARAM;
 
 extern volatile int uae_int_requested;
 extern void set_uae_int_flag (void);
@@ -45,18 +38,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,20 +62,12 @@ 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
-#define TRAPFLAG_EXTRA_STACK 4
-#define TRAPFLAG_DORET 8
-
-extern uaecptr libemu_InstallFunction (TrapFunction, uaecptr, int, const char *);
-extern uaecptr libemu_InstallFunctionFlags (TrapFunction, uaecptr, int, int, const char *);
+#define RTAREA_BASE 0xF00000