just some misc cleanup that's been setting around

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4403 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Shawn Hoffman 2009-10-11 22:44:58 +00:00
parent 9da9346274
commit 2cfbd4327f
4 changed files with 71 additions and 80 deletions

View File

@ -827,7 +827,7 @@
>
</File>
<File
RelativePath=".\Src\HW\StreamADPCM.H"
RelativePath=".\Src\HW\StreamADPCM.h"
>
</File>
</Filter>

View File

@ -33,7 +33,7 @@ void DoState(PointerWrap &p);
void Update();
// Calls by DSP plugin
// Called by DSP plugin
u32 Callback_GetStreaming(short* _pDestBuffer, u32 _numSamples);
void Read32(u32& _uReturnValue, const u32 _iAddress);

View File

@ -229,9 +229,6 @@ void Shutdown()
}
void Read16(u16& _uReturnValue, const u32 _iAddress)
{
// WTF is this check about? DSP is at 5000 TODO remove
if ((_iAddress & 0x6C00) != 0x6c00)
{
switch (_iAddress & 0xFFFF)
{
@ -300,17 +297,11 @@ void Read16(u16& _uReturnValue, const u32 _iAddress)
_dbg_assert_(DSPINTERFACE,0);
break;
}
if (_iAddress != 0xCC005004)
if (_iAddress != (0xCC000000 + DSP_MAIL_FROM_DSP_HI))
{
DEBUG_LOG(DSPINTERFACE, "DSPInterface(r16) 0x%08x (%02x) (%08x)", _iAddress, _uReturnValue, PowerPC::ppcState.pc);
}
return;
}
else
{
_dbg_assert_(DSPINTERFACE,0);
}
_uReturnValue = 0x000;
}
void Write16(const u16 _Value, const u32 _Address)