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

Using new IO Port

This commit is contained in:
Jaby 2022-08-31 23:02:40 +02:00 committed by Jaby
parent 5a2b0b9a50
commit 1b14057f9c
3 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/PSX/System/IOPorts/IOPort.hpp
View File

@ -100,11 +100,11 @@ public:
return this->value; return this->value;
} }
constexpr IOPort<T>& operator=(T value) { constexpr void operator=(T value) {
this->value = value; this->value = value;
} }
constexpr volatile IOPort<T>& operator=(T value) volatile { constexpr void operator=(T value) volatile {
this->value = value; this->value = value;
} }
}; };

11
include/PSX/System/IOPorts/SPU_IO.hpp
View File

@ -1,8 +1,10 @@
#ifndef __JABYENGINE_SPU_IO_HPP__ #ifndef __JABYENGINE_SPU_IO_HPP__
#define __JABYENGINE_SPU_IO_HPP__ #define __JABYENGINE_SPU_IO_HPP__
#include "../../Auxiliary/io_class_helper.hpp" #include "IOPort.hpp"
#include <limits.h> #include <limits.h>
#include "../../Auxiliary/io_class_helper.hpp"
namespace SPU { namespace SPU {
struct __no_align ubus32_t struct __no_align ubus32_t
{ {
@ -213,10 +215,9 @@ namespace SPU {
io_class__2option_map_getter_is(bool, cd_audio_disable, cd_audio_enable, 0); io_class__2option_map_getter_is(bool, cd_audio_disable, cd_audio_enable, 0);
}; };
struct __no_align DataTransferControl { struct DataTransferControl {
static inline __always_inline auto& Register = *reinterpret_cast<DataTransferControl*>(0x1F801DAC); 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);
uint16_t raw_value = 0;
}; };
} }

10
src/Library/src/BootLoader/boot_spu.cpp
View File

@ -33,15 +33,7 @@ namespace SPU {
io_class__update_with(Control::Register, Control()); io_class__update_with(Control::Register, Control());
} }
void test() {
static __always_inline volatile auto& Dino = *reinterpret_cast<IOPort<uint16_t>*>(0x120);
while(Dino.is_bit_set(0));
}
void setup() { void setup() {
test();
clear_main_volume(); clear_main_volume();
clear_keys(); clear_keys();
disable_control(); disable_control();
@ -50,7 +42,7 @@ namespace SPU {
clear_voice(voice); clear_voice(voice);
} }
io_class__update_with(DataTransferControl::Register, (2 << 1)); DataTransferControl::Register = (2 << 1);
enable_control(); enable_control();
} }
} }