- Add "fs" to npfs and msfs.

- Put blue in drivers\setup.
- Re-organize Audio stack in /wdm and /ksfilter directories.

svn path=/trunk/; revision=26252

diff --git a/reactos/drivers/base/directory.rbuild b/reactos/drivers/base/directory.rbuild
index e066ca5..0a9c175 100644 (file)
--- a/reactos/drivers/base/directory.rbuild
+++ b/reactos/drivers/base/directory.rbuild
@@ -1,9 +1,6 @@
 <directory name="beep">
        <xi:include href="beep/beep.rbuild" />
 </directory>
-<directory name="blue">
-       <xi:include href="blue/blue.rbuild" />
-</directory>
 <directory name="bootvid">
        <xi:include href="bootvid/bootvid.rbuild" />
 </directory>

diff --git a/reactos/drivers/drivers.rbuild b/reactos/drivers/drivers.rbuild
index da13c97..14a60c9 100644 (file)
--- a/reactos/drivers/drivers.rbuild
+++ b/reactos/drivers/drivers.rbuild
@@ -11,6 +11,9 @@
 <directory name="input">
        <xi:include href="input/directory.rbuild" />
 </directory>
+<directory name="ksfilter">
+       <xi:include href="ksfilter/directory.rbuild" />
+</directory>
 <directory name="multimedia">
        <xi:include href="multimedia/directory.rbuild" />
 </directory>
@@ -23,6 +26,9 @@
 <directory name="serial">
        <xi:include href="serial/directory.rbuild" />
 </directory>
+<directory name="setup">
+       <xi:include href="setup/directory.rbuild" />
+</directory>
 <directory name="storage">
        <xi:include href="storage/directory.rbuild" />
 </directory>
@@ -32,6 +38,9 @@
 <directory name="video">
        <xi:include href="video/directory.rbuild" />
 </directory>
+<directory name="wdm">
+       <xi:include href="wdm/directory.rbuild" />
+</directory>
 <directory name="wmi">
        <xi:include href="wmi/wmilib.rbuild" />
 </directory>

diff --git a/reactos/drivers/filesystems/directory.rbuild b/reactos/drivers/filesystems/directory.rbuild
index f26bbf7..475381b 100644 (file)
--- a/reactos/drivers/filesystems/directory.rbuild
+++ b/reactos/drivers/filesystems/directory.rbuild
@@ -4,14 +4,14 @@
 <directory name="fs_rec">
        <xi:include href="fs_rec/fs_rec.rbuild" />
 </directory>
-<directory name="ms">
-       <xi:include href="ms/msfs.rbuild" />
+<directory name="msfs">
+       <xi:include href="msfs/msfs.rbuild" />
 </directory>
 <directory name="mup">
        <xi:include href="mup/mup.rbuild" />
 </directory>
-<directory name="np">
-       <xi:include href="np/npfs.rbuild" />
+<directory name="npfs">
+       <xi:include href="npfs/npfs.rbuild" />
 </directory>
 <directory name="ntfs">
        <xi:include href="ntfs/ntfs.rbuild" />

diff --git a/reactos/drivers/filesystems/ms/create.c b/reactos/drivers/filesystems/msfs/create.c
similarity index 100%
rename from reactos/drivers/filesystems/ms/create.c
rename to reactos/drivers/filesystems/msfs/create.c

diff --git a/reactos/drivers/filesystems/ms/finfo.c b/reactos/drivers/filesystems/msfs/finfo.c
similarity index 100%
rename from reactos/drivers/filesystems/ms/finfo.c
rename to reactos/drivers/filesystems/msfs/finfo.c

diff --git a/reactos/drivers/filesystems/ms/fsctrl.c b/reactos/drivers/filesystems/msfs/fsctrl.c
similarity index 100%
rename from reactos/drivers/filesystems/ms/fsctrl.c
rename to reactos/drivers/filesystems/msfs/fsctrl.c

diff --git a/reactos/drivers/filesystems/ms/msfs.c b/reactos/drivers/filesystems/msfs/msfs.c
similarity index 100%
rename from reactos/drivers/filesystems/ms/msfs.c
rename to reactos/drivers/filesystems/msfs/msfs.c

diff --git a/reactos/drivers/filesystems/ms/msfs.h b/reactos/drivers/filesystems/msfs/msfs.h
similarity index 100%
rename from reactos/drivers/filesystems/ms/msfs.h
rename to reactos/drivers/filesystems/msfs/msfs.h

diff --git a/reactos/drivers/filesystems/ms/msfs.rbuild b/reactos/drivers/filesystems/msfs/msfs.rbuild
similarity index 100%
rename from reactos/drivers/filesystems/ms/msfs.rbuild
rename to reactos/drivers/filesystems/msfs/msfs.rbuild

diff --git a/reactos/drivers/filesystems/ms/msfs.rc b/reactos/drivers/filesystems/msfs/msfs.rc
similarity index 100%
rename from reactos/drivers/filesystems/ms/msfs.rc
rename to reactos/drivers/filesystems/msfs/msfs.rc

diff --git a/reactos/drivers/filesystems/ms/rw.c b/reactos/drivers/filesystems/msfs/rw.c
similarity index 100%
rename from reactos/drivers/filesystems/ms/rw.c
rename to reactos/drivers/filesystems/msfs/rw.c

diff --git a/reactos/drivers/filesystems/np/create.c b/reactos/drivers/filesystems/npfs/create.c
similarity index 100%
rename from reactos/drivers/filesystems/np/create.c
rename to reactos/drivers/filesystems/npfs/create.c

diff --git a/reactos/drivers/filesystems/np/finfo.c b/reactos/drivers/filesystems/npfs/finfo.c
similarity index 100%
rename from reactos/drivers/filesystems/np/finfo.c
rename to reactos/drivers/filesystems/npfs/finfo.c

diff --git a/reactos/drivers/filesystems/np/fsctrl.c b/reactos/drivers/filesystems/npfs/fsctrl.c
similarity index 100%
rename from reactos/drivers/filesystems/np/fsctrl.c
rename to reactos/drivers/filesystems/npfs/fsctrl.c

diff --git a/reactos/drivers/filesystems/np/npfs.c b/reactos/drivers/filesystems/npfs/npfs.c
similarity index 100%
rename from reactos/drivers/filesystems/np/npfs.c
rename to reactos/drivers/filesystems/npfs/npfs.c

diff --git a/reactos/drivers/filesystems/np/npfs.h b/reactos/drivers/filesystems/npfs/npfs.h
similarity index 100%
rename from reactos/drivers/filesystems/np/npfs.h
rename to reactos/drivers/filesystems/npfs/npfs.h

diff --git a/reactos/drivers/filesystems/np/npfs.rbuild b/reactos/drivers/filesystems/npfs/npfs.rbuild
similarity index 100%
rename from reactos/drivers/filesystems/np/npfs.rbuild
rename to reactos/drivers/filesystems/npfs/npfs.rbuild

diff --git a/reactos/drivers/filesystems/np/npfs.rc b/reactos/drivers/filesystems/npfs/npfs.rc
similarity index 100%
rename from reactos/drivers/filesystems/np/npfs.rc
rename to reactos/drivers/filesystems/npfs/npfs.rc

diff --git a/reactos/drivers/filesystems/np/rw.c b/reactos/drivers/filesystems/npfs/rw.c
similarity index 100%
rename from reactos/drivers/filesystems/np/rw.c
rename to reactos/drivers/filesystems/npfs/rw.c

diff --git a/reactos/drivers/filesystems/np/volume.c b/reactos/drivers/filesystems/npfs/volume.c
similarity index 100%
rename from reactos/drivers/filesystems/np/volume.c
rename to reactos/drivers/filesystems/npfs/volume.c

diff --git a/reactos/drivers/ksfilter/directory.rbuild b/reactos/drivers/ksfilter/directory.rbuild
new file mode 100644 (file)
index 0000000..087572e
--- /dev/null
+++ b/reactos/drivers/ksfilter/directory.rbuild
@@ -0,0 +1,3 @@
+<directory name="ks">\r
+       <xi:include href="ks/ks.rbuild" />\r
+</directory>
\ No newline at end of file

diff --git a/reactos/drivers/multimedia/ks/allocators.c b/reactos/drivers/ksfilter/ks/allocators.c
similarity index 100%
rename from reactos/drivers/multimedia/ks/allocators.c
rename to reactos/drivers/ksfilter/ks/allocators.c

diff --git a/reactos/drivers/multimedia/ks/clocks.c b/reactos/drivers/ksfilter/ks/clocks.c
similarity index 100%
rename from reactos/drivers/multimedia/ks/clocks.c
rename to reactos/drivers/ksfilter/ks/clocks.c

diff --git a/reactos/drivers/multimedia/ks/connectivity.c b/reactos/drivers/ksfilter/ks/connectivity.c
similarity index 100%
rename from reactos/drivers/multimedia/ks/connectivity.c
rename to reactos/drivers/ksfilter/ks/connectivity.c

diff --git a/reactos/drivers/multimedia/ks/events.c b/reactos/drivers/ksfilter/ks/events.c
similarity index 100%
rename from reactos/drivers/multimedia/ks/events.c
rename to reactos/drivers/ksfilter/ks/events.c

diff --git a/reactos/drivers/multimedia/ks/irp.c b/reactos/drivers/ksfilter/ks/irp.c
similarity index 100%
rename from reactos/drivers/multimedia/ks/irp.c
rename to reactos/drivers/ksfilter/ks/irp.c

diff --git a/reactos/drivers/multimedia/ks/ks.def b/reactos/drivers/ksfilter/ks/ks.def
similarity index 100%
rename from reactos/drivers/multimedia/ks/ks.def
rename to reactos/drivers/ksfilter/ks/ks.def

diff --git a/reactos/drivers/multimedia/ks/ks.rbuild b/reactos/drivers/ksfilter/ks/ks.rbuild
similarity index 100%
rename from reactos/drivers/multimedia/ks/ks.rbuild
rename to reactos/drivers/ksfilter/ks/ks.rbuild

diff --git a/reactos/drivers/multimedia/ks/ks.rc b/reactos/drivers/ksfilter/ks/ks.rc
similarity index 100%
rename from reactos/drivers/multimedia/ks/ks.rc
rename to reactos/drivers/ksfilter/ks/ks.rc

diff --git a/reactos/drivers/multimedia/ks/methods.c b/reactos/drivers/ksfilter/ks/methods.c
similarity index 100%
rename from reactos/drivers/multimedia/ks/methods.c
rename to reactos/drivers/ksfilter/ks/methods.c

diff --git a/reactos/drivers/multimedia/ks/misc.c b/reactos/drivers/ksfilter/ks/misc.c
similarity index 100%
rename from reactos/drivers/multimedia/ks/misc.c
rename to reactos/drivers/ksfilter/ks/misc.c

diff --git a/reactos/drivers/multimedia/ks/properties.c b/reactos/drivers/ksfilter/ks/properties.c
similarity index 100%
rename from reactos/drivers/multimedia/ks/properties.c
rename to reactos/drivers/ksfilter/ks/properties.c

diff --git a/reactos/drivers/multimedia/ks/topology.c b/reactos/drivers/ksfilter/ks/topology.c
similarity index 100%
rename from reactos/drivers/multimedia/ks/topology.c
rename to reactos/drivers/ksfilter/ks/topology.c

diff --git a/reactos/drivers/multimedia/ks/worker.c b/reactos/drivers/ksfilter/ks/worker.c
similarity index 100%
rename from reactos/drivers/multimedia/ks/worker.c
rename to reactos/drivers/ksfilter/ks/worker.c

diff --git a/reactos/drivers/ksfilter/swenum/.gitignore b/reactos/drivers/ksfilter/swenum/.gitignore
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/reactos/drivers/multimedia/sb16_nt4/control.c b/reactos/drivers/multimedia/audio/sb16_nt4/control.c
similarity index 100%
rename from reactos/drivers/multimedia/sb16_nt4/control.c
rename to reactos/drivers/multimedia/audio/sb16_nt4/control.c

diff --git a/reactos/drivers/multimedia/sb16_nt4/interrupt.c b/reactos/drivers/multimedia/audio/sb16_nt4/interrupt.c
similarity index 100%
rename from reactos/drivers/multimedia/sb16_nt4/interrupt.c
rename to reactos/drivers/multimedia/audio/sb16_nt4/interrupt.c

diff --git a/reactos/drivers/multimedia/sb16_nt4/main.c b/reactos/drivers/multimedia/audio/sb16_nt4/main.c
similarity index 100%
rename from reactos/drivers/multimedia/sb16_nt4/main.c
rename to reactos/drivers/multimedia/audio/sb16_nt4/main.c

diff --git a/reactos/drivers/multimedia/sb16_nt4/sb16_nt4.def b/reactos/drivers/multimedia/audio/sb16_nt4/sb16_nt4.def
similarity index 100%
rename from reactos/drivers/multimedia/sb16_nt4/sb16_nt4.def
rename to reactos/drivers/multimedia/audio/sb16_nt4/sb16_nt4.def

diff --git a/reactos/drivers/multimedia/sb16_nt4/sb16_nt4.rbuild b/reactos/drivers/multimedia/audio/sb16_nt4/sb16_nt4.rbuild
similarity index 100%
rename from reactos/drivers/multimedia/sb16_nt4/sb16_nt4.rbuild
rename to reactos/drivers/multimedia/audio/sb16_nt4/sb16_nt4.rbuild

diff --git a/reactos/drivers/multimedia/sb16_nt4/sndblst.h b/reactos/drivers/multimedia/audio/sb16_nt4/sndblst.h
similarity index 100%
rename from reactos/drivers/multimedia/sb16_nt4/sndblst.h
rename to reactos/drivers/multimedia/audio/sb16_nt4/sndblst.h

diff --git a/reactos/drivers/multimedia/directory.rbuild b/reactos/drivers/multimedia/directory.rbuild
index aeca33a..5ad9ad0 100755 (executable)
--- a/reactos/drivers/multimedia/directory.rbuild
+++ b/reactos/drivers/multimedia/directory.rbuild
@@ -1,43 +1,3 @@
 <directory name="audio">
        <xi:include href="audio/directory.rbuild" />
-</directory>
-
-<!--
-    Kernel Streaming
-
-    This is mostly incomplete at the moment.
--->
-
-<directory name="ks">
-       <xi:include href="ks/ks.rbuild" />
-</directory>
-
-<directory name="drmk">
-       <xi:include href="drmk/drmk.rbuild" />
-</directory>
-
-<directory name="portcls">
-       <xi:include href="portcls/portcls.rbuild" />
-</directory>
-
-<!--<directory name="avtest">
-       <xi:include href="avtest/avtest.rbuild" />
-</directory-->
-
-
-<!--
-       Drivers (experimental)
--->
-
-<directory name="mpu401_ks">
-       <xi:include href="mpu401_ks/mpu401.rbuild" />
-</directory>
-
-<directory name="sb16_nt4">
-       <xi:include href="sb16_nt4/sb16_nt4.rbuild" />
-</directory>
-
-<!--directory name="sb16_ks">
-       <xi:include href="sb16_ks/sb16.rbuild" />
-</directory-->
-
+</directory>
\ No newline at end of file

diff --git a/reactos/drivers/base/blue/blue.c b/reactos/drivers/setup/blue/blue.c
similarity index 100%
rename from reactos/drivers/base/blue/blue.c
rename to reactos/drivers/setup/blue/blue.c

diff --git a/reactos/drivers/base/blue/blue.rbuild b/reactos/drivers/setup/blue/blue.rbuild
similarity index 100%
rename from reactos/drivers/base/blue/blue.rbuild
rename to reactos/drivers/setup/blue/blue.rbuild

diff --git a/reactos/drivers/base/blue/blue.rc b/reactos/drivers/setup/blue/blue.rc
similarity index 100%
rename from reactos/drivers/base/blue/blue.rc
rename to reactos/drivers/setup/blue/blue.rc

diff --git a/reactos/drivers/setup/directory.rbuild b/reactos/drivers/setup/directory.rbuild
new file mode 100644 (file)
index 0000000..6e7db3c
--- /dev/null
+++ b/reactos/drivers/setup/directory.rbuild
@@ -0,0 +1,3 @@
+<directory name="blue">\r
+       <xi:include href="blue/blue.rbuild" />\r
+</directory>
\ No newline at end of file

diff --git a/reactos/drivers/wdm/audio/backpln/adapters/dmusic/.gitignore b/reactos/drivers/wdm/audio/backpln/adapters/dmusic/.gitignore
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/reactos/drivers/wdm/audio/backpln/directory.rbuild b/reactos/drivers/wdm/audio/backpln/directory.rbuild
new file mode 100644 (file)
index 0000000..2f25af5
--- /dev/null
+++ b/reactos/drivers/wdm/audio/backpln/directory.rbuild
@@ -0,0 +1,3 @@
+<directory name="portcls">\r
+       <xi:include href="portcls/portcls.rbuild" />\r
+</directory>
\ No newline at end of file

diff --git a/reactos/drivers/multimedia/portcls/adapter.c b/reactos/drivers/wdm/audio/backpln/portcls/adapter.c
similarity index 100%
rename from reactos/drivers/multimedia/portcls/adapter.c
rename to reactos/drivers/wdm/audio/backpln/portcls/adapter.c

diff --git a/reactos/drivers/multimedia/portcls/dll.c b/reactos/drivers/wdm/audio/backpln/portcls/dll.c
similarity index 100%
rename from reactos/drivers/multimedia/portcls/dll.c
rename to reactos/drivers/wdm/audio/backpln/portcls/dll.c

diff --git a/reactos/drivers/multimedia/portcls/drm.c b/reactos/drivers/wdm/audio/backpln/portcls/drm.c
similarity index 100%
rename from reactos/drivers/multimedia/portcls/drm.c
rename to reactos/drivers/wdm/audio/backpln/portcls/drm.c

diff --git a/reactos/drivers/multimedia/portcls/helper/ResourceList.c b/reactos/drivers/wdm/audio/backpln/portcls/helper/ResourceList.c
similarity index 100%
rename from reactos/drivers/multimedia/portcls/helper/ResourceList.c
rename to reactos/drivers/wdm/audio/backpln/portcls/helper/ResourceList.c

diff --git a/reactos/drivers/multimedia/portcls/irp.c b/reactos/drivers/wdm/audio/backpln/portcls/irp.c
similarity index 100%
rename from reactos/drivers/multimedia/portcls/irp.c
rename to reactos/drivers/wdm/audio/backpln/portcls/irp.c

diff --git a/reactos/drivers/multimedia/portcls/miniport/IMiniport.cpp b/reactos/drivers/wdm/audio/backpln/portcls/miniport/IMiniport.cpp
similarity index 100%
rename from reactos/drivers/multimedia/portcls/miniport/IMiniport.cpp
rename to reactos/drivers/wdm/audio/backpln/portcls/miniport/IMiniport.cpp

diff --git a/reactos/drivers/multimedia/portcls/miniport/IMiniportDMus.cpp b/reactos/drivers/wdm/audio/backpln/portcls/miniport/IMiniportDMus.cpp
similarity index 100%
rename from reactos/drivers/multimedia/portcls/miniport/IMiniportDMus.cpp
rename to reactos/drivers/wdm/audio/backpln/portcls/miniport/IMiniportDMus.cpp

diff --git a/reactos/drivers/multimedia/portcls/miniport/IMiniportMidi.cpp b/reactos/drivers/wdm/audio/backpln/portcls/miniport/IMiniportMidi.cpp
similarity index 100%
rename from reactos/drivers/multimedia/portcls/miniport/IMiniportMidi.cpp
rename to reactos/drivers/wdm/audio/backpln/portcls/miniport/IMiniportMidi.cpp

diff --git a/reactos/drivers/multimedia/portcls/miniport/IMiniportTopology.cpp b/reactos/drivers/wdm/audio/backpln/portcls/miniport/IMiniportTopology.cpp
similarity index 100%
rename from reactos/drivers/multimedia/portcls/miniport/IMiniportTopology.cpp
rename to reactos/drivers/wdm/audio/backpln/portcls/miniport/IMiniportTopology.cpp

diff --git a/reactos/drivers/multimedia/portcls/miniport/IMiniportWaveCyclic.cpp b/reactos/drivers/wdm/audio/backpln/portcls/miniport/IMiniportWaveCyclic.cpp
similarity index 100%
rename from reactos/drivers/multimedia/portcls/miniport/IMiniportWaveCyclic.cpp
rename to reactos/drivers/wdm/audio/backpln/portcls/miniport/IMiniportWaveCyclic.cpp

diff --git a/reactos/drivers/multimedia/portcls/miniport/IMiniportWavePci.cpp b/reactos/drivers/wdm/audio/backpln/portcls/miniport/IMiniportWavePci.cpp
similarity index 100%
rename from reactos/drivers/multimedia/portcls/miniport/IMiniportWavePci.cpp
rename to reactos/drivers/wdm/audio/backpln/portcls/miniport/IMiniportWavePci.cpp

diff --git a/reactos/drivers/multimedia/portcls/miniport/factory.cpp b/reactos/drivers/wdm/audio/backpln/portcls/miniport/factory.cpp
similarity index 100%
rename from reactos/drivers/multimedia/portcls/miniport/factory.cpp
rename to reactos/drivers/wdm/audio/backpln/portcls/miniport/factory.cpp

diff --git a/reactos/drivers/multimedia/portcls/port/IPort.cpp b/reactos/drivers/wdm/audio/backpln/portcls/port/IPort.cpp
similarity index 100%
rename from reactos/drivers/multimedia/portcls/port/IPort.cpp
rename to reactos/drivers/wdm/audio/backpln/portcls/port/IPort.cpp

diff --git a/reactos/drivers/multimedia/portcls/port/IPortDMus.cpp b/reactos/drivers/wdm/audio/backpln/portcls/port/IPortDMus.cpp
similarity index 100%
rename from reactos/drivers/multimedia/portcls/port/IPortDMus.cpp
rename to reactos/drivers/wdm/audio/backpln/portcls/port/IPortDMus.cpp

diff --git a/reactos/drivers/multimedia/portcls/port/IPortMidi.cpp b/reactos/drivers/wdm/audio/backpln/portcls/port/IPortMidi.cpp
similarity index 100%
rename from reactos/drivers/multimedia/portcls/port/IPortMidi.cpp
rename to reactos/drivers/wdm/audio/backpln/portcls/port/IPortMidi.cpp

diff --git a/reactos/drivers/multimedia/portcls/port/IPortTopology.cpp b/reactos/drivers/wdm/audio/backpln/portcls/port/IPortTopology.cpp
similarity index 100%
rename from reactos/drivers/multimedia/portcls/port/IPortTopology.cpp
rename to reactos/drivers/wdm/audio/backpln/portcls/port/IPortTopology.cpp

diff --git a/reactos/drivers/multimedia/portcls/port/IPortWaveCyclic.cpp b/reactos/drivers/wdm/audio/backpln/portcls/port/IPortWaveCyclic.cpp
similarity index 100%
rename from reactos/drivers/multimedia/portcls/port/IPortWaveCyclic.cpp
rename to reactos/drivers/wdm/audio/backpln/portcls/port/IPortWaveCyclic.cpp

diff --git a/reactos/drivers/multimedia/portcls/port/IPortWavePci.cpp b/reactos/drivers/wdm/audio/backpln/portcls/port/IPortWavePci.cpp
similarity index 100%
rename from reactos/drivers/multimedia/portcls/port/IPortWavePci.cpp
rename to reactos/drivers/wdm/audio/backpln/portcls/port/IPortWavePci.cpp

diff --git a/reactos/drivers/multimedia/portcls/port/factory.c b/reactos/drivers/wdm/audio/backpln/portcls/port/factory.c
similarity index 100%
rename from reactos/drivers/multimedia/portcls/port/factory.c
rename to reactos/drivers/wdm/audio/backpln/portcls/port/factory.c

diff --git a/reactos/drivers/multimedia/portcls/port/port.h b/reactos/drivers/wdm/audio/backpln/portcls/port/port.h
similarity index 100%
rename from reactos/drivers/multimedia/portcls/port/port.h
rename to reactos/drivers/wdm/audio/backpln/portcls/port/port.h

diff --git a/reactos/drivers/multimedia/portcls/portcls.def b/reactos/drivers/wdm/audio/backpln/portcls/portcls.def
similarity index 100%
rename from reactos/drivers/multimedia/portcls/portcls.def
rename to reactos/drivers/wdm/audio/backpln/portcls/portcls.def

diff --git a/reactos/drivers/multimedia/portcls/portcls.rbuild b/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild
similarity index 100%
rename from reactos/drivers/multimedia/portcls/portcls.rbuild
rename to reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild

diff --git a/reactos/drivers/multimedia/portcls/portcls.rc b/reactos/drivers/wdm/audio/backpln/portcls/portcls.rc
similarity index 100%
rename from reactos/drivers/multimedia/portcls/portcls.rc
rename to reactos/drivers/wdm/audio/backpln/portcls/portcls.rc

diff --git a/reactos/drivers/multimedia/portcls/private.h b/reactos/drivers/wdm/audio/backpln/portcls/private.h
similarity index 100%
rename from reactos/drivers/multimedia/portcls/private.h
rename to reactos/drivers/wdm/audio/backpln/portcls/private.h

diff --git a/reactos/drivers/multimedia/portcls/stubs.c b/reactos/drivers/wdm/audio/backpln/portcls/stubs.c
similarity index 100%
rename from reactos/drivers/multimedia/portcls/stubs.c
rename to reactos/drivers/wdm/audio/backpln/portcls/stubs.c

diff --git a/reactos/drivers/multimedia/portcls/undoc.c b/reactos/drivers/wdm/audio/backpln/portcls/undoc.c
similarity index 100%
rename from reactos/drivers/multimedia/portcls/undoc.c
rename to reactos/drivers/wdm/audio/backpln/portcls/undoc.c

diff --git a/reactos/drivers/multimedia/stdunk/stdunk.c b/reactos/drivers/wdm/audio/backpln/stdunk/stdunk.c
similarity index 100%
rename from reactos/drivers/multimedia/stdunk/stdunk.c
rename to reactos/drivers/wdm/audio/backpln/stdunk/stdunk.c

diff --git a/reactos/drivers/multimedia/stdunk/stdunk.cpp b/reactos/drivers/wdm/audio/backpln/stdunk/stdunk.cpp
similarity index 100%
rename from reactos/drivers/multimedia/stdunk/stdunk.cpp
rename to reactos/drivers/wdm/audio/backpln/stdunk/stdunk.cpp

diff --git a/reactos/drivers/wdm/audio/directory.rbuild b/reactos/drivers/wdm/audio/directory.rbuild
new file mode 100644 (file)
index 0000000..3616a73
--- /dev/null
+++ b/reactos/drivers/wdm/audio/directory.rbuild
@@ -0,0 +1,12 @@
+<directory name="backpln">\r
+       <xi:include href="backpln/directory.rbuild" />\r
+</directory>\r
+<directory name="drivers">\r
+       <xi:include href="drivers/directory.rbuild" />\r
+</directory>\r
+<directory name="drm">\r
+       <xi:include href="drm/directory.rbuild" />\r
+</directory>\r
+<directory name="legacy">\r
+       <xi:include href="legacy/directory.rbuild" />\r
+</directory>
\ No newline at end of file

diff --git a/reactos/drivers/wdm/audio/drivers/directory.rbuild b/reactos/drivers/wdm/audio/drivers/directory.rbuild
new file mode 100644 (file)
index 0000000..219901b
--- /dev/null
+++ b/reactos/drivers/wdm/audio/drivers/directory.rbuild
@@ -0,0 +1,3 @@
+<directory name="mpu401_ks">\r
+       <xi:include href="mpu401_ks/mpu401.rbuild" />\r
+</directory>
\ No newline at end of file

diff --git a/reactos/drivers/multimedia/mpu401_ks/adapter.cpp b/reactos/drivers/wdm/audio/drivers/mpu401_ks/adapter.cpp
similarity index 100%
rename from reactos/drivers/multimedia/mpu401_ks/adapter.cpp
rename to reactos/drivers/wdm/audio/drivers/mpu401_ks/adapter.cpp

diff --git a/reactos/drivers/multimedia/mpu401_ks/mpu401.def b/reactos/drivers/wdm/audio/drivers/mpu401_ks/mpu401.def
similarity index 100%
rename from reactos/drivers/multimedia/mpu401_ks/mpu401.def
rename to reactos/drivers/wdm/audio/drivers/mpu401_ks/mpu401.def

diff --git a/reactos/drivers/multimedia/mpu401_ks/mpu401.rbuild b/reactos/drivers/wdm/audio/drivers/mpu401_ks/mpu401.rbuild
similarity index 100%
rename from reactos/drivers/multimedia/mpu401_ks/mpu401.rbuild
rename to reactos/drivers/wdm/audio/drivers/mpu401_ks/mpu401.rbuild

diff --git a/reactos/drivers/multimedia/mpu401_ks/mpu401.rc b/reactos/drivers/wdm/audio/drivers/mpu401_ks/mpu401.rc
similarity index 100%
rename from reactos/drivers/multimedia/mpu401_ks/mpu401.rc
rename to reactos/drivers/wdm/audio/drivers/mpu401_ks/mpu401.rc

diff --git a/reactos/drivers/multimedia/sb16_ks/adapter.cpp b/reactos/drivers/wdm/audio/drivers/sb16_ks/adapter.cpp
similarity index 100%
rename from reactos/drivers/multimedia/sb16_ks/adapter.cpp
rename to reactos/drivers/wdm/audio/drivers/sb16_ks/adapter.cpp

diff --git a/reactos/drivers/multimedia/sb16_ks/main.cpp b/reactos/drivers/wdm/audio/drivers/sb16_ks/main.cpp
similarity index 100%
rename from reactos/drivers/multimedia/sb16_ks/main.cpp
rename to reactos/drivers/wdm/audio/drivers/sb16_ks/main.cpp

diff --git a/reactos/drivers/multimedia/sb16_ks/sb16.h b/reactos/drivers/wdm/audio/drivers/sb16_ks/sb16.h
similarity index 100%
rename from reactos/drivers/multimedia/sb16_ks/sb16.h
rename to reactos/drivers/wdm/audio/drivers/sb16_ks/sb16.h

diff --git a/reactos/drivers/multimedia/sb16_ks/sb16.rbuild b/reactos/drivers/wdm/audio/drivers/sb16_ks/sb16.rbuild
similarity index 100%
rename from reactos/drivers/multimedia/sb16_ks/sb16.rbuild
rename to reactos/drivers/wdm/audio/drivers/sb16_ks/sb16.rbuild

diff --git a/reactos/drivers/multimedia/sb16_ks/sb16_ks.def b/reactos/drivers/wdm/audio/drivers/sb16_ks/sb16_ks.def
similarity index 100%
rename from reactos/drivers/multimedia/sb16_ks/sb16_ks.def
rename to reactos/drivers/wdm/audio/drivers/sb16_ks/sb16_ks.def

diff --git a/reactos/drivers/multimedia/sb16_ks/stdunk.cpp b/reactos/drivers/wdm/audio/drivers/sb16_ks/stdunk.cpp
similarity index 100%
rename from reactos/drivers/multimedia/sb16_ks/stdunk.cpp
rename to reactos/drivers/wdm/audio/drivers/sb16_ks/stdunk.cpp

diff --git a/reactos/drivers/wdm/audio/drm/directory.rbuild b/reactos/drivers/wdm/audio/drm/directory.rbuild
new file mode 100644 (file)
index 0000000..48016ad
--- /dev/null
+++ b/reactos/drivers/wdm/audio/drm/directory.rbuild
@@ -0,0 +1,3 @@
+<directory name="drmk">\r
+       <xi:include href="drmk/drmk.rbuild" />\r
+</directory>
\ No newline at end of file

diff --git a/reactos/drivers/multimedia/drmk/drmk.def b/reactos/drivers/wdm/audio/drm/drmk/drmk.def
similarity index 100%
rename from reactos/drivers/multimedia/drmk/drmk.def
rename to reactos/drivers/wdm/audio/drm/drmk/drmk.def

diff --git a/reactos/drivers/multimedia/drmk/drmk.rbuild b/reactos/drivers/wdm/audio/drm/drmk/drmk.rbuild
similarity index 100%
rename from reactos/drivers/multimedia/drmk/drmk.rbuild
rename to reactos/drivers/wdm/audio/drm/drmk/drmk.rbuild

diff --git a/reactos/drivers/multimedia/drmk/drmk.rc b/reactos/drivers/wdm/audio/drm/drmk/drmk.rc
similarity index 100%
rename from reactos/drivers/multimedia/drmk/drmk.rc
rename to reactos/drivers/wdm/audio/drm/drmk/drmk.rc

diff --git a/reactos/drivers/multimedia/drmk/stubs.c b/reactos/drivers/wdm/audio/drm/drmk/stubs.c
similarity index 100%
rename from reactos/drivers/multimedia/drmk/stubs.c
rename to reactos/drivers/wdm/audio/drm/drmk/stubs.c

diff --git a/reactos/drivers/wdm/audio/filters/kmixer/.gitignore b/reactos/drivers/wdm/audio/filters/kmixer/.gitignore
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/reactos/drivers/wdm/audio/filters/splitter/.gitignore b/reactos/drivers/wdm/audio/filters/splitter/.gitignore
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/reactos/drivers/wdm/audio/filters/swmidi/.gitignore b/reactos/drivers/wdm/audio/filters/swmidi/.gitignore
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/reactos/drivers/wdm/audio/legacy/directory.rbuild b/reactos/drivers/wdm/audio/legacy/directory.rbuild
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/reactos/drivers/multimedia/wdmaud/entry.c b/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c
similarity index 100%
rename from reactos/drivers/multimedia/wdmaud/entry.c
rename to reactos/drivers/wdm/audio/legacy/wdmaud/entry.c

diff --git a/reactos/drivers/multimedia/wdmaud/wdmaud.rbuild b/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.rbuild
similarity index 100%
rename from reactos/drivers/multimedia/wdmaud/wdmaud.rbuild
rename to reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.rbuild

diff --git a/reactos/drivers/wdm/audio/sysaudio/.gitignore b/reactos/drivers/wdm/audio/sysaudio/.gitignore
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/reactos/drivers/wdm/directory.rbuild b/reactos/drivers/wdm/directory.rbuild
new file mode 100644 (file)
index 0000000..c0f9dc6
--- /dev/null
+++ b/reactos/drivers/wdm/directory.rbuild
@@ -0,0 +1,3 @@
+<directory name="audio">\r
+       <xi:include href="audio/directory.rbuild" />\r
+</directory>
\ No newline at end of file