Merge branch 'main' into GPU-Setup

include/PSX/System/IOPorts/DMA_IO.hpp

@@ -3,6 +3,7 @@
 #include "IOPort.hpp"
 
 namespace DMA {
+    namespace Port {
         struct __no_align MADR : public ComplexBitMap<uint32_t> {
             __io_port_inherit_complex_bit_map(MADR);
 
@@ -138,5 +139,6 @@ namespace DMA {
         __declare_io_port_global(DMAControlRegister,   DPCR, 0x1F8010F0);
         __declare_io_port_global(DMAInterruptRegister, DICR, 0x1F8010F4);
     }
+}
 
 #endif //!__JABYENGINE_DMA_IO_HPP__

lib/pcsx-redux/ps-exe.ld

@@ -68,16 +68,16 @@ SECTIONS {
 	{
 		.planschi
 		{
-			*libJabyEngine.a:boot_*.o(.text.startup._GLOBAL__*)
-			*libJabyEngine.a:boot_*.o(.ctors)
+			*libJabyEngine.a:*_boot.o(.text.startup._GLOBAL__*)
+			*libJabyEngine.a:*_boot.o(.ctors)
 
-            *libJabyEngine.a:boot_*.o(.text.*)
-			*libJabyEngine.a:boot_*.o(.rodata*)
-            *libJabyEngine.a:boot_*.o(.sdata*)
-			*libJabyEngine.a::boot_*.o(.data*)
-			*libJabyEngine.a::boot_*.o(.sbss*)
-			*libJabyEngine.a::boot_*.o(.bss*)
-            *libJabyEngine.a::boot_*.o(*)
+            *libJabyEngine.a:*_boot.o(.text.*)
+			*libJabyEngine.a:*_boot.o(.rodata*)
+            *libJabyEngine.a:*_boot.o(.sdata*)
+			*libJabyEngine.a::*_boot.o(.data*)
+			*libJabyEngine.a::*_boot.o(.sbss*)
+			*libJabyEngine.a::*_boot.o(.bss*)
+            *libJabyEngine.a::*_boot.o(*)
 		}
 	}
     __boot_loader_end = .;

src/Library/src/BootLoader/spu_boot.cpp

@@ -3,7 +3,7 @@
 
 namespace SPU {
     using namespace Port;
-    using namespace DMA;
+    using namespace DMA::Port;
 
     static void clear_key() {
         Key::off.write(UI32_MAX);