ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DS Video: Add hblank DMAs

This commit is contained in:
Vicki Pfau 2017-03-20 16:23:24 -07:00
parent 06a9d3265b
commit 40f1d66685
3 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/mgba/internal/ds/dma.h
View File

@ -40,6 +40,7 @@ void DS9DMAWriteCNT(struct DSCommon* dscore, int dma, uint32_t value);
struct DSDMA; struct DSDMA;
void DSDMASchedule(struct DSCommon* dscore, int number, struct GBADMA* info); void DSDMASchedule(struct DSCommon* dscore, int number, struct GBADMA* info);
void DSDMARunVblank(struct DSCommon* dscore, int32_t cycles); void DSDMARunVblank(struct DSCommon* dscore, int32_t cycles);
void DSDMARunHblank(struct DSCommon* dscore, int32_t cycles);
void DSDMAUpdate(struct DSCommon* dscore); void DSDMAUpdate(struct DSCommon* dscore);
CXX_GUARD_END CXX_GUARD_END

20
src/ds/dma.c
View File

@ -103,6 +103,10 @@ void DSDMASchedule(struct DSCommon* dscore, int number, struct GBADMA* info) {
DSGXScheduleDMA(dscore, number, info); DSGXScheduleDMA(dscore, number, info);
return; return;
case DS_DMA_TIMING_HBLANK: // DS7_DMA_TIMING_SLOT1 case DS_DMA_TIMING_HBLANK: // DS7_DMA_TIMING_SLOT1
if (dscore == &dscore->p->ds9) {
// Handled implicitly
return;
}
default: default:
mLOG(DS_MEM, STUB, "Unimplemented DMA"); mLOG(DS_MEM, STUB, "Unimplemented DMA");
} }
@ -151,7 +155,21 @@ void DSDMARunVblank(struct DSCommon* dscore, int32_t cycles) {
int i; int i;
for (i = 0; i < 4; ++i) { for (i = 0; i < 4; ++i) {
dma = &memory->dma[i]; dma = &memory->dma[i];
if (GBADMARegisterIsEnable(dma->reg) && GBADMARegisterGetTiming(dma->reg) == DMA_TIMING_VBLANK && !dma->nextCount) { if (GBADMARegisterIsEnable(dma->reg) && GBADMARegisterGetTiming(dma->reg) == DS_DMA_TIMING_VBLANK && !dma->nextCount) {
dma->when = mTimingCurrentTime(&dscore->timing) + 3 + cycles;
dma->nextCount = dma->count;
}
}
DSDMAUpdate(dscore);
}
void DSDMARunHblank(struct DSCommon* dscore, int32_t cycles) {
struct DSCoreMemory* memory = &dscore->memory;
struct GBADMA* dma;
int i;
for (i = 0; i < 4; ++i) {
dma = &memory->dma[i];
if (GBADMARegisterIsEnable(dma->reg) && GBADMARegisterGetTiming9(dma->reg) == DS_DMA_TIMING_HBLANK && !dma->nextCount) {
dma->when = mTimingCurrentTime(&dscore->timing) + 3 + cycles; dma->when = mTimingCurrentTime(&dscore->timing) + 3 + cycles;
dma->nextCount = dma->count; dma->nextCount = dma->count;
} }

3
src/ds/video.c
View File

@ -399,6 +399,9 @@ void _startHblank9(struct mTiming* timing, void* context, uint32_t cyclesLate) {
_performCapture(video, video->vcount); _performCapture(video, video->vcount);
} }
if (video->vcount < DS_VIDEO_VERTICAL_PIXELS) {
DSDMARunHblank(&video->p->ds9, -cyclesLate);
}
if (GBARegisterDISPSTATIsHblankIRQ(dispstat)) { if (GBARegisterDISPSTATIsHblankIRQ(dispstat)) {
DSRaiseIRQ(video->p->ds9.cpu, video->p->ds9.memory.io, DS_IRQ_HBLANK); DSRaiseIRQ(video->p->ds9.cpu, video->p->ds9.memory.io, DS_IRQ_HBLANK);
} }