From 72f9e6c952d7d9a007077f8b15aabad02d9e05c1 Mon Sep 17 00:00:00 2001 From: feos Date: Wed, 12 Jun 2024 13:42:20 +0300 Subject: [PATCH] uae: move --- .../Computers/Amiga/PUAE.ISettable.cs | 105 ++++++++++++++++++ .../Computers/Amiga/PUAE.cs | 105 ------------------ 2 files changed, 105 insertions(+), 105 deletions(-) diff --git a/src/BizHawk.Emulation.Cores/Computers/Amiga/PUAE.ISettable.cs b/src/BizHawk.Emulation.Cores/Computers/Amiga/PUAE.ISettable.cs index b2d75449a7..6fb5f5db49 100644 --- a/src/BizHawk.Emulation.Cores/Computers/Amiga/PUAE.ISettable.cs +++ b/src/BizHawk.Emulation.Cores/Computers/Amiga/PUAE.ISettable.cs @@ -113,6 +113,111 @@ namespace BizHawk.Emulation.Cores.Computers.Amiga Auto } + private void CreateArguments(PUAESyncSettings settings) + { + _args = new List + { + "puae", + "-0", "romfile", + }; + + switch(settings.MachineConfig) + { + case MachineConfig.A500_OCS_130_512K_512K: + _chipsetCompatible = Enum.GetName(typeof(ChipsetCompatible), ChipsetCompatible.A500); + AppendSetting(new List + { + "cpu_model=" + (int)CpuModel._68000, + "chipset=" + Chipset.OCS, + "chipset_compatible=" + _chipsetCompatible, + "chipmem_size=" + (int)ChipMemory.KB_512, + "bogomem_size=" + (int)SlowMemory.KB_512, + "fastmem_size=0", + }); + EnableCycleExact(); + break; + case MachineConfig.A600_ECS_205_2M: + _chipsetCompatible = Enum.GetName(typeof(ChipsetCompatible), ChipsetCompatible.A600); + AppendSetting(new List + { + "cpu_model=" + (int)CpuModel._68000, + "chipset=" + Chipset.ECS, + "chipset_compatible=" + _chipsetCompatible, + "chipmem_size=" + (int)ChipMemory.MB_2, + "bogomem_size=" + (int)SlowMemory.KB_0, + "fastmem_size=0", + }); + EnableCycleExact(); + break; + case MachineConfig.A1200_AGA_310_2M_8M: + _chipsetCompatible = Enum.GetName(typeof(ChipsetCompatible), ChipsetCompatible.A1200); + AppendSetting(new List + { + "cpu_model=" + (int)CpuModel._68020, + "chipset=" + Chipset.AGA, + "chipset_compatible=" + _chipsetCompatible, + "chipmem_size=" + (int)ChipMemory.MB_2, + "bogomem_size=" + (int)SlowMemory.KB_0, + "fastmem_size=8", + }); + EnableCycleExact(); + break; + case MachineConfig.A4000_AGA_310_2M_8M: + _chipsetCompatible = Enum.GetName(typeof(ChipsetCompatible), ChipsetCompatible.A4000); + AppendSetting(new List + { + "cpu_model=" + (int)CpuModel._68040, + "fpu_model=68040", + "mmu_model=68040", + "chipset=" + Chipset.AGA, + "chipset_compatible=" + _chipsetCompatible, + "chipmem_size=" + (int)ChipMemory.MB_2, + "bogomem_size=" + (int)SlowMemory.KB_0, + "fastmem_size=8", + }); + break; + } + + if (settings.CpuModel != CpuModel.Auto) + { + AppendSetting("cpu_model=" + (int)settings.CpuModel); + + if (settings.CpuModel < CpuModel._68030) + { + EnableCycleExact(); + } + } + + if (settings.Chipset != Chipset.Auto) + { + AppendSetting("chipset=" + (int)settings.Chipset); + } + + if (settings.ChipsetCompatible != ChipsetCompatible.Auto) + { + AppendSetting("chipset_compatible=" + + Enum.GetName(typeof(ChipsetCompatible), settings.ChipsetCompatible)); + } + + if (settings.ChipMemory != ChipMemory.Auto) + { + AppendSetting("chipmem_size=" + (int)settings.ChipMemory); + } + + if (settings.SlowMemory != SlowMemory.Auto) + { + AppendSetting("bogomem_size=" + (int)settings.SlowMemory); + } + + if (settings.FastMemory != FASTMEM_AUTO) + { + AppendSetting("fastmem_size=" + settings.FastMemory); + } + + AppendSetting("input.mouse_speed=" + settings.MouseSpeed); + AppendSetting("sound_stereo_separation=" + settings.StereoSeparation / 10); + } + private void AppendSetting(List settings) { foreach (var s in settings) diff --git a/src/BizHawk.Emulation.Cores/Computers/Amiga/PUAE.cs b/src/BizHawk.Emulation.Cores/Computers/Amiga/PUAE.cs index e7cf16e312..1343a332ac 100644 --- a/src/BizHawk.Emulation.Cores/Computers/Amiga/PUAE.cs +++ b/src/BizHawk.Emulation.Cores/Computers/Amiga/PUAE.cs @@ -78,111 +78,6 @@ namespace BizHawk.Emulation.Cores.Computers.Amiga PostInit(); } - private void CreateArguments(PUAESyncSettings settings) - { - _args = new List - { - "puae", - "-0", "romfile", - }; - - switch(settings.MachineConfig) - { - case MachineConfig.A500_OCS_130_512K_512K: - _chipsetCompatible = Enum.GetName(typeof(ChipsetCompatible), ChipsetCompatible.A500); - AppendSetting(new List - { - "cpu_model=" + (int)CpuModel._68000, - "chipset=" + Chipset.OCS, - "chipset_compatible=" + _chipsetCompatible, - "chipmem_size=" + (int)ChipMemory.KB_512, - "bogomem_size=" + (int)SlowMemory.KB_512, - "fastmem_size=0", - }); - EnableCycleExact(); - break; - case MachineConfig.A600_ECS_205_2M: - _chipsetCompatible = Enum.GetName(typeof(ChipsetCompatible), ChipsetCompatible.A600); - AppendSetting(new List - { - "cpu_model=" + (int)CpuModel._68000, - "chipset=" + Chipset.ECS, - "chipset_compatible=" + _chipsetCompatible, - "chipmem_size=" + (int)ChipMemory.MB_2, - "bogomem_size=" + (int)SlowMemory.KB_0, - "fastmem_size=0", - }); - EnableCycleExact(); - break; - case MachineConfig.A1200_AGA_310_2M_8M: - _chipsetCompatible = Enum.GetName(typeof(ChipsetCompatible), ChipsetCompatible.A1200); - AppendSetting(new List - { - "cpu_model=" + (int)CpuModel._68020, - "chipset=" + Chipset.AGA, - "chipset_compatible=" + _chipsetCompatible, - "chipmem_size=" + (int)ChipMemory.MB_2, - "bogomem_size=" + (int)SlowMemory.KB_0, - "fastmem_size=8", - }); - EnableCycleExact(); - break; - case MachineConfig.A4000_AGA_310_2M_8M: - _chipsetCompatible = Enum.GetName(typeof(ChipsetCompatible), ChipsetCompatible.A4000); - AppendSetting(new List - { - "cpu_model=" + (int)CpuModel._68040, - "fpu_model=68040", - "mmu_model=68040", - "chipset=" + Chipset.AGA, - "chipset_compatible=" + _chipsetCompatible, - "chipmem_size=" + (int)ChipMemory.MB_2, - "bogomem_size=" + (int)SlowMemory.KB_0, - "fastmem_size=8", - }); - break; - } - - if (settings.CpuModel != CpuModel.Auto) - { - AppendSetting("cpu_model=" + (int)settings.CpuModel); - - if (settings.CpuModel < CpuModel._68030) - { - EnableCycleExact(); - } - } - - if (settings.Chipset != Chipset.Auto) - { - AppendSetting("chipset=" + (int)settings.Chipset); - } - - if (settings.ChipsetCompatible != ChipsetCompatible.Auto) - { - AppendSetting("chipset_compatible=" - + Enum.GetName(typeof(ChipsetCompatible), settings.ChipsetCompatible)); - } - - if (settings.ChipMemory != ChipMemory.Auto) - { - AppendSetting("chipmem_size=" + (int)settings.ChipMemory); - } - - if (settings.SlowMemory != SlowMemory.Auto) - { - AppendSetting("bogomem_size=" + (int)settings.SlowMemory); - } - - if (settings.FastMemory != FASTMEM_AUTO) - { - AppendSetting("fastmem_size=" + settings.FastMemory); - } - - AppendSetting("input.mouse_speed=" + settings.MouseSpeed); - AppendSetting("sound_stereo_separation=" + settings.StereoSeparation / 10); - } - private static ControllerDefinition InitInput() { var controller = new ControllerDefinition("Amiga Controller");