ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Just a few minor things. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2469 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2010-01-22 08:49:54 +00:00
parent 4f2601a687
commit b76d7c164b
4 changed files with 33 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pcsx2/R5900OpcodeImpl.cpp
View File

@ -732,7 +732,6 @@ void MOVN() {
* Format: OP * * Format: OP *
*********************************************************/ *********************************************************/
#include "Sifcmd.h"
/* /*
int __Deci2Call(int call, u32 *addr); int __Deci2Call(int call, u32 *addr);
*/ */
@ -821,6 +820,8 @@ int __Deci2Call(int call, u32 *addr)
return 0; return 0;
} }
// This function is the only one that uses Sifcmd.h in Pcsx2.
#include "Sifcmd.h"
void SYSCALL() void SYSCALL()
{ {
@ -841,7 +842,8 @@ void SYSCALL()
__Deci2Call( cpuRegs.GPR.n.a0.UL[0], (u32*)PSM(cpuRegs.GPR.n.a1.UL[0]) ); __Deci2Call( cpuRegs.GPR.n.a0.UL[0], (u32*)PSM(cpuRegs.GPR.n.a1.UL[0]) );
} }
if (call == 0x77) // The only thing this code is used for is the one log message, so don't execute it if we aren't logging bios messages.
if (macTrace.EE.Bios() && (call == 0x77))
{ {
t_sif_dma_transfer *dmat; t_sif_dma_transfer *dmat;
//struct t_sif_cmd_header *hdr; //struct t_sif_cmd_header *hdr;

5
pcsx2/Sif.cpp
View File

@ -20,11 +20,8 @@
#include "IopCommon.h" #include "IopCommon.h"
#include "Sif.h" #include "Sif.h"
#include "Sifcmd.h"
DMACh *sif0ch; DMACh *sif0ch, *sif1ch, *sif2ch;
DMACh *sif1ch;
DMACh *sif2ch;
static _sif0 sif0; static _sif0 sif0;
static _sif1 sif1; static _sif1 sif1;

4
pcsx2/Sif.h
View File

@ -52,9 +52,7 @@ struct _sif1
s32 counter; s32 counter;
struct sifData sifData; struct sifData sifData;
}; };
extern DMACh *sif0ch; extern DMACh *sif0ch, *sif1ch, *sif2ch;
extern DMACh *sif1ch;
extern DMACh *sif2ch;
extern void sifInit(); extern void sifInit();
extern void SIF0Dma(); extern void SIF0Dma();

54
plugins/zerospu2/Targets/dsound51.h
View File

@ -1,21 +1,21 @@
/* ZeroSPU2 /* ZeroSPU2
* Copyright (C) 2006-2010 zerofrog * Copyright (C) 2006-2010 zerofrog
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#ifndef DSOUND51_H_INCLUDED #ifndef DSOUND51_H_INCLUDED
#define DSOUND51_H_INCLUDED #define DSOUND51_H_INCLUDED
@ -30,17 +30,17 @@
// use DirectSound for the sound // use DirectSound for the sound
#include <dsound.h> #include <dsound.h>
extern int DSSetupSound(); extern int DSSetupSound();
extern void DSRemoveSound(); extern void DSRemoveSound();
extern int DSSoundGetBytesBuffered(); extern int DSSoundGetBytesBuffered();
extern void DSSoundFeedVoiceData(unsigned char* pSound,long lBytes); extern void DSSoundFeedVoiceData(unsigned char* pSound,long lBytes);
static SoundCallbacks DSCmds = static SoundCallbacks DSCmds =
{ {
(intFunction)DSSetupSound, (intFunction)DSSetupSound,
(voidFunction)DSRemoveSound, (voidFunction)DSRemoveSound,
(intFunction)DSSoundGetBytesBuffered, (intFunction)DSSoundGetBytesBuffered,
(soundFeedFunction)DSSoundFeedVoiceData (soundFeedFunction)DSSoundFeedVoiceData
}; };
#endif #endif