From 224af7cee9163ed5e8b8bc2a80316e7d18242bdc Mon Sep 17 00:00:00 2001
From: Andrew Greenwood <silverblade@reactos.org>
Date: Sun, 8 Jul 2007 16:12:09 +0000
Subject: [PATCH] Further tidying up of the multimedia components. Renamed
 MPU401_KS to MPU401 and SB16_KS to SB16. Have updated the rbuild files so
 these should still build without issue.

svn path=/trunk/; revision=27487
---
 .../drivers/wdm/audio/drivers/directory.rbuild |  9 ++++++---
 .../drivers/{mpu401_ks => mpu401}/adapter.cpp  |  0
 .../drivers/{mpu401_ks => mpu401}/mpu401.def   |  0
 .../wdm/audio/drivers/mpu401/mpu401.rbuild     | 18 ++++++++++++++++++
 .../drivers/{mpu401_ks => mpu401}/mpu401.rc    |  0
 .../wdm/audio/drivers/mpu401_ks/mpu401.rbuild  | 11 -----------
 .../drivers/{sb16_ks => sb16}/adapter.cpp      |  0
 .../audio/drivers/{sb16_ks => sb16}/main.cpp   |  0
 .../wdm/audio/drivers/{sb16_ks => sb16}/sb16.h |  0
 .../drivers/{sb16_ks => sb16}/sb16.rbuild      |  0
 .../drivers/{sb16_ks => sb16}/sb16_ks.def      |  0
 .../audio/drivers/{sb16_ks => sb16}/stdunk.cpp |  0
 12 files changed, 24 insertions(+), 14 deletions(-)
 rename reactos/drivers/wdm/audio/drivers/{mpu401_ks => mpu401}/adapter.cpp (100%)
 rename reactos/drivers/wdm/audio/drivers/{mpu401_ks => mpu401}/mpu401.def (100%)
 create mode 100644 reactos/drivers/wdm/audio/drivers/mpu401/mpu401.rbuild
 rename reactos/drivers/wdm/audio/drivers/{mpu401_ks => mpu401}/mpu401.rc (100%)
 delete mode 100644 reactos/drivers/wdm/audio/drivers/mpu401_ks/mpu401.rbuild
 rename reactos/drivers/wdm/audio/drivers/{sb16_ks => sb16}/adapter.cpp (100%)
 rename reactos/drivers/wdm/audio/drivers/{sb16_ks => sb16}/main.cpp (100%)
 rename reactos/drivers/wdm/audio/drivers/{sb16_ks => sb16}/sb16.h (100%)
 rename reactos/drivers/wdm/audio/drivers/{sb16_ks => sb16}/sb16.rbuild (100%)
 rename reactos/drivers/wdm/audio/drivers/{sb16_ks => sb16}/sb16_ks.def (100%)
 rename reactos/drivers/wdm/audio/drivers/{sb16_ks => sb16}/stdunk.cpp (100%)

diff --git a/reactos/drivers/wdm/audio/drivers/directory.rbuild b/reactos/drivers/wdm/audio/drivers/directory.rbuild
index 6a839ae40b1..522d9058d41 100644
--- a/reactos/drivers/wdm/audio/drivers/directory.rbuild
+++ b/reactos/drivers/wdm/audio/drivers/directory.rbuild
@@ -1,3 +1,6 @@
-<directory name="mpu401_ks">
-	<xi:include href="mpu401_ks/mpu401.rbuild" />
-</directory>
\ No newline at end of file
+<directory name="mpu401">
+	<xi:include href="mpu401/mpu401.rbuild" />
+</directory>
+<!--directory name="sb16">
+	<xi:include href="sb16/sb16.rbuild" />
+</directory-->
diff --git a/reactos/drivers/wdm/audio/drivers/mpu401_ks/adapter.cpp b/reactos/drivers/wdm/audio/drivers/mpu401/adapter.cpp
similarity index 100%
rename from reactos/drivers/wdm/audio/drivers/mpu401_ks/adapter.cpp
rename to reactos/drivers/wdm/audio/drivers/mpu401/adapter.cpp
diff --git a/reactos/drivers/wdm/audio/drivers/mpu401_ks/mpu401.def b/reactos/drivers/wdm/audio/drivers/mpu401/mpu401.def
similarity index 100%
rename from reactos/drivers/wdm/audio/drivers/mpu401_ks/mpu401.def
rename to reactos/drivers/wdm/audio/drivers/mpu401/mpu401.def
diff --git a/reactos/drivers/wdm/audio/drivers/mpu401/mpu401.rbuild b/reactos/drivers/wdm/audio/drivers/mpu401/mpu401.rbuild
new file mode 100644
index 00000000000..1d3b6711f33
--- /dev/null
+++ b/reactos/drivers/wdm/audio/drivers/mpu401/mpu401.rbuild
@@ -0,0 +1,18 @@
+<!--
+	This module fails to load as NTOSKRNL currently does not support
+	imports (hence PORTCLS fails to load.)
+
+	A. Greenwood (July 2007)
+-->
+
+<module name="mpu401" type="kernelmodedriver" installbase="system32/drivers" installname="mpu401.sys" allowwarnings="true" entrypoint="DriverEntry">
+    <linkerflag>-Wl,--entry,_DriverEntry@8</linkerflag>
+    <include base="mpu401">.</include>
+    <include base="mpu401">..</include>
+    <library>ntoskrnl</library>
+    <library>portcls</library>
+    <define name="DBG" />
+    <define name="__USE_W32API" />
+    <!--file>mpu401.rc</file-->
+    <file>adapter.cpp</file>
+</module>
diff --git a/reactos/drivers/wdm/audio/drivers/mpu401_ks/mpu401.rc b/reactos/drivers/wdm/audio/drivers/mpu401/mpu401.rc
similarity index 100%
rename from reactos/drivers/wdm/audio/drivers/mpu401_ks/mpu401.rc
rename to reactos/drivers/wdm/audio/drivers/mpu401/mpu401.rc
diff --git a/reactos/drivers/wdm/audio/drivers/mpu401_ks/mpu401.rbuild b/reactos/drivers/wdm/audio/drivers/mpu401_ks/mpu401.rbuild
deleted file mode 100644
index 28263e97139..00000000000
--- a/reactos/drivers/wdm/audio/drivers/mpu401_ks/mpu401.rbuild
+++ /dev/null
@@ -1,11 +0,0 @@
-<module name="mpu401" type="kernelmodedriver" installbase="system32/drivers" installname="mpu401.sys" allowwarnings="true" entrypoint="DriverEntry">
-    <linkerflag>-Wl,--entry,_DriverEntry@8</linkerflag>
-	<include base="mpu401">.</include>
-	<include base="mpu401">..</include>
-    <library>ntoskrnl</library>
-    <library>portcls</library>
-    <define name="DBG" />
-	<define name="__USE_W32API" />
-	<!--file>mpu401.rc</file-->
-	<file>adapter.cpp</file>
-</module>
diff --git a/reactos/drivers/wdm/audio/drivers/sb16_ks/adapter.cpp b/reactos/drivers/wdm/audio/drivers/sb16/adapter.cpp
similarity index 100%
rename from reactos/drivers/wdm/audio/drivers/sb16_ks/adapter.cpp
rename to reactos/drivers/wdm/audio/drivers/sb16/adapter.cpp
diff --git a/reactos/drivers/wdm/audio/drivers/sb16_ks/main.cpp b/reactos/drivers/wdm/audio/drivers/sb16/main.cpp
similarity index 100%
rename from reactos/drivers/wdm/audio/drivers/sb16_ks/main.cpp
rename to reactos/drivers/wdm/audio/drivers/sb16/main.cpp
diff --git a/reactos/drivers/wdm/audio/drivers/sb16_ks/sb16.h b/reactos/drivers/wdm/audio/drivers/sb16/sb16.h
similarity index 100%
rename from reactos/drivers/wdm/audio/drivers/sb16_ks/sb16.h
rename to reactos/drivers/wdm/audio/drivers/sb16/sb16.h
diff --git a/reactos/drivers/wdm/audio/drivers/sb16_ks/sb16.rbuild b/reactos/drivers/wdm/audio/drivers/sb16/sb16.rbuild
similarity index 100%
rename from reactos/drivers/wdm/audio/drivers/sb16_ks/sb16.rbuild
rename to reactos/drivers/wdm/audio/drivers/sb16/sb16.rbuild
diff --git a/reactos/drivers/wdm/audio/drivers/sb16_ks/sb16_ks.def b/reactos/drivers/wdm/audio/drivers/sb16/sb16_ks.def
similarity index 100%
rename from reactos/drivers/wdm/audio/drivers/sb16_ks/sb16_ks.def
rename to reactos/drivers/wdm/audio/drivers/sb16/sb16_ks.def
diff --git a/reactos/drivers/wdm/audio/drivers/sb16_ks/stdunk.cpp b/reactos/drivers/wdm/audio/drivers/sb16/stdunk.cpp
similarity index 100%
rename from reactos/drivers/wdm/audio/drivers/sb16_ks/stdunk.cpp
rename to reactos/drivers/wdm/audio/drivers/sb16/stdunk.cpp