askl

src/core/CMakeLists.txt

@@ -459,12 +459,8 @@ add_library(core STATIC
     hle/service/fgm/fgm.h
     hle/service/friend/friend.cpp
     hle/service/friend/friend.h
-    hle/service/friend/friend_results.h
-    hle/service/friend/friend_service.cpp
-    hle/service/friend/friend_service.h
-    hle/service/friend/friend_types.h
-    hle/service/friend/notification_service.cpp
-    hle/service/friend/notification_service.h
+    hle/service/friend/friend_interface.cpp
+    hle/service/friend/friend_interface.h
     hle/service/glue/arp.cpp
     hle/service/glue/arp.h
     hle/service/glue/bgtc.cpp

src/core/hle/service/friend/friend.cpp

@@ -1,6 +1,7 @@
 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include <queue>
 #include "common/logging/log.h"
 #include "common/uuid.h"
 #include "core/core.h"
@@ -13,9 +14,6 @@
 #include "core/hle/service/server_manager.h"
 
 namespace Service::Friend {
-Module::Interface::Interface(std::shared_ptr<Module> module_, Core::System& system_,
-                             const char* name)
-    : ServiceFramework{system_, name}, module{std::move(module_)} {}
 
 class IFriendService final : public ServiceFramework<IFriendService> {
 public:
@@ -332,17 +330,11 @@ void Module::Interface::CreateNotificationService(HLERequestContext& ctx) {
     rb.PushIpcInterface<INotificationService>(system, uuid);
 }
 
-Friend::Friend(std::shared_ptr<Module> module_, Core::System& system_, const char* name)
-    : Interface(std::move(module_), system_, name) {
-    static const FunctionInfo functions[] = {
-        {0, &Friend::CreateFriendService, "CreateFriendService"},
-        {1, &Friend::CreateNotificationService, "CreateNotificationService"},
-        {2, nullptr, "CreateDaemonSuspendSessionService"},
-    };
-    RegisterHandlers(functions);
-}
+Module::Interface::Interface(std::shared_ptr<Module> module_, Core::System& system_,
+                             const char* name)
+    : ServiceFramework{system_, name}, module{std::move(module_)} {}
 
-Friend::~Friend() = default;
+Module::Interface::~Interface() = default;
 
 void LoopProcess(Core::System& system) {
     auto server_manager = std::make_unique<ServerManager>(system);

src/core/hle/service/friend/friend_interface.cpp

@@ -0,0 +1,20 @@
+// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "core/hle/service/friend/friend_interface.h"
+
+namespace Service::Friend {
+
+Friend::Friend(std::shared_ptr<Module> module_, Core::System& system_, const char* name)
+    : Interface(std::move(module_), system_, name) {
+    static const FunctionInfo functions[] = {
+        {0, &Friend::CreateFriendService, "CreateFriendService"},
+        {1, &Friend::CreateNotificationService, "CreateNotificationService"},
+        {2, nullptr, "CreateDaemonSuspendSessionService"},
+    };
+    RegisterHandlers(functions);
+}
+
+Friend::~Friend() = default;
+
+} // namespace Service::Friend

src/core/hle/service/friend/friend_interface.h

@@ -0,0 +1,16 @@
+// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "core/hle/service/friend/friend.h"
+
+namespace Service::Friend {
+
+class Friend final : public Module::Interface {
+public:
+    explicit Friend(std::shared_ptr<Module> module_, Core::System& system_, const char* name);
+    ~Friend() override;
+};
+
+} // namespace Service::Friend

src/core/hle/service/friend/friend_results.h

@@ -1,14 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "core/hle/result.h"
-
-namespace Service::Friend {
-
-constexpr Result NotInitialized{ErrorModule::Account, 1};
-constexpr Result InvalidArgument{ErrorModule::Account, 2};
-constexpr Result NoNotifications{ErrorModule::Account, 15};
-
-} // namespace Service::Friend

src/core/hle/service/friend/friend_service.cpp

@@ -1,184 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "common/logging/log.h"
-#include "common/uuid.h"
-#include "core/hle/ipc_helpers.h"
-#include "core/hle/service/friend/friend_results.h"
-#include "core/hle/service/friend/friend_service.h"
-#include "core/hle/service/friend/friend_types.h"
-
-namespace Service::Friend {
-
-IFriendService::IFriendService(Core::System& system_)
-    : ServiceFramework{system_, "IFriendService"}, service_context{system, "IFriendService"} {
-    // clang-format off
-        static const FunctionInfo functions[] = {
-            {0, &IFriendService::GetCompletionEvent, "GetCompletionEvent"},
-            {1, nullptr, "Cancel"},
-            {10100, nullptr, "GetFriendListIds"},
-            {10101, &IFriendService::GetFriendList, "GetFriendList"},
-            {10102, nullptr, "UpdateFriendInfo"},
-            {10110, nullptr, "GetFriendProfileImage"},
-            {10120, &IFriendService::CheckFriendListAvailability, "CheckFriendListAvailability"},
-            {10121, nullptr, "EnsureFriendListAvailable"},
-            {10200, nullptr, "SendFriendRequestForApplication"},
-            {10211, nullptr, "AddFacedFriendRequestForApplication"},
-            {10400, &IFriendService::GetBlockedUserListIds, "GetBlockedUserListIds"},
-            {10420, nullptr, "IsBlockedUserListCacheAvailable"},
-            {10421, nullptr, "EnsureBlockedUserListAvailable"},
-            {10500, nullptr, "GetProfileList"},
-            {10600, nullptr, "DeclareOpenOnlinePlaySession"},
-            {10601, &IFriendService::DeclareCloseOnlinePlaySession, "DeclareCloseOnlinePlaySession"},
-            {10610, &IFriendService::UpdateUserPresence, "UpdateUserPresence"},
-            {10700, &IFriendService::GetPlayHistoryRegistrationKey, "GetPlayHistoryRegistrationKey"},
-            {10701, nullptr, "GetPlayHistoryRegistrationKeyWithNetworkServiceAccountId"},
-            {10702, nullptr, "AddPlayHistory"},
-            {11000, nullptr, "GetProfileImageUrl"},
-            {20100, nullptr, "GetFriendCount"},
-            {20101, nullptr, "GetNewlyFriendCount"},
-            {20102, nullptr, "GetFriendDetailedInfo"},
-            {20103, nullptr, "SyncFriendList"},
-            {20104, nullptr, "RequestSyncFriendList"},
-            {20110, nullptr, "LoadFriendSetting"},
-            {20200, nullptr, "GetReceivedFriendRequestCount"},
-            {20201, nullptr, "GetFriendRequestList"},
-            {20300, nullptr, "GetFriendCandidateList"},
-            {20301, nullptr, "GetNintendoNetworkIdInfo"},
-            {20302, nullptr, "GetSnsAccountLinkage"},
-            {20303, nullptr, "GetSnsAccountProfile"},
-            {20304, nullptr, "GetSnsAccountFriendList"},
-            {20400, nullptr, "GetBlockedUserList"},
-            {20401, nullptr, "SyncBlockedUserList"},
-            {20500, nullptr, "GetProfileExtraList"},
-            {20501, nullptr, "GetRelationship"},
-            {20600, nullptr, "GetUserPresenceView"},
-            {20700, nullptr, "GetPlayHistoryList"},
-            {20701, nullptr, "GetPlayHistoryStatistics"},
-            {20800, nullptr, "LoadUserSetting"},
-            {20801, nullptr, "SyncUserSetting"},
-            {20900, nullptr, "RequestListSummaryOverlayNotification"},
-            {21000, nullptr, "GetExternalApplicationCatalog"},
-            {22000, nullptr, "GetReceivedFriendInvitationList"},
-            {22001, nullptr, "GetReceivedFriendInvitationDetailedInfo"},
-            {22010, nullptr, "GetReceivedFriendInvitationCountCache"},
-            {30100, nullptr, "DropFriendNewlyFlags"},
-            {30101, nullptr, "DeleteFriend"},
-            {30110, nullptr, "DropFriendNewlyFlag"},
-            {30120, nullptr, "ChangeFriendFavoriteFlag"},
-            {30121, nullptr, "ChangeFriendOnlineNotificationFlag"},
-            {30200, nullptr, "SendFriendRequest"},
-            {30201, nullptr, "SendFriendRequestWithApplicationInfo"},
-            {30202, nullptr, "CancelFriendRequest"},
-            {30203, nullptr, "AcceptFriendRequest"},
-            {30204, nullptr, "RejectFriendRequest"},
-            {30205, nullptr, "ReadFriendRequest"},
-            {30210, nullptr, "GetFacedFriendRequestRegistrationKey"},
-            {30211, nullptr, "AddFacedFriendRequest"},
-            {30212, nullptr, "CancelFacedFriendRequest"},
-            {30213, nullptr, "GetFacedFriendRequestProfileImage"},
-            {30214, nullptr, "GetFacedFriendRequestProfileImageFromPath"},
-            {30215, nullptr, "SendFriendRequestWithExternalApplicationCatalogId"},
-            {30216, nullptr, "ResendFacedFriendRequest"},
-            {30217, nullptr, "SendFriendRequestWithNintendoNetworkIdInfo"},
-            {30300, nullptr, "GetSnsAccountLinkPageUrl"},
-            {30301, nullptr, "UnlinkSnsAccount"},
-            {30400, nullptr, "BlockUser"},
-            {30401, nullptr, "BlockUserWithApplicationInfo"},
-            {30402, nullptr, "UnblockUser"},
-            {30500, nullptr, "GetProfileExtraFromFriendCode"},
-            {30700, nullptr, "DeletePlayHistory"},
-            {30810, nullptr, "ChangePresencePermission"},
-            {30811, nullptr, "ChangeFriendRequestReception"},
-            {30812, nullptr, "ChangePlayLogPermission"},
-            {30820, nullptr, "IssueFriendCode"},
-            {30830, nullptr, "ClearPlayLog"},
-            {30900, nullptr, "SendFriendInvitation"},
-            {30910, nullptr, "ReadFriendInvitation"},
-            {30911, nullptr, "ReadAllFriendInvitations"},
-            {40100, nullptr, "DeleteFriendListCache"},
-            {40400, nullptr, "DeleteBlockedUserListCache"},
-            {49900, nullptr, "DeleteNetworkServiceAccountCache"},
-        };
-    // clang-format on
-
-    RegisterHandlers(functions);
-
-    completion_event = service_context.CreateEvent("IFriendService:CompletionEvent");
-}
-
-IFriendService::~IFriendService() {
-    service_context.CloseEvent(completion_event);
-}
-
-void IFriendService::GetCompletionEvent(Kernel::HLERequestContext& ctx) {
-    LOG_DEBUG(Service_Friend, "called");
-
-    IPC::ResponseBuilder rb{ctx, 2, 1};
-    rb.Push(ResultSuccess);
-    rb.PushCopyObjects(completion_event->GetReadableEvent());
-}
-
-void IFriendService::GetBlockedUserListIds(Kernel::HLERequestContext& ctx) {
-    // This is safe to stub, as there should be no adverse consequences from reporting no
-    // blocked users.
-    LOG_WARNING(Service_Friend, "(STUBBED) called");
-    IPC::ResponseBuilder rb{ctx, 3};
-    rb.Push(ResultSuccess);
-    rb.Push<u32>(0); // Indicates there are no blocked users
-}
-
-void IFriendService::DeclareCloseOnlinePlaySession(Kernel::HLERequestContext& ctx) {
-    // Stub used by Splatoon 2
-    LOG_WARNING(Service_Friend, "(STUBBED) called");
-    IPC::ResponseBuilder rb{ctx, 2};
-    rb.Push(ResultSuccess);
-}
-
-void IFriendService::UpdateUserPresence(Kernel::HLERequestContext& ctx) {
-    // Stub used by Retro City Rampage
-    LOG_WARNING(Service_Friend, "(STUBBED) called");
-    IPC::ResponseBuilder rb{ctx, 2};
-    rb.Push(ResultSuccess);
-}
-
-void IFriendService::GetPlayHistoryRegistrationKey(Kernel::HLERequestContext& ctx) {
-    IPC::RequestParser rp{ctx};
-    const auto local_play = rp.Pop<bool>();
-    const auto uuid = rp.PopRaw<Common::UUID>();
-
-    LOG_WARNING(Service_Friend, "(STUBBED) called, local_play={}, uuid=0x{}", local_play,
-                uuid.RawString());
-
-    IPC::ResponseBuilder rb{ctx, 2};
-    rb.Push(ResultSuccess);
-}
-
-void IFriendService::GetFriendList(Kernel::HLERequestContext& ctx) {
-    IPC::RequestParser rp{ctx};
-    const auto friend_offset = rp.Pop<u32>();
-    const auto uuid = rp.PopRaw<Common::UUID>();
-    [[maybe_unused]] const auto filter = rp.PopRaw<SizedFriendFilter>();
-    const auto pid = rp.Pop<u64>();
-    LOG_WARNING(Service_Friend, "(STUBBED) called, offset={}, uuid=0x{}, pid={}", friend_offset,
-                uuid.RawString(), pid);
-
-    IPC::ResponseBuilder rb{ctx, 3};
-    rb.Push(ResultSuccess);
-
-    rb.Push<u32>(0); // Friend count
-    // TODO(ogniK): Return a buffer of u64s which are the "NetworkServiceAccountId"
-}
-
-void IFriendService::CheckFriendListAvailability(Kernel::HLERequestContext& ctx) {
-    IPC::RequestParser rp{ctx};
-    const auto uuid{rp.PopRaw<Common::UUID>()};
-
-    LOG_WARNING(Service_Friend, "(STUBBED) called, uuid=0x{}", uuid.RawString());
-
-    IPC::ResponseBuilder rb{ctx, 3};
-    rb.Push(ResultSuccess);
-    rb.Push(true);
-}
-
-} // namespace Service::Friend

src/core/hle/service/friend/friend_service.h

@@ -1,31 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "core/hle/service/friend/friend.h"
-#include "core/hle/service/kernel_helpers.h"
-#include "core/hle/service/service.h"
-
-namespace Service::Friend {
-
-class IFriendService final : public ServiceFramework<IFriendService> {
-public:
-    explicit IFriendService(Core::System& system_);
-    ~IFriendService() override;
-
-private:
-    void GetCompletionEvent(Kernel::HLERequestContext& ctx);
-    void GetFriendList(Kernel::HLERequestContext& ctx);
-    void CheckFriendListAvailability(Kernel::HLERequestContext& ctx);
-    void GetBlockedUserListIds(Kernel::HLERequestContext& ctx);
-    void DeclareCloseOnlinePlaySession(Kernel::HLERequestContext& ctx);
-    void UpdateUserPresence(Kernel::HLERequestContext& ctx);
-    void GetPlayHistoryRegistrationKey(Kernel::HLERequestContext& ctx);
-
-    KernelHelpers::ServiceContext service_context;
-
-    Kernel::KEvent* completion_event;
-};
-
-} // namespace Service::Friend

src/core/hle/service/friend/friend_types.h

@@ -1,46 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include <array>
-#include "common/common_types.h"
-
-namespace Service::Friend {
-
-enum class PresenceFilter : u32 {
-    None = 0,
-    Online = 1,
-    OnlinePlay = 2,
-    OnlineOrOnlinePlay = 3,
-};
-
-struct SizedFriendFilter {
-    PresenceFilter presence;
-    u8 is_favorite;
-    u8 same_app;
-    u8 same_app_played;
-    u8 arbitary_app_played;
-    u64 group_id;
-};
-static_assert(sizeof(SizedFriendFilter) == 0x10, "SizedFriendFilter is an invalid size");
-
-enum class NotificationTypes : u32 {
-    HasUpdatedFriendsList = 0x65,
-    HasReceivedFriendRequest = 0x1,
-};
-
-struct SizedNotificationInfo {
-    NotificationTypes notification_type;
-    INSERT_PADDING_WORDS(
-        1); // TODO(ogniK): This doesn't seem to be used within any IPC returns as of now
-    u64_le account_id;
-};
-static_assert(sizeof(SizedNotificationInfo) == 0x10, "SizedNotificationInfo is an incorrect size");
-
-struct States {
-    bool has_updated_friends;
-    bool has_received_friend_request;
-};
-
-} // namespace Service::Friend

src/core/hle/service/friend/notification_service.cpp

@@ -1,83 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "common/logging/log.h"
-#include "core/hle/ipc_helpers.h"
-#include "core/hle/service/friend/friend_results.h"
-#include "core/hle/service/friend/friend_types.h"
-#include "core/hle/service/friend/notification_service.h"
-
-namespace Service::Friend {
-
-INotificationService::INotificationService(Core::System& system_, Common::UUID uuid_)
-    : ServiceFramework{system_, "INotificationService"}, uuid{uuid_}, service_context{
-                                                                          system_,
-                                                                          "INotificationService"} {
-    // clang-format off
-        static const FunctionInfo functions[] = {
-            {0, &INotificationService::GetEvent, "GetEvent"},
-            {1, &INotificationService::Clear, "Clear"},
-            {2, &INotificationService::Pop, "Pop"}
-        };
-    // clang-format on
-
-    RegisterHandlers(functions);
-
-    notification_event = service_context.CreateEvent("INotificationService:NotifyEvent");
-}
-
-INotificationService::~INotificationService() {
-    service_context.CloseEvent(notification_event);
-}
-
-void INotificationService::GetEvent(Kernel::HLERequestContext& ctx) {
-    LOG_DEBUG(Service_Friend, "called");
-
-    IPC::ResponseBuilder rb{ctx, 2, 1};
-    rb.Push(ResultSuccess);
-    rb.PushCopyObjects(notification_event->GetReadableEvent());
-}
-
-void INotificationService::Clear(Kernel::HLERequestContext& ctx) {
-    LOG_DEBUG(Service_Friend, "called");
-    while (!notifications.empty()) {
-        notifications.pop();
-    }
-    std::memset(&states, 0, sizeof(States));
-
-    IPC::ResponseBuilder rb{ctx, 2};
-    rb.Push(ResultSuccess);
-}
-
-void INotificationService::Pop(Kernel::HLERequestContext& ctx) {
-    LOG_DEBUG(Service_Friend, "called");
-
-    if (notifications.empty()) {
-        LOG_ERROR(Service_Friend, "No notifications in queue!");
-        IPC::ResponseBuilder rb{ctx, 2};
-        rb.Push(NoNotifications);
-        return;
-    }
-
-    const auto notification = notifications.front();
-    notifications.pop();
-
-    switch (notification.notification_type) {
-    case NotificationTypes::HasUpdatedFriendsList:
-        states.has_updated_friends = false;
-        break;
-    case NotificationTypes::HasReceivedFriendRequest:
-        states.has_received_friend_request = false;
-        break;
-    default:
-        // HOS seems not have an error case for an unknown notification
-        LOG_WARNING(Service_Friend, "Unknown notification {:08X}", notification.notification_type);
-        break;
-    }
-
-    IPC::ResponseBuilder rb{ctx, 6};
-    rb.Push(ResultSuccess);
-    rb.PushRaw<SizedNotificationInfo>(notification);
-}
-
-} // namespace Service::Friend

src/core/hle/service/friend/notification_service.h

@@ -1,32 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-#include <queue>
-
-#include "common/uuid.h"
-#include "core/hle/service/friend/friend_types.h"
-#include "core/hle/service/kernel_helpers.h"
-#include "core/hle/service/service.h"
-
-namespace Service::Friend {
-
-class INotificationService final : public ServiceFramework<INotificationService> {
-public:
-    explicit INotificationService(Core::System& system_, Common::UUID uuid_);
-    ~INotificationService() override;
-
-private:
-    void GetEvent(Kernel::HLERequestContext& ctx);
-    void Clear(Kernel::HLERequestContext& ctx);
-    void Pop(Kernel::HLERequestContext& ctx);
-
-    Common::UUID uuid;
-    KernelHelpers::ServiceContext service_context;
-
-    Kernel::KEvent* notification_event;
-    std::queue<SizedNotificationInfo> notifications;
-    States states{};
-};
-
-} // namespace Service::Friend

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

@@ -14,11 +14,22 @@ constexpr Result VibrationInvalidStyleIndex{ErrorModule::HID, 122};
 constexpr Result VibrationInvalidNpadId{ErrorModule::HID, 123};
 constexpr Result VibrationDeviceIndexOutOfRange{ErrorModule::HID, 124};
 constexpr Result InvalidSixAxisFusionRange{ErrorModule::HID, 423};
+
+constexpr Result ResultMcuInvalidHandle{ErrorModule::HID, 541};
+constexpr Result ResultMcuNotEnabled{ErrorModule::HID, 542};
+constexpr Result ResultMcuNoDeviceConnected{ErrorModule::HID, 543};
+constexpr Result ResultMcuUnknown544{ErrorModule::HID, 544};
+constexpr Result ResultMcuUnknown546{ErrorModule::HID, 546};
+constexpr Result ResultMcuUnknown548{ErrorModule::HID, 548};
+
 constexpr Result NpadIsDualJoycon{ErrorModule::HID, 601};
 constexpr Result NpadIsSameType{ErrorModule::HID, 602};
 constexpr Result InvalidNpadId{ErrorModule::HID, 709};
 constexpr Result NpadNotConnected{ErrorModule::HID, 710};
 constexpr Result InvalidArraySize{ErrorModule::HID, 715};
+
+constexpr Result ResultControllerUpdateFailed{ErrorModule::HID, 3201};
+
 constexpr Result InvalidPalmaHandle{ErrorModule::HID, 3302};
 
 } // namespace Service::HID
@@ -29,3 +40,17 @@ constexpr Result InvalidProcessorState{ErrorModule::Irsensor, 78};
 constexpr Result InvalidIrCameraHandle{ErrorModule::Irsensor, 204};
 
 } // namespace Service::IRS
+
+namespace Service::HIDBUS {
+
+constexpr Result ResultNotEnabled{ErrorModule::HIDBUS, 1};
+constexpr Result ResultControllerUpdateFailed{ErrorModule::HIDBUS, 3};
+constexpr Result ResultInvalidBusHandle{ErrorModule::HIDBUS, 4};
+constexpr Result ResultNoDeviceConnected{ErrorModule::HIDBUS, 5};
+constexpr Result ResultUknown6{ErrorModule::HIDBUS, 6};
+constexpr Result ResultPollingRecieveDataNotAvailable{ErrorModule::HIDBUS, 7};
+constexpr Result ResultDeviceEnabledNotSet{ErrorModule::HIDBUS, 8};
+constexpr Result ResultBusHandleAlreadyInitialized{ErrorModule::HIDBUS, 10};
+constexpr Result ResultInvalidBusType{ErrorModule::HIDBUS, 11};
+
+} // namespace Service::HID

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

@@ -12,6 +12,8 @@
 #include "core/hle/kernel/k_shared_memory.h"
 #include "core/hle/kernel/k_transfer_memory.h"
 #include "core/hle/service/hid/hidbus.h"
+#include "core/hle/service/hid/errors.h"
+#include "core/hle/service/hid/controllers/npad.h"
 #include "core/hle/service/hid/hidbus/ringcon.h"
 #include "core/hle/service/hid/hidbus/starlink.h"
 #include "core/hle/service/hid/hidbus/stubbed.h"
@@ -47,56 +49,9 @@ HidBus::HidBus(Core::System& system_)
 
     RegisterHandlers(functions);
 
-    // Register update callbacks
-    hidbus_update_event = Core::Timing::CreateEvent(
-        "Hidbus::UpdateCallback",
-        [this](std::uintptr_t user_data, s64 time,
-               std::chrono::nanoseconds ns_late) -> std::optional<std::chrono::nanoseconds> {
-            const auto guard = LockService();
-            UpdateHidbus(user_data, ns_late);
-            return std::nullopt;
-        });
-
-    system_.CoreTiming().ScheduleLoopingEvent(hidbus_update_ns, hidbus_update_ns,
-                                              hidbus_update_event);
 }
 
 HidBus::~HidBus() {
-    system.CoreTiming().UnscheduleEvent(hidbus_update_event, 0);
-}
-
-void HidBus::UpdateHidbus(std::uintptr_t user_data, std::chrono::nanoseconds ns_late) {
-    if (is_hidbus_enabled) {
-        for (std::size_t i = 0; i < devices.size(); ++i) {
-            if (!devices[i].is_device_initializated) {
-                continue;
-            }
-            auto& device = devices[i].device;
-            device->OnUpdate();
-            auto& cur_entry = hidbus_status.entries[devices[i].handle.internal_index];
-            cur_entry.is_polling_mode = device->IsPollingMode();
-            cur_entry.polling_mode = device->GetPollingMode();
-            cur_entry.is_enabled = device->IsEnabled();
-
-            u8* shared_memory = system.Kernel().GetHidBusSharedMem().GetPointer();
-            std::memcpy(shared_memory + (i * sizeof(HidbusStatusManagerEntry)), &hidbus_status,
-                        sizeof(HidbusStatusManagerEntry));
-        }
-    }
-}
-
-std::optional<std::size_t> HidBus::GetDeviceIndexFromHandle(BusHandle handle) const {
-    for (std::size_t i = 0; i < devices.size(); ++i) {
-        const auto& device_handle = devices[i].handle;
-        if (handle.abstracted_pad_id == device_handle.abstracted_pad_id &&
-            handle.internal_index == device_handle.internal_index &&
-            handle.player_number == device_handle.player_number &&
-            handle.bus_type_id == device_handle.bus_type_id &&
-            handle.is_valid == device_handle.is_valid) {
-            return i;
-        }
-    }
-    return std::nullopt;
 }
 
 void HidBus::GetBusHandle(HLERequestContext& ctx) {
@@ -114,38 +69,9 @@ void HidBus::GetBusHandle(HLERequestContext& ctx) {
     LOG_INFO(Service_HID, "called, npad_id={}, bus_type={}, applet_resource_user_id={}",
              parameters.npad_id, parameters.bus_type, parameters.applet_resource_user_id);
 
-    bool is_handle_found = 0;
-    std::size_t handle_index = 0;
-
-    for (std::size_t i = 0; i < devices.size(); i++) {
-        const auto& handle = devices[i].handle;
-        if (!handle.is_valid) {
-            continue;
-        }
-        if (static_cast<Core::HID::NpadIdType>(handle.player_number) == parameters.npad_id &&
-            handle.bus_type_id == static_cast<u8>(parameters.bus_type)) {
-            is_handle_found = true;
-            handle_index = i;
-            break;
-        }
-    }
-
-    // Handle not found. Create a new one
-    if (!is_handle_found) {
-        for (std::size_t i = 0; i < devices.size(); i++) {
-            if (devices[i].handle.is_valid) {
-                continue;
-            }
-            devices[i].handle = {
-                .abstracted_pad_id = static_cast<u8>(i),
-                .internal_index = static_cast<u8>(i),
-                .player_number = static_cast<u8>(parameters.npad_id),
-                .bus_type_id = static_cast<u8>(parameters.bus_type),
-                .is_valid = true,
-            };
-            handle_index = i;
-            break;
-        }
+    if (parameters.bus_type >= BusType::MaxBusType) {
+        IPC::ResponseBuilder rb{ctx, 2};
+        rb.Push(HIDBUS::ResultInvalidBusType);
     }
 
     struct OutData {
@@ -155,10 +81,8 @@ void HidBus::GetBusHandle(HLERequestContext& ctx) {
     };
     static_assert(sizeof(OutData) == 0x10, "OutData has incorrect size.");
 
-    const OutData out_data{
-        .is_valid = true,
-        .handle = devices[handle_index].handle,
-    };
+    OutData out_data{};
+    out_data.is_valid = GetBusHandleImpl(out_data.handle, parameters.npad_id, parameters.bus_type);
 
     IPC::ResponseBuilder rb{ctx, 6};
     rb.Push(ResultSuccess);
@@ -175,21 +99,10 @@ void HidBus::IsExternalDeviceConnected(HLERequestContext& ctx) {
              bus_handle_.abstracted_pad_id, bus_handle_.bus_type_id, bus_handle_.internal_index,
              bus_handle_.player_number, bus_handle_.is_valid);
 
-    const auto device_index = GetDeviceIndexFromHandle(bus_handle_);
+    auto result = TranslateHidErrorToHidBusError(ResultSuccess);
 
-    if (device_index) {
-        const auto& device = devices[device_index.value()].device;
-        const bool is_attached = device->IsDeviceActivated();
-
-        IPC::ResponseBuilder rb{ctx, 3};
-        rb.Push(ResultSuccess);
-        rb.Push(is_attached);
-        return;
-    }
-
-    LOG_ERROR(Service_HID, "Invalid handle");
     IPC::ResponseBuilder rb{ctx, 2};
-    rb.Push(ResultUnknown);
+    rb.Push(result);
     return;
 }
 
@@ -204,40 +117,6 @@ void HidBus::Initialize(HLERequestContext& ctx) {
              bus_handle_.abstracted_pad_id, bus_handle_.bus_type_id, bus_handle_.internal_index,
              bus_handle_.player_number, bus_handle_.is_valid, applet_resource_user_id);
 
-    is_hidbus_enabled = true;
-
-    const auto device_index = GetDeviceIndexFromHandle(bus_handle_);
-
-    if (device_index) {
-        const auto entry_index = devices[device_index.value()].handle.internal_index;
-        auto& cur_entry = hidbus_status.entries[entry_index];
-
-        if (bus_handle_.internal_index == 0 && Settings::values.enable_ring_controller) {
-            MakeDevice<RingController>(bus_handle_);
-            devices[device_index.value()].is_device_initializated = true;
-            devices[device_index.value()].device->ActivateDevice();
-            cur_entry.is_in_focus = true;
-            cur_entry.is_connected = true;
-            cur_entry.is_connected_result = ResultSuccess;
-            cur_entry.is_enabled = false;
-            cur_entry.is_polling_mode = false;
-        } else {
-            MakeDevice<HidbusStubbed>(bus_handle_);
-            devices[device_index.value()].is_device_initializated = true;
-            cur_entry.is_in_focus = true;
-            cur_entry.is_connected = false;
-            cur_entry.is_connected_result = ResultSuccess;
-            cur_entry.is_enabled = false;
-            cur_entry.is_polling_mode = false;
-        }
-
-        std::memcpy(system.Kernel().GetHidBusSharedMem().GetPointer(), &hidbus_status,
-                    sizeof(hidbus_status));
-
-        IPC::ResponseBuilder rb{ctx, 2};
-        rb.Push(ResultSuccess);
-        return;
-    }
 
     LOG_ERROR(Service_HID, "Invalid handle");
     IPC::ResponseBuilder rb{ctx, 2};
@@ -256,27 +135,6 @@ void HidBus::Finalize(HLERequestContext& ctx) {
              bus_handle_.abstracted_pad_id, bus_handle_.bus_type_id, bus_handle_.internal_index,
              bus_handle_.player_number, bus_handle_.is_valid, applet_resource_user_id);
 
-    const auto device_index = GetDeviceIndexFromHandle(bus_handle_);
-
-    if (device_index) {
-        const auto entry_index = devices[device_index.value()].handle.internal_index;
-        auto& cur_entry = hidbus_status.entries[entry_index];
-        auto& device = devices[device_index.value()].device;
-        devices[device_index.value()].is_device_initializated = false;
-        device->DeactivateDevice();
-
-        cur_entry.is_in_focus = true;
-        cur_entry.is_connected = false;
-        cur_entry.is_connected_result = ResultSuccess;
-        cur_entry.is_enabled = false;
-        cur_entry.is_polling_mode = false;
-        std::memcpy(system.Kernel().GetHidBusSharedMem().GetPointer(), &hidbus_status,
-                    sizeof(hidbus_status));
-
-        IPC::ResponseBuilder rb{ctx, 2};
-        rb.Push(ResultSuccess);
-        return;
-    }
 
     LOG_ERROR(Service_HID, "Invalid handle");
     IPC::ResponseBuilder rb{ctx, 2};
@@ -305,16 +163,6 @@ void HidBus::EnableExternalDevice(HLERequestContext& ctx) {
               parameters.bus_handle.player_number, parameters.bus_handle.is_valid, parameters.inval,
               parameters.applet_resource_user_id);
 
-    const auto device_index = GetDeviceIndexFromHandle(parameters.bus_handle);
-
-    if (device_index) {
-        auto& device = devices[device_index.value()].device;
-        device->Enable(parameters.enable);
-
-        IPC::ResponseBuilder rb{ctx, 2};
-        rb.Push(ResultSuccess);
-        return;
-    }
 
     LOG_ERROR(Service_HID, "Invalid handle");
     IPC::ResponseBuilder rb{ctx, 2};
@@ -332,21 +180,29 @@ void HidBus::GetExternalDeviceId(HLERequestContext& ctx) {
               bus_handle_.abstracted_pad_id, bus_handle_.bus_type_id, bus_handle_.internal_index,
               bus_handle_.player_number, bus_handle_.is_valid);
 
-    const auto device_index = GetDeviceIndexFromHandle(bus_handle_);
+    u32 device_id{};
+    auto result = SetEventForSendCommandAsycResult2();
+    if (result.IsSuccess()) {
+        if (1) {
+            result = HIDBUS::ResultInvalidBusHandle;
+        }
+    }
 
-    if (device_index) {
-        const auto& device = devices[device_index.value()].device;
-        u32 device_id = device->GetDeviceId();
+    if (result.IsSuccess()) {
+        // result = GetExternalDeviceIdImpl();
+    }
+
+    if (result.IsSuccess()) {
         IPC::ResponseBuilder rb{ctx, 3};
         rb.Push(ResultSuccess);
         rb.Push<u32>(device_id);
         return;
     }
 
-    LOG_ERROR(Service_HID, "Invalid handle");
+    result = TranslateHidErrorToHidBusError(result);
+
     IPC::ResponseBuilder rb{ctx, 2};
-    rb.Push(ResultUnknown);
-    return;
+    rb.Push(result);
 }
 
 void HidBus::SendCommandAsync(HLERequestContext& ctx) {
@@ -360,16 +216,6 @@ void HidBus::SendCommandAsync(HLERequestContext& ctx) {
               data.size(), bus_handle_.abstracted_pad_id, bus_handle_.bus_type_id,
               bus_handle_.internal_index, bus_handle_.player_number, bus_handle_.is_valid);
 
-    const auto device_index = GetDeviceIndexFromHandle(bus_handle_);
-
-    if (device_index) {
-        auto& device = devices[device_index.value()].device;
-        device->SetCommand(data);
-
-        IPC::ResponseBuilder rb{ctx, 2};
-        rb.Push(ResultSuccess);
-        return;
-    }
 
     LOG_ERROR(Service_HID, "Invalid handle");
     IPC::ResponseBuilder rb{ctx, 2};
@@ -387,18 +233,6 @@ void HidBus::GetSendCommandAsynceResult(HLERequestContext& ctx) {
               bus_handle_.abstracted_pad_id, bus_handle_.bus_type_id, bus_handle_.internal_index,
               bus_handle_.player_number, bus_handle_.is_valid);
 
-    const auto device_index = GetDeviceIndexFromHandle(bus_handle_);
-
-    if (device_index) {
-        const auto& device = devices[device_index.value()].device;
-        const std::vector<u8> data = device->GetReply();
-        const u64 data_size = ctx.WriteBuffer(data);
-
-        IPC::ResponseBuilder rb{ctx, 4};
-        rb.Push(ResultSuccess);
-        rb.Push<u64>(data_size);
-        return;
-    }
 
     LOG_ERROR(Service_HID, "Invalid handle");
     IPC::ResponseBuilder rb{ctx, 2};
@@ -416,16 +250,6 @@ void HidBus::SetEventForSendCommandAsycResult(HLERequestContext& ctx) {
              bus_handle_.abstracted_pad_id, bus_handle_.bus_type_id, bus_handle_.internal_index,
              bus_handle_.player_number, bus_handle_.is_valid);
 
-    const auto device_index = GetDeviceIndexFromHandle(bus_handle_);
-
-    if (device_index) {
-        const auto& device = devices[device_index.value()].device;
-        IPC::ResponseBuilder rb{ctx, 2, 1};
-        rb.Push(ResultSuccess);
-        rb.PushCopyObjects(device->GetSendCommandAsycEvent());
-        return;
-    }
-
     LOG_ERROR(Service_HID, "Invalid handle");
     IPC::ResponseBuilder rb{ctx, 2};
     rb.Push(ResultUnknown);
@@ -467,17 +291,6 @@ void HidBus::EnableJoyPollingReceiveMode(HLERequestContext& ctx) {
              t_mem_handle, polling_mode_, bus_handle_.abstracted_pad_id, bus_handle_.bus_type_id,
              bus_handle_.internal_index, bus_handle_.player_number, bus_handle_.is_valid);
 
-    const auto device_index = GetDeviceIndexFromHandle(bus_handle_);
-
-    if (device_index) {
-        auto& device = devices[device_index.value()].device;
-        device->SetPollingMode(polling_mode_);
-        device->SetTransferMemoryAddress(t_mem->GetSourceAddress());
-
-        IPC::ResponseBuilder rb{ctx, 2};
-        rb.Push(ResultSuccess);
-        return;
-    }
 
     LOG_ERROR(Service_HID, "Invalid handle");
     IPC::ResponseBuilder rb{ctx, 2};
@@ -495,16 +308,6 @@ void HidBus::DisableJoyPollingReceiveMode(HLERequestContext& ctx) {
              bus_handle_.abstracted_pad_id, bus_handle_.bus_type_id, bus_handle_.internal_index,
              bus_handle_.player_number, bus_handle_.is_valid);
 
-    const auto device_index = GetDeviceIndexFromHandle(bus_handle_);
-
-    if (device_index) {
-        auto& device = devices[device_index.value()].device;
-        device->DisablePollingMode();
-
-        IPC::ResponseBuilder rb{ctx, 2};
-        rb.Push(ResultSuccess);
-        return;
-    }
 
     LOG_ERROR(Service_HID, "Invalid handle");
     IPC::ResponseBuilder rb{ctx, 2};
@@ -521,4 +324,59 @@ void HidBus::SetStatusManagerType(HLERequestContext& ctx) {
     IPC::ResponseBuilder rb{ctx, 2};
     rb.Push(ResultSuccess);
 };
+
+
+bool HidBus::GetBusHandleImpl(BusHandle& handle, Core::HID::NpadIdType npad_id, BusType bus_type) {
+    ASSERT_MSG(&handle != nullptr, "Handle is null");
+
+    if (!Controller_NPad::IsNpadIdValid(npad_id)) {
+        return false;
+    }
+
+    if (bus_type == BusType::LeftJoyRail || bus_type == BusType::RightJoyRail) {
+        return true;
+    }
+
+    if (bus_type == BusType::InternalBus) {
+        return true;
+    }
+
+    return false;
+}
+
+
+Result TranslateHidErrorToHidBusError(Result result) {
+    if (result.IsSuccess()) {
+        return result;
+    }
+    if (result.module != ErrorModule::HID) {
+        return result;
+    }
+    if (result == ResultMcuNotEnabled) {
+        return HIDBUS::ResultNotEnabled;
+    }
+    if (result == ResultMcuNoDeviceConnected) {
+        return HIDBUS::ResultNoDeviceConnected;
+    }
+    if (result == ResultMcuUnknown544) {
+        return HIDBUS::ResultUknown6;
+    }
+    if ((result.description & 0x1FFB) == 0x221) {
+        return HIDBUS::ResultPollingRecieveDataNotAvailable;
+    }
+    if (result == ResultMcuInvalidHandle) {
+        return HIDBUS::ResultInvalidBusHandle;
+    }
+    if (result == ResultMcuUnknown546) {
+        return HIDBUS::ResultDeviceEnabledNotSet;
+    }
+    if (result == ResultMcuUnknown548) {
+        return HIDBUS::ResultInvalidBusHandle;
+    }
+    if (result == ResultControllerUpdateFailed) {
+        return HIDBUS::ResultControllerUpdateFailed;
+    }
+    return result;
+}
+
 } // namespace Service::HID

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

@@ -108,21 +108,12 @@ private:
     void DisableJoyPollingReceiveMode(HLERequestContext& ctx);
     void SetStatusManagerType(HLERequestContext& ctx);
 
-    void UpdateHidbus(std::uintptr_t user_data, std::chrono::nanoseconds ns_late);
-    std::optional<std::size_t> GetDeviceIndexFromHandle(BusHandle handle) const;
+    bool GetBusHandleImpl(BusHandle& handle, Core::HID::NpadIdType npad_id, BusType bus_type);
+    Result TranslateHidErrorToHidBusError(Result result);
+    Result SetEventForSendCommandAsycResult2();
 
-    template <typename T>
-    void MakeDevice(BusHandle handle) {
-        const auto device_index = GetDeviceIndexFromHandle(handle);
-        if (device_index) {
-            devices[device_index.value()].device = std::make_unique<T>(system, service_context);
-        }
-    }
 
-    bool is_hidbus_enabled{false};
     HidbusStatusManager hidbus_status{};
-    std::array<HidbusDevice, max_number_of_handles> devices{};
-    std::shared_ptr<Core::Timing::EventType> hidbus_update_event;
     KernelHelpers::ServiceContext service_context;
 };