flodavid/suyu
1
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

Merge pull request #7103 from Morph1984/service-ctx-event

Browse source 
service: Replace all service event creation with ServiceContext::CreateEvent
This commit is contained in:
bunnei 2021-10-04 17:20:46 -07:00 committed by GitHub
commit b869439969
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
26 changed files with 367 additions and 271 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/core/hle/service/acc/async_context.cpp
View file

@ -4,15 +4,12 @@
#include "core/core.h" #include "core/core.h"
#include "core/hle/ipc_helpers.h" #include "core/hle/ipc_helpers.h"
#include "core/hle/kernel/k_event.h"
#include "core/hle/service/acc/async_context.h" #include "core/hle/service/acc/async_context.h"
namespace Service::Account { namespace Service::Account {
IAsyncContext::IAsyncContext(Core::System& system_) IAsyncContext::IAsyncContext(Core::System& system_)
: ServiceFramework{system_, "IAsyncContext"}, compeletion_event{system_.Kernel()} { : ServiceFramework{system_, "IAsyncContext"}, service_context{system_, "IAsyncContext"} {
Kernel::KAutoObject::Create(std::addressof(compeletion_event));
compeletion_event.Initialize("IAsyncContext:CompletionEvent");
// clang-format off // clang-format off
static const FunctionInfo functions[] = { static const FunctionInfo functions[] = {
{0, &IAsyncContext::GetSystemEvent, "GetSystemEvent"}, {0, &IAsyncContext::GetSystemEvent, "GetSystemEvent"},
@ -23,6 +20,12 @@ IAsyncContext::IAsyncContext(Core::System& system_)
// clang-format on // clang-format on
RegisterHandlers(functions); RegisterHandlers(functions);
completion_event = service_context.CreateEvent("IAsyncContext:CompletionEvent");
}
IAsyncContext::~IAsyncContext() {
service_context.CloseEvent(completion_event);
} }
void IAsyncContext::GetSystemEvent(Kernel::HLERequestContext& ctx) { void IAsyncContext::GetSystemEvent(Kernel::HLERequestContext& ctx) {
@ -30,7 +33,7 @@ void IAsyncContext::GetSystemEvent(Kernel::HLERequestContext& ctx) {
IPC::ResponseBuilder rb{ctx, 2, 1}; IPC::ResponseBuilder rb{ctx, 2, 1};
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
rb.PushCopyObjects(compeletion_event.GetReadableEvent()); rb.PushCopyObjects(completion_event->GetReadableEvent());
} }
void IAsyncContext::Cancel(Kernel::HLERequestContext& ctx) { void IAsyncContext::Cancel(Kernel::HLERequestContext& ctx) {
@ -62,7 +65,7 @@ void IAsyncContext::GetResult(Kernel::HLERequestContext& ctx) {
void IAsyncContext::MarkComplete() { void IAsyncContext::MarkComplete() {
is_complete.store(true); is_complete.store(true);
compeletion_event.GetWritableEvent().Signal(); completion_event->GetWritableEvent().Signal();
} }
} // namespace Service::Account } // namespace Service::Account

7
src/core/hle/service/acc/async_context.h
View file

@ -5,7 +5,7 @@
#pragma once #pragma once
#include <atomic> #include <atomic>
#include "core/hle/kernel/k_event.h" #include "core/hle/service/kernel_helpers.h"
#include "core/hle/service/service.h" #include "core/hle/service/service.h"
namespace Core { namespace Core {
@ -17,6 +17,7 @@ namespace Service::Account {
class IAsyncContext : public ServiceFramework<IAsyncContext> { class IAsyncContext : public ServiceFramework<IAsyncContext> {
public: public:
explicit IAsyncContext(Core::System& system_); explicit IAsyncContext(Core::System& system_);
~IAsyncContext() override;
void GetSystemEvent(Kernel::HLERequestContext& ctx); void GetSystemEvent(Kernel::HLERequestContext& ctx);
void Cancel(Kernel::HLERequestContext& ctx); void Cancel(Kernel::HLERequestContext& ctx);
@ -30,8 +31,10 @@ protected:
void MarkComplete(); void MarkComplete();
KernelHelpers::ServiceContext service_context;
std::atomic<bool> is_complete{false}; std::atomic<bool> is_complete{false};
Kernel::KEvent compeletion_event; Kernel::KEvent* completion_event;
}; };
} // namespace Service::Account } // namespace Service::Account

115
src/core/hle/service/am/am.cpp
View file

@ -16,9 +16,7 @@
#include "core/hle/ipc_helpers.h" #include "core/hle/ipc_helpers.h"
#include "core/hle/kernel/k_event.h" #include "core/hle/kernel/k_event.h"
#include "core/hle/kernel/k_process.h" #include "core/hle/kernel/k_process.h"
#include "core/hle/kernel/k_readable_event.h"
#include "core/hle/kernel/k_transfer_memory.h" #include "core/hle/kernel/k_transfer_memory.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/acc/profile_manager.h" #include "core/hle/service/acc/profile_manager.h"
#include "core/hle/service/am/am.h" #include "core/hle/service/am/am.h"
@ -254,8 +252,9 @@ IDebugFunctions::IDebugFunctions(Core::System& system_)
IDebugFunctions::~IDebugFunctions() = default; IDebugFunctions::~IDebugFunctions() = default;
ISelfController::ISelfController(Core::System& system_, NVFlinger::NVFlinger& nvflinger_) ISelfController::ISelfController(Core::System& system_, NVFlinger::NVFlinger& nvflinger_)
: ServiceFramework{system_, "ISelfController"}, nvflinger{nvflinger_}, : ServiceFramework{system_, "ISelfController"}, nvflinger{nvflinger_}, service_context{
launchable_event{system.Kernel()}, accumulated_suspended_tick_changed_event{system.Kernel()} { system,
"ISelfController"} {
// clang-format off // clang-format off
static const FunctionInfo functions[] = { static const FunctionInfo functions[] = {
{0, &ISelfController::Exit, "Exit"}, {0, &ISelfController::Exit, "Exit"},
@ -311,9 +310,7 @@ ISelfController::ISelfController(Core::System& system_, NVFlinger::NVFlinger& nv
RegisterHandlers(functions); RegisterHandlers(functions);
Kernel::KAutoObject::Create(std::addressof(launchable_event)); launchable_event = service_context.CreateEvent("ISelfController:LaunchableEvent");
launchable_event.Initialize("ISelfController:LaunchableEvent");
// This event is created by AM on the first time GetAccumulatedSuspendedTickChangedEvent() is // This event is created by AM on the first time GetAccumulatedSuspendedTickChangedEvent() is
// called. Yuzu can just create it unconditionally, since it doesn't need to support multiple // called. Yuzu can just create it unconditionally, since it doesn't need to support multiple
@ -321,13 +318,15 @@ ISelfController::ISelfController(Core::System& system_, NVFlinger::NVFlinger& nv
// suspended if the event has previously been created by a call to // suspended if the event has previously been created by a call to
// GetAccumulatedSuspendedTickChangedEvent. // GetAccumulatedSuspendedTickChangedEvent.
Kernel::KAutoObject::Create(std::addressof(accumulated_suspended_tick_changed_event)); accumulated_suspended_tick_changed_event =
accumulated_suspended_tick_changed_event.Initialize( service_context.CreateEvent("ISelfController:AccumulatedSuspendedTickChangedEvent");
"ISelfController:AccumulatedSuspendedTickChangedEvent"); accumulated_suspended_tick_changed_event->GetWritableEvent().Signal();
accumulated_suspended_tick_changed_event.GetWritableEvent().Signal();
} }
ISelfController::~ISelfController() = default; ISelfController::~ISelfController() {
service_context.CloseEvent(launchable_event);
service_context.CloseEvent(accumulated_suspended_tick_changed_event);
}
void ISelfController::Exit(Kernel::HLERequestContext& ctx) { void ISelfController::Exit(Kernel::HLERequestContext& ctx) {
LOG_DEBUG(Service_AM, "called"); LOG_DEBUG(Service_AM, "called");
@ -383,11 +382,11 @@ void ISelfController::LeaveFatalSection(Kernel::HLERequestContext& ctx) {
void ISelfController::GetLibraryAppletLaunchableEvent(Kernel::HLERequestContext& ctx) { void ISelfController::GetLibraryAppletLaunchableEvent(Kernel::HLERequestContext& ctx) {
LOG_WARNING(Service_AM, "(STUBBED) called"); LOG_WARNING(Service_AM, "(STUBBED) called");
launchable_event.GetWritableEvent().Signal(); launchable_event->GetWritableEvent().Signal();
IPC::ResponseBuilder rb{ctx, 2, 1}; IPC::ResponseBuilder rb{ctx, 2, 1};
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
rb.PushCopyObjects(launchable_event.GetReadableEvent()); rb.PushCopyObjects(launchable_event->GetReadableEvent());
} }
void ISelfController::SetScreenShotPermission(Kernel::HLERequestContext& ctx) { void ISelfController::SetScreenShotPermission(Kernel::HLERequestContext& ctx) {
@ -566,7 +565,7 @@ void ISelfController::GetAccumulatedSuspendedTickChangedEvent(Kernel::HLERequest
IPC::ResponseBuilder rb{ctx, 2, 1}; IPC::ResponseBuilder rb{ctx, 2, 1};
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
rb.PushCopyObjects(accumulated_suspended_tick_changed_event.GetReadableEvent()); rb.PushCopyObjects(accumulated_suspended_tick_changed_event->GetReadableEvent());
} }
void ISelfController::SetAlbumImageTakenNotificationEnabled(Kernel::HLERequestContext& ctx) { void ISelfController::SetAlbumImageTakenNotificationEnabled(Kernel::HLERequestContext& ctx) {
@ -584,40 +583,39 @@ void ISelfController::SetAlbumImageTakenNotificationEnabled(Kernel::HLERequestCo
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
} }
AppletMessageQueue::AppletMessageQueue(Kernel::KernelCore& kernel) AppletMessageQueue::AppletMessageQueue(Core::System& system)
: on_new_message{kernel}, on_operation_mode_changed{kernel} { : service_context{system, "AppletMessageQueue"} {
on_new_message = service_context.CreateEvent("AMMessageQueue:OnMessageReceived");
Kernel::KAutoObject::Create(std::addressof(on_new_message)); on_operation_mode_changed = service_context.CreateEvent("AMMessageQueue:OperationModeChanged");
Kernel::KAutoObject::Create(std::addressof(on_operation_mode_changed));
on_new_message.Initialize("AMMessageQueue:OnMessageReceived");
on_operation_mode_changed.Initialize("AMMessageQueue:OperationModeChanged");
} }
AppletMessageQueue::~AppletMessageQueue() = default; AppletMessageQueue::~AppletMessageQueue() {
service_context.CloseEvent(on_new_message);
service_context.CloseEvent(on_operation_mode_changed);
}
Kernel::KReadableEvent& AppletMessageQueue::GetMessageReceiveEvent() { Kernel::KReadableEvent& AppletMessageQueue::GetMessageReceiveEvent() {
return on_new_message.GetReadableEvent(); return on_new_message->GetReadableEvent();
} }
Kernel::KReadableEvent& AppletMessageQueue::GetOperationModeChangedEvent() { Kernel::KReadableEvent& AppletMessageQueue::GetOperationModeChangedEvent() {
return on_operation_mode_changed.GetReadableEvent(); return on_operation_mode_changed->GetReadableEvent();
} }
void AppletMessageQueue::PushMessage(AppletMessage msg) { void AppletMessageQueue::PushMessage(AppletMessage msg) {
messages.push(msg); messages.push(msg);
on_new_message.GetWritableEvent().Signal(); on_new_message->GetWritableEvent().Signal();
} }
AppletMessageQueue::AppletMessage AppletMessageQueue::PopMessage() { AppletMessageQueue::AppletMessage AppletMessageQueue::PopMessage() {
if (messages.empty()) { if (messages.empty()) {
on_new_message.GetWritableEvent().Clear(); on_new_message->GetWritableEvent().Clear();
return AppletMessage::NoMessage; return AppletMessage::NoMessage;
} }
auto msg = messages.front(); auto msg = messages.front();
messages.pop(); messages.pop();
if (messages.empty()) { if (messages.empty()) {
on_new_message.GetWritableEvent().Clear(); on_new_message->GetWritableEvent().Clear();
} }
return msg; return msg;
} }
@ -637,7 +635,7 @@ void AppletMessageQueue::FocusStateChanged() {
void AppletMessageQueue::OperationModeChanged() { void AppletMessageQueue::OperationModeChanged() {
PushMessage(AppletMessage::OperationModeChanged); PushMessage(AppletMessage::OperationModeChanged);
PushMessage(AppletMessage::PerformanceModeChanged); PushMessage(AppletMessage::PerformanceModeChanged);
on_operation_mode_changed.GetWritableEvent().Signal(); on_operation_mode_changed->GetWritableEvent().Signal();
} }
ICommonStateGetter::ICommonStateGetter(Core::System& system_, ICommonStateGetter::ICommonStateGetter(Core::System& system_,
@ -1272,10 +1270,8 @@ void ILibraryAppletCreator::CreateHandleStorage(Kernel::HLERequestContext& ctx)
} }
IApplicationFunctions::IApplicationFunctions(Core::System& system_) IApplicationFunctions::IApplicationFunctions(Core::System& system_)
: ServiceFramework{system_, "IApplicationFunctions"}, gpu_error_detected_event{system.Kernel()}, : ServiceFramework{system_, "IApplicationFunctions"}, service_context{system,
friend_invitation_storage_channel_event{system.Kernel()}, "IApplicationFunctions"} {
notification_storage_channel_event{system.Kernel()}, health_warning_disappeared_system_event{
system.Kernel()} {
// clang-format off // clang-format off
static const FunctionInfo functions[] = { static const FunctionInfo functions[] = {
{1, &IApplicationFunctions::PopLaunchParameter, "PopLaunchParameter"}, {1, &IApplicationFunctions::PopLaunchParameter, "PopLaunchParameter"},
@ -1343,21 +1339,22 @@ IApplicationFunctions::IApplicationFunctions(Core::System& system_)
RegisterHandlers(functions); RegisterHandlers(functions);
Kernel::KAutoObject::Create(std::addressof(gpu_error_detected_event)); gpu_error_detected_event =
Kernel::KAutoObject::Create(std::addressof(friend_invitation_storage_channel_event)); service_context.CreateEvent("IApplicationFunctions:GpuErrorDetectedSystemEvent");
Kernel::KAutoObject::Create(std::addressof(notification_storage_channel_event)); friend_invitation_storage_channel_event =
Kernel::KAutoObject::Create(std::addressof(health_warning_disappeared_system_event)); service_context.CreateEvent("IApplicationFunctions:FriendInvitationStorageChannelEvent");
notification_storage_channel_event =
gpu_error_detected_event.Initialize("IApplicationFunctions:GpuErrorDetectedSystemEvent"); service_context.CreateEvent("IApplicationFunctions:NotificationStorageChannelEvent");
friend_invitation_storage_channel_event.Initialize( health_warning_disappeared_system_event =
"IApplicationFunctions:FriendInvitationStorageChannelEvent"); service_context.CreateEvent("IApplicationFunctions:HealthWarningDisappearedSystemEvent");
notification_storage_channel_event.Initialize(
"IApplicationFunctions:NotificationStorageChannelEvent");
health_warning_disappeared_system_event.Initialize(
"IApplicationFunctions:HealthWarningDisappearedSystemEvent");
} }
IApplicationFunctions::~IApplicationFunctions() = default; IApplicationFunctions::~IApplicationFunctions() {
service_context.CloseEvent(gpu_error_detected_event);
service_context.CloseEvent(friend_invitation_storage_channel_event);
service_context.CloseEvent(notification_storage_channel_event);
service_context.CloseEvent(health_warning_disappeared_system_event);
}
void IApplicationFunctions::EnableApplicationCrashReport(Kernel::HLERequestContext& ctx) { void IApplicationFunctions::EnableApplicationCrashReport(Kernel::HLERequestContext& ctx) {
LOG_WARNING(Service_AM, "(STUBBED) called"); LOG_WARNING(Service_AM, "(STUBBED) called");
@ -1751,7 +1748,7 @@ void IApplicationFunctions::GetGpuErrorDetectedSystemEvent(Kernel::HLERequestCon
IPC::ResponseBuilder rb{ctx, 2, 1}; IPC::ResponseBuilder rb{ctx, 2, 1};
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
rb.PushCopyObjects(gpu_error_detected_event.GetReadableEvent()); rb.PushCopyObjects(gpu_error_detected_event->GetReadableEvent());
} }
void IApplicationFunctions::GetFriendInvitationStorageChannelEvent(Kernel::HLERequestContext& ctx) { void IApplicationFunctions::GetFriendInvitationStorageChannelEvent(Kernel::HLERequestContext& ctx) {
@ -1759,7 +1756,7 @@ void IApplicationFunctions::GetFriendInvitationStorageChannelEvent(Kernel::HLERe
IPC::ResponseBuilder rb{ctx, 2, 1}; IPC::ResponseBuilder rb{ctx, 2, 1};
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
rb.PushCopyObjects(friend_invitation_storage_channel_event.GetReadableEvent()); rb.PushCopyObjects(friend_invitation_storage_channel_event->GetReadableEvent());
} }
void IApplicationFunctions::TryPopFromFriendInvitationStorageChannel( void IApplicationFunctions::TryPopFromFriendInvitationStorageChannel(
@ -1775,7 +1772,7 @@ void IApplicationFunctions::GetNotificationStorageChannelEvent(Kernel::HLEReques
IPC::ResponseBuilder rb{ctx, 2, 1}; IPC::ResponseBuilder rb{ctx, 2, 1};
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
rb.PushCopyObjects(notification_storage_channel_event.GetReadableEvent()); rb.PushCopyObjects(notification_storage_channel_event->GetReadableEvent());
} }
void IApplicationFunctions::GetHealthWarningDisappearedSystemEvent(Kernel::HLERequestContext& ctx) { void IApplicationFunctions::GetHealthWarningDisappearedSystemEvent(Kernel::HLERequestContext& ctx) {
@ -1783,12 +1780,12 @@ void IApplicationFunctions::GetHealthWarningDisappearedSystemEvent(Kernel::HLERe
IPC::ResponseBuilder rb{ctx, 2, 1}; IPC::ResponseBuilder rb{ctx, 2, 1};
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
rb.PushCopyObjects(health_warning_disappeared_system_event.GetReadableEvent()); rb.PushCopyObjects(health_warning_disappeared_system_event->GetReadableEvent());
} }
void InstallInterfaces(SM::ServiceManager& service_manager, NVFlinger::NVFlinger& nvflinger, void InstallInterfaces(SM::ServiceManager& service_manager, NVFlinger::NVFlinger& nvflinger,
Core::System& system) { Core::System& system) {
auto message_queue = std::make_shared<AppletMessageQueue>(system.Kernel()); auto message_queue = std::make_shared<AppletMessageQueue>(system);
// Needed on game boot // Needed on game boot
message_queue->PushMessage(AppletMessageQueue::AppletMessage::FocusStateChanged); message_queue->PushMessage(AppletMessageQueue::AppletMessage::FocusStateChanged);
@ -1801,8 +1798,8 @@ void InstallInterfaces(SM::ServiceManager& service_manager, NVFlinger::NVFlinger
} }
IHomeMenuFunctions::IHomeMenuFunctions(Core::System& system_) IHomeMenuFunctions::IHomeMenuFunctions(Core::System& system_)
: ServiceFramework{system_, "IHomeMenuFunctions"}, pop_from_general_channel_event{ : ServiceFramework{system_, "IHomeMenuFunctions"}, service_context{system,
system.Kernel()} { "IHomeMenuFunctions"} {
// clang-format off // clang-format off
static const FunctionInfo functions[] = { static const FunctionInfo functions[] = {
{10, &IHomeMenuFunctions::RequestToGetForeground, "RequestToGetForeground"}, {10, &IHomeMenuFunctions::RequestToGetForeground, "RequestToGetForeground"},
@ -1823,11 +1820,13 @@ IHomeMenuFunctions::IHomeMenuFunctions(Core::System& system_)
RegisterHandlers(functions); RegisterHandlers(functions);
Kernel::KAutoObject::Create(std::addressof(pop_from_general_channel_event)); pop_from_general_channel_event =
pop_from_general_channel_event.Initialize("IHomeMenuFunctions:PopFromGeneralChannelEvent"); service_context.CreateEvent("IHomeMenuFunctions:PopFromGeneralChannelEvent");
} }
IHomeMenuFunctions::~IHomeMenuFunctions() = default; IHomeMenuFunctions::~IHomeMenuFunctions() {
service_context.CloseEvent(pop_from_general_channel_event);
}
void IHomeMenuFunctions::RequestToGetForeground(Kernel::HLERequestContext& ctx) { void IHomeMenuFunctions::RequestToGetForeground(Kernel::HLERequestContext& ctx) {
LOG_WARNING(Service_AM, "(STUBBED) called"); LOG_WARNING(Service_AM, "(STUBBED) called");
@ -1841,7 +1840,7 @@ void IHomeMenuFunctions::GetPopFromGeneralChannelEvent(Kernel::HLERequestContext
IPC::ResponseBuilder rb{ctx, 2, 1}; IPC::ResponseBuilder rb{ctx, 2, 1};
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
rb.PushCopyObjects(pop_from_general_channel_event.GetReadableEvent()); rb.PushCopyObjects(pop_from_general_channel_event->GetReadableEvent());
} }
IGlobalStateController::IGlobalStateController(Core::System& system_) IGlobalStateController::IGlobalStateController(Core::System& system_)

32
src/core/hle/service/am/am.h
View file

@ -8,7 +8,7 @@
#include <memory> #include <memory>
#include <queue> #include <queue>
#include "core/hle/kernel/k_event.h" #include "core/hle/service/kernel_helpers.h"
#include "core/hle/service/service.h" #include "core/hle/service/service.h"
namespace Kernel { namespace Kernel {
@ -53,7 +53,7 @@ public:
PerformanceModeChanged = 31, PerformanceModeChanged = 31,
}; };
explicit AppletMessageQueue(Kernel::KernelCore& kernel); explicit AppletMessageQueue(Core::System& system);
~AppletMessageQueue(); ~AppletMessageQueue();
Kernel::KReadableEvent& GetMessageReceiveEvent(); Kernel::KReadableEvent& GetMessageReceiveEvent();
@ -66,9 +66,12 @@ public:
void OperationModeChanged(); void OperationModeChanged();
private: private:
KernelHelpers::ServiceContext service_context;
Kernel::KEvent* on_new_message;
Kernel::KEvent* on_operation_mode_changed;
std::queue<AppletMessage> messages; std::queue<AppletMessage> messages;
Kernel::KEvent on_new_message;
Kernel::KEvent on_operation_mode_changed;
}; };
class IWindowController final : public ServiceFramework<IWindowController> { class IWindowController final : public ServiceFramework<IWindowController> {
@ -156,8 +159,11 @@ private:
}; };
NVFlinger::NVFlinger& nvflinger; NVFlinger::NVFlinger& nvflinger;
Kernel::KEvent launchable_event;
Kernel::KEvent accumulated_suspended_tick_changed_event; KernelHelpers::ServiceContext service_context;
Kernel::KEvent* launchable_event;
Kernel::KEvent* accumulated_suspended_tick_changed_event;
u32 idle_time_detection_extension = 0; u32 idle_time_detection_extension = 0;
u64 num_fatal_sections_entered = 0; u64 num_fatal_sections_entered = 0;
@ -298,13 +304,15 @@ private:
void GetNotificationStorageChannelEvent(Kernel::HLERequestContext& ctx); void GetNotificationStorageChannelEvent(Kernel::HLERequestContext& ctx);
void GetHealthWarningDisappearedSystemEvent(Kernel::HLERequestContext& ctx); void GetHealthWarningDisappearedSystemEvent(Kernel::HLERequestContext& ctx);
KernelHelpers::ServiceContext service_context;
bool launch_popped_application_specific = false; bool launch_popped_application_specific = false;
bool launch_popped_account_preselect = false; bool launch_popped_account_preselect = false;
s32 previous_program_index{-1}; s32 previous_program_index{-1};
Kernel::KEvent gpu_error_detected_event; Kernel::KEvent* gpu_error_detected_event;
Kernel::KEvent friend_invitation_storage_channel_event; Kernel::KEvent* friend_invitation_storage_channel_event;
Kernel::KEvent notification_storage_channel_event; Kernel::KEvent* notification_storage_channel_event;
Kernel::KEvent health_warning_disappeared_system_event; Kernel::KEvent* health_warning_disappeared_system_event;
}; };
class IHomeMenuFunctions final : public ServiceFramework<IHomeMenuFunctions> { class IHomeMenuFunctions final : public ServiceFramework<IHomeMenuFunctions> {
@ -316,7 +324,9 @@ private:
void RequestToGetForeground(Kernel::HLERequestContext& ctx); void RequestToGetForeground(Kernel::HLERequestContext& ctx);
void GetPopFromGeneralChannelEvent(Kernel::HLERequestContext& ctx); void GetPopFromGeneralChannelEvent(Kernel::HLERequestContext& ctx);
Kernel::KEvent pop_from_general_channel_event; KernelHelpers::ServiceContext service_context;
Kernel::KEvent* pop_from_general_channel_event;
}; };
class IGlobalStateController final : public ServiceFramework<IGlobalStateController> { class IGlobalStateController final : public ServiceFramework<IGlobalStateController> {

41
src/core/hle/service/am/applets/applets.cpp
View file

@ -12,8 +12,7 @@
#include "core/frontend/applets/profile_select.h" #include "core/frontend/applets/profile_select.h"
#include "core/frontend/applets/software_keyboard.h" #include "core/frontend/applets/software_keyboard.h"
#include "core/frontend/applets/web_browser.h" #include "core/frontend/applets/web_browser.h"
#include "core/hle/kernel/k_readable_event.h" #include "core/hle/kernel/k_event.h"
#include "core/hle/kernel/k_writable_event.h"
#include "core/hle/service/am/am.h" #include "core/hle/service/am/am.h"
#include "core/hle/service/am/applet_ae.h" #include "core/hle/service/am/applet_ae.h"
#include "core/hle/service/am/applet_oe.h" #include "core/hle/service/am/applet_oe.h"
@ -29,19 +28,19 @@
namespace Service::AM::Applets { namespace Service::AM::Applets {
AppletDataBroker::AppletDataBroker(Core::System& system_, LibraryAppletMode applet_mode_) AppletDataBroker::AppletDataBroker(Core::System& system_, LibraryAppletMode applet_mode_)
: system{system_}, applet_mode{applet_mode_}, state_changed_event{system.Kernel()}, : system{system_}, applet_mode{applet_mode_}, service_context{system,
pop_out_data_event{system.Kernel()}, pop_interactive_out_data_event{system.Kernel()} { "ILibraryAppletAccessor"} {
state_changed_event = service_context.CreateEvent("ILibraryAppletAccessor:StateChangedEvent");
Kernel::KAutoObject::Create(std::addressof(state_changed_event)); pop_out_data_event = service_context.CreateEvent("ILibraryAppletAccessor:PopDataOutEvent");
Kernel::KAutoObject::Create(std::addressof(pop_out_data_event)); pop_interactive_out_data_event =
Kernel::KAutoObject::Create(std::addressof(pop_interactive_out_data_event)); service_context.CreateEvent("ILibraryAppletAccessor:PopInteractiveDataOutEvent");
state_changed_event.Initialize("ILibraryAppletAccessor:StateChangedEvent");
pop_out_data_event.Initialize("ILibraryAppletAccessor:PopDataOutEvent");
pop_interactive_out_data_event.Initialize("ILibraryAppletAccessor:PopInteractiveDataOutEvent");
} }
AppletDataBroker::~AppletDataBroker() = default; AppletDataBroker::~AppletDataBroker() {
service_context.CloseEvent(state_changed_event);
service_context.CloseEvent(pop_out_data_event);
service_context.CloseEvent(pop_interactive_out_data_event);
}
AppletDataBroker::RawChannelData AppletDataBroker::PeekDataToAppletForDebug() const { AppletDataBroker::RawChannelData AppletDataBroker::PeekDataToAppletForDebug() const {
std::vector<std::vector<u8>> out_normal; std::vector<std::vector<u8>> out_normal;
@ -65,7 +64,7 @@ std::shared_ptr<IStorage> AppletDataBroker::PopNormalDataToGame() {
auto out = std::move(out_channel.front()); auto out = std::move(out_channel.front());
out_channel.pop_front(); out_channel.pop_front();
pop_out_data_event.GetWritableEvent().Clear(); pop_out_data_event->GetWritableEvent().Clear();
return out; return out;
} }
@ -84,7 +83,7 @@ std::shared_ptr<IStorage> AppletDataBroker::PopInteractiveDataToGame() {
auto out = std::move(out_interactive_channel.front()); auto out = std::move(out_interactive_channel.front());
out_interactive_channel.pop_front(); out_interactive_channel.pop_front();
pop_interactive_out_data_event.GetWritableEvent().Clear(); pop_interactive_out_data_event->GetWritableEvent().Clear();
return out; return out;
} }
@ -103,7 +102,7 @@ void AppletDataBroker::PushNormalDataFromGame(std::shared_ptr<IStorage>&& storag
void AppletDataBroker::PushNormalDataFromApplet(std::shared_ptr<IStorage>&& storage) { void AppletDataBroker::PushNormalDataFromApplet(std::shared_ptr<IStorage>&& storage) {
out_channel.emplace_back(std::move(storage)); out_channel.emplace_back(std::move(storage));
pop_out_data_event.GetWritableEvent().Signal(); pop_out_data_event->GetWritableEvent().Signal();
} }
void AppletDataBroker::PushInteractiveDataFromGame(std::shared_ptr<IStorage>&& storage) { void AppletDataBroker::PushInteractiveDataFromGame(std::shared_ptr<IStorage>&& storage) {
@ -112,11 +111,11 @@ void AppletDataBroker::PushInteractiveDataFromGame(std::shared_ptr<IStorage>&& s
void AppletDataBroker::PushInteractiveDataFromApplet(std::shared_ptr<IStorage>&& storage) { void AppletDataBroker::PushInteractiveDataFromApplet(std::shared_ptr<IStorage>&& storage) {
out_interactive_channel.emplace_back(std::move(storage)); out_interactive_channel.emplace_back(std::move(storage));
pop_interactive_out_data_event.GetWritableEvent().Signal(); pop_interactive_out_data_event->GetWritableEvent().Signal();
} }
void AppletDataBroker::SignalStateChanged() { void AppletDataBroker::SignalStateChanged() {
state_changed_event.GetWritableEvent().Signal(); state_changed_event->GetWritableEvent().Signal();
switch (applet_mode) { switch (applet_mode) {
case LibraryAppletMode::AllForeground: case LibraryAppletMode::AllForeground:
@ -141,15 +140,15 @@ void AppletDataBroker::SignalStateChanged() {
} }
Kernel::KReadableEvent& AppletDataBroker::GetNormalDataEvent() { Kernel::KReadableEvent& AppletDataBroker::GetNormalDataEvent() {
return pop_out_data_event.GetReadableEvent(); return pop_out_data_event->GetReadableEvent();
} }
Kernel::KReadableEvent& AppletDataBroker::GetInteractiveDataEvent() { Kernel::KReadableEvent& AppletDataBroker::GetInteractiveDataEvent() {
return pop_interactive_out_data_event.GetReadableEvent(); return pop_interactive_out_data_event->GetReadableEvent();
} }
Kernel::KReadableEvent& AppletDataBroker::GetStateChangedEvent() { Kernel::KReadableEvent& AppletDataBroker::GetStateChangedEvent() {
return state_changed_event.GetReadableEvent(); return state_changed_event->GetReadableEvent();
} }
Applet::Applet(Core::System& system_, LibraryAppletMode applet_mode_) Applet::Applet(Core::System& system_, LibraryAppletMode applet_mode_)

10
src/core/hle/service/am/applets/applets.h
View file

@ -8,7 +8,7 @@
#include <queue> #include <queue>
#include "common/swap.h" #include "common/swap.h"
#include "core/hle/kernel/k_event.h" #include "core/hle/service/kernel_helpers.h"
union ResultCode; union ResultCode;
@ -105,6 +105,8 @@ private:
Core::System& system; Core::System& system;
LibraryAppletMode applet_mode; LibraryAppletMode applet_mode;
KernelHelpers::ServiceContext service_context;
// Queues are named from applet's perspective // Queues are named from applet's perspective
// PopNormalDataToApplet and PushNormalDataFromGame // PopNormalDataToApplet and PushNormalDataFromGame
@ -119,13 +121,13 @@ private:
// PopInteractiveDataToGame and PushInteractiveDataFromApplet // PopInteractiveDataToGame and PushInteractiveDataFromApplet
std::deque<std::shared_ptr<IStorage>> out_interactive_channel; std::deque<std::shared_ptr<IStorage>> out_interactive_channel;
Kernel::KEvent state_changed_event; Kernel::KEvent* state_changed_event;
// Signaled on PushNormalDataFromApplet // Signaled on PushNormalDataFromApplet
Kernel::KEvent pop_out_data_event; Kernel::KEvent* pop_out_data_event;
// Signaled on PushInteractiveDataFromApplet // Signaled on PushInteractiveDataFromApplet
Kernel::KEvent pop_interactive_out_data_event; Kernel::KEvent* pop_interactive_out_data_event;
}; };
class Applet { class Applet {

31
src/core/hle/service/aoc/aoc_u.cpp
View file

@ -16,8 +16,8 @@
#include "core/file_sys/patch_manager.h" #include "core/file_sys/patch_manager.h"
#include "core/file_sys/registered_cache.h" #include "core/file_sys/registered_cache.h"
#include "core/hle/ipc_helpers.h" #include "core/hle/ipc_helpers.h"
#include "core/hle/kernel/k_event.h"
#include "core/hle/kernel/k_process.h" #include "core/hle/kernel/k_process.h"
#include "core/hle/kernel/k_readable_event.h"
#include "core/hle/kernel/kernel.h" #include "core/hle/kernel/kernel.h"
#include "core/hle/service/aoc/aoc_u.h" #include "core/hle/service/aoc/aoc_u.h"
#include "core/loader/loader.h" #include "core/loader/loader.h"
@ -49,7 +49,8 @@ static std::vector<u64> AccumulateAOCTitleIDs(Core::System& system) {
class IPurchaseEventManager final : public ServiceFramework<IPurchaseEventManager> { class IPurchaseEventManager final : public ServiceFramework<IPurchaseEventManager> {
public: public:
explicit IPurchaseEventManager(Core::System& system_) explicit IPurchaseEventManager(Core::System& system_)
: ServiceFramework{system_, "IPurchaseEventManager"}, purchased_event{system.Kernel()} { : ServiceFramework{system_, "IPurchaseEventManager"}, service_context{
system, "IPurchaseEventManager"} {
// clang-format off // clang-format off
static const FunctionInfo functions[] = { static const FunctionInfo functions[] = {
{0, &IPurchaseEventManager::SetDefaultDeliveryTarget, "SetDefaultDeliveryTarget"}, {0, &IPurchaseEventManager::SetDefaultDeliveryTarget, "SetDefaultDeliveryTarget"},
@ -62,8 +63,11 @@ public:
RegisterHandlers(functions); RegisterHandlers(functions);
Kernel::KAutoObject::Create(std::addressof(purchased_event)); purchased_event = service_context.CreateEvent("IPurchaseEventManager:PurchasedEvent");
purchased_event.Initialize("IPurchaseEventManager:PurchasedEvent"); }
~IPurchaseEventManager() override {
service_context.CloseEvent(purchased_event);
} }
private: private:
@ -96,15 +100,17 @@ private:
IPC::ResponseBuilder rb{ctx, 2, 1}; IPC::ResponseBuilder rb{ctx, 2, 1};
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
rb.PushCopyObjects(purchased_event.GetReadableEvent()); rb.PushCopyObjects(purchased_event->GetReadableEvent());
} }
Kernel::KEvent purchased_event; KernelHelpers::ServiceContext service_context;
Kernel::KEvent* purchased_event;
}; };
AOC_U::AOC_U(Core::System& system_) AOC_U::AOC_U(Core::System& system_)
: ServiceFramework{system_, "aoc:u"}, add_on_content{AccumulateAOCTitleIDs(system)}, : ServiceFramework{system_, "aoc:u"}, add_on_content{AccumulateAOCTitleIDs(system)},
aoc_change_event{system.Kernel()} { service_context{system_, "aoc:u"} {
// clang-format off // clang-format off
static const FunctionInfo functions[] = { static const FunctionInfo functions[] = {
{0, nullptr, "CountAddOnContentByApplicationId"}, {0, nullptr, "CountAddOnContentByApplicationId"},
@ -126,11 +132,12 @@ AOC_U::AOC_U(Core::System& system_)
RegisterHandlers(functions); RegisterHandlers(functions);
Kernel::KAutoObject::Create(std::addressof(aoc_change_event)); aoc_change_event = service_context.CreateEvent("GetAddOnContentListChanged:Event");
aoc_change_event.Initialize("GetAddOnContentListChanged:Event");
} }
AOC_U::~AOC_U() = default; AOC_U::~AOC_U() {
service_context.CloseEvent(aoc_change_event);
}
void AOC_U::CountAddOnContent(Kernel::HLERequestContext& ctx) { void AOC_U::CountAddOnContent(Kernel::HLERequestContext& ctx) {
struct Parameters { struct Parameters {
@ -254,7 +261,7 @@ void AOC_U::GetAddOnContentListChangedEvent(Kernel::HLERequestContext& ctx) {
IPC::ResponseBuilder rb{ctx, 2, 1}; IPC::ResponseBuilder rb{ctx, 2, 1};
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
rb.PushCopyObjects(aoc_change_event.GetReadableEvent()); rb.PushCopyObjects(aoc_change_event->GetReadableEvent());
} }
void AOC_U::GetAddOnContentListChangedEventWithProcessId(Kernel::HLERequestContext& ctx) { void AOC_U::GetAddOnContentListChangedEventWithProcessId(Kernel::HLERequestContext& ctx) {
@ -262,7 +269,7 @@ void AOC_U::GetAddOnContentListChangedEventWithProcessId(Kernel::HLERequestConte
IPC::ResponseBuilder rb{ctx, 2, 1}; IPC::ResponseBuilder rb{ctx, 2, 1};
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
rb.PushCopyObjects(aoc_change_event.GetReadableEvent()); rb.PushCopyObjects(aoc_change_event->GetReadableEvent());
} }
void AOC_U::CreateEcPurchasedEventManager(Kernel::HLERequestContext& ctx) { void AOC_U::CreateEcPurchasedEventManager(Kernel::HLERequestContext& ctx) {

6
src/core/hle/service/aoc/aoc_u.h
View file

@ -4,7 +4,7 @@
#pragma once #pragma once
#include "core/hle/kernel/k_event.h" #include "core/hle/service/kernel_helpers.h"
#include "core/hle/service/service.h" #include "core/hle/service/service.h"
namespace Core { namespace Core {
@ -33,7 +33,9 @@ private:
void CreatePermanentEcPurchasedEventManager(Kernel::HLERequestContext& ctx); void CreatePermanentEcPurchasedEventManager(Kernel::HLERequestContext& ctx);
std::vector<u64> add_on_content; std::vector<u64> add_on_content;
Kernel::KEvent aoc_change_event; KernelHelpers::ServiceContext service_context;
Kernel::KEvent* aoc_change_event;
}; };
/// Registers all AOC services with the specified service manager. /// Registers all AOC services with the specified service manager.

11
src/core/hle/service/audio/audin_u.cpp
View file

@ -12,7 +12,7 @@
namespace Service::Audio { namespace Service::Audio {
IAudioIn::IAudioIn(Core::System& system_) IAudioIn::IAudioIn(Core::System& system_)
: ServiceFramework{system_, "IAudioIn"}, buffer_event{system_.Kernel()} { : ServiceFramework{system_, "IAudioIn"}, service_context{system_, "IAudioIn"} {
// clang-format off // clang-format off
static const FunctionInfo functions[] = { static const FunctionInfo functions[] = {
{0, nullptr, "GetAudioInState"}, {0, nullptr, "GetAudioInState"},
@ -35,11 +35,12 @@ IAudioIn::IAudioIn(Core::System& system_)
RegisterHandlers(functions); RegisterHandlers(functions);
Kernel::KAutoObject::Create(std::addressof(buffer_event)); buffer_event = service_context.CreateEvent("IAudioIn:BufferEvent");
buffer_event.Initialize("IAudioIn:BufferEvent");
} }
IAudioIn::~IAudioIn() = default; IAudioIn::~IAudioIn() {
service_context.CloseEvent(buffer_event);
}
void IAudioIn::Start(Kernel::HLERequestContext& ctx) { void IAudioIn::Start(Kernel::HLERequestContext& ctx) {
LOG_WARNING(Service_Audio, "(STUBBED) called"); LOG_WARNING(Service_Audio, "(STUBBED) called");
@ -53,7 +54,7 @@ void IAudioIn::RegisterBufferEvent(Kernel::HLERequestContext& ctx) {
IPC::ResponseBuilder rb{ctx, 2, 1}; IPC::ResponseBuilder rb{ctx, 2, 1};
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
rb.PushCopyObjects(buffer_event.GetReadableEvent()); rb.PushCopyObjects(buffer_event->GetReadableEvent());
} }
void IAudioIn::AppendAudioInBufferAuto(Kernel::HLERequestContext& ctx) { void IAudioIn::AppendAudioInBufferAuto(Kernel::HLERequestContext& ctx) {

6
src/core/hle/service/audio/audin_u.h
View file

@ -4,7 +4,7 @@
#pragma once #pragma once
#include "core/hle/kernel/k_event.h" #include "core/hle/service/kernel_helpers.h"
#include "core/hle/service/service.h" #include "core/hle/service/service.h"
namespace Core { namespace Core {
@ -27,7 +27,9 @@ private:
void RegisterBufferEvent(Kernel::HLERequestContext& ctx); void RegisterBufferEvent(Kernel::HLERequestContext& ctx);
void AppendAudioInBufferAuto(Kernel::HLERequestContext& ctx); void AppendAudioInBufferAuto(Kernel::HLERequestContext& ctx);
Kernel::KEvent buffer_event; KernelHelpers::ServiceContext service_context;
Kernel::KEvent* buffer_event;
}; };
class AudInU final : public ServiceFramework<AudInU> { class AudInU final : public ServiceFramework<AudInU> {

32
src/core/hle/service/audio/audout_u.cpp
View file

@ -15,11 +15,10 @@
#include "core/hle/ipc_helpers.h" #include "core/hle/ipc_helpers.h"
#include "core/hle/kernel/hle_ipc.h" #include "core/hle/kernel/hle_ipc.h"
#include "core/hle/kernel/k_event.h" #include "core/hle/kernel/k_event.h"
#include "core/hle/kernel/k_readable_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/audio/audout_u.h" #include "core/hle/service/audio/audout_u.h"
#include "core/hle/service/audio/errors.h" #include "core/hle/service/audio/errors.h"
#include "core/hle/service/kernel_helpers.h"
#include "core/memory.h" #include "core/memory.h"
namespace Service::Audio { namespace Service::Audio {
@ -41,11 +40,12 @@ enum class AudioState : u32 {
class IAudioOut final : public ServiceFramework<IAudioOut> { class IAudioOut final : public ServiceFramework<IAudioOut> {
public: public:
IAudioOut(Core::System& system_, AudoutParams audio_params_, AudioCore::AudioOut& audio_core_, explicit IAudioOut(Core::System& system_, AudoutParams audio_params_,
std::string&& device_name_, std::string&& unique_name) AudioCore::AudioOut& audio_core_, std::string&& device_name_,
: ServiceFramework{system_, "IAudioOut"}, audio_core{audio_core_}, device_name{std::move( std::string&& unique_name)
device_name_)}, : ServiceFramework{system_, "IAudioOut"}, audio_core{audio_core_},
audio_params{audio_params_}, buffer_event{system.Kernel()}, main_memory{system.Memory()} { device_name{std::move(device_name_)}, audio_params{audio_params_},
main_memory{system.Memory()}, service_context{system_, "IAudioOut"} {
// clang-format off // clang-format off
static const FunctionInfo functions[] = { static const FunctionInfo functions[] = {
{0, &IAudioOut::GetAudioOutState, "GetAudioOutState"}, {0, &IAudioOut::GetAudioOutState, "GetAudioOutState"},
@ -67,16 +67,19 @@ public:
RegisterHandlers(functions); RegisterHandlers(functions);
// This is the event handle used to check if the audio buffer was released // This is the event handle used to check if the audio buffer was released
Kernel::KAutoObject::Create(std::addressof(buffer_event)); buffer_event = service_context.CreateEvent("IAudioOutBufferReleased");
buffer_event.Initialize("IAudioOutBufferReleased");
stream = audio_core.OpenStream(system.CoreTiming(), audio_params.sample_rate, stream = audio_core.OpenStream(system.CoreTiming(), audio_params.sample_rate,
audio_params.channel_count, std::move(unique_name), [this] { audio_params.channel_count, std::move(unique_name), [this] {
const auto guard = LockService(); const auto guard = LockService();
buffer_event.GetWritableEvent().Signal(); buffer_event->GetWritableEvent().Signal();
}); });
} }
~IAudioOut() override {
service_context.CloseEvent(buffer_event);
}
private: private:
struct AudioBuffer { struct AudioBuffer {
u64_le next; u64_le next;
@ -126,7 +129,7 @@ private:
IPC::ResponseBuilder rb{ctx, 2, 1}; IPC::ResponseBuilder rb{ctx, 2, 1};
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
rb.PushCopyObjects(buffer_event.GetReadableEvent()); rb.PushCopyObjects(buffer_event->GetReadableEvent());
} }
void AppendAudioOutBufferImpl(Kernel::HLERequestContext& ctx) { void AppendAudioOutBufferImpl(Kernel::HLERequestContext& ctx) {
@ -227,9 +230,12 @@ private:
[[maybe_unused]] AudoutParams audio_params{}; [[maybe_unused]] AudoutParams audio_params{};
/// This is the event handle used to check if the audio buffer was released
Kernel::KEvent buffer_event;
Core::Memory::Memory& main_memory; Core::Memory::Memory& main_memory;
KernelHelpers::ServiceContext service_context;
/// This is the event handle used to check if the audio buffer was released
Kernel::KEvent* buffer_event;
}; };
AudOutU::AudOutU(Core::System& system_) : ServiceFramework{system_, "audout:u"} { AudOutU::AudOutU(Core::System& system_) : ServiceFramework{system_, "audout:u"} {

41
src/core/hle/service/audio/audren_u.cpp
View file

@ -17,8 +17,6 @@
#include "core/hle/ipc_helpers.h" #include "core/hle/ipc_helpers.h"
#include "core/hle/kernel/hle_ipc.h" #include "core/hle/kernel/hle_ipc.h"
#include "core/hle/kernel/k_event.h" #include "core/hle/kernel/k_event.h"
#include "core/hle/kernel/k_readable_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/audio/audren_u.h" #include "core/hle/service/audio/audren_u.h"
#include "core/hle/service/audio/errors.h" #include "core/hle/service/audio/errors.h"
@ -30,7 +28,7 @@ public:
explicit IAudioRenderer(Core::System& system_, explicit IAudioRenderer(Core::System& system_,
const AudioCommon::AudioRendererParameter& audren_params, const AudioCommon::AudioRendererParameter& audren_params,
const std::size_t instance_number) const std::size_t instance_number)
: ServiceFramework{system_, "IAudioRenderer"}, system_event{system.Kernel()} { : ServiceFramework{system_, "IAudioRenderer"}, service_context{system_, "IAudioRenderer"} {
// clang-format off // clang-format off
static const FunctionInfo functions[] = { static const FunctionInfo functions[] = {
{0, &IAudioRenderer::GetSampleRate, "GetSampleRate"}, {0, &IAudioRenderer::GetSampleRate, "GetSampleRate"},
@ -49,17 +47,20 @@ public:
// clang-format on // clang-format on
RegisterHandlers(functions); RegisterHandlers(functions);
Kernel::KAutoObject::Create(std::addressof(system_event)); system_event = service_context.CreateEvent("IAudioRenderer:SystemEvent");
system_event.Initialize("IAudioRenderer:SystemEvent");
renderer = std::make_unique<AudioCore::AudioRenderer>( renderer = std::make_unique<AudioCore::AudioRenderer>(
system.CoreTiming(), system.Memory(), audren_params, system.CoreTiming(), system.Memory(), audren_params,
[this]() { [this]() {
const auto guard = LockService(); const auto guard = LockService();
system_event.GetWritableEvent().Signal(); system_event->GetWritableEvent().Signal();
}, },
instance_number); instance_number);
} }
~IAudioRenderer() override {
service_context.CloseEvent(system_event);
}
private: private:
void GetSampleRate(Kernel::HLERequestContext& ctx) { void GetSampleRate(Kernel::HLERequestContext& ctx) {
LOG_DEBUG(Service_Audio, "called"); LOG_DEBUG(Service_Audio, "called");
@ -130,7 +131,7 @@ private:
IPC::ResponseBuilder rb{ctx, 2, 1}; IPC::ResponseBuilder rb{ctx, 2, 1};
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
rb.PushCopyObjects(system_event.GetReadableEvent()); rb.PushCopyObjects(system_event->GetReadableEvent());
} }
void SetRenderingTimeLimit(Kernel::HLERequestContext& ctx) { void SetRenderingTimeLimit(Kernel::HLERequestContext& ctx) {
@ -164,14 +165,16 @@ private:
rb.Push(ERR_NOT_SUPPORTED); rb.Push(ERR_NOT_SUPPORTED);
} }
Kernel::KEvent system_event; KernelHelpers::ServiceContext service_context;
Kernel::KEvent* system_event;
std::unique_ptr<AudioCore::AudioRenderer> renderer; std::unique_ptr<AudioCore::AudioRenderer> renderer;
u32 rendering_time_limit_percent = 100; u32 rendering_time_limit_percent = 100;
}; };
class IAudioDevice final : public ServiceFramework<IAudioDevice> { class IAudioDevice final : public ServiceFramework<IAudioDevice> {
public: public:
explicit IAudioDevice(Core::System& system_, Kernel::KEvent& buffer_event_, u32_le revision_) explicit IAudioDevice(Core::System& system_, Kernel::KEvent* buffer_event_, u32_le revision_)
: ServiceFramework{system_, "IAudioDevice"}, buffer_event{buffer_event_}, revision{ : ServiceFramework{system_, "IAudioDevice"}, buffer_event{buffer_event_}, revision{
revision_} { revision_} {
static const FunctionInfo functions[] = { static const FunctionInfo functions[] = {
@ -279,11 +282,11 @@ private:
void QueryAudioDeviceSystemEvent(Kernel::HLERequestContext& ctx) { void QueryAudioDeviceSystemEvent(Kernel::HLERequestContext& ctx) {
LOG_WARNING(Service_Audio, "(STUBBED) called"); LOG_WARNING(Service_Audio, "(STUBBED) called");
buffer_event.GetWritableEvent().Signal(); buffer_event->GetWritableEvent().Signal();
IPC::ResponseBuilder rb{ctx, 2, 1}; IPC::ResponseBuilder rb{ctx, 2, 1};
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
rb.PushCopyObjects(buffer_event.GetReadableEvent()); rb.PushCopyObjects(buffer_event->GetReadableEvent());
} }
void GetActiveChannelCount(Kernel::HLERequestContext& ctx) { void GetActiveChannelCount(Kernel::HLERequestContext& ctx) {
@ -300,7 +303,7 @@ private:
IPC::ResponseBuilder rb{ctx, 2, 1}; IPC::ResponseBuilder rb{ctx, 2, 1};
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
rb.PushCopyObjects(buffer_event.GetReadableEvent()); rb.PushCopyObjects(buffer_event->GetReadableEvent());
} }
void QueryAudioDeviceOutputEvent(Kernel::HLERequestContext& ctx) { void QueryAudioDeviceOutputEvent(Kernel::HLERequestContext& ctx) {
@ -308,16 +311,15 @@ private:
IPC::ResponseBuilder rb{ctx, 2, 1}; IPC::ResponseBuilder rb{ctx, 2, 1};
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
rb.PushCopyObjects(buffer_event.GetReadableEvent()); rb.PushCopyObjects(buffer_event->GetReadableEvent());
} }
Kernel::KEvent& buffer_event; Kernel::KEvent* buffer_event;
u32_le revision = 0; u32_le revision = 0;
}; };
AudRenU::AudRenU(Core::System& system_) AudRenU::AudRenU(Core::System& system_)
: ServiceFramework{system_, "audren:u"}, buffer_event{system.Kernel()} { : ServiceFramework{system_, "audren:u"}, service_context{system_, "audren:u"} {
// clang-format off // clang-format off
static const FunctionInfo functions[] = { static const FunctionInfo functions[] = {
{0, &AudRenU::OpenAudioRenderer, "OpenAudioRenderer"}, {0, &AudRenU::OpenAudioRenderer, "OpenAudioRenderer"},
@ -330,11 +332,12 @@ AudRenU::AudRenU(Core::System& system_)
RegisterHandlers(functions); RegisterHandlers(functions);
Kernel::KAutoObject::Create(std::addressof(buffer_event)); buffer_event = service_context.CreateEvent("IAudioOutBufferReleasedEvent");
buffer_event.Initialize("IAudioOutBufferReleasedEvent");
} }
AudRenU::~AudRenU() = default; AudRenU::~AudRenU() {
service_context.CloseEvent(buffer_event);
}
void AudRenU::OpenAudioRenderer(Kernel::HLERequestContext& ctx) { void AudRenU::OpenAudioRenderer(Kernel::HLERequestContext& ctx) {
LOG_DEBUG(Service_Audio, "called"); LOG_DEBUG(Service_Audio, "called");

6
src/core/hle/service/audio/audren_u.h
View file

@ -4,7 +4,7 @@
#pragma once #pragma once
#include "core/hle/kernel/k_event.h" #include "core/hle/service/kernel_helpers.h"
#include "core/hle/service/service.h" #include "core/hle/service/service.h"
namespace Core { namespace Core {
@ -31,8 +31,10 @@ private:
void OpenAudioRendererImpl(Kernel::HLERequestContext& ctx); void OpenAudioRendererImpl(Kernel::HLERequestContext& ctx);
KernelHelpers::ServiceContext service_context;
std::size_t audren_instance_count = 0; std::size_t audren_instance_count = 0;
Kernel::KEvent buffer_event; Kernel::KEvent* buffer_event;
}; };
// Describes a particular audio feature that may be supported in a particular revision. // Describes a particular audio feature that may be supported in a particular revision.

22
src/core/hle/service/bcat/backend/backend.cpp
View file

@ -5,22 +5,24 @@
#include "common/hex_util.h" #include "common/hex_util.h"
#include "common/logging/log.h" #include "common/logging/log.h"
#include "core/core.h" #include "core/core.h"
#include "core/hle/kernel/k_readable_event.h" #include "core/hle/kernel/k_event.h"
#include "core/hle/kernel/k_writable_event.h"
#include "core/hle/lock.h" #include "core/hle/lock.h"
#include "core/hle/service/bcat/backend/backend.h" #include "core/hle/service/bcat/backend/backend.h"
namespace Service::BCAT { namespace Service::BCAT {
ProgressServiceBackend::ProgressServiceBackend(Kernel::KernelCore& kernel, ProgressServiceBackend::ProgressServiceBackend(Core::System& system, std::string_view event_name)
std::string_view event_name) : service_context{system, "ProgressServiceBackend"} {
: update_event{kernel} { update_event = service_context.CreateEvent("ProgressServiceBackend:UpdateEvent:" +
Kernel::KAutoObject::Create(std::addressof(update_event)); std::string(event_name));
update_event.Initialize("ProgressServiceBackend:UpdateEvent:" + std::string(event_name)); }
ProgressServiceBackend::~ProgressServiceBackend() {
service_context.CloseEvent(update_event);
} }
Kernel::KReadableEvent& ProgressServiceBackend::GetEvent() { Kernel::KReadableEvent& ProgressServiceBackend::GetEvent() {
return update_event.GetReadableEvent(); return update_event->GetReadableEvent();
} }
DeliveryCacheProgressImpl& ProgressServiceBackend::GetImpl() { DeliveryCacheProgressImpl& ProgressServiceBackend::GetImpl() {
@ -88,9 +90,9 @@ void ProgressServiceBackend::FinishDownload(ResultCode result) {
void ProgressServiceBackend::SignalUpdate() { void ProgressServiceBackend::SignalUpdate() {
if (need_hle_lock) { if (need_hle_lock) {
std::lock_guard lock(HLE::g_hle_lock); std::lock_guard lock(HLE::g_hle_lock);
update_event.GetWritableEvent().Signal(); update_event->GetWritableEvent().Signal();
} else { } else {
update_event.GetWritableEvent().Signal(); update_event->GetWritableEvent().Signal();
} }
} }

10
src/core/hle/service/bcat/backend/backend.h
View file

@ -11,8 +11,8 @@
#include "common/common_types.h" #include "common/common_types.h"
#include "core/file_sys/vfs_types.h" #include "core/file_sys/vfs_types.h"
#include "core/hle/kernel/k_event.h"
#include "core/hle/result.h" #include "core/hle/result.h"
#include "core/hle/service/kernel_helpers.h"
namespace Core { namespace Core {
class System; class System;
@ -70,6 +70,8 @@ class ProgressServiceBackend {
friend class IBcatService; friend class IBcatService;
public: public:
~ProgressServiceBackend();
// Clients should call this with true if any of the functions are going to be called from a // Clients should call this with true if any of the functions are going to be called from a
// non-HLE thread and this class need to lock the hle mutex. (default is false) // non-HLE thread and this class need to lock the hle mutex. (default is false)
void SetNeedHLELock(bool need); void SetNeedHLELock(bool need);
@ -97,15 +99,17 @@ public:
void FinishDownload(ResultCode result); void FinishDownload(ResultCode result);
private: private:
explicit ProgressServiceBackend(Kernel::KernelCore& kernel, std::string_view event_name); explicit ProgressServiceBackend(Core::System& system, std::string_view event_name);
Kernel::KReadableEvent& GetEvent(); Kernel::KReadableEvent& GetEvent();
DeliveryCacheProgressImpl& GetImpl(); DeliveryCacheProgressImpl& GetImpl();
void SignalUpdate(); void SignalUpdate();
KernelHelpers::ServiceContext service_context;
DeliveryCacheProgressImpl impl{}; DeliveryCacheProgressImpl impl{};
Kernel::KEvent update_event; Kernel::KEvent* update_event;
bool need_hle_lock = false; bool need_hle_lock = false;
}; };

4
src/core/hle/service/bcat/bcat_module.cpp
View file

@ -127,8 +127,8 @@ public:
explicit IBcatService(Core::System& system_, Backend& backend_) explicit IBcatService(Core::System& system_, Backend& backend_)
: ServiceFramework{system_, "IBcatService"}, backend{backend_}, : ServiceFramework{system_, "IBcatService"}, backend{backend_},
progress{{ progress{{
ProgressServiceBackend{system_.Kernel(), "Normal"}, ProgressServiceBackend{system_, "Normal"},
ProgressServiceBackend{system_.Kernel(), "Directory"}, ProgressServiceBackend{system_, "Directory"},
}} { }} {
// clang-format off // clang-format off
static const FunctionInfo functions[] = { static const FunctionInfo functions[] = {

17
src/core/hle/service/btdrv/btdrv.cpp
View file

@ -7,9 +7,9 @@
#include "core/hle/ipc_helpers.h" #include "core/hle/ipc_helpers.h"
#include "core/hle/kernel/hle_ipc.h" #include "core/hle/kernel/hle_ipc.h"
#include "core/hle/kernel/k_event.h" #include "core/hle/kernel/k_event.h"
#include "core/hle/kernel/k_readable_event.h"
#include "core/hle/kernel/kernel.h" #include "core/hle/kernel/kernel.h"
#include "core/hle/service/btdrv/btdrv.h" #include "core/hle/service/btdrv/btdrv.h"
#include "core/hle/service/kernel_helpers.h"
#include "core/hle/service/service.h" #include "core/hle/service/service.h"
#include "core/hle/service/sm/sm.h" #include "core/hle/service/sm/sm.h"
@ -18,7 +18,7 @@ namespace Service::BtDrv {
class Bt final : public ServiceFramework<Bt> { class Bt final : public ServiceFramework<Bt> {
public: public:
explicit Bt(Core::System& system_) explicit Bt(Core::System& system_)
: ServiceFramework{system_, "bt"}, register_event{system.Kernel()} { : ServiceFramework{system_, "bt"}, service_context{system_, "bt"} {
// clang-format off // clang-format off
static const FunctionInfo functions[] = { static const FunctionInfo functions[] = {
{0, nullptr, "LeClientReadCharacteristic"}, {0, nullptr, "LeClientReadCharacteristic"},
@ -35,8 +35,11 @@ public:
// clang-format on // clang-format on
RegisterHandlers(functions); RegisterHandlers(functions);
Kernel::KAutoObject::Create(std::addressof(register_event)); register_event = service_context.CreateEvent("BT:RegisterEvent");
register_event.Initialize("BT:RegisterEvent"); }
~Bt() override {
service_context.CloseEvent(register_event);
} }
private: private:
@ -45,10 +48,12 @@ private:
IPC::ResponseBuilder rb{ctx, 2, 1}; IPC::ResponseBuilder rb{ctx, 2, 1};
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
rb.PushCopyObjects(register_event.GetReadableEvent()); rb.PushCopyObjects(register_event->GetReadableEvent());
} }
Kernel::KEvent register_event; KernelHelpers::ServiceContext service_context;
Kernel::KEvent* register_event;
}; };
class BtDrv final : public ServiceFramework<BtDrv> { class BtDrv final : public ServiceFramework<BtDrv> {

42
src/core/hle/service/btm/btm.cpp
View file

@ -9,9 +9,9 @@
#include "core/hle/ipc_helpers.h" #include "core/hle/ipc_helpers.h"
#include "core/hle/kernel/hle_ipc.h" #include "core/hle/kernel/hle_ipc.h"
#include "core/hle/kernel/k_event.h" #include "core/hle/kernel/k_event.h"
#include "core/hle/kernel/k_readable_event.h"
#include "core/hle/kernel/kernel.h" #include "core/hle/kernel/kernel.h"
#include "core/hle/service/btm/btm.h" #include "core/hle/service/btm/btm.h"
#include "core/hle/service/kernel_helpers.h"
#include "core/hle/service/service.h" #include "core/hle/service/service.h"
namespace Service::BTM { namespace Service::BTM {
@ -19,9 +19,7 @@ namespace Service::BTM {
class IBtmUserCore final : public ServiceFramework<IBtmUserCore> { class IBtmUserCore final : public ServiceFramework<IBtmUserCore> {
public: public:
explicit IBtmUserCore(Core::System& system_) explicit IBtmUserCore(Core::System& system_)
: ServiceFramework{system_, "IBtmUserCore"}, scan_event{system.Kernel()}, : ServiceFramework{system_, "IBtmUserCore"}, service_context{system_, "IBtmUserCore"} {
connection_event{system.Kernel()}, service_discovery{system.Kernel()},
config_event{system.Kernel()} {
// clang-format off // clang-format off
static const FunctionInfo functions[] = { static const FunctionInfo functions[] = {
{0, &IBtmUserCore::AcquireBleScanEvent, "AcquireBleScanEvent"}, {0, &IBtmUserCore::AcquireBleScanEvent, "AcquireBleScanEvent"},
@ -60,15 +58,17 @@ public:
// clang-format on // clang-format on
RegisterHandlers(functions); RegisterHandlers(functions);
Kernel::KAutoObject::Create(std::addressof(scan_event)); scan_event = service_context.CreateEvent("IBtmUserCore:ScanEvent");
Kernel::KAutoObject::Create(std::addressof(connection_event)); connection_event = service_context.CreateEvent("IBtmUserCore:ConnectionEvent");
Kernel::KAutoObject::Create(std::addressof(service_discovery)); service_discovery_event = service_context.CreateEvent("IBtmUserCore:DiscoveryEvent");
Kernel::KAutoObject::Create(std::addressof(config_event)); config_event = service_context.CreateEvent("IBtmUserCore:ConfigEvent");
}
scan_event.Initialize("IBtmUserCore:ScanEvent"); ~IBtmUserCore() override {
connection_event.Initialize("IBtmUserCore:ConnectionEvent"); service_context.CloseEvent(scan_event);
service_discovery.Initialize("IBtmUserCore:Discovery"); service_context.CloseEvent(connection_event);
config_event.Initialize("IBtmUserCore:ConfigEvent"); service_context.CloseEvent(service_discovery_event);
service_context.CloseEvent(config_event);
} }
private: private:
@ -77,7 +77,7 @@ private:
IPC::ResponseBuilder rb{ctx, 2, 1}; IPC::ResponseBuilder rb{ctx, 2, 1};
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
rb.PushCopyObjects(scan_event.GetReadableEvent()); rb.PushCopyObjects(scan_event->GetReadableEvent());
} }
void AcquireBleConnectionEvent(Kernel::HLERequestContext& ctx) { void AcquireBleConnectionEvent(Kernel::HLERequestContext& ctx) {
@ -85,7 +85,7 @@ private:
IPC::ResponseBuilder rb{ctx, 2, 1}; IPC::ResponseBuilder rb{ctx, 2, 1};
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
rb.PushCopyObjects(connection_event.GetReadableEvent()); rb.PushCopyObjects(connection_event->GetReadableEvent());
} }
void AcquireBleServiceDiscoveryEvent(Kernel::HLERequestContext& ctx) { void AcquireBleServiceDiscoveryEvent(Kernel::HLERequestContext& ctx) {
@ -93,7 +93,7 @@ private:
IPC::ResponseBuilder rb{ctx, 2, 1}; IPC::ResponseBuilder rb{ctx, 2, 1};
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
rb.PushCopyObjects(service_discovery.GetReadableEvent()); rb.PushCopyObjects(service_discovery_event->GetReadableEvent());
} }
void AcquireBleMtuConfigEvent(Kernel::HLERequestContext& ctx) { void AcquireBleMtuConfigEvent(Kernel::HLERequestContext& ctx) {
@ -101,13 +101,15 @@ private:
IPC::ResponseBuilder rb{ctx, 2, 1}; IPC::ResponseBuilder rb{ctx, 2, 1};
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
rb.PushCopyObjects(config_event.GetReadableEvent()); rb.PushCopyObjects(config_event->GetReadableEvent());
} }
Kernel::KEvent scan_event; KernelHelpers::ServiceContext service_context;
Kernel::KEvent connection_event;
Kernel::KEvent service_discovery; Kernel::KEvent* scan_event;
Kernel::KEvent config_event; Kernel::KEvent* connection_event;
Kernel::KEvent* service_discovery_event;
Kernel::KEvent* config_event;
}; };
class BTM_USR final : public ServiceFramework<BTM_USR> { class BTM_USR final : public ServiceFramework<BTM_USR> {

26
src/core/hle/service/friend/friend.cpp
View file

@ -8,11 +8,10 @@
#include "core/core.h" #include "core/core.h"
#include "core/hle/ipc_helpers.h" #include "core/hle/ipc_helpers.h"
#include "core/hle/kernel/k_event.h" #include "core/hle/kernel/k_event.h"
#include "core/hle/kernel/k_readable_event.h"
#include "core/hle/kernel/k_writable_event.h"
#include "core/hle/service/friend/errors.h" #include "core/hle/service/friend/errors.h"
#include "core/hle/service/friend/friend.h" #include "core/hle/service/friend/friend.h"
#include "core/hle/service/friend/friend_interface.h" #include "core/hle/service/friend/friend_interface.h"
#include "core/hle/service/kernel_helpers.h"
namespace Service::Friend { namespace Service::Friend {
@ -184,9 +183,9 @@ private:
class INotificationService final : public ServiceFramework<INotificationService> { class INotificationService final : public ServiceFramework<INotificationService> {
public: public:
explicit INotificationService(Common::UUID uuid_, Core::System& system_) explicit INotificationService(Core::System& system_, Common::UUID uuid_)
: ServiceFramework{system_, "INotificationService"}, uuid{uuid_}, notification_event{ : ServiceFramework{system_, "INotificationService"}, uuid{uuid_},
system.Kernel()} { service_context{system_, "INotificationService"} {
// clang-format off // clang-format off
static const FunctionInfo functions[] = { static const FunctionInfo functions[] = {
{0, &INotificationService::GetEvent, "GetEvent"}, {0, &INotificationService::GetEvent, "GetEvent"},
@ -197,8 +196,11 @@ public:
RegisterHandlers(functions); RegisterHandlers(functions);
Kernel::KAutoObject::Create(std::addressof(notification_event)); notification_event = service_context.CreateEvent("INotificationService:NotifyEvent");
notification_event.Initialize("INotificationService:NotifyEvent"); }
~INotificationService() override {
service_context.CloseEvent(notification_event);
} }
private: private:
@ -207,7 +209,7 @@ private:
IPC::ResponseBuilder rb{ctx, 2, 1}; IPC::ResponseBuilder rb{ctx, 2, 1};
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
rb.PushCopyObjects(notification_event.GetReadableEvent()); rb.PushCopyObjects(notification_event->GetReadableEvent());
} }
void Clear(Kernel::HLERequestContext& ctx) { void Clear(Kernel::HLERequestContext& ctx) {
@ -272,8 +274,10 @@ private:
bool has_received_friend_request; bool has_received_friend_request;
}; };
Common::UUID uuid{Common::INVALID_UUID}; Common::UUID uuid;
Kernel::KEvent notification_event; KernelHelpers::ServiceContext service_context;
Kernel::KEvent* notification_event;
std::queue<SizedNotificationInfo> notifications; std::queue<SizedNotificationInfo> notifications;
States states{}; States states{};
}; };
@ -293,7 +297,7 @@ void Module::Interface::CreateNotificationService(Kernel::HLERequestContext& ctx
IPC::ResponseBuilder rb{ctx, 2, 0, 1}; IPC::ResponseBuilder rb{ctx, 2, 0, 1};
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
rb.PushIpcInterface<INotificationService>(uuid, system); rb.PushIpcInterface<INotificationService>(system, uuid);
} }
Module::Interface::Interface(std::shared_ptr<Module> module_, Core::System& system_, Module::Interface::Interface(std::shared_ptr<Module> module_, Core::System& system_,

49
src/core/hle/service/nfp/nfp.cpp
View file

@ -8,9 +8,8 @@
#include "common/logging/log.h" #include "common/logging/log.h"
#include "core/core.h" #include "core/core.h"
#include "core/hle/ipc_helpers.h" #include "core/hle/ipc_helpers.h"
#include "core/hle/kernel/k_readable_event.h" #include "core/hle/kernel/k_event.h"
#include "core/hle/kernel/k_thread.h" #include "core/hle/kernel/k_thread.h"
#include "core/hle/kernel/k_writable_event.h"
#include "core/hle/kernel/kernel.h" #include "core/hle/kernel/kernel.h"
#include "core/hle/lock.h" #include "core/hle/lock.h"
#include "core/hle/service/nfp/nfp.h" #include "core/hle/service/nfp/nfp.h"
@ -23,18 +22,21 @@ constexpr ResultCode ERR_NO_APPLICATION_AREA(ErrorModule::NFP, 152);
Module::Interface::Interface(std::shared_ptr<Module> module_, Core::System& system_, Module::Interface::Interface(std::shared_ptr<Module> module_, Core::System& system_,
const char* name) const char* name)
: ServiceFramework{system_, name}, nfc_tag_load{system.Kernel()}, module{std::move(module_)} { : ServiceFramework{system_, name}, module{std::move(module_)}, service_context{system_,
Kernel::KAutoObject::Create(std::addressof(nfc_tag_load)); "NFP::IUser"} {
nfc_tag_load.Initialize("IUser:NFCTagDetected"); nfc_tag_load = service_context.CreateEvent("NFP::IUser:NFCTagDetected");
} }
Module::Interface::~Interface() = default; Module::Interface::~Interface() {
service_context.CloseEvent(nfc_tag_load);
}
class IUser final : public ServiceFramework<IUser> { class IUser final : public ServiceFramework<IUser> {
public: public:
explicit IUser(Module::Interface& nfp_interface_, Core::System& system_) explicit IUser(Module::Interface& nfp_interface_, Core::System& system_,
KernelHelpers::ServiceContext& service_context_)
: ServiceFramework{system_, "NFP::IUser"}, nfp_interface{nfp_interface_}, : ServiceFramework{system_, "NFP::IUser"}, nfp_interface{nfp_interface_},
deactivate_event{system.Kernel()}, availability_change_event{system.Kernel()} { service_context{service_context_} {
static const FunctionInfo functions[] = { static const FunctionInfo functions[] = {
{0, &IUser::Initialize, "Initialize"}, {0, &IUser::Initialize, "Initialize"},
{1, &IUser::Finalize, "Finalize"}, {1, &IUser::Finalize, "Finalize"},
@ -64,11 +66,14 @@ public:
}; };
RegisterHandlers(functions); RegisterHandlers(functions);
Kernel::KAutoObject::Create(std::addressof(deactivate_event)); deactivate_event = service_context.CreateEvent("NFP::IUser:DeactivateEvent");
Kernel::KAutoObject::Create(std::addressof(availability_change_event)); availability_change_event =
service_context.CreateEvent("NFP::IUser:AvailabilityChangeEvent");
}
deactivate_event.Initialize("IUser:DeactivateEvent"); ~IUser() override {
availability_change_event.Initialize("IUser:AvailabilityChangeEvent"); service_context.CloseEvent(deactivate_event);
service_context.CloseEvent(availability_change_event);
} }
private: private:
@ -166,7 +171,7 @@ private:
IPC::ResponseBuilder rb{ctx, 2, 1}; IPC::ResponseBuilder rb{ctx, 2, 1};
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
rb.PushCopyObjects(deactivate_event.GetReadableEvent()); rb.PushCopyObjects(deactivate_event->GetReadableEvent());
} }
void StopDetection(Kernel::HLERequestContext& ctx) { void StopDetection(Kernel::HLERequestContext& ctx) {
@ -175,7 +180,7 @@ private:
switch (device_state) { switch (device_state) {
case DeviceState::TagFound: case DeviceState::TagFound:
case DeviceState::TagNearby: case DeviceState::TagNearby:
deactivate_event.GetWritableEvent().Signal(); deactivate_event->GetWritableEvent().Signal();
device_state = DeviceState::Initialized; device_state = DeviceState::Initialized;
break; break;
case DeviceState::SearchingForTag: case DeviceState::SearchingForTag:
@ -264,7 +269,7 @@ private:
IPC::ResponseBuilder rb{ctx, 2, 1}; IPC::ResponseBuilder rb{ctx, 2, 1};
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
rb.PushCopyObjects(availability_change_event.GetReadableEvent()); rb.PushCopyObjects(availability_change_event->GetReadableEvent());
} }
void GetRegisterInfo(Kernel::HLERequestContext& ctx) { void GetRegisterInfo(Kernel::HLERequestContext& ctx) {
@ -313,14 +318,16 @@ private:
rb.PushRaw<u32>(0); // This is from the GetCommonInfo stub rb.PushRaw<u32>(0); // This is from the GetCommonInfo stub
} }
Module::Interface& nfp_interface;
KernelHelpers::ServiceContext& service_context;
bool has_attached_handle{}; bool has_attached_handle{};
const u64 device_handle{0}; // Npad device 1 const u64 device_handle{0}; // Npad device 1
const u32 npad_id{0}; // Player 1 controller const u32 npad_id{0}; // Player 1 controller
State state{State::NonInitialized}; State state{State::NonInitialized};
DeviceState device_state{DeviceState::Initialized}; DeviceState device_state{DeviceState::Initialized};
Module::Interface& nfp_interface; Kernel::KEvent* deactivate_event;
Kernel::KEvent deactivate_event; Kernel::KEvent* availability_change_event;
Kernel::KEvent availability_change_event;
}; };
void Module::Interface::CreateUserInterface(Kernel::HLERequestContext& ctx) { void Module::Interface::CreateUserInterface(Kernel::HLERequestContext& ctx) {
@ -328,7 +335,7 @@ void Module::Interface::CreateUserInterface(Kernel::HLERequestContext& ctx) {
IPC::ResponseBuilder rb{ctx, 2, 0, 1}; IPC::ResponseBuilder rb{ctx, 2, 0, 1};
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
rb.PushIpcInterface<IUser>(*this, system); rb.PushIpcInterface<IUser>(*this, system, service_context);
} }
bool Module::Interface::LoadAmiibo(const std::vector<u8>& buffer) { bool Module::Interface::LoadAmiibo(const std::vector<u8>& buffer) {
@ -338,12 +345,12 @@ bool Module::Interface::LoadAmiibo(const std::vector<u8>& buffer) {
} }
std::memcpy(&amiibo, buffer.data(), sizeof(amiibo)); std::memcpy(&amiibo, buffer.data(), sizeof(amiibo));
nfc_tag_load.GetWritableEvent().Signal(); nfc_tag_load->GetWritableEvent().Signal();
return true; return true;
} }
Kernel::KReadableEvent& Module::Interface::GetNFCEvent() { Kernel::KReadableEvent& Module::Interface::GetNFCEvent() {
return nfc_tag_load.GetReadableEvent(); return nfc_tag_load->GetReadableEvent();
} }
const Module::Interface::AmiiboFile& Module::Interface::GetAmiiboBuffer() const { const Module::Interface::AmiiboFile& Module::Interface::GetAmiiboBuffer() const {

11
src/core/hle/service/nfp/nfp.h
View file

@ -7,7 +7,7 @@
#include <array> #include <array>
#include <vector> #include <vector>
#include "core/hle/kernel/k_event.h" #include "core/hle/service/kernel_helpers.h"
#include "core/hle/service/service.h" #include "core/hle/service/service.h"
namespace Kernel { namespace Kernel {
@ -42,12 +42,13 @@ public:
Kernel::KReadableEvent& GetNFCEvent(); Kernel::KReadableEvent& GetNFCEvent();
const AmiiboFile& GetAmiiboBuffer() const; const AmiiboFile& GetAmiiboBuffer() const;
private:
Kernel::KEvent nfc_tag_load;
AmiiboFile amiibo{};
protected: protected:
std::shared_ptr<Module> module; std::shared_ptr<Module> module;
private:
KernelHelpers::ServiceContext service_context;
Kernel::KEvent* nfc_tag_load;
AmiiboFile amiibo{};
}; };
}; };

32
src/core/hle/service/nifm/nifm.cpp
View file

@ -6,10 +6,21 @@
#include "core/core.h" #include "core/core.h"
#include "core/hle/ipc_helpers.h" #include "core/hle/ipc_helpers.h"
#include "core/hle/kernel/k_event.h" #include "core/hle/kernel/k_event.h"
#include "core/hle/kernel/k_readable_event.h"
#include "core/hle/kernel/kernel.h" #include "core/hle/kernel/kernel.h"
#include "core/hle/service/kernel_helpers.h"
#include "core/hle/service/nifm/nifm.h" #include "core/hle/service/nifm/nifm.h"
#include "core/hle/service/service.h" #include "core/hle/service/service.h"
namespace {
// Avoids name conflict with Windows' CreateEvent macro.
[[nodiscard]] Kernel::KEvent* CreateKEvent(Service::KernelHelpers::ServiceContext& service_context,
std::string&& name) {
return service_context.CreateEvent(std::move(name));
}
} // Anonymous namespace
#include "core/network/network.h" #include "core/network/network.h"
#include "core/network/network_interface.h" #include "core/network/network_interface.h"
@ -129,7 +140,7 @@ public:
class IRequest final : public ServiceFramework<IRequest> { class IRequest final : public ServiceFramework<IRequest> {
public: public:
explicit IRequest(Core::System& system_) explicit IRequest(Core::System& system_)
: ServiceFramework{system_, "IRequest"}, event1{system.Kernel()}, event2{system.Kernel()} { : ServiceFramework{system_, "IRequest"}, service_context{system_, "IRequest"} {
static const FunctionInfo functions[] = { static const FunctionInfo functions[] = {
{0, &IRequest::GetRequestState, "GetRequestState"}, {0, &IRequest::GetRequestState, "GetRequestState"},
{1, &IRequest::GetResult, "GetResult"}, {1, &IRequest::GetResult, "GetResult"},
@ -159,11 +170,13 @@ public:
}; };
RegisterHandlers(functions); RegisterHandlers(functions);
Kernel::KAutoObject::Create(std::addressof(event1)); event1 = CreateKEvent(service_context, "IRequest:Event1");
Kernel::KAutoObject::Create(std::addressof(event2)); event2 = CreateKEvent(service_context, "IRequest:Event2");
}
event1.Initialize("IRequest:Event1"); ~IRequest() override {
event2.Initialize("IRequest:Event2"); service_context.CloseEvent(event1);
service_context.CloseEvent(event2);
} }
private: private:
@ -199,7 +212,7 @@ private:
IPC::ResponseBuilder rb{ctx, 2, 2}; IPC::ResponseBuilder rb{ctx, 2, 2};
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
rb.PushCopyObjects(event1.GetReadableEvent(), event2.GetReadableEvent()); rb.PushCopyObjects(event1->GetReadableEvent(), event2->GetReadableEvent());
} }
void Cancel(Kernel::HLERequestContext& ctx) { void Cancel(Kernel::HLERequestContext& ctx) {
@ -230,7 +243,10 @@ private:
rb.Push<u32>(0); rb.Push<u32>(0);
} }
Kernel::KEvent event1, event2; KernelHelpers::ServiceContext service_context;
Kernel::KEvent* event1;
Kernel::KEvent* event2;
}; };
class INetworkProfile final : public ServiceFramework<INetworkProfile> { class INetworkProfile final : public ServiceFramework<INetworkProfile> {

25
src/core/hle/service/nim/nim.cpp
View file

@ -7,9 +7,8 @@
#include "core/core.h" #include "core/core.h"
#include "core/hle/ipc_helpers.h" #include "core/hle/ipc_helpers.h"
#include "core/hle/kernel/k_event.h" #include "core/hle/kernel/k_event.h"
#include "core/hle/kernel/k_readable_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/kernel_helpers.h"
#include "core/hle/service/nim/nim.h" #include "core/hle/service/nim/nim.h"
#include "core/hle/service/service.h" #include "core/hle/service/service.h"
#include "core/hle/service/sm/sm.h" #include "core/hle/service/sm/sm.h"
@ -301,7 +300,7 @@ class IEnsureNetworkClockAvailabilityService final
public: public:
explicit IEnsureNetworkClockAvailabilityService(Core::System& system_) explicit IEnsureNetworkClockAvailabilityService(Core::System& system_)
: ServiceFramework{system_, "IEnsureNetworkClockAvailabilityService"}, : ServiceFramework{system_, "IEnsureNetworkClockAvailabilityService"},
finished_event{system.Kernel()} { service_context{system_, "IEnsureNetworkClockAvailabilityService"} {
static const FunctionInfo functions[] = { static const FunctionInfo functions[] = {
{0, &IEnsureNetworkClockAvailabilityService::StartTask, "StartTask"}, {0, &IEnsureNetworkClockAvailabilityService::StartTask, "StartTask"},
{1, &IEnsureNetworkClockAvailabilityService::GetFinishNotificationEvent, {1, &IEnsureNetworkClockAvailabilityService::GetFinishNotificationEvent,
@ -313,17 +312,19 @@ public:
}; };
RegisterHandlers(functions); RegisterHandlers(functions);
Kernel::KAutoObject::Create(std::addressof(finished_event)); finished_event =
finished_event.Initialize("IEnsureNetworkClockAvailabilityService:FinishEvent"); service_context.CreateEvent("IEnsureNetworkClockAvailabilityService:FinishEvent");
}
~IEnsureNetworkClockAvailabilityService() override {
service_context.CloseEvent(finished_event);
} }
private: private:
Kernel::KEvent finished_event;
void StartTask(Kernel::HLERequestContext& ctx) { void StartTask(Kernel::HLERequestContext& ctx) {
// No need to connect to the internet, just finish the task straight away. // No need to connect to the internet, just finish the task straight away.
LOG_DEBUG(Service_NIM, "called"); LOG_DEBUG(Service_NIM, "called");
finished_event.GetWritableEvent().Signal(); finished_event->GetWritableEvent().Signal();
IPC::ResponseBuilder rb{ctx, 2}; IPC::ResponseBuilder rb{ctx, 2};
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
} }
@ -333,7 +334,7 @@ private:
IPC::ResponseBuilder rb{ctx, 2, 1}; IPC::ResponseBuilder rb{ctx, 2, 1};
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
rb.PushCopyObjects(finished_event.GetReadableEvent()); rb.PushCopyObjects(finished_event->GetReadableEvent());
} }
void GetResult(Kernel::HLERequestContext& ctx) { void GetResult(Kernel::HLERequestContext& ctx) {
@ -345,7 +346,7 @@ private:
void Cancel(Kernel::HLERequestContext& ctx) { void Cancel(Kernel::HLERequestContext& ctx) {
LOG_DEBUG(Service_NIM, "called"); LOG_DEBUG(Service_NIM, "called");
finished_event.GetWritableEvent().Clear(); finished_event->GetWritableEvent().Clear();
IPC::ResponseBuilder rb{ctx, 2}; IPC::ResponseBuilder rb{ctx, 2};
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
} }
@ -368,6 +369,10 @@ private:
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
rb.PushRaw<s64>(server_time); rb.PushRaw<s64>(server_time);
} }
KernelHelpers::ServiceContext service_context;
Kernel::KEvent* finished_event;
}; };
class NTC final : public ServiceFramework<NTC> { class NTC final : public ServiceFramework<NTC> {

24
src/core/hle/service/ptm/psm.cpp
View file

@ -8,9 +8,8 @@
#include "core/core.h" #include "core/core.h"
#include "core/hle/ipc_helpers.h" #include "core/hle/ipc_helpers.h"
#include "core/hle/kernel/k_event.h" #include "core/hle/kernel/k_event.h"
#include "core/hle/kernel/k_readable_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/kernel_helpers.h"
#include "core/hle/service/ptm/psm.h" #include "core/hle/service/ptm/psm.h"
#include "core/hle/service/service.h" #include "core/hle/service/service.h"
#include "core/hle/service/sm/sm.h" #include "core/hle/service/sm/sm.h"
@ -20,7 +19,7 @@ namespace Service::PSM {
class IPsmSession final : public ServiceFramework<IPsmSession> { class IPsmSession final : public ServiceFramework<IPsmSession> {
public: public:
explicit IPsmSession(Core::System& system_) explicit IPsmSession(Core::System& system_)
: ServiceFramework{system_, "IPsmSession"}, state_change_event{system.Kernel()} { : ServiceFramework{system_, "IPsmSession"}, service_context{system_, "IPsmSession"} {
// clang-format off // clang-format off
static const FunctionInfo functions[] = { static const FunctionInfo functions[] = {
{0, &IPsmSession::BindStateChangeEvent, "BindStateChangeEvent"}, {0, &IPsmSession::BindStateChangeEvent, "BindStateChangeEvent"},
@ -33,27 +32,28 @@ public:
RegisterHandlers(functions); RegisterHandlers(functions);
Kernel::KAutoObject::Create(std::addressof(state_change_event)); state_change_event = service_context.CreateEvent("IPsmSession::state_change_event");
state_change_event.Initialize("IPsmSession::state_change_event");
} }
~IPsmSession() override = default; ~IPsmSession() override {
service_context.CloseEvent(state_change_event);
}
void SignalChargerTypeChanged() { void SignalChargerTypeChanged() {
if (should_signal && should_signal_charger_type) { if (should_signal && should_signal_charger_type) {
state_change_event.GetWritableEvent().Signal(); state_change_event->GetWritableEvent().Signal();
} }
} }
void SignalPowerSupplyChanged() { void SignalPowerSupplyChanged() {
if (should_signal && should_signal_power_supply) { if (should_signal && should_signal_power_supply) {
state_change_event.GetWritableEvent().Signal(); state_change_event->GetWritableEvent().Signal();
} }
} }
void SignalBatteryVoltageStateChanged() { void SignalBatteryVoltageStateChanged() {
if (should_signal && should_signal_battery_voltage) { if (should_signal && should_signal_battery_voltage) {
state_change_event.GetWritableEvent().Signal(); state_change_event->GetWritableEvent().Signal();
} }
} }
@ -65,7 +65,7 @@ private:
IPC::ResponseBuilder rb{ctx, 2, 1}; IPC::ResponseBuilder rb{ctx, 2, 1};
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
rb.PushCopyObjects(state_change_event.GetReadableEvent()); rb.PushCopyObjects(state_change_event->GetReadableEvent());
} }
void UnbindStateChangeEvent(Kernel::HLERequestContext& ctx) { void UnbindStateChangeEvent(Kernel::HLERequestContext& ctx) {
@ -110,11 +110,13 @@ private:
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
} }
KernelHelpers::ServiceContext service_context;
bool should_signal_charger_type{}; bool should_signal_charger_type{};
bool should_signal_power_supply{}; bool should_signal_power_supply{};
bool should_signal_battery_voltage{}; bool should_signal_battery_voltage{};
bool should_signal{}; bool should_signal{};
Kernel::KEvent state_change_event; Kernel::KEvent* state_change_event;
}; };
class PSM final : public ServiceFramework<PSM> { class PSM final : public ServiceFramework<PSM> {

14
src/core/hle/service/time/standard_user_system_clock_core.cpp
View file

@ -4,6 +4,7 @@
#include "common/assert.h" #include "common/assert.h"
#include "core/core.h" #include "core/core.h"
#include "core/hle/kernel/k_event.h"
#include "core/hle/service/time/standard_local_system_clock_core.h" #include "core/hle/service/time/standard_local_system_clock_core.h"
#include "core/hle/service/time/standard_network_system_clock_core.h" #include "core/hle/service/time/standard_network_system_clock_core.h"
#include "core/hle/service/time/standard_user_system_clock_core.h" #include "core/hle/service/time/standard_user_system_clock_core.h"
@ -16,10 +17,15 @@ StandardUserSystemClockCore::StandardUserSystemClockCore(
: SystemClockCore(local_system_clock_core_.GetSteadyClockCore()), : SystemClockCore(local_system_clock_core_.GetSteadyClockCore()),
local_system_clock_core{local_system_clock_core_}, local_system_clock_core{local_system_clock_core_},
network_system_clock_core{network_system_clock_core_}, network_system_clock_core{network_system_clock_core_},
auto_correction_time{SteadyClockTimePoint::GetRandom()}, auto_correction_event{ auto_correction_time{SteadyClockTimePoint::GetRandom()}, service_context{
system_.Kernel()} { system_,
Kernel::KAutoObject::Create(std::addressof(auto_correction_event)); "StandardUserSystemClockCore"} {
auto_correction_event.Initialize("StandardUserSystemClockCore:AutoCorrectionEvent"); auto_correction_event =
service_context.CreateEvent("StandardUserSystemClockCore:AutoCorrectionEvent");
}
StandardUserSystemClockCore::~StandardUserSystemClockCore() {
service_context.CloseEvent(auto_correction_event);
} }
ResultCode StandardUserSystemClockCore::SetAutomaticCorrectionEnabled(Core::System& system, ResultCode StandardUserSystemClockCore::SetAutomaticCorrectionEnabled(Core::System& system,

7
src/core/hle/service/time/standard_user_system_clock_core.h
View file

@ -4,7 +4,7 @@
#pragma once #pragma once
#include "core/hle/kernel/k_event.h" #include "core/hle/service/kernel_helpers.h"
#include "core/hle/service/time/clock_types.h" #include "core/hle/service/time/clock_types.h"
#include "core/hle/service/time/system_clock_core.h" #include "core/hle/service/time/system_clock_core.h"
@ -27,6 +27,8 @@ public:
StandardNetworkSystemClockCore& network_system_clock_core_, StandardNetworkSystemClockCore& network_system_clock_core_,
Core::System& system_); Core::System& system_);
~StandardUserSystemClockCore() override;
ResultCode SetAutomaticCorrectionEnabled(Core::System& system, bool value); ResultCode SetAutomaticCorrectionEnabled(Core::System& system, bool value);
ResultCode GetClockContext(Core::System& system, SystemClockContext& ctx) const override; ResultCode GetClockContext(Core::System& system, SystemClockContext& ctx) const override;
@ -55,7 +57,8 @@ private:
StandardNetworkSystemClockCore& network_system_clock_core; StandardNetworkSystemClockCore& network_system_clock_core;
bool auto_correction_enabled{}; bool auto_correction_enabled{};
SteadyClockTimePoint auto_correction_time; SteadyClockTimePoint auto_correction_time;
Kernel::KEvent auto_correction_event; KernelHelpers::ServiceContext service_context;
Kernel::KEvent* auto_correction_event;
}; };
} // namespace Service::Time::Clock } // namespace Service::Time::Clock