[reactos] 01/01: [STORAGE] Storage driver cleanup part 5 (last part)

[Eric Kohl]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c1f22c88ca9b6175fb4a0c...

commit c1f22c88ca9b6175fb4a0c1af6625f80d046c5b1
Author:     Eric Kohl [e-mail]
AuthorDate: Sat Nov 30 13:33:32 2019 +0100
Commit:     Eric Kohl [e-mail]
CommitDate: Sat Nov 30 13:33:32 2019 +0100

[STORAGE] Storage driver cleanup part 5 (last part)

Move the fdc and flpydrv drivers into the floppy directory.
---
 drivers/storage/CMakeLists.txt                     | 1 -
 drivers/storage/fdc/CMakeLists.txt                 | 2 --
 drivers/storage/floppy/CMakeLists.txt              | 2 ++
 drivers/storage/{fdc => floppy}/fdc/CMakeLists.txt | 0
 drivers/storage/{fdc => floppy}/fdc/fdc.c          | 0
 drivers/storage/{fdc => floppy}/fdc/fdc.h          | 0
 drivers/storage/{fdc => floppy}/fdc/fdc.rc         | 0
 drivers/storage/{fdc => floppy}/fdc/fdo.c          | 0
 drivers/storage/{fdc => floppy}/fdc/misc.c         | 0
 drivers/storage/{fdc => floppy}/fdc/pdo.c          | 0
 drivers/storage/{fdc => floppy}/flpydisk/.keep     | 0
 11 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/storage/CMakeLists.txt b/drivers/storage/CMakeLists.txt
index 40c861b0a1d..aafce81c642 100644
--- a/drivers/storage/CMakeLists.txt
+++ b/drivers/storage/CMakeLists.txt
@@ -1,5 +1,4 @@
 add_subdirectory(class)
-#add_subdirectory(fdc)
 add_subdirectory(floppy)
 add_subdirectory(ide)
 add_subdirectory(port)
diff --git a/drivers/storage/fdc/CMakeLists.txt b/drivers/storage/fdc/CMakeLists.txt
deleted file mode 100644
index fc6b28e7a12..00000000000
--- a/drivers/storage/fdc/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-
-add_subdirectory(fdc)
diff --git a/drivers/storage/floppy/CMakeLists.txt b/drivers/storage/floppy/CMakeLists.txt
index 732ce5e16b6..d598c15db96 100644
--- a/drivers/storage/floppy/CMakeLists.txt
+++ b/drivers/storage/floppy/CMakeLists.txt
@@ -1 +1,3 @@
+#add_subdirectory(fdc)
 add_subdirectory(floppy)
+#add_subdirectory(flpydisk)
diff --git a/drivers/storage/fdc/fdc/CMakeLists.txt b/drivers/storage/floppy/fdc/CMakeLists.txt
similarity index 100%
rename from drivers/storage/fdc/fdc/CMakeLists.txt
rename to drivers/storage/floppy/fdc/CMakeLists.txt
diff --git a/drivers/storage/fdc/fdc/fdc.c b/drivers/storage/floppy/fdc/fdc.c
similarity index 100%
rename from drivers/storage/fdc/fdc/fdc.c
rename to drivers/storage/floppy/fdc/fdc.c
diff --git a/drivers/storage/fdc/fdc/fdc.h b/drivers/storage/floppy/fdc/fdc.h
similarity index 100%
rename from drivers/storage/fdc/fdc/fdc.h
rename to drivers/storage/floppy/fdc/fdc.h
diff --git a/drivers/storage/fdc/fdc/fdc.rc b/drivers/storage/floppy/fdc/fdc.rc
similarity index 100%
rename from drivers/storage/fdc/fdc/fdc.rc
rename to drivers/storage/floppy/fdc/fdc.rc
diff --git a/drivers/storage/fdc/fdc/fdo.c b/drivers/storage/floppy/fdc/fdo.c
similarity index 100%
rename from drivers/storage/fdc/fdc/fdo.c
rename to drivers/storage/floppy/fdc/fdo.c
diff --git a/drivers/storage/fdc/fdc/misc.c b/drivers/storage/floppy/fdc/misc.c
similarity index 100%
rename from drivers/storage/fdc/fdc/misc.c
rename to drivers/storage/floppy/fdc/misc.c
diff --git a/drivers/storage/fdc/fdc/pdo.c b/drivers/storage/floppy/fdc/pdo.c
similarity index 100%
rename from drivers/storage/fdc/fdc/pdo.c
rename to drivers/storage/floppy/fdc/pdo.c
diff --git a/drivers/storage/fdc/flpydisk/.keep b/drivers/storage/floppy/flpydisk/.keep
similarity index 100%
rename from drivers/storage/fdc/flpydisk/.keep
rename to drivers/storage/floppy/flpydisk/.keep