summaryrefslogtreecommitdiff
path: root/Source/Plugins
diff options
context:
space:
mode:
authorShawn Hoffman <godisgovernment@gmail.com>2009-10-06 15:49:20 +0000
committerShawn Hoffman <godisgovernment@gmail.com>2009-10-06 15:49:20 +0000
commit4c22bea4d47f4d0cf1b31b9d4e02178ecb7bccd7 (patch)
treeb66dd41898197b3be87748402f073a067db0e565 /Source/Plugins
parent19b8e6bc08774ecd292fddbd70b0b80eb26cae60 (diff)
Add ability to use Reset (reset button interrupt, still figuring out the other reset modes)
Add support for button combos that are built-in to controllers: y+x+start for three seconds updates the origin b+x+start for three seconds resets Changed CPeripheralInterface to a namespace and renamed to ProcessorInterface git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4366 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Plugins')
-rw-r--r--Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCodes.cpp18
1 files changed, 15 insertions, 3 deletions
diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCodes.cpp b/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCodes.cpp
index ec146f922a..803b6c9bfd 100644
--- a/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCodes.cpp
+++ b/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCodes.cpp
@@ -54,7 +54,13 @@ IUCode* UCodeFactory(u32 _CRC, CMailHandler& _rMailHandler)
INFO_LOG(DSPHLE, "CRC %08x: AX ucode chosen", _CRC);
return new CUCode_AX(_rMailHandler);
- case 0x088e38a5: // IPL - JAP
+ // Dunno if this is correct (well, pretty sure it's not...) but it
+ // prevents the deluge of error msgs when loading IPL with DSP HLE :p
+ case 0x6ba3b3ea: // IPL - PAL
+ case 0x24b22038: // IPL - NTSC/NTSC-JAP
+ return new CUCode_InitAudioSystem(_rMailHandler);
+
+ case 0x088e38a5: // IPL - JAP (shuffle2) - were these hashes from a different hash algo? seem incorrect (see above)
case 0xd73338cf: // IPL
case 0x42f64ac4: // Luigi
case 0x4be6a5cb: // AC, Pikmin
@@ -88,10 +94,16 @@ IUCode* UCodeFactory(u32 _CRC, CMailHandler& _rMailHandler)
return new CUCode_AXWii(_rMailHandler, _CRC);
default:
- PanicAlert("DSPHLE: Unknown ucode (CRC = %08x) - forcing AX/AXWii.\n\nTry LLE plugin if this is homebrew.", _CRC);
if (g_dspInitialize.bWii)
+ {
+ PanicAlert("DSPHLE: Unknown ucode (CRC = %08x) - forcing AXWii.\n\nTry LLE plugin if this is homebrew.", _CRC);
return new CUCode_AXWii(_rMailHandler, _CRC);
- return new CUCode_AX(_rMailHandler);
+ }
+ else
+ {
+ PanicAlert("DSPHLE: Unknown ucode (CRC = %08x) - forcing AX.\n\nTry LLE plugin if this is homebrew.", _CRC);
+ return new CUCode_AX(_rMailHandler);
+ }
}
return NULL;