mirror of
https://github.com/wheremyfoodat/Panda3DS.git
synced 2025-04-18 03:31:31 +12:00
[IR] Implement shmem header
This commit is contained in:
parent
be801e544d
commit
03ae0d02d8
2 changed files with 71 additions and 1 deletions
|
@ -24,6 +24,25 @@ class IRUserService {
|
||||||
void requireConnection(u32 messagePointer);
|
void requireConnection(u32 messagePointer);
|
||||||
|
|
||||||
std::optional<Handle> connectionStatusEvent = std::nullopt;
|
std::optional<Handle> connectionStatusEvent = std::nullopt;
|
||||||
|
std::optional<MemoryBlock> sharedMemory = std::nullopt;
|
||||||
|
bool connectedDevice = false;
|
||||||
|
|
||||||
|
// Header of the IR shared memory containing various bits of info
|
||||||
|
// https://www.3dbrew.org/wiki/IRUSER_Shared_Memory
|
||||||
|
struct SharedMemoryStatus {
|
||||||
|
u32 latestReceiveError;
|
||||||
|
u32 latestSharedError;
|
||||||
|
|
||||||
|
u8 connectionStatus;
|
||||||
|
u8 connectionAttemptStatus;
|
||||||
|
u8 connectionRole;
|
||||||
|
u8 machineID;
|
||||||
|
u8 isConnected;
|
||||||
|
u8 networkID;
|
||||||
|
u8 isInitialized; // https://github.com/citra-emu/citra/blob/c10ffda91feb3476a861c47fb38641c1007b9d33/src/core/hle/service/ir/ir_user.cpp#L41
|
||||||
|
u8 unk1;
|
||||||
|
};
|
||||||
|
static_assert(sizeof(SharedMemoryStatus) == 16);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
IRUserService(Memory& mem, Kernel& kernel) : mem(mem), kernel(kernel) {}
|
IRUserService(Memory& mem, Kernel& kernel) : mem(mem), kernel(kernel) {}
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
#include "services/ir_user.hpp"
|
#include "services/ir_user.hpp"
|
||||||
|
|
||||||
|
#include <cstddef>
|
||||||
|
|
||||||
#include "ipc.hpp"
|
#include "ipc.hpp"
|
||||||
#include "kernel.hpp"
|
#include "kernel.hpp"
|
||||||
|
|
||||||
|
@ -13,7 +15,11 @@ namespace IRUserCommands {
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
void IRUserService::reset() { connectionStatusEvent = std::nullopt; }
|
void IRUserService::reset() {
|
||||||
|
connectionStatusEvent = std::nullopt;
|
||||||
|
sharedMemory = std::nullopt;
|
||||||
|
connectedDevice = false;
|
||||||
|
}
|
||||||
|
|
||||||
void IRUserService::handleSyncRequest(u32 messagePointer) {
|
void IRUserService::handleSyncRequest(u32 messagePointer) {
|
||||||
const u32 command = mem.read32(messagePointer);
|
const u32 command = mem.read32(messagePointer);
|
||||||
|
@ -40,6 +46,14 @@ void IRUserService::initializeIrnopShared(u32 messagePointer) {
|
||||||
log("IR:USER: InitializeIrnopShared (shared mem size = %08X, sharedMemHandle = %X) (stubbed)\n", sharedMemSize, sharedMemHandle);
|
log("IR:USER: InitializeIrnopShared (shared mem size = %08X, sharedMemHandle = %X) (stubbed)\n", sharedMemSize, sharedMemHandle);
|
||||||
Helpers::warn("Game is initializing IR:USER. If it explodes, this is probably why");
|
Helpers::warn("Game is initializing IR:USER. If it explodes, this is probably why");
|
||||||
|
|
||||||
|
KernelObject* object = kernel.getObject(sharedMemHandle, KernelObjectType::MemoryBlock);
|
||||||
|
if (object == nullptr) {
|
||||||
|
Helpers::panic("IR::InitializeIrnopShared: Shared memory object does not exist");
|
||||||
|
}
|
||||||
|
|
||||||
|
MemoryBlock* memoryBlock = object->getData<MemoryBlock>();
|
||||||
|
sharedMemory = *memoryBlock;
|
||||||
|
|
||||||
mem.write32(messagePointer, IPC::responseHeader(0x18, 1, 0));
|
mem.write32(messagePointer, IPC::responseHeader(0x18, 1, 0));
|
||||||
mem.write32(messagePointer + 4, Result::Success);
|
mem.write32(messagePointer + 4, Result::Success);
|
||||||
}
|
}
|
||||||
|
@ -47,6 +61,13 @@ void IRUserService::initializeIrnopShared(u32 messagePointer) {
|
||||||
void IRUserService::finalizeIrnop(u32 messagePointer) {
|
void IRUserService::finalizeIrnop(u32 messagePointer) {
|
||||||
log("IR:USER: FinalizeIrnop\n");
|
log("IR:USER: FinalizeIrnop\n");
|
||||||
|
|
||||||
|
if (connectedDevice) {
|
||||||
|
connectedDevice = false;
|
||||||
|
// This should also disconnect CirclePad Pro?
|
||||||
|
}
|
||||||
|
|
||||||
|
sharedMemory = std::nullopt;
|
||||||
|
|
||||||
// This should disconnect any connected device de-initialize the shared memory
|
// This should disconnect any connected device de-initialize the shared memory
|
||||||
mem.write32(messagePointer, IPC::responseHeader(0x2, 1, 0));
|
mem.write32(messagePointer, IPC::responseHeader(0x2, 1, 0));
|
||||||
mem.write32(messagePointer + 4, Result::Success);
|
mem.write32(messagePointer + 4, Result::Success);
|
||||||
|
@ -69,12 +90,42 @@ void IRUserService::requireConnection(u32 messagePointer) {
|
||||||
const u8 deviceID = mem.read8(messagePointer + 4);
|
const u8 deviceID = mem.read8(messagePointer + 4);
|
||||||
log("IR:USER: RequireConnection (device: %d)\n", deviceID);
|
log("IR:USER: RequireConnection (device: %d)\n", deviceID);
|
||||||
|
|
||||||
|
// Reference: https://github.com/citra-emu/citra/blob/c10ffda91feb3476a861c47fb38641c1007b9d33/src/core/hle/service/ir/ir_user.cpp#L306
|
||||||
|
if (sharedMemory.has_value()) {
|
||||||
|
u32 sharedMemAddress = sharedMemory.value().addr;
|
||||||
|
|
||||||
|
// What even is this device meant to be.
|
||||||
|
if (deviceID == 1) {
|
||||||
|
mem.write8(sharedMemAddress + offsetof(SharedMemoryStatus, connectionStatus), 2);
|
||||||
|
mem.write8(sharedMemAddress + offsetof(SharedMemoryStatus, connectionRole), 2);
|
||||||
|
mem.write8(sharedMemAddress + offsetof(SharedMemoryStatus, isConnected), 1);
|
||||||
|
|
||||||
|
connectedDevice = true;
|
||||||
|
if (connectionStatusEvent.has_value()) {
|
||||||
|
kernel.signalEvent(connectionStatusEvent.value());
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
log("IR:USER: Unknown device %d\n", deviceID);
|
||||||
|
mem.write8(sharedMemAddress + offsetof(SharedMemoryStatus, connectionStatus), 1);
|
||||||
|
mem.write8(sharedMemAddress + offsetof(SharedMemoryStatus, connectionAttemptStatus), 2);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
mem.write32(messagePointer, IPC::responseHeader(0x6, 1, 0));
|
mem.write32(messagePointer, IPC::responseHeader(0x6, 1, 0));
|
||||||
mem.write32(messagePointer + 4, Result::Success);
|
mem.write32(messagePointer + 4, Result::Success);
|
||||||
}
|
}
|
||||||
|
|
||||||
void IRUserService::disconnect(u32 messagePointer) {
|
void IRUserService::disconnect(u32 messagePointer) {
|
||||||
log("IR:USER: Disconnect\n");
|
log("IR:USER: Disconnect\n");
|
||||||
|
|
||||||
|
// If there's a connected device, disconnect it and trigger the status event
|
||||||
|
if (connectedDevice) {
|
||||||
|
connectedDevice = false;
|
||||||
|
if (connectionStatusEvent.has_value()) {
|
||||||
|
kernel.signalEvent(connectionStatusEvent.value());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
mem.write32(messagePointer, IPC::responseHeader(0x9, 1, 0));
|
mem.write32(messagePointer, IPC::responseHeader(0x9, 1, 0));
|
||||||
mem.write32(messagePointer + 4, Result::Success);
|
mem.write32(messagePointer + 4, Result::Success);
|
||||||
}
|
}
|
Loading…
Add table
Add a link
Reference in a new issue