diff options
| author | hrydgard <hrydgard@gmail.com> | 2011-01-28 21:39:23 +0000 |
|---|---|---|
| committer | hrydgard <hrydgard@gmail.com> | 2011-01-28 21:39:23 +0000 |
| commit | a63cfd033fbed3b2b26b6169adee767e6e088a5b (patch) | |
| tree | 2228e3d1a90620621b91857fde8191abd5d46e17 /Source/Core | |
| parent | 46d00f211ffb183788fb9d38cc795e9734994601 (diff) | |
delete more old stuff
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6953 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/Core/Src/HW/DSPLLE/DSPLLEGlobals.cpp | 24 | ||||
| -rw-r--r-- | Source/Core/Core/Src/HW/DSPLLE/DSPLLEGlobals.h | 4 |
3 files changed, 1 insertions, 29 deletions
diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp b/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp index 6e608f2224..57816bf688 100644 --- a/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp +++ b/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp @@ -333,7 +333,7 @@ void DSPLLE::DSP_SendAIBuffer(unsigned int address, unsigned int num_samples) if (pMixer != 0 && address != 0) { - const short *samples = (const short *)LLEMemory_Get_Pointer(address); + const short *samples = (const short *)&g_dsp.cpu_ram[address & Memory::RAM_MASK]; pMixer->PushSamples(samples, num_samples); } diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPLLEGlobals.cpp b/Source/Core/Core/Src/HW/DSPLLE/DSPLLEGlobals.cpp index 8afa14d2bc..e102e0ff83 100644 --- a/Source/Core/Core/Src/HW/DSPLLE/DSPLLEGlobals.cpp +++ b/Source/Core/Core/Src/HW/DSPLLE/DSPLLEGlobals.cpp @@ -23,30 +23,6 @@ #include "DSPCore.h" #include "DSPLLEGlobals.h" -// TODO: Get rid of this file. - -// ======================================================================================= -// For PB address detection -// -------------- - -// This will only work on GC, not Wii. -u32 RAM_MASK = 0x1FFFFFF; - -u16 LLEMemory_Read_U16(u32 _uAddress) -{ - return Common::swap16(*(u16*)&g_dsp.cpu_ram[_uAddress & RAM_MASK]); -} - -u32 LLEMemory_Read_U32(u32 _uAddress) -{ - return Common::swap32(*(u32*)&g_dsp.cpu_ram[_uAddress & RAM_MASK]); -} - -void* LLEMemory_Get_Pointer(u32 _uAddress) -{ - return &g_dsp.cpu_ram[_uAddress & RAM_MASK]; -} - #if PROFILE #define PROFILE_MAP_SIZE 0x10000 diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPLLEGlobals.h b/Source/Core/Core/Src/HW/DSPLLE/DSPLLEGlobals.h index 0fef8f7654..87cb817b9e 100644 --- a/Source/Core/Core/Src/HW/DSPLLE/DSPLLEGlobals.h +++ b/Source/Core/Core/Src/HW/DSPLLE/DSPLLEGlobals.h @@ -26,10 +26,6 @@ #define PROFILE 0 -u16 LLEMemory_Read_U16(u32 _uAddress); // For PB address detection -u32 LLEMemory_Read_U32(u32 _uAddress); -void* LLEMemory_Get_Pointer(u32 _uAddress); - #if PROFILE void ProfilerDump(u64 _count); void ProfilerInit(); |
