From d08f201e0c0e6d36176983f9673a89550705952b Mon Sep 17 00:00:00 2001 From: Narr the Reg Date: Thu, 22 Feb 2024 11:58:52 -0600 Subject: service: hid: Move and migrate AppletResource and ActiveVibrationDevice --- src/hid_core/resource_manager.cpp | 26 -------------------------- src/hid_core/resource_manager.h | 13 ------------- 2 files changed, 39 deletions(-) (limited to 'src/hid_core') diff --git a/src/hid_core/resource_manager.cpp b/src/hid_core/resource_manager.cpp index 01261ba97..62fec03b1 100644 --- a/src/hid_core/resource_manager.cpp +++ b/src/hid_core/resource_manager.cpp @@ -4,7 +4,6 @@ #include "common/logging/log.h" #include "core/core.h" #include "core/core_timing.h" -#include "core/hle/kernel/k_shared_memory.h" #include "core/hle/service/ipc_helpers.h" #include "core/hle/service/set/system_settings_server.h" #include "core/hle/service/sm/sm.h" @@ -501,29 +500,4 @@ void ResourceManager::UpdateMotion(std::chrono::nanoseconds ns_late) { console_six_axis->OnUpdate(core_timing); } -IAppletResource::IAppletResource(Core::System& system_, std::shared_ptr resource, - u64 applet_resource_user_id) - : ServiceFramework{system_, "IAppletResource"}, aruid{applet_resource_user_id}, - resource_manager{resource} { - static const FunctionInfo functions[] = { - {0, &IAppletResource::GetSharedMemoryHandle, "GetSharedMemoryHandle"}, - }; - RegisterHandlers(functions); -} - -IAppletResource::~IAppletResource() { - resource_manager->FreeAppletResourceId(aruid); -} - -void IAppletResource::GetSharedMemoryHandle(HLERequestContext& ctx) { - Kernel::KSharedMemory* handle; - const auto result = resource_manager->GetSharedMemoryHandle(&handle, aruid); - - LOG_DEBUG(Service_HID, "called, applet_resource_user_id={}, result=0x{:X}", aruid, result.raw); - - IPC::ResponseBuilder rb{ctx, 2, 1}; - rb.Push(result); - rb.PushCopyObjects(handle); -} - } // namespace Service::HID diff --git a/src/hid_core/resource_manager.h b/src/hid_core/resource_manager.h index dc3ff01f8..5abd7e044 100644 --- a/src/hid_core/resource_manager.h +++ b/src/hid_core/resource_manager.h @@ -174,17 +174,4 @@ private: KernelHelpers::ServiceContext service_context; }; -class IAppletResource final : public ServiceFramework { -public: - explicit IAppletResource(Core::System& system_, std::shared_ptr resource, - u64 applet_resource_user_id); - ~IAppletResource() override; - -private: - void GetSharedMemoryHandle(HLERequestContext& ctx); - - u64 aruid{}; - std::shared_ptr resource_manager; -}; - } // namespace Service::HID -- cgit v1.2.3