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

Re-Update SPU IO

Browse Source
This commit is contained in:
jaby
2024-09-29 16:00:02 +02:00
parent 4b935e3984
commit 9620b0ec41
8 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/PSX/SPU/spu.hpp
View File

@@ -3,11 +3,11 @@
namespace JabyEngine {
namespace SPU {
using SPU_IO::operator""_vol;
using SPU_IO_Values::operator""_vol;
using SRAMAdr = SPU_IO::SRAMAdr;
using SimpleVolume = SPU_IO::SimpleVolume;
using SweepVolume = SPU_IO::SweepVolume;
using SRAMAdr = SPU_IO_Values::SRAMAdr;
using SimpleVolume = SPU_IO_Values::SimpleVolume;
using SweepVolume = SPU_IO_Values::SweepVolume;
struct Voice {
size_t get_id() const {
@@ -15,10 +15,10 @@ namespace JabyEngine {
}
SRAMAdr allocate(size_t size);
SRAMAdr allocate(SPU_IO::SampleRate frequency, size_t size);
SRAMAdr allocate(SPU_IO_Values::SampleRate frequency, size_t size);
void deallocate();
void set_sample_rate(SPU_IO::SampleRate frequency) {
void set_sample_rate(SPU_IO_Values::SampleRate frequency) {
SPU_IO::Voice[Voice::get_id()].sampleRate.write(frequency);
}
@@ -28,7 +28,7 @@ namespace JabyEngine {
}
void play() {
SPU_IO::Key::On.write(SPU_IO::KeyOn::for_specific(Voice::get_id()));
SPU_IO::Key::On.write(SPU_IO_Values::KeyOn::for_specific(Voice::get_id()));
}
void play_if_end() {
@@ -38,7 +38,7 @@ namespace JabyEngine {
}
void stop() {
SPU_IO::Key::Off.write(SPU_IO::KeyOff::for_specific(Voice::get_id()));
SPU_IO::Key::Off.write(SPU_IO_Values::KeyOff::for_specific(Voice::get_id()));
}
bool is_end() const {

36
include/PSX/System/IOPorts/spu_io.hpp
View File

@@ -4,34 +4,34 @@
namespace JabyEngine {
namespace SPU_IO {
using namespace SPU_IO_Values;
namespace Value = SPU_IO_Values;
static constexpr size_t VoiceCount = 24;
static constexpr size_t ReverbCount = 1;
struct ControlRegisterIO : public IOPort<SPU_IO_Values::ControlRegister> {
struct ControlRegisterIO : public IOPort<Value::ControlRegister> {
using TransferMode = Value::RAMTransferMode;
void set_transfer_mode(TransferMode mode) {
this->write(this->read().set(ControlRegister::TransferMode.with(mode)));
while(this->read().get(ControlRegister::TransferMode) != mode);
this->write(this->read().set(Value::ControlRegister::TransferMode.with(mode)));
while(this->read().get(Value::ControlRegister::TransferMode) != mode);
}
};
using ADIO = IOPort<SPU_IO_Values::AD>;
using DataTransferControlIO = IOPort<SPU_IO_Values::DataTransferControl>;
using EchoIO = IOPort32<SPU_IO_Values::Echo>;
using KeyOffIO = IOPort32<SPU_IO_Values::KeyOff>;
using KeyOnIO = IOPort32<SPU_IO_Values::KeyOn>;
using KeyStatusIO = IOPort32<SPU_IO_Values::KeyStatus>;
using NoiseIO = IOPort<SPU_IO_Values::Noise>;
using PitchModulationIO = IOPort32<SPU_IO_Values::PitchModulation>;
using SampleRateIO = IOPort<SPU_IO_Values::SampleRate>;
using SimpleVolumeIO = IOPort<SPU_IO_Values::SimpleVolume>;
using StatusRegisterIO = IOPort<SPU_IO_Values::StatusRegister>;
using SRIO = IOPort<SPU_IO_Values::SR>;
using SRAMAdrIO = IOPort<SPU_IO_Values::SRAMAdr>;
using SweepVolumeIO = IOPort<SweepVolume>;
using ADIO = IOPort<Value::AD>;
using DataTransferControlIO = IOPort<Value::DataTransferControl>;
using EchoIO = IOPort32<Value::Echo>;
using KeyOffIO = IOPort32<Value::KeyOff>;
using KeyOnIO = IOPort32<Value::KeyOn>;
using KeyStatusIO = IOPort32<Value::KeyStatus>;
using NoiseIO = IOPort<Value::Noise>;
using PitchModulationIO = IOPort32<Value::PitchModulation>;
using SampleRateIO = IOPort<Value::SampleRate>;
using SimpleVolumeIO = IOPort<Value::SimpleVolume>;
using StatusRegisterIO = IOPort<Value::StatusRegister>;
using SRIO = IOPort<Value::SR>;
using SRAMAdrIO = IOPort<Value::SRAMAdr>;
using SweepVolumeIO = IOPort<Value::SweepVolume>;
#pragma pack(push, 1)
struct Voice {