aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/hle/kernel/address_arbiter.cpp
diff options
context:
space:
mode:
authorGravatar bunnei <bunneidev@gmail.com>2015-01-14 23:41:33 -0500
committerGravatar bunnei <bunneidev@gmail.com>2015-01-21 18:42:04 -0500
commit1f7a04f05a488b7d457d356f9bf2dda296cd6b92 (patch)
treeab6bffea6b9f85039af93f4f809c4d657f192d8f /src/core/hle/kernel/address_arbiter.cpp
parent14cbbf4d9b8e07f9f2d679bcf66c2180463ae57c (diff)
Thread: Keep track of multiple wait objects.
Diffstat (limited to 'src/core/hle/kernel/address_arbiter.cpp')
-rw-r--r--src/core/hle/kernel/address_arbiter.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/hle/kernel/address_arbiter.cpp b/src/core/hle/kernel/address_arbiter.cpp
index b7434aaf..ff147206 100644
--- a/src/core/hle/kernel/address_arbiter.cpp
+++ b/src/core/hle/kernel/address_arbiter.cpp
@@ -15,7 +15,7 @@
namespace Kernel {
-class AddressArbiter : public Object {
+class AddressArbiter : public WaitObject {
public:
std::string GetTypeName() const override { return "Arbiter"; }
std::string GetName() const override { return name; }
@@ -30,7 +30,8 @@ public:
/// Arbitrate an address
ResultCode ArbitrateAddress(Handle handle, ArbitrationType type, u32 address, s32 value, u64 nanoseconds) {
- Object* object = Kernel::g_handle_table.GetGeneric(handle).get();
+ WaitObject* object = static_cast<WaitObject*>(Kernel::g_handle_table.GetGeneric(handle).get());
+
if (object == nullptr)
return InvalidHandle(ErrorModule::Kernel);