From 2a2040a9fe9c01704032277b52aac60e0f5a1e9c Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Sat, 30 Nov 2019 13:13:59 +0100 Subject: [PATCH] [STORAGE] Storage driver cleanup part 4 Move the floppy driver into the floppy/floppy directory. --- drivers/storage/floppy/CMakeLists.txt | 17 +---------------- drivers/storage/floppy/floppy/CMakeLists.txt | 16 ++++++++++++++++ drivers/storage/floppy/{ => floppy}/SOURCES | 0 drivers/storage/floppy/{ => floppy}/csqrtns.c | 0 drivers/storage/floppy/{ => floppy}/csqrtns.h | 0 drivers/storage/floppy/{ => floppy}/floppy.c | 0 drivers/storage/floppy/{ => floppy}/floppy.h | 0 drivers/storage/floppy/{ => floppy}/floppy.rc | 0 .../storage/floppy/{ => floppy}/floppy_reg.inf | 0 drivers/storage/floppy/{ => floppy}/hardware.c | 0 drivers/storage/floppy/{ => floppy}/hardware.h | 0 drivers/storage/floppy/{ => floppy}/ioctl.c | 0 drivers/storage/floppy/{ => floppy}/ioctl.h | 0 drivers/storage/floppy/{ => floppy}/precomp.h | 0 drivers/storage/floppy/{ => floppy}/readwrite.c | 0 drivers/storage/floppy/{ => floppy}/readwrite.h | 0 16 files changed, 17 insertions(+), 16 deletions(-) create mode 100644 drivers/storage/floppy/floppy/CMakeLists.txt rename drivers/storage/floppy/{ => floppy}/SOURCES (100%) rename drivers/storage/floppy/{ => floppy}/csqrtns.c (100%) rename drivers/storage/floppy/{ => floppy}/csqrtns.h (100%) rename drivers/storage/floppy/{ => floppy}/floppy.c (100%) rename drivers/storage/floppy/{ => floppy}/floppy.h (100%) rename drivers/storage/floppy/{ => floppy}/floppy.rc (100%) rename drivers/storage/floppy/{ => floppy}/floppy_reg.inf (100%) rename drivers/storage/floppy/{ => floppy}/hardware.c (100%) rename drivers/storage/floppy/{ => floppy}/hardware.h (100%) rename drivers/storage/floppy/{ => floppy}/ioctl.c (100%) rename drivers/storage/floppy/{ => floppy}/ioctl.h (100%) rename drivers/storage/floppy/{ => floppy}/precomp.h (100%) rename drivers/storage/floppy/{ => floppy}/readwrite.c (100%) rename drivers/storage/floppy/{ => floppy}/readwrite.h (100%) diff --git a/drivers/storage/floppy/CMakeLists.txt b/drivers/storage/floppy/CMakeLists.txt index c1dd6a29dc7..732ce5e16b6 100644 --- a/drivers/storage/floppy/CMakeLists.txt +++ b/drivers/storage/floppy/CMakeLists.txt @@ -1,16 +1 @@ - -list(APPEND SOURCE - csqrtns.c - floppy.c - hardware.c - ioctl.c - readwrite.c - precomp.h) - -add_library(floppy MODULE ${SOURCE} floppy.rc) -target_link_libraries(floppy csq) -add_pch(floppy precomp.h SOURCE) -set_module_type(floppy kernelmodedriver) -add_importlibs(floppy hal ntoskrnl) -add_cd_file(TARGET floppy DESTINATION reactos/system32/drivers NO_CAB FOR all) -add_registry_inf(floppy_reg.inf) +add_subdirectory(floppy) diff --git a/drivers/storage/floppy/floppy/CMakeLists.txt b/drivers/storage/floppy/floppy/CMakeLists.txt new file mode 100644 index 00000000000..c1dd6a29dc7 --- /dev/null +++ b/drivers/storage/floppy/floppy/CMakeLists.txt @@ -0,0 +1,16 @@ + +list(APPEND SOURCE + csqrtns.c + floppy.c + hardware.c + ioctl.c + readwrite.c + precomp.h) + +add_library(floppy MODULE ${SOURCE} floppy.rc) +target_link_libraries(floppy csq) +add_pch(floppy precomp.h SOURCE) +set_module_type(floppy kernelmodedriver) +add_importlibs(floppy hal ntoskrnl) +add_cd_file(TARGET floppy DESTINATION reactos/system32/drivers NO_CAB FOR all) +add_registry_inf(floppy_reg.inf) diff --git a/drivers/storage/floppy/SOURCES b/drivers/storage/floppy/floppy/SOURCES similarity index 100% rename from drivers/storage/floppy/SOURCES rename to drivers/storage/floppy/floppy/SOURCES diff --git a/drivers/storage/floppy/csqrtns.c b/drivers/storage/floppy/floppy/csqrtns.c similarity index 100% rename from drivers/storage/floppy/csqrtns.c rename to drivers/storage/floppy/floppy/csqrtns.c diff --git a/drivers/storage/floppy/csqrtns.h b/drivers/storage/floppy/floppy/csqrtns.h similarity index 100% rename from drivers/storage/floppy/csqrtns.h rename to drivers/storage/floppy/floppy/csqrtns.h diff --git a/drivers/storage/floppy/floppy.c b/drivers/storage/floppy/floppy/floppy.c similarity index 100% rename from drivers/storage/floppy/floppy.c rename to drivers/storage/floppy/floppy/floppy.c diff --git a/drivers/storage/floppy/floppy.h b/drivers/storage/floppy/floppy/floppy.h similarity index 100% rename from drivers/storage/floppy/floppy.h rename to drivers/storage/floppy/floppy/floppy.h diff --git a/drivers/storage/floppy/floppy.rc b/drivers/storage/floppy/floppy/floppy.rc similarity index 100% rename from drivers/storage/floppy/floppy.rc rename to drivers/storage/floppy/floppy/floppy.rc diff --git a/drivers/storage/floppy/floppy_reg.inf b/drivers/storage/floppy/floppy/floppy_reg.inf similarity index 100% rename from drivers/storage/floppy/floppy_reg.inf rename to drivers/storage/floppy/floppy/floppy_reg.inf diff --git a/drivers/storage/floppy/hardware.c b/drivers/storage/floppy/floppy/hardware.c similarity index 100% rename from drivers/storage/floppy/hardware.c rename to drivers/storage/floppy/floppy/hardware.c diff --git a/drivers/storage/floppy/hardware.h b/drivers/storage/floppy/floppy/hardware.h similarity index 100% rename from drivers/storage/floppy/hardware.h rename to drivers/storage/floppy/floppy/hardware.h diff --git a/drivers/storage/floppy/ioctl.c b/drivers/storage/floppy/floppy/ioctl.c similarity index 100% rename from drivers/storage/floppy/ioctl.c rename to drivers/storage/floppy/floppy/ioctl.c diff --git a/drivers/storage/floppy/ioctl.h b/drivers/storage/floppy/floppy/ioctl.h similarity index 100% rename from drivers/storage/floppy/ioctl.h rename to drivers/storage/floppy/floppy/ioctl.h diff --git a/drivers/storage/floppy/precomp.h b/drivers/storage/floppy/floppy/precomp.h similarity index 100% rename from drivers/storage/floppy/precomp.h rename to drivers/storage/floppy/floppy/precomp.h diff --git a/drivers/storage/floppy/readwrite.c b/drivers/storage/floppy/floppy/readwrite.c similarity index 100% rename from drivers/storage/floppy/readwrite.c rename to drivers/storage/floppy/floppy/readwrite.c diff --git a/drivers/storage/floppy/readwrite.h b/drivers/storage/floppy/floppy/readwrite.h similarity index 100% rename from drivers/storage/floppy/readwrite.h rename to drivers/storage/floppy/floppy/readwrite.h