From 3e4725c99c9455ad288c45d7dba3f552b1ba3bfb Mon Sep 17 00:00:00 2001 From: Gericom Date: Fri, 2 Jan 2026 15:32:48 +0100 Subject: [PATCH] Renamed methods in IReadSectorsDmaPatchCode --- .../patches/arm9/sdk2to4/CardiSetCardDmaPatchCode.h | 4 ++-- arm9/source/patches/platform/IReadSectorsDmaPatchCode.h | 4 ++-- .../patches/platform/ace3ds/Ace3DSReadSdDmaPatchCode.h | 4 ++-- .../platform/dspico/DSPicoReadSdSectorDmaPatchCode.h | 8 ++++---- .../source/patches/platform/g003/G003ReadSdDmaPatchCode.h | 4 ++-- .../platform/stargate/StargateReadSdDmaPatchCode.h | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/arm9/source/patches/arm9/sdk2to4/CardiSetCardDmaPatchCode.h b/arm9/source/patches/arm9/sdk2to4/CardiSetCardDmaPatchCode.h index f636a01..87504fb 100644 --- a/arm9/source/patches/arm9/sdk2to4/CardiSetCardDmaPatchCode.h +++ b/arm9/source/patches/arm9/sdk2to4/CardiSetCardDmaPatchCode.h @@ -25,9 +25,9 @@ public: { patch_cardisetcarddma_cardi_common = (u32)cardiCommonPointer; patch_cardisetcarddma_rom_offset_to_sd_sector_asm_address = (u32)sectorRemapPatchCode->GetRemapFunction(); - patch_cardisetcarddma_sdreaddma_asm_address = (u32)readSectorsDmaPatchCode->GetSdReadDmaFunction(); + patch_cardisetcarddma_sdreaddma_asm_address = (u32)readSectorsDmaPatchCode->GetReadSectorsDmaFunction(); patch_cardionreadcard_osdisableirqmask_address = (u32)osDisableIrqMaskPointer; - patch_cardionreadcard_sdreaddma_finish_asm_address = (u32)readSectorsDmaPatchCode->GetSdReadDmaFinishFunction(); + patch_cardionreadcard_sdreaddma_finish_asm_address = (u32)readSectorsDmaPatchCode->GetReadSectorsDmaFinishFunction(); } const void* GetCardiSetCardDmaFunction() const diff --git a/arm9/source/patches/platform/IReadSectorsDmaPatchCode.h b/arm9/source/patches/platform/IReadSectorsDmaPatchCode.h index 2d63108..ef7c84f 100644 --- a/arm9/source/patches/platform/IReadSectorsDmaPatchCode.h +++ b/arm9/source/patches/platform/IReadSectorsDmaPatchCode.h @@ -18,9 +18,9 @@ public: /// @brief Gets a pointer to the dma SD read function in the patch code. /// @return The pointer to the dma SD read function. - virtual const ReadSectorsDmaFunc GetSdReadDmaFunction() const = 0; + virtual const ReadSectorsDmaFunc GetReadSectorsDmaFunction() const = 0; /// @brief Gets a pointer to the dma SD read finish function in the patch code. /// @return The pointer to the dma SD read finish function. - virtual const ReadSectorsDmaFinishFunc GetSdReadDmaFinishFunction() const = 0; + virtual const ReadSectorsDmaFinishFunc GetReadSectorsDmaFinishFunction() const = 0; }; diff --git a/arm9/source/patches/platform/ace3ds/Ace3DSReadSdDmaPatchCode.h b/arm9/source/patches/platform/ace3ds/Ace3DSReadSdDmaPatchCode.h index 58fd9b8..e634ef2 100644 --- a/arm9/source/patches/platform/ace3ds/Ace3DSReadSdDmaPatchCode.h +++ b/arm9/source/patches/platform/ace3ds/Ace3DSReadSdDmaPatchCode.h @@ -19,12 +19,12 @@ public: ace3ds_readSdDma_miiCardDmaCopy32Ptr = (u32)miiCardDmaCopy32Ptr; } - const ReadSectorsDmaFunc GetSdReadDmaFunction() const override + const ReadSectorsDmaFunc GetReadSectorsDmaFunction() const override { return (const ReadSectorsDmaFunc)GetAddressAtTarget((void*)ace3ds_readSdDma); } - const ReadSectorsDmaFinishFunc GetSdReadDmaFinishFunction() const override + const ReadSectorsDmaFinishFunc GetReadSectorsDmaFinishFunction() const override { return (const ReadSectorsDmaFinishFunc)GetAddressAtTarget((void*)ace3ds_finishReadSdDma); } diff --git a/arm9/source/patches/platform/dspico/DSPicoReadSdSectorDmaPatchCode.h b/arm9/source/patches/platform/dspico/DSPicoReadSdSectorDmaPatchCode.h index 1377c90..1a55ede 100644 --- a/arm9/source/patches/platform/dspico/DSPicoReadSdSectorDmaPatchCode.h +++ b/arm9/source/patches/platform/dspico/DSPicoReadSdSectorDmaPatchCode.h @@ -24,7 +24,7 @@ public: return GetAddressAtTarget((void*)dspico_readSdSectorDma_pollSdDataReady); } - const IReadSectorsDmaPatchCode::ReadSectorsDmaFinishFunc GetSdReadDmaFinishFunction() const + const IReadSectorsDmaPatchCode::ReadSectorsDmaFinishFunc GetReadSectorsDmaFinishFunction() const { return (const IReadSectorsDmaPatchCode::ReadSectorsDmaFinishFunc)GetAddressAtTarget((void*)dspico_finishReadSdSectorDma); } @@ -36,18 +36,18 @@ public: DSPicoReadSdSectorDmaPatchCode(PatchHeap& patchHeap, const DSPicoReadSdSectorDmaPollSdDataReadyPatchCode* pollSdDataReadyPatchCode, const void* miiCardDmaCopy32Ptr) : PatchCode(SECTION_START(dspico_readsdsectordma), SECTION_SIZE(dspico_readsdsectordma), patchHeap) - , _sdReadDmaFinishFunc(pollSdDataReadyPatchCode->GetSdReadDmaFinishFunction()) + , _sdReadDmaFinishFunc(pollSdDataReadyPatchCode->GetReadSectorsDmaFinishFunction()) { dspico_readSdSectorDma_miiCardDmaCopy32Ptr = (u32)miiCardDmaCopy32Ptr; dspico_readSdSectorDma_pollSdDataReadyPtr = (u32)pollSdDataReadyPatchCode->GetPollSdDataReadyFunction(); } - const ReadSectorsDmaFunc GetSdReadDmaFunction() const override + const ReadSectorsDmaFunc GetReadSectorsDmaFunction() const override { return (const ReadSectorsDmaFunc)GetAddressAtTarget((void*)dspico_readSdSectorDma); } - const ReadSectorsDmaFinishFunc GetSdReadDmaFinishFunction() const override + const ReadSectorsDmaFinishFunc GetReadSectorsDmaFinishFunction() const override { return _sdReadDmaFinishFunc; } diff --git a/arm9/source/patches/platform/g003/G003ReadSdDmaPatchCode.h b/arm9/source/patches/platform/g003/G003ReadSdDmaPatchCode.h index 0928afa..e00bb03 100644 --- a/arm9/source/patches/platform/g003/G003ReadSdDmaPatchCode.h +++ b/arm9/source/patches/platform/g003/G003ReadSdDmaPatchCode.h @@ -19,12 +19,12 @@ public: g003_readSdDma_miiCardDmaCopy32Ptr = (u32)miiCardDmaCopy32Ptr; } - const ReadSectorsDmaFunc GetSdReadDmaFunction() const override + const ReadSectorsDmaFunc GetReadSectorsDmaFunction() const override { return (const ReadSectorsDmaFunc)GetAddressAtTarget((void*)g003_readSdDma); } - const ReadSectorsDmaFinishFunc GetSdReadDmaFinishFunction() const override + const ReadSectorsDmaFinishFunc GetReadSectorsDmaFinishFunction() const override { return (const ReadSectorsDmaFinishFunc)GetAddressAtTarget((void*)g003_finishReadSdDma); } diff --git a/arm9/source/patches/platform/stargate/StargateReadSdDmaPatchCode.h b/arm9/source/patches/platform/stargate/StargateReadSdDmaPatchCode.h index 46f9d6e..565e3d9 100644 --- a/arm9/source/patches/platform/stargate/StargateReadSdDmaPatchCode.h +++ b/arm9/source/patches/platform/stargate/StargateReadSdDmaPatchCode.h @@ -19,12 +19,12 @@ public: stargate_readSdDma_miiCardDmaCopy32Ptr = (u32)miiCardDmaCopy32Ptr; } - const ReadSectorsDmaFunc GetSdReadDmaFunction() const override + const ReadSectorsDmaFunc GetReadSectorsDmaFunction() const override { return (const ReadSectorsDmaFunc)GetAddressAtTarget((void*)stargate_readSdDma); } - const ReadSectorsDmaFinishFunc GetSdReadDmaFinishFunction() const override + const ReadSectorsDmaFinishFunc GetReadSectorsDmaFinishFunction() const override { return (const ReadSectorsDmaFinishFunc)GetAddressAtTarget((void*)stargate_finishReadSdDma); }