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

dma controller: rename check to dmaCheck 

The conflicting macro is the check() assertion macro defined
in Apple's CoreFoundation framework, specifically in the
AssertMacros.h file.
Unfortunately, this file must be included in the Cocoa port.

From rogerman in bug #3259154
This commit is contained in:
riccardom 2011-04-13 20:38:55 +00:00
parent 713b5dc1b2
commit 4d1b0b5809
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
desmume/src/MMU.cpp
View File

@ -1759,7 +1759,7 @@ bool DmaController::loadstate(EMUFILE* f)
read8le(&temp,f); sar = (EDMASourceUpdate)temp;
read8le(&temp,f); dar = (EDMADestinationUpdate)temp;
read32le(&saddr,f); read32le(&daddr,f);
read32le(&check,f); read32le(&running,f); read32le(&paused,f); read32le(&triggered,f);
read32le(&dmaCheck,f); read32le(&running,f); read32le(&paused,f); read32le(&triggered,f);
read64le(&nextEvent,f);
if(version==1)
@ -1782,7 +1782,7 @@ void DmaController::savestate(EMUFILE *f)
write8le(sar,f);
write8le(dar,f);
write32le(saddr,f); write32le(daddr,f);
write32le(check,f); write32le(running,f); write32le(paused,f); write32le(triggered,f);
write32le(dmaCheck,f); write32le(running,f); write32le(paused,f); write32le(triggered,f);
write64le(nextEvent,f);
write32le(saddr_user,f);
write32le(daddr_user,f);
@ -1870,7 +1870,7 @@ if(_startmode==0 && wordcount==1) {
void DmaController::exec()
{
check = FALSE;
dmaCheck = FALSE;
if(running)
{
@ -2056,7 +2056,7 @@ void DmaController::tryTrigger(EDMAMode mode)
void DmaController::doSchedule()
{
check = TRUE;
dmaCheck = TRUE;
nextEvent = nds_timer;
NDS_RescheduleDMA();
}

4
desmume/src/MMU.h
View File

@ -202,7 +202,7 @@ public:
u32 saddr_user, daddr_user;
//indicates whether the dma needs to be checked for triggering
BOOL check;
BOOL dmaCheck;
//indicates whether the dma right now is logically running
//(though for now we copy all the data when it triggers)
@ -237,7 +237,7 @@ public:
//by inspecting dma3 saddr when it boots
saddr(0), daddr(0),
saddr_user(0), daddr_user(0),
check(FALSE),
dmaCheck(FALSE),
running(FALSE),
paused(FALSE),
triggered(FALSE),

4
desmume/src/NDSSystem.cpp
View File

@ -1184,11 +1184,11 @@ template<int procnum, int chan> struct TSequenceItem_DMA : public TSequenceItem
FORCEINLINE bool isTriggered()
{
return (controller->check && nds_timer>= controller->nextEvent);
return (controller->dmaCheck && nds_timer>= controller->nextEvent);
}
FORCEINLINE bool isEnabled() {
return controller->check?TRUE:FALSE;
return controller->dmaCheck?TRUE:FALSE;
}
FORCEINLINE u64 next()