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

deal with FIFO overflow more gracefully

This commit is contained in:
Arisotura 2022-08-27 13:37:56 +02:00
parent b858114c48
commit 67630e3913
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/frontend/qt_sdl/LocalMP.cpp
View File

@ -147,6 +147,11 @@ bool SemWait(int num, int timeout)
return WaitForSingleObject(SemPool[num], timeout) == WAIT_OBJECT_0; return WaitForSingleObject(SemPool[num], timeout) == WAIT_OBJECT_0;
} }
void SemReset(int num)
{
while (WaitForSingleObject(SemPool[num], 0) == WAIT_OBJECT_0);
}
/*bool SemWaitMultiple(int start, u16 bitmask, int timeout) /*bool SemWaitMultiple(int start, u16 bitmask, int timeout)
{ {
HANDLE semlist[16]; HANDLE semlist[16];
@ -378,13 +383,16 @@ int RecvPacketGeneric(u8* packet, bool block, u64* timestamp)
MPQueue->lock(); MPQueue->lock();
u8* data = (u8*)MPQueue->data(); u8* data = (u8*)MPQueue->data();
MPQueueHeader* header = (MPQueueHeader*)&data[0];
MPPacketHeader pktheader; MPPacketHeader pktheader;
FIFORead(0, &pktheader, sizeof(pktheader)); FIFORead(0, &pktheader, sizeof(pktheader));
if (pktheader.Magic != 0x4946494E) if (pktheader.Magic != 0x4946494E)
{ {
printf("MP: !!!! PACKET FIFO IS CRAPOED\n"); printf("PACKET FIFO OVERFLOW\n");
PacketReadOffset = header->PacketWriteOffset;
SemReset(InstanceID);
MPQueue->unlock(); MPQueue->unlock();
return 0; return 0;
} }
@ -494,7 +502,9 @@ u16 RecvReplies(u8* packets, u64 timestamp, u16 aidmask)
if (pktheader.Magic != 0x4946494E) if (pktheader.Magic != 0x4946494E)
{ {
printf("MP: !!!! REPLY FIFO IS CRAPOED\n"); printf("REPLY FIFO OVERFLOW\n");
ReplyReadOffset = header->ReplyWriteOffset;
SemReset(16+InstanceID);
MPQueue->unlock(); MPQueue->unlock();
return 0; return 0;
} }