--- uae/src/cfgfile.c 2018/04/24 17:03:56 1.1.1.11 +++ uae/src/cfgfile.c 2018/04/24 17:18:31 1.1.1.18 @@ -12,13 +12,19 @@ #include -#include "config.h" #include "options.h" #include "threaddep/thread.h" #include "uae.h" #include "autoconf.h" +#include "filesys.h" #include "events.h" #include "custom.h" +#include "audio.h" +#include "inputdevice.h" +#include "romlist.h" +#include "gui.h" + +#define cfgfile_write fprintf /* @@@ need to get rid of this... just cut part of the manual and print that * as a help text. */ @@ -35,10 +41,7 @@ static struct cfg_lines opttable[] = {"use_debugger", "Enable the debugger?" }, {"cpu_speed", "can be max, real, or a number between 1 and 20" }, {"cpu_type", "Can be 68000, 68010, 68020, 68020/68881" }, - {"cpu_compatible", "yes enables compatibility-mode" }, {"cpu_24bit_addressing", "must be set to 'no' in order for Z3mem or P96mem to work" }, - {"autoconfig", "yes = add filesystems and extra ram" }, - {"accuracy", "emulation accuracy, default is 2" }, {"log_illegal_mem", "print illegal memory access by Amiga software?" }, {"fastmem_size", "Size in megabytes of fast-memory" }, {"chipmem_size", "Size in megabytes of chip-memory" }, @@ -60,18 +63,17 @@ static struct cfg_lines opttable[] = {"gfx_colour_mode", "" }, {"32bit_blits", "Enable 32 bit blitter emulation" }, {"immediate_blits", "Perform blits immediately" }, - {"gfxlib_replacement", "Use graphics.library replacement?" }, + {"show_leds", "LED display" }, {"sound_output", "" }, {"sound_frequency", "" }, - {"sound_bits", "" }, {"sound_channels", "" }, - {"sound_min_buff", "" }, {"sound_max_buff", "" }, {"parallel_on_demand", "" }, {"serial_on_demand", "" }, {"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" }, @@ -89,20 +91,46 @@ static const char *linemode1[] = { "none 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", - "68040", "68040", 0 + "68000", "68010", + "68ec020", "68ec020/68881", "68ec020/68882", + "68020", "68020/68881", "68020/68882", + "68030", "68030/68881", "68030/68882", + "68040", "68060", 0 +}; +static int mode_to_cpumodel[] = { + 68000, 68010, + 68020, 68020, 68020, + 68020, 68020, 68020, + 68030, 68030, 68030, + 68040, 68060 +}; +static int mode_to_fpumodel[] = { + 0, 0, + 0, 68881, 68882, + 0, 68881, 68882, + 0, 68881, 68882, + 68040, 68060 }; -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", "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 *stereomode[] = { "mono", "stereo", "mixed", 0 }; +static const char *interpolmode[] = { "none", "rh", "crux", "sinc", "anti", 0 }; +static const char *soundfiltermode1[] = { "off", "emulated", "on", 0 }; +static const char *soundfiltermode2[] = { "standard", "enhanced", 0 }; static const char *collmode[] = { "none", "sprites", "playfields", "full", 0 }; +static const char *idemode[] = { "none", "a600/a1200", "a4000", 0 }; + +static const char *obsolete[] = { + "accuracy", "gfx_opengl", "gfx_32bit_blits", "32bit_blits", + "gfx_immediate_blits", "gfx_ntsc", "win32", "gfx_filter_bits", + "sound_pri_cutoff", "sound_pri_time", "sound_min_buff", "sound_bits", + "gfx_test_speed", "gfxlib_replacement", "enforcer", "catweasel_io", + "fast_copper", "sound_adjust", "serial_hardware_dtrdsr", "cpu_compatible", + 0 +}; #define UNEXPANDED "$(FILE_PATH)" @@ -134,117 +162,150 @@ char *cfgfile_subst_path (const char *pa return my_strdup (file); } -void save_options (FILE *f, struct uae_prefs *p) +static void write_gfx_params (FILE *f, const struct gfx_params *p, const char *suffix) +{ + cfgfile_write (f, "gfx_width_%s=%d\n", suffix, p->width); + cfgfile_write (f, "gfx_height_%s=%d\n", suffix, p->height); + cfgfile_write (f, "gfx_lores_%s=%s\n", suffix, p->lores ? "true" : "false"); + cfgfile_write (f, "gfx_linemode_%s=%s\n", suffix, linemode1[p->linedbl]); + cfgfile_write (f, "gfx_correct_aspect_%s=%s\n", suffix, p->correct_aspect ? "true" : "false"); + cfgfile_write (f, "gfx_center_horizontal_%s=%s\n", suffix, centermode1[p->xcenter]); + cfgfile_write (f, "gfx_center_vertical_%s=%s\n", suffix, centermode1[p->ycenter]); + cfgfile_write (f, "gfx_show_leds_%s=%s\n", suffix, p->leds_on_screen ? "true" : "false"); +} + +void save_options (FILE *f, const struct uae_prefs *p) { struct strlist *sl; char *str; int i; - fprintf (f, "config_description=%s\n", p->description); + cfgfile_write (f, "config_description=%s\n", p->description); for (sl = p->unknown_lines; sl; sl = sl->next) - fprintf (f, "%s\n", sl->str); + cfgfile_write (f, "%s\n", sl->str); - fprintf (f, "%s.rom_path=%s\n", TARGET_NAME, p->path_rom); - fprintf (f, "%s.floppy_path=%s\n", TARGET_NAME, p->path_floppy); - fprintf (f, "%s.hardfile_path=%s\n", TARGET_NAME, p->path_hardfile); + cfgfile_write (f, "%s.rom_path=%s\n", TARGET_NAME, p->path_rom); + cfgfile_write (f, "%s.floppy_path=%s\n", TARGET_NAME, p->path_floppy); + cfgfile_write (f, "%s.hardfile_path=%s\n", TARGET_NAME, p->path_hardfile); 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"); + cfgfile_write (f, "use_gui=%s\n", guimode1[p->start_gui]); + cfgfile_write (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); + cfgfile_write (f, "kickstart_rom_file=%s\n", str); + free (str); + if (currprefs.rom_crc32) + cfgfile_write (f, "kickstart_rom_crc=0x%x\n", currprefs.rom_crc32); + str = cfgfile_subst_path (p->path_rom, UNEXPANDED, p->romextfile); + cfgfile_write (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); + cfgfile_write (f, "kickstart_key_file=%s\n", str); free (str); - fprintf (f, "kickshifter=%s\n", p->kickshifter ? "true" : "false"); + cfgfile_write (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); + cfgfile_write (f, "floppy%d=%s\n", i, str); free (str); + cfgfile_write (f, "floppy%dtype=%d\n", i, p->dfxtype[i]); + } + cfgfile_write (f, "nr_floppies=%d\n", p->nr_floppies); + cfgfile_write (f, "parallel_on_demand=%s\n", p->parallel_demand ? "true" : "false"); + cfgfile_write (f, "serial_on_demand=%s\n", p->serial_demand ? "true" : "false"); + + cfgfile_write (f, "sound_output=%s\n", soundmode[p->produce_sound]); + cfgfile_write (f, "sound_channels=%s\n", stereomode[p->sound_stereo]); + cfgfile_write (f, "sound_stereo_separation=%d\n", p->sound_stereo_separation); + cfgfile_write (f, "sound_stereo_mixing_delay=%d\n", p->sound_mixed_stereo_delay >= 0 ? p->sound_mixed_stereo_delay : 0); + cfgfile_write (f, "sound_max_buff=%d\n", p->sound_maxbsiz); + cfgfile_write (f, "sound_frequency=%d\n", p->sound_freq); + cfgfile_write (f, "sound_interpol=%s\n", interpolmode[p->sound_interpol]); + cfgfile_write (f, "sound_filter=%s\n", soundfiltermode1[p->sound_filter]); + cfgfile_write (f, "sound_filter_type=%s\n", soundfiltermode2[p->sound_filter_type]); + + for (i = 0; i < 2; i++) { + int v = i == 0 ? p->jport0 : p->jport1; + char tmp1[100], tmp2[50]; + if (v < JSEM_JOYS) { + sprintf (tmp2, "kbd%d", v + 1); + } else if (v < JSEM_MICE) { + sprintf (tmp2, "joy%d", v - JSEM_JOYS); + } else { + strcpy (tmp2, "mouse"); + if (v - JSEM_MICE > 0) + sprintf (tmp2, "mouse%d", v - JSEM_MICE); + } + sprintf (tmp1, "joyport%d=%s\n", i, tmp2); + cfgfile_write (f, tmp1); } - 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 + 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); - - fprintf (f, "joyport0=%s\n", portmode[p->jport0]); - fprintf (f, "joyport1=%s\n", portmode[p->jport1]); - - 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"); - fprintf (f, "gfx_linemode=%s\n", linemode1[p->gfx_linedbl]); - 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", 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, "immediate_blits=%s\n", p->immediate_blits ? "true" : "false"); - fprintf (f, "ntsc=%s\n", p->ntscmode ? "true" : "false"); + cfgfile_write (f, "bsdsocket_emu=%s\n", p->socket_emu ? "true" : "false"); + + cfgfile_write (f, "gfx_framerate=%d\n", p->gfx_framerate); + write_gfx_params (f, &p->gfx_w, "windowed"); + write_gfx_params (f, &p->gfx_f, "fullscreen"); + cfgfile_write (f, "gfx_fullscreen_amiga=%s\n", p->gfx_afullscreen ? "true" : "false"); + cfgfile_write (f, "gfx_fullscreen_picasso=%s\n", p->gfx_pfullscreen ? "true" : "false"); + cfgfile_write (f, "gfx_colour_mode=%s\n", colormode1[p->color_mode]); + + cfgfile_write (f, "immediate_blits=%s\n", p->immediate_blits ? "true" : "false"); + cfgfile_write (f, "ntsc=%s\n", p->ntscmode ? "true" : "false"); if (p->chipset_mask & CSMASK_AGA) - fprintf (f, "chipset=aga\n"); + cfgfile_write (f, "chipset=aga\n"); else if ((p->chipset_mask & CSMASK_ECS_AGNUS) && (p->chipset_mask & CSMASK_ECS_AGNUS)) - fprintf (f, "chipset=ecs\n"); + cfgfile_write (f, "chipset=ecs\n"); else if (p->chipset_mask & CSMASK_ECS_AGNUS) - fprintf (f, "chipset=ecs_agnus\n"); + cfgfile_write (f, "chipset=ecs_agnus\n"); else if (p->chipset_mask & CSMASK_ECS_DENISE) - fprintf (f, "chipset=ecs_denise\n"); + cfgfile_write (f, "chipset=ecs_denise\n"); else - fprintf (f, "chipset=ocs\n"); - fprintf (f, "collision_level=%s\n", collmode[p->collision_level]); + cfgfile_write (f, "chipset=ocs\n"); + cfgfile_write (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); - fprintf (f, "z3mem_size=%d\n", p->z3fastmem_size / 0x100000); - fprintf (f, "bogomem_size=%d\n", p->bogomem_size / 0x40000); - fprintf (f, "gfxcard_size=%d\n", p->gfxmem_size / 0x100000); - fprintf (f, "chipmem_size=%d\n", p->chipmem_size / 0x80000); + cfgfile_write (f, "ide=%s\n", p->cs_ide == 1 ? "a600/a1200" : (p->cs_ide == 2 ? "a4000" : "none")); + cfgfile_write (f, "a1000ram=%s\n", p->cs_a1000ram ? "true" : "false"); + cfgfile_write (f, "fatgary=%d\n", p->cs_fatgaryrev); + cfgfile_write (f, "ramsey=%d\n", p->cs_ramseyrev); + + cfgfile_write (f, "fastmem_size=%d\n", p->fastmem_size / 0x100000); + cfgfile_write (f, "a3000mem_size=%d\n", p->mbresmem_low_size / 0x100000); + cfgfile_write (f, "mbresmem_size=%d\n", p->mbresmem_high_size / 0x100000); + cfgfile_write (f, "z3mem_size=%d\n", p->z3fastmem_size / 0x100000); + cfgfile_write (f, "bogomem_size=%d\n", p->bogomem_size / 0x40000); + cfgfile_write (f, "gfxcard_size=%d\n", p->gfxmem_size / 0x100000); + cfgfile_write (f, "chipmem_size=%d\n", p->chipmem_size / 0x80000); if (p->m68k_speed > 0) - fprintf (f, "finegrain_cpu_speed=%d\n", p->m68k_speed); + cfgfile_write (f, "finegrain_cpu_speed=%d\n", p->m68k_speed); else - fprintf (f, "cpu_speed=%s\n", p->m68k_speed == -1 ? "max" : "real"); + cfgfile_write (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"); + for (i = 0; cpumode[i] != NULL; i++) + if (mode_to_cpumodel[i] == p->cpu_model && mode_to_fpumodel[i] == p->fpu_model) { + cfgfile_write (f, "cpu_type=%s\n", cpumode[i]); + break; + } - fprintf (f, "accuracy=%d\n", p->emul_accuracy); - fprintf (f, "log_illegal_mem=%s\n", p->illegal_mem ? "true" : "false"); + cfgfile_write (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" - : p->keyboard_lang == KBD_LANG_FR ? "fr" - : p->keyboard_lang == KBD_LANG_IT ? "it" - : "FOO")); + cfgfile_write (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" + : p->keyboard_lang == KBD_LANG_FR ? "fr" + : p->keyboard_lang == KBD_LANG_IT ? "it" + : "FOO")); write_filesys_config (p->mountinfo, UNEXPANDED, p->path_hardfile, f); /* Don't write gfxlib/gfx_test_speed options. */ } -int cfgfile_yesno (char *option, char *value, char *name, int *location) +int cfgfile_yesno (const char *option, const char *value, const char *name, int *location) { if (strcmp (option, name) != 0) return 0; @@ -259,15 +320,14 @@ int cfgfile_yesno (char *option, char *v return 1; } -int cfgfile_intval (char *option, char *value, char *name, int *location, int scale) +int cfgfile_intval (const char *option, const char *value, const char *name, int *location, int scale) { int base = 10; char *endptr; if (strcmp (option, name) != 0) return 0; - /* I guess octal isn't popular enough to worry about here... */ if (value[0] == '0' && value[1] == 'x') - value += 2, base = 16; + base = 16; *location = strtol (value, &endptr, base) * scale; if (*endptr != '\0' || *value == '\0') @@ -275,7 +335,22 @@ int cfgfile_intval (char *option, char * return 1; } -int cfgfile_strval (char *option, char *value, char *name, int *location, const char *table[], int more) +int cfgfile_uintval (const char *option, const char *value, const char *name, unsigned int *location, int scale) +{ + int base = 10; + char *endptr; + if (strcmp (option, name) != 0) + return 0; + if (value[0] == '0' && value[1] == 'x') + base = 16; + *location = strtoul (value, &endptr, base) * scale; + + if (*endptr != '\0' || *value == '\0') + write_log ("Option `%s' requires a numeric argument.\n", option); + return 1; +} + +int cfgfile_strval (const char *option, const char *value, const char *name, int *location, const char *table[], int more) { int val; if (strcmp (option, name) != 0) @@ -292,7 +367,7 @@ int cfgfile_strval (char *option, char * return 1; } -int cfgfile_string (char *option, char *value, char *name, char *location, int maxsz) +int cfgfile_string (const char *option, const char *value, const char *name, char *location, int maxsz) { if (strcmp (option, name) != 0) return 0; @@ -333,13 +408,18 @@ static void set_chipset_mask (struct uae : CSMASK_AGA | CSMASK_ECS_DENISE | CSMASK_ECS_AGNUS); } -int cfgfile_parse_option (struct uae_prefs *p, char *option, char *value) +static int cfgfile_parse_host (struct uae_prefs *p, char *option, char *value) { int tmpval; int dummy; char *section = 0; char *tmpp; + if (memcmp (option, "input.", 6) == 0) { + read_inputdevice_config (p, option, value); + return 1; + } + for (tmpp = option; *tmpp != '\0'; tmpp++) if (isupper (*tmpp)) *tmpp = tolower (*tmpp); @@ -358,106 +438,122 @@ int cfgfile_parse_option (struct uae_pre } return 0; } + if (cfgfile_yesno (option, value, "use_debugger", &p->start_debugger) || cfgfile_yesno (option, value, "bsdsocket_emu", &p->socket_emu) - || cfgfile_yesno (option, value, "immediate_blits", &p->immediate_blits) - || 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_lores", &p->gfx_w.lores) + && cfgfile_yesno (option, value, "gfx_lores", &p->gfx_f.lores)) + || cfgfile_yesno (option, value, "gfx_lores_windowed", &p->gfx_w.lores) + || cfgfile_yesno (option, value, "gfx_lores_fullscreen", &p->gfx_f.lores) + + || (cfgfile_yesno (option, value, "gfx_correct_aspect", &p->gfx_w.correct_aspect) + && cfgfile_yesno (option, value, "gfx_correct_aspect", &p->gfx_f.correct_aspect)) + || cfgfile_yesno (option, value, "gfx_correct_aspect_windowed", &p->gfx_w.correct_aspect) + || cfgfile_yesno (option, value, "gfx_correct_aspect_fullscreen", &p->gfx_f.correct_aspect) + + || (cfgfile_yesno (option, value, "show_leds", &p->gfx_w.leds_on_screen) + && cfgfile_yesno (option, value, "show_leds", &p->gfx_f.leds_on_screen)) + || cfgfile_yesno (option, value, "gfx_show_leds_windowed", &p->gfx_w.leds_on_screen) + || cfgfile_yesno (option, value, "gfx_show_leds_fullscreen", &p->gfx_f.leds_on_screen) + || cfgfile_yesno (option, value, "gfx_fullscreen_amiga", &p->gfx_afullscreen) || cfgfile_yesno (option, value, "gfx_fullscreen_picasso", &p->gfx_pfullscreen) - || 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) - /* 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)) return 1; - if (cfgfile_intval (option, value, "accuracy", &p->emul_accuracy, 1) - || cfgfile_intval (option, value, "sound_min_buff", &p->sound_minbsiz, 1) - || cfgfile_intval (option, value, "sound_max_buff", &p->sound_maxbsiz, 1) + if (cfgfile_intval (option, value, "sound_max_buff", &p->sound_maxbsiz, 1) || cfgfile_intval (option, value, "sound_frequency", &p->sound_freq, 1) - || 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, "sound_stereo_separation", &p->sound_stereo_separation, 1) + || cfgfile_intval (option, value, "sound_stereo_mixing_delay", &p->sound_mixed_stereo_delay, 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) - || cfgfile_intval (option, value, "a3000mem_size", &p->a3000mem_size, 0x100000) - || 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, "nr_floppies", &p->nr_floppies, 1)) + || (cfgfile_intval (option, value, "gfx_width", &p->gfx_w.width, 1) + && cfgfile_intval (option, value, "gfx_width", &p->gfx_f.width, 1)) + || cfgfile_intval (option, value, "gfx_width_windowed", &p->gfx_w.width, 1) + || cfgfile_intval (option, value, "gfx_width_fullscreen", &p->gfx_f.width, 1) + || (cfgfile_intval (option, value, "gfx_height", &p->gfx_w.height, 1) + && cfgfile_intval (option, value, "gfx_height", &p->gfx_f.height, 1)) + || cfgfile_intval (option, value, "gfx_height_windowed", &p->gfx_w.height, 1) + || cfgfile_intval (option, value, "gfx_height_fullscreen", &p->gfx_f.height, 1)) return 1; if (cfgfile_strval (option, value, "sound_output", &p->produce_sound, soundmode, 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, "sound_filter", &p->sound_filter, soundfiltermode1, 0) + || cfgfile_strval (option, value, "sound_filter_type", &p->sound_filter_type, soundfiltermode2, 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_linemode", &p->gfx_w.linedbl, linemode1, 1) + && cfgfile_strval (option, value, "gfx_linemode", &p->gfx_f.linedbl, linemode1, 1)) + || (cfgfile_strval (option, value, "gfx_linemode", &p->gfx_w.linedbl, linemode2, 0) + && cfgfile_strval (option, value, "gfx_linemode", &p->gfx_f.linedbl, linemode2, 0)) + || cfgfile_strval (option, value, "gfx_linemode_windowed", &p->gfx_w.linedbl, linemode1, 1) + || cfgfile_strval (option, value, "gfx_linemode_windowed", &p->gfx_w.linedbl, linemode2, 0) + || cfgfile_strval (option, value, "gfx_linemode_fullscreen", &p->gfx_f.linedbl, linemode1, 1) + || cfgfile_strval (option, value, "gfx_linemode_fullscreen", &p->gfx_f.linedbl, linemode2, 0) + || (cfgfile_strval (option, value, "gfx_center_horizontal", &p->gfx_w.xcenter, centermode1, 1) + && cfgfile_strval (option, value, "gfx_center_horizontal", &p->gfx_f.xcenter, centermode1, 1)) + || (cfgfile_strval (option, value, "gfx_center_horizontal", &p->gfx_w.xcenter, centermode2, 0) + && cfgfile_strval (option, value, "gfx_center_horizontal", &p->gfx_f.xcenter, centermode2, 0)) + || cfgfile_strval (option, value, "gfx_center_horizontal_windowed", &p->gfx_w.xcenter, centermode1, 1) + || cfgfile_strval (option, value, "gfx_center_horizontal_windowed", &p->gfx_w.xcenter, centermode2, 0) + || cfgfile_strval (option, value, "gfx_center_horizontal_fullscreen", &p->gfx_f.xcenter, centermode1, 1) + || cfgfile_strval (option, value, "gfx_center_horizontal_fullscreen", &p->gfx_f.xcenter, centermode2, 0) + || (cfgfile_strval (option, value, "gfx_center_vertical", &p->gfx_w.ycenter, centermode1, 1) + && cfgfile_strval (option, value, "gfx_center_vertical", &p->gfx_f.ycenter, centermode1, 1)) + || (cfgfile_strval (option, value, "gfx_center_vertical", &p->gfx_w.ycenter, centermode2, 0) + && cfgfile_strval (option, value, "gfx_center_vertical", &p->gfx_f.ycenter, centermode2, 0)) + || cfgfile_strval (option, value, "gfx_center_vertical_windowed", &p->gfx_w.ycenter, centermode1, 1) + || cfgfile_strval (option, value, "gfx_center_vertical_windowed", &p->gfx_w.ycenter, centermode2, 0) + || cfgfile_strval (option, value, "gfx_center_vertical_fullscreen", &p->gfx_f.ycenter, centermode1, 1) + || cfgfile_strval (option, value, "gfx_center_vertical_fullscreen", &p->gfx_f.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) || cfgfile_strval (option, value, "gfx_color_mode", &p->color_mode, colormode2, 0)) return 1; - if (cfgfile_string (option, value, "floppy0", p->df[0], 256) - || cfgfile_string (option, value, "floppy1", p->df[1], 256) - || 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_key_file", p->keyfile, 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->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 (strcmp (option, "joyport0") == 0 || strcmp (option, "joyport1") == 0) { + int port = strcmp (option, "joyport0") == 0 ? 0 : 1; + int start = -1; + char *pp = 0; + if (strncmp (value, "kbd", 3) == 0) { + start = JSEM_KBDLAYOUT; + pp = value + 3; + } else if (strncmp (value, "joy", 3) == 0) { + start = JSEM_JOYS; + pp = value + 3; + } else if (strncmp (value, "mouse", 5) == 0) { + start = JSEM_MICE; + pp = value + 5; + } + if (pp) { + int v = atol (pp); + if (start >= 0) { + if (start == JSEM_KBDLAYOUT) + v--; + if (v >= 0) { + start += v; + if (port) + p->jport1 = start; + else + p->jport0 = start; + } + } } - } - - if (cfgfile_strval (option, value, "cpu_type", &p->cpu_level, cpumode, 0)) { - 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) - /* 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)) { - p->m68k_speed *= CYCLE_UNIT; + + if (cfgfile_string (option, value, "config_description", p->description, 256) + || cfgfile_string (option, value, "config_sortstr", p->sortstr, 256)) 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; + + /* Tricky ones... */ + if (cfgfile_strval (option, value, "sound_channels", &p->sound_stereo, stereomode, 1)) { + if (p->sound_stereo == SND_NONE) { /* "mixed stereo" compatibility hack */ + p->sound_stereo = SND_STEREO; + p->sound_mixed_stereo_delay = 5; + p->sound_stereo_separation = 7; } return 1; } @@ -480,7 +576,7 @@ int cfgfile_parse_option (struct uae_pre if (strcmp (option, "filesystem") == 0 || strcmp (option, "hardfile") == 0) { - int secs, heads, reserved, bs, ro; + int secs, heads, reserved, bs, ro, pri; char *aname, *root; char *tmpp = strchr (value, ','); char *str; @@ -518,11 +614,11 @@ int cfgfile_parse_option (struct uae_pre aname = 0; } str = cfgfile_subst_path (UNEXPANDED, p->path_hardfile, root); - tmpp = add_filesys_unit (p->mountinfo, aname, str, ro, secs, - heads, reserved, bs); + tmpp = add_filesys_unit (p->mountinfo, NULL, aname, str, ro, secs, + heads, reserved, bs, -1); free (str); if (tmpp) - write_log ("Error: %s\n", tmpp); + gui_message (tmpp); return 1; invalid_fs: @@ -533,6 +629,142 @@ int cfgfile_parse_option (struct uae_pre return 0; } +static int cfgfile_parse_hardware (struct uae_prefs *p, char *option, char *value) +{ + int tmpval, dummy, i; + unsigned int crc32; + + if (cfgfile_yesno (option, value, "immediate_blits", &p->immediate_blits) + || cfgfile_yesno (option, value, "a1000ram", &p->cs_a1000ram) + || cfgfile_yesno (option, value, "kickshifter", &p->kickshifter) + || cfgfile_yesno (option, value, "ntsc", &p->ntscmode) + || cfgfile_yesno (option, value, "cpu_24bit_addressing", &p->address_space_24) + || cfgfile_yesno (option, value, "parallel_on_demand", &p->parallel_demand) + || cfgfile_yesno (option, value, "serial_on_demand", &p->serial_demand)) + return 1; + + if (cfgfile_intval (option, value, "fatgary", &p->cs_fatgaryrev, 1) + || cfgfile_intval (option, value, "ramsey", &p->cs_ramseyrev, 1) + || cfgfile_uintval (option, value, "fastmem_size", &p->fastmem_size, 0x100000) + || cfgfile_uintval (option, value, "a3000mem_size", &p->mbresmem_low_size, 0x100000) + || cfgfile_uintval (option, value, "mbresmem_size", &p->mbresmem_high_size, 0x100000) + || cfgfile_uintval (option, value, "z3mem_size", &p->z3fastmem_size, 0x100000) + || cfgfile_uintval (option, value, "bogomem_size", &p->bogomem_size, 0x40000) + || cfgfile_uintval (option, value, "gfxcard_size", &p->gfxmem_size, 0x100000) + || cfgfile_uintval (option, value, "chipmem_size", &p->chipmem_size, 0x80000) + || cfgfile_uintval (option, value, "kickstart_rom_crc", &p->rom_crc32, 1) + || cfgfile_intval (option, value, "nr_floppies", &p->nr_floppies, 1) + || cfgfile_intval (option, value, "floppy0type", &p->dfxtype[0], 1) + || cfgfile_intval (option, value, "floppy1type", &p->dfxtype[1], 1) + || cfgfile_intval (option, value, "floppy2type", &p->dfxtype[2], 1) + || cfgfile_intval (option, value, "floppy3type", &p->dfxtype[3], 1)) + return 1; + + /* Default configurations want to allow multiple possible ROMs. For these, + * we have the following option, which validates the CRC32 against the list + * of available ROMs. + * Config files should sort these entries so that the most desired ROM appears + * last. */ + if (cfgfile_uintval (option, value, "kickstart_rom_crc_attempt", &crc32, 1)) { + for (i = 0;; i++) { + struct romlist *rl = romlist_from_idx (i, ROMTYPE_KICK, 1); + if (!rl) + break; + if (rl->rd->crc32 == crc32) { + p->rom_crc32 = crc32; + break; + } + } + return 1; + } + + if (cfgfile_strval (option, value, "ide", &p->cs_ide, idemode, 0) + || cfgfile_strval (option, value, "collision_level", &p->collision_level, collmode, 0)) + return 1; + + if (cfgfile_string (option, value, "floppy0", p->df[0], 256) + || cfgfile_string (option, value, "floppy1", p->df[1], 256) + || 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)) + return 1; + + if (cfgfile_strval (option, value, "chipset", &tmpval, csmode, 0)) { + set_chipset_mask (p, tmpval); + return 1; + } + + if (cfgfile_strval (option, value, "cpu_type", &tmpval, cpumode, 0)) { + p->fpu_model = 0; + p->address_space_24 = 0; + p->cpu_model = 68000; + switch (tmpval) { + case 0: + p->cpu_model = 68000; + break; + case 1: + p->cpu_model = 68010; + break; + case 2: case 3: case 4: + case 5: case 6: case 7: + p->cpu_model = 68020; + p->address_space_24 = tmpval < 5; + p->fpu_model = (tmpval == 3 || tmpval == 6 ? 68881 + : tmpval == 4 || tmpval == 7 ? 68882 + : 0); + break; + case 8: case 9: case 10: + p->cpu_model = 68030; + p->fpu_model = (tmpval == 9 ? 68881 : tmpval == 10 ? 68882 : 0); + break; + case 11: + p->cpu_model = 68040; + p->fpu_model = 68040; + break; + case 12: + p->cpu_model = 68060; + p->fpu_model = 68060; + break; + } + return 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)) { + 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; + } + + return 0; +} + +int cfgfile_parse_option (struct uae_prefs *p, char *option, char *value) +{ + if (cfgfile_parse_hardware (p, option, value)) + return 1; + if (cfgfile_parse_host (p, option, value)) + return 1; + + return 0; +} + void cfgfile_parse_line (struct uae_prefs *p, char *line) { int i; @@ -579,7 +811,6 @@ static void subst (char *p, char *f, int int cfgfile_load (struct uae_prefs *p, const char *filename) { - char *str; int i; FILE *fh; @@ -590,15 +821,22 @@ int cfgfile_load (struct uae_prefs *p, c return 0; while (fgets (line, 256, fh) != 0) { - line[strcspn (line, "\t \r\n")] = '\0'; - if (strlen (line) > 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) { + if (line[0] == '#' || line[0] == ';') + continue; 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); return 1; @@ -621,7 +859,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); } @@ -642,7 +880,7 @@ void cfgfile_show_usage (void) 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) +static void parse_gfx_specs (struct uae_prefs *p, char *spec) { char *x0 = my_strdup (spec); char *x1, *x2; @@ -655,21 +893,24 @@ static void parse_gfx_specs (char *spec) 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; + p->gfx_w.width = atoi (x0); + p->gfx_w.height = atoi (x1); + p->gfx_w.lores = strchr (x2, 'l') != 0; + p->gfx_w.xcenter = strchr (x2, 'x') != 0 ? 1 : strchr (x2, 'X') != 0 ? 2 : 0; + p->gfx_w.ycenter = strchr (x2, 'y') != 0 ? 1 : strchr (x2, 'Y') != 0 ? 2 : 0; + p->gfx_w.linedbl = strchr (x2, 'd') != 0; + p->gfx_w.linedbl += 2 * (strchr (x2, 'D') != 0); + p->gfx_w.correct_aspect = strchr (x2, 'c') != 0; - if (currprefs.gfx_linedbl == 3) { + p->gfx_f = p->gfx_w; + + p->gfx_afullscreen = strchr (x2, 'a') != 0; + p->gfx_pfullscreen = strchr (x2, 'p') != 0; + + if (p->gfx_w.linedbl == 3) { fprintf (stderr, "You can't use both 'd' and 'D' modifiers in the display mode specification.\n"); } - + free (x0); return; @@ -680,10 +921,10 @@ static void parse_gfx_specs (char *spec) free (x0); } -static void parse_sound_spec (char *spec) +static void parse_sound_spec (struct uae_prefs *p, char *spec) { char *x0 = my_strdup (spec); - char *x1, *x2 = NULL, *x3 = NULL, *x4 = NULL, *x5 = NULL; + char *x1, *x2 = NULL, *x3 = NULL, *x4 = NULL; x1 = strchr (x0, ':'); if (x1 != NULL) { @@ -695,59 +936,52 @@ static void parse_sound_spec (char *spec if (x3 != NULL) { *x3++ = '\0'; x4 = strchr (x3 + 1, ':'); - if (x4 != NULL) { - *x4++ = '\0'; - x5 = strchr (x4 + 1, ':'); - } } } } - currprefs.produce_sound = atoi (x0); + p->produce_sound = atoi (x0); if (x1) { - currprefs.mixed_stereo = 0; - if (*x1 == 'S') - currprefs.stereo = currprefs.mixed_stereo = 1; - else if (*x1 == 's') - currprefs.stereo = 1; + p->sound_mixed_stereo_delay = 0; + if (*x1 == 'S') { + p->sound_stereo = SND_STEREO; + p->sound_stereo_separation = 7; + } else if (*x1 == 's') + p->sound_stereo = SND_STEREO; else - currprefs.stereo = 0; + p->sound_stereo = SND_MONO; } - if (x2) - currprefs.sound_bits = atoi (x2); + /* x2 used to be bits, now fixed at 16 bit. */ if (x3) - currprefs.sound_freq = atoi (x3); + p->sound_freq = atoi (x3); if (x4) - currprefs.sound_maxbsiz = currprefs.sound_minbsiz = atoi (x4); - if (x5) - currprefs.sound_minbsiz = atoi (x5); + p->sound_maxbsiz = atoi (x4); free (x0); - return; } -static void parse_joy_spec (char *spec) +static void parse_joy_spec (struct uae_prefs *p, 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; + case '0': v0 = JSEM_JOYS; break; + case '1': v0 = JSEM_JOYS + 1; break; + case 'M': case 'm': v0 = JSEM_MICE; break; + case 'A': case 'a': v0 = JSEM_KBDLAYOUT; break; + case 'B': case 'b': v0 = JSEM_KBDLAYOUT + 1; break; + case 'C': case 'c': v0 = JSEM_KBDLAYOUT + 2; 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; + case '0': v1 = JSEM_JOYS; break; + case '1': v1 = JSEM_JOYS + 1; break; + case 'M': case 'm': v1 = JSEM_MICE; break; + case 'A': case 'a': v1 = JSEM_KBDLAYOUT; break; + case 'B': case 'b': v1 = JSEM_KBDLAYOUT + 1; break; + case 'C': case 'c': v1 = JSEM_KBDLAYOUT + 2; break; default: goto bad; } if (v0 == v1) @@ -755,15 +989,15 @@ static void parse_joy_spec (char *spec) /* Let's scare Pascal programmers */ if (0) bad: - fprintf (stderr, "Bad joystick mode specification. Use -J xy, where x and y\n" + write_log ("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; + p->jport0 = v0; + p->jport1 = v1; } -static void parse_filesys_spec (int readonly, char *spec) +static void parse_filesys_spec (struct uae_prefs *p, int readonly, char *spec) { char buf[256]; char *s2; @@ -775,20 +1009,20 @@ static void parse_filesys_spec (int read #ifdef __DOS__ { char *tmp; - + while ((tmp = strchr (s2, '\\'))) *tmp = '/'; } #endif - s2 = add_filesys_unit (currprefs.mountinfo, buf, s2, readonly, 0, 0, 0, 0); + s2 = add_filesys_unit (p->mountinfo, NULL, buf, s2, readonly, 0, 0, 0, 0, -1); if (s2) fprintf (stderr, "%s\n", s2); } else { fprintf (stderr, "Usage: [-m | -M] VOLNAME:mount_point\n"); } } - -static void parse_hardfile_spec (char *spec) + +static void parse_hardfile_spec (struct uae_prefs *p, char *spec) { char *x0 = my_strdup (spec); char *x1, *x2, *x3, *x4; @@ -809,7 +1043,7 @@ static void parse_hardfile_spec (char *s if (x4 == NULL) goto argh; *x4++ = '\0'; - x4 = add_filesys_unit (currprefs.mountinfo, 0, x4, 0, atoi (x0), atoi (x1), atoi (x2), atoi (x3)); + x4 = add_filesys_unit (p->mountinfo, NULL, 0, x4, 0, atoi (x0), atoi (x1), atoi (x2), atoi (x3), -1); if (x4) fprintf (stderr, "%s\n", x4); @@ -822,34 +1056,34 @@ static void parse_hardfile_spec (char *s return; } -static void parse_cpu_specs (char *spec) +static void parse_cpu_specs (struct uae_prefs *p, char *spec) { + int lvl; 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; + + lvl = *spec++ - '0'; + p->fpu_model = 0; + p->cpu_model = lvl * 10 + 68000; + if (p->cpu_model >= 68040) + p->fpu_model = p->cpu_model; + p->address_space_24 = p->cpu_model < 68020; while (*spec != '\0') { switch (*spec) { - case 'a': - if (currprefs.cpu_level < 2) + case 'a': + if (p->cpu_model < 68020) fprintf (stderr, "In 68000/68010 emulation, the address space is always 24 bit.\n"); - else if (currprefs.cpu_level >= 4) + else if (p->cpu_model >= 68040) fprintf (stderr, "In 68040 emulation, the address space is always 32 bit.\n"); else - currprefs.address_space_24 = 1; + p->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; + case 'c': + fprintf (stderr, "Obsolete CPU type modifier 'c'.\n"); break; - default: + default: fprintf (stderr, "Bad CPU parameter specified - type \"uae -h\" for help.\n"); break; } @@ -858,7 +1092,7 @@ static void parse_cpu_specs (char *spec) } /* Returns the number of args used up (0 or 1). */ -int parse_cmdline_option (char c, char *arg) +int parse_cmdline_option (struct uae_prefs *p, char c, char *arg) { const char arg_required[] = "0123rKpImWSAJwNCZUFcblOdHRv"; @@ -870,102 +1104,99 @@ int parse_cmdline_option (char c, char * 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 '0': strncpy (p->df[0], arg, 255); p->df[0][255] = 0; break; + case '1': strncpy (p->df[1], arg, 255); p->df[1][255] = 0; break; + case '2': strncpy (p->df[2], arg, 255); p->df[2][255] = 0; break; + case '3': strncpy (p->df[3], arg, 255); p->df[3][255] = 0; break; + case 'r': strncpy (p->romfile, arg, 255); p->romfile[255] = 0; break; + case 'K': strncpy (p->keyfile, arg, 255); p->keyfile[255] = 0; break; + case 'p': strncpy (p->prtname, arg, 255); p->prtname[255] = 0; break; + /* case 'I': strncpy (p->sername, arg, 255); p->sername[255] = 0; p->use_serial = 1; break; */ + case 'm': case 'M': parse_filesys_spec (p, c == 'M', arg); break; + case 'W': parse_hardfile_spec (p, arg); break; + case 'S': parse_sound_spec (p, arg); break; + case 'R': p->gfx_framerate = atoi (arg); break; + case 'i': p->illegal_mem = 1; break; + case 'J': parse_joy_spec (p, arg); break; + + case 't': p->test_drawing_speed = 1; break; + case 'L': p->x11_use_low_bandwidth = 1; break; + case 'T': p->x11_use_mitshm = 1; break; + case 'w': p->m68k_speed = atoi (arg); break; + + case 'G': p->start_gui = 0; break; + case 'D': p->start_debugger = 1; break; case 'n': if (strchr (arg, '3') != 0) - currprefs.blits_32bit_enabled = 1; + p->blits_32bit_enabled = 1; if (strchr (arg, 'i') != 0) - currprefs.immediate_blits = 1; + p->immediate_blits = 1; break; case 'v': - set_chipset_mask (&currprefs, atoi (arg)); + set_chipset_mask (p, atoi (arg)); break; case 'C': - parse_cpu_specs (arg); + parse_cpu_specs (p, arg); break; case 'Z': - currprefs.z3fastmem_size = atoi (arg) * 0x100000; + p->z3fastmem_size = atoi (arg) * 0x100000; break; case 'U': - currprefs.gfxmem_size = atoi (arg) * 0x100000; + p->gfxmem_size = atoi (arg) * 0x100000; break; case 'F': - currprefs.fastmem_size = atoi (arg) * 0x100000; + p->fastmem_size = atoi (arg) * 0x100000; break; case 'b': - currprefs.bogomem_size = atoi (arg) * 0x40000; + p->bogomem_size = atoi (arg) * 0x40000; break; case 'c': - currprefs.chipmem_size = atoi (arg) * 0x80000; + p->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; + if (0 == strcasecmp (arg, "de")) + p->keyboard_lang = KBD_LANG_DE; + else if (0 == strcasecmp (arg, "dk")) + p->keyboard_lang = KBD_LANG_DK; + else if (0 == strcasecmp (arg, "us")) + p->keyboard_lang = KBD_LANG_US; + else if (0 == strcasecmp (arg, "se")) + p->keyboard_lang = KBD_LANG_SE; + else if (0 == strcasecmp (arg, "fr")) + p->keyboard_lang = KBD_LANG_FR; + else if (0 == strcasecmp (arg, "it")) + p->keyboard_lang = KBD_LANG_IT; + else if (0 == strcasecmp (arg, "es")) + p->keyboard_lang = KBD_LANG_ES; break; - case 'O': parse_gfx_specs (arg); break; + case 'O': parse_gfx_specs (p, arg); break; case 'd': if (strchr (arg, 'S') != NULL || strchr (arg, 's')) { write_log (" Serial on demand.\n"); - currprefs.serial_demand = 1; + p->serial_demand = 1; } if (strchr (arg, 'P') != NULL || strchr (arg, 'p')) { write_log (" Parallel on demand.\n"); - currprefs.parallel_demand = 1; + p->parallel_demand = 1; } break; case 'H': - currprefs.color_mode = atoi (arg); - if (currprefs.color_mode < 0) { + p->color_mode = atoi (arg); + if (p->color_mode < 0) { fprintf (stderr, "Bad color mode selected. Using default.\n"); - currprefs.color_mode = 0; + p->color_mode = 0; } break; default: @@ -974,3 +1205,100 @@ int parse_cmdline_option (char c, char * } return !! strchr (arg_required, c); } + +int cstype_from_prefs (struct uae_prefs *p) +{ + if ((p->chipset_mask & CSMASK_AGA) == 0) { + if (p->cs_ramseyrev == -1 && p->cs_fatgaryrev == -1) { + if (p->cs_ide == 0) { + if (p->cs_a1000ram && p->chipset_mask == CSMASK_OCS) + return CP_A1000; + if (p->chipset_mask == CSMASK_FULL_ECS) + return CP_A500P; + return CP_A500; + } + if (p->chipset_mask == CSMASK_FULL_ECS) + return CP_A600; + return CP_GENERIC; + } + if (p->cs_ide == 0 && p->cs_fatgaryrev == 0 && p->cs_ramseyrev == 0xd) + return CP_A3000; + return CP_GENERIC; + } + if (p->cs_ide == 1 && p->cs_ramseyrev == -1 && p->cs_fatgaryrev == -1) + return CP_A1200; + if (p->cs_ide == 2 && p->cs_ramseyrev == 0xf && p->cs_fatgaryrev == 0) + return CP_A4000; + return CP_GENERIC; +} + +void built_in_chipset_prefs (struct uae_prefs *p, int cstype) +{ + p->cs_a1000ram = 0; + p->cs_fatgaryrev = -1; + p->cs_ide = 0; + p->cs_ramseyrev = -1; + + switch (cstype) + { + case CP_GENERIC: // generic + p->cs_fatgaryrev = 0; + p->cs_ide = -1; + p->cs_ramseyrev = 0x0f; + break; + case CP_CDTV: // CDTV + break; + case CP_CD32: // CD32 + break; + case CP_A500: // A500 + if (p->chipset_mask & CSMASK_AGA) + p->chipset_mask = CSMASK_ECS_AGNUS; + break; + case CP_A500P: // A500+ + p->chipset_mask = CSMASK_FULL_ECS; + break; + case CP_A600: // A600 + p->cs_ide = 1; + p->chipset_mask = CSMASK_FULL_ECS; + break; + case CP_A1000: // A1000 + p->cs_a1000ram = 1; + p->chipset_mask = CSMASK_OCS; + break; + case CP_A1200: // A1200 + p->cs_ide = 1; + p->chipset_mask = CSMASK_AGA; + break; + case CP_A2000: // A2000 + if (p->chipset_mask & CSMASK_AGA) + p->chipset_mask = CSMASK_ECS_AGNUS; + p->cs_rtc = 1; + break; + case CP_A3000: // A3000 + p->cs_rtc = 2; + p->cs_fatgaryrev = 0; + p->cs_ramseyrev = 0x0d; + p->chipset_mask = CSMASK_FULL_ECS; + break; + case CP_A3000T: // A3000T + p->cs_rtc = 2; + p->cs_fatgaryrev = 0; + p->cs_ramseyrev = 0x0d; + p->chipset_mask = CSMASK_FULL_ECS; + break; + case CP_A4000: // A4000 + p->cs_rtc = 2; + p->cs_fatgaryrev = 0; + p->cs_ramseyrev = 0x0f; + p->cs_ide = 2; + p->chipset_mask = CSMASK_AGA; + break; + case CP_A4000T: // A4000T + p->cs_rtc = 2; + p->cs_fatgaryrev = 0; + p->cs_ramseyrev = 0x0f; + p->cs_ide = 2; + p->chipset_mask = CSMASK_AGA; + break; + } +}