motion

src/common/input.h

@@ -24,6 +24,7 @@ enum class InputType {
     Analog,
     Trigger,
     Motion,
+    VirtualMotion,
     Touch,
     Color,
     Vibration,

src/core/hid/input_converter.cpp

@@ -5,6 +5,8 @@
 #include <random>
 
 #include "common/input.h"
+#include "common/math_util.h"
+#include "common/quaternion.h"
 #include "core/hid/input_converter.h"
 
 namespace Core::HID {
@@ -81,7 +83,7 @@ Common::Input::MotionStatus TransformToMotion(const Common::Input::CallbackStatu
     Common::Input::MotionStatus status{};
     switch (callback.type) {
     case Common::Input::InputType::Button: {
-        Common::Input::AnalogProperties properties{
+       const Common::Input::AnalogProperties properties{
             .deadzone = 0.0f,
             .range = 1.0f,
             .offset = 0.0f,
@@ -93,31 +95,18 @@ Common::Input::MotionStatus TransformToMotion(const Common::Input::CallbackStatu
             .raw_value = 0.0f,
             .properties = properties,
         };
-        status.accel.y = {
+        status.delta_timestamp = 5000;
-            .value = 0.0f,
+        status.force_update = true;
-            .raw_value = 0.0f,
+        status.accel.x = default_analog_status;
-            .properties = properties,
+        status.accel.y = default_analog_status;
-        };
         status.accel.z = {
             .value = 0.0f,
             .raw_value = -1.0f,
             .properties = properties,
         };
-        status.gyro.x = {
+        status.gyro.x = default_analog_status;
-            .value = 0.0f,
+        status.gyro.y = default_analog_status;
-            .raw_value = 0.0f,
+        status.gyro.z = default_analog_status;
-            .properties = properties,
-        };
-        status.gyro.y = {
-            .value = 0.0f,
-            .raw_value = 0.0f,
-            .properties = properties,
-        };
-        status.gyro.z = {
-            .value = 0.0f,
-            .raw_value = 0.0f,
-            .properties = properties,
-        };
         if (TransformToButton(callback).value) {
             std::random_device device;
             std::mt19937 gen(device());
@@ -134,6 +123,9 @@ Common::Input::MotionStatus TransformToMotion(const Common::Input::CallbackStatu
     case Common::Input::InputType::Motion:
         status = callback.motion_status;
         break;
+    case Common::Input::InputType::VirtualMotion:
+        status = GetVirtualMotion(callback.motion_status);
+        break;
     default:
         LOG_ERROR(Input, "Conversion from type {} to motion not implemented", callback.type);
         break;
@@ -437,4 +429,32 @@ void SanitizeStick(Common::Input::AnalogStatus& analog_x, Common::Input::AnalogS
     }
 }
 
+Common::Input::MotionStatus GetVirtualMotion(Common::Input::MotionStatus input_data,
+                                             Common::Vec3f last_giro) {
+    Common::Input::MotionStatus motion_status = input_data;
+
+    // Axis data is stored in the gyro value
+    float wx = input_data.gyro.x.raw_value;
+    float wy = input_data.gyro.y.raw_value;
+
+    float rotX = (wy * 2 - 1.0f) * 135.0f;  // up/down best
+    float rotY = (wx * 2 - 1.0f) * -180.0f; // left/right
+    float rotZ = input_data.gyro.y.raw_value * 14.0f + m_lastGyroRotation.z;
+
+    Common::Vec3f rotation(rotX - m_lastGyroRotation.x, (rotY - m_lastGyroRotation.y) * 15.0f,
+                       rotZ - m_lastGyroRotation.z);
+
+    rotation.x = std::min(1.0f, std::max(-1.0f, rotation.x / 360.0f));
+    rotation.y = std::min(1.0f, std::max(-1.0f, rotation.y / 360.0f));
+    rotation.z = std::min(1.0f, std::max(-1.0f, rotation.z / 360.0f));
+
+    motion_status.gyro.x.raw_value = rotation.x;
+    motion_status.gyro.y.raw_value = rotation.y;
+    motion_status.gyro.z.raw_value = rotation.z;
+
+    motion_status.accel.x.raw_value = 0.0f;
+    motion_status.accel.y.raw_value = 0.0f;
+    motion_status.accel.z.raw_value = -1.0f;
+}
+
 } // namespace Core::HID

src/core/hid/input_converter.h

@@ -116,4 +116,21 @@ void SanitizeAnalog(Common::Input::AnalogStatus& analog, bool clamp_value);
 void SanitizeStick(Common::Input::AnalogStatus& analog_x, Common::Input::AnalogStatus& analog_y,
                    bool clamp_value);
 
+/**
+ * Converts raw stick data into a valid stick value
+ * @param analog_x raw analog data and properties for the x-axis
+ * @param analog_y raw analog data and properties for the y-axis
+ * @param clamp_value bool that determines if the value needs to be clamped into the unit circle.
+ */
+void SanitizeStick(Common::Input::AnalogStatus& analog_x, Common::Input::AnalogStatus& analog_y,
+                   bool clamp_value);
+
+/**
+ * Calculates the accelerometer value needed to reach the axis position as if it was a pointer to a screen
+ *
+ * @param input_data Motion status containing the position of all 3 axis
+ * @return Motion status with accelerometer data
+ */
+Common::Input::MotionStatus GetVirtualMotion(Common::Input::MotionStatus input_data);
+
 } // namespace Core::HID

src/core/hle/service/hid/errors.h

@@ -14,22 +14,11 @@ constexpr Result VibrationInvalidStyleIndex{ErrorModule::HID, 122};
 constexpr Result VibrationInvalidNpadId{ErrorModule::HID, 123};
 constexpr Result VibrationDeviceIndexOutOfRange{ErrorModule::HID, 124};
 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 NpadIsSameType{ErrorModule::HID, 602};
 constexpr Result InvalidNpadId{ErrorModule::HID, 709};
 constexpr Result NpadNotConnected{ErrorModule::HID, 710};
 constexpr Result InvalidArraySize{ErrorModule::HID, 715};
-
-constexpr Result ResultControllerUpdateFailed{ErrorModule::HID, 3201};
-
 constexpr Result InvalidPalmaHandle{ErrorModule::HID, 3302};
 
 } // namespace Service::HID
@@ -40,17 +29,3 @@ constexpr Result InvalidProcessorState{ErrorModule::Irsensor, 78};
 constexpr Result InvalidIrCameraHandle{ErrorModule::Irsensor, 204};
 
 } // 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

src/core/hle/service/hid/hidbus.cpp

@@ -12,8 +12,6 @@
 #include "core/hle/kernel/k_shared_memory.h"
 #include "core/hle/kernel/k_transfer_memory.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/starlink.h"
 #include "core/hle/service/hid/hidbus/stubbed.h"
@@ -49,9 +47,56 @@ HidBus::HidBus(Core::System& system_)
 
     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() {
+    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) {
@@ -69,9 +114,38 @@ void HidBus::GetBusHandle(HLERequestContext& ctx) {
     LOG_INFO(Service_HID, "called, npad_id={}, bus_type={}, 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 {
@@ -81,8 +155,10 @@ void HidBus::GetBusHandle(HLERequestContext& ctx) {
     };
     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};
     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_.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};
-    rb.Push(result);
+    rb.Push(ResultUnknown);
     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_.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");
     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_.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");
     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.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");
     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_.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};
         rb.Push(ResultSuccess);
         rb.Push<u32>(device_id);
         return;
     }
 
-    result = TranslateHidErrorToHidBusError(result);
+    LOG_ERROR(Service_HID, "Invalid handle");
-
     IPC::ResponseBuilder rb{ctx, 2};
-    rb.Push(result);
+    rb.Push(ResultUnknown);
+    return;
 }
 
 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,
               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");
     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_.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");
     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_.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");
     IPC::ResponseBuilder rb{ctx, 2};
     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,
              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");
     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_.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");
     IPC::ResponseBuilder rb{ctx, 2};
@@ -324,59 +521,4 @@ void HidBus::SetStatusManagerType(HLERequestContext& ctx) {
     IPC::ResponseBuilder rb{ctx, 2};
     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

src/core/hle/service/hid/hidbus.h

@@ -108,12 +108,21 @@ private:
     void DisableJoyPollingReceiveMode(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{};
+    std::array<HidbusDevice, max_number_of_handles> devices{};
+    std::shared_ptr<Core::Timing::EventType> hidbus_update_event;
     KernelHelpers::ServiceContext service_context;
 };
 

src/input_common/input_poller.cpp

@@ -674,7 +674,7 @@ public:
 
     void ForceUpdate() override {
         const Common::Input::CallbackStatus status{
-            .type = Common::Input::InputType::Motion,
+            .type = Common::Input::InputType::VirtualMotion,
             .motion_status = GetStatus(),
         };
 
@@ -686,7 +686,7 @@ public:
 
     void OnChange() {
         const Common::Input::CallbackStatus status{
-            .type = Common::Input::InputType::Motion,
+            .type = Common::Input::InputType::VirtualMotion,
             .motion_status = GetStatus(),
         };
 
@@ -1039,14 +1039,13 @@ std::unique_ptr<Common::Input::InputDevice> InputFactory::CreateColorDevice(
 }
 
 std::unique_ptr<Common::Input::InputDevice> InputFactory::CreateMotionDevice(
-    Common::ParamPackage params) {
+    const Common::ParamPackage& params) {
     const PadIdentifier identifier = {
         .guid = Common::UUID{params.Get("guid", "")},
         .port = static_cast<std::size_t>(params.Get("port", 0)),
         .pad = static_cast<std::size_t>(params.Get("pad", 0)),
     };
 
-    if (params.Has("motion")) {
     const auto motion_sensor = params.Get("motion", 0);
     const auto gyro_threshold = params.Get("threshold", 0.007f);
     input_engine->PreSetController(identifier);
@@ -1055,6 +1054,14 @@ std::unique_ptr<Common::Input::InputDevice> InputFactory::CreateMotionDevice(
                                              input_engine.get());
 }
 
+std::unique_ptr<Common::Input::InputDevice> InputFactory::CreateVirtualMotionDevice(
+    const Common::ParamPackage& params) {
+    const PadIdentifier identifier = {
+        .guid = Common::UUID{params.Get("guid", "")},
+        .port = static_cast<std::size_t>(params.Get("port", 0)),
+        .pad = static_cast<std::size_t>(params.Get("pad", 0)),
+    };
+
     const auto deadzone = std::clamp(params.Get("deadzone", 0.15f), 0.0f, 1.0f);
     const auto range = std::clamp(params.Get("range", 1.0f), 0.25f, 1.50f);
     const auto threshold = std::clamp(params.Get("threshold", 0.5f), 0.0f, 1.0f);
@@ -1147,7 +1154,7 @@ std::unique_ptr<Common::Input::InputDevice> InputFactory::Create(
         return CreateHatButtonDevice(params);
     }
     if (params.Has("axis_x") && params.Has("axis_y") && params.Has("axis_z")) {
-        return CreateMotionDevice(params);
+        return CreateVirtualMotionDevice(params);
     }
     if (params.Has("motion")) {
         return CreateMotionDevice(params);

src/input_common/input_poller.h

@@ -204,6 +204,19 @@ private:
     /**
      * Creates a motion device from the parameters given.
      * @param params contains parameters for creating the device:
+     *               - "motion": index of the motion sensor
+     *               - "threshold": gyro deadzone to avoid drifting
+     *               - "guid": text string for identifying controllers
+     *               - "port": port of the connected device
+     *               - "pad": slot of the connected controller
+     * @returns a unique input device with the parameters specified
+     */
+    std::unique_ptr<Common::Input::InputDevice> CreateMotionDevice(
+        const Common::ParamPackage& params);
+
+    /**
+     * Creates a virtual motion device from the parameters given.
+     * @param params contains parameters for creating the device:
      *               - "axis_x": the controller horizontal axis id to bind with the input
      *               - "axis_y": the controller vertical axis id to bind with the input
      *               - "axis_z": the controller forward axis id to bind with the input
@@ -220,7 +233,8 @@ private:
      *               - "pad": slot of the connected controller
      * @returns a unique input device with the parameters specified
      */
-    std::unique_ptr<Common::Input::InputDevice> CreateMotionDevice(Common::ParamPackage params);
+    std::unique_ptr<Common::Input::InputDevice> CreateVirtualMotionDevice(
+        const Common::ParamPackage& params);
 
     /**
      * Creates a camera device from the parameters given.