Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
e56b1b69b7 | ||
|
56bff126d2 |
@@ -281,10 +281,10 @@ static_assert(sizeof(ProcessorState) == 0xE20, "ProcessorState is an invalid siz
|
|||||||
|
|
||||||
// This is nn::irsensor::detail::DeviceFormat
|
// This is nn::irsensor::detail::DeviceFormat
|
||||||
struct DeviceFormat {
|
struct DeviceFormat {
|
||||||
Core::IrSensor::IrCameraStatus camera_status{Core::IrSensor::IrCameraStatus::Unconnected};
|
Core::IrSensor::IrCameraStatus camera_status{Core::IrSensor::IrCameraStatus::Available};
|
||||||
Core::IrSensor::IrCameraInternalStatus camera_internal_status{
|
Core::IrSensor::IrCameraInternalStatus camera_internal_status{
|
||||||
Core::IrSensor::IrCameraInternalStatus::Ready};
|
Core::IrSensor::IrCameraInternalStatus::Stopped};
|
||||||
Core::IrSensor::IrSensorMode mode{Core::IrSensor::IrSensorMode::None};
|
Core::IrSensor::IrSensorMode mode{Core::IrSensor::IrSensorMode::ImageTransferProcessor};
|
||||||
ProcessorState state{};
|
ProcessorState state{};
|
||||||
};
|
};
|
||||||
static_assert(sizeof(DeviceFormat) == 0xE30, "DeviceFormat is an invalid size");
|
static_assert(sizeof(DeviceFormat) == 0xE30, "DeviceFormat is an invalid size");
|
||||||
|
@@ -14,22 +14,11 @@ constexpr Result VibrationInvalidStyleIndex{ErrorModule::HID, 122};
|
|||||||
constexpr Result VibrationInvalidNpadId{ErrorModule::HID, 123};
|
constexpr Result VibrationInvalidNpadId{ErrorModule::HID, 123};
|
||||||
constexpr Result VibrationDeviceIndexOutOfRange{ErrorModule::HID, 124};
|
constexpr Result VibrationDeviceIndexOutOfRange{ErrorModule::HID, 124};
|
||||||
constexpr Result InvalidSixAxisFusionRange{ErrorModule::HID, 423};
|
constexpr Result InvalidSixAxisFusionRange{ErrorModule::HID, 423};
|
||||||
|
|
||||||
constexpr Result ResultMcuInvalidHandle{ErrorModule::HID, 541};
|
|
||||||
constexpr Result ResultMcuNotEnabled{ErrorModule::HID, 542};
|
|
||||||
constexpr Result ResultMcuNoDeviceConnected{ErrorModule::HID, 543};
|
|
||||||
constexpr Result ResultMcuUnknown544{ErrorModule::HID, 544};
|
|
||||||
constexpr Result ResultMcuUnknown546{ErrorModule::HID, 546};
|
|
||||||
constexpr Result ResultMcuUnknown548{ErrorModule::HID, 548};
|
|
||||||
|
|
||||||
constexpr Result NpadIsDualJoycon{ErrorModule::HID, 601};
|
constexpr Result NpadIsDualJoycon{ErrorModule::HID, 601};
|
||||||
constexpr Result NpadIsSameType{ErrorModule::HID, 602};
|
constexpr Result NpadIsSameType{ErrorModule::HID, 602};
|
||||||
constexpr Result InvalidNpadId{ErrorModule::HID, 709};
|
constexpr Result InvalidNpadId{ErrorModule::HID, 709};
|
||||||
constexpr Result NpadNotConnected{ErrorModule::HID, 710};
|
constexpr Result NpadNotConnected{ErrorModule::HID, 710};
|
||||||
constexpr Result InvalidArraySize{ErrorModule::HID, 715};
|
constexpr Result InvalidArraySize{ErrorModule::HID, 715};
|
||||||
|
|
||||||
constexpr Result ResultControllerUpdateFailed{ErrorModule::HID, 3201};
|
|
||||||
|
|
||||||
constexpr Result InvalidPalmaHandle{ErrorModule::HID, 3302};
|
constexpr Result InvalidPalmaHandle{ErrorModule::HID, 3302};
|
||||||
|
|
||||||
} // namespace Service::HID
|
} // namespace Service::HID
|
||||||
@@ -40,17 +29,3 @@ constexpr Result InvalidProcessorState{ErrorModule::Irsensor, 78};
|
|||||||
constexpr Result InvalidIrCameraHandle{ErrorModule::Irsensor, 204};
|
constexpr Result InvalidIrCameraHandle{ErrorModule::Irsensor, 204};
|
||||||
|
|
||||||
} // namespace Service::IRS
|
} // namespace Service::IRS
|
||||||
|
|
||||||
namespace Service::HIDBUS {
|
|
||||||
|
|
||||||
constexpr Result ResultNotEnabled{ErrorModule::HIDBUS, 1};
|
|
||||||
constexpr Result ResultControllerUpdateFailed{ErrorModule::HIDBUS, 3};
|
|
||||||
constexpr Result ResultInvalidBusHandle{ErrorModule::HIDBUS, 4};
|
|
||||||
constexpr Result ResultNoDeviceConnected{ErrorModule::HIDBUS, 5};
|
|
||||||
constexpr Result ResultUknown6{ErrorModule::HIDBUS, 6};
|
|
||||||
constexpr Result ResultPollingRecieveDataNotAvailable{ErrorModule::HIDBUS, 7};
|
|
||||||
constexpr Result ResultDeviceEnabledNotSet{ErrorModule::HIDBUS, 8};
|
|
||||||
constexpr Result ResultBusHandleAlreadyInitialized{ErrorModule::HIDBUS, 10};
|
|
||||||
constexpr Result ResultInvalidBusType{ErrorModule::HIDBUS, 11};
|
|
||||||
|
|
||||||
} // namespace Service::HID
|
|
@@ -12,8 +12,6 @@
|
|||||||
#include "core/hle/kernel/k_shared_memory.h"
|
#include "core/hle/kernel/k_shared_memory.h"
|
||||||
#include "core/hle/kernel/k_transfer_memory.h"
|
#include "core/hle/kernel/k_transfer_memory.h"
|
||||||
#include "core/hle/service/hid/hidbus.h"
|
#include "core/hle/service/hid/hidbus.h"
|
||||||
#include "core/hle/service/hid/errors.h"
|
|
||||||
#include "core/hle/service/hid/controllers/npad.h"
|
|
||||||
#include "core/hle/service/hid/hidbus/ringcon.h"
|
#include "core/hle/service/hid/hidbus/ringcon.h"
|
||||||
#include "core/hle/service/hid/hidbus/starlink.h"
|
#include "core/hle/service/hid/hidbus/starlink.h"
|
||||||
#include "core/hle/service/hid/hidbus/stubbed.h"
|
#include "core/hle/service/hid/hidbus/stubbed.h"
|
||||||
@@ -49,9 +47,56 @@ HidBus::HidBus(Core::System& system_)
|
|||||||
|
|
||||||
RegisterHandlers(functions);
|
RegisterHandlers(functions);
|
||||||
|
|
||||||
|
// Register update callbacks
|
||||||
|
hidbus_update_event = Core::Timing::CreateEvent(
|
||||||
|
"Hidbus::UpdateCallback",
|
||||||
|
[this](std::uintptr_t user_data, s64 time,
|
||||||
|
std::chrono::nanoseconds ns_late) -> std::optional<std::chrono::nanoseconds> {
|
||||||
|
const auto guard = LockService();
|
||||||
|
UpdateHidbus(user_data, ns_late);
|
||||||
|
return std::nullopt;
|
||||||
|
});
|
||||||
|
|
||||||
|
system_.CoreTiming().ScheduleLoopingEvent(hidbus_update_ns, hidbus_update_ns,
|
||||||
|
hidbus_update_event);
|
||||||
}
|
}
|
||||||
|
|
||||||
HidBus::~HidBus() {
|
HidBus::~HidBus() {
|
||||||
|
system.CoreTiming().UnscheduleEvent(hidbus_update_event, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
void HidBus::UpdateHidbus(std::uintptr_t user_data, std::chrono::nanoseconds ns_late) {
|
||||||
|
if (is_hidbus_enabled) {
|
||||||
|
for (std::size_t i = 0; i < devices.size(); ++i) {
|
||||||
|
if (!devices[i].is_device_initializated) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
auto& device = devices[i].device;
|
||||||
|
device->OnUpdate();
|
||||||
|
auto& cur_entry = hidbus_status.entries[devices[i].handle.internal_index];
|
||||||
|
cur_entry.is_polling_mode = device->IsPollingMode();
|
||||||
|
cur_entry.polling_mode = device->GetPollingMode();
|
||||||
|
cur_entry.is_enabled = device->IsEnabled();
|
||||||
|
|
||||||
|
u8* shared_memory = system.Kernel().GetHidBusSharedMem().GetPointer();
|
||||||
|
std::memcpy(shared_memory + (i * sizeof(HidbusStatusManagerEntry)), &hidbus_status,
|
||||||
|
sizeof(HidbusStatusManagerEntry));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
std::optional<std::size_t> HidBus::GetDeviceIndexFromHandle(BusHandle handle) const {
|
||||||
|
for (std::size_t i = 0; i < devices.size(); ++i) {
|
||||||
|
const auto& device_handle = devices[i].handle;
|
||||||
|
if (handle.abstracted_pad_id == device_handle.abstracted_pad_id &&
|
||||||
|
handle.internal_index == device_handle.internal_index &&
|
||||||
|
handle.player_number == device_handle.player_number &&
|
||||||
|
handle.bus_type_id == device_handle.bus_type_id &&
|
||||||
|
handle.is_valid == device_handle.is_valid) {
|
||||||
|
return i;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return std::nullopt;
|
||||||
}
|
}
|
||||||
|
|
||||||
void HidBus::GetBusHandle(HLERequestContext& ctx) {
|
void HidBus::GetBusHandle(HLERequestContext& ctx) {
|
||||||
@@ -69,9 +114,38 @@ void HidBus::GetBusHandle(HLERequestContext& ctx) {
|
|||||||
LOG_INFO(Service_HID, "called, npad_id={}, bus_type={}, applet_resource_user_id={}",
|
LOG_INFO(Service_HID, "called, npad_id={}, bus_type={}, applet_resource_user_id={}",
|
||||||
parameters.npad_id, parameters.bus_type, parameters.applet_resource_user_id);
|
parameters.npad_id, parameters.bus_type, parameters.applet_resource_user_id);
|
||||||
|
|
||||||
if (parameters.bus_type >= BusType::MaxBusType) {
|
bool is_handle_found = 0;
|
||||||
IPC::ResponseBuilder rb{ctx, 2};
|
std::size_t handle_index = 0;
|
||||||
rb.Push(HIDBUS::ResultInvalidBusType);
|
|
||||||
|
for (std::size_t i = 0; i < devices.size(); i++) {
|
||||||
|
const auto& handle = devices[i].handle;
|
||||||
|
if (!handle.is_valid) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (static_cast<Core::HID::NpadIdType>(handle.player_number) == parameters.npad_id &&
|
||||||
|
handle.bus_type_id == static_cast<u8>(parameters.bus_type)) {
|
||||||
|
is_handle_found = true;
|
||||||
|
handle_index = i;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Handle not found. Create a new one
|
||||||
|
if (!is_handle_found) {
|
||||||
|
for (std::size_t i = 0; i < devices.size(); i++) {
|
||||||
|
if (devices[i].handle.is_valid) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
devices[i].handle = {
|
||||||
|
.abstracted_pad_id = static_cast<u8>(i),
|
||||||
|
.internal_index = static_cast<u8>(i),
|
||||||
|
.player_number = static_cast<u8>(parameters.npad_id),
|
||||||
|
.bus_type_id = static_cast<u8>(parameters.bus_type),
|
||||||
|
.is_valid = true,
|
||||||
|
};
|
||||||
|
handle_index = i;
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
struct OutData {
|
struct OutData {
|
||||||
@@ -81,8 +155,10 @@ void HidBus::GetBusHandle(HLERequestContext& ctx) {
|
|||||||
};
|
};
|
||||||
static_assert(sizeof(OutData) == 0x10, "OutData has incorrect size.");
|
static_assert(sizeof(OutData) == 0x10, "OutData has incorrect size.");
|
||||||
|
|
||||||
OutData out_data{};
|
const OutData out_data{
|
||||||
out_data.is_valid = GetBusHandleImpl(out_data.handle, parameters.npad_id, parameters.bus_type);
|
.is_valid = true,
|
||||||
|
.handle = devices[handle_index].handle,
|
||||||
|
};
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 6};
|
IPC::ResponseBuilder rb{ctx, 6};
|
||||||
rb.Push(ResultSuccess);
|
rb.Push(ResultSuccess);
|
||||||
@@ -99,10 +175,21 @@ void HidBus::IsExternalDeviceConnected(HLERequestContext& ctx) {
|
|||||||
bus_handle_.abstracted_pad_id, bus_handle_.bus_type_id, bus_handle_.internal_index,
|
bus_handle_.abstracted_pad_id, bus_handle_.bus_type_id, bus_handle_.internal_index,
|
||||||
bus_handle_.player_number, bus_handle_.is_valid);
|
bus_handle_.player_number, bus_handle_.is_valid);
|
||||||
|
|
||||||
auto result = TranslateHidErrorToHidBusError(ResultSuccess);
|
const auto device_index = GetDeviceIndexFromHandle(bus_handle_);
|
||||||
|
|
||||||
|
if (device_index) {
|
||||||
|
const auto& device = devices[device_index.value()].device;
|
||||||
|
const bool is_attached = device->IsDeviceActivated();
|
||||||
|
|
||||||
|
IPC::ResponseBuilder rb{ctx, 3};
|
||||||
|
rb.Push(ResultSuccess);
|
||||||
|
rb.Push(is_attached);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
LOG_ERROR(Service_HID, "Invalid handle");
|
||||||
IPC::ResponseBuilder rb{ctx, 2};
|
IPC::ResponseBuilder rb{ctx, 2};
|
||||||
rb.Push(result);
|
rb.Push(ResultUnknown);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -117,6 +204,40 @@ void HidBus::Initialize(HLERequestContext& ctx) {
|
|||||||
bus_handle_.abstracted_pad_id, bus_handle_.bus_type_id, bus_handle_.internal_index,
|
bus_handle_.abstracted_pad_id, bus_handle_.bus_type_id, bus_handle_.internal_index,
|
||||||
bus_handle_.player_number, bus_handle_.is_valid, applet_resource_user_id);
|
bus_handle_.player_number, bus_handle_.is_valid, applet_resource_user_id);
|
||||||
|
|
||||||
|
is_hidbus_enabled = true;
|
||||||
|
|
||||||
|
const auto device_index = GetDeviceIndexFromHandle(bus_handle_);
|
||||||
|
|
||||||
|
if (device_index) {
|
||||||
|
const auto entry_index = devices[device_index.value()].handle.internal_index;
|
||||||
|
auto& cur_entry = hidbus_status.entries[entry_index];
|
||||||
|
|
||||||
|
if (bus_handle_.internal_index == 0 && Settings::values.enable_ring_controller) {
|
||||||
|
MakeDevice<RingController>(bus_handle_);
|
||||||
|
devices[device_index.value()].is_device_initializated = true;
|
||||||
|
devices[device_index.value()].device->ActivateDevice();
|
||||||
|
cur_entry.is_in_focus = true;
|
||||||
|
cur_entry.is_connected = true;
|
||||||
|
cur_entry.is_connected_result = ResultSuccess;
|
||||||
|
cur_entry.is_enabled = false;
|
||||||
|
cur_entry.is_polling_mode = false;
|
||||||
|
} else {
|
||||||
|
MakeDevice<HidbusStubbed>(bus_handle_);
|
||||||
|
devices[device_index.value()].is_device_initializated = true;
|
||||||
|
cur_entry.is_in_focus = true;
|
||||||
|
cur_entry.is_connected = false;
|
||||||
|
cur_entry.is_connected_result = ResultSuccess;
|
||||||
|
cur_entry.is_enabled = false;
|
||||||
|
cur_entry.is_polling_mode = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::memcpy(system.Kernel().GetHidBusSharedMem().GetPointer(), &hidbus_status,
|
||||||
|
sizeof(hidbus_status));
|
||||||
|
|
||||||
|
IPC::ResponseBuilder rb{ctx, 2};
|
||||||
|
rb.Push(ResultSuccess);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
LOG_ERROR(Service_HID, "Invalid handle");
|
LOG_ERROR(Service_HID, "Invalid handle");
|
||||||
IPC::ResponseBuilder rb{ctx, 2};
|
IPC::ResponseBuilder rb{ctx, 2};
|
||||||
@@ -135,6 +256,27 @@ void HidBus::Finalize(HLERequestContext& ctx) {
|
|||||||
bus_handle_.abstracted_pad_id, bus_handle_.bus_type_id, bus_handle_.internal_index,
|
bus_handle_.abstracted_pad_id, bus_handle_.bus_type_id, bus_handle_.internal_index,
|
||||||
bus_handle_.player_number, bus_handle_.is_valid, applet_resource_user_id);
|
bus_handle_.player_number, bus_handle_.is_valid, applet_resource_user_id);
|
||||||
|
|
||||||
|
const auto device_index = GetDeviceIndexFromHandle(bus_handle_);
|
||||||
|
|
||||||
|
if (device_index) {
|
||||||
|
const auto entry_index = devices[device_index.value()].handle.internal_index;
|
||||||
|
auto& cur_entry = hidbus_status.entries[entry_index];
|
||||||
|
auto& device = devices[device_index.value()].device;
|
||||||
|
devices[device_index.value()].is_device_initializated = false;
|
||||||
|
device->DeactivateDevice();
|
||||||
|
|
||||||
|
cur_entry.is_in_focus = true;
|
||||||
|
cur_entry.is_connected = false;
|
||||||
|
cur_entry.is_connected_result = ResultSuccess;
|
||||||
|
cur_entry.is_enabled = false;
|
||||||
|
cur_entry.is_polling_mode = false;
|
||||||
|
std::memcpy(system.Kernel().GetHidBusSharedMem().GetPointer(), &hidbus_status,
|
||||||
|
sizeof(hidbus_status));
|
||||||
|
|
||||||
|
IPC::ResponseBuilder rb{ctx, 2};
|
||||||
|
rb.Push(ResultSuccess);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
LOG_ERROR(Service_HID, "Invalid handle");
|
LOG_ERROR(Service_HID, "Invalid handle");
|
||||||
IPC::ResponseBuilder rb{ctx, 2};
|
IPC::ResponseBuilder rb{ctx, 2};
|
||||||
@@ -163,6 +305,16 @@ void HidBus::EnableExternalDevice(HLERequestContext& ctx) {
|
|||||||
parameters.bus_handle.player_number, parameters.bus_handle.is_valid, parameters.inval,
|
parameters.bus_handle.player_number, parameters.bus_handle.is_valid, parameters.inval,
|
||||||
parameters.applet_resource_user_id);
|
parameters.applet_resource_user_id);
|
||||||
|
|
||||||
|
const auto device_index = GetDeviceIndexFromHandle(parameters.bus_handle);
|
||||||
|
|
||||||
|
if (device_index) {
|
||||||
|
auto& device = devices[device_index.value()].device;
|
||||||
|
device->Enable(parameters.enable);
|
||||||
|
|
||||||
|
IPC::ResponseBuilder rb{ctx, 2};
|
||||||
|
rb.Push(ResultSuccess);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
LOG_ERROR(Service_HID, "Invalid handle");
|
LOG_ERROR(Service_HID, "Invalid handle");
|
||||||
IPC::ResponseBuilder rb{ctx, 2};
|
IPC::ResponseBuilder rb{ctx, 2};
|
||||||
@@ -180,29 +332,21 @@ void HidBus::GetExternalDeviceId(HLERequestContext& ctx) {
|
|||||||
bus_handle_.abstracted_pad_id, bus_handle_.bus_type_id, bus_handle_.internal_index,
|
bus_handle_.abstracted_pad_id, bus_handle_.bus_type_id, bus_handle_.internal_index,
|
||||||
bus_handle_.player_number, bus_handle_.is_valid);
|
bus_handle_.player_number, bus_handle_.is_valid);
|
||||||
|
|
||||||
u32 device_id{};
|
const auto device_index = GetDeviceIndexFromHandle(bus_handle_);
|
||||||
auto result = SetEventForSendCommandAsycResult2();
|
|
||||||
if (result.IsSuccess()) {
|
|
||||||
if (1) {
|
|
||||||
result = HIDBUS::ResultInvalidBusHandle;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (result.IsSuccess()) {
|
if (device_index) {
|
||||||
// result = GetExternalDeviceIdImpl();
|
const auto& device = devices[device_index.value()].device;
|
||||||
}
|
u32 device_id = device->GetDeviceId();
|
||||||
|
|
||||||
if (result.IsSuccess()) {
|
|
||||||
IPC::ResponseBuilder rb{ctx, 3};
|
IPC::ResponseBuilder rb{ctx, 3};
|
||||||
rb.Push(ResultSuccess);
|
rb.Push(ResultSuccess);
|
||||||
rb.Push<u32>(device_id);
|
rb.Push<u32>(device_id);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
result = TranslateHidErrorToHidBusError(result);
|
LOG_ERROR(Service_HID, "Invalid handle");
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 2};
|
IPC::ResponseBuilder rb{ctx, 2};
|
||||||
rb.Push(result);
|
rb.Push(ResultUnknown);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
void HidBus::SendCommandAsync(HLERequestContext& ctx) {
|
void HidBus::SendCommandAsync(HLERequestContext& ctx) {
|
||||||
@@ -216,6 +360,16 @@ void HidBus::SendCommandAsync(HLERequestContext& ctx) {
|
|||||||
data.size(), bus_handle_.abstracted_pad_id, bus_handle_.bus_type_id,
|
data.size(), bus_handle_.abstracted_pad_id, bus_handle_.bus_type_id,
|
||||||
bus_handle_.internal_index, bus_handle_.player_number, bus_handle_.is_valid);
|
bus_handle_.internal_index, bus_handle_.player_number, bus_handle_.is_valid);
|
||||||
|
|
||||||
|
const auto device_index = GetDeviceIndexFromHandle(bus_handle_);
|
||||||
|
|
||||||
|
if (device_index) {
|
||||||
|
auto& device = devices[device_index.value()].device;
|
||||||
|
device->SetCommand(data);
|
||||||
|
|
||||||
|
IPC::ResponseBuilder rb{ctx, 2};
|
||||||
|
rb.Push(ResultSuccess);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
LOG_ERROR(Service_HID, "Invalid handle");
|
LOG_ERROR(Service_HID, "Invalid handle");
|
||||||
IPC::ResponseBuilder rb{ctx, 2};
|
IPC::ResponseBuilder rb{ctx, 2};
|
||||||
@@ -233,6 +387,18 @@ void HidBus::GetSendCommandAsynceResult(HLERequestContext& ctx) {
|
|||||||
bus_handle_.abstracted_pad_id, bus_handle_.bus_type_id, bus_handle_.internal_index,
|
bus_handle_.abstracted_pad_id, bus_handle_.bus_type_id, bus_handle_.internal_index,
|
||||||
bus_handle_.player_number, bus_handle_.is_valid);
|
bus_handle_.player_number, bus_handle_.is_valid);
|
||||||
|
|
||||||
|
const auto device_index = GetDeviceIndexFromHandle(bus_handle_);
|
||||||
|
|
||||||
|
if (device_index) {
|
||||||
|
const auto& device = devices[device_index.value()].device;
|
||||||
|
const std::vector<u8> data = device->GetReply();
|
||||||
|
const u64 data_size = ctx.WriteBuffer(data);
|
||||||
|
|
||||||
|
IPC::ResponseBuilder rb{ctx, 4};
|
||||||
|
rb.Push(ResultSuccess);
|
||||||
|
rb.Push<u64>(data_size);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
LOG_ERROR(Service_HID, "Invalid handle");
|
LOG_ERROR(Service_HID, "Invalid handle");
|
||||||
IPC::ResponseBuilder rb{ctx, 2};
|
IPC::ResponseBuilder rb{ctx, 2};
|
||||||
@@ -250,6 +416,16 @@ void HidBus::SetEventForSendCommandAsycResult(HLERequestContext& ctx) {
|
|||||||
bus_handle_.abstracted_pad_id, bus_handle_.bus_type_id, bus_handle_.internal_index,
|
bus_handle_.abstracted_pad_id, bus_handle_.bus_type_id, bus_handle_.internal_index,
|
||||||
bus_handle_.player_number, bus_handle_.is_valid);
|
bus_handle_.player_number, bus_handle_.is_valid);
|
||||||
|
|
||||||
|
const auto device_index = GetDeviceIndexFromHandle(bus_handle_);
|
||||||
|
|
||||||
|
if (device_index) {
|
||||||
|
const auto& device = devices[device_index.value()].device;
|
||||||
|
IPC::ResponseBuilder rb{ctx, 2, 1};
|
||||||
|
rb.Push(ResultSuccess);
|
||||||
|
rb.PushCopyObjects(device->GetSendCommandAsycEvent());
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
LOG_ERROR(Service_HID, "Invalid handle");
|
LOG_ERROR(Service_HID, "Invalid handle");
|
||||||
IPC::ResponseBuilder rb{ctx, 2};
|
IPC::ResponseBuilder rb{ctx, 2};
|
||||||
rb.Push(ResultUnknown);
|
rb.Push(ResultUnknown);
|
||||||
@@ -291,6 +467,17 @@ void HidBus::EnableJoyPollingReceiveMode(HLERequestContext& ctx) {
|
|||||||
t_mem_handle, polling_mode_, bus_handle_.abstracted_pad_id, bus_handle_.bus_type_id,
|
t_mem_handle, polling_mode_, bus_handle_.abstracted_pad_id, bus_handle_.bus_type_id,
|
||||||
bus_handle_.internal_index, bus_handle_.player_number, bus_handle_.is_valid);
|
bus_handle_.internal_index, bus_handle_.player_number, bus_handle_.is_valid);
|
||||||
|
|
||||||
|
const auto device_index = GetDeviceIndexFromHandle(bus_handle_);
|
||||||
|
|
||||||
|
if (device_index) {
|
||||||
|
auto& device = devices[device_index.value()].device;
|
||||||
|
device->SetPollingMode(polling_mode_);
|
||||||
|
device->SetTransferMemoryAddress(t_mem->GetSourceAddress());
|
||||||
|
|
||||||
|
IPC::ResponseBuilder rb{ctx, 2};
|
||||||
|
rb.Push(ResultSuccess);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
LOG_ERROR(Service_HID, "Invalid handle");
|
LOG_ERROR(Service_HID, "Invalid handle");
|
||||||
IPC::ResponseBuilder rb{ctx, 2};
|
IPC::ResponseBuilder rb{ctx, 2};
|
||||||
@@ -308,6 +495,16 @@ void HidBus::DisableJoyPollingReceiveMode(HLERequestContext& ctx) {
|
|||||||
bus_handle_.abstracted_pad_id, bus_handle_.bus_type_id, bus_handle_.internal_index,
|
bus_handle_.abstracted_pad_id, bus_handle_.bus_type_id, bus_handle_.internal_index,
|
||||||
bus_handle_.player_number, bus_handle_.is_valid);
|
bus_handle_.player_number, bus_handle_.is_valid);
|
||||||
|
|
||||||
|
const auto device_index = GetDeviceIndexFromHandle(bus_handle_);
|
||||||
|
|
||||||
|
if (device_index) {
|
||||||
|
auto& device = devices[device_index.value()].device;
|
||||||
|
device->DisablePollingMode();
|
||||||
|
|
||||||
|
IPC::ResponseBuilder rb{ctx, 2};
|
||||||
|
rb.Push(ResultSuccess);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
LOG_ERROR(Service_HID, "Invalid handle");
|
LOG_ERROR(Service_HID, "Invalid handle");
|
||||||
IPC::ResponseBuilder rb{ctx, 2};
|
IPC::ResponseBuilder rb{ctx, 2};
|
||||||
@@ -324,59 +521,4 @@ void HidBus::SetStatusManagerType(HLERequestContext& ctx) {
|
|||||||
IPC::ResponseBuilder rb{ctx, 2};
|
IPC::ResponseBuilder rb{ctx, 2};
|
||||||
rb.Push(ResultSuccess);
|
rb.Push(ResultSuccess);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
bool HidBus::GetBusHandleImpl(BusHandle& handle, Core::HID::NpadIdType npad_id, BusType bus_type) {
|
|
||||||
ASSERT_MSG(&handle != nullptr, "Handle is null");
|
|
||||||
|
|
||||||
if (!Controller_NPad::IsNpadIdValid(npad_id)) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (bus_type == BusType::LeftJoyRail || bus_type == BusType::RightJoyRail) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (bus_type == BusType::InternalBus) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
Result TranslateHidErrorToHidBusError(Result result) {
|
|
||||||
if (result.IsSuccess()) {
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
if (result.module != ErrorModule::HID) {
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
if (result == ResultMcuNotEnabled) {
|
|
||||||
return HIDBUS::ResultNotEnabled;
|
|
||||||
}
|
|
||||||
if (result == ResultMcuNoDeviceConnected) {
|
|
||||||
return HIDBUS::ResultNoDeviceConnected;
|
|
||||||
}
|
|
||||||
if (result == ResultMcuUnknown544) {
|
|
||||||
return HIDBUS::ResultUknown6;
|
|
||||||
}
|
|
||||||
if ((result.description & 0x1FFB) == 0x221) {
|
|
||||||
return HIDBUS::ResultPollingRecieveDataNotAvailable;
|
|
||||||
}
|
|
||||||
if (result == ResultMcuInvalidHandle) {
|
|
||||||
return HIDBUS::ResultInvalidBusHandle;
|
|
||||||
}
|
|
||||||
if (result == ResultMcuUnknown546) {
|
|
||||||
return HIDBUS::ResultDeviceEnabledNotSet;
|
|
||||||
}
|
|
||||||
if (result == ResultMcuUnknown548) {
|
|
||||||
return HIDBUS::ResultInvalidBusHandle;
|
|
||||||
}
|
|
||||||
if (result == ResultControllerUpdateFailed) {
|
|
||||||
return HIDBUS::ResultControllerUpdateFailed;
|
|
||||||
}
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace Service::HID
|
} // namespace Service::HID
|
||||||
|
@@ -108,12 +108,21 @@ private:
|
|||||||
void DisableJoyPollingReceiveMode(HLERequestContext& ctx);
|
void DisableJoyPollingReceiveMode(HLERequestContext& ctx);
|
||||||
void SetStatusManagerType(HLERequestContext& ctx);
|
void SetStatusManagerType(HLERequestContext& ctx);
|
||||||
|
|
||||||
bool GetBusHandleImpl(BusHandle& handle, Core::HID::NpadIdType npad_id, BusType bus_type);
|
void UpdateHidbus(std::uintptr_t user_data, std::chrono::nanoseconds ns_late);
|
||||||
Result TranslateHidErrorToHidBusError(Result result);
|
std::optional<std::size_t> GetDeviceIndexFromHandle(BusHandle handle) const;
|
||||||
Result SetEventForSendCommandAsycResult2();
|
|
||||||
|
|
||||||
|
template <typename T>
|
||||||
|
void MakeDevice(BusHandle handle) {
|
||||||
|
const auto device_index = GetDeviceIndexFromHandle(handle);
|
||||||
|
if (device_index) {
|
||||||
|
devices[device_index.value()].device = std::make_unique<T>(system, service_context);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool is_hidbus_enabled{false};
|
||||||
HidbusStatusManager hidbus_status{};
|
HidbusStatusManager hidbus_status{};
|
||||||
|
std::array<HidbusDevice, max_number_of_handles> devices{};
|
||||||
|
std::shared_ptr<Core::Timing::EventType> hidbus_update_event;
|
||||||
KernelHelpers::ServiceContext service_context;
|
KernelHelpers::ServiceContext service_context;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@@ -296,7 +296,7 @@ void IRS::RunTeraPluginProcessor(HLERequestContext& ctx) {
|
|||||||
|
|
||||||
if (result.IsSuccess()) {
|
if (result.IsSuccess()) {
|
||||||
auto& device = GetIrCameraSharedMemoryDeviceEntry(parameters.camera_handle);
|
auto& device = GetIrCameraSharedMemoryDeviceEntry(parameters.camera_handle);
|
||||||
MakeProcessor<TeraPluginProcessor>(parameters.camera_handle, device);
|
MakeProcessorWithCoreContext<TeraPluginProcessor>(parameters.camera_handle, device);
|
||||||
auto& image_transfer_processor =
|
auto& image_transfer_processor =
|
||||||
GetProcessor<TeraPluginProcessor>(parameters.camera_handle);
|
GetProcessor<TeraPluginProcessor>(parameters.camera_handle);
|
||||||
image_transfer_processor.SetConfig(parameters.processor_config);
|
image_transfer_processor.SetConfig(parameters.processor_config);
|
||||||
|
@@ -1,29 +1,103 @@
|
|||||||
// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
|
// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
|
||||||
// SPDX-License-Identifier: GPL-3.0-or-later
|
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
|
#include "core/hid/emulated_controller.h"
|
||||||
|
#include "core/hid/hid_core.h"
|
||||||
#include "core/hle/service/hid/irsensor/tera_plugin_processor.h"
|
#include "core/hle/service/hid/irsensor/tera_plugin_processor.h"
|
||||||
|
|
||||||
namespace Service::IRS {
|
namespace Service::IRS {
|
||||||
TeraPluginProcessor::TeraPluginProcessor(Core::IrSensor::DeviceFormat& device_format)
|
TeraPluginProcessor::TeraPluginProcessor(Core::HID::HIDCore& hid_core_,
|
||||||
: device(device_format) {
|
Core::IrSensor::DeviceFormat& device_format,
|
||||||
|
std::size_t npad_index)
|
||||||
|
: device{device_format} {
|
||||||
|
npad_device = hid_core_.GetEmulatedControllerByIndex(npad_index);
|
||||||
|
|
||||||
device.mode = Core::IrSensor::IrSensorMode::TeraPluginProcessor;
|
device.mode = Core::IrSensor::IrSensorMode::TeraPluginProcessor;
|
||||||
device.camera_status = Core::IrSensor::IrCameraStatus::Unconnected;
|
device.camera_status = Core::IrSensor::IrCameraStatus::Unconnected;
|
||||||
device.camera_internal_status = Core::IrSensor::IrCameraInternalStatus::Stopped;
|
device.camera_internal_status = Core::IrSensor::IrCameraInternalStatus::Stopped;
|
||||||
|
|
||||||
|
shared_memory = std::construct_at(
|
||||||
|
reinterpret_cast<TeraSharedMemory*>(&device_format.state.processor_raw_data));
|
||||||
|
|
||||||
|
Core::HID::ControllerUpdateCallback engine_callback{
|
||||||
|
.on_change = [this](Core::HID::ControllerTriggerType type) { OnControllerUpdate(type); },
|
||||||
|
.is_npad_service = true,
|
||||||
|
};
|
||||||
|
callback_key = npad_device->SetCallback(engine_callback);
|
||||||
}
|
}
|
||||||
|
|
||||||
TeraPluginProcessor::~TeraPluginProcessor() = default;
|
TeraPluginProcessor::~TeraPluginProcessor() {
|
||||||
|
npad_device->DeleteCallback(callback_key);
|
||||||
|
};
|
||||||
|
|
||||||
void TeraPluginProcessor::StartProcessor() {}
|
void TeraPluginProcessor::StartProcessor() {
|
||||||
|
device.camera_status = Core::IrSensor::IrCameraStatus::Available;
|
||||||
|
device.camera_internal_status = Core::IrSensor::IrCameraInternalStatus::Ready;
|
||||||
|
}
|
||||||
|
|
||||||
void TeraPluginProcessor::SuspendProcessor() {}
|
void TeraPluginProcessor::SuspendProcessor() {}
|
||||||
|
|
||||||
void TeraPluginProcessor::StopProcessor() {}
|
void TeraPluginProcessor::StopProcessor() {}
|
||||||
|
|
||||||
|
void TeraPluginProcessor::OnControllerUpdate(Core::HID::ControllerTriggerType type) {
|
||||||
|
if (type != Core::HID::ControllerTriggerType::IrSensor) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
next_state = {};
|
||||||
|
const auto camera_data = npad_device->GetCamera();
|
||||||
|
auto filtered_image = camera_data.data;
|
||||||
|
|
||||||
|
memcpy(next_state.data.data(), filtered_image.data(), GetDataSize(format));
|
||||||
|
|
||||||
|
// These 4 bytes seem to control the brightness of a image
|
||||||
|
next_state.data[0] = 1;
|
||||||
|
next_state.data[1] = 2;
|
||||||
|
next_state.data[2] = 0xde;
|
||||||
|
next_state.data[3] = 0x07;
|
||||||
|
|
||||||
|
// Data from HW
|
||||||
|
/* next_state.data = {
|
||||||
|
0x01, 0x02, 0xde, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x48, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa4,
|
||||||
|
0x41, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x13, 0x13, 0x00, 0x00, 0x06, 0x00, 0xc0, 0x28,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x98, 0x00, 0x00, 0x3c, 0x00, 0x05, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x20, 0xa8, 0x09, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x04,
|
||||||
|
0x12, 0x41, 0x00, 0x00, 0x13, 0x86, 0x02, 0x00, 0x00, 0x00, 0x1e, 0xc0, 0x02, 0x00, 0x00, 0x00,
|
||||||
|
0x40, 0x0f, 0x00, 0x00, 0x00, 0x30, 0xcd, 0x34, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x10, 0xa4, 0x01, 0x00, 0x00, 0x00, 0x20, 0x00, 0x02, 0x00, 0x00, 0x80, 0xf3, 0x01, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x36, 0x08, 0x04, 0x60, 0x02, 0x00, 0x76, 0x80, 0x09, 0x00, 0x00, 0x88, 0xd1,
|
||||||
|
0x20, 0x00, 0x00, 0x00, 0x65, 0x5a, 0x00, 0x00, 0x00, 0x00, 0x80, 0x06, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x28, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x3b, 0x00, 0x00, 0x00, 0x40, 0x01, 0x68, 0x00, 0x00, 0x00,
|
||||||
|
0x80, 0xf2, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x04, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0x00,
|
||||||
|
0x04, 0x00, 0x00, 0x00, 0x04, 0x80, 0x04, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x06, 0x06, 0x00,
|
||||||
|
0x00, 0x00, 0x04, 0xa0, 0x57, 0x02, 0x04, 0x40, 0x51, 0x02, 0x00, 0x40, 0xc1, 0x01, 0x00, 0x50,
|
||||||
|
0x86, 0x02, 0x00, 0x50, 0x0d, 0x04, 0x00, 0xb0, 0x05, 0x00, 0x00, 0x50, 0x04, 0x00, 0x00, 0xb0,
|
||||||
|
0x09, 0x00, 0x00, 0xb0, 0x01, 0xc0, 0x06, 0xc0, 0x0e, 0x00, 0x00, 0xb0, 0x01, 0x00, 0x00, 0x20,
|
||||||
|
0x01, 0x00, 0x00, 0x20, 0x01, 0x00, 0x00, 0x80, 0x04, 0x00, 0x00, 0x20, 0x05, 0x00, 0x00, 0x80,
|
||||||
|
0x01, 0x00, 0x00, 0x80, 0x04, 0x00, 0x00, 0x86, 0x01, 0x00, 0x00, 0x80, 0x04, 0x00, 0x00, 0x00,
|
||||||
|
0x00,
|
||||||
|
};*/
|
||||||
|
next_state.sampling_number = camera_data.sample;
|
||||||
|
next_state.timestamp = next_state.sampling_number + 131;
|
||||||
|
next_state.ambient_noise_level = Core::IrSensor::CameraAmbientNoiseLevel::Low;
|
||||||
|
|
||||||
|
shared_memory->tera_lifo.WriteNextEntry(next_state);
|
||||||
|
|
||||||
|
if (!IsProcessorActive()) {
|
||||||
|
StartProcessor();
|
||||||
|
}
|
||||||
|
}
|
||||||
void TeraPluginProcessor::SetConfig(Core::IrSensor::PackedTeraPluginProcessorConfig config) {
|
void TeraPluginProcessor::SetConfig(Core::IrSensor::PackedTeraPluginProcessorConfig config) {
|
||||||
current_config.mode = config.mode;
|
current_config.mode = config.mode;
|
||||||
current_config.unknown_1 = config.unknown_1;
|
current_config.unknown_1 = config.unknown_1;
|
||||||
current_config.unknown_2 = config.unknown_2;
|
current_config.unknown_2 = config.unknown_2;
|
||||||
current_config.unknown_3 = config.unknown_3;
|
current_config.unknown_3 = config.unknown_3;
|
||||||
|
|
||||||
|
LOG_ERROR(Service_IRS, "{} {} {} {}", config.mode, config.unknown_1, config.unknown_2,
|
||||||
|
config.unknown_3);
|
||||||
|
npad_device->SetCameraFormat(format);
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace Service::IRS
|
} // namespace Service::IRS
|
||||||
|
@@ -3,15 +3,21 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "common/bit_field.h"
|
|
||||||
#include "common/common_types.h"
|
#include "common/common_types.h"
|
||||||
#include "core/hid/irs_types.h"
|
#include "core/hid/irs_types.h"
|
||||||
|
#include "core/hle/service/hid/irs_ring_lifo.h"
|
||||||
#include "core/hle/service/hid/irsensor/processor_base.h"
|
#include "core/hle/service/hid/irsensor/processor_base.h"
|
||||||
|
|
||||||
|
namespace Core::HID {
|
||||||
|
class EmulatedController;
|
||||||
|
} // namespace Core::HID
|
||||||
|
|
||||||
namespace Service::IRS {
|
namespace Service::IRS {
|
||||||
class TeraPluginProcessor final : public ProcessorBase {
|
class TeraPluginProcessor final : public ProcessorBase {
|
||||||
public:
|
public:
|
||||||
explicit TeraPluginProcessor(Core::IrSensor::DeviceFormat& device_format);
|
explicit TeraPluginProcessor(Core::HID::HIDCore& hid_core_,
|
||||||
|
Core::IrSensor::DeviceFormat& device_format,
|
||||||
|
std::size_t npad_index);
|
||||||
~TeraPluginProcessor() override;
|
~TeraPluginProcessor() override;
|
||||||
|
|
||||||
// Called when the processor is initialized
|
// Called when the processor is initialized
|
||||||
@@ -27,6 +33,10 @@ public:
|
|||||||
void SetConfig(Core::IrSensor::PackedTeraPluginProcessorConfig config);
|
void SetConfig(Core::IrSensor::PackedTeraPluginProcessorConfig config);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
static constexpr auto format = Core::IrSensor::ImageTransferProcessorFormat::Size20x15;
|
||||||
|
static constexpr std::size_t width = 40;
|
||||||
|
static constexpr std::size_t height = 30;
|
||||||
|
|
||||||
// This is nn::irsensor::TeraPluginProcessorConfig
|
// This is nn::irsensor::TeraPluginProcessorConfig
|
||||||
struct TeraPluginProcessorConfig {
|
struct TeraPluginProcessorConfig {
|
||||||
u8 mode;
|
u8 mode;
|
||||||
@@ -46,8 +56,22 @@ private:
|
|||||||
static_assert(sizeof(TeraPluginProcessorState) == 0x140,
|
static_assert(sizeof(TeraPluginProcessorState) == 0x140,
|
||||||
"TeraPluginProcessorState is an invalid size");
|
"TeraPluginProcessorState is an invalid size");
|
||||||
|
|
||||||
|
struct TeraSharedMemory {
|
||||||
|
Service::IRS::Lifo<TeraPluginProcessorState, 6> tera_lifo;
|
||||||
|
static_assert(sizeof(tera_lifo) == 0x790, "tera_lifo is an invalid size");
|
||||||
|
INSERT_PADDING_WORDS(0x1A4);
|
||||||
|
};
|
||||||
|
static_assert(sizeof(TeraSharedMemory) == 0xE20, "TeraSharedMemory is an invalid size");
|
||||||
|
|
||||||
|
void OnControllerUpdate(Core::HID::ControllerTriggerType type);
|
||||||
|
|
||||||
|
TeraSharedMemory* shared_memory = nullptr;
|
||||||
|
TeraPluginProcessorState next_state{};
|
||||||
|
|
||||||
TeraPluginProcessorConfig current_config{};
|
TeraPluginProcessorConfig current_config{};
|
||||||
Core::IrSensor::DeviceFormat& device;
|
Core::IrSensor::DeviceFormat& device;
|
||||||
|
Core::HID::EmulatedController* npad_device;
|
||||||
|
int callback_key{};
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace Service::IRS
|
} // namespace Service::IRS
|
||||||
|
Reference in New Issue
Block a user