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

Get rid of Tags.h. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2310 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2009-12-05 08:13:04 +00:00
parent 1b42c82faf
commit cf21dbf992
12 changed files with 13 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pcsx2/Gif.cpp
View File

@ -15,7 +15,6 @@
#include "PrecompiledHeader.h"
#include "Common.h"
#include "Tags.h"
#include "GS.h"
#include "Gif.h"

1
pcsx2/Hw.cpp
View File

@ -16,7 +16,6 @@
#include "PrecompiledHeader.h"
#include "Common.h"
#include "Tags.h"
#include "Hardware.h"

1
pcsx2/IPU/IPU.cpp
View File

@ -15,7 +15,6 @@
#include "PrecompiledHeader.h"
#include "Common.h"
#include "Tags.h"
#include "IPU.h"
#include "yuv2rgb.h"

24
pcsx2/Linux/pcsx2.cbp
View File

@ -308,7 +308,6 @@
<Unit filename="../System/SysCoreThread.cpp" />
<Unit filename="../System/SysThreadBase.cpp" />
<Unit filename="../System/SysThreads.h" />
<Unit filename="../Tags.h" />
<Unit filename="../Utilities/AsciiFile.h" />
<Unit filename="../Utilities/FileUtils.cpp" />
<Unit filename="../Utilities/folderdesc.txt" />
@ -364,8 +363,8 @@
<Unit filename="../gui/MainFrame.h" />
<Unit filename="../gui/MainMenuClicks.cpp" />
<Unit filename="../gui/MemoryCardFile.cpp" />
<Unit filename="../gui/MessageBoxes.cpp" />
<Unit filename="../gui/Panels/AudioPanel.cpp" />
<Unit filename="../gui/MessageBoxes.cpp" />
<Unit filename="../gui/Panels/AudioPanel.cpp" />
<Unit filename="../gui/Panels/BaseConfigPanel.h" />
<Unit filename="../gui/Panels/BiosSelectorPanel.cpp" />
<Unit filename="../gui/Panels/ConfigurationPanels.h" />
@ -406,13 +405,13 @@
<Option weight="0" />
<Option compiler="gcc" use="1" buildCommand="$(SvnRootDir)/tools/bin2app.sh $(SvnRootDir) $file" />
</Unit>
<Unit filename="../gui/Resources/ButtonIcon_Camera.h" />
<Unit filename="../gui/Resources/ButtonIcon_Camera.png">
<Option compile="1" />
<Option weight="0" />
<Option compiler="gcc" use="1" buildCommand="$(SvnRootDir)/tools/bin2app.sh $(SvnRootDir) $file" />
</Unit>
<Unit filename="../gui/Resources/ConfigIcon_Cpu.h" />
<Unit filename="../gui/Resources/ButtonIcon_Camera.h" />
<Unit filename="../gui/Resources/ButtonIcon_Camera.png">
<Option compile="1" />
<Option weight="0" />
<Option compiler="gcc" use="1" buildCommand="$(SvnRootDir)/tools/bin2app.sh $(SvnRootDir) $file" />
</Unit>
<Unit filename="../gui/Resources/ConfigIcon_Cpu.h" />
<Unit filename="../gui/Resources/ConfigIcon_Cpu.png">
<Option compile="1" />
<Option weight="0" />
@ -457,10 +456,9 @@
<Unit filename="../gui/Resources/EmbeddedImage.h" />
<Unit filename="../gui/Saveslots.cpp" />
<Unit filename="../gui/i18n.cpp" />
<Unit filename="../gui/i18n.cpp" />
<Unit filename="../gui/i18n.h" />
<Unit filename="../gui/pxLogTextCtrl.cpp" />
<Unit filename="../ps2/BiosTools.cpp" />
<Unit filename="../gui/pxLogTextCtrl.cpp" />
<Unit filename="../ps2/BiosTools.cpp" />
<Unit filename="../ps2/BiosTools.h" />
<Unit filename="../ps2/GIFpath.cpp" />
<Unit filename="../ps2/Iop/IopHwRead.cpp" />

1
pcsx2/SPR.cpp
View File

@ -15,7 +15,6 @@
#include "PrecompiledHeader.h"
#include "Common.h"
#include "Tags.h"
#include "SPR.h"
#include "VUmicro.h"

4
pcsx2/Sif.cpp
View File

@ -18,7 +18,6 @@
#define _PC_ // disables MIPS opcode macros.
#include "IopCommon.h"
#include "Tags.h"
#include "Sif.h"
#include "Sifcmd.h"
@ -196,7 +195,8 @@ __forceinline void SIF0Dma()
if (sif0dma->qwc == 0)
{
// Stop if TIE & the IRQ are set, or at the end.
if ((sif0dma->chcr.TIE && Tag::IRQ(sif0dma->chcr._u32)) || sif0.end)
// Remind me to look closer at this. (the IRQ tag of a chcr?)
if ((sif0dma->chcr.TIE && DMA_TAG(sif0dma->chcr._u32).IRQ) || sif0.end)
{
if (sif0.end)
SIF_LOG(" EE SIF end");

67
pcsx2/Tags.h
View File

@ -1,67 +0,0 @@
/* PCSX2 - PS2 Emulator for PCs
* Copyright (C) 2002-2009 PCSX2 Dev Team
*
* PCSX2 is free software: you can redistribute it and/or modify it under the terms
* of the GNU Lesser General Public License as published by the Free Software Found-
* ation, either version 3 of the License, or (at your option) any later version.
*
* PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along with PCSX2.
* If not, see <http://www.gnu.org/licenses/>.
*/
// This is meant to be a collection of generic functions dealing with tags.
// It's now going to be mostly depreciated for Dmac.h.
#include "Dmac.h"
// Transfer functions using u32. Eventually should be phased out for the tDMA_TAG functions.
namespace Tag
{
static __forceinline void UpperTransfer(DMACh *tag, u32* ptag)
{
tag->chcrTransfer((tDMA_TAG*)ptag);
}
static __forceinline void LowerTransfer(DMACh *tag, u32* ptag)
{
tag->qwcTransfer((tDMA_TAG*)ptag);
}
static __forceinline bool Transfer(const char *s, DMACh *tag, u32* ptag)
{
return tag->transfer(s, (tDMA_TAG*)ptag);
}
static __forceinline void UnsafeTransfer(DMACh *tag, u32* ptag)
{
tag->unsafeTransfer((tDMA_TAG*)ptag);
}
}
// Misc Tag functions, soon to be obsolete.
namespace Tag
{
static __forceinline tag_id Id(u32* tag)
{
return (tag_id)(((tDMA_TAG)tag[0]).ID);
}
static __forceinline tag_id Id(u32 tag)
{
return (tag_id)(((tDMA_TAG)tag).ID);
}
static __forceinline bool IRQ(u32 *tag)
{
return !!((tDMA_TAG)tag[0]).IRQ;
}
static __forceinline bool IRQ(u32 tag)
{
return !!((tDMA_TAG)tag).IRQ;
}
}

1
pcsx2/Vif.cpp
View File

@ -16,7 +16,6 @@
#include "PrecompiledHeader.h"
#include "Common.h"
#include "Tags.h"
#include <cmath>
#include <assert.h>

1
pcsx2/Vif0Dma.cpp
View File

@ -16,7 +16,6 @@
#include "PrecompiledHeader.h"
#include "Common.h"
#include "Tags.h"
#include "VifDma.h"
#include "VifDma_internal.h"

1
pcsx2/Vif1Dma.cpp
View File

@ -16,7 +16,6 @@
#include "PrecompiledHeader.h"
#include "Common.h"
#include "Tags.h"
#include "VifDma.h"
#include "VifDma_internal.h"

1
pcsx2/VifDma.cpp
View File

@ -15,7 +15,6 @@
#include "PrecompiledHeader.h"
#include "Common.h"
#include "Tags.h"
#include "VifDma.h"
#include "VifDma_internal.h"

1
pcsx2/windows/VCprojects/pcsx2.vcxproj
View File

@ -651,7 +651,6 @@
<ClInclude Include="..\..\Stats.h" />
<ClInclude Include="..\..\StringUtils.h" />
<ClInclude Include="..\..\System.h" />
<ClInclude Include="..\..\Tags.h" />
<ClInclude Include="..\..\Threading.h" />
<ClInclude Include="..\..\tinyxml\tinystr.h" />
<ClInclude Include="..\..\tinyxml\tinyxml.h" />