49 files changed, 0 insertions, 6514 deletions

diff --git a/src/core/hle/service/hid/controllers/applet_resource.cpp b/src/core/hle/service/hid/controllers/applet_resource.cpp
deleted file mode 100644
index b4ff663c2..000000000
--- a/src/core/hle/service/hid/controllers/applet_resource.cpp
+++ /dev/null
@@ -1,329 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#include "core/core.h"
-#include "core/hle/kernel/k_shared_memory.h"
-#include "core/hle/service/hid/controllers/applet_resource.h"
-#include "core/hle/service/hid/controllers/types/shared_memory_format.h"
-#include "core/hle/service/hid/errors.h"
-
-namespace Service::HID {
-
-AppletResource::AppletResource(Core::System& system_) : system{system_} {}
-
-AppletResource::~AppletResource() = default;
-
-Result AppletResource::CreateAppletResource(u64 aruid) {
-    const u64 index = GetIndexFromAruid(aruid);
-
-    if (index >= AruidIndexMax) {
-        return ResultAruidNotRegistered;
-    }
-
-    if (data[index].flag.is_assigned) {
-        return ResultAruidAlreadyRegistered;
-    }
-
-    auto& shared_memory = shared_memory_holder[index];
-    if (!shared_memory.IsMapped()) {
-        const Result result = shared_memory.Initialize(system);
-        if (result.IsError()) {
-            return result;
-        }
-        if (shared_memory.GetAddress() == nullptr) {
-            shared_memory.Finalize();
-            return ResultSharedMemoryNotInitialized;
-        }
-    }
-
-    auto* shared_memory_format = shared_memory.GetAddress();
-    if (shared_memory_format != nullptr) {
-        shared_memory_format->Initialize();
-    }
-
-    data[index].shared_memory_format = shared_memory_format;
-    data[index].flag.is_assigned.Assign(true);
-    // TODO: InitializeSixAxisControllerConfig(false);
-    active_aruid = aruid;
-    return ResultSuccess;
-}
-
-Result AppletResource::RegisterAppletResourceUserId(u64 aruid, bool enable_input) {
-    const u64 index = GetIndexFromAruid(aruid);
-
-    if (index < AruidIndexMax) {
-        return ResultAruidAlreadyRegistered;
-    }
-
-    std::size_t data_index = AruidIndexMax;
-    for (std::size_t i = 0; i < AruidIndexMax; i++) {
-        if (!data[i].flag.is_initialized) {
-            data_index = i;
-            break;
-        }
-    }
-
-    if (data_index == AruidIndexMax) {
-        return ResultAruidNoAvailableEntries;
-    }
-
-    AruidData& aruid_data = data[data_index];
-
-    aruid_data.aruid = aruid;
-    aruid_data.flag.is_initialized.Assign(true);
-    if (enable_input) {
-        aruid_data.flag.enable_pad_input.Assign(true);
-        aruid_data.flag.enable_six_axis_sensor.Assign(true);
-        aruid_data.flag.bit_18.Assign(true);
-        aruid_data.flag.enable_touchscreen.Assign(true);
-    }
-
-    data_index = AruidIndexMax;
-    for (std::size_t i = 0; i < AruidIndexMax; i++) {
-        if (registration_list.flag[i] == RegistrationStatus::Initialized) {
-            if (registration_list.aruid[i] != aruid) {
-                continue;
-            }
-            data_index = i;
-            break;
-        }
-        if (registration_list.flag[i] == RegistrationStatus::None) {
-            data_index = i;
-            break;
-        }
-    }
-
-    if (data_index == AruidIndexMax) {
-        return ResultSuccess;
-    }
-
-    registration_list.flag[data_index] = RegistrationStatus::Initialized;
-    registration_list.aruid[data_index] = aruid;
-
-    return ResultSuccess;
-}
-
-void AppletResource::UnregisterAppletResourceUserId(u64 aruid) {
-    u64 index = GetIndexFromAruid(aruid);
-
-    if (index < AruidIndexMax) {
-        if (data[index].flag.is_assigned) {
-            data[index].shared_memory_format = nullptr;
-            data[index].flag.is_assigned.Assign(false);
-        }
-    }
-
-    index = GetIndexFromAruid(aruid);
-    if (index < AruidIndexMax) {
-        DestroySevenSixAxisTransferMemory();
-        data[index].flag.raw = 0;
-        data[index].aruid = 0;
-
-        index = GetIndexFromAruid(aruid);
-        if (index < AruidIndexMax) {
-            registration_list.flag[index] = RegistrationStatus::PendingDelete;
-        }
-    }
-}
-
-void AppletResource::FreeAppletResourceId(u64 aruid) {
-    u64 index = GetIndexFromAruid(aruid);
-    if (index >= AruidIndexMax) {
-        return;
-    }
-
-    auto& aruid_data = data[index];
-    if (aruid_data.flag.is_assigned) {
-        aruid_data.shared_memory_format = nullptr;
-        aruid_data.flag.is_assigned.Assign(false);
-    }
-}
-
-u64 AppletResource::GetActiveAruid() {
-    return active_aruid;
-}
-
-Result AppletResource::GetSharedMemoryHandle(Kernel::KSharedMemory** out_handle, u64 aruid) {
-    u64 index = GetIndexFromAruid(aruid);
-    if (index >= AruidIndexMax) {
-        return ResultAruidNotRegistered;
-    }
-
-    *out_handle = shared_memory_holder[index].GetHandle();
-    return ResultSuccess;
-}
-
-Result AppletResource::GetSharedMemoryFormat(SharedMemoryFormat** out_shared_memory_format,
-                                             u64 aruid) {
-    u64 index = GetIndexFromAruid(aruid);
-    if (index >= AruidIndexMax) {
-        return ResultAruidNotRegistered;
-    }
-
-    *out_shared_memory_format = data[index].shared_memory_format;
-    return ResultSuccess;
-}
-
-AruidData* AppletResource::GetAruidData(u64 aruid) {
-    const u64 aruid_index = GetIndexFromAruid(aruid);
-    if (aruid_index == AruidIndexMax) {
-        return nullptr;
-    }
-    return &data[aruid_index];
-}
-
-AruidData* AppletResource::GetAruidDataByIndex(std::size_t aruid_index) {
-    return &data[aruid_index];
-}
-
-bool AppletResource::IsVibrationAruidActive(u64 aruid) const {
-    return aruid == 0 || aruid == active_vibration_aruid;
-}
-
-u64 AppletResource::GetIndexFromAruid(u64 aruid) {
-    for (std::size_t i = 0; i < AruidIndexMax; i++) {
-        if (registration_list.flag[i] == RegistrationStatus::Initialized &&
-            registration_list.aruid[i] == aruid) {
-            return i;
-        }
-    }
-    return AruidIndexMax;
-}
-
-Result AppletResource::DestroySevenSixAxisTransferMemory() {
-    // TODO
-    return ResultSuccess;
-}
-
-void AppletResource::EnableInput(u64 aruid, bool is_enabled) {
-    const u64 index = GetIndexFromAruid(aruid);
-    if (index >= AruidIndexMax) {
-        return;
-    }
-
-    data[index].flag.enable_pad_input.Assign(is_enabled);
-    data[index].flag.enable_touchscreen.Assign(is_enabled);
-}
-
-void AppletResource::EnableSixAxisSensor(u64 aruid, bool is_enabled) {
-    const u64 index = GetIndexFromAruid(aruid);
-    if (index >= AruidIndexMax) {
-        return;
-    }
-
-    data[index].flag.enable_six_axis_sensor.Assign(is_enabled);
-}
-
-void AppletResource::EnablePadInput(u64 aruid, bool is_enabled) {
-    const u64 index = GetIndexFromAruid(aruid);
-    if (index >= AruidIndexMax) {
-        return;
-    }
-
-    data[index].flag.enable_pad_input.Assign(is_enabled);
-}
-
-void AppletResource::EnableTouchScreen(u64 aruid, bool is_enabled) {
-    const u64 index = GetIndexFromAruid(aruid);
-    if (index >= AruidIndexMax) {
-        return;
-    }
-
-    data[index].flag.enable_touchscreen.Assign(is_enabled);
-}
-
-void AppletResource::SetIsPalmaConnectable(u64 aruid, bool is_connectable) {
-    const u64 index = GetIndexFromAruid(aruid);
-    if (index >= AruidIndexMax) {
-        return;
-    }
-
-    data[index].flag.is_palma_connectable.Assign(is_connectable);
-}
-
-void AppletResource::EnablePalmaBoostMode(u64 aruid, bool is_enabled) {
-    const u64 index = GetIndexFromAruid(aruid);
-    if (index >= AruidIndexMax) {
-        return;
-    }
-
-    data[index].flag.enable_palma_boost_mode.Assign(is_enabled);
-}
-
-Result AppletResource::RegisterCoreAppletResource() {
-    if (ref_counter == std::numeric_limits<s32>::max() - 1) {
-        return ResultAppletResourceOverflow;
-    }
-    if (ref_counter == 0) {
-        const u64 index = GetIndexFromAruid(0);
-        if (index < AruidIndexMax) {
-            return ResultAruidAlreadyRegistered;
-        }
-
-        std::size_t data_index = AruidIndexMax;
-        for (std::size_t i = 0; i < AruidIndexMax; i++) {
-            if (!data[i].flag.is_initialized) {
-                data_index = i;
-                break;
-            }
-        }
-
-        if (data_index == AruidIndexMax) {
-            return ResultAruidNoAvailableEntries;
-        }
-
-        AruidData& aruid_data = data[data_index];
-
-        aruid_data.aruid = 0;
-        aruid_data.flag.is_initialized.Assign(true);
-        aruid_data.flag.enable_pad_input.Assign(true);
-        aruid_data.flag.enable_six_axis_sensor.Assign(true);
-        aruid_data.flag.bit_18.Assign(true);
-        aruid_data.flag.enable_touchscreen.Assign(true);
-
-        data_index = AruidIndexMax;
-        for (std::size_t i = 0; i < AruidIndexMax; i++) {
-            if (registration_list.flag[i] == RegistrationStatus::Initialized) {
-                if (registration_list.aruid[i] != 0) {
-                    continue;
-                }
-                data_index = i;
-                break;
-            }
-            if (registration_list.flag[i] == RegistrationStatus::None) {
-                data_index = i;
-                break;
-            }
-        }
-
-        Result result = ResultSuccess;
-
-        if (data_index == AruidIndexMax) {
-            result = CreateAppletResource(0);
-        } else {
-            registration_list.flag[data_index] = RegistrationStatus::Initialized;
-            registration_list.aruid[data_index] = 0;
-        }
-
-        if (result.IsError()) {
-            UnregisterAppletResourceUserId(0);
-            return result;
-        }
-    }
-    ref_counter++;
-    return ResultSuccess;
-}
-
-Result AppletResource::UnregisterCoreAppletResource() {
-    if (ref_counter == 0) {
-        return ResultAppletResourceNotInitialized;
-    }
-
-    if (--ref_counter == 0) {
-        UnregisterAppletResourceUserId(0);
-    }
-
-    return ResultSuccess;
-}
-
-} // namespace Service::HID
diff --git a/src/core/hle/service/hid/controllers/applet_resource.h b/src/core/hle/service/hid/controllers/applet_resource.h
deleted file mode 100644
index 0862fdc2f..000000000
--- a/src/core/hle/service/hid/controllers/applet_resource.h
+++ /dev/null
@@ -1,123 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#pragma once
-
-#include <array>
-#include <mutex>
-
-#include "common/bit_field.h"
-#include "common/common_types.h"
-#include "core/hle/result.h"
-#include "core/hle/service/hid/controllers/shared_memory_holder.h"
-
-namespace Core {
-class System;
-}
-
-namespace Kernel {
-class KSharedMemory;
-}
-
-namespace Service::HID {
-struct SharedMemoryFormat;
-class AppletResource;
-class NPadResource;
-
-static constexpr std::size_t AruidIndexMax = 0x20;
-static constexpr u64 SystemAruid = 0;
-
-enum class RegistrationStatus : u32 {
-    None,
-    Initialized,
-    PendingDelete,
-};
-
-struct DataStatusFlag {
-    union {
-        u32 raw{};
-
-        BitField<0, 1, u32> is_initialized;
-        BitField<1, 1, u32> is_assigned;
-        BitField<16, 1, u32> enable_pad_input;
-        BitField<17, 1, u32> enable_six_axis_sensor;
-        BitField<18, 1, u32> bit_18;
-        BitField<19, 1, u32> is_palma_connectable;
-        BitField<20, 1, u32> enable_palma_boost_mode;
-        BitField<21, 1, u32> enable_touchscreen;
-    };
-};
-
-struct AruidRegisterList {
-    std::array<RegistrationStatus, AruidIndexMax> flag{};
-    std::array<u64, AruidIndexMax> aruid{};
-};
-static_assert(sizeof(AruidRegisterList) == 0x180, "AruidRegisterList is an invalid size");
-
-struct AruidData {
-    DataStatusFlag flag{};
-    u64 aruid{};
-    SharedMemoryFormat* shared_memory_format{nullptr};
-};
-
-struct HandheldConfig {
-    bool is_handheld_hid_enabled;
-    bool is_force_handheld;
-    bool is_joycon_rail_enabled;
-    bool is_force_handheld_style_vibration;
-};
-static_assert(sizeof(HandheldConfig) == 0x4, "HandheldConfig is an invalid size");
-
-struct AppletResourceHolder {
-    std::shared_ptr<AppletResource> applet_resource{nullptr};
-    std::recursive_mutex* shared_mutex{nullptr};
-    NPadResource* shared_npad_resource{nullptr};
-    std::shared_ptr<HandheldConfig> handheld_config{nullptr};
-    long* handle_1;
-};
-
-class AppletResource {
-public:
-    explicit AppletResource(Core::System& system_);
-    ~AppletResource();
-
-    Result CreateAppletResource(u64 aruid);
-
-    Result RegisterAppletResourceUserId(u64 aruid, bool enable_input);
-    void UnregisterAppletResourceUserId(u64 aruid);
-
-    void FreeAppletResourceId(u64 aruid);
-
-    u64 GetActiveAruid();
-    Result GetSharedMemoryHandle(Kernel::KSharedMemory** out_handle, u64 aruid);
-    Result GetSharedMemoryFormat(SharedMemoryFormat** out_shared_memory_format, u64 aruid);
-    AruidData* GetAruidData(u64 aruid);
-    AruidData* GetAruidDataByIndex(std::size_t aruid_index);
-
-    bool IsVibrationAruidActive(u64 aruid) const;
-
-    u64 GetIndexFromAruid(u64 aruid);
-
-    Result DestroySevenSixAxisTransferMemory();
-
-    void EnableInput(u64 aruid, bool is_enabled);
-    void EnableSixAxisSensor(u64 aruid, bool is_enabled);
-    void EnablePadInput(u64 aruid, bool is_enabled);
-    void EnableTouchScreen(u64 aruid, bool is_enabled);
-    void SetIsPalmaConnectable(u64 aruid, bool is_connectable);
-    void EnablePalmaBoostMode(u64 aruid, bool is_enabled);
-
-    Result RegisterCoreAppletResource();
-    Result UnregisterCoreAppletResource();
-
-private:
-    u64 active_aruid{};
-    AruidRegisterList registration_list{};
-    std::array<AruidData, AruidIndexMax> data{};
-    std::array<SharedMemoryHolder, AruidIndexMax> shared_memory_holder{};
-    s32 ref_counter{};
-    u64 active_vibration_aruid;
-
-    Core::System& system;
-};
-} // namespace Service::HID
diff --git a/src/core/hle/service/hid/controllers/capture_button.cpp b/src/core/hle/service/hid/controllers/capture_button.cpp
deleted file mode 100644
index 7847c080e..000000000
--- a/src/core/hle/service/hid/controllers/capture_button.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "core/core_timing.h"
-#include "core/hle/service/hid/controllers/applet_resource.h"
-#include "core/hle/service/hid/controllers/capture_button.h"
-#include "core/hle/service/hid/controllers/types/shared_memory_format.h"
-
-namespace Service::HID {
-
-CaptureButton::CaptureButton(Core::HID::HIDCore& hid_core_) : ControllerBase{hid_core_} {}
-
-CaptureButton::~CaptureButton() = default;
-
-void CaptureButton::OnInit() {}
-
-void CaptureButton::OnRelease() {}
-
-void CaptureButton::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
-    if (!smart_update) {
-        return;
-    }
-
-    std::scoped_lock shared_lock{*shared_mutex};
-    const u64 aruid = applet_resource->GetActiveAruid();
-    auto* data = applet_resource->GetAruidData(aruid);
-
-    if (data == nullptr || !data->flag.is_assigned) {
-        return;
-    }
-
-    auto& header = data->shared_memory_format->capture_button.header;
-    header.timestamp = core_timing.GetGlobalTimeNs().count();
-    header.total_entry_count = 17;
-    header.entry_count = 0;
-    header.last_entry_index = 0;
-}
-
-} // namespace Service::HID
diff --git a/src/core/hle/service/hid/controllers/capture_button.h b/src/core/hle/service/hid/controllers/capture_button.h
deleted file mode 100644
index dcc4715c5..000000000
--- a/src/core/hle/service/hid/controllers/capture_button.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "core/hle/service/hid/controllers/controller_base.h"
-
-namespace Service::HID {
-
-class CaptureButton final : public ControllerBase {
-public:
-    explicit CaptureButton(Core::HID::HIDCore& hid_core_);
-    ~CaptureButton() override;
-
-    // Called when the controller is initialized
-    void OnInit() override;
-
-    // When the controller is released
-    void OnRelease() override;
-
-    // When the controller is requesting an update for the shared memory
-    void OnUpdate(const Core::Timing::CoreTiming& core_timing) override;
-
-private:
-    bool smart_update{};
-};
-} // namespace Service::HID
diff --git a/src/core/hle/service/hid/controllers/console_six_axis.cpp b/src/core/hle/service/hid/controllers/console_six_axis.cpp
deleted file mode 100644
index 4b574c2e5..000000000
--- a/src/core/hle/service/hid/controllers/console_six_axis.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "core/core_timing.h"
-#include "core/hid/emulated_console.h"
-#include "core/hid/hid_core.h"
-#include "core/hle/service/hid/controllers/console_six_axis.h"
-#include "core/hle/service/hid/controllers/types/shared_memory_format.h"
-
-namespace Service::HID {
-
-ConsoleSixAxis::ConsoleSixAxis(Core::HID::HIDCore& hid_core_) : ControllerBase{hid_core_} {
-    console = hid_core.GetEmulatedConsole();
-}
-
-ConsoleSixAxis::~ConsoleSixAxis() = default;
-
-void ConsoleSixAxis::OnInit() {}
-
-void ConsoleSixAxis::OnRelease() {}
-
-void ConsoleSixAxis::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
-    std::scoped_lock shared_lock{*shared_mutex};
-    const u64 aruid = applet_resource->GetActiveAruid();
-    auto* data = applet_resource->GetAruidData(aruid);
-
-    if (data == nullptr || !data->flag.is_assigned) {
-        return;
-    }
-
-    ConsoleSixAxisSensorSharedMemoryFormat& shared_memory = data->shared_memory_format->console;
-
-    if (!IsControllerActivated()) {
-        return;
-    }
-
-    const auto motion_status = console->GetMotion();
-
-    shared_memory.sampling_number++;
-    shared_memory.is_seven_six_axis_sensor_at_rest = motion_status.is_at_rest;
-    shared_memory.verticalization_error = motion_status.verticalization_error;
-    shared_memory.gyro_bias = motion_status.gyro_bias;
-}
-
-} // namespace Service::HID
diff --git a/src/core/hle/service/hid/controllers/console_six_axis.h b/src/core/hle/service/hid/controllers/console_six_axis.h
deleted file mode 100644
index e3351f83c..000000000
--- a/src/core/hle/service/hid/controllers/console_six_axis.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "core/hle/service/hid/controllers/controller_base.h"
-
-namespace Core::HID {
-class EmulatedConsole;
-} // namespace Core::HID
-
-namespace Service::HID {
-class ConsoleSixAxis final : public ControllerBase {
-public:
-    explicit ConsoleSixAxis(Core::HID::HIDCore& hid_core_);
-    ~ConsoleSixAxis() override;
-
-    // Called when the controller is initialized
-    void OnInit() override;
-
-    // When the controller is released
-    void OnRelease() override;
-
-    // When the controller is requesting an update for the shared memory
-    void OnUpdate(const Core::Timing::CoreTiming& core_timing) override;
-
-private:
-    Core::HID::EmulatedConsole* console = nullptr;
-};
-} // namespace Service::HID
diff --git a/src/core/hle/service/hid/controllers/controller_base.cpp b/src/core/hle/service/hid/controllers/controller_base.cpp
deleted file mode 100644
index afca7154c..000000000
--- a/src/core/hle/service/hid/controllers/controller_base.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "core/hle/service/hid/controllers/controller_base.h"
-
-namespace Service::HID {
-
-ControllerBase::ControllerBase(Core::HID::HIDCore& hid_core_) : hid_core(hid_core_) {}
-ControllerBase::~ControllerBase() = default;
-
-Result ControllerBase::Activate() {
-    if (is_activated) {
-        return ResultSuccess;
-    }
-    is_activated = true;
-    OnInit();
-    return ResultSuccess;
-}
-
-Result ControllerBase::Activate(u64 aruid) {
-    return Activate();
-}
-
-void ControllerBase::DeactivateController() {
-    if (is_activated) {
-        OnRelease();
-    }
-    is_activated = false;
-}
-
-bool ControllerBase::IsControllerActivated() const {
-    return is_activated;
-}
-
-void ControllerBase::SetAppletResource(std::shared_ptr<AppletResource> resource,
-                                       std::recursive_mutex* resource_mutex) {
-    applet_resource = resource;
-    shared_mutex = resource_mutex;
-}
-
-} // namespace Service::HID
diff --git a/src/core/hle/service/hid/controllers/controller_base.h b/src/core/hle/service/hid/controllers/controller_base.h
deleted file mode 100644
index b34b85ece..000000000
--- a/src/core/hle/service/hid/controllers/controller_base.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include <memory>
-
-#include "common/common_types.h"
-#include "core/hle/result.h"
-#include "core/hle/service/hid/controllers/applet_resource.h"
-
-namespace Core::Timing {
-class CoreTiming;
-}
-
-namespace Core::HID {
-class HIDCore;
-} // namespace Core::HID
-
-namespace Service::HID {
-class ControllerBase {
-public:
-    explicit ControllerBase(Core::HID::HIDCore& hid_core_);
-    virtual ~ControllerBase();
-
-    // Called when the controller is initialized
-    virtual void OnInit() = 0;
-
-    // When the controller is released
-    virtual void OnRelease() = 0;
-
-    // When the controller is requesting an update for the shared memory
-    virtual void OnUpdate(const Core::Timing::CoreTiming& core_timing) = 0;
-
-    // When the controller is requesting a motion update for the shared memory
-    virtual void OnMotionUpdate(const Core::Timing::CoreTiming& core_timing) {}
-
-    Result Activate();
-    Result Activate(u64 aruid);
-
-    void DeactivateController();
-
-    bool IsControllerActivated() const;
-
-    void SetAppletResource(std::shared_ptr<AppletResource> resource,
-                           std::recursive_mutex* resource_mutex);
-
-protected:
-    bool is_activated{false};
-    std::shared_ptr<AppletResource> applet_resource{nullptr};
-    std::recursive_mutex* shared_mutex{nullptr};
-
-    Core::HID::HIDCore& hid_core;
-};
-} // namespace Service::HID
diff --git a/src/core/hle/service/hid/controllers/debug_mouse.cpp b/src/core/hle/service/hid/controllers/debug_mouse.cpp
deleted file mode 100644
index ceeb78d36..000000000
--- a/src/core/hle/service/hid/controllers/debug_mouse.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "core/core_timing.h"
-#include "core/frontend/emu_window.h"
-#include "core/hid/emulated_devices.h"
-#include "core/hid/hid_core.h"
-#include "core/hle/service/hid/controllers/applet_resource.h"
-#include "core/hle/service/hid/controllers/debug_mouse.h"
-#include "core/hle/service/hid/controllers/types/shared_memory_format.h"
-
-namespace Service::HID {
-
-DebugMouse::DebugMouse(Core::HID::HIDCore& hid_core_) : ControllerBase{hid_core_} {
-    emulated_devices = hid_core.GetEmulatedDevices();
-}
-
-DebugMouse::~DebugMouse() = default;
-
-void DebugMouse::OnInit() {}
-void DebugMouse::OnRelease() {}
-
-void DebugMouse::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
-    std::scoped_lock shared_lock{*shared_mutex};
-    const u64 aruid = applet_resource->GetActiveAruid();
-    auto* data = applet_resource->GetAruidData(aruid);
-
-    if (data == nullptr || !data->flag.is_assigned) {
-        return;
-    }
-
-    MouseSharedMemoryFormat& shared_memory = data->shared_memory_format->debug_mouse;
-
-    if (!IsControllerActivated()) {
-        shared_memory.mouse_lifo.buffer_count = 0;
-        shared_memory.mouse_lifo.buffer_tail = 0;
-        return;
-    }
-
-    next_state = {};
-
-    const auto& last_entry = shared_memory.mouse_lifo.ReadCurrentEntry().state;
-    next_state.sampling_number = last_entry.sampling_number + 1;
-
-    if (Settings::values.mouse_enabled) {
-        const auto& mouse_button_state = emulated_devices->GetMouseButtons();
-        const auto& mouse_position_state = emulated_devices->GetMousePosition();
-        const auto& mouse_wheel_state = emulated_devices->GetMouseWheel();
-        next_state.attribute.is_connected.Assign(1);
-        next_state.x = static_cast<s32>(mouse_position_state.x * Layout::ScreenUndocked::Width);
-        next_state.y = static_cast<s32>(mouse_position_state.y * Layout::ScreenUndocked::Height);
-        next_state.delta_x = next_state.x - last_entry.x;
-        next_state.delta_y = next_state.y - last_entry.y;
-        next_state.delta_wheel_x = mouse_wheel_state.x - last_mouse_wheel_state.x;
-        next_state.delta_wheel_y = mouse_wheel_state.y - last_mouse_wheel_state.y;
-
-        last_mouse_wheel_state = mouse_wheel_state;
-        next_state.button = mouse_button_state;
-    }
-
-    shared_memory.mouse_lifo.WriteNextEntry(next_state);
-}
-
-} // namespace Service::HID
diff --git a/src/core/hle/service/hid/controllers/debug_mouse.h b/src/core/hle/service/hid/controllers/debug_mouse.h
deleted file mode 100644
index ec939fa9f..000000000
--- a/src/core/hle/service/hid/controllers/debug_mouse.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "core/hle/service/hid/controllers/controller_base.h"
-
-namespace Core::HID {
-class EmulatedDevices;
-struct MouseState;
-struct AnalogStickState;
-} // namespace Core::HID
-
-namespace Service::HID {
-class DebugMouse final : public ControllerBase {
-public:
-    explicit DebugMouse(Core::HID::HIDCore& hid_core_);
-    ~DebugMouse() override;
-
-    // Called when the controller is initialized
-    void OnInit() override;
-
-    // When the controller is released
-    void OnRelease() override;
-
-    // When the controller is requesting an update for the shared memory
-    void OnUpdate(const Core::Timing::CoreTiming& core_timing) override;
-
-private:
-    Core::HID::MouseState next_state{};
-    Core::HID::AnalogStickState last_mouse_wheel_state{};
-    Core::HID::EmulatedDevices* emulated_devices = nullptr;
-};
-} // namespace Service::HID
diff --git a/src/core/hle/service/hid/controllers/debug_pad.cpp b/src/core/hle/service/hid/controllers/debug_pad.cpp
deleted file mode 100644
index dc83f90f3..000000000
--- a/src/core/hle/service/hid/controllers/debug_pad.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "common/settings.h"
-#include "core/core_timing.h"
-#include "core/hid/emulated_controller.h"
-#include "core/hid/hid_core.h"
-#include "core/hid/hid_types.h"
-#include "core/hle/service/hid/controllers/applet_resource.h"
-#include "core/hle/service/hid/controllers/debug_pad.h"
-#include "core/hle/service/hid/controllers/types/shared_memory_format.h"
-
-namespace Service::HID {
-
-DebugPad::DebugPad(Core::HID::HIDCore& hid_core_) : ControllerBase{hid_core_} {
-    controller = hid_core.GetEmulatedController(Core::HID::NpadIdType::Other);
-}
-
-DebugPad::~DebugPad() = default;
-
-void DebugPad::OnInit() {}
-
-void DebugPad::OnRelease() {}
-
-void DebugPad::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
-    std::scoped_lock shared_lock{*shared_mutex};
-    const u64 aruid = applet_resource->GetActiveAruid();
-    auto* data = applet_resource->GetAruidData(aruid);
-
-    if (data == nullptr || !data->flag.is_assigned) {
-        return;
-    }
-
-    DebugPadSharedMemoryFormat& shared_memory = data->shared_memory_format->debug_pad;
-
-    if (!IsControllerActivated()) {
-        shared_memory.debug_pad_lifo.buffer_count = 0;
-        shared_memory.debug_pad_lifo.buffer_tail = 0;
-        return;
-    }
-
-    const auto& last_entry = shared_memory.debug_pad_lifo.ReadCurrentEntry().state;
-    next_state.sampling_number = last_entry.sampling_number + 1;
-
-    if (Settings::values.debug_pad_enabled) {
-        next_state.attribute.connected.Assign(1);
-
-        const auto& button_state = controller->GetDebugPadButtons();
-        const auto& stick_state = controller->GetSticks();
-
-        next_state.pad_state = button_state;
-        next_state.l_stick = stick_state.left;
-        next_state.r_stick = stick_state.right;
-    }
-
-    shared_memory.debug_pad_lifo.WriteNextEntry(next_state);
-}
-
-} // namespace Service::HID
diff --git a/src/core/hle/service/hid/controllers/debug_pad.h b/src/core/hle/service/hid/controllers/debug_pad.h
deleted file mode 100644
index dd00b2402..000000000
--- a/src/core/hle/service/hid/controllers/debug_pad.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "core/hle/service/hid/controllers/controller_base.h"
-#include "core/hle/service/hid/controllers/types/debug_pad_types.h"
-
-namespace Core::HID {
-class HIDCore;
-}
-
-namespace Core::Timing {
-class CoreTiming;
-}
-
-namespace Service::HID {
-class DebugPad final : public ControllerBase {
-public:
-    explicit DebugPad(Core::HID::HIDCore& hid_core_);
-    ~DebugPad() override;
-
-    // Called when the controller is initialized
-    void OnInit() override;
-
-    // When the controller is released
-    void OnRelease() override;
-
-    // When the controller is requesting an update for the shared memory
-    void OnUpdate(const Core::Timing::CoreTiming& core_timing) override;
-
-private:
-    DebugPadState next_state{};
-    Core::HID::EmulatedController* controller = nullptr;
-};
-} // namespace Service::HID
diff --git a/src/core/hle/service/hid/controllers/digitizer.cpp b/src/core/hle/service/hid/controllers/digitizer.cpp
deleted file mode 100644
index d5514c965..000000000
--- a/src/core/hle/service/hid/controllers/digitizer.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "core/core_timing.h"
-#include "core/hle/service/hid/controllers/applet_resource.h"
-#include "core/hle/service/hid/controllers/digitizer.h"
-#include "core/hle/service/hid/controllers/types/shared_memory_format.h"
-
-namespace Service::HID {
-
-Digitizer::Digitizer(Core::HID::HIDCore& hid_core_) : ControllerBase{hid_core_} {}
-
-Digitizer::~Digitizer() = default;
-
-void Digitizer::OnInit() {}
-
-void Digitizer::OnRelease() {}
-
-void Digitizer::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
-    if (!smart_update) {
-        return;
-    }
-
-    std::scoped_lock shared_lock{*shared_mutex};
-    const u64 aruid = applet_resource->GetActiveAruid();
-    auto* data = applet_resource->GetAruidData(aruid);
-
-    if (data == nullptr || !data->flag.is_assigned) {
-        return;
-    }
-
-    auto& header = data->shared_memory_format->digitizer.header;
-    header.timestamp = core_timing.GetGlobalTimeNs().count();
-    header.total_entry_count = 17;
-    header.entry_count = 0;
-    header.last_entry_index = 0;
-}
-
-} // namespace Service::HID
diff --git a/src/core/hle/service/hid/controllers/digitizer.h b/src/core/hle/service/hid/controllers/digitizer.h
deleted file mode 100644
index d81f814c3..000000000
--- a/src/core/hle/service/hid/controllers/digitizer.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "core/hle/service/hid/controllers/controller_base.h"
-
-namespace Service::HID {
-
-class Digitizer final : public ControllerBase {
-public:
-    explicit Digitizer(Core::HID::HIDCore& hid_core_);
-    ~Digitizer() override;
-
-    // Called when the controller is initialized
-    void OnInit() override;
-
-    // When the controller is released
-    void OnRelease() override;
-
-    // When the controller is requesting an update for the shared memory
-    void OnUpdate(const Core::Timing::CoreTiming& core_timing) override;
-
-private:
-    bool smart_update{};
-};
-} // namespace Service::HID
diff --git a/src/core/hle/service/hid/controllers/gesture.cpp b/src/core/hle/service/hid/controllers/gesture.cpp
deleted file mode 100644
index c73da13ee..000000000
--- a/src/core/hle/service/hid/controllers/gesture.cpp
+++ /dev/null
@@ -1,366 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "common/math_util.h"
-#include "common/settings.h"
-#include "core/frontend/emu_window.h"
-#include "core/hid/emulated_console.h"
-#include "core/hid/hid_core.h"
-#include "core/hle/service/hid/controllers/applet_resource.h"
-#include "core/hle/service/hid/controllers/gesture.h"
-#include "core/hle/service/hid/controllers/types/shared_memory_format.h"
-
-namespace Service::HID {
-// HW is around 700, value is set to 400 to make it easier to trigger with mouse
-constexpr f32 swipe_threshold = 400.0f; // Threshold in pixels/s
-constexpr f32 angle_threshold = 0.015f; // Threshold in radians
-constexpr f32 pinch_threshold = 0.5f;   // Threshold in pixels
-constexpr f32 press_delay = 0.5f;       // Time in seconds
-constexpr f32 double_tap_delay = 0.35f; // Time in seconds
-
-constexpr f32 Square(s32 num) {
-    return static_cast<f32>(num * num);
-}
-
-Gesture::Gesture(Core::HID::HIDCore& hid_core_) : ControllerBase(hid_core_) {
-    console = hid_core.GetEmulatedConsole();
-}
-Gesture::~Gesture() = default;
-
-void Gesture::OnInit() {
-    std::scoped_lock shared_lock{*shared_mutex};
-    const u64 aruid = applet_resource->GetActiveAruid();
-    auto* data = applet_resource->GetAruidData(aruid);
-
-    if (data == nullptr || !data->flag.is_assigned) {
-        return;
-    }
-
-    shared_memory = &data->shared_memory_format->gesture;
-    shared_memory->gesture_lifo.buffer_count = 0;
-    shared_memory->gesture_lifo.buffer_tail = 0;
-    force_update = true;
-}
-
-void Gesture::OnRelease() {}
-
-void Gesture::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
-    std::scoped_lock shared_lock{*shared_mutex};
-    const u64 aruid = applet_resource->GetActiveAruid();
-    auto* data = applet_resource->GetAruidData(aruid);
-
-    if (data == nullptr || !data->flag.is_assigned) {
-        return;
-    }
-
-    shared_memory = &data->shared_memory_format->gesture;
-
-    if (!IsControllerActivated()) {
-        shared_memory->gesture_lifo.buffer_count = 0;
-        shared_memory->gesture_lifo.buffer_tail = 0;
-        return;
-    }
-
-    ReadTouchInput();
-
-    GestureProperties gesture = GetGestureProperties();
-    f32 time_difference =
-        static_cast<f32>(shared_memory->gesture_lifo.timestamp - last_update_timestamp) /
-        (1000 * 1000 * 1000);
-
-    // Only update if necessary
-    if (!ShouldUpdateGesture(gesture, time_difference)) {
-        return;
-    }
-
-    last_update_timestamp = shared_memory->gesture_lifo.timestamp;
-    UpdateGestureSharedMemory(gesture, time_difference);
-}
-
-void Gesture::ReadTouchInput() {
-    if (!Settings::values.touchscreen.enabled) {
-        fingers = {};
-        return;
-    }
-
-    const auto touch_status = console->GetTouch();
-    for (std::size_t id = 0; id < fingers.size(); ++id) {
-        fingers[id] = touch_status[id];
-    }
-}
-
-bool Gesture::ShouldUpdateGesture(const GestureProperties& gesture, f32 time_difference) {
-    const auto& last_entry = GetLastGestureEntry();
-    if (force_update) {
-        force_update = false;
-        return true;
-    }
-
-    // Update if coordinates change
-    for (size_t id = 0; id < MAX_POINTS; id++) {
-        if (gesture.points[id] != last_gesture.points[id]) {
-            return true;
-        }
-    }
-
-    // Update on press and hold event after 0.5 seconds
-    if (last_entry.type == GestureType::Touch && last_entry.point_count == 1 &&
-        time_difference > press_delay) {
-        return enable_press_and_tap;
-    }
-
-    return false;
-}
-
-void Gesture::UpdateGestureSharedMemory(GestureProperties& gesture, f32 time_difference) {
-    GestureType type = GestureType::Idle;
-    GestureAttribute attributes{};
-
-    const auto& last_entry = shared_memory->gesture_lifo.ReadCurrentEntry().state;
-
-    // Reset next state to default
-    next_state.sampling_number = last_entry.sampling_number + 1;
-    next_state.delta = {};
-    next_state.vel_x = 0;
-    next_state.vel_y = 0;
-    next_state.direction = GestureDirection::None;
-    next_state.rotation_angle = 0;
-    next_state.scale = 0;
-
-    if (gesture.active_points > 0) {
-        if (last_gesture.active_points == 0) {
-            NewGesture(gesture, type, attributes);
-        } else {
-            UpdateExistingGesture(gesture, type, time_difference);
-        }
-    } else {
-        EndGesture(gesture, last_gesture, type, attributes, time_difference);
-    }
-
-    // Apply attributes
-    next_state.detection_count = gesture.detection_count;
-    next_state.type = type;
-    next_state.attributes = attributes;
-    next_state.pos = gesture.mid_point;
-    next_state.point_count = static_cast<s32>(gesture.active_points);
-    next_state.points = gesture.points;
-    last_gesture = gesture;
-
-    shared_memory->gesture_lifo.WriteNextEntry(next_state);
-}
-
-void Gesture::NewGesture(GestureProperties& gesture, GestureType& type,
-                         GestureAttribute& attributes) {
-    const auto& last_entry = GetLastGestureEntry();
-
-    gesture.detection_count++;
-    type = GestureType::Touch;
-
-    // New touch after cancel is not considered new
-    if (last_entry.type != GestureType::Cancel) {
-        attributes.is_new_touch.Assign(1);
-        enable_press_and_tap = true;
-    }
-}
-
-void Gesture::UpdateExistingGesture(GestureProperties& gesture, GestureType& type,
-                                    f32 time_difference) {
-    const auto& last_entry = GetLastGestureEntry();
-
-    // Promote to pan type if touch moved
-    for (size_t id = 0; id < MAX_POINTS; id++) {
-        if (gesture.points[id] != last_gesture.points[id]) {
-            type = GestureType::Pan;
-            break;
-        }
-    }
-
-    // Number of fingers changed cancel the last event and clear data
-    if (gesture.active_points != last_gesture.active_points) {
-        type = GestureType::Cancel;
-        enable_press_and_tap = false;
-        gesture.active_points = 0;
-        gesture.mid_point = {};
-        gesture.points.fill({});
-        return;
-    }
-
-    // Calculate extra parameters of panning
-    if (type == GestureType::Pan) {
-        UpdatePanEvent(gesture, last_gesture, type, time_difference);
-        return;
-    }
-
-    // Promote to press type
-    if (last_entry.type == GestureType::Touch) {
-        type = GestureType::Press;
-    }
-}
-
-void Gesture::EndGesture(GestureProperties& gesture, GestureProperties& last_gesture_props,
-                         GestureType& type, GestureAttribute& attributes, f32 time_difference) {
-    const auto& last_entry = GetLastGestureEntry();
-
-    if (last_gesture_props.active_points != 0) {
-        switch (last_entry.type) {
-        case GestureType::Touch:
-            if (enable_press_and_tap) {
-                SetTapEvent(gesture, last_gesture_props, type, attributes);
-                return;
-            }
-            type = GestureType::Cancel;
-            force_update = true;
-            break;
-        case GestureType::Press:
-        case GestureType::Tap:
-        case GestureType::Swipe:
-        case GestureType::Pinch:
-        case GestureType::Rotate:
-            type = GestureType::Complete;
-            force_update = true;
-            break;
-        case GestureType::Pan:
-            EndPanEvent(gesture, last_gesture_props, type, time_difference);
-            break;
-        default:
-            break;
-        }
-        return;
-    }
-    if (last_entry.type == GestureType::Complete || last_entry.type == GestureType::Cancel) {
-        gesture.detection_count++;
-    }
-}
-
-void Gesture::SetTapEvent(GestureProperties& gesture, GestureProperties& last_gesture_props,
-                          GestureType& type, GestureAttribute& attributes) {
-    type = GestureType::Tap;
-    gesture = last_gesture_props;
-    force_update = true;
-    f32 tap_time_difference =
-        static_cast<f32>(last_update_timestamp - last_tap_timestamp) / (1000 * 1000 * 1000);
-    last_tap_timestamp = last_update_timestamp;
-    if (tap_time_difference < double_tap_delay) {
-        attributes.is_double_tap.Assign(1);
-    }
-}
-
-void Gesture::UpdatePanEvent(GestureProperties& gesture, GestureProperties& last_gesture_props,
-                             GestureType& type, f32 time_difference) {
-    const auto& last_entry = GetLastGestureEntry();
-
-    next_state.delta = gesture.mid_point - last_entry.pos;
-    next_state.vel_x = static_cast<f32>(next_state.delta.x) / time_difference;
-    next_state.vel_y = static_cast<f32>(next_state.delta.y) / time_difference;
-    last_pan_time_difference = time_difference;
-
-    // Promote to pinch type
-    if (std::abs(gesture.average_distance - last_gesture_props.average_distance) >
-        pinch_threshold) {
-        type = GestureType::Pinch;
-        next_state.scale = gesture.average_distance / last_gesture_props.average_distance;
-    }
-
-    const f32 angle_between_two_lines = std::atan((gesture.angle - last_gesture_props.angle) /
-                                                  (1 + (gesture.angle * last_gesture_props.angle)));
-    // Promote to rotate type
-    if (std::abs(angle_between_two_lines) > angle_threshold) {
-        type = GestureType::Rotate;
-        next_state.scale = 0;
-        next_state.rotation_angle = angle_between_two_lines * 180.0f / Common::PI;
-    }
-}
-
-void Gesture::EndPanEvent(GestureProperties& gesture, GestureProperties& last_gesture_props,
-                          GestureType& type, f32 time_difference) {
-    const auto& last_entry = GetLastGestureEntry();
-    next_state.vel_x =
-        static_cast<f32>(last_entry.delta.x) / (last_pan_time_difference + time_difference);
-    next_state.vel_y =
-        static_cast<f32>(last_entry.delta.y) / (last_pan_time_difference + time_difference);
-    const f32 curr_vel =
-        std::sqrt((next_state.vel_x * next_state.vel_x) + (next_state.vel_y * next_state.vel_y));
-
-    // Set swipe event with parameters
-    if (curr_vel > swipe_threshold) {
-        SetSwipeEvent(gesture, last_gesture_props, type);
-        return;
-    }
-
-    // End panning without swipe
-    type = GestureType::Complete;
-    next_state.vel_x = 0;
-    next_state.vel_y = 0;
-    force_update = true;
-}
-
-void Gesture::SetSwipeEvent(GestureProperties& gesture, GestureProperties& last_gesture_props,
-                            GestureType& type) {
-    const auto& last_entry = GetLastGestureEntry();
-
-    type = GestureType::Swipe;
-    gesture = last_gesture_props;
-    force_update = true;
-    next_state.delta = last_entry.delta;
-
-    if (std::abs(next_state.delta.x) > std::abs(next_state.delta.y)) {
-        if (next_state.delta.x > 0) {
-            next_state.direction = GestureDirection::Right;
-            return;
-        }
-        next_state.direction = GestureDirection::Left;
-        return;
-    }
-    if (next_state.delta.y > 0) {
-        next_state.direction = GestureDirection::Down;
-        return;
-    }
-    next_state.direction = GestureDirection::Up;
-}
-
-const GestureState& Gesture::GetLastGestureEntry() const {
-    return shared_memory->gesture_lifo.ReadCurrentEntry().state;
-}
-
-GestureProperties Gesture::GetGestureProperties() {
-    GestureProperties gesture;
-    std::array<Core::HID::TouchFinger, MAX_POINTS> active_fingers;
-    const auto end_iter = std::copy_if(fingers.begin(), fingers.end(), active_fingers.begin(),
-                                       [](const auto& finger) { return finger.pressed; });
-    gesture.active_points =
-        static_cast<std::size_t>(std::distance(active_fingers.begin(), end_iter));
-
-    for (size_t id = 0; id < gesture.active_points; ++id) {
-        const auto& [active_x, active_y] = active_fingers[id].position;
-        gesture.points[id] = {
-            .x = static_cast<s32>(active_x * Layout::ScreenUndocked::Width),
-            .y = static_cast<s32>(active_y * Layout::ScreenUndocked::Height),
-        };
-
-        // Hack: There is no touch in docked but games still allow it
-        if (Settings::IsDockedMode()) {
-            gesture.points[id] = {
-                .x = static_cast<s32>(active_x * Layout::ScreenDocked::Width),
-                .y = static_cast<s32>(active_y * Layout::ScreenDocked::Height),
-            };
-        }
-
-        gesture.mid_point.x += static_cast<s32>(gesture.points[id].x / gesture.active_points);
-        gesture.mid_point.y += static_cast<s32>(gesture.points[id].y / gesture.active_points);
-    }
-
-    for (size_t id = 0; id < gesture.active_points; ++id) {
-        const f32 distance = std::sqrt(Square(gesture.mid_point.x - gesture.points[id].x) +
-                                       Square(gesture.mid_point.y - gesture.points[id].y));
-        gesture.average_distance += distance / static_cast<f32>(gesture.active_points);
-    }
-
-    gesture.angle = std::atan2(static_cast<f32>(gesture.mid_point.y - gesture.points[0].y),
-                               static_cast<f32>(gesture.mid_point.x - gesture.points[0].x));
-
-    gesture.detection_count = last_gesture.detection_count;
-
-    return gesture;
-}
-
-} // namespace Service::HID
diff --git a/src/core/hle/service/hid/controllers/gesture.h b/src/core/hle/service/hid/controllers/gesture.h
deleted file mode 100644
index 78da1552a..000000000
--- a/src/core/hle/service/hid/controllers/gesture.h
+++ /dev/null
@@ -1,87 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include <array>
-
-#include "common/common_types.h"
-#include "core/hle/service/hid/controllers/controller_base.h"
-#include "core/hle/service/hid/controllers/types/touch_types.h"
-
-namespace Core::HID {
-class EmulatedConsole;
-}
-
-namespace Service::HID {
-struct GestureSharedMemoryFormat;
-
-class Gesture final : public ControllerBase {
-public:
-    explicit Gesture(Core::HID::HIDCore& hid_core_);
-    ~Gesture() override;
-
-    // Called when the controller is initialized
-    void OnInit() override;
-
-    // When the controller is released
-    void OnRelease() override;
-
-    // When the controller is requesting an update for the shared memory
-    void OnUpdate(const Core::Timing::CoreTiming& core_timing) override;
-
-private:
-    // Reads input from all available input engines
-    void ReadTouchInput();
-
-    // Returns true if gesture state needs to be updated
-    bool ShouldUpdateGesture(const GestureProperties& gesture, f32 time_difference);
-
-    // Updates the shared memory to the next state
-    void UpdateGestureSharedMemory(GestureProperties& gesture, f32 time_difference);
-
-    // Initializes new gesture
-    void NewGesture(GestureProperties& gesture, GestureType& type, GestureAttribute& attributes);
-
-    // Updates existing gesture state
-    void UpdateExistingGesture(GestureProperties& gesture, GestureType& type, f32 time_difference);
-
-    // Terminates exiting gesture
-    void EndGesture(GestureProperties& gesture, GestureProperties& last_gesture_props,
-                    GestureType& type, GestureAttribute& attributes, f32 time_difference);
-
-    // Set current event to a tap event
-    void SetTapEvent(GestureProperties& gesture, GestureProperties& last_gesture_props,
-                     GestureType& type, GestureAttribute& attributes);
-
-    // Calculates and set the extra parameters related to a pan event
-    void UpdatePanEvent(GestureProperties& gesture, GestureProperties& last_gesture_props,
-                        GestureType& type, f32 time_difference);
-
-    // Terminates the pan event
-    void EndPanEvent(GestureProperties& gesture, GestureProperties& last_gesture_props,
-                     GestureType& type, f32 time_difference);
-
-    // Set current event to a swipe event
-    void SetSwipeEvent(GestureProperties& gesture, GestureProperties& last_gesture_props,
-                       GestureType& type);
-
-    // Retrieves the last gesture entry, as indicated by shared memory indices.
-    [[nodiscard]] const GestureState& GetLastGestureEntry() const;
-
-    // Returns the average distance, angle and middle point of the active fingers
-    GestureProperties GetGestureProperties();
-
-    GestureState next_state{};
-    GestureSharedMemoryFormat* shared_memory;
-    Core::HID::EmulatedConsole* console = nullptr;
-
-    std::array<Core::HID::TouchFinger, MAX_POINTS> fingers{};
-    GestureProperties last_gesture{};
-    s64 last_update_timestamp{};
-    s64 last_tap_timestamp{};
-    f32 last_pan_time_difference{};
-    bool force_update{false};
-    bool enable_press_and_tap{false};
-};
-} // namespace Service::HID
diff --git a/src/core/hle/service/hid/controllers/home_button.cpp b/src/core/hle/service/hid/controllers/home_button.cpp
deleted file mode 100644
index 1397379f3..000000000
--- a/src/core/hle/service/hid/controllers/home_button.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "core/core_timing.h"
-#include "core/hle/service/hid/controllers/applet_resource.h"
-#include "core/hle/service/hid/controllers/home_button.h"
-#include "core/hle/service/hid/controllers/types/shared_memory_format.h"
-
-namespace Service::HID {
-
-HomeButton::HomeButton(Core::HID::HIDCore& hid_core_) : ControllerBase{hid_core_} {}
-
-HomeButton::~HomeButton() = default;
-
-void HomeButton::OnInit() {}
-
-void HomeButton::OnRelease() {}
-
-void HomeButton::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
-    if (!smart_update) {
-        return;
-    }
-
-    std::scoped_lock shared_lock{*shared_mutex};
-    const u64 aruid = applet_resource->GetActiveAruid();
-    auto* data = applet_resource->GetAruidData(aruid);
-
-    if (data == nullptr || !data->flag.is_assigned) {
-        return;
-    }
-
-    auto& header = data->shared_memory_format->home_button.header;
-    header.timestamp = core_timing.GetGlobalTimeNs().count();
-    header.total_entry_count = 17;
-    header.entry_count = 0;
-    header.last_entry_index = 0;
-}
-
-} // namespace Service::HID
diff --git a/src/core/hle/service/hid/controllers/home_button.h b/src/core/hle/service/hid/controllers/home_button.h
deleted file mode 100644
index e91c2aa5d..000000000
--- a/src/core/hle/service/hid/controllers/home_button.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "core/hle/service/hid/controllers/controller_base.h"
-
-namespace Service::HID {
-
-class HomeButton final : public ControllerBase {
-public:
-    explicit HomeButton(Core::HID::HIDCore& hid_core_);
-    ~HomeButton() override;
-
-    // Called when the controller is initialized
-    void OnInit() override;
-
-    // When the controller is released
-    void OnRelease() override;
-
-    // When the controller is requesting an update for the shared memory
-    void OnUpdate(const Core::Timing::CoreTiming& core_timing) override;
-
-private:
-    bool smart_update{};
-};
-} // namespace Service::HID
diff --git a/src/core/hle/service/hid/controllers/keyboard.cpp b/src/core/hle/service/hid/controllers/keyboard.cpp
deleted file mode 100644
index c069bcbb2..000000000
--- a/src/core/hle/service/hid/controllers/keyboard.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "common/settings.h"
-#include "core/core_timing.h"
-#include "core/hid/emulated_devices.h"
-#include "core/hid/hid_core.h"
-#include "core/hle/service/hid/controllers/applet_resource.h"
-#include "core/hle/service/hid/controllers/keyboard.h"
-#include "core/hle/service/hid/controllers/types/shared_memory_format.h"
-
-namespace Service::HID {
-
-Keyboard::Keyboard(Core::HID::HIDCore& hid_core_) : ControllerBase{hid_core_} {
-    emulated_devices = hid_core.GetEmulatedDevices();
-}
-
-Keyboard::~Keyboard() = default;
-
-void Keyboard::OnInit() {}
-
-void Keyboard::OnRelease() {}
-
-void Keyboard::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
-    std::scoped_lock shared_lock{*shared_mutex};
-    const u64 aruid = applet_resource->GetActiveAruid();
-    auto* data = applet_resource->GetAruidData(aruid);
-
-    if (data == nullptr || !data->flag.is_assigned) {
-        return;
-    }
-
-    KeyboardSharedMemoryFormat& shared_memory = data->shared_memory_format->keyboard;
-
-    if (!IsControllerActivated()) {
-        shared_memory.keyboard_lifo.buffer_count = 0;
-        shared_memory.keyboard_lifo.buffer_tail = 0;
-        return;
-    }
-
-    const auto& last_entry = shared_memory.keyboard_lifo.ReadCurrentEntry().state;
-    next_state.sampling_number = last_entry.sampling_number + 1;
-
-    if (Settings::values.keyboard_enabled) {
-        const auto& keyboard_state = emulated_devices->GetKeyboard();
-        const auto& keyboard_modifier_state = emulated_devices->GetKeyboardModifier();
-
-        next_state.key = keyboard_state;
-        next_state.modifier = keyboard_modifier_state;
-        next_state.attribute.is_connected.Assign(1);
-    }
-
-    shared_memory.keyboard_lifo.WriteNextEntry(next_state);
-}
-
-} // namespace Service::HID
diff --git a/src/core/hle/service/hid/controllers/keyboard.h b/src/core/hle/service/hid/controllers/keyboard.h
deleted file mode 100644
index e8ca326c6..000000000
--- a/src/core/hle/service/hid/controllers/keyboard.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "core/hle/service/hid/controllers/controller_base.h"
-#include "core/hle/service/hid/controllers/types/keyboard_types.h"
-
-namespace Service::HID {
-class Keyboard final : public ControllerBase {
-public:
-    explicit Keyboard(Core::HID::HIDCore& hid_core_);
-    ~Keyboard() override;
-
-    // Called when the controller is initialized
-    void OnInit() override;
-
-    // When the controller is released
-    void OnRelease() override;
-
-    // When the controller is requesting an update for the shared memory
-    void OnUpdate(const Core::Timing::CoreTiming& core_timing) override;
-
-private:
-    KeyboardState next_state{};
-    Core::HID::EmulatedDevices* emulated_devices = nullptr;
-};
-} // namespace Service::HID
diff --git a/src/core/hle/service/hid/controllers/mouse.cpp b/src/core/hle/service/hid/controllers/mouse.cpp
deleted file mode 100644
index 3a8d1751b..000000000
--- a/src/core/hle/service/hid/controllers/mouse.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "core/core_timing.h"
-#include "core/frontend/emu_window.h"
-#include "core/hid/emulated_devices.h"
-#include "core/hid/hid_core.h"
-#include "core/hle/service/hid/controllers/applet_resource.h"
-#include "core/hle/service/hid/controllers/mouse.h"
-#include "core/hle/service/hid/controllers/types/shared_memory_format.h"
-
-namespace Service::HID {
-
-Mouse::Mouse(Core::HID::HIDCore& hid_core_) : ControllerBase{hid_core_} {
-    emulated_devices = hid_core.GetEmulatedDevices();
-}
-
-Mouse::~Mouse() = default;
-
-void Mouse::OnInit() {}
-void Mouse::OnRelease() {}
-
-void Mouse::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
-    std::scoped_lock shared_lock{*shared_mutex};
-    const u64 aruid = applet_resource->GetActiveAruid();
-    auto* data = applet_resource->GetAruidData(aruid);
-
-    if (data == nullptr || !data->flag.is_assigned) {
-        return;
-    }
-
-    MouseSharedMemoryFormat& shared_memory = data->shared_memory_format->mouse;
-
-    if (!IsControllerActivated()) {
-        shared_memory.mouse_lifo.buffer_count = 0;
-        shared_memory.mouse_lifo.buffer_tail = 0;
-        return;
-    }
-
-    next_state = {};
-
-    const auto& last_entry = shared_memory.mouse_lifo.ReadCurrentEntry().state;
-    next_state.sampling_number = last_entry.sampling_number + 1;
-
-    if (Settings::values.mouse_enabled) {
-        const auto& mouse_button_state = emulated_devices->GetMouseButtons();
-        const auto& mouse_position_state = emulated_devices->GetMousePosition();
-        const auto& mouse_wheel_state = emulated_devices->GetMouseWheel();
-        next_state.attribute.is_connected.Assign(1);
-        next_state.x = static_cast<s32>(mouse_position_state.x * Layout::ScreenUndocked::Width);
-        next_state.y = static_cast<s32>(mouse_position_state.y * Layout::ScreenUndocked::Height);
-        next_state.delta_x = next_state.x - last_entry.x;
-        next_state.delta_y = next_state.y - last_entry.y;
-        next_state.delta_wheel_x = mouse_wheel_state.x - last_mouse_wheel_state.x;
-        next_state.delta_wheel_y = mouse_wheel_state.y - last_mouse_wheel_state.y;
-
-        last_mouse_wheel_state = mouse_wheel_state;
-        next_state.button = mouse_button_state;
-    }
-
-    shared_memory.mouse_lifo.WriteNextEntry(next_state);
-}
-
-} // namespace Service::HID
diff --git a/src/core/hle/service/hid/controllers/mouse.h b/src/core/hle/service/hid/controllers/mouse.h
deleted file mode 100644
index cefad956c..000000000
--- a/src/core/hle/service/hid/controllers/mouse.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "core/hle/service/hid/controllers/controller_base.h"
-
-namespace Core::HID {
-class EmulatedDevices;
-struct MouseState;
-struct AnalogStickState;
-} // namespace Core::HID
-
-namespace Service::HID {
-class Mouse final : public ControllerBase {
-public:
-    explicit Mouse(Core::HID::HIDCore& hid_core_);
-    ~Mouse() override;
-
-    // Called when the controller is initialized
-    void OnInit() override;
-
-    // When the controller is released
-    void OnRelease() override;
-
-    // When the controller is requesting an update for the shared memory
-    void OnUpdate(const Core::Timing::CoreTiming& core_timing) override;
-
-private:
-    Core::HID::MouseState next_state{};
-    Core::HID::AnalogStickState last_mouse_wheel_state{};
-    Core::HID::EmulatedDevices* emulated_devices = nullptr;
-};
-} // namespace Service::HID
diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp
deleted file mode 100644
index 17cd0d7a0..000000000
--- a/src/core/hle/service/hid/controllers/npad.cpp
+++ /dev/null
@@ -1,1342 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include <algorithm>
-#include <array>
-#include <chrono>
-#include <cstring>
-
-#include "common/assert.h"
-#include "common/bit_field.h"
-#include "common/common_types.h"
-#include "common/logging/log.h"
-#include "common/settings.h"
-#include "core/core_timing.h"
-#include "core/hid/emulated_controller.h"
-#include "core/hid/hid_core.h"
-#include "core/hle/kernel/k_event.h"
-#include "core/hle/kernel/k_readable_event.h"
-#include "core/hle/service/hid/controllers/applet_resource.h"
-#include "core/hle/service/hid/controllers/npad.h"
-#include "core/hle/service/hid/controllers/types/shared_memory_format.h"
-#include "core/hle/service/hid/errors.h"
-#include "core/hle/service/hid/hid_util.h"
-#include "core/hle/service/kernel_helpers.h"
-
-namespace Service::HID {
-
-NPad::NPad(Core::HID::HIDCore& hid_core_, KernelHelpers::ServiceContext& service_context_)
-    : hid_core{hid_core_}, service_context{service_context_}, npad_resource{service_context} {
-    for (std::size_t aruid_index = 0; aruid_index < AruidIndexMax; ++aruid_index) {
-        for (std::size_t i = 0; i < controller_data[aruid_index].size(); ++i) {
-            auto& controller = controller_data[aruid_index][i];
-            controller.device = hid_core.GetEmulatedControllerByIndex(i);
-            controller.vibration[Core::HID::EmulatedDeviceIndex::LeftIndex].latest_vibration_value =
-                Core::HID::DEFAULT_VIBRATION_VALUE;
-            controller.vibration[Core::HID::EmulatedDeviceIndex::RightIndex]
-                .latest_vibration_value = Core::HID::DEFAULT_VIBRATION_VALUE;
-            Core::HID::ControllerUpdateCallback engine_callback{
-                .on_change =
-                    [this, i](Core::HID::ControllerTriggerType type) { ControllerUpdate(type, i); },
-                .is_npad_service = true,
-            };
-            controller.callback_key = controller.device->SetCallback(engine_callback);
-        }
-    }
-}
-
-NPad::~NPad() {
-    for (std::size_t aruid_index = 0; aruid_index < AruidIndexMax; ++aruid_index) {
-        for (std::size_t i = 0; i < controller_data[aruid_index].size(); ++i) {
-            auto& controller = controller_data[aruid_index][i];
-            controller.device->DeleteCallback(controller.callback_key);
-        }
-    }
-}
-
-Result NPad::Activate() {
-    if (ref_counter == std::numeric_limits<s32>::max() - 1) {
-        return ResultNpadResourceOverflow;
-    }
-
-    if (ref_counter == 0) {
-        std::scoped_lock lock{mutex};
-
-        // TODO: Activate handlers and AbstractedPad
-    }
-
-    ref_counter++;
-    return ResultSuccess;
-}
-
-Result NPad::Activate(u64 aruid) {
-    std::scoped_lock lock{mutex};
-    std::scoped_lock shared_lock{*applet_resource_holder.shared_mutex};
-
-    auto* data = applet_resource_holder.applet_resource->GetAruidData(aruid);
-    const auto aruid_index = applet_resource_holder.applet_resource->GetIndexFromAruid(aruid);
-
-    if (data == nullptr || !data->flag.is_assigned) {
-        return ResultSuccess;
-    }
-
-    for (std::size_t i = 0; i < controller_data[aruid_index].size(); ++i) {
-        auto& controller = controller_data[aruid_index][i];
-        controller.shared_memory = &data->shared_memory_format->npad.npad_entry[i].internal_state;
-    }
-
-    // Prefill controller buffers
-    for (auto& controller : controller_data[aruid_index]) {
-        auto* npad = controller.shared_memory;
-        npad->fullkey_color = {
-            .attribute = ColorAttribute::NoController,
-            .fullkey = {},
-        };
-        npad->joycon_color = {
-            .attribute = ColorAttribute::NoController,
-            .left = {},
-            .right = {},
-        };
-        // HW seems to initialize the first 19 entries
-        for (std::size_t i = 0; i < 19; ++i) {
-            WriteEmptyEntry(npad);
-        }
-    }
-
-    return ResultSuccess;
-}
-
-Result NPad::ActivateNpadResource() {
-    return npad_resource.Activate();
-}
-
-Result NPad::ActivateNpadResource(u64 aruid) {
-    return npad_resource.Activate(aruid);
-}
-
-void NPad::ControllerUpdate(Core::HID::ControllerTriggerType type, std::size_t controller_idx) {
-    if (type == Core::HID::ControllerTriggerType::All) {
-        ControllerUpdate(Core::HID::ControllerTriggerType::Connected, controller_idx);
-        ControllerUpdate(Core::HID::ControllerTriggerType::Battery, controller_idx);
-        return;
-    }
-
-    for (std::size_t aruid_index = 0; aruid_index < AruidIndexMax; aruid_index++) {
-        if (controller_idx >= controller_data[aruid_index].size()) {
-            return;
-        }
-
-        auto* data = applet_resource_holder.applet_resource->GetAruidDataByIndex(aruid_index);
-
-        if (!data->flag.is_assigned) {
-            continue;
-        }
-
-        auto& controller = controller_data[aruid_index][controller_idx];
-        const auto is_connected = controller.device->IsConnected();
-        const auto npad_type = controller.device->GetNpadStyleIndex();
-        const auto npad_id = controller.device->GetNpadIdType();
-        switch (type) {
-        case Core::HID::ControllerTriggerType::Connected:
-        case Core::HID::ControllerTriggerType::Disconnected:
-            if (is_connected == controller.is_connected) {
-                return;
-            }
-            UpdateControllerAt(data->aruid, npad_type, npad_id, is_connected);
-            break;
-        case Core::HID::ControllerTriggerType::Battery: {
-            if (!controller.device->IsConnected()) {
-                return;
-            }
-            auto* shared_memory = controller.shared_memory;
-            const auto& battery_level = controller.device->GetBattery();
-            shared_memory->battery_level_dual = battery_level.dual.battery_level;
-            shared_memory->battery_level_left = battery_level.left.battery_level;
-            shared_memory->battery_level_right = battery_level.right.battery_level;
-            break;
-        }
-        default:
-            break;
-        }
-    }
-}
-
-void NPad::InitNewlyAddedController(u64 aruid, Core::HID::NpadIdType npad_id) {
-    auto& controller = GetControllerFromNpadIdType(aruid, npad_id);
-    if (!npad_resource.IsControllerSupported(aruid, controller.device->GetNpadStyleIndex())) {
-        return;
-    }
-    LOG_DEBUG(Service_HID, "Npad connected {}", npad_id);
-    const auto controller_type = controller.device->GetNpadStyleIndex();
-    const auto& body_colors = controller.device->GetColors();
-    const auto& battery_level = controller.device->GetBattery();
-    auto* shared_memory = controller.shared_memory;
-    if (controller_type == Core::HID::NpadStyleIndex::None) {
-        npad_resource.SignalStyleSetUpdateEvent(aruid, npad_id);
-        return;
-    }
-
-    // Reset memory values
-    shared_memory->style_tag.raw = Core::HID::NpadStyleSet::None;
-    shared_memory->device_type.raw = 0;
-    shared_memory->system_properties.raw = 0;
-    shared_memory->joycon_color.attribute = ColorAttribute::NoController;
-    shared_memory->joycon_color.attribute = ColorAttribute::NoController;
-    shared_memory->fullkey_color = {};
-    shared_memory->joycon_color.left = {};
-    shared_memory->joycon_color.right = {};
-    shared_memory->battery_level_dual = {};
-    shared_memory->battery_level_left = {};
-    shared_memory->battery_level_right = {};
-
-    switch (controller_type) {
-    case Core::HID::NpadStyleIndex::None:
-        ASSERT(false);
-        break;
-    case Core::HID::NpadStyleIndex::ProController:
-        shared_memory->fullkey_color.attribute = ColorAttribute::Ok;
-        shared_memory->fullkey_color.fullkey = body_colors.fullkey;
-        shared_memory->battery_level_dual = battery_level.dual.battery_level;
-        shared_memory->style_tag.fullkey.Assign(1);
-        shared_memory->device_type.fullkey.Assign(1);
-        shared_memory->system_properties.is_vertical.Assign(1);
-        shared_memory->system_properties.use_plus.Assign(1);
-        shared_memory->system_properties.use_minus.Assign(1);
-        shared_memory->system_properties.is_charging_joy_dual.Assign(
-            battery_level.dual.is_charging);
-        shared_memory->applet_footer_type = AppletFooterUiType::SwitchProController;
-        shared_memory->sixaxis_fullkey_properties.is_newly_assigned.Assign(1);
-        break;
-    case Core::HID::NpadStyleIndex::Handheld:
-        shared_memory->fullkey_color.attribute = ColorAttribute::Ok;
-        shared_memory->joycon_color.attribute = ColorAttribute::Ok;
-        shared_memory->fullkey_color.fullkey = body_colors.fullkey;
-        shared_memory->joycon_color.left = body_colors.left;
-        shared_memory->joycon_color.right = body_colors.right;
-        shared_memory->style_tag.handheld.Assign(1);
-        shared_memory->device_type.handheld_left.Assign(1);
-        shared_memory->device_type.handheld_right.Assign(1);
-        shared_memory->system_properties.is_vertical.Assign(1);
-        shared_memory->system_properties.use_plus.Assign(1);
-        shared_memory->system_properties.use_minus.Assign(1);
-        shared_memory->system_properties.use_directional_buttons.Assign(1);
-        shared_memory->system_properties.is_charging_joy_dual.Assign(
-            battery_level.left.is_charging);
-        shared_memory->system_properties.is_charging_joy_left.Assign(
-            battery_level.left.is_charging);
-        shared_memory->system_properties.is_charging_joy_right.Assign(
-            battery_level.right.is_charging);
-        shared_memory->assignment_mode = NpadJoyAssignmentMode::Dual;
-        shared_memory->applet_footer_type = AppletFooterUiType::HandheldJoyConLeftJoyConRight;
-        shared_memory->sixaxis_handheld_properties.is_newly_assigned.Assign(1);
-        break;
-    case Core::HID::NpadStyleIndex::JoyconDual:
-        shared_memory->fullkey_color.attribute = ColorAttribute::Ok;
-        shared_memory->joycon_color.attribute = ColorAttribute::Ok;
-        shared_memory->style_tag.joycon_dual.Assign(1);
-        if (controller.is_dual_left_connected) {
-            shared_memory->joycon_color.left = body_colors.left;
-            shared_memory->battery_level_left = battery_level.left.battery_level;
-            shared_memory->device_type.joycon_left.Assign(1);
-            shared_memory->system_properties.use_minus.Assign(1);
-            shared_memory->system_properties.is_charging_joy_left.Assign(
-                battery_level.left.is_charging);
-            shared_memory->sixaxis_dual_left_properties.is_newly_assigned.Assign(1);
-        }
-        if (controller.is_dual_right_connected) {
-            shared_memory->joycon_color.right = body_colors.right;
-            shared_memory->battery_level_right = battery_level.right.battery_level;
-            shared_memory->device_type.joycon_right.Assign(1);
-            shared_memory->system_properties.use_plus.Assign(1);
-            shared_memory->system_properties.is_charging_joy_right.Assign(
-                battery_level.right.is_charging);
-            shared_memory->sixaxis_dual_right_properties.is_newly_assigned.Assign(1);
-        }
-        shared_memory->system_properties.use_directional_buttons.Assign(1);
-        shared_memory->system_properties.is_vertical.Assign(1);
-        shared_memory->assignment_mode = NpadJoyAssignmentMode::Dual;
-
-        if (controller.is_dual_left_connected && controller.is_dual_right_connected) {
-            shared_memory->applet_footer_type = AppletFooterUiType::JoyDual;
-            shared_memory->fullkey_color.fullkey = body_colors.left;
-            shared_memory->battery_level_dual = battery_level.left.battery_level;
-            shared_memory->system_properties.is_charging_joy_dual.Assign(
-                battery_level.left.is_charging);
-        } else if (controller.is_dual_left_connected) {
-            shared_memory->applet_footer_type = AppletFooterUiType::JoyDualLeftOnly;
-            shared_memory->fullkey_color.fullkey = body_colors.left;
-            shared_memory->battery_level_dual = battery_level.left.battery_level;
-            shared_memory->system_properties.is_charging_joy_dual.Assign(
-                battery_level.left.is_charging);
-        } else {
-            shared_memory->applet_footer_type = AppletFooterUiType::JoyDualRightOnly;
-            shared_memory->fullkey_color.fullkey = body_colors.right;
-            shared_memory->battery_level_dual = battery_level.right.battery_level;
-            shared_memory->system_properties.is_charging_joy_dual.Assign(
-                battery_level.right.is_charging);
-        }
-        break;
-    case Core::HID::NpadStyleIndex::JoyconLeft:
-        shared_memory->fullkey_color.attribute = ColorAttribute::Ok;
-        shared_memory->fullkey_color.fullkey = body_colors.left;
-        shared_memory->joycon_color.attribute = ColorAttribute::Ok;
-        shared_memory->joycon_color.left = body_colors.left;
-        shared_memory->battery_level_dual = battery_level.left.battery_level;
-        shared_memory->style_tag.joycon_left.Assign(1);
-        shared_memory->device_type.joycon_left.Assign(1);
-        shared_memory->system_properties.is_horizontal.Assign(1);
-        shared_memory->system_properties.use_minus.Assign(1);
-        shared_memory->system_properties.is_charging_joy_left.Assign(
-            battery_level.left.is_charging);
-        shared_memory->applet_footer_type = AppletFooterUiType::JoyLeftHorizontal;
-        shared_memory->sixaxis_left_properties.is_newly_assigned.Assign(1);
-        break;
-    case Core::HID::NpadStyleIndex::JoyconRight:
-        shared_memory->fullkey_color.attribute = ColorAttribute::Ok;
-        shared_memory->fullkey_color.fullkey = body_colors.right;
-        shared_memory->joycon_color.attribute = ColorAttribute::Ok;
-        shared_memory->joycon_color.right = body_colors.right;
-        shared_memory->battery_level_right = battery_level.right.battery_level;
-        shared_memory->style_tag.joycon_right.Assign(1);
-        shared_memory->device_type.joycon_right.Assign(1);
-        shared_memory->system_properties.is_horizontal.Assign(1);
-        shared_memory->system_properties.use_plus.Assign(1);
-        shared_memory->system_properties.is_charging_joy_right.Assign(
-            battery_level.right.is_charging);
-        shared_memory->applet_footer_type = AppletFooterUiType::JoyRightHorizontal;
-        shared_memory->sixaxis_right_properties.is_newly_assigned.Assign(1);
-        break;
-    case Core::HID::NpadStyleIndex::GameCube:
-        shared_memory->style_tag.gamecube.Assign(1);
-        shared_memory->device_type.fullkey.Assign(1);
-        shared_memory->system_properties.is_vertical.Assign(1);
-        shared_memory->system_properties.use_plus.Assign(1);
-        break;
-    case Core::HID::NpadStyleIndex::Pokeball:
-        shared_memory->style_tag.palma.Assign(1);
-        shared_memory->device_type.palma.Assign(1);
-        shared_memory->sixaxis_fullkey_properties.is_newly_assigned.Assign(1);
-        break;
-    case Core::HID::NpadStyleIndex::NES:
-        shared_memory->style_tag.lark.Assign(1);
-        shared_memory->device_type.fullkey.Assign(1);
-        break;
-    case Core::HID::NpadStyleIndex::SNES:
-        shared_memory->style_tag.lucia.Assign(1);
-        shared_memory->device_type.fullkey.Assign(1);
-        shared_memory->applet_footer_type = AppletFooterUiType::Lucia;
-        break;
-    case Core::HID::NpadStyleIndex::N64:
-        shared_memory->style_tag.lagoon.Assign(1);
-        shared_memory->device_type.fullkey.Assign(1);
-        shared_memory->applet_footer_type = AppletFooterUiType::Lagon;
-        break;
-    case Core::HID::NpadStyleIndex::SegaGenesis:
-        shared_memory->style_tag.lager.Assign(1);
-        shared_memory->device_type.fullkey.Assign(1);
-        break;
-    default:
-        break;
-    }
-
-    controller.is_connected = true;
-    controller.device->Connect();
-    controller.device->SetLedPattern();
-    if (controller_type == Core::HID::NpadStyleIndex::JoyconDual) {
-        if (controller.is_dual_left_connected) {
-            controller.device->SetPollingMode(Core::HID::EmulatedDeviceIndex::LeftIndex,
-                                              Common::Input::PollingMode::Active);
-        }
-        if (controller.is_dual_right_connected) {
-            controller.device->SetPollingMode(Core::HID::EmulatedDeviceIndex::RightIndex,
-                                              Common::Input::PollingMode::Active);
-        }
-    } else {
-        controller.device->SetPollingMode(Core::HID::EmulatedDeviceIndex::AllDevices,
-                                          Common::Input::PollingMode::Active);
-    }
-
-    npad_resource.SignalStyleSetUpdateEvent(aruid, npad_id);
-    WriteEmptyEntry(controller.shared_memory);
-    hid_core.SetLastActiveController(npad_id);
-}
-
-void NPad::WriteEmptyEntry(NpadInternalState* npad) {
-    NPadGenericState dummy_pad_state{};
-    NpadGcTriggerState dummy_gc_state{};
-    dummy_pad_state.sampling_number = npad->fullkey_lifo.ReadCurrentEntry().sampling_number + 1;
-    npad->fullkey_lifo.WriteNextEntry(dummy_pad_state);
-    dummy_pad_state.sampling_number = npad->handheld_lifo.ReadCurrentEntry().sampling_number + 1;
-    npad->handheld_lifo.WriteNextEntry(dummy_pad_state);
-    dummy_pad_state.sampling_number = npad->joy_dual_lifo.ReadCurrentEntry().sampling_number + 1;
-    npad->joy_dual_lifo.WriteNextEntry(dummy_pad_state);
-    dummy_pad_state.sampling_number = npad->joy_left_lifo.ReadCurrentEntry().sampling_number + 1;
-    npad->joy_left_lifo.WriteNextEntry(dummy_pad_state);
-    dummy_pad_state.sampling_number = npad->joy_right_lifo.ReadCurrentEntry().sampling_number + 1;
-    npad->joy_right_lifo.WriteNextEntry(dummy_pad_state);
-    dummy_pad_state.sampling_number = npad->palma_lifo.ReadCurrentEntry().sampling_number + 1;
-    npad->palma_lifo.WriteNextEntry(dummy_pad_state);
-    dummy_pad_state.sampling_number = npad->system_ext_lifo.ReadCurrentEntry().sampling_number + 1;
-    npad->system_ext_lifo.WriteNextEntry(dummy_pad_state);
-    dummy_gc_state.sampling_number = npad->gc_trigger_lifo.ReadCurrentEntry().sampling_number + 1;
-    npad->gc_trigger_lifo.WriteNextEntry(dummy_gc_state);
-}
-
-void NPad::RequestPadStateUpdate(u64 aruid, Core::HID::NpadIdType npad_id) {
-    std::scoped_lock lock{*applet_resource_holder.shared_mutex};
-    auto& controller = GetControllerFromNpadIdType(aruid, npad_id);
-    const auto controller_type = controller.device->GetNpadStyleIndex();
-
-    if (!controller.device->IsConnected() && controller.is_connected) {
-        DisconnectNpad(aruid, npad_id);
-        return;
-    }
-    if (!controller.device->IsConnected()) {
-        return;
-    }
-    if (controller.device->IsConnected() && !controller.is_connected) {
-        InitNewlyAddedController(aruid, npad_id);
-    }
-
-    // This function is unique to yuzu for the turbo buttons and motion to work properly
-    controller.device->StatusUpdate();
-
-    auto& pad_entry = controller.npad_pad_state;
-    auto& trigger_entry = controller.npad_trigger_state;
-    const auto button_state = controller.device->GetNpadButtons();
-    const auto stick_state = controller.device->GetSticks();
-
-    using btn = Core::HID::NpadButton;
-    pad_entry.npad_buttons.raw = btn::None;
-    if (controller_type != Core::HID::NpadStyleIndex::JoyconLeft) {
-        constexpr btn right_button_mask = btn::A | btn::B | btn::X | btn::Y | btn::StickR | btn::R |
-                                          btn::ZR | btn::Plus | btn::StickRLeft | btn::StickRUp |
-                                          btn::StickRRight | btn::StickRDown;
-        pad_entry.npad_buttons.raw = button_state.raw & right_button_mask;
-        pad_entry.r_stick = stick_state.right;
-    }
-
-    if (controller_type != Core::HID::NpadStyleIndex::JoyconRight) {
-        constexpr btn left_button_mask =
-            btn::Left | btn::Up | btn::Right | btn::Down | btn::StickL | btn::L | btn::ZL |
-            btn::Minus | btn::StickLLeft | btn::StickLUp | btn::StickLRight | btn::StickLDown;
-        pad_entry.npad_buttons.raw |= button_state.raw & left_button_mask;
-        pad_entry.l_stick = stick_state.left;
-    }
-
-    if (controller_type == Core::HID::NpadStyleIndex::JoyconLeft ||
-        controller_type == Core::HID::NpadStyleIndex::JoyconDual) {
-        pad_entry.npad_buttons.left_sl.Assign(button_state.left_sl);
-        pad_entry.npad_buttons.left_sr.Assign(button_state.left_sr);
-    }
-
-    if (controller_type == Core::HID::NpadStyleIndex::JoyconRight ||
-        controller_type == Core::HID::NpadStyleIndex::JoyconDual) {
-        pad_entry.npad_buttons.right_sl.Assign(button_state.right_sl);
-        pad_entry.npad_buttons.right_sr.Assign(button_state.right_sr);
-    }
-
-    if (controller_type == Core::HID::NpadStyleIndex::GameCube) {
-        const auto& trigger_state = controller.device->GetTriggers();
-        trigger_entry.l_analog = trigger_state.left;
-        trigger_entry.r_analog = trigger_state.right;
-        pad_entry.npad_buttons.zl.Assign(false);
-        pad_entry.npad_buttons.zr.Assign(button_state.r);
-        pad_entry.npad_buttons.l.Assign(button_state.zl);
-        pad_entry.npad_buttons.r.Assign(button_state.zr);
-    }
-
-    if (pad_entry.npad_buttons.raw != Core::HID::NpadButton::None) {
-        hid_core.SetLastActiveController(npad_id);
-    }
-}
-
-void NPad::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
-    if (ref_counter == 0) {
-        return;
-    }
-
-    std::scoped_lock lock{*applet_resource_holder.shared_mutex};
-    for (std::size_t aruid_index = 0; aruid_index < AruidIndexMax; ++aruid_index) {
-        const auto* data = applet_resource_holder.applet_resource->GetAruidDataByIndex(aruid_index);
-        const auto aruid = data->aruid;
-
-        if (!data->flag.is_assigned) {
-            continue;
-        }
-
-        for (std::size_t i = 0; i < controller_data[aruid_index].size(); ++i) {
-            auto& controller = controller_data[aruid_index][i];
-            controller.shared_memory =
-                &data->shared_memory_format->npad.npad_entry[i].internal_state;
-            auto* npad = controller.shared_memory;
-
-            const auto& controller_type = controller.device->GetNpadStyleIndex();
-
-            if (controller_type == Core::HID::NpadStyleIndex::None ||
-                !controller.device->IsConnected()) {
-                continue;
-            }
-
-            RequestPadStateUpdate(aruid, controller.device->GetNpadIdType());
-            auto& pad_state = controller.npad_pad_state;
-            auto& libnx_state = controller.npad_libnx_state;
-            auto& trigger_state = controller.npad_trigger_state;
-
-            // LibNX exclusively uses this section, so we always update it since LibNX doesn't
-            // activate any controllers.
-            libnx_state.connection_status.raw = 0;
-            libnx_state.connection_status.is_connected.Assign(1);
-            switch (controller_type) {
-            case Core::HID::NpadStyleIndex::None:
-                ASSERT(false);
-                break;
-            case Core::HID::NpadStyleIndex::ProController:
-            case Core::HID::NpadStyleIndex::NES:
-            case Core::HID::NpadStyleIndex::SNES:
-            case Core::HID::NpadStyleIndex::N64:
-            case Core::HID::NpadStyleIndex::SegaGenesis:
-                pad_state.connection_status.raw = 0;
-                pad_state.connection_status.is_connected.Assign(1);
-                pad_state.connection_status.is_wired.Assign(1);
-
-                libnx_state.connection_status.is_wired.Assign(1);
-                pad_state.sampling_number =
-                    npad->fullkey_lifo.ReadCurrentEntry().state.sampling_number + 1;
-                npad->fullkey_lifo.WriteNextEntry(pad_state);
-                break;
-            case Core::HID::NpadStyleIndex::Handheld:
-                pad_state.connection_status.raw = 0;
-                pad_state.connection_status.is_connected.Assign(1);
-                pad_state.connection_status.is_wired.Assign(1);
-                pad_state.connection_status.is_left_connected.Assign(1);
-                pad_state.connection_status.is_right_connected.Assign(1);
-                pad_state.connection_status.is_left_wired.Assign(1);
-                pad_state.connection_status.is_right_wired.Assign(1);
-
-                libnx_state.connection_status.is_wired.Assign(1);
-                libnx_state.connection_status.is_left_connected.Assign(1);
-                libnx_state.connection_status.is_right_connected.Assign(1);
-                libnx_state.connection_status.is_left_wired.Assign(1);
-                libnx_state.connection_status.is_right_wired.Assign(1);
-                pad_state.sampling_number =
-                    npad->handheld_lifo.ReadCurrentEntry().state.sampling_number + 1;
-                npad->handheld_lifo.WriteNextEntry(pad_state);
-                break;
-            case Core::HID::NpadStyleIndex::JoyconDual:
-                pad_state.connection_status.raw = 0;
-                pad_state.connection_status.is_connected.Assign(1);
-                if (controller.is_dual_left_connected) {
-                    pad_state.connection_status.is_left_connected.Assign(1);
-                    libnx_state.connection_status.is_left_connected.Assign(1);
-                }
-                if (controller.is_dual_right_connected) {
-                    pad_state.connection_status.is_right_connected.Assign(1);
-                    libnx_state.connection_status.is_right_connected.Assign(1);
-                }
-
-                pad_state.sampling_number =
-                    npad->joy_dual_lifo.ReadCurrentEntry().state.sampling_number + 1;
-                npad->joy_dual_lifo.WriteNextEntry(pad_state);
-                break;
-            case Core::HID::NpadStyleIndex::JoyconLeft:
-                pad_state.connection_status.raw = 0;
-                pad_state.connection_status.is_connected.Assign(1);
-                pad_state.connection_status.is_left_connected.Assign(1);
-
-                libnx_state.connection_status.is_left_connected.Assign(1);
-                pad_state.sampling_number =
-                    npad->joy_left_lifo.ReadCurrentEntry().state.sampling_number + 1;
-                npad->joy_left_lifo.WriteNextEntry(pad_state);
-                break;
-            case Core::HID::NpadStyleIndex::JoyconRight:
-                pad_state.connection_status.raw = 0;
-                pad_state.connection_status.is_connected.Assign(1);
-                pad_state.connection_status.is_right_connected.Assign(1);
-
-                libnx_state.connection_status.is_right_connected.Assign(1);
-                pad_state.sampling_number =
-                    npad->joy_right_lifo.ReadCurrentEntry().state.sampling_number + 1;
-                npad->joy_right_lifo.WriteNextEntry(pad_state);
-                break;
-            case Core::HID::NpadStyleIndex::GameCube:
-                pad_state.connection_status.raw = 0;
-                pad_state.connection_status.is_connected.Assign(1);
-                pad_state.connection_status.is_wired.Assign(1);
-
-                libnx_state.connection_status.is_wired.Assign(1);
-                pad_state.sampling_number =
-                    npad->fullkey_lifo.ReadCurrentEntry().state.sampling_number + 1;
-                trigger_state.sampling_number =
-                    npad->gc_trigger_lifo.ReadCurrentEntry().state.sampling_number + 1;
-                npad->fullkey_lifo.WriteNextEntry(pad_state);
-                npad->gc_trigger_lifo.WriteNextEntry(trigger_state);
-                break;
-            case Core::HID::NpadStyleIndex::Pokeball:
-                pad_state.connection_status.raw = 0;
-                pad_state.connection_status.is_connected.Assign(1);
-                pad_state.sampling_number =
-                    npad->palma_lifo.ReadCurrentEntry().state.sampling_number + 1;
-                npad->palma_lifo.WriteNextEntry(pad_state);
-                break;
-            default:
-                break;
-            }
-
-            libnx_state.npad_buttons.raw = pad_state.npad_buttons.raw;
-            libnx_state.l_stick = pad_state.l_stick;
-            libnx_state.r_stick = pad_state.r_stick;
-            npad->system_ext_lifo.WriteNextEntry(pad_state);
-
-            press_state |= static_cast<u64>(pad_state.npad_buttons.raw);
-        }
-    }
-}
-
-Result NPad::SetSupportedNpadStyleSet(u64 aruid, Core::HID::NpadStyleSet supported_style_set) {
-    std::scoped_lock lock{mutex};
-    hid_core.SetSupportedStyleTag({supported_style_set});
-    const Result result = npad_resource.SetSupportedNpadStyleSet(aruid, supported_style_set);
-    if (result.IsSuccess()) {
-        OnUpdate({});
-    }
-    return result;
-}
-
-Result NPad::GetSupportedNpadStyleSet(u64 aruid,
-                                      Core::HID::NpadStyleSet& out_supported_style_set) const {
-    std::scoped_lock lock{mutex};
-    const Result result = npad_resource.GetSupportedNpadStyleSet(out_supported_style_set, aruid);
-
-    if (result == ResultUndefinedStyleset) {
-        out_supported_style_set = Core::HID::NpadStyleSet::None;
-        return ResultSuccess;
-    }
-
-    return result;
-}
-
-Result NPad::GetMaskedSupportedNpadStyleSet(
-    u64 aruid, Core::HID::NpadStyleSet& out_supported_style_set) const {
-    std::scoped_lock lock{mutex};
-    const Result result =
-        npad_resource.GetMaskedSupportedNpadStyleSet(out_supported_style_set, aruid);
-
-    if (result == ResultUndefinedStyleset) {
-        out_supported_style_set = Core::HID::NpadStyleSet::None;
-        return ResultSuccess;
-    }
-
-    return result;
-}
-
-Result NPad::SetSupportedNpadIdType(u64 aruid,
-                                    std::span<const Core::HID::NpadIdType> supported_npad_list) {
-    std::scoped_lock lock{mutex};
-    if (supported_npad_list.size() > MaxSupportedNpadIdTypes) {
-        return ResultInvalidArraySize;
-    }
-
-    Result result = npad_resource.SetSupportedNpadIdType(aruid, supported_npad_list);
-
-    if (result.IsSuccess()) {
-        OnUpdate({});
-    }
-
-    return result;
-}
-
-Result NPad::SetNpadJoyHoldType(u64 aruid, NpadJoyHoldType hold_type) {
-    std::scoped_lock lock{mutex};
-    return npad_resource.SetNpadJoyHoldType(aruid, hold_type);
-}
-
-Result NPad::GetNpadJoyHoldType(u64 aruid, NpadJoyHoldType& out_hold_type) const {
-    std::scoped_lock lock{mutex};
-    return npad_resource.GetNpadJoyHoldType(out_hold_type, aruid);
-}
-
-Result NPad::SetNpadHandheldActivationMode(u64 aruid, NpadHandheldActivationMode mode) {
-    std::scoped_lock lock{mutex};
-    Result result = npad_resource.SetNpadHandheldActivationMode(aruid, mode);
-    if (result.IsSuccess()) {
-        OnUpdate({});
-    }
-    return result;
-}
-
-Result NPad::GetNpadHandheldActivationMode(u64 aruid, NpadHandheldActivationMode& out_mode) const {
-    std::scoped_lock lock{mutex};
-    return npad_resource.GetNpadHandheldActivationMode(out_mode, aruid);
-}
-
-bool NPad::SetNpadMode(u64 aruid, Core::HID::NpadIdType& new_npad_id, Core::HID::NpadIdType npad_id,
-                       NpadJoyDeviceType npad_device_type, NpadJoyAssignmentMode assignment_mode) {
-    if (!IsNpadIdValid(npad_id)) {
-        LOG_ERROR(Service_HID, "Invalid NpadIdType npad_id:{}", npad_id);
-        return false;
-    }
-
-    auto& controller = GetControllerFromNpadIdType(aruid, npad_id);
-    if (controller.shared_memory->assignment_mode != assignment_mode) {
-        controller.shared_memory->assignment_mode = assignment_mode;
-    }
-
-    if (!controller.device->IsConnected()) {
-        return false;
-    }
-
-    if (assignment_mode == NpadJoyAssignmentMode::Dual) {
-        if (controller.device->GetNpadStyleIndex() == Core::HID::NpadStyleIndex::JoyconLeft) {
-            DisconnectNpad(aruid, npad_id);
-            controller.is_dual_left_connected = true;
-            controller.is_dual_right_connected = false;
-            UpdateControllerAt(aruid, Core::HID::NpadStyleIndex::JoyconDual, npad_id, true);
-            return false;
-        }
-        if (controller.device->GetNpadStyleIndex() == Core::HID::NpadStyleIndex::JoyconRight) {
-            DisconnectNpad(aruid, npad_id);
-            controller.is_dual_left_connected = false;
-            controller.is_dual_right_connected = true;
-            UpdateControllerAt(aruid, Core::HID::NpadStyleIndex::JoyconDual, npad_id, true);
-            return false;
-        }
-        return false;
-    }
-
-    // This is for NpadJoyAssignmentMode::Single
-
-    // Only JoyconDual get affected by this function
-    if (controller.device->GetNpadStyleIndex() != Core::HID::NpadStyleIndex::JoyconDual) {
-        return false;
-    }
-
-    if (controller.is_dual_left_connected && !controller.is_dual_right_connected) {
-        DisconnectNpad(aruid, npad_id);
-        UpdateControllerAt(aruid, Core::HID::NpadStyleIndex::JoyconLeft, npad_id, true);
-        return false;
-    }
-    if (!controller.is_dual_left_connected && controller.is_dual_right_connected) {
-        DisconnectNpad(aruid, npad_id);
-        UpdateControllerAt(aruid, Core::HID::NpadStyleIndex::JoyconRight, npad_id, true);
-        return false;
-    }
-
-    // We have two controllers connected to the same npad_id we need to split them
-    new_npad_id = hid_core.GetFirstDisconnectedNpadId();
-    auto& controller_2 = GetControllerFromNpadIdType(aruid, new_npad_id);
-    DisconnectNpad(aruid, npad_id);
-    if (npad_device_type == NpadJoyDeviceType::Left) {
-        UpdateControllerAt(aruid, Core::HID::NpadStyleIndex::JoyconLeft, npad_id, true);
-        controller_2.is_dual_left_connected = false;
-        controller_2.is_dual_right_connected = true;
-        UpdateControllerAt(aruid, Core::HID::NpadStyleIndex::JoyconDual, new_npad_id, true);
-    } else {
-        UpdateControllerAt(aruid, Core::HID::NpadStyleIndex::JoyconRight, npad_id, true);
-        controller_2.is_dual_left_connected = true;
-        controller_2.is_dual_right_connected = false;
-        UpdateControllerAt(aruid, Core::HID::NpadStyleIndex::JoyconDual, new_npad_id, true);
-    }
-    return true;
-}
-
-bool NPad::VibrateControllerAtIndex(u64 aruid, Core::HID::NpadIdType npad_id,
-                                    std::size_t device_index,
-                                    const Core::HID::VibrationValue& vibration_value) {
-    auto& controller = GetControllerFromNpadIdType(aruid, npad_id);
-    if (!controller.device->IsConnected()) {
-        return false;
-    }
-
-    if (!controller.device->IsVibrationEnabled(device_index)) {
-        if (controller.vibration[device_index].latest_vibration_value.low_amplitude != 0.0f ||
-            controller.vibration[device_index].latest_vibration_value.high_amplitude != 0.0f) {
-            // Send an empty vibration to stop any vibrations.
-            Core::HID::VibrationValue vibration{0.0f, 160.0f, 0.0f, 320.0f};
-            controller.device->SetVibration(device_index, vibration);
-            // Then reset the vibration value to its default value.
-            controller.vibration[device_index].latest_vibration_value =
-                Core::HID::DEFAULT_VIBRATION_VALUE;
-        }
-
-        return false;
-    }
-
-    if (!Settings::values.enable_accurate_vibrations.GetValue()) {
-        using std::chrono::duration_cast;
-        using std::chrono::milliseconds;
-        using std::chrono::steady_clock;
-
-        const auto now = steady_clock::now();
-
-        // Filter out non-zero vibrations that are within 15ms of each other.
-        if ((vibration_value.low_amplitude != 0.0f || vibration_value.high_amplitude != 0.0f) &&
-            duration_cast<milliseconds>(
-                now - controller.vibration[device_index].last_vibration_timepoint) <
-                milliseconds(15)) {
-            return false;
-        }
-
-        controller.vibration[device_index].last_vibration_timepoint = now;
-    }
-
-    Core::HID::VibrationValue vibration{
-        vibration_value.low_amplitude, vibration_value.low_frequency,
-        vibration_value.high_amplitude, vibration_value.high_frequency};
-    return controller.device->SetVibration(device_index, vibration);
-}
-
-void NPad::VibrateController(u64 aruid,
-                             const Core::HID::VibrationDeviceHandle& vibration_device_handle,
-                             const Core::HID::VibrationValue& vibration_value) {
-    if (IsVibrationHandleValid(vibration_device_handle).IsError()) {
-        return;
-    }
-
-    if (!Settings::values.vibration_enabled.GetValue() && !permit_vibration_session_enabled) {
-        return;
-    }
-
-    auto& controller = GetControllerFromHandle(aruid, vibration_device_handle);
-    const auto device_index = static_cast<std::size_t>(vibration_device_handle.device_index);
-
-    if (!controller.vibration[device_index].device_mounted || !controller.device->IsConnected()) {
-        return;
-    }
-
-    if (vibration_device_handle.device_index == Core::HID::DeviceIndex::None) {
-        ASSERT_MSG(false, "DeviceIndex should never be None!");
-        return;
-    }
-
-    // Some games try to send mismatched parameters in the device handle, block these.
-    if ((controller.device->GetNpadStyleIndex() == Core::HID::NpadStyleIndex::JoyconLeft &&
-         (vibration_device_handle.npad_type == Core::HID::NpadStyleIndex::JoyconRight ||
-          vibration_device_handle.device_index == Core::HID::DeviceIndex::Right)) ||
-        (controller.device->GetNpadStyleIndex() == Core::HID::NpadStyleIndex::JoyconRight &&
-         (vibration_device_handle.npad_type == Core::HID::NpadStyleIndex::JoyconLeft ||
-          vibration_device_handle.device_index == Core::HID::DeviceIndex::Left))) {
-        return;
-    }
-
-    // Filter out vibrations with equivalent values to reduce unnecessary state changes.
-    if (vibration_value.low_amplitude ==
-            controller.vibration[device_index].latest_vibration_value.low_amplitude &&
-        vibration_value.high_amplitude ==
-            controller.vibration[device_index].latest_vibration_value.high_amplitude) {
-        return;
-    }
-
-    if (VibrateControllerAtIndex(aruid, controller.device->GetNpadIdType(), device_index,
-                                 vibration_value)) {
-        controller.vibration[device_index].latest_vibration_value = vibration_value;
-    }
-}
-
-void NPad::VibrateControllers(
-    u64 aruid, std::span<const Core::HID::VibrationDeviceHandle> vibration_device_handles,
-    std::span<const Core::HID::VibrationValue> vibration_values) {
-    if (!Settings::values.vibration_enabled.GetValue() && !permit_vibration_session_enabled) {
-        return;
-    }
-
-    ASSERT_OR_EXECUTE_MSG(
-        vibration_device_handles.size() == vibration_values.size(), { return; },
-        "The amount of device handles does not match with the amount of vibration values,"
-        "this is undefined behavior!");
-
-    for (std::size_t i = 0; i < vibration_device_handles.size(); ++i) {
-        VibrateController(aruid, vibration_device_handles[i], vibration_values[i]);
-    }
-}
-
-Core::HID::VibrationValue NPad::GetLastVibration(
-    u64 aruid, const Core::HID::VibrationDeviceHandle& vibration_device_handle) const {
-    if (IsVibrationHandleValid(vibration_device_handle).IsError()) {
-        return {};
-    }
-
-    const auto& controller = GetControllerFromHandle(aruid, vibration_device_handle);
-    const auto device_index = static_cast<std::size_t>(vibration_device_handle.device_index);
-    return controller.vibration[device_index].latest_vibration_value;
-}
-
-void NPad::InitializeVibrationDevice(
-    const Core::HID::VibrationDeviceHandle& vibration_device_handle) {
-    if (IsVibrationHandleValid(vibration_device_handle).IsError()) {
-        return;
-    }
-
-    const auto aruid = applet_resource_holder.applet_resource->GetActiveAruid();
-    const auto npad_index = static_cast<Core::HID::NpadIdType>(vibration_device_handle.npad_id);
-    const auto device_index = static_cast<std::size_t>(vibration_device_handle.device_index);
-    InitializeVibrationDeviceAtIndex(aruid, npad_index, device_index);
-}
-
-void NPad::InitializeVibrationDeviceAtIndex(u64 aruid, Core::HID::NpadIdType npad_id,
-                                            std::size_t device_index) {
-    auto& controller = GetControllerFromNpadIdType(aruid, npad_id);
-    if (!Settings::values.vibration_enabled.GetValue()) {
-        controller.vibration[device_index].device_mounted = false;
-        return;
-    }
-
-    controller.vibration[device_index].device_mounted =
-        controller.device->IsVibrationEnabled(device_index);
-}
-
-void NPad::SetPermitVibrationSession(bool permit_vibration_session) {
-    permit_vibration_session_enabled = permit_vibration_session;
-}
-
-bool NPad::IsVibrationDeviceMounted(
-    u64 aruid, const Core::HID::VibrationDeviceHandle& vibration_device_handle) const {
-    if (IsVibrationHandleValid(vibration_device_handle).IsError()) {
-        return false;
-    }
-
-    const auto& controller = GetControllerFromHandle(aruid, vibration_device_handle);
-    const auto device_index = static_cast<std::size_t>(vibration_device_handle.device_index);
-    return controller.vibration[device_index].device_mounted;
-}
-
-Result NPad::AcquireNpadStyleSetUpdateEventHandle(u64 aruid, Kernel::KReadableEvent** out_event,
-                                                  Core::HID::NpadIdType npad_id) {
-    std::scoped_lock lock{mutex};
-    return npad_resource.AcquireNpadStyleSetUpdateEventHandle(aruid, out_event, npad_id);
-}
-
-void NPad::AddNewControllerAt(u64 aruid, Core::HID::NpadStyleIndex controller,
-                              Core::HID::NpadIdType npad_id) {
-    UpdateControllerAt(aruid, controller, npad_id, true);
-}
-
-void NPad::UpdateControllerAt(u64 aruid, Core::HID::NpadStyleIndex type,
-                              Core::HID::NpadIdType npad_id, bool connected) {
-    auto& controller = GetControllerFromNpadIdType(aruid, npad_id);
-    if (!connected) {
-        DisconnectNpad(aruid, npad_id);
-        return;
-    }
-
-    controller.device->SetNpadStyleIndex(type);
-    InitNewlyAddedController(aruid, npad_id);
-}
-
-Result NPad::DisconnectNpad(u64 aruid, Core::HID::NpadIdType npad_id) {
-    if (!IsNpadIdValid(npad_id)) {
-        LOG_ERROR(Service_HID, "Invalid NpadIdType npad_id:{}", npad_id);
-        return ResultInvalidNpadId;
-    }
-
-    LOG_DEBUG(Service_HID, "Npad disconnected {}", npad_id);
-    auto& controller = GetControllerFromNpadIdType(aruid, npad_id);
-    for (std::size_t device_idx = 0; device_idx < controller.vibration.size(); ++device_idx) {
-        // Send an empty vibration to stop any vibrations.
-        VibrateControllerAtIndex(aruid, npad_id, device_idx, {});
-        controller.vibration[device_idx].device_mounted = false;
-    }
-
-    auto* shared_memory = controller.shared_memory;
-    // Don't reset shared_memory->assignment_mode this value is persistent
-    shared_memory->style_tag.raw = Core::HID::NpadStyleSet::None; // Zero out
-    shared_memory->device_type.raw = 0;
-    shared_memory->system_properties.raw = 0;
-    shared_memory->button_properties.raw = 0;
-    shared_memory->sixaxis_fullkey_properties.raw = 0;
-    shared_memory->sixaxis_handheld_properties.raw = 0;
-    shared_memory->sixaxis_dual_left_properties.raw = 0;
-    shared_memory->sixaxis_dual_right_properties.raw = 0;
-    shared_memory->sixaxis_left_properties.raw = 0;
-    shared_memory->sixaxis_right_properties.raw = 0;
-    shared_memory->battery_level_dual = Core::HID::NpadBatteryLevel::Empty;
-    shared_memory->battery_level_left = Core::HID::NpadBatteryLevel::Empty;
-    shared_memory->battery_level_right = Core::HID::NpadBatteryLevel::Empty;
-    shared_memory->fullkey_color = {
-        .attribute = ColorAttribute::NoController,
-        .fullkey = {},
-    };
-    shared_memory->joycon_color = {
-        .attribute = ColorAttribute::NoController,
-        .left = {},
-        .right = {},
-    };
-    shared_memory->applet_footer_type = AppletFooterUiType::None;
-
-    controller.is_dual_left_connected = true;
-    controller.is_dual_right_connected = true;
-    controller.is_connected = false;
-    controller.device->Disconnect();
-    npad_resource.SignalStyleSetUpdateEvent(aruid, npad_id);
-    WriteEmptyEntry(shared_memory);
-    return ResultSuccess;
-}
-
-Result NPad::IsFirmwareUpdateAvailableForSixAxisSensor(
-    u64 aruid, const Core::HID::SixAxisSensorHandle& sixaxis_handle,
-    bool& is_firmware_available) const {
-    const auto is_valid = IsSixaxisHandleValid(sixaxis_handle);
-    if (is_valid.IsError()) {
-        LOG_ERROR(Service_HID, "Invalid handle, error_code={}", is_valid.raw);
-        return is_valid;
-    }
-
-    const auto& sixaxis_properties = GetSixaxisProperties(aruid, sixaxis_handle);
-    is_firmware_available = sixaxis_properties.is_firmware_update_available != 0;
-    return ResultSuccess;
-}
-
-Result NPad::ResetIsSixAxisSensorDeviceNewlyAssigned(
-    u64 aruid, const Core::HID::SixAxisSensorHandle& sixaxis_handle) {
-    const auto is_valid = IsSixaxisHandleValid(sixaxis_handle);
-    if (is_valid.IsError()) {
-        LOG_ERROR(Service_HID, "Invalid handle, error_code={}", is_valid.raw);
-        return is_valid;
-    }
-
-    auto& sixaxis_properties = GetSixaxisProperties(aruid, sixaxis_handle);
-    sixaxis_properties.is_newly_assigned.Assign(0);
-
-    return ResultSuccess;
-}
-
-Result NPad::MergeSingleJoyAsDualJoy(u64 aruid, Core::HID::NpadIdType npad_id_1,
-                                     Core::HID::NpadIdType npad_id_2) {
-    if (!IsNpadIdValid(npad_id_1) || !IsNpadIdValid(npad_id_2)) {
-        LOG_ERROR(Service_HID, "Invalid NpadIdType npad_id_1:{}, npad_id_2:{}", npad_id_1,
-                  npad_id_2);
-        return ResultInvalidNpadId;
-    }
-    auto& controller_1 = GetControllerFromNpadIdType(aruid, npad_id_1);
-    auto& controller_2 = GetControllerFromNpadIdType(aruid, npad_id_2);
-    auto controller_style_1 = controller_1.device->GetNpadStyleIndex();
-    auto controller_style_2 = controller_2.device->GetNpadStyleIndex();
-
-    // Simplify this code by converting dualjoycon with only a side connected to single joycons
-    if (controller_style_1 == Core::HID::NpadStyleIndex::JoyconDual) {
-        if (controller_1.is_dual_left_connected && !controller_1.is_dual_right_connected) {
-            controller_style_1 = Core::HID::NpadStyleIndex::JoyconLeft;
-        }
-        if (!controller_1.is_dual_left_connected && controller_1.is_dual_right_connected) {
-            controller_style_1 = Core::HID::NpadStyleIndex::JoyconRight;
-        }
-    }
-    if (controller_style_2 == Core::HID::NpadStyleIndex::JoyconDual) {
-        if (controller_2.is_dual_left_connected && !controller_2.is_dual_right_connected) {
-            controller_style_2 = Core::HID::NpadStyleIndex::JoyconLeft;
-        }
-        if (!controller_2.is_dual_left_connected && controller_2.is_dual_right_connected) {
-            controller_style_2 = Core::HID::NpadStyleIndex::JoyconRight;
-        }
-    }
-
-    // Invalid merge errors
-    if (controller_style_1 == Core::HID::NpadStyleIndex::JoyconDual ||
-        controller_style_2 == Core::HID::NpadStyleIndex::JoyconDual) {
-        return NpadIsDualJoycon;
-    }
-    if (controller_style_1 == Core::HID::NpadStyleIndex::JoyconLeft &&
-        controller_style_2 == Core::HID::NpadStyleIndex::JoyconLeft) {
-        return NpadIsSameType;
-    }
-    if (controller_style_1 == Core::HID::NpadStyleIndex::JoyconRight &&
-        controller_style_2 == Core::HID::NpadStyleIndex::JoyconRight) {
-        return NpadIsSameType;
-    }
-
-    // These exceptions are handled as if they where dual joycon
-    if (controller_style_1 != Core::HID::NpadStyleIndex::JoyconLeft &&
-        controller_style_1 != Core::HID::NpadStyleIndex::JoyconRight) {
-        return NpadIsDualJoycon;
-    }
-    if (controller_style_2 != Core::HID::NpadStyleIndex::JoyconLeft &&
-        controller_style_2 != Core::HID::NpadStyleIndex::JoyconRight) {
-        return NpadIsDualJoycon;
-    }
-
-    // Disconnect the joycons and connect them as dual joycon at the first index.
-    DisconnectNpad(aruid, npad_id_1);
-    DisconnectNpad(aruid, npad_id_2);
-    controller_1.is_dual_left_connected = true;
-    controller_1.is_dual_right_connected = true;
-    AddNewControllerAt(aruid, Core::HID::NpadStyleIndex::JoyconDual, npad_id_1);
-    return ResultSuccess;
-}
-
-Result NPad::StartLrAssignmentMode(u64 aruid) {
-    std::scoped_lock lock{mutex};
-    bool is_enabled{};
-    Result result = npad_resource.GetLrAssignmentMode(is_enabled, aruid);
-    if (result.IsSuccess() && is_enabled == false) {
-        result = npad_resource.SetLrAssignmentMode(aruid, true);
-    }
-    return result;
-}
-
-Result NPad::StopLrAssignmentMode(u64 aruid) {
-    std::scoped_lock lock{mutex};
-    bool is_enabled{};
-    Result result = npad_resource.GetLrAssignmentMode(is_enabled, aruid);
-    if (result.IsSuccess() && is_enabled == true) {
-        result = npad_resource.SetLrAssignmentMode(aruid, false);
-    }
-    return result;
-}
-
-Result NPad::SwapNpadAssignment(u64 aruid, Core::HID::NpadIdType npad_id_1,
-                                Core::HID::NpadIdType npad_id_2) {
-    if (!IsNpadIdValid(npad_id_1) || !IsNpadIdValid(npad_id_2)) {
-        LOG_ERROR(Service_HID, "Invalid NpadIdType npad_id_1:{}, npad_id_2:{}", npad_id_1,
-                  npad_id_2);
-        return ResultInvalidNpadId;
-    }
-    if (npad_id_1 == Core::HID::NpadIdType::Handheld ||
-        npad_id_2 == Core::HID::NpadIdType::Handheld || npad_id_1 == Core::HID::NpadIdType::Other ||
-        npad_id_2 == Core::HID::NpadIdType::Other) {
-        return ResultSuccess;
-    }
-    const auto& controller_1 = GetControllerFromNpadIdType(aruid, npad_id_1).device;
-    const auto& controller_2 = GetControllerFromNpadIdType(aruid, npad_id_2).device;
-    const auto type_index_1 = controller_1->GetNpadStyleIndex();
-    const auto type_index_2 = controller_2->GetNpadStyleIndex();
-    const auto is_connected_1 = controller_1->IsConnected();
-    const auto is_connected_2 = controller_2->IsConnected();
-
-    if (!npad_resource.IsControllerSupported(aruid, type_index_1) && is_connected_1) {
-        return ResultNpadNotConnected;
-    }
-    if (!npad_resource.IsControllerSupported(aruid, type_index_2) && is_connected_2) {
-        return ResultNpadNotConnected;
-    }
-
-    UpdateControllerAt(aruid, type_index_2, npad_id_1, is_connected_2);
-    UpdateControllerAt(aruid, type_index_1, npad_id_2, is_connected_1);
-
-    return ResultSuccess;
-}
-
-Result NPad::GetLedPattern(Core::HID::NpadIdType npad_id, Core::HID::LedPattern& pattern) const {
-    if (!IsNpadIdValid(npad_id)) {
-        LOG_ERROR(Service_HID, "Invalid NpadIdType npad_id:{}", npad_id);
-        return ResultInvalidNpadId;
-    }
-    const auto aruid = applet_resource_holder.applet_resource->GetActiveAruid();
-    const auto& controller = GetControllerFromNpadIdType(aruid, npad_id).device;
-    pattern = controller->GetLedPattern();
-    return ResultSuccess;
-}
-
-Result NPad::IsUnintendedHomeButtonInputProtectionEnabled(bool& out_is_enabled, u64 aruid,
-                                                          Core::HID::NpadIdType npad_id) const {
-    std::scoped_lock lock{mutex};
-    return npad_resource.GetHomeProtectionEnabled(out_is_enabled, aruid, npad_id);
-}
-
-Result NPad::EnableUnintendedHomeButtonInputProtection(u64 aruid, Core::HID::NpadIdType npad_id,
-                                                       bool is_enabled) {
-    std::scoped_lock lock{mutex};
-    return npad_resource.SetHomeProtectionEnabled(aruid, npad_id, is_enabled);
-}
-
-void NPad::SetNpadAnalogStickUseCenterClamp(u64 aruid, bool is_enabled) {
-    std::scoped_lock lock{mutex};
-    npad_resource.SetNpadAnalogStickUseCenterClamp(aruid, is_enabled);
-}
-
-void NPad::ClearAllConnectedControllers() {
-    for (std::size_t aruid_index = 0; aruid_index < AruidIndexMax; aruid_index++) {
-        for (auto& controller : controller_data[aruid_index]) {
-            if (controller.device->IsConnected() &&
-                controller.device->GetNpadStyleIndex() != Core::HID::NpadStyleIndex::None) {
-                controller.device->Disconnect();
-                controller.device->SetNpadStyleIndex(Core::HID::NpadStyleIndex::None);
-            }
-        }
-    }
-}
-
-void NPad::DisconnectAllConnectedControllers() {
-    for (std::size_t aruid_index = 0; aruid_index < AruidIndexMax; aruid_index++) {
-        for (auto& controller : controller_data[aruid_index]) {
-            controller.device->Disconnect();
-        }
-    }
-}
-
-void NPad::ConnectAllDisconnectedControllers() {
-    for (std::size_t aruid_index = 0; aruid_index < AruidIndexMax; aruid_index++) {
-        for (auto& controller : controller_data[aruid_index]) {
-            if (controller.device->GetNpadStyleIndex() != Core::HID::NpadStyleIndex::None &&
-                !controller.device->IsConnected()) {
-                controller.device->Connect();
-            }
-        }
-    }
-}
-
-void NPad::ClearAllControllers() {
-    for (std::size_t aruid_index = 0; aruid_index < AruidIndexMax; aruid_index++) {
-        for (auto& controller : controller_data[aruid_index]) {
-            controller.device->Disconnect();
-            controller.device->SetNpadStyleIndex(Core::HID::NpadStyleIndex::None);
-        }
-    }
-}
-
-Core::HID::NpadButton NPad::GetAndResetPressState() {
-    return static_cast<Core::HID::NpadButton>(press_state.exchange(0));
-}
-
-Result NPad::ApplyNpadSystemCommonPolicy(u64 aruid) {
-    std::scoped_lock lock{mutex};
-    const Result result = npad_resource.ApplyNpadSystemCommonPolicy(aruid, false);
-    if (result.IsSuccess()) {
-        OnUpdate({});
-    }
-    return result;
-}
-
-Result NPad::ApplyNpadSystemCommonPolicyFull(u64 aruid) {
-    std::scoped_lock lock{mutex};
-    const Result result = npad_resource.ApplyNpadSystemCommonPolicy(aruid, true);
-    if (result.IsSuccess()) {
-        OnUpdate({});
-    }
-    return result;
-}
-
-Result NPad::ClearNpadSystemCommonPolicy(u64 aruid) {
-    std::scoped_lock lock{mutex};
-    const Result result = npad_resource.ClearNpadSystemCommonPolicy(aruid);
-    if (result.IsSuccess()) {
-        OnUpdate({});
-    }
-    return result;
-}
-
-void NPad::SetRevision(u64 aruid, NpadRevision revision) {
-    npad_resource.SetNpadRevision(aruid, revision);
-}
-
-NpadRevision NPad::GetRevision(u64 aruid) {
-    return npad_resource.GetNpadRevision(aruid);
-}
-
-Result NPad::RegisterAppletResourceUserId(u64 aruid) {
-    return npad_resource.RegisterAppletResourceUserId(aruid);
-}
-
-void NPad::UnregisterAppletResourceUserId(u64 aruid) {
-    npad_resource.UnregisterAppletResourceUserId(aruid);
-}
-
-void NPad::SetNpadExternals(std::shared_ptr<AppletResource> resource,
-                            std::recursive_mutex* shared_mutex) {
-    applet_resource_holder.applet_resource = resource;
-    applet_resource_holder.shared_mutex = shared_mutex;
-    applet_resource_holder.shared_npad_resource = &npad_resource;
-}
-
-NPad::NpadControllerData& NPad::GetControllerFromHandle(
-    u64 aruid, const Core::HID::VibrationDeviceHandle& device_handle) {
-    const auto npad_id = static_cast<Core::HID::NpadIdType>(device_handle.npad_id);
-    return GetControllerFromNpadIdType(aruid, npad_id);
-}
-
-const NPad::NpadControllerData& NPad::GetControllerFromHandle(
-    u64 aruid, const Core::HID::VibrationDeviceHandle& device_handle) const {
-    const auto npad_id = static_cast<Core::HID::NpadIdType>(device_handle.npad_id);
-    return GetControllerFromNpadIdType(aruid, npad_id);
-}
-
-NPad::NpadControllerData& NPad::GetControllerFromHandle(
-    u64 aruid, const Core::HID::SixAxisSensorHandle& device_handle) {
-    const auto npad_id = static_cast<Core::HID::NpadIdType>(device_handle.npad_id);
-    return GetControllerFromNpadIdType(aruid, npad_id);
-}
-
-const NPad::NpadControllerData& NPad::GetControllerFromHandle(
-    u64 aruid, const Core::HID::SixAxisSensorHandle& device_handle) const {
-    const auto npad_id = static_cast<Core::HID::NpadIdType>(device_handle.npad_id);
-    return GetControllerFromNpadIdType(aruid, npad_id);
-}
-
-NPad::NpadControllerData& NPad::GetControllerFromNpadIdType(u64 aruid,
-                                                            Core::HID::NpadIdType npad_id) {
-    if (!IsNpadIdValid(npad_id)) {
-        LOG_ERROR(Service_HID, "Invalid NpadIdType npad_id:{}", npad_id);
-        npad_id = Core::HID::NpadIdType::Player1;
-    }
-    const auto npad_index = NpadIdTypeToIndex(npad_id);
-    const auto aruid_index = applet_resource_holder.applet_resource->GetIndexFromAruid(aruid);
-    return controller_data[aruid_index][npad_index];
-}
-
-const NPad::NpadControllerData& NPad::GetControllerFromNpadIdType(
-    u64 aruid, Core::HID::NpadIdType npad_id) const {
-    if (!IsNpadIdValid(npad_id)) {
-        LOG_ERROR(Service_HID, "Invalid NpadIdType npad_id:{}", npad_id);
-        npad_id = Core::HID::NpadIdType::Player1;
-    }
-    const auto npad_index = NpadIdTypeToIndex(npad_id);
-    const auto aruid_index = applet_resource_holder.applet_resource->GetIndexFromAruid(aruid);
-    return controller_data[aruid_index][npad_index];
-}
-
-Core::HID::SixAxisSensorProperties& NPad::GetSixaxisProperties(
-    u64 aruid, const Core::HID::SixAxisSensorHandle& sixaxis_handle) {
-    auto& controller = GetControllerFromHandle(aruid, sixaxis_handle);
-    switch (sixaxis_handle.npad_type) {
-    case Core::HID::NpadStyleIndex::ProController:
-    case Core::HID::NpadStyleIndex::Pokeball:
-        return controller.shared_memory->sixaxis_fullkey_properties;
-    case Core::HID::NpadStyleIndex::Handheld:
-        return controller.shared_memory->sixaxis_handheld_properties;
-    case Core::HID::NpadStyleIndex::JoyconDual:
-        if (sixaxis_handle.device_index == Core::HID::DeviceIndex::Left) {
-            return controller.shared_memory->sixaxis_dual_left_properties;
-        }
-        return controller.shared_memory->sixaxis_dual_right_properties;
-    case Core::HID::NpadStyleIndex::JoyconLeft:
-        return controller.shared_memory->sixaxis_left_properties;
-    case Core::HID::NpadStyleIndex::JoyconRight:
-        return controller.shared_memory->sixaxis_right_properties;
-    default:
-        return controller.shared_memory->sixaxis_fullkey_properties;
-    }
-}
-
-const Core::HID::SixAxisSensorProperties& NPad::GetSixaxisProperties(
-    u64 aruid, const Core::HID::SixAxisSensorHandle& sixaxis_handle) const {
-    const auto& controller = GetControllerFromHandle(aruid, sixaxis_handle);
-    switch (sixaxis_handle.npad_type) {
-    case Core::HID::NpadStyleIndex::ProController:
-    case Core::HID::NpadStyleIndex::Pokeball:
-        return controller.shared_memory->sixaxis_fullkey_properties;
-    case Core::HID::NpadStyleIndex::Handheld:
-        return controller.shared_memory->sixaxis_handheld_properties;
-    case Core::HID::NpadStyleIndex::JoyconDual:
-        if (sixaxis_handle.device_index == Core::HID::DeviceIndex::Left) {
-            return controller.shared_memory->sixaxis_dual_left_properties;
-        }
-        return controller.shared_memory->sixaxis_dual_right_properties;
-    case Core::HID::NpadStyleIndex::JoyconLeft:
-        return controller.shared_memory->sixaxis_left_properties;
-    case Core::HID::NpadStyleIndex::JoyconRight:
-        return controller.shared_memory->sixaxis_right_properties;
-    default:
-        return controller.shared_memory->sixaxis_fullkey_properties;
-    }
-}
-
-AppletDetailedUiType NPad::GetAppletDetailedUiType(Core::HID::NpadIdType npad_id) {
-    const auto aruid = applet_resource_holder.applet_resource->GetActiveAruid();
-    const auto& shared_memory = GetControllerFromNpadIdType(aruid, npad_id).shared_memory;
-
-    return {
-        .ui_variant = 0,
-        .footer = shared_memory->applet_footer_type,
-    };
-}
-
-} // namespace Service::HID
diff --git a/src/core/hle/service/hid/controllers/npad.h b/src/core/hle/service/hid/controllers/npad.h
deleted file mode 100644
index 8ab333064..000000000
--- a/src/core/hle/service/hid/controllers/npad.h
+++ /dev/null
@@ -1,214 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include <array>
-#include <atomic>
-#include <mutex>
-#include <span>
-
-#include "common/common_types.h"
-#include "core/hid/hid_types.h"
-#include "core/hle/service/hid/controllers/controller_base.h"
-#include "core/hle/service/hid/controllers/npad/npad_resource.h"
-#include "core/hle/service/hid/controllers/types/npad_types.h"
-
-namespace Core::HID {
-class EmulatedController;
-enum class ControllerTriggerType;
-} // namespace Core::HID
-
-namespace Kernel {
-class KEvent;
-class KReadableEvent;
-} // namespace Kernel
-
-namespace Service::KernelHelpers {
-class ServiceContext;
-} // namespace Service::KernelHelpers
-
-union Result;
-
-namespace Service::HID {
-class AppletResource;
-struct NpadInternalState;
-struct NpadSixAxisSensorLifo;
-struct NpadSharedMemoryFormat;
-
-class NPad final {
-public:
-    explicit NPad(Core::HID::HIDCore& hid_core_, KernelHelpers::ServiceContext& service_context_);
-    ~NPad();
-
-    Result Activate();
-    Result Activate(u64 aruid);
-
-    Result ActivateNpadResource();
-    Result ActivateNpadResource(u64 aruid);
-
-    // When the controller is requesting an update for the shared memory
-    void OnUpdate(const Core::Timing::CoreTiming& core_timing);
-
-    Result SetSupportedNpadStyleSet(u64 aruid, Core::HID::NpadStyleSet supported_style_set);
-    Result GetSupportedNpadStyleSet(u64 aruid,
-                                    Core::HID::NpadStyleSet& out_supported_style_set) const;
-    Result GetMaskedSupportedNpadStyleSet(u64 aruid,
-                                          Core::HID::NpadStyleSet& out_supported_style_set) const;
-
-    Result SetSupportedNpadIdType(u64 aruid,
-                                  std::span<const Core::HID::NpadIdType> supported_npad_list);
-
-    Result SetNpadJoyHoldType(u64 aruid, NpadJoyHoldType hold_type);
-    Result GetNpadJoyHoldType(u64 aruid, NpadJoyHoldType& out_hold_type) const;
-
-    Result SetNpadHandheldActivationMode(u64 aruid, NpadHandheldActivationMode mode);
-    Result GetNpadHandheldActivationMode(u64 aruid, NpadHandheldActivationMode& out_mode) const;
-
-    bool SetNpadMode(u64 aruid, Core::HID::NpadIdType& new_npad_id, Core::HID::NpadIdType npad_id,
-                     NpadJoyDeviceType npad_device_type, NpadJoyAssignmentMode assignment_mode);
-
-    bool VibrateControllerAtIndex(u64 aruid, Core::HID::NpadIdType npad_id,
-                                  std::size_t device_index,
-                                  const Core::HID::VibrationValue& vibration_value);
-
-    void VibrateController(u64 aruid,
-                           const Core::HID::VibrationDeviceHandle& vibration_device_handle,
-                           const Core::HID::VibrationValue& vibration_value);
-
-    void VibrateControllers(
-        u64 aruid, std::span<const Core::HID::VibrationDeviceHandle> vibration_device_handles,
-        std::span<const Core::HID::VibrationValue> vibration_values);
-
-    Core::HID::VibrationValue GetLastVibration(
-        u64 aruid, const Core::HID::VibrationDeviceHandle& vibration_device_handle) const;
-
-    void InitializeVibrationDevice(const Core::HID::VibrationDeviceHandle& vibration_device_handle);
-
-    void InitializeVibrationDeviceAtIndex(u64 aruid, Core::HID::NpadIdType npad_id,
-                                          std::size_t device_index);
-
-    void SetPermitVibrationSession(bool permit_vibration_session);
-
-    bool IsVibrationDeviceMounted(
-        u64 aruid, const Core::HID::VibrationDeviceHandle& vibration_device_handle) const;
-
-    Result AcquireNpadStyleSetUpdateEventHandle(u64 aruid, Kernel::KReadableEvent** out_event,
-                                                Core::HID::NpadIdType npad_id);
-
-    // Adds a new controller at an index.
-    void AddNewControllerAt(u64 aruid, Core::HID::NpadStyleIndex controller,
-                            Core::HID::NpadIdType npad_id);
-    // Adds a new controller at an index with connection status.
-    void UpdateControllerAt(u64 aruid, Core::HID::NpadStyleIndex controller,
-                            Core::HID::NpadIdType npad_id, bool connected);
-
-    Result DisconnectNpad(u64 aruid, Core::HID::NpadIdType npad_id);
-
-    Result IsFirmwareUpdateAvailableForSixAxisSensor(
-        u64 aruid, const Core::HID::SixAxisSensorHandle& sixaxis_handle,
-        bool& is_firmware_available) const;
-    Result ResetIsSixAxisSensorDeviceNewlyAssigned(
-        u64 aruid, const Core::HID::SixAxisSensorHandle& sixaxis_handle);
-
-    Result GetLedPattern(Core::HID::NpadIdType npad_id, Core::HID::LedPattern& pattern) const;
-
-    Result IsUnintendedHomeButtonInputProtectionEnabled(bool& out_is_enabled, u64 aruid,
-                                                        Core::HID::NpadIdType npad_id) const;
-    Result EnableUnintendedHomeButtonInputProtection(u64 aruid, Core::HID::NpadIdType npad_id,
-                                                     bool is_enabled);
-
-    void SetNpadAnalogStickUseCenterClamp(u64 aruid, bool is_enabled);
-    void ClearAllConnectedControllers();
-    void DisconnectAllConnectedControllers();
-    void ConnectAllDisconnectedControllers();
-    void ClearAllControllers();
-
-    Result MergeSingleJoyAsDualJoy(u64 aruid, Core::HID::NpadIdType npad_id_1,
-                                   Core::HID::NpadIdType npad_id_2);
-    Result StartLrAssignmentMode(u64 aruid);
-    Result StopLrAssignmentMode(u64 aruid);
-    Result SwapNpadAssignment(u64 aruid, Core::HID::NpadIdType npad_id_1,
-                              Core::HID::NpadIdType npad_id_2);
-
-    // Logical OR for all buttons presses on all controllers
-    // Specifically for cheat engine and other features.
-    Core::HID::NpadButton GetAndResetPressState();
-
-    Result ApplyNpadSystemCommonPolicy(u64 aruid);
-    Result ApplyNpadSystemCommonPolicyFull(u64 aruid);
-    Result ClearNpadSystemCommonPolicy(u64 aruid);
-
-    void SetRevision(u64 aruid, NpadRevision revision);
-    NpadRevision GetRevision(u64 aruid);
-
-    Result RegisterAppletResourceUserId(u64 aruid);
-    void UnregisterAppletResourceUserId(u64 aruid);
-    void SetNpadExternals(std::shared_ptr<AppletResource> resource,
-                          std::recursive_mutex* shared_mutex);
-
-    AppletDetailedUiType GetAppletDetailedUiType(Core::HID::NpadIdType npad_id);
-
-private:
-    struct VibrationData {
-        bool device_mounted{};
-        Core::HID::VibrationValue latest_vibration_value{};
-        std::chrono::steady_clock::time_point last_vibration_timepoint{};
-    };
-
-    struct NpadControllerData {
-        NpadInternalState* shared_memory = nullptr;
-        Core::HID::EmulatedController* device = nullptr;
-
-        std::array<VibrationData, 2> vibration{};
-        bool is_connected{};
-
-        // Dual joycons can have only one side connected
-        bool is_dual_left_connected{true};
-        bool is_dual_right_connected{true};
-
-        // Current pad state
-        NPadGenericState npad_pad_state{};
-        NPadGenericState npad_libnx_state{};
-        NpadGcTriggerState npad_trigger_state{};
-        int callback_key{};
-    };
-
-    void ControllerUpdate(Core::HID::ControllerTriggerType type, std::size_t controller_idx);
-    void InitNewlyAddedController(u64 aruid, Core::HID::NpadIdType npad_id);
-    void RequestPadStateUpdate(u64 aruid, Core::HID::NpadIdType npad_id);
-    void WriteEmptyEntry(NpadInternalState* npad);
-
-    NpadControllerData& GetControllerFromHandle(
-        u64 aruid, const Core::HID::VibrationDeviceHandle& device_handle);
-    const NpadControllerData& GetControllerFromHandle(
-        u64 aruid, const Core::HID::VibrationDeviceHandle& device_handle) const;
-    NpadControllerData& GetControllerFromHandle(
-        u64 aruid, const Core::HID::SixAxisSensorHandle& device_handle);
-    const NpadControllerData& GetControllerFromHandle(
-        u64 aruid, const Core::HID::SixAxisSensorHandle& device_handle) const;
-    NpadControllerData& GetControllerFromNpadIdType(u64 aruid, Core::HID::NpadIdType npad_id);
-    const NpadControllerData& GetControllerFromNpadIdType(u64 aruid,
-                                                          Core::HID::NpadIdType npad_id) const;
-
-    Core::HID::SixAxisSensorProperties& GetSixaxisProperties(
-        u64 aruid, const Core::HID::SixAxisSensorHandle& device_handle);
-    const Core::HID::SixAxisSensorProperties& GetSixaxisProperties(
-        u64 aruid, const Core::HID::SixAxisSensorHandle& device_handle) const;
-
-    Core::HID::HIDCore& hid_core;
-    KernelHelpers::ServiceContext& service_context;
-
-    s32 ref_counter{};
-    mutable std::mutex mutex;
-    NPadResource npad_resource;
-    AppletResourceHolder applet_resource_holder{};
-    Kernel::KEvent* input_event{nullptr};
-    std::mutex* input_mutex{nullptr};
-
-    std::atomic<u64> press_state{};
-    bool permit_vibration_session_enabled;
-    std::array<std::array<NpadControllerData, MaxSupportedNpadIdTypes>, AruidIndexMax>
-        controller_data{};
-};
-} // namespace Service::HID
diff --git a/src/core/hle/service/hid/controllers/npad/npad_data.cpp b/src/core/hle/service/hid/controllers/npad/npad_data.cpp
deleted file mode 100644
index d2423b6d3..000000000
--- a/src/core/hle/service/hid/controllers/npad/npad_data.cpp
+++ /dev/null
@@ -1,228 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#include "core/hle/service/hid/controllers/npad/npad_data.h"
-#include "core/hle/service/hid/hid_util.h"
-
-namespace Service::HID {
-
-NPadData::NPadData() {
-    ClearNpadSystemCommonPolicy();
-}
-
-NPadData::~NPadData() = default;
-
-NpadStatus NPadData::GetNpadStatus() const {
-    return status;
-}
-
-void NPadData::SetNpadAnalogStickUseCenterClamp(bool is_enabled) {
-    status.use_center_clamp.Assign(is_enabled);
-}
-
-bool NPadData::GetNpadAnalogStickUseCenterClamp() const {
-    return status.use_center_clamp.As<bool>();
-}
-
-void NPadData::SetNpadSystemExtStateEnabled(bool is_enabled) {
-    status.system_ext_state.Assign(is_enabled);
-}
-
-bool NPadData::GetNpadSystemExtState() const {
-    return status.system_ext_state.As<bool>();
-}
-
-Result NPadData::SetSupportedNpadIdType(std::span<const Core::HID::NpadIdType> list) {
-    // Note: Real limit is 11. But array size is 10. N's bug?
-    if (list.size() > MaxSupportedNpadIdTypes) {
-        return ResultInvalidArraySize;
-    }
-
-    supported_npad_id_types_count = list.size();
-    memcpy(supported_npad_id_types.data(), list.data(),
-           list.size() * sizeof(Core::HID::NpadIdType));
-
-    return ResultSuccess;
-}
-
-std::size_t NPadData::GetSupportedNpadIdType(std::span<Core::HID::NpadIdType> out_list) const {
-    std::size_t out_size = std::min(supported_npad_id_types_count, out_list.size());
-
-    memcpy(out_list.data(), supported_npad_id_types.data(),
-           out_size * sizeof(Core::HID::NpadIdType));
-
-    return out_size;
-}
-
-bool NPadData::IsNpadIdTypeSupported(Core::HID::NpadIdType npad_id) const {
-    for (std::size_t i = 0; i < supported_npad_id_types_count; i++) {
-        if (supported_npad_id_types[i] == npad_id) {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-void NPadData::SetNpadSystemCommonPolicy(bool is_full_policy) {
-    supported_npad_style_set = Core::HID::NpadStyleSet::Fullkey | Core::HID::NpadStyleSet::JoyDual |
-                               Core::HID::NpadStyleSet::SystemExt | Core::HID::NpadStyleSet::System;
-    handheld_activation_mode = NpadHandheldActivationMode::Dual;
-
-    status.is_supported_styleset_set.Assign(true);
-    status.is_hold_type_set.Assign(true);
-    status.lr_assignment_mode.Assign(false);
-    status.is_policy.Assign(true);
-    if (is_full_policy) {
-        status.is_full_policy.Assign(true);
-    }
-
-    supported_npad_id_types_count = 10;
-    supported_npad_id_types[0] = Core::HID::NpadIdType::Player1;
-    supported_npad_id_types[1] = Core::HID::NpadIdType::Player2;
-    supported_npad_id_types[2] = Core::HID::NpadIdType::Player3;
-    supported_npad_id_types[3] = Core::HID::NpadIdType::Player4;
-    supported_npad_id_types[4] = Core::HID::NpadIdType::Player5;
-    supported_npad_id_types[5] = Core::HID::NpadIdType::Player6;
-    supported_npad_id_types[6] = Core::HID::NpadIdType::Player7;
-    supported_npad_id_types[7] = Core::HID::NpadIdType::Player8;
-    supported_npad_id_types[8] = Core::HID::NpadIdType::Other;
-    supported_npad_id_types[9] = Core::HID::NpadIdType::Handheld;
-
-    for (auto& input_protection : is_unintended_home_button_input_protection) {
-        input_protection = true;
-    }
-}
-
-void NPadData::ClearNpadSystemCommonPolicy() {
-    status.raw = 0;
-    supported_npad_style_set = Core::HID::NpadStyleSet::All;
-    npad_hold_type = NpadJoyHoldType::Vertical;
-    handheld_activation_mode = NpadHandheldActivationMode::Dual;
-
-    for (auto& button_assignment : npad_button_assignment) {
-        button_assignment = Core::HID::NpadButton::None;
-    }
-
-    supported_npad_id_types_count = 10;
-    supported_npad_id_types[0] = Core::HID::NpadIdType::Player1;
-    supported_npad_id_types[1] = Core::HID::NpadIdType::Player2;
-    supported_npad_id_types[2] = Core::HID::NpadIdType::Player3;
-    supported_npad_id_types[3] = Core::HID::NpadIdType::Player4;
-    supported_npad_id_types[4] = Core::HID::NpadIdType::Player5;
-    supported_npad_id_types[5] = Core::HID::NpadIdType::Player6;
-    supported_npad_id_types[6] = Core::HID::NpadIdType::Player7;
-    supported_npad_id_types[7] = Core::HID::NpadIdType::Player8;
-    supported_npad_id_types[8] = Core::HID::NpadIdType::Other;
-    supported_npad_id_types[9] = Core::HID::NpadIdType::Handheld;
-
-    for (auto& input_protection : is_unintended_home_button_input_protection) {
-        input_protection = true;
-    }
-}
-
-void NPadData::SetNpadJoyHoldType(NpadJoyHoldType hold_type) {
-    npad_hold_type = hold_type;
-    status.is_hold_type_set.Assign(true);
-}
-
-NpadJoyHoldType NPadData::GetNpadJoyHoldType() const {
-    return npad_hold_type;
-}
-
-void NPadData::SetHandheldActivationMode(NpadHandheldActivationMode activation_mode) {
-    handheld_activation_mode = activation_mode;
-}
-
-NpadHandheldActivationMode NPadData::GetHandheldActivationMode() const {
-    return handheld_activation_mode;
-}
-
-void NPadData::SetSupportedNpadStyleSet(Core::HID::NpadStyleSet style_set) {
-    supported_npad_style_set = style_set;
-    status.is_supported_styleset_set.Assign(true);
-    status.is_hold_type_set.Assign(true);
-}
-
-Core::HID::NpadStyleSet NPadData::GetSupportedNpadStyleSet() const {
-    return supported_npad_style_set;
-}
-
-bool NPadData::IsNpadStyleIndexSupported(Core::HID::NpadStyleIndex style_index) const {
-    Core::HID::NpadStyleTag style = {supported_npad_style_set};
-    switch (style_index) {
-    case Core::HID::NpadStyleIndex::ProController:
-        return style.fullkey.As<bool>();
-    case Core::HID::NpadStyleIndex::Handheld:
-        return style.handheld.As<bool>();
-    case Core::HID::NpadStyleIndex::JoyconDual:
-        return style.joycon_dual.As<bool>();
-    case Core::HID::NpadStyleIndex::JoyconLeft:
-        return style.joycon_left.As<bool>();
-    case Core::HID::NpadStyleIndex::JoyconRight:
-        return style.joycon_right.As<bool>();
-    case Core::HID::NpadStyleIndex::GameCube:
-        return style.gamecube.As<bool>();
-    case Core::HID::NpadStyleIndex::Pokeball:
-        return style.palma.As<bool>();
-    case Core::HID::NpadStyleIndex::NES:
-        return style.lark.As<bool>();
-    case Core::HID::NpadStyleIndex::SNES:
-        return style.lucia.As<bool>();
-    case Core::HID::NpadStyleIndex::N64:
-        return style.lagoon.As<bool>();
-    case Core::HID::NpadStyleIndex::SegaGenesis:
-        return style.lager.As<bool>();
-    default:
-        return false;
-    }
-}
-
-void NPadData::SetLrAssignmentMode(bool is_enabled) {
-    status.lr_assignment_mode.Assign(is_enabled);
-}
-
-bool NPadData::GetLrAssignmentMode() const {
-    return status.lr_assignment_mode.As<bool>();
-}
-
-void NPadData::SetAssigningSingleOnSlSrPress(bool is_enabled) {
-    status.assigning_single_on_sl_sr_press.Assign(is_enabled);
-}
-
-bool NPadData::GetAssigningSingleOnSlSrPress() const {
-    return status.assigning_single_on_sl_sr_press.As<bool>();
-}
-
-void NPadData::SetHomeProtectionEnabled(bool is_enabled, Core::HID::NpadIdType npad_id) {
-    is_unintended_home_button_input_protection[NpadIdTypeToIndex(npad_id)] = is_enabled;
-}
-
-bool NPadData::GetHomeProtectionEnabled(Core::HID::NpadIdType npad_id) const {
-    return is_unintended_home_button_input_protection[NpadIdTypeToIndex(npad_id)];
-}
-
-void NPadData::SetCaptureButtonAssignment(Core::HID::NpadButton button_assignment,
-                                          std::size_t style_index) {
-    npad_button_assignment[style_index] = button_assignment;
-}
-
-Core::HID::NpadButton NPadData::GetCaptureButtonAssignment(std::size_t style_index) const {
-    return npad_button_assignment[style_index];
-}
-
-std::size_t NPadData::GetNpadCaptureButtonAssignmentList(
-    std::span<Core::HID::NpadButton> out_list) const {
-    for (std::size_t i = 0; i < out_list.size(); i++) {
-        Core::HID::NpadStyleSet style_set = GetStylesetByIndex(i);
-        if ((style_set & supported_npad_style_set) == Core::HID::NpadStyleSet::None ||
-            npad_button_assignment[i] == Core::HID::NpadButton::None) {
-            return i;
-        }
-        out_list[i] = npad_button_assignment[i];
-    }
-
-    return out_list.size();
-}
-
-} // namespace Service::HID
diff --git a/src/core/hle/service/hid/controllers/npad/npad_data.h b/src/core/hle/service/hid/controllers/npad/npad_data.h
deleted file mode 100644
index f799a9f9c..000000000
--- a/src/core/hle/service/hid/controllers/npad/npad_data.h
+++ /dev/null
@@ -1,88 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#pragma once
-
-#include <array>
-#include <span>
-
-#include "common/common_types.h"
-#include "core/hid/hid_types.h"
-#include "core/hle/result.h"
-#include "core/hle/service/hid/controllers/types/npad_types.h"
-
-namespace Service::HID {
-
-struct NpadStatus {
-    union {
-        u32 raw{};
-
-        BitField<0, 1, u32> is_supported_styleset_set;
-        BitField<1, 1, u32> is_hold_type_set;
-        BitField<2, 1, u32> lr_assignment_mode;
-        BitField<3, 1, u32> assigning_single_on_sl_sr_press;
-        BitField<4, 1, u32> is_full_policy;
-        BitField<5, 1, u32> is_policy;
-        BitField<6, 1, u32> use_center_clamp;
-        BitField<7, 1, u32> system_ext_state;
-    };
-};
-static_assert(sizeof(NpadStatus) == 4, "NpadStatus is an invalid size");
-
-/// Handles Npad request from HID interfaces
-class NPadData final {
-public:
-    explicit NPadData();
-    ~NPadData();
-
-    NpadStatus GetNpadStatus() const;
-
-    void SetNpadAnalogStickUseCenterClamp(bool is_enabled);
-    bool GetNpadAnalogStickUseCenterClamp() const;
-
-    void SetNpadSystemExtStateEnabled(bool is_enabled);
-    bool GetNpadSystemExtState() const;
-
-    Result SetSupportedNpadIdType(std::span<const Core::HID::NpadIdType> list);
-    std::size_t GetSupportedNpadIdType(std::span<Core::HID::NpadIdType> out_list) const;
-    bool IsNpadIdTypeSupported(Core::HID::NpadIdType npad_id) const;
-
-    void SetNpadSystemCommonPolicy(bool is_full_policy);
-    void ClearNpadSystemCommonPolicy();
-
-    void SetNpadJoyHoldType(NpadJoyHoldType hold_type);
-    NpadJoyHoldType GetNpadJoyHoldType() const;
-
-    void SetHandheldActivationMode(NpadHandheldActivationMode activation_mode);
-    NpadHandheldActivationMode GetHandheldActivationMode() const;
-
-    void SetSupportedNpadStyleSet(Core::HID::NpadStyleSet style_set);
-    Core::HID::NpadStyleSet GetSupportedNpadStyleSet() const;
-    bool IsNpadStyleIndexSupported(Core::HID::NpadStyleIndex style_index) const;
-
-    void SetLrAssignmentMode(bool is_enabled);
-    bool GetLrAssignmentMode() const;
-
-    void SetAssigningSingleOnSlSrPress(bool is_enabled);
-    bool GetAssigningSingleOnSlSrPress() const;
-
-    void SetHomeProtectionEnabled(bool is_enabled, Core::HID::NpadIdType npad_id);
-    bool GetHomeProtectionEnabled(Core::HID::NpadIdType npad_id) const;
-
-    void SetCaptureButtonAssignment(Core::HID::NpadButton button_assignment,
-                                    std::size_t style_index);
-    Core::HID::NpadButton GetCaptureButtonAssignment(std::size_t style_index) const;
-    std::size_t GetNpadCaptureButtonAssignmentList(std::span<Core::HID::NpadButton> out_list) const;
-
-private:
-    NpadStatus status{};
-    Core::HID::NpadStyleSet supported_npad_style_set{Core::HID::NpadStyleSet::All};
-    NpadJoyHoldType npad_hold_type{NpadJoyHoldType::Vertical};
-    NpadHandheldActivationMode handheld_activation_mode{};
-    std::array<Core::HID::NpadIdType, MaxSupportedNpadIdTypes> supported_npad_id_types{};
-    std::array<Core::HID::NpadButton, StyleIndexCount> npad_button_assignment{};
-    std::size_t supported_npad_id_types_count{};
-    std::array<bool, MaxSupportedNpadIdTypes> is_unintended_home_button_input_protection{};
-};
-
-} // namespace Service::HID
diff --git a/src/core/hle/service/hid/controllers/npad/npad_resource.cpp b/src/core/hle/service/hid/controllers/npad/npad_resource.cpp
deleted file mode 100644
index 0a9341a39..000000000
--- a/src/core/hle/service/hid/controllers/npad/npad_resource.cpp
+++ /dev/null
@@ -1,685 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#include "core/hle/kernel/k_event.h"
-#include "core/hle/kernel/k_readable_event.h"
-#include "core/hle/service/hid/controllers/npad/npad_resource.h"
-#include "core/hle/service/hid/controllers/types/npad_types.h"
-#include "core/hle/service/hid/errors.h"
-#include "core/hle/service/hid/hid_util.h"
-
-namespace Service::HID {
-
-NPadResource::NPadResource(KernelHelpers::ServiceContext& context) : service_context{context} {}
-
-NPadResource::~NPadResource() = default;
-
-Result NPadResource::RegisterAppletResourceUserId(u64 aruid) {
-    const auto aruid_index = GetIndexFromAruid(aruid);
-    if (aruid_index < AruidIndexMax) {
-        return ResultAruidAlreadyRegistered;
-    }
-
-    std::size_t data_index = AruidIndexMax;
-    for (std::size_t i = 0; i < AruidIndexMax; i++) {
-        if (!state[i].flag.is_initialized) {
-            data_index = i;
-            break;
-        }
-    }
-
-    if (data_index == AruidIndexMax) {
-        return ResultAruidNoAvailableEntries;
-    }
-
-    auto& aruid_data = state[data_index];
-
-    aruid_data.aruid = aruid;
-    aruid_data.flag.is_initialized.Assign(true);
-
-    data_index = AruidIndexMax;
-    for (std::size_t i = 0; i < AruidIndexMax; i++) {
-        if (registration_list.flag[i] == RegistrationStatus::Initialized) {
-            if (registration_list.aruid[i] != aruid) {
-                continue;
-            }
-            data_index = i;
-            break;
-        }
-        if (registration_list.flag[i] == RegistrationStatus::None) {
-            data_index = i;
-            break;
-        }
-    }
-
-    if (data_index == AruidIndexMax) {
-        return ResultSuccess;
-    }
-
-    registration_list.flag[data_index] = RegistrationStatus::Initialized;
-    registration_list.aruid[data_index] = aruid;
-
-    return ResultSuccess;
-}
-
-void NPadResource::UnregisterAppletResourceUserId(u64 aruid) {
-    const u64 aruid_index = GetIndexFromAruid(aruid);
-
-    DestroyStyleSetUpdateEvents(aruid);
-    if (aruid_index < AruidIndexMax) {
-        state[aruid_index] = {};
-        registration_list.flag[aruid_index] = RegistrationStatus::PendingDelete;
-    }
-}
-
-void NPadResource::DestroyStyleSetUpdateEvents(u64 aruid) {
-    const u64 aruid_index = GetIndexFromAruid(aruid);
-
-    if (aruid_index >= AruidIndexMax) {
-        return;
-    }
-
-    for (auto& controller_state : state[aruid_index].controller_state) {
-        if (!controller_state.is_styleset_update_event_initialized) {
-            continue;
-        }
-        service_context.CloseEvent(controller_state.style_set_update_event);
-        controller_state.is_styleset_update_event_initialized = false;
-    }
-}
-
-Result NPadResource::Activate(u64 aruid) {
-    const u64 aruid_index = GetIndexFromAruid(aruid);
-
-    if (aruid_index >= AruidIndexMax) {
-        return ResultSuccess;
-    }
-
-    auto& state_data = state[aruid_index];
-
-    if (state_data.flag.is_assigned) {
-        return ResultAruidAlreadyRegistered;
-    }
-
-    state_data.flag.is_assigned.Assign(true);
-    state_data.data.ClearNpadSystemCommonPolicy();
-    state_data.npad_revision = NpadRevision::Revision0;
-    state_data.button_config = {};
-
-    if (active_data_aruid == aruid) {
-        default_hold_type = active_data.GetNpadJoyHoldType();
-        active_data.SetNpadJoyHoldType(default_hold_type);
-    }
-    return ResultSuccess;
-}
-
-Result NPadResource::Activate() {
-    if (ref_counter == std::numeric_limits<s32>::max() - 1) {
-        return ResultAppletResourceOverflow;
-    }
-    if (ref_counter == 0) {
-        RegisterAppletResourceUserId(SystemAruid);
-        Activate(SystemAruid);
-    }
-    ref_counter++;
-    return ResultSuccess;
-}
-
-Result NPadResource::Deactivate() {
-    if (ref_counter == 0) {
-        return ResultAppletResourceNotInitialized;
-    }
-
-    UnregisterAppletResourceUserId(SystemAruid);
-    ref_counter--;
-    return ResultSuccess;
-}
-
-NPadData* NPadResource::GetActiveData() {
-    return &active_data;
-}
-
-u64 NPadResource::GetActiveDataAruid() {
-    return active_data_aruid;
-}
-
-void NPadResource::SetAppletResourceUserId(u64 aruid) {
-    if (active_data_aruid == aruid) {
-        return;
-    }
-
-    active_data_aruid = aruid;
-    default_hold_type = active_data.GetNpadJoyHoldType();
-    const u64 aruid_index = GetIndexFromAruid(aruid);
-
-    if (aruid_index >= AruidIndexMax) {
-        return;
-    }
-
-    auto& data = state[aruid_index].data;
-    if (data.GetNpadStatus().is_policy || data.GetNpadStatus().is_full_policy) {
-        data.SetNpadJoyHoldType(default_hold_type);
-    }
-
-    active_data = data;
-    if (data.GetNpadStatus().is_hold_type_set) {
-        active_data.SetNpadJoyHoldType(default_hold_type);
-    }
-}
-
-std::size_t NPadResource::GetIndexFromAruid(u64 aruid) const {
-    for (std::size_t i = 0; i < AruidIndexMax; i++) {
-        if (registration_list.flag[i] == RegistrationStatus::Initialized &&
-            registration_list.aruid[i] == aruid) {
-            return i;
-        }
-    }
-    return AruidIndexMax;
-}
-
-Result NPadResource::ApplyNpadSystemCommonPolicy(u64 aruid, bool is_full_policy) {
-    const u64 aruid_index = GetIndexFromAruid(aruid);
-    if (aruid_index >= AruidIndexMax) {
-        return ResultNpadNotConnected;
-    }
-
-    auto& data = state[aruid_index].data;
-    data.SetNpadSystemCommonPolicy(is_full_policy);
-    data.SetNpadJoyHoldType(default_hold_type);
-    if (active_data_aruid == aruid) {
-        active_data.SetNpadSystemCommonPolicy(is_full_policy);
-        active_data.SetNpadJoyHoldType(default_hold_type);
-    }
-    return ResultSuccess;
-}
-
-Result NPadResource::ClearNpadSystemCommonPolicy(u64 aruid) {
-    const u64 aruid_index = GetIndexFromAruid(aruid);
-    if (aruid_index >= AruidIndexMax) {
-        return ResultNpadNotConnected;
-    }
-
-    state[aruid_index].data.ClearNpadSystemCommonPolicy();
-    if (active_data_aruid == aruid) {
-        active_data.ClearNpadSystemCommonPolicy();
-    }
-    return ResultSuccess;
-}
-
-Result NPadResource::SetSupportedNpadStyleSet(u64 aruid, Core::HID::NpadStyleSet style_set) {
-    const u64 aruid_index = GetIndexFromAruid(aruid);
-    if (aruid_index >= AruidIndexMax) {
-        return ResultNpadNotConnected;
-    }
-
-    auto& data = state[aruid_index].data;
-    data.SetSupportedNpadStyleSet(style_set);
-    if (active_data_aruid == aruid) {
-        active_data.SetSupportedNpadStyleSet(style_set);
-        active_data.SetNpadJoyHoldType(data.GetNpadJoyHoldType());
-    }
-    return ResultSuccess;
-}
-
-Result NPadResource::GetSupportedNpadStyleSet(Core::HID::NpadStyleSet& out_style_Set,
-                                              u64 aruid) const {
-    const u64 aruid_index = GetIndexFromAruid(aruid);
-    if (aruid_index >= AruidIndexMax) {
-        return ResultNpadNotConnected;
-    }
-
-    auto& data = state[aruid_index].data;
-    if (!data.GetNpadStatus().is_supported_styleset_set) {
-        return ResultUndefinedStyleset;
-    }
-
-    out_style_Set = data.GetSupportedNpadStyleSet();
-    return ResultSuccess;
-}
-
-Result NPadResource::GetMaskedSupportedNpadStyleSet(Core::HID::NpadStyleSet& out_style_set,
-                                                    u64 aruid) const {
-    if (aruid == SystemAruid) {
-        out_style_set = Core::HID::NpadStyleSet::Fullkey | Core::HID::NpadStyleSet::Handheld |
-                        Core::HID::NpadStyleSet::JoyDual | Core::HID::NpadStyleSet::JoyLeft |
-                        Core::HID::NpadStyleSet::JoyRight | Core::HID::NpadStyleSet::Palma |
-                        Core::HID::NpadStyleSet::SystemExt | Core::HID::NpadStyleSet::System;
-        return ResultSuccess;
-    }
-
-    const u64 aruid_index = GetIndexFromAruid(aruid);
-    if (aruid_index >= AruidIndexMax) {
-        return ResultNpadNotConnected;
-    }
-
-    auto& data = state[aruid_index].data;
-    if (!data.GetNpadStatus().is_supported_styleset_set) {
-        return ResultUndefinedStyleset;
-    }
-
-    Core::HID::NpadStyleSet mask{Core::HID::NpadStyleSet::None};
-    out_style_set = data.GetSupportedNpadStyleSet();
-
-    switch (state[aruid_index].npad_revision) {
-    case NpadRevision::Revision1:
-        mask = Core::HID::NpadStyleSet::Fullkey | Core::HID::NpadStyleSet::Handheld |
-               Core::HID::NpadStyleSet::JoyDual | Core::HID::NpadStyleSet::JoyLeft |
-               Core::HID::NpadStyleSet::JoyRight | Core::HID::NpadStyleSet::Gc |
-               Core::HID::NpadStyleSet::Palma | Core::HID::NpadStyleSet::SystemExt |
-               Core::HID::NpadStyleSet::System;
-        break;
-    case NpadRevision::Revision2:
-        mask = Core::HID::NpadStyleSet::Fullkey | Core::HID::NpadStyleSet::Handheld |
-               Core::HID::NpadStyleSet::JoyDual | Core::HID::NpadStyleSet::JoyLeft |
-               Core::HID::NpadStyleSet::JoyRight | Core::HID::NpadStyleSet::Gc |
-               Core::HID::NpadStyleSet::Palma | Core::HID::NpadStyleSet::Lark |
-               Core::HID::NpadStyleSet::SystemExt | Core::HID::NpadStyleSet::System;
-        break;
-    case NpadRevision::Revision3:
-        mask = Core::HID::NpadStyleSet::Fullkey | Core::HID::NpadStyleSet::Handheld |
-               Core::HID::NpadStyleSet::JoyDual | Core::HID::NpadStyleSet::JoyLeft |
-               Core::HID::NpadStyleSet::JoyRight | Core::HID::NpadStyleSet::Gc |
-               Core::HID::NpadStyleSet::Palma | Core::HID::NpadStyleSet::Lark |
-               Core::HID::NpadStyleSet::HandheldLark | Core::HID::NpadStyleSet::Lucia |
-               Core::HID::NpadStyleSet::Lagoon | Core::HID::NpadStyleSet::Lager |
-               Core::HID::NpadStyleSet::SystemExt | Core::HID::NpadStyleSet::System;
-        break;
-    default:
-        mask = Core::HID::NpadStyleSet::Fullkey | Core::HID::NpadStyleSet::Handheld |
-               Core::HID::NpadStyleSet::JoyDual | Core::HID::NpadStyleSet::JoyLeft |
-               Core::HID::NpadStyleSet::JoyRight | Core::HID::NpadStyleSet::SystemExt |
-               Core::HID::NpadStyleSet::System;
-        break;
-    }
-
-    out_style_set = out_style_set & mask;
-    return ResultSuccess;
-}
-
-Result NPadResource::GetAvailableStyleset(Core::HID::NpadStyleSet& out_style_set, u64 aruid) const {
-    const u64 aruid_index = GetIndexFromAruid(aruid);
-    if (aruid_index >= AruidIndexMax) {
-        return ResultNpadNotConnected;
-    }
-
-    auto& data = state[aruid_index].data;
-    if (!data.GetNpadStatus().is_supported_styleset_set) {
-        return ResultUndefinedStyleset;
-    }
-
-    Core::HID::NpadStyleSet mask{Core::HID::NpadStyleSet::None};
-    out_style_set = data.GetSupportedNpadStyleSet();
-
-    switch (state[aruid_index].npad_revision) {
-    case NpadRevision::Revision1:
-        mask = Core::HID::NpadStyleSet::Fullkey | Core::HID::NpadStyleSet::Handheld |
-               Core::HID::NpadStyleSet::JoyDual | Core::HID::NpadStyleSet::JoyLeft |
-               Core::HID::NpadStyleSet::JoyRight | Core::HID::NpadStyleSet::Gc |
-               Core::HID::NpadStyleSet::Palma | Core::HID::NpadStyleSet::SystemExt |
-               Core::HID::NpadStyleSet::System;
-        break;
-    case NpadRevision::Revision2:
-        mask = Core::HID::NpadStyleSet::Fullkey | Core::HID::NpadStyleSet::Handheld |
-               Core::HID::NpadStyleSet::JoyDual | Core::HID::NpadStyleSet::JoyLeft |
-               Core::HID::NpadStyleSet::JoyRight | Core::HID::NpadStyleSet::Gc |
-               Core::HID::NpadStyleSet::Palma | Core::HID::NpadStyleSet::Lark |
-               Core::HID::NpadStyleSet::SystemExt | Core::HID::NpadStyleSet::System;
-        break;
-    case NpadRevision::Revision3:
-        mask = Core::HID::NpadStyleSet::Fullkey | Core::HID::NpadStyleSet::Handheld |
-               Core::HID::NpadStyleSet::JoyDual | Core::HID::NpadStyleSet::JoyLeft |
-               Core::HID::NpadStyleSet::JoyRight | Core::HID::NpadStyleSet::Gc |
-               Core::HID::NpadStyleSet::Palma | Core::HID::NpadStyleSet::Lark |
-               Core::HID::NpadStyleSet::HandheldLark | Core::HID::NpadStyleSet::Lucia |
-               Core::HID::NpadStyleSet::Lagoon | Core::HID::NpadStyleSet::Lager |
-               Core::HID::NpadStyleSet::SystemExt | Core::HID::NpadStyleSet::System;
-        break;
-    default:
-        mask = Core::HID::NpadStyleSet::Fullkey | Core::HID::NpadStyleSet::Handheld |
-               Core::HID::NpadStyleSet::JoyDual | Core::HID::NpadStyleSet::JoyLeft |
-               Core::HID::NpadStyleSet::JoyRight | Core::HID::NpadStyleSet::SystemExt |
-               Core::HID::NpadStyleSet::System;
-        break;
-    }
-
-    out_style_set = out_style_set & mask;
-    return ResultSuccess;
-}
-
-NpadRevision NPadResource::GetNpadRevision(u64 aruid) const {
-    const u64 aruid_index = GetIndexFromAruid(aruid);
-    if (aruid_index >= AruidIndexMax) {
-        return NpadRevision::Revision0;
-    }
-
-    return state[aruid_index].npad_revision;
-}
-
-Result NPadResource::IsSupportedNpadStyleSet(bool& is_set, u64 aruid) {
-    const u64 aruid_index = GetIndexFromAruid(aruid);
-    if (aruid_index >= AruidIndexMax) {
-        return ResultNpadNotConnected;
-    }
-
-    is_set = state[aruid_index].data.GetNpadStatus().is_supported_styleset_set.Value() != 0;
-    return ResultSuccess;
-}
-
-Result NPadResource::SetNpadJoyHoldType(u64 aruid, NpadJoyHoldType hold_type) {
-    const u64 aruid_index = GetIndexFromAruid(aruid);
-    if (aruid_index >= AruidIndexMax) {
-        return ResultNpadNotConnected;
-    }
-
-    state[aruid_index].data.SetNpadJoyHoldType(hold_type);
-    if (active_data_aruid == aruid) {
-        active_data.SetNpadJoyHoldType(hold_type);
-    }
-    return ResultSuccess;
-}
-
-Result NPadResource::GetNpadJoyHoldType(NpadJoyHoldType& hold_type, u64 aruid) const {
-    const u64 aruid_index = GetIndexFromAruid(aruid);
-    if (aruid_index >= AruidIndexMax) {
-        return ResultNpadNotConnected;
-    }
-
-    auto& data = state[aruid_index].data;
-    if (data.GetNpadStatus().is_policy || data.GetNpadStatus().is_full_policy) {
-        hold_type = active_data.GetNpadJoyHoldType();
-        return ResultSuccess;
-    }
-    hold_type = data.GetNpadJoyHoldType();
-    return ResultSuccess;
-}
-
-Result NPadResource::SetNpadHandheldActivationMode(u64 aruid,
-                                                   NpadHandheldActivationMode activation_mode) {
-    const u64 aruid_index = GetIndexFromAruid(aruid);
-    if (aruid_index >= AruidIndexMax) {
-        return ResultNpadNotConnected;
-    }
-
-    state[aruid_index].data.SetHandheldActivationMode(activation_mode);
-    if (active_data_aruid == aruid) {
-        active_data.SetHandheldActivationMode(activation_mode);
-    }
-    return ResultSuccess;
-}
-
-Result NPadResource::GetNpadHandheldActivationMode(NpadHandheldActivationMode& activation_mode,
-                                                   u64 aruid) const {
-    const u64 aruid_index = GetIndexFromAruid(aruid);
-    if (aruid_index >= AruidIndexMax) {
-        return ResultNpadNotConnected;
-    }
-
-    activation_mode = state[aruid_index].data.GetHandheldActivationMode();
-    return ResultSuccess;
-}
-
-Result NPadResource::SetSupportedNpadIdType(
-    u64 aruid, std::span<const Core::HID::NpadIdType> supported_npad_list) {
-    const u64 aruid_index = GetIndexFromAruid(aruid);
-    if (aruid_index >= AruidIndexMax) {
-        return ResultNpadNotConnected;
-    }
-    if (supported_npad_list.size() > MaxSupportedNpadIdTypes) {
-        return ResultInvalidArraySize;
-    }
-
-    Result result = state[aruid_index].data.SetSupportedNpadIdType(supported_npad_list);
-    if (result.IsSuccess() && active_data_aruid == aruid) {
-        result = active_data.SetSupportedNpadIdType(supported_npad_list);
-    }
-
-    return result;
-}
-
-bool NPadResource::IsControllerSupported(u64 aruid, Core::HID::NpadStyleIndex style_index) const {
-    const u64 aruid_index = GetIndexFromAruid(aruid);
-    if (aruid_index >= AruidIndexMax) {
-        return false;
-    }
-    return state[aruid_index].data.IsNpadStyleIndexSupported(style_index);
-}
-
-Result NPadResource::SetLrAssignmentMode(u64 aruid, bool is_enabled) {
-    const u64 aruid_index = GetIndexFromAruid(aruid);
-    if (aruid_index >= AruidIndexMax) {
-        return ResultNpadNotConnected;
-    }
-
-    state[aruid_index].data.SetLrAssignmentMode(is_enabled);
-    if (active_data_aruid == aruid) {
-        active_data.SetLrAssignmentMode(is_enabled);
-    }
-    return ResultSuccess;
-}
-
-Result NPadResource::GetLrAssignmentMode(bool& is_enabled, u64 aruid) const {
-    const u64 aruid_index = GetIndexFromAruid(aruid);
-    if (aruid_index >= AruidIndexMax) {
-        return ResultNpadNotConnected;
-    }
-
-    is_enabled = state[aruid_index].data.GetLrAssignmentMode();
-    return ResultSuccess;
-}
-
-Result NPadResource::SetAssigningSingleOnSlSrPress(u64 aruid, bool is_enabled) {
-    const u64 aruid_index = GetIndexFromAruid(aruid);
-    if (aruid_index >= AruidIndexMax) {
-        return ResultNpadNotConnected;
-    }
-
-    state[aruid_index].data.SetAssigningSingleOnSlSrPress(is_enabled);
-    if (active_data_aruid == aruid) {
-        active_data.SetAssigningSingleOnSlSrPress(is_enabled);
-    }
-    return ResultSuccess;
-}
-
-Result NPadResource::IsAssigningSingleOnSlSrPressEnabled(bool& is_enabled, u64 aruid) const {
-    const u64 aruid_index = GetIndexFromAruid(aruid);
-    if (aruid_index >= AruidIndexMax) {
-        return ResultNpadNotConnected;
-    }
-
-    is_enabled = state[aruid_index].data.GetAssigningSingleOnSlSrPress();
-    return ResultSuccess;
-}
-
-Result NPadResource::AcquireNpadStyleSetUpdateEventHandle(u64 aruid,
-                                                          Kernel::KReadableEvent** out_event,
-                                                          Core::HID::NpadIdType npad_id) {
-    const u64 aruid_index = GetIndexFromAruid(aruid);
-    if (aruid_index >= AruidIndexMax) {
-        return ResultNpadNotConnected;
-    }
-
-    auto& controller_state = state[aruid_index].controller_state[NpadIdTypeToIndex(npad_id)];
-    if (!controller_state.is_styleset_update_event_initialized) {
-        // Auto clear = true
-        controller_state.style_set_update_event =
-            service_context.CreateEvent("NpadResource:StylesetUpdateEvent");
-
-        // Assume creating the event succeeds otherwise crash the system here
-        controller_state.is_styleset_update_event_initialized = true;
-    }
-
-    *out_event = &controller_state.style_set_update_event->GetReadableEvent();
-
-    if (controller_state.is_styleset_update_event_initialized) {
-        controller_state.style_set_update_event->Signal();
-    }
-
-    return ResultSuccess;
-}
-
-Result NPadResource::SignalStyleSetUpdateEvent(u64 aruid, Core::HID::NpadIdType npad_id) {
-    const u64 aruid_index = GetIndexFromAruid(aruid);
-    if (aruid_index >= AruidIndexMax) {
-        return ResultNpadNotConnected;
-    }
-    auto controller = state[aruid_index].controller_state[NpadIdTypeToIndex(npad_id)];
-    if (controller.is_styleset_update_event_initialized) {
-        controller.style_set_update_event->Signal();
-    }
-    return ResultSuccess;
-}
-
-Result NPadResource::GetHomeProtectionEnabled(bool& is_enabled, u64 aruid,
-                                              Core::HID::NpadIdType npad_id) const {
-    const u64 aruid_index = GetIndexFromAruid(aruid);
-    if (aruid_index >= AruidIndexMax) {
-        return ResultNpadNotConnected;
-    }
-
-    is_enabled = state[aruid_index].data.GetHomeProtectionEnabled(npad_id);
-    return ResultSuccess;
-}
-
-Result NPadResource::SetHomeProtectionEnabled(u64 aruid, Core::HID::NpadIdType npad_id,
-                                              bool is_enabled) {
-    const u64 aruid_index = GetIndexFromAruid(aruid);
-    if (aruid_index >= AruidIndexMax) {
-        return ResultNpadNotConnected;
-    }
-
-    state[aruid_index].data.SetHomeProtectionEnabled(is_enabled, npad_id);
-    if (active_data_aruid == aruid) {
-        active_data.SetHomeProtectionEnabled(is_enabled, npad_id);
-    }
-    return ResultSuccess;
-}
-
-Result NPadResource::SetNpadAnalogStickUseCenterClamp(u64 aruid, bool is_enabled) {
-    const u64 aruid_index = GetIndexFromAruid(aruid);
-    if (aruid_index >= AruidIndexMax) {
-        return ResultNpadNotConnected;
-    }
-
-    state[aruid_index].data.SetNpadAnalogStickUseCenterClamp(is_enabled);
-    if (active_data_aruid == aruid) {
-        active_data.SetNpadAnalogStickUseCenterClamp(is_enabled);
-    }
-    return ResultSuccess;
-}
-
-Result NPadResource::SetButtonConfig(u64 aruid, Core::HID::NpadIdType npad_id, std::size_t index,
-                                     Core::HID::NpadButton button_config) {
-    const u64 aruid_index = GetIndexFromAruid(aruid);
-    if (aruid_index >= AruidIndexMax) {
-        return ResultNpadNotConnected;
-    }
-
-    state[aruid_index].button_config[NpadIdTypeToIndex(npad_id)][index] = button_config;
-    return ResultSuccess;
-}
-
-Core::HID::NpadButton NPadResource::GetButtonConfig(u64 aruid, Core::HID::NpadIdType npad_id,
-                                                    std::size_t index, Core::HID::NpadButton mask,
-                                                    bool is_enabled) {
-    const u64 aruid_index = GetIndexFromAruid(aruid);
-    if (aruid_index >= AruidIndexMax) {
-        return Core::HID::NpadButton::None;
-    }
-
-    auto& button_config = state[aruid_index].button_config[NpadIdTypeToIndex(npad_id)][index];
-    if (is_enabled) {
-        button_config = button_config | mask;
-        return button_config;
-    }
-
-    button_config = Core::HID::NpadButton::None;
-    return Core::HID::NpadButton::None;
-}
-
-void NPadResource::ResetButtonConfig() {
-    for (auto& selected_state : state) {
-        selected_state.button_config = {};
-    }
-}
-
-Result NPadResource::SetNpadCaptureButtonAssignment(u64 aruid,
-                                                    Core::HID::NpadStyleSet npad_style_set,
-                                                    Core::HID::NpadButton button_assignment) {
-    const u64 aruid_index = GetIndexFromAruid(aruid);
-    if (aruid_index >= AruidIndexMax) {
-        return ResultNpadNotConnected;
-    }
-
-    // Must be a power of two
-    const auto raw_styleset = static_cast<u32>(npad_style_set);
-    if (raw_styleset == 0 && (raw_styleset & (raw_styleset - 1)) != 0) {
-        return ResultMultipleStyleSetSelected;
-    }
-
-    std::size_t style_index{};
-    Core::HID::NpadStyleSet style_selected{};
-    for (style_index = 0; style_index < StyleIndexCount; ++style_index) {
-        style_selected = GetStylesetByIndex(style_index);
-        if (npad_style_set == style_selected) {
-            break;
-        }
-    }
-
-    if (style_selected == Core::HID::NpadStyleSet::None) {
-        return ResultMultipleStyleSetSelected;
-    }
-
-    state[aruid_index].data.SetCaptureButtonAssignment(button_assignment, style_index);
-    if (active_data_aruid == aruid) {
-        active_data.SetCaptureButtonAssignment(button_assignment, style_index);
-    }
-    return ResultSuccess;
-}
-
-Result NPadResource::ClearNpadCaptureButtonAssignment(u64 aruid) {
-    const u64 aruid_index = GetIndexFromAruid(aruid);
-    if (aruid_index >= AruidIndexMax) {
-        return ResultNpadNotConnected;
-    }
-
-    for (std::size_t i = 0; i < StyleIndexCount; i++) {
-        state[aruid_index].data.SetCaptureButtonAssignment(Core::HID::NpadButton::None, i);
-        if (active_data_aruid == aruid) {
-            active_data.SetCaptureButtonAssignment(Core::HID::NpadButton::None, i);
-        }
-    }
-    return ResultSuccess;
-}
-
-std::size_t NPadResource::GetNpadCaptureButtonAssignment(std::span<Core::HID::NpadButton> out_list,
-                                                         u64 aruid) const {
-    const u64 aruid_index = GetIndexFromAruid(aruid);
-    if (aruid_index >= AruidIndexMax) {
-        return 0;
-    }
-    return state[aruid_index].data.GetNpadCaptureButtonAssignmentList(out_list);
-}
-
-void NPadResource::SetNpadRevision(u64 aruid, NpadRevision revision) {
-    const u64 aruid_index = GetIndexFromAruid(aruid);
-    if (aruid_index >= AruidIndexMax) {
-        return;
-    }
-
-    state[aruid_index].npad_revision = revision;
-}
-
-Result NPadResource::SetNpadSystemExtStateEnabled(u64 aruid, bool is_enabled) {
-    const u64 aruid_index = GetIndexFromAruid(aruid);
-    if (aruid_index >= AruidIndexMax) {
-        return ResultNpadNotConnected;
-    }
-
-    state[aruid_index].data.SetNpadAnalogStickUseCenterClamp(is_enabled);
-    if (active_data_aruid == aruid) {
-        active_data.SetNpadAnalogStickUseCenterClamp(is_enabled);
-    }
-    return ResultSuccess;
-}
-
-} // namespace Service::HID
diff --git a/src/core/hle/service/hid/controllers/npad/npad_resource.h b/src/core/hle/service/hid/controllers/npad/npad_resource.h
deleted file mode 100644
index 4c7e6ab0e..000000000
--- a/src/core/hle/service/hid/controllers/npad/npad_resource.h
+++ /dev/null
@@ -1,132 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#pragma once
-
-#include <array>
-#include <mutex>
-#include <span>
-
-#include "common/common_types.h"
-#include "core/hid/hid_types.h"
-#include "core/hle/result.h"
-#include "core/hle/service/hid/controllers/applet_resource.h"
-#include "core/hle/service/hid/controllers/npad/npad_data.h"
-#include "core/hle/service/hid/controllers/types/npad_types.h"
-#include "core/hle/service/kernel_helpers.h"
-
-namespace Core {
-class System;
-}
-
-namespace Kernel {
-class KReadableEvent;
-}
-
-namespace Service::HID {
-struct DataStatusFlag;
-
-struct NpadControllerState {
-    bool is_styleset_update_event_initialized{};
-    INSERT_PADDING_BYTES(0x7);
-    Kernel::KEvent* style_set_update_event{nullptr};
-    INSERT_PADDING_BYTES(0x27);
-};
-
-struct NpadState {
-    DataStatusFlag flag{};
-    u64 aruid{};
-    NPadData data{};
-    std::array<std::array<Core::HID::NpadButton, StyleIndexCount>, MaxSupportedNpadIdTypes>
-        button_config;
-    std::array<NpadControllerState, MaxSupportedNpadIdTypes> controller_state;
-    NpadRevision npad_revision;
-};
-
-/// Handles Npad request from HID interfaces
-class NPadResource final {
-public:
-    explicit NPadResource(KernelHelpers::ServiceContext& context);
-    ~NPadResource();
-
-    NPadData* GetActiveData();
-    u64 GetActiveDataAruid();
-
-    Result RegisterAppletResourceUserId(u64 aruid);
-    void UnregisterAppletResourceUserId(u64 aruid);
-
-    void DestroyStyleSetUpdateEvents(u64 aruid);
-
-    Result Activate(u64 aruid);
-    Result Activate();
-    Result Deactivate();
-
-    void SetAppletResourceUserId(u64 aruid);
-    std::size_t GetIndexFromAruid(u64 aruid) const;
-
-    Result ApplyNpadSystemCommonPolicy(u64 aruid, bool is_full_policy);
-    Result ClearNpadSystemCommonPolicy(u64 aruid);
-
-    Result SetSupportedNpadStyleSet(u64 aruid, Core::HID::NpadStyleSet style_set);
-    Result GetSupportedNpadStyleSet(Core::HID::NpadStyleSet& out_style_Set, u64 aruid) const;
-    Result GetMaskedSupportedNpadStyleSet(Core::HID::NpadStyleSet& out_style_set, u64 aruid) const;
-    Result GetAvailableStyleset(Core::HID::NpadStyleSet& out_style_set, u64 aruid) const;
-
-    NpadRevision GetNpadRevision(u64 aruid) const;
-    void SetNpadRevision(u64 aruid, NpadRevision revision);
-
-    Result IsSupportedNpadStyleSet(bool& is_set, u64 aruid);
-
-    Result SetNpadJoyHoldType(u64 aruid, NpadJoyHoldType hold_type);
-    Result GetNpadJoyHoldType(NpadJoyHoldType& hold_type, u64 aruid) const;
-
-    Result SetNpadHandheldActivationMode(u64 aruid, NpadHandheldActivationMode activation_mode);
-    Result GetNpadHandheldActivationMode(NpadHandheldActivationMode& activation_mode,
-                                         u64 aruid) const;
-
-    Result SetSupportedNpadIdType(u64 aruid,
-                                  std::span<const Core::HID::NpadIdType> supported_npad_list);
-    bool IsControllerSupported(u64 aruid, Core::HID::NpadStyleIndex style_index) const;
-
-    Result SetLrAssignmentMode(u64 aruid, bool is_enabled);
-    Result GetLrAssignmentMode(bool& is_enabled, u64 aruid) const;
-
-    Result SetAssigningSingleOnSlSrPress(u64 aruid, bool is_enabled);
-    Result IsAssigningSingleOnSlSrPressEnabled(bool& is_enabled, u64 aruid) const;
-
-    Result AcquireNpadStyleSetUpdateEventHandle(u64 aruid, Kernel::KReadableEvent** out_event,
-                                                Core::HID::NpadIdType npad_id);
-    Result SignalStyleSetUpdateEvent(u64 aruid, Core::HID::NpadIdType npad_id);
-
-    Result GetHomeProtectionEnabled(bool& is_enabled, u64 aruid,
-                                    Core::HID::NpadIdType npad_id) const;
-    Result SetHomeProtectionEnabled(u64 aruid, Core::HID::NpadIdType npad_id, bool is_enabled);
-
-    Result SetNpadAnalogStickUseCenterClamp(u64 aruid, bool is_enabled);
-
-    Result SetButtonConfig(u64 aruid, Core::HID::NpadIdType npad_id, std::size_t index,
-                           Core::HID::NpadButton button_config);
-    Core::HID::NpadButton GetButtonConfig(u64 aruid, Core::HID::NpadIdType npad_id,
-                                          std::size_t index, Core::HID::NpadButton mask,
-                                          bool is_enabled);
-    void ResetButtonConfig();
-
-    Result SetNpadCaptureButtonAssignment(u64 aruid, Core::HID::NpadStyleSet npad_style_set,
-                                          Core::HID::NpadButton button_assignment);
-    Result ClearNpadCaptureButtonAssignment(u64 aruid);
-    std::size_t GetNpadCaptureButtonAssignment(std::span<Core::HID::NpadButton> out_list,
-                                               u64 aruid) const;
-
-    Result SetNpadSystemExtStateEnabled(u64 aruid, bool is_enabled);
-
-private:
-    NPadData active_data{};
-    AruidRegisterList registration_list{};
-    std::array<NpadState, AruidIndexMax> state{};
-    u64 active_data_aruid{};
-    NpadJoyHoldType default_hold_type{};
-    s32 ref_counter{};
-
-    KernelHelpers::ServiceContext& service_context;
-};
-} // namespace Service::HID
diff --git a/src/core/hle/service/hid/controllers/palma.cpp b/src/core/hle/service/hid/controllers/palma.cpp
deleted file mode 100644
index aa0454b5e..000000000
--- a/src/core/hle/service/hid/controllers/palma.cpp
+++ /dev/null
@@ -1,226 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "core/core_timing.h"
-#include "core/hid/emulated_controller.h"
-#include "core/hid/hid_core.h"
-#include "core/hid/hid_types.h"
-#include "core/hle/kernel/k_event.h"
-#include "core/hle/kernel/k_readable_event.h"
-#include "core/hle/service/hid/controllers/palma.h"
-#include "core/hle/service/kernel_helpers.h"
-
-namespace Service::HID {
-
-Palma::Palma(Core::HID::HIDCore& hid_core_, KernelHelpers::ServiceContext& service_context_)
-    : ControllerBase{hid_core_}, service_context{service_context_} {
-    controller = hid_core.GetEmulatedController(Core::HID::NpadIdType::Other);
-    operation_complete_event = service_context.CreateEvent("hid:PalmaOperationCompleteEvent");
-}
-
-Palma::~Palma() {
-    service_context.CloseEvent(operation_complete_event);
-};
-
-void Palma::OnInit() {}
-
-void Palma::OnRelease() {}
-
-void Palma::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
-    if (!IsControllerActivated()) {
-        return;
-    }
-}
-
-Result Palma::GetPalmaConnectionHandle(Core::HID::NpadIdType npad_id,
-                                       PalmaConnectionHandle& handle) {
-    active_handle.npad_id = npad_id;
-    handle = active_handle;
-    return ResultSuccess;
-}
-
-Result Palma::InitializePalma(const PalmaConnectionHandle& handle) {
-    if (handle.npad_id != active_handle.npad_id) {
-        return InvalidPalmaHandle;
-    }
-    Activate();
-    return ResultSuccess;
-}
-
-Kernel::KReadableEvent& Palma::AcquirePalmaOperationCompleteEvent(
-    const PalmaConnectionHandle& handle) const {
-    if (handle.npad_id != active_handle.npad_id) {
-        LOG_ERROR(Service_HID, "Invalid npad id {}", handle.npad_id);
-    }
-    return operation_complete_event->GetReadableEvent();
-}
-
-Result Palma::GetPalmaOperationInfo(const PalmaConnectionHandle& handle,
-                                    PalmaOperationType& operation_type,
-                                    PalmaOperationData& data) const {
-    if (handle.npad_id != active_handle.npad_id) {
-        return InvalidPalmaHandle;
-    }
-    operation_type = operation.operation;
-    data = operation.data;
-    return ResultSuccess;
-}
-
-Result Palma::PlayPalmaActivity(const PalmaConnectionHandle& handle, u64 palma_activity) {
-    if (handle.npad_id != active_handle.npad_id) {
-        return InvalidPalmaHandle;
-    }
-    operation.operation = PalmaOperationType::PlayActivity;
-    operation.result = PalmaResultSuccess;
-    operation.data = {};
-    operation_complete_event->Signal();
-    return ResultSuccess;
-}
-
-Result Palma::SetPalmaFrModeType(const PalmaConnectionHandle& handle, PalmaFrModeType fr_mode_) {
-    if (handle.npad_id != active_handle.npad_id) {
-        return InvalidPalmaHandle;
-    }
-    fr_mode = fr_mode_;
-    return ResultSuccess;
-}
-
-Result Palma::ReadPalmaStep(const PalmaConnectionHandle& handle) {
-    if (handle.npad_id != active_handle.npad_id) {
-        return InvalidPalmaHandle;
-    }
-    operation.operation = PalmaOperationType::ReadStep;
-    operation.result = PalmaResultSuccess;
-    operation.data = {};
-    operation_complete_event->Signal();
-    return ResultSuccess;
-}
-
-Result Palma::EnablePalmaStep(const PalmaConnectionHandle& handle, bool is_enabled) {
-    if (handle.npad_id != active_handle.npad_id) {
-        return InvalidPalmaHandle;
-    }
-    return ResultSuccess;
-}
-
-Result Palma::ResetPalmaStep(const PalmaConnectionHandle& handle) {
-    if (handle.npad_id != active_handle.npad_id) {
-        return InvalidPalmaHandle;
-    }
-    return ResultSuccess;
-}
-
-void Palma::ReadPalmaApplicationSection() {}
-
-void Palma::WritePalmaApplicationSection() {}
-
-Result Palma::ReadPalmaUniqueCode(const PalmaConnectionHandle& handle) {
-    if (handle.npad_id != active_handle.npad_id) {
-        return InvalidPalmaHandle;
-    }
-    operation.operation = PalmaOperationType::ReadUniqueCode;
-    operation.result = PalmaResultSuccess;
-    operation.data = {};
-    operation_complete_event->Signal();
-    return ResultSuccess;
-}
-
-Result Palma::SetPalmaUniqueCodeInvalid(const PalmaConnectionHandle& handle) {
-    if (handle.npad_id != active_handle.npad_id) {
-        return InvalidPalmaHandle;
-    }
-    operation.operation = PalmaOperationType::SetUniqueCodeInvalid;
-    operation.result = PalmaResultSuccess;
-    operation.data = {};
-    operation_complete_event->Signal();
-    return ResultSuccess;
-}
-
-void Palma::WritePalmaActivityEntry() {}
-
-Result Palma::WritePalmaRgbLedPatternEntry(const PalmaConnectionHandle& handle, u64 unknown) {
-    if (handle.npad_id != active_handle.npad_id) {
-        return InvalidPalmaHandle;
-    }
-    operation.operation = PalmaOperationType::WriteRgbLedPatternEntry;
-    operation.result = PalmaResultSuccess;
-    operation.data = {};
-    operation_complete_event->Signal();
-    return ResultSuccess;
-}
-
-Result Palma::WritePalmaWaveEntry(const PalmaConnectionHandle& handle, PalmaWaveSet wave,
-                                  Common::ProcessAddress t_mem, u64 size) {
-    if (handle.npad_id != active_handle.npad_id) {
-        return InvalidPalmaHandle;
-    }
-    operation.operation = PalmaOperationType::WriteWaveEntry;
-    operation.result = PalmaResultSuccess;
-    operation.data = {};
-    operation_complete_event->Signal();
-    return ResultSuccess;
-}
-
-Result Palma::SetPalmaDataBaseIdentificationVersion(const PalmaConnectionHandle& handle,
-                                                    s32 database_id_version_) {
-    if (handle.npad_id != active_handle.npad_id) {
-        return InvalidPalmaHandle;
-    }
-    database_id_version = database_id_version_;
-    operation.operation = PalmaOperationType::ReadDataBaseIdentificationVersion;
-    operation.result = PalmaResultSuccess;
-    operation.data[0] = {};
-    operation_complete_event->Signal();
-    return ResultSuccess;
-}
-
-Result Palma::GetPalmaDataBaseIdentificationVersion(const PalmaConnectionHandle& handle) {
-    if (handle.npad_id != active_handle.npad_id) {
-        return InvalidPalmaHandle;
-    }
-    operation.operation = PalmaOperationType::ReadDataBaseIdentificationVersion;
-    operation.result = PalmaResultSuccess;
-    operation.data = {};
-    operation.data[0] = static_cast<u8>(database_id_version);
-    operation_complete_event->Signal();
-    return ResultSuccess;
-}
-
-void Palma::SuspendPalmaFeature() {}
-
-Result Palma::GetPalmaOperationResult(const PalmaConnectionHandle& handle) const {
-    if (handle.npad_id != active_handle.npad_id) {
-        return InvalidPalmaHandle;
-    }
-    return operation.result;
-}
-void Palma::ReadPalmaPlayLog() {}
-
-void Palma::ResetPalmaPlayLog() {}
-
-void Palma::SetIsPalmaAllConnectable(bool is_all_connectable) {
-    // If true controllers are able to be paired
-    is_connectable = is_all_connectable;
-}
-
-void Palma::SetIsPalmaPairedConnectable() {}
-
-Result Palma::PairPalma(const PalmaConnectionHandle& handle) {
-    if (handle.npad_id != active_handle.npad_id) {
-        return InvalidPalmaHandle;
-    }
-    // TODO: Do something
-    return ResultSuccess;
-}
-
-void Palma::SetPalmaBoostMode(bool boost_mode) {}
-
-void Palma::CancelWritePalmaWaveEntry() {}
-
-void Palma::EnablePalmaBoostMode() {}
-
-void Palma::GetPalmaBluetoothAddress() {}
-
-void Palma::SetDisallowedPalmaConnection() {}
-
-} // namespace Service::HID
diff --git a/src/core/hle/service/hid/controllers/palma.h b/src/core/hle/service/hid/controllers/palma.h
deleted file mode 100644
index 73884230d..000000000
--- a/src/core/hle/service/hid/controllers/palma.h
+++ /dev/null
@@ -1,162 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include <array>
-#include "common/common_funcs.h"
-#include "common/typed_address.h"
-#include "core/hle/service/hid/controllers/controller_base.h"
-#include "core/hle/service/hid/errors.h"
-
-namespace Kernel {
-class KEvent;
-class KReadableEvent;
-} // namespace Kernel
-
-namespace Service::KernelHelpers {
-class ServiceContext;
-}
-
-namespace Core::HID {
-class EmulatedController;
-} // namespace Core::HID
-
-namespace Service::HID {
-class Palma final : public ControllerBase {
-public:
-    using PalmaOperationData = std::array<u8, 0x140>;
-
-    // This is nn::hid::PalmaOperationType
-    enum class PalmaOperationType {
-        PlayActivity,
-        SetFrModeType,
-        ReadStep,
-        EnableStep,
-        ResetStep,
-        ReadApplicationSection,
-        WriteApplicationSection,
-        ReadUniqueCode,
-        SetUniqueCodeInvalid,
-        WriteActivityEntry,
-        WriteRgbLedPatternEntry,
-        WriteWaveEntry,
-        ReadDataBaseIdentificationVersion,
-        WriteDataBaseIdentificationVersion,
-        SuspendFeature,
-        ReadPlayLog,
-        ResetPlayLog,
-    };
-
-    // This is nn::hid::PalmaWaveSet
-    enum class PalmaWaveSet : u64 {
-        Small,
-        Medium,
-        Large,
-    };
-
-    // This is nn::hid::PalmaFrModeType
-    enum class PalmaFrModeType : u64 {
-        Off,
-        B01,
-        B02,
-        B03,
-        Downloaded,
-    };
-
-    // This is nn::hid::PalmaFeature
-    enum class PalmaFeature : u64 {
-        FrMode,
-        RumbleFeedback,
-        Step,
-        MuteSwitch,
-    };
-
-    // This is nn::hid::PalmaOperationInfo
-    struct PalmaOperationInfo {
-        PalmaOperationType operation{};
-        Result result{PalmaResultSuccess};
-        PalmaOperationData data{};
-    };
-    static_assert(sizeof(PalmaOperationInfo) == 0x148, "PalmaOperationInfo is an invalid size");
-
-    // This is nn::hid::PalmaActivityEntry
-    struct PalmaActivityEntry {
-        u32 rgb_led_pattern_index;
-        INSERT_PADDING_BYTES(2);
-        PalmaWaveSet wave_set;
-        u32 wave_index;
-        INSERT_PADDING_BYTES(12);
-    };
-    static_assert(sizeof(PalmaActivityEntry) == 0x20, "PalmaActivityEntry is an invalid size");
-
-    struct PalmaConnectionHandle {
-        Core::HID::NpadIdType npad_id;
-        INSERT_PADDING_BYTES(4); // Unknown
-    };
-    static_assert(sizeof(PalmaConnectionHandle) == 0x8,
-                  "PalmaConnectionHandle has incorrect size.");
-
-    explicit Palma(Core::HID::HIDCore& hid_core_, KernelHelpers::ServiceContext& service_context_);
-    ~Palma() override;
-
-    // Called when the controller is initialized
-    void OnInit() override;
-
-    // When the controller is released
-    void OnRelease() override;
-
-    // When the controller is requesting an update for the shared memory
-    void OnUpdate(const Core::Timing::CoreTiming& core_timing) override;
-
-    Result GetPalmaConnectionHandle(Core::HID::NpadIdType npad_id, PalmaConnectionHandle& handle);
-    Result InitializePalma(const PalmaConnectionHandle& handle);
-    Kernel::KReadableEvent& AcquirePalmaOperationCompleteEvent(
-        const PalmaConnectionHandle& handle) const;
-    Result GetPalmaOperationInfo(const PalmaConnectionHandle& handle,
-                                 PalmaOperationType& operation_type,
-                                 PalmaOperationData& data) const;
-    Result PlayPalmaActivity(const PalmaConnectionHandle& handle, u64 palma_activity);
-    Result SetPalmaFrModeType(const PalmaConnectionHandle& handle, PalmaFrModeType fr_mode_);
-    Result ReadPalmaStep(const PalmaConnectionHandle& handle);
-    Result EnablePalmaStep(const PalmaConnectionHandle& handle, bool is_enabled);
-    Result ResetPalmaStep(const PalmaConnectionHandle& handle);
-    Result ReadPalmaUniqueCode(const PalmaConnectionHandle& handle);
-    Result SetPalmaUniqueCodeInvalid(const PalmaConnectionHandle& handle);
-    Result WritePalmaRgbLedPatternEntry(const PalmaConnectionHandle& handle, u64 unknown);
-    Result WritePalmaWaveEntry(const PalmaConnectionHandle& handle, PalmaWaveSet wave,
-                               Common::ProcessAddress t_mem, u64 size);
-    Result SetPalmaDataBaseIdentificationVersion(const PalmaConnectionHandle& handle,
-                                                 s32 database_id_version_);
-    Result GetPalmaDataBaseIdentificationVersion(const PalmaConnectionHandle& handle);
-    Result GetPalmaOperationResult(const PalmaConnectionHandle& handle) const;
-    void SetIsPalmaAllConnectable(bool is_all_connectable);
-    Result PairPalma(const PalmaConnectionHandle& handle);
-    void SetPalmaBoostMode(bool boost_mode);
-
-private:
-    void ReadPalmaApplicationSection();
-    void WritePalmaApplicationSection();
-    void WritePalmaActivityEntry();
-    void SuspendPalmaFeature();
-    void ReadPalmaPlayLog();
-    void ResetPalmaPlayLog();
-    void SetIsPalmaPairedConnectable();
-    void CancelWritePalmaWaveEntry();
-    void EnablePalmaBoostMode();
-    void GetPalmaBluetoothAddress();
-    void SetDisallowedPalmaConnection();
-
-    bool is_connectable{};
-    s32 database_id_version{};
-    PalmaOperationInfo operation{};
-    PalmaFrModeType fr_mode{};
-    PalmaConnectionHandle active_handle{};
-
-    Core::HID::EmulatedController* controller;
-
-    Kernel::KEvent* operation_complete_event;
-    KernelHelpers::ServiceContext& service_context;
-};
-
-} // namespace Service::HID
diff --git a/src/core/hle/service/hid/controllers/seven_six_axis.cpp b/src/core/hle/service/hid/controllers/seven_six_axis.cpp
deleted file mode 100644
index 495568484..000000000
--- a/src/core/hle/service/hid/controllers/seven_six_axis.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#include <cstring>
-#include "common/common_types.h"
-#include "core/core.h"
-#include "core/core_timing.h"
-#include "core/frontend/emu_window.h"
-#include "core/hid/emulated_console.h"
-#include "core/hid/emulated_devices.h"
-#include "core/hid/hid_core.h"
-#include "core/hle/service/hid/controllers/seven_six_axis.h"
-#include "core/memory.h"
-
-namespace Service::HID {
-SevenSixAxis::SevenSixAxis(Core::System& system_)
-    : ControllerBase{system_.HIDCore()}, system{system_} {
-    console = hid_core.GetEmulatedConsole();
-}
-
-SevenSixAxis::~SevenSixAxis() = default;
-
-void SevenSixAxis::OnInit() {}
-void SevenSixAxis::OnRelease() {}
-
-void SevenSixAxis::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
-    if (!IsControllerActivated() || transfer_memory == 0) {
-        seven_sixaxis_lifo.buffer_count = 0;
-        seven_sixaxis_lifo.buffer_tail = 0;
-        return;
-    }
-
-    const auto& last_entry = seven_sixaxis_lifo.ReadCurrentEntry().state;
-    next_seven_sixaxis_state.sampling_number = last_entry.sampling_number + 1;
-
-    const auto motion_status = console->GetMotion();
-    last_global_timestamp = core_timing.GetGlobalTimeNs().count();
-
-    // This value increments every time the switch goes to sleep
-    next_seven_sixaxis_state.unknown = 1;
-    next_seven_sixaxis_state.timestamp = last_global_timestamp - last_saved_timestamp;
-    next_seven_sixaxis_state.accel = motion_status.accel;
-    next_seven_sixaxis_state.gyro = motion_status.gyro;
-    next_seven_sixaxis_state.quaternion = {
-        {
-            motion_status.quaternion.xyz.y,
-            motion_status.quaternion.xyz.x,
-            -motion_status.quaternion.w,
-        },
-        -motion_status.quaternion.xyz.z,
-    };
-
-    seven_sixaxis_lifo.WriteNextEntry(next_seven_sixaxis_state);
-    system.ApplicationMemory().WriteBlock(transfer_memory, &seven_sixaxis_lifo,
-                                          sizeof(seven_sixaxis_lifo));
-}
-
-void SevenSixAxis::SetTransferMemoryAddress(Common::ProcessAddress t_mem) {
-    transfer_memory = t_mem;
-}
-
-void SevenSixAxis::ResetTimestamp() {
-    last_saved_timestamp = last_global_timestamp;
-}
-
-} // namespace Service::HID
diff --git a/src/core/hle/service/hid/controllers/seven_six_axis.h b/src/core/hle/service/hid/controllers/seven_six_axis.h
deleted file mode 100644
index 40e3f5d12..000000000
--- a/src/core/hle/service/hid/controllers/seven_six_axis.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#pragma once
-
-#include "common/common_types.h"
-#include "common/quaternion.h"
-#include "common/typed_address.h"
-#include "core/hle/service/hid/controllers/controller_base.h"
-#include "core/hle/service/hid/ring_lifo.h"
-
-namespace Core {
-class System;
-} // namespace Core
-
-namespace Core::HID {
-class EmulatedConsole;
-} // namespace Core::HID
-
-namespace Service::HID {
-class SevenSixAxis final : public ControllerBase {
-public:
-    explicit SevenSixAxis(Core::System& system_);
-    ~SevenSixAxis() override;
-
-    // Called when the controller is initialized
-    void OnInit() override;
-
-    // When the controller is released
-    void OnRelease() override;
-
-    // When the controller is requesting an update for the shared memory
-    void OnUpdate(const Core::Timing::CoreTiming& core_timing) override;
-
-    // Called on InitializeSevenSixAxisSensor
-    void SetTransferMemoryAddress(Common::ProcessAddress t_mem);
-
-    // Called on ResetSevenSixAxisSensorTimestamp
-    void ResetTimestamp();
-
-private:
-    struct SevenSixAxisState {
-        INSERT_PADDING_WORDS(2); // unused
-        u64 timestamp{};
-        u64 sampling_number{};
-        u64 unknown{};
-        Common::Vec3f accel{};
-        Common::Vec3f gyro{};
-        Common::Quaternion<f32> quaternion{};
-    };
-    static_assert(sizeof(SevenSixAxisState) == 0x48, "SevenSixAxisState is an invalid size");
-
-    Lifo<SevenSixAxisState, 0x21> seven_sixaxis_lifo{};
-    static_assert(sizeof(seven_sixaxis_lifo) == 0xA70, "SevenSixAxisState is an invalid size");
-
-    u64 last_saved_timestamp{};
-    u64 last_global_timestamp{};
-
-    SevenSixAxisState next_seven_sixaxis_state{};
-    Common::ProcessAddress transfer_memory{};
-    Core::HID::EmulatedConsole* console = nullptr;
-
-    Core::System& system;
-};
-} // namespace Service::HID
diff --git a/src/core/hle/service/hid/controllers/shared_memory_holder.cpp b/src/core/hle/service/hid/controllers/shared_memory_holder.cpp
deleted file mode 100644
index 0bc5169c6..000000000
--- a/src/core/hle/service/hid/controllers/shared_memory_holder.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#include "core/core.h"
-#include "core/hle/kernel/k_shared_memory.h"
-#include "core/hle/service/hid/controllers/applet_resource.h"
-#include "core/hle/service/hid/controllers/shared_memory_holder.h"
-#include "core/hle/service/hid/controllers/types/shared_memory_format.h"
-#include "core/hle/service/hid/errors.h"
-
-namespace Service::HID {
-SharedMemoryHolder::SharedMemoryHolder() {}
-
-SharedMemoryHolder::~SharedMemoryHolder() {
-    Finalize();
-}
-
-Result SharedMemoryHolder::Initialize(Core::System& system) {
-    shared_memory = Kernel::KSharedMemory::Create(system.Kernel());
-    const Result result = shared_memory->Initialize(
-        system.DeviceMemory(), nullptr, Kernel::Svc::MemoryPermission::None,
-        Kernel::Svc::MemoryPermission::Read, sizeof(SharedMemoryFormat));
-    if (result.IsError()) {
-        return result;
-    }
-    Kernel::KSharedMemory::Register(system.Kernel(), shared_memory);
-
-    is_created = true;
-    is_mapped = true;
-    address = std::construct_at(reinterpret_cast<SharedMemoryFormat*>(shared_memory->GetPointer()));
-    return ResultSuccess;
-}
-
-void SharedMemoryHolder::Finalize() {
-    if (address != nullptr) {
-        shared_memory->Close();
-    }
-    is_created = false;
-    is_mapped = false;
-    address = nullptr;
-}
-
-bool SharedMemoryHolder::IsMapped() {
-    return is_mapped;
-}
-
-SharedMemoryFormat* SharedMemoryHolder::GetAddress() {
-    return address;
-}
-
-Kernel::KSharedMemory* SharedMemoryHolder::GetHandle() {
-    return shared_memory;
-}
-} // namespace Service::HID
diff --git a/src/core/hle/service/hid/controllers/shared_memory_holder.h b/src/core/hle/service/hid/controllers/shared_memory_holder.h
deleted file mode 100644
index 943407c00..000000000
--- a/src/core/hle/service/hid/controllers/shared_memory_holder.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#pragma once
-
-#include "core/hle/result.h"
-
-namespace Core {
-class System;
-}
-
-namespace Kernel {
-class KSharedMemory;
-}
-
-namespace Service::HID {
-struct SharedMemoryFormat;
-
-// This is nn::hid::detail::SharedMemoryHolder
-class SharedMemoryHolder {
-public:
-    SharedMemoryHolder();
-    ~SharedMemoryHolder();
-
-    Result Initialize(Core::System& system);
-    void Finalize();
-
-    bool IsMapped();
-    SharedMemoryFormat* GetAddress();
-    Kernel::KSharedMemory* GetHandle();
-
-private:
-    bool is_owner{};
-    bool is_created{};
-    bool is_mapped{};
-    INSERT_PADDING_BYTES(0x5);
-    Kernel::KSharedMemory* shared_memory;
-    INSERT_PADDING_BYTES(0x38);
-    SharedMemoryFormat* address = nullptr;
-};
-// Correct size is 0x50 bytes
-static_assert(sizeof(SharedMemoryHolder) == 0x50, "SharedMemoryHolder is an invalid size");
-
-} // namespace Service::HID
diff --git a/src/core/hle/service/hid/controllers/six_axis.cpp b/src/core/hle/service/hid/controllers/six_axis.cpp
deleted file mode 100644
index adab60911..000000000
--- a/src/core/hle/service/hid/controllers/six_axis.cpp
+++ /dev/null
@@ -1,421 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#include "common/common_types.h"
-#include "core/core_timing.h"
-#include "core/hid/emulated_controller.h"
-#include "core/hid/hid_core.h"
-#include "core/hle/service/hid/controllers/npad.h"
-#include "core/hle/service/hid/controllers/six_axis.h"
-#include "core/hle/service/hid/controllers/types/shared_memory_format.h"
-#include "core/hle/service/hid/errors.h"
-#include "core/hle/service/hid/hid_util.h"
-
-namespace Service::HID {
-
-SixAxis::SixAxis(Core::HID::HIDCore& hid_core_, std::shared_ptr<NPad> npad_)
-    : ControllerBase{hid_core_}, npad{npad_} {
-    for (std::size_t i = 0; i < controller_data.size(); ++i) {
-        auto& controller = controller_data[i];
-        controller.device = hid_core.GetEmulatedControllerByIndex(i);
-    }
-}
-
-SixAxis::~SixAxis() = default;
-
-void SixAxis::OnInit() {}
-void SixAxis::OnRelease() {}
-
-void SixAxis::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
-    std::scoped_lock shared_lock{*shared_mutex};
-    const u64 aruid = applet_resource->GetActiveAruid();
-    auto* data = applet_resource->GetAruidData(aruid);
-
-    if (data == nullptr || !data->flag.is_assigned) {
-        return;
-    }
-
-    if (!IsControllerActivated()) {
-        return;
-    }
-
-    for (std::size_t i = 0; i < controller_data.size(); ++i) {
-        NpadSharedMemoryEntry& shared_memory = data->shared_memory_format->npad.npad_entry[i];
-        auto& controller = controller_data[i];
-        const auto& controller_type = controller.device->GetNpadStyleIndex();
-
-        if (controller_type == Core::HID::NpadStyleIndex::None ||
-            !controller.device->IsConnected()) {
-            continue;
-        }
-
-        const auto& motion_state = controller.device->GetMotions();
-        auto& sixaxis_fullkey_state = controller.sixaxis_fullkey_state;
-        auto& sixaxis_handheld_state = controller.sixaxis_handheld_state;
-        auto& sixaxis_dual_left_state = controller.sixaxis_dual_left_state;
-        auto& sixaxis_dual_right_state = controller.sixaxis_dual_right_state;
-        auto& sixaxis_left_lifo_state = controller.sixaxis_left_lifo_state;
-        auto& sixaxis_right_lifo_state = controller.sixaxis_right_lifo_state;
-
-        auto& sixaxis_fullkey_lifo = shared_memory.internal_state.sixaxis_fullkey_lifo;
-        auto& sixaxis_handheld_lifo = shared_memory.internal_state.sixaxis_handheld_lifo;
-        auto& sixaxis_dual_left_lifo = shared_memory.internal_state.sixaxis_dual_left_lifo;
-        auto& sixaxis_dual_right_lifo = shared_memory.internal_state.sixaxis_dual_right_lifo;
-        auto& sixaxis_left_lifo = shared_memory.internal_state.sixaxis_left_lifo;
-        auto& sixaxis_right_lifo = shared_memory.internal_state.sixaxis_right_lifo;
-
-        // Clear previous state
-        sixaxis_fullkey_state = {};
-        sixaxis_handheld_state = {};
-        sixaxis_dual_left_state = {};
-        sixaxis_dual_right_state = {};
-        sixaxis_left_lifo_state = {};
-        sixaxis_right_lifo_state = {};
-
-        if (controller.sixaxis_sensor_enabled && Settings::values.motion_enabled.GetValue()) {
-            controller.sixaxis_at_rest = true;
-            for (std::size_t e = 0; e < motion_state.size(); ++e) {
-                controller.sixaxis_at_rest =
-                    controller.sixaxis_at_rest && motion_state[e].is_at_rest;
-            }
-        }
-
-        const auto set_motion_state = [&](Core::HID::SixAxisSensorState& state,
-                                          const Core::HID::ControllerMotion& hid_state) {
-            using namespace std::literals::chrono_literals;
-            static constexpr Core::HID::SixAxisSensorState default_motion_state = {
-                .delta_time = std::chrono::nanoseconds(5ms).count(),
-                .accel = {0, 0, -1.0f},
-                .orientation =
-                    {
-                        Common::Vec3f{1.0f, 0, 0},
-                        Common::Vec3f{0, 1.0f, 0},
-                        Common::Vec3f{0, 0, 1.0f},
-                    },
-                .attribute = {1},
-            };
-            if (!controller.sixaxis_sensor_enabled) {
-                state = default_motion_state;
-                return;
-            }
-            if (!Settings::values.motion_enabled.GetValue()) {
-                state = default_motion_state;
-                return;
-            }
-            state.attribute.is_connected.Assign(1);
-            state.delta_time = std::chrono::nanoseconds(5ms).count();
-            state.accel = hid_state.accel;
-            state.gyro = hid_state.gyro;
-            state.rotation = hid_state.rotation;
-            state.orientation = hid_state.orientation;
-        };
-
-        switch (controller_type) {
-        case Core::HID::NpadStyleIndex::None:
-            ASSERT(false);
-            break;
-        case Core::HID::NpadStyleIndex::ProController:
-            set_motion_state(sixaxis_fullkey_state, motion_state[0]);
-            break;
-        case Core::HID::NpadStyleIndex::Handheld:
-            set_motion_state(sixaxis_handheld_state, motion_state[0]);
-            break;
-        case Core::HID::NpadStyleIndex::JoyconDual:
-            set_motion_state(sixaxis_dual_left_state, motion_state[0]);
-            set_motion_state(sixaxis_dual_right_state, motion_state[1]);
-            break;
-        case Core::HID::NpadStyleIndex::JoyconLeft:
-            set_motion_state(sixaxis_left_lifo_state, motion_state[0]);
-            break;
-        case Core::HID::NpadStyleIndex::JoyconRight:
-            set_motion_state(sixaxis_right_lifo_state, motion_state[1]);
-            break;
-        case Core::HID::NpadStyleIndex::Pokeball:
-            using namespace std::literals::chrono_literals;
-            set_motion_state(sixaxis_fullkey_state, motion_state[0]);
-            sixaxis_fullkey_state.delta_time = std::chrono::nanoseconds(15ms).count();
-            break;
-        default:
-            break;
-        }
-
-        sixaxis_fullkey_state.sampling_number =
-            sixaxis_fullkey_lifo.lifo.ReadCurrentEntry().state.sampling_number + 1;
-        sixaxis_handheld_state.sampling_number =
-            sixaxis_handheld_lifo.lifo.ReadCurrentEntry().state.sampling_number + 1;
-        sixaxis_dual_left_state.sampling_number =
-            sixaxis_dual_left_lifo.lifo.ReadCurrentEntry().state.sampling_number + 1;
-        sixaxis_dual_right_state.sampling_number =
-            sixaxis_dual_right_lifo.lifo.ReadCurrentEntry().state.sampling_number + 1;
-        sixaxis_left_lifo_state.sampling_number =
-            sixaxis_left_lifo.lifo.ReadCurrentEntry().state.sampling_number + 1;
-        sixaxis_right_lifo_state.sampling_number =
-            sixaxis_right_lifo.lifo.ReadCurrentEntry().state.sampling_number + 1;
-
-        if (IndexToNpadIdType(i) == Core::HID::NpadIdType::Handheld) {
-            // This buffer only is updated on handheld on HW
-            sixaxis_handheld_lifo.lifo.WriteNextEntry(sixaxis_handheld_state);
-        } else {
-            // Handheld doesn't update this buffer on HW
-            sixaxis_fullkey_lifo.lifo.WriteNextEntry(sixaxis_fullkey_state);
-        }
-
-        sixaxis_dual_left_lifo.lifo.WriteNextEntry(sixaxis_dual_left_state);
-        sixaxis_dual_right_lifo.lifo.WriteNextEntry(sixaxis_dual_right_state);
-        sixaxis_left_lifo.lifo.WriteNextEntry(sixaxis_left_lifo_state);
-        sixaxis_right_lifo.lifo.WriteNextEntry(sixaxis_right_lifo_state);
-    }
-}
-
-Result SixAxis::SetGyroscopeZeroDriftMode(const Core::HID::SixAxisSensorHandle& sixaxis_handle,
-                                          Core::HID::GyroscopeZeroDriftMode drift_mode) {
-    const auto is_valid = IsSixaxisHandleValid(sixaxis_handle);
-    if (is_valid.IsError()) {
-        LOG_ERROR(Service_HID, "Invalid handle, error_code={}", is_valid.raw);
-        return is_valid;
-    }
-
-    auto& sixaxis = GetSixaxisState(sixaxis_handle);
-    auto& controller = GetControllerFromHandle(sixaxis_handle);
-    sixaxis.gyroscope_zero_drift_mode = drift_mode;
-    controller.device->SetGyroscopeZeroDriftMode(drift_mode);
-
-    return ResultSuccess;
-}
-
-Result SixAxis::GetGyroscopeZeroDriftMode(const Core::HID::SixAxisSensorHandle& sixaxis_handle,
-                                          Core::HID::GyroscopeZeroDriftMode& drift_mode) const {
-    const auto is_valid = IsSixaxisHandleValid(sixaxis_handle);
-    if (is_valid.IsError()) {
-        LOG_ERROR(Service_HID, "Invalid handle, error_code={}", is_valid.raw);
-        return is_valid;
-    }
-
-    const auto& sixaxis = GetSixaxisState(sixaxis_handle);
-    drift_mode = sixaxis.gyroscope_zero_drift_mode;
-
-    return ResultSuccess;
-}
-
-Result SixAxis::IsSixAxisSensorAtRest(const Core::HID::SixAxisSensorHandle& sixaxis_handle,
-                                      bool& is_at_rest) const {
-    const auto is_valid = IsSixaxisHandleValid(sixaxis_handle);
-    if (is_valid.IsError()) {
-        LOG_ERROR(Service_HID, "Invalid handle, error_code={}", is_valid.raw);
-        return is_valid;
-    }
-
-    const auto& controller = GetControllerFromHandle(sixaxis_handle);
-    is_at_rest = controller.sixaxis_at_rest;
-    return ResultSuccess;
-}
-
-Result SixAxis::LoadSixAxisSensorCalibrationParameter(
-    const Core::HID::SixAxisSensorHandle& sixaxis_handle,
-    Core::HID::SixAxisSensorCalibrationParameter& calibration) const {
-    const auto is_valid = IsSixaxisHandleValid(sixaxis_handle);
-    if (is_valid.IsError()) {
-        LOG_ERROR(Service_HID, "Invalid handle, error_code={}", is_valid.raw);
-        return is_valid;
-    }
-
-    // TODO: Request this data to the controller. On error return 0xd8ca
-    const auto& sixaxis = GetSixaxisState(sixaxis_handle);
-    calibration = sixaxis.calibration;
-    return ResultSuccess;
-}
-
-Result SixAxis::GetSixAxisSensorIcInformation(
-    const Core::HID::SixAxisSensorHandle& sixaxis_handle,
-    Core::HID::SixAxisSensorIcInformation& ic_information) const {
-    const auto is_valid = IsSixaxisHandleValid(sixaxis_handle);
-    if (is_valid.IsError()) {
-        LOG_ERROR(Service_HID, "Invalid handle, error_code={}", is_valid.raw);
-        return is_valid;
-    }
-
-    // TODO: Request this data to the controller. On error return 0xd8ca
-    const auto& sixaxis = GetSixaxisState(sixaxis_handle);
-    ic_information = sixaxis.ic_information;
-    return ResultSuccess;
-}
-
-Result SixAxis::EnableSixAxisSensorUnalteredPassthrough(
-    const Core::HID::SixAxisSensorHandle& sixaxis_handle, bool is_enabled) {
-    const auto is_valid = IsSixaxisHandleValid(sixaxis_handle);
-    if (is_valid.IsError()) {
-        LOG_ERROR(Service_HID, "Invalid handle, error_code={}", is_valid.raw);
-        return is_valid;
-    }
-
-    auto& sixaxis = GetSixaxisState(sixaxis_handle);
-    sixaxis.unaltered_passtrough = is_enabled;
-    return ResultSuccess;
-}
-
-Result SixAxis::IsSixAxisSensorUnalteredPassthroughEnabled(
-    const Core::HID::SixAxisSensorHandle& sixaxis_handle, bool& is_enabled) const {
-    const auto is_valid = IsSixaxisHandleValid(sixaxis_handle);
-    if (is_valid.IsError()) {
-        LOG_ERROR(Service_HID, "Invalid handle, error_code={}", is_valid.raw);
-        return is_valid;
-    }
-
-    const auto& sixaxis = GetSixaxisState(sixaxis_handle);
-    is_enabled = sixaxis.unaltered_passtrough;
-    return ResultSuccess;
-}
-
-Result SixAxis::SetSixAxisEnabled(const Core::HID::SixAxisSensorHandle& sixaxis_handle,
-                                  bool sixaxis_status) {
-    const auto is_valid = IsSixaxisHandleValid(sixaxis_handle);
-    if (is_valid.IsError()) {
-        LOG_ERROR(Service_HID, "Invalid handle, error_code={}", is_valid.raw);
-        return is_valid;
-    }
-
-    auto& controller = GetControllerFromHandle(sixaxis_handle);
-    controller.sixaxis_sensor_enabled = sixaxis_status;
-    return ResultSuccess;
-}
-
-Result SixAxis::IsSixAxisSensorFusionEnabled(const Core::HID::SixAxisSensorHandle& sixaxis_handle,
-                                             bool& is_fusion_enabled) const {
-    const auto is_valid = IsSixaxisHandleValid(sixaxis_handle);
-    if (is_valid.IsError()) {
-        LOG_ERROR(Service_HID, "Invalid handle, error_code={}", is_valid.raw);
-        return is_valid;
-    }
-
-    const auto& sixaxis = GetSixaxisState(sixaxis_handle);
-    is_fusion_enabled = sixaxis.is_fusion_enabled;
-
-    return ResultSuccess;
-}
-Result SixAxis::SetSixAxisFusionEnabled(const Core::HID::SixAxisSensorHandle& sixaxis_handle,
-                                        bool is_fusion_enabled) {
-    const auto is_valid = IsSixaxisHandleValid(sixaxis_handle);
-    if (is_valid.IsError()) {
-        LOG_ERROR(Service_HID, "Invalid handle, error_code={}", is_valid.raw);
-        return is_valid;
-    }
-
-    auto& sixaxis = GetSixaxisState(sixaxis_handle);
-    sixaxis.is_fusion_enabled = is_fusion_enabled;
-
-    return ResultSuccess;
-}
-
-Result SixAxis::SetSixAxisFusionParameters(
-    const Core::HID::SixAxisSensorHandle& sixaxis_handle,
-    Core::HID::SixAxisSensorFusionParameters sixaxis_fusion_parameters) {
-    const auto is_valid = IsSixaxisHandleValid(sixaxis_handle);
-    if (is_valid.IsError()) {
-        LOG_ERROR(Service_HID, "Invalid handle, error_code={}", is_valid.raw);
-        return is_valid;
-    }
-
-    const auto param1 = sixaxis_fusion_parameters.parameter1;
-    if (param1 < 0.0f || param1 > 1.0f) {
-        return InvalidSixAxisFusionRange;
-    }
-
-    auto& sixaxis = GetSixaxisState(sixaxis_handle);
-    sixaxis.fusion = sixaxis_fusion_parameters;
-
-    return ResultSuccess;
-}
-
-Result SixAxis::GetSixAxisFusionParameters(
-    const Core::HID::SixAxisSensorHandle& sixaxis_handle,
-    Core::HID::SixAxisSensorFusionParameters& parameters) const {
-    const auto is_valid = IsSixaxisHandleValid(sixaxis_handle);
-    if (is_valid.IsError()) {
-        LOG_ERROR(Service_HID, "Invalid handle, error_code={}", is_valid.raw);
-        return is_valid;
-    }
-
-    const auto& sixaxis = GetSixaxisState(sixaxis_handle);
-    parameters = sixaxis.fusion;
-
-    return ResultSuccess;
-}
-
-SixAxis::SixaxisParameters& SixAxis::GetSixaxisState(
-    const Core::HID::SixAxisSensorHandle& sixaxis_handle) {
-    auto& controller = GetControllerFromHandle(sixaxis_handle);
-    switch (sixaxis_handle.npad_type) {
-    case Core::HID::NpadStyleIndex::ProController:
-    case Core::HID::NpadStyleIndex::Pokeball:
-        return controller.sixaxis_fullkey;
-    case Core::HID::NpadStyleIndex::Handheld:
-        return controller.sixaxis_handheld;
-    case Core::HID::NpadStyleIndex::JoyconDual:
-        if (sixaxis_handle.device_index == Core::HID::DeviceIndex::Left) {
-            return controller.sixaxis_dual_left;
-        }
-        return controller.sixaxis_dual_right;
-    case Core::HID::NpadStyleIndex::JoyconLeft:
-        return controller.sixaxis_left;
-    case Core::HID::NpadStyleIndex::JoyconRight:
-        return controller.sixaxis_right;
-    default:
-        return controller.sixaxis_unknown;
-    }
-}
-
-const SixAxis::SixaxisParameters& SixAxis::GetSixaxisState(
-    const Core::HID::SixAxisSensorHandle& sixaxis_handle) const {
-    const auto& controller = GetControllerFromHandle(sixaxis_handle);
-    switch (sixaxis_handle.npad_type) {
-    case Core::HID::NpadStyleIndex::ProController:
-    case Core::HID::NpadStyleIndex::Pokeball:
-        return controller.sixaxis_fullkey;
-    case Core::HID::NpadStyleIndex::Handheld:
-        return controller.sixaxis_handheld;
-    case Core::HID::NpadStyleIndex::JoyconDual:
-        if (sixaxis_handle.device_index == Core::HID::DeviceIndex::Left) {
-            return controller.sixaxis_dual_left;
-        }
-        return controller.sixaxis_dual_right;
-    case Core::HID::NpadStyleIndex::JoyconLeft:
-        return controller.sixaxis_left;
-    case Core::HID::NpadStyleIndex::JoyconRight:
-        return controller.sixaxis_right;
-    default:
-        return controller.sixaxis_unknown;
-    }
-}
-
-SixAxis::NpadControllerData& SixAxis::GetControllerFromHandle(
-    const Core::HID::SixAxisSensorHandle& device_handle) {
-    const auto npad_id = static_cast<Core::HID::NpadIdType>(device_handle.npad_id);
-    return GetControllerFromNpadIdType(npad_id);
-}
-
-const SixAxis::NpadControllerData& SixAxis::GetControllerFromHandle(
-    const Core::HID::SixAxisSensorHandle& device_handle) const {
-    const auto npad_id = static_cast<Core::HID::NpadIdType>(device_handle.npad_id);
-    return GetControllerFromNpadIdType(npad_id);
-}
-
-SixAxis::NpadControllerData& SixAxis::GetControllerFromNpadIdType(Core::HID::NpadIdType npad_id) {
-    if (!IsNpadIdValid(npad_id)) {
-        LOG_ERROR(Service_HID, "Invalid NpadIdType npad_id:{}", npad_id);
-        npad_id = Core::HID::NpadIdType::Player1;
-    }
-    const auto npad_index = NpadIdTypeToIndex(npad_id);
-    return controller_data[npad_index];
-}
-
-const SixAxis::NpadControllerData& SixAxis::GetControllerFromNpadIdType(
-    Core::HID::NpadIdType npad_id) const {
-    if (!IsNpadIdValid(npad_id)) {
-        LOG_ERROR(Service_HID, "Invalid NpadIdType npad_id:{}", npad_id);
-        npad_id = Core::HID::NpadIdType::Player1;
-    }
-    const auto npad_index = NpadIdTypeToIndex(npad_id);
-    return controller_data[npad_index];
-}
-
-} // namespace Service::HID
diff --git a/src/core/hle/service/hid/controllers/six_axis.h b/src/core/hle/service/hid/controllers/six_axis.h
deleted file mode 100644
index 4c4f5dc7b..000000000
--- a/src/core/hle/service/hid/controllers/six_axis.h
+++ /dev/null
@@ -1,111 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#pragma once
-
-#include "common/common_types.h"
-#include "core/hid/hid_types.h"
-#include "core/hle/service/hid/controllers/controller_base.h"
-#include "core/hle/service/hid/ring_lifo.h"
-
-namespace Core::HID {
-class EmulatedController;
-} // namespace Core::HID
-
-namespace Service::HID {
-class NPad;
-
-class SixAxis final : public ControllerBase {
-public:
-    explicit SixAxis(Core::HID::HIDCore& hid_core_, std::shared_ptr<NPad> npad_);
-    ~SixAxis() override;
-
-    // Called when the controller is initialized
-    void OnInit() override;
-
-    // When the controller is released
-    void OnRelease() override;
-
-    // When the controller is requesting an update for the shared memory
-    void OnUpdate(const Core::Timing::CoreTiming& core_timing) override;
-
-    Result SetGyroscopeZeroDriftMode(const Core::HID::SixAxisSensorHandle& sixaxis_handle,
-                                     Core::HID::GyroscopeZeroDriftMode drift_mode);
-    Result GetGyroscopeZeroDriftMode(const Core::HID::SixAxisSensorHandle& sixaxis_handle,
-                                     Core::HID::GyroscopeZeroDriftMode& drift_mode) const;
-    Result IsSixAxisSensorAtRest(const Core::HID::SixAxisSensorHandle& sixaxis_handle,
-                                 bool& is_at_rest) const;
-    Result EnableSixAxisSensorUnalteredPassthrough(
-        const Core::HID::SixAxisSensorHandle& sixaxis_handle, bool is_enabled);
-    Result IsSixAxisSensorUnalteredPassthroughEnabled(
-        const Core::HID::SixAxisSensorHandle& sixaxis_handle, bool& is_enabled) const;
-    Result LoadSixAxisSensorCalibrationParameter(
-        const Core::HID::SixAxisSensorHandle& sixaxis_handle,
-        Core::HID::SixAxisSensorCalibrationParameter& calibration) const;
-    Result GetSixAxisSensorIcInformation(
-        const Core::HID::SixAxisSensorHandle& sixaxis_handle,
-        Core::HID::SixAxisSensorIcInformation& ic_information) const;
-    Result SetSixAxisEnabled(const Core::HID::SixAxisSensorHandle& sixaxis_handle,
-                             bool sixaxis_status);
-    Result IsSixAxisSensorFusionEnabled(const Core::HID::SixAxisSensorHandle& sixaxis_handle,
-                                        bool& is_fusion_enabled) const;
-    Result SetSixAxisFusionEnabled(const Core::HID::SixAxisSensorHandle& sixaxis_handle,
-                                   bool is_fusion_enabled);
-    Result SetSixAxisFusionParameters(
-        const Core::HID::SixAxisSensorHandle& sixaxis_handle,
-        Core::HID::SixAxisSensorFusionParameters sixaxis_fusion_parameters);
-    Result GetSixAxisFusionParameters(const Core::HID::SixAxisSensorHandle& sixaxis_handle,
-                                      Core::HID::SixAxisSensorFusionParameters& parameters) const;
-
-private:
-    static constexpr std::size_t NPAD_COUNT = 10;
-
-    struct SixaxisParameters {
-        bool is_fusion_enabled{true};
-        bool unaltered_passtrough{false};
-        Core::HID::SixAxisSensorFusionParameters fusion{};
-        Core::HID::SixAxisSensorCalibrationParameter calibration{};
-        Core::HID::SixAxisSensorIcInformation ic_information{};
-        Core::HID::GyroscopeZeroDriftMode gyroscope_zero_drift_mode{
-            Core::HID::GyroscopeZeroDriftMode::Standard};
-    };
-
-    struct NpadControllerData {
-        Core::HID::EmulatedController* device = nullptr;
-
-        // Motion parameters
-        bool sixaxis_at_rest{true};
-        bool sixaxis_sensor_enabled{true};
-        SixaxisParameters sixaxis_fullkey{};
-        SixaxisParameters sixaxis_handheld{};
-        SixaxisParameters sixaxis_dual_left{};
-        SixaxisParameters sixaxis_dual_right{};
-        SixaxisParameters sixaxis_left{};
-        SixaxisParameters sixaxis_right{};
-        SixaxisParameters sixaxis_unknown{};
-
-        // Current pad state
-        Core::HID::SixAxisSensorState sixaxis_fullkey_state{};
-        Core::HID::SixAxisSensorState sixaxis_handheld_state{};
-        Core::HID::SixAxisSensorState sixaxis_dual_left_state{};
-        Core::HID::SixAxisSensorState sixaxis_dual_right_state{};
-        Core::HID::SixAxisSensorState sixaxis_left_lifo_state{};
-        Core::HID::SixAxisSensorState sixaxis_right_lifo_state{};
-        int callback_key{};
-    };
-
-    SixaxisParameters& GetSixaxisState(const Core::HID::SixAxisSensorHandle& device_handle);
-    const SixaxisParameters& GetSixaxisState(
-        const Core::HID::SixAxisSensorHandle& device_handle) const;
-
-    NpadControllerData& GetControllerFromHandle(
-        const Core::HID::SixAxisSensorHandle& device_handle);
-    const NpadControllerData& GetControllerFromHandle(
-        const Core::HID::SixAxisSensorHandle& device_handle) const;
-    NpadControllerData& GetControllerFromNpadIdType(Core::HID::NpadIdType npad_id);
-    const NpadControllerData& GetControllerFromNpadIdType(Core::HID::NpadIdType npad_id) const;
-
-    std::shared_ptr<NPad> npad;
-    std::array<NpadControllerData, NPAD_COUNT> controller_data{};
-};
-} // namespace Service::HID
diff --git a/src/core/hle/service/hid/controllers/sleep_button.cpp b/src/core/hle/service/hid/controllers/sleep_button.cpp
deleted file mode 100644
index d44b1f4cc..000000000
--- a/src/core/hle/service/hid/controllers/sleep_button.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "core/core_timing.h"
-#include "core/hle/service/hid/controllers/applet_resource.h"
-#include "core/hle/service/hid/controllers/sleep_button.h"
-#include "core/hle/service/hid/controllers/types/shared_memory_format.h"
-
-namespace Service::HID {
-
-SleepButton::SleepButton(Core::HID::HIDCore& hid_core_) : ControllerBase{hid_core_} {}
-
-SleepButton::~SleepButton() = default;
-
-void SleepButton::OnInit() {}
-
-void SleepButton::OnRelease() {}
-
-void SleepButton::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
-    if (!smart_update) {
-        return;
-    }
-
-    std::scoped_lock shared_lock{*shared_mutex};
-    const u64 aruid = applet_resource->GetActiveAruid();
-    auto* data = applet_resource->GetAruidData(aruid);
-
-    if (data == nullptr || !data->flag.is_assigned) {
-        return;
-    }
-
-    auto& header = data->shared_memory_format->capture_button.header;
-    header.timestamp = core_timing.GetGlobalTimeNs().count();
-    header.total_entry_count = 17;
-    header.entry_count = 0;
-    header.last_entry_index = 0;
-}
-
-} // namespace Service::HID
diff --git a/src/core/hle/service/hid/controllers/sleep_button.h b/src/core/hle/service/hid/controllers/sleep_button.h
deleted file mode 100644
index 59964bf63..000000000
--- a/src/core/hle/service/hid/controllers/sleep_button.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "core/hle/service/hid/controllers/controller_base.h"
-
-namespace Service::HID {
-
-class SleepButton final : public ControllerBase {
-public:
-    explicit SleepButton(Core::HID::HIDCore& hid_core_);
-    ~SleepButton() override;
-
-    // Called when the controller is initialized
-    void OnInit() override;
-
-    // When the controller is released
-    void OnRelease() override;
-
-    // When the controller is requesting an update for the shared memory
-    void OnUpdate(const Core::Timing::CoreTiming& core_timing) override;
-
-private:
-    bool smart_update{};
-};
-} // namespace Service::HID
diff --git a/src/core/hle/service/hid/controllers/touchscreen.cpp b/src/core/hle/service/hid/controllers/touchscreen.cpp
deleted file mode 100644
index b585a5829..000000000
--- a/src/core/hle/service/hid/controllers/touchscreen.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include <algorithm>
-#include "common/common_types.h"
-#include "common/settings.h"
-#include "core/core_timing.h"
-#include "core/frontend/emu_window.h"
-#include "core/hid/emulated_console.h"
-#include "core/hid/hid_core.h"
-#include "core/hle/service/hid/controllers/applet_resource.h"
-#include "core/hle/service/hid/controllers/touchscreen.h"
-#include "core/hle/service/hid/controllers/types/shared_memory_format.h"
-
-namespace Service::HID {
-
-TouchScreen::TouchScreen(Core::HID::HIDCore& hid_core_)
-    : ControllerBase{hid_core_}, touchscreen_width(Layout::ScreenUndocked::Width),
-      touchscreen_height(Layout::ScreenUndocked::Height) {
-    console = hid_core.GetEmulatedConsole();
-}
-
-TouchScreen::~TouchScreen() = default;
-
-void TouchScreen::OnInit() {}
-
-void TouchScreen::OnRelease() {}
-
-void TouchScreen::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
-    const u64 aruid = applet_resource->GetActiveAruid();
-    auto* data = applet_resource->GetAruidData(aruid);
-
-    if (data == nullptr || !data->flag.is_assigned) {
-        return;
-    }
-
-    TouchScreenSharedMemoryFormat& shared_memory = data->shared_memory_format->touch_screen;
-    shared_memory.touch_screen_lifo.timestamp = core_timing.GetGlobalTimeNs().count();
-
-    if (!IsControllerActivated()) {
-        shared_memory.touch_screen_lifo.buffer_count = 0;
-        shared_memory.touch_screen_lifo.buffer_tail = 0;
-        return;
-    }
-
-    const auto touch_status = console->GetTouch();
-    for (std::size_t id = 0; id < MAX_FINGERS; id++) {
-        const auto& current_touch = touch_status[id];
-        auto& finger = fingers[id];
-        finger.id = current_touch.id;
-
-        if (finger.attribute.start_touch) {
-            finger.attribute.raw = 0;
-            continue;
-        }
-
-        if (finger.attribute.end_touch) {
-            finger.attribute.raw = 0;
-            finger.pressed = false;
-            continue;
-        }
-
-        if (!finger.pressed && current_touch.pressed) {
-            // Ignore all touch fingers if disabled
-            if (!Settings::values.touchscreen.enabled) {
-                continue;
-            }
-
-            finger.attribute.start_touch.Assign(1);
-            finger.pressed = true;
-            finger.position = current_touch.position;
-            continue;
-        }
-
-        if (finger.pressed && !current_touch.pressed) {
-            finger.attribute.raw = 0;
-            finger.attribute.end_touch.Assign(1);
-            continue;
-        }
-
-        // Only update position if touch is not on a special frame
-        finger.position = current_touch.position;
-    }
-
-    std::array<Core::HID::TouchFinger, MAX_FINGERS> active_fingers;
-    const auto end_iter = std::copy_if(fingers.begin(), fingers.end(), active_fingers.begin(),
-                                       [](const auto& finger) { return finger.pressed; });
-    const auto active_fingers_count =
-        static_cast<std::size_t>(std::distance(active_fingers.begin(), end_iter));
-
-    const u64 timestamp = static_cast<u64>(core_timing.GetGlobalTimeNs().count());
-    const auto& last_entry = shared_memory.touch_screen_lifo.ReadCurrentEntry().state;
-
-    next_state.sampling_number = last_entry.sampling_number + 1;
-    next_state.entry_count = static_cast<s32>(active_fingers_count);
-
-    for (std::size_t id = 0; id < MAX_FINGERS; ++id) {
-        auto& touch_entry = next_state.states[id];
-        if (id < active_fingers_count) {
-            const auto& [active_x, active_y] = active_fingers[id].position;
-            touch_entry.position = {
-                .x = static_cast<u16>(active_x * static_cast<float>(touchscreen_width)),
-                .y = static_cast<u16>(active_y * static_cast<float>(touchscreen_height)),
-            };
-            touch_entry.diameter_x = Settings::values.touchscreen.diameter_x;
-            touch_entry.diameter_y = Settings::values.touchscreen.diameter_y;
-            touch_entry.rotation_angle = Settings::values.touchscreen.rotation_angle;
-            touch_entry.delta_time = timestamp - active_fingers[id].last_touch;
-            fingers[active_fingers[id].id].last_touch = timestamp;
-            touch_entry.finger = active_fingers[id].id;
-            touch_entry.attribute.raw = active_fingers[id].attribute.raw;
-        } else {
-            // Clear touch entry
-            touch_entry.attribute.raw = 0;
-            touch_entry.position = {};
-            touch_entry.diameter_x = 0;
-            touch_entry.diameter_y = 0;
-            touch_entry.rotation_angle = 0;
-            touch_entry.delta_time = 0;
-            touch_entry.finger = 0;
-        }
-    }
-
-    shared_memory.touch_screen_lifo.WriteNextEntry(next_state);
-}
-
-void TouchScreen::SetTouchscreenDimensions(u32 width, u32 height) {
-    touchscreen_width = width;
-    touchscreen_height = height;
-}
-
-} // namespace Service::HID
diff --git a/src/core/hle/service/hid/controllers/touchscreen.h b/src/core/hle/service/hid/controllers/touchscreen.h
deleted file mode 100644
index 945d359be..000000000
--- a/src/core/hle/service/hid/controllers/touchscreen.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include <array>
-
-#include "core/hid/hid_types.h"
-#include "core/hle/service/hid/controllers/controller_base.h"
-#include "core/hle/service/hid/controllers/types/touch_types.h"
-
-namespace Core::HID {
-class EmulatedConsole;
-} // namespace Core::HID
-
-namespace Service::HID {
-struct TouchScreenSharedMemoryFormat;
-
-class TouchScreen final : public ControllerBase {
-public:
-    explicit TouchScreen(Core::HID::HIDCore& hid_core_);
-    ~TouchScreen() override;
-
-    // Called when the controller is initialized
-    void OnInit() override;
-
-    // When the controller is released
-    void OnRelease() override;
-
-    // When the controller is requesting an update for the shared memory
-    void OnUpdate(const Core::Timing::CoreTiming& core_timing) override;
-
-    void SetTouchscreenDimensions(u32 width, u32 height);
-
-private:
-    TouchScreenState next_state{};
-    Core::HID::EmulatedConsole* console = nullptr;
-
-    std::array<Core::HID::TouchFinger, MAX_FINGERS> fingers{};
-    u32 touchscreen_width;
-    u32 touchscreen_height;
-};
-} // namespace Service::HID
diff --git a/src/core/hle/service/hid/controllers/types/debug_pad_types.h b/src/core/hle/service/hid/controllers/types/debug_pad_types.h
deleted file mode 100644
index a96171b62..000000000
--- a/src/core/hle/service/hid/controllers/types/debug_pad_types.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#pragma once
-
-#include "common/bit_field.h"
-#include "common/common_types.h"
-#include "core/hid/hid_types.h"
-
-namespace Service::HID {
-
-// This is nn::hid::DebugPadAttribute
-struct DebugPadAttribute {
-    union {
-        u32 raw{};
-        BitField<0, 1, u32> connected;
-    };
-};
-static_assert(sizeof(DebugPadAttribute) == 0x4, "DebugPadAttribute is an invalid size");
-
-// This is nn::hid::DebugPadState
-struct DebugPadState {
-    s64 sampling_number{};
-    DebugPadAttribute attribute{};
-    Core::HID::DebugPadButton pad_state{};
-    Core::HID::AnalogStickState r_stick{};
-    Core::HID::AnalogStickState l_stick{};
-};
-static_assert(sizeof(DebugPadState) == 0x20, "DebugPadState is an invalid state");
-
-} // namespace Service::HID
diff --git a/src/core/hle/service/hid/controllers/types/gesture_types.h b/src/core/hle/service/hid/controllers/types/gesture_types.h
deleted file mode 100644
index b4f034cd3..000000000
--- a/src/core/hle/service/hid/controllers/types/gesture_types.h
+++ /dev/null
@@ -1,77 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#pragma once
-
-#include <array>
-#include "common/bit_field.h"
-#include "common/common_types.h"
-#include "common/point.h"
-
-namespace Service::HID {
-static constexpr size_t MAX_FINGERS = 16;
-static constexpr size_t MAX_POINTS = 4;
-
-// This is nn::hid::GestureType
-enum class GestureType : u32 {
-    Idle,     // Nothing touching the screen
-    Complete, // Set at the end of a touch event
-    Cancel,   // Set when the number of fingers change
-    Touch,    // A finger just touched the screen
-    Press,    // Set if last type is touch and the finger hasn't moved
-    Tap,      // Fast press then release
-    Pan,      // All points moving together across the screen
-    Swipe,    // Fast press movement and release of a single point
-    Pinch,    // All points moving away/closer to the midpoint
-    Rotate,   // All points rotating from the midpoint
-};
-
-// This is nn::hid::GestureDirection
-enum class GestureDirection : u32 {
-    None,
-    Left,
-    Up,
-    Right,
-    Down,
-};
-
-// This is nn::hid::GestureAttribute
-struct GestureAttribute {
-    union {
-        u32 raw{};
-
-        BitField<4, 1, u32> is_new_touch;
-        BitField<8, 1, u32> is_double_tap;
-    };
-};
-static_assert(sizeof(GestureAttribute) == 4, "GestureAttribute is an invalid size");
-
-// This is nn::hid::GestureState
-struct GestureState {
-    s64 sampling_number{};
-    s64 detection_count{};
-    GestureType type{GestureType::Idle};
-    GestureDirection direction{GestureDirection::None};
-    Common::Point<s32> pos{};
-    Common::Point<s32> delta{};
-    f32 vel_x{};
-    f32 vel_y{};
-    GestureAttribute attributes{};
-    f32 scale{};
-    f32 rotation_angle{};
-    s32 point_count{};
-    std::array<Common::Point<s32>, 4> points{};
-};
-static_assert(sizeof(GestureState) == 0x60, "GestureState is an invalid size");
-
-struct GestureProperties {
-    std::array<Common::Point<s32>, MAX_POINTS> points{};
-    std::size_t active_points{};
-    Common::Point<s32> mid_point{};
-    s64 detection_count{};
-    u64 delta_time{};
-    f32 average_distance{};
-    f32 angle{};
-};
-
-} // namespace Service::HID
diff --git a/src/core/hle/service/hid/controllers/types/keyboard_types.h b/src/core/hle/service/hid/controllers/types/keyboard_types.h
deleted file mode 100644
index f44a536b9..000000000
--- a/src/core/hle/service/hid/controllers/types/keyboard_types.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#pragma once
-
-#include "common/common_types.h"
-#include "core/hid/hid_types.h"
-
-namespace Service::HID {
-
-// This is nn::hid::detail::KeyboardState
-struct KeyboardState {
-    s64 sampling_number{};
-    Core::HID::KeyboardModifier modifier{};
-    Core::HID::KeyboardAttribute attribute{};
-    Core::HID::KeyboardKey key{};
-};
-static_assert(sizeof(KeyboardState) == 0x30, "KeyboardState is an invalid size");
-
-} // namespace Service::HID
diff --git a/src/core/hle/service/hid/controllers/types/mouse_types.h b/src/core/hle/service/hid/controllers/types/mouse_types.h
deleted file mode 100644
index 8bd6e167c..000000000
--- a/src/core/hle/service/hid/controllers/types/mouse_types.h
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#pragma once
-
-#include "common/common_types.h"
-
-namespace Service::HID {} // namespace Service::HID
diff --git a/src/core/hle/service/hid/controllers/types/npad_types.h b/src/core/hle/service/hid/controllers/types/npad_types.h
deleted file mode 100644
index 419c33a8c..000000000
--- a/src/core/hle/service/hid/controllers/types/npad_types.h
+++ /dev/null
@@ -1,255 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#pragma once
-
-#include "common/bit_field.h"
-#include "common/common_funcs.h"
-#include "common/common_types.h"
-#include "core/hid/hid_types.h"
-
-namespace Service::HID {
-static constexpr std::size_t MaxSupportedNpadIdTypes = 10;
-static constexpr std::size_t StyleIndexCount = 7;
-
-// This is nn::hid::NpadJoyHoldType
-enum class NpadJoyHoldType : u64 {
-    Vertical = 0,
-    Horizontal = 1,
-};
-
-// This is nn::hid::NpadJoyAssignmentMode
-enum class NpadJoyAssignmentMode : u32 {
-    Dual = 0,
-    Single = 1,
-};
-
-// This is nn::hid::NpadJoyDeviceType
-enum class NpadJoyDeviceType : s64 {
-    Left = 0,
-    Right = 1,
-};
-
-// This is nn::hid::NpadHandheldActivationMode
-enum class NpadHandheldActivationMode : u64 {
-    Dual = 0,
-    Single = 1,
-    None = 2,
-    MaxActivationMode = 3,
-};
-
-// This is nn::hid::system::AppletFooterUiAttributesSet
-struct AppletFooterUiAttributes {
-    INSERT_PADDING_BYTES(0x4);
-};
-
-// This is nn::hid::system::AppletFooterUiType
-enum class AppletFooterUiType : u8 {
-    None = 0,
-    HandheldNone = 1,
-    HandheldJoyConLeftOnly = 2,
-    HandheldJoyConRightOnly = 3,
-    HandheldJoyConLeftJoyConRight = 4,
-    JoyDual = 5,
-    JoyDualLeftOnly = 6,
-    JoyDualRightOnly = 7,
-    JoyLeftHorizontal = 8,
-    JoyLeftVertical = 9,
-    JoyRightHorizontal = 10,
-    JoyRightVertical = 11,
-    SwitchProController = 12,
-    CompatibleProController = 13,
-    CompatibleJoyCon = 14,
-    LarkHvc1 = 15,
-    LarkHvc2 = 16,
-    LarkNesLeft = 17,
-    LarkNesRight = 18,
-    Lucia = 19,
-    Verification = 20,
-    Lagon = 21,
-};
-
-using AppletFooterUiVariant = u8;
-
-// This is "nn::hid::system::AppletDetailedUiType".
-struct AppletDetailedUiType {
-    AppletFooterUiVariant ui_variant;
-    INSERT_PADDING_BYTES(0x2);
-    AppletFooterUiType footer;
-};
-static_assert(sizeof(AppletDetailedUiType) == 0x4, "AppletDetailedUiType is an invalid size");
-// This is nn::hid::NpadCommunicationMode
-enum class NpadCommunicationMode : u64 {
-    Mode_5ms = 0,
-    Mode_10ms = 1,
-    Mode_15ms = 2,
-    Default = 3,
-};
-
-enum class NpadRevision : u32 {
-    Revision0 = 0,
-    Revision1 = 1,
-    Revision2 = 2,
-    Revision3 = 3,
-};
-
-// This is nn::hid::detail::ColorAttribute
-enum class ColorAttribute : u32 {
-    Ok = 0,
-    ReadError = 1,
-    NoController = 2,
-};
-static_assert(sizeof(ColorAttribute) == 4, "ColorAttribute is an invalid size");
-
-// This is nn::hid::detail::NpadFullKeyColorState
-struct NpadFullKeyColorState {
-    ColorAttribute attribute{ColorAttribute::NoController};
-    Core::HID::NpadControllerColor fullkey{};
-};
-static_assert(sizeof(NpadFullKeyColorState) == 0xC, "NpadFullKeyColorState is an invalid size");
-
-// This is nn::hid::detail::NpadJoyColorState
-struct NpadJoyColorState {
-    ColorAttribute attribute{ColorAttribute::NoController};
-    Core::HID::NpadControllerColor left{};
-    Core::HID::NpadControllerColor right{};
-};
-static_assert(sizeof(NpadJoyColorState) == 0x14, "NpadJoyColorState is an invalid size");
-
-// This is nn::hid::NpadAttribute
-struct NpadAttribute {
-    union {
-        u32 raw{};
-        BitField<0, 1, u32> is_connected;
-        BitField<1, 1, u32> is_wired;
-        BitField<2, 1, u32> is_left_connected;
-        BitField<3, 1, u32> is_left_wired;
-        BitField<4, 1, u32> is_right_connected;
-        BitField<5, 1, u32> is_right_wired;
-    };
-};
-static_assert(sizeof(NpadAttribute) == 4, "NpadAttribute is an invalid size");
-
-// This is nn::hid::NpadFullKeyState
-// This is nn::hid::NpadHandheldState
-// This is nn::hid::NpadJoyDualState
-// This is nn::hid::NpadJoyLeftState
-// This is nn::hid::NpadJoyRightState
-// This is nn::hid::NpadPalmaState
-// This is nn::hid::NpadSystemExtState
-struct NPadGenericState {
-    s64_le sampling_number{};
-    Core::HID::NpadButtonState npad_buttons{};
-    Core::HID::AnalogStickState l_stick{};
-    Core::HID::AnalogStickState r_stick{};
-    NpadAttribute connection_status{};
-    INSERT_PADDING_BYTES(4); // Reserved
-};
-static_assert(sizeof(NPadGenericState) == 0x28, "NPadGenericState is an invalid size");
-
-// This is nn::hid::server::NpadGcTriggerState
-struct NpadGcTriggerState {
-    s64 sampling_number{};
-    s32 l_analog{};
-    s32 r_analog{};
-};
-static_assert(sizeof(NpadGcTriggerState) == 0x10, "NpadGcTriggerState is an invalid size");
-
-// This is nn::hid::NpadSystemProperties
-struct NPadSystemProperties {
-    union {
-        s64 raw{};
-        BitField<0, 1, s64> is_charging_joy_dual;
-        BitField<1, 1, s64> is_charging_joy_left;
-        BitField<2, 1, s64> is_charging_joy_right;
-        BitField<3, 1, s64> is_powered_joy_dual;
-        BitField<4, 1, s64> is_powered_joy_left;
-        BitField<5, 1, s64> is_powered_joy_right;
-        BitField<9, 1, s64> is_system_unsupported_button;
-        BitField<10, 1, s64> is_system_ext_unsupported_button;
-        BitField<11, 1, s64> is_vertical;
-        BitField<12, 1, s64> is_horizontal;
-        BitField<13, 1, s64> use_plus;
-        BitField<14, 1, s64> use_minus;
-        BitField<15, 1, s64> use_directional_buttons;
-    };
-};
-static_assert(sizeof(NPadSystemProperties) == 0x8, "NPadSystemProperties is an invalid size");
-
-// This is nn::hid::NpadSystemButtonProperties
-struct NpadSystemButtonProperties {
-    union {
-        s32 raw{};
-        BitField<0, 1, s32> is_home_button_protection_enabled;
-    };
-};
-static_assert(sizeof(NpadSystemButtonProperties) == 0x4, "NPadButtonProperties is an invalid size");
-
-// This is nn::hid::system::DeviceType
-struct DeviceType {
-    union {
-        u32 raw{};
-        BitField<0, 1, s32> fullkey;
-        BitField<1, 1, s32> debug_pad;
-        BitField<2, 1, s32> handheld_left;
-        BitField<3, 1, s32> handheld_right;
-        BitField<4, 1, s32> joycon_left;
-        BitField<5, 1, s32> joycon_right;
-        BitField<6, 1, s32> palma;
-        BitField<7, 1, s32> lark_hvc_left;
-        BitField<8, 1, s32> lark_hvc_right;
-        BitField<9, 1, s32> lark_nes_left;
-        BitField<10, 1, s32> lark_nes_right;
-        BitField<11, 1, s32> handheld_lark_hvc_left;
-        BitField<12, 1, s32> handheld_lark_hvc_right;
-        BitField<13, 1, s32> handheld_lark_nes_left;
-        BitField<14, 1, s32> handheld_lark_nes_right;
-        BitField<15, 1, s32> lucia;
-        BitField<16, 1, s32> lagon;
-        BitField<17, 1, s32> lager;
-        BitField<31, 1, s32> system;
-    };
-};
-
-// This is nn::hid::detail::NfcXcdDeviceHandleStateImpl
-struct NfcXcdDeviceHandleStateImpl {
-    u64 handle{};
-    bool is_available{};
-    bool is_activated{};
-    INSERT_PADDING_BYTES(0x6); // Reserved
-    u64 sampling_number{};
-};
-static_assert(sizeof(NfcXcdDeviceHandleStateImpl) == 0x18,
-              "NfcXcdDeviceHandleStateImpl is an invalid size");
-
-// This is nn::hid::NpadLarkType
-enum class NpadLarkType : u32 {
-    Invalid,
-    H1,
-    H2,
-    NL,
-    NR,
-};
-
-// This is nn::hid::NpadLuciaType
-enum class NpadLuciaType : u32 {
-    Invalid,
-    J,
-    E,
-    U,
-};
-
-// This is nn::hid::NpadLagonType
-enum class NpadLagonType : u32 {
-    Invalid,
-};
-
-// This is nn::hid::NpadLagerType
-enum class NpadLagerType : u32 {
-    Invalid,
-    J,
-    E,
-    U,
-};
-
-} // namespace Service::HID
diff --git a/src/core/hle/service/hid/controllers/types/shared_memory_format.h b/src/core/hle/service/hid/controllers/types/shared_memory_format.h
deleted file mode 100644
index 976043b9c..000000000
--- a/src/core/hle/service/hid/controllers/types/shared_memory_format.h
+++ /dev/null
@@ -1,240 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#pragma once
-
-#include "common/common_funcs.h"
-#include "common/common_types.h"
-#include "common/vector_math.h"
-#include "core/hid/hid_types.h"
-#include "core/hle/service/hid//controllers/types/debug_pad_types.h"
-#include "core/hle/service/hid//controllers/types/keyboard_types.h"
-#include "core/hle/service/hid//controllers/types/mouse_types.h"
-#include "core/hle/service/hid//controllers/types/npad_types.h"
-#include "core/hle/service/hid//controllers/types/touch_types.h"
-#include "core/hle/service/hid/ring_lifo.h"
-
-namespace Service::HID {
-static const std::size_t HidEntryCount = 17;
-
-struct CommonHeader {
-    s64 timestamp{};
-    s64 total_entry_count{};
-    s64 last_entry_index{};
-    s64 entry_count{};
-};
-static_assert(sizeof(CommonHeader) == 0x20, "CommonHeader is an invalid size");
-
-// This is nn::hid::detail::DebugPadSharedMemoryFormat
-struct DebugPadSharedMemoryFormat {
-    // This is nn::hid::detail::DebugPadLifo
-    Lifo<DebugPadState, HidEntryCount> debug_pad_lifo{};
-    static_assert(sizeof(debug_pad_lifo) == 0x2C8, "debug_pad_lifo is an invalid size");
-    INSERT_PADDING_WORDS(0x4E);
-};
-static_assert(sizeof(DebugPadSharedMemoryFormat) == 0x400,
-              "DebugPadSharedMemoryFormat is an invalid size");
-
-// This is nn::hid::detail::TouchScreenSharedMemoryFormat
-struct TouchScreenSharedMemoryFormat {
-    // This is nn::hid::detail::TouchScreenLifo
-    Lifo<TouchScreenState, HidEntryCount> touch_screen_lifo{};
-    static_assert(sizeof(touch_screen_lifo) == 0x2C38, "touch_screen_lifo is an invalid size");
-    INSERT_PADDING_WORDS(0xF2);
-};
-static_assert(sizeof(TouchScreenSharedMemoryFormat) == 0x3000,
-              "TouchScreenSharedMemoryFormat is an invalid size");
-
-// This is nn::hid::detail::MouseSharedMemoryFormat
-struct MouseSharedMemoryFormat {
-    // This is nn::hid::detail::MouseLifo
-    Lifo<Core::HID::MouseState, HidEntryCount> mouse_lifo{};
-    static_assert(sizeof(mouse_lifo) == 0x350, "mouse_lifo is an invalid size");
-    INSERT_PADDING_WORDS(0x2C);
-};
-static_assert(sizeof(MouseSharedMemoryFormat) == 0x400,
-              "MouseSharedMemoryFormat is an invalid size");
-
-// This is nn::hid::detail::KeyboardSharedMemoryFormat
-struct KeyboardSharedMemoryFormat {
-    // This is nn::hid::detail::KeyboardLifo
-    Lifo<KeyboardState, HidEntryCount> keyboard_lifo{};
-    static_assert(sizeof(keyboard_lifo) == 0x3D8, "keyboard_lifo is an invalid size");
-    INSERT_PADDING_WORDS(0xA);
-};
-static_assert(sizeof(KeyboardSharedMemoryFormat) == 0x400,
-              "KeyboardSharedMemoryFormat is an invalid size");
-
-// This is nn::hid::detail::DigitizerSharedMemoryFormat
-struct DigitizerSharedMemoryFormat {
-    CommonHeader header;
-    INSERT_PADDING_BYTES(0xFE0);
-};
-static_assert(sizeof(DigitizerSharedMemoryFormat) == 0x1000,
-              "DigitizerSharedMemoryFormat is an invalid size");
-
-// This is nn::hid::detail::HomeButtonSharedMemoryFormat
-struct HomeButtonSharedMemoryFormat {
-    CommonHeader header;
-    INSERT_PADDING_BYTES(0x1E0);
-};
-static_assert(sizeof(HomeButtonSharedMemoryFormat) == 0x200,
-              "HomeButtonSharedMemoryFormat is an invalid size");
-
-// This is nn::hid::detail::SleepButtonSharedMemoryFormat
-struct SleepButtonSharedMemoryFormat {
-    CommonHeader header;
-    INSERT_PADDING_BYTES(0x1E0);
-};
-static_assert(sizeof(SleepButtonSharedMemoryFormat) == 0x200,
-              "SleepButtonSharedMemoryFormat is an invalid size");
-
-// This is nn::hid::detail::CaptureButtonSharedMemoryFormat
-struct CaptureButtonSharedMemoryFormat {
-    CommonHeader header;
-    INSERT_PADDING_BYTES(0x1E0);
-};
-static_assert(sizeof(CaptureButtonSharedMemoryFormat) == 0x200,
-              "CaptureButtonSharedMemoryFormat is an invalid size");
-
-// This is nn::hid::detail::InputDetectorSharedMemoryFormat
-struct InputDetectorSharedMemoryFormat {
-    CommonHeader header;
-    INSERT_PADDING_BYTES(0x7E0);
-};
-static_assert(sizeof(InputDetectorSharedMemoryFormat) == 0x800,
-              "InputDetectorSharedMemoryFormat is an invalid size");
-
-// This is nn::hid::detail::UniquePadSharedMemoryFormat
-struct UniquePadSharedMemoryFormat {
-    CommonHeader header;
-    INSERT_PADDING_BYTES(0x3FE0);
-};
-static_assert(sizeof(UniquePadSharedMemoryFormat) == 0x4000,
-              "UniquePadSharedMemoryFormat is an invalid size");
-
-// This is nn::hid::detail::NpadSixAxisSensorLifo
-struct NpadSixAxisSensorLifo {
-    Lifo<Core::HID::SixAxisSensorState, HidEntryCount> lifo;
-};
-
-// This is nn::hid::detail::NpadInternalState
-struct NpadInternalState {
-    Core::HID::NpadStyleTag style_tag{Core::HID::NpadStyleSet::None};
-    NpadJoyAssignmentMode assignment_mode{NpadJoyAssignmentMode::Dual};
-    NpadFullKeyColorState fullkey_color{};
-    NpadJoyColorState joycon_color{};
-    Lifo<NPadGenericState, HidEntryCount> fullkey_lifo{};
-    Lifo<NPadGenericState, HidEntryCount> handheld_lifo{};
-    Lifo<NPadGenericState, HidEntryCount> joy_dual_lifo{};
-    Lifo<NPadGenericState, HidEntryCount> joy_left_lifo{};
-    Lifo<NPadGenericState, HidEntryCount> joy_right_lifo{};
-    Lifo<NPadGenericState, HidEntryCount> palma_lifo{};
-    Lifo<NPadGenericState, HidEntryCount> system_ext_lifo{};
-    NpadSixAxisSensorLifo sixaxis_fullkey_lifo{};
-    NpadSixAxisSensorLifo sixaxis_handheld_lifo{};
-    NpadSixAxisSensorLifo sixaxis_dual_left_lifo{};
-    NpadSixAxisSensorLifo sixaxis_dual_right_lifo{};
-    NpadSixAxisSensorLifo sixaxis_left_lifo{};
-    NpadSixAxisSensorLifo sixaxis_right_lifo{};
-    DeviceType device_type{};
-    INSERT_PADDING_BYTES(0x4); // Reserved
-    NPadSystemProperties system_properties{};
-    NpadSystemButtonProperties button_properties{};
-    Core::HID::NpadBatteryLevel battery_level_dual{};
-    Core::HID::NpadBatteryLevel battery_level_left{};
-    Core::HID::NpadBatteryLevel battery_level_right{};
-    AppletFooterUiAttributes applet_footer_attributes{};
-    AppletFooterUiType applet_footer_type{AppletFooterUiType::None};
-    INSERT_PADDING_BYTES(0x5B); // Reserved
-    INSERT_PADDING_BYTES(0x20); // Unknown
-    Lifo<NpadGcTriggerState, HidEntryCount> gc_trigger_lifo{};
-    NpadLarkType lark_type_l_and_main{};
-    NpadLarkType lark_type_r{};
-    NpadLuciaType lucia_type{};
-    NpadLagerType lager_type{};
-    Core::HID::SixAxisSensorProperties sixaxis_fullkey_properties;
-    Core::HID::SixAxisSensorProperties sixaxis_handheld_properties;
-    Core::HID::SixAxisSensorProperties sixaxis_dual_left_properties;
-    Core::HID::SixAxisSensorProperties sixaxis_dual_right_properties;
-    Core::HID::SixAxisSensorProperties sixaxis_left_properties;
-    Core::HID::SixAxisSensorProperties sixaxis_right_properties;
-};
-static_assert(sizeof(NpadInternalState) == 0x43F8, "NpadInternalState is an invalid size");
-
-// This is nn::hid::detail::NpadSharedMemoryEntry
-struct NpadSharedMemoryEntry {
-    NpadInternalState internal_state;
-    INSERT_PADDING_BYTES(0xC08);
-};
-static_assert(sizeof(NpadSharedMemoryEntry) == 0x5000, "NpadSharedMemoryEntry is an invalid size");
-
-// This is nn::hid::detail::NpadSharedMemoryFormat
-struct NpadSharedMemoryFormat {
-    std::array<NpadSharedMemoryEntry, MaxSupportedNpadIdTypes> npad_entry;
-};
-static_assert(sizeof(NpadSharedMemoryFormat) == 0x32000,
-              "NpadSharedMemoryFormat is an invalid size");
-
-// This is nn::hid::detail::GestureSharedMemoryFormat
-struct GestureSharedMemoryFormat {
-    // This is nn::hid::detail::GestureLifo
-    Lifo<GestureState, HidEntryCount> gesture_lifo{};
-    static_assert(sizeof(gesture_lifo) == 0x708, "gesture_lifo is an invalid size");
-    INSERT_PADDING_WORDS(0x3E);
-};
-static_assert(sizeof(GestureSharedMemoryFormat) == 0x800,
-              "GestureSharedMemoryFormat is an invalid size");
-
-// This is nn::hid::detail::ConsoleSixAxisSensorSharedMemoryFormat
-struct ConsoleSixAxisSensorSharedMemoryFormat {
-    u64 sampling_number{};
-    bool is_seven_six_axis_sensor_at_rest{};
-    INSERT_PADDING_BYTES(3); // padding
-    f32 verticalization_error{};
-    Common::Vec3f gyro_bias{};
-    INSERT_PADDING_BYTES(4); // padding
-};
-static_assert(sizeof(ConsoleSixAxisSensorSharedMemoryFormat) == 0x20,
-              "ConsoleSixAxisSensorSharedMemoryFormat is an invalid size");
-
-// This is nn::hid::detail::SharedMemoryFormat
-struct SharedMemoryFormat {
-    void Initialize() {}
-
-    DebugPadSharedMemoryFormat debug_pad;
-    TouchScreenSharedMemoryFormat touch_screen;
-    MouseSharedMemoryFormat mouse;
-    KeyboardSharedMemoryFormat keyboard;
-    DigitizerSharedMemoryFormat digitizer;
-    HomeButtonSharedMemoryFormat home_button;
-    SleepButtonSharedMemoryFormat sleep_button;
-    CaptureButtonSharedMemoryFormat capture_button;
-    InputDetectorSharedMemoryFormat input_detector;
-    UniquePadSharedMemoryFormat unique_pad;
-    NpadSharedMemoryFormat npad;
-    GestureSharedMemoryFormat gesture;
-    ConsoleSixAxisSensorSharedMemoryFormat console;
-    INSERT_PADDING_BYTES(0x19E0);
-    MouseSharedMemoryFormat debug_mouse;
-    INSERT_PADDING_BYTES(0x2000);
-};
-static_assert(offsetof(SharedMemoryFormat, debug_pad) == 0x0, "debug_pad has wrong offset");
-static_assert(offsetof(SharedMemoryFormat, touch_screen) == 0x400, "touch_screen has wrong offset");
-static_assert(offsetof(SharedMemoryFormat, mouse) == 0x3400, "mouse has wrong offset");
-static_assert(offsetof(SharedMemoryFormat, keyboard) == 0x3800, "keyboard has wrong offset");
-static_assert(offsetof(SharedMemoryFormat, digitizer) == 0x3C00, "digitizer has wrong offset");
-static_assert(offsetof(SharedMemoryFormat, home_button) == 0x4C00, "home_button has wrong offset");
-static_assert(offsetof(SharedMemoryFormat, sleep_button) == 0x4E00,
-              "sleep_button has wrong offset");
-static_assert(offsetof(SharedMemoryFormat, capture_button) == 0x5000,
-              "capture_button has wrong offset");
-static_assert(offsetof(SharedMemoryFormat, input_detector) == 0x5200,
-              "input_detector has wrong offset");
-static_assert(offsetof(SharedMemoryFormat, npad) == 0x9A00, "npad has wrong offset");
-static_assert(offsetof(SharedMemoryFormat, gesture) == 0x3BA00, "gesture has wrong offset");
-static_assert(offsetof(SharedMemoryFormat, console) == 0x3C200, "console has wrong offset");
-static_assert(offsetof(SharedMemoryFormat, debug_mouse) == 0x3DC00, "debug_mouse has wrong offset");
-static_assert(sizeof(SharedMemoryFormat) == 0x40000, "SharedMemoryFormat is an invalid size");
-
-} // namespace Service::HID
diff --git a/src/core/hle/service/hid/controllers/types/touch_types.h b/src/core/hle/service/hid/controllers/types/touch_types.h
deleted file mode 100644
index efeaa796d..000000000
--- a/src/core/hle/service/hid/controllers/types/touch_types.h
+++ /dev/null
@@ -1,90 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#pragma once
-
-#include <array>
-
-#include <array>
-#include "common/bit_field.h"
-#include "common/common_funcs.h"
-#include "common/common_types.h"
-#include "common/point.h"
-#include "core/hid/hid_types.h"
-
-namespace Service::HID {
-static constexpr std::size_t MAX_FINGERS = 16;
-static constexpr size_t MAX_POINTS = 4;
-
-// This is nn::hid::GestureType
-enum class GestureType : u32 {
-    Idle,     // Nothing touching the screen
-    Complete, // Set at the end of a touch event
-    Cancel,   // Set when the number of fingers change
-    Touch,    // A finger just touched the screen
-    Press,    // Set if last type is touch and the finger hasn't moved
-    Tap,      // Fast press then release
-    Pan,      // All points moving together across the screen
-    Swipe,    // Fast press movement and release of a single point
-    Pinch,    // All points moving away/closer to the midpoint
-    Rotate,   // All points rotating from the midpoint
-};
-
-// This is nn::hid::GestureDirection
-enum class GestureDirection : u32 {
-    None,
-    Left,
-    Up,
-    Right,
-    Down,
-};
-
-// This is nn::hid::GestureAttribute
-struct GestureAttribute {
-    union {
-        u32 raw{};
-
-        BitField<4, 1, u32> is_new_touch;
-        BitField<8, 1, u32> is_double_tap;
-    };
-};
-static_assert(sizeof(GestureAttribute) == 4, "GestureAttribute is an invalid size");
-
-// This is nn::hid::GestureState
-struct GestureState {
-    s64 sampling_number{};
-    s64 detection_count{};
-    GestureType type{GestureType::Idle};
-    GestureDirection direction{GestureDirection::None};
-    Common::Point<s32> pos{};
-    Common::Point<s32> delta{};
-    f32 vel_x{};
-    f32 vel_y{};
-    GestureAttribute attributes{};
-    f32 scale{};
-    f32 rotation_angle{};
-    s32 point_count{};
-    std::array<Common::Point<s32>, 4> points{};
-};
-static_assert(sizeof(GestureState) == 0x60, "GestureState is an invalid size");
-
-struct GestureProperties {
-    std::array<Common::Point<s32>, MAX_POINTS> points{};
-    std::size_t active_points{};
-    Common::Point<s32> mid_point{};
-    s64 detection_count{};
-    u64 delta_time{};
-    f32 average_distance{};
-    f32 angle{};
-};
-
-// This is nn::hid::TouchScreenState
-struct TouchScreenState {
-    s64 sampling_number{};
-    s32 entry_count{};
-    INSERT_PADDING_BYTES(4); // Reserved
-    std::array<Core::HID::TouchState, MAX_FINGERS> states{};
-};
-static_assert(sizeof(TouchScreenState) == 0x290, "TouchScreenState is an invalid size");
-
-} // namespace Service::HID
diff --git a/src/core/hle/service/hid/controllers/unique_pad.cpp b/src/core/hle/service/hid/controllers/unique_pad.cpp
deleted file mode 100644
index 6c543031d..000000000
--- a/src/core/hle/service/hid/controllers/unique_pad.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "core/core_timing.h"
-#include "core/hle/service/hid/controllers/applet_resource.h"
-#include "core/hle/service/hid/controllers/types/shared_memory_format.h"
-#include "core/hle/service/hid/controllers/unique_pad.h"
-
-namespace Service::HID {
-
-UniquePad::UniquePad(Core::HID::HIDCore& hid_core_) : ControllerBase{hid_core_} {}
-
-UniquePad::~UniquePad() = default;
-
-void UniquePad::OnInit() {}
-
-void UniquePad::OnRelease() {}
-
-void UniquePad::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
-    if (!smart_update) {
-        return;
-    }
-
-    const u64 aruid = applet_resource->GetActiveAruid();
-    auto* data = applet_resource->GetAruidData(aruid);
-
-    if (data == nullptr || !data->flag.is_assigned) {
-        return;
-    }
-
-    auto& header = data->shared_memory_format->capture_button.header;
-    header.timestamp = core_timing.GetGlobalTimeNs().count();
-    header.total_entry_count = 17;
-    header.entry_count = 0;
-    header.last_entry_index = 0;
-}
-
-} // namespace Service::HID
diff --git a/src/core/hle/service/hid/controllers/unique_pad.h b/src/core/hle/service/hid/controllers/unique_pad.h
deleted file mode 100644
index 966368264..000000000
--- a/src/core/hle/service/hid/controllers/unique_pad.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "core/hle/service/hid/controllers/controller_base.h"
-
-namespace Service::HID {
-
-class UniquePad final : public ControllerBase {
-public:
-    explicit UniquePad(Core::HID::HIDCore& hid_core_);
-    ~UniquePad() override;
-
-    // Called when the controller is initialized
-    void OnInit() override;
-
-    // When the controller is released
-    void OnRelease() override;
-
-    // When the controller is requesting an update for the shared memory
-    void OnUpdate(const Core::Timing::CoreTiming& core_timing) override;
-
-private:
-    bool smart_update{};
-};
-} // namespace Service::HID