From fcc8b0b8e76fba18a2caf2af01560964c64534f0 Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Thu, 12 Oct 2023 05:22:02 -0700 Subject: [PATCH] Match and link CARAMManager.cpp Former-commit-id: a566a6bc24deff0cb3b11bcf9bc1edf0f917aae0 --- configure.py | 2 +- src/Kyoto/CARAMManager.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.py b/configure.py index 32a79fd7..598456b0 100755 --- a/configure.py +++ b/configure.py @@ -893,7 +893,7 @@ config.libs = [ RetroLib( "Kyoto2", [ - Object(NonMatching, "Kyoto/CARAMManager.cpp"), + Object(Matching, "Kyoto/CARAMManager.cpp"), Object(NonMatching, "Kyoto/Math/CFrustumPlanes.cpp"), Object(NonMatching, "Kyoto/Graphics/CCubeMaterial.cpp"), Object(NonMatching, "Kyoto/Graphics/CCubeSurface.cpp"), diff --git a/src/Kyoto/CARAMManager.cpp b/src/Kyoto/CARAMManager.cpp index 9f4d82f1..e9ccd33f 100644 --- a/src/Kyoto/CARAMManager.cpp +++ b/src/Kyoto/CARAMManager.cpp @@ -109,7 +109,7 @@ bool CARAMManager::Free(const void* ptr) { uint CARAMManager::DMAToARAM(void* src, void* dest, uint len, EDMAPriority priority) { DCStoreRange(src, len); - SAramDMARequest* req = new SAramDMARequest(); + SAramDMARequest* req = rs_new SAramDMARequest(); req->mComplete = false; req->mUniqueID = mDMAUniqueID; mActiveDMAs.push_back(req); @@ -123,7 +123,7 @@ uint CARAMManager::DMAToARAM(void* src, void* dest, uint len, EDMAPriority prior int CARAMManager::DMAToMRAM(void* src, void* dest, uint len, EDMAPriority priority) { DCInvalidateRange(dest, len); - SAramDMARequest* req = new SAramDMARequest(); + SAramDMARequest* req = rs_new SAramDMARequest(); req->mComplete = false; req->mUniqueID = mDMAUniqueID; mActiveDMAs.push_back(req);