--- uae/src/cfgfile.c	2018/04/24 16:44:54	1.1
+++ uae/src/cfgfile.c	2018/04/24 17:10:53	1.1.1.14
@@ -14,15 +14,11 @@
 
 #include "config.h"
 #include "options.h"
-#include "threaddep/penguin.h"
+#include "threaddep/thread.h"
 #include "uae.h"
 #include "autoconf.h"
-
-struct mount_data {
-    struct mount_data *next;
-    int secs, heads, reserved, bs, ro;
-    char *aname, *root;
-};
+#include "events.h"
+#include "custom.h"
 
 /* @@@ need to get rid of this... just cut part of the manual and print that
  * as a help text.  */
@@ -76,6 +72,7 @@ static struct cfg_lines opttable[] =
     {"joyport0", "" },
     {"joyport1", "" },
     {"kickstart_rom_file", "Kickstart ROM image, (C) Copyright Amiga, Inc." },
+    {"kickstart_ext_rom_file", "Extended Kickstart ROM image, (C) Copyright Amiga, Inc." },
     {"kickstart_key_file", "Key-file for encrypted ROM images (from Cloanto's Amiga Forever)" },
     {"floppy0", "Diskfile for drive 0" },
     {"floppy1", "Diskfile for drive 1" },
@@ -85,18 +82,28 @@ static struct cfg_lines opttable[] =
     {"filesystem", "access,'Amiga volume-name':'host directory path' - where 'access' can be 'read-only' or 'read-write'" }
 };
 
+static const char *guimode1[] = { "no", "yes", "nowait", 0 };
+static const char *guimode2[] = { "false", "true", "nowait", 0 };
+static const char *guimode3[] = { "0", "1", "nowait", 0 };
+static const char *csmode[] = { "ocs", "ecs_agnus", "ecs_denise", "ecs", "aga", 0 };
 static const char *linemode1[] = { "none", "double", "scanlines", 0 };
 static const char *linemode2[] = { "n", "d", "s", 0 };
 static const char *speedmode[] = { "max", "real", 0 };
-static const char *cpumode[] = { "68000", "68000", "68010", "68010",
-				 "68ec020", "68020", "68ec020/68881", "68020/68881", 0 };
+static const char *cpumode[] = {
+    "68000", "68000", "68010", "68010", "68ec020", "68020", "68ec020/68881", "68020/68881",
+    "68040", "68040", 0
+};
 static const char *portmode[] = { "joy0", "joy1", "mouse", "kbd1", "kbd2", "kbd3", 0 };
 static const char *colormode1[] = { "8bit", "15bit", "16bit", "8bit_dither", "4bit_dither", "32bit", 0 };
 static const char *colormode2[] = { "8", "15", "16", "8d", "4d", "32", 0 };
 static const char *soundmode[] = { "none", "interrupts", "normal", "exact", 0 };
-static const char *stereomode1[] = { "mono", "stereo", 0 };
-static const char *stereomode2[] = { "m", "s", 0 };
-static const char *stereomode3[] = { "1", "2", 0 };
+static const char *centermode1[] = { "none", "simple", "smart", 0 };
+static const char *centermode2[] = { "false", "true", "smart", 0 };
+static const char *stereomode1[] = { "mono", "stereo", "mixed", 0 };
+static const char *stereomode2[] = { "m", "s", "x", 0 };
+static const char *stereomode3[] = { "1", "2", "3", 0 };
+static const char *interpolmode[] = { "none", "rh", "crux", 0 };
+static const char *collmode[] = { "none", "sprites", "playfields", "full", 0 };
 
 #define UNEXPANDED "$(FILE_PATH)"
 
@@ -143,29 +150,37 @@ void save_options (FILE *f, struct uae_p
     fprintf (f, "%s.floppy_path=%s\n", TARGET_NAME, p->path_floppy);
     fprintf (f, "%s.hardfile_path=%s\n", TARGET_NAME, p->path_hardfile);
 
-    fprintf (f, "use_gui=%s\n", p->start_gui ? "true" : "false");
+    target_save_options (f, p);
+
+    fprintf (f, "use_gui=%s\n", guimode1[p->start_gui]);
     fprintf (f, "use_debugger=%s\n", p->start_debugger ? "true" : "false");
     str = cfgfile_subst_path (p->path_rom, UNEXPANDED, p->romfile);
     fprintf (f, "kickstart_rom_file=%s\n", str);
     free (str);
+    str = cfgfile_subst_path (p->path_rom, UNEXPANDED, p->romextfile);
+    fprintf (f, "kickstart_ext_rom_file=%s\n", str);
+    free (str);
     str = cfgfile_subst_path (p->path_rom, UNEXPANDED, p->keyfile);
     fprintf (f, "kickstart_key_file=%s\n", str);
     free (str);
+    fprintf (f, "kickshifter=%s\n", p->kickshifter ? "true" : "false");
 
     for (i = 0; i < 4; i++) {
 	str = cfgfile_subst_path (p->path_floppy, UNEXPANDED, p->df[i]);
 	fprintf (f, "floppy%d=%s\n", i, str);
 	free (str);
     }
+    fprintf (f, "nr_floppies=%d\n", p->nr_floppies);
     fprintf (f, "parallel_on_demand=%s\n", p->parallel_demand ? "true" : "false");
     fprintf (f, "serial_on_demand=%s\n", p->serial_demand ? "true" : "false");
 
     fprintf (f, "sound_output=%s\n", soundmode[p->produce_sound]);
-    fprintf (f, "sound_channels=%s\n", stereomode1[p->stereo]);
+    fprintf (f, "sound_channels=%s\n", stereomode1[p->sound_stereo + p->mixed_stereo]);
     fprintf (f, "sound_bits=%d\n", p->sound_bits);
     fprintf (f, "sound_min_buff=%d\n", p->sound_minbsiz);
     fprintf (f, "sound_max_buff=%d\n", p->sound_maxbsiz);
     fprintf (f, "sound_frequency=%d\n", p->sound_freq);
+    fprintf (f, "sound_interpol=%s\n", interpolmode[p->sound_interpol]);
 
     fprintf (f, "sound_pri_time=%d\n", p->sound_pri_time);
     fprintf (f, "sound_pri_cutoff=%d\n", p->sound_pri_cutoff);
@@ -173,8 +188,9 @@ void save_options (FILE *f, struct uae_p
     fprintf (f, "joyport0=%s\n", portmode[p->jport0]);
     fprintf (f, "joyport1=%s\n", portmode[p->jport1]);
 
-    fprintf (f, "framerate=%d\n", p->framerate);
+    fprintf (f, "bsdsocket_emu=%s\n", p->socket_emu ? "true" : "false");
 
+    fprintf (f, "gfx_framerate=%d\n", p->gfx_framerate);
     fprintf (f, "gfx_width=%d\n", p->gfx_width);
     fprintf (f, "gfx_height=%d\n", p->gfx_height);
     fprintf (f, "gfx_lores=%s\n", p->gfx_lores ? "true" : "false");
@@ -182,12 +198,23 @@ void save_options (FILE *f, struct uae_p
     fprintf (f, "gfx_correct_aspect=%s\n", p->gfx_correct_aspect ? "true" : "false");
     fprintf (f, "gfx_fullscreen_amiga=%s\n", p->gfx_afullscreen ? "true" : "false");
     fprintf (f, "gfx_fullscreen_picasso=%s\n", p->gfx_pfullscreen ? "true" : "false");
-    fprintf (f, "gfx_center_horizontal=%s\n", p->gfx_xcenter ? "true" : "false");
-    fprintf (f, "gfx_center_vertical=%s\n", p->gfx_ycenter ? "true" : "false");
+    fprintf (f, "gfx_center_horizontal=%s\n", centermode1[p->gfx_xcenter]);
+    fprintf (f, "gfx_center_vertical=%s\n", centermode1[p->gfx_ycenter]);
     fprintf (f, "gfx_colour_mode=%s\n", colormode1[p->color_mode]);
 
-    fprintf (f, "32bit_blits=%s\n", p->blits_32bit_enabled ? "true" : "false");
     fprintf (f, "immediate_blits=%s\n", p->immediate_blits ? "true" : "false");
+    fprintf (f, "ntsc=%s\n", p->ntscmode ? "true" : "false");
+    if (p->chipset_mask & CSMASK_AGA)
+	fprintf (f, "chipset=aga\n");
+    else if ((p->chipset_mask & CSMASK_ECS_AGNUS) && (p->chipset_mask & CSMASK_ECS_AGNUS))
+	fprintf (f, "chipset=ecs\n");
+    else if (p->chipset_mask & CSMASK_ECS_AGNUS)
+	fprintf (f, "chipset=ecs_agnus\n");
+    else if (p->chipset_mask & CSMASK_ECS_DENISE)
+	fprintf (f, "chipset=ecs_denise\n");
+    else
+	fprintf (f, "chipset=ocs\n");
+    fprintf (f, "collision_level=%s\n", collmode[p->collision_level]);
 
     fprintf (f, "fastmem_size=%d\n", p->fastmem_size / 0x100000);
     fprintf (f, "a3000mem_size=%d\n", p->a3000mem_size / 0x100000);
@@ -196,19 +223,19 @@ void save_options (FILE *f, struct uae_p
     fprintf (f, "gfxcard_size=%d\n", p->gfxmem_size / 0x100000);
     fprintf (f, "chipmem_size=%d\n", p->chipmem_size / 0x80000);
 
-    if (currprefs.m68k_speed > 0)
-	fprintf (f, "cpu_speed=%d\n", p->m68k_speed);
+    if (p->m68k_speed > 0)
+	fprintf (f, "finegrain_cpu_speed=%d\n", p->m68k_speed);
     else
 	fprintf (f, "cpu_speed=%s\n", p->m68k_speed == -1 ? "max" : "real");
 
     fprintf (f, "cpu_type=%s\n", cpumode[p->cpu_level * 2 + !p->address_space_24]);
     fprintf (f, "cpu_compatible=%s\n", p->cpu_compatible ? "true" : "false");
-    fprintf (f, "autoconfig=%s\n", p->automount_uaedev ? "true" : "false");
 
     fprintf (f, "accuracy=%d\n", p->emul_accuracy);
     fprintf (f, "log_illegal_mem=%s\n", p->illegal_mem ? "true" : "false");
 
     fprintf (f, "kbd_lang=%s\n", (p->keyboard_lang == KBD_LANG_DE ? "de"
+				  : p->keyboard_lang == KBD_LANG_DK ? "dk"
 				  : p->keyboard_lang == KBD_LANG_ES ? "es"
 				  : p->keyboard_lang == KBD_LANG_US ? "us"
 				  : p->keyboard_lang == KBD_LANG_SE ? "se"
@@ -259,8 +286,10 @@ int cfgfile_strval (char *option, char *
 	return 0;
     val = match_string (table, value);
     if (val == -1) {
-	if (! more)
-	    write_log ("Unknown value for option `%s'.\n", option);
+	if (more)
+	    return 0;
+
+	write_log ("Unknown value for option `%s'.\n", option);
 	return 1;
     }
     *location = val;
@@ -299,11 +328,22 @@ static int getintval (char **p, int *res
     return 1;
 }
 
-int cfgfile_parse_option (struct uae_prefs *p, char *option, char *value,
-			  struct mount_data **pmqueue)
+static void set_chipset_mask (struct uae_prefs *p, int val)
+{
+    p->chipset_mask = (val == 0 ? 0
+		       : val == 1 ? CSMASK_ECS_AGNUS
+		       : val == 2 ? CSMASK_ECS_DENISE
+		       : val == 3 ? CSMASK_ECS_DENISE | CSMASK_ECS_AGNUS
+		       : CSMASK_AGA | CSMASK_ECS_DENISE | CSMASK_ECS_AGNUS);
+}
+
+int cfgfile_parse_option (struct uae_prefs *p, char *option, char *value)
 {
+    int tmpval;
+    int dummy;
     char *section = 0;
     char *tmpp;
+
     for (tmpp = option; *tmpp != '\0'; tmpp++)
 	if (isupper (*tmpp))
 	    *tmpp = tolower (*tmpp);
@@ -323,18 +363,18 @@ int cfgfile_parse_option (struct uae_pre
 	return 0;
     }
     if (cfgfile_yesno (option, value, "use_debugger", &p->start_debugger)
-	|| cfgfile_yesno (option, value, "use_gui", &p->start_gui)
+	|| cfgfile_yesno (option, value, "bsdsocket_emu", &p->socket_emu)
 	|| cfgfile_yesno (option, value, "immediate_blits", &p->immediate_blits)
-	|| cfgfile_yesno (option, value, "32bit_blits", &p->blits_32bit_enabled)
+	|| cfgfile_yesno (option, value, "kickshifter", &p->kickshifter)
 	|| cfgfile_yesno (option, value, "gfx_lores", &p->gfx_lores)
 	|| cfgfile_yesno (option, value, "gfx_correct_aspect", &p->gfx_correct_aspect)
 	|| cfgfile_yesno (option, value, "gfx_fullscreen_amiga", &p->gfx_afullscreen)
 	|| cfgfile_yesno (option, value, "gfx_fullscreen_picasso", &p->gfx_pfullscreen)
-	|| cfgfile_yesno (option, value, "gfx_center_horizontal", &p->gfx_xcenter)
-	|| cfgfile_yesno (option, value, "gfx_center_vertical", &p->gfx_ycenter)
+	|| cfgfile_yesno (option, value, "ntsc", &p->ntscmode)
 	|| cfgfile_yesno (option, value, "cpu_compatible", &p->cpu_compatible)
 	|| cfgfile_yesno (option, value, "cpu_24bit_addressing", &p->address_space_24)
-	|| cfgfile_yesno (option, value, "autoconfig", &p->automount_uaedev)
+	/* For backward compatibility.  */
+	|| cfgfile_yesno (option, value, "autoconfig", &dummy)
 	|| cfgfile_yesno (option, value, "parallel_on_demand", &p->parallel_demand)
 	|| cfgfile_yesno (option, value, "serial_on_demand", &p->serial_demand)
 	|| cfgfile_yesno (option, value, "log_illegal_mem", &p->illegal_mem))
@@ -346,7 +386,7 @@ int cfgfile_parse_option (struct uae_pre
 	|| cfgfile_intval (option, value, "sound_bits", &p->sound_bits, 1)
 	|| cfgfile_intval (option, value, "sound_pri_cutoff", &p->sound_pri_cutoff, 1)
 	|| cfgfile_intval (option, value, "sound_pri_time", &p->sound_pri_time, 1)
-	|| cfgfile_intval (option, value, "framerate", &p->framerate, 1)
+	|| cfgfile_intval (option, value, "gfx_framerate", &p->gfx_framerate, 1)
 	|| cfgfile_intval (option, value, "gfx_width", &p->gfx_width, 1)
 	|| cfgfile_intval (option, value, "gfx_height", &p->gfx_height, 1)
 	|| cfgfile_intval (option, value, "fastmem_size", &p->fastmem_size, 0x100000)
@@ -354,16 +394,23 @@ int cfgfile_parse_option (struct uae_pre
 	|| cfgfile_intval (option, value, "z3mem_size", &p->z3fastmem_size, 0x100000)
 	|| cfgfile_intval (option, value, "bogomem_size", &p->bogomem_size, 0x40000)
 	|| cfgfile_intval (option, value, "gfxcard_size", &p->gfxmem_size, 0x100000)
-	|| cfgfile_intval (option, value, "chipmem_size", &p->chipmem_size, 0x80000))
+	|| cfgfile_intval (option, value, "chipmem_size", &p->chipmem_size, 0x80000)
+	|| cfgfile_intval (option, value, "nr_floppies", &p->nr_floppies, 1))
 	return 1;
     if (cfgfile_strval (option, value, "sound_output", &p->produce_sound, soundmode, 0)
-	|| cfgfile_strval (option, value, "sound_channels", &p->stereo, stereomode1, 1)
-	|| cfgfile_strval (option, value, "sound_channels", &p->stereo, stereomode2, 1)
-	|| cfgfile_strval (option, value, "sound_channels", &p->stereo, stereomode3, 0)
+	|| cfgfile_strval (option, value, "sound_interpol", &p->sound_interpol, interpolmode, 0)
 	|| cfgfile_strval (option, value, "joyport0", &p->jport0, portmode, 0)
 	|| cfgfile_strval (option, value, "joyport1", &p->jport1, portmode, 0)
+	|| cfgfile_strval (option, value, "use_gui", &p->start_gui, guimode1, 1)
+	|| cfgfile_strval (option, value, "use_gui", &p->start_gui, guimode2, 1)
+	|| cfgfile_strval (option, value, "use_gui", &p->start_gui, guimode3, 0)
+	|| cfgfile_strval (option, value, "collision_level", &p->collision_level, collmode, 0)
 	|| cfgfile_strval (option, value, "gfx_linemode", &p->gfx_linedbl, linemode1, 1)
 	|| cfgfile_strval (option, value, "gfx_linemode", &p->gfx_linedbl, linemode2, 0)
+	|| cfgfile_strval (option, value, "gfx_center_horizontal", &p->gfx_xcenter, centermode1, 1)
+	|| cfgfile_strval (option, value, "gfx_center_vertical", &p->gfx_ycenter, centermode1, 1)
+	|| cfgfile_strval (option, value, "gfx_center_horizontal", &p->gfx_xcenter, centermode2, 0)
+	|| cfgfile_strval (option, value, "gfx_center_vertical", &p->gfx_ycenter, centermode2, 0)
 	|| cfgfile_strval (option, value, "gfx_colour_mode", &p->color_mode, colormode1, 1)
 	|| cfgfile_strval (option, value, "gfx_colour_mode", &p->color_mode, colormode2, 0)
 	|| cfgfile_strval (option, value, "gfx_color_mode", &p->color_mode, colormode1, 1)
@@ -374,26 +421,57 @@ int cfgfile_parse_option (struct uae_pre
 	|| cfgfile_string (option, value, "floppy2", p->df[2], 256)
 	|| cfgfile_string (option, value, "floppy3", p->df[3], 256)
 	|| cfgfile_string (option, value, "kickstart_rom_file", p->romfile, 256)
+	|| cfgfile_string (option, value, "kickstart_ext_rom_file", p->romextfile, 256)
 	|| cfgfile_string (option, value, "kickstart_key_file", p->keyfile, 256)
-	|| cfgfile_string (option, value, "description", p->description, 256))
+	|| cfgfile_string (option, value, "config_description", p->description, 256))
 	return 1;
 
     /* Tricky ones... */
+    if (cfgfile_strval (option, value, "chipset", &tmpval, csmode, 0)) {
+	set_chipset_mask (p, tmpval);
+	return 1;
+    }
+
+    if (cfgfile_strval (option, value, "sound_channels", &p->sound_stereo, stereomode1, 1)
+	|| cfgfile_strval (option, value, "sound_channels", &p->sound_stereo, stereomode2, 1)
+	|| cfgfile_strval (option, value, "sound_channels", &p->sound_stereo, stereomode3, 0))
+    {
+	p->mixed_stereo = 0;
+	if (p->sound_stereo == 2) {
+	    p->sound_stereo = 1;
+	    p->mixed_stereo = 1;
+	}
+	return 1;
+    }
+
     if (cfgfile_strval (option, value, "cpu_type", &p->cpu_level, cpumode, 0)) {
-	p->address_space_24 = !(p->cpu_level & 1);
+	p->address_space_24 = p->cpu_level < 8 && !(p->cpu_level & 1);
 	p->cpu_level >>= 1;
 	return 1;
     }
-    if (cfgfile_strval (option, value, "cpu_speed", &p->m68k_speed, speedmode, 1)) {
+    if (cfgfile_strval (option, value, "cpu_speed", &p->m68k_speed, speedmode, 1)
+	/* Broken earlier versions used to write this out as a string.  */
+	|| cfgfile_strval (option, value, "finegraincpu_speed", &p->m68k_speed, speedmode, 1))
+    {
 	p->m68k_speed--;
 	return 1;
     }
-    if (cfgfile_intval (option, value, "cpu_speed", &p->m68k_speed, 1))
+    if (cfgfile_intval (option, value, "cpu_speed", &p->m68k_speed, 1)) {
+        p->m68k_speed *= CYCLE_UNIT;
 	return 1;
+    }
+    if (cfgfile_intval (option, value, "finegrain_cpu_speed", &p->m68k_speed, 1)) {
+	if (OFFICIAL_CYCLE_UNIT > CYCLE_UNIT) {
+	    int factor = OFFICIAL_CYCLE_UNIT / CYCLE_UNIT;
+	    p->m68k_speed = (p->m68k_speed + factor - 1) / factor;
+	}
+	return 1;
+    }
 
     if (strcmp (option, "kbd_lang") == 0) {
 	KbdLang l;
 	if ((l = KBD_LANG_DE, strcasecmp (value, "de") == 0)
+	    || (l = KBD_LANG_DK, strcasecmp (value, "dk") == 0)
 	    || (l = KBD_LANG_SE, strcasecmp (value, "se") == 0)
 	    || (l = KBD_LANG_US, strcasecmp (value, "us") == 0)
 	    || (l = KBD_LANG_FR, strcasecmp (value, "fr") == 0)
@@ -408,9 +486,10 @@ int cfgfile_parse_option (struct uae_pre
     if (strcmp (option, "filesystem") == 0
 	|| strcmp (option, "hardfile") == 0)
     {
-	struct mount_data *data = xmalloc (sizeof (struct mount_data));
+	int secs, heads, reserved, bs, ro;
+	char *aname, *root;
 	char *tmpp = strchr (value, ',');
-
+	char *str;
 	if (tmpp == 0)
 	    goto invalid_fs;
 
@@ -418,14 +497,14 @@ int cfgfile_parse_option (struct uae_pre
 	if (strcmp (value, "0") == 0 || strcasecmp (value, "ro") == 0
 	    || strcasecmp (value, "readonly") == 0
 	    || strcasecmp (value, "read-only") == 0)
-	    data->ro = 1;
+	    ro = 1;
 	else if (strcmp (value, "1") == 0 || strcasecmp (value, "rw") == 0
 		 || strcasecmp (value, "readwrite") == 0
 		 || strcasecmp (value, "read-write") == 0)
-	    data->ro = 0;
+	    ro = 0;
 	else
 	    goto invalid_fs;
-	data->secs = 0; data->heads = 0; data->reserved = 0; data->bs = 0;
+	secs = 0; heads = 0; reserved = 0; bs = 0;
 
 	value = tmpp;
 	if (strcmp (option, "filesystem") == 0) {
@@ -433,36 +512,26 @@ int cfgfile_parse_option (struct uae_pre
 	    if (tmpp == 0)
 		goto invalid_fs;
 	    *tmpp++ = '\0';
-	    data->aname = my_strdup (value);
-	    data->root = my_strdup (tmpp);
+	    aname = value;
+	    root = tmpp;
 	} else {
-	    if (! getintval (&value, &data->secs, ',')
-		|| ! getintval (&value, &data->heads, ',')
-		|| ! getintval (&value, &data->reserved, ',')
-		|| ! getintval (&value, &data->bs, ','))
+	    if (! getintval (&value, &secs, ',')
+		|| ! getintval (&value, &heads, ',')
+		|| ! getintval (&value, &reserved, ',')
+		|| ! getintval (&value, &bs, ','))
 		goto invalid_fs;
-	    data->root = my_strdup (value);
-	    data->aname = 0;
-	}
-	if (pmqueue == 0) {
-	    char *str = cfgfile_subst_path (UNEXPANDED, p->path_hardfile, data->root);
-	    tmpp = add_filesys_unit (p->mountinfo, data->aname, str, data->ro, data->secs,
-				     data->heads, data->reserved, data->bs);
-	    free (str);
-	    if (tmpp)
-		write_log ("Error: %s\n", tmpp);
-	    free (data->root);
-	    if (data->aname)
-		free (data->aname);
-	    free (data);
-	} else {
-	    data->next = *pmqueue;
-	    *pmqueue = data;
+	    root = value;
+	    aname = 0;
 	}
+	str = cfgfile_subst_path (UNEXPANDED, p->path_hardfile, root);
+	tmpp = add_filesys_unit (p->mountinfo, aname, str, ro, secs,
+				 heads, reserved, bs);
+	free (str);
+	if (tmpp)
+	    write_log ("Error: %s\n", tmpp);
 	return 1;
 
       invalid_fs:
-	free (data);
 	write_log ("Invalid filesystem/hardfile specification.\n");
 	return 1;
     }
@@ -470,7 +539,7 @@ int cfgfile_parse_option (struct uae_pre
     return 0;
 }
 
-void cfgfile_parse_line (struct uae_prefs *p, char *line, struct mount_data **pmqueue)
+void cfgfile_parse_line (struct uae_prefs *p, char *line)
 {
     int i;
     char *orig_line = my_strdup (line);
@@ -486,12 +555,18 @@ void cfgfile_parse_line (struct uae_pref
     *line2++ = '\0';
 
     /* Get rid of whitespace.  */
-    line2[strcspn (line2, "\t \r\n")] = '\0';
+    i = strlen (line2);
+    while (i > 0 && (line2[i - 1] == '\t' || line2[i - 1] == ' '
+		     || line2[i - 1] == '\r' || line2[i - 1] == '\n'))
+	line2[--i] = '\0';
     line2 += strspn (line2, "\t \r\n");
-    line[strcspn (line, "\t \r\n")] = '\0';
+    i = strlen (line);
+    while (i > 0 && (line[i - 1] == '\t' || line[i - 1] == ' '
+		     || line[i - 1] == '\r' || line[i - 1] == '\n'))
+	line[--i] = '\0';
     line += strspn (line, "\t \r\n");
 
-    if (! cfgfile_parse_option (p, line, line2, pmqueue)) {
+    if (! cfgfile_parse_option (p, line, line2)) {
 	struct strlist *u = xmalloc (sizeof (struct strlist));
 	u->str = orig_line;
 	u->next = p->unknown_lines;
@@ -510,47 +585,32 @@ static void subst (char *p, char *f, int
 
 int cfgfile_load (struct uae_prefs *p, const char *filename)
 {
-    struct mount_data *q = 0;
-    char *str;
     int i;
 
     FILE *fh;
     char line[256];
 
-    fh = fopen (filename, "rt");
+    fh = fopen (filename, "r");
     if (! fh)
 	return 0;
 
     while (fgets (line, 256, fh) != 0) {
-	line[strcspn (line, "\t \r\n")] = '\0';
+	int len = strlen (line);
+	/* Delete trailing whitespace.  */
+	while (len > 0 && strcspn (line + len - 1, "\t \r\n") == 0) {
+	    line[--len] = '\0';
+	}
 	if (strlen (line) > 0)
-	    cfgfile_parse_line (p, line, &q);
+	    cfgfile_parse_line (p, line);
     }
     fclose (fh);
 
     for (i = 0; i < 4; i++)
 	subst (p->path_floppy, p->df[i], sizeof p->df[i]);
     subst (p->path_rom, p->romfile, sizeof p->romfile);
+    subst (p->path_rom, p->romextfile, sizeof p->romextfile);
     subst (p->path_rom, p->keyfile, sizeof p->keyfile);
 
-    while (q != 0) {
-	const char *errstr;
-	struct mount_data *data = q;
-
-	str = cfgfile_subst_path (UNEXPANDED, p->path_hardfile, data->root);
-	errstr = add_filesys_unit (p->mountinfo, data->aname, str, data->ro, data->secs,
-				   data->heads, data->reserved, data->bs);
-	free (str);
-
-	if (errstr)
-	    write_log ("Error: %s\n", errstr);
-	q = data->next;
-	free (data->root);
-	if (data->aname)
-	    free (data->aname);
-	free (data);
-    }
-	
     return 1;
 }
 
@@ -571,7 +631,7 @@ int cfgfile_get_description (const char
     struct uae_prefs p;
     default_prefs (&p);
     strcpy (p.description, "");
-    if (cfgfile_load (&p, filename) && strlen (p.description) != 0) {
+    if (cfgfile_load (&p, filename)) {
 	result = 1;
 	strcpy (description, p.description);
     }
@@ -587,3 +647,340 @@ void cfgfile_show_usage (void)
     for (i = 0; i < sizeof opttable / sizeof *opttable; i++)
 	fprintf (stderr, "%s: %s\n", opttable[i].config_label, opttable[i].config_help);
 }
+
+/* This implements the old commandline option parsing.  I've re-added this
+   because the new way of doing things is painful for me (it requires me
+   to type a couple hundred characters when invoking UAE).  The following
+   is far less annoying to use.  */
+static void parse_gfx_specs (char *spec)
+{
+    char *x0 = my_strdup (spec);
+    char *x1, *x2;
+
+    x1 = strchr (x0, ':');
+    if (x1 == 0)
+	goto argh;
+    x2 = strchr (x1+1, ':');
+    if (x2 == 0)
+	goto argh;
+    *x1++ = 0; *x2++ = 0;
+
+    currprefs.gfx_width = atoi (x0);
+    currprefs.gfx_height = atoi (x1);
+    currprefs.gfx_lores = strchr (x2, 'l') != 0;
+    currprefs.gfx_xcenter = strchr (x2, 'x') != 0 ? 1 : strchr (x2, 'X') != 0 ? 2 : 0;
+    currprefs.gfx_ycenter = strchr (x2, 'y') != 0 ? 1 : strchr (x2, 'Y') != 0 ? 2 : 0;
+    currprefs.gfx_linedbl = strchr (x2, 'd') != 0;
+    currprefs.gfx_linedbl += 2 * (strchr (x2, 'D') != 0);
+    currprefs.gfx_afullscreen = strchr (x2, 'a') != 0;
+    currprefs.gfx_pfullscreen = strchr (x2, 'p') != 0;
+    currprefs.gfx_correct_aspect = strchr (x2, 'c') != 0;
+
+    if (currprefs.gfx_linedbl == 3) {
+	fprintf (stderr, "You can't use both 'd' and 'D' modifiers in the display mode specification.\n");
+    }
+    
+    free (x0);
+    return;
+
+    argh:
+    fprintf (stderr, "Bad display mode specification.\n");
+    fprintf (stderr, "The format to use is: \"width:height:modifiers\"\n");
+    fprintf (stderr, "Type \"uae -h\" for detailed help.\n");
+    free (x0);
+}
+
+static void parse_sound_spec (char *spec)
+{
+    char *x0 = my_strdup (spec);
+    char *x1, *x2 = NULL, *x3 = NULL, *x4 = NULL, *x5 = NULL;
+
+    x1 = strchr (x0, ':');
+    if (x1 != NULL) {
+	*x1++ = '\0';
+	x2 = strchr (x1 + 1, ':');
+	if (x2 != NULL) {
+	    *x2++ = '\0';
+	    x3 = strchr (x2 + 1, ':');
+	    if (x3 != NULL) {
+		*x3++ = '\0';
+		x4 = strchr (x3 + 1, ':');
+		if (x4 != NULL) {
+		    *x4++ = '\0';
+		    x5 = strchr (x4 + 1, ':');
+		}
+	    }
+	}
+    }
+    currprefs.produce_sound = atoi (x0);
+    if (x1) {
+	currprefs.mixed_stereo = 0;
+	if (*x1 == 'S')
+	    currprefs.sound_stereo = currprefs.mixed_stereo = 1;
+	else if (*x1 == 's')
+	    currprefs.sound_stereo = 1;
+	else
+	    currprefs.sound_stereo = 0;
+    }
+    if (x2)
+	currprefs.sound_bits = atoi (x2);
+    if (x3)
+	currprefs.sound_freq = atoi (x3);
+    if (x4)
+	currprefs.sound_maxbsiz = currprefs.sound_minbsiz = atoi (x4);
+    if (x5)
+	currprefs.sound_minbsiz = atoi (x5);
+    free (x0);
+    return;
+}
+
+
+static void parse_joy_spec (char *spec)
+{
+    int v0 = 2, v1 = 0;
+    if (strlen(spec) != 2)
+	goto bad;
+
+    switch (spec[0]) {
+     case '0': v0 = 0; break;
+     case '1': v0 = 1; break;
+     case 'M': case 'm': v0 = 2; break;
+     case 'A': case 'a': v0 = 3; break;
+     case 'B': case 'b': v0 = 4; break;
+     case 'C': case 'c': v0 = 5; break;
+     default: goto bad;
+    }
+
+    switch (spec[1]) {
+     case '0': v1 = 0; break;
+     case '1': v1 = 1; break;
+     case 'M': case 'm': v1 = 2; break;
+     case 'A': case 'a': v1 = 3; break;
+     case 'B': case 'b': v1 = 4; break;
+     case 'C': case 'c': v1 = 5; break;
+     default: goto bad;
+    }
+    if (v0 == v1)
+	goto bad;
+    /* Let's scare Pascal programmers */
+    if (0)
+bad:
+    fprintf (stderr, "Bad joystick mode specification. Use -J xy, where x and y\n"
+	     "can be 0 for joystick 0, 1 for joystick 1, M for mouse, and\n"
+	     "a, b or c for different keyboard settings.\n");
+
+    currprefs.jport0 = v0;
+    currprefs.jport1 = v1;
+}
+
+static void parse_filesys_spec (int readonly, char *spec)
+{
+    char buf[256];
+    char *s2;
+
+    strncpy (buf, spec, 255); buf[255] = 0;
+    s2 = strchr (buf, ':');
+    if (s2) {
+	*s2++ = '\0';
+#ifdef __DOS__
+	{
+	    char *tmp;
+ 
+	    while ((tmp = strchr (s2, '\\')))
+		*tmp = '/';
+	}
+#endif
+	s2 = add_filesys_unit (currprefs.mountinfo, buf, s2, readonly, 0, 0, 0, 0);
+	if (s2)
+	    fprintf (stderr, "%s\n", s2);
+    } else {
+	fprintf (stderr, "Usage: [-m | -M] VOLNAME:mount_point\n");
+    }
+}
+ 
+static void parse_hardfile_spec (char *spec)
+{
+    char *x0 = my_strdup (spec);
+    char *x1, *x2, *x3, *x4;
+
+    x1 = strchr (x0, ':');
+    if (x1 == NULL)
+	goto argh;
+    *x1++ = '\0';
+    x2 = strchr (x1 + 1, ':');
+    if (x2 == NULL)
+	goto argh;
+    *x2++ = '\0';
+    x3 = strchr (x2 + 1, ':');
+    if (x3 == NULL)
+	goto argh;
+    *x3++ = '\0';
+    x4 = strchr (x3 + 1, ':');
+    if (x4 == NULL)
+	goto argh;
+    *x4++ = '\0';
+    x4 = add_filesys_unit (currprefs.mountinfo, 0, x4, 0, atoi (x0), atoi (x1), atoi (x2), atoi (x3));
+    if (x4)
+	fprintf (stderr, "%s\n", x4);
+
+    free (x0);
+    return;
+
+ argh:
+    free (x0);
+    fprintf (stderr, "Bad hardfile parameter specified - type \"uae -h\" for help.\n");
+    return;
+}
+
+static void parse_cpu_specs (char *spec)
+{
+    if (*spec < '0' || *spec > '4') {
+	fprintf (stderr, "CPU parameter string must begin with '0', '1', '2', '3' or '4'.\n");
+	return;
+    }
+	
+    currprefs.cpu_level = *spec++ - '0';
+    currprefs.address_space_24 = currprefs.cpu_level < 2;
+    currprefs.cpu_compatible = 0;
+    while (*spec != '\0') {
+	switch (*spec) {
+	 case 'a':
+	    if (currprefs.cpu_level < 2)
+		fprintf (stderr, "In 68000/68010 emulation, the address space is always 24 bit.\n");
+	    else if (currprefs.cpu_level >= 4)
+		fprintf (stderr, "In 68040 emulation, the address space is always 32 bit.\n");
+	    else
+		currprefs.address_space_24 = 1;
+	    break;
+	 case 'c':
+	    if (currprefs.cpu_level != 0)
+		fprintf (stderr, "The more compatible CPU emulation is only available for 68000\n"
+			 "emulation, not for 68010 upwards.\n");
+	    else
+		currprefs.cpu_compatible = 1;
+	    break;
+	 default:
+	    fprintf (stderr, "Bad CPU parameter specified - type \"uae -h\" for help.\n");
+	    break;
+	}
+	spec++;
+    }
+}
+
+/* Returns the number of args used up (0 or 1).  */
+int parse_cmdline_option (char c, char *arg)
+{
+    const char arg_required[] = "0123rKpImWSAJwNCZUFcblOdHRv";
+
+    if (strchr (arg_required, c) && ! arg) {
+	fprintf (stderr, "Missing argument for option `-%c'!\n", c);
+	return 0;
+    }
+
+    switch (c) {
+    case 'h': usage (); exit (0);
+
+    case '0': strncpy (currprefs.df[0], arg, 255); currprefs.df[0][255] = 0; break;
+    case '1': strncpy (currprefs.df[1], arg, 255); currprefs.df[1][255] = 0; break;
+    case '2': strncpy (currprefs.df[2], arg, 255); currprefs.df[2][255] = 0; break;
+    case '3': strncpy (currprefs.df[3], arg, 255); currprefs.df[3][255] = 0; break;
+    case 'r': strncpy (currprefs.romfile, arg, 255); currprefs.romfile[255] = 0; break;
+    case 'K': strncpy (currprefs.keyfile, arg, 255); currprefs.keyfile[255] = 0; break;
+    case 'p': strncpy (currprefs.prtname, arg, 255); currprefs.prtname[255] = 0; break;
+	/*     case 'I': strncpy (currprefs.sername, arg, 255); currprefs.sername[255] = 0; currprefs.use_serial = 1; break; */
+    case 'm': case 'M': parse_filesys_spec (c == 'M', arg); break;
+    case 'W': parse_hardfile_spec (arg); break;
+    case 'S': parse_sound_spec (arg); break;
+    case 'R': currprefs.gfx_framerate = atoi (arg); break;
+    case 'A': currprefs.emul_accuracy = atoi (arg); break;
+    case 'x': currprefs.no_xhair = 1; break;
+    case 'i': currprefs.illegal_mem = 1; break;
+    case 'J': parse_joy_spec (arg); break;
+
+    case 't': currprefs.test_drawing_speed = 1; break;
+    case 'L': currprefs.x11_use_low_bandwidth = 1; break;
+    case 'T': currprefs.x11_use_mitshm = 1; break;
+    case 'w': currprefs.m68k_speed = atoi (arg); break;
+
+	/* case 'g': currprefs.use_gfxlib = 1; break; */
+    case 'G': currprefs.start_gui = 0; break;
+    case 'D': currprefs.start_debugger = 1; break;
+
+    case 'n':
+	if (strchr (arg, '3') != 0)
+	    currprefs.blits_32bit_enabled = 1;
+	if (strchr (arg, 'i') != 0)
+	    currprefs.immediate_blits = 1;
+	break;
+
+    case 'v':
+	set_chipset_mask (&currprefs, atoi (arg));
+	break;
+
+    case 'C':
+	parse_cpu_specs (arg);
+	break;
+
+    case 'Z':
+	currprefs.z3fastmem_size = atoi (arg) * 0x100000;
+	break;
+
+    case 'U':
+	currprefs.gfxmem_size = atoi (arg) * 0x100000;
+	break;
+
+    case 'F':
+	currprefs.fastmem_size = atoi (arg) * 0x100000;
+	break;
+
+    case 'b':
+	currprefs.bogomem_size = atoi (arg) * 0x40000;
+	break;
+
+    case 'c':
+	currprefs.chipmem_size = atoi (arg) * 0x80000;
+	break;
+
+    case 'l':
+	if (0 == strcasecmp(arg, "de"))
+	    currprefs.keyboard_lang = KBD_LANG_DE;
+	else if (0 == strcasecmp(arg, "dk"))
+	    currprefs.keyboard_lang = KBD_LANG_DK;
+	else if (0 == strcasecmp(arg, "us"))
+	    currprefs.keyboard_lang = KBD_LANG_US;
+	else if (0 == strcasecmp(arg, "se"))
+	    currprefs.keyboard_lang = KBD_LANG_SE;
+	else if (0 == strcasecmp(arg, "fr"))
+	    currprefs.keyboard_lang = KBD_LANG_FR;
+	else if (0 == strcasecmp(arg, "it"))
+	    currprefs.keyboard_lang = KBD_LANG_IT;
+	else if (0 == strcasecmp(arg, "es"))
+	    currprefs.keyboard_lang = KBD_LANG_ES;
+	break;
+
+    case 'O': parse_gfx_specs (arg); break;
+    case 'd':
+	if (strchr (arg, 'S') != NULL || strchr (arg, 's')) {
+	    write_log ("  Serial on demand.\n");
+	    currprefs.serial_demand = 1;
+	}
+	if (strchr (arg, 'P') != NULL || strchr (arg, 'p')) {
+	    write_log ("  Parallel on demand.\n");
+	    currprefs.parallel_demand = 1;
+	}
+
+	break;
+
+    case 'H':
+	currprefs.color_mode = atoi (arg);
+	if (currprefs.color_mode < 0) {
+	    fprintf (stderr, "Bad color mode selected. Using default.\n");
+	    currprefs.color_mode = 0;
+	}
+	break;
+    default:
+	fprintf (stderr, "Unknown option `-%c'!\n", c);
+	break;
+    }
+    return !! strchr (arg_required, c);
+}