Clear Voice Keys
This commit is contained in:
parent
f953044f23
commit
5c15b66873
|
|
@ -2,11 +2,28 @@
|
|||
#define __JABYENGINE_IOPORT_HPP__
|
||||
#include "../../Auxiliary/bits.hpp"
|
||||
|
||||
template<typename T>
|
||||
struct Bit {
|
||||
typedef T ValueType;
|
||||
|
||||
size_t value;
|
||||
|
||||
constexpr Bit(size_t value) : value(value) {
|
||||
}
|
||||
|
||||
constexpr operator size_t() const {
|
||||
return this->value;
|
||||
}
|
||||
};
|
||||
|
||||
template<typename T>
|
||||
struct BitRange {
|
||||
typedef T ValueType;
|
||||
|
||||
size_t begin;
|
||||
size_t length;
|
||||
|
||||
static constexpr BitRange from_to(size_t start, size_t end) {
|
||||
static constexpr BitRange<T> from_to(size_t start, size_t end) {
|
||||
return {start, (end - start + 1)};
|
||||
}
|
||||
};
|
||||
|
|
@ -29,9 +46,8 @@ public:
|
|||
}
|
||||
|
||||
template<typename S>
|
||||
constexpr volatile IOPort<T>& set_bit(S bit) volatile {
|
||||
constexpr void set_bit(S bit) volatile {
|
||||
this->value = bit::set(this->value, static_cast<size_t>(bit));
|
||||
return *this;
|
||||
}
|
||||
|
||||
template<typename S>
|
||||
|
|
@ -41,9 +57,8 @@ public:
|
|||
}
|
||||
|
||||
template<typename S>
|
||||
constexpr volatile IOPort<T>& clear_bit(S bit) volatile {
|
||||
constexpr void clear_bit(S bit) volatile {
|
||||
this->value = bit::set(this->value, static_cast<size_t>(bit));
|
||||
return *this;
|
||||
}
|
||||
|
||||
template<typename S>
|
||||
|
|
@ -58,39 +73,46 @@ public:
|
|||
|
||||
//Accessing values
|
||||
template<typename S>
|
||||
constexpr IOPort<T>& set_value(S value, const BitRange& range) {
|
||||
constexpr IOPort<T>& set_value(S value, const BitRange<S>& range) {
|
||||
this->value = bit::value::set_normalized(this->value, static_cast<T>(value), range.begin, range.length);
|
||||
return *this;
|
||||
}
|
||||
|
||||
template<typename S>
|
||||
constexpr volatile IOPort<T>& set_value(S value, const BitRange& range) volatile {
|
||||
constexpr void set_value(S value, const BitRange<S>& range) volatile {
|
||||
this->value = bit::value::set_normalized(this->value, static_cast<T>(value), range.begin, range.length);
|
||||
return *this;
|
||||
}
|
||||
|
||||
template<typename S>
|
||||
constexpr IOPort<T>& clear_value(const BitRange& range) {
|
||||
constexpr IOPort<T>& clear_value(const BitRange<S>& range) {
|
||||
this->value = bit::value::clear_normalized(this->value, range.begin, range.length);
|
||||
return *this;
|
||||
}
|
||||
|
||||
template<typename S>
|
||||
constexpr volatile IOPort<T>& clear_value(const BitRange& range) volatile {
|
||||
constexpr void clear_value(const BitRange<S>& range) volatile {
|
||||
this->value = bit::value::clear_normalized(this->value, range.begin, range.length);
|
||||
return *this;
|
||||
}
|
||||
|
||||
template<typename S>
|
||||
constexpr S get_value(const BitRange& range) {
|
||||
constexpr S get_value(const BitRange<S>& range) {
|
||||
return static_cast<S>(bit::value::get_normalized(this->value, range.begin, range.length));
|
||||
}
|
||||
|
||||
template<typename S>
|
||||
constexpr S get_value(const BitRange& range) volatile {
|
||||
constexpr S get_value(const BitRange<S>& range) volatile {
|
||||
return static_cast<S>(bit::value::get_normalized(this->value, range.begin, range.length));
|
||||
}
|
||||
|
||||
//For easy access
|
||||
constexpr T read() const {
|
||||
return const_cast<volatile IOPort<T>*>(this)->value;
|
||||
}
|
||||
|
||||
constexpr void write(T value) {
|
||||
const_cast<volatile IOPort<T>*>(this)->value = value;
|
||||
}
|
||||
|
||||
//For raw access
|
||||
constexpr operator T() const {
|
||||
return this->value;
|
||||
|
|
@ -100,8 +122,9 @@ public:
|
|||
return this->value;
|
||||
}
|
||||
|
||||
constexpr void operator=(T value) {
|
||||
constexpr IOPort<T>& operator=(T value) {
|
||||
this->value = value;
|
||||
return *this;
|
||||
}
|
||||
|
||||
constexpr void operator=(T value) volatile {
|
||||
|
|
@ -109,4 +132,36 @@ public:
|
|||
}
|
||||
};
|
||||
|
||||
struct __no_align ubus32_t {
|
||||
IOPort<uint16_t> low;
|
||||
IOPort<uint16_t> high;
|
||||
|
||||
constexpr ubus32_t(uint32_t value) {
|
||||
*this = value;
|
||||
}
|
||||
|
||||
constexpr operator uint32_t() const {
|
||||
return ((this->high << 16) | this->low);
|
||||
}
|
||||
|
||||
constexpr operator uint32_t() const volatile {
|
||||
return ((this->high << 16) | this->low);
|
||||
}
|
||||
|
||||
constexpr ubus32_t& operator=(uint32_t value) {
|
||||
this->low = (value & 0xFFFF);
|
||||
this->high = (value >> 16);
|
||||
|
||||
return *this;
|
||||
}
|
||||
|
||||
constexpr void operator=(uint32_t value) volatile {
|
||||
this->low = (value & 0xFFFF);
|
||||
this->high = (value >> 16);
|
||||
}
|
||||
};
|
||||
static constexpr uintptr_t IO_Base_Mask = 0xF0000000;
|
||||
static constexpr uintptr_t IO_Base_Adr = 0x10000000;
|
||||
|
||||
#define __declare_io_port_global(type, name, adr) static __always_inline auto& name = *reinterpret_cast<IOPort<type>*>((IO_Base_Adr + (adr & ~IO_Base_Mask)))
|
||||
#endif //!__JABYENGINE_IOPORT_HPP__
|
||||
|
|
@ -3,222 +3,85 @@
|
|||
#include "IOPort.hpp"
|
||||
#include <limits.h>
|
||||
|
||||
#include "../../Auxiliary/io_class_helper.hpp"
|
||||
|
||||
namespace SPU {
|
||||
struct __no_align ubus32_t
|
||||
{
|
||||
uint16_t low;
|
||||
uint16_t high;
|
||||
|
||||
constexpr ubus32_t() : low(0), high(0) {
|
||||
}
|
||||
|
||||
constexpr operator uint32_t() const {
|
||||
return ((this->high << 16) | this->low);
|
||||
}
|
||||
|
||||
constexpr void operator=(uint32_t value) {
|
||||
this->low = (value & 0xFFFF);
|
||||
this->high = (value >> 16);
|
||||
}
|
||||
|
||||
constexpr void operator=(ubus32_t value) volatile {
|
||||
this->low = value.low;
|
||||
this->high = value.high;
|
||||
}
|
||||
};
|
||||
|
||||
enum Mode {
|
||||
enum struct SweepMode {
|
||||
Linear = 0,
|
||||
Exponential = 1,
|
||||
};
|
||||
|
||||
struct __no_align SampleRate {
|
||||
uint16_t raw_value = 0;
|
||||
|
||||
static constexpr SampleRate from_HZ(long double freq)
|
||||
{
|
||||
//SampleRate is defined as 4096 == 44100Hz
|
||||
constexpr long double Base = (4096.0 / 44100.0);
|
||||
enum struct SweepDirection {
|
||||
Increase = 0,
|
||||
Decrease = 1,
|
||||
};
|
||||
|
||||
return static_cast<SampleRate>(((freq*4096.0)/44100.0));
|
||||
enum struct SweepPhase {
|
||||
Posititve = 0,
|
||||
Negative = 1,
|
||||
};
|
||||
|
||||
//0..0x1F = Fast..Slow
|
||||
typedef uint8_t SweepShift;
|
||||
|
||||
//0..3 = +7, +6, +5, +4 or -6, -7, -6, -5
|
||||
typedef uint8_t SweepStep;
|
||||
|
||||
struct __no_align SampleRate : public IOPort<uint16_t> {
|
||||
using IOPort<uint16_t>::IOPort;
|
||||
|
||||
static constexpr SampleRate from_HZ(double freq) {
|
||||
//4096 == 44100Hz
|
||||
constexpr double Base = (4096.0 / 44100.0);
|
||||
|
||||
return static_cast<uint16_t>((freq*Base));
|
||||
}
|
||||
};
|
||||
|
||||
struct __no_align SweepVolume {
|
||||
typedef int16_t VolumeStep;
|
||||
struct __no_align SweepVolume : public IOPort<int16_t> {
|
||||
// For Volume Mode
|
||||
static constexpr Bit<int16_t> ModeBit = 15; // 0 Volume Mode; 1 Sweep Mode
|
||||
static constexpr BitRange<int16_t> VolumeRange = BitRange<int16_t>::from_to(0, 14);
|
||||
|
||||
static constexpr VolumeStep VolumeMax = 1000;
|
||||
static constexpr VolumeStep SingleVolumeStep = (I16_MAX >> 1)/VolumeMax;
|
||||
|
||||
enum Direction {
|
||||
Increase = 0,
|
||||
Decrease = 1,
|
||||
};
|
||||
|
||||
enum Phase {
|
||||
Positive = 0,
|
||||
Negative = 1,
|
||||
};
|
||||
|
||||
int16_t raw_value = 0;
|
||||
|
||||
constexpr SweepVolume() = default;
|
||||
|
||||
constexpr auto& set_volume_percent(double percent) {
|
||||
this->raw_value = bit::value::set_normalized(this->raw_value, static_cast<int16_t>((I16_MAX/100.0)*percent), __start_end_bit2_start_length(0, 14));
|
||||
return *this;
|
||||
}
|
||||
|
||||
constexpr auto& set_volume(int16_t volume) {
|
||||
this->raw_value = bit::value::set_normalized(this->raw_value, static_cast<int16_t>((volume >> 1)), __start_end_bit2_start_length(0, 14));
|
||||
return *this;
|
||||
}
|
||||
|
||||
constexpr int16_t get_volume_step() const {
|
||||
return bit::value::get_normalized(this->raw_value, __start_end_bit2_start_length(0, 14));
|
||||
}
|
||||
|
||||
io_class__2option_map(volume_mode, sweep_mode, 15);
|
||||
io_class__2option_map_getter(Mode, linear_sweep_mode, exponential_sweep_mode, sweep_mode_type, 14);
|
||||
io_class__2option_map_getter(Direction, increase_sweep_mode, decrease_sweep_mode, sweep_mode_direction, 13);
|
||||
io_class__2option_map_getter(Phase, positive_sweep_phase, negative_sweep_phase, sweep_phase, 12);
|
||||
|
||||
//Uses only 5bit of shift (0..1F (slow..fast))
|
||||
constexpr auto& set_sweep_shift(uint8_5b shift) {
|
||||
const int16_t crop_value = static_cast<int16_t>(shift); //(bit::value::crop_value(shift, 5));
|
||||
this->raw_value = bit::value::set_normalized(this->raw_value, crop_value, __start_end_bit2_start_length(2, 6));
|
||||
return *this;
|
||||
}
|
||||
|
||||
constexpr uint8_5b get_sweep_shift() const {
|
||||
return bit::value::get_normalized(this->raw_value, __start_end_bit2_start_length(2, 6));
|
||||
}
|
||||
|
||||
//0..3 maps to => +7, +6, +5, +4 or -8, -7, -6, -5
|
||||
constexpr auto& set_sweep_step(uint8_2b step) {
|
||||
this->raw_value = bit::value::set_normalized(this->raw_value, static_cast<int16_t>(step), __start_end_bit2_start_length(0, 1));
|
||||
return *this;
|
||||
}
|
||||
|
||||
constexpr uint8_2b get_sweep_step() const {
|
||||
return bit::value::get_normalized(this->raw_value, __start_end_bit2_start_length(0, 1));
|
||||
}
|
||||
// For Sweep Mode
|
||||
static constexpr Bit<SweepMode> SweepModeBit = 14;
|
||||
static constexpr Bit<SweepDirection> SweepDirectionBit = 13;
|
||||
static constexpr Bit<SweepPhase> SweepPhaseBit = 12;
|
||||
static constexpr BitRange<SweepShift> SweepShiftRange = BitRange<SweepShift>::from_to(2, 6);
|
||||
static constexpr BitRange<SweepStep> SweepStepRange = BitRange<SweepStep>::from_to(0, 1);
|
||||
};
|
||||
|
||||
struct __no_align ADSR {
|
||||
ubus32_t raw_value;
|
||||
struct __no_align SR : public IOPort<uint16_t> {
|
||||
static constexpr Bit<SweepMode> SustainModeBit = (31 - 16);
|
||||
static constexpr Bit<SweepDirection> SustainDirectionBit = (30 - 16);
|
||||
static constexpr BitRange<SweepShift> SustainShiftRange = BitRange<SweepShift>::from_to((24 - 16), (28 - 16));
|
||||
static constexpr BitRange<SweepStep> SustainStepRange = BitRange<SweepStep>::from_to((22 - 16), (23 - 16));
|
||||
static constexpr Bit<SweepMode> ReleaseModeBit = (21 - 16);
|
||||
static constexpr BitRange<SweepShift> ReleaseShiftRange = BitRange<SweepShift>::from_to((16 - 16), (20 - 16));
|
||||
};
|
||||
|
||||
struct __no_align KeyW {
|
||||
ubus32_t raw_value;
|
||||
|
||||
constexpr KeyW() = default;
|
||||
|
||||
static constexpr KeyW All1() {
|
||||
KeyW value;
|
||||
|
||||
value.raw_value = static_cast<uint32_t>(0xFFFFFFFF);
|
||||
return value;
|
||||
}
|
||||
|
||||
constexpr KeyW& set(size_t id) {
|
||||
this->raw_value = bit::set<uint32_t>(this->raw_value, id);
|
||||
return *this;
|
||||
}
|
||||
};
|
||||
|
||||
struct __no_align KeyR {
|
||||
ubus32_t raw_value;
|
||||
|
||||
constexpr bool is_set(size_t id) const {
|
||||
return bit::is_set<uint32_t>(this->raw_value, id);
|
||||
}
|
||||
};
|
||||
|
||||
struct __no_align Key {
|
||||
static inline __always_inline auto& on = *reinterpret_cast<KeyW*>(0x1F801D88);
|
||||
static inline __always_inline auto& off = *reinterpret_cast<KeyW*>(0x1F801D8C);
|
||||
static inline __always_inline auto& state = *reinterpret_cast<KeyR*>(0x1F801D9C);
|
||||
struct __no_align AD : public IOPort<uint16_t> {
|
||||
static constexpr Bit<SweepMode> AttackModeBit = 15;
|
||||
static constexpr BitRange<SweepShift> AttackShiftRange = BitRange<SweepShift>::from_to(10, 14);
|
||||
static constexpr BitRange<SweepStep> AttackStepRange = BitRange<SweepStep>::from_to(8, 9);
|
||||
static constexpr BitRange<SweepShift> DecayShiftRange = BitRange<SweepShift>::from_to(4, 7);
|
||||
static constexpr BitRange<uint16_t> SustainLevelRange = BitRange<uint16_t>::from_to(0, 3);
|
||||
};
|
||||
|
||||
struct __no_align Voice {
|
||||
static constexpr size_t Count = 24;
|
||||
static inline __always_inline auto& Channel = reinterpret_cast<Voice(&)[Count]>(*reinterpret_cast<Voice*>(0x1f801c00));
|
||||
|
||||
SweepVolume volumeLeft;
|
||||
SweepVolume volumeRight;
|
||||
SampleRate sampleRate;
|
||||
uint16_t adr;
|
||||
ADSR adsr;
|
||||
SweepVolume currentVolume; //Not used
|
||||
uint16_t repeatAdr;
|
||||
SweepVolume volumeLeft;
|
||||
SweepVolume volumeRight;
|
||||
SampleRate sampleRate;
|
||||
IOPort<uint16_t> adr;
|
||||
IOPort<AD> ad;
|
||||
IOPort<SR> sr;
|
||||
IOPort<SweepVolume> currentVolume; //Not used
|
||||
IOPort<uint16_t> repeatAdr;
|
||||
};
|
||||
|
||||
struct MainVolume {
|
||||
static inline __always_inline auto& Left = *reinterpret_cast<SweepVolume*>(0x1F801D80);
|
||||
static inline __always_inline auto& Right = *reinterpret_cast<SweepVolume*>(0x1F801D82);
|
||||
};
|
||||
|
||||
struct __no_align Control {
|
||||
static inline __always_inline auto& Register = *reinterpret_cast<Control*>(0x1F801DAA);
|
||||
|
||||
enum TransferMode
|
||||
{
|
||||
Stop = 0,
|
||||
ManualWrite = (1 << 4),
|
||||
DMAWrite = (2 << 4),
|
||||
DMARead = (3 << 4),
|
||||
};
|
||||
|
||||
uint16_t raw_value = 0;
|
||||
|
||||
constexpr Control() = default;
|
||||
|
||||
io_class__2option_map(off, on, 15);
|
||||
io_class__2option_map_getter_is(bool, mute, unmute, 14);
|
||||
|
||||
constexpr Control& set_noise_shift(uint8_4b shift) {
|
||||
this->raw_value = bit::value::set_normalized(this->raw_value, static_cast<uint16_t>(shift), __start_end_bit2_start_length(10, 13));
|
||||
return *this;
|
||||
}
|
||||
|
||||
constexpr uint8_4b get_noise_shift() const {
|
||||
return bit::value::get_normalized(this->raw_value, __start_end_bit2_start_length(10, 13));
|
||||
}
|
||||
|
||||
constexpr Control& set_noise_step(uint8_2b step) {
|
||||
this->raw_value = bit::value::set_normalized(this->raw_value, static_cast<uint16_t>(step), __start_end_bit2_start_length(8, 9));
|
||||
return *this;
|
||||
}
|
||||
|
||||
constexpr uint8_2b get_noise_step() const {
|
||||
return bit::value::get_normalized(this->raw_value, __start_end_bit2_start_length(8, 9));
|
||||
}
|
||||
|
||||
io_class__2option_map_getter_is(bool, reverb_disabled, reverb_enabled, 7);
|
||||
io_class__2option_map(irq9_ack, irq9_enable, 6);
|
||||
|
||||
constexpr Control& set_transfer_mode(TransferMode mode) {
|
||||
this->raw_value = bit::value::set_normalized(this->raw_value, static_cast<uint16_t>(mode), __start_end_bit2_start_length(4, 5));
|
||||
return *this;
|
||||
}
|
||||
|
||||
constexpr TransferMode get_transfer_mode() const {
|
||||
return static_cast<TransferMode>(bit::value::get_normalized(this->raw_value, __start_end_bit2_start_length(4, 5)));
|
||||
}
|
||||
|
||||
io_class__2option_map_getter_is(bool, external_reverb_off, external_reverb_on, 3);
|
||||
io_class__2option_map_getter_is(bool, cd_reverb_off, cd_reverb_on, 2);
|
||||
io_class__2option_map_getter_is(bool, external_audio_off, external_audio_on, 1);
|
||||
io_class__2option_map_getter_is(bool, cd_audio_disable, cd_audio_enable, 0);
|
||||
};
|
||||
|
||||
struct DataTransferControl {
|
||||
static inline __always_inline auto& Register = *reinterpret_cast<IOPort<uint16_t>*>(0x1F801DAC);
|
||||
static inline __always_inline volatile auto& vRegister = *reinterpret_cast<IOPort<uint16_t>*>(0x1F801DAC);
|
||||
};
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
#endif //!__JABYENGINE_SPU_IO_HPP__
|
||||
|
|
@ -2,47 +2,11 @@
|
|||
#include <PSX/System/IOPorts/IOPort.hpp>
|
||||
|
||||
namespace SPU {
|
||||
static void clear_main_volume() {
|
||||
static constexpr auto StartVol = SweepVolume().set_volume_mode().set_volume_percent(50.0);
|
||||
|
||||
io_class__update_with(MainVolume::Left, StartVol);
|
||||
io_class__update_with(MainVolume::Right, StartVol);
|
||||
}
|
||||
|
||||
static void clear_keys() {
|
||||
io_class__update_with(Key::off, KeyW::All1());
|
||||
}
|
||||
|
||||
static void clear_voice(Voice& voice) {
|
||||
io_class__update_with(voice.volumeLeft, SweepVolume());
|
||||
io_class__update_with(voice.volumeRight, SweepVolume());
|
||||
|
||||
io_class__update_with(voice.sampleRate, SampleRate::from_HZ(0.0));
|
||||
io_class__update_with(voice.adsr, ADSR());
|
||||
io_class__update_with(voice.currentVolume, SweepVolume());
|
||||
|
||||
voice.adr = 0x200;
|
||||
voice.repeatAdr = 0x200;
|
||||
}
|
||||
|
||||
static void enable_control() {
|
||||
io_class__update_with(Control::Register, Control().set_on().set_unmute().set_cd_audio_enable());
|
||||
}
|
||||
|
||||
static void disable_control() {
|
||||
io_class__update_with(Control::Register, Control());
|
||||
static void clear_key() {
|
||||
Key::off.write(UI32_MAX);
|
||||
}
|
||||
|
||||
void setup() {
|
||||
clear_main_volume();
|
||||
clear_keys();
|
||||
disable_control();
|
||||
|
||||
for(auto& voice : Voice::Channel) {
|
||||
clear_voice(voice);
|
||||
}
|
||||
|
||||
DataTransferControl::Register = (2 << 1);
|
||||
enable_control();
|
||||
clear_key();
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue