diff options
| author | 2024-02-21 22:25:31 -0500 | |
|---|---|---|
| committer | 2024-02-21 22:54:05 -0500 | |
| commit | e85466c1ae5c993617920f28e9ee1799591d4a9a (patch) | |
| tree | 06e0610553d633da38488813ee3bf33987cf4bf3 /src/core/hle/service/psc | |
| parent | psc: rewrite IPmService (diff) | |
| download | yuzu-e85466c1ae5c993617920f28e9ee1799591d4a9a.tar.gz yuzu-e85466c1ae5c993617920f28e9ee1799591d4a9a.tar.xz yuzu-e85466c1ae5c993617920f28e9ee1799591d4a9a.zip | |
psc: stub overlay notification channel
Diffstat (limited to 'src/core/hle/service/psc')
| -rw-r--r-- | src/core/hle/service/psc/ovln/ovln_types.h | 21 | ||||
| -rw-r--r-- | src/core/hle/service/psc/ovln/receiver.cpp | 24 | ||||
| -rw-r--r-- | src/core/hle/service/psc/ovln/receiver.h | 16 | ||||
| -rw-r--r-- | src/core/hle/service/psc/ovln/receiver_service.cpp | 28 | ||||
| -rw-r--r-- | src/core/hle/service/psc/ovln/receiver_service.h | 22 | ||||
| -rw-r--r-- | src/core/hle/service/psc/ovln/sender.cpp | 32 | ||||
| -rw-r--r-- | src/core/hle/service/psc/ovln/sender.h | 21 | ||||
| -rw-r--r-- | src/core/hle/service/psc/ovln/sender_service.cpp | 30 | ||||
| -rw-r--r-- | src/core/hle/service/psc/ovln/sender_service.h | 23 | ||||
| -rw-r--r-- | src/core/hle/service/psc/psc.cpp | 4 |
10 files changed, 221 insertions, 0 deletions
diff --git a/src/core/hle/service/psc/ovln/ovln_types.h b/src/core/hle/service/psc/ovln/ovln_types.h new file mode 100644 index 000000000..343b05dcc --- /dev/null +++ b/src/core/hle/service/psc/ovln/ovln_types.h | |||
| @@ -0,0 +1,21 @@ | |||
| 1 | // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project | ||
| 2 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
| 3 | |||
| 4 | #pragma once | ||
| 5 | |||
| 6 | #include "common/bit_field.h" | ||
| 7 | #include "common/common_types.h" | ||
| 8 | |||
| 9 | namespace Service::PSC { | ||
| 10 | |||
| 11 | using OverlayNotification = std::array<u64, 0x10>; | ||
| 12 | static_assert(sizeof(OverlayNotification) == 0x80, "OverlayNotification has incorrect size"); | ||
| 13 | |||
| 14 | union MessageFlags { | ||
| 15 | u64 raw; | ||
| 16 | BitField<0, 8, u64> message_type; | ||
| 17 | BitField<8, 8, u64> queue_type; | ||
| 18 | }; | ||
| 19 | static_assert(sizeof(MessageFlags) == 0x8, "MessageFlags has incorrect size"); | ||
| 20 | |||
| 21 | } // namespace Service::PSC | ||
diff --git a/src/core/hle/service/psc/ovln/receiver.cpp b/src/core/hle/service/psc/ovln/receiver.cpp new file mode 100644 index 000000000..85f62816d --- /dev/null +++ b/src/core/hle/service/psc/ovln/receiver.cpp | |||
| @@ -0,0 +1,24 @@ | |||
| 1 | // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project | ||
| 2 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
| 3 | |||
| 4 | #include "core/hle/service/psc/ovln/receiver.h" | ||
| 5 | |||
| 6 | namespace Service::PSC { | ||
| 7 | |||
| 8 | IReceiver::IReceiver(Core::System& system_) : ServiceFramework{system_, "IReceiver"} { | ||
| 9 | // clang-format off | ||
| 10 | static const FunctionInfo functions[] = { | ||
| 11 | {0, nullptr, "AddSource"}, | ||
| 12 | {1, nullptr, "RemoveSource"}, | ||
| 13 | {2, nullptr, "GetReceiveEventHandle"}, | ||
| 14 | {3, nullptr, "Receive"}, | ||
| 15 | {4, nullptr, "ReceiveWithTick"}, | ||
| 16 | }; | ||
| 17 | // clang-format on | ||
| 18 | |||
| 19 | RegisterHandlers(functions); | ||
| 20 | } | ||
| 21 | |||
| 22 | IReceiver::~IReceiver() = default; | ||
| 23 | |||
| 24 | } // namespace Service::PSC | ||
diff --git a/src/core/hle/service/psc/ovln/receiver.h b/src/core/hle/service/psc/ovln/receiver.h new file mode 100644 index 000000000..c47a4ff7e --- /dev/null +++ b/src/core/hle/service/psc/ovln/receiver.h | |||
| @@ -0,0 +1,16 @@ | |||
| 1 | // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project | ||
| 2 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
| 3 | |||
| 4 | #pragma once | ||
| 5 | |||
| 6 | #include "core/hle/service/service.h" | ||
| 7 | |||
| 8 | namespace Service::PSC { | ||
| 9 | |||
| 10 | class IReceiver final : public ServiceFramework<IReceiver> { | ||
| 11 | public: | ||
| 12 | explicit IReceiver(Core::System& system_); | ||
| 13 | ~IReceiver() override; | ||
| 14 | }; | ||
| 15 | |||
| 16 | } // namespace Service::PSC | ||
diff --git a/src/core/hle/service/psc/ovln/receiver_service.cpp b/src/core/hle/service/psc/ovln/receiver_service.cpp new file mode 100644 index 000000000..bb988e905 --- /dev/null +++ b/src/core/hle/service/psc/ovln/receiver_service.cpp | |||
| @@ -0,0 +1,28 @@ | |||
| 1 | // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project | ||
| 2 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
| 3 | |||
| 4 | #include "core/hle/service/cmif_serialization.h" | ||
| 5 | #include "core/hle/service/psc/ovln/receiver.h" | ||
| 6 | #include "core/hle/service/psc/ovln/receiver_service.h" | ||
| 7 | |||
| 8 | namespace Service::PSC { | ||
| 9 | |||
| 10 | IReceiverService::IReceiverService(Core::System& system_) : ServiceFramework{system_, "ovln:rcv"} { | ||
| 11 | // clang-format off | ||
| 12 | static const FunctionInfo functions[] = { | ||
| 13 | {0, D<&IReceiverService::OpenReceiver>, "OpenReceiver"}, | ||
| 14 | }; | ||
| 15 | // clang-format on | ||
| 16 | |||
| 17 | RegisterHandlers(functions); | ||
| 18 | } | ||
| 19 | |||
| 20 | IReceiverService::~IReceiverService() = default; | ||
| 21 | |||
| 22 | Result IReceiverService::OpenReceiver(Out<SharedPointer<IReceiver>> out_receiver) { | ||
| 23 | LOG_DEBUG(Service_PSC, "called"); | ||
| 24 | *out_receiver = std::make_shared<IReceiver>(system); | ||
| 25 | R_SUCCEED(); | ||
| 26 | } | ||
| 27 | |||
| 28 | } // namespace Service::PSC | ||
diff --git a/src/core/hle/service/psc/ovln/receiver_service.h b/src/core/hle/service/psc/ovln/receiver_service.h new file mode 100644 index 000000000..b3b31ba4a --- /dev/null +++ b/src/core/hle/service/psc/ovln/receiver_service.h | |||
| @@ -0,0 +1,22 @@ | |||
| 1 | // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project | ||
| 2 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
| 3 | |||
| 4 | #pragma once | ||
| 5 | |||
| 6 | #include "core/hle/service/cmif_types.h" | ||
| 7 | #include "core/hle/service/service.h" | ||
| 8 | |||
| 9 | namespace Service::PSC { | ||
| 10 | |||
| 11 | class IReceiver; | ||
| 12 | |||
| 13 | class IReceiverService final : public ServiceFramework<IReceiverService> { | ||
| 14 | public: | ||
| 15 | explicit IReceiverService(Core::System& system_); | ||
| 16 | ~IReceiverService() override; | ||
| 17 | |||
| 18 | private: | ||
| 19 | Result OpenReceiver(Out<SharedPointer<IReceiver>> out_receiver); | ||
| 20 | }; | ||
| 21 | |||
| 22 | } // namespace Service::PSC | ||
diff --git a/src/core/hle/service/psc/ovln/sender.cpp b/src/core/hle/service/psc/ovln/sender.cpp new file mode 100644 index 000000000..3227a56f2 --- /dev/null +++ b/src/core/hle/service/psc/ovln/sender.cpp | |||
| @@ -0,0 +1,32 @@ | |||
| 1 | // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project | ||
| 2 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
| 3 | |||
| 4 | #include "core/hle/service/cmif_serialization.h" | ||
| 5 | #include "core/hle/service/psc/ovln/sender.h" | ||
| 6 | |||
| 7 | namespace Service::PSC { | ||
| 8 | |||
| 9 | ISender::ISender(Core::System& system_) : ServiceFramework{system_, "ISender"} { | ||
| 10 | // clang-format off | ||
| 11 | static const FunctionInfo functions[] = { | ||
| 12 | {0, D<&ISender::Send>, "Send"}, | ||
| 13 | {1, nullptr, "GetUnreceivedMessageCount"}, | ||
| 14 | }; | ||
| 15 | // clang-format on | ||
| 16 | |||
| 17 | RegisterHandlers(functions); | ||
| 18 | } | ||
| 19 | |||
| 20 | ISender::~ISender() = default; | ||
| 21 | |||
| 22 | Result ISender::Send(const OverlayNotification& notification, MessageFlags flags) { | ||
| 23 | std::string data; | ||
| 24 | for (const auto m : notification) { | ||
| 25 | data += fmt::format("{:016X} ", m); | ||
| 26 | } | ||
| 27 | |||
| 28 | LOG_WARNING(Service_PSC, "(STUBBED) called, flags={} notification={}", flags.raw, data); | ||
| 29 | R_SUCCEED(); | ||
| 30 | } | ||
| 31 | |||
| 32 | } // namespace Service::PSC | ||
diff --git a/src/core/hle/service/psc/ovln/sender.h b/src/core/hle/service/psc/ovln/sender.h new file mode 100644 index 000000000..c1575428e --- /dev/null +++ b/src/core/hle/service/psc/ovln/sender.h | |||
| @@ -0,0 +1,21 @@ | |||
| 1 | // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project | ||
| 2 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
| 3 | |||
| 4 | #pragma once | ||
| 5 | |||
| 6 | #include "core/hle/service/cmif_types.h" | ||
| 7 | #include "core/hle/service/psc/ovln/ovln_types.h" | ||
| 8 | #include "core/hle/service/service.h" | ||
| 9 | |||
| 10 | namespace Service::PSC { | ||
| 11 | |||
| 12 | class ISender final : public ServiceFramework<ISender> { | ||
| 13 | public: | ||
| 14 | explicit ISender(Core::System& system_); | ||
| 15 | ~ISender() override; | ||
| 16 | |||
| 17 | private: | ||
| 18 | Result Send(const OverlayNotification& notification, MessageFlags flags); | ||
| 19 | }; | ||
| 20 | |||
| 21 | } // namespace Service::PSC | ||
diff --git a/src/core/hle/service/psc/ovln/sender_service.cpp b/src/core/hle/service/psc/ovln/sender_service.cpp new file mode 100644 index 000000000..18d2c83a3 --- /dev/null +++ b/src/core/hle/service/psc/ovln/sender_service.cpp | |||
| @@ -0,0 +1,30 @@ | |||
| 1 | // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project | ||
| 2 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
| 3 | |||
| 4 | #include "core/hle/service/cmif_serialization.h" | ||
| 5 | #include "core/hle/service/psc/ovln/sender.h" | ||
| 6 | #include "core/hle/service/psc/ovln/sender_service.h" | ||
| 7 | |||
| 8 | namespace Service::PSC { | ||
| 9 | |||
| 10 | ISenderService::ISenderService(Core::System& system_) : ServiceFramework{system_, "ovln:snd"} { | ||
| 11 | // clang-format off | ||
| 12 | static const FunctionInfo functions[] = { | ||
| 13 | {0, D<&ISenderService::OpenSender>, "OpenSender"}, | ||
| 14 | }; | ||
| 15 | // clang-format on | ||
| 16 | |||
| 17 | RegisterHandlers(functions); | ||
| 18 | } | ||
| 19 | |||
| 20 | ISenderService::~ISenderService() = default; | ||
| 21 | |||
| 22 | Result ISenderService::OpenSender(Out<SharedPointer<ISender>> out_sender, u32 sender_id, | ||
| 23 | std::array<u64, 2> data) { | ||
| 24 | LOG_WARNING(Service_PSC, "(STUBBED) called, sender_id={}, data={:016X} {:016X}", sender_id, | ||
| 25 | data[0], data[1]); | ||
| 26 | *out_sender = std::make_shared<ISender>(system); | ||
| 27 | R_SUCCEED(); | ||
| 28 | } | ||
| 29 | |||
| 30 | } // namespace Service::PSC | ||
diff --git a/src/core/hle/service/psc/ovln/sender_service.h b/src/core/hle/service/psc/ovln/sender_service.h new file mode 100644 index 000000000..10027701f --- /dev/null +++ b/src/core/hle/service/psc/ovln/sender_service.h | |||
| @@ -0,0 +1,23 @@ | |||
| 1 | // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project | ||
| 2 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
| 3 | |||
| 4 | #pragma once | ||
| 5 | |||
| 6 | #include "core/hle/service/cmif_types.h" | ||
| 7 | #include "core/hle/service/service.h" | ||
| 8 | |||
| 9 | namespace Service::PSC { | ||
| 10 | |||
| 11 | class ISender; | ||
| 12 | |||
| 13 | class ISenderService final : public ServiceFramework<ISenderService> { | ||
| 14 | public: | ||
| 15 | explicit ISenderService(Core::System& system_); | ||
| 16 | ~ISenderService() override; | ||
| 17 | |||
| 18 | private: | ||
| 19 | Result OpenSender(Out<SharedPointer<ISender>> out_sender, u32 sender_id, | ||
| 20 | std::array<u64, 2> data); | ||
| 21 | }; | ||
| 22 | |||
| 23 | } // namespace Service::PSC | ||
diff --git a/src/core/hle/service/psc/psc.cpp b/src/core/hle/service/psc/psc.cpp index a086c13ed..e1762d694 100644 --- a/src/core/hle/service/psc/psc.cpp +++ b/src/core/hle/service/psc/psc.cpp | |||
| @@ -1,6 +1,8 @@ | |||
| 1 | // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project | 1 | // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project |
| 2 | // SPDX-License-Identifier: GPL-2.0-or-later | 2 | // SPDX-License-Identifier: GPL-2.0-or-later |
| 3 | 3 | ||
| 4 | #include "core/hle/service/psc/ovln/receiver_service.h" | ||
| 5 | #include "core/hle/service/psc/ovln/sender_service.h" | ||
| 4 | #include "core/hle/service/psc/pm_control.h" | 6 | #include "core/hle/service/psc/pm_control.h" |
| 5 | #include "core/hle/service/psc/pm_service.h" | 7 | #include "core/hle/service/psc/pm_service.h" |
| 6 | #include "core/hle/service/psc/psc.h" | 8 | #include "core/hle/service/psc/psc.h" |
| @@ -17,6 +19,8 @@ void LoopProcess(Core::System& system) { | |||
| 17 | 19 | ||
| 18 | server_manager->RegisterNamedService("psc:c", std::make_shared<IPmControl>(system)); | 20 | server_manager->RegisterNamedService("psc:c", std::make_shared<IPmControl>(system)); |
| 19 | server_manager->RegisterNamedService("psc:m", std::make_shared<IPmService>(system)); | 21 | server_manager->RegisterNamedService("psc:m", std::make_shared<IPmService>(system)); |
| 22 | server_manager->RegisterNamedService("ovln:rcv", std::make_shared<IReceiverService>(system)); | ||
| 23 | server_manager->RegisterNamedService("ovln:snd", std::make_shared<ISenderService>(system)); | ||
| 20 | 24 | ||
| 21 | auto time = std::make_shared<Time::TimeManager>(system); | 25 | auto time = std::make_shared<Time::TimeManager>(system); |
| 22 | 26 | ||