piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-26 07:39:45 -06:00
Code Issues Packages Projects Releases Wiki Activity

updated dsp null some clean up as well.

Browse Source 
Please test on windows


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2018 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee
2009-01-26 16:58:01 +00:00
parent 356db07cbf
commit 52deb12599
6 changed files with 919 additions and 923 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Plugins/Plugin_DSP_NULL/Src/SConscript
View File

@ -11,6 +11,7 @@ files = [
"main.cpp", "main.cpp",
"Globals.cpp", "Globals.cpp",
"UCodes/UCode_AX.cpp", "UCodes/UCode_AX.cpp",
"UCodes/UCode_AXWii.cpp",
"UCodes/UCode_CARD.cpp", "UCodes/UCode_CARD.cpp",
"UCodes/UCode_InitAudioSystem.cpp", "UCodes/UCode_InitAudioSystem.cpp",
"UCodes/UCode_Jac.cpp", "UCodes/UCode_Jac.cpp",

10
Source/Plugins/Plugin_DSP_NULL/Src/UCodes/UCode_AX.cpp
View File

@ -17,7 +17,6 @@
#include "FileUtil.h" // For IsDirectory() #include "FileUtil.h" // For IsDirectory()
#include "StringUtil.h" // For StringFromFormat() #include "StringUtil.h" // For StringFromFormat()
#include <sstream> #include <sstream>
#include "../MailHandler.h" #include "../MailHandler.h"
@ -27,7 +26,6 @@
#include "UCode_AX.h" #include "UCode_AX.h"
#include "UCode_AX_Voice.h" #include "UCode_AX_Voice.h"
// ------------------------------------------------------------------ // ------------------------------------------------------------------
// Externals // Externals
// ----------- // -----------
@ -95,8 +93,9 @@ void CUCode_AX::SaveLog_(bool Wii, const char* _fmt, va_list ap)
char Msg[512]; char Msg[512];
vsprintf(Msg, _fmt, ap); vsprintf(Msg, _fmt, ap);
TmpMailLog += Msg; TmpMailLog += Msg;
TmpMailLog += "\n"; TmpMailLog += "\n";
} }
// ---------------- // ----------------
@ -125,6 +124,7 @@ int ReadOutPBs(u32 pbs_address, AXParamBlock* _pPBs, int _num)
for (size_t p = 0; p < sizeof(AXParamBlock) / 2; p++) for (size_t p = 0; p < sizeof(AXParamBlock) / 2; p++)
{ {
pDest[p] = Common::swap16(pSrc[p]); pDest[p] = Common::swap16(pSrc[p]);
} }
blockAddr = (_pPBs[i].next_pb_hi << 16) | _pPBs[i].next_pb_lo; blockAddr = (_pPBs[i].next_pb_hi << 16) | _pPBs[i].next_pb_lo;
count++; count++;
@ -236,6 +236,7 @@ void CUCode_AX::MixAdd(short* _pBuffer, int _iSize)
*_pBuffer++ = left; *_pBuffer++ = left;
*_pBuffer++ = right; *_pBuffer++ = right;
} }
} }
@ -343,7 +344,6 @@ bool CUCode_AX::AXTask(u32& _uMail)
m_addressPBs = Memory_Read_U32(uAddress); m_addressPBs = Memory_Read_U32(uAddress);
uAddress += 4; uAddress += 4;
SaveLog("%08x : AXLIST PB address: %08x", uAddress, m_addressPBs);
} }
break; break;

8
Source/Plugins/Plugin_DSP_NULL/Src/UCodes/UCode_AXWii.cpp
View File

@ -102,8 +102,6 @@ void CUCode_AXWii::MixAdd_(short* _pBuffer, int _iSize, ParamBlockType &PBs)
// ------------------------------------------- // -------------------------------------------
// write logging data to debugger // write logging data to debugger
// ---------------------------------------------------------------------------------------
/* Make the updates we are told to do. See comments to the GC version in UCode_AX.cpp */ /* Make the updates we are told to do. See comments to the GC version in UCode_AX.cpp */
// ------------ // ------------
for (int i = 0; i < numberOfPBs; i++) for (int i = 0; i < numberOfPBs; i++)
@ -205,7 +203,6 @@ bool CUCode_AXWii::AXTask(u32& _uMail)
// u32 Addr__9; // u32 Addr__9;
bool bExecuteList = true; bool bExecuteList = true;
if (false) if (false)
{ {
// PanicAlert("%i", sizeof(AXParamBlockWii)); // 252 ?? // PanicAlert("%i", sizeof(AXParamBlockWii)); // 252 ??
@ -242,7 +239,6 @@ bool CUCode_AXWii::AXTask(u32& _uMail)
{ {
u32 address = Memory_Read_U32(uAddress); u32 address = Memory_Read_U32(uAddress);
uAddress += 4; uAddress += 4;
SaveLog("%08x : AXLIST 1: %08x", uAddress, address);
} }
break; break;
@ -250,14 +246,13 @@ bool CUCode_AXWii::AXTask(u32& _uMail)
{ {
u32 address = Memory_Read_U32(uAddress); u32 address = Memory_Read_U32(uAddress);
uAddress += 4; uAddress += 4;
SaveLog("%08x : AXLIST 3: %08x", uAddress, address);
} }
break; break;
case 0x0004: // PBs are here now case 0x0004: // PBs are here now
m_addressPBs = Memory_Read_U32(uAddress); m_addressPBs = Memory_Read_U32(uAddress);
lCUCode_AX->m_addressPBs = m_addressPBs; // for the sake of logging lCUCode_AX->m_addressPBs = m_addressPBs; // for the sake of logging
SaveLog("%08x : AXLIST PB address: %08x", uAddress, m_addressPBs);
uAddress += 4; uAddress += 4;
break; break;
@ -270,7 +265,6 @@ bool CUCode_AXWii::AXTask(u32& _uMail)
uAddress += 4; uAddress += 4;
uAddress += 2; uAddress += 2;
SaveLog("%08x : AXLIST 5_1 5_2 addresses: %08x %08x", uAddress, Addr__5_1, Addr__5_2);
} }
else else
{ {

1
Source/Plugins/Plugin_DSP_NULL/Src/UCodes/UCode_AX_Voice.h
View File

@ -54,6 +54,7 @@ inline int ReadOutPBsWii(u32 pbs_address, ParamBlockType& _pPBs, int _num)
{ {
if(p == 6 || p == 7) pDest[p] = pSrc[p]; // control for the u32 if(p == 6 || p == 7) pDest[p] = pSrc[p]; // control for the u32
else pDest[p] = Common::swap16(pSrc[p]); else pDest[p] = Common::swap16(pSrc[p]);
} }
_pPBs[i].mixer_control = Common::swap32(_pPBs[i].mixer_control); _pPBs[i].mixer_control = Common::swap32(_pPBs[i].mixer_control);