diff options
author | bunnei <bunneidev@gmail.com> | 2014-11-24 21:31:53 +0100 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2014-11-24 21:31:53 +0100 |
commit | bb730855e58d18d8964d158a55822c40503d548f (patch) | |
tree | 9c3ff113839583d1deca837e9888d81f25d485a0 /src/core/hle/service/service.h | |
parent | Merge pull request #191 from archshift/deletexyz (diff) | |
parent | Use pointers instead of passing handles around in some functions. (diff) | |
download | yuzu-bb730855e58d18d8964d158a55822c40503d548f.tar yuzu-bb730855e58d18d8964d158a55822c40503d548f.tar.gz yuzu-bb730855e58d18d8964d158a55822c40503d548f.tar.bz2 yuzu-bb730855e58d18d8964d158a55822c40503d548f.tar.lz yuzu-bb730855e58d18d8964d158a55822c40503d548f.tar.xz yuzu-bb730855e58d18d8964d158a55822c40503d548f.tar.zst yuzu-bb730855e58d18d8964d158a55822c40503d548f.zip |
Diffstat (limited to 'src/core/hle/service/service.h')
-rw-r--r-- | src/core/hle/service/service.h | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/src/core/hle/service/service.h b/src/core/hle/service/service.h index 55aa84e83..20e7fb4d3 100644 --- a/src/core/hle/service/service.h +++ b/src/core/hle/service/service.h @@ -75,12 +75,7 @@ public: m_handles.erase(std::remove(m_handles.begin(), m_handles.end(), handle), m_handles.end()); } - /** - * Synchronize kernel object - * @param wait Boolean wait set if current thread should wait as a result of sync operation - * @return Result of operation, 0 on success, otherwise error code - */ - Result SyncRequest(bool* wait) override { + ResultVal<bool> SyncRequest() override { u32* cmd_buff = GetCommandBuffer(); auto itr = m_functions.find(cmd_buff[0]); @@ -91,7 +86,7 @@ public: // TODO(bunnei): Hack - ignore error u32* cmd_buff = Service::GetCommandBuffer(); cmd_buff[1] = 0; - return 0; + return MakeResult<bool>(false); } if (itr->second.func == nullptr) { ERROR_LOG(OSHLE, "unimplemented function: port=%s, name=%s", @@ -100,23 +95,18 @@ public: // TODO(bunnei): Hack - ignore error u32* cmd_buff = Service::GetCommandBuffer(); cmd_buff[1] = 0; - return 0; + return MakeResult<bool>(false); } itr->second.func(this); - return 0; // TODO: Implement return from actual function + return MakeResult<bool>(false); // TODO: Implement return from actual function } - /** - * Wait for kernel object to synchronize - * @param wait Boolean wait set if current thread should wait as a result of sync operation - * @return Result of operation, 0 on success, otherwise error code - */ - Result WaitSynchronization(bool* wait) override { + ResultVal<bool> WaitSynchronization() override { // TODO(bunnei): ImplementMe ERROR_LOG(OSHLE, "unimplemented function"); - return 0; + return UnimplementedFunction(ErrorModule::OS); } protected: |