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

fix #2805 for real this time (#2936) 

* fix https://github.com/TASVideos/BizHawk/issues/2805

* fix https://github.com/TASVideos/BizHawk/issues/2805 for real this time

* misc

* advance penguin
This commit is contained in:
CasualPokePlayer 2021-09-21 05:46:57 -07:00 committed by GitHub
parent b5639f8834
commit d513c5b2a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/dll/libmgba.dll.so
View File

Binary file not shown.

BIN
Assets/dll/mgba.dll
View File

Binary file not shown.

5
src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/LibmGBA.cs
View File

@ -180,6 +180,11 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
[BizImport(cc, Compatibility = true)] [BizImport(cc, Compatibility = true)]
public abstract byte BizReadBus(IntPtr ctx, uint addr); public abstract byte BizReadBus(IntPtr ctx, uint addr);
[UnmanagedFunctionPointer(cc)]
public delegate void InputCallback();
[BizImport(cc, Compatibility = true)]
public abstract void BizSetInputCallback(IntPtr ctx, InputCallback cb);
[UnmanagedFunctionPointer(cc)] [UnmanagedFunctionPointer(cc)]
public delegate void TraceCallback(string msg); public delegate void TraceCallback(string msg);
[BizImport(cc, Compatibility = true)] [BizImport(cc, Compatibility = true)]

11
src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.IInputPollable.cs
View File

@ -4,10 +4,15 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
{ {
public partial class MGBAHawk : IInputPollable public partial class MGBAHawk : IInputPollable
{ {
private readonly LibmGBA.InputCallback InputCallback;
public int LagCount { get; set; } public int LagCount { get; set; }
public bool IsLagFrame { get; set; } public bool IsLagFrame { get; set; }
private void InputCb()
[FeatureNotImplemented] {
public IInputCallbackSystem InputCallbacks { get; private set; } // most things are already handled in the core, this is just for event.oninputpoll
InputCallbacks.Call();
}
private InputCallbackSystem _inputCallbacks = new InputCallbackSystem();
public IInputCallbackSystem InputCallbacks => _inputCallbacks;
} }
} }

3
src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.cs
View File

@ -78,7 +78,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
throw; throw;
} }
InputCallbacks = new MemoryBasedInputCallbackSystem(this, "System Bus", new[] { 0x4000130u }); InputCallback = new LibmGBA.InputCallback(InputCb);
LibmGBA.BizSetInputCallback(Core, InputCallback);
} }
public IEmulatorServiceProvider ServiceProvider { get; } public IEmulatorServiceProvider ServiceProvider { get; }

2
submodules/mgba

@ -1 +1 @@
Subproject commit 751a87dd3a7b4bdc2b2b00fa89ace69b685529ce Subproject commit ade176cfbaca2903ab40d998287f9eb1e84624b5