archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-21 11:51:48 +02:00
Code Issues Projects Releases Packages Wiki Activity

tiny change: get rid of a couple of uses of "long". better to use int or the explicitly sized typedefs. possibly really minor speedup of zelda ucode audio on linux.

Browse source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4474 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
hrydgard 2009-10-28 22:51:00 +00:00
parent f3681c0e1b
commit 2a99dfb261
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Source/Core/Core/Src/HW/DVDInterface.cpp
View file

@ -715,7 +715,7 @@ void ExecuteCommand(UDICR& _DICR)
else*/ else*/
if ((offset < 0) || ((offset + len) > 0x40) || len > 0x40) if ((offset < 0) || ((offset + len) > 0x40) || len > 0x40)
{ {
unsigned long addr = m_DIMAR.Address; u32 addr = m_DIMAR.Address;
if (iDVDOffset == 0x84800000) { if (iDVDOffset == 0x84800000) {
ERROR_LOG(DVDINTERFACE, "FIRMWARE UPLOAD"); ERROR_LOG(DVDINTERFACE, "FIRMWARE UPLOAD");
} else { } else {
@ -731,7 +731,7 @@ void ExecuteCommand(UDICR& _DICR)
} }
else else
{ {
unsigned long addr = m_DIMAR.Address; u32 addr = m_DIMAR.Address;
memcpy(media_buffer + offset, Memory::GetPointer(addr), len); memcpy(media_buffer + offset, Memory::GetPointer(addr), len);
while (len >= 4) while (len >= 4)
{ {
@ -769,7 +769,8 @@ void ExecuteCommand(UDICR& _DICR)
break; break;
case 0x100: case 0x100:
{ {
static int percentage; // urgh
static int percentage = 0;
static int status = 0; static int status = 0;
percentage++; percentage++;
if (percentage > 100) if (percentage > 100)

2
Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_Zelda_ADPCM.cpp
View file

@ -67,7 +67,7 @@ void CUCode_Zelda::AFCdecodebuffer(const s16 *coef, const char *src, signed shor
short hist2 = *hist2p; short hist2 = *hist2p;
for (int i = 0; i < 16; i++) for (int i = 0; i < 16; i++)
{ {
int sample = delta * nibbles[i] + ((long)hist * coef[idx * 2]) + ((long)hist2 * coef[idx * 2 + 1]); int sample = delta * nibbles[i] + ((int)hist * coef[idx * 2]) + ((int)hist2 * coef[idx * 2 + 1]);
if (type == 9) if (type == 9)
sample >>= 11; sample >>= 11;
else else