diff options
author | german77 <juangerman-13@hotmail.com> | 2022-01-09 06:23:40 +0100 |
---|---|---|
committer | Narr the Reg <juangerman-13@hotmail.com> | 2022-04-16 07:49:26 +0200 |
commit | d2f9412cf1717f884855af22793f3a1e5815c967 (patch) | |
tree | a1beab6c5d35dbfb8a58ef45f919e9d4a7d1d58d /src/core/hle/service/hid/hidbus.cpp | |
parent | hidbus: Implement hidbus and ringcon (diff) | |
download | yuzu-d2f9412cf1717f884855af22793f3a1e5815c967.tar yuzu-d2f9412cf1717f884855af22793f3a1e5815c967.tar.gz yuzu-d2f9412cf1717f884855af22793f3a1e5815c967.tar.bz2 yuzu-d2f9412cf1717f884855af22793f3a1e5815c967.tar.lz yuzu-d2f9412cf1717f884855af22793f3a1e5815c967.tar.xz yuzu-d2f9412cf1717f884855af22793f3a1e5815c967.tar.zst yuzu-d2f9412cf1717f884855af22793f3a1e5815c967.zip |
Diffstat (limited to 'src/core/hle/service/hid/hidbus.cpp')
-rw-r--r-- | src/core/hle/service/hid/hidbus.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/hle/service/hid/hidbus.cpp b/src/core/hle/service/hid/hidbus.cpp index db2864277..af7662a15 100644 --- a/src/core/hle/service/hid/hidbus.cpp +++ b/src/core/hle/service/hid/hidbus.cpp @@ -3,6 +3,7 @@ // Refer to the license.txt file included. #include "common/logging/log.h" +#include "common/settings.h" #include "core/core.h" #include "core/core_timing.h" #include "core/core_timing_util.h" @@ -190,6 +191,7 @@ void HidBus::IsExternalDeviceConnected(Kernel::HLERequestContext& ctx) { IPC::ResponseBuilder rb{ctx, 3}; rb.Push(ResultSuccess); rb.Push(is_attached); + return; } LOG_ERROR(Service_HID, "Invalid handle"); @@ -217,7 +219,7 @@ void HidBus::Initialize(Kernel::HLERequestContext& ctx) { 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) { + 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(); |