diff --git a/pcsx2/Gif.cpp b/pcsx2/Gif.cpp
index 598818c34a..91a713ef54 100644
--- a/pcsx2/Gif.cpp
+++ b/pcsx2/Gif.cpp
@@ -15,7 +15,6 @@
#include "PrecompiledHeader.h"
#include "Common.h"
-#include "Tags.h"
#include "GS.h"
#include "Gif.h"
diff --git a/pcsx2/Hw.cpp b/pcsx2/Hw.cpp
index 1f29d44b89..a716de663a 100644
--- a/pcsx2/Hw.cpp
+++ b/pcsx2/Hw.cpp
@@ -16,7 +16,6 @@
#include "PrecompiledHeader.h"
#include "Common.h"
-#include "Tags.h"
#include "Hardware.h"
diff --git a/pcsx2/IPU/IPU.cpp b/pcsx2/IPU/IPU.cpp
index 11dd49fda7..0c3e3f9e5b 100644
--- a/pcsx2/IPU/IPU.cpp
+++ b/pcsx2/IPU/IPU.cpp
@@ -15,7 +15,6 @@
#include "PrecompiledHeader.h"
#include "Common.h"
-#include "Tags.h"
#include "IPU.h"
#include "yuv2rgb.h"
diff --git a/pcsx2/Linux/pcsx2.cbp b/pcsx2/Linux/pcsx2.cbp
index 61a3c509b5..1dff11da66 100644
--- a/pcsx2/Linux/pcsx2.cbp
+++ b/pcsx2/Linux/pcsx2.cbp
@@ -308,7 +308,6 @@
-
@@ -364,8 +363,8 @@
-
-
+
+
@@ -406,13 +405,13 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -457,10 +456,9 @@
-
-
-
+
+
diff --git a/pcsx2/SPR.cpp b/pcsx2/SPR.cpp
index cb5ac48196..86122daf67 100644
--- a/pcsx2/SPR.cpp
+++ b/pcsx2/SPR.cpp
@@ -15,7 +15,6 @@
#include "PrecompiledHeader.h"
#include "Common.h"
-#include "Tags.h"
#include "SPR.h"
#include "VUmicro.h"
diff --git a/pcsx2/Sif.cpp b/pcsx2/Sif.cpp
index 5f8c242da6..8ca41d3b36 100644
--- a/pcsx2/Sif.cpp
+++ b/pcsx2/Sif.cpp
@@ -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");
diff --git a/pcsx2/Tags.h b/pcsx2/Tags.h
deleted file mode 100644
index bc9055ad9c..0000000000
--- a/pcsx2/Tags.h
+++ /dev/null
@@ -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 .
- */
-
-// 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;
- }
-}
diff --git a/pcsx2/Vif.cpp b/pcsx2/Vif.cpp
index 193042749c..a230396d88 100644
--- a/pcsx2/Vif.cpp
+++ b/pcsx2/Vif.cpp
@@ -16,7 +16,6 @@
#include "PrecompiledHeader.h"
#include "Common.h"
-#include "Tags.h"
#include
#include
diff --git a/pcsx2/Vif0Dma.cpp b/pcsx2/Vif0Dma.cpp
index 6d9b46cf6a..a7af288f55 100644
--- a/pcsx2/Vif0Dma.cpp
+++ b/pcsx2/Vif0Dma.cpp
@@ -16,7 +16,6 @@
#include "PrecompiledHeader.h"
#include "Common.h"
-#include "Tags.h"
#include "VifDma.h"
#include "VifDma_internal.h"
diff --git a/pcsx2/Vif1Dma.cpp b/pcsx2/Vif1Dma.cpp
index f2439db4d3..e2b34e2104 100644
--- a/pcsx2/Vif1Dma.cpp
+++ b/pcsx2/Vif1Dma.cpp
@@ -16,7 +16,6 @@
#include "PrecompiledHeader.h"
#include "Common.h"
-#include "Tags.h"
#include "VifDma.h"
#include "VifDma_internal.h"
diff --git a/pcsx2/VifDma.cpp b/pcsx2/VifDma.cpp
index 73a19e0465..6a941e92aa 100644
--- a/pcsx2/VifDma.cpp
+++ b/pcsx2/VifDma.cpp
@@ -15,7 +15,6 @@
#include "PrecompiledHeader.h"
#include "Common.h"
-#include "Tags.h"
#include "VifDma.h"
#include "VifDma_internal.h"
diff --git a/pcsx2/windows/VCprojects/pcsx2.vcxproj b/pcsx2/windows/VCprojects/pcsx2.vcxproj
index 5811b48535..7614c0303c 100644
--- a/pcsx2/windows/VCprojects/pcsx2.vcxproj
+++ b/pcsx2/windows/VCprojects/pcsx2.vcxproj
@@ -651,7 +651,6 @@
-