Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2397 from Subv/pulse

Browse source 
Kernel: Implemented Pulse event and timers.
This commit is contained in:
bunnei 2017-01-10 10:45:00 -05:00 • committed by GitHub
commit 84d72fd92f
5 changed files with 20 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/core/hle/kernel/timer.cpp
View file

@ -31,11 +31,6 @@ SharedPtr<Timer> Timer::Create(ResetType reset_type, std::string name) {
timer->interval_delay = 0;
timer->callback_handle = timer_callback_handle_table.Create(timer).MoveFrom();
if (reset_type == ResetType::Pulse) {
LOG_ERROR(Kernel, "Unimplemented timer reset type Pulse");
UNIMPLEMENTED();
}
return timer;
}
@ -70,6 +65,13 @@ void Timer::Clear() {
signaled = false;
}
void Timer::WakeupAllWaitingThreads() {
WaitObject::WakeupAllWaitingThreads();
if (reset_type == ResetType::Pulse)
signaled = false;
}
/// The timer callback event, called when a timer is fired
static void TimerCallback(u64 timer_handle, int cycles_late) {
SharedPtr<Timer> timer =