--- uae/src/cfgfile.c 2018/04/24 16:53:03 1.1.1.5 +++ uae/src/cfgfile.c 2018/04/24 17:00:14 1.1.1.9 @@ -17,6 +17,7 @@ #include "threaddep/penguin.h" #include "uae.h" #include "autoconf.h" +#include "events.h" #include "custom.h" /* @@@ need to get rid of this... just cut part of the manual and print that @@ -84,18 +85,21 @@ static const char *csmode[] = { "ocs", " 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 *centermode1[] = { "none", "simple", "smart", 0 }; static const char *centermode2[] = { "false", "true", "smart", 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 *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)" @@ -158,11 +162,12 @@ void save_options (FILE *f, struct uae_p 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->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); @@ -202,6 +207,7 @@ void save_options (FILE *f, struct uae_p 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); @@ -211,18 +217,18 @@ void save_options (FILE *f, struct uae_p fprintf (f, "chipmem_size=%d\n", p->chipmem_size / 0x80000); if (p->m68k_speed > 0) - fprintf (f, "cpu_speed=%d\n", p->m68k_speed); + 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, "finegrain_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" @@ -273,8 +279,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; @@ -313,7 +321,7 @@ static int getintval (char **p, int *res return 1; } -static int set_chipset_mask (struct uae_prefs *p, int val) +static void set_chipset_mask (struct uae_prefs *p, int val) { p->chipset_mask = (val == 0 ? 0 : val == 1 ? CSMASK_ECS_AGNUS @@ -325,6 +333,7 @@ static int set_chipset_mask (struct uae_ int cfgfile_parse_option (struct uae_prefs *p, char *option, char *value) { int tmpval; + int dummy; char *section = 0; char *tmpp; @@ -358,7 +367,8 @@ int cfgfile_parse_option (struct uae_pre || 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)) @@ -378,15 +388,14 @@ 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, "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) @@ -412,9 +421,20 @@ int cfgfile_parse_option (struct uae_pre set_chipset_mask (p, tmpval); return 1; } - + + if (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)) + { + p->mixed_stereo = 0; + if (p->stereo == 2) { + p->stereo = 1; + p->mixed_stereo = 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; } @@ -422,12 +442,22 @@ int cfgfile_parse_option (struct uae_pre 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) @@ -666,7 +696,10 @@ static void parse_sound_spec (char *spec } currprefs.produce_sound = atoi (x0); if (x1) { - if (*x1 == 's') + currprefs.mixed_stereo = 0; + if (*x1 == 'S') + currprefs.stereo = currprefs.mixed_stereo = 1; + else if (*x1 == 's') currprefs.stereo = 1; else currprefs.stereo = 0; @@ -783,8 +816,8 @@ static void parse_hardfile_spec (char *s static void parse_cpu_specs (char *spec) { - if (*spec < '0' || *spec > '3') { - fprintf (stderr, "CPU parameter string must begin with '0', '1', '2' or '3'.\n"); + if (*spec < '0' || *spec > '4') { + fprintf (stderr, "CPU parameter string must begin with '0', '1', '2', '3' or '4'.\n"); return; } @@ -796,6 +829,8 @@ static void parse_cpu_specs (char *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; @@ -843,7 +878,6 @@ int parse_cmdline_option (char c, char * case 'x': currprefs.no_xhair = 1; break; case 'i': currprefs.illegal_mem = 1; break; case 'J': parse_joy_spec (arg); break; - case 'a': currprefs.automount_uaedev = 0; break; case 't': currprefs.test_drawing_speed = 1; break; case 'L': currprefs.x11_use_low_bandwidth = 1; break; @@ -892,6 +926,8 @@ int parse_cmdline_option (char c, char * 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"))