mirror of
https://github.com/wheremyfoodat/Panda3DS.git
synced 2025-07-04 14:26:20 +12:00
Initial CPP implementation
This commit is contained in:
wheremyfoodat
parent
ce356c6e61
commit
382c0f953d
14 changed files with 658 additions and 184 deletions
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -81,6 +81,7 @@ struct EmulatorConfig {
|
|||
|
||||
bool sdCardInserted = true;
|
||||
bool sdWriteProtected = false;
|
||||
bool circlePadProEnabled = true;
|
||||
bool usePortableBuild = false;
|
||||
|
||||
bool audioEnabled = audioEnabledDefault;
|
||||
|
|
|
|||
14
include/services/ir/circlepad_pro.hpp
Normal file
14
include/services/ir/circlepad_pro.hpp
Normal file
|
|
@ -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
|
||||
23
include/services/ir/ir_device.hpp
Normal file
23
include/services/ir/ir_device.hpp
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
#pragma once
|
||||
#include <functional>
|
||||
#include <span>
|
||||
|
||||
#include "helpers.hpp"
|
||||
|
||||
namespace IR {
|
||||
class Device {
|
||||
public:
|
||||
using Payload = std::span<const u8>;
|
||||
|
||||
protected:
|
||||
using SendCallback = std::function<void(Payload)>; // 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
|
||||
148
include/services/ir/ir_types.hpp
Normal file
148
include/services/ir/ir_types.hpp
Normal file
|
|
@ -0,0 +1,148 @@
|
|||
#pragma once
|
||||
#include <array>
|
||||
|
||||
#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<const u8> 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<u32>(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
|
||||
|
|
@ -1,11 +1,14 @@
|
|||
#pragma once
|
||||
#include <optional>
|
||||
#include <span>
|
||||
|
||||
#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<Handle>;
|
||||
|
||||
IREvent connectionStatusEvent = std::nullopt;
|
||||
IREvent receiveEvent = std::nullopt;
|
||||
IREvent sendEvent = std::nullopt;
|
||||
IR::CirclePadPro cpp;
|
||||
|
||||
std::optional<MemoryBlock> 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<const u8> data);
|
||||
|
||||
// IR service calls this to send a console->device payload
|
||||
void receivePayload(std::span<const u8> data);
|
||||
// IR devices call this to send a device->console payload
|
||||
void sendPayload(std::span<const u8> 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();
|
||||
};
|
||||
|
|
@ -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; }
|
||||
};
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@ void EmulatorConfig::load() {
|
|||
defaultRomPath = toml::find_or<std::string>(general, "DefaultRomPath", "");
|
||||
|
||||
printAppVersion = toml::find_or<toml::boolean>(general, "PrintAppVersion", true);
|
||||
circlePadProEnabled = toml::find_or<toml::boolean>(general, "EnableCirclePadPro", true);
|
||||
systemLanguage = languageCodeFromString(toml::find_or<std::string>(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;
|
||||
|
|
|
|||
60
src/core/services/ir/circlepad_pro.cpp
Normal file
60
src/core/services/ir/circlepad_pro.cpp
Normal file
|
|
@ -0,0 +1,60 @@
|
|||
#include "services/ir/circlepad_pro.hpp"
|
||||
|
||||
#include <array>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
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<u8, 0x40> 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<std::size_t>(offset + size) > calibrationData.size()) {
|
||||
Helpers::warn("IR::ReadCalibrationData: Read beyond the end of calibration data!!");
|
||||
return;
|
||||
}
|
||||
|
||||
std::vector<u8> response(5 + size);
|
||||
response[0] = static_cast<u8>(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;
|
||||
}
|
||||
}
|
||||
}
|
||||
31
src/core/services/ir/crc8.cpp
Normal file
31
src/core/services/ir/crc8.cpp
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
#include <array>
|
||||
|
||||
#include "services/ir/ir_user.hpp"
|
||||
|
||||
u8 IRUserService::crc8(std::span<const u8> data) {
|
||||
// The IR service uses CRC8 with generator polynomial = 0x07 for verifying payloads received from IR devices
|
||||
static constexpr std::array<u8, 256> 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;
|
||||
}
|
||||
341
src/core/services/ir/ir_user.cpp
Normal file
341
src/core/services/ir/ir_user.cpp
Normal file
|
|
@ -0,0 +1,341 @@
|
|||
#include "services/ir/ir_user.hpp"
|
||||
|
||||
#include <array>
|
||||
#include <cstddef>
|
||||
#include <memory>
|
||||
#include <span>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#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<IR::Buffer> 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<MemoryBlock>();
|
||||
sharedMemory = *memoryBlock;
|
||||
|
||||
receiveBuffer = std::make_unique<IR::Buffer>(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<u8> 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<const u8> payload) {
|
||||
if (!receiveBuffer) {
|
||||
return;
|
||||
}
|
||||
|
||||
std::vector<u8> 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<u8>(size));
|
||||
} else if (size < 0x4000) {
|
||||
packet.push_back(static_cast<u8>(size >> 8) | 0x40);
|
||||
packet.push_back(static_cast<u8>(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<u8>(CPPResponseID::PollButtons);
|
||||
response.c_stick.c_stick_x = rand() & 0xFFF;
|
||||
response.c_stick.c_stick_y = static_cast<u32>(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<u8> response_buffer(sizeof(response));
|
||||
std::memcpy(response_buffer.data(), &response, sizeof(response));
|
||||
sendPayload(response_buffer);
|
||||
}
|
||||
|
|
@ -1,173 +0,0 @@
|
|||
#include "services/ir_user.hpp"
|
||||
|
||||
#include <cstddef>
|
||||
|
||||
#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<MemoryBlock>();
|
||||
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);
|
||||
}
|
||||
|
|
@ -7,9 +7,10 @@
|
|||
|
||||
ServiceManager::ServiceManager(std::span<u32, 16> 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;
|
||||
|
||||
|
|
|
|||
|
|
@ -139,6 +139,8 @@ 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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue