Special request from Knitax: Allow setting 68030-68060 as well.

This commit is contained in:
simon.kagstrom 2009-05-22 10:35:54 +00:00
parent acdeb56cc7
commit afef092a1f

View File

@ -66,7 +66,7 @@ static const char *memory_messages[] = {
static const char *cpu_chipset_messages[] = { static const char *cpu_chipset_messages[] = {
/*00*/ "CPU type", /*00*/ "CPU type",
/*01*/ "^|68000|68010|68020", /*01*/ "^|68000|68010|68020|68030|68040|68060",
/*03*/ "Chipset type", /*03*/ "Chipset type",
/*04*/ "^|OCS|ECS|ECS full|AGA", /*04*/ "^|OCS|ECS|ECS full|AGA",
NULL NULL
@ -187,10 +187,12 @@ static void insert_floppy(int which)
static void cpu_chipset_options(void) static void cpu_chipset_options(void)
{ {
const int cpu_levels[] = { 0, 1, 2, 3, 4, 6};
const int chipset_masks[] = {0, CSMASK_ECS_AGNUS, CSMASK_ECS_DENISE, CSMASK_AGA}; const int chipset_masks[] = {0, CSMASK_ECS_AGNUS, CSMASK_ECS_DENISE, CSMASK_AGA};
int submenus[2], opt; int submenus[2], opt;
submenus[0] = currprefs.cpu_level; submenus[0] = find_index_by_val(currprefs.cpu_level, cpu_levels,
sizeof(cpu_levels) / sizeof(cpu_levels[0]));
submenus[1] = find_index_by_val(currprefs.chipset_mask, chipset_masks, submenus[1] = find_index_by_val(currprefs.chipset_mask, chipset_masks,
sizeof(chipset_masks) / sizeof(chipset_masks[0])); sizeof(chipset_masks) / sizeof(chipset_masks[0]));
@ -198,7 +200,7 @@ static void cpu_chipset_options(void)
cpu_chipset_messages, submenus); cpu_chipset_messages, submenus);
if (opt < 0) if (opt < 0)
return; return;
changed_prefs.cpu_level = submenus[0]; changed_prefs.cpu_level = cpu_levels[submenus[0]];
changed_prefs.chipset_mask = chipset_masks[submenus[1]]; changed_prefs.chipset_mask = chipset_masks[submenus[1]];
prefs_has_changed = 1; prefs_has_changed = 1;