diff options
| author | nakeee <nakeee@gmail.com> | 2009-07-02 21:20:47 +0000 |
|---|---|---|
| committer | nakeee <nakeee@gmail.com> | 2009-07-02 21:20:47 +0000 |
| commit | ac9510187ceb1ecb6dab1042d16a1ead1b27edef (patch) | |
| tree | 017b87da9708be1ce98c267ec44c44d5877dbd8a /Source/Core/DSPCore/Src/DSPCore.cpp | |
| parent | 20db80bf6d59b8fc86c31af0122647fbf2ef35b5 (diff) | |
LLE Recommit some clean up from previous commits
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3652 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DSPCore/Src/DSPCore.cpp')
| -rw-r--r-- | Source/Core/DSPCore/Src/DSPCore.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Source/Core/DSPCore/Src/DSPCore.cpp b/Source/Core/DSPCore/Src/DSPCore.cpp index 565e2e6b1a..e26f37ace1 100644 --- a/Source/Core/DSPCore/Src/DSPCore.cpp +++ b/Source/Core/DSPCore/Src/DSPCore.cpp @@ -37,6 +37,7 @@ SDSP g_dsp; DSPBreakpoints dsp_breakpoints;
DSPCoreState core_state = DSPCORE_RUNNING;
Common::Event step_event;
+DSPInitialize *dsp_initialize = NULL;
static bool LoadRom(const char *fname, int size_in_words, u16 *rom)
{
@@ -64,8 +65,10 @@ static bool LoadRom(const char *fname, int size_in_words, u16 *rom) return false;
}
-bool DSPCore_Init(const char *irom_filename, const char *coef_filename)
+bool DSPCore_Init(const char *irom_filename, const char *coef_filename, DSPInitialize *dspInit)
{
+ dsp_initialize = dspInit;
+
g_dsp.step_counter = 0;
g_dsp.irom = (u16*)AllocateMemoryPages(DSP_IROM_BYTE_SIZE);
@@ -157,10 +160,10 @@ void DSPCore_CheckExternalInterrupt() // check if there is an external interrupt
if (g_dsp.cr & CR_EXTERNAL_INT)
{
- if (dsp_SR_is_flag_set(FLAG_ENABLE_INTERUPT) && (g_dsp.exception_in_progress_hack == false))
+ if (dsp_SR_is_flag_set(SR_EXT_INT_ENABLE) && (g_dsp.exception_in_progress_hack == false))
{
// level 7 is the interrupt exception
- DSPCore_SetException(7);
+ DSPCore_SetException(EXP_INT);
g_dsp.cr &= ~CR_EXTERNAL_INT;
}
|