[ros-diffs] [reactos] 02/03: [CDROM][DISK] Remove "_new" suffix from cdrom and disk drivers

[Victor Perevertkin]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3088717b3f8ce7fa86081…

commit 3088717b3f8ce7fa86081d6481463fbd3c9e8274
Author:     Victor Perevertkin <victor.perevertkin(a)reactos.org>
AuthorDate: Sun Aug 8 01:25:05 2021 +0300
Commit:     Victor Perevertkin <victor.perevertkin(a)reactos.org>
CommitDate: Sun Aug 8 02:42:34 2021 +0300

    [CDROM][DISK] Remove "_new" suffix from cdrom and disk drivers
---
 drivers/storage/class/CMakeLists.txt                      | 4 ++--
 drivers/storage/class/{cdrom_new => cdrom}/CMakeLists.txt | 0
 drivers/storage/class/{cdrom_new => cdrom}/aacs.c         | 0
 drivers/storage/class/{cdrom_new => cdrom}/autorun.c      | 0
 drivers/storage/class/{cdrom_new => cdrom}/cdrom.c        | 0
 drivers/storage/class/{cdrom_new => cdrom}/cdrom.h        | 0
 drivers/storage/class/{cdrom_new => cdrom}/cdrom.inf      | 0
 drivers/storage/class/{cdrom_new => cdrom}/cdrom.rc       | 0
 drivers/storage/class/{cdrom_new => cdrom}/cdrom_reg.inf  | 0
 drivers/storage/class/{cdrom_new => cdrom}/cdromp.h       | 0
 drivers/storage/class/{cdrom_new => cdrom}/common.c       | 0
 drivers/storage/class/{cdrom_new => cdrom}/data.c         | 0
 drivers/storage/class/{cdrom_new => cdrom}/guid.c         | 0
 drivers/storage/class/{cdrom_new => cdrom}/init.c         | 0
 drivers/storage/class/{cdrom_new => cdrom}/ioctl.c        | 0
 drivers/storage/class/{cdrom_new => cdrom}/ioctl.h        | 0
 drivers/storage/class/{cdrom_new => cdrom}/license.txt    | 0
 drivers/storage/class/{cdrom_new => cdrom}/localwpp.ini   | 0
 drivers/storage/class/{cdrom_new => cdrom}/mmc.c          | 0
 drivers/storage/class/{cdrom_new => cdrom}/mmc.h          | 0
 drivers/storage/class/{cdrom_new => cdrom}/pnppower.c     | 0
 drivers/storage/class/{cdrom_new => cdrom}/scratch.c      | 0
 drivers/storage/class/{cdrom_new => cdrom}/scratch.h      | 0
 drivers/storage/class/{cdrom_new => cdrom}/sense.c        | 0
 drivers/storage/class/{cdrom_new => cdrom}/zpodd.c        | 0
 drivers/storage/class/{disk_new => disk}/CMakeLists.txt   | 0
 drivers/storage/class/{disk_new => disk}/data.c           | 0
 drivers/storage/class/{disk_new => disk}/disk.c           | 0
 drivers/storage/class/{disk_new => disk}/disk.h           | 0
 drivers/storage/class/{disk_new => disk}/disk.inf         | 0
 drivers/storage/class/{disk_new => disk}/disk.rc          | 0
 drivers/storage/class/{disk_new => disk}/disk_reg.inf     | 0
 drivers/storage/class/{disk_new => disk}/diskwmi.c        | 0
 drivers/storage/class/{disk_new => disk}/geometry.c       | 0
 drivers/storage/class/{disk_new => disk}/license.txt      | 0
 drivers/storage/class/{disk_new => disk}/pnp.c            | 0
 media/doc/3rd Party Files.txt                             | 4 ++--
 37 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/storage/class/CMakeLists.txt b/drivers/storage/class/CMakeLists.txt
index 1c275b94d48..f84026a6fa5 100644
--- a/drivers/storage/class/CMakeLists.txt
+++ b/drivers/storage/class/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_subdirectory(cdrom_new)
+add_subdirectory(cdrom)
 add_subdirectory(classpnp)
-add_subdirectory(disk_new)
+add_subdirectory(disk)
 add_subdirectory(ramdisk)
diff --git a/drivers/storage/class/cdrom_new/CMakeLists.txt
b/drivers/storage/class/cdrom/CMakeLists.txt
similarity index 100%
rename from drivers/storage/class/cdrom_new/CMakeLists.txt
rename to drivers/storage/class/cdrom/CMakeLists.txt
diff --git a/drivers/storage/class/cdrom_new/aacs.c b/drivers/storage/class/cdrom/aacs.c
similarity index 100%
rename from drivers/storage/class/cdrom_new/aacs.c
rename to drivers/storage/class/cdrom/aacs.c
diff --git a/drivers/storage/class/cdrom_new/autorun.c
b/drivers/storage/class/cdrom/autorun.c
similarity index 100%
rename from drivers/storage/class/cdrom_new/autorun.c
rename to drivers/storage/class/cdrom/autorun.c
diff --git a/drivers/storage/class/cdrom_new/cdrom.c
b/drivers/storage/class/cdrom/cdrom.c
similarity index 100%
rename from drivers/storage/class/cdrom_new/cdrom.c
rename to drivers/storage/class/cdrom/cdrom.c
diff --git a/drivers/storage/class/cdrom_new/cdrom.h
b/drivers/storage/class/cdrom/cdrom.h
similarity index 100%
rename from drivers/storage/class/cdrom_new/cdrom.h
rename to drivers/storage/class/cdrom/cdrom.h
diff --git a/drivers/storage/class/cdrom_new/cdrom.inf
b/drivers/storage/class/cdrom/cdrom.inf
similarity index 100%
rename from drivers/storage/class/cdrom_new/cdrom.inf
rename to drivers/storage/class/cdrom/cdrom.inf
diff --git a/drivers/storage/class/cdrom_new/cdrom.rc
b/drivers/storage/class/cdrom/cdrom.rc
similarity index 100%
rename from drivers/storage/class/cdrom_new/cdrom.rc
rename to drivers/storage/class/cdrom/cdrom.rc
diff --git a/drivers/storage/class/cdrom_new/cdrom_reg.inf
b/drivers/storage/class/cdrom/cdrom_reg.inf
similarity index 100%
rename from drivers/storage/class/cdrom_new/cdrom_reg.inf
rename to drivers/storage/class/cdrom/cdrom_reg.inf
diff --git a/drivers/storage/class/cdrom_new/cdromp.h
b/drivers/storage/class/cdrom/cdromp.h
similarity index 100%
rename from drivers/storage/class/cdrom_new/cdromp.h
rename to drivers/storage/class/cdrom/cdromp.h
diff --git a/drivers/storage/class/cdrom_new/common.c
b/drivers/storage/class/cdrom/common.c
similarity index 100%
rename from drivers/storage/class/cdrom_new/common.c
rename to drivers/storage/class/cdrom/common.c
diff --git a/drivers/storage/class/cdrom_new/data.c b/drivers/storage/class/cdrom/data.c
similarity index 100%
rename from drivers/storage/class/cdrom_new/data.c
rename to drivers/storage/class/cdrom/data.c
diff --git a/drivers/storage/class/cdrom_new/guid.c b/drivers/storage/class/cdrom/guid.c
similarity index 100%
rename from drivers/storage/class/cdrom_new/guid.c
rename to drivers/storage/class/cdrom/guid.c
diff --git a/drivers/storage/class/cdrom_new/init.c b/drivers/storage/class/cdrom/init.c
similarity index 100%
rename from drivers/storage/class/cdrom_new/init.c
rename to drivers/storage/class/cdrom/init.c
diff --git a/drivers/storage/class/cdrom_new/ioctl.c
b/drivers/storage/class/cdrom/ioctl.c
similarity index 100%
rename from drivers/storage/class/cdrom_new/ioctl.c
rename to drivers/storage/class/cdrom/ioctl.c
diff --git a/drivers/storage/class/cdrom_new/ioctl.h
b/drivers/storage/class/cdrom/ioctl.h
similarity index 100%
rename from drivers/storage/class/cdrom_new/ioctl.h
rename to drivers/storage/class/cdrom/ioctl.h
diff --git a/drivers/storage/class/cdrom_new/license.txt
b/drivers/storage/class/cdrom/license.txt
similarity index 100%
rename from drivers/storage/class/cdrom_new/license.txt
rename to drivers/storage/class/cdrom/license.txt
diff --git a/drivers/storage/class/cdrom_new/localwpp.ini
b/drivers/storage/class/cdrom/localwpp.ini
similarity index 100%
rename from drivers/storage/class/cdrom_new/localwpp.ini
rename to drivers/storage/class/cdrom/localwpp.ini
diff --git a/drivers/storage/class/cdrom_new/mmc.c b/drivers/storage/class/cdrom/mmc.c
similarity index 100%
rename from drivers/storage/class/cdrom_new/mmc.c
rename to drivers/storage/class/cdrom/mmc.c
diff --git a/drivers/storage/class/cdrom_new/mmc.h b/drivers/storage/class/cdrom/mmc.h
similarity index 100%
rename from drivers/storage/class/cdrom_new/mmc.h
rename to drivers/storage/class/cdrom/mmc.h
diff --git a/drivers/storage/class/cdrom_new/pnppower.c
b/drivers/storage/class/cdrom/pnppower.c
similarity index 100%
rename from drivers/storage/class/cdrom_new/pnppower.c
rename to drivers/storage/class/cdrom/pnppower.c
diff --git a/drivers/storage/class/cdrom_new/scratch.c
b/drivers/storage/class/cdrom/scratch.c
similarity index 100%
rename from drivers/storage/class/cdrom_new/scratch.c
rename to drivers/storage/class/cdrom/scratch.c
diff --git a/drivers/storage/class/cdrom_new/scratch.h
b/drivers/storage/class/cdrom/scratch.h
similarity index 100%
rename from drivers/storage/class/cdrom_new/scratch.h
rename to drivers/storage/class/cdrom/scratch.h
diff --git a/drivers/storage/class/cdrom_new/sense.c
b/drivers/storage/class/cdrom/sense.c
similarity index 100%
rename from drivers/storage/class/cdrom_new/sense.c
rename to drivers/storage/class/cdrom/sense.c
diff --git a/drivers/storage/class/cdrom_new/zpodd.c
b/drivers/storage/class/cdrom/zpodd.c
similarity index 100%
rename from drivers/storage/class/cdrom_new/zpodd.c
rename to drivers/storage/class/cdrom/zpodd.c
diff --git a/drivers/storage/class/disk_new/CMakeLists.txt
b/drivers/storage/class/disk/CMakeLists.txt
similarity index 100%
rename from drivers/storage/class/disk_new/CMakeLists.txt
rename to drivers/storage/class/disk/CMakeLists.txt
diff --git a/drivers/storage/class/disk_new/data.c b/drivers/storage/class/disk/data.c
similarity index 100%
rename from drivers/storage/class/disk_new/data.c
rename to drivers/storage/class/disk/data.c
diff --git a/drivers/storage/class/disk_new/disk.c b/drivers/storage/class/disk/disk.c
similarity index 100%
rename from drivers/storage/class/disk_new/disk.c
rename to drivers/storage/class/disk/disk.c
diff --git a/drivers/storage/class/disk_new/disk.h b/drivers/storage/class/disk/disk.h
similarity index 100%
rename from drivers/storage/class/disk_new/disk.h
rename to drivers/storage/class/disk/disk.h
diff --git a/drivers/storage/class/disk_new/disk.inf
b/drivers/storage/class/disk/disk.inf
similarity index 100%
rename from drivers/storage/class/disk_new/disk.inf
rename to drivers/storage/class/disk/disk.inf
diff --git a/drivers/storage/class/disk_new/disk.rc b/drivers/storage/class/disk/disk.rc
similarity index 100%
rename from drivers/storage/class/disk_new/disk.rc
rename to drivers/storage/class/disk/disk.rc
diff --git a/drivers/storage/class/disk_new/disk_reg.inf
b/drivers/storage/class/disk/disk_reg.inf
similarity index 100%
rename from drivers/storage/class/disk_new/disk_reg.inf
rename to drivers/storage/class/disk/disk_reg.inf
diff --git a/drivers/storage/class/disk_new/diskwmi.c
b/drivers/storage/class/disk/diskwmi.c
similarity index 100%
rename from drivers/storage/class/disk_new/diskwmi.c
rename to drivers/storage/class/disk/diskwmi.c
diff --git a/drivers/storage/class/disk_new/geometry.c
b/drivers/storage/class/disk/geometry.c
similarity index 100%
rename from drivers/storage/class/disk_new/geometry.c
rename to drivers/storage/class/disk/geometry.c
diff --git a/drivers/storage/class/disk_new/license.txt
b/drivers/storage/class/disk/license.txt
similarity index 100%
rename from drivers/storage/class/disk_new/license.txt
rename to drivers/storage/class/disk/license.txt
diff --git a/drivers/storage/class/disk_new/pnp.c b/drivers/storage/class/disk/pnp.c
similarity index 100%
rename from drivers/storage/class/disk_new/pnp.c
rename to drivers/storage/class/disk/pnp.c
diff --git a/media/doc/3rd Party Files.txt b/media/doc/3rd Party Files.txt
index 816500a77a4..bc533b0d833 100644
--- a/media/doc/3rd Party Files.txt	
+++ b/media/doc/3rd Party Files.txt	
@@ -116,7 +116,7 @@ License: BSD-3-Clause (https://spdx.org/licenses/BSD-3-Clause.html)
 URL: https://github.com/virtio-win/kvm-guest-drivers-windows/tree/master/NetKVM/…
 
 Title: Microsoft CDROM Storage Class Driver
-Path: drivers/storage/class/cdrom_new
+Path: drivers/storage/class/cdrom
 Used Version: git commit 96eb96d
 License: MS-PL (https://spdx.org/licenses/MS-PL.html)
 URL: https://github.com/microsoft/Windows-driver-samples/tree/master/storage/cla…
@@ -128,7 +128,7 @@ License: MS-PL (https://spdx.org/licenses/MS-PL.html)
 URL:
https://github.com/microsoft/Windows-driver-samples/tree/master/storage/cla…
 
 Title: Microsoft Disk Class Driver
-Path: drivers/storage/class/disk_new
+Path: drivers/storage/class/disk
 Used Version: git commit 3428c5f
 License: MS-PL (https://spdx.org/licenses/MS-PL.html)
 URL: https://github.com/microsoft/Windows-driver-samples/tree/master/storage/cla…