jaby/jabyengine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Added missing IO

Browse Source
This commit is contained in:
jaby
2024-09-29 16:09:04 +02:00
parent 5bafe78ab5
commit c41d996c34
4 changed files with 30 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
include/PSX/System/IOPorts/timer_io.hpp
View File

@@ -3,8 +3,6 @@
namespace JabyEngine {
namespace Timer_IO {
using namespace Timer_IO_Values;
using CounterModeIO = IOPort<Timer_IO_Values::CounterMode>;
using CounterTargetIO = IOPort<Timer_IO_Values::CounterTarget>;
using CounterValueIO = IOPort<Timer_IO_Values::CounterValue>;
@@ -17,14 +15,14 @@ namespace JabyEngine {
uint32_t unused;
inline uint16_t get_current_value() const {
return this->value.read().get(CounterValue::Value);
return this->value.read().get(Timer_IO_Values::CounterValue::Value);
}
inline void set_target_value(uint16_t value) {
this->target.write(CounterTarget{0}.set_range(CounterTarget::CounterTargetValue, value));
this->target.write(Timer_IO_Values::CounterTarget{0}.set_range(Timer_IO_Values::CounterTarget::CounterTargetValue, value));
}
inline void set_mode(CounterMode mode) {
inline void set_mode(Timer_IO_Values::CounterMode mode) {
this->mode.write(mode);
}
};
@@ -33,49 +31,49 @@ namespace JabyEngine {
#pragma pack(push, 1)
struct Counter0 : public Counter {
struct SyncMode {
static constexpr auto Zero_At_Hblank = CounterMode::SyncMode.with(1u);
static constexpr auto Pause_During_Hblank = CounterMode::SyncMode.with(0u);
static constexpr auto Zero_At_Hblank_Pause_Outside_Hblank = CounterMode::SyncMode.with(2u);
static constexpr auto Pause_Until_Hblank_Then_Freerun = CounterMode::SyncMode.with(3u);
static constexpr auto Zero_At_Hblank = Timer_IO_Values::CounterMode::SyncMode.with(1u);
static constexpr auto Pause_During_Hblank = Timer_IO_Values::CounterMode::SyncMode.with(0u);
static constexpr auto Zero_At_Hblank_Pause_Outside_Hblank = Timer_IO_Values::CounterMode::SyncMode.with(2u);
static constexpr auto Pause_Until_Hblank_Then_Freerun = Timer_IO_Values::CounterMode::SyncMode.with(3u);
};
struct Source {
static constexpr auto System_Clock = CounterMode::ClockSource.with(0u);
static constexpr auto Dot_Clock = CounterMode::ClockSource.with(1u);
static constexpr auto System_Clock_Too = CounterMode::ClockSource.with(2u);
static constexpr auto Dot_Clock_Too = CounterMode::ClockSource.with(3u);
static constexpr auto System_Clock = Timer_IO_Values::CounterMode::ClockSource.with(0u);
static constexpr auto Dot_Clock = Timer_IO_Values::CounterMode::ClockSource.with(1u);
static constexpr auto System_Clock_Too = Timer_IO_Values::CounterMode::ClockSource.with(2u);
static constexpr auto Dot_Clock_Too = Timer_IO_Values::CounterMode::ClockSource.with(3u);
};
};
struct Counter1 : public Counter {
struct SyncMode {
static constexpr auto Pause_During_Vblank = CounterMode::SyncMode.with(0u);
static constexpr auto Zero_At_Vblank = CounterMode::SyncMode.with(1u);
static constexpr auto Zero_At_Vblank_Pause_Outside_Vblank = CounterMode::SyncMode.with(2u);
static constexpr auto Pause_Until_Vblank_Then_FreeRun = CounterMode::SyncMode.with(3u);
static constexpr auto Pause_During_Vblank = Timer_IO_Values::CounterMode::SyncMode.with(0u);
static constexpr auto Zero_At_Vblank = Timer_IO_Values::CounterMode::SyncMode.with(1u);
static constexpr auto Zero_At_Vblank_Pause_Outside_Vblank = Timer_IO_Values::CounterMode::SyncMode.with(2u);
static constexpr auto Pause_Until_Vblank_Then_FreeRun = Timer_IO_Values::CounterMode::SyncMode.with(3u);
};
struct Source {
static constexpr auto System_Clock = CounterMode::ClockSource.with(0u);
static constexpr auto Hblank = CounterMode::ClockSource.with(1u);
static constexpr auto System_Clock_Too = CounterMode::ClockSource.with(2u);
static constexpr auto Hblank_Too = CounterMode::ClockSource.with(3u);
static constexpr auto System_Clock = Timer_IO_Values::CounterMode::ClockSource.with(0u);
static constexpr auto Hblank = Timer_IO_Values::CounterMode::ClockSource.with(1u);
static constexpr auto System_Clock_Too = Timer_IO_Values::CounterMode::ClockSource.with(2u);
static constexpr auto Hblank_Too = Timer_IO_Values::CounterMode::ClockSource.with(3u);
};
};
struct Counter2 : public Counter {
struct SyncMode {
static constexpr auto Stop_Counter = CounterMode::SyncMode.with(0u);
static constexpr auto FreeRun = CounterMode::SyncMode.with(1u);
static constexpr auto FreeRun_Too = CounterMode::SyncMode.with(2u);
static constexpr auto Stop_Counter_Too = CounterMode::SyncMode.with(3u);
static constexpr auto Stop_Counter = Timer_IO_Values::CounterMode::SyncMode.with(0u);
static constexpr auto FreeRun = Timer_IO_Values::CounterMode::SyncMode.with(1u);
static constexpr auto FreeRun_Too = Timer_IO_Values::CounterMode::SyncMode.with(2u);
static constexpr auto Stop_Counter_Too = Timer_IO_Values::CounterMode::SyncMode.with(3u);
};
struct Source {
static constexpr auto System_Clock = CounterMode::ClockSource.with(0u);
static constexpr auto System_Clock_Too = CounterMode::ClockSource.with(1u);
static constexpr auto System_Clock_Div_8 = CounterMode::ClockSource.with(2u);
static constexpr auto System_Clock_Div_8_Too = CounterMode::ClockSource.with(3u);
static constexpr auto System_Clock = Timer_IO_Values::CounterMode::ClockSource.with(0u);
static constexpr auto System_Clock_Too = Timer_IO_Values::CounterMode::ClockSource.with(1u);
static constexpr auto System_Clock_Div_8 = Timer_IO_Values::CounterMode::ClockSource.with(2u);
static constexpr auto System_Clock_Div_8_Too = Timer_IO_Values::CounterMode::ClockSource.with(3u);
};
};
#pragma pack(pop)