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

disable the dngp database hack, and add some debugging statements to it

This commit is contained in:
nattthebear 2017-06-02 17:19:31 -04:00
parent 034337c51d
commit b7865f7576
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Emulation.Common/Database/Database.cs
View File

@ -338,7 +338,7 @@ namespace BizHawk.Emulation.Common
case ".NGP": case ".NGP":
case ".NGC": case ".NGC":
game.System = "DNGP"; game.System = "NGP";
break; break;
} }

26
BizHawk.Emulation.Cores/Consoles/SNK/DualNeoGeoPort.cs
View File

@ -91,9 +91,13 @@ namespace BizHawk.Emulation.Cores.Consoles.SNK
{ {
case LinkRequest.RequestTypes.EndOfFrame: case LinkRequest.RequestTypes.EndOfFrame:
if (r.RequestType == LinkRequest.RequestTypes.EndOfFrame) if (r.RequestType == LinkRequest.RequestTypes.EndOfFrame)
{
Console.WriteLine("\nEnd of Frame {0} {1}", _leftData.Count, _rightData.Count);
return; return;
}
break; break;
case LinkRequest.RequestTypes.Write: case LinkRequest.RequestTypes.Write:
Console.Write("LW ");
_leftData.Enqueue(l.Data); _leftData.Enqueue(l.Data);
l = LeftIn.Take(); l = LeftIn.Take();
continue; continue;
@ -101,6 +105,8 @@ namespace BizHawk.Emulation.Cores.Consoles.SNK
case LinkRequest.RequestTypes.Poll: case LinkRequest.RequestTypes.Poll:
if (_rightData.Count > 0) if (_rightData.Count > 0)
{ {
if (l.RequestType == LinkRequest.RequestTypes.Read)
Console.Write("LR ");
LeftOut.Add(new LinkResult LeftOut.Add(new LinkResult
{ {
Data = l.RequestType == LinkRequest.RequestTypes.Read ? _rightData.Dequeue() : _rightData.Peek(), Data = l.RequestType == LinkRequest.RequestTypes.Read ? _rightData.Dequeue() : _rightData.Peek(),
@ -111,6 +117,8 @@ namespace BizHawk.Emulation.Cores.Consoles.SNK
} }
else if (r.RequestType != LinkRequest.RequestTypes.Write) else if (r.RequestType != LinkRequest.RequestTypes.Write)
{ {
if (l.RequestType == LinkRequest.RequestTypes.Read)
Console.Write("L! ");
LeftOut.Add(new LinkResult LeftOut.Add(new LinkResult
{ {
Data = l.Data, Data = l.Data,
@ -127,6 +135,7 @@ namespace BizHawk.Emulation.Cores.Consoles.SNK
switch (r.RequestType) switch (r.RequestType)
{ {
case LinkRequest.RequestTypes.Write: case LinkRequest.RequestTypes.Write:
Console.Write("RW ");
_rightData.Enqueue(r.Data); _rightData.Enqueue(r.Data);
r = RightIn.Take(); r = RightIn.Take();
continue; continue;
@ -134,6 +143,8 @@ namespace BizHawk.Emulation.Cores.Consoles.SNK
case LinkRequest.RequestTypes.Poll: case LinkRequest.RequestTypes.Poll:
if (_leftData.Count > 0) if (_leftData.Count > 0)
{ {
if (r.RequestType == LinkRequest.RequestTypes.Read)
Console.Write("RR ");
RightOut.Add(new LinkResult RightOut.Add(new LinkResult
{ {
Data = r.RequestType == LinkRequest.RequestTypes.Read ? _leftData.Dequeue() : _leftData.Peek(), Data = r.RequestType == LinkRequest.RequestTypes.Read ? _leftData.Dequeue() : _leftData.Peek(),
@ -144,6 +155,8 @@ namespace BizHawk.Emulation.Cores.Consoles.SNK
} }
else if (l.RequestType != LinkRequest.RequestTypes.Write) else if (l.RequestType != LinkRequest.RequestTypes.Write)
{ {
if (r.RequestType == LinkRequest.RequestTypes.Read)
Console.Write("R! ");
RightOut.Add(new LinkResult RightOut.Add(new LinkResult
{ {
Data = r.Data, Data = r.Data,
@ -206,11 +219,20 @@ namespace BizHawk.Emulation.Cores.Consoles.SNK
_core._neopop.SetCommsCallbacks(_readcb, _pollcb, _writecb); _core._neopop.SetCommsCallbacks(_readcb, _pollcb, _writecb);
} }
private bool CommsPollNoBuffer()
{
_push.Add(new LinkRequest
{
RequestType = LinkRequest.RequestTypes.Poll
});
return _pull.Take().Return;
}
[BizExport(CallingConvention.Cdecl)] [BizExport(CallingConvention.Cdecl)]
public bool CommsReadCallback(byte* buffer) public bool CommsReadCallback(byte* buffer)
{ {
if (buffer == null) if (buffer == null)
return true; return CommsPollNoBuffer();
_push.Add(new LinkRequest _push.Add(new LinkRequest
{ {
RequestType = LinkRequest.RequestTypes.Read, RequestType = LinkRequest.RequestTypes.Read,
@ -224,7 +246,7 @@ namespace BizHawk.Emulation.Cores.Consoles.SNK
public bool CommsPollCallback(byte* buffer) public bool CommsPollCallback(byte* buffer)
{ {
if (buffer == null) if (buffer == null)
return true; return CommsPollNoBuffer();
_push.Add(new LinkRequest _push.Add(new LinkRequest
{ {
RequestType = LinkRequest.RequestTypes.Poll, RequestType = LinkRequest.RequestTypes.Poll,