Support HighResolutionTimer in a better fashion

This commit is contained in:
Jaby
2023-01-10 20:36:28 +01:00
committed by Jaby
parent 9950484f9a
commit 4ec13192f3
8 changed files with 152 additions and 129 deletions

View File

@@ -1,51 +1,37 @@
#include <PSX/System/IOPorts/interrupt_io.hpp>
#include <PSX/System/IOPorts/timer_io.hpp>
#include <PSX/System/syscalls.h>
#include <PSX/jabyengine_config.hpp>
#ifdef JABYENGINE_USE_HIGH_PERCISION_TIMER
#include <PSX/System/IOPorts/interrupt_io.hpp>
#include <PSX/System/syscalls.h>
#define private public
#include <PSX/Timer/high_res_timer.hpp>
#undef private
#include <GPU/gpu.hpp>
#include <stdio.h>
namespace JabyEngine {
namespace Timer {
extern InterrupCallback IRQCallback;
void setup() {
using namespace Timer_IO;
namespace JabyEngine {
namespace Timer {
extern InterrupCallback IRQCallback;
static constexpr auto Mode = CounterMode::with(CounterMode::FreeRun, Counter2::SyncMode::Freerun, CounterMode::ResetAfterTarget, CounterMode::IRQAtTarget, CounterMode::IRQEveryTime, CounterMode::IRQPulse, Counter2::Source::System_Clock_Div_8);
static constexpr double CPU_Frequency_Hz = 33868800.0;
static constexpr double CPU_Frequency_Hz_Div8 = (CPU_Frequency_Hz/8.0);
Interrupt::disable_irq(Interrupt::Timer2);
template<typename T>
static constexpr T NS_Per_Tick(double CPU_Frequency_Hz, double time = 1.0) {
return static_cast<T>((time/CPU_Frequency_Hz)*1000.0*1000.0*1000.0);
}
__syscall_EnterCriticalSection();
__syscall_SysEnqIntRP(Timer2Irq, &IRQCallback);
__syscall_ExitCriticalSection();
template<typename T>
static constexpr T US_Per_Tick(double CPU_Frequency_Hz, double time = 1.0) {
return static_cast<T>(((time*1000.0)/NS_Per_Tick<double>(CPU_Frequency_Hz)));
}
Counter2.target.write(CounterTarget::CounterTargetValue.with(HighResTime::TicksFor10ms));
Counter2.mode.write(Mode);
template<typename T>
static constexpr T MS_Per_Tick(double CPU_Frequency_Hz, double time = 1.0) {
return static_cast<T>(((time*1000.0*1000.0)/NS_Per_Tick<double>(CPU_Frequency_Hz)));
}
void setup() {
using namespace Timer_IO;
static constexpr auto Mode = CounterMode::with(CounterMode::FreeRun, Counter2::SyncMode::Freerun, CounterMode::ResetAfterTarget, CounterMode::IRQAtTarget, CounterMode::IRQEveryTime, CounterMode::IRQPulse, Counter2::Source::System_Clock_Div_8);
#ifdef JABYENGINE_USE_HIGH_PERCISION_TIMER
static constexpr uint16_t Target = US_Per_Tick<uint16_t>(CPU_Frequency_Hz, 100.0);
#else
static constexpr uint16_t Target = MS_Per_Tick<uint16_t>(CPU_Frequency_Hz_Div8, 10.0);
#endif //#ifdef JABYENGINE_USE_HIGH_PERCISION_TIMER
Interrupt::disable_irq(Interrupt::Timer2);
__syscall_EnterCriticalSection();
__syscall_SysEnqIntRP(Timer2Irq, &IRQCallback);
__syscall_ExitCriticalSection();
Counter2.target.write(CounterTarget::CounterTargetValue.with(Target));
Counter2.mode.write(Mode);
Interrupt::enable_irq(Interrupt::Timer2);
Interrupt::enable_irq(Interrupt::Timer2);
}
}
}
}
#else
namespace JabyEngine {
namespace Timer {
void setup() {
}
}
}
#endif //JABYENGINE_USE_HIGH_PERCISION_TIMER