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

Update more converted IO

Browse Source
This commit is contained in:
jaby
2024-09-29 16:05:52 +02:00
parent 9620b0ec41
commit 5bafe78ab5
7 changed files with 36 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Library/internal-include/GPU/gpu_internal.hpp
View File

@@ -13,11 +13,11 @@ namespace JabyEngine {
static constexpr auto Height = PublicDisplay::Height;
#ifdef JABYENGINE_PAL
static constexpr auto DisplayMode = GPU_IO::DisplayMode::PAL();
static constexpr auto DisplayMode = GPU_IO_Values::DisplayMode::PAL();
static constexpr uint16_t ScanlinesV = 288;
static constexpr auto DisplayRange = PositionI16::create(78, 35);
#else
static constexpr auto DisplayMode = GPU_IO::DisplayMode::NTSC();
static constexpr auto DisplayMode = GPU_IO_Values::DisplayMode::NTSC();
static constexpr uint16_t ScanlinesV = 240;
static constexpr auto DisplayRange = PositionI16::create(76, 16);
#endif //JABYENGINE_PAL
@@ -78,7 +78,7 @@ namespace JabyEngine {
struct Receive {
static void prepare() {
GPU_IO::GP1.set_dma_direction(GPU_IO::GPUSTAT::DMADirection::CPU2GPU);
GPU_IO::GP1.set_dma_direction(GPU_IO_Values::GPUSTAT::DMADirection::CPU2GPU);
reset_cmd_buffer();
}

10
src/Library/internal-include/periphery_internal.hpp
View File

@@ -11,17 +11,17 @@ namespace JabyEngine {
using namespace Periphery_IO;
static void connect_to(uint16_t port) {
JOY_CTRL.write(Value::JOY_CTRL::create_for(port));
JOY_CTRL.write(Periphery_IO_Values::JOY_CTRL::create_for(port));
busy_loop(500);
}
static void close_connection() {
JOY_CTRL.write(Value::JOY_CTRL::close());
JOY_CTRL.write(Periphery_IO_Values::JOY_CTRL::close());
}
static void send_byte(uint8_t byte) {
while(!JOY_STAT.is_ready_transfer());
JOY_TX_DATA.write(Value::JOY_TX_DATA::create(byte));
JOY_TX_DATA.write(Periphery_IO_Values::JOY_TX_DATA::create(byte));
}
static uint8_t read_byte() {
@@ -30,8 +30,8 @@ namespace JabyEngine {
}
static void acknowledge() {
while(JOY_STAT.read().is_set(Value::JOY_STAT::ACKIrqLow));
JOY_CTRL.write(JOY_CTRL.read().set(Value::JOY_CTRL::ACK));
while(JOY_STAT.read().is_set(Periphery_IO_Values::JOY_STAT::ACKIrqLow));
JOY_CTRL.write(JOY_CTRL.read().set(Periphery_IO_Values::JOY_CTRL::ACK));
Interrupt::ack_irq(Interrupt::Periphery);
}

4
src/Library/src/GPU/gpu.cpp
View File

@@ -61,7 +61,7 @@ namespace JabyEngine {
wait_ready_for_CMD();
#ifdef __SUPPORT_PS3__
// The PS3 needs explict change to FiFo
GPU_IO::GP1.set_dma_direction(GPU_IO::GPUSTAT::DMADirection::Fifo);
GPU_IO::GP1.set_dma_direction(GPU_IO_Values::GPUSTAT::DMADirection::Fifo);
#endif // __SUPPORT_PS3__
for(size_t n = 0; n < words; n++) {
@@ -72,7 +72,7 @@ namespace JabyEngine {
void render_dma(const uint32_t* data) {
// DPCR already enabled
DMA_IO::GPU.wait();
GPU_IO::GP1.set_dma_direction(GPU_IO::GPUSTAT::DMADirection::CPU2GPU);
GPU_IO::GP1.set_dma_direction(GPU_IO_Values::GPUSTAT::DMADirection::CPU2GPU);
DMA_IO::GPU.set_adr(reinterpret_cast<uintptr_t>(data));
DMA_IO::GPU.block_ctrl.write(DMA_IO::BCR::SyncMode2::for_gpu_cmd());