Prepare IO Ports for timer
This commit is contained in:
parent
8c6c9e23d6
commit
e5175d0f9c
|
@ -25,6 +25,11 @@ namespace JabyEngine {
|
||||||
constexpr const volatile T& ref() const {
|
constexpr const volatile T& ref() const {
|
||||||
return const_cast<volatile IOPort<T>*>(this)->value;
|
return const_cast<volatile IOPort<T>*>(this)->value;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
constexpr IOPort<T>& operator=(T value) {
|
||||||
|
IOPort::write(value);
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
struct __no_align ubus32_t {
|
struct __no_align ubus32_t {
|
||||||
|
@ -63,6 +68,7 @@ namespace JabyEngine {
|
||||||
|
|
||||||
#define __declare_io_port_global(type, name, adr) __declare_io_port_global_raw(, type, name, adr)
|
#define __declare_io_port_global(type, name, adr) __declare_io_port_global_raw(, type, name, adr)
|
||||||
#define __declare_io_port_global_const(type, name, adr) __declare_io_port_global_raw(const, type, name, adr)
|
#define __declare_io_port_global_const(type, name, adr) __declare_io_port_global_raw(const, type, name, adr)
|
||||||
|
|
||||||
#define __declare_io_port_global_array(type, name, adr, size) static __always_inline auto& name = reinterpret_cast<type(&)[size]>(*reinterpret_cast<type*>((IO_Base_Adr + (adr & ~IO_Base_Mask))))
|
#define __declare_io_port_global_array(type, name, adr, size) static __always_inline auto& name = reinterpret_cast<type(&)[size]>(*reinterpret_cast<type*>((IO_Base_Adr + (adr & ~IO_Base_Mask))))
|
||||||
#define __declare_io_port_global_struct(type, name, adr) static __always_inline auto& name = *reinterpret_cast<type*>(__io_port_adr(adr))
|
#define __declare_io_port_global_struct(type, name, adr) static __always_inline auto& name = *reinterpret_cast<type*>(__io_port_adr(adr))
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,93 @@
|
||||||
|
#ifndef __JABYENGINE_TIMER_IO_HPP__
|
||||||
|
#define __JABYENGINE_TIMER_IO_HPP__
|
||||||
|
#include "ioport.hpp"
|
||||||
|
|
||||||
|
namespace JabyEngine {
|
||||||
|
namespace Timer {
|
||||||
|
enum struct SyncMode {};
|
||||||
|
|
||||||
|
struct __no_align CounterMode : public ComplexBitMap<uint32_t> {
|
||||||
|
__io_port_inherit_complex_bit_map(CounterMode);
|
||||||
|
|
||||||
|
static constexpr auto SyncEnable = Bit<uint32_t>(0);
|
||||||
|
static constexpr auto SyncMode = BitRange<uint32_t>::from_to(1, 2);
|
||||||
|
static constexpr auto ResetAfterTarget = Bit<uint32_t>(3);
|
||||||
|
static constexpr auto IRQAtTarget = Bit<uint32_t>(4);
|
||||||
|
static constexpr auto IRQAtMax = Bit<uint32_t>(5);
|
||||||
|
static constexpr auto IRQOneShot = !Bit<uint32_t>(6);
|
||||||
|
static constexpr auto IRQEveryTime = Bit<uint32_t>(6);
|
||||||
|
static constexpr auto IRQPulse = !Bit<uint32_t>(7);
|
||||||
|
static constexpr auto IRQToggle = Bit<uint32_t>(7);
|
||||||
|
static constexpr auto ClockSource = BitRange<uint32_t>::from_to(8, 9);
|
||||||
|
static constexpr auto HasIRQRequest = Bit<uint32_t>(10);
|
||||||
|
static constexpr auto IsTargetReached = Bit<uint32_t>(11);
|
||||||
|
static constexpr auto IsMaxReached = Bit<uint32_t>(12);
|
||||||
|
};
|
||||||
|
|
||||||
|
struct __no_align CounterTarget : public ComplexBitMap<uint32_t> {
|
||||||
|
__io_port_inherit_complex_bit_map(CounterTarget);
|
||||||
|
|
||||||
|
static constexpr auto CounterTargetValue = BitRange<uint32_t>::from_to(0, 15);
|
||||||
|
};
|
||||||
|
|
||||||
|
struct __no_align Timer {
|
||||||
|
IOPort<CounterMode> counter_mode;
|
||||||
|
IOPort<CounterTarget> counter_target;
|
||||||
|
private:
|
||||||
|
uint32_t _unused[2];
|
||||||
|
};
|
||||||
|
|
||||||
|
__declare_io_port_global_array(Timer, timer, 0x1F801104, 3);
|
||||||
|
static_assert(sizeof(Timer) == 0x10);
|
||||||
|
|
||||||
|
namespace Counter0 {
|
||||||
|
struct SyncMode {
|
||||||
|
static constexpr auto Pause_During_Hblank = CounterMode::SyncMode.with(0);
|
||||||
|
static constexpr auto Zero_At_Hblank = CounterMode::SyncMode.with(1);
|
||||||
|
static constexpr auto Zero_At_Hblank_Pause_Outside_Hblank = CounterMode::SyncMode.with(2);
|
||||||
|
static constexpr auto Pause_Until_Hblank_Then_Freerun = CounterMode::SyncMode.with(3);
|
||||||
|
};
|
||||||
|
|
||||||
|
struct Source {
|
||||||
|
static constexpr auto System_Clock = CounterMode::ClockSource.with(0);
|
||||||
|
static constexpr auto Dot_Clock = CounterMode::ClockSource.with(1);
|
||||||
|
static constexpr auto System_Clock_Too = CounterMode::ClockSource.with(2);
|
||||||
|
static constexpr auto Dot_Clock_Too = CounterMode::ClockSource.with(3);
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
namespace Counter1 {
|
||||||
|
struct SyncMode {
|
||||||
|
static constexpr auto Pause_During_Vblank = CounterMode::SyncMode.with(0);
|
||||||
|
static constexpr auto Zero_At_Vblank = CounterMode::SyncMode.with(1);
|
||||||
|
static constexpr auto Zero_At_Vblank_Pause_Outside_Vblank = CounterMode::SyncMode.with(2);
|
||||||
|
static constexpr auto Pause_Until_Vblank_Then_Freerun = CounterMode::SyncMode.with(3);
|
||||||
|
};
|
||||||
|
|
||||||
|
struct Source {
|
||||||
|
static constexpr auto System_Clock = CounterMode::ClockSource.with(0);
|
||||||
|
static constexpr auto Hblank = CounterMode::ClockSource.with(1);
|
||||||
|
static constexpr auto System_Clock_Too = CounterMode::ClockSource.with(2);
|
||||||
|
static constexpr auto Hblank_Too = CounterMode::ClockSource.with(3);
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
namespace Counter2 {
|
||||||
|
struct SyncMode {
|
||||||
|
static constexpr auto Stop_Counter = CounterMode::SyncMode.with(0);
|
||||||
|
static constexpr auto Freerun = CounterMode::SyncMode.with(1);
|
||||||
|
static constexpr auto Freerun_Too = CounterMode::SyncMode.with(2);
|
||||||
|
static constexpr auto Stop_Counter_Too = CounterMode::SyncMode.with(3);
|
||||||
|
};
|
||||||
|
|
||||||
|
struct Source {
|
||||||
|
static constexpr auto System_Clock = CounterMode::ClockSource.with(0);
|
||||||
|
static constexpr auto System_Clock_Too = CounterMode::ClockSource.with(1);
|
||||||
|
static constexpr auto System_Clock_Div_8 = CounterMode::ClockSource.with(2);
|
||||||
|
static constexpr auto System_Clock_Div_8_Too = CounterMode::ClockSource.with(3);
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif //!__JABYENGINE_TIMER_IO_HPP__
|
|
@ -20,5 +20,9 @@ namespace JabyEngine {
|
||||||
namespace BootFile {
|
namespace BootFile {
|
||||||
JabyEngine::NextRoutine setup();
|
JabyEngine::NextRoutine setup();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
namespace Timer {
|
||||||
|
void setup();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
#endif //!BOOT_LOADER_HPP
|
#endif //!BOOT_LOADER_HPP
|
|
@ -0,0 +1,14 @@
|
||||||
|
#include <PSX/System/IOPorts/timer_io.hpp>
|
||||||
|
|
||||||
|
namespace JabyEngine {
|
||||||
|
namespace Timer {
|
||||||
|
void setup() {
|
||||||
|
// Just testing around
|
||||||
|
static constexpr auto wuff = CounterMode::with(CounterMode::IRQAtMax, Counter0::SyncMode::Zero_At_Hblank);
|
||||||
|
|
||||||
|
timer[0].counter_mode = wuff;
|
||||||
|
timer[0].counter_mode = wuff;
|
||||||
|
timer[0].counter_mode = wuff;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue