Mirrors/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

hle: kernel: Refactor IPC interfaces to not use std::shared_ptr.

Browse source
This commit is contained in:
bunnei 2021-04-03 21:21:22 -07:00
parent da7e9553de
commit 5e5933256b
28 changed files with 65 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -588,12 +588,11 @@ AppletMessageQueue::AppletMessageQueue(Kernel::KernelCore& kernel) {
AppletMessageQueue::~AppletMessageQueue() = default;
const std::shared_ptr<Kernel::KReadableEvent>& AppletMessageQueue::GetMessageReceiveEvent() const {
Kernel::KReadableEvent* AppletMessageQueue::GetMessageReceiveEvent() const {
return on_new_message->GetReadableEvent();
}
const std::shared_ptr<Kernel::KReadableEvent>& AppletMessageQueue::GetOperationModeChangedEvent()
const {
Kernel::KReadableEvent* AppletMessageQueue::GetOperationModeChangedEvent() const {
return on_operation_mode_changed->GetReadableEvent();
}

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

@ -56,8 +56,8 @@ public:
explicit AppletMessageQueue(Kernel::KernelCore& kernel);
~AppletMessageQueue();
const std::shared_ptr<Kernel::KReadableEvent>& GetMessageReceiveEvent() const;
const std::shared_ptr<Kernel::KReadableEvent>& GetOperationModeChangedEvent() const;
Kernel::KReadableEvent* GetMessageReceiveEvent() const;
Kernel::KReadableEvent* GetOperationModeChangedEvent() const;
void PushMessage(AppletMessage msg);
AppletMessage PopMessage();
std::size_t GetMessageCount() const;

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

@ -142,15 +142,15 @@ void AppletDataBroker::SignalStateChanged() const {
}
}
std::shared_ptr<Kernel::KReadableEvent> AppletDataBroker::GetNormalDataEvent() const {
Kernel::KReadableEvent* AppletDataBroker::GetNormalDataEvent() const {
return pop_out_data_event->GetReadableEvent();
}
std::shared_ptr<Kernel::KReadableEvent> AppletDataBroker::GetInteractiveDataEvent() const {
Kernel::KReadableEvent* AppletDataBroker::GetInteractiveDataEvent() const {
return pop_interactive_out_data_event->GetReadableEvent();
}
std::shared_ptr<Kernel::KReadableEvent> AppletDataBroker::GetStateChangedEvent() const {
Kernel::KReadableEvent* AppletDataBroker::GetStateChangedEvent() const {
return state_changed_event->GetReadableEvent();
}

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

@ -97,9 +97,9 @@ public:
void SignalStateChanged() const;
std::shared_ptr<Kernel::KReadableEvent> GetNormalDataEvent() const;
std::shared_ptr<Kernel::KReadableEvent> GetInteractiveDataEvent() const;
std::shared_ptr<Kernel::KReadableEvent> GetStateChangedEvent() const;
Kernel::KReadableEvent* GetNormalDataEvent() const;
Kernel::KReadableEvent* GetInteractiveDataEvent() const;
Kernel::KReadableEvent* GetStateChangedEvent() const;
private:
Core::System& system;

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

@ -21,7 +21,7 @@ ProgressServiceBackend::ProgressServiceBackend(Kernel::KernelCore& kernel,
}
std::shared_ptr<Kernel::KReadableEvent> ProgressServiceBackend::GetEvent() const {
return event->GetReadableEvent();
return SharedFrom(event->GetReadableEvent());
}
DeliveryCacheProgressImpl& ProgressServiceBackend::GetImpl() {

2
src/core/hle/service/bcat/module.cpp
View file

@ -109,7 +109,7 @@ private:
IPC::ResponseBuilder rb{ctx, 2, 1};
rb.Push(RESULT_SUCCESS);
rb.PushCopyObjects(event);
rb.PushCopyObjects(event.get());
}
void GetImpl(Kernel::HLERequestContext& ctx) {

3
src/core/hle/service/hid/controllers/npad.cpp
View file

@ -955,8 +955,7 @@ bool Controller_NPad::IsVibrationDeviceMounted(const DeviceHandle& vibration_dev
return vibration_devices_mounted[npad_index][device_index];
}
std::shared_ptr<Kernel::KReadableEvent> Controller_NPad::GetStyleSetChangedEvent(
u32 npad_id) const {
Kernel::KReadableEvent* Controller_NPad::GetStyleSetChangedEvent(u32 npad_id) const {
const auto& styleset_event = styleset_changed_events[NPadIdToIndex(npad_id)];
return styleset_event->GetReadableEvent();
}

2
src/core/hle/service/hid/controllers/npad.h
View file

@ -199,7 +199,7 @@ public:
bool IsVibrationDeviceMounted(const DeviceHandle& vibration_device_handle) const;
std::shared_ptr<Kernel::KReadableEvent> GetStyleSetChangedEvent(u32 npad_id) const;
Kernel::KReadableEvent* GetStyleSetChangedEvent(u32 npad_id) const;
void SignalStyleSetChangedEvent(u32 npad_id) const;
// Adds a new controller at an index.

2
src/core/hle/service/hid/hid.cpp
View file

@ -118,7 +118,7 @@ void IAppletResource::GetSharedMemoryHandle(Kernel::HLERequestContext& ctx) {
IPC::ResponseBuilder rb{ctx, 2, 1};
rb.Push(RESULT_SUCCESS);
rb.PushCopyObjects(shared_mem);
rb.PushCopyObjects(shared_mem.get());
}
void IAppletResource::UpdateControllers(std::uintptr_t user_data,

2
src/core/hle/service/hid/irs.cpp
View file

@ -62,7 +62,7 @@ void IRS::GetIrsensorSharedMemoryHandle(Kernel::HLERequestContext& ctx) {
IPC::ResponseBuilder rb{ctx, 2, 1};
rb.Push(RESULT_SUCCESS);
rb.PushCopyObjects(shared_mem);
rb.PushCopyObjects(shared_mem.get());
}
void IRS::StopImageProcessor(Kernel::HLERequestContext& ctx) {

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

@ -343,7 +343,7 @@ bool Module::Interface::LoadAmiibo(const std::vector<u8>& buffer) {
return true;
}
const std::shared_ptr<Kernel::KReadableEvent>& Module::Interface::GetNFCEvent() const {
Kernel::KReadableEvent* Module::Interface::GetNFCEvent() const {
return nfc_tag_load->GetReadableEvent();
}

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

@ -38,7 +38,7 @@ public:
void CreateUserInterface(Kernel::HLERequestContext& ctx);
bool LoadAmiibo(const std::vector<u8>& buffer);
const std::shared_ptr<Kernel::KReadableEvent>& GetNFCEvent() const;
Kernel::KReadableEvent* GetNFCEvent() const;
const AmiiboFile& GetAmiiboBuffer() const;
private:

2
src/core/hle/service/ns/pl_u.cpp
View file

@ -267,7 +267,7 @@ void PL_U::GetSharedMemoryNativeHandle(Kernel::HLERequestContext& ctx) {
IPC::ResponseBuilder rb{ctx, 2, 1};
rb.Push(RESULT_SUCCESS);
rb.PushCopyObjects(impl->shared_font_mem);
rb.PushCopyObjects(impl->shared_font_mem.get());
}
void PL_U::GetSharedFontInOrderOfPriority(Kernel::HLERequestContext& ctx) {

2
src/core/hle/service/nvdrv/interface.cpp
View file

@ -189,7 +189,7 @@ void NVDRV::QueryEvent(Kernel::HLERequestContext& ctx) {
rb.Push(RESULT_SUCCESS);
auto event = nvdrv->GetEvent(event_id);
event->Clear();
rb.PushCopyObjects(event);
rb.PushCopyObjects(event.get());
rb.PushEnum(NvResult::Success);
} else {
IPC::ResponseBuilder rb{ctx, 3};

2
src/core/hle/service/nvdrv/nvdrv.cpp
View file

@ -178,7 +178,7 @@ void Module::SignalSyncpt(const u32 syncpoint_id, const u32 value) {
}
std::shared_ptr<Kernel::KReadableEvent> Module::GetEvent(const u32 event_id) const {
return events_interface.events[event_id].event->GetReadableEvent();
return SharedFrom(events_interface.events[event_id].event->GetReadableEvent());
}
std::shared_ptr<Kernel::KWritableEvent> Module::GetEventWriteable(const u32 event_id) const {

2
src/core/hle/service/nvflinger/buffer_queue.cpp
View file

@ -194,7 +194,7 @@ std::shared_ptr<Kernel::KWritableEvent> BufferQueue::GetWritableBufferWaitEvent(
}
std::shared_ptr<Kernel::KReadableEvent> BufferQueue::GetBufferWaitEvent() const {
return buffer_wait_event->GetReadableEvent();
return SharedFrom(buffer_wait_event->GetReadableEvent());
}
} // namespace Service::NVFlinger

1
src/core/hle/service/nvflinger/buffer_queue.h
View file

@ -13,6 +13,7 @@
#include "common/common_funcs.h"
#include "common/math_util.h"
#include "common/swap.h"
#include "core/hle/kernel/k_readable_event.h"
#include "core/hle/kernel/object.h"
#include "core/hle/service/nvdrv/nvdata.h"

2
src/core/hle/service/sm/controller.cpp
View file

@ -30,7 +30,7 @@ void Controller::CloneCurrentObject(Kernel::HLERequestContext& ctx) {
IPC::ResponseBuilder rb{ctx, 2, 0, 1, IPC::ResponseBuilder::Flags::AlwaysMoveHandles};
rb.Push(RESULT_SUCCESS);
rb.PushMoveObjects(ctx.Session()->GetParent()->Client());
rb.PushMoveObjects(ctx.Session()->GetParent()->Client().get());
}
void Controller::CloneCurrentObjectEx(Kernel::HLERequestContext& ctx) {

8
src/core/hle/service/sm/sm.cpp
View file

@ -134,7 +134,7 @@ void SM::GetService(Kernel::HLERequestContext& ctx) {
const auto& server_port = client_port.Unwrap()->GetServerPort();
if (server_port->GetHLEHandler()) {
server_port->GetHLEHandler()->ClientConnected(server);
server_port->GetHLEHandler()->ClientConnected(client, server);
} else {
server_port->AppendPendingSession(server);
}
@ -142,7 +142,7 @@ void SM::GetService(Kernel::HLERequestContext& ctx) {
LOG_DEBUG(Service_SM, "called service={} -> session={}", name, client->GetObjectId());
IPC::ResponseBuilder rb{ctx, 2, 0, 1, IPC::ResponseBuilder::Flags::AlwaysMoveHandles};
rb.Push(RESULT_SUCCESS);
rb.PushMoveObjects(std::move(client));
rb.PushMoveObjects(client.get());
}
void SM::RegisterService(Kernel::HLERequestContext& ctx) {
@ -170,7 +170,9 @@ void SM::RegisterService(Kernel::HLERequestContext& ctx) {
IPC::ResponseBuilder rb{ctx, 2, 0, 1, IPC::ResponseBuilder::Flags::AlwaysMoveHandles};
rb.Push(handle.Code());
rb.PushMoveObjects(std::move(handle).Unwrap());
auto server_port = handle.Unwrap();
rb.PushMoveObjects(server_port.get());
}
void SM::UnregisterService(Kernel::HLERequestContext& ctx) {

2
src/core/hle/service/time/time.cpp
View file

@ -393,7 +393,7 @@ void Module::Interface::GetSharedMemoryNativeHandle(Kernel::HLERequestContext& c
LOG_DEBUG(Service_Time, "called");
IPC::ResponseBuilder rb{ctx, 2, 1};
rb.Push(RESULT_SUCCESS);
rb.PushCopyObjects(SharedFrom(&system.Kernel().GetTimeSharedMem()));
rb.PushCopyObjects(&system.Kernel().GetTimeSharedMem());
}
Module::Interface::Interface(std::shared_ptr<Module> module_, Core::System& system_,

2
src/core/hle/service/vi/display/vi_display.cpp
View file

@ -34,7 +34,7 @@ const Layer& Display::GetLayer(std::size_t index) const {
}
std::shared_ptr<Kernel::KReadableEvent> Display::GetVSyncEvent() const {
return vsync_event->GetReadableEvent();
return SharedFrom(vsync_event->GetReadableEvent());
}
void Display::SignalVSyncEvent() {

4
src/core/hle/service/vi/vi.cpp
View file

@ -674,7 +674,7 @@ private:
// TODO(Subv): Find out what this actually is.
IPC::ResponseBuilder rb{ctx, 2, 1};
rb.Push(RESULT_SUCCESS);
rb.PushCopyObjects(buffer_queue.GetBufferWaitEvent());
rb.PushCopyObjects(buffer_queue.GetBufferWaitEvent().get());
}
NVFlinger::NVFlinger& nv_flinger;
@ -1209,7 +1209,7 @@ private:
IPC::ResponseBuilder rb{ctx, 2, 1};
rb.Push(RESULT_SUCCESS);
rb.PushCopyObjects(vsync_event);
rb.PushCopyObjects(vsync_event.get());
}
void ConvertScalingMode(Kernel::HLERequestContext& ctx) {