Renamed a few files so that they more clearly represent their meaning. This was goign to be part of a bigger change but I got annoyed before I had to chance to actually start working on it, so I'll drop this anyhow.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1486 96395faa-99c1-11dd-bbfe-3dabce05a288

pcsx2/CDVD/CDVD.cpp

@@ -22,7 +22,7 @@
 #include <time.h>
 
 #include "IopCommon.h"
-#include "CDVDiso.h"
+#include "IsoFStools.h"
 #include "CDVD_internal.h"
 
 static cdvdStruct cdvd;

pcsx2/CDVD/IsoFScdvd.h

@@ -21,8 +21,8 @@
  *  Modified by Florin for PCSX2 emu
  */
 
-#ifndef _CDVDLIB_H
+#ifndef _ISOFSCDVD_H
-#define _CDVDLIB_H
+#define _ISOFSCDVD_H
 
 #include "Common.h"
 
@@ -168,4 +168,4 @@ int CDVD_findfile(const char* fname, struct TocEntry* tocEntry);
 int CdRead(u32 lsn, u32 sectors, void *buf, CdRMode *mode);
 int DvdRead(u32 lsn, u32 sectors, void *buf, CdRMode *mode);
 
-#endif // _CDVDLIB_H
+#endif // _ISOFSCDVD_H

pcsx2/CDVD/IsoFSdrv.cpp

@@ -22,8 +22,8 @@
 
 #include "PrecompiledHeader.h"
 
-#include "CDVDiso.h"
+#include "IsoFStools.h"
-#include "CDVDisodrv.h"
+#include "IsoFSdrv.h"
 
 CdRMode cdReadMode;
 

pcsx2/CDVD/IsoFSdrv.h

@@ -20,10 +20,10 @@
  *  Modified by Florin for PCSX2 emu
  */
 
-#ifndef __CDVDISODRV_H__
+#ifndef __ISOFSDRV_H__
-#define __CDVDISODRV_H__
+#define __ISOFSDRV_H__
 
-#include "CDVDlib.h"
+#include "IsoFScdvd.h"
 
 extern CdRMode cdReadMode;
 
@@ -35,4 +35,4 @@ int CDVDFS_read( int fd, char * buffer, int size );
 int CDVDFS_write( int fd, char * buffer, int size );
 int CDVDFS_close( int fd);
 
-#endif//__CDVDISODRV_H__
+#endif//__ISOFSDRV_H__

pcsx2/CDVD/IsoFStools.cpp

@@ -24,8 +24,8 @@
 
 #include <ctype.h>
 
-#include "CDVDiso.h"
+#include "IsoFStools.h"
-#include "CDVDisodrv.h"
+#include "IsoFSdrv.h"
 
 struct dir_toc_data
 {

pcsx2/CDVD/IsoFStools.h

@@ -20,10 +20,10 @@
  *  Modified by Florin for PCSX2 emu
  */
 
-#ifndef __CDVDISO_H__
+#ifndef __ISOFSTOOLS_H__
-#define __CDVDISO_H__
+#define __ISOFSTOOLS_H__
 
-#include "CDVDlib.h"
+#include "IsoFScdvd.h"
 
 int CDVD_findfile(const char* fname, TocEntry* tocEntry);
 int CDVD_GetDir_RPC_request(char* pathname, char* extensions, unsigned int inc_dirs);
@@ -146,4 +146,4 @@ struct dirTocEntry
 #pragma pack()
 #endif
 
-#endif//__CDVDISO_H__
+#endif//__ISOFSTOOLS_H__

pcsx2/Elfheader.cpp

@@ -19,7 +19,7 @@
 #include "PrecompiledHeader.h"
 
 #include "Common.h"
-#include "CDVD/CDVDisodrv.h"
+#include "CDVD/IsoFSdrv.h"
 
 using namespace std;
 

pcsx2/Misc.cpp

@@ -29,7 +29,7 @@
 #include "IopCommon.h"
 #include "HostGui.h"
 
-#include "CDVD/CDVDisodrv.h"
+#include "CDVD/IsoFSdrv.h"
 #include "VUmicro.h"
 #include "VU.h"
 #include "iCore.h"

pcsx2/SaveState.cpp

@@ -21,7 +21,7 @@
 #include "IopCommon.h"
 #include "SaveState.h"
 
-#include "CDVD/CDVDisodrv.h"
+#include "CDVD/IsoFSdrv.h"
 #include "VUmicro.h"
 #include "VU.h"
 #include "iCore.h"

pcsx2/windows/VCprojects/pcsx2_2008.vcproj

@@ -2449,22 +2449,6 @@
 			<Filter
 				Name="FileSystems"
 				>
-				<File
-					RelativePath="..\..\CDVD\CDVDiso.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\CDVD\CDVDiso.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\CDVD\CDVDisodrv.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\CDVD\CDVDisodrv.h"
-					>
-				</File>
 				<File
 					RelativePath="..\..\Elfheader.cpp"
 					>
@@ -2473,6 +2457,26 @@
 					RelativePath="..\..\Elfheader.h"
 					>
 				</File>
+				<File
+					RelativePath="..\..\CDVD\IsoFScdvd.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\CDVD\IsoFSdrv.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\CDVD\IsoFSdrv.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\CDVD\IsoFStools.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\CDVD\IsoFStools.h"
+					>
+				</File>
 			</Filter>
 			<Filter
 				Name="Linux"

pcsx2_suite_2008.sln

@@ -82,8 +82,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Include", "Include", "{0FAD
 		common\include\PS2Etypes.h = common\include\PS2Etypes.h
 	EndProjectSection
 EndProject
-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "setup", "setup\setup.vdproj", "{14259DC9-2A12-4B05-A7D7-23C1A9FFEA03}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -273,11 +271,6 @@ Global
 		{CDD9DB83-3BD9-4ED8-BB83-399A2F65F022}.Release SSE4|Win32.Build.0 = Release|Win32
 		{CDD9DB83-3BD9-4ED8-BB83-399A2F65F022}.Release SSSE3|Win32.ActiveCfg = Release|Win32
 		{CDD9DB83-3BD9-4ED8-BB83-399A2F65F022}.Release SSSE3|Win32.Build.0 = Release|Win32
-		{14259DC9-2A12-4B05-A7D7-23C1A9FFEA03}.Debug|Win32.ActiveCfg = Release
-		{14259DC9-2A12-4B05-A7D7-23C1A9FFEA03}.Devel|Win32.ActiveCfg = Release
-		{14259DC9-2A12-4B05-A7D7-23C1A9FFEA03}.Release SSE2|Win32.ActiveCfg = Release
-		{14259DC9-2A12-4B05-A7D7-23C1A9FFEA03}.Release SSE4|Win32.ActiveCfg = Release
-		{14259DC9-2A12-4B05-A7D7-23C1A9FFEA03}.Release SSSE3|Win32.ActiveCfg = Release
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE