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

Use new IO Port related types and further improvements of readability #1

Merged
jaby merged 18 commits from Overlay-The-Beginning_CDDrive_EndOfIO into Overlay-The-Beginning_CDDrive 2023-03-23 19:43:52 +00:00
Conversation 0 Commits 18 Files Changed 25 +34 -5
3 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 37192b537b - Show all commits

12
include/PSX/System/IOPorts/ioport.hpp
View File

@ -3,6 +3,18 @@
#include "../../Auxiliary/complex_bitmap.hpp"
namespace JabyEngine {
template<typename T>
struct NormalValue {
typedef T Value;
typedef T NakedValue;
};
template<typename T>
struct VolatileValue {
typedef volatile T Value;
typedef T NakedValue;
};
template<typename T>
struct VolatilePOD {
volatile T raw;

15
include/PSX/System/IOPorts/memory_io.hpp
View File

@ -4,11 +4,16 @@
namespace JabyEngine {
namespace Memory_IO {
struct COM_DELAY {
typedef uint32_t Type;
template<template<typename> typename T>
struct COM_DELAY_base {
T<uint32_t>::Value value;
static constexpr uint32_t SetupValue = 0x1325;
void setup() {
this->value = 0x1325;
}
};
typedef COM_DELAY_base<VolatileValue> COM_DELAY_v;
typedef COM_DELAY_base<NormalValue> COM_DELAY_t;
struct CD_DELAY {
typedef uint32_t Type;
@ -16,7 +21,9 @@ namespace JabyEngine {
static constexpr uint32_t SetupValue = 0x20943;
};
__declare_io_port_global_simple(COM_DELAY::Type, COM_DELAY, 0x1F801020);
static auto& COM_DELAY = *reinterpret_cast<COM_DELAY_v*>(0x1F801020);
//__declare_io_port_global_simple(COM_DELAY::Type, COM_DELAY, 0x1F801020);
__declare_io_port_global_simple(CD_DELAY::Type, CD_DELAY, 0x1F801018);
}
}

12
src/Library/src/BootLoader/cd_boot.cpp
View File

@ -16,7 +16,17 @@ namespace JabyEngine {
void setup() {
__syscall_EnterCriticalSection();
Memory_IO::COM_DELAY.write(Memory_IO::COM_DELAY::SetupValue);
Memory_IO::COM_DELAY.setup();
Memory_IO::COM_DELAY.setup();
Memory_IO::COM_DELAY.setup();
Memory_IO::COM_DELAY_t b{Memory_IO::COM_DELAY.value};
b.setup();
b.setup();
b.setup();
//Memory_IO::COM_DELAY.write(Memory_IO::COM_DELAY::SetupValue);
Memory_IO::CD_DELAY.write(Memory_IO::CD_DELAY::SetupValue);
__syscall_SysEnqIntRP(CdromIoIrq, &::JabyEngine::CD::internal::callback);