From e10f4147241b3a4829f5eeaef20aa0022e31de24 Mon Sep 17 00:00:00 2001
From: Timothy O'Barr <finalfantasytimothy@gmail.com>
Date: Mon, 18 Apr 2022 04:15:23 -0700
Subject: [PATCH] CDVD: Rename cdrom files to Ps1CD for clarity of function
 (#5907)

---
 pcsx2/CDVD/CDVD.cpp                 | 2 +-
 pcsx2/CDVD/{CdRom.cpp => Ps1CD.cpp} | 2 +-
 pcsx2/CDVD/{CdRom.h => Ps1CD.h}     | 0
 pcsx2/CMakeLists.txt                | 4 ++--
 pcsx2/HwWrite.cpp                   | 2 +-
 pcsx2/IopHw.cpp                     | 2 +-
 pcsx2/R3000A.cpp                    | 2 +-
 pcsx2/pcsx2.vcxproj                 | 4 ++--
 pcsx2/pcsx2.vcxproj.filters         | 4 ++--
 pcsx2/pcsx2core.vcxproj             | 4 ++--
 pcsx2/pcsx2core.vcxproj.filters     | 4 ++--
 pcsx2/ps2/Iop/IopHwRead.cpp         | 2 +-
 pcsx2/ps2/Iop/IopHwWrite.cpp        | 2 +-
 13 files changed, 17 insertions(+), 17 deletions(-)
 rename pcsx2/CDVD/{CdRom.cpp => Ps1CD.cpp} (99%)
 rename pcsx2/CDVD/{CdRom.h => Ps1CD.h} (100%)

diff --git a/pcsx2/CDVD/CDVD.cpp b/pcsx2/CDVD/CDVD.cpp
index ecb5636faf..d8ce3eac8c 100644
--- a/pcsx2/CDVD/CDVD.cpp
+++ b/pcsx2/CDVD/CDVD.cpp
@@ -26,7 +26,7 @@
 #include "common/FileSystem.h"
 #include "common/StringUtil.h"
 
-#include "CdRom.h"
+#include "Ps1CD.h"
 #include "CDVD.h"
 #include "CDVD_internal.h"
 #include "CDVDisoReader.h"
diff --git a/pcsx2/CDVD/CdRom.cpp b/pcsx2/CDVD/Ps1CD.cpp
similarity index 99%
rename from pcsx2/CDVD/CdRom.cpp
rename to pcsx2/CDVD/Ps1CD.cpp
index bd841ab4ca..0d883d6229 100644
--- a/pcsx2/CDVD/CdRom.cpp
+++ b/pcsx2/CDVD/Ps1CD.cpp
@@ -17,7 +17,7 @@
 #include "R3000A.h"
 #include "Common.h"
 
-#include "CdRom.h"
+#include "Ps1CD.h"
 #include "CDVD.h"
 #include "IopHw.h"
 #include "IopDma.h"
diff --git a/pcsx2/CDVD/CdRom.h b/pcsx2/CDVD/Ps1CD.h
similarity index 100%
rename from pcsx2/CDVD/CdRom.h
rename to pcsx2/CDVD/Ps1CD.h
diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt
index b83e1d0ddb..bf9e4eec85 100644
--- a/pcsx2/CMakeLists.txt
+++ b/pcsx2/CMakeLists.txt
@@ -256,7 +256,7 @@ set(pcsx2Headers
 # CDVD sources
 set(pcsx2CDVDSources
 	CDVD/BlockdumpFileReader.cpp
-	CDVD/CdRom.cpp
+	CDVD/Ps1CD.cpp
 	CDVD/CDVDaccess.cpp
 	CDVD/CDVD.cpp
 	CDVD/CDVDdiscReader.cpp
@@ -277,7 +277,7 @@ set(pcsx2CDVDSources
 
 # CDVD headers
 set(pcsx2CDVDHeaders
-	CDVD/CdRom.h
+	CDVD/Ps1CD.h
 	CDVD/CDVDaccess.h
 	CDVD/CDVD.h
 	CDVD/CDVD_internal.h
diff --git a/pcsx2/HwWrite.cpp b/pcsx2/HwWrite.cpp
index fd7501ba7b..b0cc8e6679 100644
--- a/pcsx2/HwWrite.cpp
+++ b/pcsx2/HwWrite.cpp
@@ -27,7 +27,7 @@
 #include "SPU2/spu2.h"
 #include "R3000A.h"
 
-#include "CDVD/CdRom.h"
+#include "CDVD/Ps1CD.h"
 #include "CDVD/CDVD.h"
 
 using namespace R5900;
diff --git a/pcsx2/IopHw.cpp b/pcsx2/IopHw.cpp
index fdcf5961ed..17d564ebc1 100644
--- a/pcsx2/IopHw.cpp
+++ b/pcsx2/IopHw.cpp
@@ -25,7 +25,7 @@
 #include "IopCounters.h"
 #include "IopHw.h"
 #include "IopDma.h"
-#include "CDVD/CdRom.h"
+#include "CDVD/Ps1CD.h"
 #include "CDVD/CDVD.h"
 
 
diff --git a/pcsx2/R3000A.cpp b/pcsx2/R3000A.cpp
index 2bd5e7c4bc..69fe63e76e 100644
--- a/pcsx2/R3000A.cpp
+++ b/pcsx2/R3000A.cpp
@@ -27,7 +27,7 @@
 #include "IopBios.h"
 #include "IopHw.h"
 #include "IopDma.h"
-#include "CDVD/CdRom.h"
+#include "CDVD/Ps1CD.h"
 #include "CDVD/CDVD.h"
 
 using namespace R3000A;
diff --git a/pcsx2/pcsx2.vcxproj b/pcsx2/pcsx2.vcxproj
index 892a2320f3..61c31d6529 100644
--- a/pcsx2/pcsx2.vcxproj
+++ b/pcsx2/pcsx2.vcxproj
@@ -634,7 +634,7 @@
     <ClCompile Include="IopHw.cpp" />
     <ClCompile Include="ps2\Iop\IopHwRead.cpp" />
     <ClCompile Include="ps2\Iop\IopHwWrite.cpp" />
-    <ClCompile Include="CDVD\CdRom.cpp" />
+    <ClCompile Include="CDVD\Ps1CD.cpp" />
     <ClCompile Include="CDVD\CDVD.cpp" />
     <ClCompile Include="CDVD\CDVDaccess.cpp" />
     <ClCompile Include="CDVD\CDVDisoReader.cpp" />
@@ -1070,7 +1070,7 @@
     <ClInclude Include="x86\iR3000A.h" />
     <ClInclude Include="IopHw.h" />
     <ClInclude Include="ps2\Iop\IopHw_Internal.h" />
-    <ClInclude Include="CDVD\CdRom.h" />
+    <ClInclude Include="CDVD\Ps1CD.h" />
     <ClInclude Include="CDVD\CDVD.h" />
     <ClInclude Include="CDVD\CDVD_internal.h" />
     <ClInclude Include="CDVD\CDVDaccess.h" />
diff --git a/pcsx2/pcsx2.vcxproj.filters b/pcsx2/pcsx2.vcxproj.filters
index af0c7a8309..608d1ae52e 100644
--- a/pcsx2/pcsx2.vcxproj.filters
+++ b/pcsx2/pcsx2.vcxproj.filters
@@ -695,7 +695,7 @@
     <ClCompile Include="ps2\Iop\IopHwWrite.cpp">
       <Filter>System\Ps2\Iop\Hardware</Filter>
     </ClCompile>
-    <ClCompile Include="CDVD\CdRom.cpp">
+    <ClCompile Include="CDVD\Ps1CD.cpp">
       <Filter>System\Ps2\Iop\CDVD</Filter>
     </ClCompile>
     <ClCompile Include="CDVD\CDVD.cpp">
@@ -1978,7 +1978,7 @@
     <ClInclude Include="ps2\Iop\IopHw_Internal.h">
       <Filter>System\Ps2\Iop\Hardware</Filter>
     </ClInclude>
-    <ClInclude Include="CDVD\CdRom.h">
+    <ClInclude Include="CDVD\Ps1CD.h">
       <Filter>System\Ps2\Iop\CDVD</Filter>
     </ClInclude>
     <ClInclude Include="CDVD\CDVD.h">
diff --git a/pcsx2/pcsx2core.vcxproj b/pcsx2/pcsx2core.vcxproj
index c96e94e6c6..99723427bf 100644
--- a/pcsx2/pcsx2core.vcxproj
+++ b/pcsx2/pcsx2core.vcxproj
@@ -404,7 +404,7 @@
     <ClCompile Include="IopHw.cpp" />
     <ClCompile Include="ps2\Iop\IopHwRead.cpp" />
     <ClCompile Include="ps2\Iop\IopHwWrite.cpp" />
-    <ClCompile Include="CDVD\CdRom.cpp" />
+    <ClCompile Include="CDVD\Ps1CD.cpp" />
     <ClCompile Include="CDVD\CDVD.cpp" />
     <ClCompile Include="CDVD\CDVDaccess.cpp" />
     <ClCompile Include="CDVD\CDVDisoReader.cpp" />
@@ -695,7 +695,7 @@
     <ClInclude Include="x86\iR3000A.h" />
     <ClInclude Include="IopHw.h" />
     <ClInclude Include="ps2\Iop\IopHw_Internal.h" />
-    <ClInclude Include="CDVD\CdRom.h" />
+    <ClInclude Include="CDVD\Ps1CD.h" />
     <ClInclude Include="CDVD\CDVD.h" />
     <ClInclude Include="CDVD\CDVD_internal.h" />
     <ClInclude Include="CDVD\CDVDaccess.h" />
diff --git a/pcsx2/pcsx2core.vcxproj.filters b/pcsx2/pcsx2core.vcxproj.filters
index 9561d819f4..befdc07b4a 100644
--- a/pcsx2/pcsx2core.vcxproj.filters
+++ b/pcsx2/pcsx2core.vcxproj.filters
@@ -602,7 +602,7 @@
     <ClCompile Include="ps2\Iop\IopHwWrite.cpp">
       <Filter>System\Ps2\Iop\Hardware</Filter>
     </ClCompile>
-    <ClCompile Include="CDVD\CdRom.cpp">
+    <ClCompile Include="CDVD\Ps1CD.cpp">
       <Filter>System\Ps2\Iop\CDVD</Filter>
     </ClCompile>
     <ClCompile Include="CDVD\CDVD.cpp">
@@ -1463,7 +1463,7 @@
     <ClInclude Include="ps2\Iop\IopHw_Internal.h">
       <Filter>System\Ps2\Iop\Hardware</Filter>
     </ClInclude>
-    <ClInclude Include="CDVD\CdRom.h">
+    <ClInclude Include="CDVD\Ps1CD.h">
       <Filter>System\Ps2\Iop\CDVD</Filter>
     </ClInclude>
     <ClInclude Include="CDVD\CDVD.h">
diff --git a/pcsx2/ps2/Iop/IopHwRead.cpp b/pcsx2/ps2/Iop/IopHwRead.cpp
index fd2aa297e2..0aae64a121 100644
--- a/pcsx2/ps2/Iop/IopHwRead.cpp
+++ b/pcsx2/ps2/Iop/IopHwRead.cpp
@@ -18,7 +18,7 @@
 #include "IopHw_Internal.h"
 #include "Sif.h"
 #include "Sio.h"
-#include "CDVD/CdRom.h"
+#include "CDVD/Ps1CD.h"
 #include "FW.h"
 #include "SPU2/spu2.h"
 #include "DEV9/DEV9.h"
diff --git a/pcsx2/ps2/Iop/IopHwWrite.cpp b/pcsx2/ps2/Iop/IopHwWrite.cpp
index 00b7b501d5..5253d2e9a5 100644
--- a/pcsx2/ps2/Iop/IopHwWrite.cpp
+++ b/pcsx2/ps2/Iop/IopHwWrite.cpp
@@ -18,7 +18,7 @@
 #include "Sif.h"
 #include "Sio.h"
 #include "FW.h"
-#include "CDVD/CdRom.h"
+#include "CDVD/Ps1CD.h"
 #include "SPU2/spu2.h"
 #include "DEV9/DEV9.h"
 #include "USB/USB.h"