From 068eb48557a96b30ff595f88dd28357f880333ef Mon Sep 17 00:00:00 2001 From: Jaby Date: Sun, 8 Jan 2023 21:08:23 +0100 Subject: [PATCH] Improve struct and namespace usage --- include/PSX/GPU/gpu.hpp | 18 +++--- include/PSX/System/IOPorts/dma_io.hpp | 14 ++--- include/PSX/System/IOPorts/gpu_io.hpp | 10 ++-- include/PSX/System/IOPorts/interrupt_io.hpp | 16 ++--- include/PSX/System/IOPorts/ioport.hpp | 3 + include/PSX/System/IOPorts/spu_io.hpp | 52 ++++++++-------- include/PSX/System/IOPorts/timer_io.hpp | 28 ++++----- src/Library/include/GPU/gpu.hpp | 66 ++++++++++----------- src/Library/src/BootLoader/gpu_boot.cpp | 6 +- src/Library/src/BootLoader/spu_boot.cpp | 52 ++++++++-------- src/Library/src/BootLoader/start_boot.cpp | 2 +- src/Library/src/BootLoader/timer_boot.cpp | 6 +- src/Library/src/GPU/GPU.cpp | 38 ------------ src/Library/src/GPU/gpu.cpp | 35 +++++++++++ 14 files changed, 169 insertions(+), 177 deletions(-) delete mode 100644 src/Library/src/GPU/GPU.cpp create mode 100644 src/Library/src/GPU/gpu.cpp diff --git a/include/PSX/GPU/gpu.hpp b/include/PSX/GPU/gpu.hpp index b89b2f20..2960d8e3 100644 --- a/include/PSX/GPU/gpu.hpp +++ b/include/PSX/GPU/gpu.hpp @@ -12,7 +12,7 @@ namespace JabyEngine { namespace GPU { - namespace Display { + struct Display { #ifdef JABYENGINE_PAL static constexpr size_t Width = 320; static constexpr size_t Height = 256; @@ -22,21 +22,19 @@ namespace JabyEngine { #endif static void enable() { - GP1.write(Command::GP1::SetDisplayState(DisplayState::On)); + GPU_IO::GP1.write(GPU_IO::Command::GP1::SetDisplayState(GPU_IO::DisplayState::On)); } static void disable() { - GP1.write(Command::GP1::SetDisplayState(DisplayState::Off)); + GPU_IO::GP1.write(GPU_IO::Command::GP1::SetDisplayState(GPU_IO::DisplayState::Off)); } - } + }; - namespace Screen { - extern uint8_t CurrentDisplayAreaID; + struct Screen { + static uint8_t CurrentDisplayAreaID; - namespace Range { - void set_offset(uint16_t x, uint16_t y); - } - } + static void set_offset(uint16_t x, uint16_t y); + }; } } #endif //!__JABYENGINE_GPU_HPP__ \ No newline at end of file diff --git a/include/PSX/System/IOPorts/dma_io.hpp b/include/PSX/System/IOPorts/dma_io.hpp index ea16e67f..60117b77 100644 --- a/include/PSX/System/IOPorts/dma_io.hpp +++ b/include/PSX/System/IOPorts/dma_io.hpp @@ -3,7 +3,7 @@ #include "ioport.hpp" namespace JabyEngine { - namespace DMA { + namespace DMA_IO { struct __no_align MADR : public ComplexBitMap { __io_port_inherit_complex_bit_map(MADR); @@ -130,13 +130,13 @@ namespace JabyEngine { static constexpr auto ForceIRQ = Bit(15); }; - __declare_io_port_global(Registers, MDECin, 0x1F801080); - __declare_io_port_global(Registers, MDECout, 0x1F801090); + __declare_io_port_global_struct(Registers, MDECin, 0x1F801080); + __declare_io_port_global_struct(Registers, MDECout, 0x1F801090); __declare_io_port_global_struct(Registers, GPU, 0x1F8010A0); - __declare_io_port_global(Registers, CDROM, 0x1F8010B0); - __declare_io_port_global(Registers, SPU, 0x1F8010C0); - __declare_io_port_global(Registers, PIO, 0x1F8010D0); - __declare_io_port_global(Registers, OTC, 0x1F8010E0); + __declare_io_port_global_struct(Registers, CDROM, 0x1F8010B0); + __declare_io_port_global_struct(Registers, SPU, 0x1F8010C0); + __declare_io_port_global_struct(Registers, PIO, 0x1F8010D0); + __declare_io_port_global_struct(Registers, OTC, 0x1F8010E0); __declare_io_port_global(DMAControlRegister, DPCR, 0x1F8010F0); __declare_io_port_global(DMAInterruptRegister, DICR, 0x1F8010F4); diff --git a/include/PSX/System/IOPorts/gpu_io.hpp b/include/PSX/System/IOPorts/gpu_io.hpp index 7c4d2742..7578276c 100644 --- a/include/PSX/System/IOPorts/gpu_io.hpp +++ b/include/PSX/System/IOPorts/gpu_io.hpp @@ -4,7 +4,7 @@ #include "../../GPU/gpu_types.hpp" namespace JabyEngine { - namespace GPU { + namespace GPU_IO { enum struct SemiTransparency { B_Half_add_F_Half = 0, B_add_F = 1, @@ -47,11 +47,11 @@ namespace JabyEngine { Off = 1 }; - namespace Command { + struct Command { struct __no_align GP0 : public ComplexBitMap { __io_port_inherit_complex_bit_map(GP0); - static constexpr GP0 QuickFill(Color24 color) { + static constexpr GP0 QuickFill(GPU::Color24 color) { return ComplexBitMap{(0x02 << 24) | color.raw()}; } @@ -132,7 +132,7 @@ namespace JabyEngine { return ComplexBitMap{construct_cmd(0x08, mode)}; } }; - } + }; struct __no_align GPUStatusRegister : public ComplexBitMap { static constexpr auto DrawingOddLinesInterlaced = Bit(31); @@ -144,7 +144,7 @@ namespace JabyEngine { static constexpr auto InterruptRequest = Bit(24); static constexpr auto DisplayDisabled = Bit(23); static constexpr auto VerticalInterlaceOn = Bit(22); - static constexpr auto DisplayAreaColorDepth = BitRange::from_to(21, 21); + static constexpr auto DisplayAreaColorDepth = BitRange::from_to(21, 21); static constexpr auto VideoModePal = Bit(20); static constexpr auto VerticalResolutionValue = BitRange::from_to(19, 19); static constexpr auto HorizontalResolutionValue = BitRange::from_to(17, 18); diff --git a/include/PSX/System/IOPorts/interrupt_io.hpp b/include/PSX/System/IOPorts/interrupt_io.hpp index 864ef63e..3ac2dc67 100644 --- a/include/PSX/System/IOPorts/interrupt_io.hpp +++ b/include/PSX/System/IOPorts/interrupt_io.hpp @@ -3,7 +3,7 @@ #include "ioport.hpp" namespace JabyEngine { - namespace Interrupt { + struct Interrupt { static constexpr auto VBlank = Bit(0); static constexpr auto GPU = Bit(1); static constexpr auto CDROM = Bit(2); @@ -17,16 +17,16 @@ namespace JabyEngine { static constexpr auto Controller = Bit(10); static constexpr auto LightPen = Controller; - struct __no_align IRQStatus : public ComplexBitMap { - __io_port_inherit_complex_bit_map(IRQStatus); + struct __no_align Status : public ComplexBitMap { + __io_port_inherit_complex_bit_map(Status); }; - struct __no_align IRQMask : public ComplexBitMap { - __io_port_inherit_complex_bit_map(IRQMask); + struct __no_align Mask : public ComplexBitMap { + __io_port_inherit_complex_bit_map(Mask); }; - __declare_io_port_global(IRQStatus, Status, 0x1F801070); - __declare_io_port_global(IRQMask, Mask, 0x1F801074); + __declare_io_port_member(struct Status, Status, 0x1F801070); + __declare_io_port_member(struct Mask, Mask, 0x1F801074); static bool is_irq(Bit irq) { return Status.read().is_bit_set(irq); @@ -43,7 +43,7 @@ namespace JabyEngine { static void enable_irq(Bit irq) { Mask.write(Mask.read().set_bit(irq)); } - } + }; } #endif //!__JABYENGINE_INTERRUPT_IO_HPP__ \ No newline at end of file diff --git a/include/PSX/System/IOPorts/ioport.hpp b/include/PSX/System/IOPorts/ioport.hpp index 1aae0679..3451e1d4 100644 --- a/include/PSX/System/IOPorts/ioport.hpp +++ b/include/PSX/System/IOPorts/ioport.hpp @@ -69,6 +69,9 @@ namespace JabyEngine { #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_member(type, name, adr) __declare_io_port_global_raw(inline, type, name, adr) + #define __declare_io_port_member_const(type, name, adr) __declare_io_port_global_raw(const inline, type, name, adr) + #define __declare_io_port_global_array(type, name, adr, size) static __always_inline auto& name = reinterpret_cast(*reinterpret_cast((IO_Base_Adr + (adr & ~IO_Base_Mask)))) #define __declare_io_port_global_struct(type, name, adr) static __always_inline auto& name = *reinterpret_cast(__io_port_adr(adr)) diff --git a/include/PSX/System/IOPorts/spu_io.hpp b/include/PSX/System/IOPorts/spu_io.hpp index 650186bf..99549a75 100644 --- a/include/PSX/System/IOPorts/spu_io.hpp +++ b/include/PSX/System/IOPorts/spu_io.hpp @@ -3,7 +3,7 @@ #include "ioport.hpp" namespace JabyEngine { - namespace SPU { + namespace SPU_IO { enum struct Mode { Linear = 0, Exponential = 1, @@ -129,34 +129,34 @@ namespace JabyEngine { static constexpr size_t VoiceCount = 24; - namespace Key { - __declare_io_port_global(ubus32_t, on, 0x1F801D88); - __declare_io_port_global(ubus32_t, off, 0x1F801D8C); - __declare_io_port_global(ubus32_t, status, 0x1F801D9C); - } + struct Key { + __declare_io_port_member(ubus32_t, On, 0x1F801D88); + __declare_io_port_member(ubus32_t, Off, 0x1F801D8C); + __declare_io_port_member(ubus32_t, Status, 0x1F801D9C); + }; - namespace MainVolume { - __declare_io_port_global(SweepVolume, left, 0x1F801D80); - __declare_io_port_global(SweepVolume, right, 0x1F801D82); - } + struct MainVolume { + __declare_io_port_member(SweepVolume, Left, 0x1F801D80); + __declare_io_port_member(SweepVolume, Right, 0x1F801D82); + }; - namespace CDVolume { - __declare_io_port_global(SimpleVolume, left, 0x1F801DB0); - __declare_io_port_global(SimpleVolume, right, 0x1F801DB2); - } + struct CDVolume { + __declare_io_port_member(SimpleVolume, Left, 0x1F801DB0); + __declare_io_port_member(SimpleVolume, Right, 0x1F801DB2); + }; - namespace ExternalAudioInputVolume { - __declare_io_port_global(SimpleVolume, left, 0x1F801DB4); - __declare_io_port_global(SimpleVolume, right, 0x1F801DB6); - } + struct ExternalAudioInputVolume { + __declare_io_port_member(SimpleVolume, Left, 0x1F801DB4); + __declare_io_port_member(SimpleVolume, Right, 0x1F801DB6); + }; - namespace Reverb { - namespace Volume { - __declare_io_port_global(SimpleVolume, left, 0x1F801D84); - __declare_io_port_global(SimpleVolume, right, 0x1F801D86); - } - __declare_io_port_global(uint16_t, work_area_adr, 0x1F801DA2); - } + struct Reverb { + struct Volume { + __declare_io_port_member(SimpleVolume, Left, 0x1F801D84); + __declare_io_port_member(SimpleVolume, Right, 0x1F801D86); + }; + __declare_io_port_member(uint16_t, WorkAreaAdr, 0x1F801DA2); + }; __declare_io_port_global(ControlRegister, Control, 0x1F801DAA); __declare_io_port_global(uint16_t, DataTransferControl, 0x1F801DAC); @@ -164,7 +164,7 @@ namespace JabyEngine { __declare_io_port_global(NoiseGenerator, NON, 0x1F801D94); __declare_io_port_global(EchoOn, EON, 0x1F801D98); - __declare_io_port_global_array(Voice, Voices, 0x1F801C00, VoiceCount); + __declare_io_port_global_array(struct Voice, Voice, 0x1F801C00, VoiceCount); } } #endif //!__JABYENGINE_SPU_IO_HPP__ \ No newline at end of file diff --git a/include/PSX/System/IOPorts/timer_io.hpp b/include/PSX/System/IOPorts/timer_io.hpp index 010e4c04..fc8db231 100644 --- a/include/PSX/System/IOPorts/timer_io.hpp +++ b/include/PSX/System/IOPorts/timer_io.hpp @@ -3,9 +3,7 @@ #include "ioport.hpp" namespace JabyEngine { - namespace Timer { - enum struct SyncMode {}; - + namespace Timer_IO { struct __no_align CounterMode : public ComplexBitMap { __io_port_inherit_complex_bit_map(CounterMode); @@ -31,19 +29,19 @@ namespace JabyEngine { static constexpr auto CounterTargetValue = BitRange::from_to(0, 15); }; - struct __no_align TimerInfo { + struct __no_align Counter { IOPort value; IOPort mode; IOPort target; private: - uint32_t _unused[1]; + uint32_t _unused; }; static constexpr uintptr_t counter_base_adr(size_t ID) { return (0x1F801100 + (ID*0x10)); } - namespace Counter0 { + struct __no_align Counter0 : public Counter { struct SyncMode { static constexpr auto Pause_During_Hblank = CounterMode::SyncMode.with(0); static constexpr auto Zero_At_Hblank = CounterMode::SyncMode.with(1); @@ -57,11 +55,9 @@ namespace JabyEngine { static constexpr auto System_Clock_Too = CounterMode::ClockSource.with(2); static constexpr auto Dot_Clock_Too = CounterMode::ClockSource.with(3); }; + }; - __declare_io_port_global_struct(TimerInfo, Timer, counter_base_adr(0)); - } - - namespace Counter1 { + struct __no_align Counter1 : public Counter { struct SyncMode { static constexpr auto Pause_During_Vblank = CounterMode::SyncMode.with(0); static constexpr auto Zero_At_Vblank = CounterMode::SyncMode.with(1); @@ -75,11 +71,9 @@ namespace JabyEngine { static constexpr auto System_Clock_Too = CounterMode::ClockSource.with(2); static constexpr auto Hblank_Too = CounterMode::ClockSource.with(3); }; + }; - __declare_io_port_global_struct(TimerInfo, Timer, counter_base_adr(1)); - } - - namespace Counter2 { + struct __no_align Counter2 : public Counter { struct SyncMode { static constexpr auto Stop_Counter = CounterMode::SyncMode.with(0); static constexpr auto Freerun = CounterMode::SyncMode.with(1); @@ -93,9 +87,11 @@ namespace JabyEngine { static constexpr auto System_Clock_Div_8 = CounterMode::ClockSource.with(2); static constexpr auto System_Clock_Div_8_Too = CounterMode::ClockSource.with(3); }; + }; - __declare_io_port_global_struct(TimerInfo, Timer, counter_base_adr(2)); - } + __declare_io_port_global_struct(struct Counter0, Counter0, counter_base_adr(0)); + __declare_io_port_global_struct(struct Counter1, Counter1, counter_base_adr(1)); + __declare_io_port_global_struct(struct Counter2, Counter2, counter_base_adr(2)); } } diff --git a/src/Library/include/GPU/gpu.hpp b/src/Library/include/GPU/gpu.hpp index b259fed1..0466a586 100644 --- a/src/Library/include/GPU/gpu.hpp +++ b/src/Library/include/GPU/gpu.hpp @@ -4,11 +4,9 @@ #include #include -#include - namespace JabyEngine { namespace GPU { - namespace Screen { + struct ScreenHelper { struct Mode { enum struct TVEncoding { NTSC = 0, @@ -17,26 +15,26 @@ namespace JabyEngine { static constexpr auto HorizontalResolution368 = Bit(6); static constexpr auto VerticalInterlace = Bit(5); - static constexpr auto DisplayAreaColorDepth = BitRange::from_to(4, 4); + static constexpr auto DisplayAreaColorDepth = BitRange::from_to(4, 4); static constexpr auto VideoMode = BitRange::from_to(3, 3); - static constexpr auto VerticalResolution = BitRange::from_to(2, 2); - static constexpr auto HorizontalResolution = BitRange::from_to(0, 1); + static constexpr auto VerticalResolution = BitRange::from_to(2, 2); + static constexpr auto HorizontalResolution = BitRange::from_to(0, 1); static constexpr uint32_t PAL() { return ComplexBitMap::with( - Mode::HorizontalResolution.with(GPU::HorizontalResolution::$320), - Mode::VerticalResolution.with(GPU::VerticalResolution::$240), + Mode::HorizontalResolution.with(GPU_IO::HorizontalResolution::$320), + Mode::VerticalResolution.with(GPU_IO::VerticalResolution::$240), Mode::VideoMode.with(TVEncoding::PAL), - Mode::DisplayAreaColorDepth.with(GPU::DisplayAreaColorDepth::$15bit) + Mode::DisplayAreaColorDepth.with(GPU_IO::DisplayAreaColorDepth::$15bit) ).raw; } static constexpr uint32_t NTSC() { return ComplexBitMap::with( - Mode::HorizontalResolution.with(GPU::HorizontalResolution::$320), - Mode::VerticalResolution.with(GPU::VerticalResolution::$240), + Mode::HorizontalResolution.with(GPU_IO::HorizontalResolution::$320), + Mode::VerticalResolution.with(GPU_IO::VerticalResolution::$240), Mode::VideoMode.with(TVEncoding::NTSC), - Mode::DisplayAreaColorDepth.with(GPU::DisplayAreaColorDepth::$15bit) + Mode::DisplayAreaColorDepth.with(GPU_IO::DisplayAreaColorDepth::$15bit) ).raw; } }; @@ -47,41 +45,41 @@ namespace JabyEngine { #ifdef JABYENGINE_PAL static constexpr uint16_t FirstVisiblePixelV = 0xA3; - GP1.write(Command::GP1::DisplayMode(Mode::PAL())); - GPU::Screen::Range::set_offset(0, 0); + GPU_IO::GP1.write(GPU_IO::Command::GP1::DisplayMode(Mode::PAL())); + GPU::Screen::set_offset(0, 0); #else static constexpr uint16_t FirstVisiblePixelV = 0x88; - GP1.write(Command::GP1::DisplayMode(Mode::NTSC())); + GPU_IO::GP1.write(GPU_IO::Command::GP1::DisplayMode(Mode::NTSC())); GPU::Screen::set_offset(0, 5); //< Random values #endif } - void exchange_buffer_and_display(); - } + static void exchange_buffer_and_display(); + }; static void set_draw_area(uint16_t x, uint16_t y) { - GP0.write(Command::GP0::DrawAreaTopLeft(x, y)); - GP0.write(Command::GP0::DrawAreaBottomRight((x + Display::Width), (y + Display::Height))); + GPU_IO::GP0.write(GPU_IO::Command::GP0::DrawAreaTopLeft(x, y)); + GPU_IO::GP0.write(GPU_IO::Command::GP0::DrawAreaBottomRight((x + Display::Width), (y + Display::Height))); } static void quick_fill_fast(const Color24& color, const PositionU16& pos, const SizeU16& size) { - GP0.write(Command::GP0::QuickFill(color)); - GP0.write(Command::GP0::TopLeftPosition(pos.x, pos.y)); - GP0.write(Command::GP0::WidthHeight(size.width, size.height)); + GPU_IO::GP0.write(GPU_IO::Command::GP0::QuickFill(color)); + GPU_IO::GP0.write(GPU_IO::Command::GP0::TopLeftPosition(pos.x, pos.y)); + GPU_IO::GP0.write(GPU_IO::Command::GP0::WidthHeight(size.width, size.height)); } static void reset_cmd_buffer() { - GP1.write(Command::GP1::ResetCMDBufer()); + GPU_IO::GP1.write(GPU_IO::Command::GP1::ResetCMDBufer()); } static void wait_ready_for_CMD() { - while(!GPUSTAT.read().is(GPUStatusRegister::GP0ReadyForCMD)); + while(!GPU_IO::GPUSTAT.read().is(GPU_IO::GPUStatusRegister::GP0ReadyForCMD)); } namespace DMA { static void wait() { - while(::JabyEngine::DMA::GPU.channel_ctrl.read().is(::JabyEngine::DMA::CHCHR::Busy)); + while(::JabyEngine::DMA_IO::GPU.channel_ctrl.read().is(::JabyEngine::DMA_IO::CHCHR::Busy)); } static void end() { @@ -91,28 +89,26 @@ namespace JabyEngine { namespace Receive { static void prepare() { - GP1.write(Command::GP1::DMADirection(DMADirection::CPU2GPU)); + GPU_IO::GP1.write(GPU_IO::Command::GP1::DMADirection(GPU_IO::DMADirection::CPU2GPU)); reset_cmd_buffer(); } static void set_src(uintptr_t adr) { - printf("Source: 0x%p\n", adr); - ::JabyEngine::DMA::GPU.adr.write(::JabyEngine::DMA::MADR::MemoryAdr.with(static_cast(adr))); + DMA_IO::GPU.adr.write(DMA_IO::MADR::MemoryAdr.with(static_cast(adr))); } static void set_dst(const PositionU16& position, const SizeU16& size) { - wait_ready_for_CMD(); - GP0.write(Command::GP0::CPU2VRAM_Blitting()); - GP0.write(Command::GP0::TopLeftPosition(position.x, position.y)); - GP0.write(Command::GP0::WidthHeight(size.width, size.height)); + GPU_IO::GP0.write(GPU_IO::Command::GP0::CPU2VRAM_Blitting()); + GPU_IO::GP0.write(GPU_IO::Command::GP0::TopLeftPosition(position.x, position.y)); + GPU_IO::GP0.write(GPU_IO::Command::GP0::WidthHeight(size.width, size.height)); } static void start(uint16_t blockCount, uint16_t wordsPerBlock = 0x10) { - typedef ::JabyEngine::DMA::BCR::SyncMode1 SyncMode1; + typedef DMA_IO::BCR::SyncMode1 SyncMode1; - ::JabyEngine::DMA::GPU.block_ctrl.write(SyncMode1::with(SyncMode1::BlockSize.with(wordsPerBlock), SyncMode1::BlockAmount.with(blockCount))); - ::JabyEngine::DMA::GPU.channel_ctrl.write(::JabyEngine::DMA::CHCHR::StartGPUReceive()); + DMA_IO::GPU.block_ctrl.write(SyncMode1::with(SyncMode1::BlockSize.with(wordsPerBlock), SyncMode1::BlockAmount.with(blockCount))); + DMA_IO::GPU.channel_ctrl.write(DMA_IO::CHCHR::StartGPUReceive()); } } } diff --git a/src/Library/src/BootLoader/gpu_boot.cpp b/src/Library/src/BootLoader/gpu_boot.cpp index 90644665..d1b84d47 100644 --- a/src/Library/src/BootLoader/gpu_boot.cpp +++ b/src/Library/src/BootLoader/gpu_boot.cpp @@ -46,9 +46,9 @@ namespace JabyEngine { } void setup() { - GP1.write(Command::GP1::Reset()); - Screen::configurate(); - Screen::exchange_buffer_and_display(); + GPU_IO::GP1.write(GPU_IO::Command::GP1::Reset()); + ScreenHelper::configurate(); + ScreenHelper::exchange_buffer_and_display(); GPU::wait_ready_for_CMD(); quick_fill_fast(Color24::Black(), PositionU16(32, 0), SizeU16(Display::Width, Display::Height)); diff --git a/src/Library/src/BootLoader/spu_boot.cpp b/src/Library/src/BootLoader/spu_boot.cpp index 37b98a7f..7b5d8fcf 100644 --- a/src/Library/src/BootLoader/spu_boot.cpp +++ b/src/Library/src/BootLoader/spu_boot.cpp @@ -7,32 +7,32 @@ namespace JabyEngine { using namespace JabyEngine; static void clear_main_volume() { - static constexpr auto StartVol = SweepVolume::with(SweepVolume::VolumeEnable, SweepVolume::Volume.with(I16_MAX >> 2)); + static constexpr auto StartVol = SPU_IO::SweepVolume::with(SPU_IO::SweepVolume::VolumeEnable, SPU_IO::SweepVolume::Volume.with(I16_MAX >> 2)); - MainVolume::left.write(StartVol); - MainVolume::right.write(StartVol); + SPU_IO::MainVolume::Left.write(StartVol); + SPU_IO::MainVolume::Right.write(StartVol); } static void clear_cd_and_ext_audio_volume() { - CDVolume::left.write(0); - CDVolume::right.write(0); + SPU_IO::CDVolume::Left.write(0); + SPU_IO::CDVolume::Right.write(0); - ExternalAudioInputVolume::left.write(0); - ExternalAudioInputVolume::right.write(0); + SPU_IO::ExternalAudioInputVolume::Left.write(0); + SPU_IO::ExternalAudioInputVolume::Right.write(0); } static void clear_control_register() { - Control.write(ControlRegister()); + SPU_IO::Control.write(SPU_IO::ControlRegister()); } static void clear_voice() { - for(auto& voice : Voices) { - voice.volumeLeft.write(SweepVolume()); - voice.volumeRight.write(SweepVolume()); - voice.sampleRate.write(SampleRate()); - voice.ad.write(AD()); - voice.sr.write(SR()); - voice.currentVolume.write(SimpleVolume(0)); + for(auto& voice : SPU_IO::Voice) { + voice.volumeLeft.write(SPU_IO::SweepVolume()); + voice.volumeRight.write(SPU_IO::SweepVolume()); + voice.sampleRate.write(SPU_IO::SampleRate()); + voice.ad.write(SPU_IO::AD()); + voice.sr.write(SPU_IO::SR()); + voice.currentVolume.write(SPU_IO::SimpleVolume(0)); voice.adr.write(0x200); voice.repeatAdr.write(0x200); @@ -40,37 +40,37 @@ namespace JabyEngine { } static void clear_pmon() { - PMON.write(PitchModFlags()); + SPU_IO::PMON.write(SPU_IO::PitchModFlags()); } static void clear_noise_and_echo() { - NON.write(NoiseGenerator()); - EON.write(EchoOn()); + SPU_IO::NON.write(SPU_IO::NoiseGenerator()); + SPU_IO::EON.write(SPU_IO::EchoOn()); } static void clear_reverb() { - Reverb::Volume::left.write(0); - Reverb::Volume::right.write(0); - Reverb::work_area_adr.write(0); + SPU_IO::Reverb::Volume::Left.write(0); + SPU_IO::Reverb::Volume::Right.write(0); + SPU_IO::Reverb::WorkAreaAdr.write(0); } static void setup_control_register() { - static constexpr auto SetupValue = ControlRegister::with(ControlRegister::Enable, ControlRegister::Unmute, ControlRegister::CDAudioEnable); + static constexpr auto SetupValue = SPU_IO::ControlRegister::with(SPU_IO::ControlRegister::Enable, SPU_IO::ControlRegister::Unmute, SPU_IO::ControlRegister::CDAudioEnable); - Control.write(SetupValue); + SPU_IO::Control.write(SetupValue); } static void setup_data_transfer_control() { static constexpr uint16_t RequiredValue = (2 << 1); - DataTransferControl.write(RequiredValue); + SPU_IO::DataTransferControl.write(RequiredValue); } static void wait_voices() { static constexpr int16_t Treshhold = (I16_MAX*0.03); try_again: - for(const auto& voice : Voices) { + for(const auto& voice : SPU_IO::Voice) { if(voice.currentVolume.read() > Treshhold) { goto try_again; } @@ -78,7 +78,7 @@ namespace JabyEngine { } void stop_voices() { - Key::off.write(UI32_MAX); + SPU_IO::Key::Off.write(UI32_MAX); } void setup() { diff --git a/src/Library/src/BootLoader/start_boot.cpp b/src/Library/src/BootLoader/start_boot.cpp index cfdda265..1785bb09 100644 --- a/src/Library/src/BootLoader/start_boot.cpp +++ b/src/Library/src/BootLoader/start_boot.cpp @@ -7,7 +7,7 @@ namespace JabyEngine { namespace Setup { static void enable_DMA() { - DMA::DPCR.write(DMA::DPCR.read() | DMA::DMAControlRegister::SPUEnable | DMA::DMAControlRegister::GPUEnable); + DMA_IO::DPCR.write(DMA_IO::DPCR.read() | DMA_IO::DMAControlRegister::SPUEnable | DMA_IO::DMAControlRegister::GPUEnable); } JabyEngine::NextRoutine start() { diff --git a/src/Library/src/BootLoader/timer_boot.cpp b/src/Library/src/BootLoader/timer_boot.cpp index a9a7e943..78b7e050 100644 --- a/src/Library/src/BootLoader/timer_boot.cpp +++ b/src/Library/src/BootLoader/timer_boot.cpp @@ -28,6 +28,8 @@ namespace JabyEngine { } 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); static constexpr uint16_t Target = MS_Per_Tick(CPU_Frequncey_Hz_Div8)*10; @@ -37,8 +39,8 @@ namespace JabyEngine { __syscall_SysEnqIntRP(Timer2Irq, &IRQCallback); __syscall_ExitCriticalSection(); - Counter2::Timer.target.write(CounterTarget::CounterTargetValue.with(Target)); - Counter2::Timer.mode.write(Mode); + Counter2.target.write(CounterTarget::CounterTargetValue.with(Target)); + Counter2.mode.write(Mode); Interrupt::enable_irq(Interrupt::Timer2); } diff --git a/src/Library/src/GPU/GPU.cpp b/src/Library/src/GPU/GPU.cpp deleted file mode 100644 index a0df5cb6..00000000 --- a/src/Library/src/GPU/GPU.cpp +++ /dev/null @@ -1,38 +0,0 @@ -#include "../include/GPU/gpu.hpp" - -namespace JabyEngine { - namespace GPU { - namespace Screen { - uint8_t CurrentDisplayAreaID = 1; //< Setup will call exchange and set it to 0 - - namespace Range { - #ifdef JABYENGINE_PAL - static constexpr uint16_t ScanlinesV = 288; - #else - static constexpr uint16_t ScanlinesV = 240; - #endif //JABYENGINE_PAL - - #ifndef USE_NO$PSX - void set_offset(uint16_t x, uint16_t y) { - x += 78; - y += 43; - - GP1.write(Command::GP1::HorizontalDisplayRange((x << 3), (x + Display::Width) << 3)); - GP1.write(Command::GP1::VerticalDisplayRange(y, y + Display::Height)); - } - #else - void set_offset(uint16_t x, uint16_t y) { - GP1.write(Command::GP1::HorizontalDisplayRange(x, (x + Display::Width*8))); - GP1.write(Command::GP1::VerticalDisplayRange(y - (ScanlinesV/2), y + (ScanlinesV/2))); - } - #endif //USE_NO$PSX - } - - void exchange_buffer_and_display() { - GPU::set_draw_area(0, (Display::Height*CurrentDisplayAreaID)); - CurrentDisplayAreaID ^= 1; - GP1.write(Command::GP1::DisplayArea(0, (Display::Height*CurrentDisplayAreaID))); - } - } - } -} \ No newline at end of file diff --git a/src/Library/src/GPU/gpu.cpp b/src/Library/src/GPU/gpu.cpp new file mode 100644 index 00000000..27aa069a --- /dev/null +++ b/src/Library/src/GPU/gpu.cpp @@ -0,0 +1,35 @@ +#include "../include/GPU/gpu.hpp" + +namespace JabyEngine { + namespace GPU { + uint8_t Screen :: CurrentDisplayAreaID = 1; //< Setup will call exchange and set it to 0 + + #ifdef JABYENGINE_PAL + static constexpr uint16_t ScanlinesV = 288; + #else + static constexpr uint16_t ScanlinesV = 240; + #endif //JABYENGINE_PAL + + void ScreenHelper :: exchange_buffer_and_display() { + GPU::set_draw_area(0, (Display::Height*Screen::CurrentDisplayAreaID)); + Screen::CurrentDisplayAreaID ^= 1; + GPU_IO::GP1.write(GPU_IO::Command::GP1::DisplayArea(0, (Display::Height*Screen::CurrentDisplayAreaID))); + } + + #ifndef USE_NO$PSX + void Screen :: set_offset(uint16_t x, uint16_t y) { + x += 78; + y += 43; + + GPU_IO::GP1.write(GPU_IO::Command::GP1::HorizontalDisplayRange((x << 3), (x + Display::Width) << 3)); + GPU_IO::GP1.write(GPU_IO::Command::GP1::VerticalDisplayRange(y, y + Display::Height)); + } + #else + void Screen :: set_offset(uint16_t x, uint16_t y) { + GP1.write(Command::GP1::HorizontalDisplayRange(x, (x + Display::Width*8))); + GP1.write(Command::GP1::VerticalDisplayRange(y - (ScanlinesV/2), y + (ScanlinesV/2))); + } + #endif //USE_NO$PSX + } + +} \ No newline at end of file