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

return Z1 and Z2 from TSC (fix scummvm mouse); and fix a creepy looking bug with IME setting in swi intrWaitARM

This commit is contained in:
zeromus 2010-04-14 06:12:19 +00:00
parent 8d72769735
commit 80e807c6da
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
desmume/src/MMU.cpp
View File

@ -3897,13 +3897,16 @@ void FASTCALL _MMU_ARM7_write16(u32 adr, u16 val)
case 0x20 : case 0x20 :
val = 0; val = 0;
break; break;
case 0x30 : case 0x30: //Z1
val = 0; //used for pressure calculation - must be nonzero or else some softwares will think the stylus is up.
if(nds.isTouch) val = 2048;
else val = 0;
break; break;
case 0x40 : case 0x40: //Z2
val = 0; //used for pressure calculation. we dont support pressure calculation so just return something.
val = 2048;
break; break;
case 0x50 : case 0x50:
if(spicnt & 0x800) if(spicnt & 0x800)
{ {
if(partie) if(partie)

1
desmume/src/bios.cpp
View File

@ -256,6 +256,7 @@ TEMPLATE u32 intrWaitARM()
//if(!noDiscard) //if(!noDiscard)
// intrFlag &= cpu->newIrqFlags; // intrFlag &= cpu->newIrqFlags;
MMU.reg_IME[PROCNUM] = 1;
_MMU_write32<PROCNUM>(0x04000208, 1); // set IME=1 _MMU_write32<PROCNUM>(0x04000208, 1); // set IME=1
if (intrFlag) if (intrFlag)