piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-24 14:49:53 -06:00
Code Issues Packages Projects Releases Wiki Activity

make cross-instance pause work without being a shitshow

Browse Source
This commit is contained in:
Arisotura
2023-03-11 13:46:29 +01:00
parent 8e1a647574
commit ca0a76af1a
4 changed files with 68 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/frontend/qt_sdl/IPC.cpp
View File

@ -61,6 +61,8 @@ const u32 kMaxCommandSize = 0x800;
const u32 kCommandStart = sizeof(BufferHeader);
const u32 kCommandEnd = kBufferSize;
bool CmdRecvFlags[Cmd_MAX];
void Init()
{
@ -109,6 +111,8 @@ void Init()
}
Buffer->unlock();
memset(CmdRecvFlags, 0, sizeof(CmdRecvFlags));
printf("IPC: instance ID %d\n", InstanceID);
}
@ -185,6 +189,8 @@ void FIFOWrite(void* buf, int len)
void Process()
{
memset(CmdRecvFlags, 0, sizeof(CmdRecvFlags));
Buffer->lock();
u8* data = (u8*)Buffer->data();
BufferHeader* header = (BufferHeader*)&data[0];
@ -211,13 +217,18 @@ void Process()
if (!(cmdheader.Recipients & (1<<InstanceID)))
continue;
if (cmdheader.Command >= Cmd_MAX)
continue;
// handle this command
switch (cmdheader.Command)
/*switch (cmdheader.Command)
{
case Cmd_Pause:
Input::ExtHotkeyPress(HK_Pause);
break;
}
}*/
CmdRecvFlags[cmdheader.Command] = true;
// TODO: store the command data, for future commands that will need it
}
Buffer->unlock();
@ -225,6 +236,22 @@ void Process()
bool SendCommand(u16 recipients, u16 command, u16 len, void* cmddata)
{
if (command >= Cmd_MAX)
{
printf("IPC: invalid command %d\n", command);
return false;
}
if (len && cmddata==nullptr)
{
printf("IPC: ????? sending command with NULL buffer\n");
return false;
}
if (len > kMaxCommandSize)
{
printf("IPC: command too long\n");
return false;
}
Buffer->lock();
u8* data = (u8*)Buffer->data();
BufferHeader* header = (BufferHeader*)&data[0];
@ -237,19 +264,6 @@ bool SendCommand(u16 recipients, u16 command, u16 len, void* cmddata)
return false;
}
if (len && cmddata==nullptr)
{
printf("IPC: ????? sending command with NULL buffer\n");
Buffer->unlock();
return false;
}
if (len > kMaxCommandSize)
{
printf("IPC: command too long\n");
Buffer->unlock();
return false;
}
CommandHeader cmdheader;
cmdheader.Magic = 0x4D434C4D;
cmdheader.SenderID = InstanceID;
@ -264,4 +278,10 @@ bool SendCommand(u16 recipients, u16 command, u16 len, void* cmddata)
return true;
}
bool CommandReceived(u16 command)
{
if (command >= Cmd_MAX) return false;
return CmdRecvFlags[command];
}
}