From 3d353ce49084a43111d434e0974a6225d34af93d Mon Sep 17 00:00:00 2001 From: luigi__ Date: Thu, 12 Nov 2009 22:24:23 +0000 Subject: [PATCH] Remove an useless include. --- desmume/src/bios.cpp | 51 ++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/desmume/src/bios.cpp b/desmume/src/bios.cpp index 4235be88d..c1394bc96 100644 --- a/desmume/src/bios.cpp +++ b/desmume/src/bios.cpp @@ -22,7 +22,6 @@ #include "cp15.h" #include #include "MMU.h" -#include "SPU.h" #include "debug.h" #include "NDSSystem.h" @@ -214,31 +213,6 @@ TEMPLATE static u32 WaitByLoop() //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() { u32 intrFlagAdr = 0; @@ -284,6 +258,31 @@ TEMPLATE static u32 waitVBlankARM() return intrWaitARM(); } +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() { _MMU_write08(0x04000301, 0xC0);