ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

uae: support up to 4 floppies through xml bundler

This commit is contained in:
feos 2024-06-12 23:49:04 +03:00
parent 712c82b0df
commit c39da847c2
4 changed files with 39 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskBundler.cs
View File

@ -34,6 +34,7 @@ namespace BizHawk.Client.EmuHawk
Icon = ToolIcon;
SystemDropDown.Items.AddRange(new[]
{
VSystemID.Raw.Amiga,
VSystemID.Raw.AmstradCPC,
VSystemID.Raw.AppleII,
VSystemID.Raw.Arcade,

6
src/BizHawk.Emulation.Cores/Computers/Amiga/LibPUAE.cs
View File

@ -8,11 +8,7 @@ namespace BizHawk.Emulation.Cores.Computers.Amiga
{
public abstract class LibPUAE : LibWaterboxCore
{
public const int PAL_WIDTH = 720;
public const int PAL_HEIGHT = 576;
public const int NTSC_WIDTH = 720;
public const int NTSC_HEIGHT = 480;
public const int KEY_COUNT = 0x68;
public const int KEY_COUNT = 0x68;
[BizImport(CC, Compatibility = true)]
public abstract bool Init(int argc, string[] argv);

17
src/BizHawk.Emulation.Cores/Computers/Amiga/PUAE.ISettable.cs
View File

@ -10,8 +10,6 @@ namespace BizHawk.Emulation.Cores.Computers.Amiga
{
public partial class PUAE : ISettable<object, PUAE.PUAESyncSettings>
{
public const int FASTMEM_AUTO = -1;
public enum MachineConfig
{
[Display(Name = "A500 OCS KS1.3 512K 512K")]
@ -113,12 +111,25 @@ namespace BizHawk.Emulation.Cores.Computers.Amiga
Auto
}
public enum DriveType
{
DRV_NONE = -1,
DRV_35_DD = 0,
DRV_35_HD,
DRV_525_SD,
DRV_35_DD_ESCOM,
DRV_PC_525_ONLY_40,
DRV_PC_35_ONLY_80,
DRV_PC_525_40_80,
DRV_525_DD,
DRV_FB
}
private void CreateArguments(PUAESyncSettings settings)
{
_args = new List<string>
{
"puae",
"-0", "romfile",
};
switch(settings.MachineConfig)

37
src/BizHawk.Emulation.Cores/Computers/Amiga/PUAE.cs
View File

@ -19,15 +19,22 @@ namespace BizHawk.Emulation.Cores.Computers.Amiga
private LibPUAE _puae;
private List<string> _args;
private static string _chipsetCompatible = "";
public const int PAL_WIDTH = 720;
public const int PAL_HEIGHT = 576;
public const int NTSC_WIDTH = 720;
public const int NTSC_HEIGHT = 480;
public const int FASTMEM_AUTO = -1;
public const int MAX_FLOPPIES = 4;
[CoreConstructor(VSystemID.Raw.Amiga)]
public PUAE(CoreLoadParameters<object, PUAESyncSettings> lp)
: base(lp.Comm, new Configuration
{
DefaultWidth = LibPUAE.PAL_WIDTH,
DefaultHeight = LibPUAE.PAL_HEIGHT,
MaxWidth = LibPUAE.PAL_WIDTH,
MaxHeight = LibPUAE.PAL_HEIGHT,
DefaultWidth = PAL_WIDTH,
DefaultHeight = PAL_HEIGHT,
MaxWidth = PAL_WIDTH,
MaxHeight = PAL_HEIGHT,
MaxSamples = 2 * 1024,
SystemId = VSystemID.Raw.Amiga,
DefaultFpsNumerator = 50,
@ -35,6 +42,9 @@ namespace BizHawk.Emulation.Cores.Computers.Amiga
})
{
_syncSettings = lp.SyncSettings ?? new();
var filesToRemove = new List<string>();
CreateArguments(_syncSettings);
ControllerDefinition = InitInput();
_puae = PreInit<LibPUAE>(new WaterboxOptions
{
@ -48,12 +58,13 @@ namespace BizHawk.Emulation.Cores.Computers.Amiga
SkipMemoryConsistencyCheck = lp.Comm.CorePreferences.HasFlag(CoreComm.CorePreferencesFlags.WaterboxMemoryConsistencyCheck),
});
var filesToRemove = new List<string>();
CreateArguments(_syncSettings);
_exe.AddReadonlyFile(lp.Roms[0].FileData, "romfile");
filesToRemove.Add("romfile");
for (var index = 0; index < MAX_FLOPPIES && index < lp.Roms.Count; index++)
{
_exe.AddReadonlyFile(lp.Roms[index].FileData, "disk" + index);
filesToRemove.Add("disk" + index);
AppendSetting($"floppy{ index }=disk{ index }");
AppendSetting($"floppy{ index }type={ (int)DriveType.DRV_35_DD }");
}
var (kickstartData, kickstartInfo) = CoreComm.CoreFileProvider.GetFirmwareWithGameInfoOrThrow(
new(VSystemID.Raw.Amiga, _chipsetCompatible),
@ -65,8 +76,6 @@ namespace BizHawk.Emulation.Cores.Computers.Amiga
"-r", kickstartInfo.Name
});
ControllerDefinition = InitInput();
if (!_puae.Init(_args.Count, _args.ToArray()))
throw new InvalidOperationException("Core rejected the rom!");
@ -95,8 +104,8 @@ namespace BizHawk.Emulation.Cores.Computers.Amiga
});
controller
.AddAxis("Mouse X", (0).RangeTo(LibPUAE.PAL_WIDTH), LibPUAE.PAL_WIDTH / 2)
.AddAxis("Mouse Y", (0).RangeTo(LibPUAE.PAL_HEIGHT), LibPUAE.PAL_HEIGHT / 2);
.AddAxis("Mouse X", (0).RangeTo(PAL_WIDTH), PAL_WIDTH / 2)
.AddAxis("Mouse Y", (0).RangeTo(PAL_HEIGHT), PAL_HEIGHT / 2);
foreach (var b in controller.BoolButtons)
{