From c97dc8df5273db8c864834d12ba796c7fec32bab Mon Sep 17 00:00:00 2001 From: hrydgard Date: Thu, 2 Jul 2009 22:15:19 +0000 Subject: [PATCH] remove audiocommon include from DSPCore git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3653 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/DSPCore/Src/DSPCore.cpp | 5 +---- Source/Core/DSPCore/Src/DSPCore.h | 4 +--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/Source/Core/DSPCore/Src/DSPCore.cpp b/Source/Core/DSPCore/Src/DSPCore.cpp index e26f37ace1..d7eebd5e4f 100644 --- a/Source/Core/DSPCore/Src/DSPCore.cpp +++ b/Source/Core/DSPCore/Src/DSPCore.cpp @@ -37,7 +37,6 @@ 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) { @@ -65,10 +64,8 @@ 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, DSPInitialize *dspInit) +bool DSPCore_Init(const char *irom_filename, const char *coef_filename) { - dsp_initialize = dspInit; - g_dsp.step_counter = 0; g_dsp.irom = (u16*)AllocateMemoryPages(DSP_IROM_BYTE_SIZE); diff --git a/Source/Core/DSPCore/Src/DSPCore.h b/Source/Core/DSPCore/Src/DSPCore.h index 7daa33eae0..24d31eed48 100644 --- a/Source/Core/DSPCore/Src/DSPCore.h +++ b/Source/Core/DSPCore/Src/DSPCore.h @@ -27,7 +27,6 @@ #define _DSPCORE_H #include "DSPBreakpoints.h" -#include "AudioCommon.h" #define DSP_IRAM_BYTE_SIZE 0x2000 #define DSP_IRAM_SIZE 0x1000 @@ -212,9 +211,8 @@ struct SDSP extern SDSP g_dsp; extern DSPBreakpoints dsp_breakpoints; -extern DSPInitialize *dsp_initialize; -bool DSPCore_Init(const char *irom_filename, const char *coef_filename, DSPInitialize *dspInit = NULL); +bool DSPCore_Init(const char *irom_filename, const char *coef_filename); void DSPCore_Reset(); void DSPCore_Shutdown(); // Frees all allocated memory.