diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/kernel/address_arbiter.cpp | 5 | ||||
| -rw-r--r-- | src/core/hle/kernel/archive.cpp | 31 | ||||
| -rw-r--r-- | src/core/hle/kernel/event.cpp | 5 | ||||
| -rw-r--r-- | src/core/hle/kernel/event.h | 4 | ||||
| -rw-r--r-- | src/core/hle/kernel/mutex.cpp | 10 | ||||
| -rw-r--r-- | src/core/hle/kernel/mutex.h | 1 | ||||
| -rw-r--r-- | src/core/hle/kernel/shared_memory.cpp | 16 | ||||
| -rw-r--r-- | src/core/hle/kernel/shared_memory.h | 1 | ||||
| -rw-r--r-- | src/core/hle/kernel/thread.cpp | 5 | ||||
| -rw-r--r-- | src/core/hle/service/service.h | 10 |
10 files changed, 0 insertions, 88 deletions
diff --git a/src/core/hle/kernel/address_arbiter.cpp b/src/core/hle/kernel/address_arbiter.cpp index 1e697fac1..db571b895 100644 --- a/src/core/hle/kernel/address_arbiter.cpp +++ b/src/core/hle/kernel/address_arbiter.cpp | |||
| @@ -25,11 +25,6 @@ public: | |||
| 25 | 25 | ||
| 26 | std::string name; ///< Name of address arbiter object (optional) | 26 | std::string name; ///< Name of address arbiter object (optional) |
| 27 | 27 | ||
| 28 | /** | ||
| 29 | * Wait for kernel object to synchronize | ||
| 30 | * @param wait Boolean wait set if current thread should wait as a result of sync operation | ||
| 31 | * @return Result of operation, 0 on success, otherwise error code | ||
| 32 | */ | ||
| 33 | ResultVal<bool> WaitSynchronization() override { | 28 | ResultVal<bool> WaitSynchronization() override { |
| 34 | // TODO(bunnei): ImplementMe | 29 | // TODO(bunnei): ImplementMe |
| 35 | ERROR_LOG(OSHLE, "(UNIMPLEMENTED)"); | 30 | ERROR_LOG(OSHLE, "(UNIMPLEMENTED)"); |
diff --git a/src/core/hle/kernel/archive.cpp b/src/core/hle/kernel/archive.cpp index e11dddc84..e273444c9 100644 --- a/src/core/hle/kernel/archive.cpp +++ b/src/core/hle/kernel/archive.cpp | |||
| @@ -52,11 +52,6 @@ public: | |||
| 52 | std::string name; ///< Name of archive (optional) | 52 | std::string name; ///< Name of archive (optional) |
| 53 | FileSys::Archive* backend; ///< Archive backend interface | 53 | FileSys::Archive* backend; ///< Archive backend interface |
| 54 | 54 | ||
| 55 | /** | ||
| 56 | * Synchronize kernel object | ||
| 57 | * @param wait Boolean wait set if current thread should wait as a result of sync operation | ||
| 58 | * @return Result of operation, 0 on success, otherwise error code | ||
| 59 | */ | ||
| 60 | ResultVal<bool> SyncRequest() override { | 55 | ResultVal<bool> SyncRequest() override { |
| 61 | u32* cmd_buff = Service::GetCommandBuffer(); | 56 | u32* cmd_buff = Service::GetCommandBuffer(); |
| 62 | FileCommand cmd = static_cast<FileCommand>(cmd_buff[0]); | 57 | FileCommand cmd = static_cast<FileCommand>(cmd_buff[0]); |
| @@ -114,11 +109,6 @@ public: | |||
| 114 | return MakeResult<bool>(false); | 109 | return MakeResult<bool>(false); |
| 115 | } | 110 | } |
| 116 | 111 | ||
| 117 | /** | ||
| 118 | * Wait for kernel object to synchronize | ||
| 119 | * @param wait Boolean wait set if current thread should wait as a result of sync operation | ||
| 120 | * @return Result of operation, 0 on success, otherwise error code | ||
| 121 | */ | ||
| 122 | ResultVal<bool> WaitSynchronization() override { | 112 | ResultVal<bool> WaitSynchronization() override { |
| 123 | // TODO(bunnei): ImplementMe | 113 | // TODO(bunnei): ImplementMe |
| 124 | ERROR_LOG(OSHLE, "(UNIMPLEMENTED)"); | 114 | ERROR_LOG(OSHLE, "(UNIMPLEMENTED)"); |
| @@ -137,11 +127,6 @@ public: | |||
| 137 | FileSys::Path path; ///< Path of the file | 127 | FileSys::Path path; ///< Path of the file |
| 138 | std::unique_ptr<FileSys::File> backend; ///< File backend interface | 128 | std::unique_ptr<FileSys::File> backend; ///< File backend interface |
| 139 | 129 | ||
| 140 | /** | ||
| 141 | * Synchronize kernel object | ||
| 142 | * @param wait Boolean wait set if current thread should wait as a result of sync operation | ||
| 143 | * @return Result of operation, 0 on success, otherwise error code | ||
| 144 | */ | ||
| 145 | ResultVal<bool> SyncRequest() override { | 130 | ResultVal<bool> SyncRequest() override { |
| 146 | u32* cmd_buff = Service::GetCommandBuffer(); | 131 | u32* cmd_buff = Service::GetCommandBuffer(); |
| 147 | FileCommand cmd = static_cast<FileCommand>(cmd_buff[0]); | 132 | FileCommand cmd = static_cast<FileCommand>(cmd_buff[0]); |
| @@ -208,11 +193,6 @@ public: | |||
| 208 | return MakeResult<bool>(false); | 193 | return MakeResult<bool>(false); |
| 209 | } | 194 | } |
| 210 | 195 | ||
| 211 | /** | ||
| 212 | * Wait for kernel object to synchronize | ||
| 213 | * @param wait Boolean wait set if current thread should wait as a result of sync operation | ||
| 214 | * @return Result of operation, 0 on success, otherwise error code | ||
| 215 | */ | ||
| 216 | ResultVal<bool> WaitSynchronization() override { | 196 | ResultVal<bool> WaitSynchronization() override { |
| 217 | // TODO(bunnei): ImplementMe | 197 | // TODO(bunnei): ImplementMe |
| 218 | ERROR_LOG(OSHLE, "(UNIMPLEMENTED)"); | 198 | ERROR_LOG(OSHLE, "(UNIMPLEMENTED)"); |
| @@ -231,11 +211,6 @@ public: | |||
| 231 | FileSys::Path path; ///< Path of the directory | 211 | FileSys::Path path; ///< Path of the directory |
| 232 | std::unique_ptr<FileSys::Directory> backend; ///< File backend interface | 212 | std::unique_ptr<FileSys::Directory> backend; ///< File backend interface |
| 233 | 213 | ||
| 234 | /** | ||
| 235 | * Synchronize kernel object | ||
| 236 | * @param wait Boolean wait set if current thread should wait as a result of sync operation | ||
| 237 | * @return Result of operation, 0 on success, otherwise error code | ||
| 238 | */ | ||
| 239 | ResultVal<bool> SyncRequest() override { | 214 | ResultVal<bool> SyncRequest() override { |
| 240 | u32* cmd_buff = Service::GetCommandBuffer(); | 215 | u32* cmd_buff = Service::GetCommandBuffer(); |
| 241 | DirectoryCommand cmd = static_cast<DirectoryCommand>(cmd_buff[0]); | 216 | DirectoryCommand cmd = static_cast<DirectoryCommand>(cmd_buff[0]); |
| @@ -273,11 +248,6 @@ public: | |||
| 273 | return MakeResult<bool>(false); | 248 | return MakeResult<bool>(false); |
| 274 | } | 249 | } |
| 275 | 250 | ||
| 276 | /** | ||
| 277 | * Wait for kernel object to synchronize | ||
| 278 | * @param wait Boolean wait set if current thread should wait as a result of sync operation | ||
| 279 | * @return Result of operation, 0 on success, otherwise error code | ||
| 280 | */ | ||
| 281 | ResultVal<bool> WaitSynchronization() override { | 251 | ResultVal<bool> WaitSynchronization() override { |
| 282 | // TODO(bunnei): ImplementMe | 252 | // TODO(bunnei): ImplementMe |
| 283 | ERROR_LOG(OSHLE, "(UNIMPLEMENTED)"); | 253 | ERROR_LOG(OSHLE, "(UNIMPLEMENTED)"); |
| @@ -313,7 +283,6 @@ ResultCode CloseArchive(FileSys::Archive::IdCode id_code) { | |||
| 313 | /** | 283 | /** |
| 314 | * Mounts an archive | 284 | * Mounts an archive |
| 315 | * @param archive Pointer to the archive to mount | 285 | * @param archive Pointer to the archive to mount |
| 316 | * @return Result of operation | ||
| 317 | */ | 286 | */ |
| 318 | ResultCode MountArchive(Archive* archive) { | 287 | ResultCode MountArchive(Archive* archive) { |
| 319 | FileSys::Archive::IdCode id_code = archive->backend->GetIdCode(); | 288 | FileSys::Archive::IdCode id_code = archive->backend->GetIdCode(); |
diff --git a/src/core/hle/kernel/event.cpp b/src/core/hle/kernel/event.cpp index 8a2925a3c..288080209 100644 --- a/src/core/hle/kernel/event.cpp +++ b/src/core/hle/kernel/event.cpp | |||
| @@ -30,11 +30,6 @@ public: | |||
| 30 | std::vector<Handle> waiting_threads; ///< Threads that are waiting for the event | 30 | std::vector<Handle> waiting_threads; ///< Threads that are waiting for the event |
| 31 | std::string name; ///< Name of event (optional) | 31 | std::string name; ///< Name of event (optional) |
| 32 | 32 | ||
| 33 | /** | ||
| 34 | * Wait for kernel object to synchronize | ||
| 35 | * @param wait Boolean wait set if current thread should wait as a result of sync operation | ||
| 36 | * @return Result of operation, 0 on success, otherwise error code | ||
| 37 | */ | ||
| 38 | ResultVal<bool> WaitSynchronization() override { | 33 | ResultVal<bool> WaitSynchronization() override { |
| 39 | bool wait = locked; | 34 | bool wait = locked; |
| 40 | if (locked) { | 35 | if (locked) { |
diff --git a/src/core/hle/kernel/event.h b/src/core/hle/kernel/event.h index 6c17ed232..73aec4e79 100644 --- a/src/core/hle/kernel/event.h +++ b/src/core/hle/kernel/event.h | |||
| @@ -15,7 +15,6 @@ namespace Kernel { | |||
| 15 | * Changes whether an event is locked or not | 15 | * Changes whether an event is locked or not |
| 16 | * @param handle Handle to event to change | 16 | * @param handle Handle to event to change |
| 17 | * @param locked Boolean locked value to set event | 17 | * @param locked Boolean locked value to set event |
| 18 | * @return Result of operation, 0 on success, otherwise error code | ||
| 19 | */ | 18 | */ |
| 20 | ResultCode SetEventLocked(const Handle handle, const bool locked); | 19 | ResultCode SetEventLocked(const Handle handle, const bool locked); |
| 21 | 20 | ||
| @@ -23,21 +22,18 @@ ResultCode SetEventLocked(const Handle handle, const bool locked); | |||
| 23 | * Hackish function to set an events permanent lock state, used to pass through synch blocks | 22 | * Hackish function to set an events permanent lock state, used to pass through synch blocks |
| 24 | * @param handle Handle to event to change | 23 | * @param handle Handle to event to change |
| 25 | * @param permanent_locked Boolean permanent locked value to set event | 24 | * @param permanent_locked Boolean permanent locked value to set event |
| 26 | * @return Result of operation, 0 on success, otherwise error code | ||
| 27 | */ | 25 | */ |
| 28 | ResultCode SetPermanentLock(Handle handle, const bool permanent_locked); | 26 | ResultCode SetPermanentLock(Handle handle, const bool permanent_locked); |
| 29 | 27 | ||
| 30 | /** | 28 | /** |
| 31 | * Signals an event | 29 | * Signals an event |
| 32 | * @param handle Handle to event to signal | 30 | * @param handle Handle to event to signal |
| 33 | * @return Result of operation, 0 on success, otherwise error code | ||
| 34 | */ | 31 | */ |
| 35 | ResultCode SignalEvent(const Handle handle); | 32 | ResultCode SignalEvent(const Handle handle); |
| 36 | 33 | ||
| 37 | /** | 34 | /** |
| 38 | * Clears an event | 35 | * Clears an event |
| 39 | * @param handle Handle to event to clear | 36 | * @param handle Handle to event to clear |
| 40 | * @return Result of operation, 0 on success, otherwise error code | ||
| 41 | */ | 37 | */ |
| 42 | ResultCode ClearEvent(Handle handle); | 38 | ResultCode ClearEvent(Handle handle); |
| 43 | 39 | ||
diff --git a/src/core/hle/kernel/mutex.cpp b/src/core/hle/kernel/mutex.cpp index e4ff1ef40..b303ba128 100644 --- a/src/core/hle/kernel/mutex.cpp +++ b/src/core/hle/kernel/mutex.cpp | |||
| @@ -27,22 +27,12 @@ public: | |||
| 27 | std::vector<Handle> waiting_threads; ///< Threads that are waiting for the mutex | 27 | std::vector<Handle> waiting_threads; ///< Threads that are waiting for the mutex |
| 28 | std::string name; ///< Name of mutex (optional) | 28 | std::string name; ///< Name of mutex (optional) |
| 29 | 29 | ||
| 30 | /** | ||
| 31 | * Synchronize kernel object | ||
| 32 | * @param wait Boolean wait set if current thread should wait as a result of sync operation | ||
| 33 | * @return Result of operation, 0 on success, otherwise error code | ||
| 34 | */ | ||
| 35 | ResultVal<bool> SyncRequest() override { | 30 | ResultVal<bool> SyncRequest() override { |
| 36 | // TODO(bunnei): ImplementMe | 31 | // TODO(bunnei): ImplementMe |
| 37 | locked = true; | 32 | locked = true; |
| 38 | return MakeResult<bool>(false); | 33 | return MakeResult<bool>(false); |
| 39 | } | 34 | } |
| 40 | 35 | ||
| 41 | /** | ||
| 42 | * Wait for kernel object to synchronize | ||
| 43 | * @param wait Boolean wait set if current thread should wait as a result of sync operation | ||
| 44 | * @return Result of operation, 0 on success, otherwise error code | ||
| 45 | */ | ||
| 46 | ResultVal<bool> WaitSynchronization() override { | 36 | ResultVal<bool> WaitSynchronization() override { |
| 47 | // TODO(bunnei): ImplementMe | 37 | // TODO(bunnei): ImplementMe |
| 48 | bool wait = locked; | 38 | bool wait = locked; |
diff --git a/src/core/hle/kernel/mutex.h b/src/core/hle/kernel/mutex.h index 233d8c420..155449f95 100644 --- a/src/core/hle/kernel/mutex.h +++ b/src/core/hle/kernel/mutex.h | |||
| @@ -13,7 +13,6 @@ namespace Kernel { | |||
| 13 | /** | 13 | /** |
| 14 | * Releases a mutex | 14 | * Releases a mutex |
| 15 | * @param handle Handle to mutex to release | 15 | * @param handle Handle to mutex to release |
| 16 | * @return Result of operation, 0 on success, otherwise error code | ||
| 17 | */ | 16 | */ |
| 18 | ResultCode ReleaseMutex(Handle handle); | 17 | ResultCode ReleaseMutex(Handle handle); |
| 19 | 18 | ||
diff --git a/src/core/hle/kernel/shared_memory.cpp b/src/core/hle/kernel/shared_memory.cpp index b91fc98da..cfcc0e0b7 100644 --- a/src/core/hle/kernel/shared_memory.cpp +++ b/src/core/hle/kernel/shared_memory.cpp | |||
| @@ -16,11 +16,6 @@ public: | |||
| 16 | static Kernel::HandleType GetStaticHandleType() { return Kernel::HandleType::SharedMemory; } | 16 | static Kernel::HandleType GetStaticHandleType() { return Kernel::HandleType::SharedMemory; } |
| 17 | Kernel::HandleType GetHandleType() const override { return Kernel::HandleType::SharedMemory; } | 17 | Kernel::HandleType GetHandleType() const override { return Kernel::HandleType::SharedMemory; } |
| 18 | 18 | ||
| 19 | /** | ||
| 20 | * Wait for kernel object to synchronize | ||
| 21 | * @param wait Boolean wait set if current thread should wait as a result of sync operation | ||
| 22 | * @return Result of operation, 0 on success, otherwise error code | ||
| 23 | */ | ||
| 24 | ResultVal<bool> WaitSynchronization() override { | 19 | ResultVal<bool> WaitSynchronization() override { |
| 25 | // TODO(bunnei): ImplementMe | 20 | // TODO(bunnei): ImplementMe |
| 26 | ERROR_LOG(OSHLE, "(UNIMPLEMENTED)"); | 21 | ERROR_LOG(OSHLE, "(UNIMPLEMENTED)"); |
| @@ -48,11 +43,6 @@ SharedMemory* CreateSharedMemory(Handle& handle, const std::string& name) { | |||
| 48 | return shared_memory; | 43 | return shared_memory; |
| 49 | } | 44 | } |
| 50 | 45 | ||
| 51 | /** | ||
| 52 | * Creates a shared memory object | ||
| 53 | * @param name Optional name of shared memory object | ||
| 54 | * @return Handle of newly created shared memory object | ||
| 55 | */ | ||
| 56 | Handle CreateSharedMemory(const std::string& name) { | 46 | Handle CreateSharedMemory(const std::string& name) { |
| 57 | Handle handle; | 47 | Handle handle; |
| 58 | CreateSharedMemory(handle, name); | 48 | CreateSharedMemory(handle, name); |
| @@ -86,12 +76,6 @@ ResultCode MapSharedMemory(u32 handle, u32 address, MemoryPermission permissions | |||
| 86 | return RESULT_SUCCESS; | 76 | return RESULT_SUCCESS; |
| 87 | } | 77 | } |
| 88 | 78 | ||
| 89 | /** | ||
| 90 | * Gets a pointer to the shared memory block | ||
| 91 | * @param handle Shared memory block handle | ||
| 92 | * @param offset Offset from the start of the shared memory block to get pointer | ||
| 93 | * @return Pointer to the shared memory block from the specified offset | ||
| 94 | */ | ||
| 95 | ResultVal<u8*> GetSharedMemoryPointer(Handle handle, u32 offset) { | 79 | ResultVal<u8*> GetSharedMemoryPointer(Handle handle, u32 offset) { |
| 96 | SharedMemory* shared_memory = Kernel::g_object_pool.Get<SharedMemory>(handle); | 80 | SharedMemory* shared_memory = Kernel::g_object_pool.Get<SharedMemory>(handle); |
| 97 | if (shared_memory == nullptr) return InvalidHandle(ErrorModule::Kernel); | 81 | if (shared_memory == nullptr) return InvalidHandle(ErrorModule::Kernel); |
diff --git a/src/core/hle/kernel/shared_memory.h b/src/core/hle/kernel/shared_memory.h index 6ed427088..304cf5b67 100644 --- a/src/core/hle/kernel/shared_memory.h +++ b/src/core/hle/kernel/shared_memory.h | |||
| @@ -32,7 +32,6 @@ Handle CreateSharedMemory(const std::string& name="Unknown"); | |||
| 32 | * @param address Address in system memory to map shared memory block to | 32 | * @param address Address in system memory to map shared memory block to |
| 33 | * @param permissions Memory block map permissions (specified by SVC field) | 33 | * @param permissions Memory block map permissions (specified by SVC field) |
| 34 | * @param other_permissions Memory block map other permissions (specified by SVC field) | 34 | * @param other_permissions Memory block map other permissions (specified by SVC field) |
| 35 | * @return Result of operation, 0 on success, otherwise error code | ||
| 36 | */ | 35 | */ |
| 37 | ResultCode MapSharedMemory(Handle handle, u32 address, MemoryPermission permissions, | 36 | ResultCode MapSharedMemory(Handle handle, u32 address, MemoryPermission permissions, |
| 38 | MemoryPermission other_permissions); | 37 | MemoryPermission other_permissions); |
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index b01779f2e..2521f883d 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp | |||
| @@ -34,11 +34,6 @@ public: | |||
| 34 | inline bool IsWaiting() const { return (status & THREADSTATUS_WAIT) != 0; } | 34 | inline bool IsWaiting() const { return (status & THREADSTATUS_WAIT) != 0; } |
| 35 | inline bool IsSuspended() const { return (status & THREADSTATUS_SUSPEND) != 0; } | 35 | inline bool IsSuspended() const { return (status & THREADSTATUS_SUSPEND) != 0; } |
| 36 | 36 | ||
| 37 | /** | ||
| 38 | * Wait for kernel object to synchronize | ||
| 39 | * @param wait Boolean wait set if current thread should wait as a result of sync operation | ||
| 40 | * @return Result of operation, 0 on success, otherwise error code | ||
| 41 | */ | ||
| 42 | ResultVal<bool> WaitSynchronization() override { | 37 | ResultVal<bool> WaitSynchronization() override { |
| 43 | if (status != THREADSTATUS_DORMANT) { | 38 | if (status != THREADSTATUS_DORMANT) { |
| 44 | Handle thread = GetCurrentThreadHandle(); | 39 | Handle thread = GetCurrentThreadHandle(); |
diff --git a/src/core/hle/service/service.h b/src/core/hle/service/service.h index 136984b93..20e7fb4d3 100644 --- a/src/core/hle/service/service.h +++ b/src/core/hle/service/service.h | |||
| @@ -75,11 +75,6 @@ public: | |||
| 75 | m_handles.erase(std::remove(m_handles.begin(), m_handles.end(), handle), m_handles.end()); | 75 | m_handles.erase(std::remove(m_handles.begin(), m_handles.end(), handle), m_handles.end()); |
| 76 | } | 76 | } |
| 77 | 77 | ||
| 78 | /** | ||
| 79 | * Synchronize kernel object | ||
| 80 | * @param wait Boolean wait set if current thread should wait as a result of sync operation | ||
| 81 | * @return Result of operation, 0 on success, otherwise error code | ||
| 82 | */ | ||
| 83 | ResultVal<bool> SyncRequest() override { | 78 | ResultVal<bool> SyncRequest() override { |
| 84 | u32* cmd_buff = GetCommandBuffer(); | 79 | u32* cmd_buff = GetCommandBuffer(); |
| 85 | auto itr = m_functions.find(cmd_buff[0]); | 80 | auto itr = m_functions.find(cmd_buff[0]); |
| @@ -108,11 +103,6 @@ public: | |||
| 108 | return MakeResult<bool>(false); // TODO: Implement return from actual function | 103 | return MakeResult<bool>(false); // TODO: Implement return from actual function |
| 109 | } | 104 | } |
| 110 | 105 | ||
| 111 | /** | ||
| 112 | * Wait for kernel object to synchronize | ||
| 113 | * @param wait Boolean wait set if current thread should wait as a result of sync operation | ||
| 114 | * @return Result of operation, 0 on success, otherwise error code | ||
| 115 | */ | ||
| 116 | ResultVal<bool> WaitSynchronization() override { | 106 | ResultVal<bool> WaitSynchronization() override { |
| 117 | // TODO(bunnei): ImplementMe | 107 | // TODO(bunnei): ImplementMe |
| 118 | ERROR_LOG(OSHLE, "unimplemented function"); | 108 | ERROR_LOG(OSHLE, "unimplemented function"); |