From 38e7122f23424d40e0555fa40daeff55e23e4da4 Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Sun, 11 Jan 2015 14:46:49 -0200 Subject: Kernel: Convert AddressArbiter to not use Handles --- src/core/hle/svc.cpp | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) (limited to 'src/core/hle/svc.cpp') diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp index 6cbe38bc..b093d036 100644 --- a/src/core/hle/svc.cpp +++ b/src/core/hle/svc.cpp @@ -247,16 +247,34 @@ static Result WaitSynchronizationN(s32* out, Handle* handles, s32 handle_count, /// Create an address arbiter (to allocate access to shared resources) static Result CreateAddressArbiter(u32* arbiter) { - Handle handle = Kernel::CreateAddressArbiter(); - *arbiter = handle; - return 0; + using Kernel::AddressArbiter; + + ResultVal> arbiter_res = AddressArbiter::Create(); + if (arbiter_res.Failed()) + return arbiter_res.Code().raw; + + ResultVal handle_res = Kernel::g_handle_table.Create(*arbiter_res); + if (handle_res.Failed()) + return handle_res.Code().raw; + + LOG_TRACE(Kernel_SVC, "returned handle=0x%08X", *handle_res); + + *arbiter = *handle_res; + return RESULT_SUCCESS.raw; } /// Arbitrate address -static Result ArbitrateAddress(Handle arbiter, u32 address, u32 type, u32 value, s64 nanoseconds) { - LOG_TRACE(Kernel_SVC, "called handle=0x%08X, address=0x%08X, type=0x%08X, value=0x%08X", arbiter, +static Result ArbitrateAddress(Handle handle, u32 address, u32 type, u32 value, s64 nanoseconds) { + using Kernel::AddressArbiter; + + LOG_TRACE(Kernel_SVC, "called handle=0x%08X, address=0x%08X, type=0x%08X, value=0x%08X", handle, address, type, value); - return Kernel::ArbitrateAddress(arbiter, static_cast(type), + + SharedPtr arbiter = Kernel::g_handle_table.Get(handle); + if (arbiter == nullptr) + return InvalidHandle(ErrorModule::Kernel).raw; + + return arbiter->ArbitrateAddress(static_cast(type), address, value, nanoseconds).raw; } -- cgit v1.2.3