[AUDIO-BRINGUP]

- Trying to activate the software bus driver. Needs more work

svn path=/branches/audio-bringup/; revision=50034

diff --git a/boot/bootdata/hivesys_i386.inf b/boot/bootdata/hivesys_i386.inf
index 9bffb34..2c11089 100644 (file)
--- 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
 
 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 
 ; 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 ba0b596..f5b83d6 100644 (file)
--- 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\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
 ;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 5761738..15d5b7b 100644 (file)
--- 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
 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
 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
 *PNP0C08 = acpi
 ;PCI\CC_0601 = isapnp
 PCI\CC_0604 = pci

+ROOT\SWENUM = swenum

 
 [BootBusExtenders.Load]
 acpi = acpi.sys
 pci = pci.sys
 isapnp = isapnp.sys
 
 [BootBusExtenders.Load]
 acpi = acpi.sys
 pci = pci.sys
 isapnp = isapnp.sys

+swenum = swenum.sys

 
 [Cabinets]
 Cabinet=reactos.cab
 
 [Cabinets]
 Cabinet=reactos.cab

diff --git a/drivers/ksfilter/directory.rbuild b/drivers/ksfilter/directory.rbuild
index db06994..f74ff5d 100644 (file)
--- 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="ks">
                <xi:include href="ks/ks.rbuild" />
        </directory>

-       <!--<directory name="swenum">
+       <directory name="swenum">

                <xi:include href="swenum/swenum.rbuild" />
                <xi:include href="swenum/swenum.rbuild" />

-       </directory>-->
+       </directory>

 </group>
 
 </group>
 

diff --git a/drivers/ksfilter/swenum/swenum.c b/drivers/ksfilter/swenum/swenum.c
index 459e60b..cbff015 100644 (file)
--- a/drivers/ksfilter/swenum/swenum.c
+++ b/drivers/ksfilter/swenum/swenum.c
@@ -245,6 +245,9 @@ SwAddDevice(
     NTSTATUS Status;
     PDEVICE_OBJECT FunctionalDeviceObject;
 
     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);
 
     /* 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;
 
     DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = SwDispatchDeviceControl;
     DriverObject->MajorFunction[IRP_MJ_SYSTEM_CONTROL] = SwDispatchSystemControl;
 

-
+    DPRINT1("SWENUM loaded\n");
+    DbgBreakPoint();

     return STATUS_SUCCESS;
 }
 
     return STATUS_SUCCESS;
 }
 

diff --git a/media/inf/machine.inf b/media/inf/machine.inf
index 0ac8b68..fa24dde 100644 (file)
Binary files a/media/inf/machine.inf and b/media/inf/machine.inf differ