diff options
author | bunnei <ericbunnie@gmail.com> | 2014-05-27 03:57:10 +0200 |
---|---|---|
committer | bunnei <ericbunnie@gmail.com> | 2014-05-27 03:57:10 +0200 |
commit | 6e51c56fe41c3ff38db3a13e8773a9e9b2103377 (patch) | |
tree | 080a62d3b66b07d4544ffbffc70ec9915e69dde7 | |
parent | service: Renamed Sync to SyncRequest (diff) | |
download | yuzu-6e51c56fe41c3ff38db3a13e8773a9e9b2103377.tar yuzu-6e51c56fe41c3ff38db3a13e8773a9e9b2103377.tar.gz yuzu-6e51c56fe41c3ff38db3a13e8773a9e9b2103377.tar.bz2 yuzu-6e51c56fe41c3ff38db3a13e8773a9e9b2103377.tar.lz yuzu-6e51c56fe41c3ff38db3a13e8773a9e9b2103377.tar.xz yuzu-6e51c56fe41c3ff38db3a13e8773a9e9b2103377.tar.zst yuzu-6e51c56fe41c3ff38db3a13e8773a9e9b2103377.zip |
-rw-r--r-- | src/core/hle/svc.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp index ac016a966..6f72a6eb7 100644 --- a/src/core/hle/svc.cpp +++ b/src/core/hle/svc.cpp @@ -84,19 +84,17 @@ Result MapMemoryBlock(Handle memblock, u32 addr, u32 mypermissions, u32 otherper /// Connect to an OS service given the port name, returns the handle to the port to out Result ConnectToPort(void* out, const char* port_name) { Service::Interface* service = Service::g_manager->FetchFromPortName(port_name); - if (service) { - Core::g_app_core->SetReg(1, service->GetHandle()); - } else { - PanicYesNo("ConnectToPort called port_name=%s, but it is not implemented!", port_name); - } DEBUG_LOG(SVC, "ConnectToPort called port_name=%s", port_name); + _assert_msg_(KERNEL, service, "ConnectToPort called, but service is not implemented!"); + Core::g_app_core->SetReg(1, service->GetHandle()); return 0; } /// Synchronize to an OS service Result SendSyncRequest(Handle handle) { - DEBUG_LOG(SVC, "SendSyncRequest called handle=0x%08X"); Kernel::Object* object = Kernel::g_object_pool.GetFast<Kernel::Object>(handle); + DEBUG_LOG(SVC, "SendSyncRequest called handle=0x%08X"); + _assert_msg_(KERNEL, object, "SendSyncRequest called, but kernel object is NULL!"); object->SyncRequest(); return 0; } |