From 382c0f953da55592c2363c853415b8ec2af49805 Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Mon, 30 Jun 2025 01:33:32 +0300 Subject: [PATCH 01/12] Initial CPP implementation --- CMakeLists.txt | 9 +- include/config.hpp | 1 + include/services/ir/circlepad_pro.hpp | 14 + include/services/ir/ir_device.hpp | 23 ++ include/services/ir/ir_types.hpp | 148 +++++++++++ include/services/{ => ir}/ir_user.hpp | 24 +- include/services/service_manager.hpp | 3 +- src/config.cpp | 2 + src/core/services/ir/circlepad_pro.cpp | 60 +++++ src/core/services/ir/crc8.cpp | 31 +++ src/core/services/ir/ir_user.cpp | 341 +++++++++++++++++++++++++ src/core/services/ir_user.cpp | 173 ------------- src/core/services/service_manager.cpp | 7 +- src/emulator.cpp | 6 +- 14 files changed, 658 insertions(+), 184 deletions(-) create mode 100644 include/services/ir/circlepad_pro.hpp create mode 100644 include/services/ir/ir_device.hpp create mode 100644 include/services/ir/ir_types.hpp rename include/services/{ => ir}/ir_user.hpp (63%) create mode 100644 src/core/services/ir/circlepad_pro.cpp create mode 100644 src/core/services/ir/crc8.cpp create mode 100644 src/core/services/ir/ir_user.cpp delete mode 100644 src/core/services/ir_user.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 77546320..cc32316f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -346,10 +346,10 @@ set(SERVICE_SOURCE_FILES src/core/services/service_manager.cpp src/core/services src/core/services/frd.cpp src/core/services/nim.cpp src/core/services/mcu/mcu_hwc.cpp src/core/services/y2r.cpp src/core/services/cam.cpp src/core/services/ldr_ro.cpp src/core/services/act.cpp src/core/services/nfc.cpp src/core/services/dlp_srvr.cpp - src/core/services/ir_user.cpp src/core/services/http.cpp src/core/services/soc.cpp + src/core/services/ir/ir_user.cpp src/core/services/http.cpp src/core/services/soc.cpp src/core/services/ssl.cpp src/core/services/news_u.cpp src/core/services/amiibo_device.cpp src/core/services/csnd.cpp src/core/services/nwm_uds.cpp src/core/services/fonts.cpp - src/core/services/ns.cpp + src/core/services/ns.cpp src/core/services/ir/circlepad_pro.cpp src/core/services/ir/crc8.cpp ) set(PICA_SOURCE_FILES src/core/PICA/gpu.cpp src/core/PICA/regs.cpp src/core/PICA/shader_unit.cpp src/core/PICA/shader_interpreter.cpp src/core/PICA/dynapica/shader_rec.cpp @@ -397,7 +397,7 @@ set(HEADER_FILES include/emulator.hpp include/helpers.hpp include/termcolor.hpp include/result/result_common.hpp include/result/result_fs.hpp include/result/result_fnd.hpp include/result/result_gsp.hpp include/result/result_kernel.hpp include/result/result_os.hpp include/crypto/aes_engine.hpp include/metaprogramming.hpp include/PICA/pica_vertex.hpp - include/config.hpp include/services/ir_user.hpp include/http_server.hpp include/cheats.hpp + include/config.hpp include/services/ir/ir_user.hpp include/http_server.hpp include/cheats.hpp include/action_replay.hpp include/renderer_sw/renderer_sw.hpp include/compiler_builtins.hpp include/fs/romfs.hpp include/fs/ivfc.hpp include/discord_rpc.hpp include/services/http.hpp include/result/result_cfg.hpp include/applets/applet.hpp include/applets/mii_selector.hpp include/math_util.hpp include/services/soc.hpp @@ -414,7 +414,8 @@ set(HEADER_FILES include/emulator.hpp include/helpers.hpp include/termcolor.hpp include/audio/audio_interpolation.hpp include/audio/hle_mixer.hpp include/audio/dsp_simd.hpp include/services/dsp_firmware_db.hpp include/frontend_settings.hpp include/fs/archive_twl_photo.hpp include/fs/archive_twl_sound.hpp include/fs/archive_card_spi.hpp include/services/ns.hpp include/audio/audio_device.hpp - include/audio/audio_device_interface.hpp include/audio/libretro_audio_device.hpp + include/audio/audio_device_interface.hpp include/audio/libretro_audio_device.hpp include/services/ir/ir_types.hpp + include/services/ir/ir_device.hpp include/services/ir/circlepad_pro.hpp ) if(IOS) diff --git a/include/config.hpp b/include/config.hpp index 5e1bd8a7..80642e20 100644 --- a/include/config.hpp +++ b/include/config.hpp @@ -81,6 +81,7 @@ struct EmulatorConfig { bool sdCardInserted = true; bool sdWriteProtected = false; + bool circlePadProEnabled = true; bool usePortableBuild = false; bool audioEnabled = audioEnabledDefault; diff --git a/include/services/ir/circlepad_pro.hpp b/include/services/ir/circlepad_pro.hpp new file mode 100644 index 00000000..824e4572 --- /dev/null +++ b/include/services/ir/circlepad_pro.hpp @@ -0,0 +1,14 @@ +#pragma once +#include "services/ir/ir_device.hpp" +#include "services/ir/ir_types.hpp" + +namespace IR { + class CirclePadPro : public IR::Device { + public: + virtual void connect() override; + virtual void disconnect() override; + virtual void receivePayload(Payload payload) override; + + CirclePadPro(SendCallback sendCallback) : IR::Device(sendCallback) {} + }; +} // namespace IR \ No newline at end of file diff --git a/include/services/ir/ir_device.hpp b/include/services/ir/ir_device.hpp new file mode 100644 index 00000000..9a73f9ab --- /dev/null +++ b/include/services/ir/ir_device.hpp @@ -0,0 +1,23 @@ +#pragma once +#include +#include + +#include "helpers.hpp" + +namespace IR { + class Device { + public: + using Payload = std::span; + + protected: + using SendCallback = std::function; // Callback for sending data from IR device->3DS + SendCallback sendCallback; + + public: + virtual void connect() = 0; + virtual void disconnect() = 0; + virtual void receivePayload(Payload payload) = 0; + + Device(SendCallback sendCallback) : sendCallback(sendCallback) {} + }; +} // namespace IR \ No newline at end of file diff --git a/include/services/ir/ir_types.hpp b/include/services/ir/ir_types.hpp new file mode 100644 index 00000000..0b97ba76 --- /dev/null +++ b/include/services/ir/ir_types.hpp @@ -0,0 +1,148 @@ +#pragma once +#include + +#include "bitfield.hpp" +#include "helpers.hpp" +#include "memory.hpp" +#include "swap.hpp" + +// Type definitions for the IR service +// Based off https://github.com/azahar-emu/azahar/blob/de7b457ee466e432047c4ee8d37fca9eae7e031e/src/core/hle/service/ir/ir_user.cpp#L88 + +namespace IR { + class Buffer { + public: + Buffer(Memory& memory, u32 sharedMemBaseVaddr, u32 infoOffset, u32 bufferOffset, u32 maxPackets, u32 bufferSize) + : memory(memory), sharedMemBaseVaddr(sharedMemBaseVaddr), infoOffset(infoOffset), bufferOffset(bufferOffset), maxPackets(maxPackets), + maxDataSize(bufferSize - sizeof(PacketInfo) * maxPackets) { + updateBufferInfo(); + } + + u8* getPointer(u32 offset) { return (u8*)memory.getReadPointer(sharedMemBaseVaddr + offset); } + + bool put(std::span packet) { + if (info.packetCount == maxPackets) { + return false; + } + + u32 offset; + + // finds free space offset in data buffer + if (info.packetCount == 0) { + offset = 0; + if (packet.size() > maxDataSize) { + return false; + } + } else { + const u32 lastIndex = (info.endIndex + maxPackets - 1) % maxPackets; + const PacketInfo first = getPacketInfo(info.beginIndex); + const PacketInfo last = getPacketInfo(lastIndex); + offset = (last.offset + last.size) % maxDataSize; + const u32 freeSpace = (first.offset + maxDataSize - offset) % maxDataSize; + + if (packet.size() > freeSpace) { + return false; + } + } + + // Writes packet info + PacketInfo packet_info{offset, static_cast(packet.size())}; + setPacketInfo(info.endIndex, packet_info); + + // Writes packet data + for (std::size_t i = 0; i < packet.size(); ++i) { + *getDataBufferPointer((offset + i) % maxDataSize) = packet[i]; + } + + // Updates buffer info + info.endIndex++; + info.endIndex %= maxPackets; + info.packetCount++; + updateBufferInfo(); + return true; + } + + bool release(u32 count) { + if (info.packetCount < count) { + return false; + } + + info.packetCount -= count; + info.beginIndex += count; + info.beginIndex %= maxPackets; + updateBufferInfo(); + return true; + } + + u32 getPacketCount() { return info.packetCount; } + + private: + struct BufferInfo { + u32_le beginIndex; + u32_le endIndex; + u32_le packetCount; + u32_le unknown; + }; + static_assert(sizeof(BufferInfo) == 16, "IR::BufferInfo has wrong size!"); + + struct PacketInfo { + u32_le offset; + u32_le size; + }; + static_assert(sizeof(PacketInfo) == 8, "IR::PacketInfo has wrong size!"); + + u8* getPacketInfoPointer(u32 index) { return getPointer(bufferOffset + sizeof(PacketInfo) * index); } + void setPacketInfo(u32 index, const PacketInfo& packet_info) { std::memcpy(getPacketInfoPointer(index), &packet_info, sizeof(PacketInfo)); } + + PacketInfo getPacketInfo(u32 index) { + PacketInfo packet_info; + std::memcpy(&packet_info, getPacketInfoPointer(index), sizeof(PacketInfo)); + return packet_info; + } + + u8* getDataBufferPointer(u32 offset) { return getPointer(bufferOffset + sizeof(PacketInfo) * maxPackets + offset); } + void updateBufferInfo() { + if (infoOffset) { + std::memcpy(getPointer(infoOffset), &info, sizeof(info)); + } + } + + BufferInfo info{0, 0, 0, 0}; + Memory& memory; + u32 sharedMemBaseVaddr; + u32 infoOffset; + u32 bufferOffset; + u32 maxPackets; + u32 maxDataSize; + }; + + struct CPPResponse { + union { + BitField<0, 8, u32> header; + BitField<8, 12, u32> c_stick_x; + BitField<20, 12, u32> c_stick_y; + } c_stick; + union { + BitField<0, 5, u8> battery_level; + BitField<5, 1, u8> zl_not_held; + BitField<6, 1, u8> zr_not_held; + BitField<7, 1, u8> r_not_held; + } buttons; + u8 unknown; + }; + static_assert(sizeof(CPPResponse) == 6, "Circlepad Pro response has wrong size"); + + namespace CPPResponseID { + enum : u8 { + PollButtons = 0x10, // This response contains the current Circlepad Pro button/stick state + ReadCalibrationData = 0x11, // Responding to a ReadCalibrationData request + }; + } + + namespace CPPRequestID { + enum : u8 { + ConfigurePolling = 1, // Configures if & how often to poll the Circlepad Pro button/stick state + ReadCalibrationData = 2, // Reads the Circlepad Pro calibration data + }; + } +} // namespace IR diff --git a/include/services/ir_user.hpp b/include/services/ir/ir_user.hpp similarity index 63% rename from include/services/ir_user.hpp rename to include/services/ir/ir_user.hpp index d475bdaa..a9b9ad09 100644 --- a/include/services/ir_user.hpp +++ b/include/services/ir/ir_user.hpp @@ -1,11 +1,14 @@ #pragma once #include +#include +#include "config.hpp" #include "helpers.hpp" #include "kernel_types.hpp" #include "logger.hpp" #include "memory.hpp" #include "result/result.hpp" +#include "services/ir/circlepad_pro.hpp" // Circular dependencies in this project? Never class Kernel; @@ -20,21 +23,29 @@ class IRUserService { Handle handle = KernelHandles::IR_USER; Memory& mem; Kernel& kernel; + const EmulatorConfig& config; + MAKE_LOG_FUNCTION(log, irUserLogger) // Service commands + void clearReceiveBuffer(u32 messagePointer); + void clearSendBuffer(u32 messagePointer); void disconnect(u32 messagePointer); void finalizeIrnop(u32 messagePointer); void getConnectionStatusEvent(u32 messagePointer); void getReceiveEvent(u32 messagePointer); + void getSendEvent(u32 messagePointer); void initializeIrnopShared(u32 messagePointer); void requireConnection(u32 messagePointer); void sendIrnop(u32 messagePointer); + void releaseReceivedData(u32 messagePointer); using IREvent = std::optional; IREvent connectionStatusEvent = std::nullopt; IREvent receiveEvent = std::nullopt; + IREvent sendEvent = std::nullopt; + IR::CirclePadPro cpp; std::optional sharedMemory = std::nullopt; bool connectedDevice = false; @@ -56,8 +67,19 @@ class IRUserService { }; static_assert(sizeof(SharedMemoryStatus) == 16); + // The IR service uses CRC8 with generator polynomial = 0x07 for verifying packets received from IR devices + static u8 crc8(std::span data); + + // IR service calls this to send a console->device payload + void receivePayload(std::span data); + // IR devices call this to send a device->console payload + void sendPayload(std::span payload); + public: - IRUserService(Memory& mem, Kernel& kernel) : mem(mem), kernel(kernel) {} + IRUserService(Memory& mem, const EmulatorConfig& config, Kernel& kernel) + : mem(mem), config(config), kernel(kernel), cpp([&](IR::Device::Payload payload) { sendPayload(payload); }) {} + void reset(); void handleSyncRequest(u32 messagePointer); + void updateCirclePadPro(); }; \ No newline at end of file diff --git a/include/services/service_manager.hpp b/include/services/service_manager.hpp index c777408c..a38f2ddc 100644 --- a/include/services/service_manager.hpp +++ b/include/services/service_manager.hpp @@ -23,7 +23,7 @@ #include "services/gsp_lcd.hpp" #include "services/hid.hpp" #include "services/http.hpp" -#include "services/ir_user.hpp" +#include "services/ir/ir_user.hpp" #include "services/ldr_ro.hpp" #include "services/mcu/mcu_hwc.hpp" #include "services/mic.hpp" @@ -114,4 +114,5 @@ class ServiceManager { NFCService& getNFC() { return nfc; } DSPService& getDSP() { return dsp; } Y2RService& getY2R() { return y2r; } + IRUserService& getIRUser() { return ir_user; } }; diff --git a/src/config.cpp b/src/config.cpp index 59f10bd5..28fd7df0 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -47,6 +47,7 @@ void EmulatorConfig::load() { defaultRomPath = toml::find_or(general, "DefaultRomPath", ""); printAppVersion = toml::find_or(general, "PrintAppVersion", true); + circlePadProEnabled = toml::find_or(general, "EnableCirclePadPro", true); systemLanguage = languageCodeFromString(toml::find_or(general, "SystemLanguage", "en")); } } @@ -174,6 +175,7 @@ void EmulatorConfig::save() { data["General"]["DefaultRomPath"] = defaultRomPath.string(); data["General"]["PrintAppVersion"] = printAppVersion; data["General"]["SystemLanguage"] = languageCodeToString(systemLanguage); + data["General"]["EnableCirclePadPro"] = circlePadProEnabled; data["Window"]["AppVersionOnWindow"] = windowSettings.showAppVersion; data["Window"]["RememberWindowPosition"] = windowSettings.rememberPosition; diff --git a/src/core/services/ir/circlepad_pro.cpp b/src/core/services/ir/circlepad_pro.cpp new file mode 100644 index 00000000..c4b379f1 --- /dev/null +++ b/src/core/services/ir/circlepad_pro.cpp @@ -0,0 +1,60 @@ +#include "services/ir/circlepad_pro.hpp" + +#include +#include +#include + +using namespace IR; + +void CirclePadPro::connect() {} +void CirclePadPro::disconnect() {} + +void CirclePadPro::receivePayload(Payload payload) { + const u8 type = payload[0]; + + switch (type) { + case CPPRequestID::ConfigurePolling: + // TODO + break; + + case CPPRequestID::ReadCalibrationData: { + static constexpr std::array calibrationData = { + 0x00, 0x00, 0x08, 0x80, 0x85, 0xEB, 0x11, 0x3F, 0x85, 0xEB, 0x11, 0x3F, 0xFF, 0xFF, 0xFF, 0xF5, 0xFF, 0x00, 0x08, 0x80, 0x85, 0xEB, + 0x11, 0x3F, 0x85, 0xEB, 0x11, 0x3F, 0xFF, 0xFF, 0xFF, 0x65, 0xFF, 0x00, 0x08, 0x80, 0x85, 0xEB, 0x11, 0x3F, 0x85, 0xEB, 0x11, 0x3F, + 0xFF, 0xFF, 0xFF, 0x65, 0xFF, 0x00, 0x08, 0x80, 0x85, 0xEB, 0x11, 0x3F, 0x85, 0xEB, 0x11, 0x3F, 0xFF, 0xFF, 0xFF, 0x65, + }; + + struct ReadCalibrationDataRequest { + u8 requestID; + u8 expectedResponseTime; + u16_le offset; + u16_le size; + }; + static_assert(sizeof(ReadCalibrationDataRequest) == 6, "ReadCalibrationDataRequest has wrong size"); + + if (payload.size() != sizeof(ReadCalibrationDataRequest)) { + Helpers::warn("IR::ReadCalibrationData: Wrong request size"); + return; + } + + ReadCalibrationDataRequest request; + std::memcpy(&request, payload.data(), sizeof(request)); + + const u16 offset = request.offset & ~0xF; + const u16 size = request.size & ~0xF; + + if (static_cast(offset + size) > calibrationData.size()) { + Helpers::warn("IR::ReadCalibrationData: Read beyond the end of calibration data!!"); + return; + } + + std::vector response(5 + size); + response[0] = static_cast(CPPResponseID::ReadCalibrationData); + std::memcpy(&response[1], &request.offset, sizeof(request.offset)); + std::memcpy(&response[3], &request.size, sizeof(request.size)); + std::memcpy(&response[5], calibrationData.data() + offset, size); + sendCallback(response); + break; + } + } +} diff --git a/src/core/services/ir/crc8.cpp b/src/core/services/ir/crc8.cpp new file mode 100644 index 00000000..a5016fd0 --- /dev/null +++ b/src/core/services/ir/crc8.cpp @@ -0,0 +1,31 @@ +#include + +#include "services/ir/ir_user.hpp" + +u8 IRUserService::crc8(std::span data) { + // The IR service uses CRC8 with generator polynomial = 0x07 for verifying payloads received from IR devices + static constexpr std::array crcTable = { + 0x00, 0x07, 0x0E, 0x09, 0x1C, 0x1B, 0x12, 0x15, 0x38, 0x3F, 0x36, 0x31, 0x24, 0x23, 0x2A, 0x2D, 0x70, 0x77, 0x7E, 0x79, 0x6C, 0x6B, + 0x62, 0x65, 0x48, 0x4F, 0x46, 0x41, 0x54, 0x53, 0x5A, 0x5D, 0xE0, 0xE7, 0xEE, 0xE9, 0xFC, 0xFB, 0xF2, 0xF5, 0xD8, 0xDF, 0xD6, 0xD1, + 0xC4, 0xC3, 0xCA, 0xCD, 0x90, 0x97, 0x9E, 0x99, 0x8C, 0x8B, 0x82, 0x85, 0xA8, 0xAF, 0xA6, 0xA1, 0xB4, 0xB3, 0xBA, 0xBD, 0xC7, 0xC0, + 0xC9, 0xCE, 0xDB, 0xDC, 0xD5, 0xD2, 0xFF, 0xF8, 0xF1, 0xF6, 0xE3, 0xE4, 0xED, 0xEA, 0xB7, 0xB0, 0xB9, 0xBE, 0xAB, 0xAC, 0xA5, 0xA2, + 0x8F, 0x88, 0x81, 0x86, 0x93, 0x94, 0x9D, 0x9A, 0x27, 0x20, 0x29, 0x2E, 0x3B, 0x3C, 0x35, 0x32, 0x1F, 0x18, 0x11, 0x16, 0x03, 0x04, + 0x0D, 0x0A, 0x57, 0x50, 0x59, 0x5E, 0x4B, 0x4C, 0x45, 0x42, 0x6F, 0x68, 0x61, 0x66, 0x73, 0x74, 0x7D, 0x7A, 0x89, 0x8E, 0x87, 0x80, + 0x95, 0x92, 0x9B, 0x9C, 0xB1, 0xB6, 0xBF, 0xB8, 0xAD, 0xAA, 0xA3, 0xA4, 0xF9, 0xFE, 0xF7, 0xF0, 0xE5, 0xE2, 0xEB, 0xEC, 0xC1, 0xC6, + 0xCF, 0xC8, 0xDD, 0xDA, 0xD3, 0xD4, 0x69, 0x6E, 0x67, 0x60, 0x75, 0x72, 0x7B, 0x7C, 0x51, 0x56, 0x5F, 0x58, 0x4D, 0x4A, 0x43, 0x44, + 0x19, 0x1E, 0x17, 0x10, 0x05, 0x02, 0x0B, 0x0C, 0x21, 0x26, 0x2F, 0x28, 0x3D, 0x3A, 0x33, 0x34, 0x4E, 0x49, 0x40, 0x47, 0x52, 0x55, + 0x5C, 0x5B, 0x76, 0x71, 0x78, 0x7F, 0x6A, 0x6D, 0x64, 0x63, 0x3E, 0x39, 0x30, 0x37, 0x22, 0x25, 0x2C, 0x2B, 0x06, 0x01, 0x08, 0x0F, + 0x1A, 0x1D, 0x14, 0x13, 0xAE, 0xA9, 0xA0, 0xA7, 0xB2, 0xB5, 0xBC, 0xBB, 0x96, 0x91, 0x98, 0x9F, 0x8A, 0x8D, 0x84, 0x83, 0xDE, 0xD9, + 0xD0, 0xD7, 0xC2, 0xC5, 0xCC, 0xCB, 0xE6, 0xE1, 0xE8, 0xEF, 0xFA, 0xFD, 0xF4, 0xF3, + }; + + u8 crc = 0; + crc = ~crc; + + for (usize i = 0; i < data.size(); i++) { + const u8 byte = data[i]; + crc = crcTable[crc ^ byte]; + } + + return ~crc; +} \ No newline at end of file diff --git a/src/core/services/ir/ir_user.cpp b/src/core/services/ir/ir_user.cpp new file mode 100644 index 00000000..b111ddf4 --- /dev/null +++ b/src/core/services/ir/ir_user.cpp @@ -0,0 +1,341 @@ +#include "services/ir/ir_user.hpp" + +#include +#include +#include +#include +#include +#include + +#include "ipc.hpp" +#include "kernel.hpp" +#include "services/ir/ir_types.hpp" + +using namespace IR; + +namespace IRUserCommands { + enum : u32 { + FinalizeIrnop = 0x00020000, + ClearReceiveBuffer = 0x00030000, + ClearSendBuffer = 0x00040000, + RequireConnection = 0x00060040, + Disconnect = 0x00090000, + GetReceiveEvent = 0x000A0000, + GetSendEvent = 0x000B0000, + GetConnectionStatusEvent = 0x000C0000, + SendIrnop = 0x000D0042, + InitializeIrnopShared = 0x00180182, + ReleaseReceivedData = 0x00190040, + }; +} + +std::unique_ptr receiveBuffer; + +void IRUserService::reset() { + connectionStatusEvent = std::nullopt; + receiveEvent = std::nullopt; + sendEvent = std::nullopt; + sharedMemory = std::nullopt; + + receiveBuffer = nullptr; + connectedDevice = false; +} + +void IRUserService::handleSyncRequest(u32 messagePointer) { + const u32 command = mem.read32(messagePointer); + switch (command) { + case IRUserCommands::Disconnect: disconnect(messagePointer); break; + case IRUserCommands::FinalizeIrnop: finalizeIrnop(messagePointer); break; + case IRUserCommands::GetReceiveEvent: getReceiveEvent(messagePointer); break; + case IRUserCommands::GetSendEvent: getSendEvent(messagePointer); break; + case IRUserCommands::GetConnectionStatusEvent: getConnectionStatusEvent(messagePointer); break; + case IRUserCommands::InitializeIrnopShared: initializeIrnopShared(messagePointer); break; + case IRUserCommands::RequireConnection: requireConnection(messagePointer); break; + case IRUserCommands::SendIrnop: sendIrnop(messagePointer); break; + case IRUserCommands::ClearReceiveBuffer: clearReceiveBuffer(messagePointer); break; + case IRUserCommands::ClearSendBuffer: clearSendBuffer(messagePointer); break; + case IRUserCommands::ReleaseReceivedData: releaseReceivedData(messagePointer); break; + default: Helpers::panic("ir:USER service requested. Command: %08X\n", command); + } +} + +void IRUserService::initializeIrnopShared(u32 messagePointer) { + const u32 sharedMemSize = mem.read32(messagePointer + 4); + const u32 receiveBufferSize = mem.read32(messagePointer + 8); + const u32 receiveBufferPackageCount = mem.read32(messagePointer + 12); + const u32 sendBufferSize = mem.read32(messagePointer + 16); + const u32 sendBufferPackageCount = mem.read32(messagePointer + 20); + const u32 bitrate = mem.read32(messagePointer + 24); + const u32 descriptor = mem.read32(messagePointer + 28); + const u32 sharedMemHandle = mem.read32(messagePointer + 32); + + 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"); + + KernelObject* object = kernel.getObject(sharedMemHandle, KernelObjectType::MemoryBlock); + if (object == nullptr) { + Helpers::panic("IR::InitializeIrnopShared: Shared memory object does not exist"); + } + + MemoryBlock* memoryBlock = object->getData(); + sharedMemory = *memoryBlock; + + receiveBuffer = std::make_unique(mem, memoryBlock->addr, 0x10, 0x20, receiveBufferPackageCount, receiveBufferSize); + + // Set the initialized byte in shared mem to 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 + 4, Result::Success); +} + +void IRUserService::finalizeIrnop(u32 messagePointer) { + log("IR:USER: FinalizeIrnop\n"); + + if (connectedDevice) { + connectedDevice = false; + cpp.disconnect(); + } + + sharedMemory = std::nullopt; + + // This should disconnect any connected device de-initialize the shared memory + mem.write32(messagePointer, IPC::responseHeader(0x2, 1, 0)); + mem.write32(messagePointer + 4, Result::Success); +} + +void IRUserService::getConnectionStatusEvent(u32 messagePointer) { + log("IR:USER: GetConnectionStatusEvent\n"); + + if (!connectionStatusEvent.has_value()) { + connectionStatusEvent = kernel.makeEvent(ResetType::OneShot); + } + + mem.write32(messagePointer, IPC::responseHeader(0xC, 1, 2)); + mem.write32(messagePointer + 4, Result::Success); + // TOOD: Descriptor here + mem.write32(messagePointer + 12, connectionStatusEvent.value()); +} + +void IRUserService::getReceiveEvent(u32 messagePointer) { + log("IR:USER: GetReceiveEvent\n"); + + if (!receiveEvent.has_value()) { + receiveEvent = kernel.makeEvent(ResetType::OneShot); + } + + mem.write32(messagePointer, IPC::responseHeader(0xA, 1, 2)); + mem.write32(messagePointer + 4, Result::Success); + mem.write32(messagePointer + 8, 0x40000000); + // TOOD: Descriptor here + mem.write32(messagePointer + 12, receiveEvent.value()); +} + +void IRUserService::getSendEvent(u32 messagePointer) { + log("IR:USER: GetSendEvent\n"); + + if (!sendEvent.has_value()) { + sendEvent = kernel.makeEvent(ResetType::OneShot); + } + + mem.write32(messagePointer, IPC::responseHeader(0xB, 1, 2)); + mem.write32(messagePointer + 4, Result::Success); + mem.write32(messagePointer + 8, 0x40000000); + // TOOD: Descriptor here + mem.write32(messagePointer + 12, sendEvent.value()); +} + +void IRUserService::requireConnection(u32 messagePointer) { + const u8 deviceID = mem.read8(messagePointer + 4); + 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; + + if (deviceID == u8(DeviceID::CirclePadPro)) { + const bool enableCirclePadPro = config.circlePadProEnabled; // TODO: This should always be true for N3DS too + + // Note: We temporarily pretend we don't have a CirclePad Pro. This code must change when we emulate it or N3DS C-stick + const u8 status = (enableCirclePadPro) ? 2 : 1; // Any value other than 2 is considered not connected. + const u8 role = 0; + const u8 connected = (enableCirclePadPro) ? 1 : 0; + + if (enableCirclePadPro) { + cpp.connect(); + } + + mem.write8(sharedMemAddress + offsetof(SharedMemoryStatus, connectionStatus), status); + mem.write8(sharedMemAddress + offsetof(SharedMemoryStatus, connectionRole), role); + mem.write8(sharedMemAddress + offsetof(SharedMemoryStatus, isConnected), connected); + + connectedDevice = connected; + 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 + 4, Result::Success); +} + +void IRUserService::sendIrnop(u32 messagePointer) { + const u32 bufferSize = mem.read32(messagePointer + 4); + const u32 inputPointer = mem.read32(messagePointer + 12); + + std::vector data; + data.reserve(bufferSize); + + for (u32 i = 0; i < bufferSize; i++) { + data.push_back(mem.read8(inputPointer + i)); + } + + mem.write32(messagePointer, IPC::responseHeader(0xD, 1, 0)); + + if (connectedDevice) { + cpp.receivePayload(data); + if (sendEvent.has_value()) { + kernel.signalEvent(sendEvent.value()); + } + + mem.write32(messagePointer + 4, Result::Success); + } else { + Helpers::warn("IR:USER: SendIrnop without connected device"); + mem.write32(messagePointer + 4, Result::FailurePlaceholder); + } +} + +void IRUserService::disconnect(u32 messagePointer) { + log("IR:USER: Disconnect\n"); + + if (sharedMemory.has_value()) { + u32 sharedMemAddress = sharedMemory.value().addr; + + mem.write8(sharedMemAddress + offsetof(SharedMemoryStatus, connectionStatus), 0); + mem.write8(sharedMemAddress + offsetof(SharedMemoryStatus, isConnected), 0); + } + + // 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 + 4, Result::Success); +} + +void IRUserService::releaseReceivedData(u32 messagePointer) { + const u32 size = mem.read32(messagePointer + 4); + log("IR:USER: ReleaseReceivedData (%08X)\n", size); + + mem.write32(messagePointer, IPC::responseHeader(0x19, 1, 0)); + + if (receiveBuffer) { + if (receiveBuffer->release(size)) { + mem.write32(messagePointer + 4, Result::Success); + } else { + Helpers::warn("IR:USER: ReleaseReceivedData failed to release\n"); + mem.write32(messagePointer + 4, Result::FailurePlaceholder); + } + } else { + Helpers::warn("IR:USER: ReleaseReceivedData with no receive buffer?\n"); + mem.write32(messagePointer + 4, Result::FailurePlaceholder); + } +} + +void IRUserService::clearReceiveBuffer(u32 messagePointer) { + log("IR:USER: ClearReceiveBuffer\n"); + mem.write32(messagePointer, IPC::responseHeader(0x0C, 1, 0)); + + if (receiveBuffer) { + if (receiveBuffer->release(receiveBuffer->getPacketCount())) { + mem.write32(messagePointer + 4, Result::Success); + } else { + Helpers::warn("IR:USER: ClearReceiveBuffer failed to release\n"); + mem.write32(messagePointer + 4, Result::FailurePlaceholder); + } + } else { + Helpers::warn("IR:USER: ClearReceiveBuffer with no receive buffer?\n"); + mem.write32(messagePointer + 4, Result::FailurePlaceholder); + } +} + +void IRUserService::clearSendBuffer(u32 messagePointer) { + log("IR:USER: ClearSendBuffer (Stubbed)\n"); + + mem.write32(messagePointer, IPC::responseHeader(0x0D, 1, 0)); + mem.write32(messagePointer + 4, Result::Success); +} + +void IRUserService::sendPayload(std::span payload) { + if (!receiveBuffer) { + return; + } + + std::vector packet; + + // Builds packet header. For the format info: + // https://www.3dbrew.org/wiki/IRUSER_Shared_Memory#Packet_structure + + packet.push_back(0xA5); + const u8 networkID = *(receiveBuffer->getPointer(offsetof(SharedMemoryStatus, networkID))); + packet.push_back(networkID); + + // puts the size info. + // The highest bit of the first byte is unknown, which is set to zero here. The second highest + // bit is a flag that determines whether the size info is in extended form. If the packet size + // can be represent within 6 bits, the short form (1 byte) of size info is chosen, the size is + // put to the lower bits of this byte, and the flag is clear. If the packet size cannot be + // represent within 6 bits, the extended form (2 bytes) is chosen, the lower 8 bits of the size + // is put to the second byte, the higher bits of the size is put to the lower bits of the first + // byte, and the flag is set. Note that the packet size must be within 14 bits due to this + // format restriction, or it will overlap with the flag bit. + usize size = payload.size(); + if (size < 0x40) { + packet.push_back(static_cast(size)); + } else if (size < 0x4000) { + packet.push_back(static_cast(size >> 8) | 0x40); + packet.push_back(static_cast(size)); + } + + // Insert the payload data + CRC8 checksum into the packet + packet.insert(packet.end(), payload.begin(), payload.end()); + packet.push_back(crc8(packet)); + + if (receiveBuffer->put(packet) && receiveEvent.has_value()) { + kernel.signalEvent(receiveEvent.value()); + } +} + +void IRUserService::updateCirclePadPro() { + if (!connectedDevice || !receiveBuffer) { + return; + } + + constexpr int C_STICK_CENTER = 0x800; + constexpr int C_STICK_RADIUS = 0x7FF; + + CPPResponse response; + response.c_stick.header = static_cast(CPPResponseID::PollButtons); + response.c_stick.c_stick_x = rand() & 0xFFF; + response.c_stick.c_stick_y = static_cast(C_STICK_CENTER); + response.buttons.battery_level = 0x1F; + response.buttons.zl_not_held = 1; + response.buttons.zr_not_held = rand() & 1; + response.buttons.r_not_held = 1; + response.unknown = 0; + + std::vector response_buffer(sizeof(response)); + std::memcpy(response_buffer.data(), &response, sizeof(response)); + sendPayload(response_buffer); +} \ No newline at end of file diff --git a/src/core/services/ir_user.cpp b/src/core/services/ir_user.cpp deleted file mode 100644 index ce4f94c4..00000000 --- a/src/core/services/ir_user.cpp +++ /dev/null @@ -1,173 +0,0 @@ -#include "services/ir_user.hpp" - -#include - -#include "ipc.hpp" -#include "kernel.hpp" - -namespace IRUserCommands { - enum : u32 { - FinalizeIrnop = 0x00020000, - RequireConnection = 0x00060040, - Disconnect = 0x00090000, - GetReceiveEvent = 0x000A0000, - GetConnectionStatusEvent = 0x000C0000, - SendIrnop = 0x000D0042, - InitializeIrnopShared = 0x00180182 - }; -} - -void IRUserService::reset() { - connectionStatusEvent = std::nullopt; - receiveEvent = std::nullopt; - sharedMemory = std::nullopt; - connectedDevice = false; -} - -void IRUserService::handleSyncRequest(u32 messagePointer) { - const u32 command = mem.read32(messagePointer); - switch (command) { - case IRUserCommands::Disconnect: disconnect(messagePointer); break; - case IRUserCommands::FinalizeIrnop: finalizeIrnop(messagePointer); break; - case IRUserCommands::GetReceiveEvent: getReceiveEvent(messagePointer); break; - case IRUserCommands::GetConnectionStatusEvent: getConnectionStatusEvent(messagePointer); break; - case IRUserCommands::InitializeIrnopShared: initializeIrnopShared(messagePointer); break; - case IRUserCommands::RequireConnection: requireConnection(messagePointer); break; - case IRUserCommands::SendIrnop: sendIrnop(messagePointer); break; - default: Helpers::panic("ir:USER service requested. Command: %08X\n", command); - } -} - -void IRUserService::initializeIrnopShared(u32 messagePointer) { - const u32 sharedMemSize = mem.read32(messagePointer + 4); - const u32 receiveBufferSize = mem.read32(messagePointer + 8); - const u32 receiveBufferPackageCount = mem.read32(messagePointer + 12); - const u32 sendBufferSize = mem.read32(messagePointer + 16); - const u32 sendBufferPackageCount = mem.read32(messagePointer + 20); - const u32 bitrate = mem.read32(messagePointer + 24); - const u32 descriptor = mem.read32(messagePointer + 28); - const u32 sharedMemHandle = mem.read32(messagePointer + 32); - - 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"); - - KernelObject* object = kernel.getObject(sharedMemHandle, KernelObjectType::MemoryBlock); - if (object == nullptr) { - Helpers::panic("IR::InitializeIrnopShared: Shared memory object does not exist"); - } - - MemoryBlock* memoryBlock = object->getData(); - sharedMemory = *memoryBlock; - - // Set the initialized byte in shared mem to 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 + 4, Result::Success); -} - -void IRUserService::finalizeIrnop(u32 messagePointer) { - 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 - mem.write32(messagePointer, IPC::responseHeader(0x2, 1, 0)); - mem.write32(messagePointer + 4, Result::Success); -} - -void IRUserService::getConnectionStatusEvent(u32 messagePointer) { - log("IR:USER: GetConnectionStatusEvent\n"); - - if (!connectionStatusEvent.has_value()) { - connectionStatusEvent = kernel.makeEvent(ResetType::OneShot); - } - //kernel.signalEvent(connectionStatusEvent.value()); // ?????????????? - - mem.write32(messagePointer, IPC::responseHeader(0xC, 1, 2)); - mem.write32(messagePointer + 4, Result::Success); - // TOOD: Descriptor here - mem.write32(messagePointer + 12, connectionStatusEvent.value()); -} - -void IRUserService::getReceiveEvent(u32 messagePointer) { - log("IR:USER: GetReceiveEvent\n"); - - if (!receiveEvent.has_value()) { - receiveEvent = kernel.makeEvent(ResetType::OneShot); - } - - mem.write32(messagePointer, IPC::responseHeader(0xA, 1, 2)); - mem.write32(messagePointer + 4, Result::Success); - mem.write32(messagePointer + 8, 0x40000000); - // TOOD: Descriptor here - mem.write32(messagePointer + 12, receiveEvent.value()); -} - -void IRUserService::requireConnection(u32 messagePointer) { - const u8 deviceID = mem.read8(messagePointer + 4); - 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; - - if (deviceID == u8(DeviceID::CirclePadPro)) { - // Note: We temporarily pretend we don't have a CirclePad Pro. This code must change when we emulate it or N3DS C-stick - constexpr u8 status = 1; // Not connected. Any value other than 2 is considered not connected. - constexpr u8 role = 0; - constexpr u8 connected = 0; - - mem.write8(sharedMemAddress + offsetof(SharedMemoryStatus, connectionStatus), status); - mem.write8(sharedMemAddress + offsetof(SharedMemoryStatus, connectionRole), role); - mem.write8(sharedMemAddress + offsetof(SharedMemoryStatus, isConnected), connected); - - 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 + 4, Result::Success); -} - -void IRUserService::sendIrnop(u32 messagePointer) { - Helpers::panic("IR:USER: SendIrnop\n"); - - mem.write32(messagePointer + 4, Result::Success); -} - -void IRUserService::disconnect(u32 messagePointer) { - log("IR:USER: Disconnect\n"); - - if (sharedMemory.has_value()) { - u32 sharedMemAddress = sharedMemory.value().addr; - - mem.write8(sharedMemAddress + offsetof(SharedMemoryStatus, connectionStatus), 0); - mem.write8(sharedMemAddress + offsetof(SharedMemoryStatus, isConnected), 0); - } - - // 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 + 4, Result::Success); -} \ No newline at end of file diff --git a/src/core/services/service_manager.cpp b/src/core/services/service_manager.cpp index ccbbdee8..46282428 100644 --- a/src/core/services/service_manager.cpp +++ b/src/core/services/service_manager.cpp @@ -7,9 +7,10 @@ ServiceManager::ServiceManager(std::span regs, Memory& mem, GPU& gpu, u32& currentPID, Kernel& kernel, const EmulatorConfig& config) : regs(regs), mem(mem), kernel(kernel), ac(mem), am(mem), boss(mem), act(mem), apt(mem, kernel), cam(mem, kernel), cecd(mem, kernel), - cfg(mem, config), csnd(mem, kernel), dlp_srvr(mem), dsp(mem, kernel, config), hid(mem, kernel), http(mem), ir_user(mem, kernel), frd(mem), - fs(mem, kernel, config), gsp_gpu(mem, gpu, kernel, currentPID), gsp_lcd(mem), ldr(mem, kernel), mcu_hwc(mem, config), mic(mem, kernel), - nfc(mem, kernel), nim(mem), ndm(mem), news_u(mem), ns(mem), nwm_uds(mem, kernel), ptm(mem, config), soc(mem), ssl(mem), y2r(mem, kernel) {} + cfg(mem, config), csnd(mem, kernel), dlp_srvr(mem), dsp(mem, kernel, config), hid(mem, kernel), http(mem), ir_user(mem, config, kernel), + frd(mem), fs(mem, kernel, config), gsp_gpu(mem, gpu, kernel, currentPID), gsp_lcd(mem), ldr(mem, kernel), mcu_hwc(mem, config), + mic(mem, kernel), nfc(mem, kernel), nim(mem), ndm(mem), news_u(mem), ns(mem), nwm_uds(mem, kernel), ptm(mem, config), soc(mem), ssl(mem), + y2r(mem, kernel) {} static constexpr int MAX_NOTIFICATION_COUNT = 16; diff --git a/src/emulator.cpp b/src/emulator.cpp index ca6f3f7d..74832214 100644 --- a/src/emulator.cpp +++ b/src/emulator.cpp @@ -132,13 +132,15 @@ void Emulator::togglePause() { running ? pause() : resume(); } void Emulator::runFrame() { if (running) { - cpu.runFrame(); // Run 1 frame of instructions - gpu.display(); // Display graphics + cpu.runFrame(); // Run 1 frame of instructions + gpu.display(); // Display graphics // Run cheats if any are loaded if (cheats.haveCheats()) [[unlikely]] { cheats.run(); } + + getServiceManager().getIRUser().updateCirclePadPro(); } else if (romType != ROMType::None) { // If the emulator is not running and a game is loaded, we still want to display the framebuffer otherwise we will get weird // double-buffering issues From 10d11cb3c969f2d7eefe58536786a97d2de32e42 Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Tue, 1 Jul 2025 02:32:40 +0300 Subject: [PATCH 02/12] Clean up CirclePad Pro state --- include/services/ir/circlepad_pro.hpp | 31 +++++++++++++++++++++++++++ include/services/ir/ir_types.hpp | 16 -------------- src/core/services/ir/ir_user.cpp | 18 ++++++---------- 3 files changed, 37 insertions(+), 28 deletions(-) diff --git a/include/services/ir/circlepad_pro.hpp b/include/services/ir/circlepad_pro.hpp index 824e4572..56ec2259 100644 --- a/include/services/ir/circlepad_pro.hpp +++ b/include/services/ir/circlepad_pro.hpp @@ -1,14 +1,45 @@ #pragma once +#include "bitfield.hpp" #include "services/ir/ir_device.hpp" #include "services/ir/ir_types.hpp" namespace IR { class CirclePadPro : public IR::Device { public: + struct ButtonState { + static constexpr int C_STICK_CENTER = 0x800; + static constexpr int C_STICK_RADIUS = 0x7FF; + + union { + BitField<0, 8, u32> header; + BitField<8, 12, u32> x; + BitField<20, 12, u32> y; + } cStick; + + union { + BitField<0, 5, u8> batteryLevel; + BitField<5, 1, u8> zlNotPressed; + BitField<6, 1, u8> zrNotPressed; + BitField<7, 1, u8> rNotPressed; + } buttons; + + u8 unknown; + + ButtonState() { + // Response header for button state reads + cStick.header = static_cast(CPPResponseID::PollButtons); + // Fully charged + buttons.batteryLevel = 0x1F; + unknown = 0; + } + }; + static_assert(sizeof(ButtonState) == 6, "Circlepad Pro button state has wrong size"); + virtual void connect() override; virtual void disconnect() override; virtual void receivePayload(Payload payload) override; CirclePadPro(SendCallback sendCallback) : IR::Device(sendCallback) {} + ButtonState state; }; } // namespace IR \ No newline at end of file diff --git a/include/services/ir/ir_types.hpp b/include/services/ir/ir_types.hpp index 0b97ba76..8fcd68ba 100644 --- a/include/services/ir/ir_types.hpp +++ b/include/services/ir/ir_types.hpp @@ -116,22 +116,6 @@ namespace IR { u32 maxDataSize; }; - struct CPPResponse { - union { - BitField<0, 8, u32> header; - BitField<8, 12, u32> c_stick_x; - BitField<20, 12, u32> c_stick_y; - } c_stick; - union { - BitField<0, 5, u8> battery_level; - BitField<5, 1, u8> zl_not_held; - BitField<6, 1, u8> zr_not_held; - BitField<7, 1, u8> r_not_held; - } buttons; - u8 unknown; - }; - static_assert(sizeof(CPPResponse) == 6, "Circlepad Pro response has wrong size"); - namespace CPPResponseID { enum : u8 { PollButtons = 0x10, // This response contains the current Circlepad Pro button/stick state diff --git a/src/core/services/ir/ir_user.cpp b/src/core/services/ir/ir_user.cpp index b111ddf4..2794a4bf 100644 --- a/src/core/services/ir/ir_user.cpp +++ b/src/core/services/ir/ir_user.cpp @@ -322,18 +322,12 @@ void IRUserService::updateCirclePadPro() { return; } - constexpr int C_STICK_CENTER = 0x800; - constexpr int C_STICK_RADIUS = 0x7FF; - - CPPResponse response; - response.c_stick.header = static_cast(CPPResponseID::PollButtons); - response.c_stick.c_stick_x = rand() & 0xFFF; - response.c_stick.c_stick_y = static_cast(C_STICK_CENTER); - response.buttons.battery_level = 0x1F; - response.buttons.zl_not_held = 1; - response.buttons.zr_not_held = rand() & 1; - response.buttons.r_not_held = 1; - response.unknown = 0; + auto& response = cpp.state; + response.cStick.x = rand() & 0xFFF; + response.cStick.y = static_cast(CirclePadPro::ButtonState::C_STICK_CENTER); + response.buttons.zlNotPressed = 1; + response.buttons.zrNotPressed = rand() & 1; + response.buttons.rNotPressed = 1; std::vector response_buffer(sizeof(response)); std::memcpy(response_buffer.data(), &response, sizeof(response)); From 95b9f75ef9b3e3acc5f2c523ed505dbd6acf5a5a Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Tue, 1 Jul 2025 03:04:55 +0300 Subject: [PATCH 03/12] Fix naming conventions --- src/core/services/ir/ir_user.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/services/ir/ir_user.cpp b/src/core/services/ir/ir_user.cpp index 2794a4bf..fdff256d 100644 --- a/src/core/services/ir/ir_user.cpp +++ b/src/core/services/ir/ir_user.cpp @@ -329,7 +329,7 @@ void IRUserService::updateCirclePadPro() { response.buttons.zrNotPressed = rand() & 1; response.buttons.rNotPressed = 1; - std::vector response_buffer(sizeof(response)); - std::memcpy(response_buffer.data(), &response, sizeof(response)); - sendPayload(response_buffer); + std::vector responsePayload(sizeof(response)); + std::memcpy(responsePayload.data(), &response, sizeof(response)); + sendPayload(responsePayload); } \ No newline at end of file From 1aa6b571e8aa4821f3768650342d01e252f15c3f Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Tue, 1 Jul 2025 03:54:10 +0300 Subject: [PATCH 04/12] Add UI for toggling CirclePad Pro --- src/panda_qt/config_window.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/panda_qt/config_window.cpp b/src/panda_qt/config_window.cpp index 0b2eb64b..5360b12c 100644 --- a/src/panda_qt/config_window.cpp +++ b/src/panda_qt/config_window.cpp @@ -168,6 +168,10 @@ ConfigWindow::ConfigWindow(ConfigCallback configCallback, MainWindowCallback win }); genLayout->addRow(tr("System language"), systemLanguage); + QCheckBox* circlePadProEnabled = new QCheckBox(tr("Enable CirclePad Pro")); + connectCheckbox(circlePadProEnabled, config.circlePadProEnabled); + genLayout->addRow(circlePadProEnabled); + QCheckBox* discordRpcEnabled = new QCheckBox(tr("Enable Discord RPC")); connectCheckbox(discordRpcEnabled, config.discordRpcEnabled); genLayout->addRow(discordRpcEnabled); From 5a912aaf2f720932ffa7f850219baa23113929fc Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Tue, 1 Jul 2025 04:03:42 +0300 Subject: [PATCH 05/12] IR: More fixes --- src/core/services/ir/crc8.cpp | 3 +-- src/core/services/ir/ir_user.cpp | 9 ++++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/core/services/ir/crc8.cpp b/src/core/services/ir/crc8.cpp index a5016fd0..4fdda868 100644 --- a/src/core/services/ir/crc8.cpp +++ b/src/core/services/ir/crc8.cpp @@ -20,12 +20,11 @@ u8 IRUserService::crc8(std::span data) { }; u8 crc = 0; - crc = ~crc; for (usize i = 0; i < data.size(); i++) { const u8 byte = data[i]; crc = crcTable[crc ^ byte]; } - return ~crc; + return crc; } \ No newline at end of file diff --git a/src/core/services/ir/ir_user.cpp b/src/core/services/ir/ir_user.cpp index fdff256d..7bd9055e 100644 --- a/src/core/services/ir/ir_user.cpp +++ b/src/core/services/ir/ir_user.cpp @@ -69,7 +69,7 @@ void IRUserService::initializeIrnopShared(u32 messagePointer) { const u32 descriptor = mem.read32(messagePointer + 28); const u32 sharedMemHandle = mem.read32(messagePointer + 32); - log("IR:USER: InitializeIrnopShared (shared mem size = %08X, sharedMemHandle = %X) (stubbed)\n", sharedMemSize, sharedMemHandle); + log("IR:USER: InitializeIrnopShared (shared mem size = %08X, sharedMemHandle = %X)\n", sharedMemSize, sharedMemHandle); Helpers::warn("Game is initializing IR:USER. If it explodes, this is probably why"); KernelObject* object = kernel.getObject(sharedMemHandle, KernelObjectType::MemoryBlock); @@ -100,6 +100,7 @@ void IRUserService::finalizeIrnop(u32 messagePointer) { } sharedMemory = std::nullopt; + receiveBuffer = nullptr; // This should disconnect any connected device de-initialize the shared memory mem.write32(messagePointer, IPC::responseHeader(0x2, 1, 0)); @@ -160,7 +161,7 @@ void IRUserService::requireConnection(u32 messagePointer) { // Note: We temporarily pretend we don't have a CirclePad Pro. This code must change when we emulate it or N3DS C-stick const u8 status = (enableCirclePadPro) ? 2 : 1; // Any value other than 2 is considered not connected. - const u8 role = 0; + const u8 role = (enableCirclePadPro) ? 2 : 0; const u8 connected = (enableCirclePadPro) ? 1 : 0; if (enableCirclePadPro) { @@ -216,7 +217,7 @@ void IRUserService::disconnect(u32 messagePointer) { log("IR:USER: Disconnect\n"); if (sharedMemory.has_value()) { - u32 sharedMemAddress = sharedMemory.value().addr; + u32 sharedMemAddress = sharedMemory->addr; mem.write8(sharedMemAddress + offsetof(SharedMemoryStatus, connectionStatus), 0); mem.write8(sharedMemAddress + offsetof(SharedMemoryStatus, isConnected), 0); @@ -225,6 +226,8 @@ void IRUserService::disconnect(u32 messagePointer) { // If there's a connected device, disconnect it and trigger the status event if (connectedDevice) { connectedDevice = false; + cpp.disconnect(); + if (connectionStatusEvent.has_value()) { kernel.signalEvent(connectionStatusEvent.value()); } From a3f9ced3aa8627d11801e505f870772b2ab11efd Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Wed, 2 Jul 2025 21:35:29 +0300 Subject: [PATCH 06/12] CPP fixes --- src/core/services/ir/circlepad_pro.cpp | 4 +++- src/core/services/ir/ir_user.cpp | 13 ++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/core/services/ir/circlepad_pro.cpp b/src/core/services/ir/circlepad_pro.cpp index c4b379f1..9e652a40 100644 --- a/src/core/services/ir/circlepad_pro.cpp +++ b/src/core/services/ir/circlepad_pro.cpp @@ -13,9 +13,11 @@ void CirclePadPro::receivePayload(Payload payload) { const u8 type = payload[0]; switch (type) { - case CPPRequestID::ConfigurePolling: + case CPPRequestID::ConfigurePolling: { + [[maybe_unused]] const u8 pollingPeriodMs = payload[1]; // TODO break; + } case CPPRequestID::ReadCalibrationData: { static constexpr std::array calibrationData = { diff --git a/src/core/services/ir/ir_user.cpp b/src/core/services/ir/ir_user.cpp index 7bd9055e..0c7b4df3 100644 --- a/src/core/services/ir/ir_user.cpp +++ b/src/core/services/ir/ir_user.cpp @@ -82,10 +82,12 @@ void IRUserService::initializeIrnopShared(u32 messagePointer) { receiveBuffer = std::make_unique(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 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 + 4, Result::Success); @@ -166,6 +168,10 @@ void IRUserService::requireConnection(u32 messagePointer) { if (enableCirclePadPro) { 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); @@ -181,6 +187,8 @@ void IRUserService::requireConnection(u32 messagePointer) { mem.write8(sharedMemAddress + offsetof(SharedMemoryStatus, connectionStatus), 1); mem.write8(sharedMemAddress + offsetof(SharedMemoryStatus, connectionAttemptStatus), 2); } + } else { + Helpers::warn("RequireConnection without shmem"); } mem.write32(messagePointer, IPC::responseHeader(0x6, 1, 0)); @@ -329,7 +337,6 @@ void IRUserService::updateCirclePadPro() { response.cStick.x = rand() & 0xFFF; response.cStick.y = static_cast(CirclePadPro::ButtonState::C_STICK_CENTER); response.buttons.zlNotPressed = 1; - response.buttons.zrNotPressed = rand() & 1; response.buttons.rNotPressed = 1; std::vector responsePayload(sizeof(response)); From 935e088ca1708ecd6867f86c5d29c2e7359a3ea4 Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Wed, 2 Jul 2025 21:56:12 +0300 Subject: [PATCH 07/12] More CPP fixes --- include/services/ir/circlepad_pro.hpp | 6 ++++++ include/services/ir/ir_user.hpp | 5 +++++ src/core/PICA/gpu.cpp | 2 +- src/core/services/ir/ir_user.cpp | 12 +++--------- src/panda_qt/main_window.cpp | 21 +++++++++++++++++++++ 5 files changed, 36 insertions(+), 10 deletions(-) diff --git a/include/services/ir/circlepad_pro.hpp b/include/services/ir/circlepad_pro.hpp index 56ec2259..2202c1cf 100644 --- a/include/services/ir/circlepad_pro.hpp +++ b/include/services/ir/circlepad_pro.hpp @@ -28,8 +28,14 @@ namespace IR { ButtonState() { // Response header for button state reads cStick.header = static_cast(CPPResponseID::PollButtons); + cStick.x = static_cast(CirclePadPro::ButtonState::C_STICK_CENTER); + cStick.y = static_cast(CirclePadPro::ButtonState::C_STICK_CENTER); + // Fully charged buttons.batteryLevel = 0x1F; + buttons.zrNotPressed = 1; + buttons.zlNotPressed = 1; + buttons.rNotPressed = 1; unknown = 0; } }; diff --git a/include/services/ir/ir_user.hpp b/include/services/ir/ir_user.hpp index a9b9ad09..221367f9 100644 --- a/include/services/ir/ir_user.hpp +++ b/include/services/ir/ir_user.hpp @@ -79,6 +79,11 @@ class IRUserService { IRUserService(Memory& mem, const EmulatorConfig& config, Kernel& kernel) : mem(mem), config(config), kernel(kernel), cpp([&](IR::Device::Payload payload) { sendPayload(payload); }) {} + void setZRPressed(bool pressed) { cpp.state.buttons.zrNotPressed = pressed ? 0 : 1; } + void setZLPressed(bool pressed) { cpp.state.buttons.zrNotPressed = pressed ? 0 : 1; } + void setCStickX(s16 value) { cpp.state.cStick.x = value; } + void setCStickY(s16 value) { cpp.state.cStick.y = value; } + void reset(); void handleSyncRequest(u32 messagePointer); void updateCirclePadPro(); diff --git a/src/core/PICA/gpu.cpp b/src/core/PICA/gpu.cpp index 838d3fb3..f5d26784 100644 --- a/src/core/PICA/gpu.cpp +++ b/src/core/PICA/gpu.cpp @@ -441,7 +441,7 @@ void GPU::fireDMA(u32 dest, u32 source, u32 size) { u8* fcram = mem.getFCRAM(); std::memcpy(&vram[dest - vramStart], &fcram[source - fcramStart], size); } else { - printf("Non-trivially optimizable GPU DMA. Falling back to byte-by-byte transfer\n"); + log("Non-trivially optimizable GPU DMA. Falling back to byte-by-byte transfer\n"); for (u32 i = 0; i < size; i++) { mem.write8(dest + i, mem.read8(source + i)); diff --git a/src/core/services/ir/ir_user.cpp b/src/core/services/ir/ir_user.cpp index 0c7b4df3..05bc513a 100644 --- a/src/core/services/ir/ir_user.cpp +++ b/src/core/services/ir/ir_user.cpp @@ -333,13 +333,7 @@ void IRUserService::updateCirclePadPro() { return; } - auto& response = cpp.state; - response.cStick.x = rand() & 0xFFF; - response.cStick.y = static_cast(CirclePadPro::ButtonState::C_STICK_CENTER); - response.buttons.zlNotPressed = 1; - response.buttons.rNotPressed = 1; - - std::vector responsePayload(sizeof(response)); - std::memcpy(responsePayload.data(), &response, sizeof(response)); - sendPayload(responsePayload); + std::vector response(sizeof(cpp.state)); + std::memcpy(response.data(), &cpp.state, sizeof(cpp.state)); + sendPayload(response); } \ No newline at end of file diff --git a/src/panda_qt/main_window.cpp b/src/panda_qt/main_window.cpp index ed6c2852..9b4db334 100644 --- a/src/panda_qt/main_window.cpp +++ b/src/panda_qt/main_window.cpp @@ -613,6 +613,27 @@ void MainWindow::pollControllers() { } else { hid.setCirclepadY(-(stickY / div)); } + + auto& ir = emu->getServiceManager().getIRUser(); + const s16 l2 = SDL_GameControllerGetAxis(gameController, SDL_CONTROLLER_AXIS_TRIGGERLEFT); + const s16 r2 = SDL_GameControllerGetAxis(gameController, SDL_CONTROLLER_AXIS_TRIGGERRIGHT); + const s16 cstickX = SDL_GameControllerGetAxis(gameController, SDL_CONTROLLER_AXIS_RIGHTX); + const s16 cstickY = SDL_GameControllerGetAxis(gameController, SDL_CONTROLLER_AXIS_RIGHTY); + + ir.setZLPressed(l2 > 16000); + ir.setZRPressed(r2 > 16000); + + if (std::abs(cstickX) < deadzone) { + ir.setCStickX(IR::CirclePadPro::ButtonState::C_STICK_CENTER); + } else { + ir.setCStickX(cstickX / 8); + } + + if (std::abs(cstickY) < deadzone) { + ir.setCStickY(IR::CirclePadPro::ButtonState::C_STICK_CENTER); + } else { + ir.setCStickY(-(cstickY / 8)); + } } SDL_Event event; From 0ab8a6d956097ea82ef781dc954c4195f5a30222 Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Thu, 3 Jul 2025 00:52:55 +0300 Subject: [PATCH 08/12] More CirclePad Pro improvements --- include/services/hid.hpp | 24 ++++++--- include/services/ir/circlepad_pro.hpp | 1 - include/services/ir/ir_user.hpp | 9 ++-- src/core/services/hid.cpp | 78 +++++++++++++++------------ src/core/services/ir/ir_user.cpp | 14 ++++- src/core/services/service_manager.cpp | 2 +- src/http_server.cpp | 4 +- src/hydra_core.cpp | 1 + src/libretro_core.cpp | 1 + src/lua.cpp | 2 + src/panda_qt/main_window.cpp | 48 +++++++++-------- src/panda_qt/mappings.cpp | 2 + src/panda_sdl/frontend_sdl.cpp | 48 +++++++++++++---- src/panda_sdl/mappings.cpp | 2 + 14 files changed, 155 insertions(+), 81 deletions(-) diff --git a/include/services/hid.hpp b/include/services/hid.hpp index a0eefb1c..642cd6f3 100644 --- a/include/services/hid.hpp +++ b/include/services/hid.hpp @@ -27,6 +27,12 @@ namespace HID::Keys { GPIO0Inv = 1 << 12, // Inverted value of GPIO bit 0 GPIO14Inv = 1 << 13, // Inverted value of GPIO bit 14 + // CirclePad Pro buttons. We store them in the HID service for ease, even though they're only used by the IR service + // Whenever the HID service writes to shared memory, we remember to mask them out + ZL = 1 << 14, + ZR = 1 << 15, + CirclePadProButtons = ZL | ZR, + CirclePadRight = 1 << 28, // X >= 41 CirclePadLeft = 1 << 29, // X <= -41 CirclePadUp = 1 << 30, // Y >= 41 @@ -58,6 +64,9 @@ class HIDService { s16 roll, pitch, yaw; // Gyroscope state s16 accelX, accelY, accelZ; // Accelerometer state + // New 3DS/CirclePad Pro C-stick state + s16 cStickX, cStickY; + bool accelerometerEnabled; bool eventsInitialized; bool gyroEnabled; @@ -113,7 +122,7 @@ class HIDService { // Turn bits 28 and 29 off in the new button state, which indicate whether the circlepad is steering left or right // Then, set them according to the new value of x - newButtons &= ~0x3000'0000; + newButtons &= ~(HID::Keys::CirclePadLeft | HID::Keys::CirclePadRight); if (x >= 41) // Pressing right newButtons |= 1 << 28; else if (x <= -41) // Pressing left @@ -125,13 +134,19 @@ class HIDService { // Turn bits 30 and 31 off in the new button state, which indicate whether the circlepad is steering up or down // Then, set them according to the new value of y - newButtons &= ~0xC000'0000; + newButtons &= ~(HID::Keys::CirclePadUp | HID::Keys::CirclePadDown); if (y >= 41) // Pressing up newButtons |= 1 << 30; else if (y <= -41) // Pressing down newButtons |= 1 << 31; } + void setCStickX(s16 x) { cStickX = x; } + void setCStickY(s16 y) { cStickY = y; } + + s16 getCStickX() { return cStickX; } + s16 getCStickY() { return cStickY; } + void setRoll(s16 value) { roll = value; } void setPitch(s16 value) { pitch = value; } void setYaw(s16 value) { yaw = value; } @@ -157,9 +172,6 @@ class HIDService { touchScreenPressed = true; } - void releaseTouchScreen() { - touchScreenPressed = false; - } - + void releaseTouchScreen() { touchScreenPressed = false; } bool isTouchScreenPressed() { return touchScreenPressed; } }; diff --git a/include/services/ir/circlepad_pro.hpp b/include/services/ir/circlepad_pro.hpp index 2202c1cf..6895ab6f 100644 --- a/include/services/ir/circlepad_pro.hpp +++ b/include/services/ir/circlepad_pro.hpp @@ -8,7 +8,6 @@ namespace IR { public: struct ButtonState { static constexpr int C_STICK_CENTER = 0x800; - static constexpr int C_STICK_RADIUS = 0x7FF; union { BitField<0, 8, u32> header; diff --git a/include/services/ir/ir_user.hpp b/include/services/ir/ir_user.hpp index 221367f9..556ff1d9 100644 --- a/include/services/ir/ir_user.hpp +++ b/include/services/ir/ir_user.hpp @@ -8,6 +8,7 @@ #include "logger.hpp" #include "memory.hpp" #include "result/result.hpp" +#include "services/hid.hpp" #include "services/ir/circlepad_pro.hpp" // Circular dependencies in this project? Never @@ -23,6 +24,8 @@ class IRUserService { Handle handle = KernelHandles::IR_USER; Memory& mem; Kernel& kernel; + // The IR service has a reference to the HID service as that's where the frontends store CirclePad Pro button state in + HIDService& hid; const EmulatorConfig& config; MAKE_LOG_FUNCTION(log, irUserLogger) @@ -76,11 +79,9 @@ class IRUserService { void sendPayload(std::span payload); public: - IRUserService(Memory& mem, const EmulatorConfig& config, Kernel& kernel) - : mem(mem), config(config), kernel(kernel), cpp([&](IR::Device::Payload payload) { sendPayload(payload); }) {} + IRUserService(Memory& mem, HIDService& hid, const EmulatorConfig& config, Kernel& kernel) + : mem(mem), hid(hid), config(config), kernel(kernel), cpp([&](IR::Device::Payload payload) { sendPayload(payload); }) {} - void setZRPressed(bool pressed) { cpp.state.buttons.zrNotPressed = pressed ? 0 : 1; } - void setZLPressed(bool pressed) { cpp.state.buttons.zrNotPressed = pressed ? 0 : 1; } void setCStickX(s16 value) { cpp.state.cStick.x = value; } void setCStickY(s16 value) { cpp.state.cStick.y = value; } diff --git a/src/core/services/hid.cpp b/src/core/services/hid.cpp index a7b9b13b..997884f1 100644 --- a/src/core/services/hid.cpp +++ b/src/core/services/hid.cpp @@ -1,7 +1,9 @@ #include "services/hid.hpp" + +#include + #include "ipc.hpp" #include "kernel.hpp" -#include namespace HIDCommands { enum : u32 { @@ -36,6 +38,8 @@ void HIDService::reset() { touchScreenX = touchScreenY = 0; roll = pitch = yaw = 0; accelX = accelY = accelZ = 0; + + cStickX = cStickY = 0; } void HIDService::handleSyncRequest(u32 messagePointer) { @@ -87,17 +91,17 @@ void HIDService::disableGyroscopeLow(u32 messagePointer) { void HIDService::getGyroscopeLowCalibrateParam(u32 messagePointer) { log("HID::GetGyroscopeLowCalibrateParam\n"); - constexpr s16 unit = 6700; // Approximately from Citra which took it from hardware + constexpr s16 unit = 6700; // Approximately from Citra which took it from hardware mem.write32(messagePointer, IPC::responseHeader(0x16, 6, 0)); mem.write32(messagePointer + 4, Result::Success); // Fill calibration data (for x/y/z depending on i) for (int i = 0; i < 3; i++) { - const u32 pointer = messagePointer + 8 + i * 3 * sizeof(u16); // Pointer to write the calibration info for the current coordinate + const u32 pointer = messagePointer + 8 + i * 3 * sizeof(u16); // Pointer to write the calibration info for the current coordinate - mem.write16(pointer, 0); // Zero point - mem.write16(pointer + 1 * sizeof(u16), unit); // Positive unit point - mem.write16(pointer + 2 * sizeof(u16), -unit); // Negative unit point + mem.write16(pointer, 0); // Zero point + mem.write16(pointer + 1 * sizeof(u16), unit); // Positive unit point + mem.write16(pointer + 2 * sizeof(u16), -unit); // Negative unit point } } @@ -134,9 +138,9 @@ void HIDService::getIPCHandles(u32 messagePointer) { } mem.write32(messagePointer, IPC::responseHeader(0xA, 1, 7)); - mem.write32(messagePointer + 4, Result::Success); // Result code - mem.write32(messagePointer + 8, 0x14000000); // Translation descriptor - mem.write32(messagePointer + 12, KernelHandles::HIDSharedMemHandle); // Shared memory handle + mem.write32(messagePointer + 4, Result::Success); // Result code + mem.write32(messagePointer + 8, 0x14000000); // Translation descriptor + mem.write32(messagePointer + 12, KernelHandles::HIDSharedMemHandle); // Shared memory handle // Write HID event handles for (int i = 0; i < events.size(); i++) { @@ -149,23 +153,27 @@ void HIDService::updateInputs(u64 currentTick) { if (sharedMem) { // First, update the pad state if (nextPadIndex == 0) { - writeSharedMem(0x8, readSharedMem(0x0)); // Copy previous tick count - writeSharedMem(0x0, currentTick); // Write new tick count + writeSharedMem(0x8, readSharedMem(0x0)); // Copy previous tick count + writeSharedMem(0x0, currentTick); // Write new tick count } - writeSharedMem(0x10, nextPadIndex); // Index last updated by the HID module - writeSharedMem(0x1C, newButtons); // Current PAD state - writeSharedMem(0x20, circlePadX); // Current circle pad state - writeSharedMem(0x22, circlePadY); - - const size_t padEntryOffset = 0x28 + (nextPadIndex * 0x10); // Offset in the array of 8 pad entries - nextPadIndex = (nextPadIndex + 1) % 8; // Move to next entry - - const u32 pressed = (newButtons ^ oldButtons) & newButtons; // Pressed buttons - const u32 released = (newButtons ^ oldButtons) & oldButtons; // Released buttons + // Mask out the CirclePadPro buttons when writing to HID shared memory, since the actual OS doesn't store anything in those bits + const u32 currentButtons = newButtons & ~HID::Keys::CirclePadProButtons; + const u32 previousButtons = oldButtons & ~HID::Keys::CirclePadProButtons; oldButtons = newButtons; - writeSharedMem(padEntryOffset, newButtons); + writeSharedMem(0x10, nextPadIndex); // Index last updated by the HID module + writeSharedMem(0x1C, currentButtons); // Current PAD state + writeSharedMem(0x20, circlePadX); // Current circle pad state + writeSharedMem(0x22, circlePadY); + + const size_t padEntryOffset = 0x28 + (nextPadIndex * 0x10); // Offset in the array of 8 pad entries + nextPadIndex = (nextPadIndex + 1) % 8; // Move to next entry + + const u32 pressed = (currentButtons ^ previousButtons) & currentButtons; // Pressed buttons + const u32 released = (currentButtons ^ previousButtons) & previousButtons; // Released buttons + + writeSharedMem(padEntryOffset, currentButtons); writeSharedMem(padEntryOffset + 4, pressed); writeSharedMem(padEntryOffset + 8, released); writeSharedMem(padEntryOffset + 12, circlePadX); @@ -173,12 +181,12 @@ void HIDService::updateInputs(u64 currentTick) { // Next, update touchscreen state if (nextTouchscreenIndex == 0) { - writeSharedMem(0xB0, readSharedMem(0xA8)); // Copy previous tick count - writeSharedMem(0xA8, currentTick); // Write new tick count + writeSharedMem(0xB0, readSharedMem(0xA8)); // Copy previous tick count + writeSharedMem(0xA8, currentTick); // Write new tick count } - writeSharedMem(0xB8, nextTouchscreenIndex); // Index last updated by the HID module - const size_t touchEntryOffset = 0xC8 + (nextTouchscreenIndex * 8); // Offset in the array of 8 touchscreen entries - nextTouchscreenIndex = (nextTouchscreenIndex + 1) % 8; // Move to next entry + writeSharedMem(0xB8, nextTouchscreenIndex); // Index last updated by the HID module + const size_t touchEntryOffset = 0xC8 + (nextTouchscreenIndex * 8); // Offset in the array of 8 touchscreen entries + nextTouchscreenIndex = (nextTouchscreenIndex + 1) % 8; // Move to next entry writeSharedMem(touchEntryOffset, touchScreenX); writeSharedMem(touchEntryOffset + 2, touchScreenY); @@ -186,10 +194,10 @@ void HIDService::updateInputs(u64 currentTick) { // Next, update accelerometer state if (nextAccelerometerIndex == 0) { - writeSharedMem(0x110, readSharedMem(0x108)); // Copy previous tick count - writeSharedMem(0x108, currentTick); // Write new tick count + writeSharedMem(0x110, readSharedMem(0x108)); // Copy previous tick count + writeSharedMem(0x108, currentTick); // Write new tick count } - writeSharedMem(0x118, nextAccelerometerIndex); // Index last updated by the HID module + writeSharedMem(0x118, nextAccelerometerIndex); // Index last updated by the HID module const size_t accelEntryOffset = 0x128 + (nextAccelerometerIndex * 6); // Offset in the array of 8 accelerometer entries // Raw data of current accelerometer entry @@ -204,12 +212,12 @@ void HIDService::updateInputs(u64 currentTick) { accelerometerData[0] = accelX; accelerometerData[1] = accelY; accelerometerData[2] = accelZ; - nextAccelerometerIndex = (nextAccelerometerIndex + 1) % 8; // Move to next entry + nextAccelerometerIndex = (nextAccelerometerIndex + 1) % 8; // Move to next entry // Next, update gyro state if (nextGyroIndex == 0) { - writeSharedMem(0x160, readSharedMem(0x158)); // Copy previous tick count - writeSharedMem(0x158, currentTick); // Write new tick count + writeSharedMem(0x160, readSharedMem(0x158)); // Copy previous tick count + writeSharedMem(0x158, currentTick); // Write new tick count } const size_t gyroEntryOffset = 0x178 + (nextGyroIndex * 6); // Offset in the array of 8 touchscreen entries s16* gyroData = getSharedMemPointer(gyroEntryOffset); @@ -220,8 +228,8 @@ void HIDService::updateInputs(u64 currentTick) { // Since gyroscope euler angles are relative, we zero them out here and the frontend will update them again when we receive a new rotation roll = pitch = yaw = 0; - writeSharedMem(0x168, nextGyroIndex); // Index last updated by the HID module - nextGyroIndex = (nextGyroIndex + 1) % 32; // Move to next entry + writeSharedMem(0x168, nextGyroIndex); // Index last updated by the HID module + nextGyroIndex = (nextGyroIndex + 1) % 32; // Move to next entry } // For some reason, the original developers decided to signal the HID events each time the OS rescanned inputs diff --git a/src/core/services/ir/ir_user.cpp b/src/core/services/ir/ir_user.cpp index 05bc513a..6af21182 100644 --- a/src/core/services/ir/ir_user.cpp +++ b/src/core/services/ir/ir_user.cpp @@ -333,7 +333,17 @@ void IRUserService::updateCirclePadPro() { return; } - std::vector response(sizeof(cpp.state)); - std::memcpy(response.data(), &cpp.state, sizeof(cpp.state)); + // The button state for the CirclePad Pro is stored in the HID service to make the frontend logic simpler + // We take the button state, format it nicely into the CirclePad Pro struct, and return it + auto& cppState = cpp.state; + u32 buttons = hid.getOldButtons(); + + cppState.buttons.zlNotPressed = (buttons & HID::Keys::ZL) ? 0 : 1; + cppState.buttons.zrNotPressed = (buttons & HID::Keys::ZR) ? 0 : 1; + cppState.cStick.x = hid.getCStickX(); + cppState.cStick.y = hid.getCStickY(); + + std::vector response(sizeof(cppState)); + std::memcpy(response.data(), &cppState, sizeof(cppState)); sendPayload(response); } \ No newline at end of file diff --git a/src/core/services/service_manager.cpp b/src/core/services/service_manager.cpp index 46282428..8205cd64 100644 --- a/src/core/services/service_manager.cpp +++ b/src/core/services/service_manager.cpp @@ -7,7 +7,7 @@ ServiceManager::ServiceManager(std::span regs, Memory& mem, GPU& gpu, u32& currentPID, Kernel& kernel, const EmulatorConfig& config) : regs(regs), mem(mem), kernel(kernel), ac(mem), am(mem), boss(mem), act(mem), apt(mem, kernel), cam(mem, kernel), cecd(mem, kernel), - cfg(mem, config), csnd(mem, kernel), dlp_srvr(mem), dsp(mem, kernel, config), hid(mem, kernel), http(mem), ir_user(mem, config, kernel), + cfg(mem, config), csnd(mem, kernel), dlp_srvr(mem), dsp(mem, kernel, config), hid(mem, kernel), http(mem), ir_user(mem, hid, config, kernel), frd(mem), fs(mem, kernel, config), gsp_gpu(mem, gpu, kernel, currentPID), gsp_lcd(mem), ldr(mem, kernel), mcu_hwc(mem, config), mic(mem, kernel), nfc(mem, kernel), nim(mem), ndm(mem), news_u(mem), ns(mem), nwm_uds(mem, kernel), ptm(mem, config), soc(mem), ssl(mem), y2r(mem, kernel) {} diff --git a/src/http_server.cpp b/src/http_server.cpp index 41c7ae82..c0114bc1 100644 --- a/src/http_server.cpp +++ b/src/http_server.cpp @@ -93,8 +93,10 @@ HttpServer::HttpServer(Emulator* emulator) {"Left", {HID::Keys::Left}}, {"Up", {HID::Keys::Up}}, {"Down", {HID::Keys::Down}}, - {"R", {HID::Keys::R}}, {"L", {HID::Keys::L}}, + {"R", {HID::Keys::R}}, + {"ZL", {HID::Keys::ZL}}, + {"ZR", {HID::Keys::ZR}}, {"X", {HID::Keys::X}}, {"Y", {HID::Keys::Y}}, }) { diff --git a/src/hydra_core.cpp b/src/hydra_core.cpp index 0bcd21a8..2f80b8b0 100644 --- a/src/hydra_core.cpp +++ b/src/hydra_core.cpp @@ -82,6 +82,7 @@ void HydraCore::runFrame() { hid.setKey(HID::Keys::Down, checkButtonCallback(0, hydra::ButtonType::Keypad1Down)); hid.setKey(HID::Keys::Left, checkButtonCallback(0, hydra::ButtonType::Keypad1Left)); hid.setKey(HID::Keys::Right, checkButtonCallback(0, hydra::ButtonType::Keypad1Right)); + // TODO: N3DS buttons int x = !!checkButtonCallback(0, hydra::ButtonType::Analog1Right) - !!checkButtonCallback(0, hydra::ButtonType::Analog1Left); int y = !!checkButtonCallback(0, hydra::ButtonType::Analog1Up) - !!checkButtonCallback(0, hydra::ButtonType::Analog1Down); diff --git a/src/libretro_core.cpp b/src/libretro_core.cpp index 24651516..4786b317 100644 --- a/src/libretro_core.cpp +++ b/src/libretro_core.cpp @@ -351,6 +351,7 @@ void retro_run() { hid.setKey(HID::Keys::Down, getButtonState(RETRO_DEVICE_ID_JOYPAD_DOWN)); hid.setKey(HID::Keys::Left, getButtonState(RETRO_DEVICE_ID_JOYPAD_LEFT)); hid.setKey(HID::Keys::Right, getButtonState(RETRO_DEVICE_ID_JOYPAD_RIGHT)); + // TODO: N3DS buttons // Get analog values for the left analog stick (Right analog stick is N3DS-only and unimplemented) float xLeft = getAxisState(RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_X); diff --git a/src/lua.cpp b/src/lua.cpp index 5b78cec2..a5d497fd 100644 --- a/src/lua.cpp +++ b/src/lua.cpp @@ -367,6 +367,8 @@ void LuaManager::initializeThunks() { addIntConstant(HID::Keys::Right, "__ButtonRight"); addIntConstant(HID::Keys::L, "__ButtonL"); addIntConstant(HID::Keys::R, "__ButtonR"); + addIntConstant(HID::Keys::ZL, "__ButtonZL"); + addIntConstant(HID::Keys::ZR, "__ButtonZR"); // Call our Lua runtime initialization before any Lua script runs luaL_loadstring(L, runtimeInit); diff --git a/src/panda_qt/main_window.cpp b/src/panda_qt/main_window.cpp index 9b4db334..88891ddf 100644 --- a/src/panda_qt/main_window.cpp +++ b/src/panda_qt/main_window.cpp @@ -592,47 +592,53 @@ void MainWindow::initControllers() { } void MainWindow::pollControllers() { - // Update circlepad if a controller is plugged in + // Update circlepad/c-stick/ZL/ZR if a controller is plugged in if (gameController != nullptr) { HIDService& hid = emu->getServiceManager().getHID(); const s16 stickX = SDL_GameControllerGetAxis(gameController, SDL_CONTROLLER_AXIS_LEFTX); const s16 stickY = SDL_GameControllerGetAxis(gameController, SDL_CONTROLLER_AXIS_LEFTY); constexpr s16 deadzone = 3276; - constexpr s16 maxValue = 0x9C; - constexpr s16 div = 0x8000 / maxValue; + constexpr s16 triggerThreshold = SDL_JOYSTICK_AXIS_MAX / 2; - // Avoid overriding the keyboard's circlepad input - if (std::abs(stickX) < deadzone && !keyboardAnalogX) { - hid.setCirclepadX(0); - } else { - hid.setCirclepadX(stickX / div); + { + // Update circlepad + constexpr s16 circlepadMax = 0x9C; + constexpr s16 div = 0x8000 / circlepadMax; + + // Avoid overriding the keyboard's circlepad input + if (std::abs(stickX) < deadzone && !keyboardAnalogX) { + hid.setCirclepadX(0); + } else { + hid.setCirclepadX(stickX / div); + } + + if (std::abs(stickY) < deadzone && !keyboardAnalogY) { + hid.setCirclepadY(0); + } else { + hid.setCirclepadY(-(stickY / div)); + } } - if (std::abs(stickY) < deadzone && !keyboardAnalogY) { - hid.setCirclepadY(0); - } else { - hid.setCirclepadY(-(stickY / div)); - } - - auto& ir = emu->getServiceManager().getIRUser(); const s16 l2 = SDL_GameControllerGetAxis(gameController, SDL_CONTROLLER_AXIS_TRIGGERLEFT); const s16 r2 = SDL_GameControllerGetAxis(gameController, SDL_CONTROLLER_AXIS_TRIGGERRIGHT); const s16 cstickX = SDL_GameControllerGetAxis(gameController, SDL_CONTROLLER_AXIS_RIGHTX); const s16 cstickY = SDL_GameControllerGetAxis(gameController, SDL_CONTROLLER_AXIS_RIGHTY); - ir.setZLPressed(l2 > 16000); - ir.setZRPressed(r2 > 16000); + hid.setKey(HID::Keys::ZL, l2 > triggerThreshold); + hid.setKey(HID::Keys::ZR, r2 > triggerThreshold); + // Update C-Stick + // To convert from SDL coordinates, ie [-32768, 32767] to [-2048, 2047] we just divide by 8 if (std::abs(cstickX) < deadzone) { - ir.setCStickX(IR::CirclePadPro::ButtonState::C_STICK_CENTER); + hid.setCStickX(IR::CirclePadPro::ButtonState::C_STICK_CENTER); } else { - ir.setCStickX(cstickX / 8); + hid.setCStickX(cstickX / 8); } if (std::abs(cstickY) < deadzone) { - ir.setCStickY(IR::CirclePadPro::ButtonState::C_STICK_CENTER); + hid.setCStickY(IR::CirclePadPro::ButtonState::C_STICK_CENTER); } else { - ir.setCStickY(-(cstickY / 8)); + hid.setCStickY(-(cstickY / 8)); } } diff --git a/src/panda_qt/mappings.cpp b/src/panda_qt/mappings.cpp index d41b0a31..99b98107 100644 --- a/src/panda_qt/mappings.cpp +++ b/src/panda_qt/mappings.cpp @@ -10,6 +10,8 @@ InputMappings InputMappings::defaultKeyboardMappings() { mappings.setMapping(Qt::Key_I, HID::Keys::Y); mappings.setMapping(Qt::Key_Q, HID::Keys::L); mappings.setMapping(Qt::Key_P, HID::Keys::R); + mappings.setMapping(Qt::Key_1, HID::Keys::ZL); + mappings.setMapping(Qt::Key_0, HID::Keys::ZR); mappings.setMapping(Qt::Key_Up, HID::Keys::Up); mappings.setMapping(Qt::Key_Down, HID::Keys::Down); mappings.setMapping(Qt::Key_Right, HID::Keys::Right); diff --git a/src/panda_sdl/frontend_sdl.cpp b/src/panda_sdl/frontend_sdl.cpp index 2d60d2fa..50e03e3a 100644 --- a/src/panda_sdl/frontend_sdl.cpp +++ b/src/panda_sdl/frontend_sdl.cpp @@ -401,24 +401,52 @@ void FrontendSDL::run() { // Update controller analog sticks and HID service if (emu.romType != ROMType::None) { + // Update circlepad/c-stick/ZL/ZR if a controller is plugged in if (gameController != nullptr) { const s16 stickX = SDL_GameControllerGetAxis(gameController, SDL_CONTROLLER_AXIS_LEFTX); const s16 stickY = SDL_GameControllerGetAxis(gameController, SDL_CONTROLLER_AXIS_LEFTY); constexpr s16 deadzone = 3276; - constexpr s16 maxValue = 0x9C; - constexpr s16 div = 0x8000 / maxValue; + constexpr s16 triggerThreshold = SDL_JOYSTICK_AXIS_MAX / 2; - // Avoid overriding the keyboard's circlepad input - if (abs(stickX) < deadzone && !keyboardAnalogX) { - hid.setCirclepadX(0); - } else { - hid.setCirclepadX(stickX / div); + { + // Update circlepad + constexpr s16 circlepadMax = 0x9C; + constexpr s16 div = 0x8000 / circlepadMax; + + // Avoid overriding the keyboard's circlepad input + if (std::abs(stickX) < deadzone && !keyboardAnalogX) { + hid.setCirclepadX(0); + } else { + hid.setCirclepadX(stickX / div); + } + + if (std::abs(stickY) < deadzone && !keyboardAnalogY) { + hid.setCirclepadY(0); + } else { + hid.setCirclepadY(-(stickY / div)); + } } - if (abs(stickY) < deadzone && !keyboardAnalogY) { - hid.setCirclepadY(0); + const s16 l2 = SDL_GameControllerGetAxis(gameController, SDL_CONTROLLER_AXIS_TRIGGERLEFT); + const s16 r2 = SDL_GameControllerGetAxis(gameController, SDL_CONTROLLER_AXIS_TRIGGERRIGHT); + const s16 cstickX = SDL_GameControllerGetAxis(gameController, SDL_CONTROLLER_AXIS_RIGHTX); + const s16 cstickY = SDL_GameControllerGetAxis(gameController, SDL_CONTROLLER_AXIS_RIGHTY); + + hid.setKey(HID::Keys::ZL, l2 > triggerThreshold); + hid.setKey(HID::Keys::ZR, r2 > triggerThreshold); + + // Update C-Stick + // To convert from SDL coordinates, ie [-32768, 32767] to [-2048, 2047] we just divide by 8 + if (std::abs(cstickX) < deadzone) { + hid.setCStickX(IR::CirclePadPro::ButtonState::C_STICK_CENTER); } else { - hid.setCirclepadY(-(stickY / div)); + hid.setCStickX(cstickX / 8); + } + + if (std::abs(cstickY) < deadzone) { + hid.setCStickY(IR::CirclePadPro::ButtonState::C_STICK_CENTER); + } else { + hid.setCStickY(-(cstickY / 8)); } } diff --git a/src/panda_sdl/mappings.cpp b/src/panda_sdl/mappings.cpp index 0c09b852..58d139c4 100644 --- a/src/panda_sdl/mappings.cpp +++ b/src/panda_sdl/mappings.cpp @@ -10,6 +10,8 @@ InputMappings InputMappings::defaultKeyboardMappings() { mappings.setMapping(SDLK_i, HID::Keys::Y); mappings.setMapping(SDLK_q, HID::Keys::L); mappings.setMapping(SDLK_p, HID::Keys::R); + mappings.setMapping(SDLK_1, HID::Keys::ZL); + mappings.setMapping(SDLK_0, HID::Keys::ZR); mappings.setMapping(SDLK_UP, HID::Keys::Up); mappings.setMapping(SDLK_DOWN, HID::Keys::Down); mappings.setMapping(SDLK_RIGHT, HID::Keys::Right); From b2904f391f6eb9d6b3475665c8ab7ce323097d16 Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Thu, 3 Jul 2025 01:40:11 +0300 Subject: [PATCH 09/12] IR: Deglobalize receiveBuffer --- include/services/ir/ir_user.hpp | 2 ++ src/core/services/ir/ir_user.cpp | 7 ++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/include/services/ir/ir_user.hpp b/include/services/ir/ir_user.hpp index 556ff1d9..00944e93 100644 --- a/include/services/ir/ir_user.hpp +++ b/include/services/ir/ir_user.hpp @@ -1,4 +1,5 @@ #pragma once +#include #include #include @@ -51,6 +52,7 @@ class IRUserService { IR::CirclePadPro cpp; std::optional sharedMemory = std::nullopt; + std::unique_ptr receiveBuffer; bool connectedDevice = false; // Header of the IR shared memory containing various bits of info diff --git a/src/core/services/ir/ir_user.cpp b/src/core/services/ir/ir_user.cpp index 6af21182..8c565ec0 100644 --- a/src/core/services/ir/ir_user.cpp +++ b/src/core/services/ir/ir_user.cpp @@ -2,7 +2,6 @@ #include #include -#include #include #include #include @@ -29,8 +28,6 @@ namespace IRUserCommands { }; } -std::unique_ptr receiveBuffer; - void IRUserService::reset() { connectionStatusEvent = std::nullopt; receiveEvent = std::nullopt; @@ -293,16 +290,16 @@ void IRUserService::sendPayload(std::span payload) { return; } + // Based on: https://github.com/azahar-emu/azahar/blob/df3c0c18e4b71ecb5c4e009bfc07b9fd14fd39d9/src/core/hle/service/ir/ir_user.cpp#L231 std::vector packet; // Builds packet header. For the format info: // https://www.3dbrew.org/wiki/IRUSER_Shared_Memory#Packet_structure - packet.push_back(0xA5); const u8 networkID = *(receiveBuffer->getPointer(offsetof(SharedMemoryStatus, networkID))); packet.push_back(networkID); - // puts the size info. + // Append size info. // The highest bit of the first byte is unknown, which is set to zero here. The second highest // bit is a flag that determines whether the size info is in extended form. If the packet size // can be represent within 6 bits, the short form (1 byte) of size info is chosen, the size is From dc7f8a48bdca9ce444dbf862da10c04dea584b4c Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Thu, 3 Jul 2025 02:42:43 +0300 Subject: [PATCH 10/12] IR: Move to scheduler --- include/scheduler.hpp | 3 ++- include/services/ir/circlepad_pro.hpp | 5 ++++- include/services/ir/ir_device.hpp | 4 +++- include/services/ir/ir_user.hpp | 8 +++----- src/core/services/ir/circlepad_pro.cpp | 11 ++++++++--- src/core/services/ir/ir_user.cpp | 9 ++++++++- src/emulator.cpp | 3 +-- 7 files changed, 29 insertions(+), 14 deletions(-) diff --git a/include/scheduler.hpp b/include/scheduler.hpp index cfc4d5e8..8765ae66 100644 --- a/include/scheduler.hpp +++ b/include/scheduler.hpp @@ -12,7 +12,8 @@ struct Scheduler { UpdateTimers = 1, // Update kernel timer objects RunDSP = 2, // Make the emulated DSP run for one audio frame SignalY2R = 3, // Signal that a Y2R conversion has finished - Panic = 4, // Dummy event that is always pending and should never be triggered (Timestamp = UINT64_MAX) + UpdateIR = 4, // Update an IR device (For now, just the CirclePad Pro/N3DS controls) + Panic = 5, // Dummy event that is always pending and should never be triggered (Timestamp = UINT64_MAX) TotalNumberOfEvents // How many event types do we have in total? }; static constexpr usize totalNumberOfEvents = static_cast(EventType::TotalNumberOfEvents); diff --git a/include/services/ir/circlepad_pro.hpp b/include/services/ir/circlepad_pro.hpp index 6895ab6f..4cee6007 100644 --- a/include/services/ir/circlepad_pro.hpp +++ b/include/services/ir/circlepad_pro.hpp @@ -44,7 +44,10 @@ namespace IR { virtual void disconnect() override; virtual void receivePayload(Payload payload) override; - CirclePadPro(SendCallback sendCallback) : IR::Device(sendCallback) {} + CirclePadPro(SendCallback sendCallback, Scheduler& scheduler) : IR::Device(sendCallback, scheduler) {} + ButtonState state; + // The current polling period in cycles, configured via the ConfigurePolling command + s64 period = Scheduler::nsToCycles(16000); }; } // namespace IR \ No newline at end of file diff --git a/include/services/ir/ir_device.hpp b/include/services/ir/ir_device.hpp index 9a73f9ab..db82ea99 100644 --- a/include/services/ir/ir_device.hpp +++ b/include/services/ir/ir_device.hpp @@ -3,6 +3,7 @@ #include #include "helpers.hpp" +#include "scheduler.hpp" namespace IR { class Device { @@ -11,6 +12,7 @@ namespace IR { protected: using SendCallback = std::function; // Callback for sending data from IR device->3DS + Scheduler& scheduler; SendCallback sendCallback; public: @@ -18,6 +20,6 @@ namespace IR { virtual void disconnect() = 0; virtual void receivePayload(Payload payload) = 0; - Device(SendCallback sendCallback) : sendCallback(sendCallback) {} + Device(SendCallback sendCallback, Scheduler& scheduler) : sendCallback(sendCallback), scheduler(scheduler) {} }; } // namespace IR \ No newline at end of file diff --git a/include/services/ir/ir_user.hpp b/include/services/ir/ir_user.hpp index 00944e93..797e5d9c 100644 --- a/include/services/ir/ir_user.hpp +++ b/include/services/ir/ir_user.hpp @@ -16,6 +16,7 @@ class Kernel; class IRUserService { + using Payload = IR::Device::Payload; using Handle = HorizonHandle; enum class DeviceID : u8 { @@ -75,14 +76,11 @@ class IRUserService { // The IR service uses CRC8 with generator polynomial = 0x07 for verifying packets received from IR devices static u8 crc8(std::span data); - // IR service calls this to send a console->device payload - void receivePayload(std::span data); // IR devices call this to send a device->console payload - void sendPayload(std::span payload); + void sendPayload(Payload payload); public: - IRUserService(Memory& mem, HIDService& hid, const EmulatorConfig& config, Kernel& kernel) - : mem(mem), hid(hid), config(config), kernel(kernel), cpp([&](IR::Device::Payload payload) { sendPayload(payload); }) {} + IRUserService(Memory& mem, HIDService& hid, const EmulatorConfig& config, Kernel& kernel); void setCStickX(s16 value) { cpp.state.cStick.x = value; } void setCStickY(s16 value) { cpp.state.cStick.y = value; } diff --git a/src/core/services/ir/circlepad_pro.cpp b/src/core/services/ir/circlepad_pro.cpp index 9e652a40..5ef2135a 100644 --- a/src/core/services/ir/circlepad_pro.cpp +++ b/src/core/services/ir/circlepad_pro.cpp @@ -7,15 +7,20 @@ using namespace IR; void CirclePadPro::connect() {} -void CirclePadPro::disconnect() {} +void CirclePadPro::disconnect() { scheduler.removeEvent(Scheduler::EventType::UpdateIR); } void CirclePadPro::receivePayload(Payload payload) { const u8 type = payload[0]; switch (type) { case CPPRequestID::ConfigurePolling: { - [[maybe_unused]] const u8 pollingPeriodMs = payload[1]; - // TODO + // Convert polling period from ms to ns for easier use with the scheduler + const s64 periodNs = s64(payload[1]) * 1000ll; + // Convert to cycles + period = Scheduler::nsToCycles(periodNs); + + scheduler.removeEvent(Scheduler::EventType::UpdateIR); + scheduler.addEvent(Scheduler::EventType::UpdateIR, scheduler.currentTimestamp + period); break; } diff --git a/src/core/services/ir/ir_user.cpp b/src/core/services/ir/ir_user.cpp index 8c565ec0..8e1693de 100644 --- a/src/core/services/ir/ir_user.cpp +++ b/src/core/services/ir/ir_user.cpp @@ -28,6 +28,9 @@ namespace IRUserCommands { }; } +IRUserService::IRUserService(Memory& mem, HIDService& hid, const EmulatorConfig& config, Kernel& kernel) + : mem(mem), hid(hid), config(config), kernel(kernel), cpp([&](IR::Device::Payload payload) { sendPayload(payload); }, kernel.getScheduler()) {} + void IRUserService::reset() { connectionStatusEvent = std::nullopt; receiveEvent = std::nullopt; @@ -285,7 +288,7 @@ void IRUserService::clearSendBuffer(u32 messagePointer) { mem.write32(messagePointer + 4, Result::Success); } -void IRUserService::sendPayload(std::span payload) { +void IRUserService::sendPayload(IRUserService::Payload payload) { if (!receiveBuffer) { return; } @@ -343,4 +346,8 @@ void IRUserService::updateCirclePadPro() { std::vector response(sizeof(cppState)); std::memcpy(response.data(), &cppState, sizeof(cppState)); sendPayload(response); + + // Schedule next IR event. TODO: Maybe account for cycle drift. + auto& scheduler = kernel.getScheduler(); + scheduler.addEvent(Scheduler::EventType::UpdateIR, scheduler.currentTimestamp + cpp.period); } \ No newline at end of file diff --git a/src/emulator.cpp b/src/emulator.cpp index 74832214..e7556e4e 100644 --- a/src/emulator.cpp +++ b/src/emulator.cpp @@ -139,8 +139,6 @@ void Emulator::runFrame() { if (cheats.haveCheats()) [[unlikely]] { cheats.run(); } - - getServiceManager().getIRUser().updateCirclePadPro(); } else if (romType != ROMType::None) { // If the emulator is not running and a game is loaded, we still want to display the framebuffer otherwise we will get weird // double-buffering issues @@ -182,6 +180,7 @@ void Emulator::pollScheduler() { } case Scheduler::EventType::SignalY2R: kernel.getServiceManager().getY2R().signalConversionDone(); break; + case Scheduler::EventType::UpdateIR: kernel.getServiceManager().getIRUser().updateCirclePadPro(); break; default: { Helpers::panic("Scheduler: Unimplemented event type received: %d\n", static_cast(eventType)); From 2a0661f9689266251eada1b708808c1ef87a1bc6 Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Thu, 3 Jul 2025 02:56:25 +0300 Subject: [PATCH 11/12] IR: Proper error in SendIrnop --- include/result/result.hpp | 7 ++++--- include/result/result_ir.hpp | 8 ++++++++ src/core/services/ir/ir_user.cpp | 7 ++----- 3 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 include/result/result_ir.hpp diff --git a/include/result/result.hpp b/include/result/result.hpp index 53bb725d..94fe34e1 100644 --- a/include/result/result.hpp +++ b/include/result/result.hpp @@ -2,8 +2,9 @@ #include "result_cfg.hpp" #include "result_common.hpp" -#include "result_kernel.hpp" -#include "result_os.hpp" #include "result_fnd.hpp" #include "result_fs.hpp" -#include "result_gsp.hpp" \ No newline at end of file +#include "result_gsp.hpp" +#include "result_ir.hpp" +#include "result_kernel.hpp" +#include "result_os.hpp" \ No newline at end of file diff --git a/include/result/result_ir.hpp b/include/result/result_ir.hpp new file mode 100644 index 00000000..ef38fd1f --- /dev/null +++ b/include/result/result_ir.hpp @@ -0,0 +1,8 @@ +#pragma once +#include "result_common.hpp" + +DEFINE_HORIZON_RESULT_MODULE(Result::IR, IR); + +namespace Result::IR { + DEFINE_HORIZON_RESULT(NoDeviceConnected, 13, InvalidState, Status); +}; diff --git a/src/core/services/ir/ir_user.cpp b/src/core/services/ir/ir_user.cpp index 8e1693de..631ade57 100644 --- a/src/core/services/ir/ir_user.cpp +++ b/src/core/services/ir/ir_user.cpp @@ -10,6 +10,7 @@ #include "kernel.hpp" #include "services/ir/ir_types.hpp" +#define log printf using namespace IR; namespace IRUserCommands { @@ -168,10 +169,6 @@ void IRUserService::requireConnection(u32 messagePointer) { if (enableCirclePadPro) { 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); @@ -217,7 +214,7 @@ void IRUserService::sendIrnop(u32 messagePointer) { mem.write32(messagePointer + 4, Result::Success); } else { Helpers::warn("IR:USER: SendIrnop without connected device"); - mem.write32(messagePointer + 4, Result::FailurePlaceholder); + mem.write32(messagePointer + 4, Result::IR::NoDeviceConnected); } } From cee16d8cf29dd35fc19f7bc628474d0c2b647d99 Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Thu, 3 Jul 2025 03:00:49 +0300 Subject: [PATCH 12/12] Fix name formatting --- src/core/services/ir/circlepad_pro.cpp | 20 +++++++++++--------- src/panda_qt/main_window.cpp | 16 ++++++++-------- src/panda_sdl/frontend_sdl.cpp | 12 ++++++------ 3 files changed, 25 insertions(+), 23 deletions(-) diff --git a/src/core/services/ir/circlepad_pro.cpp b/src/core/services/ir/circlepad_pro.cpp index 5ef2135a..0ed4d830 100644 --- a/src/core/services/ir/circlepad_pro.cpp +++ b/src/core/services/ir/circlepad_pro.cpp @@ -25,6 +25,7 @@ void CirclePadPro::receivePayload(Payload payload) { } case CPPRequestID::ReadCalibrationData: { + // Data from https://github.com/azahar-emu/azahar/blob/f8b8b6e53cf518a53c0ae5f0201660c1250c0393/src/core/hle/service/ir/extra_hid.cpp#L73 static constexpr std::array calibrationData = { 0x00, 0x00, 0x08, 0x80, 0x85, 0xEB, 0x11, 0x3F, 0x85, 0xEB, 0x11, 0x3F, 0xFF, 0xFF, 0xFF, 0xF5, 0xFF, 0x00, 0x08, 0x80, 0x85, 0xEB, 0x11, 0x3F, 0x85, 0xEB, 0x11, 0x3F, 0xFF, 0xFF, 0xFF, 0x65, 0xFF, 0x00, 0x08, 0x80, 0x85, 0xEB, 0x11, 0x3F, 0x85, 0xEB, 0x11, 0x3F, @@ -32,10 +33,10 @@ void CirclePadPro::receivePayload(Payload payload) { }; struct ReadCalibrationDataRequest { - u8 requestID; - u8 expectedResponseTime; - u16_le offset; - u16_le size; + u8 requestID; // Always CPPRequestID::ReadCalibrationData for this command + u8 unknown; + u16_le offset; // Offset in calibration data to read from + u16_le size; // Bytes in calibration data to read }; static_assert(sizeof(ReadCalibrationDataRequest) == 6, "ReadCalibrationDataRequest has wrong size"); @@ -47,16 +48,17 @@ void CirclePadPro::receivePayload(Payload payload) { ReadCalibrationDataRequest request; std::memcpy(&request, payload.data(), sizeof(request)); - const u16 offset = request.offset & ~0xF; - const u16 size = request.size & ~0xF; + // Get the offset and size for the calibration data read. Bottom 4 bits are ignored, aligning reads to 16 bytes + const auto offset = usize(request.offset & ~0xF); + const auto size = usize(request.size & ~0xF); - if (static_cast(offset + size) > calibrationData.size()) { + if (offset + size > calibrationData.size()) { Helpers::warn("IR::ReadCalibrationData: Read beyond the end of calibration data!!"); return; } - std::vector response(5 + size); - response[0] = static_cast(CPPResponseID::ReadCalibrationData); + std::vector response(size + 5); + response[0] = CPPResponseID::ReadCalibrationData; std::memcpy(&response[1], &request.offset, sizeof(request.offset)); std::memcpy(&response[3], &request.size, sizeof(request.size)); std::memcpy(&response[5], calibrationData.data() + offset, size); diff --git a/src/panda_qt/main_window.cpp b/src/panda_qt/main_window.cpp index 88891ddf..dbdbdec8 100644 --- a/src/panda_qt/main_window.cpp +++ b/src/panda_qt/main_window.cpp @@ -621,24 +621,24 @@ void MainWindow::pollControllers() { const s16 l2 = SDL_GameControllerGetAxis(gameController, SDL_CONTROLLER_AXIS_TRIGGERLEFT); const s16 r2 = SDL_GameControllerGetAxis(gameController, SDL_CONTROLLER_AXIS_TRIGGERRIGHT); - const s16 cstickX = SDL_GameControllerGetAxis(gameController, SDL_CONTROLLER_AXIS_RIGHTX); - const s16 cstickY = SDL_GameControllerGetAxis(gameController, SDL_CONTROLLER_AXIS_RIGHTY); + const s16 cStickX = SDL_GameControllerGetAxis(gameController, SDL_CONTROLLER_AXIS_RIGHTX); + const s16 cStickY = SDL_GameControllerGetAxis(gameController, SDL_CONTROLLER_AXIS_RIGHTY); hid.setKey(HID::Keys::ZL, l2 > triggerThreshold); hid.setKey(HID::Keys::ZR, r2 > triggerThreshold); - // Update C-Stick - // To convert from SDL coordinates, ie [-32768, 32767] to [-2048, 2047] we just divide by 8 - if (std::abs(cstickX) < deadzone) { + // Update C-Stick + // To convert from SDL coordinates, ie [-32768, 32767] to [-2048, 2047] we just divide by 8 + if (std::abs(cStickX) < deadzone) { hid.setCStickX(IR::CirclePadPro::ButtonState::C_STICK_CENTER); } else { - hid.setCStickX(cstickX / 8); + hid.setCStickX(cStickX / 8); } - if (std::abs(cstickY) < deadzone) { + if (std::abs(cStickY) < deadzone) { hid.setCStickY(IR::CirclePadPro::ButtonState::C_STICK_CENTER); } else { - hid.setCStickY(-(cstickY / 8)); + hid.setCStickY(-(cStickY / 8)); } } diff --git a/src/panda_sdl/frontend_sdl.cpp b/src/panda_sdl/frontend_sdl.cpp index 50e03e3a..665b2512 100644 --- a/src/panda_sdl/frontend_sdl.cpp +++ b/src/panda_sdl/frontend_sdl.cpp @@ -429,24 +429,24 @@ void FrontendSDL::run() { const s16 l2 = SDL_GameControllerGetAxis(gameController, SDL_CONTROLLER_AXIS_TRIGGERLEFT); const s16 r2 = SDL_GameControllerGetAxis(gameController, SDL_CONTROLLER_AXIS_TRIGGERRIGHT); - const s16 cstickX = SDL_GameControllerGetAxis(gameController, SDL_CONTROLLER_AXIS_RIGHTX); - const s16 cstickY = SDL_GameControllerGetAxis(gameController, SDL_CONTROLLER_AXIS_RIGHTY); + const s16 cStickX = SDL_GameControllerGetAxis(gameController, SDL_CONTROLLER_AXIS_RIGHTX); + const s16 cStickY = SDL_GameControllerGetAxis(gameController, SDL_CONTROLLER_AXIS_RIGHTY); hid.setKey(HID::Keys::ZL, l2 > triggerThreshold); hid.setKey(HID::Keys::ZR, r2 > triggerThreshold); // Update C-Stick // To convert from SDL coordinates, ie [-32768, 32767] to [-2048, 2047] we just divide by 8 - if (std::abs(cstickX) < deadzone) { + if (std::abs(cStickX) < deadzone) { hid.setCStickX(IR::CirclePadPro::ButtonState::C_STICK_CENTER); } else { - hid.setCStickX(cstickX / 8); + hid.setCStickX(cStickX / 8); } - if (std::abs(cstickY) < deadzone) { + if (std::abs(cStickY) < deadzone) { hid.setCStickY(IR::CirclePadPro::ButtonState::C_STICK_CENTER); } else { - hid.setCStickY(-(cstickY / 8)); + hid.setCStickY(-(cStickY / 8)); } }