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

General: the definitions of ARMCPU_ARM9, ARMCPU_ARM7 and ARMPROC seem 

to fit the best in MMU.cpp ... so let's get rid of that hack.

Feel free to revert if it breaks compilation under Linux or whatever.
Worked fine under Win32.
This commit is contained in:
luigi__ 2009-08-02 21:14:27 +00:00
parent bf124165f7
commit d1fe3e3c21
2 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
desmume/src/MMU.h
View File

@ -32,12 +32,9 @@
#include "ARM9.h" #include "ARM9.h"
#include "mc.h" #include "mc.h"
//HACK!!!! REMOVE ME SOON!
#ifndef ARMCPU_ARM7
#define ARMCPU_ARM7 1 #define ARMCPU_ARM7 1
#define ARMCPU_ARM9 0 #define ARMCPU_ARM9 0
#define ARMPROC (PROCNUM?NDS_ARM7:NDS_ARM9) #define ARMPROC (PROCNUM ? NDS_ARM7:NDS_ARM9)
#endif
typedef const u8 TWaitState; typedef const u8 TWaitState;

4
desmume/src/armcpu.h
View File

@ -22,10 +22,6 @@
#ifndef ARM_CPU #ifndef ARM_CPU
#define ARM_CPU #define ARM_CPU
#define ARMCPU_ARM7 1
#define ARMCPU_ARM9 0
#define ARMPROC (PROCNUM?NDS_ARM7:NDS_ARM9)
#include "types.h" #include "types.h"
#include "bits.h" #include "bits.h"
#include "MMU.h" #include "MMU.h"