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/kernel | |
| 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/kernel')
| -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 |
5 files changed, 11 insertions, 11 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 | } |