diff options
| author | 2015-05-29 15:09:26 -0700 | |
|---|---|---|
| committer | 2015-05-29 15:09:26 -0700 | |
| commit | a489a846563fc64f236c7ede69ce0eb34af3521a (patch) | |
| tree | 706e345043532d90cd8ca5c41af67fc31dfa7d2e /src/core/hle | |
| parent | Merge pull request #817 from linkmauve/citra.ico (diff) | |
| parent | Travis: Add a check for trailing whitespace before any actual compilation. (diff) | |
| download | yuzu-a489a846563fc64f236c7ede69ce0eb34af3521a.tar.gz yuzu-a489a846563fc64f236c7ede69ce0eb34af3521a.tar.xz yuzu-a489a846563fc64f236c7ede69ce0eb34af3521a.zip | |
Merge pull request #818 from linkmauve/no-trailing-whitespace
Ban trailing whitespace from the entire project, forever
Diffstat (limited to 'src/core/hle')
| -rw-r--r-- | src/core/hle/kernel/resource_limit.h | 8 | ||||
| -rw-r--r-- | src/core/hle/kernel/semaphore.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/kernel/thread.cpp | 8 | ||||
| -rw-r--r-- | src/core/hle/kernel/thread.h | 2 | ||||
| -rw-r--r-- | src/core/hle/kernel/timer.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/service/apt/apt.cpp | 4 | ||||
| -rw-r--r-- | src/core/hle/service/apt/apt.h | 8 | ||||
| -rw-r--r-- | src/core/hle/service/boss_p.h | 2 | ||||
| -rw-r--r-- | src/core/hle/service/boss_u.h | 2 | ||||
| -rw-r--r-- | src/core/hle/service/cam_u.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/service/cfg/cfg.cpp | 4 | ||||
| -rw-r--r-- | src/core/hle/service/fs/archive.cpp | 6 | ||||
| -rw-r--r-- | src/core/hle/service/fs/fs_user.cpp | 6 | ||||
| -rw-r--r-- | src/core/hle/service/gsp_gpu.cpp | 24 | ||||
| -rw-r--r-- | src/core/hle/service/hid/hid.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/service/hid/hid_spvr.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/service/hid/hid_user.h | 2 | ||||
| -rw-r--r-- | src/core/hle/service/ptm/ptm.h | 6 | ||||
| -rw-r--r-- | src/core/hle/service/ptm/ptm_play.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/service/service.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/service/soc_u.cpp | 30 | ||||
| -rw-r--r-- | src/core/hle/svc.cpp | 4 |
22 files changed, 65 insertions, 65 deletions
diff --git a/src/core/hle/kernel/resource_limit.h b/src/core/hle/kernel/resource_limit.h index 201ec0db9..1b8249c74 100644 --- a/src/core/hle/kernel/resource_limit.h +++ b/src/core/hle/kernel/resource_limit.h | |||
| @@ -81,13 +81,13 @@ public: | |||
| 81 | s32 max_timers = 0; | 81 | s32 max_timers = 0; |
| 82 | s32 max_shared_mems = 0; | 82 | s32 max_shared_mems = 0; |
| 83 | s32 max_address_arbiters = 0; | 83 | s32 max_address_arbiters = 0; |
| 84 | 84 | ||
| 85 | /// Max CPU time that the processes in this category can utilize | 85 | /// Max CPU time that the processes in this category can utilize |
| 86 | s32 max_cpu_time = 0; | 86 | s32 max_cpu_time = 0; |
| 87 | 87 | ||
| 88 | // TODO(Subv): Increment these in their respective Kernel::T::Create functions, keeping in mind that | 88 | // TODO(Subv): Increment these in their respective Kernel::T::Create functions, keeping in mind that |
| 89 | // APPLICATION resource limits should not be affected by the objects created by service modules. | 89 | // APPLICATION resource limits should not be affected by the objects created by service modules. |
| 90 | // Currently we have no way of distinguishing if a Create was called by the running application, | 90 | // Currently we have no way of distinguishing if a Create was called by the running application, |
| 91 | // or by a service module. Approach this once we have separated the service modules into their own processes | 91 | // or by a service module. Approach this once we have separated the service modules into their own processes |
| 92 | 92 | ||
| 93 | /// Current memory that the processes in this category are using | 93 | /// Current memory that the processes in this category are using |
diff --git a/src/core/hle/kernel/semaphore.cpp b/src/core/hle/kernel/semaphore.cpp index dbb4c9b7f..96d61ed3a 100644 --- a/src/core/hle/kernel/semaphore.cpp +++ b/src/core/hle/kernel/semaphore.cpp | |||
| @@ -42,7 +42,7 @@ void Semaphore::Acquire() { | |||
| 42 | 42 | ||
| 43 | ResultVal<s32> Semaphore::Release(s32 release_count) { | 43 | ResultVal<s32> Semaphore::Release(s32 release_count) { |
| 44 | if (max_count - available_count < release_count) | 44 | if (max_count - available_count < release_count) |
| 45 | return ResultCode(ErrorDescription::OutOfRange, ErrorModule::Kernel, | 45 | return ResultCode(ErrorDescription::OutOfRange, ErrorModule::Kernel, |
| 46 | ErrorSummary::InvalidArgument, ErrorLevel::Permanent); | 46 | ErrorSummary::InvalidArgument, ErrorLevel::Permanent); |
| 47 | 47 | ||
| 48 | s32 previous_count = available_count; | 48 | s32 previous_count = available_count; |
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index 690d33b55..22c795ad4 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp | |||
| @@ -100,7 +100,7 @@ void Thread::Stop() { | |||
| 100 | } | 100 | } |
| 101 | 101 | ||
| 102 | status = THREADSTATUS_DEAD; | 102 | status = THREADSTATUS_DEAD; |
| 103 | 103 | ||
| 104 | WakeupAllWaitingThreads(); | 104 | WakeupAllWaitingThreads(); |
| 105 | 105 | ||
| 106 | // Clean up any dangling references in objects that this thread was waiting for | 106 | // Clean up any dangling references in objects that this thread was waiting for |
| @@ -169,7 +169,7 @@ static void PriorityBoostStarvedThreads() { | |||
| 169 | } | 169 | } |
| 170 | } | 170 | } |
| 171 | 171 | ||
| 172 | /** | 172 | /** |
| 173 | * Switches the CPU's active thread context to that of the specified thread | 173 | * Switches the CPU's active thread context to that of the specified thread |
| 174 | * @param new_thread The thread to switch to | 174 | * @param new_thread The thread to switch to |
| 175 | */ | 175 | */ |
| @@ -353,7 +353,7 @@ void Thread::ResumeFromWait() { | |||
| 353 | GetObjectId()); | 353 | GetObjectId()); |
| 354 | return; | 354 | return; |
| 355 | } | 355 | } |
| 356 | 356 | ||
| 357 | ready_queue.push_back(current_priority, this); | 357 | ready_queue.push_back(current_priority, this); |
| 358 | status = THREADSTATUS_READY; | 358 | status = THREADSTATUS_READY; |
| 359 | } | 359 | } |
| @@ -504,7 +504,7 @@ void Reschedule() { | |||
| 504 | } else if (next) { | 504 | } else if (next) { |
| 505 | LOG_TRACE(Kernel, "context switch idle -> %u", next->GetObjectId()); | 505 | LOG_TRACE(Kernel, "context switch idle -> %u", next->GetObjectId()); |
| 506 | } | 506 | } |
| 507 | 507 | ||
| 508 | SwitchContext(next); | 508 | SwitchContext(next); |
| 509 | } | 509 | } |
| 510 | 510 | ||
diff --git a/src/core/hle/kernel/thread.h b/src/core/hle/kernel/thread.h index 389928178..2c65419c3 100644 --- a/src/core/hle/kernel/thread.h +++ b/src/core/hle/kernel/thread.h | |||
| @@ -94,7 +94,7 @@ public: | |||
| 94 | * @return The thread's ID | 94 | * @return The thread's ID |
| 95 | */ | 95 | */ |
| 96 | u32 GetThreadId() const { return thread_id; } | 96 | u32 GetThreadId() const { return thread_id; } |
| 97 | 97 | ||
| 98 | /** | 98 | /** |
| 99 | * Release an acquired wait object | 99 | * Release an acquired wait object |
| 100 | * @param wait_object WaitObject to release | 100 | * @param wait_object WaitObject to release |
diff --git a/src/core/hle/kernel/timer.cpp b/src/core/hle/kernel/timer.cpp index 25d066bf1..8aa4110a6 100644 --- a/src/core/hle/kernel/timer.cpp +++ b/src/core/hle/kernel/timer.cpp | |||
| @@ -88,7 +88,7 @@ static void TimerCallback(u64 timer_handle, int cycles_late) { | |||
| 88 | if (timer->interval_delay != 0) { | 88 | if (timer->interval_delay != 0) { |
| 89 | // Reschedule the timer with the interval delay | 89 | // Reschedule the timer with the interval delay |
| 90 | u64 interval_microseconds = timer->interval_delay / 1000; | 90 | u64 interval_microseconds = timer->interval_delay / 1000; |
| 91 | CoreTiming::ScheduleEvent(usToCycles(interval_microseconds) - cycles_late, | 91 | CoreTiming::ScheduleEvent(usToCycles(interval_microseconds) - cycles_late, |
| 92 | timer_callback_event_type, timer_handle); | 92 | timer_callback_event_type, timer_handle); |
| 93 | } | 93 | } |
| 94 | } | 94 | } |
diff --git a/src/core/hle/service/apt/apt.cpp b/src/core/hle/service/apt/apt.cpp index 3fd4cfb08..5d14f393d 100644 --- a/src/core/hle/service/apt/apt.cpp +++ b/src/core/hle/service/apt/apt.cpp | |||
| @@ -151,7 +151,7 @@ void SendParameter(Service::Interface* self) { | |||
| 151 | u32 handle = cmd_buff[6]; | 151 | u32 handle = cmd_buff[6]; |
| 152 | u32 size = cmd_buff[7]; | 152 | u32 size = cmd_buff[7]; |
| 153 | u32 in_param_buffer_ptr = cmd_buff[8]; | 153 | u32 in_param_buffer_ptr = cmd_buff[8]; |
| 154 | 154 | ||
| 155 | cmd_buff[1] = RESULT_SUCCESS.raw; // No error | 155 | cmd_buff[1] = RESULT_SUCCESS.raw; // No error |
| 156 | 156 | ||
| 157 | LOG_WARNING(Service_APT, "(STUBBED) called src_app_id=0x%08X, dst_app_id=0x%08X, signal_type=0x%08X," | 157 | LOG_WARNING(Service_APT, "(STUBBED) called src_app_id=0x%08X, dst_app_id=0x%08X, signal_type=0x%08X," |
| @@ -283,7 +283,7 @@ void Init() { | |||
| 283 | AddService(new APT_A_Interface); | 283 | AddService(new APT_A_Interface); |
| 284 | AddService(new APT_S_Interface); | 284 | AddService(new APT_S_Interface); |
| 285 | AddService(new APT_U_Interface); | 285 | AddService(new APT_U_Interface); |
| 286 | 286 | ||
| 287 | // Load the shared system font (if available). | 287 | // Load the shared system font (if available). |
| 288 | // The expected format is a decrypted, uncompressed BCFNT file with the 0x80 byte header | 288 | // The expected format is a decrypted, uncompressed BCFNT file with the 0x80 byte header |
| 289 | // generated by the APT:U service. The best way to get is by dumping it from RAM. We've provided | 289 | // generated by the APT:U service. The best way to get is by dumping it from RAM. We've provided |
diff --git a/src/core/hle/service/apt/apt.h b/src/core/hle/service/apt/apt.h index e7fa39325..a03e1712a 100644 --- a/src/core/hle/service/apt/apt.h +++ b/src/core/hle/service/apt/apt.h | |||
| @@ -63,7 +63,7 @@ void Initialize(Service::Interface* self); | |||
| 63 | * 4 : Handle to shared font memory | 63 | * 4 : Handle to shared font memory |
| 64 | */ | 64 | */ |
| 65 | void GetSharedFont(Service::Interface* self); | 65 | void GetSharedFont(Service::Interface* self); |
| 66 | 66 | ||
| 67 | /** | 67 | /** |
| 68 | * APT::NotifyToWait service function | 68 | * APT::NotifyToWait service function |
| 69 | * Inputs: | 69 | * Inputs: |
| @@ -88,7 +88,7 @@ void Enable(Service::Interface* self); | |||
| 88 | * 4 : Home Menu AppId | 88 | * 4 : Home Menu AppId |
| 89 | * 5 : AppID of currently active app | 89 | * 5 : AppID of currently active app |
| 90 | */ | 90 | */ |
| 91 | void GetAppletManInfo(Service::Interface* self); | 91 | void GetAppletManInfo(Service::Interface* self); |
| 92 | 92 | ||
| 93 | /** | 93 | /** |
| 94 | * APT::IsRegistered service function. This returns whether the specified AppID is registered with NS yet. | 94 | * APT::IsRegistered service function. This returns whether the specified AppID is registered with NS yet. |
| @@ -100,14 +100,14 @@ void GetAppletManInfo(Service::Interface* self); | |||
| 100 | * Outputs: | 100 | * Outputs: |
| 101 | * 0 : Return header | 101 | * 0 : Return header |
| 102 | * 1 : Result of function, 0 on success, otherwise error code | 102 | * 1 : Result of function, 0 on success, otherwise error code |
| 103 | * 2 : Output, 0 = not registered, 1 = registered. | 103 | * 2 : Output, 0 = not registered, 1 = registered. |
| 104 | */ | 104 | */ |
| 105 | void IsRegistered(Service::Interface* self); | 105 | void IsRegistered(Service::Interface* self); |
| 106 | 106 | ||
| 107 | void InquireNotification(Service::Interface* self); | 107 | void InquireNotification(Service::Interface* self); |
| 108 | 108 | ||
| 109 | /** | 109 | /** |
| 110 | * APT::SendParameter service function. This sets the parameter data state. | 110 | * APT::SendParameter service function. This sets the parameter data state. |
| 111 | * Inputs: | 111 | * Inputs: |
| 112 | * 1 : Source AppID | 112 | * 1 : Source AppID |
| 113 | * 2 : Destination AppID | 113 | * 2 : Destination AppID |
diff --git a/src/core/hle/service/boss_p.h b/src/core/hle/service/boss_p.h index 71f1e7464..6fb51d57d 100644 --- a/src/core/hle/service/boss_p.h +++ b/src/core/hle/service/boss_p.h | |||
| @@ -14,7 +14,7 @@ namespace BOSS_P { | |||
| 14 | class Interface : public Service::Interface { | 14 | class Interface : public Service::Interface { |
| 15 | public: | 15 | public: |
| 16 | Interface(); | 16 | Interface(); |
| 17 | 17 | ||
| 18 | std::string GetPortName() const override { | 18 | std::string GetPortName() const override { |
| 19 | return "boss:P"; | 19 | return "boss:P"; |
| 20 | } | 20 | } |
diff --git a/src/core/hle/service/boss_u.h b/src/core/hle/service/boss_u.h index 2668f2dfd..89e77fe47 100644 --- a/src/core/hle/service/boss_u.h +++ b/src/core/hle/service/boss_u.h | |||
| @@ -14,7 +14,7 @@ namespace BOSS_U { | |||
| 14 | class Interface : public Service::Interface { | 14 | class Interface : public Service::Interface { |
| 15 | public: | 15 | public: |
| 16 | Interface(); | 16 | Interface(); |
| 17 | 17 | ||
| 18 | std::string GetPortName() const override { | 18 | std::string GetPortName() const override { |
| 19 | return "boss:U"; | 19 | return "boss:U"; |
| 20 | } | 20 | } |
diff --git a/src/core/hle/service/cam_u.cpp b/src/core/hle/service/cam_u.cpp index fcfd87715..ecda0dbdf 100644 --- a/src/core/hle/service/cam_u.cpp +++ b/src/core/hle/service/cam_u.cpp | |||
| @@ -19,5 +19,5 @@ namespace CAM_U { | |||
| 19 | Interface::Interface() { | 19 | Interface::Interface() { |
| 20 | //Register(FunctionTable); | 20 | //Register(FunctionTable); |
| 21 | } | 21 | } |
| 22 | 22 | ||
| 23 | } // namespace | 23 | } // namespace |
diff --git a/src/core/hle/service/cfg/cfg.cpp b/src/core/hle/service/cfg/cfg.cpp index d42682883..62ad90fdc 100644 --- a/src/core/hle/service/cfg/cfg.cpp +++ b/src/core/hle/service/cfg/cfg.cpp | |||
| @@ -315,11 +315,11 @@ void Init() { | |||
| 315 | AddService(new CFG_I_Interface); | 315 | AddService(new CFG_I_Interface); |
| 316 | AddService(new CFG_S_Interface); | 316 | AddService(new CFG_S_Interface); |
| 317 | AddService(new CFG_U_Interface); | 317 | AddService(new CFG_U_Interface); |
| 318 | 318 | ||
| 319 | // Open the SystemSaveData archive 0x00010017 | 319 | // Open the SystemSaveData archive 0x00010017 |
| 320 | FileSys::Path archive_path(cfg_system_savedata_id); | 320 | FileSys::Path archive_path(cfg_system_savedata_id); |
| 321 | auto archive_result = Service::FS::OpenArchive(Service::FS::ArchiveIdCode::SystemSaveData, archive_path); | 321 | auto archive_result = Service::FS::OpenArchive(Service::FS::ArchiveIdCode::SystemSaveData, archive_path); |
| 322 | 322 | ||
| 323 | // If the archive didn't exist, create the files inside | 323 | // If the archive didn't exist, create the files inside |
| 324 | if (archive_result.Code().description == ErrorDescription::FS_NotFormatted) { | 324 | if (archive_result.Code().description == ErrorDescription::FS_NotFormatted) { |
| 325 | // Format the archive to create the directories | 325 | // Format the archive to create the directories |
diff --git a/src/core/hle/service/fs/archive.cpp b/src/core/hle/service/fs/archive.cpp index 6d4a9c7c9..7cab68024 100644 --- a/src/core/hle/service/fs/archive.cpp +++ b/src/core/hle/service/fs/archive.cpp | |||
| @@ -254,7 +254,7 @@ ResultVal<ArchiveHandle> OpenArchive(ArchiveIdCode id_code, FileSys::Path& archi | |||
| 254 | 254 | ||
| 255 | CASCADE_RESULT(std::unique_ptr<ArchiveBackend> res, itr->second->Open(archive_path)); | 255 | CASCADE_RESULT(std::unique_ptr<ArchiveBackend> res, itr->second->Open(archive_path)); |
| 256 | 256 | ||
| 257 | // This should never even happen in the first place with 64-bit handles, | 257 | // This should never even happen in the first place with 64-bit handles, |
| 258 | while (handle_map.count(next_handle) != 0) { | 258 | while (handle_map.count(next_handle) != 0) { |
| 259 | ++next_handle; | 259 | ++next_handle; |
| 260 | } | 260 | } |
| @@ -488,7 +488,7 @@ void ArchiveInit() { | |||
| 488 | RegisterArchiveType(std::move(sdmc_factory), ArchiveIdCode::SDMC); | 488 | RegisterArchiveType(std::move(sdmc_factory), ArchiveIdCode::SDMC); |
| 489 | else | 489 | else |
| 490 | LOG_ERROR(Service_FS, "Can't instantiate SDMC archive with path %s", sdmc_directory.c_str()); | 490 | LOG_ERROR(Service_FS, "Can't instantiate SDMC archive with path %s", sdmc_directory.c_str()); |
| 491 | 491 | ||
| 492 | // Create the SaveData archive | 492 | // Create the SaveData archive |
| 493 | auto savedata_factory = Common::make_unique<FileSys::ArchiveFactory_SaveData>(sdmc_directory); | 493 | auto savedata_factory = Common::make_unique<FileSys::ArchiveFactory_SaveData>(sdmc_directory); |
| 494 | RegisterArchiveType(std::move(savedata_factory), ArchiveIdCode::SaveData); | 494 | RegisterArchiveType(std::move(savedata_factory), ArchiveIdCode::SaveData); |
| @@ -503,7 +503,7 @@ void ArchiveInit() { | |||
| 503 | if (sharedextsavedata_factory->Initialize()) | 503 | if (sharedextsavedata_factory->Initialize()) |
| 504 | RegisterArchiveType(std::move(sharedextsavedata_factory), ArchiveIdCode::SharedExtSaveData); | 504 | RegisterArchiveType(std::move(sharedextsavedata_factory), ArchiveIdCode::SharedExtSaveData); |
| 505 | else | 505 | else |
| 506 | LOG_ERROR(Service_FS, "Can't instantiate SharedExtSaveData archive with path %s", | 506 | LOG_ERROR(Service_FS, "Can't instantiate SharedExtSaveData archive with path %s", |
| 507 | sharedextsavedata_factory->GetMountPoint().c_str()); | 507 | sharedextsavedata_factory->GetMountPoint().c_str()); |
| 508 | 508 | ||
| 509 | // Create the SaveDataCheck archive, basically a small variation of the RomFS archive | 509 | // Create the SaveDataCheck archive, basically a small variation of the RomFS archive |
diff --git a/src/core/hle/service/fs/fs_user.cpp b/src/core/hle/service/fs/fs_user.cpp index b25c8941d..32db773bb 100644 --- a/src/core/hle/service/fs/fs_user.cpp +++ b/src/core/hle/service/fs/fs_user.cpp | |||
| @@ -434,7 +434,7 @@ static void IsSdmcWriteable(Service::Interface* self) { | |||
| 434 | } | 434 | } |
| 435 | 435 | ||
| 436 | /** | 436 | /** |
| 437 | * FS_User::FormatSaveData service function, | 437 | * FS_User::FormatSaveData service function, |
| 438 | * formats the SaveData specified by the input path. | 438 | * formats the SaveData specified by the input path. |
| 439 | * Inputs: | 439 | * Inputs: |
| 440 | * 0 : 0x084C0242 | 440 | * 0 : 0x084C0242 |
| @@ -520,7 +520,7 @@ static void CreateExtSaveData(Service::Interface* self) { | |||
| 520 | LOG_WARNING(Service_FS, "(STUBBED) savedata_high=%08X savedata_low=%08X cmd_buff[3]=%08X " | 520 | LOG_WARNING(Service_FS, "(STUBBED) savedata_high=%08X savedata_low=%08X cmd_buff[3]=%08X " |
| 521 | "cmd_buff[4]=%08X cmd_buff[5]=%08X cmd_buff[6]=%08X cmd_buff[7]=%08X cmd_buff[8]=%08X " | 521 | "cmd_buff[4]=%08X cmd_buff[5]=%08X cmd_buff[6]=%08X cmd_buff[7]=%08X cmd_buff[8]=%08X " |
| 522 | "cmd_buff[9]=%08X cmd_buff[10]=%08X cmd_buff[11]=%08X", save_high, save_low, | 522 | "cmd_buff[9]=%08X cmd_buff[10]=%08X cmd_buff[11]=%08X", save_high, save_low, |
| 523 | cmd_buff[3], cmd_buff[4], cmd_buff[5], cmd_buff[6], cmd_buff[7], cmd_buff[8], cmd_buff[9], | 523 | cmd_buff[3], cmd_buff[4], cmd_buff[5], cmd_buff[6], cmd_buff[7], cmd_buff[8], cmd_buff[9], |
| 524 | cmd_buff[10], cmd_buff[11]); | 524 | cmd_buff[10], cmd_buff[11]); |
| 525 | 525 | ||
| 526 | cmd_buff[1] = CreateExtSaveData(media_type, save_high, save_low).raw; | 526 | cmd_buff[1] = CreateExtSaveData(media_type, save_high, save_low).raw; |
| @@ -544,7 +544,7 @@ static void DeleteExtSaveData(Service::Interface* self) { | |||
| 544 | u32 save_high = cmd_buff[3]; | 544 | u32 save_high = cmd_buff[3]; |
| 545 | u32 unknown = cmd_buff[4]; // TODO(Subv): Figure out what this is | 545 | u32 unknown = cmd_buff[4]; // TODO(Subv): Figure out what this is |
| 546 | 546 | ||
| 547 | LOG_WARNING(Service_FS, "(STUBBED) save_low=%08X save_high=%08X media_type=%08X unknown=%08X", | 547 | LOG_WARNING(Service_FS, "(STUBBED) save_low=%08X save_high=%08X media_type=%08X unknown=%08X", |
| 548 | save_low, save_high, cmd_buff[1] & 0xFF, unknown); | 548 | save_low, save_high, cmd_buff[1] & 0xFF, unknown); |
| 549 | 549 | ||
| 550 | cmd_buff[1] = DeleteExtSaveData(media_type, save_high, save_low).raw; | 550 | cmd_buff[1] = DeleteExtSaveData(media_type, save_high, save_low).raw; |
diff --git a/src/core/hle/service/gsp_gpu.cpp b/src/core/hle/service/gsp_gpu.cpp index 4af168bfc..4b0b4229d 100644 --- a/src/core/hle/service/gsp_gpu.cpp +++ b/src/core/hle/service/gsp_gpu.cpp | |||
| @@ -167,7 +167,7 @@ static void WriteHWRegsWithMask(Service::Interface* self) { | |||
| 167 | u32* cmd_buff = Kernel::GetCommandBuffer(); | 167 | u32* cmd_buff = Kernel::GetCommandBuffer(); |
| 168 | u32 reg_addr = cmd_buff[1]; | 168 | u32 reg_addr = cmd_buff[1]; |
| 169 | u32 size = cmd_buff[2]; | 169 | u32 size = cmd_buff[2]; |
| 170 | 170 | ||
| 171 | u32* src_data = (u32*)Memory::GetPointer(cmd_buff[4]); | 171 | u32* src_data = (u32*)Memory::GetPointer(cmd_buff[4]); |
| 172 | u32* mask_data = (u32*)Memory::GetPointer(cmd_buff[6]); | 172 | u32* mask_data = (u32*)Memory::GetPointer(cmd_buff[6]); |
| 173 | 173 | ||
| @@ -208,21 +208,21 @@ static void SetBufferSwap(u32 screen_id, const FrameBufferInfo& info) { | |||
| 208 | PAddr phys_address_left = Memory::VirtualToPhysicalAddress(info.address_left); | 208 | PAddr phys_address_left = Memory::VirtualToPhysicalAddress(info.address_left); |
| 209 | PAddr phys_address_right = Memory::VirtualToPhysicalAddress(info.address_right); | 209 | PAddr phys_address_right = Memory::VirtualToPhysicalAddress(info.address_right); |
| 210 | if (info.active_fb == 0) { | 210 | if (info.active_fb == 0) { |
| 211 | WriteHWRegs(base_address + 4 * static_cast<u32>(GPU_REG_INDEX(framebuffer_config[screen_id].address_left1)), 4, | 211 | WriteHWRegs(base_address + 4 * static_cast<u32>(GPU_REG_INDEX(framebuffer_config[screen_id].address_left1)), 4, |
| 212 | &phys_address_left); | 212 | &phys_address_left); |
| 213 | WriteHWRegs(base_address + 4 * static_cast<u32>(GPU_REG_INDEX(framebuffer_config[screen_id].address_right1)), 4, | 213 | WriteHWRegs(base_address + 4 * static_cast<u32>(GPU_REG_INDEX(framebuffer_config[screen_id].address_right1)), 4, |
| 214 | &phys_address_right); | 214 | &phys_address_right); |
| 215 | } else { | 215 | } else { |
| 216 | WriteHWRegs(base_address + 4 * static_cast<u32>(GPU_REG_INDEX(framebuffer_config[screen_id].address_left2)), 4, | 216 | WriteHWRegs(base_address + 4 * static_cast<u32>(GPU_REG_INDEX(framebuffer_config[screen_id].address_left2)), 4, |
| 217 | &phys_address_left); | 217 | &phys_address_left); |
| 218 | WriteHWRegs(base_address + 4 * static_cast<u32>(GPU_REG_INDEX(framebuffer_config[screen_id].address_right2)), 4, | 218 | WriteHWRegs(base_address + 4 * static_cast<u32>(GPU_REG_INDEX(framebuffer_config[screen_id].address_right2)), 4, |
| 219 | &phys_address_right); | 219 | &phys_address_right); |
| 220 | } | 220 | } |
| 221 | WriteHWRegs(base_address + 4 * static_cast<u32>(GPU_REG_INDEX(framebuffer_config[screen_id].stride)), 4, | 221 | WriteHWRegs(base_address + 4 * static_cast<u32>(GPU_REG_INDEX(framebuffer_config[screen_id].stride)), 4, |
| 222 | &info.stride); | 222 | &info.stride); |
| 223 | WriteHWRegs(base_address + 4 * static_cast<u32>(GPU_REG_INDEX(framebuffer_config[screen_id].color_format)), 4, | 223 | WriteHWRegs(base_address + 4 * static_cast<u32>(GPU_REG_INDEX(framebuffer_config[screen_id].color_format)), 4, |
| 224 | &info.format); | 224 | &info.format); |
| 225 | WriteHWRegs(base_address + 4 * static_cast<u32>(GPU_REG_INDEX(framebuffer_config[screen_id].active_fb)), 4, | 225 | WriteHWRegs(base_address + 4 * static_cast<u32>(GPU_REG_INDEX(framebuffer_config[screen_id].active_fb)), 4, |
| 226 | &info.shown_fb); | 226 | &info.shown_fb); |
| 227 | } | 227 | } |
| 228 | 228 | ||
| @@ -374,7 +374,7 @@ static void ExecuteCommand(const Command& command, u32 thread_id) { | |||
| 374 | { | 374 | { |
| 375 | auto& params = command.set_command_list_last; | 375 | auto& params = command.set_command_list_last; |
| 376 | 376 | ||
| 377 | WriteGPURegister(static_cast<u32>(GPU_REG_INDEX(command_processor_config.address)), | 377 | WriteGPURegister(static_cast<u32>(GPU_REG_INDEX(command_processor_config.address)), |
| 378 | Memory::VirtualToPhysicalAddress(params.address) >> 3); | 378 | Memory::VirtualToPhysicalAddress(params.address) >> 3); |
| 379 | WriteGPURegister(static_cast<u32>(GPU_REG_INDEX(command_processor_config.size)), params.size); | 379 | WriteGPURegister(static_cast<u32>(GPU_REG_INDEX(command_processor_config.size)), params.size); |
| 380 | 380 | ||
| @@ -470,7 +470,7 @@ static void SetLcdForceBlack(Service::Interface* self) { | |||
| 470 | 470 | ||
| 471 | LCD::Write(HW::VADDR_LCD + 4 * LCD_REG_INDEX(color_fill_top), data.raw); // Top LCD | 471 | LCD::Write(HW::VADDR_LCD + 4 * LCD_REG_INDEX(color_fill_top), data.raw); // Top LCD |
| 472 | LCD::Write(HW::VADDR_LCD + 4 * LCD_REG_INDEX(color_fill_bottom), data.raw); // Bottom LCD | 472 | LCD::Write(HW::VADDR_LCD + 4 * LCD_REG_INDEX(color_fill_bottom), data.raw); // Bottom LCD |
| 473 | 473 | ||
| 474 | cmd_buff[1] = RESULT_SUCCESS.raw; | 474 | cmd_buff[1] = RESULT_SUCCESS.raw; |
| 475 | } | 475 | } |
| 476 | 476 | ||
| @@ -516,8 +516,8 @@ static void TriggerCmdReqQueue(Service::Interface* self) { | |||
| 516 | */ | 516 | */ |
| 517 | static void ImportDisplayCaptureInfo(Service::Interface* self) { | 517 | static void ImportDisplayCaptureInfo(Service::Interface* self) { |
| 518 | u32* cmd_buff = Kernel::GetCommandBuffer(); | 518 | u32* cmd_buff = Kernel::GetCommandBuffer(); |
| 519 | 519 | ||
| 520 | // TODO(Subv): We're always returning the framebuffer structures for thread_id = 0, | 520 | // TODO(Subv): We're always returning the framebuffer structures for thread_id = 0, |
| 521 | // because we only support a single running application at a time. | 521 | // because we only support a single running application at a time. |
| 522 | // This should always return the framebuffer data that is currently displayed on the screen. | 522 | // This should always return the framebuffer data that is currently displayed on the screen. |
| 523 | 523 | ||
diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp index feac53816..c7c1bb5ab 100644 --- a/src/core/hle/service/hid/hid.cpp +++ b/src/core/hle/service/hid/hid.cpp | |||
| @@ -106,7 +106,7 @@ void Update() { | |||
| 106 | mem->touch.index_reset_ticks_previous = mem->touch.index_reset_ticks; | 106 | mem->touch.index_reset_ticks_previous = mem->touch.index_reset_ticks; |
| 107 | mem->touch.index_reset_ticks = (s64)CoreTiming::GetTicks(); | 107 | mem->touch.index_reset_ticks = (s64)CoreTiming::GetTicks(); |
| 108 | } | 108 | } |
| 109 | 109 | ||
| 110 | // Signal both handles when there's an update to Pad or touch | 110 | // Signal both handles when there's an update to Pad or touch |
| 111 | event_pad_or_touch_1->Signal(); | 111 | event_pad_or_touch_1->Signal(); |
| 112 | event_pad_or_touch_2->Signal(); | 112 | event_pad_or_touch_2->Signal(); |
diff --git a/src/core/hle/service/hid/hid_spvr.cpp b/src/core/hle/service/hid/hid_spvr.cpp index 02db12efd..532931ae0 100644 --- a/src/core/hle/service/hid/hid_spvr.cpp +++ b/src/core/hle/service/hid/hid_spvr.cpp | |||
| @@ -25,6 +25,6 @@ const Interface::FunctionInfo FunctionTable[] = { | |||
| 25 | HID_SPVR_Interface::HID_SPVR_Interface() { | 25 | HID_SPVR_Interface::HID_SPVR_Interface() { |
| 26 | Register(FunctionTable); | 26 | Register(FunctionTable); |
| 27 | } | 27 | } |
| 28 | 28 | ||
| 29 | } // namespace HID | 29 | } // namespace HID |
| 30 | } // namespace Service | 30 | } // namespace Service |
diff --git a/src/core/hle/service/hid/hid_user.h b/src/core/hle/service/hid/hid_user.h index 0eeec2c25..baf7fed79 100644 --- a/src/core/hle/service/hid/hid_user.h +++ b/src/core/hle/service/hid/hid_user.h | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | 11 | ||
| 12 | namespace Service { | 12 | namespace Service { |
| 13 | namespace HID { | 13 | namespace HID { |
| 14 | 14 | ||
| 15 | /** | 15 | /** |
| 16 | * HID service interface. | 16 | * HID service interface. |
| 17 | */ | 17 | */ |
diff --git a/src/core/hle/service/ptm/ptm.h b/src/core/hle/service/ptm/ptm.h index 493e6a11f..b690003cb 100644 --- a/src/core/hle/service/ptm/ptm.h +++ b/src/core/hle/service/ptm/ptm.h | |||
| @@ -20,15 +20,15 @@ enum class ChargeLevels : u32 { | |||
| 20 | CompletelyFull = 5, | 20 | CompletelyFull = 5, |
| 21 | }; | 21 | }; |
| 22 | 22 | ||
| 23 | /** | 23 | /** |
| 24 | * Represents the gamecoin file structure in the SharedExtData archive | 24 | * Represents the gamecoin file structure in the SharedExtData archive |
| 25 | * More information in 3dbrew (http://www.3dbrew.org/wiki/Extdata#Shared_Extdata_0xf000000b_gamecoin.dat) | 25 | * More information in 3dbrew (http://www.3dbrew.org/wiki/Extdata#Shared_Extdata_0xf000000b_gamecoin.dat) |
| 26 | */ | 26 | */ |
| 27 | struct GameCoin { | 27 | struct GameCoin { |
| 28 | u32 magic; ///< Magic number: 0x4F00 | 28 | u32 magic; ///< Magic number: 0x4F00 |
| 29 | u16 total_coins; ///< Total Play Coins | 29 | u16 total_coins; ///< Total Play Coins |
| 30 | u16 total_coins_on_date; ///< Total Play Coins obtained on the date stored below. | 30 | u16 total_coins_on_date; ///< Total Play Coins obtained on the date stored below. |
| 31 | u32 step_count; ///< Total step count at the time a new Play Coin was obtained. | 31 | u32 step_count; ///< Total step count at the time a new Play Coin was obtained. |
| 32 | u32 last_step_count; ///< Step count for the day the last Play Coin was obtained | 32 | u32 last_step_count; ///< Step count for the day the last Play Coin was obtained |
| 33 | u16 year; | 33 | u16 year; |
| 34 | u8 month; | 34 | u8 month; |
diff --git a/src/core/hle/service/ptm/ptm_play.cpp b/src/core/hle/service/ptm/ptm_play.cpp index 48e68a3d8..7bb990193 100644 --- a/src/core/hle/service/ptm/ptm_play.cpp +++ b/src/core/hle/service/ptm/ptm_play.cpp | |||
| @@ -18,6 +18,6 @@ const Interface::FunctionInfo FunctionTable[] = { | |||
| 18 | PTM_Play_Interface::PTM_Play_Interface() { | 18 | PTM_Play_Interface::PTM_Play_Interface() { |
| 19 | Register(FunctionTable); | 19 | Register(FunctionTable); |
| 20 | } | 20 | } |
| 21 | 21 | ||
| 22 | } // namespace PTM | 22 | } // namespace PTM |
| 23 | } // namespace Service \ No newline at end of file | 23 | } // namespace Service \ No newline at end of file |
diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp index 64185c62e..dc667500c 100644 --- a/src/core/hle/service/service.cpp +++ b/src/core/hle/service/service.cpp | |||
| @@ -52,7 +52,7 @@ std::unordered_map<std::string, Kernel::SharedPtr<Interface>> g_kernel_named_por | |||
| 52 | std::unordered_map<std::string, Kernel::SharedPtr<Interface>> g_srv_services; | 52 | std::unordered_map<std::string, Kernel::SharedPtr<Interface>> g_srv_services; |
| 53 | 53 | ||
| 54 | /** | 54 | /** |
| 55 | * Creates a function string for logging, complete with the name (or header code, depending | 55 | * Creates a function string for logging, complete with the name (or header code, depending |
| 56 | * on what's passed in) the port name, and all the cmd_buff arguments. | 56 | * on what's passed in) the port name, and all the cmd_buff arguments. |
| 57 | */ | 57 | */ |
| 58 | static std::string MakeFunctionString(const char* name, const char* port_name, const u32* cmd_buff) { | 58 | static std::string MakeFunctionString(const char* name, const char* port_name, const u32* cmd_buff) { |
diff --git a/src/core/hle/service/soc_u.cpp b/src/core/hle/service/soc_u.cpp index 39b8d65fd..1e0f5df9b 100644 --- a/src/core/hle/service/soc_u.cpp +++ b/src/core/hle/service/soc_u.cpp | |||
| @@ -139,7 +139,7 @@ static int TranslateError(int error) { | |||
| 139 | auto found = error_map.find(error); | 139 | auto found = error_map.find(error); |
| 140 | if (found != error_map.end()) | 140 | if (found != error_map.end()) |
| 141 | return -found->second; | 141 | return -found->second; |
| 142 | 142 | ||
| 143 | return error; | 143 | return error; |
| 144 | } | 144 | } |
| 145 | 145 | ||
| @@ -346,7 +346,7 @@ static void Bind(Service::Interface* self) { | |||
| 346 | sockaddr sock_addr = CTRSockAddr::ToPlatform(*ctr_sock_addr); | 346 | sockaddr sock_addr = CTRSockAddr::ToPlatform(*ctr_sock_addr); |
| 347 | 347 | ||
| 348 | int res = ::bind(socket_handle, &sock_addr, std::max<u32>(sizeof(sock_addr), len)); | 348 | int res = ::bind(socket_handle, &sock_addr, std::max<u32>(sizeof(sock_addr), len)); |
| 349 | 349 | ||
| 350 | int result = 0; | 350 | int result = 0; |
| 351 | if (res != 0) | 351 | if (res != 0) |
| 352 | result = TranslateError(GET_ERRNO); | 352 | result = TranslateError(GET_ERRNO); |
| @@ -360,14 +360,14 @@ static void Fcntl(Service::Interface* self) { | |||
| 360 | u32 socket_handle = cmd_buffer[1]; | 360 | u32 socket_handle = cmd_buffer[1]; |
| 361 | u32 ctr_cmd = cmd_buffer[2]; | 361 | u32 ctr_cmd = cmd_buffer[2]; |
| 362 | u32 ctr_arg = cmd_buffer[3]; | 362 | u32 ctr_arg = cmd_buffer[3]; |
| 363 | 363 | ||
| 364 | int result = 0; | 364 | int result = 0; |
| 365 | u32 posix_ret = 0; // TODO: Check what hardware returns for F_SETFL (unspecified by POSIX) | 365 | u32 posix_ret = 0; // TODO: Check what hardware returns for F_SETFL (unspecified by POSIX) |
| 366 | SCOPE_EXIT({ | 366 | SCOPE_EXIT({ |
| 367 | cmd_buffer[1] = result; | 367 | cmd_buffer[1] = result; |
| 368 | cmd_buffer[2] = posix_ret; | 368 | cmd_buffer[2] = posix_ret; |
| 369 | }); | 369 | }); |
| 370 | 370 | ||
| 371 | if (ctr_cmd == 3) { // F_GETFL | 371 | if (ctr_cmd == 3) { // F_GETFL |
| 372 | #if EMU_PLATFORM == PLATFORM_WINDOWS | 372 | #if EMU_PLATFORM == PLATFORM_WINDOWS |
| 373 | posix_ret = 0; | 373 | posix_ret = 0; |
| @@ -404,11 +404,11 @@ static void Fcntl(Service::Interface* self) { | |||
| 404 | posix_ret = -1; | 404 | posix_ret = -1; |
| 405 | return; | 405 | return; |
| 406 | } | 406 | } |
| 407 | 407 | ||
| 408 | flags &= ~O_NONBLOCK; | 408 | flags &= ~O_NONBLOCK; |
| 409 | if (ctr_arg & 4) // O_NONBLOCK | 409 | if (ctr_arg & 4) // O_NONBLOCK |
| 410 | flags |= O_NONBLOCK; | 410 | flags |= O_NONBLOCK; |
| 411 | 411 | ||
| 412 | int ret = ::fcntl(socket_handle, F_SETFL, flags); | 412 | int ret = ::fcntl(socket_handle, F_SETFL, flags); |
| 413 | if (ret == SOCKET_ERROR_VALUE) { | 413 | if (ret == SOCKET_ERROR_VALUE) { |
| 414 | result = TranslateError(GET_ERRNO); | 414 | result = TranslateError(GET_ERRNO); |
| @@ -439,8 +439,8 @@ static void Listen(Service::Interface* self) { | |||
| 439 | } | 439 | } |
| 440 | 440 | ||
| 441 | static void Accept(Service::Interface* self) { | 441 | static void Accept(Service::Interface* self) { |
| 442 | // TODO(Subv): Calling this function on a blocking socket will block the emu thread, | 442 | // TODO(Subv): Calling this function on a blocking socket will block the emu thread, |
| 443 | // preventing graceful shutdown when closing the emulator, this can be fixed by always | 443 | // preventing graceful shutdown when closing the emulator, this can be fixed by always |
| 444 | // performing nonblocking operations and spinlock until the data is available | 444 | // performing nonblocking operations and spinlock until the data is available |
| 445 | u32* cmd_buffer = Kernel::GetCommandBuffer(); | 445 | u32* cmd_buffer = Kernel::GetCommandBuffer(); |
| 446 | u32 socket_handle = cmd_buffer[1]; | 446 | u32 socket_handle = cmd_buffer[1]; |
| @@ -448,7 +448,7 @@ static void Accept(Service::Interface* self) { | |||
| 448 | sockaddr addr; | 448 | sockaddr addr; |
| 449 | socklen_t addr_len = sizeof(addr); | 449 | socklen_t addr_len = sizeof(addr); |
| 450 | u32 ret = static_cast<u32>(::accept(socket_handle, &addr, &addr_len)); | 450 | u32 ret = static_cast<u32>(::accept(socket_handle, &addr, &addr_len)); |
| 451 | 451 | ||
| 452 | if ((s32)ret != SOCKET_ERROR_VALUE) | 452 | if ((s32)ret != SOCKET_ERROR_VALUE) |
| 453 | open_sockets[ret] = { ret, true }; | 453 | open_sockets[ret] = { ret, true }; |
| 454 | 454 | ||
| @@ -525,8 +525,8 @@ static void SendTo(Service::Interface* self) { | |||
| 525 | } | 525 | } |
| 526 | 526 | ||
| 527 | static void RecvFrom(Service::Interface* self) { | 527 | static void RecvFrom(Service::Interface* self) { |
| 528 | // TODO(Subv): Calling this function on a blocking socket will block the emu thread, | 528 | // TODO(Subv): Calling this function on a blocking socket will block the emu thread, |
| 529 | // preventing graceful shutdown when closing the emulator, this can be fixed by always | 529 | // preventing graceful shutdown when closing the emulator, this can be fixed by always |
| 530 | // performing nonblocking operations and spinlock until the data is available | 530 | // performing nonblocking operations and spinlock until the data is available |
| 531 | u32* cmd_buffer = Kernel::GetCommandBuffer(); | 531 | u32* cmd_buffer = Kernel::GetCommandBuffer(); |
| 532 | u32 socket_handle = cmd_buffer[1]; | 532 | u32 socket_handle = cmd_buffer[1]; |
| @@ -568,7 +568,7 @@ static void Poll(Service::Interface* self) { | |||
| 568 | pollfd* platform_pollfd = new pollfd[nfds]; | 568 | pollfd* platform_pollfd = new pollfd[nfds]; |
| 569 | for (unsigned current_fds = 0; current_fds < nfds; ++current_fds) | 569 | for (unsigned current_fds = 0; current_fds < nfds; ++current_fds) |
| 570 | platform_pollfd[current_fds] = CTRPollFD::ToPlatform(input_fds[current_fds]); | 570 | platform_pollfd[current_fds] = CTRPollFD::ToPlatform(input_fds[current_fds]); |
| 571 | 571 | ||
| 572 | int ret = ::poll(platform_pollfd, nfds, timeout); | 572 | int ret = ::poll(platform_pollfd, nfds, timeout); |
| 573 | 573 | ||
| 574 | // Now update the output pollfd structure | 574 | // Now update the output pollfd structure |
| @@ -630,7 +630,7 @@ static void GetPeerName(Service::Interface* self) { | |||
| 630 | socklen_t len = cmd_buffer[2]; | 630 | socklen_t len = cmd_buffer[2]; |
| 631 | 631 | ||
| 632 | CTRSockAddr* ctr_dest_addr = reinterpret_cast<CTRSockAddr*>(Memory::GetPointer(cmd_buffer[0x104 >> 2])); | 632 | CTRSockAddr* ctr_dest_addr = reinterpret_cast<CTRSockAddr*>(Memory::GetPointer(cmd_buffer[0x104 >> 2])); |
| 633 | 633 | ||
| 634 | sockaddr dest_addr; | 634 | sockaddr dest_addr; |
| 635 | socklen_t dest_addr_len = sizeof(dest_addr); | 635 | socklen_t dest_addr_len = sizeof(dest_addr); |
| 636 | int ret = ::getpeername(socket_handle, &dest_addr, &dest_addr_len); | 636 | int ret = ::getpeername(socket_handle, &dest_addr, &dest_addr_len); |
| @@ -651,8 +651,8 @@ static void GetPeerName(Service::Interface* self) { | |||
| 651 | } | 651 | } |
| 652 | 652 | ||
| 653 | static void Connect(Service::Interface* self) { | 653 | static void Connect(Service::Interface* self) { |
| 654 | // TODO(Subv): Calling this function on a blocking socket will block the emu thread, | 654 | // TODO(Subv): Calling this function on a blocking socket will block the emu thread, |
| 655 | // preventing graceful shutdown when closing the emulator, this can be fixed by always | 655 | // preventing graceful shutdown when closing the emulator, this can be fixed by always |
| 656 | // performing nonblocking operations and spinlock until the data is available | 656 | // performing nonblocking operations and spinlock until the data is available |
| 657 | u32* cmd_buffer = Kernel::GetCommandBuffer(); | 657 | u32* cmd_buffer = Kernel::GetCommandBuffer(); |
| 658 | u32 socket_handle = cmd_buffer[1]; | 658 | u32 socket_handle = cmd_buffer[1]; |
diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp index ca3ff3328..d1555c753 100644 --- a/src/core/hle/svc.cpp +++ b/src/core/hle/svc.cpp | |||
| @@ -228,7 +228,7 @@ static ResultCode WaitSynchronizationN(s32* out, Handle* handles, s32 handle_cou | |||
| 228 | // Actually wait the current thread on each object if we decided to wait... | 228 | // Actually wait the current thread on each object if we decided to wait... |
| 229 | std::vector<SharedPtr<Kernel::WaitObject>> wait_objects; | 229 | std::vector<SharedPtr<Kernel::WaitObject>> wait_objects; |
| 230 | wait_objects.reserve(handle_count); | 230 | wait_objects.reserve(handle_count); |
| 231 | 231 | ||
| 232 | for (int i = 0; i < handle_count; ++i) { | 232 | for (int i = 0; i < handle_count; ++i) { |
| 233 | auto object = Kernel::g_handle_table.GetWaitObject(handles[i]); | 233 | auto object = Kernel::g_handle_table.GetWaitObject(handles[i]); |
| 234 | object->AddWaitingThread(Kernel::GetCurrentThread()); | 234 | object->AddWaitingThread(Kernel::GetCurrentThread()); |
| @@ -475,7 +475,7 @@ static ResultCode GetProcessIdOfThread(u32* process_id, Handle thread_handle) { | |||
| 475 | return ERR_INVALID_HANDLE; | 475 | return ERR_INVALID_HANDLE; |
| 476 | 476 | ||
| 477 | const SharedPtr<Kernel::Process> process = thread->owner_process; | 477 | const SharedPtr<Kernel::Process> process = thread->owner_process; |
| 478 | 478 | ||
| 479 | ASSERT_MSG(process != nullptr, "Invalid parent process for thread=0x%08X", thread_handle); | 479 | ASSERT_MSG(process != nullptr, "Invalid parent process for thread=0x%08X", thread_handle); |
| 480 | 480 | ||
| 481 | *process_id = process->process_id; | 481 | *process_id = process->process_id; |