all repos — mgba @ 823c720e1fec2adaf449ba1eb7daaaccf0c25b59

mGBA Game Boy Advance Emulator

DS DMA: Remove unused argument
Vicki Pfau vi@endrift.com
Thu, 23 Mar 2017 10:52:08 -0700
commit

823c720e1fec2adaf449ba1eb7daaaccf0c25b59

parent

12b44599ad4b036c361355c65cfa0cd6c863728d

1 files changed, 3 insertions(+), 4 deletions(-)

jump to
M src/ds/dma.csrc/ds/dma.c

@@ -12,7 +12,7 @@ #include <mgba/internal/ds/memory.h>

static void _dmaEvent(struct mTiming* timing, void* context, uint32_t cyclesLate); -static void DSDMAService(struct DSCommon* dscore, int number, struct GBADMA* info); +static void DSDMAService(struct DSCommon* dscore, struct GBADMA* info); static const int DMA_OFFSET[] = { 1, -1, 0, 1 };

@@ -129,7 +129,7 @@ dma->when = mTimingCurrentTime(&dscore->timing) + mTimingNextEvent(&dscore->timing) + 1;

DSDMAUpdate(dscore); } else { dscore->p->cpuBlocked |= DS_CPU_BLOCK_DMA; // TODO: Fix for ITCM - DSDMAService(dscore, memory->activeDMA, dma); + DSDMAService(dscore, dma); } } else { dma->nextCount = 0;

@@ -198,8 +198,7 @@ dscore->p->cpuBlocked &= ~DS_CPU_BLOCK_DMA;

} } -void DSDMAService(struct DSCommon* dscore, int number, struct GBADMA* info) { - UNUSED(number); +void DSDMAService(struct DSCommon* dscore, struct GBADMA* info) { struct ARMCore* cpu = dscore->cpu; uint32_t width = 2 << GBADMARegisterGetWidth(info->reg); int32_t wordsRemaining = info->nextCount;