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

8
src/Library/internal-include/SPU/spu_internal.hpp
View File

@@ -12,14 +12,14 @@ namespace JabyEngine {
}
static void end() {
SPU_IO::ControlRegister.set_transfer_mode(SPU_IO::ControlRegister::Stop);
SPU_IO::ControlRegister.set_transfer_mode(SPU_IO_Values::ControlRegister::Stop);
}
struct Receive {
static void prepare() {
end();
SPU_IO::DataTransferControl.write(SPU_IO::DataTransferControl::NormalTransferMode());
SPU_IO::ControlRegister.set_transfer_mode(SPU_IO::ControlRegister::Stop);
SPU_IO::DataTransferControl.write(SPU_IO_Values::DataTransferControl::NormalTransferMode());
SPU_IO::ControlRegister.set_transfer_mode(SPU_IO_Values::ControlRegister::Stop);
}
static void set_src(uintptr_t adr) {
@@ -28,7 +28,7 @@ namespace JabyEngine {
static void set_dst(SPU::SRAMAdr adr) {
SPU_IO::SRAMTransferAdr.write(adr);
SPU_IO::ControlRegister.set_transfer_mode(SPU_IO::ControlRegister::DMAWrite);
SPU_IO::ControlRegister.set_transfer_mode(SPU_IO_Values::ControlRegister::DMAWrite);
}
static void start(uint16_t blockCount, uint16_t wordsPerBlock = 0x10) {

1
src/Library/src/BootLoader/spu_boot.cpp
View File

@@ -6,6 +6,7 @@ namespace JabyEngine {
namespace SPU {
using namespace JabyEngine;
using namespace SPU_IO;
using namespace SPU_IO_Values;
static void clear_main_volume() {
static constexpr auto StartVol = SweepVolume::from(SweepVolume::VolumeMode::Enable, SweepVolume::VolumeMode::Volume.with(SweepVolume::VolumeMode::MaxVolume >> 1));

2
src/Library/src/BootLoader/start_boot.cpp
View File

@@ -44,7 +44,7 @@ namespace JabyEngine {
static void test_spu_alloc() {
static const auto calculate_spu_adr = [](size_t size) -> const uint8_t* {
return reinterpret_cast<const uint8_t*>(SPU_IO::MemoryMap::ADPCM + size);
return reinterpret_cast<const uint8_t*>(SPU_IO_Values::MemoryMap::ADPCM + size);
};
static const auto simple_assert = [](uint32_t test_id, const uint8_t* adr, const uint8_t* expected) {
static const char* ok_text = "Test %i: 0x%p == 0x%p; OK\n";

2
src/Library/src/File/Processor/vag_processor.cpp
View File

@@ -56,7 +56,7 @@ namespace JabyEngine {
state.words_left = words;
auto sram_adr = SPU::voice[state.voice_id].allocate(SPU_IO::SampleRate::from_HZ(header.get_sample_frequency()), bytes);
auto sram_adr = SPU::voice[state.voice_id].allocate(SPU_IO_Values::SampleRate::from_HZ(header.get_sample_frequency()), bytes);
SPU::voice[state.voice_id].set_volume(state.inital_vol, state.inital_vol);

2
src/Library/src/SPU/spu.cpp
View File

@@ -17,7 +17,7 @@ namespace JabyEngine {
return adr;
}
SRAMAdr Voice :: allocate(SPU_IO::SampleRate frequency, size_t size) {
SRAMAdr Voice :: allocate(SPU_IO_Values::SampleRate frequency, size_t size) {
const auto result = Voice::allocate(size);
Voice::set_sample_rate(frequency);
return result;

2
src/Library/src/SPU/spu_mmu.cpp
View File

@@ -9,7 +9,7 @@
namespace JabyEngine {
namespace SPU_MMU {
namespace SPU_MemoryMap = SPU_IO::MemoryMap;
namespace SPU_MemoryMap = SPU_IO_Values::MemoryMap;
struct SPUMemory {
const uint8_t* adr;