[reactos] 01/01: [STORAGE] Storage driver cleanup part 1

[Eric Kohl]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6b687478d1f26ab3fe47e…

commit 6b687478d1f26ab3fe47e8ce375221455423ae79
Author:     Eric Kohl <eric.kohl(a)reactos.org>
AuthorDate: Sat Nov 30 11:41:39 2019 +0100
Commit:     Eric Kohl <eric.kohl(a)reactos.org>
CommitDate: Sat Nov 30 11:54:33 2019 +0100

    [STORAGE] Storage driver cleanup part 1
    
    Move the classpnp driver into the class directory because it is a class driver, just
like the class2 driver.
---
 drivers/storage/CMakeLists.txt                      | 3 +--
 drivers/storage/class/CMakeLists.txt                | 1 +
 drivers/storage/{ => class}/classpnp/CMakeLists.txt | 2 +-
 drivers/storage/{ => class}/classpnp/autorun.c      | 0
 drivers/storage/{ => class}/classpnp/class.c        | 0
 drivers/storage/{ => class}/classpnp/class.rc       | 0
 drivers/storage/{ => class}/classpnp/classp.h       | 0
 drivers/storage/{ => class}/classpnp/classpnp.spec  | 0
 drivers/storage/{ => class}/classpnp/classwmi.c     | 0
 drivers/storage/{ => class}/classpnp/clntirp.c      | 0
 drivers/storage/{ => class}/classpnp/create.c       | 0
 drivers/storage/{ => class}/classpnp/data.c         | 0
 drivers/storage/{ => class}/classpnp/debug.c        | 0
 drivers/storage/{ => class}/classpnp/debug.h        | 0
 drivers/storage/{ => class}/classpnp/dictlib.c      | 0
 drivers/storage/{ => class}/classpnp/guid.c         | 0
 drivers/storage/{ => class}/classpnp/lock.c         | 0
 drivers/storage/{ => class}/classpnp/obsolete.c     | 0
 drivers/storage/{ => class}/classpnp/power.c        | 0
 drivers/storage/{ => class}/classpnp/retry.c        | 0
 drivers/storage/{ => class}/classpnp/utils.c        | 0
 drivers/storage/{ => class}/classpnp/xferpkt.c      | 0
 22 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/storage/CMakeLists.txt b/drivers/storage/CMakeLists.txt
index 610df522d26..2d5c1418747 100644
--- a/drivers/storage/CMakeLists.txt
+++ b/drivers/storage/CMakeLists.txt
@@ -1,7 +1,6 @@
 
 add_subdirectory(class)
-add_subdirectory(classpnp)
-add_subdirectory(fdc)
+#add_subdirectory(fdc)
 add_subdirectory(floppy)
 add_subdirectory(ide)
 add_subdirectory(port)
diff --git a/drivers/storage/class/CMakeLists.txt b/drivers/storage/class/CMakeLists.txt
index 0ead5deb252..cb0538ace05 100644
--- a/drivers/storage/class/CMakeLists.txt
+++ b/drivers/storage/class/CMakeLists.txt
@@ -1,6 +1,7 @@
 add_subdirectory(cdrom)
 add_subdirectory(cdrom_new)
 add_subdirectory(class2)
+add_subdirectory(classpnp)
 add_subdirectory(disk)
 add_subdirectory(disk_new)
 add_subdirectory(ramdisk)
diff --git a/drivers/storage/classpnp/CMakeLists.txt
b/drivers/storage/class/classpnp/CMakeLists.txt
similarity index 96%
rename from drivers/storage/classpnp/CMakeLists.txt
rename to drivers/storage/class/classpnp/CMakeLists.txt
index c5f576fbd2c..d3399c72668 100644
--- a/drivers/storage/classpnp/CMakeLists.txt
+++ b/drivers/storage/class/classpnp/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-include_directories(../inc)
+include_directories(../../inc)
 spec2def(classpnp.sys classpnp.spec ADD_IMPORTLIB)
 
 add_definitions(
diff --git a/drivers/storage/classpnp/autorun.c
b/drivers/storage/class/classpnp/autorun.c
similarity index 100%
rename from drivers/storage/classpnp/autorun.c
rename to drivers/storage/class/classpnp/autorun.c
diff --git a/drivers/storage/classpnp/class.c b/drivers/storage/class/classpnp/class.c
similarity index 100%
rename from drivers/storage/classpnp/class.c
rename to drivers/storage/class/classpnp/class.c
diff --git a/drivers/storage/classpnp/class.rc b/drivers/storage/class/classpnp/class.rc
similarity index 100%
rename from drivers/storage/classpnp/class.rc
rename to drivers/storage/class/classpnp/class.rc
diff --git a/drivers/storage/classpnp/classp.h b/drivers/storage/class/classpnp/classp.h
similarity index 100%
rename from drivers/storage/classpnp/classp.h
rename to drivers/storage/class/classpnp/classp.h
diff --git a/drivers/storage/classpnp/classpnp.spec
b/drivers/storage/class/classpnp/classpnp.spec
similarity index 100%
rename from drivers/storage/classpnp/classpnp.spec
rename to drivers/storage/class/classpnp/classpnp.spec
diff --git a/drivers/storage/classpnp/classwmi.c
b/drivers/storage/class/classpnp/classwmi.c
similarity index 100%
rename from drivers/storage/classpnp/classwmi.c
rename to drivers/storage/class/classpnp/classwmi.c
diff --git a/drivers/storage/classpnp/clntirp.c
b/drivers/storage/class/classpnp/clntirp.c
similarity index 100%
rename from drivers/storage/classpnp/clntirp.c
rename to drivers/storage/class/classpnp/clntirp.c
diff --git a/drivers/storage/classpnp/create.c b/drivers/storage/class/classpnp/create.c
similarity index 100%
rename from drivers/storage/classpnp/create.c
rename to drivers/storage/class/classpnp/create.c
diff --git a/drivers/storage/classpnp/data.c b/drivers/storage/class/classpnp/data.c
similarity index 100%
rename from drivers/storage/classpnp/data.c
rename to drivers/storage/class/classpnp/data.c
diff --git a/drivers/storage/classpnp/debug.c b/drivers/storage/class/classpnp/debug.c
similarity index 100%
rename from drivers/storage/classpnp/debug.c
rename to drivers/storage/class/classpnp/debug.c
diff --git a/drivers/storage/classpnp/debug.h b/drivers/storage/class/classpnp/debug.h
similarity index 100%
rename from drivers/storage/classpnp/debug.h
rename to drivers/storage/class/classpnp/debug.h
diff --git a/drivers/storage/classpnp/dictlib.c
b/drivers/storage/class/classpnp/dictlib.c
similarity index 100%
rename from drivers/storage/classpnp/dictlib.c
rename to drivers/storage/class/classpnp/dictlib.c
diff --git a/drivers/storage/classpnp/guid.c b/drivers/storage/class/classpnp/guid.c
similarity index 100%
rename from drivers/storage/classpnp/guid.c
rename to drivers/storage/class/classpnp/guid.c
diff --git a/drivers/storage/classpnp/lock.c b/drivers/storage/class/classpnp/lock.c
similarity index 100%
rename from drivers/storage/classpnp/lock.c
rename to drivers/storage/class/classpnp/lock.c
diff --git a/drivers/storage/classpnp/obsolete.c
b/drivers/storage/class/classpnp/obsolete.c
similarity index 100%
rename from drivers/storage/classpnp/obsolete.c
rename to drivers/storage/class/classpnp/obsolete.c
diff --git a/drivers/storage/classpnp/power.c b/drivers/storage/class/classpnp/power.c
similarity index 100%
rename from drivers/storage/classpnp/power.c
rename to drivers/storage/class/classpnp/power.c
diff --git a/drivers/storage/classpnp/retry.c b/drivers/storage/class/classpnp/retry.c
similarity index 100%
rename from drivers/storage/classpnp/retry.c
rename to drivers/storage/class/classpnp/retry.c
diff --git a/drivers/storage/classpnp/utils.c b/drivers/storage/class/classpnp/utils.c
similarity index 100%
rename from drivers/storage/classpnp/utils.c
rename to drivers/storage/class/classpnp/utils.c
diff --git a/drivers/storage/classpnp/xferpkt.c
b/drivers/storage/class/classpnp/xferpkt.c
similarity index 100%
rename from drivers/storage/classpnp/xferpkt.c
rename to drivers/storage/class/classpnp/xferpkt.c