From 868937083097ad5ea2ce5c2b209762064b9c9381 Mon Sep 17 00:00:00 2001 From: Liam Date: Wed, 21 Feb 2024 18:19:48 -0500 Subject: olsc: rewrite INativeHandleHolder --- src/core/hle/service/olsc/native_handle_holder.cpp | 9 ++++++++- src/core/hle/service/olsc/native_handle_holder.h | 8 ++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/core/hle/service/olsc/native_handle_holder.cpp b/src/core/hle/service/olsc/native_handle_holder.cpp index ac5af5497..3cb5d7b11 100644 --- a/src/core/hle/service/olsc/native_handle_holder.cpp +++ b/src/core/hle/service/olsc/native_handle_holder.cpp @@ -1,6 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "core/hle/service/cmif_serialization.h" #include "core/hle/service/olsc/native_handle_holder.h" namespace Service::OLSC { @@ -9,7 +10,7 @@ INativeHandleHolder::INativeHandleHolder(Core::System& system_) : ServiceFramework{system_, "INativeHandleHolder"} { // clang-format off static const FunctionInfo functions[] = { - {0, nullptr, "GetNativeHandle"}, + {0, D<&INativeHandleHolder::GetNativeHandle>, "GetNativeHandle"}, }; // clang-format on @@ -18,4 +19,10 @@ INativeHandleHolder::INativeHandleHolder(Core::System& system_) INativeHandleHolder::~INativeHandleHolder() = default; +Result INativeHandleHolder::GetNativeHandle(OutCopyHandle out_event) { + LOG_WARNING(Service_OLSC, "(STUBBED) called"); + *out_event = nullptr; + R_SUCCEED(); +} + } // namespace Service::OLSC diff --git a/src/core/hle/service/olsc/native_handle_holder.h b/src/core/hle/service/olsc/native_handle_holder.h index bb8973a1d..a44754c20 100644 --- a/src/core/hle/service/olsc/native_handle_holder.h +++ b/src/core/hle/service/olsc/native_handle_holder.h @@ -1,14 +1,22 @@ // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "core/hle/service/cmif_types.h" #include "core/hle/service/service.h" +namespace Kernel { +class KReadableEvent; +} + namespace Service::OLSC { class INativeHandleHolder final : public ServiceFramework { public: explicit INativeHandleHolder(Core::System& system_); ~INativeHandleHolder() override; + +private: + Result GetNativeHandle(OutCopyHandle out_event); }; } // namespace Service::OLSC -- cgit v1.2.3