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

Remove an useless include.

This commit is contained in:
luigi__ 2009-11-12 22:24:23 +00:00
parent 9c9b01cb62
commit 3d353ce490
1 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
desmume/src/bios.cpp
View File

@ -22,7 +22,6 @@
#include "cp15.h" #include "cp15.h"
#include <math.h> #include <math.h>
#include "MMU.h" #include "MMU.h"
#include "SPU.h"
#include "debug.h" #include "debug.h"
#include "NDSSystem.h" #include "NDSSystem.h"
@ -214,31 +213,6 @@ TEMPLATE static u32 WaitByLoop()
//u32 oldmode[2]; //u32 oldmode[2];
TEMPLATE static u32 wait4IRQ()
{
//execute= FALSE;
u32 instructAddr = cpu->instruct_adr;
if(cpu->wirq)
{
if(!cpu->waitIRQ)
{
cpu->waitIRQ = 0;
cpu->wirq = 0;
//cpu->switchMode(oldmode[cpu->proc_ID]);
return 1;
}
cpu->R[15] = instructAddr;
cpu->next_instruction = instructAddr;
return 1;
}
cpu->waitIRQ = 1;
cpu->wirq = 1;
cpu->R[15] = instructAddr;
cpu->next_instruction = instructAddr;
//oldmode[cpu->proc_ID] = cpu->switchMode(SVC);
return 1;
}
TEMPLATE u32 intrWaitARM() TEMPLATE u32 intrWaitARM()
{ {
u32 intrFlagAdr = 0; u32 intrFlagAdr = 0;
@ -284,6 +258,31 @@ TEMPLATE static u32 waitVBlankARM()
return intrWaitARM<PROCNUM>(); return intrWaitARM<PROCNUM>();
} }
TEMPLATE static u32 wait4IRQ()
{
//execute= FALSE;
u32 instructAddr = cpu->instruct_adr;
if(cpu->wirq)
{
if(!cpu->waitIRQ)
{
cpu->waitIRQ = 0;
cpu->wirq = 0;
//cpu->switchMode(oldmode[cpu->proc_ID]);
return 1;
}
cpu->R[15] = instructAddr;
cpu->next_instruction = instructAddr;
return 1;
}
cpu->waitIRQ = 1;
cpu->wirq = 1;
cpu->R[15] = instructAddr;
cpu->next_instruction = instructAddr;
//oldmode[cpu->proc_ID] = cpu->switchMode(SVC);
return 1;
}
TEMPLATE static u32 sleep() TEMPLATE static u32 sleep()
{ {
_MMU_write08<PROCNUM>(0x04000301, 0xC0); _MMU_write08<PROCNUM>(0x04000301, 0xC0);