Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-07-04 22:32:57 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

CPP fixes

Browse source
This commit is contained in:
wheremyfoodat 2025-07-02 21:35:29 +03:00
parent 5a912aaf2f
commit a3f9ced3aa
2 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/core/services/ir/circlepad_pro.cpp
View file

@ -13,9 +13,11 @@ void CirclePadPro::receivePayload(Payload payload) {
const u8 type = payload[0]; const u8 type = payload[0];
switch (type) { switch (type) {
case CPPRequestID::ConfigurePolling: case CPPRequestID::ConfigurePolling: {
[[maybe_unused]] const u8 pollingPeriodMs = payload[1];
// TODO // TODO
break; break;
}
case CPPRequestID::ReadCalibrationData: { case CPPRequestID::ReadCalibrationData: {
static constexpr std::array<u8, 0x40> calibrationData = { static constexpr std::array<u8, 0x40> calibrationData = {

13
src/core/services/ir/ir_user.cpp
View file

@ -82,10 +82,12 @@ void IRUserService::initializeIrnopShared(u32 messagePointer) {
receiveBuffer = std::make_unique<IR::Buffer>(mem, memoryBlock->addr, 0x10, 0x20, receiveBufferPackageCount, receiveBufferSize); receiveBuffer = std::make_unique<IR::Buffer>(mem, memoryBlock->addr, 0x10, 0x20, receiveBufferPackageCount, receiveBufferSize);
// Initialize the shared memory block to 0s
for (int i = 0; i < sizeof(SharedMemoryStatus); i++) {
mem.write8(memoryBlock->addr + i, 0);
}
// Set the initialized byte in shared mem to 1 // Set the initialized byte in shared mem to 1
mem.write8(memoryBlock->addr + offsetof(SharedMemoryStatus, isInitialized), 1); mem.write8(memoryBlock->addr + offsetof(SharedMemoryStatus, isInitialized), 1);
mem.write64(memoryBlock->addr + 0x10, 0); // Initialize the receive buffer info to all 0s
mem.write64(memoryBlock->addr + 0x18, 0);
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);
@ -166,6 +168,10 @@ void IRUserService::requireConnection(u32 messagePointer) {
if (enableCirclePadPro) { if (enableCirclePadPro) {
cpp.connect(); cpp.connect();
// Slight hack: For some reason, CirclePad Pro breaks in some games (eg Majora's Mask 3D) unless we do this
if (receiveEvent) {
kernel.signalEvent(*receiveEvent);
}
} }
mem.write8(sharedMemAddress + offsetof(SharedMemoryStatus, connectionStatus), status); mem.write8(sharedMemAddress + offsetof(SharedMemoryStatus, connectionStatus), status);
@ -181,6 +187,8 @@ void IRUserService::requireConnection(u32 messagePointer) {
mem.write8(sharedMemAddress + offsetof(SharedMemoryStatus, connectionStatus), 1); mem.write8(sharedMemAddress + offsetof(SharedMemoryStatus, connectionStatus), 1);
mem.write8(sharedMemAddress + offsetof(SharedMemoryStatus, connectionAttemptStatus), 2); mem.write8(sharedMemAddress + offsetof(SharedMemoryStatus, connectionAttemptStatus), 2);
} }
} else {
Helpers::warn("RequireConnection without shmem");
} }
mem.write32(messagePointer, IPC::responseHeader(0x6, 1, 0)); mem.write32(messagePointer, IPC::responseHeader(0x6, 1, 0));
@ -329,7 +337,6 @@ void IRUserService::updateCirclePadPro() {
response.cStick.x = rand() & 0xFFF; response.cStick.x = rand() & 0xFFF;
response.cStick.y = static_cast<u32>(CirclePadPro::ButtonState::C_STICK_CENTER); response.cStick.y = static_cast<u32>(CirclePadPro::ButtonState::C_STICK_CENTER);
response.buttons.zlNotPressed = 1; response.buttons.zlNotPressed = 1;
response.buttons.zrNotPressed = rand() & 1;
response.buttons.rNotPressed = 1; response.buttons.rNotPressed = 1;
std::vector<u8> responsePayload(sizeof(response)); std::vector<u8> responsePayload(sizeof(response));