From fe9ca5c028736b752be7c3067c818ba90c55d009 Mon Sep 17 00:00:00 2001
From: Johannes Anderwald <johannes.anderwald@reactos.org>
Date: Thu, 16 Dec 2010 09:09:43 +0000
Subject: [PATCH] [AUDIO-BRINGUP] - Trying to activate the software bus driver.
 Needs more work

svn path=/branches/audio-bringup/; revision=50034
---
 boot/bootdata/hivesys_i386.inf     |   5 +++++
 boot/bootdata/packages/reactos.dff |   1 +
 boot/bootdata/txtsetup.sif         |   3 +++
 drivers/ksfilter/directory.rbuild  |   4 ++--
 drivers/ksfilter/swenum/swenum.c   |   6 +++++-
 media/inf/machine.inf              | Bin 45686 -> 47426 bytes
 6 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/boot/bootdata/hivesys_i386.inf b/boot/bootdata/hivesys_i386.inf
index 9bffb34dea1..2c11089519f 100644
--- a/boot/bootdata/hivesys_i386.inf
+++ b/boot/bootdata/hivesys_i386.inf
@@ -1255,6 +1255,11 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Packet","ImagePath",0x00020000,"system32
 HKLM,"SYSTEM\CurrentControlSet\Services\Packet","Start",0x00010001,0x00000004
 HKLM,"SYSTEM\CurrentControlSet\Services\Packet","Type",0x00010001,0x00000001
 
+; Software BUS Driver
+HKLM,"SYSTEM\CurrentControlSet\Services\SWENUM","ErrorControl",0x00010001,0x00000001
+HKLM,"SYSTEM\CurrentControlSet\Services\SWENUM","Group",0x00000000,"Boot Bus 
+HKLM,"SYSTEM\CurrentControlSet\Services\SWENUM","Tag",0x00010001,0x00000002
+
 ; PCI Bus driver
 HKLM,"SYSTEM\CurrentControlSet\Services\Pci","ErrorControl",0x00010001,0x00000001
 HKLM,"SYSTEM\CurrentControlSet\Services\Pci","Group",0x00000000,"Boot Bus 
diff --git a/boot/bootdata/packages/reactos.dff b/boot/bootdata/packages/reactos.dff
index ba0b596f7b9..f5b83d6a87b 100644
--- a/boot/bootdata/packages/reactos.dff
+++ b/boot/bootdata/packages/reactos.dff
@@ -514,6 +514,7 @@ drivers\input\mouclass\mouclass.sys                 2
 drivers\input\sermouse\sermouse.sys                 2
 
 drivers\ksfilter\ks\ks.sys                          2
+drivers\ksfilter\swenum\swenum.sys                  2
 ;drivers\multimedia\bdasup\bdasup.sys                2
 
 drivers\network\afd\afd.sys                         2
diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif
index 57617385bbe..15d5b7b48d5 100644
--- a/boot/bootdata/txtsetup.sif
+++ b/boot/bootdata/txtsetup.sif
@@ -36,6 +36,7 @@ kbdclass.sys=,,,,,,x,,,,,,4
 l_intl.nls=,,,,,,,,,,,,2
 ntfs.sys=,,,,,,,,,,,,4
 pci.sys=,,,,,,,,,,,,4
+swenum.sys=,,,,,,,,,,,,4
 scsiport.sys=,,,,,,x,,,,,,4
 fastfat.sys=,,,,,,x,,,,,,4
 ramdisk.sys=,,,,,,x,,,,,,4
@@ -47,11 +48,13 @@ ext2.sys=,,,,,,x,,,,,,4
 *PNP0C08 = acpi
 ;PCI\CC_0601 = isapnp
 PCI\CC_0604 = pci
+ROOT\SWENUM = swenum
 
 [BootBusExtenders.Load]
 acpi = acpi.sys
 pci = pci.sys
 isapnp = isapnp.sys
+swenum = swenum.sys
 
 [Cabinets]
 Cabinet=reactos.cab
diff --git a/drivers/ksfilter/directory.rbuild b/drivers/ksfilter/directory.rbuild
index db069940a31..f74ff5d9226 100644
--- a/drivers/ksfilter/directory.rbuild
+++ b/drivers/ksfilter/directory.rbuild
@@ -4,8 +4,8 @@
 	<directory name="ks">
 		<xi:include href="ks/ks.rbuild" />
 	</directory>
-	<!--<directory name="swenum">
+	<directory name="swenum">
 		<xi:include href="swenum/swenum.rbuild" />
-	</directory>-->
+	</directory>
 </group>
 
diff --git a/drivers/ksfilter/swenum/swenum.c b/drivers/ksfilter/swenum/swenum.c
index 459e60b377f..cbff01509de 100644
--- a/drivers/ksfilter/swenum/swenum.c
+++ b/drivers/ksfilter/swenum/swenum.c
@@ -245,6 +245,9 @@ SwAddDevice(
     NTSTATUS Status;
     PDEVICE_OBJECT FunctionalDeviceObject;
 
+    DPRINT1("SWENUM AddDevice\n");
+    DbgBreakPoint();
+
     /* create the device */
     Status = IoCreateDevice(DriverObject, sizeof(KSDEVICE_HEADER), NULL, FILE_DEVICE_BUS_EXTENDER, 0, FALSE, &FunctionalDeviceObject);
 
@@ -303,7 +306,8 @@ DriverEntry(
     DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = SwDispatchDeviceControl;
     DriverObject->MajorFunction[IRP_MJ_SYSTEM_CONTROL] = SwDispatchSystemControl;
 
-
+    DPRINT1("SWENUM loaded\n");
+    DbgBreakPoint();
     return STATUS_SUCCESS;
 }
 
diff --git a/media/inf/machine.inf b/media/inf/machine.inf
index 0ac8b68bef8218df882eccd6a9571bae7e364a57..fa24ddeba11822f7a4923dbc726381a07f7b4ae5 100644
GIT binary patch
delta 915
zcmbV~-7AA(7{;%8eNMt&Hd!m1cCcDAgagEwgjn-=fLJq9KFY8-+c}MH?TGRhh~8r-
z&V@5)Qu_mN;7qxncc%BL&4Heto}RDYecji6e`bpAK8miN6{QMh?LkSFR=F{SISgR}
zGZ?4V5_?w@n$XMBaE>L6U<+~V!pk?42=SQ4g7J+uW)788+R{@!g>9_z(*z>eL5yB3
zbM<*)<WRyD0S+8we288<RXS3v^VvWVZ19LNp&e~{SRqUdzrJ(na+uFiHW9@-d|1){
zcv)70Q`*8F-wd*vocIWtn$=p)9rH%%bYX3&G$^Det6SRNsLp7dnXw<Hk7FP36eKab
zWuCz<pB(=;r#KdWeg;_e3R@b(8ikem;lkDzX8B;CWVw`7)xn%&+4Wy!!D%m)=O2p1
zzm8mvqH*$7D#w+p@uhm`tgf-r;5a314rzaHv(rgkah_V<+is<osfLvHXgM!a4F%=`
z1-U_Hh2gZUlsbepE<O_tv&p5Ex}R!89dy}ML;Xu;N~beg+J0Cj^~b5x>5+P#0Rs$+
d^BUyL*Rij6vP;xP>uY^C(c6_@^SVcmzX1hrwuArx

delta 75
zcmV-R0JQ(Y@&fkc0<hQvv*ZJK2D88lN(htM5jL~#7@P;Q9GxlwlVCFjvkoG32b1`R
hT9aTb5VJm|f&r3>Dw8le29rD}4wINHI<r750*%Vu9d`f#

-- 
2.17.1