mirror of
https://github.com/yuzu-mirror/yuzu
synced 2024-12-24 20:43:04 +00:00
hle: service: Add a helper module for managing kernel objects.
This commit is contained in:
parent
929994132a
commit
015058fadf
10 changed files with 146 additions and 20 deletions
|
@ -517,6 +517,8 @@ add_library(core STATIC
|
||||||
hle/service/psc/psc.h
|
hle/service/psc/psc.h
|
||||||
hle/service/ptm/psm.cpp
|
hle/service/ptm/psm.cpp
|
||||||
hle/service/ptm/psm.h
|
hle/service/ptm/psm.h
|
||||||
|
hle/service/kernel_helpers.cpp
|
||||||
|
hle/service/kernel_helpers.h
|
||||||
hle/service/service.cpp
|
hle/service/service.cpp
|
||||||
hle/service/service.h
|
hle/service/service.h
|
||||||
hle/service/set/set.cpp
|
hle/service/set/set.cpp
|
||||||
|
|
|
@ -18,6 +18,7 @@
|
||||||
#include "core/hle/kernel/k_writable_event.h"
|
#include "core/hle/kernel/k_writable_event.h"
|
||||||
#include "core/hle/kernel/kernel.h"
|
#include "core/hle/kernel/kernel.h"
|
||||||
#include "core/hle/service/hid/controllers/npad.h"
|
#include "core/hle/service/hid/controllers/npad.h"
|
||||||
|
#include "core/hle/service/kernel_helpers.h"
|
||||||
|
|
||||||
namespace Service::HID {
|
namespace Service::HID {
|
||||||
constexpr s32 HID_JOYSTICK_MAX = 0x7fff;
|
constexpr s32 HID_JOYSTICK_MAX = 0x7fff;
|
||||||
|
@ -147,7 +148,9 @@ bool Controller_NPad::IsDeviceHandleValid(const DeviceHandle& device_handle) {
|
||||||
device_handle.device_index < DeviceIndex::MaxDeviceIndex;
|
device_handle.device_index < DeviceIndex::MaxDeviceIndex;
|
||||||
}
|
}
|
||||||
|
|
||||||
Controller_NPad::Controller_NPad(Core::System& system_) : ControllerBase{system_} {
|
Controller_NPad::Controller_NPad(Core::System& system_,
|
||||||
|
KernelHelpers::ServiceContext& service_context_)
|
||||||
|
: ControllerBase{system_}, service_context{service_context_} {
|
||||||
latest_vibration_values.fill({DEFAULT_VIBRATION_VALUE, DEFAULT_VIBRATION_VALUE});
|
latest_vibration_values.fill({DEFAULT_VIBRATION_VALUE, DEFAULT_VIBRATION_VALUE});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -253,8 +256,8 @@ void Controller_NPad::InitNewlyAddedController(std::size_t controller_idx) {
|
||||||
void Controller_NPad::OnInit() {
|
void Controller_NPad::OnInit() {
|
||||||
auto& kernel = system.Kernel();
|
auto& kernel = system.Kernel();
|
||||||
for (std::size_t i = 0; i < styleset_changed_events.size(); ++i) {
|
for (std::size_t i = 0; i < styleset_changed_events.size(); ++i) {
|
||||||
styleset_changed_events[i] = Kernel::KEvent::Create(kernel);
|
styleset_changed_events[i] =
|
||||||
styleset_changed_events[i]->Initialize(fmt::format("npad:NpadStyleSetChanged_{}", i));
|
service_context.CreateEvent(fmt::format("npad:NpadStyleSetChanged_{}", i));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!IsControllerActivated()) {
|
if (!IsControllerActivated()) {
|
||||||
|
@ -344,8 +347,7 @@ void Controller_NPad::OnRelease() {
|
||||||
}
|
}
|
||||||
|
|
||||||
for (std::size_t i = 0; i < styleset_changed_events.size(); ++i) {
|
for (std::size_t i = 0; i < styleset_changed_events.size(); ++i) {
|
||||||
styleset_changed_events[i]->Close();
|
service_context.CloseEvent(styleset_changed_events[i]);
|
||||||
styleset_changed_events[i] = nullptr;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -20,6 +20,10 @@ class KEvent;
|
||||||
class KReadableEvent;
|
class KReadableEvent;
|
||||||
} // namespace Kernel
|
} // namespace Kernel
|
||||||
|
|
||||||
|
namespace Service::KernelHelpers {
|
||||||
|
class ServiceContext;
|
||||||
|
}
|
||||||
|
|
||||||
namespace Service::HID {
|
namespace Service::HID {
|
||||||
|
|
||||||
constexpr u32 NPAD_HANDHELD = 32;
|
constexpr u32 NPAD_HANDHELD = 32;
|
||||||
|
@ -27,7 +31,8 @@ constexpr u32 NPAD_UNKNOWN = 16; // TODO(ogniK): What is this?
|
||||||
|
|
||||||
class Controller_NPad final : public ControllerBase {
|
class Controller_NPad final : public ControllerBase {
|
||||||
public:
|
public:
|
||||||
explicit Controller_NPad(Core::System& system_);
|
explicit Controller_NPad(Core::System& system_,
|
||||||
|
KernelHelpers::ServiceContext& service_context_);
|
||||||
~Controller_NPad() override;
|
~Controller_NPad() override;
|
||||||
|
|
||||||
// Called when the controller is initialized
|
// Called when the controller is initialized
|
||||||
|
@ -566,6 +571,7 @@ private:
|
||||||
std::array<std::unique_ptr<Input::MotionDevice>, Settings::NativeMotion::NUM_MOTIONS_HID>,
|
std::array<std::unique_ptr<Input::MotionDevice>, Settings::NativeMotion::NUM_MOTIONS_HID>,
|
||||||
10>;
|
10>;
|
||||||
|
|
||||||
|
KernelHelpers::ServiceContext& service_context;
|
||||||
std::mutex mutex;
|
std::mutex mutex;
|
||||||
ButtonArray buttons;
|
ButtonArray buttons;
|
||||||
StickArray sticks;
|
StickArray sticks;
|
||||||
|
|
|
@ -46,8 +46,9 @@ constexpr auto pad_update_ns = std::chrono::nanoseconds{1000 * 1000}; //
|
||||||
constexpr auto motion_update_ns = std::chrono::nanoseconds{15 * 1000 * 1000}; // (15ms, 66.666Hz)
|
constexpr auto motion_update_ns = std::chrono::nanoseconds{15 * 1000 * 1000}; // (15ms, 66.666Hz)
|
||||||
constexpr std::size_t SHARED_MEMORY_SIZE = 0x40000;
|
constexpr std::size_t SHARED_MEMORY_SIZE = 0x40000;
|
||||||
|
|
||||||
IAppletResource::IAppletResource(Core::System& system_)
|
IAppletResource::IAppletResource(Core::System& system_,
|
||||||
: ServiceFramework{system_, "IAppletResource"} {
|
KernelHelpers::ServiceContext& service_context_)
|
||||||
|
: ServiceFramework{system_, "IAppletResource"}, service_context{service_context_} {
|
||||||
static const FunctionInfo functions[] = {
|
static const FunctionInfo functions[] = {
|
||||||
{0, &IAppletResource::GetSharedMemoryHandle, "GetSharedMemoryHandle"},
|
{0, &IAppletResource::GetSharedMemoryHandle, "GetSharedMemoryHandle"},
|
||||||
};
|
};
|
||||||
|
@ -63,7 +64,7 @@ IAppletResource::IAppletResource(Core::System& system_)
|
||||||
MakeController<Controller_Stubbed>(HidController::CaptureButton);
|
MakeController<Controller_Stubbed>(HidController::CaptureButton);
|
||||||
MakeController<Controller_Stubbed>(HidController::InputDetector);
|
MakeController<Controller_Stubbed>(HidController::InputDetector);
|
||||||
MakeController<Controller_Stubbed>(HidController::UniquePad);
|
MakeController<Controller_Stubbed>(HidController::UniquePad);
|
||||||
MakeController<Controller_NPad>(HidController::NPad);
|
MakeControllerWithServiceContext<Controller_NPad>(HidController::NPad);
|
||||||
MakeController<Controller_Gesture>(HidController::Gesture);
|
MakeController<Controller_Gesture>(HidController::Gesture);
|
||||||
MakeController<Controller_ConsoleSixAxis>(HidController::ConsoleSixAxisSensor);
|
MakeController<Controller_ConsoleSixAxis>(HidController::ConsoleSixAxisSensor);
|
||||||
|
|
||||||
|
@ -191,13 +192,14 @@ private:
|
||||||
|
|
||||||
std::shared_ptr<IAppletResource> Hid::GetAppletResource() {
|
std::shared_ptr<IAppletResource> Hid::GetAppletResource() {
|
||||||
if (applet_resource == nullptr) {
|
if (applet_resource == nullptr) {
|
||||||
applet_resource = std::make_shared<IAppletResource>(system);
|
applet_resource = std::make_shared<IAppletResource>(system, service_context);
|
||||||
}
|
}
|
||||||
|
|
||||||
return applet_resource;
|
return applet_resource;
|
||||||
}
|
}
|
||||||
|
|
||||||
Hid::Hid(Core::System& system_) : ServiceFramework{system_, "hid"} {
|
Hid::Hid(Core::System& system_)
|
||||||
|
: ServiceFramework{system_, "hid"}, service_context{system_, service_name} {
|
||||||
// clang-format off
|
// clang-format off
|
||||||
static const FunctionInfo functions[] = {
|
static const FunctionInfo functions[] = {
|
||||||
{0, &Hid::CreateAppletResource, "CreateAppletResource"},
|
{0, &Hid::CreateAppletResource, "CreateAppletResource"},
|
||||||
|
@ -347,7 +349,7 @@ void Hid::CreateAppletResource(Kernel::HLERequestContext& ctx) {
|
||||||
LOG_DEBUG(Service_HID, "called, applet_resource_user_id={}", applet_resource_user_id);
|
LOG_DEBUG(Service_HID, "called, applet_resource_user_id={}", applet_resource_user_id);
|
||||||
|
|
||||||
if (applet_resource == nullptr) {
|
if (applet_resource == nullptr) {
|
||||||
applet_resource = std::make_shared<IAppletResource>(system);
|
applet_resource = std::make_shared<IAppletResource>(system, service_context);
|
||||||
}
|
}
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 2, 0, 1};
|
IPC::ResponseBuilder rb{ctx, 2, 0, 1};
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
|
|
||||||
#include "core/hle/service/hid/controllers/controller_base.h"
|
#include "core/hle/service/hid/controllers/controller_base.h"
|
||||||
|
#include "core/hle/service/kernel_helpers.h"
|
||||||
#include "core/hle/service/service.h"
|
#include "core/hle/service/service.h"
|
||||||
|
|
||||||
namespace Core::Timing {
|
namespace Core::Timing {
|
||||||
|
@ -39,7 +40,8 @@ enum class HidController : std::size_t {
|
||||||
|
|
||||||
class IAppletResource final : public ServiceFramework<IAppletResource> {
|
class IAppletResource final : public ServiceFramework<IAppletResource> {
|
||||||
public:
|
public:
|
||||||
explicit IAppletResource(Core::System& system_);
|
explicit IAppletResource(Core::System& system_,
|
||||||
|
KernelHelpers::ServiceContext& service_context_);
|
||||||
~IAppletResource() override;
|
~IAppletResource() override;
|
||||||
|
|
||||||
void ActivateController(HidController controller);
|
void ActivateController(HidController controller);
|
||||||
|
@ -60,11 +62,18 @@ private:
|
||||||
void MakeController(HidController controller) {
|
void MakeController(HidController controller) {
|
||||||
controllers[static_cast<std::size_t>(controller)] = std::make_unique<T>(system);
|
controllers[static_cast<std::size_t>(controller)] = std::make_unique<T>(system);
|
||||||
}
|
}
|
||||||
|
template <typename T>
|
||||||
|
void MakeControllerWithServiceContext(HidController controller) {
|
||||||
|
controllers[static_cast<std::size_t>(controller)] =
|
||||||
|
std::make_unique<T>(system, service_context);
|
||||||
|
}
|
||||||
|
|
||||||
void GetSharedMemoryHandle(Kernel::HLERequestContext& ctx);
|
void GetSharedMemoryHandle(Kernel::HLERequestContext& ctx);
|
||||||
void UpdateControllers(std::uintptr_t user_data, std::chrono::nanoseconds ns_late);
|
void UpdateControllers(std::uintptr_t user_data, std::chrono::nanoseconds ns_late);
|
||||||
void UpdateMotion(std::uintptr_t user_data, std::chrono::nanoseconds ns_late);
|
void UpdateMotion(std::uintptr_t user_data, std::chrono::nanoseconds ns_late);
|
||||||
|
|
||||||
|
KernelHelpers::ServiceContext& service_context;
|
||||||
|
|
||||||
std::shared_ptr<Core::Timing::EventType> pad_update_event;
|
std::shared_ptr<Core::Timing::EventType> pad_update_event;
|
||||||
std::shared_ptr<Core::Timing::EventType> motion_update_event;
|
std::shared_ptr<Core::Timing::EventType> motion_update_event;
|
||||||
|
|
||||||
|
@ -176,6 +185,8 @@ private:
|
||||||
static_assert(sizeof(VibrationDeviceInfo) == 0x8, "VibrationDeviceInfo has incorrect size.");
|
static_assert(sizeof(VibrationDeviceInfo) == 0x8, "VibrationDeviceInfo has incorrect size.");
|
||||||
|
|
||||||
std::shared_ptr<IAppletResource> applet_resource;
|
std::shared_ptr<IAppletResource> applet_resource;
|
||||||
|
|
||||||
|
KernelHelpers::ServiceContext service_context;
|
||||||
};
|
};
|
||||||
|
|
||||||
/// Reload input devices. Used when input configuration changed
|
/// Reload input devices. Used when input configuration changed
|
||||||
|
|
64
src/core/hle/service/kernel_helpers.cpp
Normal file
64
src/core/hle/service/kernel_helpers.cpp
Normal file
|
@ -0,0 +1,64 @@
|
||||||
|
// Copyright 2021 yuzu emulator team
|
||||||
|
// Licensed under GPLv2 or any later version
|
||||||
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "core/core.h"
|
||||||
|
#include "core/hle/kernel/k_event.h"
|
||||||
|
#include "core/hle/kernel/k_process.h"
|
||||||
|
#include "core/hle/kernel/k_readable_event.h"
|
||||||
|
#include "core/hle/kernel/k_resource_limit.h"
|
||||||
|
#include "core/hle/kernel/k_scoped_resource_reservation.h"
|
||||||
|
#include "core/hle/kernel/k_writable_event.h"
|
||||||
|
#include "core/hle/service/kernel_helpers.h"
|
||||||
|
|
||||||
|
namespace Service::KernelHelpers {
|
||||||
|
|
||||||
|
ServiceContext::ServiceContext(Core::System& system_, std::string name_)
|
||||||
|
: kernel(system_.Kernel()) {
|
||||||
|
process = Kernel::KProcess::Create(kernel);
|
||||||
|
ASSERT(Kernel::KProcess::Initialize(process, system_, std::move(name_),
|
||||||
|
Kernel::KProcess::ProcessType::Userland)
|
||||||
|
.IsSuccess());
|
||||||
|
}
|
||||||
|
|
||||||
|
ServiceContext::~ServiceContext() {
|
||||||
|
process->Close();
|
||||||
|
process = nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
Kernel::KEvent* ServiceContext::CreateEvent(std::string&& name) {
|
||||||
|
// Reserve a new event from the process resource limit
|
||||||
|
Kernel::KScopedResourceReservation event_reservation(process,
|
||||||
|
Kernel::LimitableResource::Events);
|
||||||
|
if (!event_reservation.Succeeded()) {
|
||||||
|
LOG_CRITICAL(Service, "Resource limit reached!");
|
||||||
|
return {};
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create a new event.
|
||||||
|
auto* event = Kernel::KEvent::Create(kernel);
|
||||||
|
if (!event) {
|
||||||
|
LOG_CRITICAL(Service, "Unable to create event!");
|
||||||
|
return {};
|
||||||
|
}
|
||||||
|
|
||||||
|
// Initialize the event.
|
||||||
|
event->Initialize(std::move(name));
|
||||||
|
|
||||||
|
// Commit the thread reservation.
|
||||||
|
event_reservation.Commit();
|
||||||
|
|
||||||
|
// Register the event.
|
||||||
|
Kernel::KEvent::Register(kernel, event);
|
||||||
|
|
||||||
|
return event;
|
||||||
|
}
|
||||||
|
|
||||||
|
void ServiceContext::CloseEvent(Kernel::KEvent* event) {
|
||||||
|
event->GetReadableEvent().Close();
|
||||||
|
event->GetWritableEvent().Close();
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace Service::KernelHelpers
|
35
src/core/hle/service/kernel_helpers.h
Normal file
35
src/core/hle/service/kernel_helpers.h
Normal file
|
@ -0,0 +1,35 @@
|
||||||
|
// Copyright 2021 yuzu emulator team
|
||||||
|
// Licensed under GPLv2 or any later version
|
||||||
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <string>
|
||||||
|
|
||||||
|
namespace Core {
|
||||||
|
class System;
|
||||||
|
}
|
||||||
|
|
||||||
|
namespace Kernel {
|
||||||
|
class KernelCore;
|
||||||
|
class KEvent;
|
||||||
|
class KProcess;
|
||||||
|
} // namespace Kernel
|
||||||
|
|
||||||
|
namespace Service::KernelHelpers {
|
||||||
|
|
||||||
|
class ServiceContext {
|
||||||
|
public:
|
||||||
|
ServiceContext(Core::System& system_, std::string name_);
|
||||||
|
~ServiceContext();
|
||||||
|
|
||||||
|
Kernel::KEvent* CreateEvent(std::string&& name);
|
||||||
|
|
||||||
|
void CloseEvent(Kernel::KEvent* event);
|
||||||
|
|
||||||
|
private:
|
||||||
|
Kernel::KernelCore& kernel;
|
||||||
|
Kernel::KProcess* process{};
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace Service::KernelHelpers
|
|
@ -39,11 +39,12 @@ void InstallInterfaces(SM::ServiceManager& service_manager, NVFlinger::NVFlinger
|
||||||
nvflinger.SetNVDrvInstance(module_);
|
nvflinger.SetNVDrvInstance(module_);
|
||||||
}
|
}
|
||||||
|
|
||||||
Module::Module(Core::System& system) : syncpoint_manager{system.GPU()} {
|
Module::Module(Core::System& system)
|
||||||
|
: syncpoint_manager{system.GPU()}, service_context{system, "nvdrv"} {
|
||||||
auto& kernel = system.Kernel();
|
auto& kernel = system.Kernel();
|
||||||
for (u32 i = 0; i < MaxNvEvents; i++) {
|
for (u32 i = 0; i < MaxNvEvents; i++) {
|
||||||
events_interface.events[i].event = Kernel::KEvent::Create(kernel);
|
events_interface.events[i].event =
|
||||||
events_interface.events[i].event->Initialize(fmt::format("NVDRV::NvEvent_{}", i));
|
service_context.CreateEvent(fmt::format("NVDRV::NvEvent_{}", i));
|
||||||
events_interface.status[i] = EventState::Free;
|
events_interface.status[i] = EventState::Free;
|
||||||
events_interface.registered[i] = false;
|
events_interface.registered[i] = false;
|
||||||
}
|
}
|
||||||
|
@ -65,8 +66,7 @@ Module::Module(Core::System& system) : syncpoint_manager{system.GPU()} {
|
||||||
|
|
||||||
Module::~Module() {
|
Module::~Module() {
|
||||||
for (u32 i = 0; i < MaxNvEvents; i++) {
|
for (u32 i = 0; i < MaxNvEvents; i++) {
|
||||||
events_interface.events[i].event->Close();
|
service_context.CloseEvent(events_interface.events[i].event);
|
||||||
events_interface.events[i].event = nullptr;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -9,6 +9,7 @@
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#include "common/common_types.h"
|
#include "common/common_types.h"
|
||||||
|
#include "core/hle/service/kernel_helpers.h"
|
||||||
#include "core/hle/service/nvdrv/nvdata.h"
|
#include "core/hle/service/nvdrv/nvdata.h"
|
||||||
#include "core/hle/service/nvdrv/syncpoint_manager.h"
|
#include "core/hle/service/nvdrv/syncpoint_manager.h"
|
||||||
#include "core/hle/service/service.h"
|
#include "core/hle/service/service.h"
|
||||||
|
@ -154,6 +155,8 @@ private:
|
||||||
std::unordered_map<std::string, std::shared_ptr<Devices::nvdevice>> devices;
|
std::unordered_map<std::string, std::shared_ptr<Devices::nvdevice>> devices;
|
||||||
|
|
||||||
EventInterface events_interface;
|
EventInterface events_interface;
|
||||||
|
|
||||||
|
KernelHelpers::ServiceContext service_context;
|
||||||
};
|
};
|
||||||
|
|
||||||
/// Registers all NVDRV services with the specified service manager.
|
/// Registers all NVDRV services with the specified service manager.
|
||||||
|
|
|
@ -96,6 +96,9 @@ protected:
|
||||||
/// System context that the service operates under.
|
/// System context that the service operates under.
|
||||||
Core::System& system;
|
Core::System& system;
|
||||||
|
|
||||||
|
/// Identifier string used to connect to the service.
|
||||||
|
std::string service_name;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
template <typename T>
|
template <typename T>
|
||||||
friend class ServiceFramework;
|
friend class ServiceFramework;
|
||||||
|
@ -117,8 +120,6 @@ private:
|
||||||
void RegisterHandlersBaseTipc(const FunctionInfoBase* functions, std::size_t n);
|
void RegisterHandlersBaseTipc(const FunctionInfoBase* functions, std::size_t n);
|
||||||
void ReportUnimplementedFunction(Kernel::HLERequestContext& ctx, const FunctionInfoBase* info);
|
void ReportUnimplementedFunction(Kernel::HLERequestContext& ctx, const FunctionInfoBase* info);
|
||||||
|
|
||||||
/// Identifier string used to connect to the service.
|
|
||||||
std::string service_name;
|
|
||||||
/// Maximum number of concurrent sessions that this service can handle.
|
/// Maximum number of concurrent sessions that this service can handle.
|
||||||
u32 max_sessions;
|
u32 max_sessions;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue